Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[players] Allow choice of omxplayer through acceleration settings

  • Loading branch information...
commit f03c3add8bb0e962cbdc2ad10aee915db669d11d 1 parent 8fa11d5
popcornmix popcornmix authored
13 language/English/strings.po
View
@@ -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"
9 system/settings/settings.xml
View
@@ -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>
4 xbmc/cores/dvdplayer/DVDPlayer.cpp
View
@@ -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();
}
3  xbmc/settings/SettingConditions.cpp
View
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.