Skip to content

F
fdk-aac
Commit a00bd4cf authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by android code review
Browse files
Options

Merge "Don't try to shift more bits than the variable length"

parents d2854e2a 65745694
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
libAACenc/src/quantize.cpp
View file @ a00bd4cf
...@@ -127,7 +127,10 @@ static void FDKaacEnc_quantizeLines(INT gain, ...@@ -127,7 +127,10 @@ static void FDKaacEnc_quantizeLines(INT gain,
accu = fMultDiv2(FDKaacEnc_mTab_3_4[tabIndex],FDKaacEnc_quantTableE[totalShift&3]); accu = fMultDiv2(FDKaacEnc_mTab_3_4[tabIndex],FDKaacEnc_quantTableE[totalShift&3]);
totalShift = (16-4)-(3*(totalShift>>2)); totalShift = (16-4)-(3*(totalShift>>2));
FDK_ASSERT(totalShift >=0); /* MAX_QUANT_VIOLATION */ FDK_ASSERT(totalShift >=0); /* MAX_QUANT_VIOLATION */
if (totalShift < 32)
accu>>=totalShift; accu>>=totalShift;
else
accu = 0;
quaSpectrum[line] = (SHORT)(-((LONG)(k + accu) >> (DFRACT_BITS-1-16))); quaSpectrum[line] = (SHORT)(-((LONG)(k + accu) >> (DFRACT_BITS-1-16)));
} }
else if(accu > FL2FXCONST_DBL(0.0f)) else if(accu > FL2FXCONST_DBL(0.0f))
...@@ -140,7 +143,10 @@ static void FDKaacEnc_quantizeLines(INT gain, ...@@ -140,7 +143,10 @@ static void FDKaacEnc_quantizeLines(INT gain,
accu = fMultDiv2(FDKaacEnc_mTab_3_4[tabIndex],FDKaacEnc_quantTableE[totalShift&3]); accu = fMultDiv2(FDKaacEnc_mTab_3_4[tabIndex],FDKaacEnc_quantTableE[totalShift&3]);
totalShift = (16-4)-(3*(totalShift>>2)); totalShift = (16-4)-(3*(totalShift>>2));
FDK_ASSERT(totalShift >=0); /* MAX_QUANT_VIOLATION */ FDK_ASSERT(totalShift >=0); /* MAX_QUANT_VIOLATION */
if (totalShift < 32)
accu>>=totalShift; accu>>=totalShift;
else
accu = 0;
quaSpectrum[line] = (SHORT)((LONG)(k + accu) >> (DFRACT_BITS-1-16)); quaSpectrum[line] = (SHORT)((LONG)(k + accu) >> (DFRACT_BITS-1-16));
} }
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment