From 6cfabd35363c3ef5e3b209b867169a500b3ccc3c Mon Sep 17 00:00:00 2001 From: Fraunhofer IIS FDK Date: Mon, 26 Feb 2018 20:17:00 +0100 Subject: 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 --- libSACdec/include/sac_dec_errorcodes.h | 157 +++++++++++ libSACdec/include/sac_dec_lib.h | 477 +++++++++++++++++++++++++++++++++ 2 files changed, 634 insertions(+) create mode 100644 libSACdec/include/sac_dec_errorcodes.h create mode 100644 libSACdec/include/sac_dec_lib.h (limited to 'libSACdec/include') diff --git a/libSACdec/include/sac_dec_errorcodes.h b/libSACdec/include/sac_dec_errorcodes.h new file mode 100644 index 0000000..ee8b9f8 --- /dev/null +++ b/libSACdec/include/sac_dec_errorcodes.h @@ -0,0 +1,157 @@ +/* ----------------------------------------------------------------------------- +Software License for The Fraunhofer FDK AAC Codec Library for Android + +© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten +Forschung e.V. All rights reserved. + + 1. INTRODUCTION +The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software +that implements the MPEG Advanced Audio Coding ("AAC") encoding and decoding +scheme for digital audio. This FDK AAC Codec software is intended to be used on +a wide variety of Android devices. + +AAC's HE-AAC and HE-AAC v2 versions are regarded as today's most efficient +general perceptual audio codecs. AAC-ELD is considered the best-performing +full-bandwidth communications codec by independent studies and is widely +deployed. AAC has been standardized by ISO and IEC as part of the MPEG +specifications. + +Patent licenses for necessary patent claims for the FDK AAC Codec (including +those of Fraunhofer) may be obtained through Via Licensing +(www.vialicensing.com) or through the respective patent owners individually for +the purpose of encoding or decoding bit streams in products that are compliant +with the ISO/IEC MPEG audio standards. Please note that most manufacturers of +Android devices already license these patent claims through Via Licensing or +directly from the patent owners, and therefore FDK AAC Codec software may +already be covered under those patent licenses when it is used for those +licensed purposes only. + +Commercially-licensed AAC software libraries, including floating-point versions +with enhanced sound quality, are also available from Fraunhofer. Users are +encouraged to check the Fraunhofer website for additional applications +information and documentation. + +2. COPYRIGHT LICENSE + +Redistribution and use in source and binary forms, with or without modification, +are permitted without payment of copyright license fees provided that you +satisfy the following conditions: + +You must retain the complete text of this software license in redistributions of +the FDK AAC Codec or your modifications thereto in source code form. + +You must retain the complete text of this software license in the documentation +and/or other materials provided with redistributions of the FDK AAC Codec or +your modifications thereto in binary form. You must make available free of +charge copies of the complete source code of the FDK AAC Codec and your +modifications thereto to recipients of copies in binary form. + +The name of Fraunhofer may not be used to endorse or promote products derived +from this library without prior written permission. + +You may not charge copyright license fees for anyone to use, copy or distribute +the FDK AAC Codec software or your modifications thereto. + +Your modified versions of the FDK AAC Codec must carry prominent notices stating +that you changed the software and the date of any change. For modified versions +of the FDK AAC Codec, the term "Fraunhofer FDK AAC Codec Library for Android" +must be replaced by the term "Third-Party Modified Version of the Fraunhofer FDK +AAC Codec Library for Android." + +3. NO PATENT LICENSE + +NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without +limitation the patents of Fraunhofer, ARE GRANTED BY THIS SOFTWARE LICENSE. +Fraunhofer provides no warranty of patent non-infringement with respect to this +software. + +You may use this FDK AAC Codec software or modifications thereto only for +purposes that are authorized by appropriate patent licenses. + +4. DISCLAIMER + +This FDK AAC Codec software is provided by Fraunhofer on behalf of the copyright +holders and contributors "AS IS" and WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, +including but not limited to the implied warranties of merchantability and +fitness for a particular purpose. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +CONTRIBUTORS BE LIABLE for any direct, indirect, incidental, special, exemplary, +or consequential damages, including but not limited to procurement of substitute +goods or services; loss of use, data, or profits, or business interruption, +however caused and on any theory of liability, whether in contract, strict +liability, or tort (including negligence), arising in any way out of the use of +this software, even if advised of the possibility of such damage. + +5. CONTACT INFORMATION + +Fraunhofer Institute for Integrated Circuits IIS +Attention: Audio and Multimedia Departments - FDK AAC LL +Am Wolfsmantel 33 +91058 Erlangen, Germany + +www.iis.fraunhofer.de/amm +amm-info@iis.fraunhofer.de +----------------------------------------------------------------------------- */ + +/*********************** MPEG surround decoder library ************************* + + Author(s): + + Description: error codes for mpeg surround decoder + +*******************************************************************************/ + +#ifndef SAC_DEC_ERRORCODES_H +#define SAC_DEC_ERRORCODES_H + +typedef enum { + + __mps_error_start = -1000, + + MPS_OK = 0, + + /* generic/init errors */ + MPS_NOTOK = __mps_error_start, + + MPS_OUTOFMEMORY, + MPS_INVALID_HANDLE, + MPS_INVALID_PARAMETER, /* SetParam not successfull */ + MPS_UNSUPPORTED_HRTFMODEL, /* SetHRTFModel() not successfull */ + MPS_UNSUPPORTED_HRTFFREQ, /* SetHRTFModel() not successfull */ + + MPS_UNSUPPORTED_UPMIX_TYPE, /* CheckLevelTreeUpmixType() */ + MPS_UNSUPPORTED_FORMAT, /* various functions; unknown aot or no_channels in + filterbank */ + MPS_OUTPUT_BUFFER_TOO_SMALL, /* Size of provided output time buffer is too + small */ + + /* ssc errors */ + MPS_INVALID_PARAMETERBANDS, /* unsupported numParameterBands in + SpatialDecDecodeHeader() */ + MPS_INVALID_TREECONFIG, + MPS_INVALID_HRTFSET, /* SpatialDecDecodeHeader() */ + MPS_INVALID_TTT, /* SpatialDecDecodeHeader() */ + MPS_INVALID_BOXIDX, /* ecDataDec() */ + MPS_INVALID_SETIDX, /* ecDataDec() */ + MPS_INVALID_QUANTMODE, /* SpatialDecParseSpecificConfig() */ + MPS_UNEQUAL_SSC, /* FDK_SpatialDecCompareSpatialSpecificConfigHeader() */ + MPS_UNSUPPORTED_CONFIG, /* number of core channels; 3DStereoInversion; */ + + /* parse errors */ + MPS_PARSE_ERROR, + MPS_INVALID_TEMPSHAPE, /* SpatialDecParseFrameData() */ + + /* render errors */ + MPS_WRONG_PARAMETERSETS, + MPS_WRONG_PARAMETERBANDS, /* decodeAndMapFrameSmg() */ + MPS_WRONG_TREECONFIG, + MPS_WRONG_BLINDCONFIG, + MPS_WRONG_OTT, + MPS_WRONG_QUANTMODE, + MPS_RESDEC_ERROR, + MPS_APPLY_M2_ERROR, /* error in applyM2x()selection */ + + __mps_error_end + +} SACDEC_ERROR; + +#endif diff --git a/libSACdec/include/sac_dec_lib.h b/libSACdec/include/sac_dec_lib.h new file mode 100644 index 0000000..2797a10 --- /dev/null +++ b/libSACdec/include/sac_dec_lib.h @@ -0,0 +1,477 @@ +/* ----------------------------------------------------------------------------- +Software License for The Fraunhofer FDK AAC Codec Library for Android + +© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten +Forschung e.V. All rights reserved. + + 1. INTRODUCTION +The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software +that implements the MPEG Advanced Audio Coding ("AAC") encoding and decoding +scheme for digital audio. This FDK AAC Codec software is intended to be used on +a wide variety of Android devices. + +AAC's HE-AAC and HE-AAC v2 versions are regarded as today's most efficient +general perceptual audio codecs. AAC-ELD is considered the best-performing +full-bandwidth communications codec by independent studies and is widely +deployed. AAC has been standardized by ISO and IEC as part of the MPEG +specifications. + +Patent licenses for necessary patent claims for the FDK AAC Codec (including +those of Fraunhofer) may be obtained through Via Licensing +(www.vialicensing.com) or through the respective patent owners individually for +the purpose of encoding or decoding bit streams in products that are compliant +with the ISO/IEC MPEG audio standards. Please note that most manufacturers of +Android devices already license these patent claims through Via Licensing or +directly from the patent owners, and therefore FDK AAC Codec software may +already be covered under those patent licenses when it is used for those +licensed purposes only. + +Commercially-licensed AAC software libraries, including floating-point versions +with enhanced sound quality, are also available from Fraunhofer. Users are +encouraged to check the Fraunhofer website for additional applications +information and documentation. + +2. COPYRIGHT LICENSE + +Redistribution and use in source and binary forms, with or without modification, +are permitted without payment of copyright license fees provided that you +satisfy the following conditions: + +You must retain the complete text of this software license in redistributions of +the FDK AAC Codec or your modifications thereto in source code form. + +You must retain the complete text of this software license in the documentation +and/or other materials provided with redistributions of the FDK AAC Codec or +your modifications thereto in binary form. You must make available free of +charge copies of the complete source code of the FDK AAC Codec and your +modifications thereto to recipients of copies in binary form. + +The name of Fraunhofer may not be used to endorse or promote products derived +from this library without prior written permission. + +You may not charge copyright license fees for anyone to use, copy or distribute +the FDK AAC Codec software or your modifications thereto. + +Your modified versions of the FDK AAC Codec must carry prominent notices stating +that you changed the software and the date of any change. For modified versions +of the FDK AAC Codec, the term "Fraunhofer FDK AAC Codec Library for Android" +must be replaced by the term "Third-Party Modified Version of the Fraunhofer FDK +AAC Codec Library for Android." + +3. NO PATENT LICENSE + +NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without +limitation the patents of Fraunhofer, ARE GRANTED BY THIS SOFTWARE LICENSE. +Fraunhofer provides no warranty of patent non-infringement with respect to this +software. + +You may use this FDK AAC Codec software or modifications thereto only for +purposes that are authorized by appropriate patent licenses. + +4. DISCLAIMER + +This FDK AAC Codec software is provided by Fraunhofer on behalf of the copyright +holders and contributors "AS IS" and WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, +including but not limited to the implied warranties of merchantability and +fitness for a particular purpose. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +CONTRIBUTORS BE LIABLE for any direct, indirect, incidental, special, exemplary, +or consequential damages, including but not limited to procurement of substitute +goods or services; loss of use, data, or profits, or business interruption, +however caused and on any theory of liability, whether in contract, strict +liability, or tort (including negligence), arising in any way out of the use of +this software, even if advised of the possibility of such damage. + +5. CONTACT INFORMATION + +Fraunhofer Institute for Integrated Circuits IIS +Attention: Audio and Multimedia Departments - FDK AAC LL +Am Wolfsmantel 33 +91058 Erlangen, Germany + +www.iis.fraunhofer.de/amm +amm-info@iis.fraunhofer.de +----------------------------------------------------------------------------- */ + +/*********************** MPEG surround decoder library ************************* + + Author(s): + + Description: Space Decoder + +*******************************************************************************/ + +#ifndef SAC_DEC_LIB_H +#define SAC_DEC_LIB_H + +#include "common_fix.h" +#include "FDK_audio.h" +#include "sac_dec_errorcodes.h" +#include "FDK_bitstream.h" +#include "FDK_qmf_domain.h" + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/** + * \brief MPEG Surround input data interface mode. + **/ +typedef enum { + SAC_INTERFACE_QMF = + 0, /*!< Use QMF domain interface for the input downmix audio. */ + SAC_INTERFACE_TIME, /*!< Use time domain interface for the input downmix + audio. */ + SAC_INTERFACE_AUTO /*!< */ +} SAC_INPUT_CONFIG; + +/** + * \brief MPEG Surround output mode. + **/ +typedef enum { + SACDEC_OUT_MODE_NORMAL = + 0, /*!< Normal multi channel processing without output restrictions. */ + SACDEC_OUT_MODE_BINAURAL, /*!< Two channel output with binaural processsing. + */ + SACDEC_OUT_MODE_STEREO, /*!< Always two channel output mode. */ + SACDEC_OUT_MODE_6CHANNEL /*!< Always process with 5.1 channel output. */ +} SAC_DEC_OUTPUT_MODE; + +/** + * \brief MPEG Surround binaural HRTF model. + * HRTF will be applied only in combination with upmixtype + *SAC_UPMIX_TYPE_BINAURAL. + **/ +typedef enum { + SAC_BINAURAL_HRTF_KEMAR = 0, + SAC_BINAURAL_HRTF_VAST, + SAC_BINAURAL_HRTF_MPSVT, + SAC_BINAURAL_SINGLE_HRTFS +} SAC_BINAURAL_HRTF_MODEL; + +/** + * \brief MPEG Surround decoder instance available. + **/ +typedef enum { + SAC_INSTANCE_NOT_FULL_AVAILABLE = + 0, /*!< MPEG Surround decoder instance not full available. */ + SAC_INSTANCE_FULL_AVAILABLE /*!< MPEG Surround decoder instance full + available. */ +} SAC_INSTANCE_AVAIL; + +/** + * \brief MPEG Surround decoder dynamic parameters. + * + * Use mpegSurroundDecoder_SetParam() function to configure internal status of + * following parameters. + */ +typedef enum { + SACDEC_OUTPUT_MODE = 0x0001, /*!< Set MPEG Surround decoder output mode. See + SAC_DEC_OUTPUT_MODE. */ + SACDEC_BLIND_ENABLE = + 0x0002, /*!< Multi channel output without MPEG Surround side info. */ + SACDEC_PARTIALLY_COMPLEX = + 0x0003, /*!< Set partially complex flag for MPEG Surround. + 0: Use complex valued QMF data. + 1: Use real valued QMF data (low power mode) */ + SACDEC_INTERFACE = + 0x0004, /*!< Select signal input interface for MPEG Surround. + Switch time interface off: 0 + Switch time interface on: 1 */ + SACDEC_BS_DELAY = 0x0005, /*!< Select bit stream delay for MPEG Surround. + Switch bit stream delay off: 0 + Switch bit stream delay on: 1 */ + SACDEC_BINAURAL_QUALITY = + 0x0102, /*!< Set binaural quality for MPEG Surround binaural mode. + 0: Low Complexity, + 1: High Quality */ + SACDEC_BINAURAL_DISTANCE = 0x0103, /*!< Set perceived distance for binaural + playback (binaural mode only). The valid + values range from 0 to 100. Where 100 + corresponds to the farthest perceived + distance. */ + SACDEC_BINAURAL_DIALOG_CLARITY = + 0x0104, /*!< Set dialog clarity (for binaural playback). + The valid values range from 0 to 100. */ + SACDEC_BINAURAL_FRONT_ANGLE = 0x0105, /*!< Set angle between the virtual front + speaker pair (binaural mode only). + The valid range is from 0 to 180 + angular degrees. */ + SACDEC_BINAURAL_BACK_ANGLE = 0x0106, /*!< Set angle between the virtual back + speaker pair (binaural mode only). The + valid range is from 0 to 180 angular + degrees. */ + SACDEC_BINAURAL_PRESET = 0x0107, /*!< Set a virtual speaker setup preset for + binaural playback (binaural mode only). + This meta-parameter implicitly modifies + the following parameters: + SACDEC_BINAURAL_DISTANCE, + SACDEC_BINAURAL_DIALOG_CLARITY, + SACDEC_BINAURAL_FRONT_ANGLE and + SACDEC_BINAURAL_BACK_ANGLE. + The following presets are available: + 1: Dry room + 2: Living room (default) + 3: Cinema */ + + SACDEC_BS_INTERRUPTION = + 0x0200, /*!< If the given value is unequal to 0 hint the MPEG Surround + decoder that the next input data is discontinuous, because of + frame loss, seeking, etc. Announce the decoder that the + bitstream data was interrupted (fSync = 0). This will cause the + surround decoder not to parse any new bitstream data until a + new header with a valid Spatial Specific Config and a + independently decodable frame is found. Specially important + when the MPEG Surround data is split accross several frames + (for example in the case of AAC-LC downmix with 1024 + framelength and 2048 surround frame length) and a discontinuity + in the bitstream data occurs. If fSync is 1, assume that MPEG + Surround data is in sync (out of band config for example). */ + SACDEC_CLEAR_HISTORY = 0x0201, /*!< If the given value is unequal to 0 clear + all internal states (delay lines, QMF + states, ...) of the MPEG Surround decoder. + This will cause a discontinuity in the audio + output signal. */ + + SACDEC_CONCEAL_NUM_KEEP_FRAMES = + 0x0301, /*!< Error concealment: The Number of frames the module keeps the + last spatial image before fading to the particular spatial + scenario starts. The default is 10 frames. */ + SACDEC_CONCEAL_FADE_OUT_SLOPE_LENGTH = + 0x0302, /*!< Error concealment: Length of the slope (in frames) the module + creates to fade from the last spatial scenario to the + particular default scenario (downmix) in case of consecutive + errors. Default is 5. */ + SACDEC_CONCEAL_FADE_IN_SLOPE_LENGTH = + 0x0303, /*!< Error concealment: Length of the slope (in frames) the module + creates to fade from the default spatial scenario (downmix) to + the current scenario after fade-out. Default parameter value + is 5. */ + SACDEC_CONCEAL_NUM_RELEASE_FRAMES = + 0x0304 /*!< Error concealment: The number of error free frames before the + module starts fading from default to the current spatial + scenario. Default parameter value is 3 frames. */ +} SACDEC_PARAM; + +#define PCM_MPS INT_PCM + +/** + * \brief MPEG Surround decoder handle. + */ +typedef struct MpegSurroundDecoder CMpegSurroundDecoder; + +/** + * \brief Check if the full MPEG Surround decoder instance is allocated. + * + * Check if the full MPEG Surround decoder instance is allocated. + * + * \param pMpegSurroundDecoder A pointer to a decoder stucture. + * + * \return SACDEC_ERROR error code + */ +SAC_INSTANCE_AVAIL +mpegSurroundDecoder_IsFullMpegSurroundDecoderInstanceAvailable( + CMpegSurroundDecoder *pMpegSurroundDecoder); + +/** + * \brief Open one instance of the MPEG Surround decoder. + * + * Allocate one instance of decoder and input buffers. + * - Allocate decoder structure + * - Allocate input buffers (QMF/time/MPS data) + * + * \param pMpegSurroundDecoder A pointer to a decoder handle; filled on + * return. + * \param splitMemoryAllocation Allocate only outer layer of MPS decoder. Core + * part is reallocated later if needed. + * \param stereoConfigIndex USAC: Save memory by opening the MPS decoder + * for a specific stereoConfigIndex. (Needs optimization macros enabled.) + * \param pQmfDomain Pointer to QMF domain data structure. + * + * \return SACDEC_ERROR error code + */ +SACDEC_ERROR mpegSurroundDecoder_Open( + CMpegSurroundDecoder **pMpegSurroundDecoder, int stereoConfigIndex, + HANDLE_FDK_QMF_DOMAIN pQmfDomain); + +/** + * \brief Init one instance of the MPEG Surround decoder. + * + * Init one instance of the MPEG Surround decoder + * + * \param pMpegSurroundDecoder A pointer to a decoder handle; + * + * \return SACDEC_ERROR error code + */ +SACDEC_ERROR mpegSurroundDecoder_Init( + CMpegSurroundDecoder *pMpegSurroundDecoder); + +/** + * \brief Read and parse SpatialSpecificConfig. + * + * \param pMpegSurroundDecoder A pointer to a decoder handle. + * \param hBs bitstream handle config parsing data source. + * + * \return SACDEC_ERROR error code + */ +SACDEC_ERROR mpegSurroundDecoder_Config( + CMpegSurroundDecoder *pMpegSurroundDecoder, HANDLE_FDK_BITSTREAM hBs, + AUDIO_OBJECT_TYPE coreCodec, INT samplingRate, INT stereoConfigIndex, + INT coreSbrFrameLengthIndex, INT configBytes, const UCHAR configMode, + UCHAR *configChanged); + +SACDEC_ERROR +mpegSurroundDecoder_ConfigureQmfDomain( + CMpegSurroundDecoder *pMpegSurroundDecoder, + SAC_INPUT_CONFIG sac_dec_interface, UINT coreSamplingRate, + AUDIO_OBJECT_TYPE coreCodec); + +/** + * \brief Parse MPEG Surround data without header + * + * \param pMpegSurroundDecoder A MPEG Surrround decoder handle. + * \param hBs Bit stream handle data input source + * \param pMpsDataBits Pointer to number of valid bits in extension + * payload. Function updates mpsDataBits while parsing bitstream. + * \param fGlobalIndependencyFlag Global independency flag of current frame. + * + * \return Error code. + */ +int mpegSurroundDecoder_ParseNoHeader( + CMpegSurroundDecoder *pMpegSurroundDecoder, HANDLE_FDK_BITSTREAM hBs, + int *pMpsDataBits, int fGlobalIndependencyFlag); + +/* #ifdef SACDEC_MPS_ENABLE */ +/** + * \brief Parse MPEG Surround data with header. Header is ancType, ancStart, + ancStop (4 bits total). Body is ancDataSegmentByte[i]. + * + * \param pMpegSurroundDecoder A MPEG Surrround decoder handle. + * \param hBs Bit stream handle data input source + * \param pMpsDataBits Pointer to number of valid bits in extension + payload. Function updates mpsDataBits while parsing bitstream. Needs to be a + multiple of 8 + 4 (4 bits header). + * \param coreCodec The audio object type of the core codec handling + the downmix input signal. + * \param sampleRate Samplerate of input downmix data. + * \param nChannels Amount of input channels. + * \param frameSize Amount of input samples. + * \param fGlobalIndependencyFlag Global independency flag of current frame. + * + * \return Error code. + */ +int mpegSurroundDecoder_Parse(CMpegSurroundDecoder *pMpegSurroundDecoder, + HANDLE_FDK_BITSTREAM hBs, int *pMpsDataBits, + AUDIO_OBJECT_TYPE coreCodec, int sampleRate, + int frameSize, int fGlobalIndependencyFlag); +/* #endif */ + +/** + * \brief Apply MPEG Surround upmix. + * + * Process one downmix audio frame and decode one surround frame if it applies. + * Downmix framing can be different from surround framing, so depending on the + * frame size of the downmix audio data and the framing being used by the MPEG + * Surround decoder, it could be that only every second call, for example, of + * this function actually surround data was decoded. The returned value of + * frameSize will be zero, if no surround data was decoded. + * + * Decoding one MPEG Surround frame. Depending on interface configuration + * mpegSurroundDecoder_SetParam(self, SACDEC_INTERFACE, value), the QMF or time + * interface will be applied. External access to QMF buffer interface can be + * achieved by mpegSurroundDecoder_GetQmfBuffer() call before decode frame. + * While using time interface, pTimeData buffer will be shared as input and + * output buffer. + * + * \param pMpegSurroundDecoder A MPEG Surrround decoder handle. + * \param pTimeData Pointer to time buffer. Depending on interface + * configuration, the content of pTimeData is ignored, and the internal QMF + * buffer will be used as input data source. + * Otherwise, the MPEG Surround processing is applied to the timesignal + * pTimeData. For both variants, the resulting MPEG + * Surround signal is written into pTimeData. + * \param timeDataSize Size of pTimeData (available buffer size). + * \param timeDataFrameSize Frame size of input timedata + * \param nChannels Pointer where the amount of input channels is + * given and amount of output channels is returned. + * \param frameSize Pointer where the amount of output samples is + * returned into. + * \param channelType Array were the corresponding channel type for + * each output audio channel is stored into. + * \param channelIndices Array were the corresponding channel type index + * for each output audio channel is stored into. + * \param mapDescr Channep map descriptor for output channel mapping + * to be used (From MPEG PCE ordering to whatever is required). + * + * \return Error code. + */ +int mpegSurroundDecoder_Apply(CMpegSurroundDecoder *pMpegSurroundDecoder, + INT_PCM *input, PCM_MPS *pTimeData, + const int timeDataSize, int timeDataFrameSize, + int *nChannels, int *frameSize, int sampleRate, + AUDIO_OBJECT_TYPE coreCodec, + AUDIO_CHANNEL_TYPE channelType[], + UCHAR channelIndices[], + const FDK_channelMapDescr *const mapDescr); + +/** + * \brief Deallocate a MPEG Surround decoder instance. + * \param pMpegSurroundDecoder A decoder handle. + * \return No return value. + */ +void mpegSurroundDecoder_Close(CMpegSurroundDecoder *pMpegSurroundDecoder); + +/** + * \brief Free config dependent MPEG Surround memory. + * \param pMpegSurroundDecoder A decoder handle. + * \return error. + */ +SACDEC_ERROR mpegSurroundDecoder_FreeMem( + CMpegSurroundDecoder *pMpegSurroundDecoder); + +/** + * \brief Set one single MPEG Surround decoder parameter. + * + * \param pMpegSurroundDecoder A MPEG Surrround decoder handle. Must not be + * NULL pointer. + * \param param Parameter to be set. See SACDEC_PARAM. + * \param value Parameter value. See SACDEC_PARAM. + * + * \return 0 on sucess, and non-zero on failure. + */ +SACDEC_ERROR mpegSurroundDecoder_SetParam( + CMpegSurroundDecoder *pMpegSurroundDecoder, const SACDEC_PARAM param, + const INT value); + +/** + * \brief Retrieve MPEG Surround decoder library info and fill info list with all depending library infos. + * \param libInfo Pointer to library info list to be filled. + * \return 0 on sucess, and non-zero on failure. + **/ +int mpegSurroundDecoder_GetLibInfo(LIB_INFO *libInfo); + +/** + * \brief Set one single MPEG Surround decoder parameter. + * + * \param pMpegSurroundDecoder A valid MPEG Surrround decoder handle. + * + * \return The additional signal delay caused by the module. + */ +UINT mpegSurroundDecoder_GetDelay(const CMpegSurroundDecoder *self); + +/** + * \brief Get info on whether the USAC pseudo LR feature is active. + * + * \param pMpegSurroundDecoder A valid MPEG Surrround decoder handle. + * \param bsPseudoLr Pointer to return wether pseudo LR USAC feature + * is used. + * + * \return 0 on sucess, and non-zero on failure. + */ +SACDEC_ERROR mpegSurroundDecoder_IsPseudoLR( + CMpegSurroundDecoder *pMpegSurroundDecoder, int *bsPseudoLr); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* #ifndef SAC_DEC_LIB_H */ -- cgit v1.2.3