aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2024-07-16 14:43:27 +0200
committerGitHub <noreply@github.com>2024-07-16 14:43:27 +0200
commit9653cf46fb64c1173392c12350efc40b772a9a0d (patch)
tree70254de816b3cf3a0171d178342c96f9e68f8e53 /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
parent9528b2d391e543b6c7cfe8f29131c260f001beff (diff)
parent60c45d6273c4c3d55d0170ca75f2d8ec57f0c0b4 (diff)
Merge pull request #12201 from Bond-009/bdsegmentfullname
Use complete paths in BD info
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs17
1 files changed, 3 insertions, 14 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index a7b881221..d2aaba906 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -1155,18 +1155,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
/// <inheritdoc />
public IReadOnlyList<string> GetPrimaryPlaylistM2tsFiles(string path)
- {
- // Get all playable .m2ts files
- var validPlaybackFiles = _blurayExaminer.GetDiscInfo(path).Files;
-
- // Get all files from the BDMV/STREAMING directory
- // Only return playable local .m2ts files
- var files = _fileSystem.GetFiles(Path.Join(path, "BDMV", "STREAM")).ToList();
- return validPlaybackFiles
- .Select(validFile => files.FirstOrDefault(f => Path.GetFileName(f.FullName.AsSpan()).Equals(validFile, StringComparison.OrdinalIgnoreCase))?.FullName)
- .Where(f => f is not null)
- .ToList();
- }
+ => _blurayExaminer.GetDiscInfo(path).Files;
/// <inheritdoc />
public string GetInputPathArgument(EncodingJobInfo state)
@@ -1177,8 +1166,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
{
return mediaSource.VideoType switch
{
- VideoType.Dvd => GetInputArgument(GetPrimaryPlaylistVobFiles(path, null).ToList(), mediaSource),
- VideoType.BluRay => GetInputArgument(GetPrimaryPlaylistM2tsFiles(path).ToList(), mediaSource),
+ VideoType.Dvd => GetInputArgument(GetPrimaryPlaylistVobFiles(path, null), mediaSource),
+ VideoType.BluRay => GetInputArgument(GetPrimaryPlaylistM2tsFiles(path), mediaSource),
_ => GetInputArgument(path, mediaSource)
};
}