Commit 7e946ced authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch '2156_ref_port_mr2076_omasa_ext_incorrect_output_object_editing'... 

Merge branch '2156_ref_port_mr2076_omasa_ext_incorrect_output_object_editing' into 'ivas-float-update'

[non-BE] Port 326 and 340 - Float MR 2076 and 2135 to ivas-float-update - OMASA EXT and JBM object editing fixes

See merge request !2453
parents 4fe53b30 cdf05f91

lib_com/ivas_prot.h

+9 −0
Original line number Diff line number Diff line
@@ -5811,6 +5811,15 @@ 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                     */

    const uint16_t nSamplesAsked,                               /* i  : number of samples requested             */

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -204,6 +204,8 @@ 
#define NONBE_1217_OBJ_EDIT_FOA                         /* VA/Nokia: isse 1217: fix crash in object editing to FOA output in ParamISM */

#define NONBE_FIX_1255_OBJ_EDIT_JBM                     /* VA: issue 1255: restore object editing in JBM */

#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

+17 −0
Original line number Diff line number Diff line
@@ -3079,6 +3079,13 @@ 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 )

    {
@@ -3154,6 +3161,16 @@ 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 )

            {

                for ( n = 0; n < CPE_CHANNELS; n++ )

                {

                    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

+16 −0
Original line number Diff line number Diff line
@@ -184,7 +184,11 @@ 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];
@@ -196,7 +200,19 @@ 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()*/

                        ismMetaData[nS].gain = 1;

                    }

                    else

                    {

                        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

+25 −0
Original line number Diff line number Diff line
@@ -1317,3 +1317,28 @@ void ivas_omasa_render_objects_from_mix( 


    return;

}



#ifdef NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT

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

 * ivas_omasa_gain_masa_tc()

 *

 * in case of external rendering with object editing, MASA transport channels

 * need to be gained

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



void ivas_omasa_gain_masa_tc(

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

    const float gainMasa,              /* i  : gain                            */

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

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

)

{

    /* Edited OMASA EXT MASA transport gaining */

    for ( int16_t ch = 0; ch < 2; ch++ )

    {

        v_multc( output[nchan_transport_ism + ch], gainMasa, output[nchan_transport_ism + ch], output_frame );

    }



    return;

}

#endif