Commit 407125cd authored by bayers's avatar bayers
Browse files

strip out all changes not directly related to the object editing API

parent ea37c883

lib_com/ivas_ism_com.c

+0 −3
Original line number Diff line number Diff line
@@ -417,9 +417,6 @@ void ivas_ism_reset_metadata( 
    hIsmMeta->radius = 1.0f;

    hIsmMeta->ism_metadata_flag = 0;

    hIsmMeta->non_diegetic_flag = 0;

#ifdef OBJ_EDITING_DECODER

    hIsmMeta->gain = 1.0f;

#endif



    return;

}

lib_com/ivas_prot.h

+0 −5
Original line number Diff line number Diff line
@@ -1038,11 +1038,6 @@ ivas_error ivas_ism_metadata_dec( 
    DEC_CORE_HANDLE st0                                         /* i  : core-coder handle                           */

);



#ifdef OBJ_EDITING_DECODER

void ivas_ism_renderer_update_md(

	Decoder_Struct *st_ivas                                     /* i/o:  main IVAS decoder handle                   */

);

#endif



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

 * Parametric ISM prototypes

lib_com/ivas_stat_com.h

+0 −3
Original line number Diff line number Diff line
@@ -87,9 +87,6 @@ typedef struct 
    float q_azimuth_old;

    float q_elevation_old;



#ifdef OBJ_EDITING_DECODER

    float gain;

#endif



} ISM_METADATA_FRAME, *ISM_METADATA_HANDLE;

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ 
#define OBJ_EDITING_INTERFACE                           /* Interface for object editing */

#ifdef OBJ_EDITING_INTERFACE

#define OBJ_EDITING_API                                 /* object editing changes related to the API */

#define OBJ_EDITING_DECODER                             /* object editing changes realted to the decoder functions */

#define OBJ_EDITING_EXAMPLE                             /* obj editing example code in decoder.c */

#endif

lib_dec/ivas_dirac_dec.c

+0 −3
Original line number Diff line number Diff line
@@ -2286,9 +2286,6 @@ void ivas_dirac_dec_render_sf( 
                        if ( st_ivas->hEFAPdata != NULL )

                        {

                            efap_determine_gains( st_ivas->hEFAPdata, st_ivas->hIsmRendererData->gains[i], az1, el1, EFAP_MODE_EFAP );

#ifdef OBJ_EDITING_DECODER

                            v_multc( st_ivas->hIsmRendererData->gains[i], st_ivas->hIsmRendererData->edited_gains[i], st_ivas->hIsmRendererData->gains[i], nchan_out_woLFE );

#endif

                        }

                    }