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

[cleanup] accept NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT

parent 968fd04e

lib_com/ivas_prot.h

+0 −2
Original line number Diff line number Diff line
@@ -5800,14 +5800,12 @@ void ivas_omasa_render_objects_from_mix( 
    const int16_t output_frame                                  /* i  : output frame length per channel        */

);



#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT

void ivas_omasa_gain_masa_tc(

    float *output[],                                            /* i/o  : output synthesis signal                 */

    const float gainMasa,                                       /* i  : gain for MASA transport channels        */

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

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

);

#endif



void ivas_omasa_dirac_rend_jbm(

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

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -195,7 +195,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 FIX_1372_OSBA_OBJECT_EDITING                    /* VA: issue 1372: Fix OSBA object-editing in BINAURAL_ROOM_IR */

#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.c

+0 −4
Original line number Diff line number Diff line
@@ -3038,13 +3038,11 @@ void ivas_dec_prepare_renderer( 
        {

            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 */

        if ( st_ivas->ivas_format == MASA_ISM_FORMAT && st_ivas->ism_mode == ISM_MASA_MODE_DISC && st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL && st_ivas->hMasaIsmData->masa_gain_is_edited == 1 )

        {

            ivas_omasa_gain_masa_tc( st_ivas->hTcBuffer->tc, st_ivas->hMasaIsmData->gain_masa_edited, st_ivas->nchan_ism, st_ivas->hTcBuffer->n_samples_available );

        }

#endif

    }

    else if ( st_ivas->ivas_format == STEREO_FORMAT )

    {
@@ -3120,7 +3118,6 @@ void ivas_dec_prepare_renderer( 
            {

                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.  */

            if ( st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ && st_ivas->hMasaIsmData->masa_gain_is_edited == 1 )

            {
@@ -3129,7 +3126,6 @@ void ivas_dec_prepare_renderer( 
                    v_multc( st_ivas->hTcBuffer->tc[n], st_ivas->hMasaIsmData->gain_masa_edited, st_ivas->hTcBuffer->tc[n], st_ivas->hTcBuffer->n_samples_available );

                }

            }

#endif

        }

        else

        {

lib_dec/ivas_objectRenderer_internal.c

+0 −8
Original line number Diff line number Diff line
@@ -178,11 +178,7 @@ ivas_error ivas_td_binaural_renderer_sf( 
        }

        if ( subframe_idx == ism_md_subframe_update_jbm )

        {

#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT

            if ( st_ivas->ivas_format == ISM_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT )

#else

            if ( st_ivas->ivas_format == ISM_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT )

#endif

            {

                ISM_METADATA_FRAME ismMetaData[MAX_NUM_OBJECTS];

                ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS];
@@ -194,7 +190,6 @@ ivas_error ivas_td_binaural_renderer_sf( 
                    ismMetaData[nS].yaw = st_ivas->hIsmMetaData[nS]->edited_yaw;

                    ismMetaData[nS].pitch = st_ivas->hIsmMetaData[nS]->edited_pitch;

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

#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT

                    if ( st_ivas->ivas_format == MASA_ISM_FORMAT )

                    {

                        /* DISC OMASA ISM gaining with TDREND is done in ivas_dec_prepare_renderer()*/
@@ -204,9 +199,6 @@ ivas_error ivas_td_binaural_renderer_sf( 
                    {

                        ismMetaData[nS].gain = st_ivas->hIsmMetaData[nS]->edited_gain;

                    }

#else

                    ismMetaData[nS].gain = st_ivas->hIsmMetaData[nS]->edited_gain;

#endif

                    hIsmMetaData[nS] = &ismMetaData[nS];

                }

lib_dec/ivas_omasa_dec.c

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

}



#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT

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

 * ivas_omasa_gain_masa_tc()

 *
@@ -1341,4 +1340,3 @@ void ivas_omasa_gain_masa_tc( 


    return;

}
 
#endif