Commit 2f614e03 authored by vaclav's avatar vaclav
Browse files

fix builds

parent a929ee31

lib_com/ivas_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ void stereo_dmx_evs_close_encoder( 


ivas_error ivas_dec(

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

#ifdef SPLIT_REND_WITH_HEAD_ROT

#if( defined SPLIT_REND_WITH_HEAD_ROT && !defined NONBE_UNIFIED_DECODING_PATHS_FIX )

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

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

#else

lib_dec/ivas_dec.c

+10 −1
Original line number Diff line number Diff line
@@ -52,8 +52,17 @@ 
 *--------------------------------------------------------------------------*/



#ifdef NONBE_UNIFIED_DECODING_PATHS_FIX

ivas_error ivas_dec(

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

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

)

{

    // TODO: move here function ivas_jbm_dec_tc() and rename it to ivas_dec()

    st_ivas = NULL; // temp. to avoid compilation warnings

    data = NULL;    // temp. to avoid compilation warnings



    return IVAS_ERR_OK;

}

#else

ivas_error ivas_dec(

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

lib_dec/lib_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -3144,7 +3144,7 @@ static ivas_error printConfigInfo_dec( 
#ifdef NONBE_UNIFIED_DECODING_PATHS_FIX

        AUDIO_CONFIG output_config = st_ivas->hDecoderConfig->output_config;

#ifdef SPLIT_REND_WITH_HEAD_ROT

        if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

        if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

#else

        if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif