virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

wmall: fix reconstructing audio with uncoded channels

Browse Source
This commit is contained in:
Kostya Shishkov
2012-05-01 16:09:51 +02:00
parent c8370e6e35
commit 0e23b50821
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/wmalosslessdec.c
View File

@@ -654,8 +654,6 @@ static void mclms_predict(WmallDecodeCtx *s, int icoef, int *pred)
int num_channels = s->num_channels; int num_channels = s->num_channels;
for (ich = 0; ich < num_channels; ich++) { for (ich = 0; ich < num_channels; ich++) {
if (!s->is_channel_coded[ich])
continue;
pred[ich] = 0; pred[ich] = 0;
for (i = 0; i < order * num_channels; i++) for (i = 0; i < order * num_channels; i++)
pred[ich] += s->mclms_prevvalues[i + s->mclms_recent] * pred[ich] += s->mclms_prevvalues[i + s->mclms_recent] *
@@ -789,7 +787,7 @@ static void revert_inter_ch_decorr(WmallDecodeCtx *s, int tile_size)
{ {
if (s->num_channels != 2) if (s->num_channels != 2)
return; return;
else if (s->is_channel_coded[0] && s->is_channel_coded[1]) { else if (s->is_channel_coded[0] || s->is_channel_coded[1]) {
int icoef; int icoef;
for (icoef = 0; icoef < tile_size; icoef++) { for (icoef = 0; icoef < tile_size; icoef++) {
s->channel_residues[0][icoef] -= s->channel_residues[1][icoef] >> 1; s->channel_residues[0][icoef] -= s->channel_residues[1][icoef] >> 1;
@@ -955,6 +953,8 @@ static int decode_subframe(WmallDecodeCtx *s)
else else
use_normal_update_speed(s, i); use_normal_update_speed(s, i);
revert_cdlms(s, i, 0, subframe_len); revert_cdlms(s, i, 0, subframe_len);
} else {
memset(s->channel_residues[i], 0, sizeof(**s->channel_residues) * subframe_len);
} }
} }
if (s->do_mclms) if (s->do_mclms)