detect anamorphic video

LukePulverenti · LukePulverenti · commit fc8ec33944bb · 2014-06-22T12:25:47.000-04:00
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -1788,7 +1788,8 @@ private void ApplyDeviceProfileSettings(StreamState state)
                 state.TargetVideoLevel,
                 state.TargetFramerate,
                 state.TargetPacketLength,
-                state.TargetTimestamp);
+                state.TargetTimestamp,
+                state.IsTargetAnamorphic);
 
             if (mediaProfile != null)
             {
@@ -1885,7 +1886,8 @@ protected void AddDlnaHeaders(StreamState state, IDictionary<string, string> res
                     state.TargetVideoLevel,
                     state.TargetFramerate,
                     state.TargetPacketLength,
-                    state.TranscodeSeekInfo
+                    state.TranscodeSeekInfo,
+                    state.IsTargetAnamorphic
                     );
             }
 
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
@@ -313,7 +313,7 @@ protected override string GetVideoArguments(StreamState state)
             // See if we can save come cpu cycles by avoiding encoding
             if (codec.Equals("copy", StringComparison.OrdinalIgnoreCase))
             {
-                return IsH264(state.VideoStream) ? "-codec:v:0 copy -bsf h264_mp4toannexb" : "-codec:v:0 copy";
+                return IsH264(state.VideoStream) ? "-codec:v:0 copy -bsf h264_mp4toannexb -bsf dump_extra" : "-codec:v:0 copy";
             }
 
             var keyFrameArg = state.ReadInputAtNativeFramerate ?
diff --git a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
@@ -160,7 +160,7 @@ protected override string GetVideoArguments(StreamState state)
             // See if we can save come cpu cycles by avoiding encoding
             if (codec.Equals("copy", StringComparison.OrdinalIgnoreCase))
             {
-                return IsH264(state.VideoStream) ? "-codec:v:0 copy -bsf h264_mp4toannexb" : "-codec:v:0 copy";
+                return IsH264(state.VideoStream) ? "-codec:v:0 copy -bsf h264_mp4toannexb -bsf dump_extra" : "-codec:v:0 copy";
             }
 
             var keyFrameArg = state.ReadInputAtNativeFramerate ?
diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
@@ -140,7 +140,7 @@ private string GetVideoArguments(StreamState state, string codec)
             // See if we can save come cpu cycles by avoiding encoding
             if (codec.Equals("copy", StringComparison.OrdinalIgnoreCase))
             {
-                return state.VideoStream != null && IsH264(state.VideoStream) ? args + " -bsf h264_mp4toannexb" : args;
+                return state.VideoStream != null && IsH264(state.VideoStream) ? args + " -bsf h264_mp4toannexb -bsf dump_extra" : args;
             }
 
             const string keyFrameArg = " -force_key_frames expr:if(isnan(prev_forced_t),gte(t,.1),gte(t,prev_forced_t+5))";
diff --git a/MediaBrowser.Api/Playback/StreamState.cs b/MediaBrowser.Api/Playback/StreamState.cs
@@ -2,7 +2,6 @@
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Drawing;
-using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
@@ -330,5 +329,17 @@ public string TargetVideoProfile
             }
         }
 
+        public bool? IsTargetAnamorphic
+        {
+            get
+            {
+                if (Request.Static)
+                {
+                    return VideoStream == null ? null : VideoStream.IsAnamorphic;
+                }
+
+                return false;
+            }
+        }
     }
 }
