Commit ba6886f6 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

clean up defines

parent ee45861c

lib_com/ivas_ism_com.c

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ void ivas_ism_reset_metadata( 
    hIsmMeta->ism_metadata_flag = 0;

    hIsmMeta->non_diegetic_flag = 0;



#ifdef OBJ_EDITING_DECODER

#ifdef OBJ_EDITING_API

    hIsmMeta->edited_gain = 1.0f;

    hIsmMeta->edited_azimuth = 0.0f;

    hIsmMeta->edited_elevation = 0.0f;

lib_com/ivas_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -1024,7 +1024,7 @@ ivas_error ivas_ism_metadata_dec( 
    DEC_CORE_HANDLE st0                                         /* i  : core-coder handle                           */

);



#ifdef OBJ_EDITING_DECODER

#ifdef OBJ_EDITING_API

void ivas_ism_renderer_update_md(

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

);

lib_com/ivas_stat_com.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ typedef struct 
    float yaw;       /* yaw value read from the input metadata file */

    float pitch;     /* pitch value read from the input metadata file */



#ifdef OBJ_EDITING_DECODER

#ifdef OBJ_EDITING_API

    float edited_azimuth;

    float edited_elevation;

    float edited_radius;

lib_com/options.h

+2 −4
Original line number Diff line number Diff line
@@ -157,9 +157,7 @@ 
#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 */

#define OBJ_EDITING_PARAMISM                            /* obj editing for ParamISM */

#endif



/* ################### Start BE switches ################################# */

lib_dec/ivas_dirac_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -2256,7 +2256,7 @@ 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

#ifdef OBJ_EDITING_API

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

#endif

                        }