Commit 2f89ad8b authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_522_ISM_FIRST_SID

parent 11953429

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ 
#define FIX_560_VAD_FLAG                                /* Eri: Issue 560 - VAD flag issue for unified stereo */



#define FIX_549_DMX_GAIN                                /* FhG: issue 549: ParamISM output too quiet */

#define FIX_522_ISM_FIRST_SID                           /* VA: fix ISM decoder crash if first received frame is an SID */

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

#define ISM_FB                                          /* issue 556: change SWB to FB coding in 1ISM at 24.4 kbps */

#define FIX_558_PLC_DISCONT                             /* FhG: issue 558: fix discontinuities in DFT Stereo when switching from TCX concealment to ACELP */

lib_dec/ivas_init_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -283,7 +283,6 @@ ivas_error ivas_dec_setup( 
            }

        }



#ifdef FIX_522_ISM_FIRST_SID

        if ( st_ivas->ini_frame == 0 && st_ivas->ivas_format == ISM_FORMAT )

        {

            /* read the number of objects */
@@ -312,7 +311,6 @@ ivas_error ivas_dec_setup( 
                return error;

            }

        }

#endif

    }



    /*-------------------------------------------------------------------*

lib_dec/ivas_ism_metadata_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -606,10 +606,8 @@ ivas_error ivas_ism_metadata_dec_create( 


        st_ivas->hIsmMetaData[ch]->last_true_azimuth = 0;

        st_ivas->hIsmMetaData[ch]->last_true_elevation = 0;

#ifdef FIX_522_ISM_FIRST_SID

        st_ivas->hIsmMetaData[ch]->last_azimuth = 0;

        st_ivas->hIsmMetaData[ch]->last_elevation = 0;

#endif



        ivas_ism_reset_metadata( st_ivas->hIsmMetaData[ch] );

    }