[vlc-commits] omxil/mediacodec: Extend the quirk workaround for OMX. SEC to ignore horizontal padding as well

[Martin Storsjö]

vlc | branch: master | Martin Storsjö <martin at martin.st> | Wed Jan 30 12:54:07 2013 +0200| [346d9c4716c19f08600d2a84745cb50678cc1d04] | committer: Rafaël Carré

omxil/mediacodec: Extend the quirk workaround for OMX.SEC to ignore horizontal padding as well

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=346d9c4716c19f08600d2a84745cb50678cc1d04
---

 modules/codec/omxil/android_mediacodec.c |    1 +
 modules/codec/omxil/omxil.c              |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/codec/omxil/android_mediacodec.c b/modules/codec/omxil/android_mediacodec.c
index 13ec673..0b36f7a1 100644
--- 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 72db1bd..ca12e93 100644
--- 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 ) )