virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

wmalossless: reset sample pointer for each subframe.

Browse Source 
Prevents overwrites when some subframes only encode some channels.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
This commit is contained in:
Ronald S. Bultje 2012-03-21 15:02:19 -07:00
parent 326f7a68bb
commit d462949974
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libavcodec/wmalosslessdec.c
View File

@ -96,10 +96,8 @@ typedef struct WmallDecodeCtx {
uint32_t frame_num; ///< current frame number (not used for decoding) uint32_t frame_num; ///< current frame number (not used for decoding)
GetBitContext gb; ///< bitstream reader context GetBitContext gb; ///< bitstream reader context
int buf_bit_size; ///< buffer size in bits int buf_bit_size; ///< buffer size in bits
int16_t *samples_16; ///< current samplebuffer pointer (16-bit) int16_t *samples_16[WMALL_MAX_CHANNELS]; ///< current samplebuffer pointer (16-bit)
int16_t *samples_16_end; ///< maximum samplebuffer pointer int32_t *samples_32[WMALL_MAX_CHANNELS]; ///< current samplebuffer pointer (24-bit)
int *samples_32; ///< current samplebuffer pointer (24-bit)
int *samples_32_end; ///< maximum samplebuffer pointer
uint8_t drc_gain; ///< gain for the DRC tool uint8_t drc_gain; ///< gain for the DRC tool
int8_t skip_frame; ///< skip output step int8_t skip_frame; ///< skip output step
int8_t parsed_all_subframes; ///< all subframes decoded? int8_t parsed_all_subframes; ///< all subframes decoded?
@ -961,13 +959,20 @@ static int decode_subframe(WmallDecodeCtx *s)
s->channel_residues[i][j] *= s->quant_stepsize; s->channel_residues[i][j] *= s->quant_stepsize;
/* Write to proper output buffer depending on bit-depth */ /* Write to proper output buffer depending on bit-depth */
for (i = 0; i < subframe_len; i++) for (i = 0; i < s->channels_for_cur_subframe; i++) {
for (j = 0; j < s->num_channels; j++) { int c = s->channel_indexes_for_cur_subframe[i];
if (s->bits_per_sample == 16) int subframe_len = s->channel[c].subframe_len[s->channel[c].cur_subframe];
*s->samples_16++ = (int16_t) s->channel_residues[j][i];
else for (j = 0; j < subframe_len; j++) {
*s->samples_32++ = s->channel_residues[j][i]; if (s->bits_per_sample == 16) {
*s->samples_16[c] = (int16_t) s->channel_residues[c][j];
s->samples_16[c] += s->num_channels;
} else {
*s->samples_32[c] = s->channel_residues[c][j];
s->samples_32[c] += s->num_channels;
}
} }
}
/* handled one subframe */ /* handled one subframe */
for (i = 0; i < s->channels_for_cur_subframe; i++) { for (i = 0; i < s->channels_for_cur_subframe; i++) {
@ -1000,8 +1005,10 @@ static int decode_frame(WmallDecodeCtx *s)
s->packet_loss = 1; s->packet_loss = 1;
return ret; return ret;
} }
s->samples_16 = (int16_t *)s->frame.data[0]; for (i = 0; i < s->num_channels; i++) {
s->samples_32 = (int32_t *)s->frame.data[0]; s->samples_16[i] = (int16_t *)s->frame.data[0] + i;
s->samples_32[i] = (int32_t *)s->frame.data[0] + i;
}
/* get frame length */ /* get frame length */
if (s->len_prefix) if (s->len_prefix)