lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes Dvd Chapter Thumbs (#126)

Browse Source
This commit is contained in:
Luke Pulverenti 2013-04-09 08:31:18 -04:00
parent dbf9ac1233
commit 29818f8cbf
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Controller/MediaInfo/FFMpegManager.cs
View File

@ -176,7 +176,7 @@ namespace MediaBrowser.Controller.MediaInfo
if (extractImages) if (extractImages)
{ {
// Disable for now on folder rips // Disable for now on folder rips
if (video.VideoType != VideoType.VideoFile) if (video.VideoType != VideoType.VideoFile && video.VideoType != VideoType.Dvd)
{ {
continue; continue;
} }

8
MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
View File

@ -698,13 +698,14 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
{ {
var resourcePool = type == InputType.AudioFile ? _audioImageResourcePool : _videoImageResourcePool; var resourcePool = type == InputType.AudioFile ? _audioImageResourcePool : _videoImageResourcePool;
return ExtractImageInternal(GetInputArgument(inputFiles, type), offset, outputPath, resourcePool, cancellationToken); return ExtractImageInternal(GetInputArgument(inputFiles, type), type, offset, outputPath, resourcePool, cancellationToken);
} }
/// <summary> /// <summary>
/// Extracts the image. /// Extracts the image.
/// </summary> /// </summary>
/// <param name="inputPath">The input path.</param> /// <param name="inputPath">The input path.</param>
/// <param name="type">The type.</param>
/// <param name="offset">The offset.</param> /// <param name="offset">The offset.</param>
/// <param name="outputPath">The output path.</param> /// <param name="outputPath">The output path.</param>
/// <param name="resourcePool">The resource pool.</param> /// <param name="resourcePool">The resource pool.</param>
@ -714,7 +715,7 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
/// or /// or
/// outputPath</exception> /// outputPath</exception>
/// <exception cref="System.ApplicationException"></exception> /// <exception cref="System.ApplicationException"></exception>
private async Task ExtractImageInternal(string inputPath, TimeSpan? offset, string outputPath, SemaphoreSlim resourcePool, CancellationToken cancellationToken) private async Task ExtractImageInternal(string inputPath, InputType type, TimeSpan? offset, string outputPath, SemaphoreSlim resourcePool, CancellationToken cancellationToken)
{ {
if (string.IsNullOrEmpty(inputPath)) if (string.IsNullOrEmpty(inputPath))
{ {
@ -727,7 +728,8 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
} }
var args = string.Format("-i {0} -threads 0 -v quiet -vframes 1 -filter:v select=\\'eq(pict_type\\,I)\\' -f image2 \"{1}\"", inputPath, outputPath); var args = type != InputType.Dvd ? string.Format("-i {0} -threads 0 -v quiet -vframes 1 -filter:v select=\\'eq(pict_type\\,I)\\' -f image2 \"{1}\"", inputPath, outputPath) :
string.Format("-i {0} -threads 0 -v quiet -vframes 1 -f image2 \"{1}\"", inputPath, outputPath);
if (offset.HasValue) if (offset.HasValue)
{ {