Commit f55b22e5 authored by vaclav's avatar vaclav
Browse files

rename 'fastConv_set_cfg' to 'hrtf_set_audio_cfg'

parent da0084e1

apps/decoder.c

+6 −6
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ typedef struct 
    IVAS_BIN_RENDERER_TYPE binaural_renderer_sec_old;



#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

    IVAS_AUDIO_CONFIG fastConv_set_cfg;

    IVAS_AUDIO_CONFIG hrtf_set_audio_cfg;

#else

    IVAS_AUDIO_CONFIG intern_audio_config;

    int16_t room_reverb_flag;
@@ -720,7 +720,7 @@ int main( 
    }



    /*------------------------------------------------------------------------------------------*

     * Load HRTF binary file data

     * Initialize HRTF binary file data

     *------------------------------------------------------------------------------------------*/



    if ( arg.hrtfReaderEnabled )
@@ -730,7 +730,7 @@ int main( 
        hHrtfBinary.binaural_renderer = IVAS_BIN_RENDERER_TYPE_NONE;

        hHrtfBinary.binaural_renderer_sec = IVAS_BIN_RENDERER_TYPE_NONE;

#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

        hHrtfBinary.fastConv_set_cfg = IVAS_AUDIO_CONFIG_INVALID;

        hHrtfBinary.hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_INVALID;

#else

        hHrtfBinary.room_reverb_flag = 0;

        hHrtfBinary.intern_audio_config = IVAS_AUDIO_CONFIG_INVALID;
@@ -2366,7 +2366,7 @@ static ivas_error decodeG192( 
                hHrtfBinary->binaural_renderer_old = hHrtfBinary->binaural_renderer;

                hHrtfBinary->binaural_renderer_sec_old = hHrtfBinary->binaural_renderer_sec;

#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

                if ( ( error = IVAS_DEC_ReadFormat( hIvasDec, &hHrtfBinary->binaural_renderer, &hHrtfBinary->binaural_renderer_sec, &hHrtfBinary->fastConv_set_cfg ) ) != IVAS_ERR_OK )

                if ( ( error = IVAS_DEC_ReadFormat( hIvasDec, &hHrtfBinary->binaural_renderer, &hHrtfBinary->binaural_renderer_sec, &hHrtfBinary->hrtf_set_audio_cfg ) ) != IVAS_ERR_OK )

#else

                if ( ( error = IVAS_DEC_ReadFormat( hIvasDec, &hHrtfBinary->binaural_renderer, &hHrtfBinary->binaural_renderer_sec, &hHrtfBinary->room_reverb_flag, &hHrtfBinary->intern_audio_config ) ) != IVAS_ERR_OK )

#endif
@@ -3281,7 +3281,7 @@ static ivas_error decodeVoIP( 
                hHrtf->binaural_renderer_old = hHrtf->binaural_renderer;

                hHrtf->binaural_renderer_sec_old = hHrtf->binaural_renderer_sec;

#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

                if ( ( error = IVAS_DEC_ReadFormat( hIvasDec, &hHrtf->binaural_renderer, &hHrtf->binaural_renderer_sec, &hHrtf->fastConv_set_cfg ) ) != IVAS_ERR_OK )

                if ( ( error = IVAS_DEC_ReadFormat( hIvasDec, &hHrtf->binaural_renderer, &hHrtf->binaural_renderer_sec, &hHrtf->hrtf_set_audio_cfg ) ) != IVAS_ERR_OK )

#else

                if ( ( error = IVAS_DEC_ReadFormat( hIvasDec, &hHrtf->binaural_renderer, &hHrtf->binaural_renderer_sec, &hHrtf->room_reverb_flag, &hHrtf->intern_audio_config ) ) != IVAS_ERR_OK )

#endif
@@ -3818,7 +3818,7 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile( 
            }



#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

            if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, OutputConfig, hHrtfBinary->fastConv_set_cfg, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )

            if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, OutputConfig, hHrtfBinary->hrtf_set_audio_cfg, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )

#else

            if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, hHrtfBinary->room_reverb_flag, hHrtfBinary->intern_audio_config, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )

#endif

lib_dec/lib_dec.c

