better bitrate syncing

1 files changed, 9 insertions, 10 deletions

diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
index b091065b6..d81e91632 100644
--- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
@@ -236,9 +236,11 @@ namespace MediaBrowser.Api.Playback.Progressive
                 args += " -ar " + request.AudioSampleRate.Value;
             }
 
-            if (request.AudioBitRate.HasValue)
+            var bitrate = GetAudioBitrateParam(state);
+
+            if (bitrate.HasValue)
             {
-                args += " -ab " + request.AudioBitRate.Value;
+                args += " -ab " + bitrate.Value.ToString(UsCulture);
             }
 
             var volParam = string.Empty;
@@ -283,16 +285,13 @@ namespace MediaBrowser.Api.Playback.Progressive
             else if (videoCodec.Equals("mpeg4", StringComparison.OrdinalIgnoreCase))
             {
                 args = "-mbd rd -flags +mv4+aic -trellis 2 -cmp 2 -subcmp 2 -bf 2";
-            } 
-            
-            if (state.VideoRequest.VideoBitRate.HasValue)
-            {
-                // Make sure we don't request a bitrate higher than the source
-                var currentBitrate = state.VideoStream == null ? state.VideoRequest.VideoBitRate.Value : state.VideoStream.BitRate ?? state.VideoRequest.VideoBitRate.Value;
+            }
 
-                var bitrate = Math.Min(currentBitrate, state.VideoRequest.VideoBitRate.Value);
+            var bitrate = GetVideoBitrateParam(state);
 
-                args += " -b:v " + bitrate;
+            if (bitrate.HasValue)
+            {
+                args += " -b:v " + bitrate.Value.ToString(UsCulture);
             }
 
             return args.Trim();