Commit 7443af46 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

fix for compilation errors when SPLIT_REND_WITH_HEAD_ROT is disabled

parent a1251147

apps/renderer.c

+5 −3
Original line number Diff line number Diff line
@@ -420,8 +420,9 @@ static int16_t getTotalNumInChannels( 
    IVAS_REND_InputId mcIds[RENDERER_MAX_MC_INPUTS],

    IVAS_REND_InputId ismIds[RENDERER_MAX_ISM_INPUTS],

    IVAS_REND_InputId sbaIds[RENDERER_MAX_SBA_INPUTS],

    IVAS_REND_InputId masaIds[RENDERER_MAX_MASA_INPUTS],

    IVAS_REND_InputId masaIds[RENDERER_MAX_MASA_INPUTS]

#ifdef SPLIT_REND_WITH_HEAD_ROT

    ,

    IVAS_REND_InputId splitBinIds[RENDERER_MAX_BIN_INPUTS]

#endif

)
@@ -1240,6 +1241,7 @@ int main( 
        outBuffer.config.numSamplesPerChannel = (int16_t) CLDFBframeSize_smpls;

    }

#else

    inBuffer.config.numSamplesPerChannel = (int16_t) frameSize_smpls;

    inFloatBuffer = malloc( inBufferSize * sizeof( float ) );

    outFloatBuffer = malloc( outBufferSize * sizeof( float ) );

    outBuffer.config.numSamplesPerChannel = (int16_t) frameSize_smpls;

lib_rend/ivas_CQMFDecoder.c

+3 −1
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ Nations Convention on Contracts on the International Sales of Goods. 
*******************************************************************************************************/



#include "ivas_CQMFDecoder.h"

#include "options.h"

#ifdef SPLIT_REND_WITH_HEAD_ROT



#include "ivas_CQMFHuff.h"

#include "ivas_NoiseGen.h"
@@ -43,7 +45,6 @@ Nations Convention on Contracts on the International Sales of Goods. 
#include "ivas_RMSEnvDeltaHuff.h"

#include "ivas_Tables.h"

#include "ivas_cldfb_codec_bitstream.h"

#include "options.h"

#include "prot.h"

#include <assert.h>

#include <math.h>
@@ -1372,3 +1373,4 @@ static void ComputeAllocation( const int32_t iChannels, 
        }

    }

}

#endif

lib_rend/ivas_CQMFDecoder.h

+5 −2
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ 
extern "C"

{

#endif



#include "options.h"

#ifdef SPLIT_REND_WITH_HEAD_ROT



#include "lib_rend.h"

#define DECODER_ERROR_NONE               ( 0 )

#define DECODER_ERROR_FS_NOT_SUPPORTED   ( -1 )
@@ -56,9 +60,8 @@ extern "C" 
                         ivas_split_rend_bits_t *pBits,

                         float ***pppfCQMFReal,

                         float ***pppfCQMFImag );



#endif

#ifdef __cplusplus

}

#endif



#endif /* _CQMF_DECODER_H_ */

lib_rend/ivas_CQMFEncoder.c

+3 −2
Original line number Diff line number Diff line
@@ -31,13 +31,13 @@ 
*******************************************************************************************************/



#include "ivas_CQMFEncoder.h"



#include "options.h"

#ifdef SPLIT_REND_WITH_HEAD_ROT

#include <stdio.h>

#include <math.h>

#include <stdlib.h>

#include <assert.h>

#include "ivas_Tables.h"

#include "options.h"

#include "prot.h"

#include "ivas_RMSEnvGrouping.h"

#include "ivas_PerceptualModel.h"
@@ -2047,3 +2047,4 @@ static int32_t ComputeAllocation( const int32_t iChannels, 


    return iBitsUsed;

}

#endif
 
 No newline at end of file

lib_rend/ivas_CQMFEncoder.h

+3 −2
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 
extern "C"

{

#endif

#include "options.h"

#ifdef SPLIT_REND_WITH_HEAD_ROT

#include "lib_rend.h"

#define ENCODER_ERROR_NONE               ( 0 )

#define ENCODER_ERROR_FS_NOT_SUPPORTED   ( -1 )
@@ -61,9 +63,8 @@ extern "C" 
        const int32_t available_bits,

        ivas_split_rend_bits_t *pBits );

    int32_t GetNumGroups( CQMFEncoder *psCQMFEncoder );



#endif

#ifdef __cplusplus

}

#endif



#endif /* _CQMF_ENCODER_H_ */