fixes #1310 - Downscaling 1280x720 to 720x404

MediaBrowser.Api/Playback/BaseStreamingService.cs

@@ -1623,7 +1623,10 @@ namespace MediaBrowser.Api.Playback
 
                 if (state.OutputVideoBitrate.HasValue)
                 {
-                    var resolution = ResolutionNormalizer.Normalize(state.OutputVideoBitrate.Value,
+                    var resolution = ResolutionNormalizer.Normalize(
+						state.VideoStream == null ? (int?)null : state.VideoStream.BitRate,
+						state.OutputVideoBitrate.Value,
+						state.VideoStream == null ? null : state.VideoStream.Codec,
                         state.OutputVideoCodec,
                         videoRequest.MaxWidth,
                         videoRequest.MaxHeight);

MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs

@@ -82,7 +82,10 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
                 if (state.OutputVideoBitrate.HasValue)
                 {
-                    var resolution = ResolutionNormalizer.Normalize(state.OutputVideoBitrate.Value,
+                    var resolution = ResolutionNormalizer.Normalize(
+						state.VideoStream == null ? (int?)null : state.VideoStream.BitRate,
+						state.OutputVideoBitrate.Value,
+						state.VideoStream == null ? null : state.VideoStream.Codec,
                         state.OutputVideoCodec,
                         request.MaxWidth,
                         request.MaxHeight);

MediaBrowser.Model/Dlna/ResolutionNormalizer.cs

@@ -14,14 +14,29 @@ namespace MediaBrowser.Model.Dlna
                 new ResolutionConfiguration(1280, 2500000)
             };
 
-        public static ResolutionOptions Normalize(int maxBitrate,
-            string codec,
+        public static ResolutionOptions Normalize(int? inputBitrate,
+			int outputBitrate,
+			string inputCodec,
+            string outputCodec,
             int? maxWidth,
             int? maxHeight)
         {
-            foreach (var config in Configurations)
+			// If the bitrate isn't changing, then don't downlscale the resolution
+			if (inputBitrate.HasValue && outputBitrate >= inputBitrate.Value) 
+			{
+				if (maxWidth.HasValue || maxHeight.HasValue) 
+				{
+					return new ResolutionOptions
+					{
+						MaxWidth = maxWidth,
+						MaxHeight = maxHeight
+					};
+				}
+			}
+
+			foreach (var config in Configurations)
             {
-                if (maxBitrate <= config.MaxBitrate)
+				if (outputBitrate <= config.MaxBitrate)
                 {
                     var originvalValue = maxWidth;