Commit 30cd9198 authored by vaclav's avatar vaclav
Browse files

fix compilation when HRTF switches are deactivated

parent 78539cab

lib_dec/ivas_omasa_dec.c

+2 −1
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ void ivas_omasa_data_close( 
ivas_error ivas_omasa_dec_config(

    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */

#ifndef FIX_HRTF_LOAD

    ,

    uint16_t *nSamplesRendered,          /* o  : number of samples flushed from the previous frame (JBM) */

    const PCM_RESOLUTION pcm_resolution, /* i  : type for the decoded PCM resolution */

    void *data                           /* o  : output synthesis signal     */

lib_dec/lib_dec.c

+6 −1
Original line number Diff line number Diff line
@@ -2988,13 +2988,18 @@ ivas_error IVAS_DEC_VoIP_GetSamples( 
    const IVAS_DEC_PCM_TYPE pcmType,

    void *pcmBuf,

    const uint32_t systemTimestamp_ms, /* i  : current system timestamp                    */

#ifdef FIX_CREND_SIMPLIFY_CODE

#ifdef SUPPORT_JBM_TRACEFILE

    JbmTraceFileWriterFn jbmWriterFn,

    void *jbmWriter,

#endif

#ifdef FIX_CREND_SIMPLIFY_CODE

    bool *bitstreamReadDone,   /* o  : flag indicating that bitstream was read                                 */

    uint16_t *nSamplesRendered /* o  : number of samples rendered                                              */

#else

#ifdef SUPPORT_JBM_TRACEFILE

    JbmTraceFileWriterFn jbmWriterFn,

    void *jbmWriter

#endif

#endif

)

{

lib_dec/lib_dec.h

+6 −1
Original line number Diff line number Diff line
@@ -284,13 +284,18 @@ ivas_error IVAS_DEC_VoIP_GetSamples( 
    const IVAS_DEC_PCM_TYPE pcmType,

    void *pcmBuf,

    const uint32_t systemTimestamp_ms,          /* i  : current system timestamp                                                */

#ifdef FIX_CREND_SIMPLIFY_CODE

#ifdef SUPPORT_JBM_TRACEFILE

    JbmTraceFileWriterFn jbmWriterFn,

    void* jbmWriter,

#endif

#ifdef FIX_CREND_SIMPLIFY_CODE

   bool *bitstreamReadDone,                     /* o  : flag indicating that bitstream was read                                 */

   uint16_t *nSamplesRendered                   /* o  : number of samples rendered                                              */

#else

#ifdef SUPPORT_JBM_TRACEFILE

    JbmTraceFileWriterFn jbmWriterFn,

    void* jbmWriter

#endif

#endif

);

lib_rend/ivas_crend.c

+72 −72

File changed.

Preview size limit exceeded, changes collapsed.

lib_util/hrtf_file_reader.c

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.