Commit 8b5dcf3d authored by vaclav's avatar vaclav
Browse files

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

Merge remote-tracking branch 'remotes/origin/main' into 2103-basop-PortMr2047-from-float-resolve-decoder-crash-with-new-error-pattern-which-starts-with-a-lost
parents 7726195f b0129198

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ 
#define FIX_2602_NONBE_SAT_IN_SWB_TBE_SCALE                  /* Dolby/FhG: fix for issue 2026: Saturation in SWB TBE re-scaling function preventing StereoDownmix complexity job to complete */

#define FIX_2021_BANDWIDTH_EXTENSION_PROBLEM                 /* FhG: increase cldfb buffer precision*/



#define FIX_2083_FLOATING_POINT_LEFTOVERS                    /* FhG: convert floating-point leftovers in makeCustomLsSetup()*/

#define FIX_2085_FLOATING_POINT_LEFTOVERS                    /* FhG: convert floating-point leftovers in ivas_dirac_config_fx() */

/* #################### Start BASOP porting switches ############################ */

lib_rend/lib_rend_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -3653,7 +3653,11 @@ static LSSETUP_CUSTOM_STRUCT makeCustomLsSetup( 
    move16();

    FOR( i = 0; i < rendCustomLsLayout.num_spk; ++i )

    {

#ifdef FIX_2083_FLOATING_POINT_LEFTOVERS

        IF( LT_32( L_abs( rendCustomLsLayout.elevation_fx[i] ), EPSILON_FX ) )

#else

        IF( fabsf( rendCustomLsLayout.elevation[i] ) > EPSILON )

#endif

        {

            customLs.is_planar_setup = 0;

            move16();
@@ -9162,7 +9166,11 @@ static ivas_error getSamplesInternal( 
        if ( ( error = ISAR_PRE_REND_MultiBinToSplitBinaural( hIvasRend->splitRendWrapper, hIvasRend->headRotData.headPositions[0], hIvasRend->hRendererConfig->split_rend_config.splitRendBitRate, hIvasRend->hRendererConfig->split_rend_config.codec,

                                                              hIvasRend->hRendererConfig->split_rend_config.isar_frame_size_ms,

                                                              hIvasRend->hRendererConfig->split_rend_config.codec_frame_size_ms,

#ifdef FIX_2083_FLOATING_POINT_LEFTOVERS

                                                              &bits, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, extract_l( Mpy_32_32( hIvasRend->sampleRateOut, 2684355 /*(BINAURAL_MAXBANDS / 48000) in Q31*/ ) ), tmpBinaural, 1, cldfb_in_flag, ( hIvasRend->outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0, ro_md_flag, Q_buff, &Q_out[0] ) ) != IVAS_ERR_OK )

#else

                                                              &bits, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, ( const Word16 )( ( BINAURAL_MAXBANDS * hIvasRend->sampleRateOut ) / 48000 ), tmpBinaural, 1, cldfb_in_flag, ( hIvasRend->outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0, ro_md_flag, Q_buff, &Q_out[0] ) ) != IVAS_ERR_OK )

#endif

        {

            return error;

        }

lib_com/cnst.h

+5 −5

File changed.

Contains only whitespace changes.