[MPlayer-dev-eng] [PATCH] external liba52 support

[Diego Biurrun]

On Sat, Aug 30, 2008 at 01:00:01AM +0200, Dominik 'Rathann' Mierzejewski wrote:
> On Saturday, 30 August 2008 at 00:48, Diego Biurrun wrote:
> > On Fri, Aug 22, 2008 at 02:14:23AM +0200, Dominik 'Rathann' Mierzejewski wrote:
> > > Here are two patches which add external liba52-0.7.4 support.
> > 
> > This is very welcome, thanks.
> > 
> > > Patch1: conditionalizes enabling of some acceleration because
> > > liba52-0.7.4 doesn't support all that MPlayer's copy does.
> > > Patch2: the main patch, depends on Patch1
> > > 
> > > Tested with --disable-liba52-internal and without, seems to be working fine.
> > > 
> > > --- mplayer-export-2008-08-18/libmpcodecs/ad_liba52.c.accel	2008-08-22 01:26:25.000000000 +0200
> > > +++ mplayer-export-2008-08-18/libmpcodecs/ad_liba52.c	2008-08-22 01:25:33.000000000 +0200
> > > @@ -169,12 +169,18 @@ static int init(sh_audio_t *sh_audio)
> > > +#ifdef MM_ACCEL_X86_SSE
> > >    if(gCpuCaps.hasSSE) a52_accel|=MM_ACCEL_X86_SSE;
> > > +#endif
> > 
> >   if(gCpuCaps.hasSSE && MM_ACCEL_X86_SSE)
> >       a52_accel|=MM_ACCEL_X86_SSE;
> > 
> > or
> > 
> >   if(gCpuCaps.hasSSE && HAVE_SSE)
> >       a52_accel|=MM_ACCEL_X86_SSE;
> > 
> > ?
> 
> No. The last released a52dec doesn't have that define, hence the #ifdef.
> It won't simply compile otherwise.
> I could ask the package maintainer to switch to current SVN or poke
> upstream to make a release, though.

OK.  Is there a big difference between the last release and upstream
HEAD?

> > > --- mplayer-export-2008-08-18/configure.liba52	2008-08-19 00:52:31.000000000 +0200
> > > +++ mplayer-export-2008-08-18/configure	2008-08-22 02:09:52.000000000 +0200
> > > @@ -320,7 +320,8 @@ Codecs:
> > >    --disable-mp3lib          disable builtin mp3lib [enabled]
> > > -  --disable-liba52          disable builtin liba52 [enabled]
> > > +  --enable-liba52-external  enable external liba52 [autodetect] 
> > > +  --disable-liba52-internal disable builtin liba52 [autodetect] 
> > 
> > --enable-liba52-external should just be --enable-liba52, compare dvdread
> > and other libs where we support internal and external versions.
> 
> Hm. Then libfaad parts should be fixed the same way, I guess.

Fixed.  One more inconsistency removed.  I wonder how much more I will
have to fix...

Diego