Commit 4dece29f authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept OMASA_OBJECT_EDITING

parent 695e2ab0

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -1221,11 +1221,9 @@ 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

+0 −4
Original line number Diff line number Diff line
@@ -5818,11 +5818,7 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -202,7 +202,6 @@ 
#define TMP_FIX_SPLIT_REND                              // temporary fix to split-rendering (it follows the later state of the framework but it is needed now because of current test-conditions)

#define TMP_FIX_OMASA_SR_BE                             // temporary fix to keep OMASA split-rendering BE

#define OBJ_EDITING_COMMANDLINE                         /* obj editing command-line option */

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

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

#define FIX_BRATE_SWITCHING                             /* VA: fix bitrate switching cases in OMASA and OSBA */

#define NONBE_1217_INIT_OBJ_EDIT                        /* VA: issue 1217: do object editing only when objects metadata is available */

lib_dec/ivas_dirac_dec.c

+0 −11
Original line number Diff line number Diff line
@@ -1934,7 +1934,6 @@ 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
@@ -1943,16 +1942,6 @@ void ivas_dirac_dec_render_sf( 
            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

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

#else

            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++ )

lib_dec/ivas_init_dec.c

+0 −14
Original line number Diff line number Diff line
@@ -1799,24 +1799,10 @@ ivas_error ivas_init_decoder( 


            reset_indices_dec( st_ivas->hSCE[0]->hCoreCoder[0] );



#ifndef OMASA_OBJECT_EDITING

            if ( output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

            {

#endif

                if ( ( error = ivas_ism_metadata_dec_create( st_ivas, st_ivas->nchan_ism, NULL ) ) != IVAS_ERR_OK )

                {

                    return error;

                }

#ifndef OMASA_OBJECT_EDITING

            }

            else

            {

                if ( ( error = ivas_ism_metadata_dec_create( st_ivas, 1, NULL ) ) != IVAS_ERR_OK )

                {

                    return error;

                }

            }

#endif

        }

        else if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )

        {