mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-01-22 05:08:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

UI: Enable audio multi-track w/ mpegts streaming

Browse Source 
This enables audio multi-track support in UI for mpegts streams (srt,
rist ...).
The UI changes were coded though to allow re-use by other protocols.

Signed-off-by: pkv <pkv@obsproject.com>
This commit is contained in:
pkv
2022-07-15 22:03:43 +02:00
committed by Lain
parent 99ae6eb2e9
commit f186268507
6 changed files with 293 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
UI/window-basic-settings.cpp
View File

@@ -450,6 +450,12 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
HookWidget(ui->advOutTrack4, CHECK_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->advOutTrack5, CHECK_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->advOutTrack6, CHECK_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->advOutMultiTrack1, CHECK_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->advOutMultiTrack2, CHECK_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->advOutMultiTrack3, CHECK_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->advOutMultiTrack4, CHECK_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->advOutMultiTrack5, CHECK_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->advOutMultiTrack6, CHECK_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->advOutRecType, COMBO_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->advOutRecPath, EDIT_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->advOutNoSpace, CHECK_CHANGED, OUTPUTS_CHANGED);
@@ -2022,13 +2028,24 @@ static inline QString makeFormatToolTip()
return html;
}
#define RTMP_PROTOCOL "rtmp"
#define SRT_PROTOCOL "srt"
#define RIST_PROTOCOL "rist"
inline bool allowsMultiTrack(const char *protocol)
{
return astrcmpi_n(protocol, SRT_PROTOCOL, strlen(SRT_PROTOCOL)) == 0 ||
astrcmpi_n(protocol, RIST_PROTOCOL, strlen(RIST_PROTOCOL)) == 0;
}
void OBSBasicSettings::LoadAdvOutputStreamingSettings()
{
bool rescale = config_get_bool(main->Config(), "AdvOut", "Rescale");
const char *rescaleRes =
config_get_string(main->Config(), "AdvOut", "RescaleRes");
int trackIndex = config_get_int(main->Config(), "AdvOut", "TrackIndex");
int audioMixes = config_get_int(main->Config(), "AdvOut",
"StreamMultiTrackAudioMixes");
ui->advOutUseRescale->setChecked(rescale);
ui->advOutRescale->setEnabled(rescale);
ui->advOutRescale->setCurrentText(rescaleRes);
@@ -2061,6 +2078,28 @@ void OBSBasicSettings::LoadAdvOutputStreamingSettings()
ui->advOutTrack6->setChecked(true);
break;
}
ui->advOutMultiTrack1->setChecked(audioMixes & (1 << 0));
ui->advOutMultiTrack2->setChecked(audioMixes & (1 << 1));
ui->advOutMultiTrack3->setChecked(audioMixes & (1 << 2));
ui->advOutMultiTrack4->setChecked(audioMixes & (1 << 3));
ui->advOutMultiTrack5->setChecked(audioMixes & (1 << 4));
ui->advOutMultiTrack6->setChecked(audioMixes & (1 << 5));
bool is_multitrack_output = false;
obs_service_t *service_obj = main->GetService();
const char *protocol = nullptr;
protocol = obs_service_get_protocol(service_obj);
if (protocol) {
is_multitrack_output = allowsMultiTrack(protocol);
}
if (is_multitrack_output) {
ui->advStreamTrackWidget->setCurrentWidget(
ui->streamMultiTracks);
} else {
ui->advStreamTrackWidget->setCurrentWidget(
ui->streamSingleTracks);
}
}
OBSPropertiesView *
@@ -3821,7 +3860,8 @@ void OBSBasicSettings::SaveOutputSettings()
SaveTrackIndex(main->Config(), "AdvOut", "TrackIndex", ui->advOutTrack1,
ui->advOutTrack2, ui->advOutTrack3, ui->advOutTrack4,
ui->advOutTrack5, ui->advOutTrack6);
config_set_int(main->Config(), "AdvOut", "StreamMultiTrackAudioMixes",
AdvOutGetStreamingSelectedAudioTracks());
config_set_string(main->Config(), "AdvOut", "RecType",
RecTypeFromIdx(ui->advOutRecType->currentIndex()));
@@ -4191,6 +4231,8 @@ bool OBSBasicSettings::QueryAllowedToClose()
QString format = ui->advOutRecFormat->currentData().toString();
if (AdvOutGetSelectedAudioTracks() == 0 && format != "flv")
invalidTracks = true;
if (AdvOutGetStreamingSelectedAudioTracks() == 0)
invalidTracks = true;
}
if (invalidEncoder) {
@@ -6135,6 +6177,17 @@ int OBSBasicSettings::AdvOutGetSelectedAudioTracks()
return tracks;
}
int OBSBasicSettings::AdvOutGetStreamingSelectedAudioTracks()
{
int tracks = (ui->advOutMultiTrack1->isChecked() ? (1 << 0) : 0) |
(ui->advOutMultiTrack2->isChecked() ? (1 << 1) : 0) |
(ui->advOutMultiTrack3->isChecked() ? (1 << 2) : 0) |
(ui->advOutMultiTrack4->isChecked() ? (1 << 3) : 0) |
(ui->advOutMultiTrack5->isChecked() ? (1 << 4) : 0) |
(ui->advOutMultiTrack6->isChecked() ? (1 << 5) : 0);
return tracks;
}
/* Using setEditable(true) on a QComboBox when there's a custom style in use
* does not work properly, so instead completely recreate the widget, which
* seems to work fine. */