[MPlayer-dev-eng] [PATCH] latm faad handling

[Dan Oscarsson]

On 2010-06-18 at 11:23 +0200 Diego Biurrun wrote:
> > It does:
> > 
> >  - libfaad2 already implements LATM header searching and verification
> >    so I have added so you can call faad2's init and have it return
> >    failure if LATM is not found.
> > 
> >  - in ad_faad.c: first look for LATM using faad2,
> >    if this fails and it is a mpeg-ts-stream with LATM in,
> >        probe further in audio stream for LATM (tests show
> >        that this is necessary),
> >    if no LATM is found, do like before, probe using aac_probe
> >    for a AAC stream header and call faad init.
> > 
> >  - demux_ts.c is enhanced to recognise the AAC LATM header tag
> >    so that ad_faad.c can know when to search for LATM.
> 
> Maybe you can split the patch then?

I could split out the patch to the demux_ts.c file, but that part is
just a few lines and fits with the rest, so I would prefer not to.

> 
> > --- libmpdemux/demux_ts.c.org	2010-06-12 17:25:59.080522959 +0200
> > +++ libmpdemux/demux_ts.c	2010-06-12 17:28:45.068522513 +0200
> > @@ -246,7 +247,7 @@
> >  
> >  
> > -#define IS_AUDIO(x) (((x) == AUDIO_MP2) || ((x) == AUDIO_A52) || ((x) == AUDIO_LPCM_BE) || ((x) == AUDIO_AAC) || ((x) == AUDIO_DTS) || ((x) == AUDIO_TRUEHD))
> > +#define IS_AUDIO(x) (((x) == AUDIO_MP2) || ((x) == AUDIO_A52) || ((x) == AUDIO_LPCM_BE) || ((x) == AUDIO_AAC) || ((x) == AUDIO_DTS) || ((x) == AUDIO_TRUEHD) || ((x) == AUDIO_AAC_LATM))
> 
> You could break this long line while you're at it..

I could, but the file contains a few long lines like that at that place,
so all should be broken at the same time, so maybe that should be
patched separately. I thought that was cosmetics.

   Dan