Commit 3a3ea6c5 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch 'float-1578-omasa-to-foa-hoa-rendering-has-spikes-in-float' into 'main' 

[non-be] [rend-non-be] [split-non-be] [allow-regression] Resolve "OMASA to FOA/HOA rendering has spikes in float"

See merge request !2981
parents 221c8143 ebf46c60

lib_com/ivas_cnst.h

+5 −0
Original line number Diff line number Diff line
@@ -1256,7 +1256,12 @@ typedef enum 
{

    MASA_STEREO_NOT_DEFINED,

    MASA_STEREO_SPACED_MICS,

#ifdef FIX_FLOAT_1578_OMASA_REND_SPIKES

    MASA_STEREO_DOWNMIX,

    MASA_DUAL_MONO

#else

    MASA_STEREO_DOWNMIX

#endif

} MASA_TRANSPORT_SIGNAL_TYPE;



typedef enum

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ 
#define FIX_BASOP_2561_STEREO_DFT_ENC_COMPUTE_ITD       /* BASOP issue 2561: fix diffs in stereo_dft_enc_compute_itd() between float and BASOP */

#define FIX_BASOP_2517_CLICK_IN_OMASA_LTV               /* FhG: BASOP #2517: preserve precision by removing one-bit headroom from Q_min and allowing saturation during buffer scaling */

#define FIX_BASOP_2559_Q_SYNTH_HISTORY_RESET            /* FhG: BASOP issue 2559: reset hTcxDec->q_synth_history_fx in allocate_CoreCoder_TCX_fx() */

#define FIX_FLOAT_1578_OMASA_REND_SPIKES                /* Nokia: Float issue 1578: Fix spikes and collapsed perception in OMASA/MASA rendering to FOA/HOA */



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

lib_dec/ivas_dirac_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -364,7 +364,11 @@ static ivas_error ivas_dirac_rend_config_fx( 
                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );

            }

        }

#ifdef FIX_FLOAT_1578_OMASA_REND_SPIKES

        ivas_masa_init_stereotype_detection_fx( hDirACRend->masa_stereo_type_detect, ivas_total_brate );

#else

        ivas_masa_init_stereotype_detection_fx( hDirACRend->masa_stereo_type_detect );

#endif

    }

    ELSE

    {

lib_rend/ivas_dirac_output_synthesis_dec_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -3001,6 +3001,14 @@ void ivas_dirac_dec_compute_directional_responses_fx( 
                                move32();

                            }

                        }

#ifdef FIX_FLOAT_1578_OMASA_REND_SPIKES

                        ELSE IF( EQ_16( transport_signal_type, MASA_DUAL_MONO ) )

                        {

                            direct_response_fx[0] = ONE_IN_Q29; /*q29*/

                            move32();

                            /* direct_response[1] is not adjusted for dual mono input */

                        }

#endif

                        ELSE

                        {

                            set32_fx( direct_response_fx, ONE_IN_Q29, hDirACRend->num_protos_ambi ); /*q29*/

lib_rend/ivas_dirac_rend_fx.c

+427 −1

File changed.

Preview size limit exceeded, changes collapsed.