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

Fix issue#736: FOA BR switchig decoding crashes in ivas_spar_to_dirac

parent 17a3401a

lib_com/options.h

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


#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 ######################### */

lib_dec/ivas_sba_dec.c

+4 −1
Original line number Diff line number Diff line
@@ -273,8 +273,11 @@ ivas_error ivas_sba_dec_reconfigure( 
    {

        ivas_binRenderer_close( &st_ivas->hBinRenderer );

    }



#ifndef 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 ) ) ) && ( ( last_ivas_total_brate > IVAS_256k && ivas_total_brate <= IVAS_256k ) || ( last_ivas_total_brate <= IVAS_256k && ivas_total_brate > IVAS_256k ) ) )

#endif

    {

        DIRAC_CONFIG_FLAG flag_config;