Commit 38728f90 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Implements OMASA object editing (previously implemented in branch... 

Implements OMASA object editing (previously implemented in branch nokia/object-editing-interface). Changes to use non-callback API (compared to previous branch). Adds support for object editing in ParamISM to binaural rendering.
parent 0c9efe1a

apps/decoder.c

+3 −0
Original line number Diff line number Diff line
@@ -1769,6 +1769,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
@@ -1215,6 +1215,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
@@ -5797,7 +5797,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/ivas_stat_com.h

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



#ifdef OBJ_EDITING_API



    float gain;



    float edited_azimuth;

lib_com/options.h

+4 −0
Original line number Diff line number Diff line
@@ -160,6 +160,10 @@ 
#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 */





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

/* only BE switches wrt selection floating point code */