[Android] LibVLC: add mediacodec_ndk and mediacodec_jni codecs

[Thomas Guillem]

vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed May 20 16:06:40 2015 +0200| [5c3bde7a047cd8cc717c997251ba1d693f97914c] | committer: Thomas Guillem

LibVLC: add mediacodec_ndk and mediacodec_jni codecs

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=5c3bde7a047cd8cc717c997251ba1d693f97914c
---

 libvlc/src/org/videolan/libvlc/LibVLC.java |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libvlc/src/org/videolan/libvlc/LibVLC.java b/libvlc/src/org/videolan/libvlc/LibVLC.java
index 4cde814..09a5bfb 100644
--- a/libvlc/src/org/videolan/libvlc/LibVLC.java
+++ b/libvlc/src/org/videolan/libvlc/LibVLC.java
@@ -59,7 +59,7 @@ public class LibVLC {
     public final static int MEDIA_NO_HWACCEL = 0x02;
     public final static int MEDIA_PAUSED = 0x4;
 
-    private static final String DEFAULT_CODEC_LIST = "mediacodec,iomx,all";
+    private static final String DEFAULT_CODEC_LIST = "mediacodec_ndk,mediacodec_jni,iomx,all";
     private static final boolean HAS_WINDOW_VOUT = LibVlcUtil.isGingerbreadOrLater();
 
     /** libVLC instance C pointer */
@@ -221,7 +221,7 @@ public class LibVLC {
                 else {
                     final StringBuilder sb = new StringBuilder();
                     if (decoder == HWDecoderUtil.Decoder.MEDIACODEC)
-                        sb.append("mediacodec,");
+                        sb.append("mediacodec_ndk,mediacodec_jni,");
                     else if (decoder == HWDecoderUtil.Decoder.OMX)
                         sb.append("iomx,");
                     sb.append("all");
@@ -243,7 +243,7 @@ public class LibVLC {
                     this.devHardwareDecoder == DEV_HW_DECODER_OMX_DR)
                 this.devCodecList = "iomx";
             else
-                this.devCodecList = "mediacodec";
+                this.devCodecList = "mediacodec_ndk,mediacodec_jni";
 
             Log.d(TAG, "HWDec forced: " + this.devCodecList +
                 (isDirectRendering() ? "-dr" : ""));