[players] Allow choice of omxplayer through acceleration settings

xbmc · Sep 3, 2014 · f03c3ad · f03c3ad
1 parent 8fa11d5
commit f03c3ad
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/language/English/strings.po b/language/English/strings.po
@@ -6196,7 +6196,18 @@ msgctxt "#13457"
 msgid "Prefer VAAPI render method"
 msgstr ""
 
-#empty strings from id 13458 to 13499
+#: system/settings/settings.xml
+msgctxt "#13458"
+msgid "Allow hardware acceleration (OMXPlayer)"
+msgstr ""
+
+#. Description of setting "Videos -> Playback -> Allow hardware acceleration (OMXPlayer)" with label #13457
+#: system/settings/settings.xml
+msgctxt "#13459"
+msgid "Use OMXPlayer for decoding of video files."
+msgstr ""
+
+#empty strings from id 13460 to 13499
 
 #: system/settings/settings.xml
 msgctxt "#13500"

diff --git a/system/settings/settings.xml b/system/settings/settings.xml
@@ -752,6 +752,15 @@
           <default>true</default>
           <control type="toggle" />
         </setting>
+        <setting id="videoplayer.useomxplayer" type="boolean" label="13458" help="13459">
+          <requirement>HAS_OMXPLAYER</requirement>
+          <dependencies>
+            <dependency type="enable" setting="videoplayer.decodingmethod" operator="is">1</dependency>
+          </dependencies>
+          <level>2</level>
+          <default>true</default>
+          <control type="toggle" />
+        </setting>
         <setting id="videoplayer.useomx" type="boolean" label="13430" help="36161">
           <requirement>HAVE_LIBOPENMAX</requirement>
           <dependencies>

diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -562,7 +562,11 @@ CDVDPlayer::CDVDPlayer(IPlayerCallback& callback)
   m_OmxPlayerState.bOmxSentEOFs        = false;
   m_OmxPlayerState.threshold           = 0.2f;
   m_OmxPlayerState.current_deinterlace = CMediaSettings::Get().GetCurrentVideoSettings().m_DeinterlaceMode;
+#ifdef HAS_OMXPLAYER
+  m_omxplayer_mode                     = CSettings::Get().GetBool("videoplayer.useomxplayer");
+#else
   m_omxplayer_mode                     = false;
+#endif
 
   CreatePlayers();
 }

diff --git a/xbmc/settings/SettingConditions.cpp b/xbmc/settings/SettingConditions.cpp
@@ -227,6 +227,9 @@ void CSettingConditions::Initialize()
 #ifdef HAVE_LIBOPENMAX
   m_simpleConditions.insert("have_libopenmax");
 #endif
+#ifdef HAS_OMXPLAYER
+  m_simpleConditions.insert("has_omxplayer");
+#endif
 #ifdef HAVE_LIBVA
   m_simpleConditions.insert("have_libva");
 #endif