Commit d4a68d40 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

rename the switch

parent 7e1d7ce3

lib_com/ivas_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -5315,7 +5315,7 @@ void ivas_mc2sba( 
    const float gain_lfe                                        /* i  : gain for LFE, 0=ignore LFE                      */

);



#ifdef CR_FIX_727_MC_PARAMUPMIX_HEADROTATION

#ifdef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION

void ivas_param_mc_mc2sba_cldfb(

    IVAS_OUTPUT_SETUP hTransSetup,                                                /* i  : transported MC Format                                       */

    float *hoa_encoder,                                                           /* i  : HOA3 encoder for the transported MC format                  */

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ 
#define CR_FIX_586_BPF_DFT_MEM                          /* FhG: issue 586: set input memory of DFT analysis of BPF signal to zero for HQ core to fix issue with PLC and bitrate switching */

#define CR_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE /* FhG: fix for cng in ISM DTX on sudden silence periods */

#define CR_FIX_698_SBA_MSAN                             /* Dlb: issue 698: Uninitialized memory read in SBA init */

#define CR_FIX_727_MC_PARAMUPMIX_HEADROTATION              /*Dlb : issue 727 : headrotation in MC paramupmix mode*/

#define NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION              /*Dlb : issue 727 : headrotation in MC paramupmix mode*/



/* ##################### End NON-BE CR switches ########################### */

lib_dec/ivas_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -989,7 +989,7 @@ ivas_error ivas_dec( 
                    }

                }

            }

#ifndef CR_FIX_727_MC_PARAMUPMIX_HEADROTATION

