aboutsummaryrefslogtreecommitdiffstats
path: root/libMpegTPDec
diff options
context:
space:
mode:
Diffstat (limited to 'libMpegTPDec')
-rw-r--r--libMpegTPDec/src/tpdec_asc.cpp228
-rw-r--r--libMpegTPDec/src/tpdec_lib.cpp2
2 files changed, 211 insertions, 19 deletions
diff --git a/libMpegTPDec/src/tpdec_asc.cpp b/libMpegTPDec/src/tpdec_asc.cpp
index 4960d3f..e46cb32 100644
--- a/libMpegTPDec/src/tpdec_asc.cpp
+++ b/libMpegTPDec/src/tpdec_asc.cpp
@@ -1,7 +1,7 @@
/* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android
-© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten
+© Copyright 1995 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten
Forschung e.V. All rights reserved.
1. INTRODUCTION
@@ -266,11 +266,118 @@ static int CProgramConfig_ReadHeightExt(CProgramConfig *pPce,
return (err);
}
+/**
+ * \brief Sanity checks for program config element.
+ * Check order of elements according to ISO/IEC 13818-7:2003(E),
+ * chapter 8.5.1
+ *
+ * \param pPce pointer to program config element.
+ *
+ * \return 0 if successful, otherwise 1.
+ */
+static int CProgramConfig_Check(CProgramConfig *pPce) {
+ INT i;
+ INT err = 0;
+ INT numBackChannels[3] = {0};
+ INT numSideChannels[3] = {0};
+ INT numFrontChannels[3] = {0};
+ UCHAR *pCpeFront = pPce->FrontElementIsCpe;
+ UCHAR *pCpeSide = pPce->SideElementIsCpe;
+ UCHAR *pCpeBack = pPce->BackElementIsCpe;
+ UCHAR *pHeight;
+
+ pHeight = pPce->BackElementHeightInfo;
+ for (i = 0; i < pPce->NumBackChannelElements; i++) {
+ numBackChannels[*pHeight] += pPce->BackElementIsCpe[i] ? 2 : 1;
+ pHeight++;
+ }
+ pHeight = pPce->SideElementHeightInfo;
+ for (i = 0; i < pPce->NumSideChannelElements; i++) {
+ numSideChannels[*pHeight] += pPce->SideElementIsCpe[i] ? 2 : 1;
+ pHeight++;
+ }
+ pHeight = pPce->FrontElementHeightInfo;
+ for (i = 0; i < pPce->NumFrontChannelElements; i++) {
+ numFrontChannels[*pHeight] += pPce->FrontElementIsCpe[i] ? 2 : 1;
+ pHeight++;
+ }
+
+ /* 0 = normal height channels, 1 = top height channels, 2 = bottom height
+ * channels */
+ for (i = 0; i < 3; i++) {
+ /* if number of channels is odd => first element must be a SCE (front center
+ * channel) */
+ if (numFrontChannels[i] & 1) {
+ if (*pCpeFront++ == ID_CPE) {
+ err = 1;
+ goto bail;
+ }
+ numFrontChannels[i]--;
+ }
+ while (numFrontChannels[i] > 0) {
+ /* must be CPE or paired SCE */
+ if (*pCpeFront++ == ID_SCE) {
+ if (*pCpeFront++ == ID_CPE) {
+ err = 1;
+ goto bail;
+ }
+ }
+ numFrontChannels[i] -= 2;
+ };
+
+ /* in case that a top center surround channel (Ts) is transmitted the number
+ * of channels can be odd */
+ if (i != 1) {
+ /* number of channels must be even */
+ if (numSideChannels[i] & 1) {
+ err = 1;
+ goto bail;
+ }
+ while (numSideChannels[i] > 0) {
+ /* must be CPE or paired SCE */
+ if (*pCpeSide++ == ID_SCE) {
+ if (*pCpeSide++ == ID_CPE) {
+ err = 1;
+ goto bail;
+ }
+ }
+ numSideChannels[i] -= 2;
+ };
+ }
+
+ while (numBackChannels[i] > 1) {
+ /* must be CPE or paired SCE */
+ if (*pCpeBack++ == ID_SCE) {
+ if (*pCpeBack++ == ID_CPE) {
+ err = 1;
+ goto bail;
+ }
+ }
+ numBackChannels[i] -= 2;
+ };
+ /* if number of channels is odd => last element must be a SCE (back center
+ * channel) */
+ if (numBackChannels[i]) {
+ if (*pCpeBack++ == ID_CPE) {
+ err = 1;
+ goto bail;
+ }
+ }
+ }
+
+bail:
+
+ return err;
+}
+
void CProgramConfig_Read(CProgramConfig *pPce, HANDLE_FDK_BITSTREAM bs,
UINT alignmentAnchor) {
- int i, err = 0;
+ int i;
int commentBytes;
+ UCHAR tag, isCpe;
+ UCHAR checkElementTagSelect[3][PC_FSB_CHANNELS_MAX] = {{0}};
+ pPce->isValid = 1;
pPce->NumEffectiveChannels = 0;
pPce->NumChannels = 0;
pPce->ElementInstanceTag = (UCHAR)FDKreadBits(bs, 4);
@@ -297,28 +404,60 @@ void CProgramConfig_Read(CProgramConfig *pPce, HANDLE_FDK_BITSTREAM bs,
}
for (i = 0; i < pPce->NumFrontChannelElements; i++) {
- pPce->FrontElementIsCpe[i] = (UCHAR)FDKreadBits(bs, 1);
- pPce->FrontElementTagSelect[i] = (UCHAR)FDKreadBits(bs, 4);
+ pPce->FrontElementIsCpe[i] = isCpe = (UCHAR)FDKreadBits(bs, 1);
+ pPce->FrontElementTagSelect[i] = tag = (UCHAR)FDKreadBits(bs, 4);
pPce->NumChannels += pPce->FrontElementIsCpe[i] ? 2 : 1;
+
+ /* Check element instance tag according to ISO/IEC 13818-7:2003(E),
+ * chapter 8.2.1.1 */
+ if (checkElementTagSelect[isCpe][tag] == 0) {
+ checkElementTagSelect[isCpe][tag] = 1;
+ } else {
+ pPce->isValid = 0;
+ }
}
for (i = 0; i < pPce->NumSideChannelElements; i++) {
- pPce->SideElementIsCpe[i] = (UCHAR)FDKreadBits(bs, 1);
- pPce->SideElementTagSelect[i] = (UCHAR)FDKreadBits(bs, 4);
+ pPce->SideElementIsCpe[i] = isCpe = (UCHAR)FDKreadBits(bs, 1);
+ pPce->SideElementTagSelect[i] = tag = (UCHAR)FDKreadBits(bs, 4);
pPce->NumChannels += pPce->SideElementIsCpe[i] ? 2 : 1;
+
+ /* Check element instance tag according to ISO/IEC 13818-7:2003(E),
+ * chapter 8.2.1.1 */
+ if (checkElementTagSelect[isCpe][tag] == 0) {
+ checkElementTagSelect[isCpe][tag] = 1;
+ } else {
+ pPce->isValid = 0;
+ }
}
for (i = 0; i < pPce->NumBackChannelElements; i++) {
- pPce->BackElementIsCpe[i] = (UCHAR)FDKreadBits(bs, 1);
- pPce->BackElementTagSelect[i] = (UCHAR)FDKreadBits(bs, 4);
+ pPce->BackElementIsCpe[i] = isCpe = (UCHAR)FDKreadBits(bs, 1);
+ pPce->BackElementTagSelect[i] = tag = (UCHAR)FDKreadBits(bs, 4);
pPce->NumChannels += pPce->BackElementIsCpe[i] ? 2 : 1;
+
+ /* Check element instance tag according to ISO/IEC 13818-7:2003(E),
+ * chapter 8.2.1.1 */
+ if (checkElementTagSelect[isCpe][tag] == 0) {
+ checkElementTagSelect[isCpe][tag] = 1;
+ } else {
+ pPce->isValid = 0;
+ }
}
pPce->NumEffectiveChannels = pPce->NumChannels;
for (i = 0; i < pPce->NumLfeChannelElements; i++) {
- pPce->LfeElementTagSelect[i] = (UCHAR)FDKreadBits(bs, 4);
+ pPce->LfeElementTagSelect[i] = tag = (UCHAR)FDKreadBits(bs, 4);
pPce->NumChannels += 1;
+
+ /* Check element instance tag according to ISO/IEC 13818-7:2003(E),
+ * chapter 8.2.1.1 */
+ if (checkElementTagSelect[2][tag] == 0) {
+ checkElementTagSelect[2][tag] = 1;
+ } else {
+ pPce->isValid = 0;
+ }
}
for (i = 0; i < pPce->NumAssocDataElements; i++) {
@@ -336,7 +475,15 @@ void CProgramConfig_Read(CProgramConfig *pPce, HANDLE_FDK_BITSTREAM bs,
commentBytes = pPce->CommentFieldBytes;
/* Search for height info extension and read it if available */
- err = CProgramConfig_ReadHeightExt(pPce, bs, &commentBytes, alignmentAnchor);
+ if (CProgramConfig_ReadHeightExt(pPce, bs, &commentBytes, alignmentAnchor)) {
+ pPce->isValid = 0;
+ }
+
+ /* Check order of elements according to ISO / IEC 13818 - 7:2003(E),
+ * chapter 8.5.1 */
+ if (CProgramConfig_Check(pPce)) {
+ pPce->isValid = 0;
+ }
for (i = 0; i < commentBytes; i++) {
UCHAR text;
@@ -347,8 +494,6 @@ void CProgramConfig_Read(CProgramConfig *pPce, HANDLE_FDK_BITSTREAM bs,
pPce->Comment[i] = text;
}
}
-
- pPce->isValid = (err) ? 0 : 1;
}
/*
@@ -1633,6 +1778,10 @@ static TRANSPORTDEC_ERROR configExtension(CSUsacConfig *usc,
int numConfigExtensions;
CONFIG_EXT_ID usacConfigExtType;
int usacConfigExtLength;
+ int loudnessInfoSetIndex =
+ -1; /* index of loudnessInfoSet config extension. -1 if not contained. */
+ int tmp_subStreamIndex = 0;
+ AUDIO_OBJECT_TYPE tmp_aot = AOT_USAC;
numConfigExtensions = (int)escapedValue(hBs, 2, 4, 8) + 1;
for (int confExtIdx = 0; confExtIdx < numConfigExtensions; confExtIdx++) {
@@ -1662,10 +1811,12 @@ static TRANSPORTDEC_ERROR configExtension(CSUsacConfig *usc,
ErrorStatus = (TRANSPORTDEC_ERROR)cb->cbUniDrc(
cb->cbUniDrcData, hBs, usacConfigExtLength,
1, /* loudnessInfoSet */
- 0, loudnessInfoSetConfigExtensionPosition, AOT_USAC);
+ tmp_subStreamIndex, loudnessInfoSetConfigExtensionPosition,
+ tmp_aot);
if (ErrorStatus != TRANSPORTDEC_OK) {
return ErrorStatus;
}
+ loudnessInfoSetIndex = confExtIdx;
}
} break;
default:
@@ -1681,6 +1832,17 @@ static TRANSPORTDEC_ERROR configExtension(CSUsacConfig *usc,
FDKpushFor(hBs, usacConfigExtLength);
}
+ if (loudnessInfoSetIndex == -1 && cb->cbUniDrc != NULL) {
+ /* no loudnessInfoSet contained. Clear the loudnessInfoSet struct by feeding
+ * an empty config extension */
+ ErrorStatus = (TRANSPORTDEC_ERROR)cb->cbUniDrc(
+ cb->cbUniDrcData, NULL, 0, 1 /* loudnessInfoSet */, tmp_subStreamIndex,
+ 0, tmp_aot);
+ if (ErrorStatus != TRANSPORTDEC_OK) {
+ return ErrorStatus;
+ }
+ }
+
return ErrorStatus;
}
@@ -1697,6 +1859,8 @@ static TRANSPORTDEC_ERROR UsacRsv60DecoderConfig_Parse(
int channelElementIdx =
0; /* index for elements which contain audio channels (sce, cpe, lfe) */
SC_CHANNEL_CONFIG sc_chan_config = {0, 0, 0, 0};
+ int uniDrcElement =
+ -1; /* index of uniDrc extension element. -1 if not contained. */
numberOfElements = (int)escapedValue(hBs, 4, 8, 16) + 1;
usc->m_usacNumElements = numberOfElements;
@@ -1872,6 +2036,10 @@ static TRANSPORTDEC_ERROR UsacRsv60DecoderConfig_Parse(
case ID_USAC_EXT:
ErrorStatus = extElementConfig(&usc->element[i].extElement, hBs, cb, 0,
asc->m_samplesPerFrame, 0, asc->m_aot);
+ if (usc->element[i].extElement.usacExtElementType ==
+ ID_EXT_ELE_UNI_DRC) {
+ uniDrcElement = i;
+ }
if (ErrorStatus) {
return ErrorStatus;
@@ -1900,6 +2068,18 @@ static TRANSPORTDEC_ERROR UsacRsv60DecoderConfig_Parse(
}
}
+ if (uniDrcElement == -1 && cb->cbUniDrc != NULL) {
+ /* no uniDrcConfig contained. Clear the uniDrcConfig struct by feeding an
+ * empty extension element */
+ int subStreamIndex = 0;
+ ErrorStatus = (TRANSPORTDEC_ERROR)cb->cbUniDrc(
+ cb->cbUniDrcData, NULL, 0, 0 /* uniDrcConfig */, subStreamIndex, 0,
+ asc->m_aot);
+ if (ErrorStatus != TRANSPORTDEC_OK) {
+ return ErrorStatus;
+ }
+ }
+
return ErrorStatus;
}
@@ -1986,6 +2166,14 @@ static TRANSPORTDEC_ERROR UsacConfig_Parse(CSAudioSpecificConfig *asc,
if (err != TRANSPORTDEC_OK) {
return err;
}
+ } else if (cb->cbUniDrc != NULL) {
+ /* no loudnessInfoSet contained. Clear the loudnessInfoSet struct by feeding
+ * an empty config extension */
+ err = (TRANSPORTDEC_ERROR)cb->cbUniDrc(
+ cb->cbUniDrcData, NULL, 0, 1 /* loudnessInfoSet */, 0, 0, asc->m_aot);
+ if (err != TRANSPORTDEC_OK) {
+ return err;
+ }
}
/* sanity check whether number of channels signaled in UsacDecoderConfig()
@@ -1998,9 +2186,11 @@ static TRANSPORTDEC_ERROR UsacConfig_Parse(CSAudioSpecificConfig *asc,
/* Copy UsacConfig() to asc->m_sc.m_usacConfig.UsacConfig[] buffer. */
INT configSize_bits = (INT)FDKgetValidBits(hBs) - nbits;
- StoreConfigAsBitstream(hBs, configSize_bits,
- asc->m_sc.m_usacConfig.UsacConfig,
- TP_USAC_MAX_CONFIG_LEN);
+ if (StoreConfigAsBitstream(hBs, configSize_bits,
+ asc->m_sc.m_usacConfig.UsacConfig,
+ TP_USAC_MAX_CONFIG_LEN)) {
+ return TRANSPORTDEC_PARSE_ERROR;
+ }
asc->m_sc.m_usacConfig.UsacConfigBits = fAbs(configSize_bits);
return err;
@@ -2302,8 +2492,10 @@ TRANSPORTDEC_ERROR AudioSpecificConfig_Parse(
/* Copy config() to asc->config[] buffer. */
if ((ErrorStatus == TRANSPORTDEC_OK) && (self->m_aot == AOT_USAC)) {
INT configSize_bits = (INT)FDKgetValidBits(bs) - (INT)ascStartAnchor;
- StoreConfigAsBitstream(bs, configSize_bits, self->config,
- TP_USAC_MAX_CONFIG_LEN);
+ if (StoreConfigAsBitstream(bs, configSize_bits, self->config,
+ TP_USAC_MAX_CONFIG_LEN)) {
+ return TRANSPORTDEC_PARSE_ERROR;
+ }
self->configBits = fAbs(configSize_bits);
}
diff --git a/libMpegTPDec/src/tpdec_lib.cpp b/libMpegTPDec/src/tpdec_lib.cpp
index ca35184..091d011 100644
--- a/libMpegTPDec/src/tpdec_lib.cpp
+++ b/libMpegTPDec/src/tpdec_lib.cpp
@@ -1769,7 +1769,7 @@ TRANSPORTDEC_ERROR transportDec_GetLibInfo(LIB_INFO *info) {
info += i;
info->module_id = FDK_TPDEC;
-#ifdef __ANDROID__
+#ifdef SUPPRESS_BUILD_DATE_INFO
info->build_date = "";
info->build_time = "";
#else
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 18:08:27 +0000