Skip to content

fix(amf): enable H.264 profile and coder selection #4927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
k4idyn wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −1
Open

fix(amf): enable H.264 profile and coder selection #4927

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion src/video.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,16 @@

} // namespace qsv

namespace amf {

enum class coder_e : int {
auto_ = 0,
cabac = 1,
cavlc = 2,
};

} // namespace amf

util::Either<avcodec_buffer_t, int> dxgi_init_avcodec_hardware_input_buffer(platf::avcodec_encode_device_t *);
util::Either<avcodec_buffer_t, int> vaapi_init_avcodec_hardware_input_buffer(platf::avcodec_encode_device_t *);
util::Either<avcodec_buffer_t, int> cuda_init_avcodec_hardware_input_buffer(platf::avcodec_encode_device_t *);
Expand Down Expand Up @@ -814,9 +824,22 @@
{"rc"s, &config::video.amd.amd_rc_h264},
{"usage"s, &config::video.amd.amd_usage_h264},
{"vbaq"s, &config::video.amd.amd_vbaq},
{"coder"s, &config::video.amd.amd_coder},
{"enforce_hrd"s, &config::video.amd.amd_enforce_hrd},
},
{}, // SDR-specific options
{
// SDR-specific options
{"profile"s, [](const config_t &) {
switch (config::video.amd.amd_coder) {
case (int) amf::coder_e::cavlc:

Check warning on line 834 in src/video.cpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Use "std::to_underlying" to cast enums to their underlying type. 


See more on https://sonarcloud.io/project/issues?id=LizardByte_Sunshine&issues=AZ528JOQfeNRQCeug0Hx&open=AZ528JOQfeNRQCeug0Hx&pullRequest=4927
return "constrained_baseline"s;
case (int) amf::coder_e::cabac:

Check warning on line 836 in src/video.cpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Use "std::to_underlying" to cast enums to their underlying type. 


See more on https://sonarcloud.io/project/issues?id=LizardByte_Sunshine&issues=AZ528JOQfeNRQCeug0Hy&open=AZ528JOQfeNRQCeug0Hy&pullRequest=4927
return "high"s;
default:
return "main"s;
}
}},
},
{}, // HDR-specific options
{}, // YUV444 SDR-specific options
{}, // YUV444 HDR-specific options
Expand Down