Commit ea539458 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '1119-split-rendering-crashes-in-jbm' into 'main' 

Resolve "Split rendering crashes in JBM"

See merge request !1679
parents 23bfe4db f2a4663e

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ 
#define FLOAT_FIX_POINT_HRTF_FILE_FORMAT                /* allows reading floation or fix point hrtf binary file format */

#define FIX_1138_SBA_EXT_ERROR_PRINTOUT                 /* VA: issue 1138: Fix SBA EXT output call of audioCfg2channels() */

#define FIX_1117_ISAR_MALLOC                            /* VA: issue 1117: call ISAR malloc() only at the initialization. */

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



/* #################### End BE switches ################################## */

lib_dec/lib_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -2589,6 +2589,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) */

    while ( nSamplesRendered < nSamplesPerChannel )

    {