Commit a7381d5d authored by vaclav's avatar vaclav
Browse files

accept ADJUST_MCT_CHANNELS_MAX and FIX_1113_CLDFB_REND_IN_ISAR

parent 60ee3d8d

lib_com/ivas_cnst.h

+0 −6
Original line number Diff line number Diff line
@@ -1289,14 +1289,8 @@ typedef enum 
#define LFE_CHANNEL                             3



#define MIN_LFE_NRG                             0.5f

#ifdef ADJUST_MCT_CHANNELS_MAX   

#define MCT_MAX_CHANNELS                        11                          /* == 7.1.4 LS channels without the LFE channel */

#define MCT_MAX_BLOCKS                          ( ( MCT_MAX_CHANNELS + 1 ) / CPE_CHANNELS )    /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/

#else

#define MCT_MAX_CHANNELS                        12

#define MCT_MAX_BLOCKS                          ( MCT_MAX_CHANNELS / CPE_CHANNELS )    /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/

#define MAX_NUM_DATA                            max( MCT_MAX_CHANNELS, 4 )

#endif



#define NBBITS_MCT_RATIO                        4

#define BITRATE_MCT_RATIO_RANGE                 ( 1 << NBBITS_MCT_RATIO )   /* Range of the coded bitrate distribution ratio */

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -162,8 +162,6 @@ 
//#define FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT          /* Orange issue 1031 : new fix point hrtf binary file format */

//#define FIX_CREND_SIMPLIFY_CODE                         /* Ora : simplify line code in crend */

#define FLOAT_FIX_POINT_HRTF_FILE_FORMAT                /* allows reading floation or fix point hrtf binary file format */

#define FIX_1113_CLDFB_REND_IN_ISAR                     /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */

#define ADJUST_MCT_CHANNELS_MAX                         /* FhG: set correct max mct channels constant*/

#define FIX_745_FIX_DATA_TYPE_CONVERSION                /* VA: issue 745: implicit data type conversion when calling IVAS_DEC_Configure() */



/* #################### End BE switches ################################## */

lib_dec/ivas_binRenderer_internal.c

+0 −4
Original line number Diff line number Diff line
@@ -1014,11 +1014,7 @@ ivas_error ivas_rend_openCldfbRend( 
        return error;

    }



#ifdef FIX_1113_CLDFB_REND_IN_ISAR

    pCldfbRend->binaural_latency_ns = (int32_t) ( pCldfbRend->hHrtfFastConv->FASTCONV_HOA3_latency_s * 1000000000.f );

#else

    pCldfbRend->binaural_latency_ns = (int32_t) ( FASTCONV_HOA3_latency_s * 1000000000.f );

#endif

    hBinRenderer->hReverb = NULL;

    hBinRenderer->hEFAPdata = NULL;

lib_dec/ivas_mct_core_dec.c

+0 −20
Original line number Diff line number Diff line
@@ -77,15 +77,11 @@ void ivas_mct_side_bits( 
    {

        for ( ch = 0; ch < CPE_CHANNELS; ch++ )

        {

#ifdef ADJUST_MCT_CHANNELS_MAX

            if ( i < MCT_MAX_CHANNELS )

            {

#endif

                sts[i] = hCPE[cpe_id]->hCoreCoder[ch];

                i++;

#ifdef ADJUST_MCT_CHANNELS_MAX

            }

#endif

        }

    }
@@ -201,30 +197,14 @@ void ivas_mct_core_dec( 
    {

        for ( ch = 0; ch < CPE_CHANNELS; ch++ )

        {

#ifdef ADJUST_MCT_CHANNELS_MAX

            if ( i < MCT_MAX_CHANNELS )

            {

#endif

                sts[i] = hCPE[cpe_id]->hCoreCoder[ch];

                i++;

#ifdef ADJUST_MCT_CHANNELS_MAX

            }

#endif

        }

            }



#ifndef ADJUST_MCT_CHANNELS_MAX

    /*seems like obsolete code*/

    for ( ch = 0, i = 0; ch < nChannels; ch++ )

    {

        if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )

        {

            continue;

        }

        i++;

    }



#endif

    bfi = sts[0]->bfi;



    for ( ch = 0; ch < nChannels; ch++ )

lib_enc/ivas_mct_core_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -265,14 +265,10 @@ void ivas_mct_core_enc( 
    {

        for ( ch = 0; ch < CPE_CHANNELS; ch++ )

        {

#ifdef ADJUST_MCT_CHANNELS_MAX

            if ( cpe_id * CPE_CHANNELS + ch < nChannels )

            {

#endif

                sts[i] = hCPE[cpe_id]->hCoreCoder[ch];

#ifdef ADJUST_MCT_CHANNELS_MAX

            }

#endif



            if ( hCPE[cpe_id]->hCoreCoder[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )

            {