OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 09:39:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Fix matching FFmpeg formats/codecs

Browse source
This commit is contained in:
derrod 2023-08-01 09:02:04 +02:00 committed by Lain
parent a0ae12981c
commit c1cd268532
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
UI/ffmpeg-utils.hpp
View file

@ -28,6 +28,25 @@ extern "C" {
enum FFmpegCodecType { AUDIO, VIDEO, UNKNOWN };
/* This needs to handle a few special cases due to how the format is used in the UI:
* - strequal(nullptr, "") must be true
* - strequal("", nullptr) must be true
* - strequal(nullptr, nullptr) must be true
*/
static bool strequal(const char *a, const char *b)
{
if (!a && !b)
return true;
if (!a && *b == 0)
return true;
if (!b && *a == 0)
return true;
if (!a || !b)
return false;
return strcmp(a, b) == 0;
}
struct FFmpegFormat {
const char *name;
const char *long_name;
@ -46,9 +65,10 @@ struct FFmpegFormat {
bool operator==(const FFmpegFormat &format) const
{
if (strcmp(name, format.name) != 0)
if (!strequal(name, format.name))
return false;
return strcmp(mime_type, format.mime_type) != 0;
return strequal(mime_type, format.mime_type);
}
};
Q_DECLARE_METATYPE(FFmpegFormat)
@ -69,7 +89,8 @@ struct FFmpegCodec {
{
if (id != codec.id)
return false;
return strcmp(name, codec.name) != 0;
return strequal(name, codec.name);
}
};
Q_DECLARE_METATYPE(FFmpegCodec)

2
UI/window-basic-settings.cpp
View file

@ -2238,7 +2238,7 @@ void OBSBasicSettings::LoadAdvOutputRecordingEncoderProperties()
static void SelectFormat(QComboBox *combo, const char *name,
const char *mimeType)
{
FFmpegFormat format{name, mimeType};
FFmpegFormat format{name, nullptr, mimeType};
for (int i = 0; i < combo->count(); i++) {
QVariant v = combo->itemData(i);