Commit e0a4cb89 authored by Jan Kiene's avatar Jan Kiene
Browse files

accept FIX_568_ISM_BITRATE_SWITCHING

parent 6cf3b7ff

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ 
#define FIX_137_SID_MD_BITS                             /* Dlb: Fix issue #137 , SID bitrate mismatch correction */

#define FIX_470_MASA_JBM_EXT                            /* Nokia: Issue 470, fix MASA EXT output with JBM */

#define FIX_564                                         /* Nokia: Issue 564: Fix gains in JBM path for SBA with parametric binaural renderer */

#define FIX_568_ISM_BITRATE_SWITCHING                   /* Philips: Issue 568: Bugfix for renderer re-initialization by ISM and bitrate switching */

#define FIX_565_SBA_BURST_IN_FEC                        /* VA: Issue 565: Fix noise burst during FEC, due to wrong total_brate initialization */

#define FIX_562_ISM2_64KBPS                             /* VA: issue 562: fix ISM2 at 64kbps issue */

#define FIX_559_EXTL_IGF_MISMATCH                       /* VA: issue 559: fix mismatch between st->extl and st->igf observed as crash in PlanarSBA bitrate switching */

lib_dec/ivas_ism_dec.c

+0 −16
Original line number Diff line number Diff line
@@ -171,11 +171,7 @@ static ivas_error ivas_ism_bitrate_switching( 
        /* Deallocate the ParamISM struct */

        ivas_param_ism_dec_close( &( st_ivas->hDirAC ), &( st_ivas->hSpatParamRendCom ), st_ivas->hDecoderConfig->output_config );



#ifdef FIX_568_ISM_BITRATE_SWITCHING

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL || st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL )

#endif

        {

            /* close the parametric binaural renderer */

            ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin );
@@ -214,11 +210,7 @@ static ivas_error ivas_ism_bitrate_switching( 
            }

        }



#ifdef FIX_568_ISM_BITRATE_SWITCHING

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_IR )

#else

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_IR || st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif

        {

            /* close the parametric binaural renderer */

            ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin );
@@ -246,11 +238,7 @@ static ivas_error ivas_ism_bitrate_switching( 
        {

            return error;

        }

#ifdef FIX_568_ISM_BITRATE_SWITCHING

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL || st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL )

#endif

        {

            /* open the parametric binaural renderer */

            if ( ( error = ivas_dirac_dec_binaural_copy_hrtfs( &st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )
@@ -296,11 +284,7 @@ static ivas_error ivas_ism_bitrate_switching( 
            }

        }



#ifdef FIX_568_ISM_BITRATE_SWITCHING

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_IR )

#else

        if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_IR || st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif

        {

            /* open the parametric binaural renderer */

            if ( ( error = ivas_dirac_dec_binaural_copy_hrtfs( &st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )