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

aacpsy: remove dead code

Browse Source 
This code wasn't removed when the functionality was moved inside
aacenc.c with commit 8005b6de4f

Fixes CID1361962

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
This commit is contained in:
Rostislav Pehlivanov
2016-05-31 01:05:58 +01:00
parent 0d0b9397d6
commit a1953d4cec
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/aacpsy.c
View File

@@ -885,7 +885,6 @@ static FFPsyWindowInfo psy_lame_window(FFPsyContext *ctx, const float *audio,
int grouping = 0; int grouping = 0;
int uselongblock = 1; int uselongblock = 1;
int attacks[AAC_NUM_BLOCKS_SHORT + 1] = { 0 }; int attacks[AAC_NUM_BLOCKS_SHORT + 1] = { 0 };
float clippings[AAC_NUM_BLOCKS_SHORT];
int i; int i;
FFPsyWindowInfo wi = { { 0 } }; FFPsyWindowInfo wi = { { 0 } };
@@ -977,7 +976,6 @@ static FFPsyWindowInfo psy_lame_window(FFPsyContext *ctx, const float *audio,
wi.window_type[1] = prev_type; wi.window_type[1] = prev_type;
if (wi.window_type[0] != EIGHT_SHORT_SEQUENCE) { if (wi.window_type[0] != EIGHT_SHORT_SEQUENCE) {
float clipping = 0.0f;
wi.num_windows = 1; wi.num_windows = 1;
wi.grouping[0] = 1; wi.grouping[0] = 1;
@@ -986,9 +984,6 @@ static FFPsyWindowInfo psy_lame_window(FFPsyContext *ctx, const float *audio,
else else
wi.window_shape = 1; wi.window_shape = 1;
for (i = 0; i < 8; i++)
clipping = FFMAX(clipping, clippings[i]);
wi.clipping[0] = clipping;
} else { } else {
int lastgrp = 0; int lastgrp = 0;
@@ -999,15 +994,6 @@ static FFPsyWindowInfo psy_lame_window(FFPsyContext *ctx, const float *audio,
lastgrp = i; lastgrp = i;
wi.grouping[lastgrp]++; wi.grouping[lastgrp]++;
} }
for (i = 0; i < 8; i += wi.grouping[i]) {
int w;
float clipping = 0.0f;
for (w = 0; w < wi.grouping[i]; w++)
clipping = FFMAX(clipping, clippings[i+w]);
for (w = 0; w < wi.grouping[i]; w++)
wi.clipping[i+w] = clipping;
}
} }
/* Determine grouping, based on the location of the first attack, and save for /* Determine grouping, based on the location of the first attack, and save for