Commit 683fb23c authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Fix float issue 1578 by adjusting the stereo type detection.

parent 1dd70df2

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 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ 
#define FIX_FLOAT_1573_POSITION_UPDATE                  /* Eri: Float issue 1573: For static orientation and listener movement, the PoseUpdated flag is cleared and prevents 5 ms update rate. */

#define FIX_BASOP_2521_DIRAC_STEREO_STEFFI_NRGS         /* FhG: BASOP issue 2521: Fix wrong porting for determination of first subframe length in ivas_sba_dirac_stereo_compute_td_stefi_nrgs() */

#define FIX_1452_DEFAULT_REVERB                         /* Nokia/Philips/FhG: Fix default room presets and their usage in renderer */



#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

+417 −0

File changed.

Preview size limit exceeded, changes collapsed.