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

UI: Support PCM in MP4

Browse Source
This commit is contained in:
derrod
2023-05-03 12:36:41 +02:00
committed by Lain
parent d53ed7daed
commit ef3a67708e
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7510,16 +7510,17 @@ void OBSBasic::AutoRemux(QString input, bool no_show)
const char *format = config_get_string(
config, isSimpleMode ? "SimpleOutput" : "AdvOut", "RecFormat2");
/* AV1+PCM cannot be remuxed into any supported format (until FFmpeg 6.1) */
if (strcmp(vCodecName, "av1") == 0 &&
strncmp(aCodecName, "pcm", 3) == 0)
bool audio_is_pcm = strncmp(aCodecName, "pcm", 3) == 0;
/* FFmpeg <= 6.0 cannot remux AV1+PCM into any supported format. */
if (audio_is_pcm && !ff_supports_pcm_in_mp4() &&
strcmp(vCodecName, "av1") == 0)
return;
/* Retain original container for fMP4/fMOV */
if (strncmp(format, "fragmented", 10) == 0) {
output += "remuxed." + suffix;
} else if (strcmp(vCodecName, "prores") == 0 ||
strncmp(aCodecName, "pcm", 3) == 0) {
(audio_is_pcm && !ff_supports_pcm_in_mp4())) {
output += "mov";
} else {
output += "mp4";

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

@@ -4996,15 +4996,18 @@ static const unordered_map<string, unordered_set<string>> codec_compat = {
{"mpegts", {"h264", "hevc", "aac", "opus"}},
{"hls",
{"h264", "hevc", "aac"}}, // Also using MPEG-TS, but no Opus support
{"mp4",
{"h264", "hevc", "av1", "aac", "opus", "alac", "flac", "pcm_s16le",
"pcm_s24le", "pcm_f32le"}},
{"fragmented_mp4",
{"h264", "hevc", "av1", "aac", "opus", "alac", "flac", "pcm_s16le",
"pcm_s24le", "pcm_f32le"}},
{"mov",
{"h264", "hevc", "prores", "aac", "alac", "pcm_s16le", "pcm_s24le",
"pcm_f32le"}},
{"mp4", {"h264", "hevc", "av1", "aac", "opus", "alac", "flac"}},
{"fragmented_mov",
{"h264", "hevc", "prores", "aac", "alac", "pcm_s16le", "pcm_s24le",
"pcm_f32le"}},
{"fragmented_mp4",
{"h264", "hevc", "av1", "aac", "opus", "alac", "flac"}},
// MKV supports everything
{"mkv", {}},
};
@@ -5019,6 +5022,12 @@ static bool ContainerSupportsCodec(const string &container, const string &codec)
// Assume everything is supported
if (codecs.empty())
return true;
// PCM in MP4 is only supported in FFmpeg > 6.0
if ((container == "mp4" || container == "fragmented_mp4") &&
!ff_supports_pcm_in_mp4() && codec.find("pcm_") != string::npos)
return false;
return codecs.count(codec) > 0;
}