Commit e71c6f6a authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_723_SBA_BR_SWITCH_MSAN

parent 6e8ca14c

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ 
/* all switches in this category should start with "NONBE_" */





#define NONBE_FIX_723_SBA_BR_SWITCH_MSAN                      /* Dlb: issue 723: Uninitialised value used after BR switching*/

#define NONBE_FIX_729_ASAN_2ISM_ACELP                         /* VA: issue 729: fix ASAN ACELP errors with 2 ISM coding using LTV */

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

#define NONBE_FIX_694_OMASA_ACELP                             /* Nokia: Issue #694: OMASA crash in ACELP with extreme item */

lib_dec/ivas_dirac_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -1074,9 +1074,7 @@ void ivas_dirac_dec_read_BS( 
                hQMetaData->q_direction[0].band_data[orig_dirac_bands - 1].azimuth[i] = hQMetaData->q_direction[0].band_data[1].azimuth[0];

                hQMetaData->q_direction[0].band_data[orig_dirac_bands - 1].elevation[i] = hQMetaData->q_direction[0].band_data[1].elevation[0];

                hQMetaData->q_direction[0].band_data[orig_dirac_bands - 1].energy_ratio[i] = hQMetaData->q_direction[0].band_data[1].energy_ratio[0];

#ifdef NONBE_FIX_723_SBA_BR_SWITCH_MSAN

                hQMetaData->q_direction[0].band_data[orig_dirac_bands - 1].energy_ratio_index[i] = hQMetaData->q_direction[0].band_data[1].energy_ratio_index[0];

#endif

            }

            for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )

            {
@@ -1085,9 +1083,7 @@ void ivas_dirac_dec_read_BS( 
                    hQMetaData->q_direction[0].band_data[j].azimuth[i] = hQMetaData->q_direction[0].band_data[0].azimuth[0];

                    hQMetaData->q_direction[0].band_data[j].elevation[i] = hQMetaData->q_direction[0].band_data[0].elevation[0];

                    hQMetaData->q_direction[0].band_data[j].energy_ratio[i] = hQMetaData->q_direction[0].band_data[0].energy_ratio[0];

#ifdef NONBE_FIX_723_SBA_BR_SWITCH_MSAN

                    hQMetaData->q_direction[0].band_data[j].energy_ratio_index[i] = hQMetaData->q_direction[0].band_data[0].energy_ratio_index[0];

#endif

                }

            }
@@ -1146,9 +1142,7 @@ void ivas_dirac_dec_read_BS( 
            hQMetaData->q_direction[0].band_data[orig_dirac_bands - 1].azimuth[i] = hQMetaData->q_direction[0].band_data[1].azimuth[0];

            hQMetaData->q_direction[0].band_data[orig_dirac_bands - 1].elevation[i] = hQMetaData->q_direction[0].band_data[1].elevation[0];

            hQMetaData->q_direction[0].band_data[orig_dirac_bands - 1].energy_ratio[i] = hQMetaData->q_direction[0].band_data[1].energy_ratio[0];

#ifdef NONBE_FIX_723_SBA_BR_SWITCH_MSAN

            hQMetaData->q_direction[0].band_data[orig_dirac_bands - 1].energy_ratio_index[i] = hQMetaData->q_direction[0].band_data[1].energy_ratio_index[0];

#endif

        }

        for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )

        {
@@ -1157,9 +1151,7 @@ void ivas_dirac_dec_read_BS( 
                hQMetaData->q_direction[0].band_data[j].azimuth[i] = hQMetaData->q_direction[0].band_data[0].azimuth[0];

                hQMetaData->q_direction[0].band_data[j].elevation[i] = hQMetaData->q_direction[0].band_data[0].elevation[0];

                hQMetaData->q_direction[0].band_data[j].energy_ratio[i] = hQMetaData->q_direction[0].band_data[0].energy_ratio[0];

#ifdef NONBE_FIX_723_SBA_BR_SWITCH_MSAN

                hQMetaData->q_direction[0].band_data[j].energy_ratio_index[i] = hQMetaData->q_direction[0].band_data[0].energy_ratio_index[0];

#endif

            }

        }

lib_dec/ivas_spar_md_dec.c

+0 −6
Original line number Diff line number Diff line
@@ -1528,9 +1528,7 @@ static void ivas_spar_dec_parse_md_bs( 
    float quant[IVAS_SPAR_MAX_C_COEFF];

    int16_t do_repeat[IVAS_MAX_NUM_BANDS];

    int16_t bw_final, bw_fact;

#ifdef NONBE_FIX_723_SBA_BR_SWITCH_MSAN

    int32_t active_brate;

#endif

    *dtx_vad = 1;

    *bands_bw = 1;

    qsi = 0;
@@ -1602,13 +1600,9 @@ static void ivas_spar_dec_parse_md_bs( 


        ivas_parse_parameter_bitstream_dtx( &hMdDec->spar_md, st0, *bands_bw, *nB, hMdDec->spar_md_cfg.num_dmx_chans_per_band, hMdDec->spar_md_cfg.num_decorr_per_band );



#ifdef NONBE_FIX_723_SBA_BR_SWITCH_MSAN

        active_brate = ( ivas_total_brate > IVAS_SID_5k2 ) ? ivas_total_brate : last_active_brate;



        if ( active_brate >= IVAS_24k4 )

#else

        if ( last_active_brate >= IVAS_24k4 )

#endif

        {

            bw_final = 1;

        }