[vlc-commits] mediacodec: use convert_hevc_nal_units for hevc

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas.guillem at gmail.com> | Fri Oct  3 16:53:42 2014 +0200| [5e19ce9366866c509ae1d3891a84d6875a6a1173] | committer: Jean-Baptiste Kempf

mediacodec: use convert_hevc_nal_units for hevc

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/codec/omxil/android_mediacodec.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/codec/omxil/android_mediacodec.c b/modules/codec/omxil/android_mediacodec.c
index 70c1505..6edd932 100644
--- a/modules/codec/omxil/android_mediacodec.c
+++ b/modules/codec/omxil/android_mediacodec.c
@@ -37,6 +37,7 @@
 #include <vlc_cpu.h>
 
 #include "../h264_nal.h"
+#include "../hevc_nal.h"
 #include <OMX_Core.h>
 #include <OMX_Component.h>
 #include "omxil_utils.h"
@@ -480,6 +481,10 @@ static int OpenDecoder(vlc_object_t *p_this)
             convert_sps_pps(p_dec, p_dec->fmt_in.p_extra, p_dec->fmt_in.i_extra,
                             ptr, buf_size,
                             &size, &p_sys->nal_size);
+        } else if (p_dec->fmt_in.i_codec == VLC_CODEC_HEVC) {
+            convert_hevc_nal_units(p_dec, p_dec->fmt_in.p_extra,
+                                   p_dec->fmt_in.i_extra, ptr, buf_size,
+                                   &size, &p_sys->nal_size);
         } else {
             memcpy(ptr, p_dec->fmt_in.p_extra, size);
         }