xaymar/obs-ffmpeg-encoder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

ui/nvenc_shared: Fix Rate Control Mode CQP and AQ Strength

Browse Source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks
2019-07-22 14:49:43 +02:00
parent 51a5396fb1
commit 2840a7fbb1
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/ui/nvenc_shared.cpp
+8 -6
View File
@@ -106,8 +106,8 @@ std::map<ratecontrolmode, std::string> obsffmpeg::nvenc::ratecontrolmodes{
}; };
std::map<ratecontrolmode, std::string> obsffmpeg::nvenc::ratecontrolmode_to_opt{ std::map<ratecontrolmode, std::string> obsffmpeg::nvenc::ratecontrolmode_to_opt{
{ratecontrolmode::CQP, "const_qp"}, {ratecontrolmode::VBR, "vbr"}, {ratecontrolmode::VBR_HQ, "vbr_hq"}, {ratecontrolmode::CQP, "constqp"}, {ratecontrolmode::VBR, "vbr"}, {ratecontrolmode::VBR_HQ, "vbr_hq"},
{ratecontrolmode::CBR, "cbr"}, {ratecontrolmode::CBR_HQ, "cbr_hq"}, {ratecontrolmode::CBR_LD_HQ, "cbr_ld_hq"}, {ratecontrolmode::CBR, "cbr"}, {ratecontrolmode::CBR_HQ, "cbr_hq"}, {ratecontrolmode::CBR_LD_HQ, "cbr_ld_hq"},
}; };
std::map<b_ref_mode, std::string> obsffmpeg::nvenc::b_ref_modes{ std::map<b_ref_mode, std::string> obsffmpeg::nvenc::b_ref_modes{
@@ -627,9 +627,8 @@ void obsffmpeg::nvenc::update(obs_data_t* settings, AVCodec* codec, AVCodecConte
} }
{ // AQ { // AQ
bool saq = obs_data_get_bool(settings, P_AQ_SPATIAL); bool saq = obs_data_get_bool(settings, P_AQ_SPATIAL);
int saqs = static_cast<int>(obs_data_get_int(settings, P_AQ_STRENGTH)); bool taq = obs_data_get_bool(settings, P_AQ_TEMPORAL);
bool taq = obs_data_get_bool(settings, P_AQ_TEMPORAL);
if (strcmp(codec->name, "h264_nvenc")) { if (strcmp(codec->name, "h264_nvenc")) {
av_opt_set_int(context->priv_data, "spatial-aq", saq ? 1 : 0, 0); av_opt_set_int(context->priv_data, "spatial-aq", saq ? 1 : 0, 0);
@@ -638,7 +637,10 @@ void obsffmpeg::nvenc::update(obs_data_t* settings, AVCodec* codec, AVCodecConte
av_opt_set_int(context->priv_data, "spatial_aq", saq ? 1 : 0, 0); av_opt_set_int(context->priv_data, "spatial_aq", saq ? 1 : 0, 0);
av_opt_set_int(context->priv_data, "temporal_aq", taq ? 1 : 0, 0); av_opt_set_int(context->priv_data, "temporal_aq", taq ? 1 : 0, 0);
} }
av_opt_set_int(context->priv_data, "aq-strength", saqs, 0); if (saq) {
av_opt_set_int(context->priv_data, "aq-strength",
static_cast<int>(obs_data_get_int(settings, P_AQ_STRENGTH)), 0);
}
} }
{ // Other { // Other