+6 −6
Original line number Diff line number Diff line
@@ -910,7 +910,7 @@ ivas_error IVAS_DEC_ReadFormat( 
    IVAS_BIN_RENDERER_TYPE *binaural_renderer,     /* o  : binaural renderer type                   */

    IVAS_BIN_RENDERER_TYPE *binaural_renderer_sec, /* o  : secondary binaural renderer type         */

#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

    IVAS_AUDIO_CONFIG *fastConv_set_cfg /* o  : HRTF set audio config. for FastConv rend.*/

    IVAS_AUDIO_CONFIG *hrtf_set_audio_cfg /* o  : HRTF set audio config.                   */

#else

    int16_t *room_reverb_flag,             /* o  : room reverb flag                         */

    IVAS_AUDIO_CONFIG *intern_audio_config /* o  : internal audio configuration             */
@@ -1012,30 +1012,30 @@ ivas_error IVAS_DEC_ReadFormat( 
        }



#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

        *fastConv_set_cfg = IVAS_AUDIO_CONFIG_INVALID;

        *hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_INVALID;

        if ( *binaural_renderer == IVAS_BIN_RENDERER_TYPE_FASTCONV )

        {

            if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT )

            {

                /* SHD HRIRs */

                *fastConv_set_cfg = IVAS_AUDIO_CONFIG_HOA3;

                *hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_HOA3;



                if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )

                {

                    /* BRIRs */

                    *fastConv_set_cfg = IVAS_AUDIO_CONFIG_7_1_4;

                    *hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_7_1_4;

                }

            }

            else if ( st_ivas->ivas_format == MC_FORMAT )

            {

                /* HRIRs */

                *fastConv_set_cfg = IVAS_AUDIO_CONFIG_7_1_4;

                *hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_7_1_4;



                if ( ( st_ivas->hDecoderConfig->Opt_Headrotation ) &&

                     !( st_ivas->mc_mode == MC_MODE_PARAMUPMIX && output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) )

                {

                    /* SHD HRIRs for low complexity rotation */

                    *fastConv_set_cfg = IVAS_AUDIO_CONFIG_HOA3;

                    *hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_HOA3;

                }

            }

        }

lib_dec/lib_dec.h

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ ivas_error IVAS_DEC_ReadFormat( 
    IVAS_BIN_RENDERER_TYPE *binaural_renderer,  /* o  : binaural renderer type                                                  */

    IVAS_BIN_RENDERER_TYPE *binaural_renderer_sec,/* o: secondary binaural renderer type                                        */

#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

    IVAS_AUDIO_CONFIG *fastConv_set_cfg         /* o  : HRTF set audio config. for FastConv rend.                               */

    IVAS_AUDIO_CONFIG *hrtf_set_audio_cfg       /* o  : HRTF set audio config.                                                  */

#else

    int16_t *room_reverb_flag,                  /* o  : room reverb flag                                                        */

    IVAS_AUDIO_CONFIG *intern_audio_config      /* o  : internal audio configuration                                            */

lib_util/hrtf_file_reader.c

+9 −9
Original line number Diff line number Diff line
@@ -260,13 +260,13 @@ static ivas_error read_hrtf_binary_header( 
 --------------------------------------------------------------------*/



static BINAURAL_INPUT_AUDIO_CONFIG audio_cfg_2_binaural_cfg(

    const IVAS_AUDIO_CONFIG fastConv_set_cfg )

    const IVAS_AUDIO_CONFIG hrtf_set_audio_cfg )

{

    BINAURAL_INPUT_AUDIO_CONFIG hrtf_set_binaural_cfg;



    hrtf_set_binaural_cfg = BINAURAL_INPUT_AUDIO_CONFIG_UNDEFINED;



    switch ( fastConv_set_cfg )

    switch ( hrtf_set_audio_cfg )

    {

        case IVAS_AUDIO_CONFIG_7_1_4:

            hrtf_set_binaural_cfg = BINAURAL_INPUT_AUDIO_CONFIG_COMBINED;
@@ -2024,7 +2024,7 @@ ivas_error load_fastconv_HRTF_from_binary( 
    IVAS_DEC_HRTF_FASTCONV_HANDLE hHrtfFastConv, /* i/o: FastConv HRTF handle               */

#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

    const IVAS_AUDIO_CONFIG OutputConfig,       /* i  : output audio configuration         */

    const IVAS_AUDIO_CONFIG fastConv_set_cfg, /* i  : HRTF set audio config. for FastConv rend.  */

    const IVAS_AUDIO_CONFIG hrtf_set_audio_cfg, /* i  : HRTF set audio config.             */

#else

    const int16_t room_reverb_flag,              /* i  : room reverb flag                   */

    const IVAS_AUDIO_CONFIG intern_audio_config, /* i  : internal audio configuration       */
@@ -2045,7 +2045,7 @@ ivas_error load_fastconv_HRTF_from_binary( 
    BINAURAL_INPUT_AUDIO_CONFIG hrtf_set_binaural_cfg;



    /* convert audio config. to HRTF binaural config */

    hrtf_set_binaural_cfg = audio_cfg_2_binaural_cfg( fastConv_set_cfg );

    hrtf_set_binaural_cfg = audio_cfg_2_binaural_cfg( hrtf_set_audio_cfg );

#endif



    if ( hrtfReader == NULL || hrtfReader->file == NULL )

lib_util/hrtf_file_reader.h

+2 −2
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ ivas_error load_fastconv_HRTF_from_binary( 
    IVAS_DEC_HRTF_FASTCONV_HANDLE hHrtfFastConv, /* i/o: FastConv HRTF handle             */

#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

    const IVAS_AUDIO_CONFIG OutputConfig,       /* i  : output audio configuration       */

    const IVAS_AUDIO_CONFIG hrtf_set_config, /* i  : HRTF set audio config. for FastConv rend.  */

    const IVAS_AUDIO_CONFIG hrtf_set_audio_cfg, /* i  : HRTF set audio config.           */

#else

    const int16_t room_reverb_flag,        /* i  : room reverb flag                 */

    IVAS_AUDIO_CONFIG intern_audio_config, /* i  : internal audio configuration     */

lib_rend/lib_rend.c

+1 −1

File changed.

Contains only whitespace changes.