Commit dafeeebe authored by vaclav's avatar vaclav
Browse files

fix MC_MODE_PARAMUPMIX

parent 79342408

lib_dec/lib_dec.c

+5 −0
Original line number Diff line number Diff line
@@ -1027,6 +1027,11 @@ ivas_error IVAS_DEC_ReadFormat( 
                if ( st_ivas->hDecoderConfig->Opt_Headrotation )

                {

                    *fastConv_set_cfg = IVAS_AUDIO_CONFIG_HOA3;



                    if ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX )

                    {

                        *fastConv_set_cfg = IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR;

                    }

                }

            }

        }

lib_util/hrtf_file_reader.c

+4 −0
Original line number Diff line number Diff line
@@ -1942,12 +1942,16 @@ ivas_error load_fastconv_HRTF_from_binary( 
        }



#ifdef FIX_1226_FASTCONV_HRTF_LOADING_OPTIM

#if 1

        if ( hrtf_id == 4 )

#else

        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.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV || hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM ) && fastConv_set_cfg == IVAS_AUDIO_CONFIG_EXTERNAL ) )

#endif

#else

        if ( ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV &&

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