UI: Increase maximum audio tracks to 6
This commit is contained in:
parent
f10e2c6740
commit
c4ec1bc28a
5 changed files with 390 additions and 33 deletions
|
|
@ -894,7 +894,7 @@ bool SimpleOutput::ReplayBufferActive() const
|
|||
/* ------------------------------------------------------------------------ */
|
||||
|
||||
struct AdvancedOutput : BasicOutputHandler {
|
||||
OBSEncoder aacTrack[4];
|
||||
OBSEncoder aacTrack[MAX_AUDIO_MIXES];
|
||||
OBSEncoder h264Streaming;
|
||||
OBSEncoder h264Recording;
|
||||
|
||||
|
|
@ -902,7 +902,7 @@ struct AdvancedOutput : BasicOutputHandler {
|
|||
bool ffmpegRecording;
|
||||
bool useStreamEncoder;
|
||||
|
||||
string aacEncoderID[4];
|
||||
string aacEncoderID[MAX_AUDIO_MIXES];
|
||||
|
||||
AdvancedOutput(OBSBasic *main_);
|
||||
|
||||
|
|
@ -999,7 +999,7 @@ AdvancedOutput::AdvancedOutput(OBSBasic *main_) : BasicOutputHandler(main_)
|
|||
"(advanced output)";
|
||||
obs_encoder_release(h264Streaming);
|
||||
|
||||
for (int i = 0; i < 4; i++) {
|
||||
for (int i = 0; i < MAX_AUDIO_MIXES; i++) {
|
||||
char name[9];
|
||||
sprintf(name, "adv_aac%d", i);
|
||||
|
||||
|
|
@ -1094,7 +1094,7 @@ inline void AdvancedOutput::SetupStreaming()
|
|||
for (; i < trackCount; i++)
|
||||
obs_output_set_audio_encoder(streamOutput, aacTrack[i],
|
||||
i);
|
||||
for (; i < 4; i++)
|
||||
for (; i < MAX_AUDIO_MIXES; i++)
|
||||
obs_output_set_audio_encoder(streamOutput, nullptr, i);
|
||||
|
||||
} else {
|
||||
|
|
@ -1219,31 +1219,30 @@ static inline void SetEncoderName(obs_encoder_t *encoder, const char *name,
|
|||
|
||||
inline void AdvancedOutput::UpdateAudioSettings()
|
||||
{
|
||||
const char *name1 = config_get_string(main->Config(), "AdvOut",
|
||||
"Track1Name");
|
||||
const char *name2 = config_get_string(main->Config(), "AdvOut",
|
||||
"Track2Name");
|
||||
const char *name3 = config_get_string(main->Config(), "AdvOut",
|
||||
"Track3Name");
|
||||
const char *name4 = config_get_string(main->Config(), "AdvOut",
|
||||
"Track4Name");
|
||||
bool applyServiceSettings = config_get_bool(main->Config(), "AdvOut",
|
||||
"ApplyServiceSettings");
|
||||
int streamTrackIndex = config_get_int(main->Config(), "AdvOut",
|
||||
"TrackIndex");
|
||||
obs_data_t *settings[4];
|
||||
obs_data_t *settings[MAX_AUDIO_MIXES];
|
||||
|
||||
for (size_t i = 0; i < 4; i++) {
|
||||
for (size_t i = 0; i < MAX_AUDIO_MIXES; i++) {
|
||||
settings[i] = obs_data_create();
|
||||
obs_data_set_int(settings[i], "bitrate", GetAudioBitrate(i));
|
||||
}
|
||||
|
||||
SetEncoderName(aacTrack[0], name1, "Track1");
|
||||
SetEncoderName(aacTrack[1], name2, "Track2");
|
||||
SetEncoderName(aacTrack[2], name3, "Track3");
|
||||
SetEncoderName(aacTrack[3], name4, "Track4");
|
||||
for (size_t i = 0; i < MAX_AUDIO_MIXES; i++) {
|
||||
string cfg_name = "Track";
|
||||
cfg_name += to_string((int)i + 1);
|
||||
cfg_name += "Name";
|
||||
const char *name = config_get_string(main->Config(), "AdvOut",
|
||||
cfg_name.c_str());
|
||||
|
||||
for (size_t i = 0; i < 4; i++) {
|
||||
string def_name = "Track";
|
||||
def_name += to_string((int)i + 1);
|
||||
SetEncoderName(aacTrack[i], name, def_name.c_str());
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < MAX_AUDIO_MIXES; i++) {
|
||||
if (applyServiceSettings && (int)(i + 1) == streamTrackIndex)
|
||||
obs_service_apply_encoder_settings(main->GetService(),
|
||||
nullptr, settings[i]);
|
||||
|
|
@ -1258,10 +1257,8 @@ void AdvancedOutput::SetupOutputs()
|
|||
obs_encoder_set_video(h264Streaming, obs_get_video());
|
||||
if (h264Recording)
|
||||
obs_encoder_set_video(h264Recording, obs_get_video());
|
||||
obs_encoder_set_audio(aacTrack[0], obs_get_audio());
|
||||
obs_encoder_set_audio(aacTrack[1], obs_get_audio());
|
||||
obs_encoder_set_audio(aacTrack[2], obs_get_audio());
|
||||
obs_encoder_set_audio(aacTrack[3], obs_get_audio());
|
||||
for (size_t i = 0; i < MAX_AUDIO_MIXES; i++)
|
||||
obs_encoder_set_audio(aacTrack[i], obs_get_audio());
|
||||
|
||||
SetupStreaming();
|
||||
|
||||
|
|
@ -1273,9 +1270,10 @@ void AdvancedOutput::SetupOutputs()
|
|||
|
||||
int AdvancedOutput::GetAudioBitrate(size_t i) const
|
||||
{
|
||||
const char *names[] = {
|
||||
static const char *names[] = {
|
||||
"Track1Bitrate", "Track2Bitrate",
|
||||
"Track3Bitrate", "Track4Bitrate",
|
||||
"Track5Bitrate", "Track6Bitrate",
|
||||
};
|
||||
int bitrate = (int)config_get_uint(main->Config(), "AdvOut", names[i]);
|
||||
return FindClosestAvailableAACBitrate(bitrate);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue