fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FDK sanitization fixes 

Bug: 110641440
Bug: 109936783
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc

Prevent bit buffer counter overflow.

While long-term test we discovered a bit counter overflow in the bit buffer.
The bit buffer state was only used by HCR and RVLC tool and can easily be substituted with FDKgetValidBits() call.
The following patch completely removes the bit counter and all its obsolete functions.

Change-Id: Icee0519d26a2aa62367d2dece59cd3d60ffcade7

Fix call to function sbrDecoder_Header() through pointer to incorrect function type.

While testing FDK in Android P DP3 x86 64bit emulator we observed a runtime error.
The function parameter of the callback didn't use a typeless pointer.
Following patch contains a revised sbr decoder callback function with explicit data type cast to be inline with all other callbacks in FDK.

Change-Id: Id224de22beaf2eb9631babd838c4c3ceae0a801e

Fix huffman decoder escape sequence length limitation.

Change-Id: Ib05cc2c065739c27b9720a24f90d0ce4d15bf601

Prevent overflow in MPEG-D DRC _setSelectionDataInfo().

Change-Id: I3b90ef7a5168e20766a2574d57d81bb39d2a5fb9

Add sanity check for allowed LPD sampling rate.

Change-Id: I0702024adc07ed463db795dd48f4efd3de1d7896

Always check whether given channel config is supported.

Change-Id: I169161dd31bc624f2cab6be2b4c6518946ed32ba

Unsigned Integer Overflow in aacDecoder_DecodeFrame().

Change-Id: I617dd545f9ea0aca5a5e7d214bbc35f089bc355d

Unsigned Integer Overflow in SpatialDecParseSpecificConfigHeader().

Change-Id: I5994a55f993835fa511ff61a337726b3e51aed5d

Unsigned Integer Overflows in mpegSurroundDecoder_Parse().

Change-Id: I3714e88d7a9a866297bb2e93571804665a97773f

Unsigned Integer Overflow in transportDec_AdjustEndOfAccessUnit().

Change-Id: Ie4924460d30ea4ef76917704ded809d04db78993

Unsigned Integer Overflow in transportDec_readHeader().

Change-Id: I0beedab38175fc57e5bd9eb5700a3850ef2bebf7

UBSAN overflow in FFT

An overflow in the fft was observed for certain configurations. The root cause was in the scaling of the fft input data in dct_IV and dst_IV.
The following patch revises the scaling in dct and removes the unused arm implementation.

Change-Id: Idc9c44a9755b8151d5c7d8107696f43ac592413b
This commit is contained in:
Fraunhofer IIS FDK 2018-06-08 18:03:16 +02:00 committed by Jean-Michel Trivi
parent e2fc820df9
commit 62623d8d79
22 changed files with 186 additions and 827 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
libAACdec/src/aacdec_hcr.cpp
View File

