jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Remove some globals in AAC bitrate population

master
Richard Stanway 2022-02-01 02:46:53 +01:00
parent 89881147c7
commit da4d98d0e4
No known key found for this signature in database
GPG Key ID: 4F96FCA24BCE7BA1
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
UI/audio-encoders.cpp
View File

@ -13,15 +13,6 @@
using namespace std;
static const string encoders[] = {
"ffmpeg_aac",
"mf_aac",
"libfdk_aac",
"CoreAudio_AAC",
};
static const string &fallbackEncoder = encoders[0];
static const char *NullToEmpty(const char *str)
{
return str ? str : "";
@ -33,7 +24,6 @@ static const char *EncoderName(const char *id)
}
static map<int, const char *> bitrateMap;
static once_flag populateBitrateMap;
static void HandleIntProperty(obs_property_t *prop, const char *id)
{
@ -142,10 +132,20 @@ static const char *GetCodec(const char *id)
return NullToEmpty(obs_get_encoder_codec(id));
}
static const string aac_ = "AAC";
static void PopulateBitrateMap()
{
call_once(populateBitrateMap, []() {
static once_flag once;
call_once(once, []() {
const string encoders[] = {
"ffmpeg_aac",
"mf_aac",
"libfdk_aac",
"CoreAudio_AAC",
};
const string fallbackEncoder = encoders[0];
struct obs_audio_info aoi;
obs_get_audio_info(&aoi);
uint32_t output_channels = get_audio_channels(aoi.speakers);
@ -162,7 +162,7 @@ static void PopulateBitrateMap()
end(encoders))
continue;
if (aac_ != GetCodec(id))
if (strcmp(GetCodec(id), "AAC") != 0)
continue;
HandleEncoderProperties(id);
@ -172,11 +172,11 @@ static void PopulateBitrateMap()
if (encoder == fallbackEncoder)
continue;
if (aac_ != GetCodec(encoder.c_str()))
if (strcmp(GetCodec(encoder.c_str()), "AAC") != 0)
continue;
// disable mf_aac if audio output is not stereo nor mono
if ((output_channels >= 3) && (encoder == "mf_aac"))
if (output_channels >= 3 && encoder == "mf_aac")
continue;
HandleEncoderProperties(encoder.c_str());