lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move depreciated audio re-sample into audio filters

Browse Source
This commit is contained in:
tikuf 2013-10-28 15:01:35 +11:00
parent 676579d4bd
commit a2c6f687ae
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
View File

@ -1,4 +1,4 @@
using MediaBrowser.Common.MediaInfo;
using MediaBrowser.Common.MediaInfo;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Library;
@ -79,11 +79,6 @@ namespace MediaBrowser.Api.Playback.Hls
args += " -ac " + channels.Value;
}
if (state.Request.AudioSampleRate.HasValue)
{
args += " -ar " + state.Request.AudioSampleRate.Value;
}
var bitrate = GetAudioBitrateParam(state);
if (bitrate.HasValue)
@ -92,6 +87,7 @@ namespace MediaBrowser.Api.Playback.Hls
}
var volParam = string.Empty;
var AudioSampleRate = string.Empty;
// Boost volume to 200% when downsampling from 6ch to 2ch
if (channels.HasValue && channels.Value <= 2 && state.AudioStream.Channels.HasValue && state.AudioStream.Channels.Value > 5)
@ -99,7 +95,12 @@ namespace MediaBrowser.Api.Playback.Hls
volParam = ",volume=2.000000";
}
args += string.Format(" -af \"adelay=1,aresample=async=1000{0}\"", volParam);
if (state.Request.AudioSampleRate.HasValue)
{
AudioSampleRate= state.Request.AudioSampleRate.Value + ":";
}
args += string.Format(" -af \"adelay=1,aresample={0}async=1000{1}\"",AudioSampleRate, volParam);
return args;
}

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

@ -1,4 +1,4 @@
using MediaBrowser.Common.MediaInfo;
using MediaBrowser.Common.MediaInfo;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Drawing;
using MediaBrowser.Controller.Dto;
@ -219,11 +219,6 @@ namespace MediaBrowser.Api.Playback.Progressive
args += " -ac " + channels.Value;
}
if (request.AudioSampleRate.HasValue)
{
args += " -ar " + request.AudioSampleRate.Value;
}
var bitrate = GetAudioBitrateParam(state);
if (bitrate.HasValue)
@ -231,19 +226,25 @@ namespace MediaBrowser.Api.Playback.Progressive
args += " -ab " + bitrate.Value.ToString(UsCulture);
}
var volParam = string.Empty;
var volParam = string.Empty;
var AudioSampleRate = string.Empty;
// Boost volume to 200% when downsampling from 6ch to 2ch
if (channels.HasValue && channels.Value <= 2 && state.AudioStream.Channels.HasValue && state.AudioStream.Channels.Value > 5)
{
volParam = ",volume=2.000000";
// Boost volume to 200% when downsampling from 6ch to 2ch
if (channels.HasValue && channels.Value <= 2 && state.AudioStream.Channels.HasValue && state.AudioStream.Channels.Value > 5)
{
volParam = ",volume=2.000000";
}
if (state.Request.AudioSampleRate.HasValue)
{
AudioSampleRate= state.Request.AudioSampleRate.Value + ":";
}
args += string.Format(" -af \"aresample={0}async=1000{1}\"",AudioSampleRate, volParam);
return args;
}
args += string.Format(" -af \"aresample=async=1000{0}\"", volParam);
return args;
}
/// <summary>
/// Gets the video bitrate to specify on the command line
/// </summary>