Commit 19c280c4 authored by sagnowski's avatar sagnowski
Browse files

Fix preprocessor switches

parent fbb7c2bb

apps/decoder.c

+9 −9
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
#include "head_rotation_file_reader.h"

#include "jbm_file_writer.h"

#include "evs_rtp_payload.h"

#ifdef FLOAT_INTERFACE_ENC

#ifdef FLOAT_INTERFACE_DEC_REND

#include "buffer_conversions.h"

#endif

#ifdef DEBUGGING
@@ -134,7 +134,7 @@ typedef struct 
static bool parseCmdlIVAS_dec( int16_t argc, char **argv, DecArguments *arg );

static void usage_dec( void );

static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, HeadRotFileReader *headRotReader, IVAS_DEC_HANDLE hIvasDec

#ifndef FLOAT_INTERFACE_ENC

#ifndef FLOAT_INTERFACE_DEC_REND

                              ,

                              int16_t *pcmBuf

#endif
@@ -168,7 +168,7 @@ int main( 
    hrtfFileReader *hrtfReader = NULL;

    HeadRotFileReader *headRotReader = NULL;

    ivas_error error = IVAS_ERR_UNKNOWN;

#ifndef FLOAT_INTERFACE_ENC

#ifndef FLOAT_INTERFACE_DEC_REND

    int16_t pcmBuf[MAX_OUTPUT_PCM_BUFFER_SIZE];

#endif

    RenderConfigReader *renderConfigReader = NULL;
@@ -511,7 +511,7 @@ int main( 
    }

    else

    {

#ifdef FLOAT_INTERFACE_ENC

#ifdef FLOAT_INTERFACE_DEC_REND

        error = decodeG192( arg, hBsReader, headRotReader, hIvasDec );

#else

        error = decodeG192( arg, hBsReader, headRotReader, hIvasDec, pcmBuf );
@@ -1338,7 +1338,7 @@ static ivas_error decodeG192( 
    BS_READER_HANDLE hBsReader,

    HeadRotFileReader *headRotReader,

    IVAS_DEC_HANDLE hIvasDec

#ifndef FLOAT_INTERFACE_ENC

#ifndef FLOAT_INTERFACE_DEC_REND

    ,

    int16_t *pcmBuf

#endif
@@ -1363,7 +1363,7 @@ static ivas_error decodeG192( 
    ivas_error error = IVAS_ERR_UNKNOWN;

    uint16_t numObj = 0;

    IVAS_DEC_BS_FORMAT bsFormat = IVAS_DEC_BS_UNKOWN;

#ifdef FLOAT_INTERFACE_ENC

#ifdef FLOAT_INTERFACE_DEC_REND

    int16_t *audioDecBufInt = NULL;   /* Buffer for receiving audio from decoder via int interface. Packed. */

    float *audioDecBufFloat = NULL;   /* Buffer for receiving audio from decoder via float interface. Packed. */

    int16_t *audioWriteBufInt = NULL; /* Buffer for writing audio to int wav/pcm files. Interleaved. */
@@ -1386,7 +1386,7 @@ static ivas_error decodeG192( 
        fprintf( stdout, "\n-- Start the decoder (quiet mode) --\n\n" );

    }



#ifdef FLOAT_INTERFACE_ENC

#ifdef FLOAT_INTERFACE_DEC_REND

    /*------------------------------------------------------------------------------------------*

     * Allocate output audio buffers

     *------------------------------------------------------------------------------------------*/
@@ -1712,7 +1712,7 @@ static ivas_error decodeG192( 
    }



    /* add zeros at the end to have equal length of synthesized signals */

#ifdef FLOAT_INTERFACE_ENC

#ifdef FLOAT_INTERFACE_DEC_REND

    if ( outputFileIsFloat )

    {

        error = IVAS_ERR_NOT_IMPLEMENTED;
@@ -1744,7 +1744,7 @@ static ivas_error decodeG192( 


cleanup:



#ifdef FLOAT_INTERFACE_ENC

#ifdef FLOAT_INTERFACE_DEC_REND

    free( audioDecBufInt );

    free( audioDecBufFloat );

    free( audioWriteBufInt );

lib_util/buffer_conversions.c

+5 −1
Original line number Diff line number Diff line
@@ -169,6 +169,10 @@ void copyBufferInterleavedIntToPackedInt( 
    return;

}



#endif /* FLOAT_INTERFACE_ENC */



#ifdef FLOAT_INTERFACE_DEC_REND



/*--------------------------------------------------------------------------*

 * copyBufferPackedFloatToInterleavedFloat()

 *
@@ -301,4 +305,4 @@ void copyBufferPackedIntToInterleavedInt( 
    return;

}



#endif
 
#endif /* FLOAT_INTERFACE_DEC_REND */

lib_util/buffer_conversions.h

+5 −1
Original line number Diff line number Diff line
@@ -71,6 +71,10 @@ void copyBufferInterleavedIntToPackedInt( 
    const int16_t numChannels                    /* i  : Number of channels - must be equal for both buffers                                                    */

);



#endif /* FLOAT_INTERFACE_ENC */



#ifdef FLOAT_INTERFACE_DEC_REND



void copyBufferPackedFloatToInterleavedFloat(

    const float *srcBuffer,                      /* i  : Source buffer                                                                                          */

    const int16_t srcBufferNumSamplesPerChannel, /* i  : Length (per channel) of source buffer                                                                                */
@@ -104,6 +108,6 @@ void copyBufferPackedIntToInterleavedInt( 
    const int16_t numChannels                    /* i  : Number of channels - must be equal for both buffers                                                    */

);



#endif /* FLOAT_INTERFACE_ENC */

#endif /* FLOAT_INTERFACE_DEC_REND */



#endif