Commit 64375ab2 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_FIX_1197_OMASA_META_BUFFER

parent 94c702e6

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ 
#define FIX_NCHAN_BUFFERS                               /* VA: issue 1322: Correct the number of float buffers (channels) at the decoder */

#define FIX_RENDERER_STACK                              /* VA: issue 1322: reduction of renderers' buffers size */

#define FIX_1370_EXTERNAL_ORIENTATION_CHECK             /* Nokia: add sanity check for Euler angles for external orientations */

#define NONBE_FIX_1197_OMASA_META_BUFFER                /* Nokia: OMASA ISM_MASA_MODE_PARAM_ONE_OBJ history zero in rateswitching - port 251 */

#define FIX_1413_IGF_INIT_PRINTOUT                      /* FhG: use correct variable for IGF initiliazation */



// object-editing feature porting

lib_dec/ivas_omasa_dec_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -662,7 +662,6 @@ ivas_error ivas_omasa_dec_config_fx( 
            ivas_omasa_separate_object_renderer_close( st_ivas );

        }



#ifdef NONBE_FIX_1197_OMASA_META_BUFFER

        test();

        IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) && st_ivas->hMasaIsmData != NULL ) /* this structure is in use only in ISM_MASA_MODE_PARAM_ONE_OBJ */

        {
@@ -679,7 +678,6 @@ ivas_error ivas_omasa_dec_config_fx( 
            set_s( hMasaIsmData->azimuth_separated_ism_fx, 0, MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR );

            set_s( hMasaIsmData->elevation_separated_ism_fx, 0, MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR );

        }

#endif



        IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) )

        {