diff options
Diffstat (limited to 'MediaBrowser.Api/Playback/Progressive')
3 files changed, 10 insertions, 23 deletions
diff --git a/MediaBrowser.Api/Playback/Progressive/AudioService.cs b/MediaBrowser.Api/Playback/Progressive/AudioService.cs index 55b311f867..d746b265df 100644 --- a/MediaBrowser.Api/Playback/Progressive/AudioService.cs +++ b/MediaBrowser.Api/Playback/Progressive/AudioService.cs @@ -82,23 +82,21 @@ namespace MediaBrowser.Api.Playback.Progressive var audioTranscodeParams = new List<string>(); - var bitrate = GetAudioBitrateParam(state); + var bitrate = state.OutputAudioBitrate; if (bitrate.HasValue) { audioTranscodeParams.Add("-ab " + bitrate.Value.ToString(UsCulture)); } - var channels = GetNumAudioChannelsParam(request, state.AudioStream); - - if (channels.HasValue) + if (state.OutputAudioChannels.HasValue) { - audioTranscodeParams.Add("-ac " + channels.Value); + audioTranscodeParams.Add("-ac " + state.OutputAudioChannels.Value.ToString(UsCulture)); } - if (request.AudioSampleRate.HasValue) + if (state.OutputAudioSampleRate.HasValue) { - audioTranscodeParams.Add("-ar " + request.AudioSampleRate.Value); + audioTranscodeParams.Add("-ar " + state.OutputAudioSampleRate.Value.ToString(UsCulture)); } const string vn = " -vn"; @@ -107,10 +105,9 @@ namespace MediaBrowser.Api.Playback.Progressive var inputModifier = GetInputModifier(state); - return string.Format("{0} -i {1}{2} -threads {3}{4} {5} -id3v2_version 3 -write_id3v1 1 \"{6}\"", + return string.Format("{0} -i {1} -threads {2}{3} {4} -id3v2_version 3 -write_id3v1 1 \"{5}\"", inputModifier, GetInputArgument(state), - GetSlowSeekCommandLineParameter(request), threads, vn, string.Join(" ", audioTranscodeParams.ToArray()), diff --git a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs index 29ad3e500b..f39169dbd8 100644 --- a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs +++ b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs @@ -308,16 +308,7 @@ namespace MediaBrowser.Api.Playback.Progressive /// <returns>System.Nullable{System.Int64}.</returns> private long? GetEstimatedContentLength(StreamState state) { - var totalBitrate = 0; - - if (state.Request.AudioBitRate.HasValue) - { - totalBitrate += state.Request.AudioBitRate.Value; - } - if (state.VideoRequest != null && state.VideoRequest.VideoBitRate.HasValue) - { - totalBitrate += state.VideoRequest.VideoBitRate.Value; - } + var totalBitrate = state.TotalOutputBitrate ?? 0; if (totalBitrate > 0 && state.RunTimeTicks.HasValue) { diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs index 0d09854670..d61e8d73ad 100644 --- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs +++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs @@ -107,10 +107,9 @@ namespace MediaBrowser.Api.Playback.Progressive var inputModifier = GetInputModifier(state); - return string.Format("{0} -i {1}{2}{3} {4} {5} -map_metadata -1 -threads {6} {7}{8} \"{9}\"", + return string.Format("{0} -i {1}{2} {3} {4} -map_metadata -1 -threads {5} {6}{7} \"{8}\"", inputModifier, GetInputArgument(state), - GetSlowSeekCommandLineParameter(state.Request), keyFrame, GetMapArgs(state), GetVideoArguments(state, videoCodec, performSubtitleConversions), @@ -204,14 +203,14 @@ namespace MediaBrowser.Api.Playback.Progressive var args = "-acodec " + codec; // Add the number of audio channels - var channels = GetNumAudioChannelsParam(request, state.AudioStream); + var channels = state.OutputAudioChannels; if (channels.HasValue) { args += " -ac " + channels.Value; } - var bitrate = GetAudioBitrateParam(state); + var bitrate = state.OutputAudioBitrate; if (bitrate.HasValue) { |