omxil/mediacodec: Extend the quirk workaround for OMX.SEC to ignore horizontal paddin...

Signed-off-by: Rafaël Carré <funman@videolan.org>

diff --git a/modules/codec/omxil/android_mediacodec.c b/modules/codec/omxil/android_mediacodec.c
index 13ec67391de522299513280659bf8718eef0aa5b..0b36f7a1a2656fee4207d6f22bfa3bb94f40120c 100644 (file)
--- a/modules/codec/omxil/android_mediacodec.c
+++ b/modules/codec/omxil/android_mediacodec.c
@@ -486,6 +486,7 @@ static void GetOutput(decoder_t *p_dec, JNIEnv *env, picture_t **pp_pic, int loo
             if (!strncmp(p_sys->name, "OMX.SEC.", strlen("OMX.SEC.")) &&
                 !strstr(p_sys->name, ".Decoder")) {
                 p_sys->slice_height = 0;
+                p_sys->stride = p_dec->fmt_out.video.i_width;
             }
 
             continue;

diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c
index 72db1bd18702af628f7a76100b3fab7859566773..ca12e93bd0e2b69359f660551fb5997a78383b50 100644 (file)
--- a/modules/codec/omxil/omxil.c
+++ b/modules/codec/omxil/omxil.c
@@ -521,8 +521,10 @@ static OMX_ERRORTYPE GetPortDefinition(decoder_t *p_dec, OmxPort *p_port,
          * at least in the pre-4.0 firmwares). Thus, we enable this quirk on
          * any OMX.SEC. decoder that doesn't contain the string ".Decoder". */
         if(!strncmp(p_sys->psz_component, "OMX.SEC.", strlen("OMX.SEC.")) &&
-           !strstr(p_sys->psz_component, ".Decoder"))
+           !strstr(p_sys->psz_component, ".Decoder")) {
             def->format.video.nSliceHeight = 0;
+            def->format.video.nStride = p_fmt->video.i_width;
+        }
 
         if(!GetVlcVideoFormat( def->format.video.eCompressionFormat,
                                &p_fmt->i_codec, 0 ) )