mediacodec: allow interlaced picture only after API 21

61949af4 · Thomas Guillem · ccfcd3ff · 61949af4
Commit 61949af4 authored Apr 27, 2015 by Thomas Guillem
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

modules/codec/omxil/android_mediacodec.c modules/codec/omxil/android_mediacodec.c +8 -0

No files found.
--- a/modules/codec/omxil/android_mediacodec.c
+++ b/modules/codec/omxil/android_mediacodec.c
@@ -1396,6 +1396,14 @@ static picture_t *DecodeVideo(decoder_t *p_dec, block_t **pp_block)
    if (p_sys->error_state)
        goto endclean;

+    /* Allow interlaced picture only after API 21 */
+    if (p_block && p_block->i_flags & BLOCK_FLAG_INTERLACED_MASK
+        && !(jfields.get_input_buffer && jfields.get_output_buffer))
+    {
+        b_error = true;
+        goto endclean;
+    }
+
    if (!(env = jni_get_env(THREAD_NAME)))
    {
        b_error = true;