From 34a43aa4f191fd09a06e6c32805602b2c44f65be Mon Sep 17 00:00:00 2001 From: jpark37 Date: Tue, 15 Nov 2022 18:58:40 -0800 Subject: [PATCH] UI: Clarify that RGB output format is BGRA --- UI/data/locale/en-US.ini | 2 +- UI/frontend-plugins/decklink-output-ui/forms/output.ui | 2 +- UI/window-basic-settings.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini index a05a24314..20f850a9d 100644 --- a/UI/data/locale/en-US.ini +++ b/UI/data/locale/en-US.ini @@ -1138,7 +1138,7 @@ Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8-bit, 4:2:0, 3 planes)" Basic.Settings.Advanced.Video.ColorFormat.I444="I444 (8-bit, 4:4:4, 3 planes)" Basic.Settings.Advanced.Video.ColorFormat.P010="P010 (10-bit, 4:2:0, 2 planes)" Basic.Settings.Advanced.Video.ColorFormat.I010="I010 (10-bit, 4:2:0, 3 planes)" -Basic.Settings.Advanced.Video.ColorFormat.RGB="RGB (8-bit)" +Basic.Settings.Advanced.Video.ColorFormat.BGRA="BGRA (8-bit)" Basic.Settings.Advanced.Video.ColorSpace="Color Space" Basic.Settings.Advanced.Video.ColorSpace.sRGB="sRGB" Basic.Settings.Advanced.Video.ColorSpace.601="Rec. 601" diff --git a/UI/frontend-plugins/decklink-output-ui/forms/output.ui b/UI/frontend-plugins/decklink-output-ui/forms/output.ui index 3f63a8027..39971d35d 100644 --- a/UI/frontend-plugins/decklink-output-ui/forms/output.ui +++ b/UI/frontend-plugins/decklink-output-ui/forms/output.ui @@ -122,7 +122,7 @@ - Keyer output requires RGB mode in advanced settings. + Keyer output requires BGRA mode in advanced settings. diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index 03a8ba6b4..cee2945cb 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -997,7 +997,7 @@ void OBSBasicSettings::LoadColorSpaces() #define CF_I444_STR QTStr("Basic.Settings.Advanced.Video.ColorFormat.I444") #define CF_P010_STR QTStr("Basic.Settings.Advanced.Video.ColorFormat.P010") #define CF_I010_STR QTStr("Basic.Settings.Advanced.Video.ColorFormat.I010") -#define CF_RGB_STR QTStr("Basic.Settings.Advanced.Video.ColorFormat.RGB") +#define CF_BGRA_STR QTStr("Basic.Settings.Advanced.Video.ColorFormat.BGRA") void OBSBasicSettings::LoadColorFormats() { @@ -1006,7 +1006,7 @@ void OBSBasicSettings::LoadColorFormats() ui->colorFormat->addItem(CF_I444_STR, "I444"); ui->colorFormat->addItem(CF_P010_STR, "P010"); ui->colorFormat->addItem(CF_I010_STR, "I010"); - ui->colorFormat->addItem(CF_RGB_STR, "RGB"); + ui->colorFormat->addItem(CF_BGRA_STR, "RGB"); // Avoid config break } #define AV_FORMAT_DEFAULT_STR \