@ -134,17 +134,18 @@ static void DeriveNumberOfExtendedSortedSectionsInSets(
USHORT *pNumExtendedSortedSectionsInSets,
int numExtendedSortedSectionsInSetsIdx);
static INT DecodeEscapeSequence(HANDLE_FDK_BITSTREAM bs, INT quantSpecCoef,
INT *pLeftStartOfSegment,
static INT DecodeEscapeSequence(HANDLE_FDK_BITSTREAM bs, const INT bsAnchor,
INT quantSpecCoef, INT *pLeftStartOfSegment,
SCHAR *pRemainingBitsInSegment,
int *pNumDecodedBits);
static int DecodePCW_Sign(HANDLE_FDK_BITSTREAM bs, UINT codebookDim,
const SCHAR *pQuantVal, FIXP_DBL *pQuantSpecCoef,
int *quantSpecCoefIdx, INT *pLeftStartOfSegment,
static int DecodePCW_Sign(HANDLE_FDK_BITSTREAM bs, const INT bsAnchor,
UINT codebookDim, const SCHAR *pQuantVal,
FIXP_DBL *pQuantSpecCoef, int *quantSpecCoefIdx,
INT *pLeftStartOfSegment,
SCHAR *pRemainingBitsInSegment, int *pNumDecodedBits);
static const SCHAR *DecodePCW_Body(HANDLE_FDK_BITSTREAM bs,
static const SCHAR *DecodePCW_Body(HANDLE_FDK_BITSTREAM bs, const INT bsAnchor,
const UINT *pCurrentTree,
const SCHAR *pQuantValBase,
INT *pLeftStartOfSegment,
@ -291,7 +292,7 @@ UINT HcrInit(H_HCR_INFO pHcr, CAacDecoderChannelInfo *pAacDecoderChannelInfo,
SPEC_LONG(pAacDecoderChannelInfo->pSpectralCoefficient);
FDKsyncCache(bs);
pHcr->decInOut.bitstreamIndex = FDKgetBitCnt(bs);
pHcr->decInOut.bitstreamAnchor = (INT)FDKgetValidBits(bs);
if (!IsLongBlock(&pAacDecoderChannelInfo->icsInfo)) /* short block */
{
@ -436,7 +437,7 @@ UINT HcrDecoder(H_HCR_INFO pHcr, CAacDecoderChannelInfo *pAacDecoderChannelInfo,
int pTmp5;
INT bitCntOffst;
INT saveBitCnt = FDKgetBitCnt(bs); /* save bitstream position */
INT saveBitCnt = (INT)FDKgetValidBits(bs); /* save bitstream position */
HcrCalcNumCodeword(pHcr);
@ -487,7 +488,7 @@ UINT HcrDecoder(H_HCR_INFO pHcr, CAacDecoderChannelInfo *pAacDecoderChannelInfo,
pSamplingRateInfo);
/* restore bitstream position */
bitCntOffst = saveBitCnt - FDKgetBitCnt(bs);
bitCntOffst = (INT)FDKgetValidBits(bs) - saveBitCnt;
if (bitCntOffst) {
FDKpushBiDirectional(bs, bitCntOffst);
}
@ -815,7 +816,6 @@ static void HcrPrepareSegmentationGrid(H_HCR_INFO pHcr) {
INT *pLeftStartOfSegment = pHcr->segmentInfo.pLeftStartOfSegment;
INT *pRightStartOfSegment = pHcr->segmentInfo.pRightStartOfSegment;
SCHAR *pRemainingBitsInSegment = pHcr->segmentInfo.pRemainingBitsInSegment;
INT bitstreamIndex = pHcr->decInOut.bitstreamIndex;
const UCHAR *pMaxCwLength = aMaxCwLen;
for (i = numSortedSection; i != 0; i--) {
@ -825,7 +825,7 @@ static void HcrPrepareSegmentationGrid(H_HCR_INFO pHcr) {
for (j = *pNumSortedCodewordInSection; j != 0; j--) {
/* width allows a new segment */
intermediateResult = bitstreamIndex + segmentStart;
intermediateResult = segmentStart;
if ((segmentStart + segmentWidth) <= lengthOfReorderedSpectralData) {
/* store segment start, segment length and increment the number of
* segments */
@ -841,12 +841,11 @@ static void HcrPrepareSegmentationGrid(H_HCR_INFO pHcr) {
pLeftStartOfSegment--;
pRightStartOfSegment--;
pRemainingBitsInSegment--;
segmentStart = *pLeftStartOfSegment - bitstreamIndex;
segmentStart = *pLeftStartOfSegment;
lastSegmentWidth = lengthOfReorderedSpectralData - segmentStart;
*pRemainingBitsInSegment = lastSegmentWidth;
*pRightStartOfSegment =
bitstreamIndex + segmentStart + lastSegmentWidth - 1;
*pRightStartOfSegment = segmentStart + lastSegmentWidth - 1;
endFlag = 1;
break;
}
@ -1071,9 +1070,9 @@ static void DecodePCWs(HANDLE_FDK_BITSTREAM bs, H_HCR_INFO pHcr) {
numDecodedBits = 0;
/* decode PCW_BODY */
pQuantVal =
DecodePCW_Body(bs, pCurrentTree, pQuantValBase, pLeftStartOfSegment,
pRemainingBitsInSegment, &numDecodedBits);
pQuantVal = DecodePCW_Body(
bs, pHcr->decInOut.bitstreamAnchor, pCurrentTree, pQuantValBase,
pLeftStartOfSegment, pRemainingBitsInSegment, &numDecodedBits);
/* result is written out here because NO sign bits follow the body */
for (i = dimension; i != 0; i--) {
@ -1115,14 +1114,14 @@ static void DecodePCWs(HANDLE_FDK_BITSTREAM bs, H_HCR_INFO pHcr) {
int err;
numDecodedBits = 0;
pQuantVal =
DecodePCW_Body(bs, pCurrentTree, pQuantValBase, pLeftStartOfSegment,
pRemainingBitsInSegment, &numDecodedBits);
pQuantVal = DecodePCW_Body(
bs, pHcr->decInOut.bitstreamAnchor, pCurrentTree, pQuantValBase,
pLeftStartOfSegment, pRemainingBitsInSegment, &numDecodedBits);
err = DecodePCW_Sign(
bs, dimension, pQuantVal, pQuantizedSpectralCoefficients,
&quantizedSpectralCoefficientsIdx, pLeftStartOfSegment,
pRemainingBitsInSegment, &numDecodedBits);
bs, pHcr->decInOut.bitstreamAnchor, dimension, pQuantVal,
pQuantizedSpectralCoefficients, &quantizedSpectralCoefficientsIdx,
pLeftStartOfSegment, pRemainingBitsInSegment, &numDecodedBits);
if (err != 0) {
return;
}
@ -1157,14 +1156,14 @@ static void DecodePCWs(HANDLE_FDK_BITSTREAM bs, H_HCR_INFO pHcr) {
numDecodedBits = 0;
/* decode PCW_BODY */
pQuantVal =
DecodePCW_Body(bs, pCurrentTree, pQuantValBase, pLeftStartOfSegment,
pRemainingBitsInSegment, &numDecodedBits);
pQuantVal = DecodePCW_Body(
bs, pHcr->decInOut.bitstreamAnchor, pCurrentTree, pQuantValBase,
pLeftStartOfSegment, pRemainingBitsInSegment, &numDecodedBits);
err = DecodePCW_Sign(
bs, dimension, pQuantVal, pQuantizedSpectralCoefficients,
&quantizedSpectralCoefficientsIdx, pLeftStartOfSegment,
pRemainingBitsInSegment, &numDecodedBits);
bs, pHcr->decInOut.bitstreamAnchor, dimension, pQuantVal,
pQuantizedSpectralCoefficients, &quantizedSpectralCoefficientsIdx,
pLeftStartOfSegment, pRemainingBitsInSegment, &numDecodedBits);
if (err != 0) {
return;
}
@ -1177,7 +1176,7 @@ static void DecodePCWs(HANDLE_FDK_BITSTREAM bs, H_HCR_INFO pHcr) {
(FIXP_DBL)ESCAPE_VALUE) {
pQuantizedSpectralCoefficients[quantizedSpectralCoefficientsIdx] =
(FIXP_DBL)DecodeEscapeSequence(
bs,
bs, pHcr->decInOut.bitstreamAnchor,
pQuantizedSpectralCoefficients
[quantizedSpectralCoefficientsIdx],
pLeftStartOfSegment, pRemainingBitsInSegment,
@ -1193,7 +1192,7 @@ static void DecodePCWs(HANDLE_FDK_BITSTREAM bs, H_HCR_INFO pHcr) {
(FIXP_DBL)ESCAPE_VALUE) {
pQuantizedSpectralCoefficients[quantizedSpectralCoefficientsIdx] =
(FIXP_DBL)DecodeEscapeSequence(
bs,
bs, pHcr->decInOut.bitstreamAnchor,
pQuantizedSpectralCoefficients
[quantizedSpectralCoefficientsIdx],
pLeftStartOfSegment, pRemainingBitsInSegment,
@ -1331,7 +1330,7 @@ void CarryBitToBranchValue(UCHAR carryBit, UINT treeNode, UINT *branchValue,
spectral coefficients
--------------------------------------------------------------------------------------------
*/
static const SCHAR *DecodePCW_Body(HANDLE_FDK_BITSTREAM bs,
static const SCHAR *DecodePCW_Body(HANDLE_FDK_BITSTREAM bs, const INT bsAnchor,
const UINT *pCurrentTree,
const SCHAR *pQuantValBase,
INT *pLeftStartOfSegment,
@ -1349,7 +1348,7 @@ static const SCHAR *DecodePCW_Body(HANDLE_FDK_BITSTREAM bs,
/* decode whole PCW-codeword-body */
while (1) {
carryBit = HcrGetABitFromBitstream(bs, pLeftStartOfSegment,
carryBit = HcrGetABitFromBitstream(bs, bsAnchor, pLeftStartOfSegment,
pLeftStartOfSegment, /* dummy */
FROM_LEFT_TO_RIGHT);
*pRemainingBitsInSegment -= 1;
@ -1384,8 +1383,8 @@ value == 16, a escapeSequence is decoded in two steps:
--------------------------------------------------------------------------------------------
*/
static INT DecodeEscapeSequence(HANDLE_FDK_BITSTREAM bs, INT quantSpecCoef,
INT *pLeftStartOfSegment,
static INT DecodeEscapeSequence(HANDLE_FDK_BITSTREAM bs, const INT bsAnchor,
INT quantSpecCoef, INT *pLeftStartOfSegment,
SCHAR *pRemainingBitsInSegment,
int *pNumDecodedBits) {
UINT i;
@ -1396,7 +1395,7 @@ static INT DecodeEscapeSequence(HANDLE_FDK_BITSTREAM bs, INT quantSpecCoef,
/* decode escape prefix */
while (1) {
carryBit = HcrGetABitFromBitstream(bs, pLeftStartOfSegment,
carryBit = HcrGetABitFromBitstream(bs, bsAnchor, pLeftStartOfSegment,
pLeftStartOfSegment, /* dummy */
FROM_LEFT_TO_RIGHT);
*pRemainingBitsInSegment -= 1;
@ -1412,7 +1411,7 @@ static INT DecodeEscapeSequence(HANDLE_FDK_BITSTREAM bs, INT quantSpecCoef,
/* decode escape word */
for (i = escapeOnesCounter; i != 0; i--) {
carryBit = HcrGetABitFromBitstream(bs, pLeftStartOfSegment,
carryBit = HcrGetABitFromBitstream(bs, bsAnchor, pLeftStartOfSegment,
pLeftStartOfSegment, /* dummy */
FROM_LEFT_TO_RIGHT);
*pRemainingBitsInSegment -= 1;
@ -1441,9 +1440,10 @@ the last of eight function of HCR)
line)
--------------------------------------------------------------------------------------------
*/
static int DecodePCW_Sign(HANDLE_FDK_BITSTREAM bs, UINT codebookDim,
const SCHAR *pQuantVal, FIXP_DBL *pQuantSpecCoef,
int *quantSpecCoefIdx, INT *pLeftStartOfSegment,
static int DecodePCW_Sign(HANDLE_FDK_BITSTREAM bs, const INT bsAnchor,
UINT codebookDim, const SCHAR *pQuantVal,
FIXP_DBL *pQuantSpecCoef, int *quantSpecCoefIdx,
INT *pLeftStartOfSegment,
SCHAR *pRemainingBitsInSegment,
int *pNumDecodedBits) {
UINT i;
@ -1453,7 +1453,7 @@ static int DecodePCW_Sign(HANDLE_FDK_BITSTREAM bs, UINT codebookDim,
for (i = codebookDim; i != 0; i--) {
quantSpecCoef = *pQuantVal++;
if (quantSpecCoef != 0) {
carryBit = HcrGetABitFromBitstream(bs, pLeftStartOfSegment,
carryBit = HcrGetABitFromBitstream(bs, bsAnchor, pLeftStartOfSegment,
pLeftStartOfSegment, /* dummy */
FROM_LEFT_TO_RIGHT);
*pRemainingBitsInSegment -= 1;

7
libAACdec/src/aacdec_hcr_bit.cpp
View File

@ -132,13 +132,14 @@ read direction. It is called very often, therefore it makes sense to inline it
return: - bit from bitstream
--------------------------------------------------------------------------------------------
*/
UINT HcrGetABitFromBitstream(HANDLE_FDK_BITSTREAM bs, INT *pLeftStartOfSegment,
UINT HcrGetABitFromBitstream(HANDLE_FDK_BITSTREAM bs, const INT bsAnchor,
INT *pLeftStartOfSegment,
INT *pRightStartOfSegment, UCHAR readDirection) {
UINT bit;
INT readBitOffset;
if (readDirection == FROM_LEFT_TO_RIGHT) {
readBitOffset = *pLeftStartOfSegment - FDKgetBitCnt(bs);
readBitOffset = (INT)FDKgetValidBits(bs) - bsAnchor + *pLeftStartOfSegment;
if (readBitOffset) {
FDKpushBiDirectional(bs, readBitOffset);
}
@ -147,7 +148,7 @@ UINT HcrGetABitFromBitstream(HANDLE_FDK_BITSTREAM bs, INT *pLeftStartOfSegment,
*pLeftStartOfSegment += 1;
} else {
readBitOffset = *pRightStartOfSegment - FDKgetBitCnt(bs);
readBitOffset = (INT)FDKgetValidBits(bs) - bsAnchor + *pRightStartOfSegment;
if (readBitOffset) {
FDKpushBiDirectional(bs, readBitOffset);
}

3
libAACdec/src/aacdec_hcr_bit.h
View File

@ -107,7 +107,8 @@ amm-info@iis.fraunhofer.de
UCHAR ToggleReadDirection(UCHAR readDirection);
UINT HcrGetABitFromBitstream(HANDLE_FDK_BITSTREAM bs, INT *pLeftStartOfSegment,
UINT HcrGetABitFromBitstream(HANDLE_FDK_BITSTREAM bs, const INT bsAnchor,
INT *pLeftStartOfSegment,
INT *pRightStartOfSegment, UCHAR readDirection);
#endif /* AACDEC_HCR_BIT_H */

2
libAACdec/src/aacdec_hcr_types.h
View File

@ -350,7 +350,7 @@ typedef struct {
SHORT lengthOfReorderedSpectralData;
SHORT numSection;
SHORT *pNumLineInSect;
INT bitstreamIndex;
INT bitstreamAnchor;
SCHAR lengthOfLongestCodeword;
UCHAR *pCodebook;
} HCR_INPUT_OUTPUT;

42
libAACdec/src/aacdec_hcrs.cpp
View File

@ -615,9 +615,9 @@ UINT Hcr_State_BODY_ONLY(HANDLE_FDK_BITSTREAM bs, void *ptr) {
for (; pRemainingBitsInSegment[segmentOffset] > 0;
pRemainingBitsInSegment[segmentOffset] -= 1) {
carryBit = HcrGetABitFromBitstream(bs, &pLeftStartOfSegment[segmentOffset],
&pRightStartOfSegment[segmentOffset],
readDirection);
carryBit = HcrGetABitFromBitstream(
bs, pHcr->decInOut.bitstreamAnchor, &pLeftStartOfSegment[segmentOffset],
&pRightStartOfSegment[segmentOffset], readDirection);
CarryBitToBranchValue(carryBit, /* make a step in decoding tree */
treeNode, &branchValue, &branchNode);
@ -749,9 +749,9 @@ UINT Hcr_State_BODY_SIGN__BODY(HANDLE_FDK_BITSTREAM bs, void *ptr) {
for (; pRemainingBitsInSegment[segmentOffset] > 0;
pRemainingBitsInSegment[segmentOffset] -= 1) {
carryBit = HcrGetABitFromBitstream(bs, &pLeftStartOfSegment[segmentOffset],
&pRightStartOfSegment[segmentOffset],
readDirection);
carryBit = HcrGetABitFromBitstream(
bs, pHcr->decInOut.bitstreamAnchor, &pLeftStartOfSegment[segmentOffset],
&pRightStartOfSegment[segmentOffset], readDirection);
CarryBitToBranchValue(carryBit, /* make a step in decoding tree */
treeNode, &branchValue, &branchNode);
@ -884,9 +884,9 @@ UINT Hcr_State_BODY_SIGN__SIGN(HANDLE_FDK_BITSTREAM bs, void *ptr) {
/* loop for sign bit decoding */
for (; pRemainingBitsInSegment[segmentOffset] > 0;
pRemainingBitsInSegment[segmentOffset] -= 1) {
carryBit = HcrGetABitFromBitstream(bs, &pLeftStartOfSegment[segmentOffset],
&pRightStartOfSegment[segmentOffset],
readDirection);
carryBit = HcrGetABitFromBitstream(
bs, pHcr->decInOut.bitstreamAnchor, &pLeftStartOfSegment[segmentOffset],
&pRightStartOfSegment[segmentOffset], readDirection);
cntSign -=
1; /* decrement sign counter because one sign bit has been read */
@ -997,9 +997,9 @@ UINT Hcr_State_BODY_SIGN_ESC__BODY(HANDLE_FDK_BITSTREAM bs, void *ptr) {
for (; pRemainingBitsInSegment[segmentOffset] > 0;
pRemainingBitsInSegment[segmentOffset] -= 1) {
carryBit = HcrGetABitFromBitstream(bs, &pLeftStartOfSegment[segmentOffset],
&pRightStartOfSegment[segmentOffset],
readDirection);
carryBit = HcrGetABitFromBitstream(
bs, pHcr->decInOut.bitstreamAnchor, &pLeftStartOfSegment[segmentOffset],
&pRightStartOfSegment[segmentOffset], readDirection);
/* make a step in tree */
CarryBitToBranchValue(carryBit, treeNode, &branchValue, &branchNode);
@ -1159,9 +1159,9 @@ UINT Hcr_State_BODY_SIGN_ESC__SIGN(HANDLE_FDK_BITSTREAM bs, void *ptr) {
/* loop for sign bit decoding */
for (; pRemainingBitsInSegment[segmentOffset] > 0;
pRemainingBitsInSegment[segmentOffset] -= 1) {
carryBit = HcrGetABitFromBitstream(bs, &pLeftStartOfSegment[segmentOffset],
&pRightStartOfSegment[segmentOffset],
readDirection);
carryBit = HcrGetABitFromBitstream(
bs, pHcr->decInOut.bitstreamAnchor, &pLeftStartOfSegment[segmentOffset],
&pRightStartOfSegment[segmentOffset], readDirection);
/* decrement sign counter because one sign bit has been read */
cntSign -= 1;
@ -1314,9 +1314,9 @@ UINT Hcr_State_BODY_SIGN_ESC__ESC_PREFIX(HANDLE_FDK_BITSTREAM bs, void *ptr) {
/* decode escape prefix */
for (; pRemainingBitsInSegment[segmentOffset] > 0;
pRemainingBitsInSegment[segmentOffset] -= 1) {
carryBit = HcrGetABitFromBitstream(bs, &pLeftStartOfSegment[segmentOffset],
&pRightStartOfSegment[segmentOffset],
readDirection);
carryBit = HcrGetABitFromBitstream(
bs, pHcr->decInOut.bitstreamAnchor, &pLeftStartOfSegment[segmentOffset],
&pRightStartOfSegment[segmentOffset], readDirection);
/* count ones and store sum in escapePrefixUp */
if (carryBit == 1) {
@ -1435,9 +1435,9 @@ UINT Hcr_State_BODY_SIGN_ESC__ESC_WORD(HANDLE_FDK_BITSTREAM bs, void *ptr) {
/* decode escape word */
for (; pRemainingBitsInSegment[segmentOffset] > 0;
pRemainingBitsInSegment[segmentOffset] -= 1) {
carryBit = HcrGetABitFromBitstream(bs, &pLeftStartOfSegment[segmentOffset],
&pRightStartOfSegment[segmentOffset],
readDirection);
carryBit = HcrGetABitFromBitstream(
bs, pHcr->decInOut.bitstreamAnchor, &pLeftStartOfSegment[segmentOffset],
&pRightStartOfSegment[segmentOffset], readDirection);
/* build escape word */
escapeWord <<=

14
libAACdec/src/aacdecoder.cpp
View File

@ -1630,14 +1630,14 @@ CAacDecoder_Init(HANDLE_AACDECODER self, const CSAudioSpecificConfig *asc,
aacChannelsOffset = 0;
aacChannelsOffsetIdx = 0;
elementOffset = 0;
if ((ascChannels <= 0) ||
(asc->m_channelConfiguration > AACDEC_MAX_CH_CONF)) {
return AAC_DEC_UNSUPPORTED_CHANNELCONFIG;
}
if ((ascChannels + aacChannelsOffsetIdx) > ((8) * 2)) {
return AAC_DEC_UNSUPPORTED_CHANNELCONFIG;
}
if (configMode & AC_CM_ALLOC_MEM) {
if ((ascChannels <= 0) ||
(asc->m_channelConfiguration > AACDEC_MAX_CH_CONF)) {
return AAC_DEC_UNSUPPORTED_CHANNELCONFIG;
}
if ((ascChannels + aacChannelsOffsetIdx) > ((8) * 2)) {
return AAC_DEC_UNSUPPORTED_CHANNELCONFIG;
}
if ((ascChannels + aacChannelsOffset) > (8)) {
return AAC_DEC_UNSUPPORTED_CHANNELCONFIG;
}

21
libAACdec/src/aacdecoder_lib.cpp
View File

@ -368,6 +368,23 @@ static INT aacDecoder_CtrlCFGChangeCallback(
return errTp;
}
static INT aacDecoder_SbrCallback(
void *handle, HANDLE_FDK_BITSTREAM hBs, const INT sampleRateIn,
const INT sampleRateOut, const INT samplesPerFrame,
const AUDIO_OBJECT_TYPE coreCodec, const MP4_ELEMENT_ID elementID,
const INT elementIndex, const UCHAR harmonicSBR,
const UCHAR stereoConfigIndex, const UCHAR configMode, UCHAR *configChanged,
const INT downscaleFactor) {
HANDLE_SBRDECODER self = (HANDLE_SBRDECODER)handle;
INT errTp = sbrDecoder_Header(self, hBs, sampleRateIn, sampleRateOut,
samplesPerFrame, coreCodec, elementID,
elementIndex, harmonicSBR, stereoConfigIndex,
configMode, configChanged, downscaleFactor);
return errTp;
}
static INT aacDecoder_SscCallback(void *handle, HANDLE_FDK_BITSTREAM hBs,
const AUDIO_OBJECT_TYPE coreCodec,
const INT samplingRate,
@ -959,7 +976,7 @@ LINKSPEC_CPP HANDLE_AACDECODER aacDecoder_Open(TRANSPORT_TYPE transportFmt,
goto bail;
}
aacDec->qmfModeUser = NOT_DEFINED;
transportDec_RegisterSbrCallback(aacDec->hInput, (cbSbr_t)sbrDecoder_Header,
transportDec_RegisterSbrCallback(aacDec->hInput, aacDecoder_SbrCallback,
(void *)aacDec->hSbrDecoder);
if (mpegSurroundDecoder_Open(
@ -1865,7 +1882,7 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER self, INT_PCM *pTimeData_extern,
} /* USAC DASH IPF flushing possible end */
if (accessUnit < numPrerollAU) {
FDKpushBack(hBsAu, auStartAnchor - FDKgetValidBits(hBsAu));
FDKpushBack(hBsAu, auStartAnchor - (INT)FDKgetValidBits(hBsAu));
} else {
if ((self->buildUpStatus == AACDEC_RSV60_BUILD_UP_ON) ||
(self->buildUpStatus == AACDEC_RSV60_BUILD_UP_ON_IN_BAND) ||

12
libAACdec/src/block.cpp
View File

@ -127,9 +127,11 @@ amm-info@iis.fraunhofer.de
The function reads the escape sequence from the bitstream,
if the absolute value of the quantized coefficient has the
value 16.
A limitation is implemented to maximal 31 bits to prevent endless loops.
If it strikes, MAX_QUANTIZED_VALUE + 1 is returned, independent of the sign of
parameter q.
A limitation is implemented to maximal 21 bits according to
ISO/IEC 14496-3:2009(E) 4.6.3.3.
This limits the escape prefix to a maximum of eight 1's.
If more than eight 1's are read, MAX_QUANTIZED_VALUE + 1 is
returned, independent of the sign of parameter q.
\return quantized coefficient
*/
@ -139,11 +141,11 @@ LONG CBlock_GetEscape(HANDLE_FDK_BITSTREAM bs, /*!< pointer to bitstream */
if (fAbs(q) != 16) return (q);
LONG i, off;
for (i = 4; i < 32; i++) {
for (i = 4; i < 13; i++) {
if (FDKreadBit(bs) == 0) break;
}
if (i == 32) return (MAX_QUANTIZED_VALUE + 1);
if (i == 13) return (MAX_QUANTIZED_VALUE + 1);
off = FDKreadBits(bs, i);
i = off + (1 << i);

29
libAACdec/src/rvlc.cpp
View File

@ -168,13 +168,14 @@ static void rvlcInit(CErRvlcInfo *pRvlc,
/* set base bitstream ptr to the RVL-coded part (start of RVLC data (ESC 2))
*/
FDKsyncCache(bs);
pRvlc->bsAnchor = (INT)FDKgetValidBits(bs);
pRvlc->bitstreamIndexRvlFwd = FDKgetBitCnt(
bs); /* first bit within RVL coded block as start address for forward
decoding */
pRvlc->bitstreamIndexRvlBwd = FDKgetBitCnt(bs) + pRvlc->length_of_rvlc_sf -
1; /* last bit within RVL coded block as start
address for backward decoding */
pRvlc->bitstreamIndexRvlFwd =
0; /* first bit within RVL coded block as start address for forward
decoding */
pRvlc->bitstreamIndexRvlBwd =
pRvlc->length_of_rvlc_sf - 1; /* last bit within RVL coded block as start
address for backward decoding */
/* skip RVLC-bitstream-part -- pointing now to escapes (if present) or to TNS
* data (if present) */
@ -183,7 +184,7 @@ static void rvlcInit(CErRvlcInfo *pRvlc,
if (pRvlc->sf_escapes_present != 0) {
/* locate internal bitstream ptr at escapes (which is the second part) */
FDKsyncCache(bs);
pRvlc->bitstreamIndexEsc = FDKgetBitCnt(bs);
pRvlc->bitstreamIndexEsc = pRvlc->bsAnchor - (INT)FDKgetValidBits(bs);
/* skip escapeRVLC-bitstream-part -- pointing to TNS data (if present) to
* make decoder continue */
@ -259,8 +260,9 @@ static SCHAR rvlcDecodeEscapeWord(CErRvlcInfo *pRvlc, HANDLE_FDK_BITSTREAM bs) {
treeNode = *pEscTree; /* init at starting node */
for (i = MAX_LEN_RVLC_ESCAPE_WORD - 1; i >= 0; i--) {
carryBit = rvlcReadBitFromBitstream(bs, /* get next bit */
pBitstreamIndexEsc, FWD);
carryBit =
rvlcReadBitFromBitstream(bs, /* get next bit */
pRvlc->bsAnchor, pBitstreamIndexEsc, FWD);
CarryBitToBranchValue(carryBit, /* huffman decoding, do a single step in
huffman decoding tree */
@ -370,8 +372,9 @@ SCHAR decodeRVLCodeword(HANDLE_FDK_BITSTREAM bs, CErRvlcInfo *pRvlc) {
UINT treeNode = *pRvlCodeTree;
for (i = MAX_LEN_RVLC_CODE_WORD - 1; i >= 0; i--) {
carryBit = rvlcReadBitFromBitstream(bs, /* get next bit */
pBitstrIndxRvl, direction);
carryBit =
rvlcReadBitFromBitstream(bs, /* get next bit */
pRvlc->bsAnchor, pBitstrIndxRvl, direction);
CarryBitToBranchValue(carryBit, /* huffman decoding, do a single step in
huffman decoding tree */
@ -1140,7 +1143,7 @@ void CRvlc_Decode(CAacDecoderChannelInfo *pAacDecoderChannelInfo,
rvlcInit(pRvlc, pAacDecoderChannelInfo, bs);
/* save bitstream position */
saveBitCnt = FDKgetBitCnt(bs);
saveBitCnt = (INT)FDKgetValidBits(bs);
if (pRvlc->sf_escapes_present)
rvlcDecodeEscapes(
@ -1155,7 +1158,7 @@ void CRvlc_Decode(CAacDecoderChannelInfo *pAacDecoderChannelInfo,
pAacDecoderChannelInfo->data.aac.PnsData.PnsActive = pRvlc->noise_used;
/* restore bitstream position */
bitCntOffst = saveBitCnt - FDKgetBitCnt(bs);
bitCntOffst = (INT)FDKgetValidBits(bs) - saveBitCnt;
if (bitCntOffst) {
FDKpushBiDirectional(bs, bitCntOffst);
}

1
libAACdec/src/rvlc_info.h
View File

@ -164,6 +164,7 @@ typedef struct {
UCHAR direction;
/* bitstream indices */
INT bsAnchor; /* hcr bit buffer reference index */
INT bitstreamIndexRvlFwd; /* base address of RVL-coded-scalefactor data (ESC
2) for forward decoding */
INT bitstreamIndexRvlBwd; /* base address of RVL-coded-scalefactor data (ESC

6
libAACdec/src/rvlcbit.cpp
View File

@ -123,10 +123,10 @@ read direction. It is called very often, therefore it makes sense to inline it
--------------------------------------------------------------------------------------------
*/
UCHAR rvlcReadBitFromBitstream(HANDLE_FDK_BITSTREAM bs, INT *pPosition,
UCHAR readDirection) {
UCHAR rvlcReadBitFromBitstream(HANDLE_FDK_BITSTREAM bs, const INT bsAnchor,
INT *pPosition, UCHAR readDirection) {
UINT bit;
INT readBitOffset = *pPosition - FDKgetBitCnt(bs);
INT readBitOffset = (INT)FDKgetValidBits(bs) - bsAnchor + *pPosition;
if (readBitOffset) {
FDKpushBiDirectional(bs, readBitOffset);

4
libAACdec/src/rvlcbit.h
View File

@ -105,7 +105,7 @@ amm-info@iis.fraunhofer.de
#include "rvlc.h"
UCHAR rvlcReadBitFromBitstream(HANDLE_FDK_BITSTREAM bs, INT *pPosition,
UCHAR readDirection);
UCHAR rvlcReadBitFromBitstream(HANDLE_FDK_BITSTREAM bs, const INT bsAnchor,
INT *pPosition, UCHAR readDirection);
#endif /* RVLCBIT_H */

3
libAACdec/src/usacdec_lpd.cpp
View File

@ -1221,8 +1221,7 @@ AAC_DECODER_ERROR CLpdChannelStream_Read(
(INT)(samplingRate * PIT_MIN_12k8 + (FSCALE_DENOM / 2)) / FSCALE_DENOM -
(INT)PIT_MIN_12k8;
if (pSamplingRateInfo->samplingRate >
FAC_FSCALE_MAX /* maximum allowed core sampling frequency */) {
if ((samplingRate < 6000) || (samplingRate > 24000)) {
error = AAC_DEC_PARSE_ERROR;
goto bail;
}

34
libDRCdec/src/drcDec_selectionProcess.cpp
View File

@ -1006,15 +1006,23 @@ static DRCDEC_SELECTION_PROCESS_RETURN _preSelectionRequirement7(
return DRCDEC_SELECTION_PROCESS_NO_ERROR;
}
static void _setSelectionDataInfo(DRCDEC_SELECTION_DATA* pData,
FIXP_DBL loudness,
FIXP_DBL loudnessNormalizationGainDb,
FIXP_DBL loudnessNormalizationGainDbMax,
FIXP_DBL loudnessDeviationMax,
FIXP_DBL signalPeakLevel,
FIXP_DBL outputPeakLevelMax,
int applyAdjustment) {
FIXP_DBL adjustment = 0;
static void _setSelectionDataInfo(
DRCDEC_SELECTION_DATA* pData, FIXP_DBL loudness, /* e = 7 */
FIXP_DBL loudnessNormalizationGainDb, /* e = 7 */
FIXP_DBL loudnessNormalizationGainDbMax, /* e = 7 */
FIXP_DBL loudnessDeviationMax, /* e = 7 */
FIXP_DBL signalPeakLevel, /* e = 7 */
FIXP_DBL outputPeakLevelMax, /* e = 7 */
int applyAdjustment) {
FIXP_DBL adjustment = 0; /* e = 8 */
/* use e = 8 for all function parameters to prevent overflow */
loudness >>= 1;
loudnessNormalizationGainDb >>= 1;
loudnessNormalizationGainDbMax >>= 1;
loudnessDeviationMax >>= 1;
signalPeakLevel >>= 1;
outputPeakLevelMax >>= 1;
if (applyAdjustment) {
adjustment =
@ -1028,6 +1036,14 @@ static void _setSelectionDataInfo(DRCDEC_SELECTION_DATA* pData,
pData->outputLoudness = loudness + pData->loudnessNormalizationGainDbAdjusted;
pData->outputPeakLevel =
signalPeakLevel + pData->loudnessNormalizationGainDbAdjusted;
/* shift back to e = 7 using saturation */
pData->loudnessNormalizationGainDbAdjusted = SATURATE_LEFT_SHIFT(
pData->loudnessNormalizationGainDbAdjusted, 1, DFRACT_BITS);
pData->outputLoudness =
SATURATE_LEFT_SHIFT(pData->outputLoudness, 1, DFRACT_BITS);
pData->outputPeakLevel =
SATURATE_LEFT_SHIFT(pData->outputPeakLevel, 1, DFRACT_BITS);
}
static int _targetLoudnessInRange(

6
libFDK/include/FDK_bitbuffer.h
View File

@ -113,7 +113,6 @@ typedef struct {
UINT ValidBits;
UINT ReadOffset;
UINT WriteOffset;
UINT BitCnt;
UINT BitNdx;
UCHAR *Buffer;
@ -159,15 +158,10 @@ void FDK_pushBack(HANDLE_FDK_BITBUF hBitBuffer, const UINT numberOfBits,
void FDK_pushForward(HANDLE_FDK_BITBUF hBitBuffer, const UINT numberOfBits,
UCHAR config);
void FDK_byteAlign(HANDLE_FDK_BITBUF hBitBuffer, UCHAR config);
UINT FDK_getValidBits(HANDLE_FDK_BITBUF hBitBuffer);
INT FDK_getFreeBits(HANDLE_FDK_BITBUF hBitBuffer);
void FDK_setBitCnt(HANDLE_FDK_BITBUF hBitBuffer, const UINT value);
INT FDK_getBitCnt(HANDLE_FDK_BITBUF hBitBuffer);
void FDK_Feed(HANDLE_FDK_BITBUF hBitBuffer, const UCHAR inputBuffer[],
const UINT bufferSize, UINT *bytesValid);

46
libFDK/include/FDK_bitstream.h
View File

@ -480,21 +480,6 @@ FDK_INLINE void FDKsyncCacheBwd(HANDLE_FDK_BITSTREAM hBitStream) {
hBitStream->CacheWord = 0;
}
/**
* \brief Byte Alignment Function.
* This function performs the byte_alignment() syntactic function on the
* input stream, i.e. some bits will be discarded/padded so that the next bits
* to be read/written will be aligned on a byte boundary with respect to
* the bit position 0.
*
* \param hBitStream HANDLE_FDK_BITSTREAM handle
* \return void
*/
FDK_INLINE void FDKbyteAlign(HANDLE_FDK_BITSTREAM hBitStream) {
FDKsyncCache(hBitStream);
FDK_byteAlign(&hBitStream->hBitBuf, (UCHAR)hBitStream->ConfigCache);
}
/**
* \brief Byte Alignment Function with anchor
* This function performs the byte_alignment() syntactic function on the
@ -603,37 +588,6 @@ FDK_INLINE INT FDKgetFreeBits(HANDLE_FDK_BITSTREAM hBitStream) {
return FDK_getFreeBits(&hBitStream->hBitBuf);
}
/**
* \brief reset bitcounter in bitBuffer to zero.
* \param hBitStream HANDLE_FDK_BITSTREAM handle
* \return void
*/
FDK_INLINE void FDKresetBitCnt(HANDLE_FDK_BITSTREAM hBitStream) {
FDKsyncCache(hBitStream);
FDK_setBitCnt(&hBitStream->hBitBuf, 0);
}
/**
* \brief set bitcoutner in bitBuffer to given value.
* \param hBitStream HANDLE_FDK_BITSTREAM handle
* \param value new value to be assigned to the bit counter
* \return void
*/
FDK_INLINE void FDKsetBitCnt(HANDLE_FDK_BITSTREAM hBitStream, UINT value) {
FDKsyncCache(hBitStream);
FDK_setBitCnt(&hBitStream->hBitBuf, value);
}
/**
* \brief get bitcounter state from bitBuffer.
* \param hBitStream HANDLE_FDK_BITSTREAM handle
* \return current bit counter value
*/
FDK_INLINE INT FDKgetBitCnt(HANDLE_FDK_BITSTREAM hBitStream) {
FDKsyncCache(hBitStream);
return FDK_getBitCnt(&hBitStream->hBitBuf);
}
/**
* \brief Fill the BitBuffer with a number of input bytes from external source.
* The bytesValid variable returns the number of ramaining valid bytes in

29
libFDK/src/FDK_bitbuffer.cpp
View File

@ -128,7 +128,6 @@ void FDK_InitBitBuffer(HANDLE_FDK_BITBUF hBitBuf, UCHAR *pBuffer, UINT bufSize,
hBitBuf->ValidBits = validBits;
hBitBuf->ReadOffset = 0;
hBitBuf->WriteOffset = 0;
hBitBuf->BitCnt = 0;
hBitBuf->BitNdx = 0;
hBitBuf->Buffer = pBuffer;
@ -151,7 +150,6 @@ void FDK_ResetBitBuffer(HANDLE_FDK_BITBUF hBitBuf) {
hBitBuf->ValidBits = 0;
hBitBuf->ReadOffset = 0;
hBitBuf->WriteOffset = 0;
hBitBuf->BitCnt = 0;
hBitBuf->BitNdx = 0;
}
@ -161,7 +159,6 @@ INT FDK_get(HANDLE_FDK_BITBUF hBitBuf, const UINT numberOfBits) {
UINT bitOffset = hBitBuf->BitNdx & 0x07;
hBitBuf->BitNdx = (hBitBuf->BitNdx + numberOfBits) & (hBitBuf->bufBits - 1);
hBitBuf->BitCnt += numberOfBits;
hBitBuf->ValidBits -= numberOfBits;
UINT byteMask = hBitBuf->bufSize - 1;
@ -184,7 +181,6 @@ INT FDK_get(HANDLE_FDK_BITBUF hBitBuf, const UINT numberOfBits) {
INT FDK_get32(HANDLE_FDK_BITBUF hBitBuf) {
UINT BitNdx = hBitBuf->BitNdx + 32;
hBitBuf->BitNdx = BitNdx & (hBitBuf->bufBits - 1);
hBitBuf->BitCnt += 32;
hBitBuf->ValidBits = (UINT)((INT)hBitBuf->ValidBits - (INT)32);
UINT byteOffset = (BitNdx - 1) >> 3;
@ -223,7 +219,6 @@ INT FDK_getBwd(HANDLE_FDK_BITBUF hBitBuf, const UINT numberOfBits) {
int i;
hBitBuf->BitNdx = (hBitBuf->BitNdx - numberOfBits) & (hBitBuf->bufBits - 1);
hBitBuf->BitCnt -= numberOfBits;
hBitBuf->ValidBits += numberOfBits;
UINT tx = hBitBuf->Buffer[(byteOffset - 3) & byteMask] << 24 |
@ -256,7 +251,6 @@ void FDK_put(HANDLE_FDK_BITBUF hBitBuf, UINT value, const UINT numberOfBits) {
UINT bitOffset = hBitBuf->BitNdx & 0x7;
hBitBuf->BitNdx = (hBitBuf->BitNdx + numberOfBits) & (hBitBuf->bufBits - 1);
hBitBuf->BitCnt += numberOfBits;
hBitBuf->ValidBits += numberOfBits;
UINT byteMask = hBitBuf->bufSize - 1;
@ -307,7 +301,6 @@ void FDK_putBwd(HANDLE_FDK_BITBUF hBitBuf, UINT value,
int i;
hBitBuf->BitNdx = (hBitBuf->BitNdx - numberOfBits) & (hBitBuf->bufBits - 1);
hBitBuf->BitCnt -= numberOfBits;
hBitBuf->ValidBits -= numberOfBits;
/* in place turn around */
@ -344,7 +337,6 @@ void FDK_putBwd(HANDLE_FDK_BITBUF hBitBuf, UINT value,
#ifndef FUNCTION_FDK_pushBack
void FDK_pushBack(HANDLE_FDK_BITBUF hBitBuf, const UINT numberOfBits,
UCHAR config) {
hBitBuf->BitCnt = (UINT)((INT)hBitBuf->BitCnt - (INT)numberOfBits);
hBitBuf->ValidBits =
(config == 0) ? (UINT)((INT)hBitBuf->ValidBits + (INT)numberOfBits)
: ((UINT)((INT)hBitBuf->ValidBits - (INT)numberOfBits));
@ -355,7 +347,6 @@ void FDK_pushBack(HANDLE_FDK_BITBUF hBitBuf, const UINT numberOfBits,
void FDK_pushForward(HANDLE_FDK_BITBUF hBitBuf, const UINT numberOfBits,
UCHAR config) {
hBitBuf->BitCnt = (UINT)((INT)hBitBuf->BitCnt + (INT)numberOfBits);
hBitBuf->ValidBits =
(config == 0) ? ((UINT)((INT)hBitBuf->ValidBits - (INT)numberOfBits))
: (UINT)((INT)hBitBuf->ValidBits + (INT)numberOfBits);
@ -363,19 +354,6 @@ void FDK_pushForward(HANDLE_FDK_BITBUF hBitBuf, const UINT numberOfBits,
(UINT)((INT)hBitBuf->BitNdx + (INT)numberOfBits) & (hBitBuf->bufBits - 1);
}
void FDK_byteAlign(HANDLE_FDK_BITBUF hBitBuf, UCHAR config) {
INT alignment = hBitBuf->BitCnt & 0x07;
if (alignment) {
if (config == 0)
FDK_pushForward(hBitBuf, 8 - alignment, config); /* BS_READER */
else
FDK_put(hBitBuf, 0, 8 - alignment); /* BS_WRITER */
}
hBitBuf->BitCnt = 0;
}
#ifndef FUNCTION_FDK_getValidBits
UINT FDK_getValidBits(HANDLE_FDK_BITBUF hBitBuf) { return hBitBuf->ValidBits; }
#endif /* #ifndef FUNCTION_FDK_getValidBits */
@ -384,12 +362,6 @@ INT FDK_getFreeBits(HANDLE_FDK_BITBUF hBitBuf) {
return (hBitBuf->bufBits - hBitBuf->ValidBits);
}
void FDK_setBitCnt(HANDLE_FDK_BITBUF hBitBuf, const UINT value) {
hBitBuf->BitCnt = value;
}
INT FDK_getBitCnt(HANDLE_FDK_BITBUF hBitBuf) { return hBitBuf->BitCnt; }
void FDK_Feed(HANDLE_FDK_BITBUF hBitBuf, const UCHAR *RESTRICT inputBuffer,
const UINT bufferSize, UINT *bytesValid) {
inputBuffer = &inputBuffer[bufferSize - *bytesValid];
@ -438,7 +410,6 @@ void CopyAlignedBlock(HANDLE_FDK_BITBUF h_BitBufSrc, UCHAR *RESTRICT dstBuffer,
h_BitBufSrc->BitNdx =
(h_BitBufSrc->BitNdx + bToRead) & (h_BitBufSrc->bufBits - 1);
h_BitBufSrc->BitCnt += bToRead;
h_BitBufSrc->ValidBits -= bToRead;
}

572
libFDK/src/arm/dct_arm.cpp
View File

@ -1,572 +0,0 @@
/* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android
© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten
Forschung e.V. All rights reserved.
1. INTRODUCTION
The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software
that implements the MPEG Advanced Audio Coding ("AAC") encoding and decoding
scheme for digital audio. This FDK AAC Codec software is intended to be used on
a wide variety of Android devices.
AAC's HE-AAC and HE-AAC v2 versions are regarded as today's most efficient
general perceptual audio codecs. AAC-ELD is considered the best-performing
full-bandwidth communications codec by independent studies and is widely
deployed. AAC has been standardized by ISO and IEC as part of the MPEG
specifications.
Patent licenses for necessary patent claims for the FDK AAC Codec (including
those of Fraunhofer) may be obtained through Via Licensing
(www.vialicensing.com) or through the respective patent owners individually for
the purpose of encoding or decoding bit streams in products that are compliant
with the ISO/IEC MPEG audio standards. Please note that most manufacturers of
Android devices already license these patent claims through Via Licensing or
directly from the patent owners, and therefore FDK AAC Codec software may
already be covered under those patent licenses when it is used for those
licensed purposes only.
Commercially-licensed AAC software libraries, including floating-point versions
with enhanced sound quality, are also available from Fraunhofer. Users are
encouraged to check the Fraunhofer website for additional applications
information and documentation.
2. COPYRIGHT LICENSE
Redistribution and use in source and binary forms, with or without modification,
are permitted without payment of copyright license fees provided that you
satisfy the following conditions:
You must retain the complete text of this software license in redistributions of
the FDK AAC Codec or your modifications thereto in source code form.
You must retain the complete text of this software license in the documentation
and/or other materials provided with redistributions of the FDK AAC Codec or
your modifications thereto in binary form. You must make available free of
charge copies of the complete source code of the FDK AAC Codec and your
modifications thereto to recipients of copies in binary form.
The name of Fraunhofer may not be used to endorse or promote products derived
from this library without prior written permission.
You may not charge copyright license fees for anyone to use, copy or distribute
the FDK AAC Codec software or your modifications thereto.
Your modified versions of the FDK AAC Codec must carry prominent notices stating
that you changed the software and the date of any change. For modified versions
of the FDK AAC Codec, the term "Fraunhofer FDK AAC Codec Library for Android"
must be replaced by the term "Third-Party Modified Version of the Fraunhofer FDK
AAC Codec Library for Android."
3. NO PATENT LICENSE
NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without
limitation the patents of Fraunhofer, ARE GRANTED BY THIS SOFTWARE LICENSE.
Fraunhofer provides no warranty of patent non-infringement with respect to this
software.
You may use this FDK AAC Codec software or modifications thereto only for
purposes that are authorized by appropriate patent licenses.
4. DISCLAIMER
This FDK AAC Codec software is provided by Fraunhofer on behalf of the copyright
holders and contributors "AS IS" and WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES,
including but not limited to the implied warranties of merchantability and
fitness for a particular purpose. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
CONTRIBUTORS BE LIABLE for any direct, indirect, incidental, special, exemplary,
or consequential damages, including but not limited to procurement of substitute
goods or services; loss of use, data, or profits, or business interruption,
however caused and on any theory of liability, whether in contract, strict
liability, or tort (including negligence), arising in any way out of the use of
this software, even if advised of the possibility of such damage.
5. CONTACT INFORMATION
Fraunhofer Institute for Integrated Circuits IIS
Attention: Audio and Multimedia Departments - FDK AAC LL
Am Wolfsmantel 33
91058 Erlangen, Germany
www.iis.fraunhofer.de/amm
amm-info@iis.fraunhofer.de
----------------------------------------------------------------------------- */
/******************* Library for basic calculation routines ********************
Author(s):
Description:
*******************************************************************************/
#ifdef FUNCTION_dct_IV_func1
/*
Note: This assembler routine is here, because the ARM926 compiler does
not encode the inline assembler with optimal speed.
With this version, we save 2 cycles per loop iteration.
*/
__asm void dct_IV_func1(int i, const FIXP_SPK *twiddle,
FIXP_DBL *RESTRICT pDat_0, FIXP_DBL *RESTRICT pDat_1) {
/* Register map:
r0 i
r1 twiddle
r2 pDat_0
r3 pDat_1
r4 accu1
r5 accu2
r6 accu3
r7 accu4
r8 val_tw
r9 accuX
*/
PUSH{r4 - r9}
/* 44 cycles for 2 iterations = 22 cycles/iteration */
dct_IV_loop1_start
/* First iteration */
LDR r8,
[r1],
# 4 // val_tw = *twiddle++;
LDR r5,
[ r2, #0 ] // accu2 = pDat_0[0]
LDR r4,
[ r3, #0 ] // accu1 = pDat_1[0]
SMULWT r9,
r5,
r8 // accuX = accu2*val_tw.l
SMULWB r5,
r5,
r8 // accu2 = accu2*val_tw.h
RSB r9,
r9,
# 0 // accuX =-accu2*val_tw.l
SMLAWT r5, r4, r8,
r5 // accu2 = accu2*val_tw.h + accu1*val_tw.l
SMLAWB r4,
r4, r8,
r9 // accu1 = accu1*val_tw.h - accu2*val_tw.l
LDR r8,
[r1],
# 4 // val_tw = *twiddle++;
LDR r7,
[ r3, # - 4 ] // accu4 = pDat_1[-1]
LDR r6,
[ r2, #4 ] // accu3 = pDat_0[1]
SMULWB r9,
r7,
r8 // accuX = accu4*val_tw.h
SMULWT r7,
r7,
r8 // accu4 = accu4*val_tw.l
RSB r9,
r9,
# 0 // accuX =-accu4*val_tw.h
SMLAWB r7, r6, r8,
r7 // accu4 = accu4*val_tw.l+accu3*val_tw.h
SMLAWT r6,
r6, r8,
r9 // accu3 = accu3*val_tw.l-accu4*val_tw.h
STR r5,
[r2],
# 4 // *pDat_0++ = accu2
STR r4, [r2],
# 4 // *pDat_0++ = accu1
STR r6, [r3],
#- 4 // *pDat_1-- = accu3
STR r7, [r3],
#- 4 // *pDat_1-- = accu4
/* Second iteration */
LDR r8, [r1],
# 4 // val_tw = *twiddle++;
LDR r5,
[ r2, #0 ] // accu2 = pDat_0[0]
LDR r4,
[ r3, #0 ] // accu1 = pDat_1[0]
SMULWT r9,
r5,
r8 // accuX = accu2*val_tw.l
SMULWB r5,
r5,
r8 // accu2 = accu2*val_tw.h
RSB r9,
r9,
# 0 // accuX =-accu2*val_tw.l
SMLAWT r5, r4, r8,
r5 // accu2 = accu2*val_tw.h + accu1*val_tw.l
SMLAWB r4,
r4, r8,
r9 // accu1 = accu1*val_tw.h - accu2*val_tw.l
LDR r8,
[r1],
# 4 // val_tw = *twiddle++;
LDR r7,
[ r3, # - 4 ] // accu4 = pDat_1[-1]
LDR r6,
[ r2, #4 ] // accu3 = pDat_0[1]
SMULWB r9,
r7,
r8 // accuX = accu4*val_tw.h
SMULWT r7,
r7,
r8 // accu4 = accu4*val_tw.l
RSB r9,
r9,
# 0 // accuX =-accu4*val_tw.h
SMLAWB r7, r6, r8,
r7 // accu4 = accu4*val_tw.l+accu3*val_tw.h
SMLAWT r6,
r6, r8,
r9 // accu3 = accu3*val_tw.l-accu4*val_tw.h
STR r5,
[r2],
# 4 // *pDat_0++ = accu2
STR r4, [r2],
# 4 // *pDat_0++ = accu1
STR r6, [r3],
#- 4 // *pDat_1-- = accu3
STR r7, [r3],
#- 4 // *pDat_1-- = accu4
SUBS r0, r0,
# 1 BNE dct_IV_loop1_start
POP { r4 - r9 }
BX lr
}
#endif /* FUNCTION_dct_IV_func1 */
#ifdef FUNCTION_dct_IV_func2
/* __attribute__((noinline)) */
static inline void dct_IV_func2(int i, const FIXP_SPK *twiddle,
FIXP_DBL *pDat_0, FIXP_DBL *pDat_1, int inc) {
FIXP_DBL accu1, accu2, accu3, accu4, accuX;
LONG val_tw;
accu1 = pDat_1[-2];
accu2 = pDat_1[-1];
*--pDat_1 = -(pDat_0[1] >> 1);
*pDat_0++ = (pDat_0[0] >> 1);
twiddle += inc;
__asm {
LDR val_tw, [twiddle], inc, LSL #2 // val_tw = *twiddle; twiddle += inc
B dct_IV_loop2_2nd_part
/* 42 cycles for 2 iterations = 21 cycles/iteration */
dct_IV_loop2:
SMULWT accuX, accu2, val_tw
SMULWB accu2, accu2, val_tw
RSB accuX, accuX, #0
SMLAWB accuX, accu1, val_tw, accuX
SMLAWT accu2, accu1, val_tw, accu2
STR accuX, [pDat_0], #4
STR accu2, [pDat_1, #-4] !
LDR accu4, [pDat_0, #4]
LDR accu3, [pDat_0]
SMULWB accuX, accu4, val_tw
SMULWT accu4, accu4, val_tw
RSB accuX, accuX, #0
SMLAWT accuX, accu3, val_tw, accuX
SMLAWB accu4, accu3, val_tw, accu4
LDR accu1, [pDat_1, #-8]
LDR accu2, [pDat_1, #-4]
LDR val_tw, [twiddle], inc, LSL #2 // val_tw = *twiddle; twiddle += inc
STR accuX, [pDat_1, #-4] !
STR accu4, [pDat_0], #4
dct_IV_loop2_2nd_part:
SMULWT accuX, accu2, val_tw
SMULWB accu2, accu2, val_tw
RSB accuX, accuX, #0
SMLAWB accuX, accu1, val_tw, accuX
SMLAWT accu2, accu1, val_tw, accu2
STR accuX, [pDat_0], #4
STR accu2, [pDat_1, #-4] !
LDR accu4, [pDat_0, #4]
LDR accu3, [pDat_0]
SMULWB accuX, accu4, val_tw
SMULWT accu4, accu4, val_tw
RSB accuX, accuX, #0
SMLAWT accuX, accu3, val_tw, accuX
SMLAWB accu4, accu3, val_tw, accu4
LDR accu1, [pDat_1, #-8]
LDR accu2, [pDat_1, #-4]
STR accuX, [pDat_1, #-4] !
STR accu4, [pDat_0], #4
LDR val_tw, [twiddle], inc, LSL #2 // val_tw = *twiddle; twiddle += inc
SUBS i, i, #1
BNE dct_IV_loop2
}
/* Last Sin and Cos value pair are the same */
accu1 = fMultDiv2(accu1, WTC(0x5a82799a));
accu2 = fMultDiv2(accu2, WTC(0x5a82799a));
*--pDat_1 = accu1 + accu2;
*pDat_0++ = accu1 - accu2;
}
#endif /* FUNCTION_dct_IV_func2 */
#ifdef FUNCTION_dst_IV_func1
__asm void dst_IV_func1(int i, const FIXP_SPK *twiddle, FIXP_DBL *pDat_0,
FIXP_DBL *pDat_1) {
/* Register map:
r0 i
r1 twiddle
r2 pDat_0
r3 pDat_1
r4 accu1
r5 accu2
r6 accu3
r7 accu4
r8 val_tw
r9 accuX
*/
PUSH{r4 - r9}
dst_IV_loop1 LDR r8,
[r1],
# 4 // val_tw = *twiddle++
LDR r5,
[r2] // accu2 = pDat_0[0]
LDR r6,
[ r2, #4 ] // accu3 = pDat_0[1]
RSB r5,
r5,
# 0 // accu2 = -accu2
SMULWT r9, r5,
r8 // accuX = (-accu2)*val_tw.l
LDR r4,
[ r3, # - 4 ] // accu1 = pDat_1[-1]
RSB r9,
r9,
# 0 // accuX = -(-accu2)*val_tw.l
SMLAWB r9, r4, r8,
r9 // accuX = accu1*val_tw.h-(-accu2)*val_tw.l
SMULWT r4,
r4,
r8 // accu1 = accu1*val_tw.l
LDR r7,
[ r3, # - 8 ] // accu4 = pDat_1[-2]
SMLAWB r5,
r5, r8,
r4 // accu2 = (-accu2)*val_tw.t+accu1*val_tw.l
LDR r8,
[r1],
# 4 // val_tw = *twiddle++
STR r5, [r2],
# 4 // *pDat_0++ = accu2
STR r9, [r2],
# 4 // *pDat_0++ = accu1 (accuX)
RSB r7, r7,
# 0 // accu4 = -accu4
SMULWB r5, r7,
r8 // accu2 = (-accu4)*val_tw.h
SMULWB r4,
r6,
r8 // accu1 = (-accu4)*val_tw.l
RSB r5,
r5,
# 0 // accu2 = -(-accu4)*val_tw.h
SMLAWT r6, r6, r8,
r5 // accu3 = (-accu4)*val_tw.l-(-accu3)*val_tw.h
SMLAWT r7,
r7, r8,
r4 // accu4 = (-accu3)*val_tw.l+(-accu4)*val_tw.h
STR r6,
[ r3, # - 4 ] ! // *--pDat_1 = accu3
STR r7,
[ r3, # - 4 ] ! // *--pDat_1 = accu4
LDR r8,
[r1],
# 4 // val_tw = *twiddle++
LDR r5,
[r2] // accu2 = pDat_0[0]
LDR r6,
[ r2, #4 ] // accu3 = pDat_0[1]
RSB r5,
r5,
# 0 // accu2 = -accu2
SMULWT r9, r5,
r8 // accuX = (-accu2)*val_tw.l
LDR r4,
[ r3, # - 4 ] // accu1 = pDat_1[-1]
RSB r9,
r9,
# 0 // accuX = -(-accu2)*val_tw.l
SMLAWB r9, r4, r8,
r9 // accuX = accu1*val_tw.h-(-accu2)*val_tw.l
SMULWT r4,
r4,
r8 // accu1 = accu1*val_tw.l
LDR r7,
[ r3, # - 8 ] // accu4 = pDat_1[-2]
SMLAWB r5,
r5, r8,
r4 // accu2 = (-accu2)*val_tw.t+accu1*val_tw.l
LDR r8,
[r1],
# 4 // val_tw = *twiddle++
STR r5, [r2],
# 4 // *pDat_0++ = accu2
STR r9, [r2],
# 4 // *pDat_0++ = accu1 (accuX)
RSB r7, r7,
# 0 // accu4 = -accu4
SMULWB r5, r7,
r8 // accu2 = (-accu4)*val_tw.h
SMULWB r4,
r6,
r8 // accu1 = (-accu4)*val_tw.l
RSB r5,
r5,
# 0 // accu2 = -(-accu4)*val_tw.h
SMLAWT r6, r6, r8,
r5 // accu3 = (-accu4)*val_tw.l-(-accu3)*val_tw.h
SMLAWT r7,
r7, r8,
r4 // accu4 = (-accu3)*val_tw.l+(-accu4)*val_tw.h
STR r6,
[ r3, # - 4 ] ! // *--pDat_1 = accu3
STR r7,
[ r3, # - 4 ] ! // *--pDat_1 = accu4
SUBS r0,
r0,
# 4 // i-= 4
BNE dst_IV_loop1
POP{r4 - r9} BX lr
}
#endif /* FUNCTION_dst_IV_func1 */
#ifdef FUNCTION_dst_IV_func2
/* __attribute__((noinline)) */
static inline void dst_IV_func2(int i, const FIXP_SPK *twiddle,
FIXP_DBL *RESTRICT pDat_0,
FIXP_DBL *RESTRICT pDat_1, int inc) {
FIXP_DBL accu1, accu2, accu3, accu4;
LONG val_tw;
accu4 = pDat_0[0];
accu3 = pDat_0[1];
accu4 >>= 1;
accu3 >>= 1;
accu4 = -accu4;
accu1 = pDat_1[-1];
accu2 = pDat_1[0];
*pDat_0++ = accu3;
*pDat_1-- = accu4;
__asm {
B dst_IV_loop2_2nd_part
/* 50 cycles for 2 iterations = 25 cycles/iteration */
dst_IV_loop2:
LDR val_tw, [twiddle], inc, LSL #2 // val_tw = *twiddle; twiddle += inc
RSB accu2, accu2, #0 // accu2 = -accu2
RSB accu1, accu1, #0 // accu1 = -accu1
SMULWT accu3, accu2, val_tw // accu3 = (-accu2)*val_tw.l
SMULWT accu4, accu1, val_tw // accu4 = (-accu1)*val_tw.l
RSB accu3, accu3, #0 // accu3 = -accu2*val_tw.l
SMLAWB accu1, accu1, val_tw, accu3 // accu1 = -accu1*val_tw.h-(-accu2)*val_tw.l
SMLAWB accu2, accu2, val_tw, accu4 // accu2 = (-accu1)*val_tw.l+(-accu2)*val_tw.h
STR accu1, [pDat_1], #-4 // *pDat_1-- = accu1
STR accu2, [pDat_0], #4 // *pDat_0++ = accu2
LDR accu4, [pDat_0] // accu4 = pDat_0[0]
LDR accu3, [pDat_0, #4] // accu3 = pDat_0[1]
RSB accu4, accu4, #0 // accu4 = -accu4
RSB accu3, accu3, #0 // accu3 = -accu3
SMULWB accu1, accu3, val_tw // accu1 = (-accu3)*val_tw.h
SMULWT accu2, accu3, val_tw // accu2 = (-accu3)*val_tw.l
RSB accu1, accu1, #0 // accu1 = -(-accu3)*val_tw.h
SMLAWT accu3, accu4, val_tw, accu1 // accu3 = (-accu4)*val_tw.l-(-accu3)*val_tw.h
SMLAWB accu4, accu4, val_tw, accu2 // accu4 = (-accu3)*val_tw.l+(-accu4)*val_tw.h
LDR accu1, [pDat_1, #-4] // accu1 = pDat_1[-1]
LDR accu2, [pDat_1] // accu2 = pDat_1[0]
STR accu3, [pDat_0], #4 // *pDat_0++ = accu3
STR accu4, [pDat_1], #-4 // *pDat_1-- = accu4
dst_IV_loop2_2nd_part:
LDR val_tw, [twiddle], inc, LSL #2 // val_tw = *twiddle; twiddle += inc
RSB accu2, accu2, #0 // accu2 = -accu2
RSB accu1, accu1, #0 // accu1 = -accu1
SMULWT accu3, accu2, val_tw // accu3 = (-accu2)*val_tw.l
SMULWT accu4, accu1, val_tw // accu4 = (-accu1)*val_tw.l
RSB accu3, accu3, #0 // accu3 = -accu2*val_tw.l
SMLAWB accu1, accu1, val_tw, accu3 // accu1 = -accu1*val_tw.h-(-accu2)*val_tw.l
SMLAWB accu2, accu2, val_tw, accu4 // accu2 = (-accu1)*val_tw.l+(-accu2)*val_tw.h
STR accu1, [pDat_1], #-4 // *pDat_1-- = accu1
STR accu2, [pDat_0], #4 // *pDat_0++ = accu2
LDR accu4, [pDat_0] // accu4 = pDat_0[0]
LDR accu3, [pDat_0, #4] // accu3 = pDat_0[1]
RSB accu4, accu4, #0 // accu4 = -accu4
RSB accu3, accu3, #0 // accu3 = -accu3
SMULWB accu1, accu3, val_tw // accu1 = (-accu3)*val_tw.h
SMULWT accu2, accu3, val_tw // accu2 = (-accu3)*val_tw.l
RSB accu1, accu1, #0 // accu1 = -(-accu3)*val_tw.h
SMLAWT accu3, accu4, val_tw, accu1 // accu3 = (-accu4)*val_tw.l-(-accu3)*val_tw.h
SMLAWB accu4, accu4, val_tw, accu2 // accu4 = (-accu3)*val_tw.l+(-accu4)*val_tw.h
LDR accu1, [pDat_1, #-4] // accu1 = pDat_1[-1]
LDR accu2, [pDat_1] // accu2 = pDat_1[0]
STR accu3, [pDat_0], #4 // *pDat_0++ = accu3
STR accu4, [pDat_1], #-4 // *pDat_1-- = accu4
SUBS i, i, #1
BNE dst_IV_loop2
}
/* Last Sin and Cos value pair are the same */
accu1 = fMultDiv2(-accu1, WTC(0x5a82799a));
accu2 = fMultDiv2(-accu2, WTC(0x5a82799a));
*pDat_0 = accu1 + accu2;
*pDat_1 = accu1 - accu2;
}
#endif /* FUNCTION_dst_IV_func2 */

74
libFDK/src/dct.cpp
View File

@ -124,10 +124,6 @@ amm-info@iis.fraunhofer.de
#include "FDK_tools_rom.h"
#include "fft.h"
#if defined(__arm__)
#include "arm/dct_arm.cpp"
#endif
void dct_getTables(const FIXP_WTP **ptwiddle, const FIXP_STP **sin_twiddle,
int *sin_step, int length) {
const FIXP_WTP *twiddle;
@ -387,12 +383,6 @@ void dct_IV(FIXP_DBL *pDat, int L, int *pDat_e) {
dct_getTables(&twiddle, &sin_twiddle, &sin_step, L);
#ifdef FUNCTION_dct_IV_func1
if (M >= 4 && (M & 3) == 0) {
/* ARM926: 44 cycles for 2 iterations = 22 cycles/iteration */
dct_IV_func1(M >> 2, twiddle, &pDat[0], &pDat[L - 1]);
} else
#endif /* FUNCTION_dct_IV_func1 */
{
FIXP_DBL *RESTRICT pDat_0 = &pDat[0];
FIXP_DBL *RESTRICT pDat_1 = &pDat[L - 2];
@ -410,10 +400,10 @@ void dct_IV(FIXP_DBL *pDat, int L, int *pDat_e) {
cplxMultDiv2(&accu1, &accu2, accu1, accu2, twiddle[i]);
cplxMultDiv2(&accu3, &accu4, accu4, accu3, twiddle[i + 1]);
pDat_0[0] = accu2;
pDat_0[1] = accu1;
pDat_1[0] = accu4;
pDat_1[1] = -accu3;
pDat_0[0] = accu2 >> 1;
pDat_0[1] = accu1 >> 1;
pDat_1[0] = accu4 >> 1;
pDat_1[1] = -(accu3 >> 1);
}
if (M & 1) {
FIXP_DBL accu1, accu2;
@ -423,19 +413,13 @@ void dct_IV(FIXP_DBL *pDat, int L, int *pDat_e) {
cplxMultDiv2(&accu1, &accu2, accu1, accu2, twiddle[i]);
pDat_0[0] = accu2;
pDat_0[1] = accu1;
pDat_0[0] = accu2 >> 1;
pDat_0[1] = accu1 >> 1;
}
}
fft(M, pDat, pDat_e);
#ifdef FUNCTION_dct_IV_func2
if (M >= 4 && (M & 3) == 0) {
/* ARM926: 42 cycles for 2 iterations = 21 cycles/iteration */
dct_IV_func2(M >> 2, sin_twiddle, &pDat[0], &pDat[L], sin_step);
} else
#endif /* FUNCTION_dct_IV_func2 */
{
FIXP_DBL *RESTRICT pDat_0 = &pDat[0];
FIXP_DBL *RESTRICT pDat_1 = &pDat[L - 2];
@ -446,20 +430,19 @@ void dct_IV(FIXP_DBL *pDat, int L, int *pDat_e) {
accu1 = pDat_1[0];
accu2 = pDat_1[1];
pDat_1[1] = -(pDat_0[1] >> 1);
pDat_0[0] = (pDat_0[0] >> 1);
pDat_1[1] = -pDat_0[1];
/* 28 cycles for ARM926 */
for (idx = sin_step, i = 1; i<(M + 1)>> 1; i++, idx += sin_step) {
FIXP_STP twd = sin_twiddle[idx];
cplxMultDiv2(&accu3, &accu4, accu1, accu2, twd);
cplxMult(&accu3, &accu4, accu1, accu2, twd);
pDat_0[1] = accu3;
pDat_1[0] = accu4;
pDat_0 += 2;
pDat_1 -= 2;
cplxMultDiv2(&accu3, &accu4, pDat_0[1], pDat_0[0], twd);
cplxMult(&accu3, &accu4, pDat_0[1], pDat_0[0], twd);
accu1 = pDat_1[0];
accu2 = pDat_1[1];
@ -470,8 +453,8 @@ void dct_IV(FIXP_DBL *pDat, int L, int *pDat_e) {
if ((M & 1) == 0) {
/* Last Sin and Cos value pair are the same */
accu1 = fMultDiv2(accu1, WTC(0x5a82799a));
accu2 = fMultDiv2(accu2, WTC(0x5a82799a));
accu1 = fMult(accu1, WTC(0x5a82799a));
accu2 = fMult(accu2, WTC(0x5a82799a));
pDat_1[0] = accu1 + accu2;
pDat_0[1] = accu1 - accu2;
@ -497,11 +480,6 @@ void dst_IV(FIXP_DBL *pDat, int L, int *pDat_e) {
dct_getTables(&twiddle, &sin_twiddle, &sin_step, L);
#ifdef FUNCTION_dst_IV_func1
if ((M >= 4) && ((M & 3) == 0)) {
dst_IV_func1(M, twiddle, &pDat[0], &pDat[L]);
} else
#endif
{
FIXP_DBL *RESTRICT pDat_0 = &pDat[0];
FIXP_DBL *RESTRICT pDat_1 = &pDat[L - 2];
@ -519,10 +497,10 @@ void dst_IV(FIXP_DBL *pDat, int L, int *pDat_e) {
cplxMultDiv2(&accu1, &accu2, accu1, accu2, twiddle[i]);
cplxMultDiv2(&accu3, &accu4, accu4, accu3, twiddle[i + 1]);
pDat_0[0] = accu2;
pDat_0[1] = accu1;
pDat_1[0] = accu4;
pDat_1[1] = -accu3;
pDat_0[0] = accu2 >> 1;
pDat_0[1] = accu1 >> 1;
pDat_1[0] = accu4 >> 1;
pDat_1[1] = -(accu3 >> 1);
}
if (M & 1) {
FIXP_DBL accu1, accu2;
@ -532,19 +510,13 @@ void dst_IV(FIXP_DBL *pDat, int L, int *pDat_e) {
cplxMultDiv2(&accu1, &accu2, accu1, accu2, twiddle[i]);
pDat_0[0] = accu2;
pDat_0[1] = accu1;
pDat_0[0] = accu2 >> 1;
pDat_0[1] = accu1 >> 1;
}
}
fft(M, pDat, pDat_e);
#ifdef FUNCTION_dst_IV_func2
if ((M >= 4) && ((M & 3) == 0)) {
dst_IV_func2(M >> 2, sin_twiddle + sin_step, &pDat[0], &pDat[L - 1],
sin_step);
} else
#endif /* FUNCTION_dst_IV_func2 */
{
FIXP_DBL *RESTRICT pDat_0;
FIXP_DBL *RESTRICT pDat_1;
@ -558,20 +530,20 @@ void dst_IV(FIXP_DBL *pDat, int L, int *pDat_e) {
accu1 = pDat_1[0];
accu2 = pDat_1[1];
pDat_1[1] = -(pDat_0[0] >> 1);
pDat_0[0] = (pDat_0[1] >> 1);
pDat_1[1] = -pDat_0[0];
pDat_0[0] = pDat_0[1];
for (idx = sin_step, i = 1; i<(M + 1)>> 1; i++, idx += sin_step) {
FIXP_STP twd = sin_twiddle[idx];
cplxMultDiv2(&accu3, &accu4, accu1, accu2, twd);
cplxMult(&accu3, &accu4, accu1, accu2, twd);
pDat_1[0] = -accu3;
pDat_0[1] = -accu4;
pDat_0 += 2;
pDat_1 -= 2;
cplxMultDiv2(&accu3, &accu4, pDat_0[1], pDat_0[0], twd);
cplxMult(&accu3, &accu4, pDat_0[1], pDat_0[0], twd);
accu1 = pDat_1[0];
accu2 = pDat_1[1];
@ -582,8 +554,8 @@ void dst_IV(FIXP_DBL *pDat, int L, int *pDat_e) {
if ((M & 1) == 0) {
/* Last Sin and Cos value pair are the same */
accu1 = fMultDiv2(accu1, WTC(0x5a82799a));
accu2 = fMultDiv2(accu2, WTC(0x5a82799a));
accu1 = fMult(accu1, WTC(0x5a82799a));
accu2 = fMult(accu2, WTC(0x5a82799a));
pDat_0[1] = -accu1 - accu2;
pDat_1[0] = accu2 - accu1;

14
libMpegTPDec/src/tpdec_lib.cpp
View File

@ -736,9 +736,9 @@ static TRANSPORTDEC_ERROR transportDec_AdjustEndOfAccessUnit(
hTp->parser.latm.m_audioMuxLengthBytes > 0) {
int loasOffset;
loasOffset = (hTp->parser.latm.m_audioMuxLengthBytes * 8 +
FDKgetValidBits(hBs)) -
hTp->globalFramePos;
loasOffset = ((INT)hTp->parser.latm.m_audioMuxLengthBytes * 8 +
(INT)FDKgetValidBits(hBs)) -
(INT)hTp->globalFramePos;
if (loasOffset != 0) {
FDKpushBiDirectional(hBs, loasOffset);
/* For ELD and other payloads there is an unknown amount of padding,
@ -871,7 +871,7 @@ static TRANSPORTDEC_ERROR transportDec_readHeader(
int fConfigFound = (pfConfigFound != NULL) ? *pfConfigFound : 0;
int startPos;
startPos = FDKgetValidBits(hBs);
startPos = (INT)FDKgetValidBits(hBs);
switch (hTp->transportFmt) {
case TT_MP4_ADTS:
@ -941,7 +941,7 @@ static TRANSPORTDEC_ERROR transportDec_readHeader(
fTraverseMoreFrames = 0;
}
syncLayerFrameBits = (hTp->parser.adts.bs.frame_length << 3) -
((INT)startPos - (INT)FDKgetValidBits(hBs)) -
(startPos - (INT)FDKgetValidBits(hBs)) -
syncLength;
if (syncLayerFrameBits <= 0) {
err = TRANSPORTDEC_SYNC_ERROR;
@ -952,7 +952,7 @@ static TRANSPORTDEC_ERROR transportDec_readHeader(
break;
case TT_MP4_LOAS:
if (hTp->numberOfRawDataBlocks <= 0) {
syncLayerFrameBits = FDKreadBits(hBs, 13);
syncLayerFrameBits = (INT)FDKreadBits(hBs, 13);
hTp->parser.latm.m_audioMuxLengthBytes = syncLayerFrameBits;
syncLayerFrameBits <<= 3;
}
@ -974,7 +974,7 @@ static TRANSPORTDEC_ERROR transportDec_readHeader(
hTp->numberOfRawDataBlocks =
CLatmDemux_GetNrOfSubFrames(&hTp->parser.latm);
if (hTp->transportFmt == TT_MP4_LOAS) {
syncLayerFrameBits -= startPos - FDKgetValidBits(hBs) - (13);
syncLayerFrameBits -= startPos - (INT)FDKgetValidBits(hBs) - (13);
}
}
} else {

4
libSACdec/src/sac_bitdec.cpp
View File

@ -291,13 +291,13 @@ SACDEC_ERROR SpatialDecParseSpecificConfigHeader(
if (sacHeaderLen == 127) {
sacHeaderLen += FDKreadBits(bitstream, 16);
}
numFillBits = FDKgetValidBits(bitstream);
numFillBits = (INT)FDKgetValidBits(bitstream);
err = SpatialDecParseSpecificConfig(bitstream, pSpatialSpecificConfig,
sacHeaderLen, coreCodec);
numFillBits -=
FDKgetValidBits(bitstream); /* the number of read bits (tmpBits) */
(INT)FDKgetValidBits(bitstream); /* the number of read bits (tmpBits) */
numFillBits = (8 * sacHeaderLen) - numFillBits;
if (numFillBits < 0) {
/* Parsing went wrong */

8
libSACdec/src/sac_dec_lib.cpp
View File

@ -1232,7 +1232,7 @@ int mpegSurroundDecoder_Parse(CMpegSurroundDecoder *pMpegSurroundDecoder,
FDK_ASSERT(pMpegSurroundDecoder->pSpatialDec);
mpsBsBits = FDKgetValidBits(hBs);
mpsBsBits = (INT)FDKgetValidBits(hBs);
sscParse = &pMpegSurroundDecoder
->spatialSpecificConfig[pMpegSurroundDecoder->bsFrameParse];
@ -1308,14 +1308,14 @@ int mpegSurroundDecoder_Parse(CMpegSurroundDecoder *pMpegSurroundDecoder,
pMpegSurroundDecoder->spatialSpecificConfigBackup;
/* Parse spatial specific config */
bitsRead = FDKgetValidBits(hMpsBsData);
bitsRead = (INT)FDKgetValidBits(hMpsBsData);
err = SpatialDecParseSpecificConfigHeader(
hMpsBsData,
&pMpegSurroundDecoder->spatialSpecificConfigBackup, coreCodec,
pMpegSurroundDecoder->upmixType);
bitsRead = (bitsRead - FDKgetValidBits(hMpsBsData));
bitsRead = (bitsRead - (INT)FDKgetValidBits(hMpsBsData));
parseResult = ((err == MPS_OK) ? bitsRead : -bitsRead);
if (parseResult < 0) {
@ -1429,7 +1429,7 @@ int mpegSurroundDecoder_Parse(CMpegSurroundDecoder *pMpegSurroundDecoder,
bail:
*pMpsDataBits -= (mpsBsBits - FDKgetValidBits(hBs));
*pMpsDataBits -= (mpsBsBits - (INT)FDKgetValidBits(hBs));
return err;
}