Revert "videoplayer: drop SETTING_AUDIOOUTPUT_SUPPORTSDTSHDCPUDECODING"

This reverts commit fee7ddb.
popcornmix · Sep 20, 2015 · 54b8f80 · 54b8f80
1 parent 8d7820c
commit 54b8f80
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/system/settings/settings.xml b/system/settings/settings.xml
@@ -2691,6 +2691,22 @@
           </constraints>
           <control type="list" format="string" />
         </setting>
+        <setting id="audiooutput.supportdtshdcpudecoding" type="boolean" label="38019" help="38020">
+          <level>2</level>
+          <default>false</default>
+          <control type="toggle" />
+          <dependencies>
+            <dependency type="enable">
+            <or>
+              <condition setting="audiooutput.passthrough" operator="is">false</condition>
+              <and>
+                <condition setting="audiooutput.dtshdpassthrough" operator="is">false</condition>
+                <condition setting="audiooutput.dtspassthrough" operator="is">false</condition>
+              </and>
+            </or>
+            </dependency>
+          </dependencies>
+        </setting>
       </group>
       <group id="2">
         <setting id="audiooutput.dspaddonsenabled" type="boolean" label="36441" help="36438">

diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
@@ -57,7 +57,7 @@ bool CDVDAudioCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options
   AVCodec* pCodec = NULL;
   m_bOpenedCodec = false;
 
-  if (hints.codec == AV_CODEC_ID_DTS)
+  if (hints.codec == AV_CODEC_ID_DTS && CSettings::GetInstance().GetBool(CSettings::SETTING_AUDIOOUTPUT_SUPPORTSDTSHDCPUDECODING))
     pCodec = avcodec_find_decoder_by_name("libdcadec");
 
   if (!pCodec)

diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
@@ -454,7 +454,6 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput, bool streaminfo, bool filein
           st->codec->codec = pCodec;
       }
     }
-
     /* to speed up dvd switches, only analyse very short */
     if(m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD))
       av_opt_set_int(m_pFormatContext, "analyzeduration", 500000, 0);