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

Added a fix for an error while testing : set 1

parent 8d2db8e9

lib_dec/ivas_sba_dec.c

+9 −10
Original line number Diff line number Diff line
@@ -792,6 +792,7 @@ ivas_error ivas_sba_dec_reconfigure( 


            hDirAC = st_ivas->hDirAC;

        }



#ifndef SBA_BR_SWITCHING_RECONFIG

        if ( hDirAC != NULL )

#else
@@ -909,21 +910,19 @@ ivas_error ivas_sba_dec_reconfigure( 
            return error;

        }

    }

    if ( ( ( hDecoderConfig->output_config == AUDIO_CONFIG_FOA ) || ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) || ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO ) )  && ( ( sba_mode_old != st_ivas->sba_mode ) && ( st_ivas->sba_mode == SBA_MODE_SPAR ) ) )

    if ( st_ivas->sba_mode == SBA_MODE_SPAR )

    {

       /* if ( st_ivas->hDirAC != NULL && st_ivas->sba_mode == SBA_MODE_SPAR )

        if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, st_ivas->sba_mode, IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ) ) != IVAS_ERR_OK )

        {

            return error;

        }

    }

    if ( ( ( hDecoderConfig->output_config == AUDIO_CONFIG_FOA ) || ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) || ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO ) )  && ( ( sba_mode_old != st_ivas->sba_mode ) && ( st_ivas->sba_mode == SBA_MODE_SPAR ) ) )

    {

            mvs2s( st_ivas->hDirAC->dirac_to_spar_md_bands, st_ivas->hSpar->dirac_to_spar_md_bands, DIRAC_MAX_NBANDS );

            st_ivas->hSpar->enc_param_start_band = st_ivas->hDirAC->hConfig->enc_param_start_band;

        }*/

        if ( st_ivas->hDirAC != NULL )

        {

            ivas_dirac_dec_close( st_ivas->hDirAC );

            st_ivas->hDirAC = NULL;

        }

         if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, st_ivas->sba_mode, IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ) ) != IVAS_ERR_OK )

        {

            return error;

        }

        int16_t band_grouping[IVAS_MAX_NUM_BANDS + 1];