1 files changed, 27 insertions, 26 deletions

diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs b/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
index 46ba7d2e7..21e847c68 100644
--- a/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
@@ -14,6 +14,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using CommonIO;
+using MediaBrowser.Controller.Library;
 
 namespace MediaBrowser.Server.Implementations.MediaEncoder
 {
@@ -24,16 +25,18 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
         private readonly ILogger _logger;
         private readonly IMediaEncoder _encoder;
         private readonly IChapterManager _chapterManager;
+        private readonly ILibraryManager _libraryManager;
 
         public EncodingManager(IFileSystem fileSystem, 
             ILogger logger, 
             IMediaEncoder encoder, 
-            IChapterManager chapterManager)
+            IChapterManager chapterManager, ILibraryManager libraryManager)
         {
             _fileSystem = fileSystem;
             _logger = logger;
             _encoder = encoder;
             _chapterManager = chapterManager;
+            _libraryManager = libraryManager;
         }
 
         /// <summary>
@@ -57,28 +60,17 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
                 return false;
             }
 
-            var options = _chapterManager.GetConfiguration();
-
-            if (video is Movie)
-            {
-                if (!options.EnableMovieChapterImageExtraction)
-                {
-                    return false;
-                }
-            }
-            else if (video is Episode)
+            var libraryOptions = _libraryManager.GetLibraryOptions(video);
+            if (libraryOptions != null)
             {
-                if (!options.EnableEpisodeChapterImageExtraction)
+                if (!libraryOptions.EnableChapterImageExtraction)
                 {
                     return false;
                 }
             }
             else
             {
-                if (!options.EnableOtherVideoChapterImageExtraction)
-                {
-                    return false;
-                }
+                return false;
             }
 
             // Can't extract images if there are no video streams
@@ -123,23 +115,32 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
                 {
                     if (extractImages)
                     {
-                        if (video.VideoType == VideoType.HdDvd || video.VideoType == VideoType.Iso || video.VideoType == VideoType.BluRay || video.VideoType == VideoType.Dvd)
+                        if (video.VideoType == VideoType.HdDvd || video.VideoType == VideoType.Iso)
                         {
                             continue;
                         }
+                        if (video.VideoType == VideoType.BluRay || video.VideoType == VideoType.Dvd)
+                        {
+                            if (video.PlayableStreamFileNames.Count != 1)
+                            {
+                                continue;
+                            }
+                        }
 
-                        // Add some time for the first chapter to make sure we don't end up with a black image
-                        var time = chapter.StartPositionTicks == 0 ? TimeSpan.FromTicks(Math.Min(FirstChapterTicks, video.RunTimeTicks ?? 0)) : TimeSpan.FromTicks(chapter.StartPositionTicks);
+                        try
+                        {
+                            // Add some time for the first chapter to make sure we don't end up with a black image
+                            var time = chapter.StartPositionTicks == 0 ? TimeSpan.FromTicks(Math.Min(FirstChapterTicks, video.RunTimeTicks ?? 0)) : TimeSpan.FromTicks(chapter.StartPositionTicks);
 
-                        var protocol = MediaProtocol.File;
+                            var protocol = MediaProtocol.File;
 
-                        var inputPath = MediaEncoderHelpers.GetInputArgument(_fileSystem, video.Path, protocol, null, video.PlayableStreamFileNames);
+                            var inputPath = MediaEncoderHelpers.GetInputArgument(_fileSystem, video.Path, protocol, null, video.PlayableStreamFileNames);
 
-                        try
-                        {
-							_fileSystem.CreateDirectory(Path.GetDirectoryName(path));
+                            _fileSystem.CreateDirectory(Path.GetDirectoryName(path));
+
+                            var container = video.Container;
 
-                            var tempFile = await _encoder.ExtractVideoImage(inputPath, protocol, video.Video3DFormat, time, cancellationToken).ConfigureAwait(false);
+                            var tempFile = await _encoder.ExtractVideoImage(inputPath, container, protocol, video.Video3DFormat, time, cancellationToken).ConfigureAwait(false);
                             File.Copy(tempFile, path, true);
 
                             try
@@ -157,7 +158,7 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
                         }
                         catch (Exception ex)
                         {
-                            _logger.ErrorException("Error extracting chapter images for {0}", ex, string.Join(",", inputPath));
+                            _logger.ErrorException("Error extracting chapter images for {0}", ex, string.Join(",", video.Path));
                             success = false;
                             break;
                         }