diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-09-29 20:51:04 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-09-29 20:51:04 -0400 |
| commit | 02ebeb0e5bc85a62a395e5605b66b9b558c4e2c8 (patch) | |
| tree | 78a159979e038938c019cd3c60473f6e9e0b217d /MediaBrowser.Api/Playback/BaseStreamingService.cs | |
| parent | cdfb009df876e4f5bcc99b5017ef7f4154131a4c (diff) | |
added logging during app update, and IsHD
Diffstat (limited to 'MediaBrowser.Api/Playback/BaseStreamingService.cs')
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index c782c243d0..b002d556b0 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -5,6 +5,7 @@ using MediaBrowser.Common.MediaInfo; using MediaBrowser.Controller; using MediaBrowser.Controller.Dto; using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.MediaInfo; using MediaBrowser.Model.Drawing; @@ -442,7 +443,23 @@ namespace MediaBrowser.Api.Playback /// <returns>System.String.</returns> protected string GetProbeSizeArgument(BaseItem item) { - return MediaEncoder.GetProbeSizeArgument(MediaEncoderHelpers.GetInputType(item)); + var type = InputType.AudioFile; + + if (item is Audio) + { + type = MediaEncoderHelpers.GetInputType(item.Path, null, null); + } + else + { + var video = item as Video; + + if (video != null) + { + type = MediaEncoderHelpers.GetInputType(item.Path, video.VideoType, video.IsoType); + } + } + + return MediaEncoder.GetProbeSizeArgument(type); } /// <summary> |
