Commit a2863175 authored by sagnowski's avatar sagnowski
Browse files

Add an error check for the unsupported combination of VoIP and split rendering

parent 9f4c783c

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ 
//#define FIX_CREND_SIMPLIFY_CODE                         /* Ora : simplify line code in crend */

#define FLOAT_FIX_POINT_HRTF_FILE_FORMAT                /* allows reading floation or fix point hrtf binary file format */

#define FIX_745_FIX_DATA_TYPE_CONVERSION                /* VA: issue 745: implicit data type conversion when calling IVAS_DEC_Configure() */

#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

+13 −5
Original line number Diff line number Diff line
@@ -2626,6 +2626,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 )

    {