diff --git a/MediaBrowser.Controller/MediaEncoding/MediaEncoderHelpers.cs b/MediaBrowser.Controller/MediaEncoding/MediaEncoderHelpers.cs
@@ -126,6 +126,9 @@ private static MediaStream GetMediaStream(MediaStreamInfo streamInfo, MediaForma
                 stream.RealFrameRate = GetFrameRate(streamInfo.r_frame_rate);
 
                 stream.BitDepth = GetBitDepth(stream.PixelFormat);
+
+                stream.IsAnamorphic = string.Equals(streamInfo.sample_aspect_ratio, "0:1",
+                    StringComparison.OrdinalIgnoreCase);
             }
             else
             {
diff --git a/MediaBrowser.Dlna/ConnectionManager/ControlHandler.cs b/MediaBrowser.Dlna/ConnectionManager/ControlHandler.cs
@@ -6,13 +6,11 @@
 using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 
 namespace MediaBrowser.Dlna.ConnectionManager
 {
     public class ControlHandler : BaseControlHandler
     {
-        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
         private readonly DeviceProfile _profile;
 
         public ControlHandler(ILogger logger, DeviceProfile profile, IServerConfigurationManager config)
diff --git a/MediaBrowser.Dlna/Didl/DidlBuilder.cs b/MediaBrowser.Dlna/Didl/DidlBuilder.cs
@@ -179,7 +179,8 @@ private void AddVideoResource(XmlElement container, Video video, string deviceId
                 streamInfo.TargetVideoLevel,
                 streamInfo.TargetFramerate,
                 streamInfo.TargetPacketLength,
-                streamInfo.TargetTimestamp);
+                streamInfo.TargetTimestamp,
+                streamInfo.IsTargetAnamorphic);
 
             var filename = url.Substring(0, url.IndexOf('?'));
 
@@ -203,7 +204,8 @@ private void AddVideoResource(XmlElement container, Video video, string deviceId
                 streamInfo.TargetVideoLevel,
                 streamInfo.TargetFramerate,
                 streamInfo.TargetPacketLength,
-                streamInfo.TranscodeSeekInfo);
+                streamInfo.TranscodeSeekInfo,
+                streamInfo.IsTargetAnamorphic);
 
             res.SetAttribute("protocolInfo", String.Format(
                 "http-get:*:{0}:{1}",
diff --git a/MediaBrowser.Dlna/PlayTo/PlayToController.cs b/MediaBrowser.Dlna/PlayTo/PlayToController.cs
@@ -514,7 +514,8 @@ private string GetDlnaHeaders(PlaylistItem item)
                     streamInfo.TargetVideoLevel,
                     streamInfo.TargetFramerate,
                     streamInfo.TargetPacketLength,
-                    streamInfo.TranscodeSeekInfo);
+                    streamInfo.TranscodeSeekInfo,
+                    streamInfo.IsTargetAnamorphic);
             }
 
             return null;
diff --git a/MediaBrowser.Dlna/Profiles/WdtvLiveProfile.cs b/MediaBrowser.Dlna/Profiles/WdtvLiveProfile.cs
@@ -83,7 +83,7 @@ public WdtvLiveProfile()
                     Container = "ts",
                     Type = DlnaProfileType.Video,
                     VideoCodec = "mpeg1video,mpeg2video,h264,vc1",
-                    AudioCodec = "ac3,dca,mp2,mp3"
+                    AudioCodec = "ac3,dca,mp2,mp3,aac"
                 },
 
                 new DirectPlayProfile
