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

support 5.1 aac

Browse Source
This commit is contained in:
Luke Pulverenti 2013-05-21 21:53:18 -04:00
parent 212e696f7e
commit bd85132702
5 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@ -426,11 +426,6 @@ namespace MediaBrowser.Api.Playback
{ {
if (audioStream.Channels > 2 && request.AudioCodec.HasValue) if (audioStream.Channels > 2 && request.AudioCodec.HasValue)
{ {
if (request.AudioCodec.Value == AudioCodecs.Aac)
{
// libvo_aacenc currently only supports two channel output
return 2;
}
if (request.AudioCodec.Value == AudioCodecs.Wma) if (request.AudioCodec.Value == AudioCodecs.Wma)
{ {
// wmav2 currently only supports two channel output // wmav2 currently only supports two channel output

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

@ -93,6 +93,11 @@ 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)

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

@ -98,6 +98,11 @@ namespace MediaBrowser.Api.Playback.Hls
if (state.AudioStream != null) if (state.AudioStream != null)
{ {
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

@ -3,7 +3,9 @@ using MediaBrowser.Common.MediaInfo;
using MediaBrowser.Controller; using MediaBrowser.Controller;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using ServiceStack.ServiceHost; using ServiceStack.ServiceHost;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
namespace MediaBrowser.Api.Playback.Progressive namespace MediaBrowser.Api.Playback.Progressive
{ {
@ -84,6 +86,11 @@ 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");
}
if (request.AudioBitRate.HasValue) if (request.AudioBitRate.HasValue)
{ {
audioTranscodeParams.Add("-ab " + request.AudioBitRate.Value); audioTranscodeParams.Add("-ab " + request.AudioBitRate.Value);

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

@ -217,6 +217,11 @@ namespace MediaBrowser.Api.Playback.Progressive
var args = "-acodec " + codec; var args = "-acodec " + codec;
if (string.Equals(codec, "aac", StringComparison.OrdinalIgnoreCase))
{
args += " -strict experimental";
}
// Add the number of audio channels // Add the number of audio channels
var channels = GetNumAudioChannelsParam(request, state.AudioStream); var channels = GetNumAudioChannelsParam(request, state.AudioStream);