[FFmpeg-devel] [PATCH] split codec_id for ac-3 and e-ac-3

[Aurelien Jacobs]

On Sun, 31 Aug 2008 23:29:16 -0400
Justin Ruggles <justin.ruggles at gmail.com> wrote:

> Ronald S. Bultje wrote:
> > Hi Justin,
> > 
> > On Sun, Aug 31, 2008 at 10:24 PM, Justin Ruggles
> > <justin.ruggles at gmail.com> wrote:
> >> Here is a patch to make a separate CODEC_ID_EAC3.  It adds a separate
> >> demuxer, muxer, parser, and decoder for E-AC-3.
> >>
> >> After this is done, the various other muxers/demuxers can be modified to
> >> treat E-AC-3 differently if needed.
> > 
> > Index: libavcodec/ac3_parser.c
> > ===================================================================
> > --- libavcodec/ac3_parser.c	(revision 15137)
> > +++ libavcodec/ac3_parser.c	(working copy)
> > @@ -194,3 +194,11 @@
> >      ff_aac_ac3_parse,
> >      ff_parse_close,
> >  };
> > +
> > +AVCodecParser eac3_parser = {
> > +    { CODEC_ID_EAC3 },
> > +    sizeof(AACAC3ParseContext),
> > +    ac3_parse_init,
> > +    ff_aac_ac3_parse,
> > +    ff_parse_close,
> > +};
> > 
> > Can't you just add EAC3 in the array of ac3_parser? MP2/3 does that
> > too, I think. No need for the separate entry.
> > 
> > [...]
> 
> new patch attached which shares the parser.
> 
> [...]
> 
> ===================================================================
> --- libavformat/raw.c	(revision 15137)
> +++ libavformat/raw.c	(working copy)
> @@ -487,8 +487,8 @@
>  }
>  #endif
>  
> -#ifdef CONFIG_AC3_DEMUXER
> -static int ac3_probe(AVProbeData *p)
> +#if (CONFIG_AC3_DEMUXER || CONFIG_EAC3_DEMUXER)

With #if you need to use ENABLE_* instead of CONFIG_*:
+#if (ENABLE_AC3_DEMUXER || ENABLE_EAC3_DEMUXER)

Also have a look at attached patch. It contains a slighly
simplified version of your raw.c probe functions.

Except that. Your patch is nice. Thanks.

Aurel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: eac3_raw.diff
Type: text/x-diff
Size: 2245 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20080901/903fb17d/attachment.diff>