michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

revert progressive changes

Browse Source
This commit is contained in:
Luke Pulverenti 2013-09-03 23:25:01 -04:00
parent 5234f3dcdd
commit 57a0f80c2c
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.Api/Playback/Hls/AudioHlsService.cs
View File

@ -93,11 +93,6 @@ namespace MediaBrowser.Api.Playback.Hls
var args = "-codec:a " + codec; var args = "-codec:a " + codec;
if (string.Equals(codec, "aac", StringComparison.OrdinalIgnoreCase))
{
args += " -strict experimental";
}
var channels = GetNumAudioChannelsParam(state.Request, state.AudioStream); var channels = GetNumAudioChannelsParam(state.Request, state.AudioStream);
if (channels.HasValue) if (channels.HasValue)

7
MediaBrowser.Api/Playback/Progressive/AudioService.cs
View File

@ -87,11 +87,6 @@ namespace MediaBrowser.Api.Playback.Progressive
var audioTranscodeParams = new List<string>(); var audioTranscodeParams = new List<string>();
if (string.Equals(Path.GetExtension(outputPath), ".aac", StringComparison.OrdinalIgnoreCase))
{
audioTranscodeParams.Add("-strict experimental");
}
var bitrate = GetAudioBitrateParam(state); var bitrate = GetAudioBitrateParam(state);
if (bitrate.HasValue) if (bitrate.HasValue)
@ -113,7 +108,7 @@ namespace MediaBrowser.Api.Playback.Progressive
const string vn = " -vn"; 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), GetFastSeekCommandLineParameter(request),
GetInputArgument(state.Item, state.IsoMount), GetInputArgument(state.Item, state.IsoMount),
GetSlowSeekCommandLineParameter(request), GetSlowSeekCommandLineParameter(request),

4
MediaBrowser.Api/Playback/Progressive/VideoService.cs
View File

@ -111,7 +111,7 @@ namespace MediaBrowser.Api.Playback.Progressive
var threads = string.Equals(videoCodec, "libvpx", StringComparison.OrdinalIgnoreCase) ? 2 : 0; 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, probeSize,
GetUserAgentParam(state.Item), GetUserAgentParam(state.Item),
GetFastSeekCommandLineParameter(state.Request), GetFastSeekCommandLineParameter(state.Request),
@ -285,7 +285,7 @@ namespace MediaBrowser.Api.Playback.Progressive
if (bitrate.HasValue) 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(); return args.Trim();