Commit ab64436d authored by vaclav's avatar vaclav
Browse files

build warning

parent 825c5046

lib_dec/ivas_binRenderer_internal.c

+5 −0
Original line number Diff line number Diff line
@@ -780,6 +780,11 @@ static ivas_error ivas_binaural_hrtf_open( 
                    HrtfFastConv->rightHRIRImag_HOA3[i][j] = rightHRIRImag_HOA3[i][j];

                }

            }



#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

            /* Note: IVAS_AUDIO_CONFIG_HOA2 and IVAS_AUDIO_CONFIG_FOA input configs. are not relevant in internal renderer 

            as SBA to binaural always synthesizes HOA3 output for binauralization. However, the external renderer can use them. */

#endif

            if ( input_config == IVAS_AUDIO_CONFIG_HOA2 )

            {

                for ( j = 0; j < HOA2_CHANNELS; j++ )

lib_util/hrtf_file_reader.c

+5 −5
Original line number Diff line number Diff line
@@ -1942,11 +1942,11 @@ 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.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM ) &&

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

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

                 ( 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 ) ) ||

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

             ( ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV || hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM ) && fastConv_set_cfg == IVAS_AUDIO_CONFIG_EXTERNAL ) )

#else

        if ( ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV &&