Commit e5420576 authored by multrus's avatar multrus
Browse files

Merge branch '1663_ref_portFlp1679_splitRendJbm' into 'ivas-float-update' 

Port Float MR 1679 to ivas-float-update -  Resolve "Split rendering crashes in JBM"

See merge request !2318
parents 9d7783ab 30137274

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ 
#define FIX_ISSUE_2008_MISSING_CODE_FROM_PORTING        /* FhG: Issue 2008: Code deleted while porting float-main MR !1504 (BASOP issue 1565)*/

#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.c

+8 −0
Original line number Diff line number Diff line
@@ -3040,6 +3040,14 @@ ivas_error IVAS_DEC_VoIP_GetSamples( 
        return IVAS_ERR_WRONG_PARAMS;

    }



#ifdef TMP_FIX_1119_SPLIT_RENDERING_VOIP

    if ( hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ||

         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 ( *nSamplesRendered < nSamplesPerChannel )