Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix BD/DVD folder chapter image extraction #11754

Merged
merged 1 commit into from
May 24, 2024
Merged

Fix BD/DVD folder chapter image extraction #11754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,16 +680,6 @@ public int GetVideoProfileScore(string videoCodec, string videoProfile)
return -1;
}

public string GetInputPathArgument(EncodingJobInfo state)
{
return state.MediaSource.VideoType switch
{
VideoType.Dvd => _mediaEncoder.GetInputArgument(_mediaEncoder.GetPrimaryPlaylistVobFiles(state.MediaPath, null).ToList(), state.MediaSource),
VideoType.BluRay => _mediaEncoder.GetInputArgument(_mediaEncoder.GetPrimaryPlaylistM2tsFiles(state.MediaPath).ToList(), state.MediaSource),
_ => _mediaEncoder.GetInputArgument(state.MediaPath, state.MediaSource)
};
}

/// <summary>
/// Gets the audio encoder.
/// </summary>
Expand Down Expand Up @@ -1203,7 +1193,7 @@ public string GetInputArgument(EncodingJobInfo state, EncodingOptions options, s
else
{
arg.Append(" -i ")
.Append(GetInputPathArgument(state));
.Append(_mediaEncoder.GetInputPathArgument(state));
}

// sub2video for external graphical subtitles
Expand Down
15 changes: 15 additions & 0 deletions MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,21 @@ public interface IMediaEncoder : ITranscoderSupport
/// <returns>A playlist.</returns>
IReadOnlyList<string> GetPrimaryPlaylistM2tsFiles(string path);

/// <summary>
/// Gets the input path argument from <see cref="EncodingJobInfo"/>.
/// </summary>
/// <param name="state">The <see cref="EncodingJobInfo"/>.</param>
/// <returns>The input path argument.</returns>
string GetInputPathArgument(EncodingJobInfo state);

/// <summary>
/// Gets the input path argument.
/// </summary>
/// <param name="path">The item path.</param>
/// <param name="mediaSource">The <see cref="MediaSourceInfo"/>.</param>
/// <returns>The input path argument.</returns>
string GetInputPathArgument(string path, MediaSourceInfo mediaSource);

/// <summary>
/// Generates a FFmpeg concat config for the source.
/// </summary>
Expand Down
19 changes: 16 additions & 3 deletions MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,8 @@
using MediaBrowser.Model.Globalization;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.MediaInfo;
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using static Nikse.SubtitleEdit.Core.Common.IfoParser;

namespace MediaBrowser.MediaEncoding.Encoder
{
Expand Down Expand Up @@ -621,7 +619,7 @@ public Task<string> ExtractVideoImage(string inputFile, string container, MediaS
ImageFormat? targetFormat,
CancellationToken cancellationToken)
{
var inputArgument = GetInputArgument(inputFile, mediaSource);
var inputArgument = GetInputPathArgument(inputFile, mediaSource);

if (!isAudio)
{
Expand Down Expand Up @@ -1147,6 +1145,21 @@ public IReadOnlyList<string> GetPrimaryPlaylistM2tsFiles(string path)
.ToList();
}

/// <inheritdoc />
public string GetInputPathArgument(EncodingJobInfo state)
=> GetInputPathArgument(state.MediaPath, state.MediaSource);

/// <inheritdoc />
public string GetInputPathArgument(string path, MediaSourceInfo mediaSource)
{
return mediaSource.VideoType switch
{
VideoType.Dvd => GetInputArgument(GetPrimaryPlaylistVobFiles(path, null).ToList(), mediaSource),
VideoType.BluRay => GetInputArgument(GetPrimaryPlaylistM2tsFiles(path).ToList(), mediaSource),
_ => GetInputArgument(path, mediaSource)
};
}

/// <inheritdoc />
public void GenerateConcatConfig(MediaSourceInfo source, string concatFilePath)
{
Expand Down
Loading