Skip to content

Commit 9478073

Browse files
committed
frontend: Use Hybrid MP4/MOV for replay buffer if selected for recording
1 parent 5c74a59 commit 9478073

3 files changed

Lines changed: 15 additions & 3 deletions

File tree

frontend/settings/OBSBasicSettings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3587,7 +3587,7 @@ void OBSBasicSettings::SaveHotkeySettings()
35873587
return;
35883588

35893589
const char *id = obs_obj_get_id(main->outputHandler->replayBuffer);
3590-
if (strcmp(id, "replay_buffer") == 0) {
3590+
if (strstr(id, "replay_buffer") != nullptr) {
35913591
OBSDataAutoRelease hotkeys = obs_hotkeys_save_output(main->outputHandler->replayBuffer);
35923592
config_set_string(config, "Hotkeys", "ReplayBuffer", obs_data_get_json(hotkeys));
35933593
}

frontend/utility/AdvancedOutput.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,13 @@ AdvancedOutput::AdvancedOutput(OBSBasic *main_) : BasicOutputHandler(main_)
9292
else
9393
hotkey = nullptr;
9494

95-
replayBuffer = obs_output_create("replay_buffer", Str("ReplayBuffer"), nullptr, hotkey);
95+
const char *replay_mux = "replay_buffer";
96+
if (strcmp(recFormat, "hybrid_mp4") == 0)
97+
replay_mux = "mp4_replay_buffer";
98+
else if (strcmp(recFormat, "hybrid_mov") == 0)
99+
replay_mux = "mov_replay_buffer";
100+
101+
replayBuffer = obs_output_create(replay_mux, Str("ReplayBuffer"), nullptr, hotkey);
96102

97103
if (!replayBuffer)
98104
throw "Failed to create replay buffer output "

frontend/utility/SimpleOutput.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,13 @@ SimpleOutput::SimpleOutput(OBSBasic *main_) : BasicOutputHandler(main_)
212212
else
213213
hotkey = nullptr;
214214

215-
replayBuffer = obs_output_create("replay_buffer", Str("ReplayBuffer"), nullptr, hotkey);
215+
const char *replay_mux = "replay_buffer";
216+
if (strcmp(recFormat, "hybrid_mp4") == 0)
217+
replay_mux = "mp4_replay_buffer";
218+
else if (strcmp(recFormat, "hybrid_mov") == 0)
219+
replay_mux = "mov_replay_buffer";
220+
221+
replayBuffer = obs_output_create(replay_mux, Str("ReplayBuffer"), nullptr, hotkey);
216222

217223
if (!replayBuffer)
218224
throw "Failed to create replay buffer output "

0 commit comments

Comments
 (0)