vlc | branch: master | Thomas Guillem <[email protected]> | Fri Oct 3 16:53:43 2014 +0200| [6893b7a44af01337e1c6a12b125bb6bbd00437a0] | committer: Jean-Baptiste Kempf
omxil: use convert_hevc_nal_units for hevc Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6893b7a44af01337e1c6a12b125bb6bbd00437a0 --- modules/codec/omxil/omxil.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c index 544d9ba..3997ca4 100644 --- a/modules/codec/omxil/omxil.c +++ b/modules/codec/omxil/omxil.c @@ -36,6 +36,7 @@ #include <vlc_block_helper.h> #include <vlc_cpu.h> #include "../h264_nal.h" +#include "../hevc_nal.h" #include "omxil.h" #include "omxil_core.h" @@ -1195,6 +1196,15 @@ static int OpenGeneric( vlc_object_t *p_this, bool b_encode ) p_header->pBuffer, p_header->nAllocLen, (uint32_t*) &p_header->nFilledLen, NULL ); } + else if( p_dec->fmt_in.i_codec == VLC_CODEC_HEVC && !p_sys->in.b_direct ) + { + p_header->nFilledLen = 0; + convert_hevc_nal_units( p_dec, p_dec->fmt_in.p_extra, + p_dec->fmt_in.i_extra, + p_header->pBuffer, p_header->nAllocLen, + (uint32_t*) &p_header->nFilledLen, + &p_sys->i_nal_size_length ); + } else if(p_sys->in.b_direct) { p_header->pOutputPortPrivate = p_header->pBuffer; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
