[FFmpeg-devel] [PATCH] Fix CCE decoding and cleanup

[Alex Converse]

On Thu, Sep 18, 2008 at 5:45 PM, Michael Niedermayer <michaelni at gmx.at> wrote:
>
> On Thu, Sep 18, 2008 at 05:19:39PM -0400, Alex Converse wrote:
> > Hi,
> >
> > The first patch fixes CCE decoding. The second patch cleans up some CCE
> > related documentation and variable names.
>
> [...]
>
> > @@ -1001,12 +1001,13 @@
> >                          int t = get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60;
> >                          if (t) {
> >                              int s = 1;
> > +                            int g;
> > +                            g = gain += t;
> >                              if (sign) {
> > -                                s  -= 2 * (t & 0x1);
> > -                                t >>= 1;
> > +                                s  -= 2 * (g & 0x1);
> > +                                g >>= 1;
> >                              }
> > -                            gain += t;
> > -                            gain_cache = pow(scale, gain) * s;
> > +                            gain_cache = pow(scale, -g) * s;
> >                          }
> >                      }
>
>    int t = get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60;
>    if (t) {
>        int s = 1;
>        t = (gain += t);
>        if (sign) {
>            s  -= 2 * (t & 1);
>            t >>= 1;
>        }
>        gain_cache = pow(scale, -t) * s;
>    }
> }

Fixed.

[...]

--Alex Converse
-------------- next part --------------
A non-text attachment was scrubbed...
Name: aac-cce-conform-v2.diff
Type: text/x-diff
Size: 5363 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20080918/c70d2572/attachment.diff>