Commit 16cd4860 authored by fotopoulou's avatar fotopoulou
Browse files

Revert "remove OBJ_EDITING_INTERFACE, OBJ_EDITING_PARAMISM_BIN, and OMASA_OBJECT_EDITING" 

This reverts commit 3b704fc8.
parent 68b69125

apps/decoder.c

+3 −0
Original line number Diff line number Diff line
@@ -1900,6 +1900,9 @@ static void usage_dec( void ) 
    fprintf( stdout, "                      Currently, all values default to level 3 (full functionality).\n" );

    fprintf( stdout, "-q                  : Quiet mode, no frame counter\n" );

    fprintf( stdout, "                      default is deactivated\n" );

#ifdef OMASA_OBJECT_EDITING

    fprintf( stdout, "-obj_edit           : enable object editing\n" );

#endif

#ifdef DEBUG_MODE_INFO

#ifdef DEBUG_MODE_INFO_TWEAK

    fprintf( stdout, "-info <folder>      : specify subfolder name for debug output\n" );

lib_com/ivas_cnst.h

+5 −0
Original line number Diff line number Diff line
@@ -1218,6 +1218,11 @@ enum 
#define MASA_MAXIMUM_TWO_DIR_BANDS              24

#define NBITS_HR_COH                            4

#define OMASA_TDREND_MATCHING_GAIN              0.7943f

 #ifdef OMASA_OBJECT_EDITING

#define OMASA_GAIN_EDIT_THR                     0.06f                       /* OMASA gain change threshold */

#define OMASA_AZI_EDIT_THR                      1.0f                        /* OMASA-DISC azimuth change threshold */

#define OMASA_ELE_EDIT_THR                      2.0f                        /* OMASA-DISC elevation change threshold */

#endif



#define MASA_JBM_RINGBUFFER_FRAMES              3

lib_com/ivas_prot.h

+4 −0
Original line number Diff line number Diff line
@@ -5862,7 +5862,11 @@ void ivas_omasa_dirac_rend_jbm( 
    float *output_f[]                                           /* o  : rendered time signal                    */

);



#ifdef OMASA_OBJECT_EDITING

void ivas_omasa_preProcessStereoTransportsForEditedObjects(

#else

void ivas_omasa_preProcessStereoTransportsForMovedObjects(

#endif

    Decoder_Struct *st_ivas,

    float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX],

    float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX],

lib_com/options.h

+7 −3
Original line number Diff line number Diff line
@@ -204,7 +204,9 @@ 
#define FIX_1385_INIT_IGF_STOP_FREQ                     /* FhG: Initialize infoIGFStopFreq in init_igf_dec() */

#define FIX_1387_INIT_PRM_SQQ                           /* FhG: initialize pointer prm_sqQ, which might be uninitialized in case of bfi == 1 */



// object-editing feature porting

// objject-editing feature porting

#define OBJ_EDITING_INTERFACE                         /* Interface for object editing */

#ifdef OBJ_EDITING_INTERFACE

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

#ifdef OBJ_EDITING_API

#define FIX_HRTF_LOAD_API                               // solves API conflicts between HRTF and object-editing features
@@ -212,7 +214,9 @@ 
#define TMP_FIX_OMASA_SR_BE                             // temporary fix to keep OMASA split-rendering BE

#endif

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



#endif

#define OMASA_OBJECT_EDITING                           /* Nokia: object editing interface for OMASA */

#define OBJ_EDITING_PARAMISM_BIN                       /* Nokia: object editing for ParamISM to binaural */



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_dirac_dec.c

+11 −0
Original line number Diff line number Diff line
@@ -1934,6 +1934,16 @@ void ivas_dirac_dec_render_sf( 
            }

        }



#ifdef OMASA_OBJECT_EDITING

        if ( st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )

        {

#ifdef FIX_1319_STACK_SBA_DECODER

            ivas_omasa_preProcessStereoTransportsForEditedObjects( st_ivas, Cldfb_RealBuffer_Binaural[0], Cldfb_ImagBuffer_Binaural[0], hSpatParamRendCom->num_freq_bands, subframe_idx );

#else

            ivas_omasa_preProcessStereoTransportsForEditedObjects( st_ivas, Cldfb_RealBuffer_Temp, Cldfb_ImagBuffer_Temp, hSpatParamRendCom->num_freq_bands, subframe_idx );

#endif

        }

#else

        if ( st_ivas->ism_mode != ISM_MASA_MODE_DISC && st_ivas->ism_mode != ISM_MASA_MODE_MASA_ONE_OBJ )

        {

#ifdef FIX_1319_STACK_SBA_DECODER
@@ -1942,6 +1952,7 @@ void ivas_dirac_dec_render_sf( 
            ivas_omasa_preProcessStereoTransportsForMovedObjects( st_ivas, Cldfb_RealBuffer_Temp, Cldfb_ImagBuffer_Temp, hSpatParamRendCom->num_freq_bands, subframe_idx );

#endif

        }

#endif

    }



    for ( slot_idx = 0; slot_idx < hSpatParamRendCom->subframe_nbslots[subframe_idx]; slot_idx++ )