Commit 46d0e20c authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT

parent 6b36c7e6

lib_com/ivas_prot_fx.h

+0 −2
Original line number Diff line number Diff line
@@ -178,14 +178,12 @@ void ivas_omasa_render_objects_from_mix_fx( 
    Word16 *output_q                                            /* i/o: output Q value                          */

);



#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT

void ivas_omasa_gain_masa_tc_fx(

    Word32 *output_fx[],                                       /* i/o: output synthesis signal                  */

    const Word16 gainMasa_fx,                                  /* i  : gain for MASA transport channels         */

    const Word16 nchan_transport_ism,                          /* i  : number of ISM TCs                        */

    const Word16 output_frame                                  /* i  : output frame length per channel          */

);

#endif



ivas_error ivas_omasa_ism_metadata_dec_fx(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ 
#define OBJ_EDIT_BASOP

#define FIX_1372_OSBA_OBJECT_EDITING                    /* VA: issue 1372: Fix OSBA object-editing in BINAURAL_ROOM_IR */

#define FIX_2140_OBJECT_EDITING_SANITIZER_ISSUES        /* Nokia: Issue 2140, fixes three different sanitizer issues persisting in object editing code. */

#define NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT               /* Nokia: issue 1305: Fix OMASA ext output in case of object editing */

#define NONBE_FIX_1172_OBJ_EDIT_JBM                     /* VA: issue 1172: fix OMASA object editing in JBM */



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

lib_dec/ivas_jbm_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -4379,7 +4379,6 @@ void ivas_dec_prepare_renderer_fx( 
        {

            ivas_jbm_masa_sf_to_slot_map( st_ivas, n_render_timeslots );

        }

#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT

        /* MASA transport gaining for edited disc OMASA EXT. For ISMs, only metadata is modified */

        test();

        test();
@@ -4388,7 +4387,6 @@ void ivas_dec_prepare_renderer_fx( 
        {

            ivas_omasa_gain_masa_tc_fx( st_ivas->hTcBuffer->tc_fx, st_ivas->hMasaIsmData->gain_masa_edited_fx, st_ivas->nchan_ism, st_ivas->hTcBuffer->n_samples_available );

        }

#endif

    }

    ELSE IF( EQ_16( st_ivas->ivas_format, STEREO_FORMAT ) )

    {
@@ -4512,7 +4510,6 @@ void ivas_dec_prepare_renderer_fx( 
            {

                ivas_jbm_masa_sf_to_slot_map( st_ivas, n_render_timeslots );

            }

#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT

            /* MASA transport gaining for edited param_one OMASA EXT. For ISMs, only metadata is modified.  */

            test();

            IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) && EQ_16( st_ivas->hMasaIsmData->masa_gain_is_edited, 1 ) )
@@ -4523,7 +4520,6 @@ void ivas_dec_prepare_renderer_fx( 
                    Scale_sig32( st_ivas->hTcBuffer->tc_fx[n], st_ivas->hTcBuffer->n_samples_available, Q3 );                                                                         // Q8 -> Q11

                }

            }

#endif

        }

        ELSE

        {

lib_dec/ivas_objectRenderer_internal_fx.c

+0 −9
Original line number Diff line number Diff line
@@ -208,12 +208,8 @@ ivas_error ivas_td_binaural_renderer_sf_fx( 
        IF( EQ_16( subframe_idx, ism_md_subframe_update_jbm ) )

        {

            test();

#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT

            test();

            IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) || EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) || EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) )

#else

            IF( EQ_16( st_ivas->ivas_format, ISM_FORMAT ) || EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) )

#endif

            {

                ISM_METADATA_FRAME ismMetaData[MAX_NUM_OBJECTS];

                ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS];
@@ -231,7 +227,6 @@ ivas_error ivas_td_binaural_renderer_sf_fx( 
                    move32();

                    ismMetaData[nS].non_diegetic_flag = st_ivas->hIsmMetaData[nS]->non_diegetic_flag;

                    move16();

#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT

                    IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) )

                    {

                        /* DISC OMASA ISM gaining with TDREND is done in ivas_dec_prepare_renderer()*/
@@ -243,10 +238,6 @@ ivas_error ivas_td_binaural_renderer_sf_fx( 
                        ismMetaData[nS].gain_fx = st_ivas->hIsmMetaData[nS]->edited_gain_fx;

                        move32();

                    }

#else

                    ismMetaData[nS].gain_fx = st_ivas->hIsmMetaData[nS]->edited_gain_fx;

                    move32();

#endif

                    hIsmMetaData[nS] = &ismMetaData[nS];

                }

lib_dec/ivas_omasa_dec_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -2159,7 +2159,6 @@ void ivas_omasa_render_objects_from_mix_fx( 
    return;

}



#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT

/*--------------------------------------------------------------------------*

 * ivas_omasa_gain_masa_tc_fx()

 *
@@ -2183,4 +2182,3 @@ void ivas_omasa_gain_masa_tc_fx( 


    return;

}
 
#endif