#ifndef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION

            if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == AUDIO_CONFIG_FOA || st_ivas->intern_config == AUDIO_CONFIG_HOA2 || st_ivas->intern_config == AUDIO_CONFIG_HOA3 ) )

            {

                ivas_mc2sba( st_ivas->hTransSetup, p_output, p_output, output_frame, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE );
@@ -998,7 +998,7 @@ ivas_error ivas_dec( 
            /* Rendering */

            if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

            {

#ifdef CR_FIX_727_MC_PARAMUPMIX_HEADROTATION

#ifdef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION

                if ( !( st_ivas->hCombinedOrientationData && st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV ) )

#else

#ifdef SPLIT_REND_WITH_HEAD_ROT

lib_dec/ivas_mc_param_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static void ivas_param_mc_dec_compute_interpolator( const uint16_t bAttackPresen 
static void param_mc_set_num_synth_bands( const int32_t output_Fs, PARAM_MC_DEC_HANDLE hParamMC );



static ivas_error param_mc_get_diff_proto_info( const float *proto_mtx, const uint16_t nchan_transport, const uint16_t nchan_out_cov, PARAM_MC_DIFF_PROTO_INFO *p_diff_proto_info );

#ifndef CR_FIX_727_MC_PARAMUPMIX_HEADROTATION

#ifndef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION

static void ivas_param_mc_mc2sba_cldfb( IVAS_OUTPUT_SETUP hTransSetup, float *hoa_encoder, const int16_t slot_idx, float Cldfb_RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], float Cldfb_ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], const int16_t nBands, const float gain_lfe );

#endif

static void ivas_param_mc_get_param_band_mapping( const int16_t n_target_bands, const int16_t *target_band_grouping, const int16_t n_source_bands, const int16_t *source_band_grouping, PARAM_MC_PARAMETER_BAND_MAPPING *parameter_band_mapping );
@@ -3040,7 +3040,7 @@ static ivas_error param_mc_get_diff_proto_info( 
    return IVAS_ERR_OK;

}



#ifndef CR_FIX_727_MC_PARAMUPMIX_HEADROTATION

#ifndef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION

/*-------------------------------------------------------------------------*

 * ivas_param_mc_mc2sba_cldfb()

 *

lib_dec/ivas_mc_paramupmix_dec.c

+10 −10
Original line number Diff line number Diff line
@@ -185,12 +185,12 @@ void ivas_mc_paramupmix_dec( 
    int16_t noparamupmix_delay;

    AUDIO_CONFIG output_config;

    int16_t subframeIdx, idx_in, index_slot, maxBand;

#ifdef CR_FIX_727_MC_PARAMUPMIX_HEADROTATION

#ifdef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION

    float Cldfb_RealBuffer_subfr[MAX_INTERN_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

    float Cldfb_ImagBuffer_subfr[MAX_INTERN_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT

#ifndef CR_FIX_727_MC_PARAMUPMIX_HEADROTATION

#ifndef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION

    float Cldfb_RealBuffer_subfr[MC_PARAMUPMIX_MAX_INPUT_CHANS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

    float Cldfb_ImagBuffer_subfr[MC_PARAMUPMIX_MAX_INPUT_CHANS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

    int16_t idx_lfe;
@@ -198,7 +198,7 @@ void ivas_mc_paramupmix_dec( 
    float Cldfb_RealBuffer_Binaural[MAX_HEAD_ROT_POSES][BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

    float Cldfb_ImagBuffer_Binaural[MAX_HEAD_ROT_POSES][BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

#else

#ifndef CR_FIX_727_MC_PARAMUPMIX_HEADROTATION

#ifndef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION

    float Cldfb_RealBuffer_subfr[3 + MC_PARAMUPMIX_MAX_TRANSPORT_CHANS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

    float Cldfb_ImagBuffer_subfr[3 + MC_PARAMUPMIX_MAX_TRANSPORT_CHANS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

#endif
@@ -319,7 +319,7 @@ void ivas_mc_paramupmix_dec( 
                    }

                    idx_in += 2;

                }

#ifdef CR_FIX_727_MC_PARAMUPMIX_HEADROTATION

#ifdef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION

                if ( st_ivas->hCombinedOrientationData && st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

                {

                    for ( slot_idx = 0; slot_idx < MAX_PARAM_SPATIAL_SUBFRAMES; slot_idx++ )
@@ -332,7 +332,7 @@ void ivas_mc_paramupmix_dec( 
                /*LFE handling for split rendering cases*/

                if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

                {

#ifndef CR_FIX_727_MC_PARAMUPMIX_HEADROTATION

#ifndef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION

                    /*LFE is already handled in ivas_param_mc_mc2sba_cldfb()*/

                    for ( idx_lfe = 0; idx_lfe < st_ivas->hIntSetup.num_lfe; idx_lfe++ )

                    {
@@ -386,7 +386,7 @@ void ivas_mc_paramupmix_dec( 
                if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

                {

                    int16_t pos_idx;

#ifndef CR_FIX_727_MC_PARAMUPMIX_HEADROTATION

#ifndef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION

                    for ( slot_idx = 0; slot_idx < JBM_CLDFB_SLOTS_IN_SUBFRAME; slot_idx++ )

                    {

                        if ( st_ivas->hIntSetup.num_lfe > 0 )
@@ -402,7 +402,7 @@ void ivas_mc_paramupmix_dec( 
                        {

                            for ( ch = 0; ch < st_ivas->hDecoderConfig->nchan_out; ch++ )

                            {

#ifndef CR_FIX_727_MC_PARAMUPMIX_HEADROTATION

#ifndef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION

                                if ( st_ivas->hIntSetup.num_lfe > 0 )

                                {

                                    v_add( Cldfb_RealBuffer_Binaural[pos_idx][ch][slot_idx],
@@ -661,7 +661,7 @@ ivas_error ivas_mc_paramupmix_dec_open( 
            assert( 0 && "Number of TC not supported for MC ParamUpmix!" );

#endif

    }

#ifdef CR_FIX_727_MC_PARAMUPMIX_HEADROTATION

#ifdef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION

    hMCParamUpmix->hoa_encoder = NULL;

#endif

    /*-----------------------------------------------------------------*
@@ -684,7 +684,7 @@ ivas_error ivas_mc_paramupmix_dec_open( 
        set_zero( hMCParamUpmix->pcm_delay[i], NS2SA( output_Fs, IVAS_FB_DEC_DELAY_NS ) );

    }



#ifdef CR_FIX_727_MC_PARAMUPMIX_HEADROTATION

#ifdef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION

    /* Head or external rotation */

    if ( ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) && ( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation ) )

    {
@@ -780,7 +780,7 @@ void ivas_mc_paramupmix_dec_close( 
            free( ( *hMCParamUpmix )->param_interpolator );

        }

    }

#ifdef CR_FIX_727_MC_PARAMUPMIX_HEADROTATION

#ifdef NONBE_FIX_727_MC_PARAMUPMIX_HEADROTATION

    if ( ( *hMCParamUpmix )->hoa_encoder != NULL )

    {

        free( ( *hMCParamUpmix )->hoa_encoder );