[FFmpeg-soc] [soc]: r2505 - aac/aac.c

[Robert Swain]

2008/6/21 Michael Niedermayer <michaelni at gmx.at>:
> On Sat, Jun 21, 2008 at 04:53:09PM +0100, Robert Swain wrote:
>> 2008/6/21 Michael Niedermayer <michaelni at gmx.at>:
>> > On Sat, Jun 21, 2008 at 03:49:06PM +0200, superdump wrote:
>> >> Author: superdump
>> >> Date: Sat Jun 21 15:49:05 2008
>> >> New Revision: 2505
>> >>
>> >> Log:
>> >> Make VLC tables static and use INIT_VLC_USE_STATIC for VLC initialisation
>> >>
>> >>
>> >> Modified:
>> >>    aac/aac.c
>> >>
>> >> Modified: aac/aac.c
>> >> ==============================================================================
>> >> --- aac/aac.c (original)
>> >> +++ aac/aac.c Sat Jun 21 15:49:05 2008
>> >> @@ -65,6 +65,9 @@ DECLARE_ALIGNED_16(static float, kbd_sho
>> >>  DECLARE_ALIGNED_16(static float, sine_long_1024[1024]);
>> >>  DECLARE_ALIGNED_16(static float, sine_short_128[128]);
>> >>
>> >> +static VLC mainvlc;
>> >> +static VLC books[11];
>> >> +
>> >>  /**
>> >>   * Audio Object Types
>> >>   */
>> >> @@ -365,8 +368,6 @@ typedef struct {
>> >>       * @defgroup tables   Computed / setup during initialization
>> >>       * @{
>> >>       */
>> >> -    VLC mainvlc;
>> >> -    VLC books[11];
>> >>      MDCTContext mdct;
>> >>      MDCTContext mdct_small;
>> >>      MDCTContext *mdct_ltp;
>> >> @@ -813,10 +814,10 @@ static int aac_decode_init(AVCodecContex
>> >>          int dim = (i >= 4 ? 2 : 4);
>> >>          int mod = mod_cb[i], off = off_cb[i], index = 0;
>> >>
>> >> -        if(init_vlc(&ac->books[i], 6, values,
>> >> +        if(!books[i].table && init_vlc(&books[i], 6, values,
>> >>                  tmp[i].a_bits, a_bits_size, a_bits_size,
>> >>                  tmp[i].a_code, a_code_size, a_code_size,
>> >> -                0) < 0)
>> >> +                INIT_VLC_USE_STATIC) < 0)
>> >>              return -1;
>> >
>> > NO!!!
>> >
>> > INIT_VLC_STATIC or INIT_VLC_USE_NEW_STATIC
>> > NOT INIT_VLC_USE_STATIC
>> >
>> > RTFS:
>> > #define INIT_VLC_USE_STATIC 1 ///< VERY strongly deprecated and forbidden
>>
>> There's no need to shout.
>
> sorry

No problem.

>> This was a fairly recent change you made,
>
> well, it was just discussed yesterday on ffmpeg-dev and someone posted
> a patch to move some code to the new system so i though "no help please
> dont add more code using the old broken API"

Fair enough. The subject doesn't contain init_vlc or anything like
that but I found the thread.

I'm trying to figure out how to calculate the static size and I'm
probably being stupid. I would have thought it wouldn't be difficult
but I'm not seeing anything obvious at the moment. :/

Rob