mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

fdk-aac: refresh patches 

A treewide script ran to find dirty patches, this was the only packages
found with issues. From now on the CI should no longer return false
positives on dirty patches.

Signed-off-by: Paul Spooren <mail@aparcar.org>
This commit is contained in:
Paul Spooren 2021-02-20 23:26:31 -10:00
parent 371549af83
commit ade990fa11
4 changed files with 142 additions and 747 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

442
sound/fdk-aac/patches-free/010-remove-sbr.patch
View File

File diff suppressed because it is too large Load Diff

126
sound/fdk-aac/patches-free/020-remove-hcx-rvlc-error.patch
View File

@ -52,8 +52,6 @@ Subject: Remove HCR, RVLC, error concealment
delete mode 100644 libAACdec/src/rvlcconceal.cpp delete mode 100644 libAACdec/src/rvlcconceal.cpp
delete mode 100644 libAACdec/src/rvlcconceal.h delete mode 100644 libAACdec/src/rvlcconceal.h
diff --git a/Makefile.am b/Makefile.am
index 79e0677..16b21e1 100644
--- a/Makefile.am --- a/Makefile.am
+++ b/Makefile.am +++ b/Makefile.am
@@ -50,9 +50,6 @@ AACDEC_SRC = \ @@ -50,9 +50,6 @@ AACDEC_SRC = \
@ -79,8 +77,6 @@ index 79e0677..16b21e1 100644
libAACdec/src/stereo.cpp \ libAACdec/src/stereo.cpp \
libAACdec/src/usacdec_ace_d4t64.cpp \ libAACdec/src/usacdec_ace_d4t64.cpp \
libAACdec/src/usacdec_ace_ltp.cpp \ libAACdec/src/usacdec_ace_ltp.cpp \
diff --git a/Makefile.vc b/Makefile.vc
index ac3c097..97a0615 100644
--- a/Makefile.vc --- a/Makefile.vc
+++ b/Makefile.vc +++ b/Makefile.vc
@@ -34,9 +34,6 @@ AACDEC_SRC = \ @@ -34,9 +34,6 @@ AACDEC_SRC = \
@ -106,8 +102,6 @@ index ac3c097..97a0615 100644
libAACdec/src/stereo.cpp \ libAACdec/src/stereo.cpp \
libAACdec/src/usacdec_ace_d4t64.cpp \ libAACdec/src/usacdec_ace_d4t64.cpp \
libAACdec/src/usacdec_ace_ltp.cpp \ libAACdec/src/usacdec_ace_ltp.cpp \
diff --git a/libAACdec/src/aac_ram.h b/libAACdec/src/aac_ram.h
index a861e25..7ee8d26 100644
--- a/libAACdec/src/aac_ram.h --- a/libAACdec/src/aac_ram.h
+++ b/libAACdec/src/aac_ram.h +++ b/libAACdec/src/aac_ram.h
@@ -111,9 +111,6 @@ amm-info@iis.fraunhofer.de @@ -111,9 +111,6 @@ amm-info@iis.fraunhofer.de
@ -120,8 +114,6 @@ index a861e25..7ee8d26 100644
/* End of formal fix.h */ /* End of formal fix.h */
#define MAX_SYNCHS 10 #define MAX_SYNCHS 10
diff --git a/libAACdec/src/aac_rom.cpp b/libAACdec/src/aac_rom.cpp
index cbdffc4..2c3c1b1 100644
--- a/libAACdec/src/aac_rom.cpp --- a/libAACdec/src/aac_rom.cpp
+++ b/libAACdec/src/aac_rom.cpp +++ b/libAACdec/src/aac_rom.cpp
@@ -1583,102 +1583,6 @@ const SCHAR *aQuantTable[] = { @@ -1583,102 +1583,6 @@ const SCHAR *aQuantTable[] = {
@ -227,8 +219,6 @@ index cbdffc4..2c3c1b1 100644
/* CB: 11 13 /* CB: 11 13
* 15 17 19 21 23 25 27 39 31 */ * 15 17 19 21 23 25 27 39 31 */
diff --git a/libAACdec/src/aac_rom.h b/libAACdec/src/aac_rom.h
index ffaf951..503e459 100644
--- a/libAACdec/src/aac_rom.h --- a/libAACdec/src/aac_rom.h
+++ b/libAACdec/src/aac_rom.h +++ b/libAACdec/src/aac_rom.h
@@ -105,8 +105,6 @@ amm-info@iis.fraunhofer.de @@ -105,8 +105,6 @@ amm-info@iis.fraunhofer.de
@ -249,9 +239,6 @@ index ffaf951..503e459 100644
extern const SCHAR aCodebook2StartInt[]; extern const SCHAR aCodebook2StartInt[];
diff --git a/libAACdec/src/aacdec_hcr.cpp b/libAACdec/src/aacdec_hcr.cpp
deleted file mode 100644
index 6114756..0000000
--- a/libAACdec/src/aacdec_hcr.cpp --- a/libAACdec/src/aacdec_hcr.cpp
+++ /dev/null +++ /dev/null
@@ -1,1498 +0,0 @@ @@ -1,1498 +0,0 @@
@ -1753,9 +1740,6 @@ index 6114756..0000000
- } - }
- } - }
-} -}
diff --git a/libAACdec/src/aacdec_hcr.h b/libAACdec/src/aacdec_hcr.h
deleted file mode 100644
index be21144..0000000
--- a/libAACdec/src/aacdec_hcr.h --- a/libAACdec/src/aacdec_hcr.h
+++ /dev/null +++ /dev/null
@@ -1,128 +0,0 @@ @@ -1,128 +0,0 @@
@ -1887,9 +1871,6 @@ index be21144..0000000
-INT getHcrType(H_HCR_INFO hHcr); -INT getHcrType(H_HCR_INFO hHcr);
- -
-#endif /* AACDEC_HCR_H */ -#endif /* AACDEC_HCR_H */
diff --git a/libAACdec/src/aacdec_hcr_bit.cpp b/libAACdec/src/aacdec_hcr_bit.cpp
deleted file mode 100644
index 0198659..0000000
--- a/libAACdec/src/aacdec_hcr_bit.cpp --- a/libAACdec/src/aacdec_hcr_bit.cpp
+++ /dev/null +++ /dev/null
@@ -1,164 +0,0 @@ @@ -1,164 +0,0 @@
@ -2057,9 +2038,6 @@ index 0198659..0000000
- -
- return (bit); - return (bit);
-} -}
diff --git a/libAACdec/src/aacdec_hcr_bit.h b/libAACdec/src/aacdec_hcr_bit.h
deleted file mode 100644
index 77242ac..0000000
--- a/libAACdec/src/aacdec_hcr_bit.h --- a/libAACdec/src/aacdec_hcr_bit.h
+++ /dev/null +++ /dev/null
@@ -1,114 +0,0 @@ @@ -1,114 +0,0 @@
@ -2177,9 +2155,6 @@ index 77242ac..0000000
- INT *pRightStartOfSegment, UCHAR readDirection); - INT *pRightStartOfSegment, UCHAR readDirection);
- -
-#endif /* AACDEC_HCR_BIT_H */ -#endif /* AACDEC_HCR_BIT_H */
diff --git a/libAACdec/src/aacdec_hcr_types.h b/libAACdec/src/aacdec_hcr_types.h
deleted file mode 100644
index 1cc3cb0..0000000
--- a/libAACdec/src/aacdec_hcr_types.h --- a/libAACdec/src/aacdec_hcr_types.h
+++ /dev/null +++ /dev/null
@@ -1,432 +0,0 @@ @@ -1,432 +0,0 @@
@ -2615,9 +2590,6 @@ index 1cc3cb0..0000000
-typedef CErHcrInfo *H_HCR_INFO; -typedef CErHcrInfo *H_HCR_INFO;
- -
-#endif /* AACDEC_HCR_TYPES_H */ -#endif /* AACDEC_HCR_TYPES_H */
diff --git a/libAACdec/src/aacdec_hcrs.cpp b/libAACdec/src/aacdec_hcrs.cpp
deleted file mode 100644
index d2bc867..0000000
--- a/libAACdec/src/aacdec_hcrs.cpp --- a/libAACdec/src/aacdec_hcrs.cpp
+++ /dev/null +++ /dev/null
@@ -1,1551 +0,0 @@ @@ -1,1551 +0,0 @@
@ -4172,9 +4144,6 @@ index d2bc867..0000000
- -
- return STOP_THIS_STATE; - return STOP_THIS_STATE;
-} -}
diff --git a/libAACdec/src/aacdec_hcrs.h b/libAACdec/src/aacdec_hcrs.h
deleted file mode 100644
index acb2f40..0000000
--- a/libAACdec/src/aacdec_hcrs.h --- a/libAACdec/src/aacdec_hcrs.h
+++ /dev/null +++ /dev/null
@@ -1,176 +0,0 @@ @@ -1,176 +0,0 @@
@ -4354,8 +4323,6 @@ index acb2f40..0000000
-UINT Hcr_State_BODY_SIGN_ESC__ESC_WORD(HANDLE_FDK_BITSTREAM, void*); -UINT Hcr_State_BODY_SIGN_ESC__ESC_WORD(HANDLE_FDK_BITSTREAM, void*);
- -
-#endif /* AACDEC_HCRS_H */ -#endif /* AACDEC_HCRS_H */
diff --git a/libAACdec/src/aacdecoder.cpp b/libAACdec/src/aacdecoder.cpp
index 2419ecc..6c03567 100644
--- a/libAACdec/src/aacdecoder.cpp --- a/libAACdec/src/aacdecoder.cpp
+++ b/libAACdec/src/aacdecoder.cpp +++ b/libAACdec/src/aacdecoder.cpp
@@ -163,17 +163,12 @@ amm-info@iis.fraunhofer.de @@ -163,17 +163,12 @@ amm-info@iis.fraunhofer.de
@ -4376,7 +4343,7 @@ index 2419ecc..6c03567 100644
#include "FDK_crc.h" #include "FDK_crc.h"
#define PS_IS_EXPLICITLY_DISABLED(aot, flags) \ #define PS_IS_EXPLICITLY_DISABLED(aot, flags) \
(((aot) == AOT_DRM_AAC) && !(flags & AC_PS_PRESENT)) (((aot) == AOT_DRM_AAC) && !(flags & AC_PS_PRESENT))
@@ -1191,10 +1186,6 @@ LINKSPEC_CPP HANDLE_AACDECODER CAacDecoder_Open( @@ -1191,10 +1186,6 @@ LINKSPEC_CPP HANDLE_AACDECODER CAacDecod
/* initialize progam config */ /* initialize progam config */
CProgramConfig_Init(&self->pce); CProgramConfig_Init(&self->pce);
@ -4387,7 +4354,7 @@ index 2419ecc..6c03567 100644
self->hDrcInfo = GetDrcInfo(); self->hDrcInfo = GetDrcInfo();
if (self->hDrcInfo == NULL) { if (self->hDrcInfo == NULL) {
goto bail; goto bail;
@@ -1202,8 +1193,7 @@ LINKSPEC_CPP HANDLE_AACDECODER CAacDecoder_Open( @@ -1202,8 +1193,7 @@ LINKSPEC_CPP HANDLE_AACDECODER CAacDecod
/* Init common DRC structure */ /* Init common DRC structure */
aacDecoder_drcInit(self->hDrcInfo); aacDecoder_drcInit(self->hDrcInfo);
/* Set default frame delay */ /* Set default frame delay */
@ -4397,7 +4364,7 @@ index 2419ecc..6c03567 100644
self->workBufferCore2 = GetWorkBufferCore2(); self->workBufferCore2 = GetWorkBufferCore2();
if (self->workBufferCore2 == NULL) goto bail; if (self->workBufferCore2 == NULL) goto bail;
@@ -2085,15 +2075,6 @@ CAacDecoder_Init(HANDLE_AACDECODER self, const CSAudioSpecificConfig *asc, @@ -2085,15 +2075,6 @@ CAacDecoder_Init(HANDLE_AACDECODER self,
if (self->pAacDecoderStaticChannelInfo[ch]->pCpeStaticData != if (self->pAacDecoderStaticChannelInfo[ch]->pCpeStaticData !=
NULL) { NULL) {
self->pAacDecoderStaticChannelInfo[ch] self->pAacDecoderStaticChannelInfo[ch]
@ -4413,7 +4380,7 @@ index 2419ecc..6c03567 100644
->pCpeStaticData->jointStereoPersistentData.scratchBuffer = ->pCpeStaticData->jointStereoPersistentData.scratchBuffer =
(FIXP_DBL *)self->pTimeData2; (FIXP_DBL *)self->pTimeData2;
} }
@@ -2193,12 +2174,6 @@ CAacDecoder_Init(HANDLE_AACDECODER self, const CSAudioSpecificConfig *asc, @@ -2193,12 +2174,6 @@ CAacDecoder_Init(HANDLE_AACDECODER self,
/* Delete mixdown metadata from the past */ /* Delete mixdown metadata from the past */
pcmDmx_Reset(self->hPcmUtils, PCMDMX_RESET_BS_DATA); pcmDmx_Reset(self->hPcmUtils, PCMDMX_RESET_BS_DATA);
@ -4426,7 +4393,7 @@ index 2419ecc..6c03567 100644
ch++; ch++;
chIdx++; chIdx++;
} }
@@ -2336,12 +2311,6 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame( @@ -2336,12 +2311,6 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecod
int ch; int ch;
/* Clear history */ /* Clear history */
for (ch = 0; ch < self->aacChannels; ch++) { for (ch = 0; ch < self->aacChannels; ch++) {
@ -4439,7 +4406,7 @@ index 2419ecc..6c03567 100644
/* Clear overlap-add buffers to avoid clicks. */ /* Clear overlap-add buffers to avoid clicks. */
FDKmemclear(self->pAacDecoderStaticChannelInfo[ch]->pOverlapBuffer, FDKmemclear(self->pAacDecoderStaticChannelInfo[ch]->pOverlapBuffer,
OverlapBufferSize * sizeof(FIXP_DBL)); OverlapBufferSize * sizeof(FIXP_DBL));
@@ -2403,15 +2372,6 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame( @@ -2403,15 +2372,6 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecod
if (ch >= self->aacChannels) { if (ch >= self->aacChannels) {
return AAC_DEC_UNKNOWN; return AAC_DEC_UNKNOWN;
} }
@ -4455,7 +4422,7 @@ index 2419ecc..6c03567 100644
ch++; ch++;
} }
} }
@@ -3081,13 +3041,8 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame( @@ -3081,13 +3041,8 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecod
* following concealment method, mark the frame as erroneous */ * following concealment method, mark the frame as erroneous */
{ {
CIcsInfo *pIcsInfo = &pAacDecoderChannelInfo->icsInfo; CIcsInfo *pIcsInfo = &pAacDecoderChannelInfo->icsInfo;
@ -4470,7 +4437,7 @@ index 2419ecc..6c03567 100644
const int icsIsInvalid = (GetScaleFactorBandsTransmitted(pIcsInfo) > const int icsIsInvalid = (GetScaleFactorBandsTransmitted(pIcsInfo) >
GetScaleFactorBandsTotal(pIcsInfo)); GetScaleFactorBandsTotal(pIcsInfo));
const int icsInfoUsedinFadeOut = const int icsInfoUsedinFadeOut =
@@ -3098,29 +3053,6 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame( @@ -3098,29 +3053,6 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecod
} }
} }
@ -4500,7 +4467,7 @@ index 2419ecc..6c03567 100644
if (flags & (AACDEC_INTR)) { if (flags & (AACDEC_INTR)) {
/* Reset DRC control data for this channel */ /* Reset DRC control data for this channel */
aacDecoder_drcInitChannelData(&pAacDecoderStaticChannelInfo->drcData); aacDecoder_drcInitChannelData(&pAacDecoderStaticChannelInfo->drcData);
@@ -3191,20 +3123,6 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame( @@ -3191,20 +3123,6 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecod
ErrorStatus = AAC_DEC_UNKNOWN; ErrorStatus = AAC_DEC_UNKNOWN;
break; break;
} }
@ -4521,7 +4488,7 @@ index 2419ecc..6c03567 100644
} }
} }
@@ -3249,11 +3167,6 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame( @@ -3249,11 +3167,6 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecod
} }
} }
@ -4533,8 +4500,6 @@ index 2419ecc..6c03567 100644
/* Map DRC data to StreamInfo structure */ /* Map DRC data to StreamInfo structure */
aacDecoder_drcGetInfo(self->hDrcInfo, &self->streamInfo.drcPresMode, aacDecoder_drcGetInfo(self->hDrcInfo, &self->streamInfo.drcPresMode,
&self->streamInfo.drcProgRefLev); &self->streamInfo.drcProgRefLev);
diff --git a/libAACdec/src/aacdecoder.h b/libAACdec/src/aacdecoder.h
index 0711160..3750389 100644
--- a/libAACdec/src/aacdecoder.h --- a/libAACdec/src/aacdecoder.h
+++ b/libAACdec/src/aacdecoder.h +++ b/libAACdec/src/aacdecoder.h
@@ -236,9 +236,6 @@ struct AAC_DECODER_INSTANCE { @@ -236,9 +236,6 @@ struct AAC_DECODER_INSTANCE {
@ -4547,8 +4512,6 @@ index 0711160..3750389 100644
CUsacCoreExtensions usacCoreExt; /*!< Data and handles to extend USAC FD/LPD CUsacCoreExtensions usacCoreExt; /*!< Data and handles to extend USAC FD/LPD
core decoder (SBR, MPS, ...) */ core decoder (SBR, MPS, ...) */
UINT numUsacElements[(1 * 1)]; UINT numUsacElements[(1 * 1)];
diff --git a/libAACdec/src/aacdecoder_lib.cpp b/libAACdec/src/aacdecoder_lib.cpp
index bde978e..1fc6ea0 100644
--- a/libAACdec/src/aacdecoder_lib.cpp --- a/libAACdec/src/aacdecoder_lib.cpp
+++ b/libAACdec/src/aacdecoder_lib.cpp +++ b/libAACdec/src/aacdecoder_lib.cpp
@@ -107,8 +107,6 @@ amm-info@iis.fraunhofer.de @@ -107,8 +107,6 @@ amm-info@iis.fraunhofer.de
@ -4560,7 +4523,7 @@ index bde978e..1fc6ea0 100644
#include "aacdec_drc.h" #include "aacdec_drc.h"
#include "sac_dec_lib.h" #include "sac_dec_lib.h"
@@ -280,26 +278,6 @@ static INT aacDecoder_ConfigCallback(void *handle, @@ -280,26 +278,6 @@ static INT aacDecoder_ConfigCallback(voi
{ err = aacDecoder_Config(self, pAscStruct, configMode, configChanged); } { err = aacDecoder_Config(self, pAscStruct, configMode, configChanged); }
} }
if (err == AAC_DEC_OK) { if (err == AAC_DEC_OK) {
@ -4587,7 +4550,7 @@ index bde978e..1fc6ea0 100644
errTp = TRANSPORTDEC_OK; errTp = TRANSPORTDEC_OK;
} else { } else {
if (err == AAC_DEC_NEED_TO_RESTART) { if (err == AAC_DEC_NEED_TO_RESTART) {
@@ -529,17 +507,12 @@ static AAC_DECODER_ERROR setConcealMethod( @@ -529,17 +507,12 @@ static AAC_DECODER_ERROR setConcealMetho
const HANDLE_AACDECODER self, /*!< Handle of the decoder instance */ const HANDLE_AACDECODER self, /*!< Handle of the decoder instance */
const INT method) { const INT method) {
AAC_DECODER_ERROR errorStatus = AAC_DEC_OK; AAC_DECODER_ERROR errorStatus = AAC_DEC_OK;
@ -4605,7 +4568,7 @@ index bde978e..1fc6ea0 100644
hDrcInfo = self->hDrcInfo; hDrcInfo = self->hDrcInfo;
hPcmDmx = self->hPcmUtils; hPcmDmx = self->hPcmUtils;
if (self->flags[0] & (AC_USAC | AC_RSVD50 | AC_RSV603DA) && method >= 2) { if (self->flags[0] & (AC_USAC | AC_RSVD50 | AC_RSV603DA) && method >= 2) {
@@ -555,33 +528,13 @@ static AAC_DECODER_ERROR setConcealMethod( @@ -555,33 +528,13 @@ static AAC_DECODER_ERROR setConcealMetho
} }
} }
@ -4641,7 +4604,7 @@ index bde978e..1fc6ea0 100644
switch (err) { switch (err) {
case PCMDMX_INVALID_HANDLE: case PCMDMX_INVALID_HANDLE:
errorStatus = AAC_DEC_INVALID_HANDLE; errorStatus = AAC_DEC_INVALID_HANDLE;
@@ -596,15 +549,10 @@ static AAC_DECODER_ERROR setConcealMethod( @@ -596,15 +549,10 @@ static AAC_DECODER_ERROR setConcealMetho
bail: bail:
if ((errorStatus != AAC_DEC_OK) && (errorStatus != AAC_DEC_INVALID_HANDLE)) { if ((errorStatus != AAC_DEC_OK) && (errorStatus != AAC_DEC_INVALID_HANDLE)) {
@ -4659,7 +4622,7 @@ index bde978e..1fc6ea0 100644
} }
return errorStatus; return errorStatus;
@@ -834,9 +782,6 @@ LINKSPEC_CPP AAC_DECODER_ERROR aacDecoder_SetParam( @@ -834,9 +782,6 @@ LINKSPEC_CPP AAC_DECODER_ERROR aacDecode
packed into a helper function which keeps all modules and libs in a packed into a helper function which keeps all modules and libs in a
consistent state even in the case an error occures. */ consistent state even in the case an error occures. */
errorStatus = setConcealMethod(self, value); errorStatus = setConcealMethod(self, value);
@ -4669,7 +4632,7 @@ index bde978e..1fc6ea0 100644
break; break;
default: default:
@@ -966,8 +911,7 @@ LINKSPEC_CPP HANDLE_AACDECODER aacDecoder_Open(TRANSPORT_TYPE transportFmt, @@ -966,8 +911,7 @@ LINKSPEC_CPP HANDLE_AACDECODER aacDecode
aacDec->limiterEnableCurr = 0; aacDec->limiterEnableCurr = 0;
/* Assure that all modules have same delay */ /* Assure that all modules have same delay */
@ -4679,7 +4642,7 @@ index bde978e..1fc6ea0 100644
err = -1; err = -1;
goto bail; goto bail;
} }
@@ -1359,9 +1303,7 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER self, INT_PCM *pTimeData_extern, @@ -1359,9 +1303,7 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER
break; break;
} }
@ -4690,7 +4653,7 @@ index bde978e..1fc6ea0 100644
self->frameOK = 0; /* if an error has occured do concealment in the SBR self->frameOK = 0; /* if an error has occured do concealment in the SBR
decoder too */ decoder too */
} }
@@ -1457,9 +1399,6 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER self, INT_PCM *pTimeData_extern, @@ -1457,9 +1399,6 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER
domain signal before the QMF synthesis. Therefore the DRC gains domain signal before the QMF synthesis. Therefore the DRC gains
need to be delayed by the QMF synthesis delay. */ need to be delayed by the QMF synthesis delay. */
if (self->mpsEnableCurr) drcDelay = 257; if (self->mpsEnableCurr) drcDelay = 257;
@ -4700,8 +4663,6 @@ index bde978e..1fc6ea0 100644
for (ch = 0; ch < self->streamInfo.numChannels; ch++) { for (ch = 0; ch < self->streamInfo.numChannels; ch++) {
UCHAR mapValue = FDK_chMapDescr_getMapValue( UCHAR mapValue = FDK_chMapDescr_getMapValue(
diff --git a/libAACdec/src/block.cpp b/libAACdec/src/block.cpp
index b3d09a6..a394cd7 100644
--- a/libAACdec/src/block.cpp --- a/libAACdec/src/block.cpp
+++ b/libAACdec/src/block.cpp +++ b/libAACdec/src/block.cpp
@@ -114,9 +114,6 @@ amm-info@iis.fraunhofer.de @@ -114,9 +114,6 @@ amm-info@iis.fraunhofer.de
@ -4714,7 +4675,7 @@ index b3d09a6..a394cd7 100644
#if defined(__arm__) #if defined(__arm__)
#include "arm/block_arm.cpp" #include "arm/block_arm.cpp"
#endif #endif
@@ -331,12 +328,7 @@ AAC_DECODER_ERROR CBlock_ReadSectionData( @@ -331,12 +328,7 @@ AAC_DECODER_ERROR CBlock_ReadSectionData
int group; int group;
UCHAR sect_cb; UCHAR sect_cb;
UCHAR *pCodeBook = pAacDecoderChannelInfo->pDynData->aCodeBook; UCHAR *pCodeBook = pAacDecoderChannelInfo->pDynData->aCodeBook;
@ -4727,7 +4688,7 @@ index b3d09a6..a394cd7 100644
const SHORT *BandOffsets = GetScaleFactorBandOffsets( const SHORT *BandOffsets = GetScaleFactorBandOffsets(
&pAacDecoderChannelInfo->icsInfo, pSamplingRateInfo); &pAacDecoderChannelInfo->icsInfo, pSamplingRateInfo);
pAacDecoderChannelInfo->pDynData->specificTo.aac.numberSection = 0; pAacDecoderChannelInfo->pDynData->specificTo.aac.numberSection = 0;
@@ -376,22 +368,8 @@ AAC_DECODER_ERROR CBlock_ReadSectionData( @@ -376,22 +368,8 @@ AAC_DECODER_ERROR CBlock_ReadSectionData
top = band + sect_len; top = band + sect_len;
if (flags & AC_ER_HCR) { if (flags & AC_ER_HCR) {
@ -4752,7 +4713,7 @@ index b3d09a6..a394cd7 100644
} }
/* Check spectral line limits */ /* Check spectral line limits */
@@ -718,41 +696,12 @@ AAC_DECODER_ERROR CBlock_ReadSpectralData( @@ -718,41 +696,12 @@ AAC_DECODER_ERROR CBlock_ReadSpectralDat
/* plain huffman decoding (short) finished */ /* plain huffman decoding (short) finished */
} }
@ -4796,8 +4757,6 @@ index b3d09a6..a394cd7 100644
if (IsLongBlock(&pAacDecoderChannelInfo->icsInfo) && if (IsLongBlock(&pAacDecoderChannelInfo->icsInfo) &&
!(flags & (AC_ELD | AC_SCALABLE))) { !(flags & (AC_ELD | AC_SCALABLE))) {
diff --git a/libAACdec/src/channel.cpp b/libAACdec/src/channel.cpp
index a020034..e17ccf4 100644
--- a/libAACdec/src/channel.cpp --- a/libAACdec/src/channel.cpp
+++ b/libAACdec/src/channel.cpp +++ b/libAACdec/src/channel.cpp
@@ -106,12 +106,6 @@ amm-info@iis.fraunhofer.de @@ -106,12 +106,6 @@ amm-info@iis.fraunhofer.de
@ -4852,8 +4811,6 @@ index a020034..e17ccf4 100644
} }
break; break;
diff --git a/libAACdec/src/channelinfo.h b/libAACdec/src/channelinfo.h
index 4523400..04f0012 100644
--- a/libAACdec/src/channelinfo.h --- a/libAACdec/src/channelinfo.h
+++ b/libAACdec/src/channelinfo.h +++ b/libAACdec/src/channelinfo.h
@@ -117,17 +117,12 @@ amm-info@iis.fraunhofer.de @@ -117,17 +117,12 @@ amm-info@iis.fraunhofer.de
@ -4912,9 +4869,6 @@ index 4523400..04f0012 100644
} CAacDecoderCommonData; } CAacDecoderCommonData;
typedef struct { typedef struct {
diff --git a/libAACdec/src/conceal.cpp b/libAACdec/src/conceal.cpp
deleted file mode 100644
index 5895cb8..0000000
--- a/libAACdec/src/conceal.cpp --- a/libAACdec/src/conceal.cpp
+++ /dev/null +++ /dev/null
@@ -1,2095 +0,0 @@ @@ -1,2095 +0,0 @@
@ -7013,9 +6967,6 @@ index 5895cb8..0000000
- } - }
- } - }
-} -}
diff --git a/libAACdec/src/conceal.h b/libAACdec/src/conceal.h
deleted file mode 100644
index e01a796..0000000
--- a/libAACdec/src/conceal.h --- a/libAACdec/src/conceal.h
+++ /dev/null +++ /dev/null
@@ -1,152 +0,0 @@ @@ -1,152 +0,0 @@
@ -7171,9 +7122,6 @@ index e01a796..0000000
- FIXP_PCM *pcmdata, FIXP_PCM *pcmdata_1); - FIXP_PCM *pcmdata, FIXP_PCM *pcmdata_1);
- -
-#endif /* #ifndef CONCEAL_H */ -#endif /* #ifndef CONCEAL_H */
diff --git a/libAACdec/src/conceal_types.h b/libAACdec/src/conceal_types.h
deleted file mode 100644
index d90374e..0000000
--- a/libAACdec/src/conceal_types.h --- a/libAACdec/src/conceal_types.h
+++ /dev/null +++ /dev/null
@@ -1,203 +0,0 @@ @@ -1,203 +0,0 @@
@ -7380,9 +7328,6 @@ index d90374e..0000000
-} CConcealmentInfo; -} CConcealmentInfo;
- -
-#endif /* #ifndef CONCEAL_TYPES_H */ -#endif /* #ifndef CONCEAL_TYPES_H */
diff --git a/libAACdec/src/rvlc.cpp b/libAACdec/src/rvlc.cpp
deleted file mode 100644
index b7a9be1..0000000
--- a/libAACdec/src/rvlc.cpp --- a/libAACdec/src/rvlc.cpp
+++ /dev/null +++ /dev/null
@@ -1,1217 +0,0 @@ @@ -1,1217 +0,0 @@
@ -8603,9 +8548,6 @@ index b7a9be1..0000000
- } - }
- } - }
-} -}
diff --git a/libAACdec/src/rvlc.h b/libAACdec/src/rvlc.h
deleted file mode 100644
index 9c60d51..0000000
--- a/libAACdec/src/rvlc.h --- a/libAACdec/src/rvlc.h
+++ /dev/null +++ /dev/null
@@ -1,153 +0,0 @@ @@ -1,153 +0,0 @@
@ -8762,9 +8704,6 @@ index 9c60d51..0000000
- const UINT flags, const INT elChannels); - const UINT flags, const INT elChannels);
- -
-#endif /* RVLC_H */ -#endif /* RVLC_H */
diff --git a/libAACdec/src/rvlc_info.h b/libAACdec/src/rvlc_info.h
deleted file mode 100644
index e7b3b99..0000000
--- a/libAACdec/src/rvlc_info.h --- a/libAACdec/src/rvlc_info.h
+++ /dev/null +++ /dev/null
@@ -1,204 +0,0 @@ @@ -1,204 +0,0 @@
@ -8972,9 +8911,6 @@ index e7b3b99..0000000
-typedef CErRvlcInfo RVLC_INFO; /* temp */ -typedef CErRvlcInfo RVLC_INFO; /* temp */
- -
-#endif /* RVLC_INFO_H */ -#endif /* RVLC_INFO_H */
diff --git a/libAACdec/src/rvlcbit.cpp b/libAACdec/src/rvlcbit.cpp
deleted file mode 100644
index b0c4596..0000000
--- a/libAACdec/src/rvlcbit.cpp --- a/libAACdec/src/rvlcbit.cpp
+++ /dev/null +++ /dev/null
@@ -1,148 +0,0 @@ @@ -1,148 +0,0 @@
@ -9126,9 +9062,6 @@ index b0c4596..0000000
- -
- return (bit); - return (bit);
-} -}
diff --git a/libAACdec/src/rvlcbit.h b/libAACdec/src/rvlcbit.h
deleted file mode 100644
index 2578453..0000000
--- a/libAACdec/src/rvlcbit.h --- a/libAACdec/src/rvlcbit.h
+++ /dev/null +++ /dev/null
@@ -1,111 +0,0 @@ @@ -1,111 +0,0 @@
@ -9243,9 +9176,6 @@ index 2578453..0000000
- INT *pPosition, UCHAR readDirection); - INT *pPosition, UCHAR readDirection);
- -
-#endif /* RVLCBIT_H */ -#endif /* RVLCBIT_H */
diff --git a/libAACdec/src/rvlcconceal.cpp b/libAACdec/src/rvlcconceal.cpp
deleted file mode 100644
index 77fda68..0000000
--- a/libAACdec/src/rvlcconceal.cpp --- a/libAACdec/src/rvlcconceal.cpp
+++ /dev/null +++ /dev/null
@@ -1,787 +0,0 @@ @@ -1,787 +0,0 @@
@ -10036,9 +9966,6 @@ index 77fda68..0000000
- } - }
- } - }
-} -}
diff --git a/libAACdec/src/rvlcconceal.h b/libAACdec/src/rvlcconceal.h
deleted file mode 100644
index 8e2062e..0000000
--- a/libAACdec/src/rvlcconceal.h --- a/libAACdec/src/rvlcconceal.h
+++ /dev/null +++ /dev/null
@@ -1,127 +0,0 @@ @@ -1,127 +0,0 @@
@ -10169,8 +10096,6 @@ index 8e2062e..0000000
- CAacDecoderStaticChannelInfo *pAacDecoderStaticChannelInfo); - CAacDecoderStaticChannelInfo *pAacDecoderStaticChannelInfo);
- -
-#endif /* RVLCCONCEAL_H */ -#endif /* RVLCCONCEAL_H */
diff --git a/libAACdec/src/usacdec_lpd.cpp b/libAACdec/src/usacdec_lpd.cpp
index 2110172..fcf7a76 100644
--- a/libAACdec/src/usacdec_lpd.cpp --- a/libAACdec/src/usacdec_lpd.cpp
+++ b/libAACdec/src/usacdec_lpd.cpp +++ b/libAACdec/src/usacdec_lpd.cpp
@@ -111,8 +111,6 @@ amm-info@iis.fraunhofer.de @@ -111,8 +111,6 @@ amm-info@iis.fraunhofer.de
@ -10182,7 +10107,7 @@ index 2110172..fcf7a76 100644
#include "block.h" #include "block.h"
#define SF_PITCH_TRACK 6 #define SF_PITCH_TRACK 6
@@ -1210,8 +1208,7 @@ AAC_DECODER_ERROR CLpdChannelStream_Read( @@ -1210,8 +1208,7 @@ AAC_DECODER_ERROR CLpdChannelStream_Read
: &lg_table_ccfl[1][lg_table_offset]; : &lg_table_ccfl[1][lg_table_offset];
int last_lpc_lost = pAacDecoderStaticChannelInfo->last_lpc_lost; int last_lpc_lost = pAacDecoderStaticChannelInfo->last_lpc_lost;
@ -10192,7 +10117,7 @@ index 2110172..fcf7a76 100644
INT i_offset; INT i_offset;
UINT samplingRate; UINT samplingRate;
@@ -1392,13 +1389,7 @@ AAC_DECODER_ERROR CLpdChannelStream_Read( @@ -1392,13 +1389,7 @@ AAC_DECODER_ERROR CLpdChannelStream_Read
} }
} }
@ -10207,7 +10132,7 @@ index 2110172..fcf7a76 100644
if (pAacDecoderStaticChannelInfo->last_lpd_mode == 255) { if (pAacDecoderStaticChannelInfo->last_lpd_mode == 255) {
/* We need it for TCX decoding or ACELP excitation update */ /* We need it for TCX decoding or ACELP excitation update */
E_LPC_f_lsp_a_conversion( E_LPC_f_lsp_a_conversion(
@@ -1426,9 +1417,7 @@ AAC_DECODER_ERROR CLpdChannelStream_Read( @@ -1426,9 +1417,7 @@ AAC_DECODER_ERROR CLpdChannelStream_Read
FD_SHORT; FD_SHORT;
pAacDecoderChannelInfo->data.usac.lpd_mode_last = 255; pAacDecoderChannelInfo->data.usac.lpd_mode_last = 255;
@ -10228,6 +10153,3 @@ index 2110172..fcf7a76 100644
/* Maintain LPD mode from previous frame */ /* Maintain LPD mode from previous frame */
if ((pAacDecoderStaticChannelInfo->last_core_mode == FD_LONG) || if ((pAacDecoderStaticChannelInfo->last_core_mode == FD_LONG) ||
--
cgit v1.1

253
sound/fdk-aac/patches-free/030-remove-mp3-surround.patch
View File

@ -124,8 +124,6 @@ Subject: Remove MPS surround sound encoder
delete mode 100644 libSACenc/src/sacenc_vectorfunctions.cpp delete mode 100644 libSACenc/src/sacenc_vectorfunctions.cpp
delete mode 100644 libSACenc/src/sacenc_vectorfunctions.h delete mode 100644 libSACenc/src/sacenc_vectorfunctions.h
diff --git a/Makefile.am b/Makefile.am
index 16b21e1..1550d95 100644
--- a/Makefile.am --- a/Makefile.am
+++ b/Makefile.am +++ b/Makefile.am
@@ -6,8 +6,6 @@ AM_CPPFLAGS = \ @@ -6,8 +6,6 @@ AM_CPPFLAGS = \
@ -189,7 +187,7 @@ index 16b21e1..1550d95 100644
$(PCMUTILS_SRC) $(FDK_SRC) $(SYS_SRC) $(PCMUTILS_SRC) $(FDK_SRC) $(SYS_SRC)
EXTRA_DIST = \ EXTRA_DIST = \
@@ -217,10 +184,6 @@ EXTRA_DIST = \ @@ -216,10 +183,6 @@ EXTRA_DIST = \
$(top_srcdir)/libArithCoding/include/*.h \ $(top_srcdir)/libArithCoding/include/*.h \
$(top_srcdir)/libDRCdec/include/*.h \ $(top_srcdir)/libDRCdec/include/*.h \
$(top_srcdir)/libDRCdec/src/*.h \ $(top_srcdir)/libDRCdec/src/*.h \
@ -200,8 +198,6 @@ index 16b21e1..1550d95 100644
$(top_srcdir)/libSYS/include/*.h \ $(top_srcdir)/libSYS/include/*.h \
$(top_srcdir)/libPCMutils/include/*.h \ $(top_srcdir)/libPCMutils/include/*.h \
$(top_srcdir)/libPCMutils/src/*.h \ $(top_srcdir)/libPCMutils/src/*.h \
diff --git a/Makefile.vc b/Makefile.vc
index 97a0615..54f3744 100644
--- a/Makefile.vc --- a/Makefile.vc
+++ b/Makefile.vc +++ b/Makefile.vc
@@ -21,8 +21,6 @@ AM_CPPFLAGS = \ @@ -21,8 +21,6 @@ AM_CPPFLAGS = \
@ -274,8 +270,6 @@ index 97a0615..54f3744 100644
del /f libSYS\src\*.obj 2>NUL del /f libSYS\src\*.obj 2>NUL
install: $(INST_DIRS) install: $(INST_DIRS)
diff --git a/libAACdec/src/aacdecoder.cpp b/libAACdec/src/aacdecoder.cpp
index 6c03567..cc3e245 100644
--- a/libAACdec/src/aacdecoder.cpp --- a/libAACdec/src/aacdecoder.cpp
+++ b/libAACdec/src/aacdecoder.cpp +++ b/libAACdec/src/aacdecoder.cpp
@@ -161,8 +161,6 @@ amm-info@iis.fraunhofer.de @@ -161,8 +161,6 @@ amm-info@iis.fraunhofer.de
@ -287,7 +281,7 @@ index 6c03567..cc3e245 100644
#include "usacdec_lpd.h" #include "usacdec_lpd.h"
#include "ac_arith_coder.h" #include "ac_arith_coder.h"
@@ -201,47 +199,6 @@ void CAacDecoder_SyncQmfMode(HANDLE_AACDECODER self) { @@ -201,47 +199,6 @@ void CAacDecoder_SyncQmfMode(HANDLE_AACD
} }
} }
@ -335,7 +329,7 @@ index 6c03567..cc3e245 100644
self->psPossible = self->psPossible =
((CAN_DO_PS(self->streamInfo.aot) && ((CAN_DO_PS(self->streamInfo.aot) &&
!PS_IS_EXPLICITLY_DISABLED(self->streamInfo.aot, self->flags[0]) && !PS_IS_EXPLICITLY_DISABLED(self->streamInfo.aot, self->flags[0]) &&
@@ -876,45 +833,6 @@ static AAC_DECODER_ERROR CAacDecoder_ExtPayloadParse( @@ -876,45 +833,6 @@ static AAC_DECODER_ERROR CAacDecoder_Ext
goto bail; goto bail;
} }
@ -381,7 +375,7 @@ index 6c03567..cc3e245 100644
/* Skip any trailing bytes */ /* Skip any trailing bytes */
FDKpushFor(hBs, *count); FDKpushFor(hBs, *count);
*count = 0; *count = 0;
@@ -1080,15 +998,8 @@ static AAC_DECODER_ERROR aacDecoder_ParseExplicitMpsAndSbr( @@ -1080,15 +998,8 @@ static AAC_DECODER_ERROR aacDecoder_Pars
if ((bitCnt > 0) && (self->flags[0] & (AC_USAC | AC_RSVD50))) { if ((bitCnt > 0) && (self->flags[0] & (AC_USAC | AC_RSVD50))) {
if ((self->flags[0] & AC_MPS_PRESENT) || if ((self->flags[0] & AC_MPS_PRESENT) ||
(self->elFlags[element_index] & AC_EL_USAC_MPS212)) { (self->elFlags[element_index] & AC_EL_USAC_MPS212)) {
@ -399,7 +393,7 @@ index 6c03567..cc3e245 100644
} }
} }
@@ -1581,58 +1492,6 @@ CAacDecoder_Init(HANDLE_AACDECODER self, const CSAudioSpecificConfig *asc, @@ -1581,58 +1492,6 @@ CAacDecoder_Init(HANDLE_AACDECODER self,
asc->m_sc.m_usacConfig.m_usacNumElements; asc->m_sc.m_usacConfig.m_usacNumElements;
} }
@ -458,7 +452,7 @@ index 6c03567..cc3e245 100644
self->hasAudioPreRoll = 0; self->hasAudioPreRoll = 0;
if (self->pUsacConfig[streamIndex]->m_usacNumElements) { if (self->pUsacConfig[streamIndex]->m_usacNumElements) {
self->hasAudioPreRoll = asc->m_sc.m_usacConfig.element[0] self->hasAudioPreRoll = asc->m_sc.m_usacConfig.element[0]
@@ -1764,7 +1623,6 @@ CAacDecoder_Init(HANDLE_AACDECODER self, const CSAudioSpecificConfig *asc, @@ -1764,7 +1623,6 @@ CAacDecoder_Init(HANDLE_AACDECODER self,
self->flags[streamIndex] |= (asc->m_hcrFlag) ? AC_ER_HCR : 0; self->flags[streamIndex] |= (asc->m_hcrFlag) ? AC_ER_HCR : 0;
if (asc->m_aot == AOT_ER_AAC_ELD) { if (asc->m_aot == AOT_ER_AAC_ELD) {
@ -466,7 +460,7 @@ index 6c03567..cc3e245 100644
self->flags[streamIndex] |= AC_ELD; self->flags[streamIndex] |= AC_ELD;
self->flags[streamIndex] |= self->flags[streamIndex] |=
(asc->m_sbrPresentFlag) (asc->m_sbrPresentFlag)
@@ -1776,9 +1634,7 @@ CAacDecoder_Init(HANDLE_AACDECODER self, const CSAudioSpecificConfig *asc, @@ -1776,9 +1634,7 @@ CAacDecoder_Init(HANDLE_AACDECODER self,
self->flags[streamIndex] |= self->flags[streamIndex] |=
(asc->m_sc.m_eldSpecificConfig.m_useLdQmfTimeAlign) ? AC_MPS_PRESENT (asc->m_sc.m_eldSpecificConfig.m_useLdQmfTimeAlign) ? AC_MPS_PRESENT
: 0; : 0;
@ -477,7 +471,7 @@ index 6c03567..cc3e245 100644
} }
self->flags[streamIndex] |= (asc->m_aot == AOT_ER_AAC_LD) ? AC_LD : 0; self->flags[streamIndex] |= (asc->m_aot == AOT_ER_AAC_LD) ? AC_LD : 0;
self->flags[streamIndex] |= (asc->m_epConfig >= 0) ? AC_ER : 0; self->flags[streamIndex] |= (asc->m_epConfig >= 0) ? AC_ER : 0;
@@ -1867,14 +1723,6 @@ CAacDecoder_Init(HANDLE_AACDECODER self, const CSAudioSpecificConfig *asc, @@ -1867,14 +1723,6 @@ CAacDecoder_Init(HANDLE_AACDECODER self,
case AOT_USAC: case AOT_USAC:
break; break;
case AOT_ER_AAC_ELD: case AOT_ER_AAC_ELD:
@ -492,7 +486,7 @@ index 6c03567..cc3e245 100644
break; break;
default: default:
self->qmfDomain.globalConf.qmfDomainExplicitConfig = self->qmfDomain.globalConf.qmfDomainExplicitConfig =
@@ -3128,8 +2976,6 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame( @@ -3128,8 +2976,6 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecod
if (self->flags[streamIndex] & AC_USAC) { if (self->flags[streamIndex] & AC_USAC) {
int bsPseudoLr = 0; int bsPseudoLr = 0;
@ -501,11 +495,9 @@ index 6c03567..cc3e245 100644
/* ISO/IEC 23003-3, 7.11.2.6 Modification of core decoder output (pseudo /* ISO/IEC 23003-3, 7.11.2.6 Modification of core decoder output (pseudo
* LR) */ * LR) */
if ((aacChannels == 2) && bsPseudoLr) { if ((aacChannels == 2) && bsPseudoLr) {
diff --git a/libAACdec/src/aacdecoder.h b/libAACdec/src/aacdecoder.h
index 3750389..a57b0bb 100644
--- a/libAACdec/src/aacdecoder.h --- a/libAACdec/src/aacdecoder.h
+++ b/libAACdec/src/aacdecoder.h +++ b/libAACdec/src/aacdecoder.h
@@ -276,17 +276,6 @@ This structure is allocated once for each CPE. */ @@ -276,17 +276,6 @@ This structure is allocated once for eac
HANDLE_AAC_DRC hDrcInfo; /*!< handle to DRC data structure */ HANDLE_AAC_DRC hDrcInfo; /*!< handle to DRC data structure */
INT metadataExpiry; /*!< Metadata expiry time in milli-seconds. */ INT metadataExpiry; /*!< Metadata expiry time in milli-seconds. */
@ -523,8 +515,6 @@ index 3750389..a57b0bb 100644
CAncData ancData; /*!< structure to handle ancillary data */ CAncData ancData; /*!< structure to handle ancillary data */
HANDLE_PCM_DOWNMIX hPcmUtils; /*!< privat data for the PCM utils. */ HANDLE_PCM_DOWNMIX hPcmUtils; /*!< privat data for the PCM utils. */
diff --git a/libAACdec/src/aacdecoder_lib.cpp b/libAACdec/src/aacdecoder_lib.cpp
index 1fc6ea0..e49d502 100644
--- a/libAACdec/src/aacdecoder_lib.cpp --- a/libAACdec/src/aacdecoder_lib.cpp
+++ b/libAACdec/src/aacdecoder_lib.cpp +++ b/libAACdec/src/aacdecoder_lib.cpp
@@ -109,8 +109,6 @@ amm-info@iis.fraunhofer.de @@ -109,8 +109,6 @@ amm-info@iis.fraunhofer.de
@ -536,7 +526,7 @@ index 1fc6ea0..e49d502 100644
#include "pcm_utils.h" #include "pcm_utils.h"
/* Decoder library info */ /* Decoder library info */
@@ -306,14 +304,6 @@ static INT aacDecoder_FreeMemCallback(void *handle, @@ -306,14 +304,6 @@ static INT aacDecoder_FreeMemCallback(vo
errTp = TRANSPORTDEC_UNKOWN_ERROR; errTp = TRANSPORTDEC_UNKOWN_ERROR;
} }
@ -551,7 +541,7 @@ index 1fc6ea0..e49d502 100644
/* free persistent qmf domain buffer, QmfWorkBufferCore3, QmfWorkBufferCore4, /* free persistent qmf domain buffer, QmfWorkBufferCore3, QmfWorkBufferCore4,
* QmfWorkBufferCore5 and configuration variables */ * QmfWorkBufferCore5 and configuration variables */
FDK_QmfDomain_FreeMem(&self->qmfDomain); FDK_QmfDomain_FreeMem(&self->qmfDomain);
@@ -344,44 +334,9 @@ static INT aacDecoder_SscCallback(void *handle, HANDLE_FDK_BITSTREAM hBs, @@ -344,44 +334,9 @@ static INT aacDecoder_SscCallback(void *
const INT coreSbrFrameLengthIndex, const INT coreSbrFrameLengthIndex,
const INT configBytes, const UCHAR configMode, const INT configBytes, const UCHAR configMode,
UCHAR *configChanged) { UCHAR *configChanged) {
@ -597,7 +587,7 @@ index 1fc6ea0..e49d502 100644
return (INT)errTp; return (INT)errTp;
} }
@@ -451,8 +406,6 @@ static int isSupportedMpsConfig(AUDIO_OBJECT_TYPE aot, @@ -451,8 +406,6 @@ static int isSupportedMpsConfig(AUDIO_OB
FDKinitLibInfo(libInfo); FDKinitLibInfo(libInfo);
@ -606,7 +596,7 @@ index 1fc6ea0..e49d502 100644
mpsCaps = FDKlibInfo_getCapabilities(libInfo, FDK_MPSDEC); mpsCaps = FDKlibInfo_getCapabilities(libInfo, FDK_MPSDEC);
if (!(mpsCaps & CAPF_MPS_LD) && IS_LOWDELAY(aot)) { if (!(mpsCaps & CAPF_MPS_LD) && IS_LOWDELAY(aot)) {
@@ -869,19 +822,6 @@ LINKSPEC_CPP HANDLE_AACDECODER aacDecoder_Open(TRANSPORT_TYPE transportFmt, @@ -869,19 +822,6 @@ LINKSPEC_CPP HANDLE_AACDECODER aacDecode
FDKmemclear(&aacDec->qmfDomain, sizeof(FDK_QMF_DOMAIN)); FDKmemclear(&aacDec->qmfDomain, sizeof(FDK_QMF_DOMAIN));
aacDec->qmfModeUser = NOT_DEFINED; aacDec->qmfModeUser = NOT_DEFINED;
@ -626,7 +616,7 @@ index 1fc6ea0..e49d502 100644
{ {
if (FDK_drcDec_Open(&(aacDec->hUniDrcDecoder), DRC_DEC_ALL) != 0) { if (FDK_drcDec_Open(&(aacDec->hUniDrcDecoder), DRC_DEC_ALL) != 0) {
err = -1; err = -1;
@@ -952,12 +892,6 @@ LINKSPEC_CPP AAC_DECODER_ERROR aacDecoder_Fill(HANDLE_AACDECODER self, @@ -952,12 +892,6 @@ LINKSPEC_CPP AAC_DECODER_ERROR aacDecode
static void aacDecoder_SignalInterruption(HANDLE_AACDECODER self) { static void aacDecoder_SignalInterruption(HANDLE_AACDECODER self) {
CAacDecoder_SignalInterruption(self); CAacDecoder_SignalInterruption(self);
@ -639,7 +629,7 @@ index 1fc6ea0..e49d502 100644
} }
static void aacDecoder_UpdateBitStreamCounters(CStreamInfo *pSi, static void aacDecoder_UpdateBitStreamCounters(CStreamInfo *pSi,
@@ -1157,9 +1091,6 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER self, INT_PCM *pTimeData_extern, @@ -1157,9 +1091,6 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER
Tell other modules to clear states if required. */ Tell other modules to clear states if required. */
if (flags & AACDEC_CLRHIST) { if (flags & AACDEC_CLRHIST) {
if (!(self->flags[0] & AC_USAC)) { if (!(self->flags[0] & AC_USAC)) {
@ -649,7 +639,7 @@ index 1fc6ea0..e49d502 100644
if (FDK_QmfDomain_ClearPersistentMemory(&self->qmfDomain) != 0) { if (FDK_QmfDomain_ClearPersistentMemory(&self->qmfDomain) != 0) {
ErrorStatus = AAC_DEC_UNKNOWN; ErrorStatus = AAC_DEC_UNKNOWN;
goto bail; goto bail;
@@ -1247,48 +1178,8 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER self, INT_PCM *pTimeData_extern, @@ -1247,48 +1178,8 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER
self->streamInfo.frameSize, 0); self->streamInfo.frameSize, 0);
} }
@ -698,7 +688,7 @@ index 1fc6ea0..e49d502 100644
self->qmfDomain.globalConf.TDinput = pTimeData; self->qmfDomain.globalConf.TDinput = pTimeData;
switch (FDK_QmfDomain_Configure(&self->qmfDomain)) { switch (FDK_QmfDomain_Configure(&self->qmfDomain)) {
@@ -1308,61 +1199,6 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER self, INT_PCM *pTimeData_extern, @@ -1308,61 +1199,6 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER
decoder too */ decoder too */
} }
@ -760,7 +750,7 @@ index 1fc6ea0..e49d502 100644
/* Use dedicated memory for PCM postprocessing */ /* Use dedicated memory for PCM postprocessing */
pTimeDataPcmPost = self->pTimeData2; pTimeDataPcmPost = self->pTimeData2;
timeDataPcmPostSize = self->timeData2Size; timeDataPcmPostSize = self->timeData2Size;
@@ -1395,11 +1231,6 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER self, INT_PCM *pTimeData_extern, @@ -1395,11 +1231,6 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER
reverseOutChannelMap[ch] = ch; reverseOutChannelMap[ch] = ch;
} }
@ -772,7 +762,7 @@ index 1fc6ea0..e49d502 100644
for (ch = 0; ch < self->streamInfo.numChannels; ch++) { for (ch = 0; ch < self->streamInfo.numChannels; ch++) {
UCHAR mapValue = FDK_chMapDescr_getMapValue( UCHAR mapValue = FDK_chMapDescr_getMapValue(
&self->mapDescr, (UCHAR)ch, self->chMapIndex); &self->mapDescr, (UCHAR)ch, self->chMapIndex);
@@ -1411,27 +1242,7 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER self, INT_PCM *pTimeData_extern, @@ -1411,27 +1242,7 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER
if (mapValue < (8)) reverseOutChannelMap[mapValue] = ch; if (mapValue < (8)) reverseOutChannelMap[mapValue] = ch;
} }
@ -801,7 +791,7 @@ index 1fc6ea0..e49d502 100644
drcWorkBuffer = (FIXP_DBL *)pTimeDataPcmPost; drcWorkBuffer = (FIXP_DBL *)pTimeDataPcmPost;
} }
@@ -1488,7 +1299,6 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER self, INT_PCM *pTimeData_extern, @@ -1488,7 +1299,6 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER
} }
INT interleaved = 0; INT interleaved = 0;
@ -809,7 +799,7 @@ index 1fc6ea0..e49d502 100644
/* do PCM post processing */ /* do PCM post processing */
dmxErr = pcmDmx_ApplyFrame( dmxErr = pcmDmx_ApplyFrame(
@@ -1525,8 +1335,7 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER self, INT_PCM *pTimeData_extern, @@ -1525,8 +1335,7 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER
pcmLimiter_SetSampleRate(self->hLimiter, self->streamInfo.sampleRate); pcmLimiter_SetSampleRate(self->hLimiter, self->streamInfo.sampleRate);
pcmLimiterScale += PCM_OUT_HEADROOM; pcmLimiterScale += PCM_OUT_HEADROOM;
@ -819,7 +809,7 @@ index 1fc6ea0..e49d502 100644
pInterleaveBuffer = (PCM_LIM *)pTimeDataPcmPost; pInterleaveBuffer = (PCM_LIM *)pTimeDataPcmPost;
} else { } else {
pInterleaveBuffer = (PCM_LIM *)pTimeData; pInterleaveBuffer = (PCM_LIM *)pTimeData;
@@ -1549,8 +1358,7 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER self, INT_PCM *pTimeData_extern, @@ -1549,8 +1358,7 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER
/* If numChannels = 1 we do not need interleaving. The same applies if /* If numChannels = 1 we do not need interleaving. The same applies if
SBR or MPS are used, since their output is interleaved already SBR or MPS are used, since their output is interleaved already
(resampled or not) */ (resampled or not) */
@ -829,7 +819,7 @@ index 1fc6ea0..e49d502 100644
scaleValuesSaturate( scaleValuesSaturate(
pTimeData, pTimeDataPcmPost, pTimeData, pTimeDataPcmPost,
self->streamInfo.frameSize * self->streamInfo.numChannels, self->streamInfo.frameSize * self->streamInfo.numChannels,
@@ -1688,11 +1496,6 @@ LINKSPEC_CPP void aacDecoder_Close(HANDLE_AACDECODER self) { @@ -1688,11 +1496,6 @@ LINKSPEC_CPP void aacDecoder_Close(HANDL
FDK_drcDec_Close(&self->hUniDrcDecoder); FDK_drcDec_Close(&self->hUniDrcDecoder);
@ -841,7 +831,7 @@ index 1fc6ea0..e49d502 100644
if (self->hInput != NULL) { if (self->hInput != NULL) {
transportDec_Close(&self->hInput); transportDec_Close(&self->hInput);
} }
@@ -1711,7 +1514,6 @@ LINKSPEC_CPP INT aacDecoder_GetLibInfo(LIB_INFO *info) { @@ -1711,7 +1514,6 @@ LINKSPEC_CPP INT aacDecoder_GetLibInfo(L
return -1; return -1;
} }
@ -849,8 +839,6 @@ index 1fc6ea0..e49d502 100644
transportDec_GetLibInfo(info); transportDec_GetLibInfo(info);
FDK_toolsGetLibInfo(info); FDK_toolsGetLibInfo(info);
pcmDmx_GetLibInfo(info); pcmDmx_GetLibInfo(info);
diff --git a/libAACenc/src/aacenc_lib.cpp b/libAACenc/src/aacenc_lib.cpp
index 51f3f49..7382106 100644
--- a/libAACenc/src/aacenc_lib.cpp --- a/libAACenc/src/aacenc_lib.cpp
+++ b/libAACenc/src/aacenc_lib.cpp +++ b/libAACenc/src/aacenc_lib.cpp
@@ -130,8 +130,6 @@ amm-info@iis.fraunhofer.de @@ -130,8 +130,6 @@ amm-info@iis.fraunhofer.de
@ -871,7 +859,7 @@ index 51f3f49..7382106 100644
/* Transport */ /* Transport */
HANDLE_TRANSPORTENC hTpEnc; HANDLE_TRANSPORTENC hTpEnc;
@@ -541,14 +537,6 @@ static INT aacEncoder_LimitBitrate(const HANDLE_TRANSPORTENC hTpEnc, @@ -541,14 +537,6 @@ static INT aacEncoder_LimitBitrate(const
nChannels, cm.nChannelsEff, bitRate, -1, nChannels, cm.nChannelsEff, bitRate, -1,
NULL, AACENC_BR_MODE_INVALID, nSubFrames); NULL, AACENC_BR_MODE_INVALID, nSubFrames);
@ -886,7 +874,7 @@ index 51f3f49..7382106 100644
return bitRate; return bitRate;
} }
@@ -863,17 +851,6 @@ static AACENC_ERROR FDKaacEnc_AdjustEncSettings(HANDLE_AACENCODER hAacEncoder, @@ -863,17 +851,6 @@ static AACENC_ERROR FDKaacEnc_AdjustEncS
return err; return err;
} }
@ -904,7 +892,7 @@ index 51f3f49..7382106 100644
static AACENC_ERROR aacEncInit(HANDLE_AACENCODER hAacEncoder, ULONG InitFlags, static AACENC_ERROR aacEncInit(HANDLE_AACENCODER hAacEncoder, ULONG InitFlags,
USER_PARAM *config) { USER_PARAM *config) {
AACENC_ERROR err = AACENC_OK; AACENC_ERROR err = AACENC_OK;
@@ -918,23 +895,6 @@ static AACENC_ERROR aacEncInit(HANDLE_AACENCODER hAacEncoder, ULONG InitFlags, @@ -918,23 +895,6 @@ static AACENC_ERROR aacEncInit(HANDLE_AA
hAacConfig->ancDataBitRate = 0; hAacConfig->ancDataBitRate = 0;
} }
@ -928,7 +916,7 @@ index 51f3f49..7382106 100644
/* /*
* Initialize Transport - Module. * Initialize Transport - Module.
*/ */
@@ -994,13 +954,7 @@ static AACENC_ERROR aacEncInit(HANDLE_AACENCODER hAacEncoder, ULONG InitFlags, @@ -994,13 +954,7 @@ static AACENC_ERROR aacEncInit(HANDLE_AA
hAacEncoder->nDelay += FDK_MetadataEnc_GetDelay(hAacEncoder->hMetadataEnc); hAacEncoder->nDelay += FDK_MetadataEnc_GetDelay(hAacEncoder->hMetadataEnc);
} }
@ -943,7 +931,7 @@ index 51f3f49..7382106 100644
hAacEncoder->nDelayCore = hAacEncoder->nDelay; hAacEncoder->nDelayCore = hAacEncoder->nDelay;
} }
@@ -1120,14 +1074,6 @@ AACENC_ERROR aacEncOpen(HANDLE_AACENCODER *phAacEncoder, const UINT encModules, @@ -1120,14 +1074,6 @@ AACENC_ERROR aacEncOpen(HANDLE_AACENCODE
} }
} /* (encoder_modis&ENC_MODE_FLAG_META) */ } /* (encoder_modis&ENC_MODE_FLAG_META) */
@ -958,7 +946,7 @@ index 51f3f49..7382106 100644
/* Open Transport Encoder */ /* Open Transport Encoder */
if (transportEnc_Open(&hAacEncoder->hTpEnc) != 0) { if (transportEnc_Open(&hAacEncoder->hTpEnc) != 0) {
err = AACENC_MEMORY_ERROR; err = AACENC_MEMORY_ERROR;
@@ -1146,11 +1092,6 @@ AACENC_ERROR aacEncOpen(HANDLE_AACENCODER *phAacEncoder, const UINT encModules, @@ -1146,11 +1092,6 @@ AACENC_ERROR aacEncOpen(HANDLE_AACENCODE
C_ALLOC_SCRATCH_END(_pLibInfo, LIB_INFO, FDK_MODULE_LAST) C_ALLOC_SCRATCH_END(_pLibInfo, LIB_INFO, FDK_MODULE_LAST)
} }
@ -970,7 +958,7 @@ index 51f3f49..7382106 100644
/* Initialize encoder instance with default parameters. */ /* Initialize encoder instance with default parameters. */
aacEncDefaultConfig(&hAacEncoder->aacConfig, &hAacEncoder->extParam); aacEncDefaultConfig(&hAacEncoder->aacConfig, &hAacEncoder->extParam);
@@ -1202,9 +1143,6 @@ AACENC_ERROR aacEncClose(HANDLE_AACENCODER *phAacEncoder) { @@ -1202,9 +1143,6 @@ AACENC_ERROR aacEncClose(HANDLE_AACENCOD
if (hAacEncoder->hMetadataEnc) { if (hAacEncoder->hMetadataEnc) {
FDK_MetadataEnc_Close(&hAacEncoder->hMetadataEnc); FDK_MetadataEnc_Close(&hAacEncoder->hMetadataEnc);
} }
@ -980,7 +968,7 @@ index 51f3f49..7382106 100644
Free_AacEncoder(phAacEncoder); Free_AacEncoder(phAacEncoder);
} }
@@ -1399,30 +1337,6 @@ AACENC_ERROR aacEncEncode(const HANDLE_AACENCODER hAacEncoder, @@ -1399,30 +1337,6 @@ AACENC_ERROR aacEncEncode(const HANDLE_A
} }
} }
@ -1011,7 +999,7 @@ index 51f3f49..7382106 100644
if ((inargs->numAncBytes > 0) && if ((inargs->numAncBytes > 0) &&
(getBufDescIdx(inBufDesc, IN_ANCILLRY_DATA) != -1)) { (getBufDescIdx(inBufDesc, IN_ANCILLRY_DATA) != -1)) {
INT idx = getBufDescIdx(inBufDesc, IN_ANCILLRY_DATA); INT idx = getBufDescIdx(inBufDesc, IN_ANCILLRY_DATA);
@@ -1528,7 +1442,6 @@ AACENC_ERROR aacEncGetLibInfo(LIB_INFO *info) { @@ -1528,7 +1442,6 @@ AACENC_ERROR aacEncGetLibInfo(LIB_INFO *
FDK_toolsGetLibInfo(info); FDK_toolsGetLibInfo(info);
transportEnc_GetLibInfo(info); transportEnc_GetLibInfo(info);
@ -1019,7 +1007,7 @@ index 51f3f49..7382106 100644
/* search for next free tab */ /* search for next free tab */
for (i = 0; i < FDK_MODULE_LAST; i++) { for (i = 0; i < FDK_MODULE_LAST; i++) {
@@ -1645,11 +1558,7 @@ AACENC_ERROR aacEncoder_SetParam(const HANDLE_AACENCODER hAacEncoder, @@ -1645,11 +1558,7 @@ AACENC_ERROR aacEncoder_SetParam(const H
break; break;
case AACENC_CHANNELMODE: case AACENC_CHANNELMODE:
if (settings->userChannelMode != (CHANNEL_MODE)value) { if (settings->userChannelMode != (CHANNEL_MODE)value) {
@ -1032,9 +1020,6 @@ index 51f3f49..7382106 100644
const CHANNEL_MODE_CONFIG_TAB *pConfig = const CHANNEL_MODE_CONFIG_TAB *pConfig =
FDKaacEnc_GetChannelModeConfiguration((CHANNEL_MODE)value); FDKaacEnc_GetChannelModeConfiguration((CHANNEL_MODE)value);
if (pConfig == NULL) { if (pConfig == NULL) {
diff --git a/libAACenc/src/mps_main.cpp b/libAACenc/src/mps_main.cpp
deleted file mode 100644
index 1048228..0000000
--- a/libAACenc/src/mps_main.cpp --- a/libAACenc/src/mps_main.cpp
+++ /dev/null +++ /dev/null
@@ -1,529 +0,0 @@ @@ -1,529 +0,0 @@
@ -1567,9 +1552,6 @@ index 1048228..0000000
- -
- return error; - return error;
-} -}
diff --git a/libAACenc/src/mps_main.h b/libAACenc/src/mps_main.h
deleted file mode 100644
index f56678a..0000000
--- a/libAACenc/src/mps_main.h --- a/libAACenc/src/mps_main.h
+++ /dev/null +++ /dev/null
@@ -1,270 +0,0 @@ @@ -1,270 +0,0 @@
@ -1843,9 +1825,6 @@ index f56678a..0000000
-MPS_ENCODER_ERROR FDK_MpegsEnc_GetLibInfo(LIB_INFO *info); -MPS_ENCODER_ERROR FDK_MpegsEnc_GetLibInfo(LIB_INFO *info);
- -
-#endif /* MPS_MAIN_H */ -#endif /* MPS_MAIN_H */
diff --git a/libSACdec/include/sac_dec_errorcodes.h b/libSACdec/include/sac_dec_errorcodes.h
deleted file mode 100644
index ee8b9f8..0000000
--- a/libSACdec/include/sac_dec_errorcodes.h --- a/libSACdec/include/sac_dec_errorcodes.h
+++ /dev/null +++ /dev/null
@@ -1,157 +0,0 @@ @@ -1,157 +0,0 @@
@ -2006,9 +1985,6 @@ index ee8b9f8..0000000
-} SACDEC_ERROR; -} SACDEC_ERROR;
- -
-#endif -#endif
diff --git a/libSACdec/include/sac_dec_lib.h b/libSACdec/include/sac_dec_lib.h
deleted file mode 100644
index 9913279..0000000
--- a/libSACdec/include/sac_dec_lib.h --- a/libSACdec/include/sac_dec_lib.h
+++ /dev/null +++ /dev/null
@@ -1,477 +0,0 @@ @@ -1,477 +0,0 @@
@ -2489,9 +2465,6 @@ index 9913279..0000000
-#endif /* __cplusplus */ -#endif /* __cplusplus */
- -
-#endif /* #ifndef SAC_DEC_LIB_H */ -#endif /* #ifndef SAC_DEC_LIB_H */
diff --git a/libSACdec/src/sac_bitdec.cpp b/libSACdec/src/sac_bitdec.cpp
deleted file mode 100644
index 883e1e8..0000000
--- a/libSACdec/src/sac_bitdec.cpp --- a/libSACdec/src/sac_bitdec.cpp
+++ /dev/null +++ /dev/null
@@ -1,2167 +0,0 @@ @@ -1,2167 +0,0 @@
@ -4662,9 +4635,6 @@ index 883e1e8..0000000
- FDK_FREE_MEMORY_1D(pBs->ICCLosslessData); - FDK_FREE_MEMORY_1D(pBs->ICCLosslessData);
- } - }
-} -}
diff --git a/libSACdec/src/sac_bitdec.h b/libSACdec/src/sac_bitdec.h
deleted file mode 100644
index cb0c7d2..0000000
--- a/libSACdec/src/sac_bitdec.h --- a/libSACdec/src/sac_bitdec.h
+++ /dev/null +++ /dev/null
@@ -1,161 +0,0 @@ @@ -1,161 +0,0 @@
@ -4829,9 +4799,6 @@ index cb0c7d2..0000000
- spatialDec *self, SPATIAL_SPECIFIC_CONFIG *pSpatialSpecificConfig); - spatialDec *self, SPATIAL_SPECIFIC_CONFIG *pSpatialSpecificConfig);
- -
-#endif -#endif
diff --git a/libSACdec/src/sac_calcM1andM2.cpp b/libSACdec/src/sac_calcM1andM2.cpp
deleted file mode 100644
index 6e5a145..0000000
--- a/libSACdec/src/sac_calcM1andM2.cpp --- a/libSACdec/src/sac_calcM1andM2.cpp
+++ /dev/null +++ /dev/null
@@ -1,848 +0,0 @@ @@ -1,848 +0,0 @@
@ -5683,9 +5650,6 @@ index 6e5a145..0000000
- -
- return err; - return err;
-} -}
diff --git a/libSACdec/src/sac_calcM1andM2.h b/libSACdec/src/sac_calcM1andM2.h
deleted file mode 100644
index 996238d..0000000
--- a/libSACdec/src/sac_calcM1andM2.h --- a/libSACdec/src/sac_calcM1andM2.h
+++ /dev/null +++ /dev/null
@@ -1,129 +0,0 @@ @@ -1,129 +0,0 @@
@ -5818,9 +5782,6 @@ index 996238d..0000000
- const SPATIAL_BS_FRAME* frame); - const SPATIAL_BS_FRAME* frame);
- -
-#endif /* SAC_CALCM1ANDM2_H */ -#endif /* SAC_CALCM1ANDM2_H */
diff --git a/libSACdec/src/sac_dec.cpp b/libSACdec/src/sac_dec.cpp
deleted file mode 100644
index 4537d6e..0000000
--- a/libSACdec/src/sac_dec.cpp --- a/libSACdec/src/sac_dec.cpp
+++ /dev/null +++ /dev/null
@@ -1,1509 +0,0 @@ @@ -1,1509 +0,0 @@
@ -7333,9 +7294,6 @@ index 4537d6e..0000000
- -
- return err; - return err;
-} -}
diff --git a/libSACdec/src/sac_dec.h b/libSACdec/src/sac_dec.h
deleted file mode 100644
index 992acad..0000000
--- a/libSACdec/src/sac_dec.h --- a/libSACdec/src/sac_dec.h
+++ /dev/null +++ /dev/null
@@ -1,539 +0,0 @@ @@ -1,539 +0,0 @@
@ -7878,9 +7836,6 @@ index 992acad..0000000
-} -}
- -
-#endif /* SAC_DEC_H */ -#endif /* SAC_DEC_H */
diff --git a/libSACdec/src/sac_dec_conceal.cpp b/libSACdec/src/sac_dec_conceal.cpp
deleted file mode 100644
index dfeef7b..0000000
--- a/libSACdec/src/sac_dec_conceal.cpp --- a/libSACdec/src/sac_dec_conceal.cpp
+++ /dev/null +++ /dev/null
@@ -1,392 +0,0 @@ @@ -1,392 +0,0 @@
@ -8276,9 +8231,6 @@ index dfeef7b..0000000
-bail: -bail:
- return err; - return err;
-} -}
diff --git a/libSACdec/src/sac_dec_conceal.h b/libSACdec/src/sac_dec_conceal.h
deleted file mode 100644
index 27f5249..0000000
--- a/libSACdec/src/sac_dec_conceal.h --- a/libSACdec/src/sac_dec_conceal.h
+++ /dev/null +++ /dev/null
@@ -1,187 +0,0 @@ @@ -1,187 +0,0 @@
@ -8469,9 +8421,6 @@ index 27f5249..0000000
- const INT value); - const INT value);
- -
-#endif /* SAC_DEC_CONCEAL_H */ -#endif /* SAC_DEC_CONCEAL_H */
diff --git a/libSACdec/src/sac_dec_interface.h b/libSACdec/src/sac_dec_interface.h
deleted file mode 100644
index a2eea92..0000000
--- a/libSACdec/src/sac_dec_interface.h --- a/libSACdec/src/sac_dec_interface.h
+++ /dev/null +++ /dev/null
@@ -1,335 +0,0 @@ @@ -1,335 +0,0 @@
@ -8810,9 +8759,6 @@ index a2eea92..0000000
-#endif -#endif
- -
-#endif /* SAC_DEC_INTERFACE_H */ -#endif /* SAC_DEC_INTERFACE_H */
diff --git a/libSACdec/src/sac_dec_lib.cpp b/libSACdec/src/sac_dec_lib.cpp
deleted file mode 100644
index bf6dedf..0000000
--- a/libSACdec/src/sac_dec_lib.cpp --- a/libSACdec/src/sac_dec_lib.cpp
+++ /dev/null +++ /dev/null
@@ -1,1995 +0,0 @@ @@ -1,1995 +0,0 @@
@ -10811,9 +10757,6 @@ index bf6dedf..0000000
- -
- return (outputDelay); - return (outputDelay);
-} -}
diff --git a/libSACdec/src/sac_dec_ssc_struct.h b/libSACdec/src/sac_dec_ssc_struct.h
deleted file mode 100644
index b67b465..0000000
--- a/libSACdec/src/sac_dec_ssc_struct.h --- a/libSACdec/src/sac_dec_ssc_struct.h
+++ /dev/null +++ /dev/null
@@ -1,283 +0,0 @@ @@ -1,283 +0,0 @@
@ -11100,9 +11043,6 @@ index b67b465..0000000
-} SPATIAL_SPECIFIC_CONFIG; -} SPATIAL_SPECIFIC_CONFIG;
- -
-#endif -#endif
diff --git a/libSACdec/src/sac_process.cpp b/libSACdec/src/sac_process.cpp
deleted file mode 100644
index 56c72ad..0000000
--- a/libSACdec/src/sac_process.cpp --- a/libSACdec/src/sac_process.cpp
+++ /dev/null +++ /dev/null
@@ -1,1066 +0,0 @@ @@ -1,1066 +0,0 @@
@ -12172,9 +12112,6 @@ index 56c72ad..0000000
- *Dry_imag1++ = out_im; - *Dry_imag1++ = out_im;
- } - }
-} -}
diff --git a/libSACdec/src/sac_process.h b/libSACdec/src/sac_process.h
deleted file mode 100644
index ee2f2fe..0000000
--- a/libSACdec/src/sac_process.h --- a/libSACdec/src/sac_process.h
+++ /dev/null +++ /dev/null
@@ -1,297 +0,0 @@ @@ -1,297 +0,0 @@
@ -12475,9 +12412,6 @@ index ee2f2fe..0000000
-FIXP_DBL getChGain(spatialDec *self, UINT ch, INT *scale); -FIXP_DBL getChGain(spatialDec *self, UINT ch, INT *scale);
- -
-#endif -#endif
diff --git a/libSACdec/src/sac_qmf.cpp b/libSACdec/src/sac_qmf.cpp
deleted file mode 100644
index a075490..0000000
--- a/libSACdec/src/sac_qmf.cpp --- a/libSACdec/src/sac_qmf.cpp
+++ /dev/null +++ /dev/null
@@ -1,156 +0,0 @@ @@ -1,156 +0,0 @@
@ -12637,9 +12571,6 @@ index a075490..0000000
- -
- return err; - return err;
-} -}
diff --git a/libSACdec/src/sac_qmf.h b/libSACdec/src/sac_qmf.h
deleted file mode 100644
index d1dc837..0000000
--- a/libSACdec/src/sac_qmf.h --- a/libSACdec/src/sac_qmf.h
+++ /dev/null +++ /dev/null
@@ -1,143 +0,0 @@ @@ -1,143 +0,0 @@
@ -12786,9 +12717,6 @@ index d1dc837..0000000
- FIXP_DBL *Sr, FIXP_DBL *Si); - FIXP_DBL *Sr, FIXP_DBL *Si);
- -
-#endif /* SAC_QMF_H */ -#endif /* SAC_QMF_H */
diff --git a/libSACdec/src/sac_reshapeBBEnv.cpp b/libSACdec/src/sac_reshapeBBEnv.cpp
deleted file mode 100644
index 87c0ac6..0000000
--- a/libSACdec/src/sac_reshapeBBEnv.cpp --- a/libSACdec/src/sac_reshapeBBEnv.cpp
+++ /dev/null +++ /dev/null
@@ -1,680 +0,0 @@ @@ -1,680 +0,0 @@
@ -13472,9 +13400,6 @@ index 87c0ac6..0000000
- } - }
- } - }
-} -}
diff --git a/libSACdec/src/sac_reshapeBBEnv.h b/libSACdec/src/sac_reshapeBBEnv.h
deleted file mode 100644
index 1658530..0000000
--- a/libSACdec/src/sac_reshapeBBEnv.h --- a/libSACdec/src/sac_reshapeBBEnv.h
+++ /dev/null +++ /dev/null
@@ -1,114 +0,0 @@ @@ -1,114 +0,0 @@
@ -13592,9 +13517,6 @@ index 1658530..0000000
- int ts); - int ts);
- -
-#endif -#endif
diff --git a/libSACdec/src/sac_rom.cpp b/libSACdec/src/sac_rom.cpp
deleted file mode 100644
index 4285b65..0000000
--- a/libSACdec/src/sac_rom.cpp --- a/libSACdec/src/sac_rom.cpp
+++ /dev/null +++ /dev/null
@@ -1,709 +0,0 @@ @@ -1,709 +0,0 @@
@ -14307,9 +14229,6 @@ index 4285b65..0000000
-void SpatialDequantGetCLD2Values(int idx, FIXP_DBL* x) { -void SpatialDequantGetCLD2Values(int idx, FIXP_DBL* x) {
- *x = FX_CFG2FX_DBL(dequantCLD__FDK[idx]); - *x = FX_CFG2FX_DBL(dequantCLD__FDK[idx]);
-} -}
diff --git a/libSACdec/src/sac_rom.h b/libSACdec/src/sac_rom.h
deleted file mode 100644
index d366fb6..0000000
--- a/libSACdec/src/sac_rom.h --- a/libSACdec/src/sac_rom.h
+++ /dev/null +++ /dev/null
@@ -1,230 +0,0 @@ @@ -1,230 +0,0 @@
@ -14543,9 +14462,6 @@ index d366fb6..0000000
-} -}
- -
-#endif /* SAC_ROM_H */ -#endif /* SAC_ROM_H */
diff --git a/libSACdec/src/sac_smoothing.cpp b/libSACdec/src/sac_smoothing.cpp
deleted file mode 100644
index bee6551..0000000
--- a/libSACdec/src/sac_smoothing.cpp --- a/libSACdec/src/sac_smoothing.cpp
+++ /dev/null +++ /dev/null
@@ -1,295 +0,0 @@ @@ -1,295 +0,0 @@
@ -14844,9 +14760,6 @@ index bee6551..0000000
- } - }
- return; - return;
-} -}
diff --git a/libSACdec/src/sac_smoothing.h b/libSACdec/src/sac_smoothing.h
deleted file mode 100644
index fdf3f5b..0000000
--- a/libSACdec/src/sac_smoothing.h --- a/libSACdec/src/sac_smoothing.h
+++ /dev/null +++ /dev/null
@@ -1,114 +0,0 @@ @@ -1,114 +0,0 @@
@ -14964,9 +14877,6 @@ index fdf3f5b..0000000
- int ps); - int ps);
- -
-#endif -#endif
diff --git a/libSACdec/src/sac_stp.cpp b/libSACdec/src/sac_stp.cpp
deleted file mode 100644
index 818e9df..0000000
--- a/libSACdec/src/sac_stp.cpp --- a/libSACdec/src/sac_stp.cpp
+++ /dev/null +++ /dev/null
@@ -1,548 +0,0 @@ @@ -1,548 +0,0 @@
@ -15518,9 +15428,6 @@ index 818e9df..0000000
- return (SACDEC_ERROR)MPS_OK; - return (SACDEC_ERROR)MPS_OK;
- ; - ;
-} -}
diff --git a/libSACdec/src/sac_stp.h b/libSACdec/src/sac_stp.h
deleted file mode 100644
index 18471bd..0000000
--- a/libSACdec/src/sac_stp.h --- a/libSACdec/src/sac_stp.h
+++ /dev/null +++ /dev/null
@@ -1,115 +0,0 @@ @@ -1,115 +0,0 @@
@ -15639,9 +15546,6 @@ index 18471bd..0000000
-void subbandTPDestroy(HANDLE_STP_DEC *hStpDec); -void subbandTPDestroy(HANDLE_STP_DEC *hStpDec);
- -
-#endif -#endif
diff --git a/libSACdec/src/sac_tsd.cpp b/libSACdec/src/sac_tsd.cpp
deleted file mode 100644
index 30acca8..0000000
--- a/libSACdec/src/sac_tsd.cpp --- a/libSACdec/src/sac_tsd.cpp
+++ /dev/null +++ /dev/null
@@ -1,353 +0,0 @@ @@ -1,353 +0,0 @@
@ -15998,9 +15902,6 @@ index 30acca8..0000000
- *pTsdTs = (ts + 1) & (MAX_TSD_TIME_SLOTS - 1); - *pTsdTs = (ts + 1) & (MAX_TSD_TIME_SLOTS - 1);
- return; - return;
-} -}
diff --git a/libSACdec/src/sac_tsd.h b/libSACdec/src/sac_tsd.h
deleted file mode 100644
index 2521e27..0000000
--- a/libSACdec/src/sac_tsd.h --- a/libSACdec/src/sac_tsd.h
+++ /dev/null +++ /dev/null
@@ -1,167 +0,0 @@ @@ -1,167 +0,0 @@
@ -16171,9 +16072,6 @@ index 2521e27..0000000
- FIXP_DBL *pDnonTrReal, FIXP_DBL *pDnonTrImag); - FIXP_DBL *pDnonTrReal, FIXP_DBL *pDnonTrImag);
- -
-#endif /* #ifndef SAC_TSD_H */ -#endif /* #ifndef SAC_TSD_H */
diff --git a/libSACenc/include/sacenc_lib.h b/libSACenc/include/sacenc_lib.h
deleted file mode 100644
index 758cc0f..0000000
--- a/libSACenc/include/sacenc_lib.h --- a/libSACenc/include/sacenc_lib.h
+++ /dev/null +++ /dev/null
@@ -1,405 +0,0 @@ @@ -1,405 +0,0 @@
@ -16582,9 +16480,6 @@ index 758cc0f..0000000
-#endif -#endif
- -
-#endif /* SACENC_LIB_H */ -#endif /* SACENC_LIB_H */
diff --git a/libSACenc/src/sacenc_bitstream.cpp b/libSACenc/src/sacenc_bitstream.cpp
deleted file mode 100644
index dacfc27..0000000
--- a/libSACenc/src/sacenc_bitstream.cpp --- a/libSACenc/src/sacenc_bitstream.cpp
+++ /dev/null +++ /dev/null
@@ -1,826 +0,0 @@ @@ -1,826 +0,0 @@
@ -17414,9 +17309,6 @@ index dacfc27..0000000
-bail: -bail:
- return error; - return error;
-} -}
diff --git a/libSACenc/src/sacenc_bitstream.h b/libSACenc/src/sacenc_bitstream.h
deleted file mode 100644
index 67b7b5a..0000000
--- a/libSACenc/src/sacenc_bitstream.h --- a/libSACenc/src/sacenc_bitstream.h
+++ /dev/null +++ /dev/null
@@ -1,296 +0,0 @@ @@ -1,296 +0,0 @@
@ -17716,9 +17608,6 @@ index 67b7b5a..0000000
- const INT setTo); - const INT setTo);
- -
-#endif /* SACENC_BITSTREAM_H */ -#endif /* SACENC_BITSTREAM_H */
diff --git a/libSACenc/src/sacenc_const.h b/libSACenc/src/sacenc_const.h
deleted file mode 100644
index c86e765..0000000
--- a/libSACenc/src/sacenc_const.h --- a/libSACenc/src/sacenc_const.h
+++ /dev/null +++ /dev/null
@@ -1,126 +0,0 @@ @@ -1,126 +0,0 @@
@ -17848,9 +17737,6 @@ index c86e765..0000000
-/* Function / Class Declarations *********************************************/ -/* Function / Class Declarations *********************************************/
- -
-#endif /* SACENC_CONST_H */ -#endif /* SACENC_CONST_H */
diff --git a/libSACenc/src/sacenc_delay.cpp b/libSACenc/src/sacenc_delay.cpp
deleted file mode 100644
index f2ed6b0..0000000
--- a/libSACenc/src/sacenc_delay.cpp --- a/libSACenc/src/sacenc_delay.cpp
+++ /dev/null +++ /dev/null
@@ -1,472 +0,0 @@ @@ -1,472 +0,0 @@
@ -18326,9 +18212,6 @@ index f2ed6b0..0000000
-INT fdk_sacenc_delay_GetInfoDecoderDelay(HANDLE_DELAY hDelay) { -INT fdk_sacenc_delay_GetInfoDecoderDelay(HANDLE_DELAY hDelay) {
- return (hDelay->nInfoDecoderDelay); - return (hDelay->nInfoDecoderDelay);
-} -}
diff --git a/libSACenc/src/sacenc_delay.h b/libSACenc/src/sacenc_delay.h
deleted file mode 100644
index 38bfbc5..0000000
--- a/libSACenc/src/sacenc_delay.h --- a/libSACenc/src/sacenc_delay.h
+++ /dev/null +++ /dev/null
@@ -1,175 +0,0 @@ @@ -1,175 +0,0 @@
@ -18507,9 +18390,6 @@ index 38bfbc5..0000000
-INT fdk_sacenc_delay_GetInfoDecoderDelay(HANDLE_DELAY hDelay); -INT fdk_sacenc_delay_GetInfoDecoderDelay(HANDLE_DELAY hDelay);
- -
-#endif /* SACENC_DELAY_H */ -#endif /* SACENC_DELAY_H */
diff --git a/libSACenc/src/sacenc_dmx_tdom_enh.cpp b/libSACenc/src/sacenc_dmx_tdom_enh.cpp
deleted file mode 100644
index be66c83..0000000
--- a/libSACenc/src/sacenc_dmx_tdom_enh.cpp --- a/libSACenc/src/sacenc_dmx_tdom_enh.cpp
+++ /dev/null +++ /dev/null
@@ -1,639 +0,0 @@ @@ -1,639 +0,0 @@
@ -19152,9 +19032,6 @@ index be66c83..0000000
- } - }
- return error; - return error;
-} -}
diff --git a/libSACenc/src/sacenc_dmx_tdom_enh.h b/libSACenc/src/sacenc_dmx_tdom_enh.h
deleted file mode 100644
index 0b39911..0000000
--- a/libSACenc/src/sacenc_dmx_tdom_enh.h --- a/libSACenc/src/sacenc_dmx_tdom_enh.h
+++ /dev/null +++ /dev/null
@@ -1,134 +0,0 @@ @@ -1,134 +0,0 @@
@ -19292,9 +19169,6 @@ index 0b39911..0000000
- HANDLE_ENHANCED_TIME_DOMAIN_DMX *hEnhancedTimeDmx); - HANDLE_ENHANCED_TIME_DOMAIN_DMX *hEnhancedTimeDmx);
- -
-#endif /* SACENC_DMX_TDOM_ENH_H */ -#endif /* SACENC_DMX_TDOM_ENH_H */
diff --git a/libSACenc/src/sacenc_filter.cpp b/libSACenc/src/sacenc_filter.cpp
deleted file mode 100644
index 79f0797..0000000
--- a/libSACenc/src/sacenc_filter.cpp --- a/libSACenc/src/sacenc_filter.cpp
+++ /dev/null +++ /dev/null
@@ -1,207 +0,0 @@ @@ -1,207 +0,0 @@
@ -19505,9 +19379,6 @@ index 79f0797..0000000
- -
- return error; - return error;
-} -}
diff --git a/libSACenc/src/sacenc_filter.h b/libSACenc/src/sacenc_filter.h
deleted file mode 100644
index 10e3abd..0000000
--- a/libSACenc/src/sacenc_filter.h --- a/libSACenc/src/sacenc_filter.h
+++ /dev/null +++ /dev/null
@@ -1,133 +0,0 @@ @@ -1,133 +0,0 @@
@ -19644,9 +19515,6 @@ index 10e3abd..0000000
- const INT signalLength); - const INT signalLength);
- -
-#endif /* SACENC_FILTER_H */ -#endif /* SACENC_FILTER_H */
diff --git a/libSACenc/src/sacenc_framewindowing.cpp b/libSACenc/src/sacenc_framewindowing.cpp
deleted file mode 100644
index 15f0f0a..0000000
--- a/libSACenc/src/sacenc_framewindowing.cpp --- a/libSACenc/src/sacenc_framewindowing.cpp
+++ /dev/null +++ /dev/null
@@ -1,568 +0,0 @@ @@ -1,568 +0,0 @@
@ -20218,9 +20086,6 @@ index 15f0f0a..0000000
- -
- return error; - return error;
-} -}
diff --git a/libSACenc/src/sacenc_framewindowing.h b/libSACenc/src/sacenc_framewindowing.h
deleted file mode 100644
index 6b22dc9..0000000
--- a/libSACenc/src/sacenc_framewindowing.h --- a/libSACenc/src/sacenc_framewindowing.h
+++ /dev/null +++ /dev/null
@@ -1,181 +0,0 @@ @@ -1,181 +0,0 @@
@ -20405,9 +20270,6 @@ index 6b22dc9..0000000
- const INT dim); - const INT dim);
- -
-#endif /* SACENC_FRAMEWINDOWING_H */ -#endif /* SACENC_FRAMEWINDOWING_H */
diff --git a/libSACenc/src/sacenc_huff_tab.cpp b/libSACenc/src/sacenc_huff_tab.cpp
deleted file mode 100644
index 7b28ecd..0000000
--- a/libSACenc/src/sacenc_huff_tab.cpp --- a/libSACenc/src/sacenc_huff_tab.cpp
+++ /dev/null +++ /dev/null
@@ -1,997 +0,0 @@ @@ -1,997 +0,0 @@
@ -21408,9 +21270,6 @@ index 7b28ecd..0000000
-/* Function / Class Declarations *********************************************/ -/* Function / Class Declarations *********************************************/
- -
-/* Function / Class Definition ***********************************************/ -/* Function / Class Definition ***********************************************/
diff --git a/libSACenc/src/sacenc_huff_tab.h b/libSACenc/src/sacenc_huff_tab.h
deleted file mode 100644
index 7d6c331..0000000
--- a/libSACenc/src/sacenc_huff_tab.h --- a/libSACenc/src/sacenc_huff_tab.h
+++ /dev/null +++ /dev/null
@@ -1,222 +0,0 @@ @@ -1,222 +0,0 @@
@ -21636,9 +21495,6 @@ index 7d6c331..0000000
-/* Function / Class Declarations *********************************************/ -/* Function / Class Declarations *********************************************/
- -
-#endif /* SACENC_HUFF_TAB_H */ -#endif /* SACENC_HUFF_TAB_H */
diff --git a/libSACenc/src/sacenc_lib.cpp b/libSACenc/src/sacenc_lib.cpp
deleted file mode 100644
index d6a1658..0000000
--- a/libSACenc/src/sacenc_lib.cpp --- a/libSACenc/src/sacenc_lib.cpp
+++ /dev/null +++ /dev/null
@@ -1,2042 +0,0 @@ @@ -1,2042 +0,0 @@
@ -23684,9 +23540,6 @@ index d6a1658..0000000
- } - }
- return error; - return error;
-} -}
diff --git a/libSACenc/src/sacenc_nlc_enc.cpp b/libSACenc/src/sacenc_nlc_enc.cpp
deleted file mode 100644
index 0ba6cc9..0000000
--- a/libSACenc/src/sacenc_nlc_enc.cpp --- a/libSACenc/src/sacenc_nlc_enc.cpp
+++ /dev/null +++ /dev/null
@@ -1,1442 +0,0 @@ @@ -1,1442 +0,0 @@
@ -25132,9 +24985,6 @@ index 0ba6cc9..0000000
- -
- return reset; - return reset;
-} -}
diff --git a/libSACenc/src/sacenc_nlc_enc.h b/libSACenc/src/sacenc_nlc_enc.h
deleted file mode 100644
index 506b308..0000000
--- a/libSACenc/src/sacenc_nlc_enc.h --- a/libSACenc/src/sacenc_nlc_enc.h
+++ /dev/null +++ /dev/null
@@ -1,141 +0,0 @@ @@ -1,141 +0,0 @@
@ -25279,9 +25129,6 @@ index 506b308..0000000
- const INT independency_flag); - const INT independency_flag);
- -
-#endif /* SACENC_NLC_ENC_H */ -#endif /* SACENC_NLC_ENC_H */
diff --git a/libSACenc/src/sacenc_onsetdetect.cpp b/libSACenc/src/sacenc_onsetdetect.cpp
deleted file mode 100644
index 7e9aee1..0000000
--- a/libSACenc/src/sacenc_onsetdetect.cpp --- a/libSACenc/src/sacenc_onsetdetect.cpp
+++ /dev/null +++ /dev/null
@@ -1,381 +0,0 @@ @@ -1,381 +0,0 @@
@ -25666,9 +25513,6 @@ index 7e9aee1..0000000
-} -}
- -
-/**************************************************************************/ -/**************************************************************************/
diff --git a/libSACenc/src/sacenc_onsetdetect.h b/libSACenc/src/sacenc_onsetdetect.h
deleted file mode 100644
index 5f3f0bd..0000000
--- a/libSACenc/src/sacenc_onsetdetect.h --- a/libSACenc/src/sacenc_onsetdetect.h
+++ /dev/null +++ /dev/null
@@ -1,154 +0,0 @@ @@ -1,154 +0,0 @@
@ -25826,9 +25670,6 @@ index 5f3f0bd..0000000
- const INT prevPos, INT pTransientPos[MAX_NUM_TRANS]); - const INT prevPos, INT pTransientPos[MAX_NUM_TRANS]);
- -
-#endif /* SACENC_ONSETDETECT_H */ -#endif /* SACENC_ONSETDETECT_H */
diff --git a/libSACenc/src/sacenc_paramextract.cpp b/libSACenc/src/sacenc_paramextract.cpp
deleted file mode 100644
index dcbce1e..0000000
--- a/libSACenc/src/sacenc_paramextract.cpp --- a/libSACenc/src/sacenc_paramextract.cpp
+++ /dev/null +++ /dev/null
@@ -1,725 +0,0 @@ @@ -1,725 +0,0 @@
@ -26557,9 +26398,6 @@ index dcbce1e..0000000
- -
- return nParamBand; - return nParamBand;
-} -}
diff --git a/libSACenc/src/sacenc_paramextract.h b/libSACenc/src/sacenc_paramextract.h
deleted file mode 100644
index 9ebb902..0000000
--- a/libSACenc/src/sacenc_paramextract.h --- a/libSACenc/src/sacenc_paramextract.h
+++ /dev/null +++ /dev/null
@@ -1,214 +0,0 @@ @@ -1,214 +0,0 @@
@ -26777,9 +26615,6 @@ index 9ebb902..0000000
-} -}
- -
-#endif /* SACENC_PARAMEXTRACT_H */ -#endif /* SACENC_PARAMEXTRACT_H */
diff --git a/libSACenc/src/sacenc_staticgain.cpp b/libSACenc/src/sacenc_staticgain.cpp
deleted file mode 100644
index fef9f8d..0000000
--- a/libSACenc/src/sacenc_staticgain.cpp --- a/libSACenc/src/sacenc_staticgain.cpp
+++ /dev/null +++ /dev/null
@@ -1,446 +0,0 @@ @@ -1,446 +0,0 @@
@ -27229,9 +27064,6 @@ index fef9f8d..0000000
- } - }
- return error; - return error;
-} -}
diff --git a/libSACenc/src/sacenc_staticgain.h b/libSACenc/src/sacenc_staticgain.h
deleted file mode 100644
index 5db3bec..0000000
--- a/libSACenc/src/sacenc_staticgain.h --- a/libSACenc/src/sacenc_staticgain.h
+++ /dev/null +++ /dev/null
@@ -1,177 +0,0 @@ @@ -1,177 +0,0 @@
@ -27412,9 +27244,6 @@ index 5db3bec..0000000
- HANDLE_STATIC_GAIN_CONFIG hStaticGainCfg, const MP4SPACEENC_MODE encMode); - HANDLE_STATIC_GAIN_CONFIG hStaticGainCfg, const MP4SPACEENC_MODE encMode);
- -
-#endif /* SACENC_STATICGAIN_H */ -#endif /* SACENC_STATICGAIN_H */
diff --git a/libSACenc/src/sacenc_tree.cpp b/libSACenc/src/sacenc_tree.cpp
deleted file mode 100644
index c7d3128..0000000
--- a/libSACenc/src/sacenc_tree.cpp --- a/libSACenc/src/sacenc_tree.cpp
+++ /dev/null +++ /dev/null
@@ -1,488 +0,0 @@ @@ -1,488 +0,0 @@
@ -27906,9 +27735,6 @@ index c7d3128..0000000
- -
-/***************************************************************************** -/*****************************************************************************
-******************************************************************************/ -******************************************************************************/
diff --git a/libSACenc/src/sacenc_tree.h b/libSACenc/src/sacenc_tree.h
deleted file mode 100644
index 09f5b2b..0000000
--- a/libSACenc/src/sacenc_tree.h --- a/libSACenc/src/sacenc_tree.h
+++ /dev/null +++ /dev/null
@@ -1,168 +0,0 @@ @@ -1,168 +0,0 @@
@ -28080,9 +27906,6 @@ index 09f5b2b..0000000
- const INT nHybridBand); - const INT nHybridBand);
- -
-#endif /* SACENC_TREE_H */ -#endif /* SACENC_TREE_H */
diff --git a/libSACenc/src/sacenc_vectorfunctions.cpp b/libSACenc/src/sacenc_vectorfunctions.cpp
deleted file mode 100644
index c1e24b7..0000000
--- a/libSACenc/src/sacenc_vectorfunctions.cpp --- a/libSACenc/src/sacenc_vectorfunctions.cpp
+++ /dev/null +++ /dev/null
@@ -1,450 +0,0 @@ @@ -1,450 +0,0 @@
@ -28536,9 +28359,6 @@ index c1e24b7..0000000
- -
- return (clz); - return (clz);
-} -}
diff --git a/libSACenc/src/sacenc_vectorfunctions.h b/libSACenc/src/sacenc_vectorfunctions.h
deleted file mode 100644
index e9c4abd..0000000
--- a/libSACenc/src/sacenc_vectorfunctions.h --- a/libSACenc/src/sacenc_vectorfunctions.h
+++ /dev/null +++ /dev/null
@@ -1,488 +0,0 @@ @@ -1,488 +0,0 @@
@ -29030,6 +28850,3 @@ index e9c4abd..0000000
-} -}
- -
-#endif /* SACENC_VECTORFUNCTIONS_H */ -#endif /* SACENC_VECTORFUNCTIONS_H */
--
cgit v1.1

