alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-17 15:53:42 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Use FFmpeg concat for DVD and BD folder playback

Browse Source
This commit is contained in:
Shadowghost
2023-02-04 00:08:51 +01:00
parent ddfdec7f46
commit edf3909157
4 changed files with 64 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@@ -941,8 +941,18 @@ namespace MediaBrowser.Controller.MediaEncoding
arg.Append(canvasArgs);
}
arg.Append(" -i ")
.Append(GetInputPathArgument(state));
if (state.MediaSource.VideoType == VideoType.Dvd || state.MediaSource.VideoType == VideoType.BluRay)
{
var tmpConcatPath = options.TranscodingTempPath + "/" + state.MediaSource.Id + ".concat";
_mediaEncoder.GenerateConcatConfig(state.MediaSource, tmpConcatPath);
arg.Append(" -f concat -safe 0 ");
arg.Append(" -i " + tmpConcatPath + " ");
}
else
{
arg.Append(" -i ")
.Append(GetInputPathArgument(state));
}
// sub2video for external graphical subtitles
if (state.SubtitleStream is not null

7
MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
View File

@@ -211,5 +211,12 @@ namespace MediaBrowser.Controller.MediaEncoding
/// <param name="titleNumber">The title number to start with.</param>
/// <returns>A playlist.</returns>
IEnumerable<string> GetPrimaryPlaylistM2TsFiles(string path, uint? titleNumber);
/// <summary>
/// Generates a FFmpeg concat config for the source.
/// </summary>
/// <param name="source">The <see cref="MediaSourceInfo"/>.</param>
/// <param name="concatFilePath">The path the config should be written to.</param>
void GenerateConcatConfig(MediaSourceInfo source, string concatFilePath);
}
}