diff --git a/MediaBrowser.Dlna/Profiles/WindowsPhoneProfile.cs b/MediaBrowser.Dlna/Profiles/WindowsPhoneProfile.cs
@@ -93,6 +93,20 @@ public WindowsPhoneProfile()
 
             CodecProfiles = new[]
             {
+                new CodecProfile
+                {
+                    Type = CodecType.Video,
+                    Conditions = new []
+                    {
+                        new ProfileCondition
+                        {
+                            Condition = ProfileConditionType.NotEquals,
+                            Property = ProfileConditionValue.IsAnamorphic,
+                            Value = "true"
+                        }
+                    }
+                },
+
                 new CodecProfile
                 {
                     Type = CodecType.Video,
diff --git a/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml b/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml
@@ -34,7 +34,7 @@
     <DirectPlayProfile container="avi" audioCodec="ac3,dca,mp2,mp3,pcm" videoCodec="mpeg1video,mpeg2video,mpeg4,h264,vc1" type="Video" />
     <DirectPlayProfile container="mpeg" audioCodec="ac3,dca,mp2,mp3,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
     <DirectPlayProfile container="mkv" audioCodec="ac3,dca,aac,mp2,mp3,pcm" videoCodec="mpeg1video,mpeg2video,mpeg4,h264,vc1" type="Video" />
-    <DirectPlayProfile container="ts" audioCodec="ac3,dca,mp2,mp3" videoCodec="mpeg1video,mpeg2video,h264,vc1" type="Video" />
+    <DirectPlayProfile container="ts" audioCodec="ac3,dca,mp2,mp3,aac" videoCodec="mpeg1video,mpeg2video,h264,vc1" type="Video" />
     <DirectPlayProfile container="mp4,mov" audioCodec="ac3,aac,mp2,mp3" videoCodec="h264,mpeg4" type="Video" />
     <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro" videoCodec="vc1" type="Video" />
     <DirectPlayProfile container="asf" audioCodec="mp2,ac3" videoCodec="mpeg2video" type="Video" />
diff --git a/MediaBrowser.Dlna/Service/BaseControlHandler.cs b/MediaBrowser.Dlna/Service/BaseControlHandler.cs
@@ -92,7 +92,9 @@ private ControlResponse ProcessControlRequestInternal(ControlRequest request)
                 Xml = xml,
                 IsSuccessful = true
             };
-            Logger.Debug(xml);
+
+            //Logger.Debug(xml);
+
             controlResponse.Headers.Add("EXT", string.Empty);
 
             return controlResponse;
diff --git a/MediaBrowser.Model/Dlna/ConditionProcessor.cs b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
@@ -17,7 +17,8 @@ public bool IsVideoConditionSatisfied(ProfileCondition condition,
             double? videoLevel,
             double? videoFramerate,
             int? packetLength,
-            TransportStreamTimestamp? timestamp)
+            TransportStreamTimestamp? timestamp,
+            bool? isAnamorphic)
         {
             switch (condition.Property)
             {
@@ -27,6 +28,8 @@ public bool IsVideoConditionSatisfied(ProfileCondition condition,
                 case ProfileConditionValue.Has64BitOffsets:
                     // TODO: Implement
                     return true;
+                case ProfileConditionValue.IsAnamorphic:
+                    return IsConditionSatisfied(condition, isAnamorphic);
                 case ProfileConditionValue.VideoFramerate:
                     return IsConditionSatisfied(condition, videoFramerate);
                 case ProfileConditionValue.VideoLevel:
@@ -147,6 +150,31 @@ private bool IsConditionSatisfied(ProfileCondition condition, string currentValu
                     throw new InvalidOperationException("Unexpected ProfileConditionType");
             }
         }
+
+        private bool IsConditionSatisfied(ProfileCondition condition, bool? currentValue)
+        {
+            if (!currentValue.HasValue)
+            {
+                // If the value is unknown, it satisfies if not marked as required
+                return !condition.IsRequired;
+            }
+
+            bool expected;
+            if (BoolHelper.TryParseCultureInvariant(condition.Value, out expected))
+            {
+                switch (condition.Condition)
+                {
+                    case ProfileConditionType.Equals:
+                        return currentValue.Value == expected;
+                    case ProfileConditionType.NotEquals:
+                        return currentValue.Value != expected;
+                    default:
+                        throw new InvalidOperationException("Unexpected ProfileConditionType");
+                }
+            }
+
+            return false;
+        }
         
         private bool IsConditionSatisfied(ProfileCondition condition, double? currentValue)
         {
diff --git a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
@@ -108,7 +108,8 @@ public string BuildVideoHeader(string container,
             double? videoLevel,
             double? videoFramerate,
             int? packetLength,
-            TranscodeSeekInfo transcodeSeekInfo)
+            TranscodeSeekInfo transcodeSeekInfo,
+            bool? isAnamorphic)
         {
             // first bit means Time based seek supported, second byte range seek supported (not sure about the order now), so 01 = only byte seek, 10 = time based, 11 = both, 00 = none
             string orgOp = ";DLNA.ORG_OP=" + DlnaMaps.GetOrgOpValue(runtimeTicks.HasValue, isDirectStream, transcodeSeekInfo);
@@ -145,7 +146,8 @@ public string BuildVideoHeader(string container,
                 videoLevel,
                 videoFramerate,
                 packetLength,
-                timestamp);
+                timestamp,
+                isAnamorphic);
 
             string orgPn = mediaProfile == null ? null : mediaProfile.OrgPn;
 
diff --git a/MediaBrowser.Model/Dlna/DeviceProfile.cs b/MediaBrowser.Model/Dlna/DeviceProfile.cs
@@ -269,7 +269,8 @@ public ResponseProfile GetVideoMediaProfile(string container,
             double? videoLevel,
             double? videoFramerate,
             int? packetLength,
-            TransportStreamTimestamp timestamp)
+            TransportStreamTimestamp timestamp,
+            bool? isAnamorphic)
         {
             container = (container ?? string.Empty).TrimStart('.');
 
@@ -303,7 +304,7 @@ public ResponseProfile GetVideoMediaProfile(string container,
                 var anyOff = false;
                 foreach (ProfileCondition c in i.Conditions)
                 {
-                    if (!conditionProcessor.IsVideoConditionSatisfied(c, audioBitrate, audioChannels, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp))
+                    if (!conditionProcessor.IsVideoConditionSatisfied(c, audioBitrate, audioChannels, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic))
                     {
                         anyOff = true;
                         break;
diff --git a/MediaBrowser.Model/Dlna/ProfileConditionValue.cs b/MediaBrowser.Model/Dlna/ProfileConditionValue.cs
@@ -2,18 +2,19 @@
 {
     public enum ProfileConditionValue
     {
-        AudioChannels,
-        AudioBitrate,
-        AudioProfile,
-        Width,
-        Height,
-        Has64BitOffsets,
-        PacketLength,
-        VideoBitDepth,
-        VideoBitrate,
-        VideoFramerate,
-        VideoLevel,
-        VideoProfile,
-        VideoTimestamp
+        AudioChannels = 0,
+        AudioBitrate = 1,
+        AudioProfile = 2,
+        Width = 3,
+        Height = 4,
+        Has64BitOffsets = 5,
+        PacketLength = 6,
+        VideoBitDepth = 7,
+        VideoBitrate = 8,
+        VideoFramerate = 9,
+        VideoLevel = 10,
+        VideoProfile = 11,
+        VideoTimestamp = 12,
+        IsAnamorphic = 13
     }
 }
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -370,6 +370,7 @@ private DirectPlayProfile GetVideoDirectPlayProfile(DeviceProfile profile,
             double? videoLevel = videoStream == null ? null : videoStream.Level;
             string videoProfile = videoStream == null ? null : videoStream.Profile;
             float? videoFramerate = videoStream == null ? null : videoStream.AverageFrameRate ?? videoStream.AverageFrameRate;
+            bool? isAnamorphic = videoStream == null ? null : videoStream.IsAnamorphic;
 
             int? audioBitrate = audioStream == null ? null : audioStream.BitRate;
             int? audioChannels = audioStream == null ? null : audioStream.Channels;
@@ -381,7 +382,7 @@ private DirectPlayProfile GetVideoDirectPlayProfile(DeviceProfile profile,
             // Check container conditions
             foreach (ProfileCondition i in conditions)
             {
-                if (!conditionProcessor.IsVideoConditionSatisfied(i, audioBitrate, audioChannels, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp))
+                if (!conditionProcessor.IsVideoConditionSatisfied(i, audioBitrate, audioChannels, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic))
                 {
                     return null;
                 }
@@ -403,7 +404,7 @@ private DirectPlayProfile GetVideoDirectPlayProfile(DeviceProfile profile,
 
             foreach (ProfileCondition i in conditions)
             {
-                if (!conditionProcessor.IsVideoConditionSatisfied(i, audioBitrate, audioChannels, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp))
+                if (!conditionProcessor.IsVideoConditionSatisfied(i, audioBitrate, audioChannels, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic))
                 {
                     return null;
                 }
@@ -520,6 +521,7 @@ private void ApplyTranscodingConditions(StreamInfo item, IEnumerable<ProfileCond
                             break;
                         }
                     case ProfileConditionValue.AudioProfile:
+                    case ProfileConditionValue.IsAnamorphic:
                     case ProfileConditionValue.Has64BitOffsets:
                     case ProfileConditionValue.PacketLength:
                     case ProfileConditionValue.VideoTimestamp:
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -348,6 +348,19 @@ public int? TargetTotalBitrate
             }
         }
 
+        public bool? IsTargetAnamorphic
+        {
+            get
+            {
+                if (IsDirectStream)
+                {
+                    return TargetVideoStream == null ? null : TargetVideoStream.IsAnamorphic;
+                }
+
+                return false;
+            }
+        }
+
         public int? TargetWidth
         {
             get
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -33,7 +33,7 @@ public class MediaStream
         /// </summary>
         /// <value>The channel layout.</value>
         public string ChannelLayout { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the bit rate.
         /// </summary>
@@ -155,11 +155,17 @@ public bool IsTextSubtitleStream
         /// </summary>
         /// <value>The pixel format.</value>
         public string PixelFormat { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the level.
         /// </summary>
         /// <value>The level.</value>
         public double? Level { get; set; }
+
+        /// <summary>
+        /// Gets a value indicating whether this instance is anamorphic.
+        /// </summary>
+        /// <value><c>true</c> if this instance is anamorphic; otherwise, <c>false</c>.</value>
+        public bool? IsAnamorphic { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Extensions/DoubleHelper.cs b/MediaBrowser.Model/Extensions/DoubleHelper.cs
diff --git a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteMediaStreamsRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteMediaStreamsRepository.cs
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/css/chromecast.css b/MediaBrowser.WebDashboard/dashboard-ui/css/chromecast.css
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/scripts/itemdetailpage.js b/MediaBrowser.WebDashboard/dashboard-ui/scripts/itemdetailpage.js

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ protected override string GetVideoArguments(StreamState state)`
`313`	`313`	`// See if we can save come cpu cycles by avoiding encoding`
`314`	`314`	`if (codec.Equals("copy", StringComparison.OrdinalIgnoreCase))`
`315`	`315`	`{`
`316`		`- return IsH264(state.VideoStream) ? "-codec:v:0 copy -bsf h264_mp4toannexb" : "-codec:v:0 copy";`
	`316`	`+ return IsH264(state.VideoStream) ? "-codec:v:0 copy -bsf h264_mp4toannexb -bsf dump_extra" : "-codec:v:0 copy";`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`var keyFrameArg = state.ReadInputAtNativeFramerate ?`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ protected override string GetVideoArguments(StreamState state)`
`160`	`160`	`// See if we can save come cpu cycles by avoiding encoding`
`161`	`161`	`if (codec.Equals("copy", StringComparison.OrdinalIgnoreCase))`
`162`	`162`	`{`
`163`		`- return IsH264(state.VideoStream) ? "-codec:v:0 copy -bsf h264_mp4toannexb" : "-codec:v:0 copy";`
	`163`	`+ return IsH264(state.VideoStream) ? "-codec:v:0 copy -bsf h264_mp4toannexb -bsf dump_extra" : "-codec:v:0 copy";`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`var keyFrameArg = state.ReadInputAtNativeFramerate ?`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ private string GetVideoArguments(StreamState state, string codec)`
`140`	`140`	`// See if we can save come cpu cycles by avoiding encoding`
`141`	`141`	`if (codec.Equals("copy", StringComparison.OrdinalIgnoreCase))`
`142`	`142`	`{`
`143`		`- return state.VideoStream != null && IsH264(state.VideoStream) ? args + " -bsf h264_mp4toannexb" : args;`
	`143`	`+ return state.VideoStream != null && IsH264(state.VideoStream) ? args + " -bsf h264_mp4toannexb -bsf dump_extra" : args;`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`const string keyFrameArg = " -force_key_frames expr:if(isnan(prev_forced_t),gte(t,.1),gte(t,prev_forced_t+5))";`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`using MediaBrowser.Controller.LiveTv;`
`3`	`3`	`using MediaBrowser.Model.Dlna;`
`4`	`4`	`using MediaBrowser.Model.Drawing;`
`5`		`-using MediaBrowser.Model.Dto;`
`6`	`5`	`using MediaBrowser.Model.Entities;`
`7`	`6`	`using MediaBrowser.Model.IO;`
`8`	`7`	`using MediaBrowser.Model.Logging;`
`@@ -330,5 +329,17 @@ public string TargetVideoProfile`
`330`	`329`	`}`
`331`	`330`	`}`
`332`	`331`
	`332`	`+ public bool? IsTargetAnamorphic`
	`333`	`+ {`
	`334`	`+ get`
	`335`	`+ {`
	`336`	`+ if (Request.Static)`
	`337`	`+ {`
	`338`	`+ return VideoStream == null ? null : VideoStream.IsAnamorphic;`
	`339`	`+ }`
	`340`	`+`
	`341`	`+ return false;`
	`342`	`+ }`
	`343`	`+ }`
`333`	`344`	`}`
`334`	`345`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,9 @@ private static MediaStream GetMediaStream(MediaStreamInfo streamInfo, MediaForma`
`126`	`126`	`stream.RealFrameRate = GetFrameRate(streamInfo.r_frame_rate);`
`127`	`127`
`128`	`128`	`stream.BitDepth = GetBitDepth(stream.PixelFormat);`
	`129`	`+`
	`130`	`+ stream.IsAnamorphic = string.Equals(streamInfo.sample_aspect_ratio, "0:1",`
	`131`	`+ StringComparison.OrdinalIgnoreCase);`
`129`	`132`	`}`
`130`	`133`	`else`
`131`	`134`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,11 @@`
`6`	`6`	`using MediaBrowser.Model.Logging;`
`7`	`7`	`using System;`
`8`	`8`	`using System.Collections.Generic;`
`9`		`-using System.Globalization;`
`10`	`9`
`11`	`10`	`namespace MediaBrowser.Dlna.ConnectionManager`
`12`	`11`	`{`
`13`	`12`	`public class ControlHandler : BaseControlHandler`
`14`	`13`	`{`
`15`		`- private readonly CultureInfo _usCulture = new CultureInfo("en-US");`
`16`	`14`	`private readonly DeviceProfile _profile;`
`17`	`15`
`18`	`16`	`public ControlHandler(ILogger logger, DeviceProfile profile, IServerConfigurationManager config)`
Original file line number	Diff line number	Diff line change
`@@ -514,7 +514,8 @@ private string GetDlnaHeaders(PlaylistItem item)`
`514`	`514`	`streamInfo.TargetVideoLevel,`
`515`	`515`	`streamInfo.TargetFramerate,`
`516`	`516`	`streamInfo.TargetPacketLength,`
`517`		`- streamInfo.TranscodeSeekInfo);`
	`517`	`+ streamInfo.TranscodeSeekInfo,`
	`518`	`+ streamInfo.IsTargetAnamorphic);`
`518`	`519`	`}`
`519`	`520`
`520`	`521`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,8 @@ public ResponseProfile GetVideoMediaProfile(string container,`
`269`	`269`	`double? videoLevel,`
`270`	`270`	`double? videoFramerate,`
`271`	`271`	`int? packetLength,`
`272`		`- TransportStreamTimestamp timestamp)`
	`272`	`+ TransportStreamTimestamp timestamp,`
	`273`	`+ bool? isAnamorphic)`
`273`	`274`	`{`
`274`	`275`	`container = (container ?? string.Empty).TrimStart('.');`
`275`	`276`
`@@ -303,7 +304,7 @@ public ResponseProfile GetVideoMediaProfile(string container,`
`303`	`304`	`var anyOff = false;`
`304`	`305`	`foreach (ProfileCondition c in i.Conditions)`
`305`	`306`	`{`
`306`		`- if (!conditionProcessor.IsVideoConditionSatisfied(c, audioBitrate, audioChannels, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp))`
	`307`	`+ if (!conditionProcessor.IsVideoConditionSatisfied(c, audioBitrate, audioChannels, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic))`
`307`	`308`	`{`
`308`	`309`	`anyOff = true;`
`309`	`310`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -370,6 +370,7 @@ private DirectPlayProfile GetVideoDirectPlayProfile(DeviceProfile profile,`
`370`	`370`	`double? videoLevel = videoStream == null ? null : videoStream.Level;`
`371`	`371`	`string videoProfile = videoStream == null ? null : videoStream.Profile;`
`372`	`372`	`float? videoFramerate = videoStream == null ? null : videoStream.AverageFrameRate ?? videoStream.AverageFrameRate;`
	`373`	`+ bool? isAnamorphic = videoStream == null ? null : videoStream.IsAnamorphic;`
`373`	`374`
`374`	`375`	`int? audioBitrate = audioStream == null ? null : audioStream.BitRate;`
`375`	`376`	`int? audioChannels = audioStream == null ? null : audioStream.Channels;`
`@@ -381,7 +382,7 @@ private DirectPlayProfile GetVideoDirectPlayProfile(DeviceProfile profile,`
`381`	`382`	`// Check container conditions`
`382`	`383`	`foreach (ProfileCondition i in conditions)`
`383`	`384`	`{`
`384`		`- if (!conditionProcessor.IsVideoConditionSatisfied(i, audioBitrate, audioChannels, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp))`
	`385`	`+ if (!conditionProcessor.IsVideoConditionSatisfied(i, audioBitrate, audioChannels, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic))`
`385`	`386`	`{`
`386`	`387`	`return null;`
`387`	`388`	`}`
`@@ -403,7 +404,7 @@ private DirectPlayProfile GetVideoDirectPlayProfile(DeviceProfile profile,`
`403`	`404`
`404`	`405`	`foreach (ProfileCondition i in conditions)`
`405`	`406`	`{`
`406`		`- if (!conditionProcessor.IsVideoConditionSatisfied(i, audioBitrate, audioChannels, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp))`
	`407`	`+ if (!conditionProcessor.IsVideoConditionSatisfied(i, audioBitrate, audioChannels, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic))`
`407`	`408`	`{`
`408`	`409`	`return null;`
`409`	`410`	`}`
`@@ -520,6 +521,7 @@ private void ApplyTranscodingConditions(StreamInfo item, IEnumerable<ProfileCond`
`520`	`521`	`break;`
`521`	`522`	`}`
`522`	`523`	`case ProfileConditionValue.AudioProfile:`
	`524`	`+ case ProfileConditionValue.IsAnamorphic:`
`523`	`525`	`case ProfileConditionValue.Has64BitOffsets:`
`524`	`526`	`case ProfileConditionValue.PacketLength:`
`525`	`527`	`case ProfileConditionValue.VideoTimestamp:`
Original file line number	Diff line number	Diff line change
`@@ -348,6 +348,19 @@ public int? TargetTotalBitrate`
`348`	`348`	`}`
`349`	`349`	`}`
`350`	`350`
	`351`	`+ public bool? IsTargetAnamorphic`
	`352`	`+ {`
	`353`	`+ get`
	`354`	`+ {`
	`355`	`+ if (IsDirectStream)`
	`356`	`+ {`
	`357`	`+ return TargetVideoStream == null ? null : TargetVideoStream.IsAnamorphic;`
	`358`	`+ }`
	`359`	`+`
	`360`	`+ return false;`
	`361`	`+ }`
	`362`	`+ }`
	`363`	`+`
`351`	`364`	`public int? TargetWidth`
`352`	`365`	`{`
`353`	`366`	`get`