[Ffmpeg-cvslog] r7150 - trunk/libavformat/matroska.c

[Aurelien Jacobs]

On Wed, 22 Nov 2006 10:38:44 +0100
Aurelien Jacobs <aurel at gnuage.org> wrote:

> On Wed, 22 Nov 2006 01:19:26 +0100
> Michael Niedermayer <michaelni at gmx.at> wrote:
> 
> > Hi
> > 
> > On Wed, Nov 22, 2006 at 12:47:21AM +0100, aurel wrote:
> > > Author: aurel
> > > Date: Wed Nov 22 00:47:21 2006
> > > New Revision: 7150
> > > 
> > > Modified:
> > >    trunk/libavformat/matroska.c
> > > 
> > > Log:
> > > add support for FLAC in matroska
> > > 
> > > Modified: trunk/libavformat/matroska.c
> > > ==============================================================================
> > > --- trunk/libavformat/matroska.c	(original)
> > > +++ trunk/libavformat/matroska.c	Wed Nov 22 00:47:21 2006
> > > @@ -224,6 +224,7 @@
> > >      {"A_DTS"            , CODEC_ID_DTS},
> > >      {"A_VORBIS"         , CODEC_ID_VORBIS},
> > >      {"A_AAC"            , CODEC_ID_AAC},
> > > +    {"A_FLAC"           , CODEC_ID_FLAC},
> > >      {"A_WAVPACK4"       , CODEC_ID_WAVPACK},
> > >      {"A_TTA1"           , CODEC_ID_TTA},
> > >      {NULL               , CODEC_ID_NONE}
> > > @@ -2265,6 +2266,14 @@
> > >                  }
> > >              }
> > >  
> > > +            else if (codec_id == CODEC_ID_FLAC) {
> > > +                AVPacket *pkt = av_mallocz(sizeof(AVPacket));
> > > +                av_new_packet(pkt, track->codec_priv_size);
> > > +                memcpy(pkt->data, track->codec_priv, track->codec_priv_size);
> > > +                matroska_queue_packet(matroska, pkt);
> > > +                track->codec_priv_size = 0;
> > > +            }
> > 
> > hmm, are you injecting a global header as first packet into the stream?
> 
> Indeed I am. Well not exactly in fact...
> [...]
> They managed to do even worse ! They indeed pack the extradata with the
> first data packet, but they store it in the extradata block !

Hum... sorry about this missinformation, but I was wrong. In fact, the
extra data block contains the main header (34 bytes) and several other
meta-information which are not required for decoding.
I will send a patch for flac.c so that it accept such meta-information
in the extradata.

Aurel