diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-04-14 23:54:52 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-04-14 23:54:52 -0400 |
| commit | e89d4e605bfa365958fb7c4968c5c01d6b172ee2 (patch) | |
| tree | 34743acbf5ea96caad2cda511402ef21ffa3c5f6 /MediaBrowser.Api/Playback/BaseStreamingService.cs | |
| parent | 2913638b671bfc344a08cacdf4a9dc921b426776 (diff) | |
support theme songs in the web client
Diffstat (limited to 'MediaBrowser.Api/Playback/BaseStreamingService.cs')
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index b95062567..e588068d0 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -187,7 +187,7 @@ namespace MediaBrowser.Api.Playback if (!state.HasMediaStreams) { - return state.IsInputVideo ? "-map -0:s" : string.Empty; + return state.IsInputVideo ? "-sn" : string.Empty; } if (state.VideoStream != null) @@ -1493,7 +1493,7 @@ namespace MediaBrowser.Api.Playback if (videoRequest != null) { - if (state.VideoStream != null && CanStreamCopyVideo(videoRequest, state.VideoStream, state.VideoType)) + if (state.VideoStream != null && CanStreamCopyVideo(videoRequest, state.VideoStream)) { videoRequest.VideoCodec = "copy"; } @@ -1507,19 +1507,13 @@ namespace MediaBrowser.Api.Playback return state; } - private bool CanStreamCopyVideo(VideoStreamRequest request, MediaStream videoStream, VideoType videoType) + private bool CanStreamCopyVideo(VideoStreamRequest request, MediaStream videoStream) { if (videoStream.IsInterlaced) { return false; } - // Not going to attempt this with folder rips - if (videoType != VideoType.VideoFile) - { - return false; - } - // Source and target codecs must match if (!string.Equals(request.VideoCodec, videoStream.Codec, StringComparison.OrdinalIgnoreCase)) { |