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

Merge branch 'master' of https://github.com/tikuf/MediaBrowser

Browse Source 
Conflicts:
	MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
	MediaBrowser.Api/Playback/Progressive/VideoService.cs
This commit is contained in:
Luke Pulverenti 2013-11-01 11:59:42 -04:00
commit c543fdea3a
3 changed files with 28 additions and 24 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.IO; using MediaBrowser.Common.IO;
using MediaBrowser.Common.MediaInfo; using MediaBrowser.Common.MediaInfo;
using MediaBrowser.Controller; using MediaBrowser.Controller;
using MediaBrowser.Controller.Dto; using MediaBrowser.Controller.Dto;
@ -80,11 +80,6 @@ namespace MediaBrowser.Api.Playback.Hls
args += " -ac " + channels.Value; args += " -ac " + channels.Value;
} }
if (state.Request.AudioSampleRate.HasValue)
{
args += " -ar " + state.Request.AudioSampleRate.Value;
}
var bitrate = GetAudioBitrateParam(state); var bitrate = GetAudioBitrateParam(state);
if (bitrate.HasValue) if (bitrate.HasValue)
@ -93,14 +88,20 @@ namespace MediaBrowser.Api.Playback.Hls
} }
var volParam = string.Empty; var volParam = string.Empty;
var AudioSampleRate = string.Empty;
// Boost volume to 200% when downsampling from 6ch to 2ch // 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) if (channels.HasValue && channels.Value <= 2 && state.AudioStream.Channels.HasValue && state.AudioStream.Channels.Value > 5)
{ {
volParam = ",volume=2.000000"; volParam = ",volume=2.000000";
} }
if (state.Request.AudioSampleRate.HasValue)
{
AudioSampleRate= state.Request.AudioSampleRate.Value + ":";
}
args += string.Format(" -af \"adelay=1,aresample=async=1000{0}\"", volParam); args += string.Format(" -af \"adelay=1,aresample={0}async=1000{1}\"",AudioSampleRate, volParam);
return args; return args;
} }

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

@ -1,4 +1,4 @@
using MediaBrowser.Common.IO; using MediaBrowser.Common.IO;
using MediaBrowser.Common.MediaInfo; using MediaBrowser.Common.MediaInfo;
using MediaBrowser.Controller; using MediaBrowser.Controller;
using MediaBrowser.Controller.Drawing; using MediaBrowser.Controller.Drawing;
@ -220,11 +220,6 @@ namespace MediaBrowser.Api.Playback.Progressive
args += " -ac " + channels.Value; args += " -ac " + channels.Value;
} }
if (request.AudioSampleRate.HasValue)
{
args += " -ar " + request.AudioSampleRate.Value;
}
var bitrate = GetAudioBitrateParam(state); var bitrate = GetAudioBitrateParam(state);
if (bitrate.HasValue) if (bitrate.HasValue)
@ -232,19 +227,25 @@ namespace MediaBrowser.Api.Playback.Progressive
args += " -ab " + bitrate.Value.ToString(UsCulture); 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 // 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) if (channels.HasValue && channels.Value <= 2 && state.AudioStream.Channels.HasValue && state.AudioStream.Channels.Value > 5)
{ {
volParam = ",volume=2.000000"; 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> /// <summary>
/// Gets the video bitrate to specify on the command line /// Gets the video bitrate to specify on the command line
/// </summary> /// </summary>

4
MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
View File

@ -1,4 +1,4 @@
using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.IO; using MediaBrowser.Common.IO;
using MediaBrowser.Common.MediaInfo; using MediaBrowser.Common.MediaInfo;
using MediaBrowser.Controller.IO; using MediaBrowser.Controller.IO;
@ -602,6 +602,8 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
return "-sub_charenc windows-1251"; return "-sub_charenc windows-1251";
case "vie": case "vie":
return "-sub_charenc windows-1258"; return "-sub_charenc windows-1258";
case "kor":
return "-sub_charenc cp949";
default: default:
return "-sub_charenc windows-1252"; return "-sub_charenc windows-1252";
} }