Commit c815d52d authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept OMASA_OBJECT_EDITING

parent d9d2d0eb

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -1257,11 +1257,9 @@ enum 
#define NBITS_HR_COH                            4

#define OMASA_TDREND_MATCHING_GAIN_FX 26026

//TODO: insert proper Q representations

#ifdef OMASA_OBJECT_EDITING

#define OMASA_GAIN_EDIT_THR_FX                  246                         /* OMASA gain change threshold, 0.06f in Q12 */

#define OMASA_AZI_EDIT_THR_FX                   ONE_IN_Q22                  /* OMASA-DISC azimuth change threshold, 1.0f in Q22 */

#define OMASA_ELE_EDIT_THR_FX                   ONE_IN_Q23                  /* OMASA-DISC elevation change threshold, 2.0f in Q22 */

#endif



#define MASA_INV_ANGLE_AT_EQUATOR_DEG_Q30       1453366656l                 /* 1.353553128183453f in Q30 */

lib_com/ivas_prot_fx.h

+0 −4
Original line number Diff line number Diff line
@@ -3951,11 +3951,7 @@ void ivas_set_ism_importance_interformat_fx( 
    const Word16 lp_noise_CPE_fx,                               /* i  : LP filtered total noise estimation          */

    Word16 ism_imp[]                                            /* o  : ISM importance flags                        */

);

#ifdef OMASA_OBJECT_EDITING

void ivas_omasa_preProcessStereoTransportsForEditedObjects_fx(

#else

void ivas_omasa_preProcessStereoTransportsForMovedObjects_fx(

#endif

    Decoder_Struct *st_ivas,

    Word32 inRe_fx[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /*cldfb_buf_q*/

    Word32 inIm_fx[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /*cldfb_buf_q*/

lib_com/options.h

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

#ifdef OMASA_OBJECT_EDITING

#define NONBE_1399_1400_FIX_OBJ_EDIT_ISSUES             // Nokia:  Fix 1399_1400 issue in float, this is essential for the BASOP porting

#endif

#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 OBJ_EDIT_BASOP

lib_dec/ivas_dirac_dec_fx.c

+0 −12
Original line number Diff line number Diff line
@@ -2807,7 +2807,6 @@ void ivas_dirac_dec_render_sf_fx( 
            move16();

        }



#ifdef OMASA_OBJECT_EDITING

        IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) )

        {

#ifdef FIX_1319_STACK_SBA_DECODER
@@ -2816,17 +2815,6 @@ void ivas_dirac_dec_render_sf_fx( 
            ivas_omasa_preProcessStereoTransportsForEditedObjects_fx( st_ivas, Cldfb_RealBuffer_Temp_fx, Cldfb_ImagBuffer_Temp_fx, &cldfb_buf_q, hSpatParamRendCom->num_freq_bands, subframe_idx );

#endif

        }

#else

        test();

        IF( ( NE_16( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) && NE_16( st_ivas->ism_mode, ISM_MASA_MODE_MASA_ONE_OBJ ) ) )

        {

#ifdef FIX_1319_STACK_SBA_DECODER

            ivas_omasa_preProcessStereoTransportsForMovedObjects_fx( st_ivas, Cldfb_RealBuffer_Binaural_fx[0], Cldfb_ImagBuffer_Binaural_fx[0], &cldfb_buf_q, hSpatParamRendCom->num_freq_bands, subframe_idx );

#else

            ivas_omasa_preProcessStereoTransportsForMovedObjects_fx( st_ivas, Cldfb_RealBuffer_Temp_fx, Cldfb_ImagBuffer_Temp_fx, &cldfb_buf_q, 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_fx.c

+0 −14
Original line number Diff line number Diff line
@@ -2161,24 +2161,10 @@ ivas_error ivas_init_decoder_fx( 


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



#ifndef OMASA_OBJECT_EDITING

            IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )

            {

#endif

                IF( ( error = ivas_ism_metadata_dec_create_fx( st_ivas, st_ivas->nchan_ism, NULL ) ) != IVAS_ERR_OK )

                {

                    return error;

                }

#ifndef OMASA_OBJECT_EDITING

            }

            else

            {

                IF( NE_32( ( error = ivas_ism_metadata_dec_create_fx( st_ivas, 1, NULL ) ), IVAS_ERR_OK ) )

                {

                    return error;

                }

            }

#endif

        }

        ELSE IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) )

        {