Commit a6a46c9c authored by emerit's avatar emerit
Browse files

merge define

parent 2d927c83

apps/decoder.c

+9 −9
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ int main( 
    RenderConfigReader *renderConfigReader = NULL;

    int16_t *pcmBuf = NULL;

    IVAS_RENDER_FRAMESIZE asked_frame_size;

#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

    IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;

    IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;

    IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;
@@ -514,7 +514,7 @@ int main( 


    if ( arg.hrtfReaderEnabled )

    {

#ifndef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

#ifndef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

        IVAS_DEC_HRTF_HANDLE hHrtfTD = NULL;

#endif
@@ -523,7 +523,7 @@ int main( 
            fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }

#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

        if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
@@ -545,7 +545,7 @@ int main( 


#endif



#ifndef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

#ifndef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

        IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF = NULL;

#endif
@@ -555,7 +555,7 @@ int main( 
            goto cleanup;

        }



#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

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

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
@@ -583,7 +583,7 @@ int main( 
            goto cleanup;

        }



#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

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

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
@@ -612,7 +612,7 @@ int main( 
            goto cleanup;

        }



#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

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

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
@@ -639,7 +639,7 @@ int main( 
        }

#endif



#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

        if ( ( error = load_reverb_binary( *hHrtfStatistics, arg.output_Fs, hrtfReader ) ) != IVAS_ERR_OK )

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
@@ -714,7 +714,7 @@ cleanup: 


    if ( arg.hrtfReaderEnabled )

    {

#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

        IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD );

        destroy_td_hrtf( hHrtfTD );

apps/renderer.c

+6 −6
Original line number Diff line number Diff line
@@ -629,7 +629,7 @@ int main( 
    RotFileReader *referenceRotReader = NULL;

    Vector3PairFileReader *referenceVectorReader = NULL;

    hrtfFileReader *hrtfFileReader = NULL;

#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

    IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;

    IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;

    IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;
@@ -744,7 +744,7 @@ int main( 
        }

    }



#ifndef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

#ifndef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

    if ( !isEmptyString( args.customHrtfFilePath ) )

    {

        if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )
@@ -842,7 +842,7 @@ int main( 
#ifdef IVAS_FLOAT_FIXED

    Word32 nonDiegeticPanGain_fx = ( args.nonDiegeticPanGain == 1.0f ) ? ONE_IN_Q31 : ( args.nonDiegeticPanGain == -1.0f ) ? L_negate( ONE_IN_Q31 )

                                                                                                                           : (Word32) ( args.nonDiegeticPanGain * ( 1LL << Q31 ) );

#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

    if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, !isEmptyString( args.customHrtfFilePath ), args.nonDiegeticPan, nonDiegeticPanGain_fx, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )

#else

    IF( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, args.nonDiegeticPan, nonDiegeticPanGain_fx, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )
@@ -859,7 +859,7 @@ int main( 
    }

#endif // IVAS_FLOAT_FIXED



#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

    if ( !isEmptyString( args.customHrtfFilePath ) )

    {

        if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )
@@ -1877,7 +1877,7 @@ int main( 
    free( outInt32Buffer );

    free( inInt32Buffer );

#endif

#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

cleanup:

#endif

    for ( i = 0; i < RENDERER_MAX_MASA_INPUTS; ++i )
@@ -1897,7 +1897,7 @@ cleanup: 
    RotationFileReader_close( &externalOrientationFileReader );

    RotationFileReader_close( &referenceRotReader );

    Vector3PairFileReader_close( &referenceVectorReader );

#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

    destroy_td_hrtf( hHrtfTD );

    destroy_SetOfHRTF( hSetOfHRTF );

    destroy_hrtf_statistics( hHrtfStatistics );

lib_com/common_api_types.h

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ typedef struct TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_HANDLE; 
typedef struct ivas_hrtfs_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE;

typedef struct ivas_hrtfs_fastconv_struct *IVAS_DEC_HRTF_FASTCONV_HANDLE;

typedef struct ivas_hrtfs_parambin_struct *IVAS_DEC_HRTF_PARAMBIN_HANDLE;

#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

typedef struct ivas_hrtfs_statistics_struct *IVAS_DEC_HRTF_STATISTICS_HANDLE;

#endif

typedef struct cldfb_filter_bank_struct *IVAS_CLDFB_FILTER_BANK_HANDLE;

lib_com/ivas_cnst.h

+2 −2
Original line number Diff line number Diff line
@@ -1733,11 +1733,11 @@ typedef enum 
#define RV_FILTER_MAX_FFT_SIZE                  ( 512 )

#define RV_FILTER_MAX_HISTORY                   ( 512 - 160 )               /* for longest history */

#define RV_LENGTH_NR_FC                         ( RV_FILTER_MAX_FFT_SIZE / 2 ) + 1

#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

#define RV_LENGTH_NR_FC_16KHZ                   ( RV_FILTER_MAX_FFT_SIZE / 4 ) + 1

#endif

#define IVAS_REVERB_DEFAULT_N_BANDS             31

#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

#define LR_IAC_LENGTH_NR_FC                     ( RV_LENGTH_NR_FC )

#define LR_IAC_LENGTH_NR_FC_16KHZ               ( RV_LENGTH_NR_FC_16KHZ )

#endif

lib_com/ivas_error.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ typedef enum 
    IVAS_ERR_DIRECTIVITY_NOT_SUPPORTED,

    IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED,

    IVAS_ERR_INVALID_HRTF,

#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

    IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA,

#endif

    IVAS_ERR_INVALID_INPUT_FORMAT,