68
sound/fdk-aac/patches-free/040-remove-usac.patch
View File

@ -42,8 +42,6 @@ Subject: Remove USAC
delete mode 100644 libAACdec/src/usacdec_rom.cpp delete mode 100644 libAACdec/src/usacdec_rom.cpp
delete mode 100644 libAACdec/src/usacdec_rom.h delete mode 100644 libAACdec/src/usacdec_rom.h
diff --git a/Makefile.am b/Makefile.am
index 1550d95..d5fd180 100644
--- a/Makefile.am --- a/Makefile.am
+++ b/Makefile.am +++ b/Makefile.am
@@ -57,14 +57,7 @@ AACDEC_SRC = \ @@ -57,14 +57,7 @@ AACDEC_SRC = \
@ -62,8 +60,6 @@ index 1550d95..d5fd180 100644
AACENC_SRC = \ AACENC_SRC = \
libAACenc/src/aacEnc_ram.cpp \ libAACenc/src/aacEnc_ram.cpp \
diff --git a/Makefile.vc b/Makefile.vc
index 54f3744..c236c15 100644
--- a/Makefile.vc --- a/Makefile.vc
+++ b/Makefile.vc +++ b/Makefile.vc
@@ -41,14 +41,7 @@ AACDEC_SRC = \ @@ -41,14 +41,7 @@ AACDEC_SRC = \
@ -82,8 +78,6 @@ index 54f3744..c236c15 100644
AACENC_SRC = \ AACENC_SRC = \
libAACenc/src/aacEnc_ram.cpp \ libAACenc/src/aacEnc_ram.cpp \
diff --git a/libAACdec/src/aacdecoder.cpp b/libAACdec/src/aacdecoder.cpp
index cc3e245..cd57500 100644
--- a/libAACdec/src/aacdecoder.cpp --- a/libAACdec/src/aacdecoder.cpp
+++ b/libAACdec/src/aacdecoder.cpp +++ b/libAACdec/src/aacdecoder.cpp
@@ -161,8 +161,6 @@ amm-info@iis.fraunhofer.de @@ -161,8 +161,6 @@ amm-info@iis.fraunhofer.de
@ -95,7 +89,7 @@ index cc3e245..cd57500 100644
#include "ac_arith_coder.h" #include "ac_arith_coder.h"
#include "tpdec_lib.h" #include "tpdec_lib.h"
@@ -1942,17 +1940,6 @@ CAacDecoder_Init(HANDLE_AACDECODER self, const CSAudioSpecificConfig *asc, @@ -1942,17 +1940,6 @@ CAacDecoder_Init(HANDLE_AACDECODER self,
goto bail; goto bail;
} }
} }
@ -113,7 +107,7 @@ index cc3e245..cd57500 100644
} /* for each element */ } /* for each element */
} }
@@ -2010,11 +1997,6 @@ CAacDecoder_Init(HANDLE_AACDECODER self, const CSAudioSpecificConfig *asc, @@ -2010,11 +1997,6 @@ CAacDecoder_Init(HANDLE_AACDECODER self,
self->pAacDecoderStaticChannelInfo[ch]->pOverlapBuffer, self->pAacDecoderStaticChannelInfo[ch]->pOverlapBuffer,
OverlapBufferSize); OverlapBufferSize);
@ -125,7 +119,7 @@ index cc3e245..cd57500 100644
/* Reset DRC control data for this channel */ /* Reset DRC control data for this channel */
aacDecoder_drcInitChannelData( aacDecoder_drcInitChannelData(
&self->pAacDecoderStaticChannelInfo[ch]->drcData); &self->pAacDecoderStaticChannelInfo[ch]->drcData);
@@ -2893,10 +2875,7 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame( @@ -2893,10 +2875,7 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecod
(self->frameOK && !(flags & AACDEC_CONCEAL)); (self->frameOK && !(flags & AACDEC_CONCEAL));
const int icsIsInvalid = (GetScaleFactorBandsTransmitted(pIcsInfo) > const int icsIsInvalid = (GetScaleFactorBandsTransmitted(pIcsInfo) >
GetScaleFactorBandsTotal(pIcsInfo)); GetScaleFactorBandsTotal(pIcsInfo));
@ -137,7 +131,7 @@ index cc3e245..cd57500 100644
self->frameOK = 0; self->frameOK = 0;
} }
} }
@@ -2956,16 +2935,7 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame( @@ -2956,16 +2935,7 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecod
2; 2;
} break; } break;
case AACDEC_RENDER_LPD: case AACDEC_RENDER_LPD:
@ -155,8 +149,6 @@ index cc3e245..cd57500 100644
break; break;
default: default:
ErrorStatus = AAC_DEC_UNKNOWN; ErrorStatus = AAC_DEC_UNKNOWN;
diff --git a/libAACdec/src/block.cpp b/libAACdec/src/block.cpp
index a394cd7..b8ca877 100644
--- a/libAACdec/src/block.cpp --- a/libAACdec/src/block.cpp
+++ b/libAACdec/src/block.cpp +++ b/libAACdec/src/block.cpp
@@ -107,9 +107,6 @@ amm-info@iis.fraunhofer.de @@ -107,9 +107,6 @@ amm-info@iis.fraunhofer.de
@ -344,8 +336,6 @@ index a394cd7..b8ca877 100644
} }
#include "ldfiltbank.h" #include "ldfiltbank.h"
diff --git a/libAACdec/src/channel.cpp b/libAACdec/src/channel.cpp
index e17ccf4..fe63756 100644
--- a/libAACdec/src/channel.cpp --- a/libAACdec/src/channel.cpp
+++ b/libAACdec/src/channel.cpp +++ b/libAACdec/src/channel.cpp
@@ -106,9 +106,6 @@ amm-info@iis.fraunhofer.de @@ -106,9 +106,6 @@ amm-info@iis.fraunhofer.de
@ -465,8 +455,6 @@ index e17ccf4..fe63756 100644
} }
} }
diff --git a/libAACdec/src/channelinfo.h b/libAACdec/src/channelinfo.h
index 04f0012..42c8298 100644
--- a/libAACdec/src/channelinfo.h --- a/libAACdec/src/channelinfo.h
+++ b/libAACdec/src/channelinfo.h +++ b/libAACdec/src/channelinfo.h
@@ -117,10 +117,6 @@ amm-info@iis.fraunhofer.de @@ -117,10 +117,6 @@ amm-info@iis.fraunhofer.de
@ -588,9 +576,6 @@ index 04f0012..42c8298 100644
struct { struct {
CPnsData PnsData; /* Not required for USAC */ CPnsData PnsData; /* Not required for USAC */
diff --git a/libAACdec/src/usacdec_ace_d4t64.cpp b/libAACdec/src/usacdec_ace_d4t64.cpp
deleted file mode 100644
index 43e06cd..0000000
--- a/libAACdec/src/usacdec_ace_d4t64.cpp --- a/libAACdec/src/usacdec_ace_d4t64.cpp
+++ /dev/null +++ /dev/null
@@ -1,439 +0,0 @@ @@ -1,439 +0,0 @@
@ -1033,9 +1018,6 @@ index 43e06cd..0000000
- } - }
- return; - return;
-} -}
diff --git a/libAACdec/src/usacdec_ace_d4t64.h b/libAACdec/src/usacdec_ace_d4t64.h
deleted file mode 100644
index 76bc3d9..0000000
--- a/libAACdec/src/usacdec_ace_d4t64.h --- a/libAACdec/src/usacdec_ace_d4t64.h
+++ /dev/null +++ /dev/null
@@ -1,117 +0,0 @@ @@ -1,117 +0,0 @@
@ -1156,9 +1138,6 @@ index 76bc3d9..0000000
-void D_ACELP_decode_4t64(SHORT index[], int nbits, FIXP_COD code[]); -void D_ACELP_decode_4t64(SHORT index[], int nbits, FIXP_COD code[]);
- -
-#endif /* USACDEC_ACE_D4T64_H */ -#endif /* USACDEC_ACE_D4T64_H */
diff --git a/libAACdec/src/usacdec_ace_ltp.cpp b/libAACdec/src/usacdec_ace_ltp.cpp
deleted file mode 100644
index 5964b49..0000000
--- a/libAACdec/src/usacdec_ace_ltp.cpp --- a/libAACdec/src/usacdec_ace_ltp.cpp
+++ /dev/null +++ /dev/null
@@ -1,229 +0,0 @@ @@ -1,229 +0,0 @@
@ -1391,9 +1370,6 @@ index 5964b49..0000000
- } - }
- return; - return;
-} -}
diff --git a/libAACdec/src/usacdec_ace_ltp.h b/libAACdec/src/usacdec_ace_ltp.h
deleted file mode 100644
index 5128acd..0000000
--- a/libAACdec/src/usacdec_ace_ltp.h --- a/libAACdec/src/usacdec_ace_ltp.h
+++ /dev/null +++ /dev/null
@@ -1,128 +0,0 @@ @@ -1,128 +0,0 @@
@ -1525,9 +1501,6 @@ index 5128acd..0000000
-); -);
- -
-#endif /* USACDEC_ACE_LTP_H */ -#endif /* USACDEC_ACE_LTP_H */
diff --git a/libAACdec/src/usacdec_acelp.cpp b/libAACdec/src/usacdec_acelp.cpp
deleted file mode 100644
index a606459..0000000
--- a/libAACdec/src/usacdec_acelp.cpp --- a/libAACdec/src/usacdec_acelp.cpp
+++ /dev/null +++ /dev/null
@@ -1,1296 +0,0 @@ @@ -1,1296 +0,0 @@
@ -2827,9 +2800,6 @@ index a606459..0000000
-bail: -bail:
- return error; - return error;
-} -}
diff --git a/libAACdec/src/usacdec_acelp.h b/libAACdec/src/usacdec_acelp.h
deleted file mode 100644
index 9de41ff..0000000
--- a/libAACdec/src/usacdec_acelp.h --- a/libAACdec/src/usacdec_acelp.h
+++ /dev/null +++ /dev/null
@@ -1,281 +0,0 @@ @@ -1,281 +0,0 @@
@ -3114,9 +3084,6 @@ index 9de41ff..0000000
-} -}
- -
-#endif /* USACDEC_ACELP_H */ -#endif /* USACDEC_ACELP_H */
diff --git a/libAACdec/src/usacdec_const.h b/libAACdec/src/usacdec_const.h
deleted file mode 100644
index f68e808..0000000
--- a/libAACdec/src/usacdec_const.h --- a/libAACdec/src/usacdec_const.h
+++ /dev/null +++ /dev/null
@@ -1,203 +0,0 @@ @@ -1,203 +0,0 @@
@ -3323,9 +3290,6 @@ index f68e808..0000000
-#define FDNS_NPTS FDNS_NPTS_1024 -#define FDNS_NPTS FDNS_NPTS_1024
- -
-#endif /* USACDEC_CONST_H */ -#endif /* USACDEC_CONST_H */
diff --git a/libAACdec/src/usacdec_fac.cpp b/libAACdec/src/usacdec_fac.cpp
deleted file mode 100644
index 0d3d844..0000000
--- a/libAACdec/src/usacdec_fac.cpp --- a/libAACdec/src/usacdec_fac.cpp
+++ /dev/null +++ /dev/null
@@ -1,745 +0,0 @@ @@ -1,745 +0,0 @@
@ -4074,9 +4038,6 @@ index 0d3d844..0000000
- -
- return nrSamples; - return nrSamples;
-} -}
diff --git a/libAACdec/src/usacdec_fac.h b/libAACdec/src/usacdec_fac.h
deleted file mode 100644
index 100a6fa..0000000
--- a/libAACdec/src/usacdec_fac.h --- a/libAACdec/src/usacdec_fac.h
+++ /dev/null +++ /dev/null
@@ -1,191 +0,0 @@ @@ -1,191 +0,0 @@
@ -4271,9 +4232,6 @@ index 100a6fa..0000000
- int currAliasingSymmetry); - int currAliasingSymmetry);
- -
-#endif /* USACDEC_FAC_H */ -#endif /* USACDEC_FAC_H */
diff --git a/libAACdec/src/usacdec_lpc.cpp b/libAACdec/src/usacdec_lpc.cpp
deleted file mode 100644
index 271463f..0000000
--- a/libAACdec/src/usacdec_lpc.cpp --- a/libAACdec/src/usacdec_lpc.cpp
+++ /dev/null +++ /dev/null
@@ -1,1194 +0,0 @@ @@ -1,1194 +0,0 @@
@ -5471,9 +5429,6 @@ index 271463f..0000000
- -
- *a_exp = 8 - headroom_a; - *a_exp = 8 - headroom_a;
-} -}
diff --git a/libAACdec/src/usacdec_lpc.h b/libAACdec/src/usacdec_lpc.h
deleted file mode 100644
index a6713c1..0000000
--- a/libAACdec/src/usacdec_lpc.h --- a/libAACdec/src/usacdec_lpc.h
+++ /dev/null +++ /dev/null
@@ -1,190 +0,0 @@ @@ -1,190 +0,0 @@
@ -5667,9 +5622,6 @@ index a6713c1..0000000
-void E_LPC_f_lsp_a_conversion(FIXP_LPC *lsp, FIXP_LPC *a, INT *a_exp); -void E_LPC_f_lsp_a_conversion(FIXP_LPC *lsp, FIXP_LPC *a, INT *a_exp);
- -
-#endif /* USACDEC_LPC_H */ -#endif /* USACDEC_LPC_H */
diff --git a/libAACdec/src/usacdec_lpd.cpp b/libAACdec/src/usacdec_lpd.cpp
deleted file mode 100644
index fcf7a76..0000000
--- a/libAACdec/src/usacdec_lpd.cpp --- a/libAACdec/src/usacdec_lpd.cpp
+++ /dev/null +++ /dev/null
@@ -1,2017 +0,0 @@ @@ -1,2017 +0,0 @@
@ -7690,9 +7642,6 @@ index fcf7a76..0000000
- -
- return error; - return error;
-} -}
diff --git a/libAACdec/src/usacdec_lpd.h b/libAACdec/src/usacdec_lpd.h
deleted file mode 100644
index 3e7938d..0000000
--- a/libAACdec/src/usacdec_lpd.h --- a/libAACdec/src/usacdec_lpd.h
+++ /dev/null +++ /dev/null
@@ -1,198 +0,0 @@ @@ -1,198 +0,0 @@
@ -7894,9 +7843,6 @@ index 3e7938d..0000000
-void CFdp_Reset(CAacDecoderStaticChannelInfo *pAacDecoderStaticChannelInfo); -void CFdp_Reset(CAacDecoderStaticChannelInfo *pAacDecoderStaticChannelInfo);
- -
-#endif /* USACDEC_LPD_H */ -#endif /* USACDEC_LPD_H */
diff --git a/libAACdec/src/usacdec_rom.cpp b/libAACdec/src/usacdec_rom.cpp
deleted file mode 100644
index ca3009e..0000000
--- a/libAACdec/src/usacdec_rom.cpp --- a/libAACdec/src/usacdec_rom.cpp
+++ /dev/null +++ /dev/null
@@ -1,1504 +0,0 @@ @@ -1,1504 +0,0 @@
@ -9404,9 +9350,6 @@ index ca3009e..0000000
- WTC(0x03d60412), WTC(0x02e286a8), WTC(0x02115586), WTC(0x0162aa04), - WTC(0x03d60412), WTC(0x02e286a8), WTC(0x02115586), WTC(0x0162aa04),
- WTC(0x00d6b403), WTC(0x006d99e3), WTC(0x00277872), WTC(0x000462eb), - WTC(0x00d6b403), WTC(0x006d99e3), WTC(0x00277872), WTC(0x000462eb),
-}; -};
diff --git a/libAACdec/src/usacdec_rom.h b/libAACdec/src/usacdec_rom.h
deleted file mode 100644
index f969e90..0000000
--- a/libAACdec/src/usacdec_rom.h --- a/libAACdec/src/usacdec_rom.h
+++ /dev/null +++ /dev/null
@@ -1,154 +0,0 @@ @@ -1,154 +0,0 @@
@ -9564,6 +9507,3 @@ index f969e90..0000000
-extern const FIXP_WTB FacWindowZir48[48]; -extern const FIXP_WTB FacWindowZir48[48];
- -
-#endif /* USACDEC_ROM_H */ -#endif /* USACDEC_ROM_H */
--
cgit v1.1