Commit 53666777 authored by emerit's avatar emerit
Browse files

fix #ifdef #endif

parent 5862de4c

apps/decoder.c

+8 −9
Original line number Diff line number Diff line
@@ -819,7 +819,7 @@ int main( 
#else

        if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );

            fprintf( stderr, "\nError in loading HRTF binary file %s for CRend \n\n", arg.hrtfFileName );

            goto cleanup;

        }

#endif
@@ -851,8 +851,7 @@ int main( 
#else

        if ( ( error = load_fastconv_HRTF_from_binary( hHrtfFastConv, hrtfReader ) ) != IVAS_ERR_OK )

        {



            fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );

            fprintf( stderr, "\nError in loading HRTF binary file %s for FastConv \n\n", arg.hrtfFileName );

            goto cleanup;

        }

#endif
@@ -884,7 +883,7 @@ int main( 
#else

        if ( ( error = load_parambin_HRTF_from_binary( hHrtfParambin, hrtfReader ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );

            fprintf( stderr, "\nError in loading HRTF binary file %s for parametric binauralizer \n\n", arg.hrtfFileName );

            goto cleanup;

        }

#endif
@@ -974,29 +973,29 @@ cleanup: 
        IVAS_DEC_HRTF_HANDLE hHrtfTD = NULL;

#endif

        IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD );

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        if ( hHrtfTD != NULL )

        {

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

            destroy_td_hrtf( hHrtfTD );

        }

#else

            dealloc_HRTF_binary( *hHrtfTD );

#endif

        }

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;

#else

        IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF = NULL;

#endif

        IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF );

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        if ( hSetOfHRTF != NULL )

        {

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

            destroy_SetOfHRTF( hSetOfHRTF );

        }

#else

        destroy_SetOfHRTF( *hSetOfHRTF );

#endif

    }

    }



    IVAS_DEC_Close( &hIvasDec );

    CustomLsReader_close( &hLsCustomReader );

apps/renderer.c

+1 −0
Original line number Diff line number Diff line
@@ -1030,6 +1030,7 @@ int main( 
#else

    const int16_t frameSize_smpls = (int16_t) ( ( args.framing_5ms ? 5 : 20 ) * args.sampleRate / 1000 );

#endif



#ifdef NONBE_UNIFIED_DECODING_PATHS

    if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig,

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

lib_com/ivas_cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ typedef enum 
    RENDERER_NON_DIEGETIC_DOWNMIX,

    RENDERER_OSBA_STEREO,

    RENDERER_OSBA_AMBI,

    RENDERER_OSBA_LS,

    RENDERER_OSBA_LS

} RENDERER_TYPE;



#ifdef SPLIT_REND_WITH_HEAD_ROT

lib_rend/ivas_crend.c

+2 −2
Original line number Diff line number Diff line
@@ -1555,7 +1555,7 @@ ivas_error ivas_rend_openCrend( 
                }

#else

#ifdef FIX_CRASH_LONG_BRIR

                if ( hCrend->freq_buffer_re_diffuse !NULL )

                if ( hCrend->freq_buffer_re_diffuse != NULL )

                {

                    for ( j = 0; j < max_total_ir_len; j++ )

                    {
@@ -1613,7 +1613,7 @@ ivas_error ivas_rend_openCrend( 
                }

#else

#ifdef FIX_CRASH_LONG_BRIR

                if ( hCrend->freq_buffer_im_diffuse !NULL )

                if ( hCrend->freq_buffer_im_diffuse != NULL )

                {

                    for ( j = 0; j < max_total_ir_len; j++ )

                    {

lib_util/hrtf_file_reader.c

+1 −1
Original line number Diff line number Diff line
@@ -916,7 +916,7 @@ ivas_error destroy_td_hrtf( 
 *---------------------------------------------------------------------*/



ivas_error dealloc_HRTF_binary(

    IVAS_DEC_HRTF_HANDLE( *hHrtf ) /* i/o: HRTF handle                         */

    IVAS_DEC_HRTF_HANDLE hHrtf /* i/o: HRTF handle                         */

)

{

    int16_t i;