Commit e2f57c77 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_BINARY_BINAURAL_READING

parent 6355bea6

apps/decoder.c

+0 −68
Original line number Diff line number Diff line
@@ -196,13 +196,11 @@ int main( 
    RenderConfigReader *renderConfigReader = NULL;

    int16_t *pcmBuf = NULL;

    IVAS_RENDER_FRAMESIZE asked_frame_size;

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;

    IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;

#endif

#endif

#ifdef DEBUGGING

    int32_t noClipping;

    int32_t cnt_frames_limited;
@@ -715,16 +713,12 @@ int main( 


    if ( arg.hrtfReaderEnabled )

    {

#ifndef NONBE_FIX_BINARY_BINAURAL_READING

        IVAS_DEC_HRTF_HANDLE hHrtfTD = NULL;

#endif

        if ( ( error = IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

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

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
@@ -737,16 +731,8 @@ int main( 
                destroy_td_hrtf( hHrtfTD );

            }

        }

#else

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

        {

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

            goto cleanup;

        }

#endif



#ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        if ( ( *hHrtfTD != NULL ) && ( error = load_reverb_binary( *hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
@@ -755,25 +741,14 @@ int main( 
                goto cleanup;

            }

        }

#else

        if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )

        {

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

            goto cleanup;

        }

#endif

#endif



#ifndef NONBE_FIX_BINARY_BINAURAL_READING

        IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF = NULL;

#endif

        if ( ( error = IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_GetHrtfCRendHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

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

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
@@ -786,20 +761,14 @@ int main( 
                destroy_SetOfHRTF( hSetOfHRTF );

            }

        }

#endif



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;

#else

        IVAS_DEC_HRTF_FASTCONV_HANDLE hHrtfFastConv = NULL;

#endif

        if ( ( error = IVAS_DEC_GetHrtfFastConvHandle( hIvasDec, &hHrtfFastConv ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_GetHrtfFastConvHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

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

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
@@ -812,26 +781,14 @@ int main( 
                destroy_fastconv_hrtf( hHrtfFastConv );

            }

        }

#else

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

        {

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

            goto cleanup;

        }

#endif



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;

#else

        IVAS_DEC_HRTF_PARAMBIN_HANDLE hHrtfParambin = NULL;

#endif

        if ( ( error = IVAS_DEC_GetHrtfParamBinHandle( hIvasDec, &hHrtfParambin ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_GetHrtfParamBinHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

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

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
@@ -844,16 +801,8 @@ int main( 
                destroy_parambin_hrtf( hHrtfParambin );

            }

        }

#else

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

        {

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

            goto cleanup;

        }

#endif



#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        if ( ( error = IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -871,13 +820,6 @@ int main( 
                destroy_hrtf_statistics( hHrtfStatistics );

            }

        }

#else

        if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )

        {

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

            goto cleanup;

        }

#endif

#endif

    }
@@ -955,19 +897,9 @@ cleanup: 
#endif

    if ( arg.hrtfReaderEnabled )

    {

#ifndef NONBE_FIX_BINARY_BINAURAL_READING

        IVAS_DEC_HRTF_HANDLE hHrtfTD = NULL;

#endif

        IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD );

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        destroy_td_hrtf( hHrtfTD );

#else

        dealloc_HRTF_binary( hHrtfTD );

#endif



#ifndef NONBE_FIX_BINARY_BINAURAL_READING

        IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF = NULL;

#endif

        IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF );

        destroy_SetOfHRTF( hSetOfHRTF );

apps/renderer.c

+0 −33
Original line number Diff line number Diff line
@@ -743,14 +743,12 @@ int main( 
#endif

    Vector3PairFileReader *referenceVectorReader = NULL;

    hrtfFileReader *hrtfFileReader = NULL;

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;

    IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;

    IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;

    IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;

#endif

#endif

    IsmPositionProvider *positionProvider;

    LfeRoutingConfig *lfeRoutingConfigs[RENDERER_MAX_MC_INPUTS];
@@ -804,10 +802,8 @@ int main( 


#ifdef SPLIT_REND_WITH_HEAD_ROT

    hSplitRendFileReadWrite = NULL;

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    CLDFBframeSize_smpls = 0;

    cldfb_in_flag = 0;

#endif

#endif

    for ( i = 0; i < RENDERER_MAX_MC_INPUTS; ++i )

    {
@@ -881,16 +877,6 @@ int main( 
        }

    }



#ifndef NONBE_FIX_BINARY_BINAURAL_READING

    if ( !isEmptyString( args.customHrtfFilePath ) )

    {

        if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Error opening file: %s\n", args.customHrtfFilePath );

            exit( -1 );

        }

    }

#endif



    if ( !isEmptyString( args.renderConfigFilePath ) )

    {
@@ -1016,17 +1002,12 @@ int main( 
#endif

    const int16_t frameSize_smpls = (int16_t) ( ( args.render_framesize ) * args.sampleRate * 5 / ( 1000 ) );



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

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

#else

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

#endif

    {

        fprintf( stderr, "Error opening renderer handle: %s\n", ivas_error_to_string( error ) );

        exit( -1 );

    }



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    if ( !isEmptyString( args.customHrtfFilePath ) )

    {

        if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )
@@ -1147,7 +1128,6 @@ int main( 


        hrtfFileReader_close( &hrtfFileReader );

    }

#endif



    /* === Configure === */

    if ( ( error = IVAS_REND_InitConfig( hIvasRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK )
@@ -1156,12 +1136,6 @@ int main( 
        exit( -1 );

    }



#ifndef NONBE_FIX_BINARY_BINAURAL_READING

#ifdef SPLIT_REND_WITH_HEAD_ROT

    CLDFBframeSize_smpls = 0;

    cldfb_in_flag = 0;

#endif

#endif

    if ( args.renderConfigFilePath[0] != '\0' )

    {

        IVAS_RENDER_CONFIG_DATA renderConfig;
@@ -2223,9 +2197,7 @@ int main( 
    free( outInt16Buffer );

    free( outFloatBuffer );



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

cleanup:

#endif



#ifdef SPLIT_REND_WITH_HEAD_ROT

    if ( bitsBufferData != NULL )
@@ -2258,15 +2230,10 @@ cleanup: 
    RotationFileReader_close( &externalOrientationFileReader );

    RotationFileReader_close( &referenceRotReader );

    Vector3PairFileReader_close( &referenceVectorReader );

#ifndef NONBE_FIX_BINARY_BINAURAL_READING

    hrtfFileReader_close( &hrtfFileReader );

#endif

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    destroy_td_hrtf( hHrtfTD );

    destroy_SetOfHRTF( hSetOfHRTF );

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    destroy_hrtf_statistics( hHrtfStatistics );

#endif

#endif

    IVAS_REND_Close( &hIvasRend );

    IsmPositionProvider_close( positionProvider );

lib_com/ivas_error.h

+0 −4
Original line number Diff line number Diff line
@@ -78,9 +78,7 @@ typedef enum 
    IVAS_ERR_DIRECTIVITY_NOT_SUPPORTED,

    IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED,

    IVAS_ERR_INVALID_HRTF,

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA,

#endif

    IVAS_ERR_INVALID_INPUT_FORMAT,

    IVAS_ERR_INVALID_INDEX,

    IVAS_ERR_NOT_SUPPORTED_OPTION,
@@ -260,10 +258,8 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) 
            return "Acoustic environment not supported";

        case IVAS_ERR_INVALID_HRTF:

            return "Unsupported HRTF filter set";

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        case IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA:

            return "Renderer data missing in HRTF binary file";

#endif

        case IVAS_ERR_INVALID_INPUT_FORMAT:

            return "Invalid input format";

        case IVAS_ERR_INVALID_INDEX:

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_BINARY_BINAURAL_READING                     /* Orange: Add support for reading binaural binary file */

#define NONBE_FIX_AVG_IAC_CLDFB_REVERB                        /* Orange: Add computation avg energy and iac tables for rom and binaural binary file */

#define NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES             /* Philips: Use pre-computed HRTF average L/R energies and IAC in all renderers */

#define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER           /* Qualcomm: issue 953: fix order or ER channels in LC mode*/

lib_dec/ivas_init_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -2723,12 +2723,8 @@ void ivas_destroy_dec( 
    {

        ivas_td_binaural_close( &st_ivas->hBinRendererTd );

    }

#ifdef NONBE_FIX_BINARY_BINAURAL_READING



    if ( st_ivas->hHrtfTD != NULL )

#else

    else if ( st_ivas->hHrtfTD != NULL )

#endif

    {

        BSplineModelEvalDealloc( &st_ivas->hHrtfTD->ModelParams, &st_ivas->hHrtfTD->ModelEval );