Commit b85d2882 authored by Vidhya V P's avatar Vidhya V P
Browse files

Renamed the switch with CR_* tag

parent 4145d85d

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ 


#define FIX_718_JBM_MD_UDPATE                           /* Fhg: fix issue #718, wrong setting of the update flag in the TD obj renderer in the JBM path */

#define FIX_719_CRASH_IN_CLEANUP                        /* VA: issue 719: fix Decoder crash after call to goto to cleanup */

#define FIX_736_FOA_BR_SWITCH                           /* Dlb: fix issue 736: FOA BR switching crash at decoder*/



/* ################## End BE DEVELOPMENT switches ######################### */
@@ -180,6 +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_736_FOA_BR_SWITCH                           /* Dlb: fix issue 736: FOA BR switching crash at decoder*/



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

lib_dec/ivas_sba_dec.c

+7 −7
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ ivas_error ivas_sba_dec_reconfigure( 


    if ( hSpar != NULL )

    {

#ifdef FIX_736_FOA_BR_SWITCH

#ifdef CR_FIX_736_FOA_BR_SWITCH

        if ( ( hSpar->hPCA != NULL ) && ( ( hDecoderConfig->ivas_total_brate != PCA_BRATE ) || ( st_ivas->sba_order != 1 ) ) )

#else

        if ( ( hSpar->hPCA != NULL ) && ( ( hDecoderConfig->ivas_total_brate != PCA_BRATE ) || ( sba_order_internal != 1 ) ) )
@@ -218,7 +218,7 @@ ivas_error ivas_sba_dec_reconfigure( 
                return error;

            }

        }

#ifdef FIX_736_FOA_BR_SWITCH

#ifdef CR_FIX_736_FOA_BR_SWITCH

        if ( ( hSpar->hPCA == NULL ) &&

             ( st_ivas->hDecoderConfig->ivas_total_brate == PCA_BRATE && st_ivas->sba_order == 1 ) && ( st_ivas->ivas_format == SBA_FORMAT ) )

        {
@@ -289,13 +289,13 @@ ivas_error ivas_sba_dec_reconfigure( 
    {

        ivas_binRenderer_close( &st_ivas->hBinRenderer );

    }

#ifdef FIX_736_FOA_BR_SWITCH

#ifdef CR_FIX_736_FOA_BR_SWITCH

    if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ) ? IVAS_MAX_NUM_BANDS : ( IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ) ) ) != IVAS_ERR_OK )

    {

        return error;

    }

#endif

#ifndef FIX_736_FOA_BR_SWITCH

#ifndef CR_FIX_736_FOA_BR_SWITCH

    if ( ( ( st_ivas->renderer_type != RENDERER_DISABLE ) && ( st_ivas->renderer_type != RENDERER_SBA_LINEAR_DEC ) ) || ( ( hDecoderConfig->output_config != AUDIO_CONFIG_FOA ) && ( st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_STEREO ) && ( st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_MONO ) ) || ( last_ivas_total_brate > IVAS_256k && ivas_total_brate <= IVAS_256k ) || ( last_ivas_total_brate <= IVAS_256k && ivas_total_brate > IVAS_256k ) )

#else

    if ( ( ( st_ivas->renderer_type != RENDERER_DISABLE ) && ( st_ivas->renderer_type != RENDERER_SBA_LINEAR_DEC ) ) || ( ( hDecoderConfig->output_config != AUDIO_CONFIG_FOA ) && ( st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_STEREO ) && ( st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_MONO ) ) )
@@ -324,17 +324,17 @@ ivas_error ivas_sba_dec_reconfigure( 
            mvs2s( st_ivas->hTcBuffer->subframe_nbslots, st_ivas->hSpatParamRendCom->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );

        }

    }

#ifdef FIX_736_FOA_BR_SWITCH

#ifdef CR_FIX_736_FOA_BR_SWITCH

    else

    {

#endif

#ifndef FIX_736_FOA_BR_SWITCH

#ifndef CR_FIX_736_FOA_BR_SWITCH

        if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ) ? IVAS_MAX_NUM_BANDS : ( IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ) ) ) != IVAS_ERR_OK )

        {

            return error;

        }

#endif

#ifdef FIX_736_FOA_BR_SWITCH

#ifdef CR_FIX_736_FOA_BR_SWITCH

        int16_t band_grouping[IVAS_MAX_NUM_BANDS + 1];



        st_ivas->hSpar->enc_param_start_band = min( IVAS_MAX_NUM_BANDS, SPAR_DIRAC_SPLIT_START_BAND );