Commit 5c3bde7a authored by Thomas Guillem's avatar Thomas Guillem

LibVLC: add mediacodec_ndk and mediacodec_jni codecs

parent a1f03f29
...@@ -59,7 +59,7 @@ public class LibVLC { ...@@ -59,7 +59,7 @@ public class LibVLC {
public final static int MEDIA_NO_HWACCEL = 0x02; public final static int MEDIA_NO_HWACCEL = 0x02;
public final static int MEDIA_PAUSED = 0x4; 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(); private static final boolean HAS_WINDOW_VOUT = LibVlcUtil.isGingerbreadOrLater();
/** libVLC instance C pointer */ /** libVLC instance C pointer */
...@@ -221,7 +221,7 @@ public class LibVLC { ...@@ -221,7 +221,7 @@ public class LibVLC {
else { else {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
if (decoder == HWDecoderUtil.Decoder.MEDIACODEC) if (decoder == HWDecoderUtil.Decoder.MEDIACODEC)
sb.append("mediacodec,"); sb.append("mediacodec_ndk,mediacodec_jni,");
else if (decoder == HWDecoderUtil.Decoder.OMX) else if (decoder == HWDecoderUtil.Decoder.OMX)
sb.append("iomx,"); sb.append("iomx,");
sb.append("all"); sb.append("all");
...@@ -243,7 +243,7 @@ public class LibVLC { ...@@ -243,7 +243,7 @@ public class LibVLC {
this.devHardwareDecoder == DEV_HW_DECODER_OMX_DR) this.devHardwareDecoder == DEV_HW_DECODER_OMX_DR)
this.devCodecList = "iomx"; this.devCodecList = "iomx";
else else
this.devCodecList = "mediacodec"; this.devCodecList = "mediacodec_ndk,mediacodec_jni";
Log.d(TAG, "HWDec forced: " + this.devCodecList + Log.d(TAG, "HWDec forced: " + this.devCodecList +
(isDirectRendering() ? "-dr" : "")); (isDirectRendering() ? "-dr" : ""));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment