aboutsummaryrefslogtreecommitdiffstats
path: root/libMpegTPEnc/src/tpenc_latm.cpp
diff options
context:
space:
mode:
authorFraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de>2018-02-26 20:17:00 +0100
committerJean-Michel Trivi <jmtrivi@google.com>2018-04-19 11:21:15 -0700
commit6cfabd35363c3ef5e3b209b867169a500b3ccc3c (patch)
tree01c0a19f2735e8b5d2407555fe992d4230d089eb /libMpegTPEnc/src/tpenc_latm.cpp
parent6288a1e34c4dede4c2806beb1736ece6580558c7 (diff)
downloadfdk-aac-6cfabd35363c3ef5e3b209b867169a500b3ccc3c.tar.gz
fdk-aac-6cfabd35363c3ef5e3b209b867169a500b3ccc3c.tar.bz2
fdk-aac-6cfabd35363c3ef5e3b209b867169a500b3ccc3c.zip
Upgrade to FDKv2
Bug: 71430241 Test: CTS DecoderTest and DecoderTestAacDrc original-Change-Id: Iaa20f749b8a04d553b20247cfe1a8930ebbabe30 Apply clang-format also on header files. original-Change-Id: I14de1ef16bbc79ec0283e745f98356a10efeb2e4 Fixes for MPEG-D DRC original-Change-Id: If1de2d74bbbac84b3f67de3b88b83f6a23b8a15c Catch unsupported tw_mdct at an early stage original-Change-Id: Ied9dd00d754162a0e3ca1ae3e6b854315d818afe Fixing PVC transition frames original-Change-Id: Ib75725abe39252806c32d71176308f2c03547a4e Move qmf bands sanity check original-Change-Id: Iab540c3013c174d9490d2ae100a4576f51d8dbc4 Initialize scaling variable original-Change-Id: I3c4087101b70e998c71c1689b122b0d7762e0f9e Add 16 qmf band configuration to getSlotNrgHQ() original-Change-Id: I49a5d30f703a1b126ff163df9656db2540df21f1 Always apply byte alignment at the end of the AudioMuxElement original-Change-Id: I42d560287506d65d4c3de8bfe3eb9a4ebeb4efc7 Setup SBR element only if no parse error exists original-Change-Id: I1915b73704bc80ab882b9173d6bec59cbd073676 Additional array index check in HCR original-Change-Id: I18cc6e501ea683b5009f1bbee26de8ddd04d8267 Fix fade-in index selection in concealment module original-Change-Id: Ibf802ed6ed8c05e9257e1f3b6d0ac1162e9b81c1 Enable explicit backward compatible parser for AAC_LD original-Change-Id: I27e9c678dcb5d40ed760a6d1e06609563d02482d Skip spatial specific config in explicit backward compatible ASC original-Change-Id: Iff7cc365561319e886090cedf30533f562ea4d6e Update flags description in decoder API original-Change-Id: I9a5b4f8da76bb652f5580cbd3ba9760425c43830 Add QMF domain reset function original-Change-Id: I4f89a8a2c0277d18103380134e4ed86996e9d8d6 DRC upgrade v2.1.0 original-Change-Id: I5731c0540139dab220094cd978ef42099fc45b74 Fix integer overflow in sqrtFixp_lookup() original-Change-Id: I429a6f0d19aa2cc957e0f181066f0ca73968c914 Fix integer overflow in invSqrtNorm2() original-Change-Id: I84de5cbf9fb3adeb611db203fe492fabf4eb6155 Fix integer overflow in GenerateRandomVector() original-Change-Id: I3118a641008bd9484d479e5b0b1ee2b5d7d44d74 Fix integer overflow in adjustTimeSlot_EldGrid() original-Change-Id: I29d503c247c5c8282349b79df940416a512fb9d5 Fix integer overflow in FDKsbrEnc_codeEnvelope() original-Change-Id: I6b34b61ebb9d525b0c651ed08de2befc1f801449 Follow-up on: Fix integer overflow in adjustTimeSlot_EldGrid() original-Change-Id: I6f8f578cc7089e5eb7c7b93e580b72ca35ad689a Fix integer overflow in get_pk_v2() original-Change-Id: I63375bed40d45867f6eeaa72b20b1f33e815938c Fix integer overflow in Syn_filt_zero() original-Change-Id: Ie0c02fdfbe03988f9d3b20d10cd9fe4c002d1279 Fix integer overflow in CFac_CalcFacSignal() original-Change-Id: Id2d767c40066c591b51768e978eb8af3b803f0c5 Fix integer overflow in FDKaacEnc_FDKaacEnc_calcPeNoAH() original-Change-Id: Idcbd0f4a51ae2550ed106aa6f3d678d1f9724841 Fix integer overflow in sbrDecoder_calculateGainVec() original-Change-Id: I7081bcbe29c5cede9821b38d93de07c7add2d507 Fix integer overflow in CLpc_SynthesisLattice() original-Change-Id: I4a95ddc18de150102352d4a1845f06094764c881 Fix integer overflow in Pred_Lt4() original-Change-Id: I4dbd012b2de7d07c3e70a47b92e3bfae8dbc750a Fix integer overflow in FDKsbrEnc_InitSbrFastTransientDetector() original-Change-Id: I788cbec1a4a00f44c2f3a72ad7a4afa219807d04 Fix unsigned integer overflow in FDKaacEnc_WriteBitstream() original-Change-Id: I68fc75166e7d2cd5cd45b18dbe3d8c2a92f1822a Fix unsigned integer overflow in FDK_MetadataEnc_Init() original-Change-Id: Ie8d025f9bcdb2442c704bd196e61065c03c10af4 Fix overflow in pseudo random number generators original-Change-Id: I3e2551ee01356297ca14e3788436ede80bd5513c Fix unsigned integer overflow in sbrDecoder_Parse() original-Change-Id: I3f231b2f437e9c37db4d5b964164686710eee971 Fix unsigned integer overflow in longsub() original-Change-Id: I73c2bc50415cac26f1f5a29e125bbe75f9180a6e Fix unsigned integer overflow in CAacDecoder_DecodeFrame() original-Change-Id: Ifce2db4b1454b46fa5f887e9d383f1cc43b291e4 Fix overflow at CLpdChannelStream_Read() original-Change-Id: Idb9d822ce3a4272e4794b643644f5434e2d4bf3f Fix unsigned integer overflow in Hcr_State_BODY_SIGN_ESC__ESC_WORD() original-Change-Id: I1ccf77c0015684b85534c5eb97162740a870b71c Fix unsigned integer overflow in UsacConfig_Parse() original-Change-Id: Ie6d27f84b6ae7eef092ecbff4447941c77864d9f Fix unsigned integer overflow in aacDecoder_drcParse() original-Change-Id: I713f28e883eea3d70b6fa56a7b8f8c22bcf66ca0 Fix unsigned integer overflow in aacDecoder_drcReadCompression() original-Change-Id: Ia34dfeb88c4705c558bce34314f584965cafcf7a Fix unsigned integer overflow in CDataStreamElement_Read() original-Change-Id: Iae896cc1d11f0a893d21be6aa90bd3e60a2c25f0 Fix unsigned integer overflow in transportDec_AdjustEndOfAccessUnit() original-Change-Id: I64cf29a153ee784bb4a16fdc088baabebc0007dc Fix unsigned integer overflow in transportDec_GetAuBitsRemaining() original-Change-Id: I975b3420faa9c16a041874ba0db82e92035962e4 Fix unsigned integer overflow in extractExtendedData() original-Change-Id: I2a59eb09e2053cfb58dfb75fcecfad6b85a80a8f Fix signed integer overflow in CAacDecoder_ExtPayloadParse() original-Change-Id: I4ad5ca4e3b83b5d964f1c2f8c5e7b17c477c7929 Fix unsigned integer overflow in CAacDecoder_DecodeFrame() original-Change-Id: I29a39df77d45c52a0c9c5c83c1ba81f8d0f25090 Follow-up on: Fix integer overflow in CLpc_SynthesisLattice() original-Change-Id: I8fb194ffc073a3432a380845be71036a272d388f Fix signed integer overflow in _interpolateDrcGain() original-Change-Id: I879ec9ab14005069a7c47faf80e8bc6e03d22e60 Fix unsigned integer overflow in FDKreadBits() original-Change-Id: I1f47a6a8037ff70375aa8844947d5681bb4287ad Fix unsigned integer overflow in FDKbyteAlign() original-Change-Id: Id5f3a11a0c9e50fc6f76ed6c572dbd4e9f2af766 Fix unsigned integer overflow in FDK_get32() original-Change-Id: I9d33b8e97e3d38cbb80629cb859266ca0acdce96 Fix unsigned integer overflow in FDK_pushBack() original-Change-Id: Ic87f899bc8c6acf7a377a8ca7f3ba74c3a1e1c19 Fix unsigned integer overflow in FDK_pushForward() original-Change-Id: I3b754382f6776a34be1602e66694ede8e0b8effc Fix unsigned integer overflow in ReadPsData() original-Change-Id: I25361664ba8139e32bbbef2ca8c106a606ce9c37 Fix signed integer overflow in E_UTIL_residu() original-Change-Id: I8c3abd1f437ee869caa8fb5903ce7d3d641b6aad REVERT: Follow-up on: Integer overflow in CLpc_SynthesisLattice(). original-Change-Id: I3d340099acb0414795c8dfbe6362bc0a8f045f9b Follow-up on: Fix integer overflow in CLpc_SynthesisLattice() original-Change-Id: I4aedb8b3a187064e9f4d985175aa55bb99cc7590 Follow-up on: Fix unsigned integer overflow in aacDecoder_drcParse() original-Change-Id: I2aa2e13916213bf52a67e8b0518e7bf7e57fb37d Fix integer overflow in acelp original-Change-Id: Ie6390c136d84055f8b728aefbe4ebef6e029dc77 Fix unsigned integer overflow in aacDecoder_UpdateBitStreamCounters() original-Change-Id: I391ffd97ddb0b2c184cba76139bfb356a3b4d2e2 Adjust concealment default settings original-Change-Id: I6a95db935a327c47df348030bcceafcb29f54b21 Saturate estimatedStartPos original-Change-Id: I27be2085e0ae83ec9501409f65e003f6bcba1ab6 Negative shift exponent in _interpolateDrcGain() original-Change-Id: I18edb26b26d002aafd5e633d4914960f7a359c29 Negative shift exponent in calculateICC() original-Change-Id: I3dcd2ae98d2eb70ee0d59750863cbb2a6f4f8aba Too large shift exponent in FDK_put() original-Change-Id: Ib7d9aaa434d2d8de4a13b720ca0464b31ca9b671 Too large shift exponent in CalcInvLdData() original-Change-Id: I43e6e78d4cd12daeb1dcd5d82d1798bdc2550262 Member access within null pointer of type SBR_CHANNEL original-Change-Id: Idc5e4ea8997810376d2f36bbdf628923b135b097 Member access within null pointer of type CpePersistentData original-Change-Id: Ib6c91cb0d37882768e5baf63324e429589de0d9d Member access within null pointer FDKaacEnc_psyMain() original-Change-Id: I7729b7f4479970531d9dc823abff63ca52e01997 Member access within null pointer FDKaacEnc_GetPnsParam() original-Change-Id: I9aa3b9f3456ae2e0f7483dbd5b3dde95fc62da39 Member access within null pointer FDKsbrEnc_EnvEncodeFrame() original-Change-Id: I67936f90ea714e90b3e81bc0dd1472cc713eb23a Add HCR sanity check original-Change-Id: I6c1d9732ebcf6af12f50b7641400752f74be39f7 Fix memory issue for HBE edge case with 8:3 SBR original-Change-Id: I11ea58a61e69fbe8bf75034b640baee3011e63e9 Additional SBR parametrization sanity check for ELD original-Change-Id: Ie26026fbfe174c2c7b3691f6218b5ce63e322140 Add MPEG-D DRC channel layout check original-Change-Id: Iea70a74f171b227cce636a9eac4ba662777a2f72 Additional out-of-bounds checks in MPEG-D DRC original-Change-Id: Ife4a8c3452c6fde8a0a09e941154a39a769777d4 Change-Id: Ic63cb2f628720f54fe9b572b0cb528e2599c624e
Diffstat (limited to 'libMpegTPEnc/src/tpenc_latm.cpp')
-rw-r--r--libMpegTPEnc/src/tpenc_latm.cpp933
1 files changed, 451 insertions, 482 deletions
diff --git a/libMpegTPEnc/src/tpenc_latm.cpp b/libMpegTPEnc/src/tpenc_latm.cpp
index f292019..2d35d48 100644
--- a/libMpegTPEnc/src/tpenc_latm.cpp
+++ b/libMpegTPEnc/src/tpenc_latm.cpp
@@ -1,74 +1,85 @@
-
-/* -----------------------------------------------------------------------------------------------------------
+/* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android
-© Copyright 1995 - 2015 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
- All rights reserved.
+© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten
+Forschung e.V. All rights reserved.
1. INTRODUCTION
-The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software that implements
-the MPEG Advanced Audio Coding ("AAC") encoding and decoding scheme for digital audio.
-This FDK AAC Codec software is intended to be used on a wide variety of Android devices.
-
-AAC's HE-AAC and HE-AAC v2 versions are regarded as today's most efficient general perceptual
-audio codecs. AAC-ELD is considered the best-performing full-bandwidth communications codec by
-independent studies and is widely deployed. AAC has been standardized by ISO and IEC as part
-of the MPEG specifications.
-
-Patent licenses for necessary patent claims for the FDK AAC Codec (including those of Fraunhofer)
-may be obtained through Via Licensing (www.vialicensing.com) or through the respective patent owners
-individually for the purpose of encoding or decoding bit streams in products that are compliant with
-the ISO/IEC MPEG audio standards. Please note that most manufacturers of Android devices already license
-these patent claims through Via Licensing or directly from the patent owners, and therefore FDK AAC Codec
-software may already be covered under those patent licenses when it is used for those licensed purposes only.
-
-Commercially-licensed AAC software libraries, including floating-point versions with enhanced sound quality,
-are also available from Fraunhofer. Users are encouraged to check the Fraunhofer website for additional
-applications information and documentation.
+The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software
+that implements the MPEG Advanced Audio Coding ("AAC") encoding and decoding
+scheme for digital audio. This FDK AAC Codec software is intended to be used on
+a wide variety of Android devices.
+
+AAC's HE-AAC and HE-AAC v2 versions are regarded as today's most efficient
+general perceptual audio codecs. AAC-ELD is considered the best-performing
+full-bandwidth communications codec by independent studies and is widely
+deployed. AAC has been standardized by ISO and IEC as part of the MPEG
+specifications.
+
+Patent licenses for necessary patent claims for the FDK AAC Codec (including
+those of Fraunhofer) may be obtained through Via Licensing
+(www.vialicensing.com) or through the respective patent owners individually for
+the purpose of encoding or decoding bit streams in products that are compliant
+with the ISO/IEC MPEG audio standards. Please note that most manufacturers of
+Android devices already license these patent claims through Via Licensing or
+directly from the patent owners, and therefore FDK AAC Codec software may
+already be covered under those patent licenses when it is used for those
+licensed purposes only.
+
+Commercially-licensed AAC software libraries, including floating-point versions
+with enhanced sound quality, are also available from Fraunhofer. Users are
+encouraged to check the Fraunhofer website for additional applications
+information and documentation.
2. COPYRIGHT LICENSE
-Redistribution and use in source and binary forms, with or without modification, are permitted without
-payment of copyright license fees provided that you satisfy the following conditions:
+Redistribution and use in source and binary forms, with or without modification,
+are permitted without payment of copyright license fees provided that you
+satisfy the following conditions:
-You must retain the complete text of this software license in redistributions of the FDK AAC Codec or
-your modifications thereto in source code form.
+You must retain the complete text of this software license in redistributions of
+the FDK AAC Codec or your modifications thereto in source code form.
-You must retain the complete text of this software license in the documentation and/or other materials
-provided with redistributions of the FDK AAC Codec or your modifications thereto in binary form.
-You must make available free of charge copies of the complete source code of the FDK AAC Codec and your
+You must retain the complete text of this software license in the documentation
+and/or other materials provided with redistributions of the FDK AAC Codec or
+your modifications thereto in binary form. You must make available free of
+charge copies of the complete source code of the FDK AAC Codec and your
modifications thereto to recipients of copies in binary form.
-The name of Fraunhofer may not be used to endorse or promote products derived from this library without
-prior written permission.
+The name of Fraunhofer may not be used to endorse or promote products derived
+from this library without prior written permission.
-You may not charge copyright license fees for anyone to use, copy or distribute the FDK AAC Codec
-software or your modifications thereto.
+You may not charge copyright license fees for anyone to use, copy or distribute
+the FDK AAC Codec software or your modifications thereto.
-Your modified versions of the FDK AAC Codec must carry prominent notices stating that you changed the software
-and the date of any change. For modified versions of the FDK AAC Codec, the term
-"Fraunhofer FDK AAC Codec Library for Android" must be replaced by the term
-"Third-Party Modified Version of the Fraunhofer FDK AAC Codec Library for Android."
+Your modified versions of the FDK AAC Codec must carry prominent notices stating
+that you changed the software and the date of any change. For modified versions
+of the FDK AAC Codec, the term "Fraunhofer FDK AAC Codec Library for Android"
+must be replaced by the term "Third-Party Modified Version of the Fraunhofer FDK
+AAC Codec Library for Android."
3. NO PATENT LICENSE
-NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without limitation the patents of Fraunhofer,
-ARE GRANTED BY THIS SOFTWARE LICENSE. Fraunhofer provides no warranty of patent non-infringement with
-respect to this software.
+NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without
+limitation the patents of Fraunhofer, ARE GRANTED BY THIS SOFTWARE LICENSE.
+Fraunhofer provides no warranty of patent non-infringement with respect to this
+software.
-You may use this FDK AAC Codec software or modifications thereto only for purposes that are authorized
-by appropriate patent licenses.
+You may use this FDK AAC Codec software or modifications thereto only for
+purposes that are authorized by appropriate patent licenses.
4. DISCLAIMER
-This FDK AAC Codec software is provided by Fraunhofer on behalf of the copyright holders and contributors
-"AS IS" and WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, including but not limited to the implied warranties
-of merchantability and fitness for a particular purpose. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-CONTRIBUTORS BE LIABLE for any direct, indirect, incidental, special, exemplary, or consequential damages,
-including but not limited to procurement of substitute goods or services; loss of use, data, or profits,
-or business interruption, however caused and on any theory of liability, whether in contract, strict
-liability, or tort (including negligence), arising in any way out of the use of this software, even if
-advised of the possibility of such damage.
+This FDK AAC Codec software is provided by Fraunhofer on behalf of the copyright
+holders and contributors "AS IS" and WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES,
+including but not limited to the implied warranties of merchantability and
+fitness for a particular purpose. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+CONTRIBUTORS BE LIABLE for any direct, indirect, incidental, special, exemplary,
+or consequential damages, including but not limited to procurement of substitute
+goods or services; loss of use, data, or profits, or business interruption,
+however caused and on any theory of liability, whether in contract, strict
+liability, or tort (including negligence), arising in any way out of the use of
+this software, even if advised of the possibility of such damage.
5. CONTACT INFORMATION
@@ -79,78 +90,69 @@ Am Wolfsmantel 33
www.iis.fraunhofer.de/amm
amm-info@iis.fraunhofer.de
------------------------------------------------------------------------------------------------------------ */
+----------------------------------------------------------------------------- */
-/***************************** MPEG-4 AAC Encoder **************************
+/******************* MPEG transport format encoder library *********************
Author(s):
+
Description:
-******************************************************************************/
+*******************************************************************************/
#include "tpenc_latm.h"
-
#include "genericStds.h"
static const short celpFrameLengthTable[64] = {
- 154, 170, 186, 147, 156, 165, 114, 120,
- 186, 126, 132, 138, 142, 146, 154, 166,
- 174, 182, 190, 198, 206, 210, 214, 110,
- 114, 118, 120, 122, 218, 230, 242, 254,
- 266, 278, 286, 294, 318, 342, 358, 374,
- 390, 406, 422, 136, 142, 148, 154, 160,
- 166, 170, 174, 186, 198, 206, 214, 222,
- 230, 238, 216, 160, 280, 338, 0, 0
-};
+ 154, 170, 186, 147, 156, 165, 114, 120, 186, 126, 132, 138, 142,
+ 146, 154, 166, 174, 182, 190, 198, 206, 210, 214, 110, 114, 118,
+ 120, 122, 218, 230, 242, 254, 266, 278, 286, 294, 318, 342, 358,
+ 374, 390, 406, 422, 136, 142, 148, 154, 160, 166, 170, 174, 186,
+ 198, 206, 214, 222, 230, 238, 216, 160, 280, 338, 0, 0};
/*******
write value to transport stream
first two bits define the size of the value itself
then the value itself, with a size of 0-3 bytes
*******/
-static
-UINT transportEnc_LatmWriteValue(HANDLE_FDK_BITSTREAM hBs, int value)
-{
+static UINT transportEnc_LatmWriteValue(HANDLE_FDK_BITSTREAM hBs, int value) {
UCHAR valueBytes = 4;
unsigned int bitsWritten = 0;
int i;
- if ( value < (1<<8) ) {
+ if (value < (1 << 8)) {
valueBytes = 1;
- } else if ( value < (1<<16) ) {
+ } else if (value < (1 << 16)) {
valueBytes = 2;
- } else if ( value < (1<<24) ) {
+ } else if (value < (1 << 24)) {
valueBytes = 3;
} else {
valueBytes = 4;
}
- FDKwriteBits(hBs, valueBytes-1, 2 ); /* size of value in Bytes */
- for (i=0; i<valueBytes; i++) {
+ FDKwriteBits(hBs, valueBytes - 1, 2); /* size of value in Bytes */
+ for (i = 0; i < valueBytes; i++) {
/* write most significant Byte first */
- FDKwriteBits(hBs, (UCHAR)(value>>((valueBytes-1-i)<<3)), 8);
+ FDKwriteBits(hBs, (UCHAR)(value >> ((valueBytes - 1 - i) << 3)), 8);
}
- bitsWritten = (valueBytes<<3)+2;
+ bitsWritten = (valueBytes << 3) + 2;
return bitsWritten;
}
-static
-UINT transportEnc_LatmCountFixBitDemandHeader ( HANDLE_LATM_STREAM hAss )
-{
+static UINT transportEnc_LatmCountFixBitDemandHeader(HANDLE_LATM_STREAM hAss) {
int bitDemand = 0;
- int insertSetupData = 0 ;
+ int insertSetupData = 0;
/* only if start of new latm frame */
- if (hAss->subFrameCnt==0)
- {
+ if (hAss->subFrameCnt == 0) {
/* AudioSyncStream */
if (hAss->tt == TT_MP4_LOAS) {
- bitDemand += 11 ; /* syncword */
- bitDemand += 13 ; /* audioMuxLengthBytes */
+ bitDemand += 11; /* syncword */
+ bitDemand += 13; /* audioMuxLengthBytes */
}
/* AudioMuxElement*/
@@ -164,191 +166,184 @@ UINT transportEnc_LatmCountFixBitDemandHeader ( HANDLE_LATM_STREAM hAss )
if (hAss->tt != TT_MP4_LATM_MCP0) {
/* AudioMuxElement::useSameStreamMux Flag */
- bitDemand+=1;
+ bitDemand += 1;
- if( insertSetupData ) {
+ if (insertSetupData) {
bitDemand += hAss->streamMuxConfigBits;
}
}
/* AudioMuxElement::otherDataBits */
- bitDemand += 8*hAss->otherDataLenBytes;
+ bitDemand += hAss->otherDataLenBits;
/* AudioMuxElement::ByteAlign */
- if ( bitDemand % 8 ) {
- hAss->fillBits = 8 - (bitDemand % 8);
- bitDemand += hAss->fillBits ;
+ if (bitDemand % 8) {
+ hAss->fillBits = 8 - (bitDemand % 8);
+ bitDemand += hAss->fillBits;
} else {
hAss->fillBits = 0;
}
}
- return bitDemand ;
+ return bitDemand;
}
-static
-UINT transportEnc_LatmCountVarBitDemandHeader ( HANDLE_LATM_STREAM hAss , unsigned int streamDataLength )
-{
+static UINT transportEnc_LatmCountVarBitDemandHeader(
+ HANDLE_LATM_STREAM hAss, unsigned int streamDataLength) {
int bitDemand = 0;
- int prog, layer;
+ int prog, layer;
/* Payload Length Info*/
- if( hAss->allStreamsSameTimeFraming ) {
- for( prog=0; prog<hAss->noProgram; prog++ ) {
- for( layer=0; layer<LATM_MAX_LAYERS; layer++ ) {
+ if (hAss->allStreamsSameTimeFraming) {
+ for (prog = 0; prog < hAss->noProgram; prog++) {
+ for (layer = 0; layer < LATM_MAX_LAYERS; layer++) {
LATM_LAYER_INFO *p_linfo = &(hAss->m_linfo[prog][layer]);
- if( p_linfo->streamID >= 0 ) {
- switch( p_linfo->frameLengthType ) {
- case 0:
- if ( streamDataLength > 0 ) {
- streamDataLength -= bitDemand ;
- while( streamDataLength >= (255<<3) ) {
- bitDemand+=8;
- streamDataLength -= (255<<3);
- }
- bitDemand += 8;
- }
- break;
-
- case 1:
- case 4:
- case 6:
- bitDemand += 2;
- break;
-
- default:
- return 0;
- }
- }
- }
- }
- } else {
- /* there are many possibilities to use this mechanism. */
- switch( hAss->varMode ) {
- case LATMVAR_SIMPLE_SEQUENCE: {
- /* Use the sequence generated by the encoder */
- //int streamCntPosition = transportEnc_SetWritePointer( hAss->hAssemble, 0 );
- //int streamCntPosition = FDKgetValidBits( hAss->hAssemble );
- bitDemand+=4;
-
- hAss->varStreamCnt = 0;
- for( prog=0; prog<hAss->noProgram; prog++ ) {
- for( layer=0; layer<LATM_MAX_LAYERS; layer++ ) {
- LATM_LAYER_INFO *p_linfo = &(hAss->m_linfo[prog][layer]);
-
- if( p_linfo->streamID >= 0 ) {
-
- bitDemand+=4; /* streamID */
- switch( p_linfo->frameLengthType ) {
+ if (p_linfo->streamID >= 0) {
+ switch (p_linfo->frameLengthType) {
case 0:
- streamDataLength -= bitDemand ;
- while( streamDataLength >= (255<<3) ) {
- bitDemand+=8;
- streamDataLength -= (255<<3);
+ if (streamDataLength > 0) {
+ streamDataLength -= bitDemand;
+ while (streamDataLength >= (255 << 3)) {
+ bitDemand += 8;
+ streamDataLength -= (255 << 3);
+ }
+ bitDemand += 8;
}
-
- bitDemand += 8;
break;
- /*bitDemand += 1; endFlag
- break;*/
case 1:
case 4:
case 6:
-
+ bitDemand += 2;
break;
default:
- return 0;
- }
- hAss->varStreamCnt++;
+ return 0;
}
}
}
- bitDemand+=4;
- //transportEnc_UpdateBitstreamField( hAss->hAssemble, streamCntPosition, hAss->varStreamCnt-1, 4 );
- //UINT pos = streamCntPosition-FDKgetValidBits(hAss->hAssemble);
- //FDKpushBack( hAss->hAssemble, pos);
- //FDKwriteBits( hAss->hAssemble, hAss->varStreamCnt-1, 4);
- //FDKpushFor( hAss->hAssemble, pos-4);
}
- break;
+ } else {
+ /* there are many possibilities to use this mechanism. */
+ switch (hAss->varMode) {
+ case LATMVAR_SIMPLE_SEQUENCE: {
+ /* Use the sequence generated by the encoder */
+ // int streamCntPosition = transportEnc_SetWritePointer(
+ // hAss->hAssemble, 0 ); int streamCntPosition = FDKgetValidBits(
+ // hAss->hAssemble );
+ bitDemand += 4;
+
+ hAss->varStreamCnt = 0;
+ for (prog = 0; prog < hAss->noProgram; prog++) {
+ for (layer = 0; layer < LATM_MAX_LAYERS; layer++) {
+ LATM_LAYER_INFO *p_linfo = &(hAss->m_linfo[prog][layer]);
+
+ if (p_linfo->streamID >= 0) {
+ bitDemand += 4; /* streamID */
+ switch (p_linfo->frameLengthType) {
+ case 0:
+ streamDataLength -= bitDemand;
+ while (streamDataLength >= (255 << 3)) {
+ bitDemand += 8;
+ streamDataLength -= (255 << 3);
+ }
+
+ bitDemand += 8;
+ break;
+ /*bitDemand += 1; endFlag
+ break;*/
- default:
- return 0;
+ case 1:
+ case 4:
+ case 6:
+
+ break;
+
+ default:
+ return 0;
+ }
+ hAss->varStreamCnt++;
+ }
+ }
+ }
+ bitDemand += 4;
+ // transportEnc_UpdateBitstreamField( hAss->hAssemble,
+ // streamCntPosition, hAss->varStreamCnt-1, 4 ); UINT pos =
+ // streamCntPosition-FDKgetValidBits(hAss->hAssemble); FDKpushBack(
+ // hAss->hAssemble, pos); FDKwriteBits( hAss->hAssemble,
+ // hAss->varStreamCnt-1, 4); FDKpushFor( hAss->hAssemble, pos-4);
+ } break;
+
+ default:
+ return 0;
}
}
- return bitDemand ;
+ return bitDemand;
}
TRANSPORTENC_ERROR
-CreateStreamMuxConfig(
- HANDLE_LATM_STREAM hAss,
- HANDLE_FDK_BITSTREAM hBs,
- int bufferFullness,
- CSTpCallBacks *cb
- )
-{
+CreateStreamMuxConfig(HANDLE_LATM_STREAM hAss, HANDLE_FDK_BITSTREAM hBs,
+ int bufferFullness, CSTpCallBacks *cb) {
INT streamIDcnt, tmp;
int layer, prog;
- USHORT coreFrameOffset=0;
+ USHORT coreFrameOffset = 0;
- hAss->taraBufferFullness = 0xFF;
- hAss->audioMuxVersionA = 0; /* for future extensions */
+ hAss->taraBufferFullness = 0xFF;
+ hAss->audioMuxVersionA = 0; /* for future extensions */
hAss->streamMuxConfigBits = 0;
- FDKwriteBits( hBs, hAss->audioMuxVersion, 1 ); /* audioMuxVersion */
+ FDKwriteBits(hBs, hAss->audioMuxVersion, 1); /* audioMuxVersion */
hAss->streamMuxConfigBits += 1;
- if ( hAss->audioMuxVersion == 1 ) {
- FDKwriteBits( hBs, hAss->audioMuxVersionA, 1 ); /* audioMuxVersionA */
- hAss->streamMuxConfigBits+=1;
+ if (hAss->audioMuxVersion == 1) {
+ FDKwriteBits(hBs, hAss->audioMuxVersionA, 1); /* audioMuxVersionA */
+ hAss->streamMuxConfigBits += 1;
}
- if ( hAss->audioMuxVersionA == 0 )
- {
- if ( hAss->audioMuxVersion == 1 ) {
- hAss->streamMuxConfigBits+= transportEnc_LatmWriteValue( hBs, hAss->taraBufferFullness );/* taraBufferFullness */
+ if (hAss->audioMuxVersionA == 0) {
+ if (hAss->audioMuxVersion == 1) {
+ hAss->streamMuxConfigBits += transportEnc_LatmWriteValue(
+ hBs, hAss->taraBufferFullness); /* taraBufferFullness */
}
- FDKwriteBits( hBs, hAss->allStreamsSameTimeFraming ? 1:0, 1 ); /* allStreamsSameTimeFraming */
- FDKwriteBits( hBs, hAss->noSubframes-1, 6 ); /* Number of Subframes */
- FDKwriteBits( hBs, hAss->noProgram-1, 4 ); /* Number of Programs */
+ FDKwriteBits(hBs, hAss->allStreamsSameTimeFraming ? 1 : 0,
+ 1); /* allStreamsSameTimeFraming */
+ FDKwriteBits(hBs, hAss->noSubframes - 1, 6); /* Number of Subframes */
+ FDKwriteBits(hBs, hAss->noProgram - 1, 4); /* Number of Programs */
- hAss->streamMuxConfigBits+=11;
+ hAss->streamMuxConfigBits += 11;
streamIDcnt = 0;
- for( prog=0; prog<hAss->noProgram; prog++ ) {
+ for (prog = 0; prog < hAss->noProgram; prog++) {
int transLayer = 0;
- FDKwriteBits( hBs, hAss->noLayer[prog]-1, 3 );
- hAss->streamMuxConfigBits+=3;
+ FDKwriteBits(hBs, hAss->noLayer[prog] - 1, 3);
+ hAss->streamMuxConfigBits += 3;
- for( layer=0; layer<LATM_MAX_LAYERS; layer++ ) {
- LATM_LAYER_INFO *p_linfo = &(hAss->m_linfo[prog][layer]);
- CODER_CONFIG *p_lci = hAss->config[prog][layer];
+ for (layer = 0; layer < LATM_MAX_LAYERS; layer++) {
+ LATM_LAYER_INFO *p_linfo = &(hAss->m_linfo[prog][layer]);
+ CODER_CONFIG *p_lci = hAss->config[prog][layer];
p_linfo->streamID = -1;
- if( hAss->config[prog][layer] != NULL ) {
+ if (hAss->config[prog][layer] != NULL) {
int useSameConfig = 0;
- if( transLayer > 0 ) {
- FDKwriteBits( hBs, useSameConfig ? 1 : 0, 1 );
- hAss->streamMuxConfigBits+=1;
+ if (transLayer > 0) {
+ FDKwriteBits(hBs, useSameConfig ? 1 : 0, 1);
+ hAss->streamMuxConfigBits += 1;
}
- if( (useSameConfig == 0) || (transLayer==0) ) {
+ if ((useSameConfig == 0) || (transLayer == 0)) {
const UINT alignAnchor = FDKgetValidBits(hBs);
- transportEnc_writeASC(
- hBs,
- hAss->config[prog][layer],
- cb
- );
+ if (0 !=
+ (transportEnc_writeASC(hBs, hAss->config[prog][layer], cb))) {
+ return TRANSPORTENC_UNKOWN_ERROR;
+ }
- if ( hAss->audioMuxVersion == 1 ) {
+ if (hAss->audioMuxVersion == 1) {
UINT ascLen = transportEnc_LatmWriteValue(hBs, 0);
FDKbyteAlign(hBs, alignAnchor);
ascLen = FDKgetValidBits(hBs) - alignAnchor - ascLen;
@@ -356,180 +351,160 @@ CreateStreamMuxConfig(
transportEnc_LatmWriteValue(hBs, ascLen);
- transportEnc_writeASC(
- hBs,
- hAss->config[prog][layer],
- cb
- );
+ if (0 !=
+ (transportEnc_writeASC(hBs, hAss->config[prog][layer], cb))) {
+ return TRANSPORTENC_UNKOWN_ERROR;
+ }
FDKbyteAlign(hBs, alignAnchor); /* asc length fillbits */
}
- hAss->streamMuxConfigBits += FDKgetValidBits(hBs) - alignAnchor; /* add asc length to smc summary */
+ hAss->streamMuxConfigBits +=
+ FDKgetValidBits(hBs) -
+ alignAnchor; /* add asc length to smc summary */
}
transLayer++;
- if( !hAss->allStreamsSameTimeFraming ) {
- if( streamIDcnt >= LATM_MAX_STREAM_ID )
+ if (!hAss->allStreamsSameTimeFraming) {
+ if (streamIDcnt >= LATM_MAX_STREAM_ID)
return TRANSPORTENC_INVALID_CONFIG;
}
p_linfo->streamID = streamIDcnt++;
- switch( p_lci->aot ) {
- case AOT_AAC_MAIN :
- case AOT_AAC_LC :
- case AOT_AAC_SSR :
- case AOT_AAC_LTP :
- case AOT_AAC_SCAL :
- case AOT_ER_AAC_LD :
- case AOT_ER_AAC_ELD :
- case AOT_USAC:
- p_linfo->frameLengthType = 0;
-
- FDKwriteBits( hBs, p_linfo->frameLengthType, 3 ); /* frameLengthType */
- FDKwriteBits( hBs, bufferFullness, 8 ); /* bufferFullness */
- hAss->streamMuxConfigBits+=11;
-
- if ( !hAss->allStreamsSameTimeFraming ) {
- CODER_CONFIG *p_lci_prev = hAss->config[prog][layer-1];
- if ( ((p_lci->aot == AOT_AAC_SCAL) || (p_lci->aot == AOT_ER_AAC_SCAL)) &&
- ((p_lci_prev->aot == AOT_CELP) || (p_lci_prev->aot == AOT_ER_CELP)) ) {
- FDKwriteBits( hBs, coreFrameOffset, 6 ); /* coreFrameOffset */
- hAss->streamMuxConfigBits+=6;
+ switch (p_lci->aot) {
+ case AOT_AAC_MAIN:
+ case AOT_AAC_LC:
+ case AOT_AAC_SSR:
+ case AOT_AAC_LTP:
+ case AOT_AAC_SCAL:
+ case AOT_ER_AAC_LD:
+ case AOT_ER_AAC_ELD:
+ case AOT_USAC:
+ p_linfo->frameLengthType = 0;
+
+ FDKwriteBits(hBs, p_linfo->frameLengthType,
+ 3); /* frameLengthType */
+ FDKwriteBits(hBs, bufferFullness, 8); /* bufferFullness */
+ hAss->streamMuxConfigBits += 11;
+
+ if (!hAss->allStreamsSameTimeFraming) {
+ CODER_CONFIG *p_lci_prev = hAss->config[prog][layer - 1];
+ if (((p_lci->aot == AOT_AAC_SCAL) ||
+ (p_lci->aot == AOT_ER_AAC_SCAL)) &&
+ ((p_lci_prev->aot == AOT_CELP) ||
+ (p_lci_prev->aot == AOT_ER_CELP))) {
+ FDKwriteBits(hBs, coreFrameOffset, 6); /* coreFrameOffset */
+ hAss->streamMuxConfigBits += 6;
+ }
}
- }
- break;
+ break;
- case AOT_TWIN_VQ:
- p_linfo->frameLengthType = 1;
- tmp = ( (p_lci->bitsFrame+7) >> 3 ) - 20; /* transmission frame length in bytes */
- if( (tmp < 0) ) {
- return TRANSPORTENC_INVALID_TRANSMISSION_FRAME_LENGTH;
- }
- FDKwriteBits( hBs, p_linfo->frameLengthType, 3 ); /* frameLengthType */
- FDKwriteBits( hBs, tmp, 9 );
- hAss->streamMuxConfigBits+=12;
-
- p_linfo->frameLengthBits = (tmp+20) << 3;
- break;
-
- case AOT_CELP:
- p_linfo->frameLengthType = 4;
- FDKwriteBits( hBs, p_linfo->frameLengthType, 3 ); /* frameLengthType */
- hAss->streamMuxConfigBits+=3;
- {
- int i;
- for( i=0; i<62; i++ ) {
- if( celpFrameLengthTable[i] == p_lci->bitsFrame )
- break;
+ case AOT_TWIN_VQ:
+ p_linfo->frameLengthType = 1;
+ tmp = ((p_lci->bitsFrame + 7) >> 3) -
+ 20; /* transmission frame length in bytes */
+ if ((tmp < 0)) {
+ return TRANSPORTENC_INVALID_TRANSMISSION_FRAME_LENGTH;
}
- if( i>=62 ) {
- return TRANSPORTENC_INVALID_CELP_FRAME_LENGTH;
+ FDKwriteBits(hBs, p_linfo->frameLengthType,
+ 3); /* frameLengthType */
+ FDKwriteBits(hBs, tmp, 9);
+ hAss->streamMuxConfigBits += 12;
+
+ p_linfo->frameLengthBits = (tmp + 20) << 3;
+ break;
+
+ case AOT_CELP:
+ p_linfo->frameLengthType = 4;
+ FDKwriteBits(hBs, p_linfo->frameLengthType,
+ 3); /* frameLengthType */
+ hAss->streamMuxConfigBits += 3;
+ {
+ int i;
+ for (i = 0; i < 62; i++) {
+ if (celpFrameLengthTable[i] == p_lci->bitsFrame) break;
+ }
+ if (i >= 62) {
+ return TRANSPORTENC_INVALID_CELP_FRAME_LENGTH;
+ }
+
+ FDKwriteBits(hBs, i, 6); /* CELPframeLengthTabelIndex */
+ hAss->streamMuxConfigBits += 6;
}
+ p_linfo->frameLengthBits = p_lci->bitsFrame;
+ break;
- FDKwriteBits( hBs, i, 6 ); /* CELPframeLengthTabelIndex */
- hAss->streamMuxConfigBits+=6;
- }
- p_linfo->frameLengthBits = p_lci->bitsFrame;
- break;
-
- case AOT_HVXC:
- p_linfo->frameLengthType = 6;
- FDKwriteBits( hBs, p_linfo->frameLengthType, 3 ); /* frameLengthType */
- hAss->streamMuxConfigBits+=3;
- {
- int i;
-
- if( p_lci->bitsFrame == 40 ) {
- i = 0;
- } else if( p_lci->bitsFrame == 80 ) {
- i = 1;
- } else {
- return TRANSPORTENC_INVALID_FRAME_BITS;
+ case AOT_HVXC:
+ p_linfo->frameLengthType = 6;
+ FDKwriteBits(hBs, p_linfo->frameLengthType,
+ 3); /* frameLengthType */
+ hAss->streamMuxConfigBits += 3;
+ {
+ int i;
+
+ if (p_lci->bitsFrame == 40) {
+ i = 0;
+ } else if (p_lci->bitsFrame == 80) {
+ i = 1;
+ } else {
+ return TRANSPORTENC_INVALID_FRAME_BITS;
+ }
+ FDKwriteBits(hBs, i, 1); /* HVXCframeLengthTableIndex */
+ hAss->streamMuxConfigBits += 1;
}
- FDKwriteBits( hBs, i, 1 ); /* HVXCframeLengthTableIndex */
- hAss->streamMuxConfigBits+=1;
- }
- p_linfo->frameLengthBits = p_lci->bitsFrame;
- break;
+ p_linfo->frameLengthBits = p_lci->bitsFrame;
+ break;
- case AOT_NULL_OBJECT:
- default:
- return TRANSPORTENC_INVALID_AOT;
+ case AOT_NULL_OBJECT:
+ default:
+ return TRANSPORTENC_INVALID_AOT;
}
}
}
}
- FDKwriteBits( hBs, (hAss->otherDataLenBytes>0) ? 1:0, 1 ); /* otherDataPresent */
- hAss->streamMuxConfigBits+=1;
-
- if( hAss->otherDataLenBytes > 0 ) {
-
- INT otherDataLenTmp = hAss->otherDataLenBytes;
- INT escCnt = 0;
- INT otherDataLenEsc = 1;
+ FDKwriteBits(hBs, (hAss->otherDataLenBits > 0) ? 1 : 0,
+ 1); /* otherDataPresent */
+ hAss->streamMuxConfigBits += 1;
- while(otherDataLenTmp) {
- otherDataLenTmp >>= 8;
- escCnt ++;
- }
-
- do {
- otherDataLenTmp = (hAss->otherDataLenBytes>>(escCnt*8)) & 0xFF;
- escCnt--;
- otherDataLenEsc = escCnt>0;
-
- FDKwriteBits( hBs, otherDataLenEsc, 1 );
- FDKwriteBits( hBs, otherDataLenTmp, 8 );
- hAss->streamMuxConfigBits+=9;
- } while(otherDataLenEsc);
+ if (hAss->otherDataLenBits > 0) {
+ FDKwriteBits(hBs, 0, 1);
+ FDKwriteBits(hBs, hAss->otherDataLenBits, 8);
+ hAss->streamMuxConfigBits += 9;
}
- {
- USHORT crcCheckPresent=0;
- USHORT crcCheckSum=0;
+ FDKwriteBits(hBs, 0, 1); /* crcCheckPresent=0 */
+ hAss->streamMuxConfigBits += 1;
- FDKwriteBits( hBs, crcCheckPresent, 1 ); /* crcCheckPresent */
- hAss->streamMuxConfigBits+=1;
- if ( crcCheckPresent ){
- FDKwriteBits( hBs, crcCheckSum, 8 ); /* crcCheckSum */
- hAss->streamMuxConfigBits+=8;
- }
- }
-
- } else { /* if ( audioMuxVersionA == 0 ) */
+ } else { /* if ( audioMuxVersionA == 0 ) */
/* for future extensions */
-
}
return TRANSPORTENC_OK;
}
-
-static TRANSPORTENC_ERROR
-WriteAuPayloadLengthInfo( HANDLE_FDK_BITSTREAM hBitStream, int AuLengthBits )
-{
+static TRANSPORTENC_ERROR WriteAuPayloadLengthInfo(
+ HANDLE_FDK_BITSTREAM hBitStream, int AuLengthBits) {
int restBytes;
- if( AuLengthBits % 8 )
- return TRANSPORTENC_INVALID_AU_LENGTH;
+ if (AuLengthBits % 8) return TRANSPORTENC_INVALID_AU_LENGTH;
- while( AuLengthBits >= 255*8 ) {
- FDKwriteBits( hBitStream, 255, 8 ); /* 255 shows incomplete AU */
- AuLengthBits -= (255*8);
+ while (AuLengthBits >= 255 * 8) {
+ FDKwriteBits(hBitStream, 255, 8); /* 255 shows incomplete AU */
+ AuLengthBits -= (255 * 8);
}
restBytes = (AuLengthBits) >> 3;
- FDKwriteBits( hBitStream, restBytes, 8 );
+ FDKwriteBits(hBitStream, restBytes, 8);
return TRANSPORTENC_OK;
}
-static
-TRANSPORTENC_ERROR transportEnc_LatmSetNrOfSubframes( HANDLE_LATM_STREAM hAss,
- INT noSubframes_next) /* nr of access units / payloads within a latm frame */
+static TRANSPORTENC_ERROR transportEnc_LatmSetNrOfSubframes(
+ HANDLE_LATM_STREAM hAss, INT noSubframes_next) /* nr of access units /
+ payloads within a latm
+ frame */
{
/* sanity chk */
if (noSubframes_next < 1 || noSubframes_next > MAX_NR_OF_SUBFRAMES) {
@@ -538,48 +513,50 @@ TRANSPORTENC_ERROR transportEnc_LatmSetNrOfSubframes( HANDLE_LATM_STREAM hAss,
hAss->noSubframes_next = noSubframes_next;
- /* if at start then we can take over the value immediately, otherwise we have to wait for the next SMC */
- if ( (hAss->subFrameCnt == 0) && (hAss->latmFrameCounter == 0) ) {
+ /* if at start then we can take over the value immediately, otherwise we have
+ * to wait for the next SMC */
+ if ((hAss->subFrameCnt == 0) && (hAss->latmFrameCounter == 0)) {
hAss->noSubframes = noSubframes_next;
}
return TRANSPORTENC_OK;
}
-static
-int allStreamsSameTimeFraming( HANDLE_LATM_STREAM hAss, UCHAR noProgram, UCHAR noLayer[] /* return */ )
-{
+static int allStreamsSameTimeFraming(HANDLE_LATM_STREAM hAss, UCHAR noProgram,
+ UCHAR noLayer[] /* return */) {
int prog, layer;
- signed int lastNoSamples = -1;
+ signed int lastNoSamples = -1;
signed int minFrameSamples = FDK_INT_MAX;
signed int maxFrameSamples = 0;
signed int highestSamplingRate = -1;
- for( prog=0; prog<noProgram; prog++ ) {
+ for (prog = 0; prog < noProgram; prog++) {
noLayer[prog] = 0;
- for( layer=0; layer<LATM_MAX_LAYERS; layer++ )
- {
- if( hAss->config[prog][layer] != NULL )
- {
+ for (layer = 0; layer < LATM_MAX_LAYERS; layer++) {
+ if (hAss->config[prog][layer] != NULL) {
INT hsfSamplesFrame;
noLayer[prog]++;
- if( highestSamplingRate < 0 )
+ if (highestSamplingRate < 0)
highestSamplingRate = hAss->config[prog][layer]->samplingRate;
- hsfSamplesFrame = hAss->config[prog][layer]->samplesPerFrame * highestSamplingRate / hAss->config[prog][layer]->samplingRate;
+ hsfSamplesFrame = hAss->config[prog][layer]->samplesPerFrame *
+ highestSamplingRate /
+ hAss->config[prog][layer]->samplingRate;
- if( hsfSamplesFrame <= minFrameSamples ) minFrameSamples = hsfSamplesFrame;
- if( hsfSamplesFrame >= maxFrameSamples ) maxFrameSamples = hsfSamplesFrame;
+ if (hsfSamplesFrame <= minFrameSamples)
+ minFrameSamples = hsfSamplesFrame;
+ if (hsfSamplesFrame >= maxFrameSamples)
+ maxFrameSamples = hsfSamplesFrame;
- if( lastNoSamples == -1 ) {
- lastNoSamples = hsfSamplesFrame;
+ if (lastNoSamples == -1) {
+ lastNoSamples = hsfSamplesFrame;
} else {
- if( hsfSamplesFrame != lastNoSamples ) {
+ if (hsfSamplesFrame != lastNoSamples) {
return 0;
}
}
@@ -593,18 +570,14 @@ int allStreamsSameTimeFraming( HANDLE_LATM_STREAM hAss, UCHAR noProgram, UCHAR n
/**
* Initialize LATM/LOAS Stream and add layer 0 at program 0.
*/
-static
-TRANSPORTENC_ERROR transportEnc_InitLatmStream( HANDLE_LATM_STREAM hAss,
- int fractDelayPresent,
- signed int muxConfigPeriod, /* insert setup data every muxConfigPeriod frames */
- UINT audioMuxVersion,
- TRANSPORT_TYPE tt
- )
-{
+static TRANSPORTENC_ERROR transportEnc_InitLatmStream(
+ HANDLE_LATM_STREAM hAss, int fractDelayPresent,
+ signed int
+ muxConfigPeriod, /* insert setup data every muxConfigPeriod frames */
+ UINT audioMuxVersion, TRANSPORT_TYPE tt) {
TRANSPORTENC_ERROR ErrorStatus = TRANSPORTENC_OK;
- if (hAss == NULL)
- return TRANSPORTENC_INVALID_PARAMETER;
+ if (hAss == NULL) return TRANSPORTENC_INVALID_PARAMETER;
hAss->tt = tt;
@@ -613,82 +586,78 @@ TRANSPORTENC_ERROR transportEnc_InitLatmStream( HANDLE_LATM_STREAM hAss,
hAss->audioMuxVersion = audioMuxVersion;
/* Fill noLayer array using hAss->config */
- hAss->allStreamsSameTimeFraming = allStreamsSameTimeFraming( hAss, hAss->noProgram, hAss->noLayer );
+ hAss->allStreamsSameTimeFraming =
+ allStreamsSameTimeFraming(hAss, hAss->noProgram, hAss->noLayer);
/* Only allStreamsSameTimeFraming==1 is supported */
FDK_ASSERT(hAss->allStreamsSameTimeFraming);
hAss->fractDelayPresent = fractDelayPresent;
- hAss->otherDataLenBytes = 0;
+ hAss->otherDataLenBits = 0;
hAss->varMode = LATMVAR_SIMPLE_SEQUENCE;
/* initialize counters */
- hAss->subFrameCnt = 0;
- hAss->noSubframes = DEFAULT_LATM_NR_OF_SUBFRAMES;
- hAss->noSubframes_next = DEFAULT_LATM_NR_OF_SUBFRAMES;
+ hAss->subFrameCnt = 0;
+ hAss->noSubframes = DEFAULT_LATM_NR_OF_SUBFRAMES;
+ hAss->noSubframes_next = DEFAULT_LATM_NR_OF_SUBFRAMES;
/* sync layer related */
- hAss->audioMuxLengthBytes = 0;
+ hAss->audioMuxLengthBytes = 0;
- hAss->latmFrameCounter = 0;
+ hAss->latmFrameCounter = 0;
hAss->muxConfigPeriod = muxConfigPeriod;
return ErrorStatus;
}
-
/**
*
*/
-UINT transportEnc_LatmCountTotalBitDemandHeader ( HANDLE_LATM_STREAM hAss , unsigned int streamDataLength )
-{
+UINT transportEnc_LatmCountTotalBitDemandHeader(HANDLE_LATM_STREAM hAss,
+ unsigned int streamDataLength) {
UINT bitDemand = 0;
switch (hAss->tt) {
- case TT_MP4_LOAS:
- case TT_MP4_LATM_MCP0:
- case TT_MP4_LATM_MCP1:
- if (hAss->subFrameCnt == 0) {
- bitDemand = transportEnc_LatmCountFixBitDemandHeader ( hAss );
- }
- bitDemand += transportEnc_LatmCountVarBitDemandHeader ( hAss , streamDataLength /*- bitDemand*/);
- break;
- default:
- break;
+ case TT_MP4_LOAS:
+ case TT_MP4_LATM_MCP0:
+ case TT_MP4_LATM_MCP1:
+ if (hAss->subFrameCnt == 0) {
+ bitDemand = transportEnc_LatmCountFixBitDemandHeader(hAss);
+ }
+ bitDemand += transportEnc_LatmCountVarBitDemandHeader(
+ hAss, streamDataLength /*- bitDemand*/);
+ break;
+ default:
+ break;
}
return bitDemand;
}
-static TRANSPORTENC_ERROR
-AdvanceAudioMuxElement (
- HANDLE_LATM_STREAM hAss,
- HANDLE_FDK_BITSTREAM hBs,
- int auBits,
- int bufferFullness,
- CSTpCallBacks *cb
- )
-{
+static TRANSPORTENC_ERROR AdvanceAudioMuxElement(HANDLE_LATM_STREAM hAss,
+ HANDLE_FDK_BITSTREAM hBs,
+ int auBits, int bufferFullness,
+ CSTpCallBacks *cb) {
TRANSPORTENC_ERROR ErrorStatus = TRANSPORTENC_OK;
int insertMuxSetup;
/* Insert setup data to assemble Buffer */
- if (hAss->subFrameCnt == 0)
- {
+ if (hAss->subFrameCnt == 0) {
if (hAss->muxConfigPeriod > 0) {
insertMuxSetup = (hAss->latmFrameCounter == 0);
- } else {
+ } else {
insertMuxSetup = 0;
}
if (hAss->tt != TT_MP4_LATM_MCP0) {
- if( insertMuxSetup ) {
- FDKwriteBits( hBs, 0, 1 ); /* useSameStreamMux useNewStreamMux */
- CreateStreamMuxConfig(hAss, hBs, bufferFullness, cb);
- if (ErrorStatus != TRANSPORTENC_OK)
+ if (insertMuxSetup) {
+ FDKwriteBits(hBs, 0, 1); /* useSameStreamMux useNewStreamMux */
+ if (TRANSPORTENC_OK != (ErrorStatus = CreateStreamMuxConfig(
+ hAss, hBs, bufferFullness, cb))) {
return ErrorStatus;
+ }
} else {
- FDKwriteBits( hBs, 1, 1 ); /* useSameStreamMux */
+ FDKwriteBits(hBs, 1, 1); /* useSameStreamMux */
}
}
}
@@ -699,9 +668,8 @@ AdvanceAudioMuxElement (
for (prog = 0; prog < hAss->noProgram; prog++) {
for (layer = 0; layer < hAss->noLayer[prog]; layer++) {
- ErrorStatus = WriteAuPayloadLengthInfo( hBs, auBits );
- if (ErrorStatus != TRANSPORTENC_OK)
- return ErrorStatus;
+ ErrorStatus = WriteAuPayloadLengthInfo(hBs, auBits);
+ if (ErrorStatus != TRANSPORTENC_OK) return ErrorStatus;
}
}
}
@@ -711,14 +679,8 @@ AdvanceAudioMuxElement (
}
TRANSPORTENC_ERROR
-transportEnc_LatmWrite (
- HANDLE_LATM_STREAM hAss,
- HANDLE_FDK_BITSTREAM hBs,
- int auBits,
- int bufferFullness,
- CSTpCallBacks *cb
- )
-{
+transportEnc_LatmWrite(HANDLE_LATM_STREAM hAss, HANDLE_FDK_BITSTREAM hBs,
+ int auBits, int bufferFullness, CSTpCallBacks *cb) {
TRANSPORTENC_ERROR ErrorStatus;
if (hAss->subFrameCnt == 0) {
@@ -732,81 +694,76 @@ transportEnc_LatmWrite (
- only if loas
- we must update the syncword distance (=audiomuxlengthbytes) later
*/
- if( hAss->tt == TT_MP4_LOAS && hAss->subFrameCnt == 0)
- {
+ if (hAss->tt == TT_MP4_LOAS && hAss->subFrameCnt == 0) {
/* Start new LOAS frame */
- FDKwriteBits( hBs, 0x2B7, 11 );
+ FDKwriteBits(hBs, 0x2B7, 11);
hAss->audioMuxLengthBytes = 0;
- hAss->audioMuxLengthBytesPos = FDKgetValidBits( hBs ); /* store read pointer position */
- FDKwriteBits( hBs, hAss->audioMuxLengthBytes, 13 );
+ hAss->audioMuxLengthBytesPos =
+ FDKgetValidBits(hBs); /* store read pointer position */
+ FDKwriteBits(hBs, hAss->audioMuxLengthBytes, 13);
}
- ErrorStatus = AdvanceAudioMuxElement(
- hAss,
- hBs,
- auBits,
- bufferFullness,
- cb
- );
+ ErrorStatus = AdvanceAudioMuxElement(hAss, hBs, auBits, bufferFullness, cb);
- if (ErrorStatus != TRANSPORTENC_OK)
- return ErrorStatus;
+ if (ErrorStatus != TRANSPORTENC_OK) return ErrorStatus;
return ErrorStatus;
}
-void transportEnc_LatmAdjustSubframeBits(HANDLE_LATM_STREAM hAss,
- int *bits)
-{
+void transportEnc_LatmAdjustSubframeBits(HANDLE_LATM_STREAM hAss, int *bits) {
/* Substract bits from possible previous subframe */
*bits -= hAss->latmSubframeStart;
/* Add fill bits */
- if (hAss->subFrameCnt == 0)
+ if (hAss->subFrameCnt == 0) {
+ *bits += hAss->otherDataLenBits;
*bits += hAss->fillBits;
+ }
}
-
-void transportEnc_LatmGetFrame(HANDLE_LATM_STREAM hAss,
- HANDLE_FDK_BITSTREAM hBs,
- int *bytes)
-{
+TRANSPORTENC_ERROR transportEnc_LatmGetFrame(HANDLE_LATM_STREAM hAss,
+ HANDLE_FDK_BITSTREAM hBs,
+ int *pBytes) {
+ TRANSPORTENC_ERROR ErrorStatus = TRANSPORTENC_OK;
hAss->subFrameCnt++;
- if (hAss->subFrameCnt >= hAss->noSubframes)
- {
-
+ if (hAss->subFrameCnt >= hAss->noSubframes) {
/* Add LOAS frame length if required. */
- if (hAss->tt == TT_MP4_LOAS)
- {
- int latmBytes;
-
- latmBytes = (FDKgetValidBits(hBs)+7) >> 3;
+ if (hAss->tt == TT_MP4_LOAS) {
+ FDK_BITSTREAM tmpBuf;
- /* write length info into assembler buffer */
- hAss->audioMuxLengthBytes = latmBytes - 3; /* 3=Syncword + length */
- {
- FDK_BITSTREAM tmpBuf;
+ /* Determine frame length info */
+ hAss->audioMuxLengthBytes =
+ ((FDKgetValidBits(hBs) + hAss->otherDataLenBits + 7) >> 3) -
+ 3; /* 3=Syncword + length */
- FDKinitBitStream( &tmpBuf, hBs->hBitBuf.Buffer, hBs->hBitBuf.bufSize, 0, BS_WRITER ) ;
- FDKpushFor( &tmpBuf, hAss->audioMuxLengthBytesPos );
- FDKwriteBits( &tmpBuf, hAss->audioMuxLengthBytes, 13 );
- FDKsyncCache( &tmpBuf );
+ /* Check frame length info */
+ if (hAss->audioMuxLengthBytes >= (1 << 13)) {
+ ErrorStatus = TRANSPORTENC_INVALID_AU_LENGTH;
+ goto bail;
}
+
+ /* Write length info into assembler buffer */
+ FDKinitBitStream(&tmpBuf, hBs->hBitBuf.Buffer, hBs->hBitBuf.bufSize, 0,
+ BS_WRITER);
+ FDKpushFor(&tmpBuf, hAss->audioMuxLengthBytesPos);
+ FDKwriteBits(&tmpBuf, hAss->audioMuxLengthBytes, 13);
+ FDKsyncCache(&tmpBuf);
}
+ /* Write AudioMuxElement other data bits */
+ FDKwriteBits(hBs, 0, hAss->otherDataLenBits);
+
/* Write AudioMuxElement byte alignment fill bits */
FDKwriteBits(hBs, 0, hAss->fillBits);
- FDK_ASSERT( (FDKgetValidBits(hBs) % 8) == 0);
+ FDK_ASSERT((FDKgetValidBits(hBs) % 8) == 0);
hAss->subFrameCnt = 0;
FDKsyncCache(hBs);
- *bytes = (FDKgetValidBits(hBs) + 7)>>3;
- //FDKfetchBuffer(hBs, buffer, (UINT*)bytes);
+ *pBytes = (FDKgetValidBits(hBs) + 7) >> 3;
- if (hAss->muxConfigPeriod > 0)
- {
+ if (hAss->muxConfigPeriod > 0) {
hAss->latmFrameCounter++;
if (hAss->latmFrameCounter >= hAss->muxConfigPeriod) {
@@ -816,32 +773,32 @@ void transportEnc_LatmGetFrame(HANDLE_LATM_STREAM hAss,
}
} else {
/* No data this time */
- *bytes = 0;
+ *pBytes = 0;
}
+
+bail:
+ return ErrorStatus;
}
/**
* Init LATM/LOAS
*/
-TRANSPORTENC_ERROR transportEnc_Latm_Init(
- HANDLE_LATM_STREAM hAss,
- HANDLE_FDK_BITSTREAM hBs,
- CODER_CONFIG *layerConfig,
- UINT audioMuxVersion,
- TRANSPORT_TYPE tt,
- CSTpCallBacks *cb
- )
-{
+TRANSPORTENC_ERROR transportEnc_Latm_Init(HANDLE_LATM_STREAM hAss,
+ HANDLE_FDK_BITSTREAM hBs,
+ CODER_CONFIG *layerConfig,
+ UINT audioMuxVersion,
+ TRANSPORT_TYPE tt,
+ CSTpCallBacks *cb) {
TRANSPORTENC_ERROR ErrorStatus;
int fractDelayPresent = 0;
int prog, layer;
int setupDataDistanceFrames = layerConfig->headerPeriod;
- FDK_ASSERT(setupDataDistanceFrames>=0);
+ FDK_ASSERT(setupDataDistanceFrames >= 0);
- for (prog=0; prog<LATM_MAX_PROGRAMS; prog++) {
- for (layer=0; layer<LATM_MAX_LAYERS; layer++) {
+ for (prog = 0; prog < LATM_MAX_PROGRAMS; prog++) {
+ for (layer = 0; layer < LATM_MAX_LAYERS; layer++) {
hAss->config[prog][layer] = NULL;
hAss->m_linfo[prog][layer].streamID = -1;
}
@@ -850,32 +807,44 @@ TRANSPORTENC_ERROR transportEnc_Latm_Init(
hAss->config[0][0] = layerConfig;
hAss->m_linfo[0][0].streamID = 0;
- ErrorStatus = transportEnc_InitLatmStream( hAss,
- fractDelayPresent,
- setupDataDistanceFrames,
- (audioMuxVersion)?1:0,
- tt
- );
- if (ErrorStatus != TRANSPORTENC_OK)
- goto bail;
+ ErrorStatus = transportEnc_InitLatmStream(hAss, fractDelayPresent,
+ setupDataDistanceFrames,
+ (audioMuxVersion) ? 1 : 0, tt);
+ if (ErrorStatus != TRANSPORTENC_OK) goto bail;
- ErrorStatus = transportEnc_LatmSetNrOfSubframes(
- hAss,
- layerConfig->nSubFrames
- );
- if (ErrorStatus != TRANSPORTENC_OK)
- goto bail;
+ ErrorStatus =
+ transportEnc_LatmSetNrOfSubframes(hAss, layerConfig->nSubFrames);
+ if (ErrorStatus != TRANSPORTENC_OK) goto bail;
/* Get the size of the StreamMuxConfig somehow */
- AdvanceAudioMuxElement(hAss, hBs, 0, 0, cb);
- //CreateStreamMuxConfig(hAss, hBs, 0);
+ if (TRANSPORTENC_OK !=
+ (ErrorStatus = AdvanceAudioMuxElement(hAss, hBs, 0, 0, cb))) {
+ goto bail;
+ }
+
+ // CreateStreamMuxConfig(hAss, hBs, 0);
bail:
return ErrorStatus;
}
+TRANSPORTENC_ERROR transportEnc_LatmAddOtherDataBits(HANDLE_LATM_STREAM hAss,
+ const int otherDataBits) {
+ TRANSPORTENC_ERROR ErrorStatus = TRANSPORTENC_OK;
+ if ((hAss->otherDataLenBits != 0) || (otherDataBits % 8 != 0)) {
+ /* This implementation allows to add other data bits only once.
+ To keep existing alignment only whole bytes are allowed. */
+ ErrorStatus = TRANSPORTENC_UNKOWN_ERROR;
+ } else {
+ /* Ensure correct addional bits in payload. */
+ if (hAss->tt == TT_MP4_LATM_MCP0) {
+ hAss->otherDataLenBits = otherDataBits;
+ } else {
+ hAss->otherDataLenBits = otherDataBits - 9;
+ hAss->streamMuxConfigBits += 9;
+ }
+ }
-
-
-
+ return ErrorStatus;
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 12:50:31 +0000