Commit c1677aa1 authored by emerit's avatar emerit
Browse files

Merge branch 'main' into hrtf_binary

parents a8fdd930 61a88e5d

apps/decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ int main( 


    if ( arg.hrtfReaderEnabled )

    {

        if ( ( ( error = hrtfFileReader_open( arg.hrtfFileName, &hrtfReader ) ) != IVAS_ERR_OK ) )

        if ( ( error = hrtfFileReader_open( arg.hrtfFileName, &hrtfReader ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError: Can't open HRTF binary file %s \n\n", arg.hrtfFileName );

            goto cleanup;

lib_dec/ivas_dec.c

+2 −1
Original line number Diff line number Diff line
@@ -413,13 +413,14 @@ ivas_error ivas_dec( 
                                                       &st_ivas->hIntSetup,

                                                       st_ivas->hEFAPdata,

                                                       output,

                                                       output_Fs ) != IVAS_ERR_OK ) )

                                                       output_Fs ) ) != IVAS_ERR_OK )

                {

                    return error;

                }

#else

                ivas_crend_process( st_ivas, output );

#endif



                ivas_binaural_add_LFE( st_ivas, output_frame, output );

            }

            else if ( st_ivas->renderer_type == RENDERER_MC )

lib_dec/ivas_init_dec.c

+3 −1
Original line number Diff line number Diff line
@@ -1218,6 +1218,7 @@ ivas_error ivas_init_decoder( 
                return error;

            }

        }



        if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ),

                                            getRendAudioConfigFromIvasAudioConfig( st_ivas->intern_config ),

                                            getRendAudioConfigFromIvasAudioConfig( st_ivas->hDecoderConfig->output_config ),
@@ -1225,10 +1226,11 @@ ivas_error ivas_init_decoder( 
#ifdef HRTF_BINARY_FILE

                                            st_ivas->hSetOfHRTF,

#endif

                                            st_ivas->hDecoderConfig->output_Fs ) != IVAS_ERR_OK ) )

                                            st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

        {

            return error;

        }



        st_ivas->binaural_latency_ns = st_ivas->hCrendWrapper->binaural_latency_ns;

#else

        if ( ivas_crend_open( st_ivas ) != IVAS_ERR_OK )

lib_dec/ivas_mct_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1140,7 +1140,7 @@ static ivas_error ivas_mc_dec_reconfig( 
#ifdef HRTF_BINARY_FILE

                                                    st_ivas->hSetOfHRTF,

#endif

                                                    st_ivas->hDecoderConfig->output_Fs ) != IVAS_ERR_OK ) )

                                                    st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

                {

                    return error;

                }

lib_rend/lib_rend.c

+3 −3
Original line number Diff line number Diff line
@@ -3389,7 +3389,7 @@ ivas_error IVAS_REND_GetDelay( 
        if ( hIvasRend->inputsIsm[i].base.inConfig != IVAS_REND_AUDIO_CONFIG_UNKNOWN )

        {

#ifdef FIX_197_CREND_INTERFACE

            latency_ns = max( hIvasRend->inputsIsm[i].crendWrapper->binaural_latency_ns,

            latency_ns = max( ( hIvasRend->inputsIsm[i].crendWrapper != NULL ) ? hIvasRend->inputsIsm[i].crendWrapper->binaural_latency_ns : 0,

                              hIvasRend->inputsIsm[i].tdRendWrapper.binaural_latency_ns );

#else

            latency_ns = max( hIvasRend->inputsIsm[i].crendWrapper.binaural_latency_ns,
@@ -3404,7 +3404,7 @@ ivas_error IVAS_REND_GetDelay( 
        if ( hIvasRend->inputsMc[i].base.inConfig != IVAS_REND_AUDIO_CONFIG_UNKNOWN )

        {

#ifdef FIX_197_CREND_INTERFACE

            latency_ns = max( hIvasRend->inputsMc[i].crendWrapper->binaural_latency_ns,

            latency_ns = max( ( hIvasRend->inputsMc[i].crendWrapper != NULL ) ? hIvasRend->inputsMc[i].crendWrapper->binaural_latency_ns : 0,

                              hIvasRend->inputsMc[i].tdRendWrapper.binaural_latency_ns );

#else

            latency_ns = max( hIvasRend->inputsMc[i].crendWrapper.binaural_latency_ns,
@@ -3419,7 +3419,7 @@ ivas_error IVAS_REND_GetDelay( 
        if ( hIvasRend->inputsSba[i].base.inConfig != IVAS_REND_AUDIO_CONFIG_UNKNOWN )

        {

#ifdef FIX_197_CREND_INTERFACE

            latency_ns = hIvasRend->inputsSba[i].crendWrapper->binaural_latency_ns;

            latency_ns = ( hIvasRend->inputsSba[i].crendWrapper != NULL ) ? hIvasRend->inputsSba[i].crendWrapper->binaural_latency_ns : 0;

#else

            latency_ns = hIvasRend->inputsSba[i].crendWrapper.binaural_latency_ns;

#endif