[vlc-devel] [vlc-commits] Add VP9 support in mkv

[Rafaël Carré]

Hi,

Le 20/10/2013 17:07, Denis Charmet a écrit :
> vlc | branch: master | Denis Charmet <typx at dinauz.org> | Sun Oct 20 17:03:40 2013 +0200| [cd6a14d70d1d1b1ec74fcff273fe0039ce2f337a] | committer: Denis Charmet
> 
> Add VP9 support in mkv
> 
> Close #9341
> 
>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cd6a14d70d1d1b1ec74fcff273fe0039ce2f337a
> ---
> 
>  modules/codec/avcodec/fourcc.c               |    1 +
>  modules/demux/mkv/matroska_segment_parse.cpp |    5 +++++
>  2 files changed, 6 insertions(+)
> 
> diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
> index a3f5377..892dc2f 100644
> --- a/modules/codec/avcodec/fourcc.c
> +++ b/modules/codec/avcodec/fourcc.c
> @@ -184,6 +184,7 @@ static const struct
>      { VLC_CODEC_INDEO5, AV_CODEC_ID_INDEO5, VIDEO_ES },
>  
>      { VLC_CODEC_VP8, AV_CODEC_ID_VP8, VIDEO_ES },
> +    { VLC_CODEC_VP9, AV_CODEC_ID_VP9, VIDEO_ES },

I'll take care of this part (well or j-b will apparently)

>      { VLC_CODEC_LAGARITH, AV_CODEC_ID_LAGARITH, VIDEO_ES },
>  
> diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp
> index 2988f71..c9d2c9d 100644
> --- a/modules/demux/mkv/matroska_segment_parse.cpp
> +++ b/modules/demux/mkv/matroska_segment_parse.cpp
> @@ -1349,6 +1349,11 @@ int32_t matroska_segment_c::TrackInit( mkv_track_t * p_tk )
>          p_tk->fmt.i_codec = VLC_CODEC_VP8;
>          p_tk->b_pts_only = true;
>      }
> +    else if( !strncmp( p_tk->psz_codec, "V_VP9", 5 ) )
> +    {
> +        p_tk->fmt.i_codec = VLC_CODEC_VP9;
> +        fill_extra_data( p_tk, 0 );

Does VP9 have extradata ?

Looking at libavcodec^WVLC decoder, it doesn't

> +    }
>      else if( !strncmp( p_tk->psz_codec, "V_MPEG4", 7 ) )
>      {
>          if( !strcmp( p_tk->psz_codec, "V_MPEG4/MS/V3" ) )