RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-11 17:55:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'a9ba59591ed509fb7e6decfde8da4cbfd4ddf4b8'

Browse Source 
* commit 'a9ba59591ed509fb7e6decfde8da4cbfd4ddf4b8':
  ac3dsp: Add some special-case handling for the C downmix function

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-22 11:30:53 +01:00
commit fd5e1d132b
1 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libavcodec/ac3dsp.c
View File

@ -216,9 +216,46 @@ static void ac3_sum_square_butterfly_float_c(float sum[4],
static void ac3_downmix_c(float **samples, float **matrix, static void ac3_downmix_c(float **samples, float **matrix,
int out_ch, int in_ch, int len) int out_ch, int in_ch, int len)
{ {
int **matrix_cmp = (int **)matrix;
int i, j; int i, j;
float v0, v1; float v0, v1;
if (out_ch == 2) {
if (in_ch == 5 && out_ch == 2 &&
!(matrix_cmp[1][0] | matrix_cmp[0][2] |
matrix_cmp[1][3] | matrix_cmp[0][4] |
(matrix_cmp[0][1] ^ matrix_cmp[1][1]) |
(matrix_cmp[0][0] ^ matrix_cmp[1][2]))) {
float front_mix = matrix[0][0];
float center_mix = matrix[0][1];
float surround_mix = matrix[0][3];
for (i = 0; i < len; i++) {
v0 = samples[0][i] * front_mix +
samples[1][i] * center_mix +
samples[3][i] * surround_mix;
v1 = samples[1][i] * center_mix +
samples[2][i] * front_mix +
samples[4][i] * surround_mix;
samples[0][i] = v0;
samples[1][i] = v1;
}
} else if (in_ch == 5 && out_ch == 1 &&
matrix_cmp[0][0] == matrix_cmp[0][2] &&
matrix_cmp[0][3] == matrix_cmp[0][4]) {
float front_mix = matrix[0][0];
float center_mix = matrix[0][1];
float surround_mix = matrix[0][3];
for (i = 0; i < len; i++) {
samples[0][i] = samples[0][i] * front_mix +
samples[1][i] * center_mix +
samples[2][i] * front_mix +
samples[3][i] * surround_mix +
samples[4][i] * surround_mix;
}
} else if (out_ch == 2) {
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
v0 = v1 = 0.0f; v0 = v1 = 0.0f;
for (j = 0; j < in_ch; j++) { for (j = 0; j < in_ch; j++) {