Commit 1c4a2712 authored by vaclav's avatar vaclav
Browse files

- rename *CQMF* -> *LCLD* 

- reduce number of header files
parent f95290b4

Workspace_msvc/lib_rend.vcxproj

+5 −12
Original line number Diff line number Diff line
@@ -206,12 +206,12 @@ 
    <ClCompile Include="..\lib_rend\ivas_lc3plus_common.c" />

    <ClCompile Include="..\lib_rend\ivas_lc3plus_dec.c" />

    <ClCompile Include="..\lib_rend\ivas_lc3plus_enc.c" />

    <ClCompile Include="..\lib_rend\ivas_lcld_decoder.c" />

    <ClCompile Include="..\lib_rend\ivas_lcld_encoder.c" />

    <ClCompile Include="..\lib_rend\ivas_lcld_rom_tables.c" />

    <ClCompile Include="..\lib_rend\ivas_sba_rendering.c" />

    <ClCompile Include="..\lib_rend\ivas_allrad_dec.c" />

    <ClCompile Include="..\lib_rend\ivas_cldfb_codec_bitstream.c" />

    <ClCompile Include="..\lib_rend\ivas_CQMFDecoder.c" />

    <ClCompile Include="..\lib_rend\ivas_CQMFEncoder.c" />

    <ClCompile Include="..\lib_rend\ivas_MSPred.c" />

    <ClCompile Include="..\lib_rend\ivas_NoiseGen.c" />

    <ClCompile Include="..\lib_rend\ivas_PerceptualModel.c" />
@@ -257,16 +257,9 @@ 
  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_rend\ivas_cldfb_codec_bitstream.h" />

    <ClInclude Include="..\lib_rend\ivas_CQMFDecoder.h" />

    <ClInclude Include="..\lib_rend\ivas_CQMFEncoder.h" />

    <ClInclude Include="..\lib_rend\ivas_lcld_prot.h" />

    <ClInclude Include="..\lib_rend\ivas_lcld_rom_tables.h" />

    <ClInclude Include="..\lib_rend\ivas_MSPred.h" />

    <ClInclude Include="..\lib_rend\ivas_PerceptualModel.h" />

    <ClInclude Include="..\lib_rend\ivas_PredDecoder.h" />

    <ClInclude Include="..\lib_rend\ivas_PredEncoder.h" />

    <ClInclude Include="..\lib_rend\ivas_PredTables.h" />

    <ClInclude Include="..\lib_rend\ivas_prot_rend.h" />

    <ClInclude Include="..\lib_rend\ivas_RMSEnvGrouping.h" />

    <ClInclude Include="..\lib_rend\ivas_rom_binauralRenderer.h" />

    <ClInclude Include="..\lib_rend\ivas_rom_binaural_crend_head.h" />

    <ClInclude Include="..\lib_rend\ivas_rom_rend.h" />

lib_rend/ivas_CQMFDecoder.h

deleted100644 → 0
+0 −62
Original line number Diff line number Diff line 
/******************************************************************************************************



   (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

   contributors to this repository. All Rights Reserved.



   This software is protected by copyright law and by international treaties.

   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,

   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

   contributors to this repository retain full ownership rights in their respective contributions in

   the software. This notice grants no license of any kind, including but not limited to patent

   license, nor is any license granted by implication, estoppel or otherwise.



   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making

   contributions.



   This software is provided "AS IS", without any express or implied warranties. The software is in the

   development stage. It is intended exclusively for experts who have experience with such software and

   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability

   and fitness for a particular purpose are hereby disclaimed and excluded.



   Any dispute, controversy or claim arising under or in relation to providing this software shall be

   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in

   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and

   the United Nations Convention on Contracts on the International Sales of Goods.



*******************************************************************************************************/



#ifndef _IVAS_CQMF_DECODER_H_

#define _IVAS_CQMF_DECODER_H_



#include "options.h"

#ifdef SPLIT_REND_WITH_HEAD_ROT

#include "lib_rend.h"

#define DECODER_ERROR_NONE ( 0 ) // not really used





typedef struct CQMF_DECODER CQMFDecoder;



ivas_error CreateCQMFDecoder(

    CQMFDecoder **psCQMFDecoder_out,

    const int32_t iSampleRate,

    const int32_t iChannels );



void DeleteCQMFDecoder(

    CQMFDecoder *psCQMFDecoder );



int32_t CQMFDecoderGetError(

    CQMFDecoder *psCQMFDecoder );



int32_t DecodeLCLDFrame(

    CQMFDecoder *psCQMFDecoder,

    ivas_split_rend_bits_t *pBits,

    float ***pppfCQMFReal,

    float ***pppfCQMFImag );

#endif



#endif /* _CQMF_DECODER_H_ */

lib_rend/ivas_CQMFEncoder.h

