[Ffmpeg-cvslog] r7753 - trunk/libavcodec/cook.c

[Dominik 'Rathann' Mierzejewski]

On Monday, 29 January 2007 at 09:37, banan wrote:
> Author: banan
> Date: Mon Jan 29 09:37:22 2007
> New Revision: 7753
> 
> Modified:
>    trunk/libavcodec/cook.c
> 
> Log:
> decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
> 
> 
> Modified: trunk/libavcodec/cook.c
> ==============================================================================
> --- trunk/libavcodec/cook.c	(original)
> +++ trunk/libavcodec/cook.c	Mon Jan 29 09:37:22 2007
> @@ -50,6 +50,7 @@
>  #include "avcodec.h"
>  #include "bitstream.h"
>  #include "dsputil.h"
> +#include "common.h"
>  
>  #include "cookdata.h"
>  
> @@ -112,13 +113,12 @@
>      int                 mlt_size;       //modulated lapped transform size
>  
>      /* gain buffers */
> -    COOKgain*           gain_now_ptr;
> -    COOKgain*           gain_previous_ptr;
> -    COOKgain            gain_current;
> -    COOKgain            gain_now;
> -    COOKgain            gain_previous;
> -    COOKgain            gain_channel1[2];
> -    COOKgain            gain_channel2[2];
> +    COOKgain            *gain_ptr1[2];
> +    COOKgain            *gain_ptr2[2];
> +    COOKgain            gain_1;
> +    COOKgain            gain_2;
> +    COOKgain            gain_3;
> +    COOKgain            gain_4;

Would it not be cleaner to have:
> +    COOKgain            *gain_ptr[2][2];
> +    COOKgain            gain[4];

?

>  
>      /* VLC data */
>      int                 js_vlc_bits;
> @@ -136,15 +136,10 @@
>  
>      uint8_t*            decoded_bytes_buffer;
>      float               mono_mdct_output[2048] __attribute__((aligned(16)));
> -    float*              previous_buffer_ptr[2];
>      float               mono_previous_buffer1[1024];
>      float               mono_previous_buffer2[1024];
> -    float*              decode_buf_ptr[4];
> -    float*              decode_buf_ptr2[2];
>      float               decode_buffer_1[1024];
>      float               decode_buffer_2[1024];
> -    float               decode_buffer_3[1024];
> -    float               decode_buffer_4[1024];
>  } COOKContext;

Similarly:
> +    float               mono_previous_buffer[2][1024];
> +    float               decode_buffer[2][1024];

Regards,
R.

-- 
MPlayer developer and RPMs maintainer: http://mplayerhq.hu http://rpm.livna.org
There should be a science of discontent. People need hard times and
oppression to develop psychic muscles.
	-- from "Collected Sayings of Muad'Dib" by the Princess Irulan