Commit 3f3bcd55 authored by bayers's avatar bayers
Browse files

Merge remote-tracking branch 'remotes/origin/main' into... 

Merge remote-tracking branch 'remotes/origin/main' into 809-combined-orientation-external-target-interpolation-different-within-frame-and-on-frame-borders
parents 2680f7c3 e4023bf9

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ 
#define NONBE_FIX_778_TNS_UNFIED_STEREO_MSAN                  /* FhG: Issue 778: MSAN error due to uninitialized TNS configuration */

#define NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ                 /* VA: issue 797:  fix of crash when the separated object is inactive and the MASA metadata is using very few bits */

#define NONBE_FIX_798_OSBA_MC_DEC_CRASH

#define NONBE_FIX_806_OMASA_ONE_SEP_TRANSPORT_MIX             /* Nokia: issue 806: fix one separated object mode transport mix of the separated object */

#define NONBE_FIX_809_EXTERNAL_TARGET_INTERPOLATION           /* FhG: issue 809: unify external target interpolation inter and intra frame behaviour */



/* ##################### End NON-BE switches ########################### */

lib_enc/ivas_omasa_enc.c

+7 −0
Original line number Diff line number Diff line
@@ -578,6 +578,11 @@ void ivas_omasa_enc( 
        ivas_omasa_energy_and_ratio_est( hOMasa, hMasa->data.hOmasaData, data_in_f, input_frame, nchan_ism );

    }



#ifdef NONBE_FIX_806_OMASA_ONE_SEP_TRANSPORT_MIX

    /* Downmix */

    ivas_omasa_dmx( data_in_f, data_out_f, input_frame, nchan_transport, nchan_ism, hIsmMeta, hOMasa->prev_object_dm_gains, hOMasa->interpolator );



#endif

    /* Move the ISM metadata to the first entry for encoding in the MASA_ONE_OBJ mode */

    if ( ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ )

    {
@@ -585,9 +590,11 @@ void ivas_omasa_enc( 
        hIsmMeta[0]->elevation = hIsmMeta[*idx_separated_object]->elevation;

    }



#ifndef NONBE_FIX_806_OMASA_ONE_SEP_TRANSPORT_MIX

    /* Downmix */

    ivas_omasa_dmx( data_in_f, data_out_f, input_frame, nchan_transport, nchan_ism, hIsmMeta, hOMasa->prev_object_dm_gains, hOMasa->interpolator );



#endif

    /* Merge transport signals */

    ivas_merge_masa_transports( data_out_f, &( data_in_f[nchan_ism] ), data_in_f, input_frame, nchan_transport );