Permalink
Browse files

Merge pull request #4035 from vkosh/amcodec-linux

[linux] enable android hw codecs in linux on arm devices, e.g. amlogic
  • Loading branch information...
2 parents c3de91b + e185a16 commit 9780f852c503e8276aa6e2af61f29e56cec5a955 @t-nelson t-nelson committed Jan 16, 2014
Showing with 11 additions and 9 deletions.
  1. +0 −9 system/settings/android.xml
  2. +9 −0 system/settings/settings.xml
  3. +2 −0 xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
@@ -10,15 +10,6 @@
<section id="videos">
<category id="videoplayer">
<group id="2">
- <setting id="videoplayer.useamcodec" type="boolean" label="13438" help="36422">
- <requirement>HAVE_AMCODEC</requirement>
- <level>2</level>
- <default>true</default>
- <updates>
- <update type="change" />
- </updates>
- <control type="toggle" />
- </setting>
<setting id="videoplayer.usestagefright" type="boolean" label="13436" help="36260">
<requirement>HAVE_LIBSTAGEFRIGHTDECODER</requirement>
<level>2</level>
@@ -415,6 +415,15 @@
<formatlabel>14047</formatlabel>
</control>
</setting>
+ <setting id="videoplayer.useamcodec" type="boolean" label="13438" help="36422">
+ <requirement>HAVE_AMCODEC</requirement>
+ <level>2</level>
+ <default>true</default>
+ <updates>
+ <update type="change" />
+ </updates>
+ <control type="toggle" />
+ </setting>
<setting id="videoplayer.usevdpau" type="boolean" label="13425" help="36155">
<requirement>HAVE_LIBVDPAU</requirement>
<level>2</level>
@@ -1415,7 +1415,9 @@ CAMLCodec::~CAMLCodec()
bool CAMLCodec::OpenDecoder(CDVDStreamInfo &hints)
{
+#ifdef TARGET_ANDROID
CLog::Log(LOGDEBUG, "CAMLCodec::OpenDecoder, android version %d", CAndroidFeatures::GetVersion());
+#endif
m_speed = DVD_PLAYSPEED_NORMAL;
m_1st_pts = 0;

0 comments on commit 9780f85

Please sign in to comment.