[obs-studio-freeworld] rebase patch

commit d840ffbce04ae4dbfb49f4c4b04b01eb874d12fc Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Wed Nov 15 22:07:31 2023 +0100 rebase patch ...ntly-reference-the-software-H264-encoder-.patch | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) --- diff --git a/0001-UI-Consistently-reference-the-software-H264-encoder-.patch b/0001-UI-Consistently-reference-the-software-H264-encoder-.patch index e976f5c..2d5992e 100644 --- a/0001-UI-Consistently-reference-the-software-H264-encoder-.patch +++ b/0001-UI-Consistently-reference-the-software-H264-encoder-.patch @@ -1,7 +1,7 @@ -From 04d3a21c6e72cd5574f7333adf548012d912c1ee Mon Sep 17 00:00:00 2001 +From dfa857eceb0deaf1a273fbd3423364fd7268ea90 Mon Sep 17 00:00:00 2001 From: Neal Gompa <neal(a)gompa.dev&gt; Date: Sat, 7 Jan 2023 23:15:13 -0500 -Subject: [PATCH 1/3] UI: Consistently reference the software H264 encoder +Subject: [PATCH 101/103] UI: Consistently reference the software H264 encoder properly The code here assumes that the only software encoder is the x264-based @@ -15,10 +15,10 @@ the encoder string to indicate that it's an H.264 encoder from x264. 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini -index 4c03aa7db..e44d99660 100644 +index e62f38a26..339ac4d86 100644 --- a/UI/data/locale/en-US.ini +++ b/UI/data/locale/en-US.ini -@@ -980,7 +980,7 @@ Basic.Settings.Output.Simple.Warn.Encoder="Warning: Recording with a software en +@@ -996,7 +996,7 @@ Basic.Settings.Output.Simple.Warn.Encoder="Warning: Recording with a software en Basic.Settings.Output.Simple.Warn.Lossless="Warning: Lossless quality generates tremendously large file sizes! Lossless quality can use upward of 7 gigabytes of disk space per minute at high resolutions and framerates. Lossless is not recommended for long recordings unless you have a very large amount of disk space available." Basic.Settings.Output.Simple.Warn.Lossless.Msg="Are you sure you want to use lossless quality?" Basic.Settings.Output.Simple.Warn.Lossless.Title="Lossless quality warning!" @@ -27,7 +27,7 @@ index 4c03aa7db..e44d99660 100644 Basic.Settings.Output.Simple.Encoder.Hardware.QSV.H264="Hardware (QSV, H.264)" Basic.Settings.Output.Simple.Encoder.Hardware.QSV.AV1="Hardware (QSV, AV1)" Basic.Settings.Output.Simple.Encoder.Hardware.AMD.H264="Hardware (AMD, H.264)" -@@ -991,7 +991,7 @@ Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.AV1="Hardware (NVENC, AV1)" +@@ -1007,7 +1007,7 @@ Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.AV1="Hardware (NVENC, AV1)" Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.HEVC="Hardware (NVENC, HEVC)" Basic.Settings.Output.Simple.Encoder.Hardware.Apple.H264="Hardware (Apple, H.264)" Basic.Settings.Output.Simple.Encoder.Hardware.Apple.HEVC="Hardware (Apple, HEVC)" @@ -37,10 +37,10 @@ index 4c03aa7db..e44d99660 100644 Basic.Settings.Output.Simple.Codec.AAC.Default="AAC (Default)" Basic.Settings.Output.Simple.Codec.Opus="Opus" diff --git a/UI/window-basic-auto-config-test.cpp b/UI/window-basic-auto-config-test.cpp -index 2d89d7347..09979c031 100644 +index 7d7c4278e..a8b5d884a 100644 --- a/UI/window-basic-auto-config-test.cpp +++ b/UI/window-basic-auto-config-test.cpp -@@ -993,7 +993,7 @@ void AutoConfigTestPage::TestRecordingEncoderThread() +@@ -1010,7 +1010,7 @@ void AutoConfigTestPage::TestRecordingEncoderThread() } #define ENCODER_TEXT(x) "Basic.Settings.Output.Simple.Encoder." x @@ -49,7 +49,7 @@ index 2d89d7347..09979c031 100644 #define ENCODER_NVENC ENCODER_TEXT("Hardware.NVENC.H264") #define ENCODER_QSV ENCODER_TEXT("Hardware.QSV.H264") #define ENCODER_AMD ENCODER_TEXT("Hardware.AMD.H264") -@@ -1033,7 +1033,7 @@ void AutoConfigTestPage::FinalizeResults() +@@ -1050,7 +1050,7 @@ void AutoConfigTestPage::FinalizeResults() auto encName = [](AutoConfig::Encoder enc) -> QString { switch (enc) { case AutoConfig::Encoder::x264: @@ -58,7 +58,7 @@ index 2d89d7347..09979c031 100644 case AutoConfig::Encoder::NVENC: return QTStr(ENCODER_NVENC); case AutoConfig::Encoder::QSV: -@@ -1046,7 +1046,7 @@ void AutoConfigTestPage::FinalizeResults() +@@ -1063,7 +1063,7 @@ void AutoConfigTestPage::FinalizeResults() return QTStr(QUALITY_SAME); } @@ -68,23 +68,23 @@ index 2d89d7347..09979c031 100644 auto newLabel = [this](const char *str) -> QLabel * { diff --git a/UI/window-basic-settings-stream.cpp b/UI/window-basic-settings-stream.cpp -index f6e0817a0..b056938e7 100644 +index 2ad275a44..e2ba4b677 100644 --- a/UI/window-basic-settings-stream.cpp +++ b/UI/window-basic-settings-stream.cpp -@@ -1585,7 +1585,7 @@ void OBSBasicSettings::ResetEncoders(bool streamOnly) +@@ -1670,7 +1670,7 @@ void OBSBasicSettings::ResetEncoders(bool streamOnly) #define ENCODER_STR(str) QTStr("Basic.Settings.Output.Simple.Encoder." str) - ui->simpleOutStrEncoder->addItem(ENCODER_STR("Software"), + ui->simpleOutStrEncoder->addItem(ENCODER_STR("Software.X264.H264"), QString(SIMPLE_ENCODER_X264)); + #ifdef _WIN32 if (service_supports_encoder(vcodecs, "obs_qsv11")) - ui->simpleOutStrEncoder->addItem( diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp -index fb170bfc1..48bb4bac6 100644 +index b1e6bd6fb..ddf0adc56 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp -@@ -5286,10 +5286,11 @@ void OBSBasicSettings::FillSimpleRecordingValues() +@@ -5237,10 +5237,11 @@ void OBSBasicSettings::FillSimpleRecordingValues() ADD_QUALITY("HQ"); ADD_QUALITY("Lossless"); @@ -100,5 +100,5 @@ index fb170bfc1..48bb4bac6 100644 ui->simpleOutRecEncoder->addItem( ENCODER_STR("Hardware.QSV.H264"), -- -2.39.2 +2.41.0