Commit d4e59031 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_806_OMASA_ONE_SEP_TRANSPORT_MIX

parent 5fb92634

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ 


#define NONBE_FIX_774_OSBA_MONO_DEC_CRASH                     /* FhG: issue 774: decoder crash for OSBA to mono */

#define NONBE_FIX_802_PARAMUPMIX_HIGHPASS                     /* Dlb: issue 802: Move HighPass filter operation for ParamUpmix */

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

#define NONBE_FIX_775_OSBA_BR_SWITCHING_CRASH                 /* FhG: issue 775: fix crash in OSBA with bitrate switching and output order lower than input order */

lib_enc/ivas_omasa_enc.c

+0 −7
Original line number Diff line number Diff line
@@ -578,11 +578,9 @@ 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 )

    {
@@ -590,11 +588,6 @@ 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 );