Commit 8b671de9 authored by emerit's avatar emerit
Browse files

fix test fail with binary hrtf

parent b21f63c6

apps/decoder.c

+22 −21
Original line number Diff line number Diff line
@@ -2527,6 +2527,10 @@ static ivas_error decodeG192( 
                    goto cleanup;

                }

#ifdef FIX_CREND_SIMPLIFY_CODE



                /* Load HRTF binary file data */

                if ( arg.hrtfReaderEnabled )

                {

                    /* Read main parameters from the bitstream to set-up the decoder */

                    hHrtfBinary->binaural_renderer_old = hHrtfBinary->binaural_renderer;

                    hHrtfBinary->binaural_renderer_sec_old = hHrtfBinary->binaural_renderer_sec;
@@ -2538,9 +2542,6 @@ static ivas_error decodeG192( 
                    /* Placeholder for memory reallocation */

                    /* ... */



                /* Load HRTF binary file data */

                if ( arg.hrtfReaderEnabled )

                {

                    if ( ( error = load_hrtf_from_file( hHrtfBinary, hIvasDec, arg.outputConfig, arg.output_Fs ) ) != IVAS_ERR_OK )

                    {

                        fprintf( stderr, "\nIVAS_DEC_LoadHrtfFromFile failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -3404,6 +3405,9 @@ static ivas_error decodeVoIP( 
        }

#ifdef FIX_CREND_SIMPLIFY_CODE

        if ( bitstreamReadDone == true )

        {

            /* Load HRTF binary file data */

            if ( arg.hrtfReaderEnabled )

            {

                /* Read main parameters from the bitstream to set-up the decoder */

                hHrtf->binaural_renderer_old = hHrtf->binaural_renderer;
@@ -3416,9 +3420,6 @@ static ivas_error decodeVoIP( 
                /* Placeholder for memory reallocation */

                /* ... */



            /* Load HRTF binary file data */

            if ( arg.hrtfReaderEnabled )

            {

                if ( ( error = load_hrtf_from_file( hHrtf, hIvasDec, arg.outputConfig, arg.output_Fs ) ) != IVAS_ERR_OK )

                {

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

lib_dec/lib_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -948,7 +948,7 @@ ivas_error IVAS_DEC_ReadFormat( 
        return IVAS_ERR_OK;

    }



    if ( ( st_ivas->bfi == 0 ) && ( st_ivas->ini_frame == 0 ) ) /* diff with future merge */

    if ( st_ivas->bfi == 0 )

    {

        if ( ( error = ivas_dec_get_format( st_ivas ) ) != IVAS_ERR_OK )

        {