deleted100644 → 0
+0 −69
Original line number Diff line number Diff line 
/******************************************************************************************************



   (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

   contributors to this repository. All Rights Reserved.



   This software is protected by copyright law and by international treaties.

   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,

   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

   contributors to this repository retain full ownership rights in their respective contributions in

   the software. This notice grants no license of any kind, including but not limited to patent

   license, nor is any license granted by implication, estoppel or otherwise.



   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making

   contributions.



   This software is provided "AS IS", without any express or implied warranties. The software is in the

   development stage. It is intended exclusively for experts who have experience with such software and

   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability

   and fitness for a particular purpose are hereby disclaimed and excluded.



   Any dispute, controversy or claim arising under or in relation to providing this software shall be

   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in

   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and

   the United Nations Convention on Contracts on the International Sales of Goods.



*******************************************************************************************************/



#ifndef _IVAS_CQMF_ENCODER_H_

#define _IVAS_CQMF_ENCODER_H_



#include "options.h"

#ifdef SPLIT_REND_WITH_HEAD_ROT

#include "lib_rend.h"

#define ENCODER_ERROR_NONE ( 0 ) // not really used





typedef struct CQMF_ENCODER CQMFEncoder;



ivas_error CreateCQMFEncoder(

    CQMFEncoder **psCQMFEncoder,

    const int32_t iSampleRate,

    const int32_t iChannels,

    const int32_t iTargetBitRate,

    const int32_t iAllowSidePred );



void DeleteCQMFEncoder(

    CQMFEncoder *psCQMFEncoder );



int32_t CQMFEncoderGetError(

    CQMFEncoder *psCQMFEncoder );



int32_t EncodeLCLDFrame(

    CQMFEncoder *psCQMFEncoder,

    float ***pppfCQMFReal,

    float ***pppfCQMFImag,

    int32_t *piNumiBites,

    const int32_t available_bits,

    ivas_split_rend_bits_t *pBits );



int32_t GetNumGroups(

    CQMFEncoder *psCQMFEncoder );

#endif



#endif /* _CQMF_ENCODER_H_ */

lib_rend/ivas_MSPred.c

+1 −1
Original line number Diff line number Diff line
@@ -30,11 +30,11 @@ 


*******************************************************************************************************/



#include "ivas_MSPred.h"

#include "options.h"

#include <stdint.h>

#ifdef SPLIT_REND_WITH_HEAD_ROT

#include "ivas_lcld_rom_tables.h"

#include "ivas_lcld_prot.h"

#include "ivas_prot_rend.h"

#include "wmc_auto.h"

lib_rend/ivas_MSPred.h

deleted100644 → 0
+0 −71
Original line number Diff line number Diff line 
/******************************************************************************************************



   (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

   contributors to this repository. All Rights Reserved.



   This software is protected by copyright law and by international treaties.

   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,

   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

   contributors to this repository retain full ownership rights in their respective contributions in

   the software. This notice grants no license of any kind, including but not limited to patent

   license, nor is any license granted by implication, estoppel or otherwise.



   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making

   contributions.



   This software is provided "AS IS", without any express or implied warranties. The software is in the

   development stage. It is intended exclusively for experts who have experience with such software and

   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability

   and fitness for a particular purpose are hereby disclaimed and excluded.



   Any dispute, controversy or claim arising under or in relation to providing this software shall be

   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in

   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and

   the United Nations Convention on Contracts on the International Sales of Goods.



*******************************************************************************************************/



#ifndef _IVAS_MS_PRED_H_

#define _IVAS_MS_PRED_H_



#include <stdint.h>



int32_t quantPhase( float phase );



void cplxmult( float *pr1, float *pi1, float r2, float i2 );



void rot_pm_pi( float *pr, float *pi );



void rot_p_pi_2( float *pr, float *pi );



void rot_m_pi_2( float *pr, float *pi );



int32_t requantPhase( int32_t phaseQ );



int32_t quantPred( const float pred );



float dequantPhase( const int32_t phaseQ );



float dequantPred( int32_t predQ );



int32_t PrepEncode( int32_t *piQuant, const int32_t *piMSFlags, const int32_t numBands );



void EncodePhase( int32_t *phaseQuant, const int32_t numMSBands, const int32_t diffDim );



void DecodePhase( int32_t *phaseQuant, const int32_t numMSBands, const int32_t diffDim );



int32_t EncodePredCoef( int32_t *predQuant, const int32_t numMSBands );



void DecodePredCoef( int32_t *phaseQuant, const int32_t numMSBands );



void writeMSPred( int32_t *phaseQuant, int32_t *predQuant, const int32_t MSMode, const int32_t numMSBands, int32_t numBands, void *fid, int32_t *piMsFlags );



int32_t CountMSBits( int32_t iNumBands, const int32_t iMSMode, const int32_t *piMSFlags, const int32_t *piLRPhaseDiff, const int32_t *piMSPredCoef );





#endif /* _MS_PRED_H_ */