diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini index b2892163f..43d0d4b98 100644 --- a/UI/data/locale/en-US.ini +++ b/UI/data/locale/en-US.ini @@ -894,9 +894,9 @@ Basic.Settings.Output.Simple.Warn.Lossless="Warning: Lossless quality generates 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!" Basic.Settings.Output.Simple.Encoder.Software="Software (x264)" -Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hardware (QSV)" -Basic.Settings.Output.Simple.Encoder.Hardware.AMD="Hardware (AMD)" -Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Hardware (NVENC)" +Basic.Settings.Output.Simple.Encoder.Hardware.QSV.H264="Hardware (QSV, H.264)" +Basic.Settings.Output.Simple.Encoder.Hardware.AMD.H264="Hardware (AMD, H.264)" +Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.H264="Hardware (NVENC, H.264)" Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (x264 low CPU usage preset, increases file size)" Basic.Settings.Output.Simple.TwitchVodTrack="Twitch VOD Track (Uses Track 2)" Basic.Settings.Output.Warn.EnforceResolutionFPS.Title="Incompatible Resolution/Framerate" diff --git a/UI/window-basic-auto-config-test.cpp b/UI/window-basic-auto-config-test.cpp index 760b33210..346c92f05 100644 --- a/UI/window-basic-auto-config-test.cpp +++ b/UI/window-basic-auto-config-test.cpp @@ -937,9 +937,9 @@ void AutoConfigTestPage::TestRecordingEncoderThread() #define ENCODER_TEXT(x) "Basic.Settings.Output.Simple.Encoder." x #define ENCODER_SOFTWARE ENCODER_TEXT("Software") -#define ENCODER_NVENC ENCODER_TEXT("Hardware.NVENC") -#define ENCODER_QSV ENCODER_TEXT("Hardware.QSV") -#define ENCODER_AMD ENCODER_TEXT("Hardware.AMD") +#define ENCODER_NVENC ENCODER_TEXT("Hardware.NVENC.H264") +#define ENCODER_QSV ENCODER_TEXT("Hardware.QSV.H264") +#define ENCODER_AMD ENCODER_TEXT("Hardware.AMD.H264") #define QUALITY_SAME "Basic.Settings.Output.Simple.RecordingQuality.Stream" #define QUALITY_HIGH "Basic.Settings.Output.Simple.RecordingQuality.Small" diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index abe6b4a45..73f27d8d2 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -4762,14 +4762,17 @@ void OBSBasicSettings::FillSimpleRecordingValues() ui->simpleOutRecEncoder->addItem(ENCODER_STR("SoftwareLowCPU"), QString(SIMPLE_ENCODER_X264_LOWCPU)); if (EncoderAvailable("obs_qsv11")) - ui->simpleOutRecEncoder->addItem(ENCODER_STR("Hardware.QSV"), - QString(SIMPLE_ENCODER_QSV)); + ui->simpleOutRecEncoder->addItem( + ENCODER_STR("Hardware.QSV.H264"), + QString(SIMPLE_ENCODER_QSV)); if (EncoderAvailable("ffmpeg_nvenc")) - ui->simpleOutRecEncoder->addItem(ENCODER_STR("Hardware.NVENC"), - QString(SIMPLE_ENCODER_NVENC)); + ui->simpleOutRecEncoder->addItem( + ENCODER_STR("Hardware.NVENC.H264"), + QString(SIMPLE_ENCODER_NVENC)); if (EncoderAvailable("amd_amf_h264")) - ui->simpleOutRecEncoder->addItem(ENCODER_STR("Hardware.AMD"), - QString(SIMPLE_ENCODER_AMD)); + ui->simpleOutRecEncoder->addItem( + ENCODER_STR("Hardware.AMD.H264"), + QString(SIMPLE_ENCODER_AMD)); #undef ADD_QUALITY } @@ -4778,14 +4781,17 @@ void OBSBasicSettings::FillSimpleStreamingValues() ui->simpleOutStrEncoder->addItem(ENCODER_STR("Software"), QString(SIMPLE_ENCODER_X264)); if (EncoderAvailable("obs_qsv11")) - ui->simpleOutStrEncoder->addItem(ENCODER_STR("Hardware.QSV"), - QString(SIMPLE_ENCODER_QSV)); + ui->simpleOutStrEncoder->addItem( + ENCODER_STR("Hardware.QSV.H264"), + QString(SIMPLE_ENCODER_QSV)); if (EncoderAvailable("ffmpeg_nvenc")) - ui->simpleOutStrEncoder->addItem(ENCODER_STR("Hardware.NVENC"), - QString(SIMPLE_ENCODER_NVENC)); + ui->simpleOutStrEncoder->addItem( + ENCODER_STR("Hardware.NVENC.H264"), + QString(SIMPLE_ENCODER_NVENC)); if (EncoderAvailable("amd_amf_h264")) - ui->simpleOutStrEncoder->addItem(ENCODER_STR("Hardware.AMD"), - QString(SIMPLE_ENCODER_AMD)); + ui->simpleOutStrEncoder->addItem( + ENCODER_STR("Hardware.AMD.H264"), + QString(SIMPLE_ENCODER_AMD)); #undef ENCODER_STR }