mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-04-11 18:20:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

UI: Rework recording format handling

Browse Source
This commit is contained in:
derrod
2023-04-03 15:48:55 +02:00
committed by Ryan Foster
parent a4f3eb7fcf
commit 5a375defa8
6 changed files with 107 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
UI/window-basic-main.cpp
View File

@@ -1374,9 +1374,9 @@ extern void CheckExistingCookieId();
#if OBS_RELEASE_CANDIDATE == 0 && OBS_BETA == 0
#define DEFAULT_CONTAINER "mkv"
#elif defined(__APPLE__)
#define DEFAULT_CONTAINER "fmov"
#define DEFAULT_CONTAINER "fragmented_mov"
#else
#define DEFAULT_CONTAINER "fmp4"
#define DEFAULT_CONTAINER "fragmented_mp4"
#endif
bool OBSBasic::InitBasicConfigDefaults()
@@ -1474,23 +1474,37 @@ bool OBSBasic::InitBasicConfigDefaults()
/* ----------------------------------------------------- */
/* Migrate old container selection (if any) to new key. */
if (!config_has_user_value(basicConfig, "SimpleOutput", "RecFormat2") &&
config_has_user_value(basicConfig, "SimpleOutput", "RecFormat")) {
const char *old_format = config_get_string(
basicConfig, "SimpleOutput", "RecFormat");
config_set_string(basicConfig, "SimpleOutput", "RecFormat2",
old_format);
changed = true;
}
if (!config_has_user_value(basicConfig, "AdvOut", "RecFormat2") &&
config_has_user_value(basicConfig, "AdvOut", "RecFormat")) {
const char *old_format =
config_get_string(basicConfig, "AdvOut", "RecFormat");
config_set_string(basicConfig, "AdvOut", "RecFormat2",
old_format);
changed = true;
}
auto MigrateFormat = [&](const char *section) {
bool has_old_key = config_has_user_value(basicConfig, section,
"RecFormat");
bool has_new_key = config_has_user_value(basicConfig, section,
"RecFormat2");
if (!has_new_key && !has_old_key)
return;
string old_format = config_get_string(
basicConfig, section,
has_new_key ? "RecFormat2" : "RecFormat");
string new_format = old_format;
if (old_format == "ts")
new_format = "mpegts";
else if (old_format == "m3u8")
new_format = "hls";
else if (old_format == "fmp4")
new_format = "fragmented_mp4";
else if (old_format == "fmov")
new_format = "fragmented_mov";
if (new_format != old_format || !has_new_key) {
config_set_string(basicConfig, section, "RecFormat2",
new_format.c_str());
changed = true;
}
};
MigrateFormat("AdvOut");
MigrateFormat("SimpleOutput");
/* ----------------------------------------------------- */
@@ -7382,11 +7396,11 @@ void OBSBasic::AutoRemux(QString input, bool no_show)
const obs_encoder_t *videoEncoder =
obs_output_get_video_encoder(outputHandler->fileOutput);
const char *codecName = obs_encoder_get_codec(videoEncoder);
string format = config_get_string(
const char *format = config_get_string(
config, isSimpleMode ? "SimpleOutput" : "AdvOut", "RecFormat2");
/* Retain original container for fMP4/fMOV */
if (format == "fmp4" || format == "fmov") {
if (strncmp(format, "fragmented", 10) == 0) {
output += "remuxed." + suffix;
} else if (strcmp(codecName, "prores") == 0) {
output += "mov";