diff options
Diffstat (limited to 'MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs')
| -rw-r--r-- | MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs index aa39b8c9d..352cbf365 100644 --- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs +++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs @@ -282,27 +282,22 @@ namespace MediaBrowser.Api.Playback.Hls var args = "-codec:a:0 " + codec; - if (state.AudioStream != null) - { - var channels = state.OutputAudioChannels; - - if (channels.HasValue) - { - args += " -ac " + channels.Value; - } - - var bitrate = state.OutputAudioBitrate; + var channels = state.OutputAudioChannels; - if (bitrate.HasValue) - { - args += " -ab " + bitrate.Value.ToString(UsCulture); - } + if (channels.HasValue) + { + args += " -ac " + channels.Value; + } - args += " " + GetAudioFilterParam(state, true); + var bitrate = state.OutputAudioBitrate; - return args; + if (bitrate.HasValue) + { + args += " -ab " + bitrate.Value.ToString(UsCulture); } + args += " " + GetAudioFilterParam(state, true); + return args; } @@ -313,7 +308,8 @@ namespace MediaBrowser.Api.Playback.Hls // 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 -bsf dump_extra" : "-codec:v:0 copy"; + // TOOD: Switch to -bsf dump_extra? + return IsH264(state.VideoStream) ? "-codec:v:0 copy -bsf h264_mp4toannexb" : "-codec:v:0 copy"; } var keyFrameArg = state.ReadInputAtNativeFramerate ? |