浏览代码

remove audio channel limit from transcoding conditions

Luke Pulverenti 8 年之前
父节点
当前提交
8030370cfa
共有 1 个文件被更改,包括 2 次插入5 次删除
  1. 2 5
      MediaBrowser.Api/Playback/BaseStreamingService.cs

+ 2 - 5
MediaBrowser.Api/Playback/BaseStreamingService.cs

@@ -893,12 +893,9 @@ namespace MediaBrowser.Api.Playback
                 resultChannels = Math.Min(request.MaxAudioChannels.Value, channelLimit);
             }
 
-            if (resultChannels.HasValue && !string.Equals(codec, "copy", StringComparison.OrdinalIgnoreCase))
+            if (request.TranscodingMaxAudioChannels.HasValue && !string.Equals(codec, "copy", StringComparison.OrdinalIgnoreCase))
             {
-                if (request.TranscodingMaxAudioChannels.HasValue)
-                {
-                    resultChannels = Math.Min(request.TranscodingMaxAudioChannels.Value, resultChannels.Value);
-                }
+                resultChannels = Math.Min(request.TranscodingMaxAudioChannels.Value, resultChannels ?? inputChannels ?? request.TranscodingMaxAudioChannels.Value);
             }
 
             return resultChannels ?? request.AudioChannels;