alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-29 20:08:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

update firefox profile

Browse Source
This commit is contained in:
Luke Pulverenti
2016-05-14 01:40:01 -04:00
parent 4837b08e7d
commit 187b1099bc
5 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -712,15 +712,16 @@ namespace MediaBrowser.Api.Playback
inputChannels = null;
}
int? resultChannels = null;
var codec = outputAudioCodec ?? string.Empty;
if (codec.IndexOf("wma", StringComparison.OrdinalIgnoreCase) != -1)
{
// wmav2 currently only supports two channel output
return Math.Min(2, inputChannels ?? 2);
resultChannels = Math.Min(2, inputChannels ?? 2);
}
if (request.MaxAudioChannels.HasValue)
else if (request.MaxAudioChannels.HasValue)
{
var channelLimit = codec.IndexOf("mp3", StringComparison.OrdinalIgnoreCase) != -1
? 2
@@ -732,10 +733,18 @@ namespace MediaBrowser.Api.Playback
}
// If we don't have any media info then limit it to 5 to prevent encoding errors due to asking for too many channels
return Math.Min(request.MaxAudioChannels.Value, channelLimit);
resultChannels = Math.Min(request.MaxAudioChannels.Value, channelLimit);
}
return request.AudioChannels;
if (resultChannels.HasValue && !string.Equals(codec, "copy", StringComparison.OrdinalIgnoreCase))
{
if (request.TranscodingMaxAudioChannels.HasValue)
{
resultChannels = Math.Min(request.TranscodingMaxAudioChannels.Value, resultChannels.Value);
}
}
return resultChannels ?? request.AudioChannels;
}
/// <summary>
@@ -1504,6 +1513,10 @@ namespace MediaBrowser.Api.Playback
}
}
}
else if (i == 26)
{
request.TranscodingMaxAudioChannels = int.Parse(val, UsCulture);
}
}
}

4
MediaBrowser.Api/Playback/StreamRequest.cs
View File

@@ -51,7 +51,9 @@ namespace MediaBrowser.Api.Playback
[ApiMember(Name = "MaxAudioChannels", Description = "Optional. Specify a maximum number of audio channels to encode to, e.g. 2", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
public int? MaxAudioChannels { get; set; }
public int? TranscodingMaxAudioChannels { get; set; }
/// <summary>
/// Gets or sets the audio sample rate.
/// </summary>