瀏覽代碼

Backport pull request #12531 from jellyfin/release-10.9.z

Don't apply chapter image settings to music

Original-merge: 2fe13f54eaf87eefefd27f4ccb2ace1371f5e886

Merged-by: nielsvanvelzen <nielsvanvelzen@users.noreply.github.com>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
gnattu 9 月之前
父節點
當前提交
c7bb2fe137
共有 1 個文件被更改,包括 14 次插入4 次删除
  1. 14 4
      MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

+ 14 - 4
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

@@ -598,7 +598,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             {
             {
                 try
                 try
                 {
                 {
-                    return await ExtractImageInternal(inputArgument, container, videoStream, imageStreamIndex, threedFormat, offset, true, targetFormat, cancellationToken).ConfigureAwait(false);
+                    return await ExtractImageInternal(inputArgument, container, videoStream, imageStreamIndex, threedFormat, offset, true, targetFormat, false, cancellationToken).ConfigureAwait(false);
                 }
                 }
                 catch (ArgumentException)
                 catch (ArgumentException)
                 {
                 {
@@ -610,7 +610,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 }
                 }
             }
             }
 
 
-            return await ExtractImageInternal(inputArgument, container, videoStream, imageStreamIndex, threedFormat, offset, false, targetFormat, cancellationToken).ConfigureAwait(false);
+            return await ExtractImageInternal(inputArgument, container, videoStream, imageStreamIndex, threedFormat, offset, false, targetFormat, isAudio, cancellationToken).ConfigureAwait(false);
         }
         }
 
 
         private string GetImageResolutionParameter()
         private string GetImageResolutionParameter()
@@ -636,7 +636,17 @@ namespace MediaBrowser.MediaEncoding.Encoder
             return imageResolutionParameter;
             return imageResolutionParameter;
         }
         }
 
 
-        private async Task<string> ExtractImageInternal(string inputPath, string container, MediaStream videoStream, int? imageStreamIndex, Video3DFormat? threedFormat, TimeSpan? offset, bool useIFrame, ImageFormat? targetFormat, CancellationToken cancellationToken)
+        private async Task<string> ExtractImageInternal(
+            string inputPath,
+            string container,
+            MediaStream videoStream,
+            int? imageStreamIndex,
+            Video3DFormat? threedFormat,
+            TimeSpan? offset,
+            bool useIFrame,
+            ImageFormat? targetFormat,
+            bool isAudio,
+            CancellationToken cancellationToken)
         {
         {
             ArgumentException.ThrowIfNullOrEmpty(inputPath);
             ArgumentException.ThrowIfNullOrEmpty(inputPath);
 
 
@@ -701,7 +711,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
 
             var vf = string.Join(',', filters);
             var vf = string.Join(',', filters);
             var mapArg = imageStreamIndex.HasValue ? (" -map 0:" + imageStreamIndex.Value.ToString(CultureInfo.InvariantCulture)) : string.Empty;
             var mapArg = imageStreamIndex.HasValue ? (" -map 0:" + imageStreamIndex.Value.ToString(CultureInfo.InvariantCulture)) : string.Empty;
-            var args = string.Format(CultureInfo.InvariantCulture, "-i {0}{3} -threads {4} -v quiet -vframes 1 -vf {2}{5} -f image2 \"{1}\"", inputPath, tempExtractPath, vf, mapArg, _threads, GetImageResolutionParameter());
+            var args = string.Format(CultureInfo.InvariantCulture, "-i {0}{3} -threads {4} -v quiet -vframes 1 -vf {2}{5} -f image2 \"{1}\"", inputPath, tempExtractPath, vf, mapArg, _threads, isAudio ? string.Empty : GetImageResolutionParameter());
 
 
             if (offset.HasValue)
             if (offset.HasValue)
             {
             {