Commit 84f8f5d5 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

change enum value used for selecting regular HRIRs for FastConv

parent 72cbfa0b

lib_dec/lib_dec.c

+7 −1
Original line number Diff line number Diff line
@@ -1026,28 +1026,34 @@ ivas_error IVAS_DEC_ReadFormat( 
                if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL ||

                     output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

                {

                    /* SHD transformed HRIRs */

                    *fastConv_set_cfg = IVAS_AUDIO_CONFIG_HOA3;

                }

                else if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )

                {

                    /* BRIRs */

                    *fastConv_set_cfg = IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR;

                }

            }

            else if ( st_ivas->ivas_format == MC_FORMAT )

            {

                /* BRIRs */

                *fastConv_set_cfg = IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR;



                if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

                {

                    *fastConv_set_cfg = IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB;

                    /* HRIRs */

                    *fastConv_set_cfg = IVAS_AUDIO_CONFIG_BINAURAL;

                }



                if ( st_ivas->hDecoderConfig->Opt_Headrotation )

                {

                    /* SHD transformed HRIRs for low complexity rotation */

                    *fastConv_set_cfg = IVAS_AUDIO_CONFIG_HOA3;



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

                    {

                        /* BRIRs */

                        *fastConv_set_cfg = IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR;

                    }

                }

lib_util/hrtf_file_reader.c

+1 −1
Original line number Diff line number Diff line
@@ -2020,7 +2020,7 @@ ivas_error load_fastconv_HRTF_from_binary( 


#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

        if ( ( ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV ) &&

               ( ( hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED && fastConv_set_cfg == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ||

               ( ( hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED && fastConv_set_cfg == IVAS_AUDIO_CONFIG_BINAURAL ) ||

                 ( hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA3 && fastConv_set_cfg == IVAS_AUDIO_CONFIG_HOA3 ) ||

                 ( hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA2 && fastConv_set_cfg == IVAS_AUDIO_CONFIG_HOA2 ) ||

                 ( hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_FOA && fastConv_set_cfg == IVAS_AUDIO_CONFIG_FOA ) ) ) ||