Commit 7bfbf2c9 authored by multrus's avatar multrus
Browse files

Merge branch '1663_basop_portFlp1679_splitRendJbm' into 'main' 

Port Float MR 1679 to main - Resolve "Split rendering crashes in JBM"

See merge request !2319
parents 677911db f4d9f0fb

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ 
#define FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK       /* Eri: Issue 1999: Range check on float values of distance attenuation, while the float values are not propagated to this function. The test is not correct, but configurable distance attenuation is not used in Characterization.*/

#define ADJUST_MCT_CHANNELS_MAX                         /* FhG: set correct max mct channels constant*/

#define FIX_1053_REVERB_RECONFIGURATION

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */



/* #################### End BASOP porting switches ############################ */

lib_dec/lib_dec_fx.c

+9 −0
Original line number Diff line number Diff line
@@ -3677,6 +3677,15 @@ ivas_error IVAS_DEC_VoIP_GetSamples( 
        return IVAS_ERR_WRONG_PARAMS;

    }



#ifdef TMP_FIX_1119_SPLIT_RENDERING_VOIP

    test();

    IF( EQ_32( hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ||

        EQ_32( hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) )

    {

        return IVAS_ERROR( IVAS_ERR_NOT_IMPLEMENTED, "Split rendering is not integrated with VoIP mode" );

    }

#endif



/* make sure that the FIFO after decoder/scaler contains at least one sound card frame (i.e. 20ms) */

#ifdef FIX_CREND_SIMPLIFY_CODE

    WHILE( LT_16( *nSamplesRendered, nSamplesPerChannel ) )