opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-10-24 01:59:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

UI: Add Hybrid MP4 to format selection

Browse Source
This commit is contained in:
derrod
2024-05-26 23:11:48 +02:00
parent df2a75fe4b
commit 4503f0a056
5 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/window-basic-main-outputs.cpp
+11 -2
View File
@@ -697,6 +697,9 @@ SimpleOutput::SimpleOutput(OBSBasic *main_) : BasicOutputHandler(main_)
if (!ffmpegOutput) {
bool useReplayBuffer = config_get_bool(main->Config(),
"SimpleOutput", "RecRB");
const char *recFormat = config_get_string(
main->Config(), "SimpleOutput", "RecFormat2");
if (useReplayBuffer) {
OBSDataAutoRelease hotkey;
const char *str = config_get_string(
@@ -728,8 +731,10 @@ SimpleOutput::SimpleOutput(OBSBasic *main_) : BasicOutputHandler(main_)
OBSReplayBufferSaved, this);
}
bool use_native = strcmp(recFormat, "hybrid_mp4") == 0;
fileOutput = obs_output_create(
"ffmpeg_muxer", "simple_file_output", nullptr, nullptr);
use_native ? "mp4_output" : "ffmpeg_muxer",
"simple_file_output", nullptr, nullptr);
if (!fileOutput)
throw "Failed to create recording output "
"(simple output)";
@@ -1568,6 +1573,8 @@ AdvancedOutput::AdvancedOutput(OBSBasic *main_) : BasicOutputHandler(main_)
config_get_string(main->Config(), "AdvOut", "RecEncoder");
const char *recAudioEncoder =
config_get_string(main->Config(), "AdvOut", "RecAudioEncoder");
const char *recFormat =
config_get_string(main->Config(), "AdvOut", "RecFormat2");
#ifdef __APPLE__
translate_macvth264_encoder(streamEncoder);
translate_macvth264_encoder(recordEncoder);
@@ -1623,8 +1630,10 @@ AdvancedOutput::AdvancedOutput(OBSBasic *main_) : BasicOutputHandler(main_)
OBSReplayBufferSaved, this);
}
bool native_muxer = strcmp(recFormat, "hybrid_mp4") == 0;
fileOutput = obs_output_create(
"ffmpeg_muxer", "adv_file_output", nullptr, nullptr);
native_muxer ? "mp4_output" : "ffmpeg_muxer",
"adv_file_output", nullptr, nullptr);
if (!fileOutput)
throw "Failed to create recording output "
"(advanced output)";