From cce734a0aab861b2841419571dd4eaa45885beb0 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Tue, 18 Feb 2020 21:00:57 -0800 Subject: [PATCH] UI: Allow rescaling for texture-based encoders --- UI/window-basic-main-outputs.cpp | 10 ---------- UI/window-basic-settings.cpp | 24 ++++-------------------- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/UI/window-basic-main-outputs.cpp b/UI/window-basic-main-outputs.cpp index 4353f7ae1..029cc0866 100644 --- a/UI/window-basic-main-outputs.cpp +++ b/UI/window-basic-main-outputs.cpp @@ -1284,14 +1284,9 @@ inline void AdvancedOutput::SetupStreaming() config_get_string(main->Config(), "AdvOut", "RescaleRes"); int streamTrack = config_get_int(main->Config(), "AdvOut", "TrackIndex") - 1; - uint32_t caps = obs_encoder_get_caps(h264Streaming); unsigned int cx = 0; unsigned int cy = 0; - if ((caps & OBS_ENCODER_CAP_PASS_TEXTURE) != 0) { - rescale = false; - } - if (rescale && rescaleRes && *rescaleRes) { if (sscanf(rescaleRes, "%ux%u", &cx, &cy) != 2) { cx = 0; @@ -1339,11 +1334,6 @@ inline void AdvancedOutput::SetupRecording() obs_output_set_video_encoder(replayBuffer, h264Streaming); } else { - uint32_t caps = obs_encoder_get_caps(h264Recording); - if ((caps & OBS_ENCODER_CAP_PASS_TEXTURE) != 0) { - rescale = false; - } - if (rescale && rescaleRes && *rescaleRes) { if (sscanf(rescaleRes, "%ux%u", &cx, &cy) != 2) { cx = 0; diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index 5cee02031..d001d1c91 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -3672,16 +3672,8 @@ void OBSBasicSettings::on_advOutEncoder_currentIndexChanged(int idx) ui->advOutputStreamTab->layout()->addWidget(streamEncoderProps); } - uint32_t caps = obs_get_encoder_caps(QT_TO_UTF8(encoder)); - - if (caps & OBS_ENCODER_CAP_PASS_TEXTURE) { - ui->advOutUseRescale->setChecked(false); - ui->advOutUseRescale->setVisible(false); - ui->advOutRescale->setVisible(false); - } else { - ui->advOutUseRescale->setVisible(true); - ui->advOutRescale->setVisible(true); - } + ui->advOutUseRescale->setVisible(true); + ui->advOutRescale->setVisible(true); UNUSED_PARAMETER(idx); } @@ -3712,16 +3704,8 @@ void OBSBasicSettings::on_advOutRecEncoder_currentIndexChanged(int idx) SLOT(AdvReplayBufferChanged())); } - uint32_t caps = obs_get_encoder_caps(QT_TO_UTF8(encoder)); - - if (caps & OBS_ENCODER_CAP_PASS_TEXTURE) { - ui->advOutRecUseRescale->setChecked(false); - ui->advOutRecUseRescale->setVisible(false); - ui->advOutRecRescaleContainer->setVisible(false); - } else { - ui->advOutRecUseRescale->setVisible(true); - ui->advOutRecRescaleContainer->setVisible(true); - } + ui->advOutRecUseRescale->setVisible(true); + ui->advOutRecRescaleContainer->setVisible(true); } void OBSBasicSettings::on_advOutFFIgnoreCompat_stateChanged(int)