virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Support DTS-ES extension (XCh) in dca: move subband_samples into context structure

Browse Source 
Patch by Nick Brereton, nick at nbrereton dot net

Originally committed as revision 23694 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Nick Brereton 2010-06-22 08:32:01 +00:00 committed by Martin Storsjö
parent d99659f0b3
commit 77b4b7c383
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/dca.c
View File

@ -45,6 +45,7 @@
#define DCA_SUBBANDS (32) #define DCA_SUBBANDS (32)
#define DCA_ABITS_MAX (32) /* Should be 28 */ #define DCA_ABITS_MAX (32) /* Should be 28 */
#define DCA_SUBSUBFRAMES_MAX (4) #define DCA_SUBSUBFRAMES_MAX (4)
#define DCA_BLOCKS_MAX (16)
#define DCA_LFE_MAX (3) #define DCA_LFE_MAX (3)
enum DCAMode { enum DCAMode {
@ -237,6 +238,7 @@ typedef struct {
float add_bias; ///< output bias float add_bias; ///< output bias
float scale_bias; ///< output scale float scale_bias; ///< output scale
DECLARE_ALIGNED(16, float, subband_samples)[DCA_BLOCKS_MAX][DCA_PRIM_CHANNELS_MAX][DCA_SUBBANDS][8];
DECLARE_ALIGNED(16, float, samples)[1536]; /* 6 * 256 = 1536, might only need 5 */ DECLARE_ALIGNED(16, float, samples)[1536]; /* 6 * 256 = 1536, might only need 5 */
const float *samples_chanptr[6]; const float *samples_chanptr[6];
@ -907,7 +909,7 @@ static int decode_blockcode(int code, int levels, int *values)
static const uint8_t abits_sizes[7] = { 7, 10, 12, 13, 15, 17, 19 }; static const uint8_t abits_sizes[7] = { 7, 10, 12, 13, 15, 17, 19 };
static const uint8_t abits_levels[7] = { 3, 5, 7, 9, 13, 17, 25 }; static const uint8_t abits_levels[7] = { 3, 5, 7, 9, 13, 17, 25 };
static int dca_subsubframe(DCAContext * s) static int dca_subsubframe(DCAContext * s, int block_index)
{ {
int k, l; int k, l;
int subsubframe = s->current_subsubframe; int subsubframe = s->current_subsubframe;
@ -915,7 +917,7 @@ static int dca_subsubframe(DCAContext * s)
const float *quant_step_table; const float *quant_step_table;
/* FIXME */ /* FIXME */
LOCAL_ALIGNED_16(float, subband_samples, [DCA_PRIM_CHANNELS_MAX], [DCA_SUBBANDS][8]); float (*subband_samples)[DCA_SUBBANDS][8] = s->subband_samples[block_index];
LOCAL_ALIGNED_16(int, block, [8]); LOCAL_ALIGNED_16(int, block, [8]);
/* /*
@ -1107,7 +1109,7 @@ static int dca_subframe_footer(DCAContext * s)
* @param s pointer to the DCAContext * @param s pointer to the DCAContext
*/ */
static int dca_decode_block(DCAContext * s) static int dca_decode_block(DCAContext * s, int block_index)
{ {
/* Sanity check */ /* Sanity check */
@ -1130,7 +1132,7 @@ static int dca_decode_block(DCAContext * s)
#ifdef TRACE #ifdef TRACE
av_log(s->avctx, AV_LOG_DEBUG, "DSYNC dca_subsubframe\n"); av_log(s->avctx, AV_LOG_DEBUG, "DSYNC dca_subsubframe\n");
#endif #endif
if (dca_subsubframe(s)) if (dca_subsubframe(s, block_index))
return -1; return -1;
/* Update state */ /* Update state */
@ -1263,7 +1265,7 @@ static int dca_decode_frame(AVCodecContext * avctx,
return -1; return -1;
*data_size = 256 / 8 * s->sample_blocks * sizeof(int16_t) * channels; *data_size = 256 / 8 * s->sample_blocks * sizeof(int16_t) * channels;
for (i = 0; i < (s->sample_blocks / 8); i++) { for (i = 0; i < (s->sample_blocks / 8); i++) {
dca_decode_block(s); dca_decode_block(s, i);
s->dsp.float_to_int16_interleave(samples, s->samples_chanptr, 256, channels); s->dsp.float_to_int16_interleave(samples, s->samples_chanptr, 256, channels);
samples += 256 * channels; samples += 256 * channels;
} }