From a7b32d4ec0bd3f4b383078a9ecf2e2f20757bdc9 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 25 Apr 2015 23:25:07 -0400
Subject: update audio transcoding bitrate

---
 MediaBrowser.Model/Dlna/StreamBuilder.cs  | 8 ++++----
 MediaBrowser.Model/Querying/ItemFields.cs | 5 -----
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'MediaBrowser.Model')

diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 7cda57f4b..cecd61e79 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -456,7 +456,7 @@ namespace MediaBrowser.Model.Dlna
                     playlistItem.MaxAudioChannels = Math.Min(options.MaxAudioChannels.Value, currentValue);
                 }
 
-                int audioBitrate = GetAudioBitrate(playlistItem.TargetAudioChannels, playlistItem.TargetAudioCodec, audioStream);
+                int audioBitrate = GetAudioBitrate(options.GetMaxBitrate(), playlistItem.TargetAudioChannels, playlistItem.TargetAudioCodec, audioStream);
                 playlistItem.AudioBitrate = Math.Min(playlistItem.AudioBitrate ?? audioBitrate, audioBitrate);
 
                 int? maxBitrateSetting = options.GetMaxBitrate();
@@ -479,13 +479,13 @@ namespace MediaBrowser.Model.Dlna
             return playlistItem;
         }
 
-        private int GetAudioBitrate(int? channels, string outputCodec, MediaStream audioStream)
+        private int GetAudioBitrate(int? maxTotalBitrate, int? targetAudioChannels, string targetAudioCodec, MediaStream audioStream)
         {
             var defaultBitrate = 128000;
 
-            if (channels.HasValue)
+            if (targetAudioChannels.HasValue)
             {
-                if (channels.Value >= 5)
+                if (targetAudioChannels.Value >= 5 && (maxTotalBitrate ?? 0) >= 1500000)
                 {
                     defaultBitrate = 320000;
                 }
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index 77b3dc0ee..0362b7aed 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -199,11 +199,6 @@
         /// The series studio
         /// </summary>
         SeriesStudio,
-        
-        /// <summary>
-        /// The soundtrack ids
-        /// </summary>
-        SoundtrackIds,
 
         /// <summary>
         /// The sort name of the item
-- 
cgit v1.2.3