diff options
| -rw-r--r-- | MediaBrowser.Api/Playback/Hls/AudioHlsService.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Api/Playback/Progressive/AudioService.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Api/Playback/Progressive/VideoService.cs | 4 |
3 files changed, 3 insertions, 13 deletions
diff --git a/MediaBrowser.Api/Playback/Hls/AudioHlsService.cs b/MediaBrowser.Api/Playback/Hls/AudioHlsService.cs index aed80d2f2..afd696545 100644 --- a/MediaBrowser.Api/Playback/Hls/AudioHlsService.cs +++ b/MediaBrowser.Api/Playback/Hls/AudioHlsService.cs @@ -93,11 +93,6 @@ namespace MediaBrowser.Api.Playback.Hls var args = "-codec:a " + codec; - if (string.Equals(codec, "aac", StringComparison.OrdinalIgnoreCase)) - { - args += " -strict experimental"; - } - var channels = GetNumAudioChannelsParam(state.Request, state.AudioStream); if (channels.HasValue) diff --git a/MediaBrowser.Api/Playback/Progressive/AudioService.cs b/MediaBrowser.Api/Playback/Progressive/AudioService.cs index 2cc8ca7ca..337a290b4 100644 --- a/MediaBrowser.Api/Playback/Progressive/AudioService.cs +++ b/MediaBrowser.Api/Playback/Progressive/AudioService.cs @@ -87,11 +87,6 @@ namespace MediaBrowser.Api.Playback.Progressive var audioTranscodeParams = new List<string>(); - if (string.Equals(Path.GetExtension(outputPath), ".aac", StringComparison.OrdinalIgnoreCase)) - { - audioTranscodeParams.Add("-strict experimental"); - } - var bitrate = GetAudioBitrateParam(state); if (bitrate.HasValue) @@ -113,7 +108,7 @@ namespace MediaBrowser.Api.Playback.Progressive const string vn = " -vn"; - return string.Format("-itsoffset 1 {0} -i {1}{2} -threads 0{5} {3} -id3v2_version 3 -write_id3v1 1 \"{4}\"", + return string.Format("{0} -i {1}{2} -threads 0{5} {3} -id3v2_version 3 -write_id3v1 1 \"{4}\"", GetFastSeekCommandLineParameter(request), GetInputArgument(state.Item, state.IsoMount), GetSlowSeekCommandLineParameter(request), diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs index e102e10e8..851a46edc 100644 --- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs +++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs @@ -111,7 +111,7 @@ namespace MediaBrowser.Api.Playback.Progressive var threads = string.Equals(videoCodec, "libvpx", StringComparison.OrdinalIgnoreCase) ? 2 : 0; - return string.Format("-itsoffset 1 {0} {1} {2} -i {3}{4}{5} {6} {7} -threads {8} {9}{10} \"{11}\"", + return string.Format("{0} {1} {2} -i {3}{4}{5} {6} {7} -threads {8} {9}{10} \"{11}\"", probeSize, GetUserAgentParam(state.Item), GetFastSeekCommandLineParameter(state.Request), @@ -285,7 +285,7 @@ namespace MediaBrowser.Api.Playback.Progressive if (bitrate.HasValue) { - args += string.Format(" -b:v {0} -maxrate {0} -minrate {0} -bufsize ({0}/10)", bitrate.Value.ToString(UsCulture)); + args += string.Format(" -b:v {0}", bitrate.Value.ToString(UsCulture)); } return args.Trim(); |