Mirror-Tools
/
N_m3u8DL-RE
mirror of https://github.com/nilaoda/N_m3u8DL-RE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

优化混流问题 Fix #198

This commit is contained in:
nilaoda 2023-06-18 12:19:22 +08:00
parent 8743a06d84
commit c05dbabd4e
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/N_m3u8DL-RE/Util/MergeUtil.cs
View File

@ -188,22 +188,15 @@ namespace N_m3u8DL_RE.Util
//MAP //MAP
for (int i = 0; i < files.Length; i++) for (int i = 0; i < files.Length; i++)
{ {
if (files[i].MediaType != Common.Enum.MediaType.AUDIO && files[i].MediaType != Common.Enum.MediaType.SUBTITLES && files[i].Mediainfos.Any(x => x.Type == "Video")) command.Append($" -map {i} ");
{
var x = files[i].Mediainfos.FindIndex(x => x.Type == "Video");
//视频流只取视频 防止CC字幕导致的混流失败
command.Append($" -map {i}:{x} ");
//同时需要修正 Mediainfos 数量 只保留视频
files[i].Mediainfos = new List<Mediainfo>() { files[i].Mediainfos[x] };
}
else
command.Append($" -map {i} ");
} }
var srt = files.Any(x => x.FilePath.EndsWith(".srt"));
if (mp4) if (mp4)
command.Append($" -strict unofficial -c:a copy -c:v copy -c:s mov_text "); //mp4不支持vtt/srt字幕，必须转换格式 command.Append($" -strict unofficial -c:a copy -c:v copy -c:s mov_text "); //mp4不支持vtt/srt字幕，必须转换格式
else else
command.Append($" -strict unofficial -c copy "); command.Append($" -strict unofficial -c copy -c:s {(srt ? "srt" : "webvtt")} ");
//CLEAN //CLEAN
command.Append(" -map_metadata -1 "); command.Append(" -map_metadata -1 ");