mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-03-06 07:36:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

UI: Set fragmented MP4/MOV as default for beta/rc

Browse Source 
Also includes a migration to a new key to ensure backwards-compatibility
of profile config.
This commit is contained in:
derrod
2023-03-24 12:44:37 +01:00
committed by Jim
parent 3fe241e95f
commit f1223ca566
3 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1378,6 +1378,13 @@ static const double scaled_vals[] = {1.0, 1.25, (1.0 / 0.75), 1.5,
2.5, 2.75, 3.0, 0.0};
extern void CheckExistingCookieId();
#if OBS_RELEASE_CANDIDATE == 0 && OBS_BETA == 0
#define DEFAULT_CONTAINER "mkv"
#elif defined(__APPLE__)
#define DEFAULT_CONTAINER "fmov"
#else
#define DEFAULT_CONTAINER "fmp4"
#endif
bool OBSBasic::InitBasicConfigDefaults()
{
@@ -1472,6 +1479,26 @@ 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;
}
/* ----------------------------------------------------- */
if (changed)
@@ -1486,8 +1513,8 @@ bool OBSBasic::InitBasicConfigDefaults()
config_set_default_string(basicConfig, "SimpleOutput", "FilePath",
GetDefaultVideoSavePath().c_str());
config_set_default_string(basicConfig, "SimpleOutput", "RecFormat",
"mkv");
config_set_default_string(basicConfig, "SimpleOutput", "RecFormat2",
DEFAULT_CONTAINER);
config_set_default_uint(basicConfig, "SimpleOutput", "VBitrate", 2500);
config_set_default_uint(basicConfig, "SimpleOutput", "ABitrate", 160);
config_set_default_bool(basicConfig, "SimpleOutput", "UseAdvanced",
@@ -1519,7 +1546,8 @@ bool OBSBasic::InitBasicConfigDefaults()
config_set_default_string(basicConfig, "AdvOut", "RecFilePath",
GetDefaultVideoSavePath().c_str());
config_set_default_string(basicConfig, "AdvOut", "RecFormat", "mkv");
config_set_default_string(basicConfig, "AdvOut", "RecFormat2",
DEFAULT_CONTAINER);
config_set_default_bool(basicConfig, "AdvOut", "RecUseRescale", false);
config_set_default_uint(basicConfig, "AdvOut", "RecTracks", (1 << 0));
config_set_default_string(basicConfig, "AdvOut", "RecEncoder", "none");