Commit 69feaf6a authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Port float MR 1822 to BASOP.

parent e51b4fce

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ 
#define FIX_1388_MSAN_ivas_init_decoder                 /* VA: issue 1388: fix use-of-uninitialized value in ivas_init_decoder() */

#define FIX_1288_SPLIT_REND_XSAN                        /* Dlb: Fix asan, msan and usan issues in split rendering mode*/

#define LIB_DEC_REVISION                                /* VA: cleaning and simplification of lib_dec.c */

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



// object-editing feature porting

#define OBJ_EDITING_INTERFACE                           /* Interface for object editing */

lib_dec/ivas_omasa_dec_fx.c

+19 −0
Original line number Diff line number Diff line
@@ -762,6 +762,25 @@ 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 */

        {

            MASA_ISM_DATA_HANDLE hMasaIsmData = st_ivas->hMasaIsmData;

            FOR( Word16 obj_idx = 0; obj_idx < MAX_NUM_OBJECTS; obj_idx++ )

            {

                set_s( hMasaIsmData->azimuth_ism_fx[obj_idx], 0, MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR );

                set_s( hMasaIsmData->elevation_ism_fx[obj_idx], 0, MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR );

                FOR( int16_t sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR; sf++ )

                {

                    set_l( hMasaIsmData->energy_ratio_ism_fx[obj_idx][sf], 0, CLDFB_NO_CHANNELS_MAX );

                }

            }

            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 ) )

        {

            IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) )