RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavr: fix mixing matrix reduction when normalization is disabled 

In some cases when an input contributes fully to the corresponding
output, other inputs may also contribute to the same output. This is the
case, for example, for the default 5.1 to stereo downmix matrix without
normalization.
This commit is contained in:
Justin Ruggles 2013-01-27 14:47:54 -05:00
parent 600b4c973f
commit 157542ebc1
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavresample/audio_mix.c
View File

@ -572,11 +572,22 @@ static void reduce_matrix(AudioMix *am, const double *matrix, int stride)
int skip = 1;
for (o = 0; o < am->out_channels; o++) {
int i0;
if ((o != i && matrix[o * stride + i] != 0.0) ||
(o == i && matrix[o * stride + i] != 1.0)) {
skip = 0;
break;
}
/* if the input contributes fully to the output, also check that no
other inputs contribute to this output */
if (o == i) {
for (i0 = 0; i0 < am->in_channels; i0++) {
if (i0 != i && matrix[o * stride + i0] != 0.0) {
skip = 0;
break;
}
}
}
}
if (skip) {
am->input_skip[i] = 1;