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 --- libSBRenc/src/sbrenc_freq_sca.cpp | 819 +++++++++++++++++++------------------- 1 file changed, 401 insertions(+), 418 deletions(-) (limited to 'libSBRenc/src/sbrenc_freq_sca.cpp') diff --git a/libSBRenc/src/sbrenc_freq_sca.cpp b/libSBRenc/src/sbrenc_freq_sca.cpp index 30bc5ca..c86e047 100644 --- a/libSBRenc/src/sbrenc_freq_sca.cpp +++ b/libSBRenc/src/sbrenc_freq_sca.cpp @@ -1,74 +1,85 @@ - -/* ----------------------------------------------------------------------------------------------------------- +/* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2013 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,12 +90,19 @@ Am Wolfsmantel 33 www.iis.fraunhofer.de/amm amm-info@iis.fraunhofer.de ------------------------------------------------------------------------------------------------------------ */ +----------------------------------------------------------------------------- */ + +/**************************** SBR encoder library ****************************** + + Author(s): + + Description: + +*******************************************************************************/ /*! \file - \brief frequency scale - \author Tobias Chalupka + \brief frequency scale $Revision: 95225 $ */ #include "sbrenc_freq_sca.h" @@ -98,12 +116,10 @@ static INT getStartFreq(INT fsCore, const INT start_freq); /* StopFreq */ static INT getStopFreq(INT fsCore, const INT stop_freq); -static INT numberOfBands(INT b_p_o, INT start, INT stop, FIXP_DBL warp_factor); -static void CalcBands(INT * diff, INT start , INT stop , INT num_bands); -static INT modifyBands(INT max_band, INT * diff, INT length); -static void cumSum(INT start_value, INT* diff, INT length, UCHAR *start_adress); - - +static INT numberOfBands(INT b_p_o, INT start, INT stop, FIXP_DBL warp_factor); +static void CalcBands(INT *diff, INT start, INT stop, INT num_bands); +static INT modifyBands(INT max_band, INT *diff, INT length); +static void cumSum(INT start_value, INT *diff, INT length, UCHAR *start_adress); /******************************************************************************* Functionname: FDKsbrEnc_getSbrStartFreqRAW @@ -115,24 +131,22 @@ static void cumSum(INT start_value, INT* diff, INT length, UCHAR *start_adress) Return: *******************************************************************************/ -INT -FDKsbrEnc_getSbrStartFreqRAW (INT startFreq, INT fsCore) -{ +INT FDKsbrEnc_getSbrStartFreqRAW(INT startFreq, INT fsCore) { INT result; - if ( startFreq < 0 || startFreq > 15) { + if (startFreq < 0 || startFreq > 15) { return -1; } /* Update startFreq struct */ result = getStartFreq(fsCore, startFreq); - result = (result*(fsCore>>5)+1)>>1; /* (result*fsSBR/QMFbands+1)>>1; */ + result = + (result * (fsCore >> 5) + 1) >> 1; /* (result*fsSBR/QMFbands+1)>>1; */ return (result); } /* End FDKsbrEnc_getSbrStartFreqRAW */ - /******************************************************************************* Functionname: getSbrStopFreq ******************************************************************************* @@ -142,21 +156,19 @@ FDKsbrEnc_getSbrStartFreqRAW (INT startFreq, INT fsCore) Return: *******************************************************************************/ -INT FDKsbrEnc_getSbrStopFreqRAW (INT stopFreq, INT fsCore) -{ +INT FDKsbrEnc_getSbrStopFreqRAW(INT stopFreq, INT fsCore) { INT result; - if ( stopFreq < 0 || stopFreq > 13) - return -1; + if (stopFreq < 0 || stopFreq > 13) return -1; /* Uppdate stopFreq struct */ result = getStopFreq(fsCore, stopFreq); - result = (result*(fsCore>>5)+1)>>1; /* (result*fsSBR/QMFbands+1)>>1; */ + result = + (result * (fsCore >> 5) + 1) >> 1; /* (result*fsSBR/QMFbands+1)>>1; */ return (result); } /* End getSbrStopFreq */ - /******************************************************************************* Functionname: getStartFreq ******************************************************************************* @@ -167,82 +179,80 @@ INT FDKsbrEnc_getSbrStopFreqRAW (INT stopFreq, INT fsCore) Return: *******************************************************************************/ -static INT -getStartFreq(INT fsCore, const INT start_freq) -{ +static INT getStartFreq(INT fsCore, const INT start_freq) { INT k0_min; - switch(fsCore){ - case 8000: k0_min = 24; /* (3000 * nQmfChannels / fsSBR ) + 0.5 */ - break; - case 11025: k0_min = 17; /* (3000 * nQmfChannels / fsSBR ) + 0.5 */ - break; - case 12000: k0_min = 16; /* (3000 * nQmfChannels / fsSBR ) + 0.5 */ - break; - case 16000: k0_min = 16; /* (4000 * nQmfChannels / fsSBR ) + 0.5 */ - break; - case 22050: k0_min = 12; /* (4000 * nQmfChannels / fsSBR ) + 0.5 */ - break; - case 24000: k0_min = 11; /* (4000 * nQmfChannels / fsSBR ) + 0.5 */ - break; - case 32000: k0_min = 10; /* (5000 * nQmfChannels / fsSBR ) + 0.5 */ - break; - case 44100: k0_min = 7; /* (5000 * nQmfChannels / fsSBR ) + 0.5 */ - break; - case 48000: k0_min = 7; /* (5000 * nQmfChannels / fsSBR ) + 0.5 */ - break; - case 96000: k0_min = 3; /* (5000 * nQmfChannels / fsSBR ) + 0.5 */ - break; - default: - k0_min=11; /* illegal fs */ + switch (fsCore) { + case 8000: + k0_min = 24; /* (3000 * nQmfChannels / fsSBR ) + 0.5 */ + break; + case 11025: + k0_min = 17; /* (3000 * nQmfChannels / fsSBR ) + 0.5 */ + break; + case 12000: + k0_min = 16; /* (3000 * nQmfChannels / fsSBR ) + 0.5 */ + break; + case 16000: + k0_min = 16; /* (4000 * nQmfChannels / fsSBR ) + 0.5 */ + break; + case 22050: + k0_min = 12; /* (4000 * nQmfChannels / fsSBR ) + 0.5 */ + break; + case 24000: + k0_min = 11; /* (4000 * nQmfChannels / fsSBR ) + 0.5 */ + break; + case 32000: + k0_min = 10; /* (5000 * nQmfChannels / fsSBR ) + 0.5 */ + break; + case 44100: + k0_min = 7; /* (5000 * nQmfChannels / fsSBR ) + 0.5 */ + break; + case 48000: + k0_min = 7; /* (5000 * nQmfChannels / fsSBR ) + 0.5 */ + break; + case 96000: + k0_min = 3; /* (5000 * nQmfChannels / fsSBR ) + 0.5 */ + break; + default: + k0_min = 11; /* illegal fs */ } - switch (fsCore) { - - case 8000: - { - INT v_offset[]= {-8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7}; + case 8000: { + INT v_offset[] = {-8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7}; return (k0_min + v_offset[start_freq]); } - case 11025: - { - INT v_offset[]= {-5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 9, 11, 13}; + case 11025: { + INT v_offset[] = {-5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 9, 11, 13}; return (k0_min + v_offset[start_freq]); } - case 12000: - { - INT v_offset[]= {-5, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 9, 11, 13, 16}; + case 12000: { + INT v_offset[] = {-5, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 9, 11, 13, 16}; return (k0_min + v_offset[start_freq]); } - case 16000: - { - INT v_offset[]= {-6, -4, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 9, 11, 13, 16}; + case 16000: { + INT v_offset[] = {-6, -4, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 9, 11, 13, 16}; return (k0_min + v_offset[start_freq]); } - case 22050: - case 24000: - case 32000: - { - INT v_offset[]= {-4, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 9, 11, 13, 16, 20}; + case 22050: + case 24000: + case 32000: { + INT v_offset[] = {-4, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 9, 11, 13, 16, 20}; return (k0_min + v_offset[start_freq]); } - case 44100: - case 48000: - case 96000: - { - INT v_offset[]= {-2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 9, 11, 13, 16, 20, 24}; + case 44100: + case 48000: + case 96000: { + INT v_offset[] = {-2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 9, 11, 13, 16, 20, 24}; return (k0_min + v_offset[start_freq]); } - default: - { - INT v_offset[]= {0, 1, 2, 3, 4, 5, 6, 7, 9, 11, 13, 16, 20, 24, 28, 33}; + default: { + INT v_offset[] = {0, 1, 2, 3, 4, 5, 6, 7, 9, 11, 13, 16, 20, 24, 28, 33}; return (k0_min + v_offset[start_freq]); } } } /* End getStartFreq */ - /******************************************************************************* Functionname: getStopFreq ******************************************************************************* @@ -252,78 +262,93 @@ getStartFreq(INT fsCore, const INT start_freq) Return: *******************************************************************************/ - static INT -getStopFreq(INT fsCore, const INT stop_freq) -{ - INT result,i; +static INT getStopFreq(INT fsCore, const INT stop_freq) { + INT result, i; INT k1_min; INT v_dstop[13]; INT *v_stop_freq = NULL; - INT v_stop_freq_16[14] = {48,49,50,51,52,54,55,56,57,59,60,61,63,64}; - INT v_stop_freq_22[14] = {35,37,38,40,42,44,46,48,51,53,56,58,61,64}; - INT v_stop_freq_24[14] = {32,34,36,38,40,42,44,46,49,52,55,58,61,64}; - INT v_stop_freq_32[14] = {32,34,36,38,40,42,44,46,49,52,55,58,61,64}; - INT v_stop_freq_44[14] = {23,25,27,29,32,34,37,40,43,47,51,55,59,64}; - INT v_stop_freq_48[14] = {21,23,25,27,30,32,35,38,42,45,49,54,59,64}; - INT v_stop_freq_64[14] = {20,22,24,26,29,31,34,37,41,45,49,54,59,64}; - INT v_stop_freq_88[14] = {15,17,19,21,23,26,29,33,37,41,46,51,57,64}; - INT v_stop_freq_96[14] = {13,15,17,19,21,24,27,31,35,39,44,50,57,64}; - INT v_stop_freq_192[14] = {7, 8,10,12,14,16,19,23,27,32,38,46,54,64}; - - switch(fsCore){ - case 8000: k1_min = 48; - v_stop_freq =v_stop_freq_16; - break; - case 11025: k1_min = 35; - v_stop_freq =v_stop_freq_22; - break; - case 12000: k1_min = 32; - v_stop_freq =v_stop_freq_24; - break; - case 16000: k1_min = 32; - v_stop_freq =v_stop_freq_32; - break; - case 22050: k1_min = 23; - v_stop_freq =v_stop_freq_44; - break; - case 24000: k1_min = 21; - v_stop_freq =v_stop_freq_48; - break; - case 32000: k1_min = 20; - v_stop_freq =v_stop_freq_64; - break; - case 44100: k1_min = 15; - v_stop_freq =v_stop_freq_88; - break; - case 48000: k1_min = 13; - v_stop_freq =v_stop_freq_96; - break; - case 96000: k1_min = 7; - v_stop_freq =v_stop_freq_192; - break; - default: - k1_min = 21; /* illegal fs */ + INT v_stop_freq_16[14] = {48, 49, 50, 51, 52, 54, 55, + 56, 57, 59, 60, 61, 63, 64}; + INT v_stop_freq_22[14] = {35, 37, 38, 40, 42, 44, 46, + 48, 51, 53, 56, 58, 61, 64}; + INT v_stop_freq_24[14] = {32, 34, 36, 38, 40, 42, 44, + 46, 49, 52, 55, 58, 61, 64}; + INT v_stop_freq_32[14] = {32, 34, 36, 38, 40, 42, 44, + 46, 49, 52, 55, 58, 61, 64}; + INT v_stop_freq_44[14] = {23, 25, 27, 29, 32, 34, 37, + 40, 43, 47, 51, 55, 59, 64}; + INT v_stop_freq_48[14] = {21, 23, 25, 27, 30, 32, 35, + 38, 42, 45, 49, 54, 59, 64}; + INT v_stop_freq_64[14] = {20, 22, 24, 26, 29, 31, 34, + 37, 41, 45, 49, 54, 59, 64}; + INT v_stop_freq_88[14] = {15, 17, 19, 21, 23, 26, 29, + 33, 37, 41, 46, 51, 57, 64}; + INT v_stop_freq_96[14] = {13, 15, 17, 19, 21, 24, 27, + 31, 35, 39, 44, 50, 57, 64}; + INT v_stop_freq_192[14] = {7, 8, 10, 12, 14, 16, 19, + 23, 27, 32, 38, 46, 54, 64}; + + switch (fsCore) { + case 8000: + k1_min = 48; + v_stop_freq = v_stop_freq_16; + break; + case 11025: + k1_min = 35; + v_stop_freq = v_stop_freq_22; + break; + case 12000: + k1_min = 32; + v_stop_freq = v_stop_freq_24; + break; + case 16000: + k1_min = 32; + v_stop_freq = v_stop_freq_32; + break; + case 22050: + k1_min = 23; + v_stop_freq = v_stop_freq_44; + break; + case 24000: + k1_min = 21; + v_stop_freq = v_stop_freq_48; + break; + case 32000: + k1_min = 20; + v_stop_freq = v_stop_freq_64; + break; + case 44100: + k1_min = 15; + v_stop_freq = v_stop_freq_88; + break; + case 48000: + k1_min = 13; + v_stop_freq = v_stop_freq_96; + break; + case 96000: + k1_min = 7; + v_stop_freq = v_stop_freq_192; + break; + default: + k1_min = 21; /* illegal fs */ } - /* if no valid core samplingrate is used this loop produces - a segfault, because v_stop_freq is not initialized */ /* Ensure increasing bandwidth */ - for(i = 0; i <= 12; i++) { - v_dstop[i] = v_stop_freq[i+1] - v_stop_freq[i]; + for (i = 0; i <= 12; i++) { + v_dstop[i] = v_stop_freq[i + 1] - v_stop_freq[i]; } FDKsbrEnc_Shellsort_int(v_dstop, 13); /* Sort bandwidth changes */ result = k1_min; - for(i = 0; i < stop_freq; i++) { + for (i = 0; i < stop_freq; i++) { result = result + v_dstop[i]; } - return(result); - -}/* End getStopFreq */ + return (result); +} /* End getStopFreq */ /******************************************************************************* Functionname: FDKsbrEnc_FindStartAndStopBand @@ -341,31 +366,23 @@ getStopFreq(INT fsCore, const INT stop_freq) Return: Error code (0 is OK) *******************************************************************************/ -INT -FDKsbrEnc_FindStartAndStopBand( - const INT srSbr, - const INT srCore, - const INT noChannels, - const INT startFreq, - const INT stopFreq, - INT *k0, - INT *k2 - ) -{ - +INT FDKsbrEnc_FindStartAndStopBand(const INT srSbr, const INT srCore, + const INT noChannels, const INT startFreq, + const INT stopFreq, INT *k0, INT *k2) { /* Update startFreq struct */ *k0 = getStartFreq(srCore, startFreq); /* Test if start freq is outside corecoder range */ - if( srSbr*noChannels < *k0 * srCore ) { - return (1); /* raise the cross-over frequency and/or lower the number - of target bands per octave (or lower the sampling frequency) */ + if (srSbr * noChannels < *k0 * srCore) { + return ( + 1); /* raise the cross-over frequency and/or lower the number + of target bands per octave (or lower the sampling frequency) */ } /*Update stopFreq struct */ - if ( stopFreq < 14 ) { + if (stopFreq < 14) { *k2 = getStopFreq(srCore, stopFreq); - } else if( stopFreq == 14 ) { + } else if (stopFreq == 14) { *k2 = 2 * *k0; } else { *k2 = 3 * *k0; @@ -376,23 +393,21 @@ FDKsbrEnc_FindStartAndStopBand( *k2 = noChannels; } - - /* Test for invalid k0 k2 combinations */ - if ( (srCore == 22050) && ( (*k2 - *k0) > MAX_FREQ_COEFFS_FS44100 ) ) - return (1); /* Number of bands exceeds valid range of MAX_FREQ_COEFFS for fs=44.1kHz */ + if ((srCore == 22050) && ((*k2 - *k0) > MAX_FREQ_COEFFS_FS44100)) + return (1); /* Number of bands exceeds valid range of MAX_FREQ_COEFFS for + fs=44.1kHz */ - if ( (srCore >= 24000) && ( (*k2 - *k0) > MAX_FREQ_COEFFS_FS48000 ) ) - return (1); /* Number of bands exceeds valid range of MAX_FREQ_COEFFS for fs>=48kHz */ + if ((srCore >= 24000) && ((*k2 - *k0) > MAX_FREQ_COEFFS_FS48000)) + return (1); /* Number of bands exceeds valid range of MAX_FREQ_COEFFS for + fs>=48kHz */ if ((*k2 - *k0) > MAX_FREQ_COEFFS) - return (1);/*Number of bands exceeds valid range of MAX_FREQ_COEFFS */ - - if ((*k2 - *k0) < 0) - return (1);/* Number of bands is negative */ + return (1); /*Number of bands exceeds valid range of MAX_FREQ_COEFFS */ + if ((*k2 - *k0) < 0) return (1); /* Number of bands is negative */ - return(0); + return (0); } /******************************************************************************* @@ -404,207 +419,188 @@ FDKsbrEnc_FindStartAndStopBand( Return: *******************************************************************************/ -INT -FDKsbrEnc_UpdateFreqScale( - UCHAR *v_k_master, - INT *h_num_bands, - const INT k0, - const INT k2, - const INT freqScale, - const INT alterScale - ) +INT FDKsbrEnc_UpdateFreqScale(UCHAR *v_k_master, INT *h_num_bands, const INT k0, + const INT k2, const INT freqScale, + const INT alterScale) { - - INT b_p_o = 0; /* bands_per_octave */ + INT b_p_o = 0; /* bands_per_octave */ FIXP_DBL warp = FL2FXCONST_DBL(0.0f); - INT dk = 0; + INT dk = 0; /* Internal variables */ - INT k1 = 0, i; - INT num_bands0; - INT num_bands1; - INT diff_tot[MAX_OCTAVE + MAX_SECOND_REGION]; - INT *diff0 = diff_tot; - INT *diff1 = diff_tot+MAX_OCTAVE; - INT k2_achived; - INT k2_diff; - INT incr = 0; + INT k1 = 0, i; + INT num_bands0; + INT num_bands1; + INT diff_tot[MAX_OCTAVE + MAX_SECOND_REGION]; + INT *diff0 = diff_tot; + INT *diff1 = diff_tot + MAX_OCTAVE; + INT k2_achived; + INT k2_diff; + INT incr = 0; /* Init */ - if (freqScale==1) b_p_o = 12; - if (freqScale==2) b_p_o = 10; - if (freqScale==3) b_p_o = 8; - - - if(freqScale > 0) /*Bark*/ + if (freqScale == 1) b_p_o = 12; + if (freqScale == 2) b_p_o = 10; + if (freqScale == 3) b_p_o = 8; + + if (freqScale > 0) /*Bark*/ + { + if (alterScale == 0) + warp = FL2FXCONST_DBL(0.5f); /* 1.0/(1.0*2.0) */ + else + warp = FL2FXCONST_DBL(1.0f / 2.6f); /* 1.0/(1.3*2.0); */ + + if (4 * k2 >= 9 * k0) /*two or more regions (how many times the basis band + is copied)*/ { - if(alterScale==0) - warp = FL2FXCONST_DBL(0.5f); /* 1.0/(1.0*2.0) */ - else - warp = FL2FXCONST_DBL(1.0f/2.6f); /* 1.0/(1.3*2.0); */ - - - if(4*k2 >= 9*k0) /*two or more regions (how many times the basis band is copied)*/ - { - k1=2*k0; + k1 = 2 * k0; - num_bands0=numberOfBands(b_p_o, k0, k1, FL2FXCONST_DBL(0.5f)); - num_bands1=numberOfBands(b_p_o, k1, k2, warp); + num_bands0 = numberOfBands(b_p_o, k0, k1, FL2FXCONST_DBL(0.5f)); + num_bands1 = numberOfBands(b_p_o, k1, k2, warp); - CalcBands(diff0, k0, k1, num_bands0);/*CalcBands1 => diff0 */ - FDKsbrEnc_Shellsort_int( diff0, num_bands0);/*SortBands sort diff0 */ + CalcBands(diff0, k0, k1, num_bands0); /*CalcBands1 => diff0 */ + FDKsbrEnc_Shellsort_int(diff0, num_bands0); /*SortBands sort diff0 */ - if (diff0[0] == 0) /* too wide FB bands for target tuning */ - { - return (1);/* raise the cross-over frequency and/or lower the number - of target bands per octave (or lower the sampling frequency */ - } - - cumSum(k0, diff0, num_bands0, v_k_master); /* cumsum */ - - CalcBands(diff1, k1, k2, num_bands1); /* CalcBands2 => diff1 */ - FDKsbrEnc_Shellsort_int( diff1, num_bands1); /* SortBands sort diff1 */ - if(diff0[num_bands0-1] > diff1[0]) /* max(1) > min(2) */ - { - if(modifyBands(diff0[num_bands0-1],diff1, num_bands1)) - return(1); - } - - /* Add 2'nd region */ - cumSum(k1, diff1, num_bands1, &v_k_master[num_bands0]); - *h_num_bands=num_bands0+num_bands1; /* Output nr of bands */ - - } - else /* one region */ - { - k1=k2; + if (diff0[0] == 0) /* too wide FB bands for target tuning */ + { + return (1); /* raise the cross-over frequency and/or lower the number + of target bands per octave (or lower the sampling + frequency */ + } - num_bands0=numberOfBands(b_p_o, k0, k1, FL2FXCONST_DBL(0.5f)); - CalcBands(diff0, k0, k1, num_bands0);/* CalcBands1 => diff0 */ - FDKsbrEnc_Shellsort_int( diff0, num_bands0); /* SortBands sort diff0 */ + cumSum(k0, diff0, num_bands0, v_k_master); /* cumsum */ - if (diff0[0] == 0) /* too wide FB bands for target tuning */ - { - return (1); /* raise the cross-over frequency and/or lower the number - of target bands per octave (or lower the sampling frequency */ - } + CalcBands(diff1, k1, k2, num_bands1); /* CalcBands2 => diff1 */ + FDKsbrEnc_Shellsort_int(diff1, num_bands1); /* SortBands sort diff1 */ + if (diff0[num_bands0 - 1] > diff1[0]) /* max(1) > min(2) */ + { + if (modifyBands(diff0[num_bands0 - 1], diff1, num_bands1)) return (1); + } - cumSum(k0, diff0, num_bands0, v_k_master);/* cumsum */ - *h_num_bands=num_bands0; /* Output nr of bands */ + /* Add 2'nd region */ + cumSum(k1, diff1, num_bands1, &v_k_master[num_bands0]); + *h_num_bands = num_bands0 + num_bands1; /* Output nr of bands */ - } - } - else /* Linear mode */ + } else /* one region */ { - if (alterScale==0) { - dk = 1; - num_bands0 = 2 * ((k2 - k0)/2); /* FLOOR to get to few number of bands*/ - } else { - dk = 2; - num_bands0 = 2 * (((k2 - k0)/dk +1)/2); /* ROUND to get closest fit */ - } - - k2_achived = k0 + num_bands0*dk; - k2_diff = k2 - k2_achived; + k1 = k2; - for(i=0;i diff0 */ + FDKsbrEnc_Shellsort_int(diff0, num_bands0); /* SortBands sort diff0 */ - /* If linear scale wasn't achived */ - /* and we got wide SBR are */ - if (k2_diff < 0) { - incr = 1; - i = 0; + if (diff0[0] == 0) /* too wide FB bands for target tuning */ + { + return (1); /* raise the cross-over frequency and/or lower the number + of target bands per octave (or lower the sampling + frequency */ } - /* If linear scale wasn't achived */ - /* and we got small SBR are */ - if (k2_diff > 0) { - incr = -1; - i = num_bands0-1; - } + cumSum(k0, diff0, num_bands0, v_k_master); /* cumsum */ + *h_num_bands = num_bands0; /* Output nr of bands */ + } + } else /* Linear mode */ + { + if (alterScale == 0) { + dk = 1; + num_bands0 = 2 * ((k2 - k0) / 2); /* FLOOR to get to few number of bands*/ + } else { + dk = 2; + num_bands0 = + 2 * (((k2 - k0) / dk + 1) / 2); /* ROUND to get closest fit */ + } - /* Adjust diff vector to get sepc. SBR range */ - while (k2_diff != 0) { - diff_tot[i] = diff_tot[i] - incr; - i = i + incr; - k2_diff = k2_diff + incr; - } + k2_achived = k0 + num_bands0 * dk; + k2_diff = k2 - k2_achived; - cumSum(k0, diff_tot, num_bands0, v_k_master);/* cumsum */ - *h_num_bands=num_bands0; /* Output nr of bands */ + for (i = 0; i < num_bands0; i++) diff_tot[i] = dk; + /* If linear scale wasn't achived */ + /* and we got wide SBR are */ + if (k2_diff < 0) { + incr = 1; + i = 0; } - if (*h_num_bands < 1) - return(1); /*To small sbr area */ - - return (0); -}/* End FDKsbrEnc_UpdateFreqScale */ + /* If linear scale wasn't achived */ + /* and we got small SBR are */ + if (k2_diff > 0) { + incr = -1; + i = num_bands0 - 1; + } -static INT -numberOfBands(INT b_p_o, INT start, INT stop, FIXP_DBL warp_factor) -{ - INT result=0; - /* result = 2* (INT) ( (double)b_p_o * (double)(FDKlog((double)stop/(double)start)/FDKlog((double)2)) * (double)FX_DBL2FL(warp_factor) + 0.5); */ - result = ( ( b_p_o * fMult( (CalcLdInt(stop) - CalcLdInt(start)), warp_factor) + (FL2FX_DBL(0.5f)>>LD_DATA_SHIFT) - ) >> ((DFRACT_BITS-1)-LD_DATA_SHIFT) ) << 1; /* do not optimize anymore (rounding!!) */ + /* Adjust diff vector to get sepc. SBR range */ + while (k2_diff != 0) { + diff_tot[i] = diff_tot[i] - incr; + i = i + incr; + k2_diff = k2_diff + incr; + } - return(result); -} + cumSum(k0, diff_tot, num_bands0, v_k_master); /* cumsum */ + *h_num_bands = num_bands0; /* Output nr of bands */ + } + if (*h_num_bands < 1) return (1); /*To small sbr area */ -static void -CalcBands(INT * diff, INT start , INT stop , INT num_bands) -{ - INT i, qb, qe, qtmp; - INT previous; - INT current; - FIXP_DBL base, exp, tmp; + return (0); +} /* End FDKsbrEnc_UpdateFreqScale */ + +static INT numberOfBands(INT b_p_o, INT start, INT stop, FIXP_DBL warp_factor) { + INT result = 0; + /* result = 2* (INT) ( (double)b_p_o * + * (double)(FDKlog((double)stop/(double)start)/FDKlog((double)2)) * + * (double)FX_DBL2FL(warp_factor) + 0.5); */ + result = ((b_p_o * fMult((CalcLdInt(stop) - CalcLdInt(start)), warp_factor) + + (FL2FX_DBL(0.5f) >> LD_DATA_SHIFT)) >> + ((DFRACT_BITS - 1) - LD_DATA_SHIFT)) + << 1; /* do not optimize anymore (rounding!!) */ - previous=start; - for(i=1; i<= num_bands; i++) - { - base = fDivNorm((FIXP_DBL)stop, (FIXP_DBL)start, &qb); - exp = fDivNorm((FIXP_DBL)i, (FIXP_DBL)num_bands, &qe); - tmp = fPow(base, qb, exp, qe, &qtmp); - tmp = fMult(tmp, (FIXP_DBL)(start<<24)); - current = (INT)scaleValue(tmp, qtmp-23); - current = (current+1) >> 1; /* rounding*/ - diff[i-1] = current-previous; - previous = current; - } + return (result); +} -}/* End CalcBands */ +static void CalcBands(INT *diff, INT start, INT stop, INT num_bands) { + INT i, qb, qe, qtmp; + INT previous; + INT current; + FIXP_DBL base, exp, tmp; + + previous = start; + for (i = 1; i <= num_bands; i++) { + base = fDivNorm((FIXP_DBL)stop, (FIXP_DBL)start, &qb); + exp = fDivNorm((FIXP_DBL)i, (FIXP_DBL)num_bands, &qe); + tmp = fPow(base, qb, exp, qe, &qtmp); + tmp = fMult(tmp, (FIXP_DBL)(start << 24)); + current = (INT)scaleValue(tmp, qtmp - 23); + current = (current + 1) >> 1; /* rounding*/ + diff[i - 1] = current - previous; + previous = current; + } +} /* End CalcBands */ -static void -cumSum(INT start_value, INT* diff, INT length, UCHAR *start_adress) -{ +static void cumSum(INT start_value, INT *diff, INT length, + UCHAR *start_adress) { INT i; - start_adress[0]=start_value; - for(i=1;i<=length;i++) - start_adress[i]=start_adress[i-1]+diff[i-1]; + start_adress[0] = start_value; + for (i = 1; i <= length; i++) + start_adress[i] = start_adress[i - 1] + diff[i - 1]; } /* End cumSum */ +static INT modifyBands(INT max_band_previous, INT *diff, INT length) { + INT change = max_band_previous - diff[0]; -static INT -modifyBands(INT max_band_previous, INT * diff, INT length) -{ - INT change=max_band_previous-diff[0]; - - /* Limit the change so that the last band cannot get narrower than the first one */ - if ( change > (diff[length-1] - diff[0]) / 2 ) - change = (diff[length-1] - diff[0]) / 2; + /* Limit the change so that the last band cannot get narrower than the first + * one */ + if (change > (diff[length - 1] - diff[0]) / 2) + change = (diff[length - 1] - diff[0]) / 2; diff[0] += change; - diff[length-1] -= change; + diff[length - 1] -= change; FDKsbrEnc_Shellsort_int(diff, length); - return(0); -}/* End modifyBands */ - + return (0); +} /* End modifyBands */ /******************************************************************************* Functionname: FDKsbrEnc_UpdateHiRes @@ -616,43 +612,34 @@ modifyBands(INT max_band_previous, INT * diff, INT length) Return: *******************************************************************************/ -INT -FDKsbrEnc_UpdateHiRes( - UCHAR *h_hires, - INT *num_hires, - UCHAR *v_k_master, - INT num_master, - INT *xover_band - ) -{ +INT FDKsbrEnc_UpdateHiRes(UCHAR *h_hires, INT *num_hires, UCHAR *v_k_master, + INT num_master, INT *xover_band) { INT i; - INT max1,max2; + INT max1, max2; - if( (v_k_master[*xover_band] > 32 ) || /* v_k_master[*xover_band] > noQMFChannels(dualRate)/divider */ - ( *xover_band > num_master ) ) { - /* xover_band error, too big for this startFreq. Will be clipped */ + if ((v_k_master[*xover_band] > + 32) || /* v_k_master[*xover_band] > noQMFChannels(dualRate)/divider */ + (*xover_band > num_master)) { + /* xover_band error, too big for this startFreq. Will be clipped */ /* Calculate maximum value for xover_band */ - max1=0; - max2=num_master; - while( (v_k_master[max1+1] < 32 ) && /* noQMFChannels(dualRate)/divider */ - ( (max1+1) < max2) ) - { - max1++; - } + max1 = 0; + max2 = num_master; + while ((v_k_master[max1 + 1] < 32) && /* noQMFChannels(dualRate)/divider */ + ((max1 + 1) < max2)) { + max1++; + } - *xover_band=max1; + *xover_band = max1; } *num_hires = num_master - *xover_band; - for(i = *xover_band; i <= num_master; i++) - { - h_hires[i - *xover_band] = v_k_master[i]; - } + for (i = *xover_band; i <= num_master; i++) { + h_hires[i - *xover_band] = v_k_master[i]; + } return (0); -}/* End FDKsbrEnc_UpdateHiRes */ - +} /* End FDKsbrEnc_UpdateHiRes */ /******************************************************************************* Functionname: FDKsbrEnc_UpdateLoRes @@ -663,29 +650,25 @@ FDKsbrEnc_UpdateHiRes( Return: *******************************************************************************/ -void -FDKsbrEnc_UpdateLoRes(UCHAR * h_lores, INT *num_lores, UCHAR * h_hires, INT num_hires) -{ +void FDKsbrEnc_UpdateLoRes(UCHAR *h_lores, INT *num_lores, UCHAR *h_hires, + INT num_hires) { INT i; - if(num_hires%2 == 0) /* if even number of hires bands */ - { - *num_lores=num_hires/2; - /* Use every second lores=hires[0,2,4...] */ - for(i=0;i<=*num_lores;i++) - h_lores[i]=h_hires[i*2]; + if (num_hires % 2 == 0) /* if even number of hires bands */ + { + *num_lores = num_hires / 2; + /* Use every second lores=hires[0,2,4...] */ + for (i = 0; i <= *num_lores; i++) h_lores[i] = h_hires[i * 2]; + } else /* odd number of hires which means xover is odd */ + { + *num_lores = (num_hires + 1) / 2; + + /* Use lores=hires[0,1,3,5 ...] */ + h_lores[0] = h_hires[0]; + for (i = 1; i <= *num_lores; i++) { + h_lores[i] = h_hires[i * 2 - 1]; } - else /* odd number of hires which means xover is odd */ - { - *num_lores=(num_hires+1)/2; - - /* Use lores=hires[0,1,3,5 ...] */ - h_lores[0]=h_hires[0]; - for(i=1;i<=*num_lores;i++) - { - h_lores[i]=h_hires[i*2-1]; - } - } + } -}/* End FDKsbrEnc_UpdateLoRes */ +} /* End FDKsbrEnc_UpdateLoRes */ -- cgit v1.2.3