diff options
| author | Tavares André <tavares_and@hotmail.com> | 2015-05-20 17:46:53 +0200 |
|---|---|---|
| committer | Tavares André <tavares_and@hotmail.com> | 2015-05-20 17:46:53 +0200 |
| commit | 12a8a88a38f52af99f0f640780a09cc860ba4ab7 (patch) | |
| tree | 43fbe62d4f4c30b3912402d44629f1a87f94e727 /MediaBrowser.Model | |
| parent | 33f633d37a5709230ab94773077bca02a0cd317b (diff) | |
| parent | 448dd949c78d2309a8dd27fc2c22cfa19594cadb (diff) | |
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Configuration/EncodingOptions.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dlna/StreamBuilder.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs index 7f1607217..ae714a84e 100644 --- a/MediaBrowser.Model/Configuration/EncodingOptions.cs +++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs @@ -9,7 +9,7 @@ namespace MediaBrowser.Model.Configuration public string H264Encoder { get; set; } public bool EnableDebugLogging { get; set; } public bool EnableThrottling { get; set; } - public int ThrottleThresholdSeconds { get; set; } + public int ThrottleThresholdInSeconds { get; set; } public EncodingOptions() { @@ -17,7 +17,7 @@ namespace MediaBrowser.Model.Configuration DownMixAudioBoost = 2; EncodingQuality = EncodingQuality.Auto; EnableThrottling = true; - ThrottleThresholdSeconds = 110; + ThrottleThresholdInSeconds = 120; } } } diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index 8400b204f..3c1c7ea6d 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -485,7 +485,7 @@ namespace MediaBrowser.Model.Dlna if (targetAudioChannels.HasValue) { - if (targetAudioChannels.Value >= 5 && (maxTotalBitrate ?? 0) >= 1500000) + if (targetAudioChannels.Value >= 5 && (maxTotalBitrate ?? 0) >= 2000000) { defaultBitrate = 320000; } |