Commit 6822da21 authored by emerit's avatar emerit
Browse files

Resolve "External HRTF loading does not work in OSBA Disc mode"

parent 7d2da3fe

lib_dec/lib_dec_fx.c

+97 −91
Original line number Diff line number Diff line
@@ -1042,6 +1042,10 @@ ivas_error IVAS_DEC_ReadFormat( 
        {

            *binaural_renderer_sec = IVAS_BIN_RENDERER_TYPE_TDREND;

        }

        else if ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_SBA_MODE_DISC && ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

        {

            *binaural_renderer_sec = IVAS_BIN_RENDERER_TYPE_TDREND;

        }



        *hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_INVALID;

        if ( *binaural_renderer == IVAS_BIN_RENDERER_TYPE_FASTCONV )
@@ -1211,10 +1215,12 @@ ivas_error IVAS_DEC_GetSamples( 
    {

        /* check if we need to run the setup function */

        test();

        IF( !hIvasDec->isInitialized || hIvasDec->hasBeenFedFrame ){

        IF( !hIvasDec->isInitialized || hIvasDec->hasBeenFedFrame )

        {

            /* setup */



            IF( NE_32( ( error = IVAS_DEC_Setup( hIvasDec, &l_ts, &nTransportChannels, &nOutChannels, &nSamplesRendered_loop, pcmBuf + imult3216( nSamplesRendered, nOutChannels ) ) ), IVAS_ERR_OK ) ){

            IF( NE_32( ( error = IVAS_DEC_Setup( hIvasDec, &l_ts, &nTransportChannels, &nOutChannels, &nSamplesRendered_loop, pcmBuf + imult3216( nSamplesRendered, nOutChannels ) ) ), IVAS_ERR_OK ) )

            {

                return error;

            }

        }