Commit 2201a455 authored by advasila's avatar advasila
Browse files

removing obsolete code

parent 5f7d8124

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ 
#define FIX_625_IDX_OOB                                 /* FhG: Fix index out-of-bounds UBSAN error (issue 625) */



#define MASA_AND_OBJECTS                                /* Nokia: Combination of MASA and objects */



#define FIX_657_REMOVE_EDITING                          /* Nokia: Remove remaining unused coded related to object editing */





/* ################## End BE DEVELOPMENT switches ######################### */

lib_dec/ivas_dec.c

+2 −1
Original line number Diff line number Diff line
@@ -567,9 +567,10 @@ ivas_error ivas_dec( 
            hp20( output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs );

        }



 #ifndef FIX_657_REMOVE_EDITING

        /* Set edited object positions, if editing enabled */

        ivas_omasa_set_edited_objects( st_ivas );



#endif

        /* Rendering */

        if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC )

        {

lib_dec/ivas_masa_dec.c

+2 −1
Original line number Diff line number Diff line
@@ -2434,7 +2434,7 @@ static int16_t ivas_decode_masaism_metadata( 
    return ( nb_bits_read - *next_bit_pos );

}





#ifndef FIX_657_REMOVE_EDITING

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

 * ivas_omasa_set_edited_objects()

 *
@@ -2501,3 +2501,4 @@ void ivas_omasa_set_edited_objects( 
    return;

}

#endif

#endif

lib_dec/ivas_omasa_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ ivas_error ivas_omasa_data_open( 
    {

        hMasaIsmData->q_elevation_old[ch] = 0.0f;

        hMasaIsmData->q_azimuth_old[ch] = 0.0f;

#ifdef FIX_657_REMOVE_EDITING      

        hMasaIsmData->ism_is_edited[ch] = 0;    

#endif

    }



    for ( obj_idx = 0; obj_idx < MAX_NUM_OBJECTS; obj_idx++ )

lib_dec/ivas_stat_dec.h

+2 −1
Original line number Diff line number Diff line
@@ -1059,11 +1059,12 @@ typedef struct Decoder_Struct 
    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;      /* Spatial parametric (DirAC rend, ParamBin, ParamISM) rendering common data handle. */

#ifdef MASA_AND_OBJECTS

    MASA_ISM_DATA_HANDLE hMasaIsmData;                         /* MASA_ISM rendering structure */

#ifndef FIX_657_REMOVE_EDITING

    uint8_t editing_ism_enabled;                               /* Todo Nokia: Temporary, used until proper ISM control available */

    int16_t index_of_edited_ism;                               /* Todo Nokia: Temporary, used until proper ISM control available */

    int16_t azimuth_edited;                                    /* Todo Nokia: Temporary, used until proper ISM control available */

    int16_t elevation_edited;                                  /* Todo Nokia: Temporary, used until proper ISM control available */



#endif

    int16_t flag_omasa_brate;

#endif