From 9a4189b4310228dae3e85387a5caaa50d2502ee1 Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Wed, 10 May 2023 21:57:07 +0200 Subject: [PATCH] [update] see presentation from 2023.05.11 - enable selective decoding of streams for efficiency - refactoring and tuning of pose correction - various bugfixes - update to recent main --- .gitattributes | 1 + .gitignore | 11 +- .gitlab-ci.yml | 263 +- .../{generic_issue.md => default.md} | 0 .gitlab/issue_templates/sanitizer_error.md | 39 + CMakeLists.txt | 48 +- LICENSE.md | 2 +- Makefile | 33 +- Workspace_msvc/Workspace_msvc.sln | 39 - Workspace_msvc/decoder.vcxproj | 75 +- Workspace_msvc/encoder.vcxproj | 4 +- Workspace_msvc/lib_com.vcxproj | 5 +- Workspace_msvc/lib_com.vcxproj.filters | 9 +- Workspace_msvc/lib_debug.vcxproj | 16 +- Workspace_msvc/lib_dec.vcxproj | 14 +- Workspace_msvc/lib_dec.vcxproj.filters | 30 +- Workspace_msvc/lib_enc.vcxproj | 1 + Workspace_msvc/lib_enc.vcxproj.filters | 3 + Workspace_msvc/lib_rend.vcxproj | 15 +- Workspace_msvc/lib_util.vcxproj | 8 +- Workspace_msvc/renderer.vcxproj | 6 +- ...t_renderer_config_512_0dof_tdposecorr.txt} | 2 +- .../split_renderer_config_768_2dof.txt | 10 + ...it_renderer_config_HBR_1dof_tdposecorr.txt | 11 + apps/decoder.c | 1279 +- apps/encoder.c | 238 +- apps/renderer.c | 912 +- ci/__init__.py | 0 ci/build_all_linux.sh | 2 +- ci/build_codec_instrumented_linux.sh | 2 +- ci/build_codec_sanitizers_linux.sh | 2 +- ci/check_for_warnings.py | 2 +- ci/comment_defines.py | 2 +- .../genWebpageData_Prom.csh | 220 - .../genWebpageData_Ram.csh | 54 +- .../genWebpageData_Rom.csh | 415 +- .../genWebpageData_WMOPS.csh | 2 +- .../genWebpageData_WmopPerOperatingpoint.csh | 2 +- ci/complexity_measurements/getWmops.sh | 28 +- .../index_complexity.html | 328 +- .../mergeNewsletterRam.py | 24 +- .../mergeNewsletterRom.py | 98 + .../parseNewsletterProm.py | 73 - .../parseNewsletterRam.py | 134 +- .../parseNewsletterRom.py | 134 +- .../parseNewsletterWmops.py | 2 +- ci/get_id_of_last_job_occurence.py | 75 +- ci/index-pages.html | 6 + ci/ivas_voip_be_test.sh | 144 + ci/run_evs_be_test.py | 2 +- ci/run_scheduled_sanitizer_test.py | 23 +- ci/setup_pages.py | 77 + ci/smoke_test.sh | 75 +- lib_com/ACcontextMapping.c | 4 +- lib_com/ari.c | 4 +- lib_com/ari_hm.c | 8 +- lib_com/arith_coder.c | 9 +- lib_com/basop32.c | 7 +- lib_com/basop32.h | 2 +- lib_com/basop_com_lpc.c | 8 +- lib_com/basop_lsf_tools.c | 7 +- lib_com/basop_mpy.c | 7 +- lib_com/basop_mpy.h | 2 +- lib_com/basop_proto_func.h | 2 +- lib_com/basop_settings.h | 2 +- lib_com/basop_tcx_utils.c | 7 +- lib_com/basop_util.c | 7 +- lib_com/basop_util.h | 2 +- lib_com/bitalloc.c | 9 +- lib_com/bitallocsum.c | 4 +- lib_com/bits_alloc.c | 51 +- lib_com/bitstream.c | 160 +- lib_com/calc_st_com.c | 4 +- lib_com/cb_shape.c | 4 +- lib_com/cldfb.c | 32 +- lib_com/cng_exc.c | 4 +- lib_com/cnst.h | 36 +- lib_com/codec_tcx_common.c | 4 +- lib_com/common_api_types.h | 44 +- lib_com/control.h | 2 +- lib_com/core_com_config.c | 43 +- lib_com/deemph.c | 4 +- lib_com/delay_comp.c | 27 +- lib_com/disclaimer.c | 5 +- lib_com/dlpc_bfi.c | 4 +- lib_com/edct.c | 4 +- lib_com/enh1632.c | 8 +- lib_com/enh1632.h | 2 +- lib_com/enh40.c | 16 +- lib_com/enh40.h | 2 +- lib_com/enhancer.c | 4 +- lib_com/enr_1_az.c | 4 +- lib_com/env_adj.c | 4 +- lib_com/env_stab.c | 102 +- lib_com/env_stab_trans.c | 4 +- lib_com/est_tilt.c | 4 +- lib_com/fd_cng_com.c | 10 +- lib_com/fft.c | 8 +- lib_com/fft_cldfb.c | 4 +- lib_com/fft_rel.c | 4 +- lib_com/fill_spectrum.c | 4 +- lib_com/findpulse.c | 4 +- lib_com/fine_gain_bits.c | 4 +- lib_com/frame_ener.c | 4 +- lib_com/get_gain.c | 4 +- lib_com/gs_bitallocation.c | 4 +- lib_com/gs_gains.c | 4 +- lib_com/gs_inact_switching.c | 4 +- lib_com/gs_noisefill.c | 4 +- lib_com/gs_preech.c | 4 +- lib_com/guided_plc_util.c | 4 +- lib_com/hp50.c | 5 +- lib_com/hq2_bit_alloc.c | 18 +- lib_com/hq2_core_com.c | 8 +- lib_com/hq2_noise_inject.c | 4 +- lib_com/hq_bit_allocation.c | 4 +- lib_com/hq_conf.c | 4 +- lib_com/hq_tools.c | 4 +- lib_com/hvq_pvq_bitalloc.c | 4 +- lib_com/ifft_rel.c | 4 +- lib_com/igf_base.c | 4 +- lib_com/index_pvq_opt.c | 9 +- lib_com/int_lsp.c | 4 +- lib_com/interleave_spectrum.c | 4 +- lib_com/interpol.c | 8 +- lib_com/isf_dec_amr_wb.c | 4 +- lib_com/ivas_agc_com.c | 4 +- lib_com/ivas_arith.c | 4 +- lib_com/ivas_avq_pos_reorder_com.c | 4 +- lib_com/ivas_cnst.h | 161 +- lib_com/ivas_cov_smooth.c | 160 +- lib_com/ivas_dirac_com.c | 12 +- lib_com/ivas_entropy_coder_common.c | 12 +- lib_com/ivas_error.h | 32 +- lib_com/ivas_error_utils.h | 3 +- lib_com/ivas_fb_mixer.c | 195 +- lib_com/ivas_filters.c | 4 +- lib_com/{ivas_ism_config.c => ivas_ism_com.c} | 201 +- lib_com/ivas_masa_com.c | 27 +- lib_com/ivas_mc_com.c | 7 +- lib_com/ivas_mc_param_com.c | 178 +- lib_com/ivas_mcmasa_com.c | 40 +- lib_com/ivas_mct_com.c | 26 +- lib_com/ivas_mdct_core_com.c | 4 +- lib_com/ivas_mdct_imdct.c | 9 +- lib_com/ivas_mdft_imdft.c | 9 +- lib_com/ivas_pca_tools.c | 4 +- lib_com/ivas_prot.h | 1572 +- lib_com/ivas_qmetadata_com.c | 98 +- lib_com/ivas_qspherical_com.c | 4 +- lib_com/ivas_rom_com.c | 660 +- lib_com/ivas_rom_com.h | 42 +- lib_com/ivas_sba_config.c | 62 +- lib_com/ivas_sns_com.c | 4 +- lib_com/ivas_spar_com.c | 98 +- lib_com/ivas_spar_com_quant_util.c | 4 +- lib_com/ivas_stat_com.h | 61 +- lib_com/ivas_stereo_dft_com.c | 4 +- lib_com/ivas_stereo_eclvq_com.c | 4 +- lib_com/ivas_stereo_ica_com.c | 4 +- lib_com/ivas_stereo_mdct_bands_com.c | 7 +- lib_com/ivas_stereo_mdct_stereo_com.c | 4 +- lib_com/ivas_stereo_psychlpc_com.c | 4 +- lib_com/ivas_stereo_td_bit_alloc.c | 139 +- {lib_dec => lib_com}/ivas_td_decorr.c | 167 +- lib_com/ivas_tools.c | 98 +- lib_com/ivas_transient_det.c | 66 +- lib_com/lag_wind.c | 4 +- lib_com/lerp.c | 4 +- lib_com/limit_t0.c | 4 +- lib_com/logqnorm.c | 4 +- lib_com/longarith.c | 4 +- lib_com/low_rate_band_att.c | 4 +- lib_com/lpc_tools.c | 4 +- lib_com/lsf_dec_bfi.c | 4 +- lib_com/lsf_msvq_ma.c | 4 +- lib_com/lsf_tools.c | 292 +- lib_com/lsp_conv_poly.c | 4 +- lib_com/mime.h | 2 +- lib_com/modif_fs.c | 8 +- lib_com/move.h | 2 +- lib_com/mslvq_com.c | 4 +- lib_com/nelp.c | 4 +- lib_com/options.h | 79 +- lib_com/parameter_bitmaping.c | 20 +- lib_com/phase_dispersion.c | 4 +- lib_com/ppp.c | 4 +- lib_com/pred_lt4.c | 4 +- lib_com/preemph.c | 4 +- lib_com/prot.h | 376 +- lib_com/pvq_com.c | 9 +- lib_com/range_com.c | 4 +- lib_com/re8_ppv.c | 6 +- lib_com/re8_util.c | 4 +- lib_com/realft.c | 4 +- lib_com/recovernorm.c | 4 +- lib_com/reordvct.c | 4 +- lib_com/residu.c | 4 +- lib_com/rom_com.c | 304 +- lib_com/rom_com.h | 48 +- lib_com/stab_est.c | 4 +- lib_com/stat_com.h | 3 +- lib_com/stat_noise_uv_mod.c | 4 +- lib_com/stl.h | 2 +- lib_com/swb_bwe_com.c | 4 +- lib_com/swb_bwe_com_hr.c | 4 +- lib_com/swb_bwe_com_lr.c | 4 +- lib_com/swb_tbe_com.c | 6 +- lib_com/syn_12k8.c | 4 +- lib_com/syn_filt.c | 4 +- lib_com/tcq_position_arith.c | 4 +- lib_com/tcx_ltp.c | 4 +- lib_com/tcx_mdct.c | 4 +- lib_com/tcx_mdct_window.c | 4 +- lib_com/tcx_utils.c | 68 +- lib_com/tec_com.c | 4 +- lib_com/tns_base.c | 64 +- lib_com/tools.c | 27 +- lib_com/trans_direct.c | 4 +- lib_com/trans_inv.c | 4 +- lib_com/typedef.h | 2 +- lib_com/vlpc_2st_com.c | 4 +- lib_com/weight.c | 4 +- lib_com/weight_a.c | 4 +- lib_com/wi.c | 1091 +- lib_com/window.c | 9 +- lib_com/window_ola.c | 4 +- lib_com/wtda.c | 4 +- lib_debug/debug.c | 6 +- lib_debug/debug.h | 4 +- lib_debug/mem_count.c | 933 - lib_debug/mem_count.h | 110 - lib_debug/memory.c | 187 - lib_debug/sba_debug.c | 5 +- lib_debug/sba_debug.h | 2 +- lib_debug/snr.c | 154 +- lib_debug/wmc_auto.c | 1926 + lib_debug/{wmops.h => wmc_auto.h} | 642 +- lib_debug/wmops.c | 503 - lib_dec/ACcontextMapping_dec.c | 4 +- lib_dec/FEC.c | 8 +- lib_dec/FEC_HQ_core.c | 4 +- lib_dec/FEC_HQ_phase_ecu.c | 4 +- lib_dec/FEC_adapt_codebook.c | 4 +- lib_dec/FEC_clas_estim.c | 4 +- lib_dec/FEC_lsf_estim.c | 4 +- lib_dec/FEC_pitch_estim.c | 4 +- lib_dec/FEC_scale_syn.c | 4 +- lib_dec/LD_music_post_filter.c | 4 +- lib_dec/TonalComponentDetection.c | 4 +- lib_dec/acelp_core_dec.c | 69 +- lib_dec/acelp_core_switch_dec.c | 8 +- lib_dec/amr_wb_dec.c | 4 +- lib_dec/ari_dec.c | 4 +- lib_dec/ari_hm_dec.c | 4 +- lib_dec/arith_coder_dec.c | 8 +- lib_dec/avq_dec.c | 4 +- lib_dec/bass_psfilter.c | 4 +- lib_dec/cng_dec.c | 14 +- lib_dec/core_dec_init.c | 14 +- lib_dec/core_dec_reconf.c | 4 +- lib_dec/core_dec_switch.c | 8 +- lib_dec/core_switching_dec.c | 52 +- lib_dec/d_gain2p.c | 5 +- lib_dec/dec2t32.c | 4 +- lib_dec/dec4t64.c | 4 +- lib_dec/dec_LPD.c | 4 +- lib_dec/dec_ace.c | 4 +- lib_dec/dec_acelp.c | 5 +- lib_dec/dec_acelp_tcx_main.c | 8 +- lib_dec/dec_amr_wb.c | 4 +- lib_dec/dec_gen_voic.c | 8 +- lib_dec/dec_higher_acelp.c | 4 +- lib_dec/dec_nelp.c | 4 +- lib_dec/dec_pit_exc.c | 4 +- lib_dec/dec_post.c | 4 +- lib_dec/dec_ppp.c | 4 +- lib_dec/dec_prm.c | 4 +- lib_dec/dec_tcx.c | 41 +- lib_dec/dec_tran.c | 4 +- lib_dec/dec_uv.c | 4 +- lib_dec/decision_matrix_dec.c | 4 +- lib_dec/dlpc_avq.c | 4 +- lib_dec/dlpc_stoch.c | 27 +- lib_dec/er_dec_acelp.c | 4 +- lib_dec/er_dec_tcx.c | 4 +- lib_dec/er_scale_syn.c | 4 +- lib_dec/er_sync_exc.c | 4 +- lib_dec/er_util.c | 7 +- lib_dec/evs_dec.c | 18 +- lib_dec/fd_cng_dec.c | 144 +- lib_dec/gain_dec.c | 4 +- lib_dec/gaus_dec.c | 4 +- lib_dec/gs_dec.c | 8 +- lib_dec/gs_dec_amr_wb.c | 4 +- lib_dec/hdecnrm.c | 4 +- lib_dec/hf_synth.c | 4 +- lib_dec/hq_classifier_dec.c | 4 +- lib_dec/hq_conf_fec.c | 4 +- lib_dec/hq_core_dec.c | 10 +- lib_dec/hq_env_dec.c | 4 +- lib_dec/hq_hr_dec.c | 29 +- lib_dec/hq_lr_dec.c | 30 +- lib_dec/igf_dec.c | 19 +- lib_dec/igf_scf_dec.c | 4 +- lib_dec/init_dec.c | 89 +- lib_dec/inov_dec.c | 4 +- lib_dec/ivas_agc_dec.c | 36 +- .../ivas_binRenderer_internal.c | 276 +- lib_dec/ivas_core_dec.c | 86 +- lib_dec/ivas_corecoder_dec_reconfig.c | 184 +- lib_dec/ivas_cpe_dec.c | 103 +- lib_dec/ivas_dec.c | 121 +- lib_dec/ivas_decision_matrix_dec.c | 8 +- lib_dec/ivas_dirac_dec.c | 639 +- lib_dec/ivas_dirac_decorr_dec.c | 130 +- lib_dec/ivas_dirac_onsets_dec.c | 18 +- lib_dec/ivas_dirac_output_synthesis_cov.c | 66 +- lib_dec/ivas_dirac_output_synthesis_dec.c | 169 +- lib_dec/ivas_entropy_decoder.c | 4 +- lib_dec/ivas_init_dec.c | 598 +- lib_dec/ivas_ism_dec.c | 361 + lib_dec/ivas_ism_dtx_dec.c | 200 + lib_dec/ivas_ism_metadata_dec.c | 850 +- lib_dec/ivas_ism_param_dec.c | 562 +- lib_dec/ivas_ism_renderer.c | 110 +- lib_dec/ivas_lfe_dec.c | 42 +- lib_dec/ivas_lfe_plc.c | 4 +- {lib_rend => lib_dec}/ivas_ls_custom_dec.c | 11 +- lib_dec/ivas_masa_dec.c | 290 +- lib_dec/ivas_mc_param_dec.c | 719 +- lib_dec/ivas_mcmasa_dec.c | 159 + lib_dec/ivas_mct_core_dec.c | 26 +- lib_dec/ivas_mct_dec.c | 670 +- lib_dec/ivas_mct_dec_mct.c | 35 +- lib_dec/ivas_mdct_core_dec.c | 277 +- lib_dec/ivas_mono_dmx_renderer.c | 13 +- .../ivas_objectRenderer_internal.c | 103 +- lib_dec/ivas_out_setup_conversion.c | 68 +- lib_dec/ivas_output_config.c | 449 + lib_dec/ivas_pca_dec.c | 4 +- lib_dec/ivas_post_proc.c | 11 +- lib_dec/ivas_qmetadata_dec.c | 9 +- lib_dec/ivas_qspherical_dec.c | 4 +- lib_dec/ivas_range_uni_dec.c | 4 +- lib_dec/ivas_rom_dec.c | 55 +- lib_dec/ivas_rom_dec.h | 49 +- lib_dec/ivas_sba_dec.c | 922 +- lib_dec/ivas_sba_dirac_stereo_dec.c | 589 +- lib_dec/ivas_sba_rendering_internal.c | 629 + lib_dec/ivas_sce_dec.c | 69 +- lib_dec/ivas_sns_dec.c | 136 +- lib_dec/ivas_spar_decoder.c | 211 +- lib_dec/ivas_spar_md_dec.c | 650 +- lib_dec/ivas_stat_dec.h | 1100 +- lib_dec/ivas_stereo_adapt_GR_dec.c | 4 +- lib_dec/ivas_stereo_cng_dec.c | 15 +- lib_dec/ivas_stereo_dft_dec.c | 263 +- lib_dec/ivas_stereo_dft_dec_dmx.c | 8 +- lib_dec/ivas_stereo_dft_plc.c | 4 +- lib_dec/ivas_stereo_eclvq_dec.c | 4 +- lib_dec/ivas_stereo_esf_dec.c | 4 +- lib_dec/ivas_stereo_ica_dec.c | 4 +- lib_dec/ivas_stereo_icbwe_dec.c | 4 +- lib_dec/ivas_stereo_mdct_core_dec.c | 24 +- lib_dec/ivas_stereo_mdct_stereo_dec.c | 23 +- lib_dec/ivas_stereo_switching_dec.c | 200 +- lib_dec/ivas_stereo_td_dec.c | 4 +- lib_dec/ivas_svd_dec.c | 8 +- lib_dec/ivas_tcx_core_dec.c | 30 +- lib_dec/ivas_td_low_rate_dec.c | 4 +- lib_dec/ivas_vbap.c | 174 +- lib_dec/jbm_jb4_circularbuffer.c | 27 +- lib_dec/jbm_jb4_circularbuffer.h | 4 +- lib_dec/jbm_jb4_inputbuffer.c | 39 +- lib_dec/jbm_jb4_inputbuffer.h | 9 +- lib_dec/jbm_jb4_jmf.c | 54 +- lib_dec/jbm_jb4_jmf.h | 8 +- lib_dec/jbm_jb4sb.c | 90 +- lib_dec/jbm_jb4sb.h | 11 +- lib_dec/jbm_pcmdsp_apa.c | 64 +- lib_dec/jbm_pcmdsp_apa.h | 11 +- lib_dec/jbm_pcmdsp_fifo.c | 39 +- lib_dec/jbm_pcmdsp_fifo.h | 8 +- lib_dec/jbm_pcmdsp_similarityestimation.c | 4 +- lib_dec/jbm_pcmdsp_similarityestimation.h | 2 +- lib_dec/jbm_pcmdsp_window.c | 4 +- lib_dec/jbm_pcmdsp_window.h | 2 +- lib_dec/lead_deindexing.c | 4 +- lib_dec/lib_dec.c | 549 +- lib_dec/lib_dec.h | 85 +- lib_dec/lp_exc_d.c | 4 +- lib_dec/lsf_dec.c | 22 +- lib_dec/lsf_msvq_ma_dec.c | 17 +- lib_dec/nelp_dec.c | 4 +- lib_dec/peak_vq_dec.c | 4 +- lib_dec/pit_dec.c | 4 +- lib_dec/pitch_extr.c | 8 +- lib_dec/post_dec.c | 4 +- lib_dec/ppp_dec.c | 6 +- lib_dec/pvq_core_dec.c | 8 +- lib_dec/pvq_decode.c | 4 +- lib_dec/range_dec.c | 4 +- lib_dec/re8_dec.c | 4 +- lib_dec/rom_dec.c | 4 +- lib_dec/rom_dec.h | 2 +- lib_dec/rst_dec.c | 4 +- lib_dec/stat_dec.h | 11 +- lib_dec/stat_noise_uv_dec.c | 4 +- lib_dec/swb_bwe_dec.c | 4 +- lib_dec/swb_bwe_dec_hr.c | 4 +- lib_dec/swb_bwe_dec_lr.c | 4 +- lib_dec/swb_tbe_dec.c | 9 +- lib_dec/syn_outp.c | 4 +- lib_dec/tcq_core_dec.c | 32 +- lib_dec/tcx_utils_dec.c | 4 +- lib_dec/tns_base_dec.c | 4 +- lib_dec/tonalMDCTconcealment.c | 32 +- lib_dec/transition_dec.c | 4 +- lib_dec/updt_dec.c | 25 +- lib_dec/vlpc_1st_dec.c | 4 +- lib_dec/vlpc_2st_dec.c | 4 +- lib_dec/voiced_dec.c | 10 +- lib_dec/waveadjust_fec_dec.c | 4 +- lib_enc/ACcontextMapping_enc.c | 4 +- lib_enc/FEC_enc.c | 4 +- lib_enc/SNR_calc.c | 4 +- lib_enc/acelp_core_enc.c | 56 +- lib_enc/acelp_core_switch_enc.c | 8 +- lib_enc/acelp_enc_util.c | 5 +- lib_enc/amr_wb_enc.c | 19 +- lib_enc/analy_lp.c | 4 +- lib_enc/analy_sp.c | 4 +- lib_enc/ari_enc.c | 4 +- lib_enc/ari_hm_enc.c | 4 +- lib_enc/arith_coder_enc.c | 12 +- lib_enc/avq_cod.c | 4 +- lib_enc/bass_psfilter_enc.c | 4 +- lib_enc/bw_detect.c | 56 +- lib_enc/cng_enc.c | 4 +- lib_enc/cod2t32.c | 4 +- lib_enc/cod4t64.c | 4 +- lib_enc/cod4t64_fast.c | 4 +- lib_enc/cod_ace.c | 4 +- lib_enc/cod_tcx.c | 35 +- lib_enc/cod_uv.c | 4 +- lib_enc/comvad_decision.c | 4 +- lib_enc/cor_shif.c | 4 +- lib_enc/core_enc_2div.c | 4 +- lib_enc/core_enc_init.c | 6 +- lib_enc/core_enc_ol.c | 4 +- lib_enc/core_enc_reconf.c | 4 +- lib_enc/core_enc_switch.c | 10 +- lib_enc/core_enc_updt.c | 4 +- lib_enc/core_switching_enc.c | 16 +- lib_enc/corr_xh.c | 4 +- lib_enc/decision_matrix_enc.c | 4 +- lib_enc/detect_transient.c | 4 +- lib_enc/diffcod.c | 4 +- lib_enc/dtx.c | 5 +- lib_enc/enc_acelp.c | 5 +- lib_enc/enc_acelp_tcx_main.c | 8 +- lib_enc/enc_acelpx.c | 5 +- lib_enc/enc_amr_wb.c | 4 +- lib_enc/enc_gain.c | 5 +- lib_enc/enc_gen_voic.c | 4 +- lib_enc/enc_gen_voic_rf.c | 4 +- lib_enc/enc_higher_acelp.c | 4 +- lib_enc/enc_nelp.c | 4 +- lib_enc/enc_pit_exc.c | 8 +- lib_enc/enc_ppp.c | 4 +- lib_enc/enc_prm.c | 4 +- lib_enc/enc_tran.c | 4 +- lib_enc/enc_uv.c | 4 +- lib_enc/energy.c | 4 +- lib_enc/eval_pit_contr.c | 4 +- lib_enc/evs_enc.c | 46 +- lib_enc/ext_sig_ana.c | 54 +- lib_enc/fd_cng_enc.c | 174 +- lib_enc/find_tar.c | 4 +- lib_enc/find_tilt.c | 4 +- lib_enc/find_uv.c | 4 +- lib_enc/find_wsp.c | 4 +- lib_enc/frame_spec_dif_cor_rate.c | 4 +- lib_enc/gain_enc.c | 4 +- lib_enc/gaus_enc.c | 4 +- lib_enc/gp_clip.c | 4 +- lib_enc/gs_enc.c | 4 +- lib_enc/guided_plc_enc.c | 4 +- lib_enc/hf_cod_amrwb.c | 4 +- lib_enc/hq_classifier_enc.c | 4 +- lib_enc/hq_core_enc.c | 10 +- lib_enc/hq_env_enc.c | 4 +- lib_enc/hq_hr_enc.c | 4 +- lib_enc/hq_lr_enc.c | 30 +- lib_enc/hvq_enc.c | 4 +- lib_enc/igf_enc.c | 4 +- lib_enc/igf_scf_enc.c | 4 +- lib_enc/init_enc.c | 101 +- lib_enc/inov_enc.c | 4 +- lib_enc/isf_enc_amr_wb.c | 4 +- lib_enc/ivas_agc_enc.c | 39 +- lib_enc/ivas_core_enc.c | 34 +- lib_enc/ivas_core_pre_proc.c | 12 +- lib_enc/ivas_core_pre_proc_front.c | 111 +- lib_enc/ivas_corecoder_enc_reconfig.c | 149 +- lib_enc/ivas_cpe_enc.c | 110 +- lib_enc/ivas_decision_matrix_enc.c | 8 +- lib_enc/ivas_dirac_enc.c | 88 +- lib_enc/ivas_enc.c | 70 +- lib_enc/ivas_enc_cov_handler.c | 38 +- lib_enc/ivas_entropy_coder.c | 4 +- lib_enc/ivas_front_vad.c | 42 +- lib_enc/ivas_init_enc.c | 226 +- lib_enc/ivas_ism_dtx_enc.c | 407 + lib_enc/ivas_ism_enc.c | 250 +- lib_enc/ivas_ism_metadata_enc.c | 1006 +- lib_enc/ivas_ism_param_enc.c | 167 +- lib_enc/ivas_lfe_enc.c | 32 +- lib_enc/ivas_masa_enc.c | 745 +- lib_enc/ivas_mc_param_enc.c | 204 +- lib_enc/ivas_mcmasa_enc.c | 251 +- lib_enc/ivas_mct_core_enc.c | 100 +- lib_enc/ivas_mct_enc.c | 393 +- lib_enc/ivas_mct_enc_mct.c | 74 +- lib_enc/ivas_mdct_core_enc.c | 255 +- lib_enc/ivas_pca_enc.c | 5 +- lib_enc/ivas_qmetadata_enc.c | 31 +- lib_enc/ivas_qspherical_enc.c | 4 +- lib_enc/ivas_range_uni_enc.c | 4 +- lib_enc/ivas_rom_enc.c | 4 +- lib_enc/ivas_rom_enc.h | 2 +- lib_enc/ivas_sba_enc.c | 422 +- lib_enc/ivas_sce_enc.c | 28 +- lib_enc/ivas_sns_enc.c | 178 +- lib_enc/ivas_spar_encoder.c | 367 +- lib_enc/ivas_spar_md_enc.c | 516 +- lib_enc/ivas_stat_enc.h | 109 +- lib_enc/ivas_stereo_adapt_GR_enc.c | 4 +- lib_enc/ivas_stereo_classifier.c | 4 +- lib_enc/ivas_stereo_cng_enc.c | 78 +- lib_enc/ivas_stereo_dft_enc.c | 300 +- lib_enc/ivas_stereo_dft_enc_itd.c | 323 +- lib_enc/ivas_stereo_dft_td_itd.c | 14 +- lib_enc/ivas_stereo_dmx_evs.c | 24 +- lib_enc/ivas_stereo_eclvq_enc.c | 8 +- lib_enc/ivas_stereo_ica_enc.c | 4 +- lib_enc/ivas_stereo_icbwe_enc.c | 4 +- lib_enc/ivas_stereo_mdct_core_enc.c | 14 +- lib_enc/ivas_stereo_mdct_igf_enc.c | 4 +- lib_enc/ivas_stereo_mdct_stereo_enc.c | 26 +- lib_enc/ivas_stereo_switching_enc.c | 86 +- lib_enc/ivas_stereo_td_analysis.c | 4 +- lib_enc/ivas_stereo_td_enc.c | 39 +- lib_enc/ivas_tcx_core_enc.c | 20 +- lib_enc/ivas_td_low_rate_enc.c | 4 +- lib_enc/lead_indexing.c | 4 +- lib_enc/lib_enc.c | 119 +- lib_enc/lib_enc.h | 13 +- lib_enc/long_enr.c | 14 +- lib_enc/lp_exc_e.c | 4 +- lib_enc/lsf_enc.c | 17 +- lib_enc/lsf_msvq_ma_enc.c | 285 +- lib_enc/ltd_stable.c | 4 +- lib_enc/mdct_classifier.c | 4 +- lib_enc/mdct_selector.c | 4 +- lib_enc/mslvq_enc.c | 4 +- lib_enc/multi_harm.c | 4 +- lib_enc/nelp_enc.c | 4 +- lib_enc/nois_est.c | 7 +- lib_enc/noise_adjust.c | 4 +- lib_enc/normalizecoefs.c | 4 +- lib_enc/peak_vq_enc.c | 4 +- lib_enc/pit_enc.c | 4 +- lib_enc/pitch_ol.c | 4 +- lib_enc/pitch_ol2.c | 4 +- lib_enc/plc_enc_ext.c | 5 +- lib_enc/ppp_enc.c | 6 +- lib_enc/pre_proc.c | 46 +- lib_enc/pvq_core_enc.c | 4 +- lib_enc/pvq_encode.c | 4 +- lib_enc/q_gain2p.c | 4 +- lib_enc/qlpc_avq.c | 4 +- lib_enc/qlpc_stoch.c | 19 +- lib_enc/range_enc.c | 4 +- lib_enc/re8_cod.c | 4 +- lib_enc/reordernorm.c | 4 +- lib_enc/rom_enc.c | 4 +- lib_enc/rom_enc.h | 2 +- lib_enc/rst_enc.c | 11 +- lib_enc/set_impulse.c | 4 +- lib_enc/setmodeindex.c | 4 +- lib_enc/sig_clas.c | 4 +- lib_enc/spec_center.c | 4 +- lib_enc/spec_flatness.c | 4 +- lib_enc/speech_music_classif.c | 22 +- lib_enc/stat_enc.h | 6 +- lib_enc/stat_noise_uv_enc.c | 4 +- lib_enc/subband_fft.c | 4 +- lib_enc/swb_bwe_enc.c | 15 +- lib_enc/swb_bwe_enc_hr.c | 4 +- lib_enc/swb_bwe_enc_lr.c | 4 +- lib_enc/swb_pre_proc.c | 15 +- lib_enc/swb_tbe_enc.c | 78 +- lib_enc/tcq_core_enc.c | 20 +- lib_enc/tcx_ltp_enc.c | 4 +- lib_enc/tcx_utils_enc.c | 4 +- lib_enc/tfa_enc.c | 4 +- lib_enc/tns_base_enc.c | 4 +- lib_enc/transient_detection.c | 231 +- lib_enc/transition_enc.c | 12 +- lib_enc/update_decision.c | 4 +- lib_enc/updt_enc.c | 19 +- lib_enc/updt_tar.c | 4 +- lib_enc/vad.c | 25 +- lib_enc/vad_param_updt.c | 4 +- lib_enc/vad_proc.c | 4 +- lib_enc/vbr_average_rate.c | 4 +- lib_enc/vlpc_1st_cod.c | 4 +- lib_enc/vlpc_2st_cod.c | 4 +- lib_enc/voiced_enc.c | 137 +- lib_enc/waveadjust_fec_cod.c | 4 +- lib_rend/ivas_CQMFDecoder.c | 474 +- lib_rend/ivas_CQMFDecoder.h | 7 +- lib_rend/ivas_CQMFEncoder.c | 156 +- lib_rend/ivas_CQMFEncoder.h | 5 +- lib_rend/ivas_CQMFHuff.c | 4124 -- lib_rend/ivas_CQMFHuff.h | 350 - lib_rend/ivas_MSPred.c | 10 +- lib_rend/ivas_NoiseGen.c | 15 +- lib_rend/ivas_PerceptualModel.c | 119 +- lib_rend/ivas_PerceptualModel.h | 42 +- lib_rend/ivas_PredDecoder.c | 85 +- lib_rend/ivas_PredDecoder.h | 5 +- lib_rend/ivas_PredEncoder.c | 91 +- lib_rend/ivas_PredEncoder.h | 5 +- lib_rend/ivas_PredTables.h | 12 +- lib_rend/ivas_RMSEnvDeltaHuff.c | 65 - lib_rend/ivas_RMSEnvGrouping.c | 46 +- lib_rend/ivas_Tables.c | 196 - lib_rend/ivas_Tables.h | 126 - lib_rend/ivas_allrad_dec.c | 12 +- lib_rend/ivas_binaural_reverb.c | 546 - lib_rend/ivas_cldfb_codec_bitstream.c | 16 +- lib_rend/ivas_cldfb_codec_bitstream.h | 7 +- lib_rend/ivas_crend.c | 1972 +- .../ivas_dirac_dec_binaural_functions.c | 381 +- lib_rend/ivas_efap.c | 43 +- lib_rend/ivas_hrtf.c | 289 +- lib_rend/ivas_lc3plus_common.c | 12 +- lib_rend/ivas_lc3plus_common.h | 2 +- lib_rend/ivas_lc3plus_dec.c | 460 +- lib_rend/ivas_lc3plus_dec.h | 65 + lib_rend/ivas_lc3plus_enc.c | 46 +- lib_rend/ivas_lcld_tables.c | 53066 ++++++++++++++++ lib_rend/ivas_lcld_tables.h | 567 + lib_rend/ivas_lib_rend_internal.h | 250 - lib_rend/ivas_limiter.c | 24 +- lib_rend/ivas_objectRenderer.c | 542 +- lib_rend/ivas_objectRenderer_hrFilt.c | 814 +- lib_rend/ivas_objectRenderer_mix.c | 273 +- lib_rend/ivas_objectRenderer_sfx.c | 1445 +- lib_rend/ivas_objectRenderer_sources.c | 217 +- lib_rend/ivas_objectRenderer_vec.c | 23 +- lib_rend/ivas_orient_trk.c | 711 +- lib_rend/ivas_output_init.c | 422 +- lib_rend/ivas_prot_rend.h | 1225 + lib_rend/ivas_render_config.c | 25 +- lib_rend/ivas_reverb.c | 706 +- lib_rend/ivas_reverb_delay_line.c | 5 +- lib_rend/ivas_reverb_fft_filter.c | 9 +- lib_rend/ivas_reverb_filter_design.c | 8 +- lib_rend/ivas_reverb_iir_filter.c | 7 +- lib_rend/ivas_reverb_utils.c | 66 +- lib_rend/ivas_rom_TdBinauralRenderer.c | 8 +- lib_rend/ivas_rom_TdBinauralRenderer.h | 3 +- lib_rend/ivas_rom_binauralRenderer.c | 32 +- lib_rend/ivas_rom_binauralRenderer.h | 26 +- lib_rend/ivas_rom_binaural_crend_head.c | 58 +- lib_rend/ivas_rom_binaural_crend_head.h | 45 +- lib_rend/ivas_rom_rend.c | 85 +- lib_rend/ivas_rom_rend.h | 53 +- lib_rend/ivas_rotation.c | 302 +- lib_rend/ivas_sba_rendering.c | 550 +- lib_rend/ivas_splitRend_lcld_dec.c | 114 +- lib_rend/ivas_splitRend_lcld_enc.c | 31 +- lib_rend/ivas_splitRendererPLC.c | 492 + lib_rend/ivas_splitRendererPost.c | 153 +- lib_rend/ivas_splitRendererPre.c | 73 +- lib_rend/ivas_splitRenderer_utils.c | 74 +- lib_rend/ivas_stat_rend.h | 990 +- lib_rend/lc3plus_codec/README.md | 4 +- lib_rend/lc3plus_codec/get_lc3plus.sh | 3 +- lib_rend/lc3plus_codec/lc3plus-patch.diff | 88 - lib_rend/lc3plus_codec/lc3plus.patch | 2090 + lib_rend/lib_rend.c | 4715 +- lib_rend/lib_rend.h | 84 +- lib_util/audio_file_reader.c | 71 +- lib_util/audio_file_reader.h | 22 +- lib_util/audio_file_writer.c | 6 +- lib_util/audio_file_writer.h | 5 +- lib_util/bitstream_reader.c | 2 +- lib_util/bitstream_reader.h | 6 +- lib_util/bitstream_writer.c | 3 +- lib_util/bitstream_writer.h | 5 +- lib_util/cmdl_tools.c | 137 +- lib_util/cmdl_tools.h | 13 +- lib_util/cmdln_parser.c | 79 +- lib_util/cmdln_parser.h | 23 +- lib_util/evs_rtp_payload.c | 32 +- lib_util/evs_rtp_payload.h | 3 +- lib_util/g192.c | 5 +- lib_util/g192.h | 5 +- lib_util/head_rotation_file_reader.c | 47 +- lib_util/head_rotation_file_reader.h | 7 +- lib_util/hrtf_file_reader.c | 1315 +- lib_util/hrtf_file_reader.h | 71 +- lib_util/ism_file_reader.c | 41 +- lib_util/ism_file_reader.h | 4 +- lib_util/ism_file_writer.c | 15 +- lib_util/ism_file_writer.h | 6 +- lib_util/jbm_file_reader.c | 3 +- lib_util/jbm_file_reader.h | 4 +- lib_util/jbm_file_writer.c | 24 +- lib_util/jbm_file_writer.h | 4 +- lib_util/ls_custom_file_reader.c | 11 +- lib_util/ls_custom_file_reader.h | 10 +- lib_util/masa_file_reader.c | 4 +- lib_util/masa_file_reader.h | 4 +- lib_util/masa_file_writer.c | 241 +- lib_util/masa_file_writer.h | 14 +- lib_util/mime_io.c | 3 +- lib_util/mime_io.h | 2 +- lib_util/render_config_reader.c | 24 +- lib_util/render_config_reader.h | 3 +- lib_util/rtpdump.c | 2 +- lib_util/rtpdump.h | 2 +- lib_util/split_rend_bfi_file_reader.c | 161 + .../split_rend_bfi_file_reader.h | 39 +- lib_util/split_render_file_read_write.c | 19 +- lib_util/tinywavein_c.h | 2 +- lib_util/tinywaveout_c.h | 2 +- lib_util/vector3_pair_file_reader.c | 163 + .../vector3_pair_file_reader.h | 94 +- readme.txt | 174 +- scripts/IvasBuildAndRun.py | 2 +- scripts/IvasBuildAndRunChecks.py | 2 +- scripts/README.md | 2 +- scripts/batch_comp_audio.py | 2 +- scripts/binauralRenderer_interface/.gitignore | 6 + .../IIS_BRIR_officialMPEG_Combined.sofa | 3 + ...128_Meth5_IRC_51_Q10_symL_Itrp1_48000.sofa | 3 + ...128_Meth5_IRC_52_Q10_symL_Itrp1_48000.sofa | 3 + ...128_Meth5_IRC_53_Q10_symL_Itrp1_48000.sofa | 3 + ...128_Meth5_IRC_54_Q10_symL_Itrp1_48000.sofa | 3 + .../ORANGE_HRIR_53_HOA3S_48000.sofa | 3 + .../generate_tables_from_rom_to_bin.c | 2225 + .../table_format_converter_readme.txt | 60 + .../ivas_binaural_16kHz.bin | 3 + .../ivas_binaural_32kHz.bin | 3 + .../ivas_binaural_48kHz.bin | 3 + .../generate_crend_ivas_tables_from_sofa.c | 1463 + .../ivas_crend_binaural_filter_design.c | 1389 + .../ivas_crend_binaural_filter_design.h | 67 + .../ivas_rom_binaural_crend_head.template} | 37 +- ...onv_sofa_to_rom_table_converter_readme.txt | 39 +- .../resolve_build_dep.py | 130 + scripts/check-format.sh | 2 +- scripts/config/ci_linux.json | 38 +- scripts/config/ci_linux_ltv.json | 8 +- scripts/config/ivas_modes.json | 397 +- scripts/config/ivas_modes_debug.json | 386 +- scripts/config/self_test.prm | 1210 +- scripts/config/self_test_evs.prm | 120 +- scripts/cppp/.gitignore | 2 + scripts/cut_bs.py | 2 +- .../dly_error_profile_0.dat | 3 + scripts/find_unused_symbols.sh | 2 +- scripts/generate_test_items.py | 2 +- scripts/ivas_pytests/build_all.bat | 7 - scripts/ivas_pytests/build_all.sh | 4 - scripts/ivas_pytests/clean_all.bat | 7 - scripts/ivas_pytests/clean_all.sh | 3 - scripts/ivas_pytests/disable_lib_com_optim.py | 23 - scripts/ivas_pytests/endofline.py | 26 - .../tests/unit_tests/crend/build.bat | 1 - .../tests/unit_tests/crend/clean.bat | 1 - .../unit_tests/crend/ivas_crend_io_parse.h | 128 - .../unit_tests/crend/ivas_crend_public.h | 85 - .../unit_tests/crend/ivas_crend_unit_test.c | 729 - .../unit_tests/crend/ivas_crend_unit_test.sln | 68 - .../crend/ivas_crend_unit_test.vcxproj | 195 - .../unit_tests/crend/ivas_crend_utest_utils.c | 1800 - .../unit_tests/crend/ivas_dec_parse_io.h | 136 - .../tests/unit_tests/crend/ivas_prox_mix.c | 229 - .../disabled_test_crend_unittest.py | 576 - scripts/mem_analysis.m | 38 - scripts/mem_analysis.py | 110 + scripts/parse_options_h.sh | 2 +- scripts/parse_selftest_summary.py | 2 +- scripts/plot_meta_data.py | 2 +- scripts/prepare_instrumentation.sh | 35 +- scripts/prepare_mem_dryrun.py | 29 + scripts/pyaudio3dtools/__init__.py | 2 +- scripts/pyaudio3dtools/audio3dtools.py | 6 +- scripts/pyaudio3dtools/audioarray.py | 44 +- scripts/pyaudio3dtools/audiofile.py | 47 +- scripts/pyaudio3dtools/binauralrenderer.py | 2 +- scripts/pyaudio3dtools/constants.py | 16 +- scripts/pyaudio3dtools/hoadecoder.py | 7 +- scripts/pyaudio3dtools/masarenderer.py | 2 +- .../pyaudio3dtools/quaternions/__init__.py | 2 +- .../pyaudio3dtools/quaternions/functions.py | 2 +- scripts/pyaudio3dtools/rotation.py | 6 +- scripts/pyaudio3dtools/spatialaudioconvert.py | 15 +- scripts/pyaudio3dtools/spatialaudioformat.py | 2 +- scripts/pyaudio3dtools/spatialmetadata.py | 2 +- scripts/pyivastest/IvasBaseClass.py | 2 +- scripts/pyivastest/IvasModeAnalyzer.py | 125 +- scripts/pyivastest/IvasModeCollector.py | 2 +- scripts/pyivastest/IvasModeRunner.py | 13 +- scripts/pyivastest/IvasScriptsCommon.py | 10 +- scripts/pyivastest/IvasSvnBuilder.py | 4 +- scripts/pyivastest/__init__.py | 2 +- scripts/pyivastest/constants.py | 2 +- scripts/pyivastest/ivas_svn.py | 2 +- scripts/pyprocessing/__init__.py | 2 +- scripts/pyprocessing/evs.py | 2 +- scripts/pyprocessing/ivas.py | 2 +- scripts/pyprocessing/prepost_processing.py | 2 +- scripts/pyprocessing/processing.py | 2 +- scripts/pyprocessing/processing_configs.py | 2 +- scripts/pyprocessing/utils.py | 2 +- scripts/runIvasCodec.py | 2 +- scripts/self_test.py | 8 +- .../lc3plus/ivas_lc3plus_unit_test.c | 381 +- ...vas_lc3plus_unit_test_selective_decoding.c | 1954 + scripts/strip_defines_cppp.sh | 2 +- scripts/switchPaths/sw_mctech_5fr.bin | 3 + .../Orange_53/hrfilter_model_v002_16kHz.bin | 4 +- .../Orange_53/hrfilter_model_v002_32kHz.bin | 4 +- .../Orange_53/hrfilter_model_v002_48kHz.bin | 4 +- .../metadata/create_metadata_v3.m | 433 - .../metadata/csv/t01_ch1.csv | 1000 - .../metadata/csv/t02_ch1.csv | 1000 - .../metadata/csv/t03_ch1.csv | 1000 - .../metadata/csv/t04_ch1.csv | 1000 - .../metadata/csv/t05_ch1.csv | 1000 - .../metadata/csv/t05_ch2.csv | 1000 - .../metadata/csv/t05_ch3.csv | 1000 - .../metadata/csv/t05_ch4.csv | 1000 - .../metadata/csv/t06_ch1.csv | 1000 - .../metadata/csv/t06_ch2.csv | 1000 - .../metadata/csv/t06_ch3.csv | 1000 - .../metadata/csv/t07_ch1.csv | 1000 - .../metadata/csv/t08_ch1.csv | 1000 - .../metadata/csv/t09_ch1.csv | 1000 - .../metadata/csv/t10_ch1.csv | 1000 - .../metadata/csv/t11_ch1.csv | 1000 - .../metadata/csv/t11_ch2.csv | 1000 - .../object_renderer_standalone/Makefile | 180 - .../object_renderer_standalone.sln | 68 - .../object_renderer_standalone.vcxproj | 121 - ...object_renderer_standalone.vcxproj.filters | 22 - .../renderer_standalone.c | 646 - .../td_object_renderer_readme.txt | 71 - scripts/testv/FEC_6pct2.bin | 3 + scripts/testv/config_directivity.cfg | 3 + scripts/testv/headrot_case04_3000_q.csv | 3000 + ...g => rend_config_hospital_patientroom.cfg} | 0 ...reation.cfg => rend_config_recreation.cfg} | 0 ..._renderer.cfg => rend_config_renderer.cfg} | 0 scripts/testv/stv16c.pcm | 3 - scripts/testv/stv16c.wav | 3 + scripts/testv/stv16n.pcm | 3 - scripts/testv/stv16n.wav | 3 + scripts/testv/stv1ISM48s.pcm | 3 - scripts/testv/stv1ISM48s.wav | 3 + ...VASMASA_1dir1TC.met => stv1MASA1TC48c.met} | 0 scripts/testv/stv1MASA1TC48c.wav | 3 + ...ASA_1dir1TC_DTX.met => stv1MASA1TC48n.met} | 0 scripts/testv/stv1MASA1TC48n.wav | 3 + ...VASMASA_1dir2TC.met => stv1MASA2TC48c.met} | 0 scripts/testv/stv1MASA2TC48c.wav | 3 + ...ASA_1dir2TC_DTX.met => stv1MASA2TC48n.met} | 0 scripts/testv/stv1MASA2TC48n.wav | 3 + scripts/testv/stv2ISM48s.pcm | 3 - scripts/testv/stv2ISM48s.wav | 3 + ...VASMASA_2dir1TC.met => stv2MASA1TC48c.met} | 0 scripts/testv/stv2MASA1TC48c.wav | 3 + ...VASMASA_2dir2TC.met => stv2MASA2TC48c.met} | 0 scripts/testv/stv2MASA2TC48c.wav | 3 + scripts/testv/stv2OA32c.pcm | 3 - scripts/testv/stv2OA32c.wav | 3 + scripts/testv/stv2OA48c.pcm | 3 - scripts/testv/stv2OA48c.wav | 3 + scripts/testv/stv32c.pcm | 3 - scripts/testv/stv32c.wav | 3 + scripts/testv/stv32n.pcm | 3 - scripts/testv/stv32n.wav | 3 + scripts/testv/stv3ISM48s.pcm | 3 - scripts/testv/stv3ISM48s.wav | 3 + scripts/testv/stv3OA32c.pcm | 3 - scripts/testv/stv3OA32c.wav | 3 + scripts/testv/stv3OA48c.pcm | 3 - scripts/testv/stv3OA48c.wav | 3 + scripts/testv/stv48c.pcm | 3 - scripts/testv/stv48c.wav | 3 + scripts/testv/stv48n.pcm | 3 - scripts/testv/stv48n.wav | 3 + scripts/testv/stv4ISM48n.wav | 3 + scripts/testv/stv4ISM48s.pcm | 3 - scripts/testv/stv4ISM48s.wav | 3 + scripts/testv/stv512MC48c.pcm | 3 - scripts/testv/stv512MC48c.wav | 3 + scripts/testv/stv514MC48c.pcm | 3 - scripts/testv/stv514MC48c.wav | 3 + scripts/testv/stv51MC48c.pcm | 3 - scripts/testv/stv51MC48c.wav | 3 + scripts/testv/stv714MC48c.pcm | 3 - scripts/testv/stv714MC48c.wav | 3 + scripts/testv/stv71MC48c.wav | 3 + scripts/testv/stv8c.pcm | 3 - scripts/testv/stv8c.wav | 3 + scripts/testv/stv8n.pcm | 3 - scripts/testv/stv8n.wav | 3 + scripts/testv/stvFOA16c.pcm | 3 - scripts/testv/stvFOA16c.wav | 3 + scripts/testv/stvFOA32c.pcm | 3 - scripts/testv/stvFOA32c.wav | 3 + scripts/testv/stvFOA48c.pcm | 3 - scripts/testv/stvFOA48c.wav | 3 + scripts/testv/stvISM1.csv | 3000 +- scripts/testv/stvISM2.csv | 3000 +- scripts/testv/stvISM3.csv | 3000 +- scripts/testv/stvISM4.csv | 3000 +- scripts/testv/stvST16c.pcm | 3 - scripts/testv/stvST16c.wav | 3 + scripts/testv/stvST16n.pcm | 3 - scripts/testv/stvST16n.wav | 3 + scripts/testv/stvST32c.pcm | 3 - scripts/testv/stvST32c.wav | 3 + scripts/testv/stvST32n.pcm | 3 - scripts/testv/stvST32n.wav | 3 + scripts/testv/stvST48c.pcm | 3 - scripts/testv/stvST48c.wav | 3 + scripts/testv/stvST48n.pcm | 3 - scripts/testv/stvST48n.wav | 3 + scripts/testv/stv_IVASMASA_1dir1TC.pcm | 3 - scripts/testv/stv_IVASMASA_1dir1TC_DTX.pcm | 3 - scripts/testv/stv_IVASMASA_1dir2TC.pcm | 3 - scripts/testv/stv_IVASMASA_1dir2TC_DTX.pcm | 3 - scripts/testv/stv_IVASMASA_2dir1TC.pcm | 3 - scripts/testv/stv_IVASMASA_2dir2TC.pcm | 3 - scripts/testv/test_FOA.wav | 3 - scripts/testv/test_HOA2.wav | 3 - scripts/testv/test_HOA3.wav | 3 - scripts/testv/test_ISM_1obj.wav | 3 - scripts/testv/test_ISM_2obj.wav | 3 - scripts/testv/test_ISM_3obj.wav | 3 - scripts/testv/test_ISM_4obj.wav | 3 - scripts/testv/test_MASA_1dir1TC.met | 3 - scripts/testv/test_MASA_1dir1TC.wav | 3 - scripts/testv/test_MASA_1dir2TC.met | 3 - scripts/testv/test_MASA_1dir2TC.wav | 3 - scripts/testv/test_MASA_2dir1TC.met | 3 - scripts/testv/test_MASA_2dir1TC.wav | 3 - scripts/testv/test_MASA_2dir2TC.met | 3 - scripts/testv/test_MASA_2dir2TC.wav | 3 - scripts/testv/test_MC51.wav | 3 - scripts/testv/test_MC51p2.wav | 3 - scripts/testv/test_MC51p4.wav | 3 - scripts/testv/test_MC71.wav | 3 - scripts/testv/test_MC71p4.wav | 3 - scripts/testv/test_mono.wav | 3 - scripts/testv/test_stereo.wav | 3 - scripts/tools/Darwin/wmc_tool | Bin 0 -> 502293 bytes scripts/tools/Linux/networkSimulator_g192 | Bin 0 -> 89760 bytes scripts/tools/Linux/wmc_tool | Bin 0 -> 220608 bytes scripts/tools/Win32/wmc_tool.exe | 3 + ...s_2-ele_plus_2-every-100-frames-Euler.csv} | 0 ...zi_plus_2-ele_plus_2-every-100-frames.csv} | 0 .../azi_plus_2-ele_plus_2-every-25-rows.csv | 3000 + scripts/trajectories/const000-Vector3.csv | 4 + .../trajectories/full-circle-4s-Vector3.csv | 200 + .../full-circle-4s-ccw-Vector3.csv | 200 + scripts/trajectories/full-circle-4s-ccw.csv | 800 + scripts/trajectories/full-circle-4s.csv | 800 + ...ull-circle-with-up-and-down-4s-Vector3.csv | 200 + ...circle-with-up-and-down-4s-ccw-Vector3.csv | 200 + .../full-circle-with-up-and-down-4s-ccw.csv | 800 + ...p-and-down-4s-fixed-pos-offset-Vector3.csv | 200 + .../full-circle-with-up-and-down-4s.csv | 800 + scripts/wmc_tool.exe | 3 - tests/cmp_custom.py | 201 - tests/cmp_pcm.py | 72 + tests/conftest.py | 17 +- tests/create_short_testvectors.py | 10 +- tests/cut_pcm.py | 59 +- tests/prepare_pytests.py | 2 +- tests/renderer/README.md | 18 +- tests/renderer/constants.py | 466 +- .../data/renderer_config_format_readme.txt | 2 +- .../renderer/run_test_renderer_vs_decoder.sh | 10 - tests/renderer/test_renderer.py | 293 +- tests/renderer/test_renderer_be_comparison.py | 24 +- tests/renderer/test_renderer_vs_decoder.py | 128 - tests/renderer/utils.py | 304 +- tests/run_pytests.py | 2 +- tests/test_param_file.py | 78 +- tests/test_sba_bs_dec_plc.py | 23 +- tests/test_sba_bs_enc.py | 64 +- tests/testconfig.py | 2 +- work_in_progress/readme.txt | 2 +- 1014 files changed, 120157 insertions(+), 61814 deletions(-) rename .gitlab/issue_templates/{generic_issue.md => default.md} (100%) create mode 100644 .gitlab/issue_templates/sanitizer_error.md rename Workspace_msvc/renderer_configs/{split_renderer_config_768_0dof_tdposecorr.txt => split_renderer_config_512_0dof_tdposecorr.txt} (86%) create mode 100644 Workspace_msvc/renderer_configs/split_renderer_config_768_2dof.txt create mode 100644 Workspace_msvc/renderer_configs/split_renderer_config_HBR_1dof_tdposecorr.txt create mode 100644 ci/__init__.py delete mode 100755 ci/complexity_measurements/genWebpageData_Prom.csh create mode 100755 ci/complexity_measurements/mergeNewsletterRom.py delete mode 100755 ci/complexity_measurements/parseNewsletterProm.py create mode 100755 ci/ivas_voip_be_test.sh create mode 100755 ci/setup_pages.py rename lib_com/{ivas_ism_config.c => ivas_ism_com.c} (73%) rename {lib_dec => lib_com}/ivas_td_decorr.c (72%) delete mode 100644 lib_debug/mem_count.c delete mode 100644 lib_debug/mem_count.h delete mode 100644 lib_debug/memory.c create mode 100644 lib_debug/wmc_auto.c rename lib_debug/{wmops.h => wmc_auto.h} (62%) delete mode 100644 lib_debug/wmops.c mode change 100755 => 100644 lib_dec/dec_tcx.c rename lib_rend/ivas_binauralRenderer.c => lib_dec/ivas_binRenderer_internal.c (84%) create mode 100644 lib_dec/ivas_ism_dec.c create mode 100644 lib_dec/ivas_ism_dtx_dec.c rename {lib_rend => lib_dec}/ivas_ls_custom_dec.c (93%) create mode 100755 lib_dec/ivas_mcmasa_dec.c rename lib_debug/segsnr.c => lib_dec/ivas_objectRenderer_internal.c (55%) create mode 100644 lib_dec/ivas_output_config.c create mode 100644 lib_dec/ivas_sba_rendering_internal.c mode change 100644 => 100755 lib_dec/ivas_sce_dec.c create mode 100644 lib_enc/ivas_ism_dtx_enc.c mode change 100755 => 100644 lib_enc/ivas_mct_enc_mct.c mode change 100755 => 100644 lib_enc/ivas_stereo_mdct_core_enc.c mode change 100755 => 100644 lib_enc/tcx_utils_enc.c delete mode 100644 lib_rend/ivas_CQMFHuff.c delete mode 100644 lib_rend/ivas_CQMFHuff.h delete mode 100644 lib_rend/ivas_RMSEnvDeltaHuff.c delete mode 100644 lib_rend/ivas_Tables.c delete mode 100644 lib_rend/ivas_Tables.h delete mode 100644 lib_rend/ivas_binaural_reverb.c rename {lib_dec => lib_rend}/ivas_dirac_dec_binaural_functions.c (84%) create mode 100644 lib_rend/ivas_lcld_tables.c create mode 100644 lib_rend/ivas_lcld_tables.h delete mode 100644 lib_rend/ivas_lib_rend_internal.h create mode 100644 lib_rend/ivas_prot_rend.h mode change 100755 => 100644 lib_rend/ivas_sba_rendering.c create mode 100644 lib_rend/ivas_splitRendererPLC.c delete mode 100644 lib_rend/lc3plus_codec/lc3plus-patch.diff create mode 100644 lib_rend/lc3plus_codec/lc3plus.patch create mode 100644 lib_util/split_rend_bfi_file_reader.c rename scripts/ivas_pytests/tests/unit_tests/crend/ivas_crend_unit_test.h => lib_util/split_rend_bfi_file_reader.h (72%) create mode 100644 lib_util/vector3_pair_file_reader.c rename scripts/ivas_pytests/tests/unit_tests/crend/ivas_prox_mix.h => lib_util/vector3_pair_file_reader.h (60%) create mode 100644 scripts/binauralRenderer_interface/.gitignore create mode 100644 scripts/binauralRenderer_interface/BRIRs_sofa/IIS_BRIR_officialMPEG_Combined.sofa create mode 100644 scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_Meth5_IRC_51_Q10_symL_Itrp1_48000.sofa create mode 100644 scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_Meth5_IRC_52_Q10_symL_Itrp1_48000.sofa create mode 100644 scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_Meth5_IRC_53_Q10_symL_Itrp1_48000.sofa create mode 100644 scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_Meth5_IRC_54_Q10_symL_Itrp1_48000.sofa create mode 100644 scripts/binauralRenderer_interface/HRIRs_sofa/ORANGE_HRIR_53_HOA3S_48000.sofa create mode 100644 scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c create mode 100644 scripts/binauralRenderer_interface/Table_Format_Converter/table_format_converter_readme.txt create mode 100644 scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin create mode 100644 scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin create mode 100644 scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin create mode 100644 scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c create mode 100644 scripts/binauralRenderer_interface/ivas_crend_binaural_filter_design.c create mode 100644 scripts/binauralRenderer_interface/ivas_crend_binaural_filter_design.h rename scripts/{ivas_pytests/tests/unit_tests/crend/ivas_result_t.h => binauralRenderer_interface/ivas_rom_binaural_crend_head.template} (79%) rename lib_rend/ivas_RMSEnvDeltaHuff.h => scripts/binauralRenderer_interface/mixer_conv_sofa_to_rom_table_converter_readme.txt (58%) create mode 100644 scripts/binauralRenderer_interface/resolve_build_dep.py create mode 100644 scripts/cppp/.gitignore create mode 100644 scripts/dly_error_profiles/dly_error_profile_0.dat delete mode 100644 scripts/ivas_pytests/build_all.bat delete mode 100755 scripts/ivas_pytests/build_all.sh delete mode 100644 scripts/ivas_pytests/clean_all.bat delete mode 100755 scripts/ivas_pytests/clean_all.sh delete mode 100755 scripts/ivas_pytests/disable_lib_com_optim.py delete mode 100755 scripts/ivas_pytests/endofline.py delete mode 100644 scripts/ivas_pytests/tests/unit_tests/crend/build.bat delete mode 100644 scripts/ivas_pytests/tests/unit_tests/crend/clean.bat delete mode 100644 scripts/ivas_pytests/tests/unit_tests/crend/ivas_crend_io_parse.h delete mode 100644 scripts/ivas_pytests/tests/unit_tests/crend/ivas_crend_public.h delete mode 100644 scripts/ivas_pytests/tests/unit_tests/crend/ivas_crend_unit_test.c delete mode 100644 scripts/ivas_pytests/tests/unit_tests/crend/ivas_crend_unit_test.sln delete mode 100644 scripts/ivas_pytests/tests/unit_tests/crend/ivas_crend_unit_test.vcxproj delete mode 100644 scripts/ivas_pytests/tests/unit_tests/crend/ivas_crend_utest_utils.c delete mode 100644 scripts/ivas_pytests/tests/unit_tests/crend/ivas_dec_parse_io.h delete mode 100644 scripts/ivas_pytests/tests/unit_tests/crend/ivas_prox_mix.c delete mode 100644 scripts/ivas_pytests/tests/unit_tests/disabled_test_crend_unittest.py delete mode 100644 scripts/mem_analysis.m create mode 100644 scripts/mem_analysis.py create mode 100755 scripts/prepare_mem_dryrun.py create mode 100644 scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test_selective_decoding.c create mode 100644 scripts/switchPaths/sw_mctech_5fr.bin delete mode 100644 scripts/td_object_renderer/metadata/create_metadata_v3.m delete mode 100644 scripts/td_object_renderer/metadata/csv/t01_ch1.csv delete mode 100644 scripts/td_object_renderer/metadata/csv/t02_ch1.csv delete mode 100644 scripts/td_object_renderer/metadata/csv/t03_ch1.csv delete mode 100644 scripts/td_object_renderer/metadata/csv/t04_ch1.csv delete mode 100644 scripts/td_object_renderer/metadata/csv/t05_ch1.csv delete mode 100644 scripts/td_object_renderer/metadata/csv/t05_ch2.csv delete mode 100644 scripts/td_object_renderer/metadata/csv/t05_ch3.csv delete mode 100644 scripts/td_object_renderer/metadata/csv/t05_ch4.csv delete mode 100644 scripts/td_object_renderer/metadata/csv/t06_ch1.csv delete mode 100644 scripts/td_object_renderer/metadata/csv/t06_ch2.csv delete mode 100644 scripts/td_object_renderer/metadata/csv/t06_ch3.csv delete mode 100644 scripts/td_object_renderer/metadata/csv/t07_ch1.csv delete mode 100644 scripts/td_object_renderer/metadata/csv/t08_ch1.csv delete mode 100644 scripts/td_object_renderer/metadata/csv/t09_ch1.csv delete mode 100644 scripts/td_object_renderer/metadata/csv/t10_ch1.csv delete mode 100644 scripts/td_object_renderer/metadata/csv/t11_ch1.csv delete mode 100644 scripts/td_object_renderer/metadata/csv/t11_ch2.csv delete mode 100644 scripts/td_object_renderer/object_renderer_standalone/Makefile delete mode 100644 scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone.sln delete mode 100644 scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone.vcxproj delete mode 100644 scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone.vcxproj.filters delete mode 100644 scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone/renderer_standalone.c delete mode 100644 scripts/td_object_renderer/td_object_renderer_readme.txt create mode 100644 scripts/testv/FEC_6pct2.bin create mode 100644 scripts/testv/config_directivity.cfg create mode 100644 scripts/testv/headrot_case04_3000_q.csv rename scripts/testv/{config_hospital_patientroom.cfg => rend_config_hospital_patientroom.cfg} (100%) rename scripts/testv/{config_recreation.cfg => rend_config_recreation.cfg} (100%) rename scripts/testv/{config_renderer.cfg => rend_config_renderer.cfg} (100%) delete mode 100644 scripts/testv/stv16c.pcm create mode 100644 scripts/testv/stv16c.wav delete mode 100644 scripts/testv/stv16n.pcm create mode 100644 scripts/testv/stv16n.wav delete mode 100644 scripts/testv/stv1ISM48s.pcm create mode 100644 scripts/testv/stv1ISM48s.wav rename scripts/testv/{stv_IVASMASA_1dir1TC.met => stv1MASA1TC48c.met} (100%) create mode 100644 scripts/testv/stv1MASA1TC48c.wav rename scripts/testv/{stv_IVASMASA_1dir1TC_DTX.met => stv1MASA1TC48n.met} (100%) create mode 100644 scripts/testv/stv1MASA1TC48n.wav rename scripts/testv/{stv_IVASMASA_1dir2TC.met => stv1MASA2TC48c.met} (100%) create mode 100644 scripts/testv/stv1MASA2TC48c.wav rename scripts/testv/{stv_IVASMASA_1dir2TC_DTX.met => stv1MASA2TC48n.met} (100%) create mode 100644 scripts/testv/stv1MASA2TC48n.wav delete mode 100644 scripts/testv/stv2ISM48s.pcm create mode 100644 scripts/testv/stv2ISM48s.wav rename scripts/testv/{stv_IVASMASA_2dir1TC.met => stv2MASA1TC48c.met} (100%) create mode 100644 scripts/testv/stv2MASA1TC48c.wav rename scripts/testv/{stv_IVASMASA_2dir2TC.met => stv2MASA2TC48c.met} (100%) create mode 100644 scripts/testv/stv2MASA2TC48c.wav delete mode 100644 scripts/testv/stv2OA32c.pcm create mode 100644 scripts/testv/stv2OA32c.wav delete mode 100644 scripts/testv/stv2OA48c.pcm create mode 100644 scripts/testv/stv2OA48c.wav delete mode 100644 scripts/testv/stv32c.pcm create mode 100644 scripts/testv/stv32c.wav delete mode 100644 scripts/testv/stv32n.pcm create mode 100644 scripts/testv/stv32n.wav delete mode 100644 scripts/testv/stv3ISM48s.pcm create mode 100644 scripts/testv/stv3ISM48s.wav delete mode 100644 scripts/testv/stv3OA32c.pcm create mode 100644 scripts/testv/stv3OA32c.wav delete mode 100644 scripts/testv/stv3OA48c.pcm create mode 100644 scripts/testv/stv3OA48c.wav delete mode 100644 scripts/testv/stv48c.pcm create mode 100644 scripts/testv/stv48c.wav delete mode 100644 scripts/testv/stv48n.pcm create mode 100644 scripts/testv/stv48n.wav create mode 100644 scripts/testv/stv4ISM48n.wav delete mode 100644 scripts/testv/stv4ISM48s.pcm create mode 100644 scripts/testv/stv4ISM48s.wav delete mode 100644 scripts/testv/stv512MC48c.pcm create mode 100644 scripts/testv/stv512MC48c.wav delete mode 100644 scripts/testv/stv514MC48c.pcm create mode 100644 scripts/testv/stv514MC48c.wav delete mode 100644 scripts/testv/stv51MC48c.pcm create mode 100644 scripts/testv/stv51MC48c.wav delete mode 100644 scripts/testv/stv714MC48c.pcm create mode 100644 scripts/testv/stv714MC48c.wav create mode 100644 scripts/testv/stv71MC48c.wav delete mode 100644 scripts/testv/stv8c.pcm create mode 100644 scripts/testv/stv8c.wav delete mode 100644 scripts/testv/stv8n.pcm create mode 100644 scripts/testv/stv8n.wav delete mode 100644 scripts/testv/stvFOA16c.pcm create mode 100644 scripts/testv/stvFOA16c.wav delete mode 100644 scripts/testv/stvFOA32c.pcm create mode 100644 scripts/testv/stvFOA32c.wav delete mode 100644 scripts/testv/stvFOA48c.pcm create mode 100644 scripts/testv/stvFOA48c.wav delete mode 100644 scripts/testv/stvST16c.pcm create mode 100644 scripts/testv/stvST16c.wav delete mode 100644 scripts/testv/stvST16n.pcm create mode 100644 scripts/testv/stvST16n.wav delete mode 100644 scripts/testv/stvST32c.pcm create mode 100644 scripts/testv/stvST32c.wav delete mode 100644 scripts/testv/stvST32n.pcm create mode 100644 scripts/testv/stvST32n.wav delete mode 100644 scripts/testv/stvST48c.pcm create mode 100644 scripts/testv/stvST48c.wav delete mode 100644 scripts/testv/stvST48n.pcm create mode 100644 scripts/testv/stvST48n.wav delete mode 100644 scripts/testv/stv_IVASMASA_1dir1TC.pcm delete mode 100644 scripts/testv/stv_IVASMASA_1dir1TC_DTX.pcm delete mode 100644 scripts/testv/stv_IVASMASA_1dir2TC.pcm delete mode 100644 scripts/testv/stv_IVASMASA_1dir2TC_DTX.pcm delete mode 100644 scripts/testv/stv_IVASMASA_2dir1TC.pcm delete mode 100644 scripts/testv/stv_IVASMASA_2dir2TC.pcm delete mode 100644 scripts/testv/test_FOA.wav delete mode 100644 scripts/testv/test_HOA2.wav delete mode 100644 scripts/testv/test_HOA3.wav delete mode 100644 scripts/testv/test_ISM_1obj.wav delete mode 100644 scripts/testv/test_ISM_2obj.wav delete mode 100644 scripts/testv/test_ISM_3obj.wav delete mode 100644 scripts/testv/test_ISM_4obj.wav delete mode 100644 scripts/testv/test_MASA_1dir1TC.met delete mode 100644 scripts/testv/test_MASA_1dir1TC.wav delete mode 100644 scripts/testv/test_MASA_1dir2TC.met delete mode 100644 scripts/testv/test_MASA_1dir2TC.wav delete mode 100644 scripts/testv/test_MASA_2dir1TC.met delete mode 100644 scripts/testv/test_MASA_2dir1TC.wav delete mode 100644 scripts/testv/test_MASA_2dir2TC.met delete mode 100644 scripts/testv/test_MASA_2dir2TC.wav delete mode 100644 scripts/testv/test_MC51.wav delete mode 100644 scripts/testv/test_MC51p2.wav delete mode 100644 scripts/testv/test_MC51p4.wav delete mode 100644 scripts/testv/test_MC71.wav delete mode 100644 scripts/testv/test_MC71p4.wav delete mode 100644 scripts/testv/test_mono.wav delete mode 100644 scripts/testv/test_stereo.wav create mode 100755 scripts/tools/Darwin/wmc_tool create mode 100755 scripts/tools/Linux/networkSimulator_g192 create mode 100755 scripts/tools/Linux/wmc_tool create mode 100755 scripts/tools/Win32/wmc_tool.exe rename scripts/trajectories/{azi+2-ele+2-every-100-frames-Euler.csv => azi_plus_2-ele_plus_2-every-100-frames-Euler.csv} (100%) rename scripts/trajectories/{azi+2-ele+2-every-100-frames.csv => azi_plus_2-ele_plus_2-every-100-frames.csv} (100%) create mode 100644 scripts/trajectories/azi_plus_2-ele_plus_2-every-25-rows.csv create mode 100644 scripts/trajectories/const000-Vector3.csv create mode 100644 scripts/trajectories/full-circle-4s-Vector3.csv create mode 100644 scripts/trajectories/full-circle-4s-ccw-Vector3.csv create mode 100644 scripts/trajectories/full-circle-4s-ccw.csv create mode 100644 scripts/trajectories/full-circle-4s.csv create mode 100644 scripts/trajectories/full-circle-with-up-and-down-4s-Vector3.csv create mode 100644 scripts/trajectories/full-circle-with-up-and-down-4s-ccw-Vector3.csv create mode 100644 scripts/trajectories/full-circle-with-up-and-down-4s-ccw.csv create mode 100644 scripts/trajectories/full-circle-with-up-and-down-4s-fixed-pos-offset-Vector3.csv create mode 100644 scripts/trajectories/full-circle-with-up-and-down-4s.csv delete mode 100644 scripts/wmc_tool.exe delete mode 100755 tests/cmp_custom.py create mode 100755 tests/cmp_pcm.py delete mode 100755 tests/renderer/run_test_renderer_vs_decoder.sh delete mode 100644 tests/renderer/test_renderer_vs_decoder.py diff --git a/.gitattributes b/.gitattributes index e0e62f9e1b..6b238a44ae 100644 --- a/.gitattributes +++ b/.gitattributes @@ -29,5 +29,6 @@ *.mat filter=lfs diff=lfs merge=lfs -text *.met filter=lfs diff=lfs merge=lfs -text *.pcm filter=lfs diff=lfs merge=lfs -text +*.sofa filter=lfs diff=lfs merge=lfs -text *.wav filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index 13dd28ed34..c87c691a4a 100644 --- a/.gitignore +++ b/.gitignore @@ -41,12 +41,15 @@ scripts/td_object_renderer/object_renderer_standalone/renderer_standalone.exe .cache *.log *.bak +.\#* scripts/c-code_instrument/ scripts/ifdef_instrument.list scripts/ref/ scripts/test/ scripts/out/ scripts/self_test_summary.txt +scripts/cppp/ +binary/ tests/renderer/cut tests/renderer/ref tests/dut @@ -61,5 +64,11 @@ __pycache__/ *.py[cod] *$py.class -#history +# history .history/ + +#externals +Externals/ + +# coan output files that are created when cleaning out switches +coan_out_* diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1557eb9334..a059d9eb2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,10 @@ variables: EXIT_CODE_NON_BE: 123 EXIT_CODE_FAIL: 1 +default: + interruptible: true # Make all jobs by default interruptible + artifacts: + expire_in: 2 weeks # This sets when pipelines are created. Jobs have more specific rules to restrict them. workflow: @@ -17,12 +21,13 @@ workflow: # see https://docs.gitlab.com/ee/ci/yaml/workflow.html#switch-between-branch-pipelines-and-merge-request-pipelines - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push" when: never - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' # Runs for merge requests + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Pushes to main - if: $CI_PIPELINE_SOURCE == 'schedule' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Scheduled in main - if: $CI_PIPELINE_SOURCE == 'web' # for testing stages: + - .pre - maintenance - build - test @@ -44,6 +49,13 @@ stages: echo "Commit time was $CI_COMMIT_TIMESTAMP" date | xargs echo "System time is" +.print-common-info-windows: &print-common-info-windows + - | + echo "Printing common information for build job." + echo "Current job is run on commit $CI_COMMIT_SHA" + echo "Commit time was $CI_COMMIT_TIMESTAMP" + ("echo 'System time is'", "Get-Date -Format 'dddd dd/MM/yyyy HH:mm K'") | Invoke-Expression + .get-previous-merge-commit-sha: &get-previous-merge-commit-sha - previous_merge_commit=$(git --no-pager log --merges HEAD~1 -n 1 --pretty=format:%H) @@ -125,7 +137,7 @@ stages: .rules-merge-request: extends: .rules-basis rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main - if: $CI_PIPELINE_SOURCE == 'push' when: never @@ -147,10 +159,15 @@ stages: .build-job-linux: stage: build - timeout: "2 minutes" + timeout: "4 minutes" tags: - ivas-linux +.build-job-windows: + stage: build + timeout: "4 minutes" + tags: + - ivas-windows # template for test jobs on linux that need the TESTV_DIR .test-job-linux-needs-testv-dir: @@ -167,6 +184,37 @@ stages: exit_codes: - 123 +.build-job-windows-with-check-for-warnings: + extends: .build-job-windows + stage: build + allow_failure: + exit_codes: + - 123 + + +# --------------------------------------------------------------- +# .pre jobs for setting up things +# --------------------------------------------------------------- + +# See: https://gitlab.com/gitlab-org/gitlab/-/issues/194023 +# Solution to make main branch pipelines uninterruptible while all other +# pipelines can be interrupted by default. This works because all jobs +# after uninterruptible jobs will be uninterruptible. Resource group +# setting avoids rare case where two fast merges could still interrupt +# pipeline. This should be revisited if there are updates to Gitlab. +uninterruptible: + stage: .pre + interruptible: false + resource_group: uninterruptible + script: + - echo "$CI_COMMIT_BRANCH is uninterruptible" + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + when: always + tags: + - ivas-linux + + # --------------------------------------------------------------- # Validation jobs @@ -201,26 +249,6 @@ build-codec-linux-make: # need to use the "|| exit $?" suffix to get the allowed_failure return code, otherwise the job fails with code 1...< - ci/check_for_warnings.py $BUILD_OUTPUT || exit $? -build-unittests-linux: - extends: - - .build-job-with-check-for-warnings - - .rules-basis - script: - - *print-common-info - - make unittests -j 2>&1 | tee $BUILD_OUTPUT - # need to use the "|| exit $?" suffix to get the allowed_failure return code, otherwise the job fails with code 1...< - - ci/check_for_warnings.py $BUILD_OUTPUT || exit $? - -build-td-object-renderer-standalone-linux: - extends: - - .build-job-with-check-for-warnings - - .rules-basis - script: - - *print-common-info - - make -C scripts/td_object_renderer/object_renderer_standalone -j 2>&1 | tee $BUILD_OUTPUT - # need to use the "|| exit $?" suffix to get the allowed_failure return code, otherwise the job fails with code 1...< - - ci/check_for_warnings.py $BUILD_OUTPUT || exit $? - build-codec-linux-cmake: extends: - .build-job-with-check-for-warnings @@ -252,6 +280,31 @@ build-codec-sanitizers-linux: - *print-common-info - bash ci/build_codec_sanitizers_linux.sh +build-codec-windows-cmake: + extends: + - .build-job-windows-with-check-for-warnings + - .rules-basis + script: + - *print-common-info-windows + - $winoutdata = $null + - cmake -G "Visual Studio 15 2017" . -Bbuild + - cmake --build build -j | tee -variable winoutdata + - $winoutdata | Out-File $BUILD_OUTPUT -Encoding Utf8 + - ("& python ci/check_for_warnings.py '$BUILD_OUTPUT'") | Invoke-Expression + - ("exit $LASTEXITCODE") | Invoke-Expression + +build-codec-windows-msbuild: + extends: + - .build-job-windows-with-check-for-warnings + - .rules-basis + script: + - *print-common-info-windows + - $winoutdata = $null + - MSBuild.exe .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug | tee -variable winoutdata + - $winoutdata | Out-File $BUILD_OUTPUT -Encoding Utf8 + - ("& python ci/check_for_warnings.py '$BUILD_OUTPUT'") | Invoke-Expression + - ("exit $LASTEXITCODE") | Invoke-Expression + # --------------------------------------------------------------- # Test jobs for merge requests # --------------------------------------------------------------- @@ -270,16 +323,19 @@ codec-smoke-test: ### analyze for failures - if cat smoke_test_output.txt | grep -c "failed"; then echo "Smoke test without PLC failed"; exit 1; fi - if cat smoke_test_output_plc.txt | grep -c "failed"; then echo "Smoke test with PLC failed"; exit 1; fi + - if cat smoke_test_output_jbm_noEXT.txt | grep -c "failed"; then echo "Smoke test JBM part failed"; exit 1; fi + - if cat smoke_test_output_hrtf.txt | grep -c "failed"; then echo "Smoke test with external hrtf files failed"; exit 1; fi artifacts: name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results" paths: - - out/logs/ - smoke_test_output.txt - smoke_test_output_plc.txt + - smoke_test_output_jbm_noEXT.txt + - smoke_test_output_hrtf.txt expose_as: "Smoke test results" # code selftest testvectors with memory-sanitizer binaries -msan-on-merge-request-linux: +codec-msan: extends: - .test-job-linux - .rules-merge-request @@ -287,6 +343,7 @@ msan-on-merge-request-linux: needs: ["build-codec-sanitizers-linux"] script: - *print-common-info + - python3 ci/disable_ram_counting.py - make clean - make -j CLANG=1 - python3 scripts/self_test.py --create | tee test_output.txt @@ -297,10 +354,10 @@ msan-on-merge-request-linux: paths: - scripts/ref/logs/ - test_output.txt - expose_as: "Msan selftest results" + expose_as: "msan selftest results" # code selftest testvectors with address-sanitizer binaries -asan-on-merge-request-linux: +codec-asan: extends: - .test-job-linux - .rules-merge-request @@ -308,6 +365,7 @@ asan-on-merge-request-linux: needs: ["build-codec-sanitizers-linux"] script: - *print-common-info + - python3 ci/disable_ram_counting.py - make clean - make -j CLANG=2 - python3 scripts/self_test.py --create | tee test_output.txt @@ -318,10 +376,10 @@ asan-on-merge-request-linux: paths: - scripts/ref/logs/ - test_output.txt - expose_as: "Asan selftest results" + expose_as: "asan selftest results" -# test external renderer executable -external-renderer-make-pytest: +# test renderer executable +renderer-smoke-test: extends: - .test-job-linux - .rules-merge-request @@ -329,21 +387,19 @@ external-renderer-make-pytest: stage: test script: - make -j IVAS_rend - - make -j unittests - - make -j --directory scripts/td_object_renderer/object_renderer_standalone - python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py artifacts: name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results" when: always paths: - report-junit.xml - expose_as: "external renderer make pytest results" + expose_as: "renderer make pytest results" reports: junit: - report-junit.xml -# test external renderer executable with cmake + asan -external-renderer-cmake-asan-pytest: +# test renderer executable with cmake + asan +renderer-asan: extends: - .test-job-linux - .rules-merge-request @@ -360,13 +416,13 @@ external-renderer-cmake-asan-pytest: when: always paths: - report-junit.xml - expose_as: "external renderer cmake asan pytest results" + expose_as: "renderer asan pytest results" reports: junit: - report-junit.xml -# test external renderer executable with cmake + msan -external-renderer-cmake-msan-pytest: +# test renderer executable with cmake + msan +renderer-msan: extends: - .test-job-linux - .rules-merge-request @@ -383,35 +439,13 @@ external-renderer-cmake-msan-pytest: when: always paths: - report-junit.xml - expose_as: "external renderer cmake msan pytest results" + expose_as: "renderer msan pytest results" reports: junit: - report-junit.xml -# test external renderer executable with cmake vs decoder renderer -# TODO @tmu @knj @sgi -> converted to script, decide whether to re-enable later -.external-renderer-cmake-vs-decoder-pytest: - extends: - - .test-job-linux - - .rules-merge-request - needs: ["build-codec-linux-cmake"] - stage: test - script: - - cmake -B cmake-build -G "Unix Makefiles" -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true -DDEC_TO_REND_FLOAT_DUMP=true - - cmake --build cmake-build -- -j - - python3 -m pytest -q -n 1 -rA --junit-xml=report-junit.xml tests/renderer/test_renderer_vs_decoder.py - artifacts: - name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results" - when: always - paths: - - report-junit.xml - expose_as: "external renderer cmake vs decoder results" - reports: - junit: - - report-junit.xml - -# compare external renderer bitexactness between target and source branch -external-renderer-pytest-on-merge-request: +# compare renderer bitexactness between target and source branch +renderer-pytest-on-merge-request: extends: - .test-job-linux - .rules-merge-request @@ -459,7 +493,7 @@ external-renderer-pytest-on-merge-request: paths: - report-junit.xml - report.html - expose_as: "pytest external renderer results" + expose_as: "pytest renderer results" reports: junit: - report-junit.xml @@ -560,6 +594,17 @@ evs-pytest-on-merge-request: junit: - report-junit-evs.xml +voip-be-on-merge-request: + extends: + - .test-job-linux-needs-testv-dir + - .rules-merge-request + stage: compare # Or should it be test? Comparison is done within one git revision + needs: ["build-codec-linux-make", codec-smoke-test] + timeout: "10 minutes" + script: + - *print-common-info + - bash ci/ivas_voip_be_test.sh + clang-format-check: extends: - .test-job-linux @@ -738,13 +783,13 @@ codec-comparison-on-main-push: .sanitizer-test-schedule-A: extends: - .sanitizer-test-template - timeout: 2 hours 30 minutes sanitizer-test-mono: extends: .sanitizer-test-schedule-A rules: - if: $SANITIZER_SCHEDULE_A + timeout: 2 hour script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py mono mono --tests $SANITIZER_TESTS @@ -754,7 +799,8 @@ sanitizer-test-stereo: rules: - if: $SANITIZER_SCHEDULE_A when: delayed - start_in: 2 hours 30 minutes + start_in: 2 hour + timeout: 2 hour script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py stereo $OUT_FORMATS_CHANNEL_BASED --tests $SANITIZER_TESTS @@ -764,7 +810,8 @@ sanitizer-test-stereodmxevs: rules: - if: $SANITIZER_SCHEDULE_A when: delayed - start_in: 5 hours + start_in: 4 hours + timeout: 2 hour script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py StereoDmxEVS mono --tests $SANITIZER_TESTS @@ -774,7 +821,8 @@ sanitizer-test-ism1: rules: - if: $SANITIZER_SCHEDULE_A when: delayed - start_in: 7 hours 30 minutes + start_in: 6 hours + timeout: 2 hours script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py ISM1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS @@ -784,7 +832,8 @@ sanitizer-test-ism2: rules: - if: $SANITIZER_SCHEDULE_A when: delayed - start_in: 10 hours + start_in: 8 hours + timeout: 3 hours script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py ISM2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS @@ -794,7 +843,8 @@ sanitizer-test-ism3: rules: - if: $SANITIZER_SCHEDULE_A when: delayed - start_in: 12 hours 30 minutes + start_in: 11 hours + timeout: 3 hour script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py ISM3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS @@ -804,7 +854,8 @@ sanitizer-test-ism4: rules: - if: $SANITIZER_SCHEDULE_A when: delayed - start_in: 15 hours + start_in: 14 hours + timeout: 4 hours script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS @@ -814,7 +865,8 @@ sanitizer-test-masa: rules: - if: $SANITIZER_SCHEDULE_A when: delayed - start_in: 17 hours 30 minutes + start_in: 18 hours + timeout: 3 hours script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py MASA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS @@ -824,7 +876,7 @@ sanitizer-test-masa: .sanitizer-test-schedule-B: extends: - .sanitizer-test-template - timeout: 3 hours + timeout: 4 hours sanitizer-test-mc-5_1: extends: .sanitizer-test-schedule-B @@ -839,7 +891,7 @@ sanitizer-test-mc-5_1_2: rules: - if: $SANITIZER_SCHEDULE_B when: delayed - start_in: 3 hours + start_in: 4 hours script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py 5_1_2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS @@ -849,7 +901,7 @@ sanitizer-test-mc-5_1_4: rules: - if: $SANITIZER_SCHEDULE_B when: delayed - start_in: 6 hours + start_in: 8 hours script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py 5_1_4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS @@ -859,7 +911,7 @@ sanitizer-test-mc-7_1: rules: - if: $SANITIZER_SCHEDULE_B when: delayed - start_in: 9 hours + start_in: 12 hours script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py 7_1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS @@ -869,7 +921,7 @@ sanitizer-test-mc-7_1_4: rules: - if: $SANITIZER_SCHEDULE_B when: delayed - start_in: 12 hours + start_in: 16 hours script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py 7_1_4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS @@ -913,15 +965,21 @@ coverage-test-on-main-scheduled: script: - *print-common-info - make GCOV=1 -j + - cp IVAS_rend IVAS_rend_ref # Copy exec to be able to run renderer script - python3 tests/create_short_testvectors.py - python3 -m pytest tests -v -n 0 --update_ref 1 -m create_ref --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec - python3 -m pytest tests -v -n 0 --update_ref 1 -m create_ref_part2 --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec - python3 -m pytest tests/test_param_file.py -v -n 0 --update_ref 1 -m create_ref --param_file scripts/config/self_test_evs.prm --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec + - bash ci/smoke_test.sh coverage + - python3 -m pytest -q -n auto tests/renderer/test_renderer_be_comparison.py + - bash ci/ivas_voip_be_test.sh coverage - lcov -c -d obj -o coverage.info - - genhtml coverage.info -o coverage + - commit_sha=$(git rev-parse HEAD) + - genhtml coverage.info -o coverage -t "Coverage on main @ $commit_sha" artifacts: name: "main-coverage-sha-$CI_COMMIT_SHORT_SHA" when: always + expire_in: 1 week paths: - coverage.info - coverage @@ -954,8 +1012,8 @@ coverage-test-on-main-scheduled: - mv -f wmops/log_*_all.txt wmops/*.js ${public_dir}/ # move logfiles for links - mkdir $public_dir/logs - # first move logs for "native" sampling rate - - log_files=$(cat $public_dir/graphs_wmops_flc.js | grep logFile | sed "s/.*\(wmops_newsletter_.*\.csv\).*/\1/g") + # first move logs + - log_files=$(cat $public_dir/graphs*.js | grep logFile | sed "s/.*\(wmops_newsletter_.*\.csv\).*/\1/g") - echo $log_files - ls wmops/logs - for f in $log_files; do [ -f wmops/logs/$f ] && mv wmops/logs/$f $public_dir/logs/$f; done @@ -1079,57 +1137,14 @@ complexity-StereoDmxEVS-stereo-in-mono-out: # --------------------------------------------------------------- # job that sets up gitlab pages website -# is run on a separate schedule and collects artifacts from other jobs (currently -# only the complexity measurements) multiple times a day pages: stage: deploy tags: - ivas-linux rules: - if: $UPDATE_PAGES - # TODO: add coverage job script: - - - API_URL_BASE=https://forge.3gpp.org/rep/api/v4/projects/$CI_PROJECT_ID/jobs - - branch=$CI_COMMIT_REF_NAME - - - mkdir public - - ### fetch artifacts from latest run of complexity jobs - - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-stereo-in-stereo-out) - - echo $job_id - - echo "$API_URL_BASE/$job_id/artifacts" - - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_stereo.zip - - cat artifacts_comp_stereo.zip - - unzip -o artifacts_comp_stereo.zip - - mv complexity-stereo-in-stereo-out-public ./public/ - - - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-ism-in-binaural-out) - - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_ism.zip - - unzip -o artifacts_comp_ism.zip - - mv complexity-ism-in-binaural-out-public ./public/ - - - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-sba-hoa3-in-hoa3-out) - - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_sba.zip - - unzip -o artifacts_comp_sba.zip - - mv complexity-sba-hoa3-in-hoa3-out-public ./public/ - - - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-mc-in-7_1_4-out) - - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_mc.zip - - unzip -o artifacts_comp_mc.zip - - mv complexity-mc-in-7_1_4-out-public ./public/ - - - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-masa-in-7_1_4-out) - - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_masa.zip - - unzip -o artifacts_comp_masa.zip - - mv complexity-masa-in-7_1_4-out-public ./public/ - - - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-StereoDmxEVS-stereo-in-mono-out) - - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_StereoDmxEVS.zip - - unzip -o artifacts_comp_StereoDmxEVS.zip - - mv complexity-StereoDmxEVS-stereo-in-mono-out-public ./public/ - - - cp ci/index-pages.html public/index.html + - python3 ci/setup_pages.py artifacts: paths: - public diff --git a/.gitlab/issue_templates/generic_issue.md b/.gitlab/issue_templates/default.md similarity index 100% rename from .gitlab/issue_templates/generic_issue.md rename to .gitlab/issue_templates/default.md diff --git a/.gitlab/issue_templates/sanitizer_error.md b/.gitlab/issue_templates/sanitizer_error.md new file mode 100644 index 0000000000..10ba7c7991 --- /dev/null +++ b/.gitlab/issue_templates/sanitizer_error.md @@ -0,0 +1,39 @@ +### Basic info + +- Commit SHA: + +### Bug description + +Clang (msan/asan?) sanitizer test in pipeline found an error: + + +``` + +``` + + +Link to test pipeline: XXX + +### Ways to reproduce + +Using the [scripts](https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec/-/wikis/Software-development/pyivastest-howto#how-to-reproduce-tests): + + +``` +python3 scripts/IvasBuildAndRunChecks.py --checks CLANGX -m MODE -p /path/to/my/local/ci_linux_ltv_local.json +``` +or directly: + +``` +make clean +make -j CLANG=X +./IVAS_cod ... +eid-xor -vbr -fer bit ep_015.g192 bit_fer +./IVAS_dec ... +``` + + + +/label ~"Priority::Critical" ~Company: ~Subpart: +/label ~Type:Bug ~Status::ToDo diff --git a/CMakeLists.txt b/CMakeLists.txt index a04fca12b5..e5233978bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,39 +108,29 @@ if(WMOPS) add_definitions("-DWMOPS=1") endif() -if(DEC_TO_REND_FLOAT_DUMP) - add_compile_definitions(DEC_TO_REND_FLOAT_DUMP) -endif() - project(stereo-evs) set_property(GLOBAL PROPERTY USE_FOLDERS ON) # make Visual Studio projects look nicer include(CTest) -include_directories( - lib_com - lib_debug - lib_dec - lib_enc - lib_rend - lib_util -) - file(GLOB libComSrcs "lib_com/*.c") file(GLOB libComHeaders "lib_com/*.h") add_library(lib_com ${libComSrcs} ${libComHeaders}) if(UNIX) target_link_libraries(lib_com PRIVATE m) endif() +target_include_directories(lib_com PUBLIC lib_com PRIVATE lib_enc lib_dec lib_rend lib_debug) file(GLOB libDebugSrcs "lib_debug/*.c") file(GLOB libDebugHeaders "lib_debug/*.h") add_library(lib_debug ${libDebugSrcs} ${libDebugHeaders}) target_link_libraries(lib_debug lib_com) +target_include_directories(lib_debug PUBLIC lib_debug PRIVATE lib_enc lib_dec lib_rend) file(GLOB libEncSrcs "lib_enc/*.c") file(GLOB libEncHeaders "lib_enc/*.h") add_library(lib_enc ${libEncSrcs} ${libEncHeaders}) target_link_libraries(lib_enc lib_com lib_debug) +target_include_directories(lib_enc PUBLIC lib_enc PRIVATE lib_dec lib_rend) set(lc3plus_floating_point_dir ${CMAKE_CURRENT_SOURCE_DIR}/lib_rend/lc3plus_codec/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point) if(NOT EXISTS ${lc3plus_floating_point_dir}) @@ -152,6 +142,9 @@ file(GLOB libLC3plusFftSrcs "${lc3plus_floating_point_dir}/fft/*.c") file(GLOB libLC3plusFftHeaders "${lc3plus_floating_point_dir}/fft/*.h") add_library(lc3plus ${libLC3plusSrcs} ${libLC3plusFftSrcs} ${libLC3plusHeaders} ${libLC3plusFftHeaders}) target_include_directories(lc3plus PUBLIC ${floating_point_dir} PRIVATE ${floating_point_dir}/fft ) +if(WMOPS) + target_link_libraries(lc3plus lib_debug) +endif() file(GLOB libCldfbTransCodecSrcs "lib_rend/ivas_cldfb_trans_codec/*.c") file(GLOB libCldfbTransCodecHeaders "lib_rend/ivas_cldfb_trans_codec/*.h") @@ -159,28 +152,25 @@ file(GLOB libRendSrcs "lib_rend/*.c") file(GLOB libRendHeaders "lib_rend/*.h") add_library(lib_rend ${libRendSrcs} ${libCldfbTransCodecSrcs} ${libRendHeaders} ${libCldfbTransCodecHeaders}) target_link_libraries(lib_rend lib_dec lib_com lib_debug lc3plus) # Todo refactor: This dependency on lib_dec should be removed. +target_include_directories(lib_rend PUBLIC lib_rend PRIVATE lib_enc) file(GLOB libDecSrcs "lib_dec/*.c") file(GLOB libDecHeaders "lib_dec/*.h") add_library(lib_dec ${libDecSrcs} ${libDecHeaders}) target_link_libraries(lib_dec lib_com lib_rend lib_debug) +target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_enc) file(GLOB libUtilSrcs "lib_util/*.c") file(GLOB libUtilHeaders "lib_util/*.h") add_library(lib_util ${libUtilSrcs} ${libUtilHeaders}) +target_include_directories(lib_util PUBLIC lib_util PRIVATE lib_com lib_enc lib_dec lib_rend lib_debug) -file(GLOB unitTestCRendSrcs "scripts/ivas_pytests/tests/unit_tests/crend/*.c") -file(GLOB unitTestCRendHeaders "scripts/ivas_pytests/tests/unit_tests/crend/*.h") -add_executable(IVAS_crend_unit_test ${unitTestCRendSrcs} ${unitTestCRendHeaders}) -target_link_libraries(IVAS_crend_unit_test lib_rend lib_dec lib_util lib_com lib_debug) - -file(GLOB unitTestIvasLc3plusSrcs "scripts/split_rendering/lc3plus/*.c") -add_executable(ivas_lc3plus_unit_test ${unitTestIvasLc3plusSrcs}) -target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_debug) - -add_executable(renderer_standalone "scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone/renderer_standalone.c") -target_link_libraries(renderer_standalone lib_rend lib_dec lib_util lib_com lib_debug) +if(NOT WMOPS) + file(GLOB unitTestIvasLc3plusSrcs "scripts/split_rendering/lc3plus/*.c") + add_executable(ivas_lc3plus_unit_test ${unitTestIvasLc3plusSrcs}) + target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_debug) +endif() add_executable(IVAS_cod apps/encoder.c) target_link_libraries(IVAS_cod lib_enc lib_util) @@ -196,13 +186,17 @@ endif() add_executable(IVAS_rend apps/renderer.c) target_link_libraries(IVAS_rend lib_rend lib_util) +target_include_directories(IVAS_rend PRIVATE lib_enc) if(COPY_EXECUTABLES_FROM_BUILD_DIR) # Optionally copy executables to the same place where Make puts them (useful for tests that expect executables in specific places) add_custom_command(TARGET IVAS_cod POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$" "${CMAKE_CURRENT_SOURCE_DIR}/") add_custom_command(TARGET IVAS_dec POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$" "${CMAKE_CURRENT_SOURCE_DIR}/") add_custom_command(TARGET IVAS_rend POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$" "${CMAKE_CURRENT_SOURCE_DIR}/") - add_custom_command(TARGET IVAS_crend_unit_test POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/ivas_pytests/tests/unit_tests/crend/") - add_custom_command(TARGET renderer_standalone POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/td_object_renderer/object_renderer_standalone/") - add_custom_command(TARGET ivas_lc3plus_unit_test POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/split_rendering/lc3plus") + if (NOT WMOPS) # Temp fix for using CMake to build instrumented code + add_custom_command(TARGET ivas_lc3plus_unit_test POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/split_rendering/lc3plus") + endif() endif() + +# Allow creating packages for CMake install +install(TARGETS lib_enc lib_dec lib_rend lib_com lib_util ARCHIVE DESTINATION lib) diff --git a/LICENSE.md b/LICENSE.md index 86e7d39ae7..aa9c35e4f9 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/Makefile b/Makefile index 141a607b07..7f8874d343 100644 --- a/Makefile +++ b/Makefile @@ -11,16 +11,7 @@ SRC_APP = apps BUILD = build OBJDIR = obj -# Dirs for python unittests -UTESTS_SCRIPT_DIR = scripts/ivas_pytests -UTESTS_DIR = $(UTESTS_SCRIPT_DIR)/tests/unit_tests -UTESTS_CREND_DIR = $(UTESTS_DIR)/crend - -# Source paths for python unittests -SRC_UTESTS = $(UTESTS_CREND_DIR) - - -SRC_DIRS = $(sort -u $(SRC_LIBCOM) $(SRC_LIBDEBUG) $(SRC_LIBDEC) $(SRC_LIBENC) $(SRC_LIBREND) $(SRC_LIBUTIL) $(SRC_APP) $(SRC_UTESTS)) +SRC_DIRS = $(sort -u $(SRC_LIBCOM) $(SRC_LIBDEBUG) $(SRC_LIBDEC) $(SRC_LIBENC) $(SRC_LIBREND) $(SRC_LIBUTIL) $(SRC_APP)) # Name of CLI binaries CLI_APIDEC ?= IVAS_dec @@ -33,8 +24,6 @@ LIB_LIBENC ?= libivasenc.a LIB_LIBREND ?= libivasrend.a LIB_LIBUTIL ?= libivasutil.a -CLI_UTESTS_CREND ?= IVAS_crend_unit_test - # Default tool settings CC ?= gcc RM ?= rm -f @@ -131,8 +120,6 @@ SRCS_LIBENC = $(foreach DIR,$(SRC_LIBENC),$(patsubst $(DIR)/%,%,$(wildcard $(D SRCS_LIBREND = $(foreach DIR,$(SRC_LIBREND),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c))) SRCS_LIBUTIL = $(foreach DIR,$(SRC_LIBUTIL),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c))) -SRCS_UTESTS_CREND = $(foreach DIR,$(UTESTS_CREND_DIR),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c))) - OBJS_LIBCOM = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.o)) OBJS_LIBDEBUG = $(addprefix $(OBJDIR)/,$(SRCS_LIBDEBUG:.c=.o)) OBJS_LIBDEC = $(addprefix $(OBJDIR)/,$(SRCS_LIBDEC:.c=.o)) @@ -143,17 +130,12 @@ OBJS_CLI_APIDEC = $(OBJDIR)/decoder.o OBJS_CLI_APIENC = $(OBJDIR)/encoder.o OBJS_CLI_APPREND = $(OBJDIR)/renderer.o -OBJS_CLI_UTESTS_CREND = $(addprefix $(OBJDIR)/,$(SRCS_UTESTS_CREND:.c=.o)) - -OBJS_UTESTS = $(OBJS_CLI_UTESTS_CREND) - - DEPS = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.P) $(SRCS_LIBDEBUG:.c=.P) $(SRCS_LIBDEC:.c=.P) \ $(SRCS_LIBENC:.c=.P) $(SRCS_LIBUTIL:.c=.P)) ############################################################################### -.PHONY: all clean clean_unittests clean_all +.PHONY: all clean all: $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND) @@ -187,23 +169,14 @@ $(CLI_APIDEC): $(OBJS_CLI_APIDEC) $(LIB_LIBDEC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(L $(CLI_APIREND): $(OBJS_CLI_APPREND) $(LIB_LIBREND) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LIBDEC) $(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasrend -livasdec -livasutil -livasdebug -livascom $(LDLIBS) -o $(CLI_APIREND) -$(CLI_UTESTS_CREND): $(OBJS_CLI_UTESTS_CREND) $(LIB_LIBDEC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) - $(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_UTESTS_CREND) -L. -livasdec -livascom -livasutil -livasdebug $(LDLIBS) -o $(UTESTS_CREND_DIR)/$(CLI_UTESTS_CREND) - -unittests: $(CLI_UTESTS_CREND) - libs: $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBREND) $(LIB_LIBUTIL) -clean: clean_unittests +clean: $(QUIET)$(RM) $(OBJS_LIBENC) $(OBJS_LIBDEC) $(DEPS) $(QUIET)$(RM) $(DEPS:.P=.d) $(QUIET)test ! -d $(OBJDIR) || rm -rf $(OBJDIR) $(QUIET)$(RM) $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND) $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBUTIL) $(LIB_LIBREND) -clean_unittests: - $(QUIET)$(RM) $(OBJS_UTESTS) - $(QUIET)$(RM) $(UTESTS_CREND_DIR)/$(CLI_UTESTS_CREND) - $(OBJDIR)/%.o : %.c | $(OBJDIR) $(QUIET_CC)$(CC) $(CFLAGS) -c -MD -o $@ $< @cp $(OBJDIR)/$*.d $(OBJDIR)/$*.P; \ diff --git a/Workspace_msvc/Workspace_msvc.sln b/Workspace_msvc/Workspace_msvc.sln index 32f41bb6dd..fbdb561ee2 100644 --- a/Workspace_msvc/Workspace_msvc.sln +++ b/Workspace_msvc/Workspace_msvc.sln @@ -25,16 +25,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ..\.clang-format = ..\.clang-format EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ivas_crend_unit_test", "..\scripts\ivas_pytests\tests\unit_tests\crend\ivas_crend_unit_test.vcxproj", "{32354377-ACA7-40F9-9A0E-87FC956F0B78}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 - Unittests|Win32 = Unittests|Win32 - Unittests|x64 = Unittests|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -43,89 +39,54 @@ Global {E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}.Release|Win32.ActiveCfg = Release|Win32 {E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}.Release|Win32.Build.0 = Release|Win32 {E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}.Release|x64.ActiveCfg = Release|Win32 - {E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}.Unittests|Win32.ActiveCfg = Unittests|Win32 - {E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}.Unittests|Win32.Build.0 = Unittests|Win32 - {E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}.Unittests|x64.ActiveCfg = Unittests|Win32 {824DA4CF-06F0-45C9-929A-8792F0E19C3E}.Debug|Win32.ActiveCfg = Debug|Win32 {824DA4CF-06F0-45C9-929A-8792F0E19C3E}.Debug|Win32.Build.0 = Debug|Win32 {824DA4CF-06F0-45C9-929A-8792F0E19C3E}.Debug|x64.ActiveCfg = Debug|Win32 {824DA4CF-06F0-45C9-929A-8792F0E19C3E}.Release|Win32.ActiveCfg = Release|Win32 {824DA4CF-06F0-45C9-929A-8792F0E19C3E}.Release|Win32.Build.0 = Release|Win32 {824DA4CF-06F0-45C9-929A-8792F0E19C3E}.Release|x64.ActiveCfg = Release|Win32 - {824DA4CF-06F0-45C9-929A-8792F0E19C3E}.Unittests|Win32.ActiveCfg = Unittests|Win32 - {824DA4CF-06F0-45C9-929A-8792F0E19C3E}.Unittests|Win32.Build.0 = Unittests|Win32 - {824DA4CF-06F0-45C9-929A-8792F0E19C3E}.Unittests|x64.ActiveCfg = Unittests|Win32 {39EC200D-7795-4FF8-B214-B24EDA5526AE}.Debug|Win32.ActiveCfg = Debug|Win32 {39EC200D-7795-4FF8-B214-B24EDA5526AE}.Debug|Win32.Build.0 = Debug|Win32 {39EC200D-7795-4FF8-B214-B24EDA5526AE}.Debug|x64.ActiveCfg = Debug|Win32 {39EC200D-7795-4FF8-B214-B24EDA5526AE}.Release|Win32.ActiveCfg = Release|Win32 {39EC200D-7795-4FF8-B214-B24EDA5526AE}.Release|Win32.Build.0 = Release|Win32 {39EC200D-7795-4FF8-B214-B24EDA5526AE}.Release|x64.ActiveCfg = Release|Win32 - {39EC200D-7795-4FF8-B214-B24EDA5526AE}.Unittests|Win32.ActiveCfg = Unittests|Win32 - {39EC200D-7795-4FF8-B214-B24EDA5526AE}.Unittests|Win32.Build.0 = Unittests|Win32 - {39EC200D-7795-4FF8-B214-B24EDA5526AE}.Unittests|x64.ActiveCfg = Unittests|Win32 {718DE063-A18B-BB72-9150-62B892E6FFA6}.Debug|Win32.ActiveCfg = Debug|Win32 {718DE063-A18B-BB72-9150-62B892E6FFA6}.Debug|Win32.Build.0 = Debug|Win32 {718DE063-A18B-BB72-9150-62B892E6FFA6}.Debug|x64.ActiveCfg = Debug|Win32 {718DE063-A18B-BB72-9150-62B892E6FFA6}.Release|Win32.ActiveCfg = Release|Win32 {718DE063-A18B-BB72-9150-62B892E6FFA6}.Release|Win32.Build.0 = Release|Win32 {718DE063-A18B-BB72-9150-62B892E6FFA6}.Release|x64.ActiveCfg = Release|Win32 - {718DE063-A18B-BB72-9150-62B892E6FFA6}.Unittests|Win32.ActiveCfg = Unittests|Win32 - {718DE063-A18B-BB72-9150-62B892E6FFA6}.Unittests|Win32.Build.0 = Unittests|Win32 - {718DE063-A18B-BB72-9150-62B892E6FFA6}.Unittests|x64.ActiveCfg = Release|Win32 {2FA8F384-0775-F3B7-F8C3-85209222FC70}.Debug|Win32.ActiveCfg = Debug|Win32 {2FA8F384-0775-F3B7-F8C3-85209222FC70}.Debug|Win32.Build.0 = Debug|Win32 {2FA8F384-0775-F3B7-F8C3-85209222FC70}.Debug|x64.ActiveCfg = Debug|Win32 {2FA8F384-0775-F3B7-F8C3-85209222FC70}.Release|Win32.ActiveCfg = Release|Win32 {2FA8F384-0775-F3B7-F8C3-85209222FC70}.Release|Win32.Build.0 = Release|Win32 {2FA8F384-0775-F3B7-F8C3-85209222FC70}.Release|x64.ActiveCfg = Release|Win32 - {2FA8F384-0775-F3B7-F8C3-85209222FC70}.Unittests|Win32.ActiveCfg = Unittests|Win32 - {2FA8F384-0775-F3B7-F8C3-85209222FC70}.Unittests|Win32.Build.0 = Unittests|Win32 - {2FA8F384-0775-F3B7-F8C3-85209222FC70}.Unittests|x64.ActiveCfg = Unittests|Win32 {54509728-928B-44D9-A118-A6F92F08B34F}.Debug|Win32.ActiveCfg = Debug|Win32 {54509728-928B-44D9-A118-A6F92F08B34F}.Debug|Win32.Build.0 = Debug|Win32 {54509728-928B-44D9-A118-A6F92F08B34F}.Debug|x64.ActiveCfg = Debug|Win32 {54509728-928B-44D9-A118-A6F92F08B34F}.Release|Win32.ActiveCfg = Release|Win32 {54509728-928B-44D9-A118-A6F92F08B34F}.Release|Win32.Build.0 = Release|Win32 {54509728-928B-44D9-A118-A6F92F08B34F}.Release|x64.ActiveCfg = Release|Win32 - {54509728-928B-44D9-A118-A6F92F08B34F}.Unittests|Win32.ActiveCfg = Unittests|Win32 - {54509728-928B-44D9-A118-A6F92F08B34F}.Unittests|Win32.Build.0 = Unittests|Win32 - {54509728-928B-44D9-A118-A6F92F08B34F}.Unittests|x64.ActiveCfg = Unittests|Win32 {E3DCBC31-7FC9-D127-E000-529F8460D5FD}.Debug|Win32.ActiveCfg = Debug|Win32 {E3DCBC31-7FC9-D127-E000-529F8460D5FD}.Debug|Win32.Build.0 = Debug|Win32 {E3DCBC31-7FC9-D127-E000-529F8460D5FD}.Debug|x64.ActiveCfg = Debug|Win32 {E3DCBC31-7FC9-D127-E000-529F8460D5FD}.Release|Win32.ActiveCfg = Release|Win32 {E3DCBC31-7FC9-D127-E000-529F8460D5FD}.Release|Win32.Build.0 = Release|Win32 {E3DCBC31-7FC9-D127-E000-529F8460D5FD}.Release|x64.ActiveCfg = Release|Win32 - {E3DCBC31-7FC9-D127-E000-529F8460D5FD}.Unittests|Win32.ActiveCfg = Unittests|Win32 - {E3DCBC31-7FC9-D127-E000-529F8460D5FD}.Unittests|Win32.Build.0 = Unittests|Win32 - {E3DCBC31-7FC9-D127-E000-529F8460D5FD}.Unittests|x64.ActiveCfg = Unittests|Win32 {B3FC9DFC-7268-8660-7C0D-B60BAF02C554}.Debug|Win32.ActiveCfg = Debug|Win32 {B3FC9DFC-7268-8660-7C0D-B60BAF02C554}.Debug|Win32.Build.0 = Debug|Win32 {B3FC9DFC-7268-8660-7C0D-B60BAF02C554}.Debug|x64.ActiveCfg = Debug|Win32 {B3FC9DFC-7268-8660-7C0D-B60BAF02C554}.Release|Win32.ActiveCfg = Release|Win32 {B3FC9DFC-7268-8660-7C0D-B60BAF02C554}.Release|Win32.Build.0 = Release|Win32 {B3FC9DFC-7268-8660-7C0D-B60BAF02C554}.Release|x64.ActiveCfg = Release|Win32 - {B3FC9DFC-7268-8660-7C0D-B60BAF02C554}.Unittests|Win32.ActiveCfg = Unittests|Win32 - {B3FC9DFC-7268-8660-7C0D-B60BAF02C554}.Unittests|Win32.Build.0 = Unittests|Win32 - {B3FC9DFC-7268-8660-7C0D-B60BAF02C554}.Unittests|x64.ActiveCfg = Unittests|Win32 {12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Debug|Win32.ActiveCfg = Debug|Win32 {12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Debug|Win32.Build.0 = Debug|Win32 {12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Debug|x64.ActiveCfg = Debug|Win32 {12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Release|Win32.ActiveCfg = Release|Win32 {12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Release|Win32.Build.0 = Release|Win32 {12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Release|x64.ActiveCfg = Release|Win32 - {12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Unittests|Win32.ActiveCfg = Unittests|Win32 - {12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Unittests|Win32.Build.0 = Unittests|Win32 - {12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Unittests|x64.ActiveCfg = Release|Win32 - {32354377-ACA7-40F9-9A0E-87FC956F0B78}.Debug|Win32.ActiveCfg = Debug|Win32 - {32354377-ACA7-40F9-9A0E-87FC956F0B78}.Debug|x64.ActiveCfg = Debug|Win32 - {32354377-ACA7-40F9-9A0E-87FC956F0B78}.Release|Win32.ActiveCfg = Release|Win32 - {32354377-ACA7-40F9-9A0E-87FC956F0B78}.Release|x64.ActiveCfg = Release|Win32 - {32354377-ACA7-40F9-9A0E-87FC956F0B78}.Unittests|Win32.ActiveCfg = Release|Win32 - {32354377-ACA7-40F9-9A0E-87FC956F0B78}.Unittests|Win32.Build.0 = Release|Win32 - {32354377-ACA7-40F9-9A0E-87FC956F0B78}.Unittests|x64.ActiveCfg = Release|Win32 - {32354377-ACA7-40F9-9A0E-87FC956F0B78}.Unittests|x64.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Workspace_msvc/decoder.vcxproj b/Workspace_msvc/decoder.vcxproj index 8a71725962..e59992847c 100644 --- a/Workspace_msvc/decoder.vcxproj +++ b/Workspace_msvc/decoder.vcxproj @@ -9,10 +9,6 @@ Release Win32 - - Unittests - Win32 - decoder @@ -27,12 +23,6 @@ false MultiByte - - Application - v141 - false - MultiByte - Application v141 @@ -46,10 +36,6 @@ - - - - @@ -65,13 +51,6 @@ false IVAS_dec - - ..\ - .\Debug_$(ProjectName)\ - false - false - IVAS_dec - ..\ .\Release_$(ProjectName)\ @@ -89,7 +68,7 @@ Disabled - ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories) + ..\lib_dec;..\lib_com;..\lib_util;..\lib_debug;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;$(Macros);%(PreprocessorDefinitions) EnableFastChecks @@ -121,56 +100,6 @@ MachineX86 - - - - - - - $(IntDir)$(ProjectName).tlb - - - - - Disabled - ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;$(Macros);%(PreprocessorDefinitions) - - - EnableFastChecks - MultiThreadedDebug - false - - - - - $(IntDir)$(ProjectName).pdb - Level4 - true - OldStyle - Default - %(DisableSpecificWarnings) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c0c - - - - - $(OutDir)$(TargetName).exe - true - - - true - $(IntDir)$(ProjectName).pdb - Console - false - - - MachineX86 - - $(IntDir)$(ProjectName).tlb @@ -183,7 +112,7 @@ Neither false false - ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories) + ..\lib_dec;..\lib_com;..\lib_util;..\lib_debug;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions) true diff --git a/Workspace_msvc/encoder.vcxproj b/Workspace_msvc/encoder.vcxproj index 755e404b67..bcfe92a4db 100644 --- a/Workspace_msvc/encoder.vcxproj +++ b/Workspace_msvc/encoder.vcxproj @@ -89,7 +89,7 @@ Disabled - ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories) + ..\lib_enc;..\lib_com;..\lib_util;..\lib_debug;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;$(Macros);%(PreprocessorDefinitions) EnableFastChecks @@ -198,7 +198,7 @@ Neither false false - ..\lib_enc;..\lib_dec;..\lib_com;..\lib_util;..\lib_debug;%(AdditionalIncludeDirectories) + ..\lib_enc;..\lib_com;..\lib_util;..\lib_debug;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions) true diff --git a/Workspace_msvc/lib_com.vcxproj b/Workspace_msvc/lib_com.vcxproj index 994b1ec429..23aa2ae3f0 100644 --- a/Workspace_msvc/lib_com.vcxproj +++ b/Workspace_msvc/lib_com.vcxproj @@ -244,9 +244,9 @@ + - @@ -268,6 +268,7 @@ + @@ -358,4 +359,4 @@ - + \ No newline at end of file diff --git a/Workspace_msvc/lib_com.vcxproj.filters b/Workspace_msvc/lib_com.vcxproj.filters index f9d7920ca2..7b6854e718 100644 --- a/Workspace_msvc/lib_com.vcxproj.filters +++ b/Workspace_msvc/lib_com.vcxproj.filters @@ -379,9 +379,6 @@ common_evs_c - - common_ivas_c - common_ivas_c @@ -463,6 +460,12 @@ common_ivas_c + + common_ivas_c + + + common_ivas_c + diff --git a/Workspace_msvc/lib_debug.vcxproj b/Workspace_msvc/lib_debug.vcxproj index ec954e62ff..7a2fcecef1 100644 --- a/Workspace_msvc/lib_debug.vcxproj +++ b/Workspace_msvc/lib_debug.vcxproj @@ -73,7 +73,7 @@ Disabled - ..\lib_util;..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;%(AdditionalIncludeDirectories) + ..\lib_util;..\lib_com;..\lib_debug;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions) false @@ -124,7 +124,7 @@ AnySuitable false false - ..\lib_util;..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;%(AdditionalIncludeDirectories) + ..\lib_util;..\lib_com;..\lib_debug;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions) true @@ -143,20 +143,14 @@ - - - - + - - - - + @@ -166,4 +160,4 @@ - + \ No newline at end of file diff --git a/Workspace_msvc/lib_dec.vcxproj b/Workspace_msvc/lib_dec.vcxproj index ad725ce034..e1c0f9ead1 100644 --- a/Workspace_msvc/lib_dec.vcxproj +++ b/Workspace_msvc/lib_dec.vcxproj @@ -89,7 +89,7 @@ Disabled - ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;..\lib_rend;%(AdditionalIncludeDirectories) + ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions) EnableFastChecks @@ -169,7 +169,7 @@ Neither false false - ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;..\lib_rend;%(AdditionalIncludeDirectories) + ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions) true @@ -264,6 +264,7 @@ + @@ -271,24 +272,29 @@ - + + + + + + @@ -298,6 +304,7 @@ + @@ -316,7 +323,6 @@ - diff --git a/Workspace_msvc/lib_dec.vcxproj.filters b/Workspace_msvc/lib_dec.vcxproj.filters index 5b52aabb77..d1dedc413c 100644 --- a/Workspace_msvc/lib_dec.vcxproj.filters +++ b/Workspace_msvc/lib_dec.vcxproj.filters @@ -13,9 +13,6 @@ dec_ivas_c - - dec_ivas_c - dec_ivas_c @@ -473,9 +470,6 @@ dec_ivas_c - - dec_ivas_c - dec_ivas_c @@ -500,6 +494,30 @@ dec_ivas_c + + dec_ivas_c + + + dec_ivas_c + + + dec_ivas_c + + + dec_ivas_c + + + dec_ivas_c + + + dec_ivas_c + + + dec_ivas_c + + + dec_ivas_c + diff --git a/Workspace_msvc/lib_enc.vcxproj b/Workspace_msvc/lib_enc.vcxproj index a2d1e13ae7..15f0d53574 100644 --- a/Workspace_msvc/lib_enc.vcxproj +++ b/Workspace_msvc/lib_enc.vcxproj @@ -211,6 +211,7 @@ + diff --git a/Workspace_msvc/lib_enc.vcxproj.filters b/Workspace_msvc/lib_enc.vcxproj.filters index 8fe608e0a6..21941038ec 100644 --- a/Workspace_msvc/lib_enc.vcxproj.filters +++ b/Workspace_msvc/lib_enc.vcxproj.filters @@ -584,6 +584,9 @@ enc_ivas_c + + enc_ivas_c + diff --git a/Workspace_msvc/lib_rend.vcxproj b/Workspace_msvc/lib_rend.vcxproj index dc739ee392..cf98947589 100644 --- a/Workspace_msvc/lib_rend.vcxproj +++ b/Workspace_msvc/lib_rend.vcxproj @@ -197,32 +197,29 @@ + + + - - - - - + - - @@ -246,7 +243,9 @@ - + + + diff --git a/Workspace_msvc/lib_util.vcxproj b/Workspace_msvc/lib_util.vcxproj index 089554b323..627b78564c 100644 --- a/Workspace_msvc/lib_util.vcxproj +++ b/Workspace_msvc/lib_util.vcxproj @@ -73,7 +73,7 @@ Disabled - ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;..\lib_rend;%(AdditionalIncludeDirectories) + ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_util;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;$(Macros);ZLIB_WINAPI;%(PreprocessorDefinitions) false @@ -117,7 +117,7 @@ AnySuitable false false - ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;..\lib_rend;%(AdditionalIncludeDirectories) + ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_util;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;$(Macros);ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -146,6 +146,7 @@ + @@ -158,6 +159,7 @@ + @@ -168,6 +170,7 @@ + @@ -183,6 +186,7 @@ + diff --git a/Workspace_msvc/renderer.vcxproj b/Workspace_msvc/renderer.vcxproj index 250d5c6025..94ad9f774e 100644 --- a/Workspace_msvc/renderer.vcxproj +++ b/Workspace_msvc/renderer.vcxproj @@ -86,7 +86,7 @@ Disabled - ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;..\lib_rend;..\lib_rend\ivas_cldfb_trans_codec;%(AdditionalIncludeDirectories) + ..\lib_com;..\lib_dec;..\lib_enc;..\lib_debug;..\lib_util;..\lib_rend;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;$(Macros);%(PreprocessorDefinitions) EnableFastChecks @@ -130,7 +130,7 @@ Disabled - ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;..\lib_rend;..\lib_rend\ivas_cldfb_trans_codec;%(AdditionalIncludeDirectories) + ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;..\lib_rend;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;$(Macros);%(PreprocessorDefinitions) @@ -180,7 +180,7 @@ Neither false false - ..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;..\lib_rend;..\lib_rend\ivas_cldfb_trans_codec;%(AdditionalIncludeDirectories) + ..\lib_com;..\lib_dec;..\lib_enc;..\lib_debug;..\lib_util;..\lib_rend;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions) true diff --git a/Workspace_msvc/renderer_configs/split_renderer_config_768_0dof_tdposecorr.txt b/Workspace_msvc/renderer_configs/split_renderer_config_512_0dof_tdposecorr.txt similarity index 86% rename from Workspace_msvc/renderer_configs/split_renderer_config_768_0dof_tdposecorr.txt rename to Workspace_msvc/renderer_configs/split_renderer_config_512_0dof_tdposecorr.txt index 0db07df124..e40f92718c 100644 --- a/Workspace_msvc/renderer_configs/split_renderer_config_768_0dof_tdposecorr.txt +++ b/Workspace_msvc/renderer_configs/split_renderer_config_512_0dof_tdposecorr.txt @@ -1,5 +1,5 @@ [SPLITREND] -BITRATE = 768000; +BITRATE = 512000; DOF = 0; HQMODE = 0; POSECORRECTIONMODE = 1; diff --git a/Workspace_msvc/renderer_configs/split_renderer_config_768_2dof.txt b/Workspace_msvc/renderer_configs/split_renderer_config_768_2dof.txt new file mode 100644 index 0000000000..20488df35b --- /dev/null +++ b/Workspace_msvc/renderer_configs/split_renderer_config_768_2dof.txt @@ -0,0 +1,10 @@ +[SPLITREND] +BITRATE = 768000; +DOF = 2; +HQMODE = 0; + +[GENERAL] +RENDERER = CREND; + +[ROOMACOUSTICS] +REVERB = FALSE; diff --git a/Workspace_msvc/renderer_configs/split_renderer_config_HBR_1dof_tdposecorr.txt b/Workspace_msvc/renderer_configs/split_renderer_config_HBR_1dof_tdposecorr.txt new file mode 100644 index 0000000000..162321aa61 --- /dev/null +++ b/Workspace_msvc/renderer_configs/split_renderer_config_HBR_1dof_tdposecorr.txt @@ -0,0 +1,11 @@ +[SPLITREND] +BITRATE = -1; +DOF = 1; +HQMODE = 0; +POSECORRECTIONMODE = 1; + +[GENERAL] +RENDERER = CREND; + +[ROOMACOUSTICS] +REVERB = FALSE; diff --git a/apps/decoder.c b/apps/decoder.c index aad735dd00..f3dbaad169 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -30,6 +30,10 @@ *******************************************************************************************************/ +#include +#include +#include +#include "assert.h" #include "lib_dec.h" #include "cmdl_tools.h" #include "audio_file_writer.h" @@ -39,30 +43,21 @@ #include "ls_custom_file_reader.h" #include "hrtf_file_reader.h" #include "head_rotation_file_reader.h" +#include "vector3_pair_file_reader.h" #include "jbm_file_writer.h" #include "evs_rtp_payload.h" -#include -#include -#ifdef WMOPS -#include "PROM_Size_lib_com.h" -#include "PROM_Size_lib_dec.h" -#include "wmops.h" -#endif -#ifdef RAM_COUNTING_TOOL -#include "mem_count.h" -#else -#include -#endif #ifdef DEBUGGING #include "debug.h" #endif +#include "wmc_auto.h" #include "render_config_reader.h" #ifdef SPLIT_REND_WITH_HEAD_ROT #include "split_render_file_read_write.h" #endif +#include "hrtf_file_reader.h" -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP /*------------------------------------------------------------------------------------------* * Local constants, enums, structures @@ -79,14 +74,15 @@ static #define MAX_FRAME_SIZE ( 48000 / NUM_FRAMES_PER_SEC ) #define MAX_NUM_OUTPUT_CHANNELS 16 #define MAX_OUTPUT_PCM_BUFFER_SIZE ( MAX_NUM_OUTPUT_CHANNELS * MAX_FRAME_SIZE ) - #ifdef SPLIT_REND_WITH_HEAD_ROT #define MAX_SPLIT_REND_BITRATE ( 768000 ) #define MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES ( ( ( (int32_t) MAX_SPLIT_REND_BITRATE / NUM_FRAMES_PER_SEC ) + 7 ) >> 3 ) #endif - -#define IVAS_PUBLIC_ORIENT_TRK_REF 0 -#define IVAS_PUBLIC_ORIENT_TRK_AVG 1 +#define IVAS_PUBLIC_ORIENT_TRK_NONE ( 0 ) +#define IVAS_PUBLIC_ORIENT_TRK_REF ( 1 ) +#define IVAS_PUBLIC_ORIENT_TRK_AVG ( 2 ) +#define IVAS_PUBLIC_ORIENT_TRK_REF_VEC ( 3 ) +#define IVAS_PUBLIC_ORIENT_TRK_REF_VEC_LEV ( 4 ) typedef struct { @@ -100,6 +96,10 @@ typedef struct bool voipMode; bool enableHeadRotation; char *headrotTrajFileName; + bool enableReferenceRotation; + char *refrotTrajFileName; + bool enableReferenceVectorTracking; + char *referenceVectorTrajFileName; #ifdef SUPPORT_JBM_TRACEFILE char *jbmTraceFilename; #endif @@ -108,6 +108,8 @@ typedef struct float FER; bool hrtfReaderEnabled; char *hrtfFileName; + bool hrtfCRendReaderEnabled; + char *hrtfCRendFileName; IVAS_DEC_INPUT_FORMAT inputFormat; bool customLsOutputEnabled; char *customLsSetupFilename; @@ -117,7 +119,6 @@ typedef struct char *renderConfigFilename; #ifdef DEBUGGING - bool forceSubframeBinauralization; IVAS_DEC_FORCED_REND_MODE forcedRendMode; #ifdef DEBUG_FOA_AGC FILE *agcBitstream; /* temporary */ @@ -132,7 +133,7 @@ typedef struct static bool parseCmdlIVAS_dec( int16_t argc, char **argv, DecArguments *arg ); static void usage_dec( void ); -static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, HeadRotFileReader *headRotReader, +static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, HeadRotFileReader *headRotReader, HeadRotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, #ifdef SPLIT_REND_WITH_HEAD_ROT uint8_t *splitRendBitsBuf, #endif @@ -140,46 +141,12 @@ static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, Head int16_t *pcmBuf ); static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec ); #ifdef DEBUGGING +static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec ); static int16_t app_own_random( int16_t *seed ); static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec( char *forcedRendModeChar ); #endif -#ifdef WMOPS -/*------------------------------------------------------------------------------------------* - * Function to print complexity & memory estimates at the decoder - *------------------------------------------------------------------------------------------*/ - -extern int16_t *ptr_base_stack; -extern int16_t *ptr_base_stack; -extern int16_t *ptr_max_stack; -extern int32_t wc_frame; -extern char location_max_stack[256]; -void print_stack_call_tree( void ); - -static void print_mem_dec( size_t SRAM_size ) -{ - fprintf( stdout, "\n\n --- Decoder memory usage --- \n\n" ); - - fprintf( stdout, "PROM size (decoder): %d words (or instructions)\n", PROM_Size_lib_dec ); - fprintf( stdout, "PROM size (common): %d words (or instructions)\n", PROM_Size_lib_com ); - fprintf( stdout, "Stack size (decoder): %ld words in %s() in frame #%d\n", ( ( ptr_base_stack - ptr_max_stack ) * sizeof( int16_t ) ) / sizeof( float ), location_max_stack, wc_frame ); - fprintf( stdout, "Table ROM size (decoder): %ld words\n", ( Const_Data_Size_rom_dec() + Const_Data_Size_ivas_rom_dec() ) / sizeof( float ) ); - fprintf( stdout, "Table ROM size (binaural renderer): %ld words\n", ( Const_Data_Size_ivas_rom_binauralRen() + Const_Data_Size_ivas_rom_TdBinauralR() + Const_Data_Size_ivas_rom_binaural_cr() ) / sizeof( float ) ); - fprintf( stdout, "Table ROM size (common): %ld words\n", ( Const_Data_Size_rom_com() + Const_Data_Size_ivas_rom_com() ) / sizeof( float ) ); -#ifdef RAM_COUNTING_TOOL - fprintf( stdout, "Static RAM size (decoder): %ld words\n\n", SRAM_size ); -#endif - print_stack_call_tree(); - - fprintf( stdout, "Note: this is an optimistic estimate of the memory consumption assuming\n" ); - fprintf( stdout, " that each variable (short, long or float) in the codec requires\n" ); - fprintf( stdout, " 32 bits of memory and may therefore be represented by 1 word.\n" ); - fprintf( stdout, " The following formula is used: sizeof('memory array')/sizeof(float)\n\n" ); -} -#endif - - /*------------------------------------------------------------------------------------------* * main() * @@ -197,6 +164,8 @@ int main( LsCustomFileReader *hLsCustomReader = NULL; hrtfFileReader *hrtfReader = NULL; HeadRotFileReader *headRotReader = NULL; + HeadRotFileReader *refRotReader = NULL; + Vector3PairFileReader *referenceVectorReader = NULL; ivas_error error = IVAS_ERR_UNKNOWN; int16_t pcmBuf[MAX_OUTPUT_PCM_BUFFER_SIZE]; #ifdef SPLIT_REND_WITH_HEAD_ROT @@ -211,18 +180,12 @@ int main( #endif #endif -#ifdef WMOPS - size_t SRAM_size = 0; - reset_stack(); - reset_wmops(); -#endif - #ifdef DEBUGGING dbgargs( &argc, argv ); #endif - -#ifdef RAM_COUNTING_TOOL - mem_count_init( 0, USE_32BITS ); +#ifdef WMOPS + reset_wmops(); + reset_mem( USE_32BITS ); #endif /*------------------------------------------------------------------------------------------* @@ -279,8 +242,17 @@ int main( if ( arg.hrtfReaderEnabled ) { - if ( ( ( error = hrtfFileReader_open( arg.hrtfFileName, &hrtfReader ) ) != IVAS_ERR_OK ) ) + /* sanity check */ + if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM ) { + arg.hrtfReaderEnabled = false; + fprintf( stderr, "\nError: HRTF binary file cannot be used in this output configuration.\n\n" ); + goto cleanup; + } + + if ( ( error = hrtfFileReader_open( arg.hrtfFileName, &hrtfReader ) ) != IVAS_ERR_OK ) + { + arg.hrtfReaderEnabled = false; fprintf( stderr, "\nError: Can't open HRTF binary file %s \n\n", arg.hrtfFileName ); goto cleanup; } @@ -292,6 +264,17 @@ int main( if ( arg.enableHeadRotation ) { + /* sanity check */ + if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM +#ifdef SPLIT_REND_WITH_HEAD_ROT + && arg.outputFormat != IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CLDFB +#endif + ) + { + fprintf( stderr, "\nError: Head-rotation file file cannot be used in this output configuration.\n\n" ); + goto cleanup; + } + if ( ( error = HeadRotationFileReader_open( arg.headrotTrajFileName, &headRotReader ) ) != IVAS_ERR_OK ) { fprintf( stderr, "\nError: Can't open head-rotation file %s \n\n", arg.headrotTrajFileName ); @@ -299,6 +282,60 @@ int main( } } + /*------------------------------------------------------------------------------------------* + * Open reference rotation file + *------------------------------------------------------------------------------------------*/ + + if ( arg.enableReferenceRotation ) + { + /* sanity check */ + if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM ) + { + fprintf( stderr, "\nError: Reference rotation file cannot be used in this output configuration.\n\n" ); + goto cleanup; + } + + /* sanity check */ + if ( arg.orientation_tracking != IVAS_PUBLIC_ORIENT_TRK_REF ) + { + fprintf( stderr, "\nError: Reference rotation file can be used in '-otr ref' mode only.\n\n" ); + goto cleanup; + } + + if ( ( error = HeadRotationFileReader_open( arg.refrotTrajFileName, &refRotReader ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError: Can't open reference rotation file %s \n\n", arg.refrotTrajFileName ); + goto cleanup; + } + } + + /*------------------------------------------------------------------------------------------* + * Open reference vector trajectory file + *------------------------------------------------------------------------------------------*/ + + if ( arg.enableReferenceVectorTracking ) + { + /* sanity check */ + if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM ) + { + fprintf( stderr, "\nError: Reference vector trajectory file cannot be used in this output configuration.\n\n" ); + goto cleanup; + } + + /* sanity check */ + if ( arg.orientation_tracking != IVAS_PUBLIC_ORIENT_TRK_REF_VEC && arg.orientation_tracking != IVAS_PUBLIC_ORIENT_TRK_REF_VEC_LEV ) + { + fprintf( stderr, "\nError: Reference trajectory file can be used in '-otr ref_vec' or '-otr ref_vec_lev' mode only.\n\n" ); + goto cleanup; + } + + if ( ( error = Vector3PairFileReader_open( arg.referenceVectorTrajFileName, &referenceVectorReader ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError: Can't open reference vector trajectory file %s \n\n", arg.referenceVectorTrajFileName ); + goto cleanup; + } + } + /*------------------------------------------------------------------------------------------* * Open custom loudspeaker layout file *------------------------------------------------------------------------------------------*/ @@ -318,6 +355,17 @@ int main( if ( arg.renderConfigEnabled ) { + /* sanity check */ + if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM +#ifdef SPLIT_REND_WITH_HEAD_ROT + && arg.outputFormat != IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CLDFB +#endif + ) + { + fprintf( stderr, "\nError: Renderer configuration file cannot be used in this output configuration.\n\n" ); + goto cleanup; + } + if ( ( error = RenderConfigReader_open( arg.renderConfigFilename, &renderConfigReader ) ) != IVAS_ERR_OK ) { fprintf( stderr, "\nError: Can't open Renderer configuration file %s \n\n", arg.renderConfigFilename ); @@ -334,12 +382,7 @@ int main( arg.enableHeadRotation = true; } #endif -#ifdef DEBUGGING - if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, - arg.forceSubframeBinauralization ) ) != IVAS_ERR_OK ) -#else - if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation ) ) != IVAS_ERR_OK ) -#endif + if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled ) ) != IVAS_ERR_OK ) { fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) ); goto cleanup; @@ -352,7 +395,11 @@ int main( if ( arg.voipMode ) { - IVAS_DEC_PrintConfig( hIvasDec, arg.quietModeEnabled, arg.voipMode ); + if ( ( error = printBitstreamInfoVoip( arg, hBsReader, hIvasDec ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error while previewing VoIP bitstream: %s\n", ivas_error_to_string( error ) ); + goto cleanup; + } } else { @@ -428,9 +475,9 @@ int main( fprintf( stdout, "FEC: %.2f %%\n", arg.FER ); } } -#else +#else /* DEBUGGING */ IVAS_DEC_PrintConfig( hIvasDec, 1, arg.voipMode ); -#endif +#endif /* DEBUGGING */ /*-------------------------------------------------------------------* * Load renderer configuration from file @@ -442,15 +489,15 @@ int main( /* sanity check */ #ifdef SPLIT_REND_WITH_HEAD_ROT - if ( ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM ) && ( arg.outputFormat != IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CLDFB ) ) + if ( ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM ) && ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL ) && ( arg.outputFormat != IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CLDFB ) ) { fprintf( stderr, "\nExternal Renderer Config is supported only when BINAURAL_ROOM is used as output OR when Split rendering mode is enabled. Exiting. \n" ); exit( -1 ); } #else - if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM ) + if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL ) { - fprintf( stderr, "\nExternal Renderer Config is supported only when BINAURAL_ROOM is used as output. Exiting. \n\n" ); + fprintf( stderr, "\nExternal Renderer Config is supported only for BINAURAL and BINAURAL_ROOM. Exiting. \n\n" ); goto cleanup; } #endif @@ -511,6 +558,30 @@ int main( fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName ); goto cleanup; } + + + IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF; + IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF ); + + if ( ( error = create_SetOfHRTF_from_binary( hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError in loading HRTF binary file %s for CRend \n\n", arg.hrtfCRendFileName ); + goto cleanup; + } + IVAS_DEC_HRTF_FASTCONV_HANDLE hHrtfFastConv; + IVAS_DEC_GetHrtfFastConvHandle( hIvasDec, &hHrtfFastConv ); + + if ( ( error = load_fastconv_HRTF_from_binary( hHrtfFastConv, hrtfReader ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError in loading HRTF binary file %s for FastConv \n\n", arg.hrtfCRendFileName ); + } + IVAS_DEC_HRTF_PARAMBIN_HANDLE hHrtfParambin; + IVAS_DEC_GetHrtfParamBinHandle( hIvasDec, &hHrtfParambin ); + + if ( ( error = load_parambin_HRTF_from_binary( hHrtfParambin, hrtfReader ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError in loading HRTF binary file %s for parametric binauralizer \n\n", arg.hrtfCRendFileName ); + } } /*-----------------------------------------------------------------* @@ -519,11 +590,6 @@ int main( if ( arg.voipMode ) { - if ( arg.decMode != IVAS_DEC_MODE_EVS ) - { - fprintf( stderr, "\nError: VoIP not yet supported for decMode: %d\n\n", arg.decMode ); - goto cleanup; - } if ( ( error = IVAS_DEC_EnableVoIP( hIvasDec, 60, arg.inputFormat ) ) != IVAS_ERR_OK ) { @@ -535,7 +601,7 @@ int main( } else { - error = decodeG192( arg, hBsReader, headRotReader, + error = decodeG192( arg, hBsReader, headRotReader, refRotReader, referenceVectorReader, #ifdef SPLIT_REND_WITH_HEAD_ROT splitRendBitsBuf, #endif @@ -582,10 +648,21 @@ cleanup: IVAS_DEC_GetSbaDebugParams( hIvasDec, &numOutChannels, &numTransportChannels, &pca_ingest_channels ); #endif + if ( arg.hrtfReaderEnabled ) + { + IVAS_DEC_HRTF_HANDLE hHrtfTD; + IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD ); + dealloc_HRTF_binary( hHrtfTD ); + IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF; + IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF ); + destroy_SetOfHRTF( hSetOfHRTF ); + } IVAS_DEC_Close( &hIvasDec ); CustomLsReader_close( &hLsCustomReader ); hrtfFileReader_close( &hrtfReader ); HeadRotationFileReader_close( &headRotReader ); + HeadRotationFileReader_close( &refRotReader ); + Vector3PairFileReader_close( &referenceVectorReader ); RenderConfigReader_close( &renderConfigReader ); if ( BS_Reader_Close( &hBsReader ) != IVAS_ERR_OK ) @@ -593,15 +670,9 @@ cleanup: fprintf( stderr, "\nError while closing file: %s\nContinuing...\n\n", arg.inputBitstreamFilename ); } -#ifdef RAM_COUNTING_TOOL -#ifdef WMOPS - SRAM_size = -#endif - mem_count_summary( USE_DEFAULT ); -#endif #ifdef WMOPS print_wmops(); - print_mem_dec( SRAM_size ); + print_mem( NULL ); #endif if ( !arg.quietModeEnabled ) @@ -634,6 +705,7 @@ static IVAS_DEC_AUDIO_CONFIG cmdline2config( char argv_to_upper[FILENAME_MAX]; strncpy( argv_to_upper, argv, sizeof( argv_to_upper ) - 1 ); + argv_to_upper[sizeof( argv_to_upper ) - 1] = '\0'; to_upper( argv_to_upper ); if ( strcmp( argv_to_upper, "EXT" ) == 0 ) /* external renderer */ @@ -717,10 +789,8 @@ static bool parseCmdlIVAS_dec( char argv_to_upper[FILENAME_MAX]; #ifdef DEBUGGING float ftmp; - char stmp[FILENAME_MAX]; arg->forcedRendMode = IVAS_DEC_FORCE_REND_UNFORCED; - arg->forceSubframeBinauralization = false; #ifdef DEBUG_FOA_AGC arg->agcBitstream = NULL; #endif @@ -734,8 +804,11 @@ static bool parseCmdlIVAS_dec( arg->enableHeadRotation = false; arg->headrotTrajFileName = NULL; - - arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_REF; + arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_NONE; + arg->enableReferenceRotation = false; + arg->headrotTrajFileName = NULL; + arg->enableReferenceVectorTracking = false; + arg->referenceVectorTrajFileName = NULL; #ifdef SUPPORT_JBM_TRACEFILE arg->jbmTraceFilename = NULL; @@ -748,6 +821,9 @@ static bool parseCmdlIVAS_dec( arg->hrtfReaderEnabled = false; arg->hrtfFileName = NULL; + arg->hrtfCRendReaderEnabled = false; + arg->hrtfCRendFileName = NULL; + arg->customLsOutputEnabled = false; arg->customLsSetupFilename = NULL; @@ -777,6 +853,7 @@ static bool parseCmdlIVAS_dec( while ( argv[i][0] == '-' ) { strncpy( argv_to_upper, argv[i], sizeof( argv_to_upper ) - 1 ); + argv_to_upper[sizeof( argv_to_upper ) - 1] = '\0'; to_upper( argv_to_upper ); if ( strcmp( argv_to_upper, "-VOIP" ) == 0 ) @@ -784,13 +861,13 @@ static bool parseCmdlIVAS_dec( arg->voipMode = 1; i++; } - else if ( strcmp( to_upper( argv[i] ), "-VOIP_HF_ONLY=0" ) == 0 ) + else if ( strcmp( argv_to_upper, "-VOIP_HF_ONLY=0" ) == 0 ) { arg->voipMode = 1; arg->inputFormat = IVAS_DEC_INPUT_FORMAT_RTPDUMP; i++; } - else if ( strcmp( to_upper( argv[i] ), "-VOIP_HF_ONLY=1" ) == 0 ) + else if ( strcmp( argv_to_upper, "-VOIP_HF_ONLY=1" ) == 0 ) { arg->voipMode = 1; arg->inputFormat = IVAS_DEC_INPUT_FORMAT_RTPDUMP_HF; @@ -863,21 +940,15 @@ static bool parseCmdlIVAS_dec( i++; if ( i < argc - 3 ) { - strncpy( stmp, argv[i], sizeof( stmp ) ); - arg->forcedRendMode = parseForcedRendModeDec( stmp ); + strncpy( argv_to_upper, argv[i], sizeof( argv_to_upper ) - 1 ); + argv_to_upper[sizeof( argv_to_upper ) - 1] = '\0'; + arg->forcedRendMode = parseForcedRendModeDec( argv_to_upper ); i++; } } - else if ( strcmp( argv_to_upper, "-FORCE_SUBFRAME_BIN" ) == 0 ) /* Force binauralization to subframe (5 ms) resolution */ - { - arg->forceSubframeBinauralization = true; - i++; - } #ifdef DEBUG_MODE_INFO #ifdef DEBUG_MODE_INFO_TWEAK - /*-----------------------------------------------------------------* - * Define additional subfolder for debug info output in ./res - *-----------------------------------------------------------------*/ + /* Define additional subfolder for debug info output in ./res */ else if ( strcmp( argv_to_upper, "-INFO" ) == 0 ) { extern char infoFolder[FILENAME_MAX]; @@ -910,30 +981,69 @@ static bool parseCmdlIVAS_dec( } else if ( strcmp( argv_to_upper, "-OTR" ) == 0 ) { - if ( strlen( argv[i + 1] ) > 3 ) + + strncpy( argv_to_upper, argv[i + 1], sizeof( argv_to_upper ) - 1 ); + argv_to_upper[sizeof( argv_to_upper ) - 1] = '\0'; + to_upper( argv_to_upper ); + + if ( strcmp( argv_to_upper, "NONE" ) == 0 ) { - fprintf( stderr, "Error: Invalid orientation tracking type %s \n\n", argv[i + 1] ); - usage_dec(); - return false; + arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_NONE; } - char tmp[4]; - strcpy( tmp, argv[i + 1] ); - if ( strcmp( to_upper( tmp ), "REF" ) == 0 ) + else if ( strcmp( argv_to_upper, "REF" ) == 0 ) { arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_REF; } - else if ( strcmp( to_upper( tmp ), "AVG" ) == 0 ) + else if ( strcmp( argv_to_upper, "AVG" ) == 0 ) { arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_AVG; } + else if ( strcmp( argv_to_upper, "REF_VEC" ) == 0 ) + { + arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_REF_VEC; + } + else if ( strcmp( argv_to_upper, "REF_VEC_LEV" ) == 0 ) + { + arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_REF_VEC_LEV; + } else { - fprintf( stderr, "Error: Invalid orientation tracking type %s \n\n", tmp ); + fprintf( stderr, "Error: Invalid orientation tracking type %s \n\n", argv[i + 1] ); usage_dec(); return false; } i += 2; } + else if ( strcmp( argv_to_upper, "-RF" ) == 0 ) + { + arg->enableReferenceRotation = true; + i++; + + if ( argc - i <= 4 || argv[i][0] == '-' ) + { + fprintf( stderr, "Error: Reference rotation file name not specified!\n\n" ); + usage_dec(); + return false; + } + + arg->refrotTrajFileName = argv[i]; + i++; + } + else if ( strcmp( argv_to_upper, "-RVF" ) == 0 ) + { + arg->enableReferenceVectorTracking = true; + i++; + + if ( argc - i <= 4 || argv[i][0] == '-' ) + { + fprintf( stderr, "Error: reference vector trajectory file name not specified!\n\n" ); + usage_dec(); + return false; + } + + arg->referenceVectorTrajFileName = argv[i]; + i++; + } else if ( strcmp( argv_to_upper, "-RENDER_CONFIG" ) == 0 ) { arg->renderConfigEnabled = true; @@ -958,26 +1068,27 @@ static bool parseCmdlIVAS_dec( return false; } - char *param = to_upper( argv[i] ); - if ( ( strcmp( param, "CENTER" ) == 0 ) || ( strchr( param, 'C' ) != NULL ) ) + strncpy( argv_to_upper, argv[i], sizeof( argv_to_upper ) - 1 ); + argv_to_upper[sizeof( argv_to_upper ) - 1] = '\0'; + if ( ( strcmp( argv_to_upper, "CENTER" ) == 0 ) || ( strchr( argv_to_upper, 'C' ) != NULL ) ) { arg->no_diegetic_pan = 0.f; } - else if ( ( strcmp( param, "LEFT" ) == 0 ) || ( strchr( param, 'L' ) != NULL ) ) + else if ( ( strcmp( argv_to_upper, "LEFT" ) == 0 ) || ( strchr( argv_to_upper, 'L' ) != NULL ) ) { arg->no_diegetic_pan = -1.f; } - else if ( ( strcmp( param, "RIGHT" ) == 0 ) || ( strchr( param, 'R' ) != NULL ) ) + else if ( ( strcmp( argv_to_upper, "RIGHT" ) == 0 ) || ( strchr( argv_to_upper, 'R' ) != NULL ) ) { arg->no_diegetic_pan = 1.f; } else { - arg->no_diegetic_pan = (float) atof( param ); + arg->no_diegetic_pan = (float) atof( argv_to_upper ); if ( arg->no_diegetic_pan > 1.0f || arg->no_diegetic_pan < -1.0f ) { - fprintf( stderr, "Error: Incorrect value for panning option argument specified!\n\n" ); + fprintf( stderr, "Error: Incorrect value for panning option argument specified: %s\n\n", argv[i] ); usage_dec(); return false; } @@ -1120,11 +1231,20 @@ static void usage_dec( void ) fprintf( stdout, " Format files, the magic word in the mime file is used to determine\n" ); fprintf( stdout, " which of the two supported formats is in use.\n" ); fprintf( stdout, " default bitstream file format is G.192\n" ); + fprintf( stdout, "-hrtf File : HRTF filter File used in BINAURAL output configuration\n" ); fprintf( stdout, "-T File : Head rotation specified by external trajectory File\n" ); - fprintf( stdout, "-hrtf File : HRTF filter File used in ISm format and BINAURAL output configuration\n" ); + fprintf( stdout, "-otr tracking_type : Head orientation tracking type: 'none', 'ref', 'avg', 'ref_vec' \n" ); + fprintf( stdout, " or 'ref_vec_lev' (only for binaural rendering)\n" ); + fprintf( stdout, "-rf File : Reference rotation specified by external trajectory file\n" ); + fprintf( stdout, " works only in combination with '-otr ref' mode \n" ); + fprintf( stdout, "-rvf File : Reference vector specified by external trajectory file\n" ); + fprintf( stdout, " works only in combination with '-otr ref_vec' and 'ref_vec_lev' modes\n" ); + fprintf( stdout, "-render_config File : Renderer configuration File\n" ); + fprintf( stdout, "-no_diegetic_pan : panning mono non-diegetic sound to stereo -1<= pan <=1,\n" ); + fprintf( stdout, " left or l or 1->left, right or r or -1->right, center or c or 0->middle\n" ); + fprintf( stdout, "-q : Quiet mode, no frame counter\n" ); + fprintf( stdout, " default is deactivated\n" ); #ifdef DEBUGGING - fprintf( stdout, "-force_subframe_bin : Forces parametric binauralizer code to use 5 ms time resolution even when\n" ); - fprintf( stdout, " output time resolution is larger.\n" ); fprintf( stdout, "-FEC X : Insert frame erasures, X = 0-10 is the percentage\n" ); fprintf( stdout, " of erased frames, or X may be the name of binary file or \n" ); fprintf( stdout, " file with G192 headers indicating GOOD FRAME or BAD FRAME\n" ); @@ -1132,12 +1252,11 @@ static void usage_dec( void ) fprintf( stdout, " default is OFF, if this option is not used\n" ); fprintf( stdout, "-force R : Force specific binaural rendering mode, R = (TDREND, CLDFBREND),\n" ); #endif - fprintf( stdout, "-otr tracking_type : head orientation tracking type: 'ref' or 'avg' (only for binaural rendering)\n" ); - fprintf( stdout, "-render_config file : Renderer configuration file\n" ); - fprintf( stdout, "-no_diegetic_pan : panning mono no dietic sound to stereo -1<= pan <=1,\n" ); - fprintf( stdout, " left or l or 1->left, right or r or -1->right, center or c or 0->middle\n" ); - fprintf( stdout, "-q : Quiet mode, no frame counter\n" ); - fprintf( stdout, " default is deactivated\n" ); +#ifdef DEBUG_MODE_INFO +#ifdef DEBUG_MODE_INFO_TWEAK + fprintf( stdout, "-info : specify subfolder name for debug output\n" ); +#endif +#endif fprintf( stdout, "\n" ); return; @@ -1158,103 +1277,301 @@ static int16_t app_own_random( int16_t *seed ) } #endif -/*---------------------------------------------------------------------* - * decodeG192() - * - * Read G.192 bitstream and decode in regular decoder - *---------------------------------------------------------------------*/ - -static ivas_error decodeG192( - DecArguments arg, - BS_READER_HANDLE hBsReader, - HeadRotFileReader *headRotReader, +static ivas_error initOnFirstGoodFrame( + IVAS_DEC_HANDLE hIvasDec, /* i/o: */ + const DecArguments arg, /* i : */ + const int16_t numInitialBadFrames, /* i : */ + const uint16_t numOutSamples, /* i : */ + int16_t *pFullDelayNumSamples, /* o : */ + int16_t *pRemainingDelayNumSamples, /* o : */ + int32_t *delayTimeScale, /* o : */ + IVAS_DEC_BS_FORMAT *pBsFormat, /* i/o: */ + AudioFileWriter **ppAfWriter, /* o : */ + MasaFileWriter **ppMasaWriter, /* o : */ + IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS], /* o : */ + int16_t *pNumOutChannels, /* o : */ + uint16_t *pNumObj /* o : */ #ifdef SPLIT_REND_WITH_HEAD_ROT - uint8_t *splitRendBitsBuf, + , + SplitFileReadWrite **hSplitRendFileReadWrite #endif - IVAS_DEC_HANDLE hIvasDec, - int16_t *pcmBuf ) - +) { - bool decodingFailed = true; /* Assume failure until cleanup is reached without errors */ - uint16_t bit_stream[IVAS_MAX_BITS_PER_FRAME + 4 * 8]; - int16_t i, j, num_bits; - int16_t bfi = 0; -#ifdef DEBUGGING - int16_t fec_seed = 12558; /* FEC_SEED */ -#endif - AudioFileWriter *afWriter = NULL; - MasaFileWriter *masaWriter = NULL; - bool decodedGoodFrame = false; - int16_t numInitialBadFrames = 0; /* Number of bad frames received until first good frame is decoded */ - int16_t nOutChannels = 0; - int16_t delayNumSamples = -1; - int16_t delayNumSamples_orig = 0; - int16_t zeroPad = 0; - int16_t nOutSamples = 0; - int32_t delayTimeScale = 0; ivas_error error = IVAS_ERR_UNKNOWN; - uint16_t numObj = 0; - IVAS_DEC_BS_FORMAT bsFormat = IVAS_DEC_BS_UNKOWN; - -#ifdef SPLIT_REND_WITH_HEAD_ROT - IVAS_SPLIT_REND_BITS splitRendBits; - SplitFileReadWrite *hSplitRendFileReadWrite; - int16_t delayNumSamples_temp; - int32_t delayTimeScale_temp; -#endif - IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS]; - for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i ) + /* Now delay, number of output channels and frame size are known */ + if ( ( error = IVAS_DEC_GetDelay( hIvasDec, pFullDelayNumSamples, delayTimeScale ) ) != IVAS_ERR_OK ) { - ismWriters[i] = NULL; + fprintf( stderr, "\nUnable to get delay of decoder: %s\n", ivas_error_to_string( error ) ); + return error; } - if ( !arg.quietModeEnabled ) + if ( !arg.delayCompensationEnabled ) { - fprintf( stdout, "\n------ Running the decoder ------\n\n" ); - fprintf( stdout, "Frames processed: " ); + pFullDelayNumSamples[0] = 0; } - else + *pRemainingDelayNumSamples = pFullDelayNumSamples[0]; + + if ( ( error = IVAS_DEC_GetNumOutputChannels( hIvasDec, pNumOutChannels ) ) != IVAS_ERR_OK ) { - fprintf( stdout, "\n-- Start the decoder (quiet mode) --\n\n" ); + fprintf( stderr, "\nError in IVAS_DEC_GetNumOutputChannels, code: %d\n", error ); + return error; } -#ifdef WMOPS - reset_stack(); - reset_wmops(); -#endif + int32_t pcmFrameSize; + + if ( ( error = IVAS_DEC_GetPcmFrameSize( hIvasDec, &pcmFrameSize ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError in IVAS_DEC_GetPcmFrameSize, error code: %d\n", error ); + return error; + } #ifdef SPLIT_REND_WITH_HEAD_ROT - splitRendBits.bits_buf = splitRendBitsBuf; - splitRendBits.bits_read = 0; - splitRendBits.bits_written = 0; - splitRendBits.buf_len = MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES; - hSplitRendFileReadWrite = NULL; + if ( arg.outputFormat == IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CLDFB ) + { + int16_t delayNumSamples_temp[3]; + int32_t delayTimeScale_temp; + IVAS_DEC_GetDelay( hIvasDec, delayNumSamples_temp, &delayTimeScale_temp ); + error = split_rend_writer_open( hSplitRendFileReadWrite, arg.outputWavFilename, delayNumSamples_temp[0], delayTimeScale_temp ); + if ( error != IVAS_ERR_OK ) + { + fprintf( stderr, "Could not open split rend metadata file %s\n", arg.outputWavFilename ); + exit( -1 ); + } + *ppAfWriter = NULL; + } + else #endif + { + /* Open audio writer and write all previously skipped bad frames now that frame size is known */ + if ( ( error = AudioFileWriter_open( ppAfWriter, arg.outputWavFilename, arg.output_Fs, *pNumOutChannels ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nUnable to open output file %s\n", arg.outputWavFilename ); + return error; + } + } - /*------------------------------------------------------------------------------------------* - * Loop for every packet (frame) of bitstream data - * - Read the bitstream packet - * - Run the decoder - * - Write the synthesized signal into output file - *------------------------------------------------------------------------------------------*/ + int16_t *zeroBuf = malloc( pcmFrameSize * sizeof( int16_t ) ); + memset( zeroBuf, 0, pcmFrameSize * sizeof( int16_t ) ); - while ( 1 ) + for ( int16_t i = 0; i < numInitialBadFrames; ++i ) { - /* Read next frame */ - if ( ( error = BS_Reader_ReadFrame_short( hBsReader, bit_stream, &num_bits, &bfi ) ) != IVAS_ERR_OK ) +#ifdef SPLIT_REND_WITH_HEAD_ROT + if ( *hSplitRendFileReadWrite != NULL ) { - if ( error == IVAS_ERR_END_OF_FILE ) + IVAS_SPLIT_REND_BITS splitRendBitsZero; + splitRendBitsZero.bits_written = 0; + splitRendBitsZero.bits_read = 0; + if ( split_rend_write_bitstream_to_file( *hSplitRendFileReadWrite, splitRendBitsZero.bits_buf, &splitRendBitsZero.bits_read, &splitRendBitsZero.bits_written +#ifdef SPLIT_REND_LC3PLUS + , + 0 +#endif + ) != IVAS_ERR_OK ) { - break; + fprintf( stderr, "\nUnable to write to bitstream file!\n" ); + exit( -1 ); } - fprintf( stderr, "\nError: input bitstream file couldn't be read: %s \n\n", arg.inputBitstreamFilename ); - goto cleanup; } - -#ifdef DEBUGGING - /* Random FEC simulation */ - if ( arg.FER > 0.0f ) + else +#endif + { + if ( *pRemainingDelayNumSamples < numOutSamples ) + { + if ( ( error = AudioFileWriter_write( *ppAfWriter, zeroBuf, numOutSamples * *pNumOutChannels - ( *pRemainingDelayNumSamples * *pNumOutChannels ) ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nOutput audio file writer error\n" ); + return error; + } + *pRemainingDelayNumSamples = 0; + } + else + { + *pRemainingDelayNumSamples -= numOutSamples; + } + } + } + + free( zeroBuf ); + + /* Open other output files if EXT output config - now details about ISM or MASA are known */ + if ( arg.outputFormat == IVAS_DEC_OUTPUT_EXT ) + { + if ( ( error = IVAS_DEC_GetFormat( hIvasDec, pBsFormat ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError in IVAS_DEC_GetFormat, code: %d\n", error ); + return error; + } + + /* If outputting ISM, get number of objects, open output files and write zero metadata for initial bad frames */ + if ( *pBsFormat == IVAS_DEC_BS_OBJ ) + { + if ( ( error = IVAS_DEC_GetNumObjects( hIvasDec, pNumObj ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError in IVAS_DEC_GetNumObjects: %s\n", IVAS_DEC_GetErrorMessage( error ) ); + return error; + } + + for ( int16_t i = 0; i < *pNumObj; ++i ) + { + if ( ( error = IsmFileWriter_open( arg.outputWavFilename, i, &ismWriters[i] ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError: Error opening ISM decoded metadata file %s\n", IsmFileWriter_getFilePath( ismWriters[i] ) ); + return error; + } + } + + for ( int16_t j = 0; j < numInitialBadFrames; ++j ) + { + /* write zero metadata */ + for ( int16_t i = 0; i < *pNumObj; ++i ) + { + IVAS_ISM_METADATA IsmMetadata; + + if ( ( error = IVAS_DEC_GetObjectMetadata( hIvasDec, &IsmMetadata, 1, i ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError in IVAS_DEC_GetObjectMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) ); + return error; + } + + if ( ( error = IsmFileWriter_writeFrame( IsmMetadata, ismWriters[i] ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError writing ISM metadata to file %s\n", IsmFileWriter_getFilePath( ismWriters[i] ) ); + return error; + } + } + } + } + /* If outputting MASA, open output file and write metadata for initial bad frames */ + else if ( *pBsFormat == IVAS_DEC_BS_MASA ) + { + if ( ( error = MasaFileWriter_open( arg.outputWavFilename, arg.delayCompensationEnabled, ppMasaWriter ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError: Error opening MASA decoded metadata file %s\n", MasaFileWriter_getFilePath( *ppMasaWriter ) ); + return error; + } + + /* Duplicate good first frame metadata to fill the beginning of stream. */ + MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta = NULL; + if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) ); + return error; + } + + for ( int16_t j = 0; j < numInitialBadFrames; ++j ) + { + if ( ( error = MasaFileWriter_writeFrame( *ppMasaWriter, hMasaExtOutMeta ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( *ppMasaWriter ) ); + return error; + } + } + } + } + + return IVAS_ERR_OK; +} + +/*---------------------------------------------------------------------* + * decodeG192() + * + * Read G.192 bitstream and decode in regular decoder + *---------------------------------------------------------------------*/ + +static ivas_error decodeG192( + DecArguments arg, + BS_READER_HANDLE hBsReader, + HeadRotFileReader *headRotReader, + HeadRotFileReader *refRotReader, + Vector3PairFileReader *referenceVectorReader, +#ifdef SPLIT_REND_WITH_HEAD_ROT + uint8_t *splitRendBitsBuf, +#endif + IVAS_DEC_HANDLE hIvasDec, + int16_t *pcmBuf ) + +{ + bool decodingFailed = true; /* Assume failure until cleanup is reached without errors */ + uint16_t bit_stream[IVAS_MAX_BITS_PER_FRAME + 4 * 8]; + int16_t i, num_bits; + int16_t bfi = 0; +#ifdef DEBUGGING + int16_t fec_seed = 12558; /* FEC_SEED */ +#endif + AudioFileWriter *afWriter = NULL; + MasaFileWriter *masaWriter = NULL; + bool decodedGoodFrame = false; + int16_t numInitialBadFrames = 0; /* Number of bad frames received until first good frame is decoded */ + int16_t nOutChannels = 0; + int16_t delayNumSamples = -1; + int16_t delayNumSamples_orig[3]; /* stores: overall delay, dec+rend delay, and binauralization delay */ + int16_t nOutSamples = 0; + int32_t delayTimeScale = 0; + ivas_error error = IVAS_ERR_UNKNOWN; + uint16_t numObj = 0; + IVAS_DEC_BS_FORMAT bsFormat = IVAS_DEC_BS_UNKOWN; + IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES]; + +#ifdef SPLIT_REND_WITH_HEAD_ROT + IVAS_SPLIT_REND_BITS splitRendBits; + SplitFileReadWrite *hSplitRendFileReadWrite; +#endif + + IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS]; + for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i ) + { + ismWriters[i] = NULL; + } + + if ( !arg.quietModeEnabled ) + { + fprintf( stdout, "\n------ Running the decoder ------\n\n" ); + fprintf( stdout, "Frames processed: " ); + } + else + { + fprintf( stdout, "\n-- Start the decoder (quiet mode) --\n\n" ); + } + + delayNumSamples_orig[0] = -1; + +#ifdef WMOPS + reset_stack(); + reset_wmops(); +#endif + +#ifdef SPLIT_REND_WITH_HEAD_ROT + splitRendBits.bits_buf = splitRendBitsBuf; + splitRendBits.bits_read = 0; + splitRendBits.bits_written = 0; + splitRendBits.buf_len = MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES; + hSplitRendFileReadWrite = NULL; +#endif + + /*------------------------------------------------------------------------------------------* + * Loop for every packet (frame) of bitstream data + * - Read the bitstream packet + * - Run the decoder + * - Write the synthesized signal into output file + *------------------------------------------------------------------------------------------*/ + + while ( 1 ) + { + /* Read next frame */ + if ( ( error = BS_Reader_ReadFrame_short( hBsReader, bit_stream, &num_bits, &bfi ) ) != IVAS_ERR_OK ) + { + if ( error == IVAS_ERR_END_OF_FILE ) + { + break; + } + fprintf( stderr, "\nError: input bitstream file couldn't be read: %s \n\n", arg.inputBitstreamFilename ); + goto cleanup; + } + +#ifdef DEBUGGING + /* Random FEC simulation */ + if ( arg.FER > 0.0f ) { float ftmp = (float) app_own_random( &fec_seed ) + 32768.0f; if ( ftmp <= arg.FER / 100.0f * 65535.0f ) @@ -1275,6 +1592,38 @@ static ivas_error decodeG192( goto cleanup; } + /* reference vector */ + if ( arg.enableReferenceVectorTracking ) + { + IVAS_VECTOR3 listenerPosition, referencePosition; + if ( ( error = Vector3PairFileReader_read( referenceVectorReader, &listenerPosition, &referencePosition ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError %s while reading listener and reference positions from %s\n", IVAS_DEC_GetErrorMessage( error ), Vector3PairFileReader_getFilePath( referenceVectorReader ) ); + goto cleanup; + } + + if ( ( error = IVAS_DEC_FeedRefVectorData( hIvasDec, listenerPosition, referencePosition ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nIVAS_DEC_FeedRefVectorData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) ); + goto cleanup; + } + } + /* Reference rotation */ + if ( arg.enableReferenceRotation ) + { + IVAS_QUATERNION quaternion; + if ( ( error = HeadRotationFileReading( refRotReader, &quaternion, NULL ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError %s while reading reference rotation from %s\n", IVAS_DEC_GetErrorMessage( error ), HeadRotationFileReader_getFilePath( refRotReader ) ); + goto cleanup; + } + + if ( ( error = IVAS_DEC_FeedRefRotData( hIvasDec, quaternion ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nIVAS_DEC_FeedRefRotData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) ); + goto cleanup; + } + } /* Head-tracking input simulation */ if ( arg.enableHeadRotation ) { @@ -1293,13 +1642,17 @@ static ivas_error decodeG192( else #endif { - if ( ( error = HeadRotationFileReading( headRotReader, Quaternions, frame ) ) != IVAS_ERR_OK ) + for ( i = 0; i < IVAS_MAX_PARAM_SPATIAL_SUBFRAMES; i++ ) { - fprintf( stderr, "\nError %s while reading head orientation from %s\n", IVAS_DEC_GetErrorMessage( error ), HeadRotationFileReader_getFilePath( headRotReader ) ); - goto cleanup; + if ( ( error = HeadRotationFileReading( headRotReader, &Quaternions[i], &Pos[i] ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError %s while reading head orientation from %s\n", IVAS_DEC_GetErrorMessage( error ), HeadRotationFileReader_getFilePath( headRotReader ) ); + goto cleanup; + } } } - if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions + + if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions, Pos #ifdef SPLIT_REND_WITH_HEAD_ROT , DEFAULT_AXIS @@ -1310,7 +1663,6 @@ static ivas_error decodeG192( goto cleanup; } } - /* Run decoder for one frame (get rendered output) */ if ( ( error = IVAS_DEC_GetSamples( hIvasDec, pcmBuf, &nOutSamples #ifdef SPLIT_REND_WITH_HEAD_ROT @@ -1335,161 +1687,28 @@ static ivas_error decodeG192( /* Once good frame decoded, catch up */ if ( decodedGoodFrame ) { - /* Now number of output channels and frame size are known */ - if ( ( error = IVAS_DEC_GetNumOutputChannels( hIvasDec, &nOutChannels ) ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nError in IVAS_DEC_GetNumOutputChannels, code: %d\n", error ); - goto cleanup; - } - - int32_t pcmFrameSize; - - if ( ( error = IVAS_DEC_GetPcmFrameSize( hIvasDec, &pcmFrameSize ) ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nError in IVAS_DEC_GetPcmFrameSize, error code: %d\n", error ); - goto cleanup; - } - + error = initOnFirstGoodFrame( + hIvasDec, + arg, + numInitialBadFrames, + nOutSamples, + delayNumSamples_orig, + &delayNumSamples, + &delayTimeScale, + &bsFormat, + &afWriter, + &masaWriter, + ismWriters, + &nOutChannels, + &numObj #ifdef SPLIT_REND_WITH_HEAD_ROT - if ( arg.outputFormat == IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CLDFB ) - { - IVAS_DEC_GetDelay( hIvasDec, &delayNumSamples_temp, &delayTimeScale_temp ); - error = split_rend_writer_open( &hSplitRendFileReadWrite, arg.outputWavFilename, delayNumSamples_temp, delayTimeScale_temp ); - if ( error != IVAS_ERR_OK ) - { - fprintf( stderr, "Could not open split rend metadata file %s\n", arg.outputWavFilename ); - exit( -1 ); - } - afWriter = NULL; - } - else + , + &hSplitRendFileReadWrite #endif + ); + if ( error != IVAS_ERR_OK ) { - /* Open audio writer and write all previously skipped bad frames now that frame size is known */ - if ( ( error = AudioFileWriter_open( &afWriter, arg.outputWavFilename, arg.output_Fs, nOutChannels ) ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nUnable to open output file %s\n", arg.outputWavFilename ); - goto cleanup; - } - } - - int16_t *zeroBuf = malloc( pcmFrameSize * sizeof( int16_t ) ); - memset( zeroBuf, 0, pcmFrameSize * sizeof( int16_t ) ); - - for ( i = 0; i < numInitialBadFrames; ++i ) - { -#ifdef SPLIT_REND_WITH_HEAD_ROT - if ( hSplitRendFileReadWrite != NULL ) - { - IVAS_SPLIT_REND_BITS splitRendBitsZero; - splitRendBitsZero.bits_written = 0; - splitRendBitsZero.bits_read = 0; - if ( split_rend_write_bitstream_to_file( hSplitRendFileReadWrite, splitRendBitsZero.bits_buf, &splitRendBitsZero.bits_read, &splitRendBitsZero.bits_written -#ifdef SPLIT_REND_LC3PLUS - , - 0 -#endif - ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nUnable to write to bitstream file!\n" ); - exit( -1 ); - } - } - else -#endif - { - if ( delayNumSamples < nOutSamples ) - { - if ( ( error = AudioFileWriter_write( afWriter, zeroBuf, nOutSamples * nOutChannels - ( delayNumSamples * nOutChannels ) ) ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nOutput audio file writer error\n" ); - goto cleanup; - } - delayNumSamples = 0; - } - else - { - delayNumSamples -= nOutSamples; - } - } - } - - free( zeroBuf ); - - /* Open other output files if EXT output config - now details about ISM or MASA are known */ - if ( arg.outputFormat == IVAS_DEC_OUTPUT_EXT ) - { - if ( ( error = IVAS_DEC_GetFormat( hIvasDec, &bsFormat ) ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nError in IVAS_DEC_GetFormat, code: %d\n", error ); - goto cleanup; - } - - /* If outputting ISM, get number of objects, open output files and write zero metadata for initial bad frames */ - if ( bsFormat == IVAS_DEC_BS_OBJ ) - { - if ( ( error = IVAS_DEC_GetNumObjects( hIvasDec, &numObj ) ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nError in IVAS_DEC_GetNumObjects: %s\n", IVAS_DEC_GetErrorMessage( error ) ); - goto cleanup; - } - - for ( i = 0; i < numObj; ++i ) - { - if ( ( error = IsmFileWriter_open( arg.outputWavFilename, i, &ismWriters[i] ) ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nError: Error opening ISM decoded metadata file %s\n", IsmFileWriter_getFilePath( ismWriters[i] ) ); - goto cleanup; - } - } - - for ( j = 0; j < numInitialBadFrames; ++j ) - { - /* write zero metadata */ - for ( i = 0; i < numObj; ++i ) - { - IVAS_ISM_METADATA IsmMetadata; - - if ( ( error = IVAS_DEC_GetObjectMetadata( hIvasDec, &IsmMetadata, 1, i ) ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nError in IVAS_DEC_GetObjectMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) ); - goto cleanup; - } - - if ( ( IsmFileWriter_writeFrame( IsmMetadata, ismWriters[i] ) ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nError writing ISM metadata to file %s\n", IsmFileWriter_getFilePath( ismWriters[i] ) ); - goto cleanup; - } - } - } - } - /* If outputting MASA, open output file and write metadata for initial bad frames */ - else if ( bsFormat == IVAS_DEC_BS_MASA ) - { - if ( ( error = MasaFileWriter_open( arg.outputWavFilename, &masaWriter ) ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nError: Error opening MASA decoded metadata file %s\n", MasaFileWriter_getFilePath( masaWriter ) ); - goto cleanup; - } - - /* Duplicate good first frame metadata to fill the beginning of stream. */ - IVAS_MASA_QMETADATA_HANDLE qMetadata = NULL; - if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &qMetadata ) ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) ); - goto cleanup; - } - - for ( j = 0; j < numInitialBadFrames; ++j ) - { - if ( ( MasaFileWriter_writeFrame( masaWriter, qMetadata ) ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( masaWriter ) ); - goto cleanup; - } - } - } + goto cleanup; } } else @@ -1498,23 +1717,6 @@ static ivas_error decodeG192( } } - if ( delayNumSamples == -1 ) - { - if ( arg.delayCompensationEnabled ) - { - if ( ( error = IVAS_DEC_GetDelay( hIvasDec, &delayNumSamples, &delayTimeScale ) ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nUnable to get delay of decoder: %s\n", IVAS_DEC_GetErrorMessage( error ) ); - goto cleanup; - } - delayNumSamples_orig = delayNumSamples; - } - else - { - delayNumSamples = 0; - } - zeroPad = delayNumSamples; - } /* Write current frame */ if ( decodedGoodFrame ) @@ -1552,7 +1754,7 @@ static ivas_error decodeG192( } } - /* Write ISm metadata to external file(s) */ + /* Write ISM metadata to external file(s) */ if ( decodedGoodFrame && arg.outputFormat == IVAS_DEC_OUTPUT_EXT ) { if ( bsFormat == IVAS_DEC_BS_OBJ ) @@ -1582,14 +1784,14 @@ static ivas_error decodeG192( } else if ( bsFormat == IVAS_DEC_BS_MASA ) { - IVAS_MASA_QMETADATA_HANDLE qMetadata; - if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &qMetadata ) ) != IVAS_ERR_OK ) + MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta; + if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta ) ) != IVAS_ERR_OK ) { fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) ); goto cleanup; } - if ( ( error = MasaFileWriter_writeFrame( masaWriter, qMetadata ) ) != IVAS_ERR_OK ) + if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta ) ) != IVAS_ERR_OK ) { fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( masaWriter ) ); goto cleanup; @@ -1609,22 +1811,38 @@ static ivas_error decodeG192( #endif } #ifdef WMOPS + update_mem(); update_wmops(); -#endif -#ifdef DEBUGGING -#ifdef RAM_ANALYSIS - mem_analyze(); -#endif #endif } + /*------------------------------------------------------------------------------------------* + * Add zeros at the end to have equal length of synthesized signals + *------------------------------------------------------------------------------------------*/ + + memset( pcmBuf, 0, delayNumSamples_orig[0] * nOutChannels * sizeof( int16_t ) ); + if ( afWriter != NULL ) + { + if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, delayNumSamples_orig[0] * nOutChannels ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError writing output file: %s\n", ivas_error_to_string( error ) ); + goto cleanup; + } + } + /*------------------------------------------------------------------------------------------* * Printouts after decoding has finished *------------------------------------------------------------------------------------------*/ if ( !arg.quietModeEnabled ) { - fprintf( stdout, "\nDecoder delay: %-5u [samples] - Timescale: %5u\n", delayNumSamples_orig, delayTimeScale ); + printf( "\n\nDecoder+renderer delay: %4.2f ms (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[1] / (float) delayTimeScale, delayNumSamples_orig[1], delayTimeScale ); + + if ( delayNumSamples_orig[2] > 0 ) + { + printf( "HRIR/BRIR delay: %4.2f ms (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[2] / (float) delayTimeScale, delayNumSamples_orig[2], delayTimeScale ); + printf( "Total delay: %4.2f ms (%3u samples at timescale %5u)\n", 1000.f * ( delayNumSamples_orig[1] + delayNumSamples_orig[2] ) / (float) delayTimeScale, delayNumSamples_orig[1] + delayNumSamples_orig[2], delayTimeScale ); + } } /* Print output metadata file name(s) */ @@ -1644,17 +1862,6 @@ static ivas_error decodeG192( } } - /* add zeros at the end to have equal length of synthesized signals */ - memset( pcmBuf, 0, zeroPad * nOutChannels * sizeof( int16_t ) ); - if ( afWriter != NULL ) - { - if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, zeroPad * nOutChannels ) ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nOutput audio file writer error\n" ); - goto cleanup; - } - } - /*------------------------------------------------------------------------------------------* * Close files and deallocate resources *------------------------------------------------------------------------------------------*/ @@ -1686,11 +1893,120 @@ cleanup: return error; } +#ifdef DEBUGGING +/*---------------------------------------------------------------------* + * printBitstreamInfoVoip() + * + * Print bitstream info of a VoIP G.192 or RTPDUMP bitstream. + *---------------------------------------------------------------------*/ +static ivas_error printBitstreamInfoVoip( + DecArguments arg, + BS_READER_HANDLE hBsReader, + IVAS_DEC_HANDLE hIvasDec ) +{ + bool previewFailed = true; + ivas_error error = IVAS_ERR_OK; + FILE *f_rtpstream = NULL; + EVS_RTPDUMP_DEPACKER rtpdumpDepacker; + EVS_RTPDUMP_DEPACKER_ERROR rtpdumpDepackerError = EVS_RTPDUMP_DEPACKER_NO_ERROR; + uint8_t au[( IVAS_MAX_BITS_PER_FRAME + 7 ) >> 3]; + int16_t auSizeBits; + uint8_t *auPtr = NULL; + bool isAMRWB_IOmode; + uint16_t frameTypeIndex; + bool qBit; + uint32_t nextPacketRcvTime_ms = 0; + uint16_t rtpSequenceNumber; + uint32_t rtpTimeStamp; + + rtpdumpDepacker.rtpdump = NULL; + switch ( arg.inputFormat ) + { + case IVAS_DEC_INPUT_FORMAT_RTPDUMP: + case IVAS_DEC_INPUT_FORMAT_RTPDUMP_HF: + f_rtpstream = fopen( arg.inputBitstreamFilename, "r" ); + + if ( f_rtpstream == NULL ) + { + fprintf( stderr, "could not open: %s\n", arg.inputBitstreamFilename ); + goto cleanup; + } + + rtpdumpDepackerError = EVS_RTPDUMP_DEPACKER_open( &rtpdumpDepacker, f_rtpstream, arg.inputFormat == IVAS_DEC_INPUT_FORMAT_RTPDUMP_HF ); + if ( rtpdumpDepackerError != EVS_RTPDUMP_DEPACKER_NO_ERROR ) + { + fprintf( stderr, "error in EVS_RTPDUMP_DEPACKER_open(): %d\n", rtpdumpDepackerError ); + goto cleanup; + } + break; + case IVAS_DEC_INPUT_FORMAT_G192: + auPtr = au; + break; + default: + fprintf( stderr, "Unsupported format of input bitstream" ); + goto cleanup; + } + + /* Keep reading until full frame is found */ + do + { + if ( arg.inputFormat == IVAS_DEC_INPUT_FORMAT_G192 ) + { + error = BS_Reader_ReadVoipFrame_compact( hBsReader, au, &auSizeBits, &rtpSequenceNumber, &rtpTimeStamp, &nextPacketRcvTime_ms ); + qBit = 1; /* good q_bit for INPUT_FORMAT_G192 */ + } + else + { + auPtr = au; /* might have been set to RTP packet in prev call */ + rtpdumpDepackerError = EVS_RTPDUMP_DEPACKER_readNextFrame( &rtpdumpDepacker, &rtpSequenceNumber, &rtpTimeStamp, + &nextPacketRcvTime_ms, + &isAMRWB_IOmode, &frameTypeIndex, &qBit, + &auPtr, (uint16_t *) &auSizeBits ); + /* EVS RTP payload format has timescale 16000, JBM uses 1000 internally */ + rtpTimeStamp = rtpTimeStamp / 16; + } + if ( error != IVAS_ERR_OK || rtpdumpDepackerError != EVS_RTPDUMP_DEPACKER_NO_ERROR ) + { + fprintf( stderr, "failed to read first RTP packet\n" ); + goto cleanup; + } + } while ( !qBit || auSizeBits < MIN_NUM_BITS_ACTIVE_FRAME || auSizeBits == NUM_BITS_SID_IVAS_5K2 ); + + BS_Reader_Rewind( hBsReader ); + + IVAS_DEC_PrintConfigWithVoipBitstream( hIvasDec, arg.quietModeEnabled, au, auSizeBits ); + + /*------------------------------------------------------------------------------------------* + * Close fhandles and deallocate resources + *------------------------------------------------------------------------------------------*/ + + previewFailed = false; /* This will stay set to true if cleanup is reached via a goto due to an error */ + +cleanup: + + EVS_RTPDUMP_DEPACKER_close( &rtpdumpDepacker ); + + if ( previewFailed && error == IVAS_ERR_OK ) + { + return IVAS_ERR_UNKNOWN; + } + + return IVAS_ERR_OK; +} +#endif + +#ifdef SUPPORT_JBM_TRACEFILE +static ivas_error writeJbmTraceFileFrameWrapper( const void *data, void *writer ) +{ + return JbmTraceFileWriter_writeFrame( data, writer ); +} +#endif + /*---------------------------------------------------------------------* * decodeVoIP() * - * Read G.192 bitstream and decode in VOIP + * Read G.192 or RTPDUMP bitstream and decode in VOIP *---------------------------------------------------------------------*/ static ivas_error decodeVoIP( @@ -1710,23 +2026,22 @@ static ivas_error decodeVoIP( uint16_t rtpSequenceNumber; uint32_t rtpTimeStamp; - /* For now always assume output with one channel. When adding VoIP to IVAS, - * initialization of the memory for jitter buffer etc. needs to happen after - * first good frame has been decoded because for some configs (such as EXT - * renderer) only then the number of output channels is known.*/ - const int16_t nOutChannels = 1; + bool decodedGoodFrame = false; + int16_t numInitialBadFrames = 0; /* Number of bad frames received until first good frame is decoded */ + int16_t nOutChannels = 0; + MasaFileWriter *masaWriter = NULL; + uint16_t numObj = 0; + + int16_t pcmBuf[MAX_OUTPUT_PCM_BUFFER_SIZE]; AudioFileWriter *afWriter = NULL; #ifdef SUPPORT_JBM_TRACEFILE JbmTraceFileWriter *jbmTraceWriter = NULL; #endif JbmOffsetFileWriter *jbmOffsetWriter = NULL; - const uint32_t pcmBufSizeWithSampleBasedTimeScaling = 3 * MAX_FRAME_SIZE; - int16_t pcmBuf[3 * MAX_FRAME_SIZE]; - int16_t delayNumSamples_orig = -1; + int16_t delayNumSamples_orig[3]; /* stores: overall delay, dec+rend delay, and binauralization delay */ int16_t delayNumSamples = -1; int32_t delayTimeScale = -1; - int16_t zeroPad = 0; FILE *f_rtpstream = NULL; EVS_RTPDUMP_DEPACKER rtpdumpDepacker; @@ -1736,7 +2051,15 @@ static ivas_error decodeVoIP( uint16_t frameTypeIndex; bool qBit; - memset( pcmBuf, 0, pcmBufSizeWithSampleBasedTimeScaling ); + IVAS_DEC_BS_FORMAT bsFormat = IVAS_DEC_BS_UNKOWN; + IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS]; + + for ( int16_t i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i ) + { + ismWriters[i] = NULL; + } + + delayNumSamples_orig[0] = -1; rtpdumpDepacker.rtpdump = NULL; switch ( arg.inputFormat ) @@ -1766,11 +2089,6 @@ static ivas_error decodeVoIP( goto cleanup; } - if ( ( error = AudioFileWriter_open( &afWriter, arg.outputWavFilename, arg.output_Fs, nOutChannels ) ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nUnable to open output file %s\n", arg.outputWavFilename ); - goto cleanup; - } #ifdef SUPPORT_JBM_TRACEFILE if ( arg.jbmTraceFilename != NULL ) @@ -1798,10 +2116,6 @@ static ivas_error decodeVoIP( if ( arg.inputFormat == IVAS_DEC_INPUT_FORMAT_G192 ) { error = BS_Reader_ReadVoipFrame_compact( hBsReader, au, &auSize, &rtpSequenceNumber, &rtpTimeStamp, &nextPacketRcvTime_ms ); - if ( !evsPayload_getFrameTypeFromSize( auSize, &isAMRWB_IOmode, &frameTypeIndex ) ) - { - error = IVAS_ERR_BITSTREAM_READER_INVALID_DATA; - } qBit = 1; /* good q_bit for INPUT_FORMAT_G192 */ } else @@ -1847,7 +2161,7 @@ static ivas_error decodeVoIP( while ( nextPacketRcvTime_ms <= systemTime_ms ) { /* feed the previous read packet into the receiver now */ - error = IVAS_DEC_VoIP_FeedFrame( hIvasDec, auPtr, auSize, rtpSequenceNumber, rtpTimeStamp, nextPacketRcvTime_ms, isAMRWB_IOmode, frameTypeIndex, qBit ); + error = IVAS_DEC_VoIP_FeedFrame( hIvasDec, auPtr, auSize, rtpSequenceNumber, rtpTimeStamp, nextPacketRcvTime_ms, qBit ); if ( error != IVAS_ERR_OK ) { fprintf( stderr, "\nError in IVAS_DEC_VoIP_FeedFrame: %s\n", IVAS_DEC_GetErrorMessage( error ) ); @@ -1860,10 +2174,6 @@ static ivas_error decodeVoIP( { error = BS_Reader_ReadVoipFrame_compact( hBsReader, au, &auSize, &rtpSequenceNumber, &rtpTimeStamp, &nextPacketRcvTime_ms ); - if ( !evsPayload_getFrameTypeFromSize( auSize, &isAMRWB_IOmode, &frameTypeIndex ) ) - { - error = IVAS_ERR_BITSTREAM_READER_INVALID_DATA; - } qBit = 1; /* good q_bit for VOIP_G192_RTP */ } else @@ -1895,32 +2205,21 @@ static ivas_error decodeVoIP( break; } + nOutSamples = (int16_t) ( arg.output_Fs / 50 ); + /* decode and get samples */ - if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, &nOutSamples, pcmBuf, pcmBufSizeWithSampleBasedTimeScaling, systemTime_ms ) ) != IVAS_ERR_OK ) + if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, pcmBuf, systemTime_ms +#ifdef SUPPORT_JBM_TRACEFILE + , + writeJbmTraceFileFrameWrapper, + jbmTraceWriter +#endif + ) ) != IVAS_ERR_OK ) { fprintf( stderr, "\nError in IVAS_DEC_VoIP_GetSamples: %s\n", IVAS_DEC_GetErrorMessage( error ) ); goto cleanup; } -#ifdef SUPPORT_JBM_TRACEFILE - /* write JBM trace file entry - only done for EVS testing */ - if ( jbmTraceWriter != NULL ) - { - IVAS_JBM_TRACE_DATA JbmTraceData; - - if ( ( error = IVAS_DEC_GetJbmData( hIvasDec, &JbmTraceData ) ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nError in IVAS_DEC_GetJbmData: %s\n", IVAS_DEC_GetErrorMessage( error ) ); - goto cleanup; - } - - if ( ( JbmTraceFileWriter_writeFrame( &JbmTraceData, jbmTraceWriter ) ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nError writing JBM Trace data to file %s\n", arg.jbmTraceFilename ); - goto cleanup; - } - } -#endif /* write JBM Offset file entry */ if ( jbmOffsetWriter != NULL ) @@ -1940,36 +2239,69 @@ static ivas_error decodeVoIP( } } - if ( delayNumSamples == -1 ) + /* Continue checking for first good frame until it is found */ + if ( !decodedGoodFrame ) { - if ( arg.delayCompensationEnabled ) + if ( ( error = IVAS_DEC_HasDecodedFirstGoodFrame( hIvasDec, &decodedGoodFrame ) ) != IVAS_ERR_OK ) { - if ( ( error = IVAS_DEC_GetDelay( hIvasDec, &delayNumSamples, &delayTimeScale ) ) != IVAS_ERR_OK ) + fprintf( stderr, "Error in IVAS_DEC_HasDecodedFirstGoodFrame, code: %d\n", error ); + goto cleanup; + } + + /* Once good frame decoded, catch up */ + if ( decodedGoodFrame ) + { +#ifdef SPLIT_REND_WITH_HEAD_ROT + + SplitFileReadWrite *hSplitRendFileReadWrite = NULL; +#endif + error = initOnFirstGoodFrame( + hIvasDec, + arg, + numInitialBadFrames, + nOutSamples, + delayNumSamples_orig, + &delayNumSamples, + &delayTimeScale, + &bsFormat, + &afWriter, + &masaWriter, + ismWriters, + &nOutChannels, + &numObj +#ifdef SPLIT_REND_WITH_HEAD_ROT + , + &hSplitRendFileReadWrite +#endif + ); + if ( error != IVAS_ERR_OK ) { - fprintf( stderr, "\nUnable to get delay of decoder: %s\n", IVAS_DEC_GetErrorMessage( error ) ); goto cleanup; } - delayNumSamples_orig = delayNumSamples; } else { - delayNumSamples = 0; + ++numInitialBadFrames; } - zeroPad = delayNumSamples; } - if ( delayNumSamples < nOutSamples ) + + /* Write current frame */ + if ( decodedGoodFrame ) { - if ( ( error = AudioFileWriter_write( afWriter, &pcmBuf[delayNumSamples * nOutChannels], nOutSamples * nOutChannels - ( delayNumSamples * nOutChannels ) ) ) != IVAS_ERR_OK ) + if ( delayNumSamples < nOutSamples ) { - fprintf( stderr, "\nOutput audio file writer error\n" ); - goto cleanup; + if ( ( error = AudioFileWriter_write( afWriter, &pcmBuf[delayNumSamples * nOutChannels], nOutSamples * nOutChannels - ( delayNumSamples * nOutChannels ) ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nOutput audio file writer error\n" ); + goto cleanup; + } + delayNumSamples = 0; + } + else + { + delayNumSamples -= nOutSamples; } - delayNumSamples = 0; - } - else - { - delayNumSamples -= nOutSamples; } if ( !arg.quietModeEnabled ) @@ -1981,19 +2313,21 @@ static ivas_error decodeVoIP( systemTime_ms += 20; #ifdef WMOPS + update_mem(); update_wmops(); -#endif -#ifdef DEBUGGING -#ifdef RAM_ANALYSIS - mem_analyze(); -#endif #endif } + /*------------------------------------------------------------------------------------------* + * Add zeros at the end to have equal length of synthesized signals + *------------------------------------------------------------------------------------------*/ - /* add zeros at the end to have equal length of synthesized signals */ - memset( pcmBuf, 0, zeroPad * nOutChannels * sizeof( int16_t ) ); - AudioFileWriter_write( afWriter, pcmBuf, zeroPad * nOutChannels ); + memset( pcmBuf, 0, delayNumSamples_orig[0] * nOutChannels * sizeof( int16_t ) ); + if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, delayNumSamples_orig[0] * nOutChannels ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError writing output file: %s\n", ivas_error_to_string( error ) ); + goto cleanup; + } /*------------------------------------------------------------------------------------------* * Printouts after decoding has finished @@ -2001,7 +2335,13 @@ static ivas_error decodeVoIP( if ( !arg.quietModeEnabled ) { - printf( "\nDecoder delay: %5u [samples] - Timescale: %5u\n", delayNumSamples_orig, delayTimeScale ); + printf( "\n\nDecoder+renderer delay: %4.2f ms (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[1] / (float) delayTimeScale, delayNumSamples_orig[1], delayTimeScale ); + + if ( delayNumSamples_orig[2] > 0 ) + { + printf( "HRIR/BRIR delay: %4.2f ms (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[2] / (float) delayTimeScale, delayNumSamples_orig[2], delayTimeScale ); + printf( "Total delay: %4.2f ms (%3u samples at timescale %5u)\n", 1000.f * ( delayNumSamples_orig[1] + delayNumSamples_orig[2] ) / (float) delayTimeScale, delayNumSamples_orig[1] + delayNumSamples_orig[2], delayTimeScale ); + } } /*------------------------------------------------------------------------------------------* @@ -2012,6 +2352,7 @@ static ivas_error decodeVoIP( cleanup: + EVS_RTPDUMP_DEPACKER_close( &rtpdumpDepacker ); AudioFileWriter_close( &afWriter ); JbmOffsetFileWriter_close( &jbmOffsetWriter ); #ifdef SUPPORT_JBM_TRACEFILE diff --git a/apps/encoder.c b/apps/encoder.c index 0bad34878b..aae2e1e88e 100644 --- a/apps/encoder.c +++ b/apps/encoder.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -30,6 +30,9 @@ *******************************************************************************************************/ +#include +#include +#include #include "lib_enc.h" #include "cmdl_tools.h" #include "audio_file_reader.h" @@ -37,24 +40,12 @@ #include "jbm_file_reader.h" #include "masa_file_reader.h" #include "ism_file_reader.h" -#include -#include -#ifdef WMOPS -#include "PROM_Size_lib_com.h" -#include "PROM_Size_lib_enc.h" -#include "wmops.h" -#endif -#ifdef RAM_COUNTING_TOOL -#include "mem_count.h" -#else -#include -#endif #ifdef DEBUGGING #include "debug.h" #endif +#include "wmc_auto.h" -#define WMC_TOOL_MAN - +#define WMC_TOOL_SKIP /*------------------------------------------------------------------------------------------* * Local constants, enums, structures @@ -135,6 +126,7 @@ typedef struct #endif #endif bool pca; + bool ism_extended_metadata; } EncArguments; @@ -154,40 +146,6 @@ static IVAS_ENC_FORCED_MODE parseForcedMode( char *forcedModeChar ); #endif -#ifdef WMOPS -/*------------------------------------------------------------------------------------------* - * Function to print complexity & memory estimates at the encoder - *------------------------------------------------------------------------------------------*/ - -extern int16_t *ptr_base_stack; -extern int16_t *ptr_base_stack; -extern int16_t *ptr_max_stack; -extern int32_t wc_frame; -extern char location_max_stack[256]; -void print_stack_call_tree( void ); - -static void print_mem_enc( size_t SRAM_size ) -{ - fprintf( stdout, "\n\n --- Encoder memory usage --- \n\n" ); - - fprintf( stdout, "PROM size (encoder): %d words (or instructions)\n", PROM_Size_lib_enc ); - fprintf( stdout, "PROM size (common): %d words (or instructions)\n", PROM_Size_lib_com ); - fprintf( stdout, "Stack size (encoder): %ld words in %s() in frame #%d\n", ( ( ptr_base_stack - ptr_max_stack ) * sizeof( int16_t ) ) / sizeof( float ), location_max_stack, wc_frame ); - fprintf( stdout, "Table ROM size (encoder): %ld words\n", ( Const_Data_Size_rom_enc() + Const_Data_Size_ivas_rom_enc() ) / sizeof( float ) ); - fprintf( stdout, "Table ROM size (common): %ld words\n", ( Const_Data_Size_rom_com() + Const_Data_Size_ivas_rom_com() ) / sizeof( float ) ); -#ifdef RAM_COUNTING_TOOL - fprintf( stdout, "Static RAM size (encoder): %ld words\n\n", SRAM_size ); -#endif - print_stack_call_tree(); - - fprintf( stdout, "Note: this is an optimistic estimate of the memory consumption assuming\n" ); - fprintf( stdout, " that each variable (short, long or float) in the codec requires\n" ); - fprintf( stdout, " 32 bits of memory and may therefore be represented by 1 word.\n" ); - fprintf( stdout, " The following formula is used: sizeof('memory array')/sizeof(float)\n\n" ); -} -#endif - - /*------------------------------------------------------------------------------------------* * main() * @@ -224,18 +182,12 @@ int main( #endif #endif -#ifdef WMOPS - size_t SRAM_size = 0; - reset_wmops(); - reset_stack(); -#endif - #ifdef DEBUGGING dbgargs( &argc, argv ); #endif - -#ifdef RAM_COUNTING_TOOL - mem_count_init( 0, USE_32BITS ); +#ifdef WMOPS + reset_wmops(); + reset_mem( USE_32BITS ); #endif initArgStruct( &arg ); @@ -262,21 +214,6 @@ int main( goto cleanup; } - /*------------------------------------------------------------------------------------------* - * Open input audio file - *------------------------------------------------------------------------------------------*/ - int32_t inFileSampleRate = 0; - if ( AudioFileReader_open( &audioReader, arg.inputWavFilename, &inFileSampleRate ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nCan't open %s\n\n", arg.inputWavFilename ); - goto cleanup; - } - if ( inFileSampleRate != 0 && /* inFileSampleRate will remain zero if input file is raw PCM */ - inFileSampleRate != arg.inputFs ) - { - fprintf( stderr, "Sampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n", arg.inputFs, inFileSampleRate, arg.inputWavFilename ); - goto cleanup; - } /*------------------------------------------------------------------------------------------* * Open output bitstream file @@ -442,7 +379,7 @@ int main( } break; case IVAS_ENC_INPUT_ISM: - if ( ( error = IVAS_ENC_ConfigureForObjects( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.ism.numObjects ) ) != IVAS_ERR_OK ) + if ( ( error = IVAS_ENC_ConfigureForObjects( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.ism.numObjects, arg.ism_extended_metadata ) ) != IVAS_ERR_OK ) { fprintf( stderr, "\nIVAS_ENC_ConfigureForObjects failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) ); goto cleanup; @@ -499,6 +436,65 @@ int main( goto cleanup; } + /*------------------------------------------------------------------------------------------* + * Open input audio file + *------------------------------------------------------------------------------------------*/ + + if ( AudioFileReader_open( &audioReader, arg.inputWavFilename ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nCan't open %s\n\n", arg.inputWavFilename ); + goto cleanup; + } + + /* Validate input sampling rate */ + int32_t inFileSampleRate = 0; + error = AudioFileReader_getSamplingRate( audioReader, &inFileSampleRate ); + switch ( error ) + { + case IVAS_ERR_OK: + if ( inFileSampleRate != arg.inputFs ) + { + fprintf( stderr, "\nSampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n\n", arg.inputFs, inFileSampleRate, arg.inputWavFilename ); + goto cleanup; + } + break; + case IVAS_ERR_SAMPLING_RATE_UNKNOWN: + /* IVAS_ERR_SAMPLING_RATE_UNKNOWN will be returned for raw PCM files. + * Nothing to check here */ + break; + default: + fprintf( stderr, "\nError: %s\n", ivas_error_to_string( error ) ); + goto cleanup; + } + + + /* Validate number of channels */ + int16_t encInNumChannels = 0; + if ( ( error = IVAS_ENC_GetNumInChannels( hIvasEnc, &encInNumChannels ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError: %s\n", ivas_error_to_string( error ) ); + goto cleanup; + } + int16_t inFileNumChannels = 0; + error = AudioFileReader_getNumChannels( audioReader, &inFileNumChannels ); + switch ( error ) + { + case IVAS_ERR_OK: + if ( inFileNumChannels != encInNumChannels ) + { + fprintf( stderr, "\nNumber of input audio channels mismatch: %d accepted by encoder, but %d found in file %s\n\n", encInNumChannels, inFileNumChannels, arg.inputWavFilename ); + goto cleanup; + } + break; + case IVAS_ERR_NUM_CHANNELS_UNKNOWN: + /* IVAS_ERR_NUM_CHANNELS_UNKNOWN will be returned for raw PCM files. + * Nothing to check here */ + break; + default: + fprintf( stderr, "\nError: %s\n", ivas_error_to_string( error ) ); + goto cleanup; + } + /*------------------------------------------------------------------------------------------* * Open input metadata files *------------------------------------------------------------------------------------------*/ @@ -704,7 +700,7 @@ int main( } #endif - /* Read ISm input metadata */ + /* Read ISM input metadata */ for ( i = 0; i < numIsmInputs; ++i ) { if ( ismReaders[i] == NULL ) @@ -764,12 +760,8 @@ int main( } #ifdef WMOPS + update_mem(); update_wmops(); -#endif -#ifdef DEBUGGING -#ifdef RAM_ANALYSIS - mem_analyze(); -#endif #endif } @@ -834,15 +826,9 @@ cleanup: IVAS_ENC_Close( &hIvasEnc ); -#ifdef RAM_COUNTING_TOOL -#ifdef WMOPS - SRAM_size = -#endif - mem_count_summary( USE_DEFAULT ); -#endif #ifdef WMOPS print_wmops(); - print_mem_enc( SRAM_size ); + print_mem( NULL ); #endif #ifdef DEBUGGING @@ -891,6 +877,7 @@ static void initArgStruct( EncArguments *arg ) arg->caConfig = IVAS_ENC_GetDefaultChannelAwareConfig(); arg->ca_config_file = NULL; arg->mimeOutput = false; + arg->ism_extended_metadata = false; #ifdef DEBUGGING arg->forcedMode = IVAS_ENC_FORCE_UNFORCED; @@ -942,7 +929,9 @@ static bool parseCmdlIVAS_enc( while ( i < argc - 4 ) { strncpy( argv_to_upper, argv[i], sizeof( argv_to_upper ) - 1 ); + argv_to_upper[sizeof( argv_to_upper ) - 1] = '\0'; to_upper( argv_to_upper ); + /*-----------------------------------------------------------------* * Bandwidth limitation *-----------------------------------------------------------------*/ @@ -952,6 +941,7 @@ static bool parseCmdlIVAS_enc( arg->max_bwidth_user = true; strncpy( stmp, argv[i + 1], sizeof( stmp ) - 1 ); + stmp[sizeof( stmp ) - 1] = '\0'; to_upper( stmp ); if ( strcmp( stmp, "-NB" ) == 0 || strcmp( stmp, "NB" ) == 0 ) @@ -1139,7 +1129,7 @@ static bool parseCmdlIVAS_enc( if ( i < argc - 4 ) { strncpy( stmp, argv[i], sizeof( stmp ) ); - + stmp[sizeof( stmp ) - 1] = '\0'; to_upper( argv[i] ); if ( strcmp( argv[i], "LO" ) == 0 ) { @@ -1273,8 +1263,20 @@ static bool parseCmdlIVAS_enc( arg->inputFormat = IVAS_ENC_INPUT_ISM; i++; - if ( i < argc - 5 ) + if ( i < argc - 4 ) { + if ( argv[i][0] == '+' ) + { + argv[i]++; + arg->ism_extended_metadata = true; + } + if ( !is_digits_only( argv[i] ) ) + { + fprintf( stderr, "Error: Number of ISM channels must be an integer number!\n\n" ); + usage_enc(); + return false; + } + if ( sscanf( argv[i], "%d", &tmp ) > 0 ) { i++; @@ -1286,6 +1288,12 @@ static bool parseCmdlIVAS_enc( usage_enc(); return false; } + else if ( tmp > IVAS_MAX_NUM_OBJECTS ) + { + fprintf( stderr, "Error: Too high number of ISM channels specified!\n\n" ); + usage_enc(); + return false; + } else { arg->inputFormatConfig.ism.numObjects = (int16_t) tmp; @@ -1317,7 +1325,7 @@ static bool parseCmdlIVAS_enc( } else { - fprintf( stderr, "Error: not enough arguments\n\n" ); + fprintf( stderr, "Error: not enough metadata arguments specified!\n\n" ); usage_enc(); return false; } @@ -1329,17 +1337,14 @@ static bool parseCmdlIVAS_enc( arg->inputFormat = IVAS_ENC_INPUT_SBA; /* SBA configuration */ - if ( i < argc - 4 ) + if ( i < argc - 4 && is_number( argv[i] ) && sscanf( argv[i], "%d", &tmp ) > 0 ) { - if ( sscanf( argv[i], "%d", &tmp ) > 0 ) - { - i++; - } + i++; } else { tmp = -1; /* this is to avoid a compilation warning */ - fprintf( stderr, "Error: SBA order not specified!\n\n" ); + fprintf( stderr, "Error: SBA order must be specified, expecting a number!\n\n" ); usage_enc(); return false; } @@ -1371,6 +1376,13 @@ static bool parseCmdlIVAS_enc( if ( i < argc - 4 ) { + if ( !is_digits_only( argv[i] ) ) + { + fprintf( stderr, "Error: Number of MASA channels must be an integer number!\n\n" ); + usage_enc(); + return false; + } + if ( sscanf( argv[i], "%d", &tmp ) > 0 ) { i++; @@ -1385,7 +1397,7 @@ static bool parseCmdlIVAS_enc( arg->inputFormatConfig.masaVariant = IVAS_ENC_MASA_2CH; break; default: - fprintf( stderr, "Error: MASA channels must for the moment be 1 or 2.\n\n" ); + fprintf( stderr, "Error: MASA channels must be 1 or 2.\n\n" ); usage_enc(); return false; } @@ -1410,24 +1422,23 @@ static bool parseCmdlIVAS_enc( if ( i < argc - 4 ) { - - if ( strcmp( to_upper( argv[i] ), "5_1" ) == 0 ) + if ( strcmp( argv[i], "5_1" ) == 0 ) { arg->inputFormatConfig.mcLayout = IVAS_ENC_MC_5_1; } - else if ( strcmp( to_upper( argv[i] ), "7_1" ) == 0 ) + else if ( strcmp( argv[i], "7_1" ) == 0 ) { arg->inputFormatConfig.mcLayout = IVAS_ENC_MC_7_1; } - else if ( strcmp( to_upper( argv[i] ), "5_1_2" ) == 0 ) + else if ( strcmp( argv[i], "5_1_2" ) == 0 ) { arg->inputFormatConfig.mcLayout = IVAS_ENC_MC_5_1_2; } - else if ( strcmp( to_upper( argv[i] ), "5_1_4" ) == 0 ) + else if ( strcmp( argv[i], "5_1_4" ) == 0 ) { arg->inputFormatConfig.mcLayout = IVAS_ENC_MC_5_1_4; } - else if ( strcmp( to_upper( argv[i] ), "7_1_4" ) == 0 ) + else if ( strcmp( argv[i], "7_1_4" ) == 0 ) { arg->inputFormatConfig.mcLayout = IVAS_ENC_MC_7_1_4; } @@ -1617,8 +1628,13 @@ static void usage_enc( void ) fprintf( stdout, " *VBR mode (average bitrate),\n" ); fprintf( stdout, " for AMR-WB IO modes R = (6600, 8850, 12650, 14250, 15850, 18250,\n" ); fprintf( stdout, " 19850, 23050, 23850) \n" ); - fprintf( stdout, " for IVAS stereo & ISm R =(13200, 16400, 24400, 32000, 48000, 64000, 80000, \n" ); + fprintf( stdout, " for IVAS stereo R = (13200, 16400, 24400, 32000, 48000, 64000, 80000, \n" ); fprintf( stdout, " 96000, 128000, 160000, 192000, 256000) \n" ); + fprintf( stdout, " for IVAS ISM R = 13200 for 1 ISM, 16400 for 1 ISM and 2 ISM, \n" ); + fprintf( stdout, " (24400, 32000, 48000, 64000, 80000, 96000, 128000) \n" ); + fprintf( stdout, " for 2 ISM, 3 ISM and 4 ISM also 160000, 192000, 256000) \n" ); + fprintf( stdout, " for 3 ISM and 4 ISM also 384000 \n" ); + fprintf( stdout, " for 4 ISM also 512000 \n" ); fprintf( stdout, " for IVAS SBA, MASA, MC R=(13200, 16400, 24400, 32000, 48000, 64000, 80000, \n" ); fprintf( stdout, " 96000, 128000, 160000, 192000, 256000, 384000, 512000) \n" ); fprintf( stdout, " Alternatively, R can be a bitrate switching file which consists of R values\n" ); @@ -1634,16 +1650,17 @@ static void usage_enc( void ) fprintf( stdout, "EVS mono is default, for IVAS choose one of the following: -stereo, -ism, -sba, -masa, -mc\n" ); fprintf( stdout, "-stereo [Mode] : Stereo format, default is unified stereo \n" ); fprintf( stdout, " optional for Mode: 1: DFT Stereo, 2: TD Stereo, 3: MDCT Stereo\n" ); - fprintf( stdout, "-ism Channels Files : ISm format \n" ); - fprintf( stdout, " where Channels specifies the number of ISms (1-4)\n" ); + fprintf( stdout, "-ism (+)Ch Files : ISM format \n" ); + fprintf( stdout, " where Ch specifies the number of ISMs (1-4)\n" ); + fprintf( stdout, " where positive (+) means extended metadata format is used (including orientation and radius) \n" ); fprintf( stdout, " and Files specify input files containing metadata, one file per object\n" ); fprintf( stdout, " (use NULL for no input metadata)\n" ); fprintf( stdout, "-sba +/-Order : Scene Based Audio input format (Ambisonics ACN/SN3D),\n" ); fprintf( stdout, " where Order specifies the Ambisionics order (1-3),\n" ); fprintf( stdout, " where positive (+) means full 3D and negative (-) only 2D/planar components to be coded\n" ); - fprintf( stdout, "-masa Ch File : MASA format \n" ); - fprintf( stdout, " where Ch specifies the number of input/transport channels (1 or 2): \n" ); - fprintf( stdout, " and File specifies input file containing parametric metadata \n" ); + fprintf( stdout, "-masa Channels File : MASA format \n" ); + fprintf( stdout, " where Channels specifies the number of input/transport channels (1 or 2): \n" ); + fprintf( stdout, " and File specifies input file containing parametric MASA metadata \n" ); fprintf( stdout, "-mc InputConf : Multi-channel format\n" ); fprintf( stdout, " where InputConf specifies the channel configuration: 5_1, 7_1, 5_1_2, 5_1_4, 7_1_4\n" ); fprintf( stdout, " Loudspeaker positions are assumed to have azimuth and elevation as per \n" ); @@ -1653,8 +1670,7 @@ static void usage_enc( void ) fprintf( stdout, " where 0 = adaptive, 3-100 = fixed in number of frames,\n" ); fprintf( stdout, " default is deactivated\n" ); fprintf( stdout, "-dtx : Activate DTX mode with a SID update rate of 8 frames\n" ); - fprintf( stdout, " Note: DTX is currently supported in EVS, stereo, 1 ISm, \n" ); - fprintf( stdout, " SBA (up to 128kbps) and MASA (up to 128kbps)\n" ); + fprintf( stdout, " Note: DTX is supported in EVS, stereo, ISM, SBA up to 80kbps and MASA up to 128kbps \n" ); fprintf( stdout, "-rf p o : Activate channel-aware mode for WB and SWB signal at 13.2kbps, \n" ); fprintf( stdout, " where FEC indicator, p: LO or HI, and FEC offset, o: 2, 3, 5, or 7 in number of frames.\n" ); fprintf( stdout, " Alternatively p and o can be replaced by a rf configuration file with each line \n" ); diff --git a/apps/renderer.c b/apps/renderer.c index caead83d65..c539b05815 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -30,65 +30,46 @@ *******************************************************************************************************/ -#include "options.h" -#include "audio_file_reader.h" -#include "audio_file_writer.h" -#include "cmdl_tools.h" -#include "cmdln_parser.h" -#include "common_api_types.h" -#include "head_rotation_file_reader.h" -#include "hrtf_file_reader.h" -#include "ism_file_reader.h" #include "lib_rend.h" -#include "ls_custom_file_reader.h" -#include "masa_file_reader.h" -#include "prot.h" -#include "render_config_reader.h" #ifdef SPLIT_REND_WITH_HEAD_ROT #include "split_render_file_read_write.h" #endif -#ifdef WMOPS -#include "PROM_Size_lib_rend.h" -#include "wmops.h" -#endif -#ifdef DEBUGGING -#include "debug.h" -#endif -#ifdef RAM_COUNTING_TOOL -#include "mem_count.h" +#ifdef SPLIT_REND_PLC +#include "split_rend_bfi_file_reader.h" #endif #include #include #include #include -#include #include #include +#include "audio_file_reader.h" +#include "audio_file_writer.h" +#include "cmdl_tools.h" +#include "cmdln_parser.h" +#include "head_rotation_file_reader.h" +#include "vector3_pair_file_reader.h" +#include "hrtf_file_reader.h" +#include "ism_file_reader.h" +#include "ls_custom_file_reader.h" +#include "masa_file_reader.h" +#include "prot.h" +#include "render_config_reader.h" +#include "wmc_auto.h" -#ifndef count_malloc -#ifdef RAM_COUNTING_TOOL -#define count_malloc( n1 ) MALLOC_FCT_CALL( n1 ) -#define count_calloc( n1, n2 ) CALLOC_FCT_CALL( n1, n2 ) -#define count_free( ptr ) FREE_FCT_CALL( ptr ) -#else -#define count_malloc( n1 ) malloc( n1 ) -#define count_calloc( n1, n2 ) calloc( n1, n2 ) -#define count_free( ptr ) free( ptr ) -#endif -#endif - -#ifndef min -#define min( x, y ) ( ( x ) < ( y ) ? ( x ) : ( y ) ) -#endif -#ifndef max -#define max( x, y ) ( ( x ) > ( y ) ? ( x ) : ( y ) ) -#endif +/*------------------------------------------------------------------------------------------* + * Local constants + *------------------------------------------------------------------------------------------*/ #define RENDERER_MAX_CLI_ARG_LENGTH ( FILENAME_MAX ) #define RENDERER_MAX_METADATA_LENGTH 8192 #define RENDERER_MAX_METADATA_LINE_LENGTH 1024 +#ifdef SPLIT_REND_CLDFB_HUFF_SAN_FIX +#define SPLIT_REND_BITS_BUFF_SIZE ( ( ( ( (int32_t) SPLIT_REND_MAX_BRATE / FRAMES_PER_SEC ) + 7 ) >> 3 ) + SPLIT_REND_ADDITIONAL_BYTES_TO_READ ) +#endif + #if !defined( DEBUGGING ) && !defined( WMOPS ) static #endif @@ -100,36 +81,10 @@ static #define SEP_FOLDER '/' #endif -#ifdef WMOPS -void print_stack_call_tree( void ); -int Const_Data_Size_ivas_rom_rend( void ); -extern int16_t *ptr_base_stack; -extern int16_t *ptr_max_stack; -extern int32_t wc_frame; -extern char location_max_stack[256]; /*------------------------------------------------------------------------------------------* - * Function to print complexity & memory estimates + * Local structures *------------------------------------------------------------------------------------------*/ -static void print_mem_renderer( size_t SRAM_size ) -{ - fprintf( stdout, "\n\n --- Renderer memory usage --- \n\n" ); - - fprintf( stdout, "PROM size (renderer): %d words (or instructions)\n", PROM_Size_lib_rend ); - fprintf( stdout, "Stack size: %d words in %s() in frame #%d\n", ( ptr_base_stack - ptr_max_stack ) * sizeof( int16_t ) / sizeof( float ), location_max_stack, wc_frame ); - fprintf( stdout, "Table ROM size(renderer): %d words\n", ( Const_Data_Size_ivas_rom_rend() ) / sizeof( float ) ); - fprintf( stdout, "Table ROM size (binaural renderer): %ld words\n", ( Const_Data_Size_ivas_rom_binauralRen() + Const_Data_Size_ivas_rom_TdBinauralR() + Const_Data_Size_ivas_rom_binaural_cr() ) / sizeof( float ) ); -#ifdef RAM_COUNTING_TOOL - fprintf( stdout, "Static RAM size: %d words\n\n", SRAM_size ); -#endif - print_stack_call_tree(); - - fprintf( stdout, "Note: this is an optimistic estimate of the memory consumption assuming\n" ); - fprintf( stdout, " that each variable (short, long or float) in the codec requires\n" ); - fprintf( stdout, " 32 bits of memory and may therefore be represented by 1 word.\n" ); - fprintf( stdout, " The following formula is used: sizeof('memory array')/sizeof(float)\n\n" ); -} -#endif typedef struct { @@ -193,6 +148,11 @@ typedef struct char outMetadataFilePath[RENDERER_MAX_CLI_ARG_LENGTH]; #endif char headRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH]; +#ifdef SPLIT_REND_PLC + char splitRendBFIFilePath[RENDERER_MAX_CLI_ARG_LENGTH]; +#endif + char referenceVectorFilePath[RENDERER_MAX_CLI_ARG_LENGTH]; + char referenceRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH]; char customHrtfFilePath[RENDERER_MAX_CLI_ARG_LENGTH]; char renderConfigFilePath[RENDERER_MAX_CLI_ARG_LENGTH]; int8_t orientationTracking; @@ -201,6 +161,12 @@ typedef struct bool quietModeEnabled; bool sceneDescriptionInput; float inputGainGlobal; /* Linear gain (not in dB) */ + bool lfePanningEnabled; + float lfeConfigGain; /* Linear gain (not in dB) */ + float lfeConfigAzimuth; + float lfeConfigElevation; + bool lfeCustomRoutingEnabled; + char inLfePanningMatrixFile[RENDERER_MAX_CLI_ARG_LENGTH]; } CmdlnArgs; typedef enum @@ -211,11 +177,13 @@ typedef enum CmdLnOptionId_outputFormat, CmdLnOptionId_sampleRate, CmdLnOptionId_trajFile, + CmdLnOptionId_refRotFile, CmdLnOptionId_customHrtfFile, CmdLnOptionId_renderConfigFile, CmdLnOptionId_noDiegeticPan, CmdLnOptionId_orientationTracking, - CmdLnOptionId_customLfeRouting, + CmdlnOptionId_lfePosition, + CmdlnOptionId_lfeMatrix, CmdLnOptionId_noDelayCmp, CmdLnOptionId_quietModeEnabled, CmdLnOptionId_inputMetadata, @@ -224,6 +192,10 @@ typedef enum #ifdef SPLIT_REND_WITH_HEAD_ROT CmdLnOptionId_outputMetadata, #endif +#ifdef SPLIT_REND_PLC + CmdLnOptionId_SplitRendBFIFile, +#endif + CmdLnOptionId_referenceVectorFile, } CmdLnOptionId; static const CmdLnParser_Option cliOptions[] = { @@ -284,7 +256,21 @@ static const CmdLnParser_Option cliOptions[] = { .matchShort = "om", .description = "coded metadata file for BINAURAL_SPLIT_PCM output mode", }, +#endif +#ifdef SPLIT_REND_PLC + { + .id = CmdLnOptionId_SplitRendBFIFile, + .match = "post_rend_bfi_file", + .matchShort = "prbfi", + .description = "Split rendering option: bfi file", + }, #endif + { + .id = CmdLnOptionId_refRotFile, + .match = "reference_rotation_file", + .matchShort = "rf", + .description = "Reference rotation trajectory file for simulation of head tracking (only for BINAURAL and BINAURAL_ROOM outputs)", + }, { .id = CmdLnOptionId_customHrtfFile, .match = "custom_hrtf", @@ -307,16 +293,18 @@ static const CmdLnParser_Option cliOptions[] = { .id = CmdLnOptionId_orientationTracking, .match = "tracking_type", .matchShort = "otr", - .description = "Head orientation tracking type: 'ref' or 'avg' (only for BINAURAL and BINAURAL_ROOM) (todo: check implementation)", + .description = "Head orientation tracking type: 'none', 'ref', 'avg' or `ref_vec` or `ref_vec_lev` (only for BINAURAL and BINAURAL_ROOM)", }, { - /* TODO(sgi): Replace with more configurable input, e.g. ask for a list of triplets: (gain, azimuth, elevation) to place LFE signal */ - /* rename to "lfeHandling" */ - .id = CmdLnOptionId_customLfeRouting, - .match = "neverDropLfe", - .matchShort = "ndl", - .description = "[flag] If set, renderer tries to render LFE into other channels in an optimal way when rendering to configs w/o LFE", + .id = CmdlnOptionId_lfePosition, + .match = "lfe_position", + .matchShort = "lp", + .description = "Output LFE position. Comma-delimited triplet of [gain, azimuth, elevation] where gain is linear (like --gain, -g) and azimuth, elevation are in degrees.\nIf specified, overrides the default behavior which attempts to map input to output LFE channel(s)", }, + { .id = CmdlnOptionId_lfeMatrix, + .match = "lfe_matrix", + .matchShort = "lm", + .description = "LFE panning matrix. File (CSV table) containing a matrix of dimensions [ num_input_lfe x num_output_channels ] with elements specifying linear routing gain (like --gain, -g). \nIf specified, overrides the output LFE position option and the default behavior which attempts to map input to output LFE channel(s)" }, { .id = CmdLnOptionId_noDelayCmp, .match = "no_delay_cmp", @@ -341,94 +329,56 @@ static const CmdLnParser_Option cliOptions[] = { .matchShort = "l", .description = "List supported audio formats", }, + { + .id = CmdLnOptionId_referenceVectorFile, + .match = "reference_vector_file", + .matchShort = "rvf", + .description = "Reference vector trajectory file for simulation of head tracking (only for BINAURAL and BINAURAL_ROOM outputs)", + }, }; -static const int32_t numCliOptions = sizeof( cliOptions ) / sizeof( CmdLnParser_Option ); -static IVAS_REND_AudioConfig ambisonicsOrderToEnum( - const int16_t order ); +/*------------------------------------------------------------------------------------------* + * Local function prototypes + *------------------------------------------------------------------------------------------*/ -static void parseSceneDescriptionFile( - char *path, - char *audioFilePath, - InputConfig *inConfig, - IsmPositionProvider *positionProvider, - MasaFileReader **masaReaders ); +static const int32_t numCliOptions = sizeof( cliOptions ) / sizeof( CmdLnParser_Option ); -static ivas_error parseCustomLayoutFile( - const char *filePath, - IVAS_CUSTOM_LS_DATA *pLsSetupCustom ); +static IVAS_REND_AudioConfig ambisonicsOrderToEnum( const int16_t order ); -static CmdlnArgs parseCmdlnArgs( - const int argc, - char **argv ); +static void parseSceneDescriptionFile( char *path, char *audioFilePath, InputConfig *inConfig, IsmPositionProvider *positionProvider, MasaFileReader **masaReaders ); -static IsmPositionProvider *IsmPositionProvider_open( - void ); +static ivas_error parseCustomLayoutFile( const char *filePath, IVAS_CUSTOM_LS_DATA *pLsSetupCustom ); -static void IsmPositionProvider_getNextFrame( - IsmPositionProvider *positionProvider, - ObjectPositionBuffer *objectMetadataBuffer ); +static CmdlnArgs parseCmdlnArgs( const int argc, char **argv ); -static void IsmPositionProvider_close( - IsmPositionProvider *positionProvider ); +static IsmPositionProvider *IsmPositionProvider_open( void ); -static void readFromShorthandMetadata( - IsmPositionProvider *positionProvider, - ObjectPositionBuffer *objectMetadataBuffer, - const uint32_t objIdx ); +static void IsmPositionProvider_getNextFrame( IsmPositionProvider *positionProvider, ObjectPositionBuffer *objectMetadataBuffer ); -void getMetadataFromFileReader( - IsmFileReader *ismReader, - ObjectPositionBuffer *objectMetadataBuffer, - const uint32_t objIdx ); +static void IsmPositionProvider_close( IsmPositionProvider *positionProvider ); -static void splitConfigFile( - const char *mdfFilePath, - char *metadataString, - uint32_t *metadataStringLength, - char *wavFileName, - uint32_t *wavFileNameLength ); +static void readFromShorthandMetadata( IsmPositionProvider *positionProvider, ObjectPositionBuffer *objectMetadataBuffer, const uint32_t objIdx ); -static char *readNextMetadataChunk( - char *line, - const char *delimiter ); +void getMetadataFromFileReader( IsmFileReader *ismReader, ObjectPositionBuffer *objectMetadataBuffer, const uint32_t objIdx ); -static void parseUint8( - const char *line, - uint8_t *ret ); +static void splitConfigFile( const char *mdfFilePath, char *metadataString, uint32_t *metadataStringLength, char *wavFileName, uint32_t *wavFileNameLength ); -static void parseUint16( - const char *line, - uint16_t *ret ); +static char *readNextMetadataChunk( char *line, const char *delimiter ); -static int8_t parseUint32( - const char *line, - uint32_t *ret ); +static void parseUint8( const char *line, uint8_t *ret ); -static int8_t parseInt32( - const char *line, - int32_t *ret ); +static void parseUint16( const char *line, uint16_t *ret ); -static void parseObjectPosition( - char *line, - IVAS_REND_AudioObjectPosition *position, - uint16_t *positionDuration ); - -static void parseMetadata( - char *metadataString, - char *inDir, - InputConfig *inConfig, - IsmPositionProvider *positionProvider, - MasaFileReader **masaReaders ); +static int8_t parseUint32( const char *line, uint32_t *ret ); -static void convert_backslash( char *str ); +static int8_t parseInt32( const char *line, int32_t *ret ); -static void remove_cr( char *str ); +static void parseObjectPosition( char *line, IVAS_REND_AudioObjectPosition *position, uint16_t *positionDuration ); -static void clearString( char *str ); +static void parseMetadata( char *metadataString, char *inDir, InputConfig *inConfig, IsmPositionProvider *positionProvider, MasaFileReader **masaReaders ); -static bool isEmptyString( const char *str ); +static ivas_error parseLfePanMtxFile( const char *lfeRoutingMatrixFilePath, IVAS_REND_LfePanMtx *lfePanMtx ); static void printSupportedAudioConfigs( void ); @@ -450,7 +400,14 @@ static void convertOutputBuffer( const float *floatBuffer, const int16_t numSamp #endif ); -static IVAS_REND_ReadOnlyAudioBuffer getReadOnlySubBuffer( IVAS_REND_AudioBuffer buffer, const int16_t chBeginIdx, const int16_t numChannels ) +/*------------------------------------------------------------------------------------------* + * Local functions + *------------------------------------------------------------------------------------------*/ + +static IVAS_REND_ReadOnlyAudioBuffer getReadOnlySubBuffer( + IVAS_REND_AudioBuffer buffer, + const int16_t chBeginIdx, + const int16_t numChannels ) { IVAS_REND_ReadOnlyAudioBuffer subBuffer; @@ -461,6 +418,7 @@ static IVAS_REND_ReadOnlyAudioBuffer getReadOnlySubBuffer( IVAS_REND_AudioBuffer return subBuffer; } + static int16_t getTotalNumInChannels( IVAS_REND_HANDLE hIvasRend, IVAS_REND_InputId mcIds[RENDERER_MAX_MC_INPUTS], @@ -563,6 +521,7 @@ static int16_t getTotalNumInChannels( return totalNumInChannels; } + static void setupWithSingleFormatInput( CmdlnArgs args, char *audioFilePath, @@ -604,6 +563,7 @@ static void setupWithSingleFormatInput( /* It is allowed on CLI to have no metadata for an ISM input - skip opening if string is empty or contains "NULL" */ char charBuf[FILENAME_MAX]; strncpy( charBuf, args.inMetadataFilePaths[i], min( FILENAME_MAX, RENDERER_MAX_CLI_ARG_LENGTH ) - 1 ); + charBuf[min( FILENAME_MAX, RENDERER_MAX_CLI_ARG_LENGTH ) - 1] = '\0'; to_upper( charBuf ); if ( isEmptyString( args.inMetadataFilePaths[i] ) || strncmp( charBuf, "NULL", 4 ) == 0 ) { @@ -636,6 +596,7 @@ static void setupWithSingleFormatInput( #endif } + static float dBToLin( const float gain_dB ) { @@ -743,7 +704,11 @@ static int16_t is_split_pre_rend_mode( CmdlnArgs *args ) } #endif -/* ============================================================================ */ +/*------------------------------------------------------------------------------------------* + * main() + * + * Main External renderer function for command-line interface + *------------------------------------------------------------------------------------------*/ int main( int argc, @@ -756,6 +721,11 @@ int main( HANDLE_CLDFB_FILTER_BANK cldfbSyn[MAX_INPUT_CHANNELS]; int16_t cldfb_in, CLDFBframeSize_smpls; #endif +#ifdef SPLIT_REND_PLC + SplitRendBFIFileReader *splitRendBFIReader = NULL; +#endif + Vector3PairFileReader *referenceVectorReader = NULL; + HeadRotFileReader *referenceRotReader = NULL; hrtfFileReader *hrtfFileReader = NULL; IsmPositionProvider *positionProvider; RenderConfigReader *renderConfigReader = NULL; @@ -791,17 +761,11 @@ int main( int32_t delayTimeScale = 0; int16_t i, numChannels; ivas_error error = IVAS_ERR_OK; -#ifdef WMOPS - size_t SRAM_size; -#endif + IVAS_VECTOR3 Pos[RENDERER_HEAD_POSITIONS_PER_FRAME]; #ifdef WMOPS reset_wmops(); - reset_stack(); -#endif - -#ifdef RAM_COUNTING_TOOL - mem_count_init( 0, USE_32BITS ); + reset_mem( USE_32BITS ); #endif for ( i = 0; i < RENDERER_MAX_MASA_INPUTS; ++i ) @@ -821,20 +785,60 @@ int main( convert_backslash( args.inputFilePath ); convert_backslash( args.outputFilePath ); convert_backslash( args.headRotationFilePath ); + convert_backslash( args.referenceVectorFilePath ); + convert_backslash( args.referenceRotationFilePath ); + convert_backslash( args.inLfePanningMatrixFile ); if ( !isEmptyString( args.headRotationFilePath ) ) { - HeadRotationFileReader_open( args.headRotationFilePath, &headRotReader ); + if ( HeadRotationFileReader_open( args.headRotationFilePath, &headRotReader ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error opening file: %s\n", args.headRotationFilePath ); + exit( -1 ); + } + } + + if ( !isEmptyString( args.referenceRotationFilePath ) ) + { + if ( HeadRotationFileReader_open( args.referenceRotationFilePath, &referenceRotReader ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error opening file: %s\n", args.referenceRotationFilePath ); + exit( -1 ); + } + } + if ( !isEmptyString( args.referenceVectorFilePath ) ) + { + if ( Vector3PairFileReader_open( args.referenceVectorFilePath, &referenceVectorReader ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error opening file: %s\n", args.referenceVectorFilePath ); + exit( -1 ); + } + } + +#ifdef SPLIT_REND_PLC + if ( !isEmptyString( args.splitRendBFIFilePath ) ) + { + convert_backslash( args.splitRendBFIFilePath ); + SplitRendBFIFileReader_open( args.splitRendBFIFilePath, &splitRendBFIReader ); } +#endif if ( !isEmptyString( args.customHrtfFilePath ) ) { - hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ); + if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error opening file: %s\n", args.customHrtfFilePath ); + exit( -1 ); + } } if ( !isEmptyString( args.renderConfigFilePath ) ) { - RenderConfigReader_open( args.renderConfigFilePath, &renderConfigReader ); + if ( RenderConfigReader_open( args.renderConfigFilePath, &renderConfigReader ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error opening file: %s\n", args.renderConfigFilePath ); + exit( -1 ); + } } /* Initialize main input files, i.e. audio and metadata */ @@ -854,7 +858,6 @@ int main( ); } - int32_t inFileSampleRate = 0; #ifdef SPLIT_REND_WITH_HEAD_ROT /*if split renderer is running in post renderer mode*/ if ( ( args.inConfig.numBinBuses > 0 ) && ( args.inConfig.binBuses[0].audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB ) ) @@ -870,26 +873,58 @@ int main( else #endif { - if ( AudioFileReader_open( &audioReader, audioFilePath, &inFileSampleRate ) != IVAS_ERR_OK ) + if ( AudioFileReader_open( &audioReader, audioFilePath ) != IVAS_ERR_OK ) { fprintf( stderr, "Error opening file: %s\n", audioFilePath ); exit( -1 ); } } - if ( args.sampleRate == 0 && inFileSampleRate == 0 ) + int32_t inFileSampleRate = 0; + if ( audioReader != NULL ) { - fprintf( stderr, "Sampling rate must be specified on command line when using raw PCM input\n" ); - exit( -1 ); + error = AudioFileReader_getSamplingRate( audioReader, &inFileSampleRate ); } - if ( args.sampleRate != 0 && inFileSampleRate != 0 && args.sampleRate != inFileSampleRate ) + else { - fprintf( stderr, "Sampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n", args.sampleRate, inFileSampleRate, args.inputFilePath ); - exit( -1 ); + inFileSampleRate = args.sampleRate; } - if ( args.sampleRate == 0 ) + switch ( error ) { - args.sampleRate = inFileSampleRate; + case IVAS_ERR_OK: + /* If sampling rate not given on command line, use the one from wav file */ + if ( args.sampleRate == 0 ) + { + args.sampleRate = inFileSampleRate; + } + /* else if sampling rate given on command line, compare with wav file */ + else if ( inFileSampleRate != args.sampleRate ) + { + fprintf( stderr, "Sampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n", args.sampleRate, inFileSampleRate, args.inputFilePath ); + exit( -1 ); + } + break; + case IVAS_ERR_SAMPLING_RATE_UNKNOWN: /* Returned when input is raw PCM */ + if ( args.sampleRate == 0 ) + { + fprintf( stderr, "Sampling rate must be specified on command line when using raw PCM input\n" ); + exit( -1 ); + } + break; + default: + fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) ); + exit( -1 ); + } + + int16_t inFileNumChannels = 0; + if ( audioReader != NULL ) + { + error = AudioFileReader_getNumChannels( audioReader, &inFileNumChannels ); + if ( error != IVAS_ERR_OK && error != IVAS_ERR_NUM_CHANNELS_UNKNOWN ) + { + fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) ); + exit( -1 ); + } } const int16_t frameSize_smpls = (int16_t) ( 20 * args.sampleRate / 1000 ); @@ -915,8 +950,9 @@ int main( } /* === Configure === */ - if ( ( error = IVAS_REND_InitConfig( hIvasRend, strlen( args.renderConfigFilePath ) != 0 ) ) != IVAS_ERR_OK ) + if ( ( error = IVAS_REND_InitConfig( hIvasRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK ) { + fprintf( stderr, "Error in Renderer Config Init\n" ); exit( -1 ); } @@ -931,15 +967,15 @@ int main( /* sanity check */ #ifdef SPLIT_REND_WITH_HEAD_ROT - if ( ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) && !is_split_pre_rend_mode( &args ) && ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL ) ) + if ( ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) && ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL ) && !is_split_pre_rend_mode( &args ) && ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL ) ) { fprintf( stderr, "\nExternal Renderer Config is supported only when BINAURAL_ROOM is used as output OR when Split pre-rendering mode is enabled. Exiting. \n" ); exit( -1 ); } #else - if ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) + if ( ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) && ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL ) ) { - fprintf( stderr, "\nExternal Renderer Config is supported only when BINAURAL_ROOM is used as output. Exiting. \n" ); + fprintf( stderr, "\nExternal Renderer Config is supported only when BINAURAL or BINAURAL_ROOM is used as output. Exiting. \n" ); exit( -1 ); } #endif @@ -971,6 +1007,10 @@ int main( #endif } + if ( ( error = IVAS_REND_SetOrientationTrackingMode( hIvasRend, args.orientationTracking ) ) != IVAS_ERR_OK ) + { + return error; + } /* Set up output custom layout configuration */ if ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) @@ -981,6 +1021,19 @@ int main( } } + IVAS_REND_LfePanMtx lfePanMatrix; + + /* parse input LFE panning matrix */ + if ( args.lfeCustomRoutingEnabled && !isEmptyString( args.inLfePanningMatrixFile ) ) + { + /* TODO tmu: how should we handle this on CLI for multiple MC inputs? */ + if ( ( error = parseLfePanMtxFile( args.inLfePanningMatrixFile, &lfePanMatrix ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) ); + exit( -1 ); + } + } + for ( i = 0; i < args.inConfig.numMultiChannelBuses; ++i ) { if ( ( error = IVAS_REND_AddInput( hIvasRend, args.inConfig.multiChannelBuses[i].audioConfig, &mcIds[i] ) ) != IVAS_ERR_OK ) @@ -1004,7 +1057,30 @@ int main( } } - /* TODO(sgi): Test custom LFE routing here */ + /* set panning matrix for input LFE */ + if ( args.lfeCustomRoutingEnabled ) + { + if ( args.lfePanningEnabled ) + { + fprintf( stdout, "Warning LFE position specified as well as panning matrix! Ignoring position and using gains from panning matrix\n" ); + args.lfePanningEnabled = false; + } + + if ( ( error = IVAS_REND_SetInputLfeMtx( hIvasRend, mcIds[i], (const IVAS_REND_LfePanMtx *) &lfePanMatrix ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) ); + exit( -1 ); + } + } + /* set panning gains for input LFE */ + else if ( args.lfePanningEnabled ) + { + if ( ( error = IVAS_REND_SetInputLfePos( hIvasRend, mcIds[i], args.lfeConfigGain, args.lfeConfigAzimuth, args.lfeConfigElevation ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) ); + exit( -1 ); + } + } } for ( i = 0; i < args.inConfig.numAudioObjects; ++i ) @@ -1076,8 +1152,7 @@ int main( #endif ); - if ( ( audioReader != NULL ) && AudioFileReader_getNumChannels( audioReader ) != 0 /* If input file is raw PCM, audio reader has no info about number of channels */ - && totalNumInChannels != AudioFileReader_getNumChannels( audioReader ) ) + if ( inFileNumChannels != 0 /* inFileNumChannels is 0 with raw PCM input */ && totalNumInChannels != inFileNumChannels ) { fprintf( stderr, "Number of channels in input file does not match selected configuration\n" ); exit( -1 ); @@ -1139,48 +1214,50 @@ int main( } #endif -#ifdef DEC_TO_REND_FLOAT_DUMP - printf( "Warning: Renderer executable built with DEC_TO_REND_FLOAT_DUMP enabled!\n" ); - printf( " Float dump file (./float_out.wav) will be forced as input.\n" ); -#endif - inBufferSize = frameSize_smpls * totalNumInChannels; outBufferSize = frameSize_smpls * numOutChannels; #ifdef SPLIT_REND_WITH_HEAD_ROT if ( is_split_pre_rend_mode( &args ) || is_split_post_rend_mode( &args ) ) { +#ifdef SPLIT_REND_CLDFB_HUFF_SAN_FIX + bitsBufferSize = SPLIT_REND_BITS_BUFF_SIZE; +#else bitsBufferSize = (int32_t) SPLIT_REND_MAX_BRATE / FRAMES_PER_SEC; bitsBufferSize = ( bitsBufferSize + 7 ) >> 3; +#endif +#ifdef SPLIT_REND_LC3PLUS_HBR_DBG + bitsBufferSize = ( SPLIT_REND_LC3PLUS_HBR_DBG * 7 /* Max head poses */ * 2 /* Ech pose is 2 channels */ + 256000 /* Max metadata bitrate */ ) / FRAMES_PER_SEC / 8; +#endif } else { bitsBufferSize = 0; } - #endif - inpInt16Buffer = count_malloc( inBufferSize * sizeof( int16_t ) ); + inpInt16Buffer = malloc( inBufferSize * sizeof( int16_t ) ); #ifdef SPLIT_REND_WITH_HEAD_ROT if ( cldfb_in == 0 ) { - inFloatBuffer = count_malloc( inBufferSize * sizeof( float ) ); + inFloatBuffer = malloc( inBufferSize * sizeof( float ) ); inBuffer.config.numSamplesPerChannel = (int16_t) frameSize_smpls; - outFloatBuffer = count_malloc( outBufferSize * sizeof( float ) ); + outFloatBuffer = malloc( outBufferSize * sizeof( float ) ); outBuffer.config.numSamplesPerChannel = (int16_t) frameSize_smpls; } else { - inFloatBuffer = count_malloc( CLDFBframeSize_smpls * totalNumInChannels * sizeof( float ) ); + inFloatBuffer = malloc( CLDFBframeSize_smpls * totalNumInChannels * sizeof( float ) ); inBuffer.config.numSamplesPerChannel = (int16_t) CLDFBframeSize_smpls; - outFloatBuffer = count_malloc( CLDFBframeSize_smpls * totalNumInChannels * sizeof( float ) ); + outFloatBuffer = malloc( CLDFBframeSize_smpls * totalNumInChannels * sizeof( float ) ); outBuffer.config.numSamplesPerChannel = (int16_t) CLDFBframeSize_smpls; } #else - inFloatBuffer = count_malloc( inBufferSize * sizeof( float ) ); - outFloatBuffer = count_malloc( outBufferSize * sizeof( float ) ); + inBuffer.config.numSamplesPerChannel = (int16_t) frameSize_smpls; + inFloatBuffer = malloc( inBufferSize * sizeof( float ) ); + outFloatBuffer = malloc( outBufferSize * sizeof( float ) ); outBuffer.config.numSamplesPerChannel = (int16_t) frameSize_smpls; #endif - outInt16Buffer = count_malloc( outBufferSize * sizeof( int16_t ) ); + outInt16Buffer = malloc( outBufferSize * sizeof( int16_t ) ); #ifdef SPLIT_REND_WITH_HEAD_ROT inBuffer.config.is_cldfb = cldfb_in; @@ -1198,7 +1275,7 @@ int main( #ifdef SPLIT_REND_WITH_HEAD_ROT if ( bitsBufferSize > 0 ) { - bitsBufferData = count_malloc( bitsBufferSize * sizeof( uint8_t ) ); + bitsBufferData = malloc( bitsBufferSize * sizeof( uint8_t ) ); } else { @@ -1214,6 +1291,7 @@ int main( #endif #ifdef WMOPS + reset_stack(); reset_wmops(); #endif @@ -1281,46 +1359,89 @@ int main( inBuffer.config.is_cldfb, cldfbAna #endif ); -#ifdef DEC_TO_REND_FLOAT_DUMP - /* Overwrite from dump file */ - float tmp[960 * 16]; - dbgread( tmp, sizeof( float ), numSamplesRead, "./float_out.raw" ); - /* Conversion from interleaved to packed still necessary */ - for ( int32_t i = 0; i < numSamplesRead / num_in_channels; ++i ) + ObjectPositionBuffer mtdBuffer; + IsmPositionProvider_getNextFrame( positionProvider, &mtdBuffer ); + + if ( referenceVectorReader != NULL ) { - for ( int32_t c = 0; c < num_in_channels; ++c ) + IVAS_VECTOR3 listenerPos, refPos; + if ( ( error = Vector3PairFileReader_read( referenceVectorReader, &listenerPos, &refPos ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) ); + exit( -1 ); + } + if ( ( error = IVAS_REND_SetReferenceVector( hIvasRend, listenerPos, refPos ) ) != IVAS_ERR_OK ) { - inFloatBuffer[c * frameSize_smpls + i] = tmp[i * num_in_channels + c]; + fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) ); + exit( -1 ); } } -#endif - + /* Read from reference rotation trajectory file if specified */ + if ( referenceRotReader != NULL ) + { + IVAS_QUATERNION quaternion; + if ( ( error = HeadRotationFileReading( referenceRotReader, &quaternion, NULL ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error in Head Rotation File Reading: %s\n", ivas_error_to_string( error ) ); + exit( -1 ); + } - ObjectPositionBuffer mtdBuffer; - IsmPositionProvider_getNextFrame( positionProvider, &mtdBuffer ); + if ( ( error = IVAS_REND_SetReferenceRotation( hIvasRend, quaternion ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error setting Reference Rotation: %s\n", ivas_error_to_string( error ) ); + exit( -1 ); + } + } /* Read from head rotation trajectory file if specified */ if ( headRotReader != NULL ) { IVAS_QUATERNION quatBuffer[RENDERER_HEAD_POSITIONS_PER_FRAME]; - HeadRotationFileReading( headRotReader, quatBuffer, frame ); - IVAS_REND_SetHeadRotation( hIvasRend, quatBuffer + + for ( i = 0; i < RENDERER_HEAD_POSITIONS_PER_FRAME; i++ ) + { + if ( ( error = HeadRotationFileReading( headRotReader, &quatBuffer[i], &Pos[i] ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error in Head Rotation File Reading: %s\n", ivas_error_to_string( error ) ); + exit( -1 ); + } + } + if ( ( error = IVAS_REND_SetHeadRotation( hIvasRend, quatBuffer, Pos #ifdef SPLIT_REND_WITH_HEAD_ROT - , - DEFAULT_AXIS + , + DEFAULT_AXIS #endif - ); + ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Error setting Head Rotation: %s\n", ivas_error_to_string( error ) ); + exit( -1 ); + } } else { - IVAS_REND_SetHeadRotation( hIvasRend, NULL + error = IVAS_REND_SetHeadRotation( hIvasRend, NULL, NULL #ifdef SPLIT_REND_WITH_HEAD_ROT - , - DEFAULT_AXIS + , + DEFAULT_AXIS #endif ); + if ( ( error != IVAS_ERR_OK ) && ( error != IVAS_ERR_INVALID_OUTPUT_FORMAT ) ) // VE: TBC + { + fprintf( stderr, "Error setting Head Rotation: %s\n", ivas_error_to_string( error ) ); + exit( -1 ); + } + } + +#ifdef SPLIT_REND_PLC + /* Read from split renderer bfi file if specified */ + if ( splitRendBFIReader != NULL ) + { + int16_t bfi; + SplitRendBFIFileReading( splitRendBFIReader, &bfi ); + IVAS_REND_SetSplitRendBFI( hIvasRend, bfi ); } +#endif for ( i = 0; i < args.inConfig.numMultiChannelBuses; ++i ) { @@ -1458,7 +1579,7 @@ int main( { uint32_t pre_rend_delay_ns; split_rend_read_pre_rend_delay_ns( hSplitRendFileReadWrite, &pre_rend_delay_ns ); - delayNumSamples += NS2SA( delayTimeScale, pre_rend_delay_ns ); + delayNumSamples += (int16_t) roundf( (float) pre_rend_delay_ns * delayTimeScale / 1000000000.f ); } #endif delayNumSamples_orig = delayNumSamples; @@ -1514,6 +1635,7 @@ int main( } #ifdef WMOPS + update_mem(); update_wmops(); #endif } @@ -1551,14 +1673,14 @@ int main( #endif /* === Close === */ - count_free( inpInt16Buffer ); - count_free( inFloatBuffer ); - count_free( outInt16Buffer ); - count_free( outFloatBuffer ); + free( inpInt16Buffer ); + free( inFloatBuffer ); + free( outInt16Buffer ); + free( outFloatBuffer ); #ifdef SPLIT_REND_WITH_HEAD_ROT if ( bitsBufferData != NULL ) { - count_free( bitsBufferData ); + free( bitsBufferData ); } #endif for ( i = 0; i < RENDERER_MAX_MASA_INPUTS; ++i ) @@ -1592,29 +1714,26 @@ int main( } HeadRotationFileReader_close( &headRotReader ); + Vector3PairFileReader_close( &referenceVectorReader ); + HeadRotationFileReader_close( &referenceRotReader ); hrtfFileReader_close( &hrtfFileReader ); IVAS_REND_Close( &hIvasRend ); IsmPositionProvider_close( positionProvider ); RenderConfigReader_close( &renderConfigReader ); -#ifdef RAM_COUNTING_TOOL -#ifdef WMOPS - SRAM_size = -#endif - mem_count_summary( USE_DEFAULT ); -#endif #ifdef WMOPS print_wmops(); - print_mem_renderer( SRAM_size ); -#endif - -#ifdef DEBUGGING - dbgclose(); + print_mem( NULL ); #endif return 0; } + +/*------------------------------------------------------------------------------------------* + * Local functions + *------------------------------------------------------------------------------------------*/ + static IVAS_REND_AudioConfig ambisonicsOrderToEnum( const int16_t order ) { @@ -1631,6 +1750,20 @@ static IVAS_REND_AudioConfig ambisonicsOrderToEnum( return IVAS_REND_AUDIO_CONFIG_UNKNOWN; } +static const CmdLnParser_Option *findOptionById( + const int32_t id ) +{ + for ( int32_t i = 0; i < numCliOptions; ++i ) + { + if ( cliOptions[i].id == id ) + { + return &cliOptions[i]; + } + } + + return NULL; +} + static bool parseInConfig( const char *inFormatStr, InputConfig *inConfig, @@ -1648,6 +1781,7 @@ static bool parseInConfig( #endif /* First check if input is being set to scene description file - this is not covered by parseAudioConfig(). */ strncpy( charBuf, inFormatStr, sizeof( charBuf ) - 1 ); + charBuf[sizeof( charBuf ) - 1] = '\0'; to_upper( charBuf ); if ( strcmp( charBuf, "META" ) == 0 ) { @@ -1730,7 +1864,8 @@ static bool parseInConfig( if ( error == IVAS_ERR_FAILED_FILE_OPEN ) { /* Failed to open with given string - most likely wasn't a file path */ - fprintf( stderr, "Unsupported input format: %s\n", inFormatStr ); + const CmdLnParser_Option *listOption = findOptionById( CmdLnOptionId_listFormats ); + fprintf( stderr, "Unsupported input format: %s. To list valid formats, use option --%s.\n", inFormatStr, listOption->match ); return false; } if ( error != IVAS_ERR_OK ) @@ -1745,10 +1880,13 @@ static bool parseInConfig( } break; default: + { /* Default case covers formats that are defined in the IVAS_REND_AudioConfig enum, * but cannot be used at input, e.g. BINAURAL */ - fprintf( stderr, "Unsupported input format: %s\n", inFormatStr ); + const CmdLnParser_Option *listOption = findOptionById( CmdLnOptionId_listFormats ); + fprintf( stderr, "Unsupported input format: %s. To list valid formats, use option --%s.\n", inFormatStr, listOption->match ); return false; + } } return true; @@ -1776,12 +1914,10 @@ static bool parseOutConfig( return true; } -static int8_t parseDiegeticPan( +static bool parseDiegeticPan( char *value, float *noDiegeticPan ) { - int8_t success; - success = 1; to_upper( value ); if ( ( strcmp( value, "CENTER" ) == 0 ) || ( strchr( value, 'C' ) != NULL ) ) @@ -1803,22 +1939,24 @@ static int8_t parseDiegeticPan( if ( *noDiegeticPan > 1.0f || *noDiegeticPan < -1.0f ) { fprintf( stderr, "Error: Incorrect value for panning option argument specified!\n\n" ); - success = 0; + return false; } } - return success ? 0 : -1; + return false; } -static int8_t parseOrientationTracking( +static bool parseOrientationTracking( char *value, int8_t *tracking_type ) { - int8_t success; - success = 1; to_upper( value ); - if ( strcmp( value, "REF" ) == 0 ) + if ( strcmp( value, "NONE" ) == 0 ) + { + *tracking_type = IVAS_ORIENT_TRK_NONE; + } + else if ( strcmp( value, "REF" ) == 0 ) { *tracking_type = IVAS_ORIENT_TRK_REF; } @@ -1826,13 +1964,21 @@ static int8_t parseOrientationTracking( { *tracking_type = IVAS_ORIENT_TRK_AVG; } + else if ( strcmp( value, "REF_VEC" ) == 0 ) + { + *tracking_type = IVAS_ORIENT_TRK_REF_VEC; + } + else if ( strcmp( value, "REF_VEC_LEV" ) == 0 ) + { + *tracking_type = IVAS_ORIENT_TRK_REF_VEC_LEV; + } else { fprintf( stderr, "Error: Invalid orientation tracking type %s \n\n", value ); - success = 0; + return false; } - return success ? 0 : -1; + return true; } static IVAS_REND_AudioConfig parseAudioConfig( @@ -1847,6 +1993,7 @@ static IVAS_REND_AudioConfig parseAudioConfig( #endif strncpy( charBuf, configString, sizeof( charBuf ) - 1 ); + charBuf[sizeof( charBuf ) - 1] = '\0'; to_upper( charBuf ); if ( ( strcmp( charBuf, "MONO" ) == 0 ) || ( strcmp( charBuf, "HOA0" ) == 0 ) || ( strcmp( charBuf, "SBA0" ) == 0 ) ) @@ -1891,7 +2038,16 @@ static IVAS_REND_AudioConfig parseAudioConfig( } if ( strncmp( charBuf, "ISM", 3 ) == 0 ) { - return IVAS_REND_AUDIO_CONFIG_OBJECT; + /* Accept input config as ISM only if the 4th character is a number from 1 to 4. + * Otherwise, do nothing. Unknown audio config will be returned. */ + switch ( charBuf[3] ) + { + case '1': + case '2': + case '3': + case '4': + return IVAS_REND_AUDIO_CONFIG_OBJECT; + } } if ( strncmp( charBuf, "MASA", 4 ) == 0 ) { @@ -1928,20 +2084,53 @@ static IVAS_REND_AudioConfig parseAudioConfig( return IVAS_REND_AUDIO_CONFIG_UNKNOWN; } -static const CmdLnParser_Option *findOptionById( - const int32_t id ) +static bool parseLfePositionConfig( + const char *value, + float *lfeGain, + float *lfeAzimuth, + float *lfeElevation ) { - for ( int32_t i = 0; i < numCliOptions; ++i ) + uint8_t nvalues; + const char *tok; + float values[3]; + char config_string[RENDERER_MAX_METADATA_LINE_LENGTH]; + + strncpy( config_string, value, RENDERER_MAX_METADATA_LINE_LENGTH ); + nvalues = 0; + + for ( tok = strtok( config_string, "," ); tok && *tok; tok = strtok( NULL, ",\n" ) ) { - if ( cliOptions[i].id == id ) + while ( *tok == ' ' ) { - return &cliOptions[i]; + tok++; + } + + if ( *tok == '\0' ) + { + continue; + } + values[nvalues] = (float) atof( tok ); + nvalues++; + + /* ignore any additionally specified values */ + if ( nvalues == 3 ) + { + break; } } - return NULL; + if ( nvalues != 3 ) + { + return false; + } + + *lfeGain = values[0]; + *lfeAzimuth = values[1]; + *lfeElevation = values[2]; + return true; } + static bool checkRequiredArgs( CmdlnArgs args ) { @@ -2023,14 +2212,18 @@ static CmdlnArgs defaultArgs( args.numInMetadataFiles = 0; clearString( args.headRotationFilePath ); - #ifdef SPLIT_REND_WITH_HEAD_ROT clearString( args.outMetadataFilePath ); #endif +#ifdef SPLIT_REND_PLC + clearString( args.splitRendBFIFilePath ); +#endif + clearString( args.referenceVectorFilePath ); + clearString( args.referenceRotationFilePath ); clearString( args.customHrtfFilePath ); clearString( args.renderConfigFilePath ); - args.orientationTracking = IVAS_ORIENT_TRK_REF; + args.orientationTracking = IVAS_ORIENT_TRK_NONE; args.noDiegeticPan = 0.0f; args.delayCompensationEnabled = true; @@ -2038,6 +2231,13 @@ static CmdlnArgs defaultArgs( args.sceneDescriptionInput = false; args.inputGainGlobal = 1.0f; + args.lfePanningEnabled = false; + args.lfeConfigGain = 1.0f; + args.lfeConfigAzimuth = 0; + args.lfeConfigElevation = 0; + + args.lfeCustomRoutingEnabled = false; + clearString( args.inLfePanningMatrixFile ); return args; } @@ -2104,6 +2304,20 @@ static void parseOption( strncpy( args->outMetadataFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 ); break; #endif +#ifdef SPLIT_REND_PLC + case CmdLnOptionId_SplitRendBFIFile: + assert( numOptionValues == 1 ); + strncpy( args->splitRendBFIFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 ); + break; +#endif + case CmdLnOptionId_referenceVectorFile: + assert( numOptionValues == 1 ); + strncpy( args->referenceVectorFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 ); + break; + case CmdLnOptionId_refRotFile: + assert( numOptionValues == 1 ); + strncpy( args->referenceRotationFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 ); + break; case CmdLnOptionId_customHrtfFile: assert( numOptionValues == 1 ); strncpy( args->customHrtfFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 ); @@ -2114,7 +2328,7 @@ static void parseOption( break; case CmdLnOptionId_noDiegeticPan: assert( numOptionValues == 1 ); - if ( parseDiegeticPan( optionValues[0], &args->noDiegeticPan ) != 0 ) + if ( !parseDiegeticPan( optionValues[0], &args->noDiegeticPan ) ) { fprintf( stderr, "Unknown option for diegetic panning: %s\n", optionValues[0] ); exit( -1 ); @@ -2122,14 +2336,26 @@ static void parseOption( break; case CmdLnOptionId_orientationTracking: assert( numOptionValues == 1 ); - if ( parseOrientationTracking( optionValues[0], &args->orientationTracking ) != 0 ) + if ( !parseOrientationTracking( optionValues[0], &args->orientationTracking ) ) { fprintf( stderr, "Unknown option for orientation tracking: %s\n", optionValues[0] ); exit( -1 ); } break; - case CmdLnOptionId_customLfeRouting: - assert( 0 && "Not yet implemented in CLI" ); + case CmdlnOptionId_lfePosition: + assert( numOptionValues == 1 ); + if ( !parseLfePositionConfig( optionValues[0], &args->lfeConfigGain, &args->lfeConfigAzimuth, &args->lfeConfigElevation ) ) + { + fprintf( stderr, "Unknown or invalid option for LFE position: %s\n", optionValues[0] ); + exit( -1 ); + } + args->lfePanningEnabled = true; + break; + break; + case CmdlnOptionId_lfeMatrix: + assert( numOptionValues == 1 ); + strncpy( args->inLfePanningMatrixFile, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 ); + args->lfeCustomRoutingEnabled = true; break; case CmdLnOptionId_noDelayCmp: assert( numOptionValues == 0 ); @@ -2182,7 +2408,7 @@ IsmPositionProvider *IsmPositionProvider_open( IsmPositionProvider *ipp; uint16_t i; - ipp = (IsmPositionProvider *) count_malloc( sizeof( IsmPositionProvider ) ); + ipp = (IsmPositionProvider *) malloc( sizeof( IsmPositionProvider ) ); ipp->frameCounter = 0; ipp->numObjects = 0; @@ -2208,12 +2434,15 @@ void getMetadataFromFileReader( if ( ( error = IsmFileReader_readNextFrame( ismReader, &ismMetadata ) ) != IVAS_ERR_OK ) { - fprintf( stderr, "\nError (%s) while reading ism metadata from: %s\n\n", ivas_error_to_string( error ), IsmFileReader_getFilePath( ismReader ) ); + fprintf( stderr, "\nError (%s) while reading ISM metadata from: %s\n\n", ivas_error_to_string( error ), IsmFileReader_getFilePath( ismReader ) ); exit( -1 ); } objectMetadataBuffer->positions[objIdx].azimuth = ismMetadata.azimuth; objectMetadataBuffer->positions[objIdx].elevation = ismMetadata.elevation; + objectMetadataBuffer->positions[objIdx].radius = ismMetadata.radius; + objectMetadataBuffer->positions[objIdx].yaw = ismMetadata.yaw; + objectMetadataBuffer->positions[objIdx].pitch = ismMetadata.pitch; return; } @@ -2243,7 +2472,7 @@ void readFromShorthandMetadata( return; } -void IsmPositionProvider_getNextFrame( +static void IsmPositionProvider_getNextFrame( IsmPositionProvider *positionProvider, ObjectPositionBuffer *objectMetadataBuffer ) { @@ -2253,14 +2482,25 @@ void IsmPositionProvider_getNextFrame( for ( objIdx = 0; objIdx < positionProvider->numObjects; ++objIdx ) { + /* If ISM metadata reader is open, read from metadata file */ if ( positionProvider->ismReaders[objIdx] != NULL ) { getMetadataFromFileReader( positionProvider->ismReaders[objIdx], objectMetadataBuffer, objIdx ); } - else + /* Otherwise, if positions were provided in a scene description file, use them */ + else if ( positionProvider->positions[objIdx] != NULL ) { readFromShorthandMetadata( positionProvider, objectMetadataBuffer, objIdx ); } + /* Otherwise fall back to default position */ + else + { + objectMetadataBuffer->positions[objIdx].azimuth = 0.0f; + objectMetadataBuffer->positions[objIdx].elevation = 0.0f; + objectMetadataBuffer->positions[objIdx].radius = 1.0f; + objectMetadataBuffer->positions[objIdx].yaw = 0.0f; + objectMetadataBuffer->positions[objIdx].pitch = 0.0f; + } /* Wrap azimuth to lie within (-180, 180] range */ while ( objectMetadataBuffer->positions[objIdx].azimuth < 0.0f ) @@ -2274,6 +2514,18 @@ void IsmPositionProvider_getNextFrame( /* Clamp elevation to lie within [-90, 90] range (can't be wrapped easily) */ objectMetadataBuffer->positions[objIdx].elevation = min( max( objectMetadataBuffer->positions[objIdx].elevation, -90 ), 90 ); + /* Wrap yaw to lie within (-180, 180] range */ + while ( objectMetadataBuffer->positions[objIdx].yaw < 0.0f ) + { + objectMetadataBuffer->positions[objIdx].yaw += 360.0f; + } + while ( objectMetadataBuffer->positions[objIdx].yaw >= 360.0f ) + { + objectMetadataBuffer->positions[objIdx].yaw -= 360.0f; + } + + /* Clamp pitch to lie within [-90, 90] range (can't be wrapped easily) */ + objectMetadataBuffer->positions[objIdx].pitch = min( max( objectMetadataBuffer->positions[objIdx].pitch, -90 ), 90 ); } ++positionProvider->frameCounter; @@ -2281,7 +2533,8 @@ void IsmPositionProvider_getNextFrame( return; } -void IsmPositionProvider_close( IsmPositionProvider *positionProvider ) +static void IsmPositionProvider_close( + IsmPositionProvider *positionProvider ) { uint32_t i; @@ -2299,16 +2552,16 @@ void IsmPositionProvider_close( IsmPositionProvider *positionProvider ) if ( positionProvider->positions[i] != NULL ) { - count_free( positionProvider->positions[i] ); + free( positionProvider->positions[i] ); } if ( positionProvider->positionDurations[i] != NULL ) { - count_free( positionProvider->positionDurations[i] ); + free( positionProvider->positionDurations[i] ); } } - count_free( positionProvider ); + free( positionProvider ); return; } @@ -2507,33 +2760,26 @@ static void parseObjectPosition( uint16_t *positionDuration ) { char *endptr; + int16_t read_values; + float meta_prm[7] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f }; readNextMetadataChunk( line, "," ); *positionDuration = (uint16_t) strtol( line, &endptr, 10 ); + readNextMetadataChunk( line, "\n" ); - if ( *endptr != '\0' ) - { - fprintf( stderr, "Error reading metadata\n" ); - exit( -1 ); - } - - readNextMetadataChunk( line, "," ); - position->azimuth = strtof( line, &endptr ); - - if ( *endptr != '\0' ) - { - fprintf( stderr, "Error reading metadata\n" ); - exit( -1 ); - } + read_values = (int16_t) sscanf( line, "%f,%f,%f,%f,%f,%f,%f", &meta_prm[0], &meta_prm[1], &meta_prm[2], &meta_prm[3], &meta_prm[4], &meta_prm[5], &meta_prm[6] ); - readNextMetadataChunk( line, "\n" ); - position->elevation = strtof( line, &endptr ); - if ( *endptr != '\0' ) + if ( read_values < 2 ) { fprintf( stderr, "Error reading metadata\n" ); exit( -1 ); } + position->azimuth = meta_prm[0]; + position->elevation = meta_prm[1]; + position->radius = meta_prm[2]; + position->yaw = meta_prm[5]; + position->pitch = meta_prm[6]; return; } @@ -2557,8 +2803,8 @@ static void parseIsm( if ( parseUint32( line, &numberOfObjectPositionsToRead ) == 0 ) { positionProvider->numPositions[idx] = numberOfObjectPositionsToRead; - positionProvider->positions[idx] = count_malloc( numberOfObjectPositionsToRead * sizeof( IVAS_REND_AudioObjectPosition ) ); - positionProvider->positionDurations[idx] = count_malloc( numberOfObjectPositionsToRead * sizeof( uint16_t ) ); + positionProvider->positions[idx] = malloc( numberOfObjectPositionsToRead * sizeof( IVAS_REND_AudioObjectPosition ) ); + positionProvider->positionDurations[idx] = malloc( numberOfObjectPositionsToRead * sizeof( uint16_t ) ); for ( i = 0; i < numberOfObjectPositionsToRead; ++i ) { @@ -2648,7 +2894,7 @@ static void parseMasa( if ( strncmp( line, "MASA", 4 ) != 0 ) { char numTcs = *line; - sprintf( line, "MASA%c", numTcs ); + snprintf( line, 6 /* write at most 6 characters: MASAx + null termination */, "MASA%c", numTcs ); } inConfig->masaBuses[idx].audioConfig = parseAudioConfig( line ); @@ -2858,6 +3104,8 @@ static void parseSceneDescriptionFile( strncat( audioFilePath, inAudioFilePath, inAudioFilePathLen ); parseMetadata( mtdStr, inDir, inConfig, positionProvider, masaReaders ); + + return; } static void printSupportedAudioConfigs() @@ -2894,62 +3142,72 @@ static void printSupportedAudioConfigs() return; } -// VE2AT: possibly move these functions to cmdln_parser.c ? -static void convert_backslash( - char *str ) +static ivas_error parseLfePanMtxFile( + const char *lfeRoutingMatrixFilePath, + IVAS_REND_LfePanMtx *lfePanMtx ) { - int16_t i, len; - - /* check that all backslashes are correct on the given platform */ - len = (int16_t) strlen( str ); + int16_t lfe_in, ch_out; + const char *tok; + char line[200]; /* > (10 chars * IVAS_MAX_OUTPUT_CHANNELS) i.e. "-999, " */ + FILE *mtxFile; - for ( i = 0; i < len; i++ ) + if ( strlen( lfeRoutingMatrixFilePath ) < 1 ) { -#ifdef _WIN32 - if ( str[i] == '/' ) - { - str[i] = '\\'; - } -#else - if ( str[i] == '\\' ) - { - str[i] = '/'; - } -#endif + return IVAS_ERR_FAILED_FILE_OPEN; } - return; -} + mtxFile = fopen( lfeRoutingMatrixFilePath, "r" ); -static void remove_cr( char *str ) -{ - char *pos; + if ( !mtxFile ) + { + return IVAS_ERR_FAILED_FILE_OPEN; + } - /* remove all \r characters from the string */ - pos = strchr( str, '\r' ); - while ( pos != NULL ) + /* set default panning matrix to all zeros + any subsequent issue in file reading will gracefully exit the function */ + for ( lfe_in = 0; lfe_in < IVAS_MAX_INPUT_LFE_CHANNELS; lfe_in++ ) { - strcpy( pos, pos + 1 ); - pos = strchr( pos, '\r' ); + set_zero( ( *lfePanMtx )[lfe_in], IVAS_MAX_OUTPUT_CHANNELS ); } - return; -} + for ( lfe_in = 0, ch_out = 0; lfe_in < IVAS_MAX_INPUT_LFE_CHANNELS; lfe_in++ ) + { + /* if EOF or a blank line is encountered, simply return */ + if ( ( fgets( line, 200, mtxFile ) == NULL ) && ( strcmp( line, "\n" ) == 0 ) && ( strcmp( line, "\r\n" ) == 0 ) ) + { + fclose( mtxFile ); + return IVAS_ERR_OK; + } -static void clearString( - char *str ) -{ - str[0] = '\0'; + for ( tok = strtok( line, "," ); tok && *tok; tok = strtok( NULL, ",\n" ) ) + { + while ( *tok == ' ' ) + { + tok++; + } - return; -} + if ( *tok == '\0' ) + { + continue; + } + if ( ch_out > IVAS_MAX_OUTPUT_CHANNELS ) + { + break; + } + else + { + ( *lfePanMtx )[lfe_in][ch_out] = (float) atof( tok ); + ch_out++; + } + } + } -static bool isEmptyString( - const char *str ) -{ - return str[0] == '\0'; + fclose( mtxFile ); + + return IVAS_ERR_OK; } + /*--------------------------------------------------------------------------* * convertInputBuffer() * @@ -3054,6 +3312,7 @@ static void convertOutputBuffer( ) { int16_t chnl, smpl, i; + float temp; i = 0; @@ -3105,12 +3364,21 @@ static void convertOutputBuffer( else #endif { - for ( smpl = 0; smpl < numSamplesPerChannel; ++smpl ) { for ( chnl = 0; chnl < numChannels; ++chnl ) { - intBuffer[i] = (int16_t) roundf( floatBuffer[chnl * numSamplesPerChannel + smpl] ); + temp = floatBuffer[chnl * numSamplesPerChannel + smpl]; + temp = (float) floor( temp + 0.5f ); + if ( temp > MAX16B_FLT ) + { + temp = MAX16B_FLT; + } + else if ( temp < MIN16B_FLT ) + { + temp = MIN16B_FLT; + } + intBuffer[i] = (int16_t) temp; ++i; } diff --git a/ci/__init__.py b/ci/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ci/build_all_linux.sh b/ci/build_all_linux.sh index f1c701a0d9..47ad54dc42 100755 --- a/ci/build_all_linux.sh +++ b/ci/build_all_linux.sh @@ -1,6 +1,6 @@ #! /usr/bin/bash -# (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +# (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, # Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., # Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, # Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/ci/build_codec_instrumented_linux.sh b/ci/build_codec_instrumented_linux.sh index 9f875f28fb..7c4da0a7f5 100755 --- a/ci/build_codec_instrumented_linux.sh +++ b/ci/build_codec_instrumented_linux.sh @@ -1,6 +1,6 @@ #! /usr/bin/bash -# (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +# (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, # Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., # Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, # Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/ci/build_codec_sanitizers_linux.sh b/ci/build_codec_sanitizers_linux.sh index d5891e43ad..d352fa32ec 100755 --- a/ci/build_codec_sanitizers_linux.sh +++ b/ci/build_codec_sanitizers_linux.sh @@ -1,6 +1,6 @@ #! /usr/bin/bash -# (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +# (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, # Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., # Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, # Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/ci/check_for_warnings.py b/ci/check_for_warnings.py index 76a0bc917a..f6b205e689 100755 --- a/ci/check_for_warnings.py +++ b/ci/check_for_warnings.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/ci/comment_defines.py b/ci/comment_defines.py index 3bbbcba7c1..0b6e345703 100755 --- a/ci/comment_defines.py +++ b/ci/comment_defines.py @@ -27,7 +27,7 @@ def process_file(file_path: str, defines_re): print("") -def compile_define_re(define_name: str) -> re.Pattern[str]: +def compile_define_re(define_name: str): return re.compile(f"#define\\s+{define_name}") diff --git a/ci/complexity_measurements/genWebpageData_Prom.csh b/ci/complexity_measurements/genWebpageData_Prom.csh deleted file mode 100755 index d6e716f0c5..0000000000 --- a/ci/complexity_measurements/genWebpageData_Prom.csh +++ /dev/null @@ -1,220 +0,0 @@ -#!/bin/tcsh - -# (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, -# Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., -# Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, -# Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other -# contributors to this repository. All Rights Reserved. - -# This software is protected by copyright law and by international treaties. -# The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, -# Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., -# Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, -# Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other -# contributors to this repository retain full ownership rights in their respective contributions in -# the software. This notice grants no license of any kind, including but not limited to patent -# license, nor is any license granted by implication, estoppel or otherwise. - -# Contributors are required to enter into the IVAS codec Public Collaboration agreement before making -# contributions. - -# This software is provided "AS IS", without any express or implied warranties. The software is in the -# development stage. It is intended exclusively for experts who have experience with such software and -# solely for the purpose of inspection. All implied warranties of non-infringement, merchantability -# and fitness for a particular purpose are hereby disclaimed and excluded. - -# Any dispute, controversy or claim arising under or in relation to providing this software shall be -# submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in -# accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and -# the United Nations Convention on Contracts on the International Sales of Goods. - -set maxValues = 40 - -if (${#argv} != 3) then - echo usage: $0 \ \ \ - exit -endif - -set srcFile1 = $1 - -set file_final = $2 -set file = ${file_final}_new_$$ - -set graphName = $3 - -set tmpBase = `basename $0` -set tmpFile1 = /tmp/${tmpBase}1_$$ -rm -f ${tmpFile1} -cat ${srcFile1} | tail -n ${maxValues} > ${tmpFile1} -set nLines1 = `cat ${tmpFile1} | wc -l` -set maxNumWordsLine = 7 - -rm -f $file -touch $file - -echo "var $graphName = {" >> $file -echo ' prom_worstcase: {' >> $file -echo ' description: "Worst Case PROM",' >> $file -echo ' direction: -1,' >> $file -echo ' runs: [' >> $file - - -@ i = 0 -foreach line ( "`cat ${tmpFile1}`" ) - @ i++ - set separator = "," - if ( $i == $nLines1 ) then - set separator = "" - endif - - set tmp = ( $line ) - - set numWords = `echo $tmp | wc -w` - if ( $numWords < $maxNumWordsLine ) then - continue - endif - - set revision = $tmp[1] - set shortDate = `echo $tmp[2] | sed -e "s/_/\ /g"` - set fullDate = `echo $tmp[3] | sed -e "s/_/\ /g"` - set logFileFlc = $tmp[5] - set logFileBasop = $tmp[7] - - echo ' {' >> $file - echo ' fullDate: "'${fullDate}'",' >> $file - echo ' shortDate: "'${shortDate}'",' >> $file - echo ' revision: "'${revision}'",' >> $file - echo ' logFileFlc: "'${logFileFlc}'",' >> $file - echo ' logFileBasop: "'${logFileBasop}'",' >> $file - echo ' }'${separator} >> $file - -end -echo ' ],' >> $file - -# begin displays -echo ' displays: [' >> $file - -# requirement PROM -echo ' {' >> $file -echo ' lines: { show: false },' >> $file -echo ' points: { show: false, fillColor: "#ffffff" },' >> $file -echo ' borderWidth: 1.5,' >> $file -echo ' borderColor: "#BEBEBE",' >> $file -echo ' markingsLineWidth: .75,' >> $file -echo ' hoverable: true,' >> $file -echo ' clickable: true,' >> $file -echo ' shadowSize: 0,' >> $file -echo ' color: "#000000",' >> $file -echo ' id: "requirementProm",' >> $file -echo ' data: [' >> $file - -@ i = 0 -foreach line ( "`cat ${tmpFile1}`" ) - set separator = "," - if ( $i == $nLines1 - 1 ) then - set separator = "" - endif - - set tmp = ( $line ) - - set numWords = `echo $tmp | wc -w` - if ( $numWords < $maxNumWordsLine ) then - continue - endif - - # TODO: add real requirement once decided on - set score = 0 - - echo ' ['"${i}, ${score}"']'${separator} >> $file - @ i++ - -end - -echo ' ]' >> $file -echo ' },' >> $file -# requirement ROM - -# measured ops FLC -echo ' {' >> $file -echo ' lines: { show: true },' >> $file -echo ' points: { show: true, fillColor: "#ffffff" },' >> $file -echo ' borderWidth: 1.5,' >> $file -echo ' borderColor: "#BEBEBE",' >> $file -echo ' markingsLineWidth: .75,' >> $file -echo ' hoverable: true,' >> $file -echo ' clickable: true,' >> $file -echo ' shadowSize: 0,' >> $file -echo ' color: "#FF8000",' >> $file -echo ' id: "promOpsFlc",' >> $file -echo ' data: [' >> $file - -@ i = 0 -foreach line ( "`cat ${tmpFile1}`" ) - set separator = "," - if ( $i == $nLines1 - 1 ) then - set separator = "" - endif - - set tmp = ( $line ) - - set numWords = `echo $tmp | wc -w` - if ( $numWords < $maxNumWordsLine ) then - continue - endif - - set score = $tmp[4] - - echo ' ['"${i}, ${score}"']'${separator} >> $file - @ i++ - -end - -echo ' ]' >> $file -echo ' },' >> $file -# measured ops FLC - -# measured ops BASOP -echo ' {' >> $file -echo ' lines: { show: false },' >> $file -echo ' points: { show: false, fillColor: "#ffffff" },' >> $file -echo ' borderWidth: 1.5,' >> $file -echo ' borderColor: "#BEBEBE",' >> $file -echo ' markingsLineWidth: .75,' >> $file -echo ' hoverable: true,' >> $file -echo ' clickable: true,' >> $file -echo ' shadowSize: 0,' >> $file -echo ' color: "#0080FF",' >> $file -echo ' id: "promOpsBasop",' >> $file -echo ' data: [' >> $file - -@ i = 0 -foreach line ( "`cat ${tmpFile1}`" ) - set separator = "," - if ( $i == $nLines1 - 1 ) then - set separator = "" - endif - - set tmp = ( $line ) - - set numWords = `echo $tmp | wc -w` - if ( $numWords < $maxNumWordsLine ) then - continue - endif - - set score = $tmp[6] - - echo ' ['"${i}, ${score}"']'${separator} >> $file - @ i++ - -end - -echo ' ]' >> $file -echo ' }' >> $file - -echo ' ]' >> $file - -echo ' }' >> $file -echo '};' >> $file - -mv -f $file $file_final -rm -f ${tmpFile1} diff --git a/ci/complexity_measurements/genWebpageData_Ram.csh b/ci/complexity_measurements/genWebpageData_Ram.csh index a8dbc0e2f9..d6e5a842e3 100755 --- a/ci/complexity_measurements/genWebpageData_Ram.csh +++ b/ci/complexity_measurements/genWebpageData_Ram.csh @@ -1,6 +1,6 @@ #!/bin/tcsh -# (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +# (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, # Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., # Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, # Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -77,10 +77,10 @@ foreach line ( "`cat ${tmpFile}`" ) set fullDate = `echo $tmp[3] | sed -e "s/_/\ /g"` set maxTotalRamEnc = $tmp[5] set maxTotalRamDec = $tmp[7] - set maxDynamicRamEnc = $tmp[10] - set maxDynamicRamDec = $tmp[12] - set maxStaticRamEnc = $tmp[15] - set maxStaticRamDec = $tmp[17] + set maxStackEnc = $tmp[10] + set maxStackDec = $tmp[12] + set maxHeapEnc = $tmp[15] + set maxHeapDec = $tmp[17] set logFile = $tmp[19] echo ' {' >> $file @@ -89,10 +89,10 @@ foreach line ( "`cat ${tmpFile}`" ) echo ' revision: "'${revision}'",' >> $file echo ' maxTotalRamEnc: "'${maxTotalRamEnc}'",' >> $file echo ' maxTotalRamDec: "'${maxTotalRamDec}'",' >> $file - echo ' maxDynamicRamEnc: "'${maxDynamicRamEnc}'",' >> $file - echo ' maxDynamicRamDec: "'${maxDynamicRamDec}'",' >> $file - echo ' maxStaticRamEnc: "'${maxStaticRamEnc}'",' >> $file - echo ' maxStaticRamDec: "'${maxStaticRamDec}'",' >> $file + echo ' maxStackEnc: "'${maxStackEnc}'",' >> $file + echo ' maxStackDec: "'${maxStackDec}'",' >> $file + echo ' maxHeapEnc: "'${maxHeapEnc}'",' >> $file + echo ' maxHeapDec: "'${maxHeapDec}'",' >> $file echo ' logFile: "'${logFile}'"' >> $file echo ' }'${separator} >> $file @@ -259,7 +259,7 @@ echo ' ]' >> $file echo ' },' >> $file # maxTotalRamDecScore -# maxDynamicRamCodecScore +# maxStackCodecScore echo ' {' >> $file echo ' lines: { show: true },' >> $file echo ' points: { show: true, fillColor: "#ffffff" },' >> $file @@ -270,7 +270,7 @@ echo ' hoverable: true,' >> $file echo ' clickable: true,' >> $file echo ' shadowSize: 0,' >> $file echo ' color: "#004000",' >> $file -echo ' id: "maxDynamicRamCodecScore",' >> $file +echo ' id: "maxStackCodecScore",' >> $file echo ' data: [' >> $file @ i = 0 @@ -296,10 +296,10 @@ end echo ' ]' >> $file echo ' },' >> $file -# maxDynamicRamCodecScore +# maxStackCodecScore -# maxDynamicRamEncScore +# maxStackEncScore echo ' {' >> $file echo ' lines: { show: true },' >> $file echo ' points: { show: true, fillColor: "#ffffff" },' >> $file @@ -310,7 +310,7 @@ echo ' hoverable: true,' >> $file echo ' clickable: true,' >> $file echo ' shadowSize: 0,' >> $file echo ' color: "#008000",' >> $file -echo ' id: "maxDynamicRamEncScore",' >> $file +echo ' id: "maxStackEncScore",' >> $file echo ' data: [' >> $file @ i = 0 @@ -336,9 +336,9 @@ end echo ' ]' >> $file echo ' },' >> $file -# maxDynamicRamEncScore +# maxStackEncScore -# maxDynamicRamDecScore +# maxStackDecScore echo ' {' >> $file echo ' lines: { show: true },' >> $file echo ' points: { show: true, fillColor: "#ffffff" },' >> $file @@ -349,7 +349,7 @@ echo ' hoverable: true,' >> $file echo ' clickable: true,' >> $file echo ' shadowSize: 0,' >> $file echo ' color: "#00FF00",' >> $file -echo ' id: "maxDynamicRamDecScore",' >> $file +echo ' id: "maxStackDecScore",' >> $file echo ' data: [' >> $file @ i = 0 @@ -375,9 +375,9 @@ end echo ' ]' >> $file echo ' },' >> $file -# maxDynamicRamDecScore +# maxStackDecScore -# maxStaticRamCodecScore +# maxHeapCodecScore echo ' {' >> $file echo ' lines: { show: true },' >> $file echo ' points: { show: true, fillColor: "#ffffff" },' >> $file @@ -388,7 +388,7 @@ echo ' hoverable: true,' >> $file echo ' clickable: true,' >> $file echo ' shadowSize: 0,' >> $file echo ' color: "#800080",' >> $file -echo ' id: "maxStaticRamCodecScore",' >> $file +echo ' id: "maxHeapCodecScore",' >> $file echo ' data: [' >> $file @ i = 0 @@ -414,9 +414,9 @@ end echo ' ]' >> $file echo ' },' >> $file -# maxStaticRamCodecScore +# maxHeapCodecScore -# maxStaticRamEncScore +# maxHeapEncScore echo ' {' >> $file echo ' lines: { show: true },' >> $file echo ' points: { show: true, fillColor: "#ffffff" },' >> $file @@ -427,7 +427,7 @@ echo ' hoverable: true,' >> $file echo ' clickable: true,' >> $file echo ' shadowSize: 0,' >> $file echo ' color: "#0000FF",' >> $file -echo ' id: "maxStaticRamEncScore",' >> $file +echo ' id: "maxHeapEncScore",' >> $file echo ' data: [' >> $file @ i = 0 @@ -453,9 +453,9 @@ end echo ' ]' >> $file echo ' },' >> $file -# maxStaticRamEncScore +# maxHeapEncScore -# maxStaticRamDecScore +# maxHeapDecScore echo ' {' >> $file echo ' lines: { show: true },' >> $file echo ' points: { show: true, fillColor: "#ffffff" },' >> $file @@ -466,7 +466,7 @@ echo ' hoverable: true,' >> $file echo ' clickable: true,' >> $file echo ' shadowSize: 0,' >> $file echo ' color: "#0080C0",' >> $file -echo ' id: "maxStaticRamDecScore",' >> $file +echo ' id: "maxHeapDecScore",' >> $file echo ' data: [' >> $file @ i = 0 @@ -492,7 +492,7 @@ end echo ' ]' >> $file echo ' }' >> $file -# maxStaticRamDecScore +# maxHeapDecScore echo ' ]' >> $file # end displays diff --git a/ci/complexity_measurements/genWebpageData_Rom.csh b/ci/complexity_measurements/genWebpageData_Rom.csh index d2ef2daf15..801dfda724 100755 --- a/ci/complexity_measurements/genWebpageData_Rom.csh +++ b/ci/complexity_measurements/genWebpageData_Rom.csh @@ -1,6 +1,6 @@ #!/bin/tcsh -# (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +# (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, # Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., # Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, # Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -31,61 +31,100 @@ set maxValues = 40 if (${#argv} != 3) then - echo usage: $0 \ \ \ \ + echo usage: $0 \ \ \ exit endif -set srcFile1 = $1 - +set srcFile = $1 set file_final = $2 set file = ${file_final}_new_$$ set graphName = $3 set tmpBase = `basename $0` -set tmpFile1 = /tmp/${tmpBase}1_$$ -set tmpFile2 = /tmp/${tmpBase}2_$$ -rm -f ${tmpFile1} ${tmpFile2} -cat ${srcFile1} | tail -n ${maxValues} > ${tmpFile1} -set nLines1 = `cat ${tmpFile1} | wc -l` -set maxNumWordsLine1 = 5 -set maxNumWordsLine2 = 5 +set tmpFile = /tmp/${tmpBase}_$$ +rm -f ${tmpFile} +cat ${srcFile} | tail -n ${maxValues} > ${tmpFile} +set nLines = `cat ${tmpFile} | wc -l` +set maxNumWordsLine = 21 rm -f $file touch $file echo "var $graphName = {" >> $file echo ' rom_worstcase: {' >> $file -echo ' description: "Worst Case ROM",' >> $file +echo ' description: "ROM",' >> $file echo ' direction: -1,' >> $file echo ' runs: [' >> $file - @ i = 0 -foreach line ( "`cat ${tmpFile1}`" ) +foreach line ( "`cat ${tmpFile}`" ) @ i++ set separator = "," - if ( $i == $nLines1 ) then + if ( $i == $nLines ) then set separator = "" endif set tmp = ( $line ) set numWords = `echo $tmp | wc -w` - if ( $numWords < $maxNumWordsLine1 ) then + if ( $numWords < $maxNumWordsLine ) then continue endif + + # 1 revision, + # 2 shortDate, + # 3 fullDate, + + # 4 max_total_encdec[1], + + # 5 max_prom_enc[0], + # 6 max_prom_enc[1], + # 7 max_prom_dec[0], + # 8 max_prom_dec[1], + # 9 max_prom_com[0], + # 10 max_prom_com[1], + # 11 max_prom_rend[0], + # 12 max_prom_rend[1], + + # 13 max_trom_enc[0], + # 14 max_trom_enc[1], + # 15 max_trom_dec[0], + # 16 max_trom_dec[1], + # 17 max_trom_com[0], + # 18 max_trom_com[1], + # 19 max_trom_rend[0], + # 20 max_trom_rend[1], + + # 21 newsletterFilenameLast, + + set revision = $tmp[1] set shortDate = `echo $tmp[2] | sed -e "s/_/\ /g"` set fullDate = `echo $tmp[3] | sed -e "s/_/\ /g"` - set logFileFlc = $tmp[5] + set PromEnc = $tmp[5] + set PromDec = $tmp[7] + set PromCom = $tmp[9] + set PromRend = $tmp[11] + set TromEnc = $tmp[13] + set TromDec = $tmp[15] + set TromCom = $tmp[17] + set TromRend = $tmp[19] + set logFile = $tmp[21] echo ' {' >> $file echo ' fullDate: "'${fullDate}'",' >> $file echo ' shortDate: "'${shortDate}'",' >> $file echo ' revision: "'${revision}'",' >> $file - echo ' logFileFlc: "'${logFileFlc}'",' >> $file -# echo ' logFileBasop: "'${logFileBasop[$i]}'"' >> $file + echo ' PromEnc: "'${PromEnc}'",' >> $file + echo ' PromDec: "'${PromDec}'",' >> $file + echo ' PromCom: "'${PromCom}'",' >> $file + echo ' PromRend: "'${PromRend}'",' >> $file + echo ' TromEnc: "'${TromEnc}'",' >> $file + echo ' TromDec: "'${TromDec}'",' >> $file + echo ' TromCom: "'${TromCom}'",' >> $file + echo ' TromRend: "'${TromRend}'",' >> $file + echo ' logFile: "'${logFile}'"' >> $file echo ' }'${separator} >> $file end @@ -94,7 +133,7 @@ echo ' ],' >> $file # begin displays echo ' displays: [' >> $file -# requirement ROM +# requirement ROM echo ' {' >> $file echo ' lines: { show: false },' >> $file echo ' points: { show: false, fillColor: "#ffffff" },' >> $file @@ -109,16 +148,16 @@ echo ' id: "requirementRom",' >> $file echo ' data: [' >> $file @ i = 0 -foreach line ( "`cat ${tmpFile1}`" ) +foreach line ( "`cat ${tmpFile}`" ) set separator = "," - if ( $i == $nLines1 - 1 ) then + if ( $i == $nLines - 1 ) then set separator = "" endif set tmp = ( $line ) set numWords = `echo $tmp | wc -w` - if ( $numWords < $maxNumWordsLine1 ) then + if ( $numWords < $maxNumWordsLine ) then continue endif @@ -134,7 +173,7 @@ echo ' ]' >> $file echo ' },' >> $file # requirement ROM -# maxTablesizeCodecScore FLC +# TotalRomCodecScore echo ' {' >> $file echo ' lines: { show: true },' >> $file echo ' points: { show: true, fillColor: "#ffffff" },' >> $file @@ -144,21 +183,21 @@ echo ' markingsLineWidth: .75,' >> $file echo ' hoverable: true,' >> $file echo ' clickable: true,' >> $file echo ' shadowSize: 0,' >> $file -echo ' color: "#FF8000",' >> $file -echo ' id: "maxRomFlc",' >> $file +echo ' color: "#FF0000",' >> $file +echo ' id: "TotalRomCodecScore",' >> $file echo ' data: [' >> $file @ i = 0 -foreach line ( "`cat ${tmpFile1}`" ) +foreach line ( "`cat ${tmpFile}`" ) set separator = "," - if ( $i == $nLines1 - 1 ) then + if ( $i == $nLines - 1 ) then set separator = "" endif set tmp = ( $line ) set numWords = `echo $tmp | wc -w` - if ( $numWords < $maxNumWordsLine1 ) then + if ( $numWords < $maxNumWordsLine ) then continue endif @@ -169,9 +208,323 @@ foreach line ( "`cat ${tmpFile1}`" ) end +echo ' ]' >> $file +echo ' },' >> $file +# TotalRomCodecScore + +# maxPROMEncScore +echo ' {' >> $file +echo ' lines: { show: true },' >> $file +echo ' points: { show: true, fillColor: "#ffffff" },' >> $file +echo ' borderWidth: 1.5,' >> $file +echo ' borderColor: "#BEBEBE",' >> $file +echo ' markingsLineWidth: .75,' >> $file +echo ' hoverable: true,' >> $file +echo ' clickable: true,' >> $file +echo ' shadowSize: 0,' >> $file +echo ' color: "#FF8000",' >> $file +echo ' id: "maxPROMEncScore",' >> $file +echo ' data: [' >> $file + +@ i = 0 +foreach line ( "`cat ${tmpFile}`" ) + set separator = "," + if ( $i == $nLines - 1 ) then + set separator = "" + endif + + set tmp = ( $line ) + + set numWords = `echo $tmp | wc -w` + if ( $numWords < $maxNumWordsLine ) then + continue + endif + + set score = $tmp[6] + + echo ' ['"${i}, ${score}"']'${separator} >> $file + @ i++ + +end + +echo ' ]' >> $file +echo ' },' >> $file +# maxPROMEncScore + +# maxPROMDecScore +echo ' {' >> $file +echo ' lines: { show: true },' >> $file +echo ' points: { show: true, fillColor: "#ffffff" },' >> $file +echo ' borderWidth: 1.5,' >> $file +echo ' borderColor: "#BEBEBE",' >> $file +echo ' markingsLineWidth: .75,' >> $file +echo ' hoverable: true,' >> $file +echo ' clickable: true,' >> $file +echo ' shadowSize: 0,' >> $file +echo ' color: "#FFFF00",' >> $file +echo ' id: "maxPROMDecScore",' >> $file +echo ' data: [' >> $file + +@ i = 0 +foreach line ( "`cat ${tmpFile}`" ) + set separator = "," + if ( $i == $nLines - 1 ) then + set separator = "" + endif + + set tmp = ( $line ) + + set numWords = `echo $tmp | wc -w` + if ( $numWords < $maxNumWordsLine ) then + continue + endif + + set score = $tmp[8] + + echo ' ['"${i}, ${score}"']'${separator} >> $file + @ i++ + +end + +echo ' ]' >> $file +echo ' },' >> $file +# maxPROMEncScore + +# maxPROMComScore +echo ' {' >> $file +echo ' lines: { show: true },' >> $file +echo ' points: { show: true, fillColor: "#ffffff" },' >> $file +echo ' borderWidth: 1.5,' >> $file +echo ' borderColor: "#BEBEBE",' >> $file +echo ' markingsLineWidth: .75,' >> $file +echo ' hoverable: true,' >> $file +echo ' clickable: true,' >> $file +echo ' shadowSize: 0,' >> $file +echo ' color: "#800080",' >> $file +echo ' id: "maxPROMComScore",' >> $file +echo ' data: [' >> $file + +@ i = 0 +foreach line ( "`cat ${tmpFile}`" ) + set separator = "," + if ( $i == $nLines - 1 ) then + set separator = "" + endif + + set tmp = ( $line ) + + set numWords = `echo $tmp | wc -w` + if ( $numWords < $maxNumWordsLine ) then + continue + endif + + set score = $tmp[10] + + echo ' ['"${i}, ${score}"']'${separator} >> $file + @ i++ + +end + +echo ' ]' >> $file +echo ' },' >> $file +# maxPROMComScore + + +# maxPROMRendScore +echo ' {' >> $file +echo ' lines: { show: true },' >> $file +echo ' points: { show: true, fillColor: "#ffffff" },' >> $file +echo ' borderWidth: 1.5,' >> $file +echo ' borderColor: "#BEBEBE",' >> $file +echo ' markingsLineWidth: .75,' >> $file +echo ' hoverable: true,' >> $file +echo ' clickable: true,' >> $file +echo ' shadowSize: 0,' >> $file +echo ' color: "#0000FF",' >> $file +echo ' id: "maxPROMRendScore",' >> $file +echo ' data: [' >> $file + +@ i = 0 +foreach line ( "`cat ${tmpFile}`" ) + set separator = "," + if ( $i == $nLines - 1 ) then + set separator = "" + endif + + set tmp = ( $line ) + + set numWords = `echo $tmp | wc -w` + if ( $numWords < $maxNumWordsLine ) then + continue + endif + + set score = $tmp[12] + + echo ' ['"${i}, ${score}"']'${separator} >> $file + @ i++ + +end + +echo ' ]' >> $file +echo ' },' >> $file +# maxPROMRendScore + +# maxTROMEncScore +echo ' {' >> $file +echo ' lines: { show: true },' >> $file +echo ' points: { show: true, fillColor: "#ffffff" },' >> $file +echo ' borderWidth: 1.5,' >> $file +echo ' borderColor: "#BEBEBE",' >> $file +echo ' markingsLineWidth: .75,' >> $file +echo ' hoverable: true,' >> $file +echo ' clickable: true,' >> $file +echo ' shadowSize: 0,' >> $file +echo ' color: "#0080C0",' >> $file +echo ' id: "maxTROMEncScore",' >> $file +echo ' data: [' >> $file + +@ i = 0 +foreach line ( "`cat ${tmpFile}`" ) + set separator = "," + if ( $i == $nLines - 1 ) then + set separator = "" + endif + + set tmp = ( $line ) + + set numWords = `echo $tmp | wc -w` + if ( $numWords < $maxNumWordsLine ) then + continue + endif + + set score = $tmp[14] + + echo ' ['"${i}, ${score}"']'${separator} >> $file + @ i++ + +end + +echo ' ]' >> $file +echo ' },' >> $file +# maxTROMEncScore + +# maxTROMDecScore +echo ' {' >> $file +echo ' lines: { show: true },' >> $file +echo ' points: { show: true, fillColor: "#ffffff" },' >> $file +echo ' borderWidth: 1.5,' >> $file +echo ' borderColor: "#BEBEBE",' >> $file +echo ' markingsLineWidth: .75,' >> $file +echo ' hoverable: true,' >> $file +echo ' clickable: true,' >> $file +echo ' shadowSize: 0,' >> $file +echo ' color: "#004000",' >> $file +echo ' id: "maxTROMDecScore",' >> $file +echo ' data: [' >> $file + +@ i = 0 +foreach line ( "`cat ${tmpFile}`" ) + set separator = "," + if ( $i == $nLines - 1 ) then + set separator = "" + endif + + set tmp = ( $line ) + + set numWords = `echo $tmp | wc -w` + if ( $numWords < $maxNumWordsLine ) then + continue + endif + + set score = $tmp[16] + + echo ' ['"${i}, ${score}"']'${separator} >> $file + @ i++ + +end + +echo ' ]' >> $file +echo ' },' >> $file +# maxTROMDecScore + +# maxTROMComScore +echo ' {' >> $file +echo ' lines: { show: true },' >> $file +echo ' points: { show: true, fillColor: "#ffffff" },' >> $file +echo ' borderWidth: 1.5,' >> $file +echo ' borderColor: "#BEBEBE",' >> $file +echo ' markingsLineWidth: .75,' >> $file +echo ' hoverable: true,' >> $file +echo ' clickable: true,' >> $file +echo ' shadowSize: 0,' >> $file +echo ' color: "#008000",' >> $file +echo ' id: "maxTROMComScore",' >> $file +echo ' data: [' >> $file + +@ i = 0 +foreach line ( "`cat ${tmpFile}`" ) + set separator = "," + if ( $i == $nLines - 1 ) then + set separator = "" + endif + + set tmp = ( $line ) + + set numWords = `echo $tmp | wc -w` + if ( $numWords < $maxNumWordsLine ) then + continue + endif + + set score = $tmp[18] + + echo ' ['"${i}, ${score}"']'${separator} >> $file + @ i++ + +end + +echo ' ]' >> $file +echo ' },' >> $file +# maxTROMComScore + +# maxTROMRendScore +echo ' {' >> $file +echo ' lines: { show: true },' >> $file +echo ' points: { show: true, fillColor: "#ffffff" },' >> $file +echo ' borderWidth: 1.5,' >> $file +echo ' borderColor: "#BEBEBE",' >> $file +echo ' markingsLineWidth: .75,' >> $file +echo ' hoverable: true,' >> $file +echo ' clickable: true,' >> $file +echo ' shadowSize: 0,' >> $file +echo ' color: "#00FF00",' >> $file +echo ' id: "maxTROMRendScore",' >> $file +echo ' data: [' >> $file + +@ i = 0 +foreach line ( "`cat ${tmpFile}`" ) + set separator = "," + if ( $i == $nLines - 1 ) then + set separator = "" + endif + + set tmp = ( $line ) + + set numWords = `echo $tmp | wc -w` + if ( $numWords < $maxNumWordsLine ) then + continue + endif + + set score = $tmp[20] + + echo ' ['"${i}, ${score}"']'${separator} >> $file + @ i++ + +end + echo ' ]' >> $file echo ' }' >> $file -# maxTablesizeCodecScore FLC +# maxTROMRendScore + echo ' ]' >> $file # end displays @@ -179,4 +532,4 @@ echo ' }' >> $file echo '};' >> $file mv -f $file $file_final -rm -f $tmpFile1 +rm -f $tmpFile diff --git a/ci/complexity_measurements/genWebpageData_WMOPS.csh b/ci/complexity_measurements/genWebpageData_WMOPS.csh index c030f4afac..4993ae81f2 100755 --- a/ci/complexity_measurements/genWebpageData_WMOPS.csh +++ b/ci/complexity_measurements/genWebpageData_WMOPS.csh @@ -1,6 +1,6 @@ #!/bin/tcsh -# (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +# (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, # Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., # Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, # Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/ci/complexity_measurements/genWebpageData_WmopPerOperatingpoint.csh b/ci/complexity_measurements/genWebpageData_WmopPerOperatingpoint.csh index cac8183bda..3d9d9d448c 100755 --- a/ci/complexity_measurements/genWebpageData_WmopPerOperatingpoint.csh +++ b/ci/complexity_measurements/genWebpageData_WmopPerOperatingpoint.csh @@ -1,6 +1,6 @@ #!/bin/tcsh -# (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +# (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, # Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., # Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, # Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/ci/complexity_measurements/getWmops.sh b/ci/complexity_measurements/getWmops.sh index b14933c91e..baec52ab6f 100755 --- a/ci/complexity_measurements/getWmops.sh +++ b/ci/complexity_measurements/getWmops.sh @@ -1,6 +1,6 @@ #! /bin/bash -# (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +# (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, # Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., # Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, # Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ output_format=$2 date=`date +%Y%m%d` # used for log-file file ending shortDate=`date "+%b %d" | sed -e "s/\ /_/g"` # stored in the log-file fullDate=`date "+%c" | sed -e "s/\ /_/g"` # stored in the log-file - + commit_sha=`git rev-parse --short HEAD` destDir="." @@ -56,37 +56,31 @@ wmopsFilenameFlc=${destDir}/wmops/logs/${wmopsFilenameFlcLast} # instrument and build ./scripts/IvasBuildAndRunChecks.py -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc} -C $ivas_format -f ${ep} --oc $output_format -# now get the info on worst case operating point: WMOPS number, enc-operating mode, dec-operating mode +# get the info on worst-case operating point: WMOPS number, enc-operating mode, dec-operating mode ### WMOPS ${scriptDir}/parseNewsletterWmops.py ${wmopsFilenameFlc}_WMOPS.csv ${wmopsFilenameFlcLast}_WMOPS.csv ${commit_sha} ${shortDate} ${fullDate} >> ${destDir}/wmops/log_wmops_all.txt # now update the webpage -tcsh ${scriptDir}/genWebpageData_WMOPS.csh ${destDir}/wmops/log_wmops_all.txt ${destDir}/wmops/graphs_wmops_flc.js Graphs_WMOPS +tcsh ${scriptDir}/genWebpageData_WMOPS.csh ${destDir}/wmops/log_wmops_all.txt ${destDir}/wmops/graphs_wmops_flc.js Graphs_WMOPS # per mode graph -tcsh ${scriptDir}/genWebpageData_WmopPerOperatingpoint.csh ${wmopsFilenameFlc}_WMOPS.csv ${destDir}/wmops/graphs_wmops_flc_perOP.js Graphs_WMOPS_perOP +tcsh ${scriptDir}/genWebpageData_WmopPerOperatingpoint.csh ${wmopsFilenameFlc}_WMOPS.csv ${destDir}/wmops/graphs_wmops_flc_perOP.js Graphs_WMOPS_perOP + # get memory info for webpage ### RAM -${scriptDir}/mergeNewsletterRam.py ${wmopsFilenameFlc}_SRAM.csv ${wmopsFilenameFlc}_DRAM.csv > ${wmopsFilenameFlc}_RAM.csv -${scriptDir}/parseNewsletterRam.py ${wmopsFilenameFlc}_SRAM.csv ${wmopsFilenameFlc}_DRAM.csv ${wmopsFilenameFlcLast}_RAM.csv ${commit_sha} ${shortDate} ${fullDate} >> ${destDir}/wmops/log_ram_all.txt +${scriptDir}/mergeNewsletterRam.py ${wmopsFilenameFlc}_HEAP.csv ${wmopsFilenameFlc}_STACK.csv > ${wmopsFilenameFlc}_RAM.csv +${scriptDir}/parseNewsletterRam.py ${wmopsFilenameFlc}_HEAP.csv ${wmopsFilenameFlc}_STACK.csv ${wmopsFilenameFlcLast}_RAM.csv ${commit_sha} ${shortDate} ${fullDate} >> ${destDir}/wmops/log_ram_all.txt # generate java script from database tcsh ${scriptDir}/genWebpageData_Ram.csh ${destDir}/wmops/log_ram_all.txt ${destDir}/wmops/graphs_ram_flc.js Graphs_RAM ### ROM -${scriptDir}/parseNewsletterRom.py ${wmopsFilenameFlc}_TABLES.csv ${wmopsFilenameFlcLast}_TABLES.csv ${commit_sha} ${shortDate} ${fullDate} >> ${destDir}/wmops/log_rom_all.txt + +${scriptDir}/mergeNewsletterRom.py ${wmopsFilenameFlc}_PROM.csv ${wmopsFilenameFlc}_TROM.csv > ${wmopsFilenameFlc}_ROM.csv +${scriptDir}/parseNewsletterRom.py ${wmopsFilenameFlc}_PROM.csv ${wmopsFilenameFlc}_TROM.csv ${wmopsFilenameFlcLast}_ROM.csv ${commit_sha} ${shortDate} ${fullDate} >> ${destDir}/wmops/log_rom_all.txt # generate java script from database tcsh ${scriptDir}/genWebpageData_Rom.csh ${destDir}/wmops/log_rom_all.txt ${destDir}/wmops/graphs_rom_flc.js Graphs_ROM -# now go on with BASOP -promFilenameBasopLast="null" -promScoreBasop=0 - -### PROM -${scriptDir}/parseNewsletterProm.py ${wmopsFilenameFlc}_PROM.csv ${wmopsFilenameFlcLast}_PROM.csv ${commit_sha} ${shortDate} ${fullDate} ${promScoreBasop} ${promFilenameBasopLast} >> ${destDir}/wmops/log_prom_all.txt - -# generate java script from database -tcsh ${scriptDir}/genWebpageData_Prom.csh ${destDir}/wmops/log_prom_all.txt ${destDir}/wmops/graphs_prom_flc.js Graphs_PROM diff --git a/ci/complexity_measurements/index_complexity.html b/ci/complexity_measurements/index_complexity.html index a131f56662..de3d0975fc 100755 --- a/ci/complexity_measurements/index_complexity.html +++ b/ci/complexity_measurements/index_complexity.html @@ -1,7 +1,7 @@ - @@ -103,30 +102,6 @@ - - - -
  • PROM - - ●●● - - - -
    • - - -
  • FAQ
    • @@ -226,25 +201,25 @@
    • Max. total RAM Codec: - Dynamic + Static RAM, 32 bit words, Encoder + Decoder
      • -
    • Max. total RAM - Encoder: Dynamic + Static RAM, 32 bit words, Encoder only
      • -
    • Max. total RAM - Decoder: Dynamic + Static RAM, 32 bit words, Decoder only
      • + 32 bit words, Encoder + Decoder +
    • Max. total RAM Encoder: + 32 bit words, Encoder only
      • +
    • Max. total RAM Decoder: + 32 bit words, Decoder only
      • -
    • Max. static RAM Codec: - Static RAM, 32 bit words, Encoder + Decoder
      • -
    • Max. static RAM - Encoder: Static RAM, 32 bit words,, Encoder only
      • -
    • Max. static RAM - Decoder: Static RAM, 32 bit words, Decoder only
      • +
    • Max. HEAP Codec: + 32 bit words, Encoder + Decoder
      • +
    • Max. HEAP Encoder + 32 bit words, Encoder only
      • +
    • Max. HEAP Decoder + 32 bit words, Decoder only
      • -
    • Max. dynamic RAM - Codec: Dynamic RAM, 32 bit words, Encoder + Decoder
      • -
    • Max. dynamic RAM - Encoder: Dynamic RAM, 32 bit words, Encoder only
      • -
    • Max. dynamic RAM - Decoder: Dynamic RAM, 32 bit words, Decoder only
      • +
    • Max. STACK Codec: + 32 bit words, max(Encoder, Decoder)
      • +
    • Max. STACK Encoder: + 32 bit words, Encoder only
      • +
    • Max. STACK Decoder: + 32 bit words, Decoder only
    @@ -284,8 +259,17 @@
      -
    • Measured ROM table size, 32 - bit words (Float)
      • +
    • Max. total ROM Codec: Encoder + Decoder
      • + +
    • Max. max PROM Encoder Library: lib_enc only
      • +
    • Max. max PROM Decoder Library: lib_dec only
      • +
    • Max. max PROM Common Library: lib_com only/li> +
    • Max. max PROM Ext Renderer Library: lib_ren only
      • + +
    • Max. Table ROM Encoder Library: lib_enc only
      • +
    • Max. Table ROM Decoder Library: lib_dec only
      • +
    • Max. Table ROM Common Library: lib_com only
      • +
    • Max. Table ROM Ext Renderer Library: lib_rend only
    @@ -308,22 +292,6 @@
    --> -

    IVAS FORMAT - Worst Case PROM Demand

    - -
    -
    -
    - -
    -
      -
    • Measured PROM (Float, - trunk)
      • - -
    -
    - -
    -

    FAQ

    Q:
    What is the meaning of these funny symbols in the navigation box, in the left upper corner of this page?
    @@ -821,25 +789,25 @@ function RAM() { if( item.series.id == "maxTotalRamDecScore" ){ text += "Max. total RAM dec: " + graph.runs[x].maxTotalRamDec + "
    "; } - if( item.series.id == "maxDynamicRamCodecScore" ){ - text += "Max. dynamic RAM enc: " + graph.runs[x].maxDynamicRamEnc + "
    "; - text += "Max. dynamic RAM dec: " + graph.runs[x].maxDynamicRamDec + "
    "; + if( item.series.id == "maxStackCodecScore" ){ + text += "Max. Stack enc: " + graph.runs[x].maxStackEnc + "
    "; + text += "Max. Stack dec: " + graph.runs[x].maxStackDec + "
    "; } - if( item.series.id == "maxDynamicRamEncScore" ){ - text += "Max. dynamic RAM enc: " + graph.runs[x].maxDynamicRamEnc + "
    "; + if( item.series.id == "maxStackEncScore" ){ + text += "Max. Stack enc: " + graph.runs[x].maxStackEnc + "
    "; } - if( item.series.id == "maxDynamicRamDecScore" ){ - text += "Max. dynamic RAM dec: " + graph.runs[x].maxDynamicRamDec + "
    "; + if( item.series.id == "maxStackDecScore" ){ + text += "Max. Stack dec: " + graph.runs[x].maxStackDec + "
    "; } - if( item.series.id == "maxStaticRamCodecScore" ){ - text += "Max. static RAM enc: " + graph.runs[x].maxStaticRamEnc + "
    "; - text += "Max. static RAM dec: " + graph.runs[x].maxStaticRamDec + "
    "; + if( item.series.id == "maxHeapCodecScore" ){ + text += "Max. Heap enc: " + graph.runs[x].maxHeapEnc + "
    "; + text += "Max. Heap dec: " + graph.runs[x].maxHeapDec + "
    "; } - if( item.series.id == "maxStaticRamEncScore" ){ - text += "Max. static RAM enc: " + graph.runs[x].maxStaticRamEnc + "
    "; + if( item.series.id == "maxHeapEncScore" ){ + text += "Max. Heap enc: " + graph.runs[x].maxHeapEnc + "
    "; } - if( item.series.id == "maxStaticRamDecScore" ){ - text += "Max. static RAM dec: " + graph.runs[x].maxStaticRamDec + "
    "; + if( item.series.id == "maxHeapDecScore" ){ + text += "Max. Heap dec: " + graph.runs[x].maxHeapDec + "
    "; } text += "
    " @@ -941,7 +909,8 @@ function ROM() { previousPoint = item.datapoint; $("#tooltip").remove(); - if(item.series.id != "requirementRom"){ + if(item.series.id != "requirementRom") + { var x = item.datapoint[0]; var y = item.datapoint[1]; var text = 'Score: ' + y; @@ -971,13 +940,49 @@ function ROM() { } } +/* + if( item.series.id == "TotalRomCodecScore" ){ + text += "Worst case enc: " + graph.runs[x].TotalRomEnc + "
    "; + text += "Worst case dec: " + graph.runs[x].TotalRomDec + "
    "; + } + if( item.series.id == "TotalRomEncScore" ){ + text += "Worst case enc: " + graph.runs[x].TotalRomEnc + "
    "; + } + if( item.series.id == "TotalRomDecScore" ){ + text += "Worst case dec: " + graph.runs[x].TotalRomDec + "
    "; + } + if( item.series.id == "PROMCodecScore" ){ + text += "Worst case enc: " + graph.runs[x].PromEnc + "
    "; + text += "Worst case dec: " + graph.runs[x].PromDec + "
    "; + } + if( item.series.id == "PROMEncScore" ){ + text += "Worst case enc: " + graph.runs[x].PromEnc + "
    "; + } + if( item.series.id == "PROMDecScore" ){ + text += "Worst case dec: " + graph.runs[x].PromDec + "
    "; + } + if( item.series.id == "TROMCodecScore" ){ + text += "Worst case enc: " + graph.runs[x].TromEnc + "
    "; + text += "Worst case dec: " + graph.runs[x].TromDec + "
    "; + } + if( item.series.id == "TROMEncScore" ){ + text += "Worst case enc: " + graph.runs[x].TromEnc + "
    "; + } + if( item.series.id == "TROMDecScore" ){ + text += "Worst case dec: " + graph.runs[x].TromDec + "
    "; + } +*/ + text += "
    " text += "Revision: " + graph.runs[x].revision + "
    "; text += "Date: " + graph.runs[x].fullDate + "

    "; + text += "Logfile
    "; + /* if( item.series.id == "maxRomFlc" ){ text += "Logfile
    "; } + */ /* if( item.series.id == "maxRomBasop" ){ @@ -1056,182 +1061,11 @@ function ROM() { */ } - - -function PROM() { - - var previousPoint = null; - - function drawGraph(elt, graph, max_val) { - var options = { - yaxis: { - min: 0, - max: max_val, - tickFormatter: function (v, axis) { - if (graph.direction == -1) - return v + " Ops"; - return v; - }, - invert: graph.direction == 1 - }, - xaxis: { - tickFormatter: function (v, axis) { - v = Math.round(v); - if (!(v in graph.runs)) - return ''; - return graph.runs[v].shortDate; - } - }, - legend: { show: false }, - grid: { - hoverable: true, - clickable: true - } - }; - - $.plot(elt, graph.displays, options); - - elt.bind("plothover", function (event, pos, item) { - if (!item) { - // only remove if not in tooltip anymore - if ($('#tooltip:hover').length == 0) { - $("#tooltip").remove(); - } - previousPoint = null; - return; - } - - if (previousPoint && - (previousPoint[0] == item.datapoint[0]) && - (previousPoint[1] == item.datapoint[1])) { - return; - } - - previousPoint = item.datapoint; - $("#tooltip").remove(); - - if(item.series.id != "requirementProm"){ - var x = item.datapoint[0]; - var y = item.datapoint[1]; - var text = 'Score: ' + y; - - if (graph.direction == -1) - text += " Ops"; - text += "
    "; - - if (x > 0) { - var thisValue = parseFloat(y); - var prevValue = parseFloat(item.series.data[x - 1, x - 1][1]); - var diff = Math.round((thisValue - prevValue) * 100) / 100; - var pdiff = calcPercentDiff(thisValue, prevValue); - var better; - if ((pdiff < 0 && graph.direction == -1) || - (pdiff > 0 && graph.direction == 1)) { - better = "worse"; - } else { - better = "better"; - } - pdiff = Math.abs(pdiff); - if (diff === diff) { - text += String.fromCharCode(916) + ": " + diff; - if (graph.direction == -1) - text += " Ops"; - text += " (" + pdiff + "% " + better + ")
    "; - } - } - - text += "
    " - text += "Revision: " + graph.runs[x].revision + "
    "; - text += "Date: " + graph.runs[x].fullDate + "

    "; - - if( item.series.id == "promOpsFlc" ){ - text += "Logfile
    "; - } - - if( item.series.id == "promOpsBasop" ){ - text += "Logfile
    "; - } - if( item.series.id == "promOpsBasopFlc" ){ - text += "Logfile
    "; - } - - } else { - text = "PROM requirement: 54260 Ops"; - } - - showToolTip(item.pageX, item.pageY, text); - - }); - } - - $(document).ready(function () { - var max = get_max_y_val_for_plotting(Graphs_PROM.prom_worstcase.displays, 50000); - drawGraph($("#prom-graph"), Graphs_PROM.prom_worstcase, max); - }); - - - /* FLC */ - var testData = Graphs_PROM.prom_worstcase.displays[1]; - var refData = Graphs_PROM.prom_worstcase.displays[0]; - var nEntries = testData.data.length; - - if( testData.data[nEntries-1][1] > refData.data[nEntries-1][1] ) { - document.getElementById("prom_tl_l").style.color="#FF0000"; - } else if( testData.data[nEntries-1][1] > 0.97 * refData.data[nEntries-1][1] ) { - document.getElementById("prom_tl_c").style.color="#FFFF00"; - } else { - document.getElementById("prom_tl_r").style.color="#00FF00"; - } - - if(nEntries > 1) { - if( testData.data[nEntries-1][1] > 1.01 * testData.data[nEntries-2][1] ) { - document.getElementById("prom_trend").innerHTML="↑"; - document.getElementById("prom_trend").style.color="#FF0000"; - } else if( testData.data[nEntries-1][1] < 0.99 * testData.data[nEntries-2][1] ) { - document.getElementById("prom_trend").innerHTML="↓"; - document.getElementById("prom_trend").style.color="#00FF00"; - } else { - document.getElementById("prom_trend").innerHTML="→"; - document.getElementById("prom_trend").style.color="#FFFFFF"; - } - } - - - /* BASOP */ - var testData = Graphs_PROM.prom_worstcase.displays[2]; - var refData = Graphs_PROM.prom_worstcase.displays[0]; - var nEntries = testData.data.length; - - if( testData.data[nEntries-1][1] > refData.data[nEntries-1][1] ) { - document.getElementById("prom_basop_tl_l").style.color="#FF0000"; - } else if( testData.data[nEntries-1][1] > 0.97 * refData.data[nEntries-1][1] ) { - document.getElementById("prom_basop_tl_c").style.color="#FFFF00"; - } else { - document.getElementById("prom_basop_tl_r").style.color="#00FF00"; - } - - if(nEntries > 1) { - if( testData.data[nEntries-1][1] > 1.01 * testData.data[nEntries-2][1] ) { - document.getElementById("prom_basop_trend").innerHTML="↑"; - document.getElementById("prom_basop_trend").style.color="#FF0000"; - } else if( testData.data[nEntries-1][1] < 0.99 * testData.data[nEntries-2][1] ) { - document.getElementById("prom_basop_trend").innerHTML="↓"; - document.getElementById("prom_basop_trend").style.color="#00FF00"; - } else { - document.getElementById("prom_basop_trend").innerHTML="→"; - document.getElementById("prom_basop_trend").style.color="#FFFFFF"; - } - } - -} - - WMOPS(); WMOPS_perOP(); RAM(); ROM(); - PROM(); diff --git a/ci/complexity_measurements/mergeNewsletterRam.py b/ci/complexity_measurements/mergeNewsletterRam.py index c5e61a9854..e11a754d38 100755 --- a/ci/complexity_measurements/mergeNewsletterRam.py +++ b/ci/complexity_measurements/mergeNewsletterRam.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # coding: utf-8 -# (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +# (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, # Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., # Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, # Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,23 +39,23 @@ shortDate = "" fullDate = "" if __name__ == "__main__": - newsletterFilenameSram = sys.argv[1] - newsletterFilenameDram = sys.argv[2] + newsletterFilenameHEAP = sys.argv[1] + newsletterFilenameSTACK = sys.argv[2] ram_table = {} -with open(newsletterFilenameSram, "r") as csvfile: - SRAM = csv.reader(csvfile, delimiter=";") - for row in SRAM: +with open(newsletterFilenameHEAP, "r") as csvfile: + HEAP = csv.reader(csvfile, delimiter=";") + for row in HEAP: if row[0] == "conf": continue key = row[0] lst = row[1:] ram_table[key] = lst -with open(newsletterFilenameDram, "r") as csvfile: - DRAM = csv.reader(csvfile, delimiter=";") - for row in DRAM: +with open(newsletterFilenameSTACK, "r") as csvfile: + STACK = csv.reader(csvfile, delimiter=";") + for row in STACK: if row[0] == "conf": continue key = row[0] @@ -63,13 +63,13 @@ with open(newsletterFilenameDram, "r") as csvfile: ram_table[key] += lst # now we have the following format -# SRAM enc, SRAM dec, SRAM total, DRAM enc, DRAM dec, DRAM max(enc, dec) +# HEAP enc, HEAP dec, HEAP total, STACK enc, STACK dec, STACK max(enc, dec) -print("conf;sram enc;sram dec;sram total;dram enc;dram dec;dram max;total") +print("conf;HEAP enc;HEAP dec;HEAP total;STACK enc;STACK dec;STACK max;total") for key in ram_table: ram = ram_table[key] - total = int(ram[1]) + int(ram[2]) + int(ram[5]) + total = int(ram[0]) + int(ram[1]) + int(ram[5]) print( key, ";", diff --git a/ci/complexity_measurements/mergeNewsletterRom.py b/ci/complexity_measurements/mergeNewsletterRom.py new file mode 100755 index 0000000000..89efc4aeb2 --- /dev/null +++ b/ci/complexity_measurements/mergeNewsletterRom.py @@ -0,0 +1,98 @@ +#!/usr/bin/env python3 +# coding: utf-8 + +# (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +# Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., +# Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, +# Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other +# contributors to this repository. All Rights Reserved. + +# This software is protected by copyright law and by international treaties. +# The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, +# Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., +# Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, +# Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other +# contributors to this repository retain full ownership rights in their respective contributions in +# the software. This notice grants no license of any kind, including but not limited to patent +# license, nor is any license granted by implication, estoppel or otherwise. + +# Contributors are required to enter into the IVAS codec Public Collaboration agreement before making +# contributions. + +# This software is provided "AS IS", without any express or implied warranties. The software is in the +# development stage. It is intended exclusively for experts who have experience with such software and +# solely for the purpose of inspection. All implied warranties of non-infringement, merchantability +# and fitness for a particular purpose are hereby disclaimed and excluded. + +# Any dispute, controversy or claim arising under or in relation to providing this software shall be +# submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in +# accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and +# the United Nations Convention on Contracts on the International Sales of Goods. +import csv +import sys +import re + +newsletterFilename = "" +newsletterFilenameLast = "" +revision = "" +shortDate = "" +fullDate = "" + +if __name__ == "__main__": + newsletterFilenamePROM = sys.argv[1] + newsletterFilenameTROM = sys.argv[2] + +rom_table = {} + +with open(newsletterFilenamePROM, "r") as csvfile: + PROM = csv.reader(csvfile, delimiter=";") + for row in PROM: + if row[0] == "conf": + continue + key = row[0] + lst = row[1:] + rom_table[key] = lst + +with open(newsletterFilenameTROM, "r") as csvfile: + TROM = csv.reader(csvfile, delimiter=";") + for row in TROM: + if row[0] == "conf": + continue + key = row[0] + lst = row[1:] + rom_table[key] += lst + +# now we have the following format +# PROM enc, PROM dec, PROM com, PROM rend, PROM total, TROM enc, TROM dec, TROM com, TROM rend, TROM total + +print("conf;PROM enc;PROM dec;PROM com;PROM rend;PROM total;TROM enc;TROM dec;TROM com;TROM rend;TROM total;total") + +for key in rom_table: + rom = rom_table[key] + total = int(rom[4]) + int(rom[9]) + print( + key, + ";", + rom[0], + ";", + rom[1], + ";", + rom[2], + ";", + rom[3], + ";", + rom[4], + ";", + rom[5], + ";", + rom[6], + ";", + rom[7], + ";", + rom[8], + ";", + rom[9], + ";", + total, + sep="", + ) diff --git a/ci/complexity_measurements/parseNewsletterProm.py b/ci/complexity_measurements/parseNewsletterProm.py deleted file mode 100755 index 072cb03c21..0000000000 --- a/ci/complexity_measurements/parseNewsletterProm.py +++ /dev/null @@ -1,73 +0,0 @@ -#!/usr/bin/env python3 -# coding: utf-8 -""" - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository. All Rights Reserved. - - This software is protected by copyright law and by international treaties. - The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository retain full ownership rights in their respective contributions in - the software. This notice grants no license of any kind, including but not limited to patent - license, nor is any license granted by implication, estoppel or otherwise. - - Contributors are required to enter into the IVAS codec Public Collaboration agreement before making - contributions. - - This software is provided "AS IS", without any express or implied warranties. The software is in the - development stage. It is intended exclusively for experts who have experience with such software and - solely for the purpose of inspection. All implied warranties of non-infringement, merchantability - and fitness for a particular purpose are hereby disclaimed and excluded. - - Any dispute, controversy or claim arising under or in relation to providing this software shall be - submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in - accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and - the United Nations Convention on Contracts on the International Sales of Goods. -""" - -import csv -import sys -import re - -newsletterFilename = "" -newsletterFilenameLast = "" -revision = "" -shortDate = "" -fullDate = "" -maxPromOpsBasop = "" -logfileBasop = "" - -if __name__ == "__main__": - newsletterFilename = sys.argv[1] - newsletterFilenameLast = sys.argv[2] - revision = sys.argv[3] - shortDate = sys.argv[4] - fullDate = sys.argv[5] - maxPromOpsBasop = sys.argv[6] - logfileBasop = sys.argv[7] - -max_total = ["", 0] - -with open(newsletterFilename, "r") as csvfile: - prom = csv.reader(csvfile, delimiter=";") - for row in prom: - if row[0] == "conf": - continue - if int(row[4]) > max_total[1]: - max_total[0] = re.sub(" ", "_", row[0]) - max_total[1] = int(row[4]) - -print( - revision, - shortDate, - fullDate, - max_total[1], - newsletterFilenameLast, - maxPromOpsBasop, - logfileBasop, -) diff --git a/ci/complexity_measurements/parseNewsletterRam.py b/ci/complexity_measurements/parseNewsletterRam.py index b099fb450f..719d1581d8 100755 --- a/ci/complexity_measurements/parseNewsletterRam.py +++ b/ci/complexity_measurements/parseNewsletterRam.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # coding: utf-8 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,8 +41,8 @@ shortDate = "" fullDate = "" if __name__ == "__main__": - newsletterFilenameSram = sys.argv[1] - newsletterFilenameDram = sys.argv[2] + newsletterFilenameHEAP = sys.argv[1] + newsletterFilenameSTACK = sys.argv[2] newsletterFilenameLast = sys.argv[3] revision = sys.argv[4] shortDate = sys.argv[5] @@ -52,28 +52,28 @@ max_total_enc = ["", 0] max_total_dec = ["", 0] max_total_encdec = ["", 0] -max_dynamic_enc = ["", 0] -max_dynamic_dec = ["", 0] -max_dynamic_encdec = ["", 0] +max_stack_enc = ["", 0] +max_stack_dec = ["", 0] +max_stack_encdec = ["", 0] -max_static_enc = ["", 0] -max_static_dec = ["", 0] -max_static_encdec = ["", 0] +max_heap_enc = ["", 0] +max_heap_dec = ["", 0] +max_heap_encdec = ["", 0] ram_table = {} -with open(newsletterFilenameSram, "r") as csvfile: - SRAM = csv.reader(csvfile, delimiter=";") - for row in SRAM: +with open(newsletterFilenameHEAP, "r") as csvfile: + HEAP = csv.reader(csvfile, delimiter=";") + for row in HEAP: if row[0] == "conf": continue key = row[0] lst = row[1:] ram_table[key] = lst -with open(newsletterFilenameDram, "r") as csvfile: - DRAM = csv.reader(csvfile, delimiter=";") - for row in DRAM: +with open(newsletterFilenameSTACK, "r") as csvfile: + STACK = csv.reader(csvfile, delimiter=";") + for row in STACK: if row[0] == "conf": continue key = row[0] @@ -81,76 +81,82 @@ with open(newsletterFilenameDram, "r") as csvfile: ram_table[key] += lst # now we have the following format -# SRAM enc, SRAM dec, SRAM total, DRAM enc, DRAM dec, DRAM max(enc, dec) +# HEAP enc, HEAP dec, HEAP total, STACK enc, STACK dec, STACK max(enc, dec), total for key in ram_table: ram = ram_table[key] - static_enc = int(ram[0]) - static_dec = int(ram[1]) - static_encdec = static_enc + static_dec + heap_enc = int(ram[0]) + heap_dec = int(ram[1]) + heap_encdec = heap_enc + heap_dec - dynamic_enc = int(ram[3]) - dynamic_dec = int(ram[4]) - dynamic_encdec = int(ram[5]) + stack_enc = int(ram[3]) + stack_dec = int(ram[4]) + stack_encdec = int(ram[5]) - total_enc = static_enc + dynamic_enc - total_dec = static_dec + dynamic_dec - total_encdec = static_encdec + dynamic_encdec + total_enc = heap_enc + stack_enc + total_dec = heap_dec + stack_dec + total_encdec = heap_encdec + stack_encdec - if static_enc > max_static_enc[1]: - max_static_enc[0] = re.sub(" ", "_", key) - max_static_enc[1] = static_enc + if heap_enc > max_heap_enc[1]: + max_heap_enc[0] = re.sub(" ", "_", key) + max_heap_enc[1] = heap_enc - if static_dec > max_static_dec[1]: - max_static_dec[0] = re.sub(" ", "_", key) - max_static_dec[1] = static_dec + if heap_dec > max_heap_dec[1]: + max_heap_dec[0] = re.sub(" ", "_", key) + max_heap_dec[1] = heap_dec - if static_encdec > max_static_encdec[1]: - max_static_encdec[0] = re.sub(" ", "_", key) - max_static_encdec[1] = static_encdec + if heap_encdec > max_heap_encdec[1]: + max_heap_encdec[0] = re.sub(" ", "_", key) + max_heap_encdec[1] = heap_encdec - if dynamic_enc > max_dynamic_enc[1]: - max_dynamic_enc[0] = re.sub(" ", "_", key) - max_dynamic_enc[1] = dynamic_enc + if stack_enc > max_stack_enc[1]: + max_stack_enc[0] = re.sub(" ", "_", key) + max_stack_enc[1] = stack_enc - if dynamic_dec > max_dynamic_dec[1]: - max_dynamic_dec[0] = re.sub(" ", "_", key) - max_dynamic_dec[1] = dynamic_dec + if stack_dec > max_stack_dec[1]: + max_stack_dec[0] = re.sub(" ", "_", key) + max_stack_dec[1] = stack_dec - if dynamic_encdec > max_dynamic_encdec[1]: - max_dynamic_encdec[0] = re.sub(" ", "_", key) - max_dynamic_encdec[1] = dynamic_encdec + if stack_encdec > max_stack_encdec[1]: + max_stack_encdec[0] = re.sub(" ", "_", key) + max_stack_encdec[1] = stack_encdec if total_enc > max_total_enc[1]: max_total_enc[0] = re.sub(" ", "_", key) max_total_enc[1] = total_enc - if total_dec > max_static_dec[1]: + if total_dec > max_total_dec[1]: max_total_dec[0] = re.sub(" ", "_", key) max_total_dec[1] = total_dec - if total_encdec > max_static_encdec[1]: + if total_encdec > max_total_encdec[1]: max_total_encdec[0] = re.sub(" ", "_", key) max_total_encdec[1] = total_encdec + print( - revision, - shortDate, - fullDate, - max_total_encdec[1], - max_total_enc[0], - max_total_enc[1], - max_total_dec[0], - max_total_dec[1], - max_dynamic_encdec[1], - max_dynamic_encdec[0], - max_dynamic_enc[1], - max_dynamic_dec[0], - max_dynamic_dec[1], - max_static_enc[1] + max_static_dec[1], - max_static_enc[0], - max_static_enc[1], - max_static_dec[0], - max_static_dec[1], - newsletterFilenameLast, + revision, # string revision $tmp[1] + shortDate, # string shortDate $tmp[2] + fullDate, # string fullDate $tmp[3] + + max_total_encdec[1], # value maxTotalRamCodecScore $tmp[4] + + max_total_enc[0], # string maxTotalRamEnc $tmp[5] + max_total_enc[1], # value maxTotalRamEnc $tmp[6] + max_total_dec[0], # string maxTotalRamDec $tmp[7] + max_total_dec[1], # value maxTotalRamDecScore $tmp[8] + + max_stack_encdec[1], # value maxStackCodecScore $tmp[9] + max_stack_enc[0], # string maxStackEnc $tmp[10] + max_stack_enc[1], # value maxStackEncScore $tmp[11] + max_stack_dec[0], # string maxStackDec $tmp[12] + max_stack_dec[1], # value maxStackDecScore $tmp[13] + + max_heap_encdec[1], # value maxHeapCodecScore $tmp[14] + max_heap_enc[0], # string maxHeapEnc $tmp[15] + max_heap_enc[1], # value maxHeapEncScore $tmp[16] + max_heap_dec[0], # string maxHeapDec $tmp[17] + max_heap_dec[1], # value maxHeapDecScore $tmp[19] + + newsletterFilenameLast, # string logFile $tmp[19] ) diff --git a/ci/complexity_measurements/parseNewsletterRom.py b/ci/complexity_measurements/parseNewsletterRom.py index aeb7ee2650..e32051d912 100755 --- a/ci/complexity_measurements/parseNewsletterRom.py +++ b/ci/complexity_measurements/parseNewsletterRom.py @@ -2,7 +2,7 @@ # coding: utf-8 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,21 +42,127 @@ shortDate = "" fullDate = "" if __name__ == "__main__": - newsletterFilename = sys.argv[1] - newsletterFilenameLast = sys.argv[2] - revision = sys.argv[3] - shortDate = sys.argv[4] - fullDate = sys.argv[5] + newsletterFilenamePROM = sys.argv[1] + newsletterFilenameTROM = sys.argv[2] + newsletterFilenameLast = sys.argv[3] + revision = sys.argv[4] + shortDate = sys.argv[5] + fullDate = sys.argv[6] -max_total = ["", 0] +max_prom_enc = ["", 0] +max_prom_dec = ["", 0] +max_prom_com = ["", 0] +max_prom_rend = ["", 0] +max_prom_total = ["", 0] -with open(newsletterFilename, "r") as csvfile: - rom = csv.reader(csvfile, delimiter=";") - for row in rom: +max_trom_enc = ["", 0] +max_trom_dec = ["", 0] +max_trom_com = ["", 0] +max_trom_rend = ["", 0] +max_trom_total = ["", 0] + +max_total_encdec = ["", 0] + +rom_table = {} + +with open(newsletterFilenamePROM, "r") as csvfile: + PROM = csv.reader(csvfile, delimiter=";") + for row in PROM: + if row[0] == "conf": + continue + key = row[0] + lst = row[1:] + rom_table[key] = lst + +with open(newsletterFilenameTROM, "r") as csvfile: + TROM = csv.reader(csvfile, delimiter=";") + for row in TROM: if row[0] == "conf": continue - if int(row[4]) > max_total[1]: - max_total[0] = re.sub(" ", "_", row[0]) - max_total[1] = int(row[4]) + key = row[0] + lst = row[1:] + rom_table[key] += lst + +# now we have the following format +# PROM enc, PROM dec, PROM com, PROM rend, PROM total, TROM enc, TROM dec, TROM com, TROM rend, TROM total, total + +for key in rom_table: + rom = rom_table[key] + prom_enc = int(rom[0]) + prom_dec = int(rom[1]) + prom_com = int(rom[2]) + prom_rend = int(rom[3]) + prom_total = int(rom[4]) + + trom_enc = int(rom[5]) + trom_dec = int(rom[6]) + trom_com = int(rom[7]) + trom_rend = int(rom[8]) + trom_total = int(rom[9]) + + total_encdec = prom_total + trom_total + + if prom_enc > max_prom_enc[1]: + max_prom_enc[0] = re.sub(" ", "_", key) + max_prom_enc[1] = prom_enc + + if prom_dec > max_prom_dec[1]: + max_prom_dec[0] = re.sub(" ", "_", key) + max_prom_dec[1] = prom_dec + + if prom_com > max_prom_com[1]: + max_prom_com[0] = re.sub(" ", "_", key) + max_prom_com[1] = prom_com + + if prom_rend > max_prom_rend[1]: + max_prom_rend[0] = re.sub(" ", "_", key) + max_prom_rend[1] = prom_rend + + if trom_enc > max_trom_enc[1]: + max_trom_enc[0] = re.sub(" ", "_", key) + max_trom_enc[1] = trom_enc + + if trom_dec > max_trom_dec[1]: + max_trom_dec[0] = re.sub(" ", "_", key) + max_trom_dec[1] = trom_dec + + if trom_com > max_trom_com[1]: + max_trom_com[0] = re.sub(" ", "_", key) + max_trom_com[1] = trom_com + + if trom_rend > max_trom_rend[1]: + max_trom_rend[0] = re.sub(" ", "_", key) + max_trom_rend[1] = trom_rend + + if total_encdec > max_total_encdec[1]: + max_total_encdec[0] = re.sub(" ", "_", key) + max_total_encdec[1] = total_encdec + -print(revision, shortDate, fullDate, max_total[1], newsletterFilenameLast) +print( + revision, # string revision $tmp[1] + shortDate, # string shortDate $tmp[2] + fullDate, # string fullDate $tmp[3] + + max_total_encdec[1], # value maxTotalRomCodecScore $tmp[4] + + max_prom_enc[0], # string maxPROMEnc $tmp[5] + max_prom_enc[1], # value maxPROMEncScore $tmp[6] + max_prom_dec[0], # string maxPROMDec $tmp[7] + max_prom_dec[1], # value maxPROMDecScore $tmp[8] + max_prom_com[0], # string maxPROMCom $tmp[9] + max_prom_com[1], # value maxPROMComScore $tmp[10] + max_prom_rend[0], # string maxPROMRend $tmp[11] + max_prom_rend[1], # value maxPROMRendScore $tmp[12] + + max_trom_enc[0], # string maxTROMEnc $tmp[13] + max_trom_enc[1], # value maxTROMEncScore $tmp[14] + max_trom_dec[0], # string maxTROMDec $tmp[15] + max_trom_dec[1], # value maxTROMDecScore $tmp[16] + max_trom_com[0], # string maxTROMCom $tmp[17] + max_trom_com[1], # value maxTROMComScore $tmp[18] + max_trom_rend[0], # string maxTROMRend $tmp[19] + max_trom_rend[1], # value maxTROMRendScore $tmp[20] + + newsletterFilenameLast, # string logFile $tmp[21] +) diff --git a/ci/complexity_measurements/parseNewsletterWmops.py b/ci/complexity_measurements/parseNewsletterWmops.py index 06943726a0..3328d4ca16 100755 --- a/ci/complexity_measurements/parseNewsletterWmops.py +++ b/ci/complexity_measurements/parseNewsletterWmops.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # coding: utf-8 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/ci/get_id_of_last_job_occurence.py b/ci/get_id_of_last_job_occurence.py index f6223d9980..12294cf9f5 100755 --- a/ci/get_id_of_last_job_occurence.py +++ b/ci/get_id_of_last_job_occurence.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,44 +38,45 @@ PAGE_SUFFIX = "&page={}" API_BASE_URL = "https://forge.3gpp.org/rep/api/v4/projects/49" -parser = argparse.ArgumentParser() -parser.add_argument("branch_name") -parser.add_argument("job_name") - -args = parser.parse_args() - -branch_name = args.branch_name -job_name = args.job_name - - -job_id = -1 -# check last 500 pipelines max -for page in range(100): - url_pls = API_BASE_URL + "/pipelines" +def get_job_id(branch_name, job_name): + job_id = -1 + # check last 500 pipelines max + for page in range(100): + url_pls = API_BASE_URL + "/pipelines" + + # need both suffixes here to descend through the pages and get also older pipelines + suffix = PER_PAGE_SUFFIX + PAGE_SUFFIX.format(page) + resp_pls = requests.get(url_pls + suffix) + for pl in resp_pls.json(): + if pl["ref"] == branch_name: + url_jobs = url_pls + f"/{pl['id']}/jobs" + + # only one of the suffixes here - this assumes only max of 50 jobs per pipeline + # so only one page needed + resp_jobs = requests.get(url_jobs + PER_PAGE_SUFFIX) + + if job_name not in resp_jobs.text: + continue + + # find actual job by name + for job in resp_jobs.json(): + if job["name"] == job_name and job["status"] == "success": + job_id = job["id"] + break + if job_id >= 0: + break - # need both suffixes here to descend through the pages and get also older pipelines - suffix = PER_PAGE_SUFFIX + PAGE_SUFFIX.format(page) - resp_pls = requests.get(url_pls + suffix) - for pl in resp_pls.json(): - if pl["ref"] == branch_name: - url_jobs = url_pls + f"/{pl['id']}/jobs" - - # only one of the suffixes here - this assumes only max of 50 jobs per pipeline - # so only one page needed - resp_jobs = requests.get(url_jobs + PER_PAGE_SUFFIX) + if job_id >= 0: + break - if job_name not in resp_jobs.text: - continue + return job_id - # find actual job by name - for job in resp_jobs.json(): - if job["name"] == job_name and job["status"] == "success": - job_id = job["id"] - break - if job_id >= 0: - break +if __name__ == '__main__': + parser = argparse.ArgumentParser() + parser.add_argument("branch_name") + parser.add_argument("job_name") - if job_id >= 0: - break + args = parser.parse_args() -print(job_id) + job_id = get_job_id(args.branch_name, args.job_name) + print(job_id) \ No newline at end of file diff --git a/ci/index-pages.html b/ci/index-pages.html index 0a2e73e78e..9d60155e8f 100644 --- a/ci/index-pages.html +++ b/ci/index-pages.html @@ -16,4 +16,10 @@
  • StereoDmxEVS
    • +

    Test Coverage

    + + + diff --git a/ci/ivas_voip_be_test.sh b/ci/ivas_voip_be_test.sh new file mode 100755 index 0000000000..592451c345 --- /dev/null +++ b/ci/ivas_voip_be_test.sh @@ -0,0 +1,144 @@ +#! /usr/bin/bash + +# (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +# Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., +# Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, +# Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other +# contributors to this repository. All Rights Reserved. + +# This software is protected by copyright law and by international treaties. +# The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, +# Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., +# Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, +# Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other +# contributors to this repository retain full ownership rights in their respective contributions in +# the software. This notice grants no license of any kind, including but not limited to patent +# license, nor is any license granted by implication, estoppel or otherwise. + +# Contributors are required to enter into the IVAS codec Public Collaboration agreement before making +# contributions. + +# This software is provided "AS IS", without any express or implied warranties. The software is in the +# development stage. It is intended exclusively for experts who have experience with such software and +# solely for the purpose of inspection. All implied warranties of non-infringement, merchantability +# and fitness for a particular purpose are hereby disclaimed and excluded. + +# Any dispute, controversy or claim arising under or in relation to providing this software shall be +# submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in +# accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and +# the United Nations Convention on Contracts on the International Sales of Goods. + +function usage { + echo + echo "Usage:" + echo " ivas_voip_be_test.sh [MODE]" + echo + echo " MODE - test (default) or coverage" + exit +} + +if [ ! -d "lib_com" ]; then + echo "not in root directory! - please run in IVAS root" + exit 1 +fi + +if [ -z "$1" ] || [ "$1" == "test" ]; then + WORKERS="" + BUILD=1 + COVERAGE=0 +elif [ "$1" == "coverage" ]; then + WORKERS="-t 1" + BUILD=0 + COVERAGE=1 +else + usage +fi + +if [ $BUILD -eq 1 ];then + make clean + make all -j +fi + +# Configuration +modes=('SBA_b128_wb_cbr' 'MC_7_1_b96_fb_cbr' 'ISM2_b48_fb_cbr') +output_formats=('STEREO' 'FOA' '7_1' 'HOA3') +limit_input_to_x_seconds=30 + +cfg=./scripts/config/ci_linux.json +dly_profile=./scripts/dly_error_profiles/dly_error_profile_0.dat + +output_dir_default="out" +output_dir_voip="out_voip" + +# Run the same modes in VoIP and non-VoIP mode with a neutral delay profile +./scripts/runIvasCodec.py -p $cfg $WORKERS -U $limit_input_to_x_seconds -m "${modes[@]}" --oc "${output_formats[@]}" -o $output_dir_default | tee voip_be_test_output.txt +./scripts/runIvasCodec.py -p $cfg $WORKERS -U $limit_input_to_x_seconds -m "${modes[@]}" --oc "${output_formats[@]}" -o $output_dir_voip -J "$dly_profile" | tee -a voip_be_test_output.txt + +# Check if Python scripts above failed. They return status 0 even when running a mode fails, so we have to parse log file +if grep -iq failed voip_be_test_output.txt ; then + echo "Run errors in runIvasCodec.py" + exit 1 +fi + +if [ $COVERAGE -eq 1 ];then + # Coverage analysis requires only running the codec and may exit before the comparison part + exit 0 +fi + +# Set up Python path +python_audio_module_path=$(pwd)/scripts +export PYTHONPATH=$python_audio_module_path:$PYTHONPATH +python_audiofile_script_path=$python_audio_module_path/pyaudio3dtools/audiofile.py + +# Trim JBM delay from VoIP output files +output_dir_voip_dec="$output_dir_voip"/dec +output_dir_voip_dec_trimmed="$output_dir_voip"/dec_trimmed + +if [[ ! -d $output_dir_voip_dec_trimmed ]]; then + mkdir $output_dir_voip_dec_trimmed +fi + +for cut in "$output_dir_voip_dec"/*.wav; do + output_path=${cut/$output_dir_voip_dec/$output_dir_voip_dec_trimmed} + output_path=${output_path/".wav"/".raw"} + python3 "$python_audiofile_script_path" pre-trim 60 "$cut" "$output_path" | tee -a voip_be_test_output.txt +done + +# Convert non-VoIP output from wav to pcm (comparison script doesn't support wav) +output_dir_default_dec="$output_dir_default"/dec +output_dir_default_dec_pcm="$output_dir_default"/dec_pcm + +if [[ ! -d $output_dir_default_dec_pcm ]]; then + mkdir $output_dir_default_dec_pcm +fi + +for ref in "$output_dir_default_dec"/*.wav; do + output_path=${ref/$output_dir_default_dec/$output_dir_default_dec_pcm} + output_path=${output_path/".wav"/".raw"} + python3 "$python_audiofile_script_path" convert "$ref" "$output_path" | tee -a voip_be_test_output.txt +done + +# Assert BE between non-VoIP and VoIP modes +all_be=1 + +cmp_tool_path=$(pwd)/tests/cmp_pcm.py + +for ref in "$output_dir_default_dec_pcm"/*; do + cut=${ref/$output_dir_default_dec_pcm/$output_dir_voip_dec_trimmed} + cut=${cut/".dec."/"_jbm_dly_error_profile_0_dat.dec."} + + # Print paths of compared files, since the script doesn't do it + printf "\nComparing %s and %s\n" "$ref" "$cut" | tee -a voip_be_test_output.txt + printout=$($cmp_tool_path "$ref" "$cut") + if [ $? -ne 0 ]; then + all_be=0 + fi + printf "%s\n" "$printout" | tee -a voip_be_test_output.txt +done + +if [ $all_be -eq 1 ]; then + printf "\n\nAll tested conditions are bit-exact\n" | tee -a voip_be_test_output.txt +else + printf "\n\nBitexactness problems found!\n" | tee -a voip_be_test_output.txt + exit 1; +fi diff --git a/ci/run_evs_be_test.py b/ci/run_evs_be_test.py index e3c6c750bb..f7b705b0f4 100755 --- a/ci/run_evs_be_test.py +++ b/ci/run_evs_be_test.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/ci/run_scheduled_sanitizer_test.py b/ci/run_scheduled_sanitizer_test.py index 2aaa49dee6..9886de4291 100755 --- a/ci/run_scheduled_sanitizer_test.py +++ b/ci/run_scheduled_sanitizer_test.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -63,8 +63,7 @@ def main(args): assert all([t in SUPPORTED_TESTS for t in tests]) - modes = get_modes(in_format) - returncode = run_check(modes, out_formats, tests, run_fec=run_fec) + returncode = run_check(in_format, out_formats, tests, run_fec=run_fec) collect_for_sanitizer_test(CONSOLE_OUT_FILE) @@ -92,7 +91,22 @@ def get_modes(in_format: str) -> list: return mode_list -def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True): +def get_md_file_command(in_format: str) -> list: + + cmd = list() + if in_format.startswith("ISM"): + cmd.append("--metadata_files") + md_filename = "/usr/local/ltv/ltvISM{}.csv" + n = int(in_format[-1]) + cmd.extend([md_filename.format(i) for i in range(1, n + 1)]) + + return cmd + + +def run_check(in_format: str, out_formats: list, tests: list, run_fec: bool = True): + + modes = get_modes(in_format) + md_file_command = get_md_file_command(in_format) ### always run encoder and decoder with no frameloss cmd_no_fec = [ @@ -107,6 +121,7 @@ def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True) *modes, "--oc", *out_formats, + *md_file_command, ] print( diff --git a/ci/setup_pages.py b/ci/setup_pages.py new file mode 100755 index 0000000000..a8dffafa13 --- /dev/null +++ b/ci/setup_pages.py @@ -0,0 +1,77 @@ +#!/usr/bin/env python3 +import os +import sys +import pathlib +import subprocess +from get_id_of_last_job_occurence import get_job_id + +JOBS = [ + "complexity-stereo-in-stereo-out", + "complexity-ism-in-binaural-out", + "complexity-sba-hoa3-in-hoa3-out", + "complexity-mc-in-7_1_4-out", + "complexity-masa-in-7_1_4-out", + "complexity-StereoDmxEVS-stereo-in-mono-out", + "coverage-test-on-main-scheduled", +] +ARTIFACTS = "artifacts.zip" +API_URL_BASE = "https://forge.3gpp.org/rep/api/v4/projects/{}/jobs" +PUBLIC = "./public" + + +def main(): + + public_folder = pathlib.Path(PUBLIC) + public_folder.mkdir() + + failed_count = 0 + for job in JOBS: + job_id = get_job_id(os.environ["CI_COMMIT_REF_NAME"], job) + print(f"{job_id} - {job}") + try: + curl_for_artifacts(job_id) + + job_public = job + "-public" + if job == "coverage-test-on-main-scheduled": + job_public = "coverage" + + pathlib.Path(job_public).rename(public_folder.joinpath(job_public)) + + except subprocess.CalledProcessError: + print(f"Could not get artifacts for {job}") + failed_count += 1 + + if failed_count == len(JOBS): + sys.exit(1) + + pathlib.Path("ci/index-pages.html").rename(public_folder.joinpath("index.html")) + sys.exit(0) + + +def curl_for_artifacts(job_id): + cmd = [ + "curl", + "--request", + "GET", + API_URL_BASE.format(os.environ["CI_PROJECT_ID"]) + f"/{job_id}/artifacts", + "--output", + ARTIFACTS, + ] + subprocess.run(cmd, check=True) + + # check for valid archive (if not, it is likely a 404 page, then display that) + cmd = ["unzip", "-t", ARTIFACTS] + try: + subprocess.run(cmd, check=True) + except subprocess.CalledProcessError: + with open(ARTIFACTS, "r") as f: + print(f.read()) + raise subprocess.CalledProcessError(-1, "Unzip check failed") + + # do the actual unzipping + cmd = ["unzip", ARTIFACTS] + subprocess.run(cmd, check=True) + + +if __name__ == "__main__": + main() diff --git a/ci/smoke_test.sh b/ci/smoke_test.sh index 3d7b85fdba..852b74fe47 100755 --- a/ci/smoke_test.sh +++ b/ci/smoke_test.sh @@ -1,6 +1,6 @@ #! /usr/bin/bash -# (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +# (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, # Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., # Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, # Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -28,13 +28,78 @@ # accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and # the United Nations Convention on Contracts on the International Sales of Goods. +function usage { + echo + echo "Usage:" + echo " smoke_test.sh [MODE]" + echo + echo " MODE - test (default) or coverage" + exit +} + if [ ! -d "lib_com" ]; then echo "not in root directory! - please run in IVAS root" exit 1 fi -make clean -make all -j 8 +if [ -z "$1" ] || [ "$1" == "test" ]; then + WORKERS="" + BUILD=1 +elif [ "$1" == "coverage" ]; then + WORKERS="-t 1" + BUILD=0 +else + usage +fi + + +cfg=./scripts/config/ci_linux.json +dly_profile=./scripts/dly_error_profiles/dly_error_profile_10.dat +ism_md_cmd="--metadata_files /usr/local/testv/stvISM1.csv /usr/local/testv/stvISM2.csv /usr/local/testv/stvISM3.csv /usr/local/testv/stvISM4.csv" + +if [ $BUILD -eq 1 ];then + # Enable memory macros to find unbalanced memory allocations/deallocations + # Does not implement full memory analysis + make clean + + # Replace free -> free_, malloc -> malloc_, calloc -> calloc_ + ./scripts/prepare_mem_dryrun.py + + # Enable WMOPS and disable DEBUGGING + sed -i.bak -e "s/\/\*\s*\(#define\s*WMOPS\)\s*\*\//\1/g" lib_com/options.h + sed -i.bak -e "s/\/\/\s*\(#define\s*WMOPS\)/\1/g" lib_com/options.h +# sed -i.bak -e "s/\s*\(#define\s*DEBUGGING\)/\/\*\1*\//g" lib_com/options.h + + make all -j + +fi + +# run all modes vanilla-fashion +# treat ISM modes separately because passing the metadata files to MASA modes causes crashes +ism_modes=$(./scripts/runIvasCodec.py -l | grep ISM) +non_ism_modes=$(./scripts/runIvasCodec.py -l | grep -v ISM) +./scripts/runIvasCodec.py -m $non_ism_modes -p $cfg -U 1 $WORKERS | tee smoke_test_output.txt +./scripts/runIvasCodec.py -m $ism_modes -p $cfg -U 1 $WORKERS $ism_md_cmd | tee smoke_test_output.txt +# run the decoding again, but with 15% frame loss +./scripts/runIvasCodec.py -p $cfg -U 1 $WORKERS -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt + +# run JBM modes - EXT is excluded as not supported yet +modes_with_no_ext_out=$(./scripts/runIvasCodec.py -l | grep -v MASA | grep -v ISM) +./scripts/runIvasCodec.py -m $modes_with_no_ext_out -p $cfg -U 1 $WORKERS --decoder_only --jbm_file $dly_profile | tee smoke_test_output_jbm_noEXT.txt +./scripts/runIvasCodec.py -C MASA ISM1 ISM2 ISM3 ISM4 -p $cfg -U 1 $WORKERS --decoder_only --jbm_file $dly_profile --oc BINAURAL BINAURAL_ROOM mono stereo FOA HOA3 5_1 7_1_4 | tee -a smoke_test_output_jbm_noEXT.txt + +# run all modes with binaural output using external files +modes_with_bin_out="SBA PlanarSBA MASA MC ISM1 ISM2 ISM3 ISM4" +bin_out_modes="BINAURAL BINAURAL_ROOM" + +wb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _wb_) +hrtf_wb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin" +./scripts/runIvasCodec.py -p $cfg -m $wb_modes -U 1 $WORKERS -D="-hrtf ${hrtf_wb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt + +swb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _swb_) +hrtf_swb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin" +./scripts/runIvasCodec.py -p $cfg -m $swb_modes -U 1 $WORKERS -D="-hrtf ${hrtf_swb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt -./scripts/runIvasCodec.py -p ./scripts/config/ci_linux.json -U 1 | tee smoke_test_output.txt -./scripts/runIvasCodec.py -p ./scripts/config/ci_linux.json -U 1 -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt +fb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _fb_) +hrtf_fb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin" +./scripts/runIvasCodec.py -p $cfg -m $fb_modes -U 1 $WORKERS -D="-hrtf ${hrtf_fb}" --decoder_only --oc $bin_out_modes | tee -a smoke_test_output_hrtf.txt diff --git a/lib_com/ACcontextMapping.c b/lib_com/ACcontextMapping.c index 27c51eb179..1705a3f7d3 100644 --- a/lib_com/ACcontextMapping.c +++ b/lib_com/ACcontextMapping.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * get_next_coeff_mapped() diff --git a/lib_com/ari.c b/lib_com/ari.c index 3b7ccfd9a4..2ee0be6231 100644 --- a/lib_com/ari.c +++ b/lib_com/ari.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include "prot.h" #include "basop_util.h" #include "cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------- diff --git a/lib_com/ari_hm.c b/lib_com/ari_hm.c index 78e639ea91..f1f9d5a42b 100644 --- a/lib_com/ari_hm.c +++ b/lib_com/ari_hm.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "basop_util.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * UnmapIndex() @@ -196,7 +196,7 @@ int16_t CountIndexBits( return 8; } -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP /*-------------------------------------------------------------------* * tcx_hm_render() @@ -301,3 +301,5 @@ void tcx_hm_modify_envelope( return; } + +#undef WMC_TOOL_SKIP diff --git a/lib_com/arith_coder.c b/lib_com/arith_coder.c index e534a23e04..1912b4cbf2 100644 --- a/lib_com/arith_coder.c +++ b/lib_com/arith_coder.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -45,10 +45,11 @@ #include "prot.h" #include "basop_util.h" #include "basop_proto_func.h" -#include "wmops.h" +#include "wmc_auto.h" -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP + /*-------------------------------------------------------* * expfp() * @@ -573,3 +574,5 @@ void tcx_arith_render_envelope( return; } + +#undef WMC_TOOL_SKIP diff --git a/lib_com/basop32.c b/lib_com/basop32.c index b12e336e9c..1f28351c79 100644 --- a/lib_com/basop32.c +++ b/lib_com/basop32.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -30,7 +30,6 @@ *******************************************************************************************************/ -/* WMC_TOOL_SKIP_FILE (basic ops file) */ /* v.2.3 - 30.Nov.2009 ============================================================================= @@ -167,6 +166,8 @@ HISTORY: #include "ivas_error.h" #include "ivas_error_utils.h" +#define WMC_TOOL_SKIP + #ifdef _MSC_VER #pragma warning( disable : 4310 ) #endif @@ -3203,4 +3204,4 @@ Word32 L_msu0( Word32 L_var3, Word16 var1, Word16 var2 ) #endif /* ! BASOP_NOGLOB */ -/* end of file */ +#undef WMC_TOOL_SKIP diff --git a/lib_com/basop32.h b/lib_com/basop32.h index f1bd65bc8e..ff41a1d81d 100644 --- a/lib_com/basop32.h +++ b/lib_com/basop32.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_com/basop_com_lpc.c b/lib_com/basop_com_lpc.c index a24c100d54..442afe554c 100644 --- a/lib_com/basop_com_lpc.c +++ b/lib_com/basop_com_lpc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,7 +33,6 @@ /*==================================================================================== EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0 ====================================================================================*/ -/* WMC_TOOL_SKIP_FILE (basic ops file) */ #include #include @@ -41,10 +40,11 @@ #include "typedef.h" #include "basop_proto_func.h" #include "cnst.h" - #include "basop_util.h" #include "stl.h" +#define WMC_TOOL_SKIP + #define UNROLL_CHEBYSHEV_INNER_LOOP #define NC_MAX 8 #define GUESS_TBL_SZ 256 @@ -259,3 +259,5 @@ void basop_lsf2lsp( const Word16 lsf[], Word16 lsp[] ) return; } + +#undef WMC_TOOL_SKIP diff --git a/lib_com/basop_lsf_tools.c b/lib_com/basop_lsf_tools.c index 7a7e655f81..eddce99e83 100644 --- a/lib_com/basop_lsf_tools.c +++ b/lib_com/basop_lsf_tools.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,7 +33,6 @@ /*==================================================================================== EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0 ====================================================================================*/ -/* WMC_TOOL_SKIP_FILE (basic ops file) */ #include #include @@ -42,6 +41,8 @@ #include "control.h" #include "basop_util.h" +#define WMC_TOOL_SKIP + #define NC_MAX 8 static Word16 E_LPC_f_lsp_pol_get( const Word16 lsp[], Word32 f[], const Word16 n, const Word16 past_Ovf, const Word16 isMODE1 ); @@ -309,3 +310,5 @@ static Word16 E_LPC_f_lsp_pol_get( } return Ovf; } + +#undef WMC_TOOL_SKIP diff --git a/lib_com/basop_mpy.c b/lib_com/basop_mpy.c index 478dff4cfe..db2a14c0b0 100644 --- a/lib_com/basop_mpy.c +++ b/lib_com/basop_mpy.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,7 +33,6 @@ /*==================================================================================== EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0 ====================================================================================*/ -/* WMC_TOOL_SKIP_FILE (basic ops file) */ #include "basop_mpy.h" #include @@ -42,6 +41,8 @@ #include "debug.h" #endif +#define WMC_TOOL_SKIP + Word32 Mpy_32_16_1( Word32 x, Word16 y ) { Word32 mh; @@ -87,3 +88,5 @@ Word32 Mpy_32_32( Word32 x, Word32 y ) return ( mh ); } + +#undef WMC_TOOL_SKIP diff --git a/lib_com/basop_mpy.h b/lib_com/basop_mpy.h index 699039dd15..4a8d4473c6 100644 --- a/lib_com/basop_mpy.h +++ b/lib_com/basop_mpy.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_com/basop_proto_func.h b/lib_com/basop_proto_func.h index a9a64ac4c2..0c514475f3 100644 --- a/lib_com/basop_proto_func.h +++ b/lib_com/basop_proto_func.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_com/basop_settings.h b/lib_com/basop_settings.h index 0689fa419d..758a99650c 100644 --- a/lib_com/basop_settings.h +++ b/lib_com/basop_settings.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_com/basop_tcx_utils.c b/lib_com/basop_tcx_utils.c index ea306d34b2..6d2c80f6b7 100644 --- a/lib_com/basop_tcx_utils.c +++ b/lib_com/basop_tcx_utils.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,7 +33,6 @@ /*==================================================================================== EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0 ====================================================================================*/ -/* WMC_TOOL_SKIP_FILE (basic ops file) */ #include #include @@ -47,6 +46,8 @@ #include "prot.h" #include "rom_com.h" +#define WMC_TOOL_SKIP + /* compare two positive normalized 16 bit mantissa/exponent values */ /* return value: positive if first value greater, negative if second value greater, zero if equal */ static Word16 compMantExp16Unorm( Word16 m1, Word16 e1, Word16 m2, Word16 e2 ) @@ -436,3 +437,5 @@ void basop_PsychAdaptLowFreqDeemph( Word32 x[], const Word16 lpcGains[], const W } } } + +#undef WMC_TOOL_SKIP diff --git a/lib_com/basop_util.c b/lib_com/basop_util.c index 71feed1276..bfd05e09e2 100644 --- a/lib_com/basop_util.c +++ b/lib_com/basop_util.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,7 +33,6 @@ /*==================================================================================== EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0 ====================================================================================*/ -/* WMC_TOOL_SKIP_FILE (basic ops file) */ #include #include @@ -48,6 +47,8 @@ #include "control.h" #include "cnst.h" +#define WMC_TOOL_SKIP + extern const Word32 SqrtTable[32]; extern const Word16 SqrtDiffTable[32]; @@ -1107,3 +1108,5 @@ Word32 Sqrt_l( return ( L_y ); } + +#undef WMC_TOOL_SKIP diff --git a/lib_com/basop_util.h b/lib_com/basop_util.h index 3ab5615034..c09b8ea62c 100644 --- a/lib_com/basop_util.h +++ b/lib_com/basop_util.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_com/bitalloc.c b/lib_com/bitalloc.c index 97acd28c58..e8db20d133 100644 --- a/lib_com/bitalloc.c +++ b/lib_com/bitalloc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "prot.h" #include "basop_util.h" #include "basop_proto_func.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------------- * bitalloc() @@ -221,7 +221,8 @@ void bitalloc( } -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP + /*-------------------------------------------------------------------* * BitAllocF() * @@ -1020,3 +1021,5 @@ int16_t BitAllocWB( return (Word16) t_fx; } + +#undef WMC_TOOL_SKIP diff --git a/lib_com/bitallocsum.c b/lib_com/bitallocsum.c index 124bf69fe5..d3f880752d 100644 --- a/lib_com/bitallocsum.c +++ b/lib_com/bitallocsum.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------------- * bitallocsum() diff --git a/lib_com/bits_alloc.c b/lib_com/bits_alloc.c index e9f9878853..a162e40be3 100644 --- a/lib_com/bits_alloc.c +++ b/lib_com/bits_alloc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "prot.h" #include "ivas_cnst.h" #include "ivas_rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local function prototypes @@ -516,26 +516,29 @@ static ivas_error acelp_FCB_allocator( *--------------------------------------------------------------------*/ ivas_error config_acelp1( - const int16_t enc_dec, /* i : encoder/decoder flag */ - const int32_t total_brate, /* i : total bitrate */ - const int32_t core_brate_inp, /* i : core bitrate */ - const int16_t core, /* i : core */ - const int16_t extl, /* i : extension layer */ - const int32_t extl_brate, /* i : extension layer bitrate */ - const int16_t L_frame, /* i : frame length at internal Fs */ - const int16_t GSC_noisy_speech, /* i : GSC on SWB noisy speech flag */ - ACELP_config *acelp_cfg, /* i : ACELP bit-allocation */ - const int16_t signaling_bits, /* i : number of signaling bits */ - const int16_t coder_type, /* i : coder type */ - const int16_t tc_subfr, /* i : TC subfr ID */ - const int16_t tc_call, /* i : TC call number (0,1,2,3,5(DEC)) */ - int16_t *nBits_es_Pred, /* o : number of bits for Es_pred Q */ - int16_t *unbits, /* o : number of unused bits */ - const int16_t element_mode, /* i : element mode */ - int16_t *uc_two_stage_flag, /* o : flag undicating two-stage UC */ - const int16_t tdm_lp_reuse_flag, /* i : LPC reuse flag (can be 1 only with secondary channel */ - const int16_t tdm_low_rate_mode, /* i : secondary channel low rate mode flag */ - const int16_t idchan, /* i : stereo channel ID */ + const int16_t enc_dec, /* i : encoder/decoder flag */ + const int32_t total_brate, /* i : total bitrate */ + const int32_t core_brate_inp, /* i : core bitrate */ + const int16_t core, /* i : core */ + const int16_t extl, /* i : extension layer */ + const int32_t extl_brate, /* i : extension layer bitrate */ + const int16_t L_frame, /* i : frame length at internal Fs */ + const int16_t GSC_noisy_speech, /* i : GSC on SWB noisy speech flag */ + ACELP_config *acelp_cfg, /* i : ACELP bit-allocation */ + const int16_t signaling_bits, /* i : number of signaling bits */ + const int16_t coder_type, /* i : coder type */ + const int16_t tc_subfr, /* i : TC subfr ID */ + const int16_t tc_call, /* i : TC call number (0,1,2,3,5(DEC)) */ + int16_t *nBits_es_Pred, /* o : number of bits for Es_pred Q */ + int16_t *unbits, /* o : number of unused bits */ + const int16_t element_mode, /* i : element mode */ + int16_t *uc_two_stage_flag, /* o : flag undicating two-stage UC */ + const int16_t tdm_lp_reuse_flag, /* i : LPC reuse flag (can be 1 only with secondary channel */ + const int16_t tdm_low_rate_mode, /* i : secondary channel low rate mode flag */ + const int16_t idchan, /* i : stereo channel ID */ +#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE + const int16_t active_cnt, /* i : Active frame counter */ +#endif const int16_t tdm_Pitch_reuse_flag, /* i : primary channel pitch reuse flag*/ const int16_t tdm_LRTD_flag, /* i : LRTD stereo mode flag */ const int16_t GSC_IVAS_mode /* i : GSC IVAS mode */ @@ -754,11 +757,12 @@ ivas_error config_acelp1( bits -= acelp_cfg->mid_lsf_bits; } #ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE - else if ( tdm_lp_reuse_flag == 1 && idchan == 1 ) + else if ( tdm_lp_reuse_flag == 1 && idchan == 1 && active_cnt != 1 ) { bits -= TDM_IC_LSF_PRED_BITS; } #endif + /* gain Q bit-budget - part 1 */ if ( ( coder_type != UNVOICED && coder_type != AUDIO && coder_type != INACTIVE && !( core_brate <= ACELP_8k00 && coder_type != TRANSITION ) ) || ( coder_type == INACTIVE && total_brate > MAX_GSC_INACTIVE_BRATE ) ) { @@ -1323,6 +1327,7 @@ ivas_error config_acelp1( else { int16_t nb_prm = 4; + if ( tdm_low_rate_mode == 1 ) { nb_prm = 2; diff --git a/lib_com/bitstream.c b/lib_com/bitstream.c index a542a4f230..8363a0299c 100644 --- a/lib_com/bitstream.c +++ b/lib_com/bitstream.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -49,7 +49,7 @@ #include "ivas_prot.h" #include "ivas_cnst.h" #include "ivas_rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" #ifdef DEBUGGING @@ -622,7 +622,7 @@ uint16_t get_indice_1( return st->bit_stream[pos]; } -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP /*-------------------------------------------------------------------* * reset_indices_enc() @@ -833,12 +833,6 @@ static ivas_error write_indices_element( /* restore previous pointer position */ pt_stream_loc = pt_stream_backup; } - - /* TODO implemented only for MCT for now */ - if ( ( st_ivas->hEncoderConfig->ivas_format == MC_FORMAT ) && ( st_ivas->mc_mode == MC_MODE_MCT ) && ( element_id * CPE_CHANNELS + n == LFE_CHANNEL ) ) - { - continue; - } #ifdef ENABLE_BITRATE_VERIFICATION total_nb_bits = #endif @@ -879,10 +873,6 @@ static ivas_error write_indices_element( for ( n = 0; n < n_channels; n++ ) { - if ( ( st_ivas->hEncoderConfig->ivas_format == MC_FORMAT ) && ( st_ivas->mc_mode == MC_MODE_MCT ) && ( element_id * CPE_CHANNELS + n == LFE_CHANNEL ) ) - { - continue; - } reset_indices_enc( sts[n]->hBstr, MAX_NUM_INDICES ); } } @@ -1811,7 +1801,11 @@ ivas_error preview_indices( if ( bit_stream[2] == 0 ) { st_ivas->ivas_format = SBA_FORMAT; +#ifndef LBR_SBA st_ivas->sba_mode = ivas_sba_mode_select( total_brate ); +#else + st_ivas->sba_mode = ivas_sba_mode_select(); +#endif } else { @@ -1950,24 +1944,12 @@ ivas_error preview_indices( /* read number of objects from the bitstream */ st_ivas->nchan_transport = 1; -#ifdef FIX_ISM_DECODER_PRINTOUT k = (int16_t) ( ( total_brate / FRAMES_PER_SEC ) - 1 ); while ( bit_stream[k] == 1 && st_ivas->nchan_transport < MAX_NUM_OBJECTS ) { st_ivas->nchan_transport++; k--; } -#else - if ( total_brate != SID_2k40 && total_brate != FRAME_NO_DATA ) - { - k = (int16_t) ( ( total_brate / FRAMES_PER_SEC ) - 1 ); - while ( bit_stream[k] == 1 && st_ivas->hDecoderConfig->nchan_out < MAX_NUM_OBJECTS ) - { - st_ivas->nchan_transport++; - k--; - } - } -#endif st_ivas->transport_config = AUDIO_CONFIG_EXTERNAL + st_ivas->nchan_transport; st_ivas->ism_mode = ivas_ism_mode_select( st_ivas->nchan_transport, total_brate ); @@ -2028,7 +2010,7 @@ ivas_error read_indices( file_read_FECpattern( &st_ivas->bfi ); st_ivas->bfi |= bfi; - if ( bfi ) + if ( bfi == FRAMEMODE_MISSING ) /* TODO(mcjbm): This fixes channel-aware mode BE. Still requires review from a bitstream reading expert */ { for ( k = 0; k < num_bits; k++ ) { @@ -2193,8 +2175,10 @@ ivas_error read_indices( } /* handle bad/lost speech frame(and CS bad SID frame) in the decoders CNG synthesis settings pair (total_brate, bfi) */ - if ( ( ( *CNG != 0 ) && ( ( speech_bad != 0 ) || ( speech_lost != 0 ) ) ) || /* SP_BAD or SPEECH_LOST) --> stay in CNG */ - ( sid_upd_bad != 0 ) ) /* SID_UPD_BAD --> start CNG */ + if ( ( + bfi != FRAMEMODE_FUTURE && /* TODO(mcjbm): This fixes channel-aware mode BE. Still requires review from a bitstream reading expert */ + ( *CNG != 0 ) && ( ( speech_bad != 0 ) || ( speech_lost != 0 ) ) ) || /* SP_BAD or SPEECH_LOST) --> stay in CNG */ + ( sid_upd_bad != 0 ) ) /* SID_UPD_BAD --> start CNG */ { st_ivas->bfi = 0; /* bfi=0 needed to activate CNG code */ total_brate = FRAME_NO_DATA; @@ -2236,7 +2220,8 @@ ivas_error read_indices( } /* GOOD frame */ - if ( st_ivas->bfi == 0 ) + if ( st_ivas->bfi == 0 || st_ivas->bfi == FRAMEMODE_FUTURE /* TODO(mcjbm): This fixes channel-aware mode BE. Still requires review from a bitstream reading expert */ + ) { /* GOOD frame - convert ITU-T G.192 words to short values */ st_ivas->hDecoderConfig->ivas_total_brate = total_brate; @@ -2739,116 +2724,6 @@ void get_NextCoderType( return; } -/*-------------------------------------------------------------------* - * read_indices_from_djb() - * - * Read indices from the de-jitter buffer payload (works also for AMR-WB IO mode) - *-------------------------------------------------------------------*/ -void read_indices_from_djb( - Decoder_State *st, /* i/o: decoder state structure */ - uint8_t *pt_stream, /* i : bitstream file */ - int16_t *CNG, - const int16_t num_bits, /* i : input frame length in bits */ - const Word16 isAMRWB_IOmode, - const Word16 core_mode, - const Word16 qbit, - const Word16 bitstreamformat, - const Word16 amrwb_rfc4867_flag, - const int16_t partialframe, /* i : partial frame information */ - const int16_t next_coder_type /* i : next coder type information */ -) -{ - int16_t k; - UWord8 mask = 0x80; - Word16 no_data = 0; - Word16 sti = -1; - uint16_t *bit_stream_ptr; - int32_t total_brate; - int16_t speech_lost = 0; - - st->bfi = 0; - st->BER_detect = 0; - st->mdct_sw_enable = 0; - st->mdct_sw = 0; - reset_indices_dec( st ); - - st->bfi = !qbit; - total_brate = (Word32) (num_bits) *50; - - if ( num_bits == 0 ) /* guess type of missing frame for SP_LOST and NO_DATA */ - { - speech_lost = *CNG == 0; - no_data = *CNG != 0; - } - - if ( partialframe || st->prev_use_partial_copy ) - { - st->next_coder_type = next_coder_type; - } - else - { - st->next_coder_type = INACTIVE; - } - - if ( partialframe == 1 ) - { - st->bfi = 2; - } - - /* unpack speech data */ - bit_stream_ptr = st->bit_stream; - /* convert bitstream from compact bytes to short values and store it in decoder state */ - for ( k = 0; k < num_bits; k++ ) - { - if ( bitstreamformat == VOIP_RTPDUMP && isAMRWB_IOmode ) - { - st->bit_stream[sort_ptr[core_mode][k]] = unpack_bit( &pt_stream, &mask ); - bit_stream_ptr++; - } - else - { - *bit_stream_ptr++ = unpack_bit( &pt_stream, &mask ); - } - } - - /* unpack auxiliary bits */ - if ( isAMRWB_IOmode && total_brate == SID_1k75 ) - { - if ( bitstreamformat == VOIP_RTPDUMP ) - { - /* A.2.2.1.3: AMR-WB SID_1k75 frame is followed by STI bit and CMI bits */ - sti = unpack_bit( &pt_stream, &mask ); - } - else - { - /* VOIP_G192_RTP does not contain STI and CMI */ - sti = 1; - } - read_indices_mime_handle_sti_and_all_zero_bits( st, &total_brate, sti ); - } - - /* add two zero bytes for arithmetic coder flush */ - for ( k = 0; k < 8 * 2; ++k ) - { - *bit_stream_ptr++ = 0; - } - - total_brate = read_indices_mime_handle_dtx( st, CNG, isAMRWB_IOmode, core_mode, total_brate, sti, speech_lost, no_data, amrwb_rfc4867_flag ); - /* st->CNG set inside */ - - if ( st->bfi != 1 ) - { - /* select Mode 1 or Mode 2 */ - decoder_selectCodec( st, total_brate, *st->bit_stream ? 1 : 0 ); - - /* a change of the total bitrate should not be known to the decoder, if the received frame was truly lost */ - st->total_brate = total_brate; - - mdct_switching_dec( st ); - } - - return; -} /*-------------------------------------------------------------------* * get_indice_preview() @@ -2958,14 +2833,17 @@ void evs_dec_previewFrame( void dtx_read_padding_bits( DEC_CORE_HANDLE st, - int16_t num_bits ) + const int16_t num_bits ) { /* TODO: temporary hack, need to decide what to do with core-coder bitrate */ int32_t tmp; + tmp = st->total_brate; st->total_brate = st->total_brate + num_bits * FRAMES_PER_SEC; get_next_indice( st, num_bits ); st->total_brate = tmp; + + return; } -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP diff --git a/lib_com/calc_st_com.c b/lib_com/calc_st_com.c index 5f1c3776d9..2f2cc56333 100644 --- a/lib_com/calc_st_com.c +++ b/lib_com/calc_st_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------------- diff --git a/lib_com/cb_shape.c b/lib_com/cb_shape.c index b44c46ab0f..364ed639f3 100644 --- a/lib_com/cb_shape.c +++ b/lib_com/cb_shape.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * cb_shape() diff --git a/lib_com/cldfb.c b/lib_com/cldfb.c index 1d9fefcebb..1490703aee 100644 --- a/lib_com/cldfb.c +++ b/lib_com/cldfb.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "stat_dec.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" #if __STDC_VERSION__ >= 199901L #if defined __ICL @@ -706,8 +706,7 @@ ivas_error openCldfb( HANDLE_CLDFB_FILTER_BANK hs; int16_t buf_len; - hs = (HANDLE_CLDFB_FILTER_BANK) count_malloc( sizeof( CLDFB_FILTER_BANK ) ); - if ( hs == NULL ) + if ( ( hs = (HANDLE_CLDFB_FILTER_BANK) malloc( sizeof( CLDFB_FILTER_BANK ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for CLDFB" ); } @@ -728,8 +727,7 @@ ivas_error openCldfb( buf_len = hs->p_filter_length; } - hs->cldfb_state = (float *) count_malloc( buf_len * sizeof( float ) ); - if ( hs->cldfb_state == NULL ) + if ( ( hs->cldfb_state = (float *) malloc( buf_len * sizeof( float ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for CLDFB" ); } @@ -885,16 +883,19 @@ void deleteCldfb( { HANDLE_CLDFB_FILTER_BANK hs = *h_cldfb; - if ( hs ) + if ( h_cldfb == NULL || *h_cldfb == NULL ) { - if ( hs->cldfb_state ) - { - count_free( hs->cldfb_state ); - } - count_free( hs ); - *h_cldfb = NULL; + return; } + if ( hs->cldfb_state ) + { + free( hs->cldfb_state ); + } + + free( hs ); + *h_cldfb = NULL; + return; } @@ -1148,8 +1149,7 @@ ivas_error cldfb_save_memory( hs->memory_length = hs->p_filter_length; } - hs->memory = (float *) count_malloc( hs->memory_length * sizeof( float ) ); - if ( hs->memory == NULL ) + if ( ( hs->memory = (float *) malloc( hs->memory_length * sizeof( float ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CLDFB\n" ); } @@ -1199,7 +1199,7 @@ void cldfb_restore_memory( } hs->memory_length = 0; - count_free( hs->memory ); + free( hs->memory ); hs->memory = NULL; return; diff --git a/lib_com/cng_exc.c b/lib_com/cng_exc.c index 62955ee955..9f0a22320e 100644 --- a/lib_com/cng_exc.c +++ b/lib_com/cng_exc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local constants diff --git a/lib_com/cnst.h b/lib_com/cnst.h index eda4d0f120..75f1681809 100644 --- a/lib_com/cnst.h +++ b/lib_com/cnst.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -629,6 +629,9 @@ enum #define CLDFB_NO_COL_MAX_SWITCH_BFI 10 /* CLDFB resampling - max number of CLDFB col. for switching, BFI */ #define CLDFB_OVRLP_MIN_SLOTS 3 /* CLDFB resampling - minimize processing to minimum required for transition frame ACELP->TCX/HQ */ #define INV_CLDFB_BANDWIDTH ( 1.f / 800.f ) +#ifdef SPLIT_REND_PLC +#define CLDFB_PLC_XF 2 /* Length of cross-fade into first good frame after frame loss in CLDFB cols. */ +#endif #define L_FILT_2OVER3 12 #define L_FILT_2OVER3_LP 3 @@ -1391,6 +1394,25 @@ enum #define NPARTCLDFB 10 #define NPART_SHAPING 62 +#ifdef ERI_FDCNGVQ_LOW_ROM +#define FDCNG_VQ_MAX_LEN FD_CNG_maxN_37bits +#define FDCNG_VQ_DCT_NSEGM 4 +#define FDCNG_VQ_DCT_MINTRUNC 8 +#define FDCNG_VQ_DCT_MAXTRUNC 18 +#define FDCNG_VQ_MAX_LEN_WB 21 + +#define FDCNG_VQ_DCT_NPOST 8 + +typedef enum _DCTTYPE +{ + DCT_T2_24_XX = 0, /* truncated DCT_T2_24 */ + IDCT_T2_XX_24 = 1, + DCT_T2_21_XX = 2, /* truncated DCT_T2_21 */ + IDCT_T2_XX_21 = 3 +} DCTTYPE; + +#endif + #define MSSUBFRLEN 12 #define MSNUMSUBFR 6 #define MSBUFLEN 5 @@ -1513,7 +1535,10 @@ enum #define TOD_NSPEC 80 /* number of spectral bins of the tonal detector */ #define TOD_THR_MASS 0.86f /* initial value for the adaptive threshold of the tonal detector */ #define P2A_FACT 0.9f /* long-term averaging factor for peak-to-average ratio */ -#define THR_P2A 80.0f /* threshold to detect strongly peaky signals */ +#ifdef FIX_SP2A +#define THR_P2A_HIGH 95.0f /* higher threshold to detect strongly peaky signals at low bitrates*/ +#endif +#define THR_P2A 80.0f /* lower threshold to detect strongly peaky signals at higher bitrates */ /*----------------------------------------------------------------------------------* * LD music post-filter constants @@ -1682,6 +1707,13 @@ enum #define HALF_D_STAB_TBL_FX ( (Word16) 422 ) /* Q13 0.1013138/2.0 */ #define NUM_ENV_STAB_PLC_STATES 2 /* Number of states of markov model */ +#define ENV_STAB_EST1 2.93f /* env_stab estimation coefficient 1 */ +#define ENV_STAB_EST2 (-2.20f) /* env_stab estimation coefficient 2 */ +#define ENV_STAB_EST3 0.741f /* env_stab estimation coefficient 3 */ +#define STAB_FAC_EST1 1.093f /* stab_fac HQ estimation coefficient 1 */ +#define STAB_FAC_EST2 (-5.84e-05f) /* stab_fac HQ estimation coefficient 2, including Q12 scaling */ +#define STAB_FAC_EST3 0.125f /* stab_fac HQ estimation coefficient 3 */ + #define ATT_LIM_HANGOVER 150 /* Number of hangover frames for disabling stability dependent attenuation */ #define DELTA_TH 5.0f /* Delta energy threshold for transient detection for envelope stability */ #define ENERGY_TH 100.0f /* Energy threshold for transient detection */ diff --git a/lib_com/codec_tcx_common.c b/lib_com/codec_tcx_common.c index 98a2fb4bd0..7bb6dac40b 100644 --- a/lib_com/codec_tcx_common.c +++ b/lib_com/codec_tcx_common.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * tcxGetNoiseFillingTilt() diff --git a/lib_com/common_api_types.h b/lib_com/common_api_types.h index b198758f7d..dc35a4b1bf 100644 --- a/lib_com/common_api_types.h +++ b/lib_com/common_api_types.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,6 +38,7 @@ #include "options.h" #include #include +#include "ivas_error.h" /*----------------------------------------------------------------------------------* * Common API constants @@ -49,6 +50,9 @@ #define IVAS_CLDFB_NO_CHANNELS_MAX ( 60 ) #define IVAS_MAX_INPUT_LFE_CHANNELS 4 +#define RENDERER_HEAD_POSITIONS_PER_FRAME 4 + + /*----------------------------------------------------------------------------------* * Common API structures *----------------------------------------------------------------------------------*/ @@ -67,7 +71,6 @@ typedef struct _IVAS_ENC_CHANNEL_AWARE_CONFIG int16_t fec_offset; } IVAS_ENC_CHANNEL_AWARE_CONFIG; - typedef struct _IVAS_ISM_METADATA { float azimuth; @@ -75,6 +78,8 @@ typedef struct _IVAS_ISM_METADATA float radius; float spread; float gainFactor; + float yaw; + float pitch; } IVAS_ISM_METADATA; typedef struct @@ -108,11 +113,18 @@ typedef struct ivas_split_rend_bits_t #endif } ivas_split_rend_bits_t, IVAS_SPLIT_REND_BITS, *IVAS_SPLIT_REND_BITS_HANDLE; #endif +typedef struct +{ + float x, y, z; +} IVAS_VECTOR3; typedef struct ivas_masa_metadata_frame_struct *IVAS_MASA_METADATA_HANDLE; -typedef struct ivas_masa_qmetadata_frame_struct *IVAS_MASA_QMETADATA_HANDLE; +typedef struct ivas_masa_decoder_ext_out_meta_struct *MASA_DECODER_EXT_OUT_META_HANDLE; typedef struct TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_HANDLE; +typedef struct ivas_hrtfs_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE; +typedef struct ivas_hrtfs_fastconv_struct *IVAS_DEC_HRTF_FASTCONV_HANDLE; +typedef struct ivas_hrtfs_parambin_struct *IVAS_DEC_HRTF_PARAMBIN_HANDLE; #if ( defined DEBUGGING ) || ( defined SPLIT_REND_WITH_HEAD_ROT ) typedef enum @@ -123,6 +135,15 @@ typedef enum } IVAS_RENDER_TYPE_OVERRIDE; #endif +typedef struct +{ + float azimuth; + float elevation; + float radius; + float yaw; + float pitch; +} IVAS_REND_AudioObjectPosition; + typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG { int16_t override; @@ -139,7 +160,8 @@ typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG #ifdef SPLIT_REND_WITH_HEAD_ROT #ifdef SPLIT_REND_TD_POSE_CORRECTION -typedef enum { +typedef enum +{ IVAS_SPLIT_REND_POSE_CORRECTION_MODE_CLDFB, IVAS_SPLIT_REND_POSE_CORRECTION_MODE_TD, } IVAS_SPLIT_REND_POSE_CORRECTION_MODE; @@ -169,10 +191,10 @@ typedef struct _IVAS_RENDER_CONFIG IVAS_RENDER_TYPE_OVERRIDE renderer_type_override; #endif IVAS_ROOM_ACOUSTICS_CONFIG_DATA room_acoustics; - #ifdef SPLIT_REND_WITH_HEAD_ROT IVAS_SPLIT_REND_CONFIG_DATA split_rend_config; #endif + float directivity[3]; } IVAS_RENDER_CONFIG_DATA, *IVAS_RENDER_CONFIG_HANDLE; typedef struct _IVAS_LS_CUSTOM_LAYOUT @@ -191,15 +213,17 @@ typedef struct ivas_LS_setup_custom IVAS_LSSETUP_CUSTOM_STRUCT; typedef struct _IVAS_JBM_TRACE_DATA { - double playTime; - int16_t partialCopyOffset; + uint32_t systemTimestamp_ms; + uint16_t extBufferedSamples; + uint16_t lastDecodedWasActive; + int32_t output_Fs; + int16_t dataUnit_flag; uint16_t sequenceNumber; uint32_t timeStamp; uint32_t rcvTime; - int16_t lastDecodedWasActive; - int16_t partial_frame_flag; - int16_t dataUnit_flag; + int16_t partial_frame; + int16_t partialCopyOffset; } IVAS_JBM_TRACE_DATA; diff --git a/lib_com/control.h b/lib_com/control.h index 2b3f92b535..725163728d 100644 --- a/lib_com/control.h +++ b/lib_com/control.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_com/core_com_config.c b/lib_com/core_com_config.c index 7ffb4f0e9f..7f9b385c3f 100644 --- a/lib_com/core_com_config.c +++ b/lib_com/core_com_config.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #endif #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" #include "ivas_prot.h" @@ -247,28 +247,24 @@ int16_t getResq( *-------------------------------------------------------------------*/ int16_t getTnsAllowed( - const int32_t total_brate, /* i : total bitrate */ - const int16_t igf, /* i : flag indicating IGF activity*/ - const int16_t element_mode, /* i : IVAS element mode */ - const MCT_CHAN_MODE mct_chan_mode /* i : MCT channel mode */ + const int32_t total_brate, /* i : total bitrate */ + const int16_t igf, /* i : flag indicating IGF activity*/ + const int16_t element_mode /* i : IVAS element mode */ ) { int16_t tnsAllowed = 0; - if ( mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( igf ) { - if ( igf ) - { - if ( total_brate > HQ_16k40 || ( ( total_brate > HQ_13k20 ) && element_mode == IVAS_CPE_DFT ) ) - { - tnsAllowed = 1; - } - } - else if ( total_brate > HQ_32k ) + if ( total_brate > HQ_16k40 || ( ( total_brate > HQ_13k20 ) && element_mode == IVAS_CPE_DFT ) ) { tnsAllowed = 1; } } + else if ( total_brate > HQ_32k ) + { + tnsAllowed = 1; + } return tnsAllowed; } @@ -411,16 +407,11 @@ int16_t getIgfPresent( const int16_t element_mode, /* i : IVAS element mode */ const int32_t total_brate, /* i : total bitrate */ const int16_t bwidth, /* i : audio bandwidth */ - const int16_t rf_mode, /* i : flag to signal the RF mode */ - const int16_t mct_chan_mode /* i : MCT channel mode */ + const int16_t rf_mode /* i : flag to signal the RF mode */ ) { int16_t igfPresent = 0; - if ( mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - return igfPresent; - } if ( bwidth == SWB ) { @@ -808,9 +799,7 @@ void init_tcx_cfg( const int16_t infoIGFStopFreq, const int16_t element_mode, const int16_t ini_frame, - const int16_t MCT_flag, - const MCT_CHAN_MODE mct_chan_mode /* i : MDCT channel mode */ -) + const int16_t MCT_flag ) { int16_t i; int16_t mdctWindowLength; @@ -840,13 +829,9 @@ void init_tcx_cfg( /* set number of coded lines */ hTcxCfg->tcx_coded_lines = getNumTcxCodedLines( bwidth ); - if ( mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - hTcxCfg->tcx_coded_lines = MCT_LFE_MAX_LINE; - } /* TNS in TCX */ hTcxCfg->pCurrentTnsConfig = NULL; - hTcxCfg->fIsTNSAllowed = getTnsAllowed( total_brate, igf, element_mode, mct_chan_mode ); + hTcxCfg->fIsTNSAllowed = getTnsAllowed( total_brate, igf, element_mode ); if ( hTcxCfg->fIsTNSAllowed ) { diff --git a/lib_com/deemph.c b/lib_com/deemph.c index 20b5c43719..9f4463d6a8 100644 --- a/lib_com/deemph.c +++ b/lib_com/deemph.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "debug.h" #endif #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * deemph() diff --git a/lib_com/delay_comp.c b/lib_com/delay_comp.c index 3d3b5ddf54..bc5a1784f1 100644 --- a/lib_com/delay_comp.c +++ b/lib_com/delay_comp.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "prot.h" #include "ivas_cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------------- * get_delay() @@ -51,12 +51,10 @@ /*! r: delay value in ns */ int32_t get_delay( - const int16_t enc_dec, /* i : encoder/decoder flag */ - const int32_t io_fs, /* i : input/output sampling frequency */ - const IVAS_FORMAT ivas_format, /* i : IVAS format */ - HANDLE_CLDFB_FILTER_BANK hCldfb, /* i : Handle of Cldfb analysis */ - RENDERER_TYPE renderer_type, /* i : IVAS rendering type */ - const int32_t binaural_latency_ns /* i : binaural renderer HRTF delay in ns */ + const int16_t enc_dec, /* i : encoder/decoder flag */ + const int32_t io_fs, /* i : input/output sampling frequency */ + const IVAS_FORMAT ivas_format, /* i : IVAS format */ + HANDLE_CLDFB_FILTER_BANK hCldfb /* i : Handle of Cldfb analysis */ #ifdef SPLIT_REND_WITH_HEAD_ROT , AUDIO_CONFIG output_config /* i : decoder output config */ @@ -74,6 +72,11 @@ int32_t get_delay( else /* IVAS */ { delay = IVAS_ENC_DELAY_NS; + + if ( ivas_format == MASA_FORMAT ) + { + delay = 0; /* All delay is compensated in the decoder with MASA */ + } } if ( ivas_format == SBA_FORMAT ) @@ -98,20 +101,22 @@ int32_t get_delay( else /* IVAS */ { delay = IVAS_DEC_DELAY_NS; + #ifdef SPLIT_REND_WITH_HEAD_ROT if ( output_config != AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB ) #endif { - if ( hCldfb != NULL || renderer_type == RENDERER_BINAURAL_OBJECTS_TD ) + if ( hCldfb != NULL ) { + /* compensate for filterbank delay */ delay += IVAS_FB_DEC_DELAY_NS; } } - /* compensate for Binaural renderer HRTF delay */ + if ( ivas_format == MASA_FORMAT ) { - delay += binaural_latency_ns; + delay += IVAS_ENC_DELAY_NS; /* Compensate also the encoder delay in the decoder with MASA */ } } } diff --git a/lib_com/disclaimer.c b/lib_com/disclaimer.c index 749f9fcce2..ed55a45b06 100644 --- a/lib_com/disclaimer.c +++ b/lib_com/disclaimer.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,7 +33,6 @@ /*==================================================================================== EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0 ====================================================================================*/ -/* WMC_TOOL_SKIP_FILE (basic ops file) */ #include #include "options.h" @@ -42,6 +41,8 @@ #endif #include "prot.h" +#define WMC_TOOL_SKIP + int16_t print_disclaimer( FILE *fPtr ) { diff --git a/lib_com/dlpc_bfi.c b/lib_com/dlpc_bfi.c index 33ba286c3c..b894b845f8 100644 --- a/lib_com/dlpc_bfi.c +++ b/lib_com/dlpc_bfi.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #endif #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * routine: dlpc_bfi() diff --git a/lib_com/edct.c b/lib_com/edct.c index 8fe84049a6..6f6d6c32b6 100644 --- a/lib_com/edct.c +++ b/lib_com/edct.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" #include /* for cosf, sinf */ static ivas_error get_edct_table( diff --git a/lib_com/enh1632.c b/lib_com/enh1632.c index 985398eec9..1dd192faaa 100644 --- a/lib_com/enh1632.c +++ b/lib_com/enh1632.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -30,7 +30,6 @@ *******************************************************************************************************/ -/* WMC_TOOL_SKIP_FILE (basic ops file) */ /* =========================================================================== File: ENH1632.C v.2.3 - 30.Nov.2009 @@ -90,6 +89,8 @@ #include #include "stl.h" +#define WMC_TOOL_SKIP + /***************************************************************************** * * Constants and Globals @@ -629,5 +630,4 @@ Word32 L_rotl( Word32 L_var1, Word16 var2, Word16 *var3 ) return ( L_var_out ); } - -/* end of file */ +#undef WMC_TOOL_SKIP diff --git a/lib_com/enh1632.h b/lib_com/enh1632.h index a46fb8dbe7..9216ea6c20 100644 --- a/lib_com/enh1632.h +++ b/lib_com/enh1632.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_com/enh40.c b/lib_com/enh40.c index 777bfffd8f..8a48cece39 100644 --- a/lib_com/enh40.c +++ b/lib_com/enh40.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -30,7 +30,6 @@ *******************************************************************************************************/ -/* WMC_TOOL_SKIP_FILE (basic ops file) */ /* =========================================================================== File: ENH40.C v.2.3 - 30.Nov.2009 @@ -93,6 +92,7 @@ * Include-Files * *****************************************************************************/ + #include #include #include "stl.h" @@ -100,6 +100,8 @@ #include #endif /* BASOP_NOGLOB */ +#define WMC_TOOL_SKIP + #ifdef _MSC_VER #pragma warning( disable : 4310 ) #endif @@ -161,7 +163,6 @@ #ifndef BASOP_NOGLOB Word40 L40_shl( Word40 L40_var1, Word16 var2 ) #else /* BASOP_NOGLOB */ - Word40 L40_shl_o( Word40 L40_var1, Word16 var2, Flag *Overflow ) #endif /* BASOP_NOGLOB */ { @@ -189,11 +190,10 @@ Word40 L40_shl_o( Word40 L40_var1, Word16 var2, Flag *Overflow ) { #if defined( _MSC_VER ) && ( _MSC_VER <= 1200 ) if ( L40_var_out > 0x003fffffffff ) - { #else if ( L40_var_out > 0x003fffffffffLL ) - { #endif + { #ifndef BASOP_NOGLOB Overflow = 1; exit( 1 ); @@ -258,11 +258,10 @@ Word40 L40_shl( Word40 L40_var1, Word16 var2 ) { #if defined( _MSC_VER ) && ( _MSC_VER <= 1200 ) if ( L40_var_out > 0x003fffffffff ) - { #else if ( L40_var_out > 0x003fffffffffLL ) - { #endif + { assert( 0 ); L40_var_out = MAX_40; break; @@ -542,7 +541,6 @@ Word40 L40_add( Word40 L40_var1, Word40 L40_var2 ) #ifndef BASOP_NOGLOB Word40 L40_sub( Word40 L40_var1, Word40 L40_var2 ) #else /* BASOP_NOGLOB */ - Word40 L40_sub_o( Word40 L40_var1, Word40 L40_var2, Flag *Overflow ) #endif /* BASOP_NOGLOB */ { @@ -1308,4 +1306,4 @@ Word40 L40_shl_r( Word40 L40_var1, Word16 var2 ) } -/* end of file */ +#undef WMC_TOOL_SKIP diff --git a/lib_com/enh40.h b/lib_com/enh40.h index d2a84652d4..a55bd925e9 100644 --- a/lib_com/enh40.h +++ b/lib_com/enh40.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_com/enhancer.c b/lib_com/enhancer.c index 2ed4271c05..d0eeeb76c7 100644 --- a/lib_com/enhancer.c +++ b/lib_com/enhancer.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local function prototypes diff --git a/lib_com/enr_1_az.c b/lib_com/enr_1_az.c index f5f88ed55c..2b66a14d72 100644 --- a/lib_com/enr_1_az.c +++ b/lib_com/enr_1_az.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * enr_1_Az() diff --git a/lib_com/env_adj.c b/lib_com/env_adj.c index a169311615..03b7d6cef6 100644 --- a/lib_com/env_adj.c +++ b/lib_com/env_adj.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * env_adj() diff --git a/lib_com/env_stab.c b/lib_com/env_stab.c index abe93eddce..b4da4ce9d7 100644 --- a/lib_com/env_stab.c +++ b/lib_com/env_stab.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" #ifdef DEBUGGING #include "assert.h" #endif @@ -63,10 +63,11 @@ /*--------------------------------------------------------------------------*/ float env_stability( - const int16_t *ynrm, /* i : Norm vector for current frame */ - const int16_t nb_sfm, /* i : Number of sub-bands */ - int16_t *mem_norm, /* i/o: Norm vector memory from past frame */ - int16_t *mem_env_delta /* i/o: Envelope stability memory for smoothing*/ + const int16_t *ynrm, /* i : Norm vector for current frame */ + const int16_t nb_sfm, /* i : Number of sub-bands */ + int16_t *mem_norm, /* i/o: Norm vector memory from past frame */ + int16_t *mem_env_delta, /* i/o: Envelope stability memory for smoothing*/ + const int16_t core_switching_flag /* i : Core switching flag */ ) { Word16 env_delta; @@ -82,53 +83,68 @@ float env_stability( Flag Overflow; #endif /* BASOP_NOGLOB */ - /* Calculate envelope stability parameter */ - L_env_delta = L_deposit_l( 0 ); - for ( i = 0; i < nb_sfm; i++ ) + if ( core_switching_flag ) { - tmp = sub( mem_norm[i], ynrm[i] ); - L_env_delta = L_mac0( L_env_delta, tmp, tmp ); - mem_norm[i] = ynrm[i]; + for ( i = 0; i < nb_sfm; i++ ) + { + mem_norm[i] = ynrm[i]; + } +#ifdef BASOP_NOGLOB + Overflow = 0; + env_delta = shl_o( *mem_env_delta, 1, &Overflow ); +#else + env_delta = shl_o( *mem_env_delta, 1 ); +#endif } + else + { + /* Calculate envelope stability parameter */ + L_env_delta = L_deposit_l( 0 ); + for ( i = 0; i < nb_sfm; i++ ) + { + tmp = sub( mem_norm[i], ynrm[i] ); + L_env_delta = L_mac0( L_env_delta, tmp, tmp ); + mem_norm[i] = ynrm[i]; + } #ifdef DEBUGGING - assert( nb_sfm == 27 || nb_sfm == 26 ); + assert( nb_sfm == 27 || nb_sfm == 26 ); #endif - inv_nb_sfm = 19418; /* Q19 */ - if ( nb_sfm == 26 ) - { - inv_nb_sfm = 20165; /* Q19 */ - } - exp = norm_l( L_env_delta ); - L_env_delta = Mult_32_16( L_shl( L_env_delta, exp ), inv_nb_sfm ); /* 0+exp+19-15 */ + inv_nb_sfm = 19418; /* Q19 */ + if ( nb_sfm == 26 ) + { + inv_nb_sfm = 20165; /* Q19 */ + } + exp = norm_l( L_env_delta ); + L_env_delta = Mult_32_16( L_shl( L_env_delta, exp ), inv_nb_sfm ); /* 0+exp+19-15 */ - L_tmp = Sqrt_l( L_env_delta, &exp2 ); /* exp+4+31+exp2 */ + L_tmp = Sqrt_l( L_env_delta, &exp2 ); /* exp+4+31+exp2 */ - exp = add( 35, add( exp, exp2 ) ); - if ( sub( s_and( exp, 1 ), 1 ) == 0 ) - { - L_tmp = Mult_32_16( L_tmp, 23170 ); /* 1/sqrt(2) in Q15 */ - } - exp = shr( exp, 1 ); + exp = add( 35, add( exp, exp2 ) ); + if ( sub( s_and( exp, 1 ), 1 ) == 0 ) + { + L_tmp = Mult_32_16( L_tmp, 23170 ); /* 1/sqrt(2) in Q15 */ + } + exp = shr( exp, 1 ); #ifndef BASOP_NOGLOB - env_delta = round_fx( L_shl( L_tmp, sub( 26, exp ) ) ); /* Q10 */ - L_tmp = L_mult0( 26214, env_delta ); /* 26214 is 0.1 in Q18. Q28 */ - L_tmp = L_mac( L_tmp, 29491, *mem_env_delta ); /* 29491 is 0.9 in Q15. Q28 */ - *mem_env_delta = round_fx( L_tmp ); /* Q12 */ -#else /* BASOP_NOGLOB */ - env_delta = round_fx_o( L_shl_o( L_tmp, sub( 26, exp ), &Overflow ), &Overflow ); /* Q10 */ - L_tmp = L_mult0( 26214, env_delta ); /* 26214 is 0.1 in Q18. Q28 */ - L_tmp = L_mac_o( L_tmp, 29491, *mem_env_delta, &Overflow ); /* 29491 is 0.9 in Q15. Q28 */ - *mem_env_delta = round_fx_o( L_tmp, &Overflow ); /* Q12 */ -#endif /* BASOP_NOGLOB */ - Overflow = 0; + env_delta = round_fx( L_shl( L_tmp, sub( 26, exp ) ) ); /* Q10 */ + L_tmp = L_mult0( 26214, env_delta ); /* 26214 is 0.1 in Q18. Q28 */ + L_tmp = L_mac( L_tmp, 29491, *mem_env_delta ); /* 29491 is 0.9 in Q15. Q28 */ + *mem_env_delta = round_fx( L_tmp ); /* Q12 */ +#else /* BASOP_NOGLOB */ + env_delta = round_fx_o( L_shl_o( L_tmp, sub( 26, exp ), &Overflow ), &Overflow ); /* Q10 */ + L_tmp = L_mult0( 26214, env_delta ); /* 26214 is 0.1 in Q18. Q28 */ + L_tmp = L_mac_o( L_tmp, 29491, *mem_env_delta, &Overflow ); /* 29491 is 0.9 in Q15. Q28 */ + *mem_env_delta = round_fx_o( L_tmp, &Overflow ); /* Q12 */ +#endif /* BASOP_NOGLOB */ + Overflow = 0; #ifndef BASOP_NOGLOB - env_delta = round_fx( L_shl( L_tmp, 1 ) ); /* Q13 */ -#else /* BASOP_NOGLOB */ - env_delta = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /* Q13 */ -#endif /* BASOP_NOGLOB */ - + env_delta = round_fx( L_shl( L_tmp, 1 ) ); /* Q13 */ +#else /* BASOP_NOGLOB */ + env_delta = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /* Q13 */ +#endif /* BASOP_NOGLOB */ + } if ( Overflow != 0 ) /* Saturated due to the above up-shifting operation. */ { env_stab = stab_trans_fx[L_STAB_TBL - 1]; /* The highest quantized index. */ diff --git a/lib_com/env_stab_trans.c b/lib_com/env_stab_trans.c index 6a8ca2b266..a2d4492b3f 100644 --- a/lib_com/env_stab_trans.c +++ b/lib_com/env_stab_trans.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * env_stab_transient_detect() diff --git a/lib_com/est_tilt.c b/lib_com/est_tilt.c index e126f761f8..8073e39dfb 100644 --- a/lib_com/est_tilt.c +++ b/lib_com/est_tilt.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * est_tilt() diff --git a/lib_com/fd_cng_com.c b/lib_com/fd_cng_com.c index 98b5a3df75..f2dbf746b6 100644 --- a/lib_com/fd_cng_com.c +++ b/lib_com/fd_cng_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------- @@ -68,9 +68,7 @@ ivas_error createFdCngCom( HANDLE_FD_CNG_COM hs; /* Allocate memory */ - hs = (HANDLE_FD_CNG_COM) count_malloc( sizeof( FD_CNG_COM ) ); - - if ( hs == NULL ) + if ( ( hs = (HANDLE_FD_CNG_COM) malloc( sizeof( FD_CNG_COM ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FD CNG COM" ); } @@ -162,7 +160,7 @@ void deleteFdCngCom( if ( hsCom != NULL ) { - count_free( hsCom ); + free( hsCom ); *hFdCngCom = NULL; } diff --git a/lib_com/fft.c b/lib_com/fft.c index ed0d6604e6..e6121e818a 100644 --- a/lib_com/fft.c +++ b/lib_com/fft.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" #ifdef _MSC_VER #pragma warning( disable : 4310 ) @@ -6393,7 +6393,7 @@ void rfft( } -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP #define SCALEFACTOR8 ( 4 ) #define SCALEFACTOR64 ( 7 ) @@ -6766,3 +6766,5 @@ void BASOP_cfft( return; } + +#undef WMC_TOOL_SKIP diff --git a/lib_com/fft_cldfb.c b/lib_com/fft_cldfb.c index 6967f87bcd..0ea848abdb 100644 --- a/lib_com/fft_cldfb.c +++ b/lib_com/fft_cldfb.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include #include "prot.h" #include "ivas_cnst.h" -#include "wmops.h" +#include "wmc_auto.h" #if __STDC_VERSION__ >= 199901L #if defined __ICL diff --git a/lib_com/fft_rel.c b/lib_com/fft_rel.c index a8b96e8217..46ee5e9434 100644 --- a/lib_com/fft_rel.c +++ b/lib_com/fft_rel.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local constants diff --git a/lib_com/fill_spectrum.c b/lib_com/fill_spectrum.c index a3dbcf304b..6694824879 100644 --- a/lib_com/fill_spectrum.c +++ b/lib_com/fill_spectrum.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * fill_spectrum() diff --git a/lib_com/findpulse.c b/lib_com/findpulse.c index e26980d225..3383397bcf 100644 --- a/lib_com/findpulse.c +++ b/lib_com/findpulse.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include #include "prot.h" #include "cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /*----------------------------------------------------------------------------------* * findpulse() diff --git a/lib_com/fine_gain_bits.c b/lib_com/fine_gain_bits.c index 240b174bef..c4c5ce3fca 100644 --- a/lib_com/fine_gain_bits.c +++ b/lib_com/fine_gain_bits.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "rom_com.h" #include "prot.h" #include -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------------- * subband_gain_bits() diff --git a/lib_com/frame_ener.c b/lib_com/frame_ener.c index d5c38e6640..f44cb099ce 100644 --- a/lib_com/frame_ener.c +++ b/lib_com/frame_ener.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*----------------------------------------------------------------------------------* * fer_energy() diff --git a/lib_com/get_gain.c b/lib_com/get_gain.c index 320d5ad12c..e3457128fe 100644 --- a/lib_com/get_gain.c +++ b/lib_com/get_gain.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "debug.h" #endif #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*----------------------------------------------------------------------------------* * get_gain() diff --git a/lib_com/gs_bitallocation.c b/lib_com/gs_bitallocation.c index 8458fb754f..7f7809428f 100644 --- a/lib_com/gs_bitallocation.c +++ b/lib_com/gs_bitallocation.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "rom_com.h" #include "prot.h" #include "ivas_prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local function prototypes diff --git a/lib_com/gs_gains.c b/lib_com/gs_gains.c index ea23b27781..40626468b6 100644 --- a/lib_com/gs_gains.c +++ b/lib_com/gs_gains.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local function prototypes diff --git a/lib_com/gs_inact_switching.c b/lib_com/gs_inact_switching.c index a9d2a80046..cd380e86e0 100644 --- a/lib_com/gs_inact_switching.c +++ b/lib_com/gs_inact_switching.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_com/gs_noisefill.c b/lib_com/gs_noisefill.c index 2885f324ca..a92aec0751 100644 --- a/lib_com/gs_noisefill.c +++ b/lib_com/gs_noisefill.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * gs_noisf() diff --git a/lib_com/gs_preech.c b/lib_com/gs_preech.c index b7ab89a879..5a98f40936 100644 --- a/lib_com/gs_preech.c +++ b/lib_com/gs_preech.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_com/guided_plc_util.c b/lib_com/guided_plc_util.c index cb14c503c8..884c2beeb8 100644 --- a/lib_com/guided_plc_util.c +++ b/lib_com/guided_plc_util.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #include "options.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local function prototypes diff --git a/lib_com/hp50.c b/lib_com/hp50.c index 58b15a4211..3624fabb44 100644 --- a/lib_com/hp50.c +++ b/lib_com/hp50.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -34,14 +34,13 @@ EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0 ====================================================================================*/ -#include "typedef.h" #include #include "options.h" #ifdef DEBUGGING #include "debug.h" #endif #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /* diff --git a/lib_com/hq2_bit_alloc.c b/lib_com/hq2_bit_alloc.c index b46f54480e..6b53adec8f 100644 --- a/lib_com/hq2_bit_alloc.c +++ b/lib_com/hq2_bit_alloc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -45,9 +45,9 @@ #include "basop_util.h" #include "basop_mpy.h" #include "stl.h" -#include "wmops.h" +#include "wmc_auto.h" -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP /*------------------------------------------------------------------- * Local constants @@ -375,6 +375,11 @@ void hq2_bit_alloc_har( Word32 L_y[BANDS_MAX]; +#ifdef BASOP_NOGLOB + Flag Overflow; + Overflow = 0; +#endif + grp_rngmax_fx[0] = 0; grp_rngmax_fx[1] = 0; @@ -639,7 +644,12 @@ void hq2_bit_alloc_har( L_temp = Mpy_32_16( L_Ravg_sub[GRP_SB - 1], sub( GRP_SB, 1 ) ); /* Qbe+0+1 */ L_temp = Mpy_32_16( L_temp, Inv_norm_sum_fx ); /* Qbe+1+QIpb+1 */ +#ifdef BASOP_NOGLOB + lf_hf_ge_r_fx = round_fx_o( L_shl_o( L_temp, sub( 15 + 16, sub( add( SWB_BWE_LR_Qbe, QIns ), 30 ) ), &Overflow ), &Overflow ); + Overflow = 0; /* reset BASOP Overflow */ +#else lf_hf_ge_r_fx = round_fx( L_shl( L_temp, sub( 15 + 16, sub( add( SWB_BWE_LR_Qbe, QIns ), 30 ) ) ) ); +#endif exp_normn = norm_s( norm_sum_fx ); exp_normn = sub( exp_normn, 1 ); @@ -1030,3 +1040,5 @@ void hq2_bit_alloc( } return; } + +#undef WMC_TOOL_SKIP diff --git a/lib_com/hq2_core_com.c b/lib_com/hq2_core_com.c index 33411f9334..aafe578b42 100644 --- a/lib_com/hq2_core_com.c +++ b/lib_com/hq2_core_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -45,7 +45,7 @@ #include "prot.h" #include "basop_util.h" #include "basop_proto_func.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * mdct_spectrum_denorm() @@ -306,7 +306,7 @@ void reverse_transient_frame_energies( return; } -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP void bit_allocation_second_fx( Word32 *Rk, Word32 *Rk_sort, @@ -415,7 +415,7 @@ void bit_allocation_second_fx( return; } -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP /*--------------------------------------------------------------------------* * spt_shorten_domain_pre() diff --git a/lib_com/hq2_noise_inject.c b/lib_com/hq2_noise_inject.c index 3eac77d81b..0404056dd1 100644 --- a/lib_com/hq2_noise_inject.c +++ b/lib_com/hq2_noise_inject.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * hq2_noise_inject() diff --git a/lib_com/hq_bit_allocation.c b/lib_com/hq_bit_allocation.c index fbb655e4f3..faba9f8da9 100644 --- a/lib_com/hq_bit_allocation.c +++ b/lib_com/hq_bit_allocation.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * hq_bit_allocation() diff --git a/lib_com/hq_conf.c b/lib_com/hq_conf.c index ed548171a1..ac92981593 100644 --- a/lib_com/hq_conf.c +++ b/lib_com/hq_conf.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * hq_configure() diff --git a/lib_com/hq_tools.c b/lib_com/hq_tools.c index 7a154a00a6..1d89d03145 100644 --- a/lib_com/hq_tools.c +++ b/lib_com/hq_tools.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * Local function prototypes diff --git a/lib_com/hvq_pvq_bitalloc.c b/lib_com/hvq_pvq_bitalloc.c index 9357a37964..2808030ae6 100644 --- a/lib_com/hvq_pvq_bitalloc.c +++ b/lib_com/hvq_pvq_bitalloc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------*/ /* Function hvq_pvq_bitalloc */ diff --git a/lib_com/ifft_rel.c b/lib_com/ifft_rel.c index d0200f87be..fc267a7a10 100644 --- a/lib_com/ifft_rel.c +++ b/lib_com/ifft_rel.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------* * Local constants diff --git a/lib_com/igf_base.c b/lib_com/igf_base.c index 70b202770a..ac19651009 100644 --- a/lib_com/igf_base.c +++ b/lib_com/igf_base.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #endif #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * IGF_ApplyTransFac() diff --git a/lib_com/index_pvq_opt.c b/lib_com/index_pvq_opt.c index e09c831dab..c762e96c71 100644 --- a/lib_com/index_pvq_opt.c +++ b/lib_com/index_pvq_opt.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * LOCAL DEFINITIONS @@ -89,8 +89,7 @@ static int16_t local_norm_l_opt( { int16_t l32res; -#define WMC_TOOL_MAN - MAC( 1 ); +#define WMC_TOOL_SKIP if ( l32var == (int32_t) MINNEG ) { @@ -115,7 +114,7 @@ static int16_t local_norm_l_opt( } } } -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP return ( l32res ); } diff --git a/lib_com/int_lsp.c b/lib_com/int_lsp.c index 5e1175ab1e..ff1c9cace4 100644 --- a/lib_com/int_lsp.c +++ b/lib_com/int_lsp.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * int_lsp() diff --git a/lib_com/interleave_spectrum.c b/lib_com/interleave_spectrum.c index ae1432a1eb..6046bf8f20 100644 --- a/lib_com/interleave_spectrum.c +++ b/lib_com/interleave_spectrum.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * interleave_spectrum() diff --git a/lib_com/interpol.c b/lib_com/interpol.c index da4b41a9f9..4172c4acf7 100644 --- a/lib_com/interpol.c +++ b/lib_com/interpol.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "debug.h" #endif #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * interpolation() @@ -70,10 +70,10 @@ float interpolation( for ( i = 0; i < nb_coef; i++ ) { s += ( *x1-- ) * ( *c1 ) + ( *x2++ ) * ( *c2 ); -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP c1 += up_samp; c2 += up_samp; -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP } return s; diff --git a/lib_com/isf_dec_amr_wb.c b/lib_com/isf_dec_amr_wb.c index 79eeda7b54..d51731d1c0 100644 --- a/lib_com/isf_dec_amr_wb.c +++ b/lib_com/isf_dec_amr_wb.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * isf_dec_amr_wb() diff --git a/lib_com/ivas_agc_com.c b/lib_com/ivas_agc_com.c index b02853555b..e39b8df82d 100644 --- a/lib_com/ivas_agc_com.c +++ b/lib_com/ivas_agc_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include "debug.h" #endif #include -#include "wmops.h" +#include "wmc_auto.h" #include "prot.h" /*------------------------------------------------------------------------------------------* diff --git a/lib_com/ivas_arith.c b/lib_com/ivas_arith.c index 9edbf5f53c..3b8b75138b 100644 --- a/lib_com/ivas_arith.c +++ b/lib_com/ivas_arith.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -35,7 +35,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" #include "prot.h" #include "ivas_prot.h" #include "stat_dec.h" diff --git a/lib_com/ivas_avq_pos_reorder_com.c b/lib_com/ivas_avq_pos_reorder_com.c index 66152d26fd..6f75fa2201 100644 --- a/lib_com/ivas_avq_pos_reorder_com.c +++ b/lib_com/ivas_avq_pos_reorder_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -36,7 +36,7 @@ #include "debug.h" #endif #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------* * ordr_esti() diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h index c90f035205..6d8839b51d 100644 --- a/lib_com/ivas_cnst.h +++ b/lib_com/ivas_cnst.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -36,7 +36,6 @@ #include #include "options.h" #include "cnst.h" -#include "ivas_error.h" /* clang-format off */ @@ -105,13 +104,14 @@ typedef enum AUDIO_CONFIG_BINAURAL_ROOM, /* binaural with HRIR and BRIR */ #ifdef SPLIT_REND_WITH_HEAD_ROT AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB, /* split binaural with CLDFB coded output */ + AUDIO_CONFIG_BINAURAL_SPLIT_PCM, /* split binaural with PCM coded output */ #endif AUDIO_CONFIG_ISM1, /* ISM1 */ AUDIO_CONFIG_ISM2, /* ISM2 */ AUDIO_CONFIG_ISM3, /* ISM3 */ AUDIO_CONFIG_ISM4, /* ISM4 */ - AUDIO_CONFIG_MASA1, /* MASA1 */ - AUDIO_CONFIG_MASA2, /* MASA2 */ + AUDIO_CONFIG_MASA1, /* MASA1 */ // TBV: seems not to be used + AUDIO_CONFIG_MASA2, /* MASA2 */ // TBV: seems not to be used AUDIO_CONFIG_EXTERNAL /* external renderer */ } AUDIO_CONFIG; @@ -194,8 +194,6 @@ typedef enum #define IVAS_MAX_SBA_ORDER 3 /* Maximum supported Ambisonics order */ -#define IVAS_LIMITER_THRESHOLD 32729 /* -0.01 dBFS */ -#define IVAS_LIMITER_ATTACK_SECONDS 0.005f #define IVAS_NUM_SUPPORTED_FS 3 /* number of supported sampling-rates in IVAS */ /*----------------------------------------------------------------------------------* @@ -299,7 +297,7 @@ typedef enum /*----------------------------------------------------------------------------------* - * ISm Constants + * ISM Constants *----------------------------------------------------------------------------------*/ #define ISM_NB_BITS_METADATA_NOMINAL ( ( SCE_CORE_16k_LOW_LIMIT - ACELP_16k_LOW_LIMIT ) / FRAMES_PER_SEC ) /* nominal number of metadata bits - used for configuration of Core-Coder modules */ @@ -326,6 +324,13 @@ typedef enum #define ISM_Q_STEP 2.5f #define ISM_Q_STEP_BORDER 5.0f +#define ISM_RADIUS_NBITS 6 +#define ISM_RADIUS_MIN 0.0f +#define ISM_RADIUS_DELTA 0.25f /* Max radius = (2^ISM_RADIUS_NBITS-1)*0.25 = 15.75 */ +#define ISM_EXTENDED_METADATA_BRATE IVAS_64k +#define ISM_EXTENDED_METADATA_BITS 1 +#define ISM_METADATA_RS_MAX_FRAMES 5 /* Number of frames with opposite extended metadata flags before switching */ + /* Parametric ISM */ #define MAX_PARAM_ISM_NBANDS 11 #define MAX_PARAM_ISM_NBANDS_WB 9 @@ -339,6 +344,18 @@ typedef enum #define PARAM_ISM_MAX_CHAN 16 #define PARAM_ISM_HYS_BUF_SIZE 10 +/* ISM DTX */ +#define ISM_DTX_COH_SCA_BITS 4 +#define ISM_DTX_AZI_BITS_HIGH 8 +#define ISM_DTX_ELE_BITS_HIGH 7 +#define ISM_Q_STEP_HIGH (ISM_Q_STEP / 2) +#define ISM_Q_STEP_BORDER_HIGH (ISM_Q_STEP_BORDER / 2) +#define ISM_DTX_AZI_BITS_LOW 6 +#define ISM_DTX_ELE_BITS_LOW 5 +#define ISM_Q_STEP_LOW (ISM_Q_STEP * 2) +#define ISM_Q_STEP_BORDER_LOW (ISM_Q_STEP_BORDER * 2) + + typedef enum { ISM_MODE_NONE, @@ -347,19 +364,25 @@ typedef enum } ISM_MODE; -/* ISm metadata bitstream */ +/* ISM metadata bitstream */ enum { IND_ISM_NUM_OBJECTS, - IND_ISM_METADATA_FLAG = IND_ISM_NUM_OBJECTS + MAX_NUM_OBJECTS, + IND_ISM_EXTENDED_FLAG = IND_ISM_NUM_OBJECTS + MAX_NUM_OBJECTS, + IND_ISM_METADATA_FLAG, IND_ISM_VAD_FLAG = IND_ISM_METADATA_FLAG + MAX_NUM_OBJECTS, + IND_ISM_NOISY_SPEECH_FLAG = IND_ISM_VAD_FLAG + MAX_NUM_OBJECTS, + IND_ISM_SCE_ID_DTX, + IND_ISM_DTX_COH_SCA, /* ------------- loop for objects -------------- */ - TAG_ISM_LOOP_START = IND_ISM_VAD_FLAG + MAX_NUM_OBJECTS, + TAG_ISM_LOOP_START = IND_ISM_DTX_COH_SCA + MAX_NUM_OBJECTS, IND_ISM_AZIMUTH_DIFF_FLAG = TAG_ISM_LOOP_START, IND_ISM_AZIMUTH = TAG_ISM_LOOP_START, IND_ISM_ELEVATION_DIFF_FLAG = TAG_ISM_LOOP_START, IND_ISM_ELEVATION = TAG_ISM_LOOP_START, + IND_ISM_RADIUS_DIFF_FLAG = TAG_ISM_LOOP_START, + IND_ISM_RADIUS = TAG_ISM_LOOP_START, TAG_ISM_LOOP_END = TAG_ISM_LOOP_START + 100, /* IVAS_fmToDo: to be reviewed once the final metadata are defined */ /* --------- end of loop for objects ----------- */ @@ -468,10 +491,8 @@ enum #define STEREO_DFT_OFFSET 1 #define STEREO_DFT_NBDIV 2 -#ifdef FIX_ITD_CNG #define STEREO_DFT_ITD_CNG_XFADE 100 #define STEREO_DFT_ITD_CNG_XFADE_RESET 2 -#endif #define STEREO_DFT_DELAY_DEC_BWE_NS ( STEREO_DFT_OFFSET * STEREO_DFT_HOP_NS - ACELP_LOOK_NS ) /* 1.25ms/2.5ms: max delay for core decoder*/ @@ -527,6 +548,8 @@ typedef enum #define STEREO_DFT_XCORR_LB_MAX 24 +#define STEREO_DFT_IPD_BUF_LEN 5 + #define STEREO_DFT_N_COH_PRED 4 /* Number of intra-frame predictors for coherence vector */ #define STEREO_DFT_COH_PRED_COEFFS 15 /* Number of coefficients per predictor */ #define STEREO_DFT_PRED_NBITS 2 /* Bits to signal predictor (log_2(4) = 2) */ @@ -538,9 +561,7 @@ typedef enum #define STEREO_DFT_SID_GIPD_NBITS 2 #define STEREO_DFT_FD_FILT 0.9f -#ifdef FIX_ITD_CNG #define STEREO_DFT_CNG_ITD_CNT 8 -#endif /*Residual prediction*/ #define STEREO_DFT_PAST_MAX 4 @@ -577,7 +598,9 @@ typedef enum #define NO_SYMB_GR_PRED_G 8 #define STEREO_DFT_RES_BW_MAX 66 /*Maximum number of bin for residual signal in each frame (res_cod_band_max == 6 in 48kHz)*/ -#define SBA_DIRAC_STEREO_NUM_BANDS 5 + +#define SBA_DIRAC_STEREO_NUM_BANDS 12 + #define SBA_DIRAC_NRG_SMOOTH_LONG 10 #define SBA_DIRAC_NRG_SMOOTH_SHORT 3 @@ -774,7 +797,7 @@ enum fea_names #define TDM_SIGNAL_BITS_READ_FROM_THE_END_OF_BS ( TDM_SECONDARY_SIGNALLING + TDM_RATIO_BITS + TDM_LP_REUSE_BITS + TDM_LR_CONTENT_BITS + STEREO_BITS_TCA ) #ifdef LSF_RE_USE_SECONDARY_CHANNEL #ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE -#define TDM_IC_LSF_PRED_BITS 1 /* Number of bits to code the inter channel lsf prediction mode */ +#define TDM_IC_LSF_PRED_BITS 1 /* number of bits to code the inter channel LSF prediction mode */ #endif #endif @@ -810,6 +833,14 @@ enum fea_names #define SNS_LOW_BR_MODE -1 #define SNS_NPTS 16 /* Number of downsampled SNS parameters */ +#ifdef SNS_MSVQ +#define SNS_STEREO_MODE_LR 0 +#define SNS_STEREO_MODE_MS 1 +#define SNS_STEREO_MODE_OFFSET_INDICES 4 +#define SNS_MSVQ_NSTAGES_TCX20 4 +#define SNS_MSVQ_NSTAGES_TCX10 3 +#define SNS_MSVQ_NSTAGES_SIDE 2 +#endif #define MDCT_ST_PLC_FADEOUT_MIN_NOISE_NRG 0.001f #define MDCT_ST_PLC_FADEOUT_MAX_CONC_FRAME 2 * FRAMES_PER_SEC @@ -922,6 +953,9 @@ typedef enum #define DELAY_DIRAC_SPAR_ENC_CMP_NS 500000L /* here we may set the 24 samples (at 48 kHz) additional delay to something else, leave as is for now*/ #define DELAY_DIRAC_PARAM_DEC_SFR 2 /* Delay to be compensation for DirAC parameters in the decoder (subframes) */ +#define DELAY_MASA_PARAM_DEC_SFR 2 /* Delay to be compensation for MASA parameters in the decoder (subframes) */ +#define SPH_IDX_FRONT ( MASA_NO_POINTS_EQUATOR / 2 ) /* Spherical index corresponding to front direction for setting as default value */ + #define DIRAC_SLOT_NS 1250000L /* time duration of a time slot, 1.25ms (==DELAY_RENERER_NS/MAX_PARAM_SPATIAL_SUBFRAMES) */ #define DIRAC_SLOT_ENC_NS 5000000L @@ -929,6 +963,8 @@ typedef enum { DIRAC_OPEN, /* initialize to default value */ DIRAC_RECONFIGURE /* HOA3 */ + , + DIRAC_RECONFIGURE_MODE } DIRAC_CONFIG_FLAG; @@ -954,6 +990,9 @@ typedef enum /* Common SPAR metadata constants */ #define IVAS_ACTIVEW_DM_F_SCALE 0.5f #define IVAS_ACTIVEW_DM_F_SCALE_DTX 0.25f +#ifdef LBR_SBA +#define IVAS_ACTIVEW_DM_F_SCALE_VLBR 0.25f +#endif #define IVAS_SPAR_FOA_DFLT_FREQ_PER_CHAN 24000 #define MAX_QUANT_STRATS 3 @@ -986,7 +1025,11 @@ typedef enum DECX_COEFF } ivas_coeffs_type_t; +#ifdef LBR_SBA +#define IVAS_SPAR_BR_TABLE_LEN 20 +#else #define IVAS_SPAR_BR_TABLE_LEN 18 +#endif /* TD decorr */ // VE: not all 16CH are currently supported -> t be revisited later enum @@ -1089,7 +1132,8 @@ enum #define MASA_MAXIMUM_CODING_SUBBANDS 24 #define MASA_MAXIMUM_DIRECTIONS 2 #define MASA_MAX_TRANSPORT_CHANNELS 2 -#define MASA_ENC_DELAY_SLOTS 7 + + #define MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS 5 #define MASA_DELTA_AZI_DCT0 30 @@ -1161,6 +1205,11 @@ typedef enum MASA_STEREO_DOWNMIX } MASA_TRANSPORT_SIGNAL_TYPE; +typedef enum +{ + MASA_FRAME_1SF, + MASA_FRAME_4SF +} MASA_FRAME_MODE; /*----------------------------------------------------------------------------------* * Multichannel format @@ -1226,19 +1275,14 @@ typedef enum #define NBBITS_MCT_RATIO 4 #define BITRATE_MCT_RATIO_RANGE ( 1 << NBBITS_MCT_RATIO ) /* Range of the coded bitrate distribution ratio */ -#define LFE_BITS 180 - -#define MCT_LFE_MAX_LINE 24 #define MCT_NUM_BLOCK_DATA_BITS 4 typedef enum { MCT_CHAN_MODE_REGULAR, - MCT_CHAN_MODE_LFE, MCT_CHAN_MODE_IGNORE } MCT_CHAN_MODE; - /*----------------------------------------------------------------------------------* * Parametric MC Constants *----------------------------------------------------------------------------------*/ @@ -1286,6 +1330,9 @@ typedef enum #define PARAM_MC_BAND_TO_MDCT_BAND_RATIO 16 /* Ratio of resolution of CLDFB Bands to MDCT Bands */ #define PARAM_MC_SLOT_ENC_NS 2500000L #define PARAM_MC_MDFT_NO_SLOTS 8 +#ifdef PARAMMC_SHORT_ENC_MDFT +#define PARAM_MC_CLDFB_TO_MDFT_FAC 2 +#endif /*----------------------------------------------------------------------------------* * LFE Coding Constants @@ -1373,6 +1420,7 @@ typedef enum #define BINAURAL_MAXBANDS 60 /* Max number of bands */ #define BINAURAL_CONVBANDS 50 /* Bands upto which convolution is performed */ +#define BINAURAL_NTAPS 7 #define BINAURAL_NTAPS_MAX 96 #ifdef SPLIT_REND_WITH_HEAD_ROT @@ -1386,6 +1434,10 @@ typedef enum #ifdef SPLIT_REND_LC3PLUS #define SPLIT_REND_MAX_DOF (3) +#define SPLIT_REND_MSPC_NPOSES_0DOF (1) +#define SPLIT_REND_MSPC_NPOSES_1DOF (3) +#define SPLIT_REND_MSPC_NPOSES_2DOF (7) +#define SPLIT_REND_MSPC_NPOSES_3DOF (8) #endif #ifdef SPLIT_REND_WITH_HEAD_ROT @@ -1398,6 +1450,7 @@ typedef enum #define MAX_HEAD_ROT_POSES (1 + SPLIT_REND_MAX_YAW_ONLY_POSES) #endif #define MAX_SPLIT_REND_MD_BANDS (20) +#define MAX_SPLIT_MD_SUBFRAMES (1) #define COMPLEX_MD_BAND_THRESH (MAX_SPLIT_REND_MD_BANDS) #define COMPLEX_MD_BAND_THRESH_LOW (5) @@ -1433,6 +1486,7 @@ typedef enum #define HRTF_SH_ORDER 3 #define HRTF_SH_CHANNELS 16 +#define HRTF_LS_CHANNELS 15 #define HRTF_NUM_BINS 60 #define REVERB_PREDELAY_MAX 20 /* Max input delay for reverb module */ #define GAIN_LFE 1.88364911f /* Gain applied to LFE during renderering */ @@ -1441,6 +1495,15 @@ typedef enum #define BINAURAL_COHERENCE_DIFFERENCE_BINS 9 /* Number of bins for direction-dependent diffuse-field binaural coherence */ +typedef enum +{ + BINAURAL_INPUT_AUDIO_CONFIG_INVALID, + BINAURAL_INPUT_AUDIO_CONFIG_COMBINED, /* 5_1, 5_1_2, 5_1_4, 7_1, 7_1_4 */ + BINAURAL_INPUT_AUDIO_CONFIG_HOA, /* FOA, HOA2, HOA3 */ + BINAURAL_INPUT_AUDIO_CONFIG_UNDEFINED /* Not used */ + +} BINAURAL_INPUT_AUDIO_CONFIG; + #define HEADROT_ORDER 3 #define HEADROT_SHMAT_DIM ( ( HEADROT_ORDER + 1 ) * ( HEADROT_ORDER + 1 ) ) #define HEADROT_SHMAT_DIM2 ( HEADROT_SHMAT_DIM * HEADROT_SHMAT_DIM ) @@ -1449,7 +1512,7 @@ typedef enum * TD Binaural Object renderer *----------------------------------------------------------------------------------*/ -#define MAX_NUM_TDREND_CHANNELS 16 /* max. number of channels in TD renderer (objects or loudspeaker channels) */ +#define MAX_NUM_TDREND_CHANNELS MAX_CICP_CHANNELS /* max. number of channels in TD renderer (objects or loudspeaker channels) */ #define SFX_SPAT_BIN_MAX_NO_OF_OUTPUT_SAMPLES 288 /* 288 = 6 msec @ 48 kHz. */ #define HRTF_MODEL_N_SECTIONS 3 /* No. sections used in approximate evaluation of model */ @@ -1458,23 +1521,18 @@ typedef enum #define SFX_SPAT_BIN_MAX_FILTER_LENGTH 256 #define SPAT_BIN_MAX_INPUT_CHANNELS 1 /* Max number of input channels per source/object. Mono for now, but stereo objects may be considered. */ -#ifdef FIX_ITD #define MAX_ITD 50 #define SFX_SPAT_BIN_SINC_M 5 #define SFX_SPAT_BIN_NUM_SUBSAMPLES 64 #define ITD_MEM_LEN (MAX_ITD + SFX_SPAT_BIN_SINC_M) #define L_SUBFRAME5MS_48k (L_FRAME48k/4) -#if 1 /* TODO tmu : backport fix for TD Object Renderer, remove once branch is updated with recent main */ +#ifdef FIX_421_TD_INT_TUNE #define MAX_ANGULAR_STEP (0.01f) #else -#define MAX_ANGULAR_STEP (15.0f) +#define MAX_ANGULAR_STEP (1.0f) #endif #define MAX_ANGULAR_STEP_INV ( 1.0f / MAX_ANGULAR_STEP ) #define MAX_INTERPOLATION_STEPS 12 -#define BINAURAL_TD_LATENCY_S 0.0f /* ITD fix removes TD renderer delay -- should be cleaned out */ -#else -#define BINAURAL_TD_LATENCY_S 0.00675f /* Binaural TD renderer latency in second == 324 samples in between 333 and 315 */ -#endif /* ----- Enums - TD Renderer ----- */ @@ -1506,11 +1564,6 @@ typedef enum typedef enum { TDREND_HRFILT_Method_BSplineModel -#ifdef TDREND_HRTF_TABLE_METHODS - , - TDREND_HRFILT_Method_Table_F, - TDREND_HRFILT_Method_Table_S -#endif } TDREND_HRFILT_Method_t; typedef enum @@ -1526,15 +1579,20 @@ typedef enum *----------------------------------------------------------------------------------*/ /* Orientation tracking types */ -#define IVAS_ORIENT_TRK_REF 0 -#define IVAS_ORIENT_TRK_AVG 1 +#define IVAS_ORIENT_TRK_NONE 0 +#define IVAS_ORIENT_TRK_REF 1 +#define IVAS_ORIENT_TRK_AVG 2 +#define IVAS_ORIENT_TRK_REF_VEC 3 +#define IVAS_ORIENT_TRK_REF_VEC_LEV 4 typedef enum { - OTR_TRACKING_NONE = IVAS_ORIENT_TRK_REF-1, /* track orientation relative to external reference orientation (default: yaw=pitch=roll=0) */ // VE: not really used in IVAS (only in unit-test) - OTR_TRACKING_REF_ORIENT = IVAS_ORIENT_TRK_REF, /* track orientation relative to external reference orientation (default: yaw=pitch=roll=0) */ + OTR_TRACKING_NONE = IVAS_ORIENT_TRK_NONE, + OTR_TRACKING_REF_ORIENT = IVAS_ORIENT_TRK_REF, /* track orientation relative to external reference orientation (default: no rotation) */ OTR_TRACKING_AVG_ORIENT = IVAS_ORIENT_TRK_AVG /* track orientation relative to average orientation */ - + , + OTR_TRACKING_REF_VEC = IVAS_ORIENT_TRK_REF_VEC, /* track orientation relative to external reference vector */ + OTR_TRACKING_REF_VEC_LEV = IVAS_ORIENT_TRK_REF_VEC_LEV /* track orientation relative to level component of external reference vector */ } OTR_TRACKING_T; @@ -1550,8 +1608,6 @@ typedef enum #define RV_LENGTH_NR_FC ( RV_FILTER_MAX_FFT_SIZE / 2 ) + 1 #define IVAS_REVERB_DEFAULT_N_BANDS 31 -#define IVAS_REVERB_DEFAULT_PRE_DELAY 0.016f -#define IVAS_REVERB_DEFAULT_INPUT_DELAY 0.1f /*----------------------------------------------------------------------------------* @@ -1564,6 +1620,9 @@ typedef enum #define IVAS_320_PT_LEN 320 #define IVAS_240_PT_LEN 240 #define IVAS_160_PT_LEN 160 +#ifdef PARAMMC_SHORT_ENC_MDFT +#define IVAS_120_PT_LEN 120 +#endif #define IVAS_80_PT_LEN 80 #define IVAS_40_PT_LEN 40 @@ -1672,12 +1731,28 @@ typedef enum #define SPAR_DIRAC_DTX_BANDS ( SPAR_DTX_BANDS + DIRAC_DTX_BANDS ) #define CLDFB_PAR_WEIGHT_START_BAND 7 +/*----------------------------------------------------------------------------------* + * Split rendering bitrate constants + *----------------------------------------------------------------------------------*/ + #define SIZE_SPLIT_REND_BRATE_TBL (4) #define SPLIT_REND_256k 256000 #define SPLIT_REND_384k 384000 #define SPLIT_REND_512k 512000 #define SPLIT_REND_768k 768000 -#define SPLIT_REND_MAX_BRATE SPLIT_REND_768k +#define SPLIT_REND_MAX_BRATE SPLIT_REND_768k + +#ifdef SPLIT_REND_CLDFB_HUFF_SAN_FIX +#define SPLIT_REND_ADDITIONAL_BYTES_TO_READ ( 1 ) +#endif + +/*----------------------------------------------------------------------------------* + * Limiter constants + *----------------------------------------------------------------------------------*/ + +#define IVAS_LIMITER_THRESHOLD 32729 /* -0.01 dBFS */ +#define IVAS_LIMITER_ATTACK_SECONDS 0.005f + #endif /* clang-format on */ diff --git a/lib_com/ivas_cov_smooth.c b/lib_com/ivas_cov_smooth.c index eaaec6a982..ef2f5e3693 100644 --- a/lib_com/ivas_cov_smooth.c +++ b/lib_com/ivas_cov_smooth.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -36,10 +36,10 @@ #include "debug.h" #endif #include "ivas_prot.h" -#include "wmops.h" +#include "wmc_auto.h" #include "prot.h" - +#define BAND_SMOOTH_REST_START_IDX ( 2 ) /*-----------------------------------------------------------------------------------------* * Function ivas_set_up_cov_smoothing() * @@ -50,27 +50,98 @@ static void ivas_set_up_cov_smoothing( ivas_cov_smooth_state_t *hCovState, ivas_filterbank_t *pFb, const float max_update_rate, - const int16_t min_pool_size ) + const int16_t min_pool_size, + const int16_t nchan_inp /* i : number of input channels */ +#ifdef LBR_SBA_EXTRA_COV_SMOOTH + , + const int32_t ivas_total_brate +#endif +) { int16_t j, k; - - for ( j = 0; j < pFb->filterbank_num_bands; j++ ) +#ifdef LBR_SBA_DM_COV_FIX + if ( ivas_total_brate < IVAS_24k4 ) { - float update_factor = 0.0f; - - for ( k = 0; k < pFb->fb_bin_to_band.pFb_active_bins_per_band[j]; k++ ) + for ( j = 0; j < pFb->filterbank_num_bands; j++ ) { - update_factor += pFb->fb_bin_to_band.pFb_bin_to_band[j][k]; + float update_factor; + float *p_bin_to_band; + update_factor = 0.0f; + p_bin_to_band = pFb->fb_bin_to_band.pp_short_stride_bin_to_band[j]; + int16_t active_bins; + active_bins = pFb->fb_bin_to_band.p_short_stride_num_bins_per_band[j]; + + for ( k = 0; k < active_bins; k++ ) + { + update_factor += p_bin_to_band[k]; + } + + hCovState->pSmoothing_factor[j] = update_factor / min_pool_size; +#ifdef LBR_SBA_EXTRA_COV_SMOOTH + float smooth_fact; + if ( ivas_total_brate < IVAS_24k4 ) + { + smooth_fact = 0.5f; + } + else + { + smooth_fact = 0.75; + } + hCovState->pSmoothing_factor[j] *= ( j + 1 ) * smooth_fact; +#else + hCovState->pSmoothing_factor[j] *= ( j + 1 ) * 0.75f; +#endif + + if ( hCovState->pSmoothing_factor[j] > max_update_rate ) + { + hCovState->pSmoothing_factor[j] = max_update_rate; + } } + } + else +#endif + if ( nchan_inp <= FOA_CHANNELS ) + { + for ( j = 0; j < pFb->filterbank_num_bands; j++ ) + { + float update_factor; + update_factor = 0.0f; - hCovState->pSmoothing_factor[j] = update_factor / min_pool_size; + for ( k = 0; k < pFb->fb_bin_to_band.pFb_active_bins_per_band[j]; k++ ) + { + update_factor += pFb->fb_bin_to_band.pFb_bin_to_band[j][k]; + } - if ( hCovState->pSmoothing_factor[j] > max_update_rate ) + hCovState->pSmoothing_factor[j] = update_factor / min_pool_size; + + if ( hCovState->pSmoothing_factor[j] > max_update_rate ) + { + hCovState->pSmoothing_factor[j] = max_update_rate; + } + } + } + else + { + for ( j = 0; j < pFb->filterbank_num_bands; j++ ) { - hCovState->pSmoothing_factor[j] = max_update_rate; + float update_factor; + float *p_bin_to_band; + int16_t active_bins; + update_factor = 0.0f; + p_bin_to_band = pFb->fb_bin_to_band.pp_short_stride_bin_to_band[j]; + active_bins = pFb->fb_bin_to_band.p_short_stride_num_bins_per_band[j]; + for ( k = 0; k < active_bins; k++ ) + { + update_factor += p_bin_to_band[k]; + } + hCovState->pSmoothing_factor[j] = update_factor / min_pool_size; + hCovState->pSmoothing_factor[j] *= ( j + 1 ) * 0.75f; + if ( hCovState->pSmoothing_factor[j] > max_update_rate ) + { + hCovState->pSmoothing_factor[j] = max_update_rate; + } } } - hCovState->prior_bank_idx = -1; return; @@ -88,17 +159,21 @@ ivas_error ivas_spar_covar_smooth_enc_open( const ivas_cov_smooth_cfg_t *cov_smooth_cfg, /* i : SPAR config. handle */ ivas_filterbank_t *pFb, /* i/o: FB handle */ const int16_t nchan_inp /* i : number of input channels */ +#ifdef LBR_SBA_EXTRA_COV_SMOOTH + , + const int32_t ivas_total_brate /* i : IVAS total bitrate */ +#endif ) { ivas_cov_smooth_state_t *hCovState; int16_t i, j; - if ( ( hCovState = (ivas_cov_smooth_state_t *) count_malloc( sizeof( ivas_cov_smooth_state_t ) ) ) == NULL ) + if ( ( hCovState = (ivas_cov_smooth_state_t *) malloc( sizeof( ivas_cov_smooth_state_t ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR COV encoder" ); } - if ( ( hCovState->pSmoothing_factor = (float *) count_malloc( sizeof( float ) * cov_smooth_cfg->max_bands ) ) == NULL ) + if ( ( hCovState->pSmoothing_factor = (float *) malloc( sizeof( float ) * cov_smooth_cfg->max_bands ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR COV encoder" ); } @@ -107,7 +182,7 @@ ivas_error ivas_spar_covar_smooth_enc_open( { for ( j = 0; j < nchan_inp; j++ ) { - if ( ( hCovState->pPrior_cov_real[i][j] = (float *) count_malloc( sizeof( float ) * cov_smooth_cfg->max_bands ) ) == NULL ) + if ( ( hCovState->pPrior_cov_real[i][j] = (float *) malloc( sizeof( float ) * cov_smooth_cfg->max_bands ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR COV encoder" ); } @@ -115,7 +190,11 @@ ivas_error ivas_spar_covar_smooth_enc_open( } } - ivas_set_up_cov_smoothing( hCovState, pFb, cov_smooth_cfg->max_update_rate, cov_smooth_cfg->min_pool_size ); +#ifdef LBR_SBA_EXTRA_COV_SMOOTH + ivas_set_up_cov_smoothing( hCovState, pFb, cov_smooth_cfg->max_update_rate, cov_smooth_cfg->min_pool_size, nchan_inp, ivas_total_brate ); +#else + ivas_set_up_cov_smoothing( hCovState, pFb, cov_smooth_cfg->max_update_rate, cov_smooth_cfg->min_pool_size, nchan_inp ); +#endif *hCovState_out = hCovState; @@ -141,19 +220,19 @@ void ivas_spar_covar_smooth_enc_close( if ( hCovState != NULL ) { - count_free( hCovState->pSmoothing_factor ); + free( hCovState->pSmoothing_factor ); hCovState->pSmoothing_factor = NULL; for ( i = 0; i < nchan_inp; i++ ) { for ( j = 0; j < nchan_inp; j++ ) { - count_free( hCovState->pPrior_cov_real[i][j] ); + free( hCovState->pPrior_cov_real[i][j] ); hCovState->pPrior_cov_real[i][j] = NULL; } } - count_free( hCovState ); + free( hCovState ); hCovState_out = NULL; } @@ -176,15 +255,18 @@ static void ivas_compute_smooth_cov( const int16_t start_band, const int16_t end_band, const int16_t num_ch, - const int16_t transient_det ) + const int16_t transient_det[2] ) { int16_t i, j, k; int16_t prev_idx = hCovState->prior_bank_idx; float factor = 0; + int16_t sm_b; + int16_t non_sm_b_idx; + sm_b = BAND_SMOOTH_REST_START_IDX; assert( end_band <= pFb->filterbank_num_bands ); - if ( prev_idx == -1 || transient_det == 1 ) + if ( prev_idx == -1 || transient_det[1] == 1 ) { for ( i = 0; i < num_ch; i++ ) { @@ -194,6 +276,36 @@ static void ivas_compute_smooth_cov( } } } + else if ( transient_det[0] == 1 ) + { + non_sm_b_idx = min( sm_b, end_band ); + for ( i = 0; i < num_ch; i++ ) + { + for ( j = 0; j < num_ch; j++ ) + { + if ( i == j ) + { + factor = fac; + } + else + { + factor = 0.0f; + } + + for ( k = start_band; k < non_sm_b_idx; k++ ) + { + pCov_buf[i][j][k] = pPrior_cov_buf[i][j][k] + ( hCovState->pSmoothing_factor[k] * ( pCov_buf[i][j][k] - pPrior_cov_buf[i][j][k] + factor ) ); + } + } + } + for ( i = 0; i < num_ch; i++ ) + { + for ( k = non_sm_b_idx; k < end_band; k++ ) + { + pCov_buf[i][i][k] += ( hCovState->pSmoothing_factor[k] * fac ); + } + } + } else if ( prev_idx == 0 ) { for ( i = 0; i < num_ch; i++ ) @@ -234,7 +346,7 @@ void ivas_cov_smooth_process( const int16_t start_band, const int16_t end_band, const int16_t num_ch, - const int16_t transient_det ) + const int16_t transient_det[2] ) { int16_t i, j; int16_t num_bands = end_band - start_band; diff --git a/lib_com/ivas_dirac_com.c b/lib_com/ivas_dirac_com.c index afb71a7278..172dbc5365 100644 --- a/lib_com/ivas_dirac_com.c +++ b/lib_com/ivas_dirac_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include "ivas_prot.h" #include "prot.h" #include "cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------* @@ -259,10 +259,18 @@ void ivas_dirac_config_bands( { band_grouping[reduced_band] = max_band; } +#ifdef LBR_SBA + for ( band = enc_param_start_band + ( DIRAC_MAX_NBANDS - enc_param_start_band ) / 2 - 1, reduced_band = DIRAC_MAX_NBANDS - 1; band >= enc_param_start_band; band--, reduced_band -= step ) + { + dirac_to_spar_md_bands[reduced_band] = dirac_to_spar_md_bands[band]; + dirac_to_spar_md_bands[reduced_band - 1] = dirac_to_spar_md_bands[band]; + } +#else for ( band = enc_param_start_band + 1; band < DIRAC_MAX_NBANDS; band++ ) { dirac_to_spar_md_bands[band] = dirac_to_spar_md_bands[band - 1]; } +#endif } else { diff --git a/lib_com/ivas_entropy_coder_common.c b/lib_com/ivas_entropy_coder_common.c index 1bc72598e2..a2fa26cad9 100644 --- a/lib_com/ivas_entropy_coder_common.c +++ b/lib_com/ivas_entropy_coder_common.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include "ivas_rom_com.h" #include "math.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------------------------* @@ -127,7 +127,7 @@ int16_t ivas_map_num_pred_r_to_idx( pred_r_to_idx = PRED_Q_31; break; default: - assert( "Forbidden value for prediction quantization strategy index" ); + assert( !"Forbidden value for prediction quantization strategy index" ); break; } } @@ -145,7 +145,7 @@ int16_t ivas_map_num_pred_r_to_idx( pred_r_to_idx = PRED_Q_21_ACTIVE_W; break; default: - assert( "Forbidden value for prediction quantization strategy index" ); + assert( !"Forbidden value for prediction quantization strategy index" ); break; } } @@ -179,7 +179,7 @@ int16_t ivas_map_num_drct_r_to_idx( drct_r_to_idx = DRCT_Q_11; break; default: - assert( "Forbidden value for DRCT quantization strategy index" ); + assert( !"Forbidden value for DRCT quantization strategy index" ); break; } return drct_r_to_idx; @@ -217,7 +217,7 @@ int16_t ivas_map_num_decd_r_to_idx( decd_r_to_idx = DECD_Q_11; break; default: - assert( "Forbidden value for DECD quantization strategy index" ); + assert( !"Forbidden value for DECD quantization strategy index" ); break; } diff --git a/lib_com/ivas_error.h b/lib_com/ivas_error.h index b34d98ba01..f4ea7ecb8c 100644 --- a/lib_com/ivas_error.h +++ b/lib_com/ivas_error.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -81,10 +81,12 @@ typedef enum IVAS_ERR_INVALID_INDEX, IVAS_ERR_NOT_SUPPORTED_OPTION, IVAS_ERR_NOT_IMPLEMENTED, + IVAS_ERR_WAITING_FOR_BITSTREAM, IVAS_ERR_FILE_READER_TIMESTAMP_MISMATCH, IVAS_ERR_ISM_FILE_READER_INVALID_METADATA_FORMAT, IVAS_ERR_ISM_INVALID_METADATA_VALUE, IVAS_ERR_INVALID_MASA_FORMAT_METADATA_FILE, + IVAS_ERR_IO_CONFIG_PAIR_NOT_SUPPORTED, #ifdef DEBUGGING IVAS_ERR_INVALID_FORCE_MODE, #ifdef DEBUG_AGC_ENCODER_CMD_OPTION @@ -119,6 +121,8 @@ typedef enum IVAS_ERR_BITSTREAM_WRITER_INVALID_FORMAT, IVAS_ERR_BITSTREAM_READER_INVALID_DATA, IVAS_ERR_BITSTREAM_READER_INVALID_FORMAT, + IVAS_ERR_NO_FILE_OPEN, + IVAS_ERR_SAMPLING_RATE_UNKNOWN, /*----------------------------------------* * renderer (lib_rend only) * @@ -143,18 +147,7 @@ typedef enum static inline const char *ivas_error_to_string( ivas_error error_code ) { - /* For error categories that are likely to still have many changes to - * specific error codes, return one string per category */ - if ( ( error_code & 0xF000 ) == 0x1000 ) - { - return "API error"; - } - if ( ( error_code & 0xF000 ) == 0x2000 ) - { - return "data error"; - } - - /* For categories that are unlikely to change, use more specific strings */ + /* Try to match to a specific string */ switch ( error_code ) { case IVAS_ERR_OK: @@ -177,6 +170,8 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) return "Wrong number of channels"; case IVAS_ERR_INVALID_BUFFER_SIZE: return "Invalid buffer size"; + case IVAS_ERR_IO_CONFIG_PAIR_NOT_SUPPORTED: + return "Unsupported input/output config pair"; case IVAS_ERR_FAILED_FILE_OPEN: return "File open error"; case IVAS_ERR_FAILED_FILE_WRITE: @@ -195,6 +190,17 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) break; } + /* For error categories that are likely to still have many changes to + * specific error codes, return one string per category */ + if ( ( error_code & 0xF000 ) == 0x1000 ) + { + return "API error"; + } + if ( ( error_code & 0xF000 ) == 0x2000 ) + { + return "data error"; + } + return "Unknown error"; } diff --git a/lib_com/ivas_error_utils.h b/lib_com/ivas_error_utils.h index 412bd075b4..b9a6b3f872 100644 --- a/lib_com/ivas_error_utils.h +++ b/lib_com/ivas_error_utils.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -84,6 +84,7 @@ static inline ivas_error ivas_error_wrapper( const ivas_error error_code, const fprintf( stderr, "\n\nIn function: %s(), %s:%d\n\n", function, file, line ); // assert( 0 ); + return error_code; } #else diff --git a/lib_com/ivas_fb_mixer.c b/lib_com/ivas_fb_mixer.c index 84bbdf0903..f42e8bde74 100644 --- a/lib_com/ivas_fb_mixer.c +++ b/lib_com/ivas_fb_mixer.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "ivas_prot.h" #include "ivas_rom_com.h" #include -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------------------------* @@ -110,7 +110,7 @@ ivas_error ivas_fb_set_cfg( { IVAS_FB_CFG *pFb_cfg; - if ( ( pFb_cfg = (IVAS_FB_CFG *) count_malloc( sizeof( IVAS_FB_CFG ) ) ) == NULL ) + if ( ( pFb_cfg = (IVAS_FB_CFG *) malloc( sizeof( IVAS_FB_CFG ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer config" ); } @@ -156,7 +156,11 @@ ivas_error ivas_fb_set_cfg( { pFb_cfg->fb_latency = NS2SA( sampling_rate, DELAY_FB_1_NS ); pFb_cfg->fade_len = NS2SA( sampling_rate, DELAY_FB_1_NS ); +#ifdef PARAMMC_SHORT_ENC_MDFT + pFb_cfg->prior_input_length = NS2SA( sampling_rate, DELAY_DIRAC_ENC_CMP_NS ) + NS2SA( sampling_rate, PARAM_MC_SLOT_ENC_NS ); +#else pFb_cfg->prior_input_length = NS2SA( sampling_rate, DELAY_DIRAC_ENC_CMP_NS ) + 3 * NS2SA( sampling_rate, PARAM_MC_SLOT_ENC_NS ); +#endif } *pFb_cfg_out = pFb_cfg; @@ -174,7 +178,8 @@ ivas_error ivas_fb_set_cfg( ivas_error ivas_FB_mixer_open( IVAS_FB_MIXER_HANDLE *hFbMixer_out, /* i/o: FB mixer handle */ const int32_t sampling_rate, /* i : sampling rate */ - IVAS_FB_CFG *fb_cfg /* i : FB config. handle */ + IVAS_FB_CFG *fb_cfg, /* i : FB config. handle */ + const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ ) { IVAS_FB_MIXER_HANDLE hFbMixer; @@ -186,23 +191,28 @@ ivas_error ivas_FB_mixer_open( frame_len = (int16_t) ( sampling_rate / FRAMES_PER_SEC ); + hFbMixer = *hFbMixer_out; - if ( ( hFbMixer = (IVAS_FB_MIXER_HANDLE) count_malloc( sizeof( IVAS_FB_MIXER_DATA ) ) ) == NULL ) + if ( !spar_reconfig_flag ) { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" ); - } - - if ( fb_cfg->num_out_chans > 0 ) - { - if ( ( hFbMixer->pFb = (ivas_filterbank_t *) count_malloc( sizeof( ivas_filterbank_t ) ) ) == NULL ) + if ( ( hFbMixer = (IVAS_FB_MIXER_HANDLE) malloc( sizeof( IVAS_FB_MIXER_DATA ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" ); } + + if ( fb_cfg->num_out_chans > 0 ) + { + if ( ( hFbMixer->pFb = (ivas_filterbank_t *) malloc( sizeof( ivas_filterbank_t ) ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" ); + } + } + else + { + hFbMixer->pFb = NULL; + } } - else - { - hFbMixer->pFb = NULL; - } + if ( fb_cfg->active_w_mixing == -1 ) { num_chs_alloc = 0; @@ -227,12 +237,12 @@ ivas_error ivas_FB_mixer_open( { j = fb_cfg->remix_order[i]; - if ( ( hFbMixer->ppFilterbank_inFR_re[j] = (float *) count_malloc( sizeof( float ) * frame_len ) ) == NULL ) + if ( ( hFbMixer->ppFilterbank_inFR_re[j] = (float *) malloc( sizeof( float ) * frame_len ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" ); } - if ( ( hFbMixer->ppFilterbank_inFR_im[j] = (float *) count_malloc( sizeof( float ) * frame_len ) ) == NULL ) + if ( ( hFbMixer->ppFilterbank_inFR_im[j] = (float *) malloc( sizeof( float ) * frame_len ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" ); } @@ -247,9 +257,10 @@ ivas_error ivas_FB_mixer_open( { num_chs_alloc = fb_cfg->num_in_chans; } + for ( i = 0; i < num_chs_alloc; i++ ) { - if ( ( hFbMixer->ppFilterbank_prior_input[i] = (float *) count_malloc( sizeof( float ) * fb_cfg->prior_input_length ) ) == NULL ) + if ( ( hFbMixer->ppFilterbank_prior_input[i] = (float *) malloc( sizeof( float ) * fb_cfg->prior_input_length ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" ); } @@ -260,7 +271,7 @@ ivas_error ivas_FB_mixer_open( { float *pTemp_mem; - if ( ( pTemp_mem = (float *) count_malloc( sizeof( float ) * fb_cfg->num_out_chans * fb_cfg->num_in_chans * IVAS_MAX_NUM_BANDS ) ) == NULL ) + if ( ( pTemp_mem = (float *) malloc( sizeof( float ) * fb_cfg->num_out_chans * fb_cfg->num_in_chans * IVAS_MAX_NUM_BANDS ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer" ); } @@ -275,60 +286,68 @@ ivas_error ivas_FB_mixer_open( } } - if ( fb_cfg->num_out_chans > 0 ) + if ( !spar_reconfig_flag ) { - const int16_t *pActive_bins_per_band, *pActive_bins_per_band_abs, *pStart_offset, *pStart_offset_abs; + if ( fb_cfg->num_out_chans > 0 ) + { + const int16_t *pActive_bins_per_band, *pActive_bins_per_band_abs, *pStart_offset, *pStart_offset_abs; - num_bands = ivas_get_num_bands( sampling_rate ); + num_bands = ivas_get_num_bands( sampling_rate ); - ivas_get_active_bins( &pActive_bins_per_band, &pActive_bins_per_band_abs, &pStart_offset, &pStart_offset_abs, sampling_rate ); + ivas_get_active_bins( &pActive_bins_per_band, &pActive_bins_per_band_abs, &pStart_offset, &pStart_offset_abs, sampling_rate ); - if ( fb_cfg->active_w_mixing != -1 ) - { - for ( i = 0; i < num_bands; i++ ) + if ( fb_cfg->active_w_mixing != -1 ) { - if ( ( hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] = (float *) count_malloc( sizeof( float ) * pActive_bins_per_band_abs[i] ) ) == NULL ) + for ( i = 0; i < num_bands; i++ ) { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" ); + if ( ( hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] = (float *) malloc( sizeof( float ) * pActive_bins_per_band_abs[i] ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" ); + } } } - } - if ( sampling_rate != 48000 ) - { - int16_t num_diff_bands, start_diff_band_non48k; + if ( sampling_rate != 48000 ) + { + int16_t num_diff_bands, start_diff_band_non48k; - num_diff_bands = MAX_NUM_BANDS_DIFF_NON48K; - start_diff_band_non48k = num_bands - num_diff_bands; + num_diff_bands = MAX_NUM_BANDS_DIFF_NON48K; + start_diff_band_non48k = num_bands - num_diff_bands; - hFbMixer->num_diff_bands = num_diff_bands; + hFbMixer->num_diff_bands = num_diff_bands; - for ( j = start_diff_band_non48k; j < num_bands; j++ ) - { - if ( ( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[0][j] = (float *) count_malloc( sizeof( float ) * pActive_bins_per_band[j] ) ) == NULL ) + for ( j = start_diff_band_non48k; j < num_bands; j++ ) { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" ); - } + if ( ( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[0][j] = (float *) malloc( sizeof( float ) * pActive_bins_per_band[j] ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" ); + } - if ( ( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[1][j] = (float *) count_malloc( sizeof( float ) * pActive_bins_per_band[j] ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" ); + if ( ( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[1][j] = (float *) malloc( sizeof( float ) * pActive_bins_per_band[j] ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" ); + } } } } - } - else - { + else + { - /* ignore all the deeper filter bank stuff for now */ - hFbMixer->num_diff_bands = 0; + /* ignore all the deeper filter bank stuff for now */ + hFbMixer->num_diff_bands = 0; + } } hFbMixer->fb_cfg = fb_cfg; + set_s( hFbMixer->first_frame, 1, hFbMixer->fb_cfg->num_out_chans ); + set_s( hFbMixer->first_frame + hFbMixer->fb_cfg->num_out_chans, 0, IVAS_SPAR_MAX_CH - hFbMixer->fb_cfg->num_out_chans ); - if ( ( error = ivas_filterbank_setup( hFbMixer, sampling_rate ) ) != IVAS_ERR_OK ) + if ( !spar_reconfig_flag ) { - return error; + if ( ( error = ivas_filterbank_setup( hFbMixer, sampling_rate ) ) != IVAS_ERR_OK ) + { + return error; + } } *hFbMixer_out = hFbMixer; @@ -344,8 +363,9 @@ ivas_error ivas_FB_mixer_open( *------------------------------------------------------------------------*/ void ivas_FB_mixer_close( - IVAS_FB_MIXER_HANDLE *hFbMixer_in, /* i/o: FB mixer handle */ - const int32_t sampling_rate /* i : sampling rate in Hz */ + IVAS_FB_MIXER_HANDLE *hFbMixer_in, /* i/o: FB mixer handle */ + const int32_t sampling_rate, /* i : sampling rate in Hz */ + const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ ) { IVAS_FB_MIXER_HANDLE hFbMixer; @@ -377,10 +397,10 @@ void ivas_FB_mixer_close( { j = fb_cfg->remix_order[i]; - count_free( hFbMixer->ppFilterbank_inFR_re[j] ); + free( hFbMixer->ppFilterbank_inFR_re[j] ); hFbMixer->ppFilterbank_inFR_re[j] = NULL; - count_free( hFbMixer->ppFilterbank_inFR_im[j] ); + free( hFbMixer->ppFilterbank_inFR_im[j] ); hFbMixer->ppFilterbank_inFR_im[j] = NULL; } } @@ -395,59 +415,64 @@ void ivas_FB_mixer_close( } for ( i = 0; i < num_chs_alloc; i++ ) { - count_free( hFbMixer->ppFilterbank_prior_input[i] ); + free( hFbMixer->ppFilterbank_prior_input[i] ); hFbMixer->ppFilterbank_prior_input[i] = NULL; } if ( ( fb_cfg->active_w_mixing != -1 ) && ( fb_cfg->num_out_chans > 0 ) ) { - count_free( hFbMixer->prior_mixer[0][0] ); + free( hFbMixer->prior_mixer[0][0] ); hFbMixer->prior_mixer[0][0] = NULL; } - if ( fb_cfg->num_out_chans > 0 ) + if ( !spar_reconfig_flag ) { - num_bands = hFbMixer->pFb->filterbank_num_bands; - - if ( fb_cfg->active_w_mixing != -1 ) + if ( fb_cfg->num_out_chans > 0 ) { - for ( i = 0; i < num_bands; i++ ) + num_bands = hFbMixer->pFb->filterbank_num_bands; + + if ( fb_cfg->active_w_mixing != -1 ) { - count_free( hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] ); - hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] = NULL; + for ( i = 0; i < num_bands; i++ ) + { + free( hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] ); + hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] = NULL; + } } - } - - if ( sampling_rate != 48000 ) - { - int16_t start_diff_band_non48k; - start_diff_band_non48k = num_bands - hFbMixer->num_diff_bands; - for ( j = start_diff_band_non48k; j < num_bands; j++ ) + if ( sampling_rate != 48000 ) { - count_free( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[0][j] ); - hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[0][j] = NULL; + int16_t start_diff_band_non48k; + start_diff_band_non48k = num_bands - hFbMixer->num_diff_bands; + + for ( j = start_diff_band_non48k; j < num_bands; j++ ) + { + free( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[0][j] ); + hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[0][j] = NULL; - count_free( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[1][j] ); - hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[1][j] = NULL; + free( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[1][j] ); + hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[1][j] = NULL; + } } } - } - - if ( hFbMixer->pFb != NULL ) - { - count_free( hFbMixer->pFb ); - hFbMixer->pFb = NULL; + if ( hFbMixer->pFb != NULL ) + { + free( hFbMixer->pFb ); + hFbMixer->pFb = NULL; + } } if ( hFbMixer->fb_cfg != NULL ) { - count_free( hFbMixer->fb_cfg ); + free( hFbMixer->fb_cfg ); hFbMixer->fb_cfg = NULL; } - count_free( hFbMixer ); - hFbMixer = NULL; + if ( !spar_reconfig_flag ) + { + free( hFbMixer ); + hFbMixer = NULL; + } } return; @@ -1028,10 +1053,6 @@ static ivas_error ivas_filterbank_setup( error = IVAS_ERR_OK; - set_s( hFbMixer->first_frame, 1, pCfg->num_out_chans ); - set_s( hFbMixer->first_frame + pCfg->num_out_chans, 0, IVAS_SPAR_MAX_CH - pCfg->num_out_chans ); - - if ( pCfg->num_out_chans > 0 ) { hFbMixer->pFb->filterbank_num_bands = ivas_get_num_bands( sampling_rate ); diff --git a/lib_com/ivas_filters.c b/lib_com/ivas_filters.c index 898ba7fe89..d89370e795 100644 --- a/lib_com/ivas_filters.c +++ b/lib_com/ivas_filters.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #include "ivas_prot.h" #include "ivas_cnst.h" #include "ivas_stat_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------------------------* diff --git a/lib_com/ivas_ism_config.c b/lib_com/ivas_ism_com.c similarity index 73% rename from lib_com/ivas_ism_config.c rename to lib_com/ivas_ism_com.c index 75ef0a2ae7..38a34a15bd 100644 --- a/lib_com/ivas_ism_config.c +++ b/lib_com/ivas_ism_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,11 +37,12 @@ #include "rom_com.h" #include "prot.h" #include "ivas_prot.h" +#include "ivas_stat_com.h" #include "ivas_rom_com.h" #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------* @@ -50,7 +51,7 @@ #define FRMS_PER_SECOND ( 1000000000 / FRAME_SIZE_NS ) -#define BRATE_ISM_INACTIVE 2450 /* CoreCoder bitrate in ISm inactive frames */ +#define BRATE_ISM_INACTIVE 2450 /* CoreCoder bitrate in ISM inactive frames */ #define BITS_ISM_INACTIVE ( BRATE_ISM_INACTIVE / FRMS_PER_SECOND ) #define BETA_ISM_LOW_IMP 0.6f @@ -87,15 +88,15 @@ static void bitbudget_to_brate( *-------------------------------------------------------------------*/ ivas_error ivas_ism_config( - const int32_t ism_total_brate, /* i : ISms total bitrate */ - const int16_t nchan_transport, /* i : number of transport channels */ - const int16_t num_obj, /* i : number of objects */ - ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ - const int16_t localVAD[MAX_NUM_OBJECTS], /* i : local VAD flag */ - const int16_t ism_imp[], /* i : ISM importance flags */ - int32_t element_brate[], /* o : element bitrate per object */ - int32_t total_brate[], /* o : total bitrate per object */ - int16_t nb_bits_metadata[] /* i/o: number of metadata bits */ + const int32_t ism_total_brate, /* i : ISM total bitrate */ + const int16_t nchan_transport, /* i : number of transport channels */ + const int16_t nchan_ism, /* i : number of objects */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + const int16_t localVAD[MAX_NUM_OBJECTS], /* i : local VAD flag */ + const int16_t ism_imp[], /* i : ISM importance flags */ + int32_t element_brate[], /* o : element bitrate per object */ + int32_t total_brate[], /* o : total bitrate per object */ + int16_t nb_bits_metadata[] /* i/o: number of metadata bits */ ) { int16_t ch; @@ -128,10 +129,14 @@ ivas_error ivas_ism_config( bits_element[n_ISms - 1] += bits_ism % n_ISms; bitbudget_to_brate( bits_element, element_brate, n_ISms ); - /* count ISm common signaling bits */ + /* count ISM common signaling bits */ if ( hIsmMeta != NULL ) { - nb_bits_metadata[0] += n_ISms * ISM_METADATA_FLAG_BITS + num_obj; + if ( ism_total_brate >= ISM_EXTENDED_METADATA_BRATE ) + { + nb_bits_metadata[0] += ISM_EXTENDED_METADATA_BITS; + } + nb_bits_metadata[0] += n_ISms * ISM_METADATA_FLAG_BITS + nchan_ism; for ( ch = 0; ch < n_ISms; ch++ ) { @@ -199,11 +204,7 @@ ivas_error ivas_ism_config( diff = 0; for ( ch = 0; ch < n_ISms; ch++ ) { -#ifdef FIX_ISM_INACTIVE_BITS int16_t limit; -#else - int32_t limit; -#endif limit = MIN_BRATE_SWB_BWE / FRMS_PER_SECOND; if ( element_brate[ch] < MIN_BRATE_SWB_STEREO ) /* replicate function set_bw() -> check the coded audio band-width */ @@ -223,20 +224,12 @@ ivas_error ivas_ism_config( else if ( ism_imp[ch] == ISM_LOW_IMP ) { tmp = (int16_t) ( BETA_ISM_LOW_IMP * bits_CoreCoder[ch] ); -#ifdef FIX_ISM_INACTIVE_BITS tmp = max( limit, tmp ); -#else - tmp = (int16_t) max( limit, bits_CoreCoder[ch] - tmp ); -#endif } else if ( ism_imp[ch] == ISM_MEDIUM_IMP ) { tmp = (int16_t) ( BETA_ISM_MEDIUM_IMP * bits_CoreCoder[ch] ); -#ifdef FIX_ISM_INACTIVE_BITS tmp = max( limit, tmp ); -#else - tmp = (int16_t) max( limit, bits_CoreCoder[ch] - tmp ); -#endif } else /* ism_imp[ch] == ISM_HIGH_IMP */ { @@ -301,7 +294,7 @@ ivas_error ivas_ism_config( #ifdef DEBUGGING if ( bits_CoreCoder[ch] == SID_2k40 / FRAMES_PER_SEC ) { - printf( "\nWarning: ISm bitbudget equal to SID!\n" ); + printf( "\nWarning: ISM bitbudget equal to SID!\n" ); } #endif break; @@ -320,7 +313,7 @@ ivas_error ivas_ism_config( tmpL = sum_l( total_brate, n_ISms ) + bits_side * FRMS_PER_SECOND; if ( sum_l( element_brate, n_ISms ) != tmpL ) { - return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "\nError: Mismatch in ISm bit-budget distribution. Exiting!\n" ); + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "\nError: Mismatch in ISM bit-budget distribution. Exiting!\n" ); } } #endif @@ -332,7 +325,7 @@ ivas_error ivas_ism_config( /*-------------------------------------------------------------------* * ivas_ism_reset_metadata() * - * Reset ISm metadata parameters + * Reset ISM metadata parameters *-------------------------------------------------------------------*/ void ivas_ism_reset_metadata( @@ -341,15 +334,20 @@ void ivas_ism_reset_metadata( { hIsmMeta->azimuth = 0.0f; hIsmMeta->elevation = 0.0f; + hIsmMeta->yaw = 0.0f; + hIsmMeta->pitch = 0.0f; + hIsmMeta->radius = 1.0f; return; } + /*-------------------------------------------------------------------* * ivas_ism_reset_metadata_API() * - * Reset ISm metadata parameters + * Reset ISM metadata parameters *-------------------------------------------------------------------*/ + void ivas_ism_reset_metadata_API( ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle */ ) @@ -360,6 +358,7 @@ void ivas_ism_reset_metadata_API( return; } + /*-------------------------------------------------------------------* * ism_quant_meta() * @@ -368,10 +367,12 @@ void ivas_ism_reset_metadata_API( /*! r: index of the winning codeword */ int16_t ism_quant_meta( - const float val, /* i : scalar value to quantize */ - float *valQ, /* o : quantized value */ - const float borders[], /* i : level borders */ - const int16_t cbsize /* i : codebook size */ + const float val, /* i : scalar value to quantize */ + float *valQ, /* o : quantized value */ + const float borders[], /* i : level borders */ + const float q_step, /* i : quantization step */ + const float q_step_border, /* i : quantization step at the border */ + const int16_t cbsize /* i : codebook size */ ) { int16_t idx, idx_start; @@ -381,19 +382,19 @@ int16_t ism_quant_meta( { qlow = borders[0]; idx_start = 0; - step = ISM_Q_STEP_BORDER; + step = q_step_border; } else if ( val <= borders[2] ) { qlow = borders[1]; - idx_start = (int16_t) ( ( borders[1] - borders[0] ) / ISM_Q_STEP_BORDER ); - step = ISM_Q_STEP; + idx_start = (int16_t) ( ( borders[1] - borders[0] ) / q_step_border ); + step = q_step; } else { qlow = borders[2]; - idx_start = (int16_t) ( cbsize - 1 - ( borders[3] - borders[2] ) / ISM_Q_STEP_BORDER ); - step = ISM_Q_STEP_BORDER; + idx_start = (int16_t) ( cbsize - 1 - ( borders[3] - borders[2] ) / q_step_border ); + step = q_step_border; } idx = idx_start + (int16_t) max( 0.f, min( cbsize - 1, ( ( val - qlow ) / step + 0.5f ) ) ); @@ -411,31 +412,33 @@ int16_t ism_quant_meta( /*! r: dequantized value */ float ism_dequant_meta( - const int16_t idx, /* i : quantizer index */ - const float borders[], /* i : level borders */ - const int16_t cbsize /* i : codebook size */ + const int16_t idx, /* i : quantizer index */ + const float borders[], /* i : level borders */ + const float q_step, /* i : quantization step */ + const float q_step_border, /* i : quantization step at the border */ + const int16_t cbsize /* i : codebook size */ ) { int16_t idx_start; float qlow, step, valQ; - if ( idx <= ( borders[1] - borders[0] ) / ISM_Q_STEP_BORDER ) + if ( idx <= ( borders[1] - borders[0] ) / q_step_border ) { qlow = borders[0]; idx_start = 0; - step = ISM_Q_STEP_BORDER; + step = q_step_border; } - else if ( idx <= cbsize - 1 - ( borders[3] - borders[2] ) / ISM_Q_STEP_BORDER ) + else if ( idx <= cbsize - 1 - ( borders[3] - borders[2] ) / q_step_border ) { qlow = borders[1]; - idx_start = (int16_t) ( ( borders[1] - borders[0] ) / ISM_Q_STEP_BORDER ); - step = ISM_Q_STEP; + idx_start = (int16_t) ( ( borders[1] - borders[0] ) / q_step_border ); + step = q_step; } else { qlow = borders[2]; - idx_start = (int16_t) ( cbsize - 1 - ( borders[3] - borders[2] ) / ISM_Q_STEP_BORDER ); - step = ISM_Q_STEP_BORDER; + idx_start = (int16_t) ( cbsize - 1 - ( borders[3] - borders[2] ) / q_step_border ); + step = q_step_border; } valQ = ( idx - idx_start ) * step + qlow; @@ -452,12 +455,13 @@ float ism_dequant_meta( void ivas_param_ism_config( PARAM_ISM_CONFIG_HANDLE hParamIsm /* i/o: IVAS Param ISM Config Structure */ + , + const int16_t nchan_obj /* i : number of ISM channels */ ) { - int16_t i, num_obj; + int16_t i; hParamIsm->nbands = MAX_PARAM_ISM_NBANDS; - num_obj = hParamIsm->num_obj; for ( i = 0; i < hParamIsm->nbands; i++ ) { @@ -465,7 +469,7 @@ void ivas_param_ism_config( } /* for elevation zero compute the max azi quantization indices */ - for ( i = 0; i < num_obj; i++ ) + for ( i = 0; i < nchan_obj; i++ ) { hParamIsm->last_az_diff[i] = 0; hParamIsm->last_az_sgn[i] = 1; @@ -502,3 +506,96 @@ ISM_MODE ivas_ism_mode_select( return ism_mode; } + + +/*--------------------------------------------------------------- + * ivas_ism_metadata_close() + * + * Deallocate ISM metadata handles + * ---------------------------------------------------------------*/ + +void ivas_ism_metadata_close( + ISM_METADATA_HANDLE hIsmMetaData[] /* i/o : object metadata handles */ +) +{ + int16_t n; + + if ( hIsmMetaData == NULL || hIsmMetaData == NULL ) + { + return; + } + + for ( n = 0; n < MAX_NUM_OBJECTS; n++ ) + { + if ( hIsmMetaData[n] != NULL ) + { + free( hIsmMetaData[n] ); + hIsmMetaData[n] = NULL; + } + } + + return; +} + + +/*-------------------------------------------------------------------* + * update_last_metadata() + * + * Store last metadata values + *-------------------------------------------------------------------*/ + +void update_last_metadata( + const int16_t nchan_ism, /* i : number of objects */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + const int16_t updt_flag[] /* i : last metadata update flag */ +) +{ + int16_t ch; + + for ( ch = 0; ch < nchan_ism; ch++ ) + { + if ( updt_flag[ch] == 1 ) + { + hIsmMeta[ch]->last_azimuth = hIsmMeta[ch]->azimuth; + hIsmMeta[ch]->last_elevation = hIsmMeta[ch]->elevation; + } + } + + return; +} + + +/*----------------------------------------------------------------* + * ivas_get_ism_sid_quan_bitbudget() + * + * Set quantization bits based on the number of coded objects + *----------------------------------------------------------------*/ + +void ivas_get_ism_sid_quan_bitbudget( + const int16_t nchan_ism, /* i : number of objects */ + int16_t *nBits_azimuth, /* o : number of Q bits for azimuth */ + int16_t *nBits_elevation, /* o : number of Q bits for elevation */ + float *q_step, /* o : quantization step */ + float *q_step_border, /* o : quantization step at the border */ + int16_t *nBits_coh, /* o : number of Q bits for coherence */ + int16_t *nBits_sce_id /* o : number of Q bits for sce_id_dtx */ +) +{ + *nBits_azimuth = ISM_DTX_AZI_BITS_HIGH; + *nBits_elevation = ISM_DTX_ELE_BITS_HIGH; + *q_step = ISM_Q_STEP_HIGH; + *q_step_border = ISM_Q_STEP_BORDER_HIGH; + *nBits_coh = ISM_DTX_COH_SCA_BITS; + *nBits_sce_id = 1; + + if ( nchan_ism >= 3 ) + { + *nBits_azimuth = ISM_DTX_AZI_BITS_LOW; + *nBits_elevation = ISM_DTX_ELE_BITS_LOW; + *q_step = ISM_Q_STEP_LOW; + *q_step_border = ISM_Q_STEP_BORDER_LOW; + *nBits_sce_id = 2; + } + + return; +} diff --git a/lib_com/ivas_masa_com.c b/lib_com/ivas_masa_com.c index f98dcd8414..e576c725b2 100644 --- a/lib_com/ivas_masa_com.c +++ b/lib_com/ivas_masa_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------- * Local constants @@ -302,6 +302,7 @@ void ivas_masa_set_coding_config( return; } + /*--------------------------------------------------------------- * masa_sample_rate_band_correction() * @@ -313,6 +314,8 @@ void masa_sample_rate_band_correction( int16_t *band_mapping, /* i/o: Band mapping used and modified */ IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: QMetadata structure for modification */ const int32_t sampling_rate /* i : Sampling rate */ + , + MASA_DECODER_EXT_OUT_META_HANDLE hExtOutMeta /* i/o: MASA decoder metadata ext out buffer */ ) { uint8_t band, sf; @@ -385,6 +388,26 @@ void masa_sample_rate_band_correction( hQMetaData->twoDirBands[band] = 0; } } + if ( hExtOutMeta != NULL ) + { + /* in decoder, zero the EXT out MASA meta buffer */ + for ( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ ) + { + for ( band = config->numCodingBands; band < MASA_FREQUENCY_BANDS; band++ ) + { + hExtOutMeta->directionIndex[0][sf][band] = SPH_IDX_FRONT; + hExtOutMeta->directToTotalRatio[0][sf][band] = 0u; + hExtOutMeta->spreadCoherence[0][sf][band] = 0u; + + hExtOutMeta->directionIndex[1][sf][band] = SPH_IDX_FRONT; + hExtOutMeta->directToTotalRatio[1][sf][band] = 0u; + hExtOutMeta->spreadCoherence[1][sf][band] = 0u; + + hExtOutMeta->surroundCoherence[sf][band] = 0u; + hExtOutMeta->diffuseToTotalRatio[sf][band] = UINT8_MAX; + } + } + } return; } diff --git a/lib_com/ivas_mc_com.c b/lib_com/ivas_mc_com.c index a6ee0069ff..027b687686 100644 --- a/lib_com/ivas_mc_com.c +++ b/lib_com/ivas_mc_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include #include "prot.h" #include "ivas_prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------- @@ -115,6 +115,7 @@ MC_MODE ivas_mc_mode_select( return mc_mode; } + /*--------------------------------------------------------------- * ivas_mc_setup_get_num_channels() * @@ -154,6 +155,7 @@ int16_t ivas_mc_ls_setup_get_num_channels( return nchan; } + /*--------------------------------------------------------------- * ivas_mc_map_output_config_to_mc_ls_setup() * @@ -193,6 +195,7 @@ MC_LS_SETUP ivas_mc_map_output_config_to_mc_ls_setup( return mc_ls_setup; } + /*--------------------------------------------------------------- * ivas_mc_map_ls_setup_to_output_config * diff --git a/lib_com/ivas_mc_param_com.c b/lib_com/ivas_mc_param_com.c index 3690c1219f..acf7a8eae2 100644 --- a/lib_com/ivas_mc_param_com.c +++ b/lib_com/ivas_mc_param_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------- @@ -141,7 +141,6 @@ void ivas_param_mc_metadata_open( ivas_param_mc_default_icc_map( hMetadataPMC->icc_mapping_conf, hMetadataPMC->icc_mapping[i] ); } - /* init remaining flags and indices */ hMetadataPMC->param_frame_idx = 0; hMetadataPMC->flag_use_adaptive_icc_map = 0; @@ -212,13 +211,12 @@ void ivas_param_mc_metadata_close( { uint16_t i; - /* adaptive ICC mapping */ for ( i = 0; i < 2; i++ ) { if ( hMetadataPMC->icc_map_full[i] ) { - count_free( hMetadataPMC->icc_map_full[i] ); + free( hMetadataPMC->icc_map_full[i] ); hMetadataPMC->icc_map_full[i] = NULL; } } @@ -276,7 +274,7 @@ void ivas_param_mc_create_full_icc_mapping( /* allocate memory for the map */ for ( i = 0; i < 2; i++ ) { - icc_map[i] = (int16_t *) count_malloc( *icc_map_size_full * sizeof( int16_t ) ); + icc_map[i] = (int16_t *) malloc( *icc_map_size_full * sizeof( int16_t ) ); } /* create map (non-LFE ICCs) */ @@ -330,6 +328,99 @@ void ivas_param_mc_default_icc_map( } +/*------------------------------------------------------------------------- + * ivas_param_mc_get_num_param_bands() + * + * + *------------------------------------------------------------------------*/ + +static int16_t ivas_param_mc_get_num_param_bands( + const MC_LS_SETUP mc_ls_setup, /* i : MC ls setup */ + const int32_t ivas_total_brate /* i : IVAS total bitrate */ +) +{ + int16_t num_parameter_bands; + + num_parameter_bands = 0; + + /* parameter bands */ + switch ( mc_ls_setup ) + { + case MC_LS_SETUP_5_1: + switch ( ivas_total_brate ) + { + case IVAS_48k: + num_parameter_bands = 10; + break; + case IVAS_64k: + case IVAS_80k: + num_parameter_bands = 14; + break; + default: + assert( 0 && "PARAM_MC: bitrate for CICP6 not supported!" ); + } + break; + + case MC_LS_SETUP_7_1: + switch ( ivas_total_brate ) + { + case IVAS_48k: + num_parameter_bands = 10; + break; + case IVAS_64k: + case IVAS_80k: + num_parameter_bands = 14; + break; + case IVAS_96k: + num_parameter_bands = 20; + break; + } + break; + case MC_LS_SETUP_5_1_2: + switch ( ivas_total_brate ) + { + case IVAS_48k: + num_parameter_bands = 10; + break; + case IVAS_64k: + case IVAS_80k: + num_parameter_bands = 14; + break; + case IVAS_96k: + num_parameter_bands = 20; + break; + } + break; + case MC_LS_SETUP_5_1_4: + switch ( ivas_total_brate ) + { + case IVAS_96k: + num_parameter_bands = 14; + break; + case IVAS_128k: + num_parameter_bands = 20; + break; + } + break; + case MC_LS_SETUP_7_1_4: + switch ( ivas_total_brate ) + { + case IVAS_128k: + num_parameter_bands = 20; + break; + case IVAS_160k: + num_parameter_bands = 20; + break; + } + break; + default: + assert( 0 && "PARAM_MC: channel configuration not supportet!" ); + } + + return num_parameter_bands; +} + + /*------------------------------------------------------------------------- * Local functions *------------------------------------------------------------------------*/ @@ -346,7 +437,6 @@ static void ivas_param_mc_set_coding_scheme( HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC /* i/o: Parametric MC metadata handle */ ) { - /* quantizer and coding tables */ switch ( mc_ls_setup ) { @@ -427,79 +517,7 @@ static void ivas_param_mc_set_coding_scheme( assert( 0 && "PARAM_MC: channel configuration not supported!" ); } - /* parameter bands */ - switch ( mc_ls_setup ) - { - case MC_LS_SETUP_5_1: - switch ( ivas_total_brate ) - { - case IVAS_48k: - hMetadataPMC->num_parameter_bands = 10; - break; - case IVAS_64k: - case IVAS_80k: - hMetadataPMC->num_parameter_bands = 14; - break; - default: - assert( 0 && "PARAM_MC: bitrate for CICP6 not supported!" ); - } - break; - - case MC_LS_SETUP_7_1: - switch ( ivas_total_brate ) - { - case IVAS_48k: - hMetadataPMC->num_parameter_bands = 10; - break; - case IVAS_64k: - case IVAS_80k: - hMetadataPMC->num_parameter_bands = 14; - break; - case IVAS_96k: - hMetadataPMC->num_parameter_bands = 20; - break; - } - break; - case MC_LS_SETUP_5_1_2: - switch ( ivas_total_brate ) - { - case IVAS_48k: - hMetadataPMC->num_parameter_bands = 10; - break; - case IVAS_64k: - case IVAS_80k: - hMetadataPMC->num_parameter_bands = 14; - break; - case IVAS_96k: - hMetadataPMC->num_parameter_bands = 20; - break; - } - break; - case MC_LS_SETUP_5_1_4: - switch ( ivas_total_brate ) - { - case IVAS_96k: - hMetadataPMC->num_parameter_bands = 14; - break; - case IVAS_128k: - hMetadataPMC->num_parameter_bands = 20; - break; - } - break; - case MC_LS_SETUP_7_1_4: - switch ( ivas_total_brate ) - { - case IVAS_128k: - hMetadataPMC->num_parameter_bands = 20; - break; - case IVAS_160k: - hMetadataPMC->num_parameter_bands = 20; - break; - } - break; - default: - assert( 0 && "PARAM_MC: channel configuration not supportet!" ); - } + hMetadataPMC->num_parameter_bands = ivas_param_mc_get_num_param_bands( mc_ls_setup, ivas_total_brate ); return; } diff --git a/lib_com/ivas_mcmasa_com.c b/lib_com/ivas_mcmasa_com.c index 2441cf7973..1b7db4ff01 100644 --- a/lib_com/ivas_mcmasa_com.c +++ b/lib_com/ivas_mcmasa_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -36,7 +36,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* @@ -65,6 +65,7 @@ void ivas_mcmasa_setNumTransportChannels( return; } + /*--------------------------------------------------------------------------* * ivas_mcmasa_set_separate_channel_mode() * @@ -91,24 +92,41 @@ void ivas_mcmasa_set_separate_channel_mode( return; } + /*--------------------------------------------------------------------------* - * ivas_mcmasa_mono_brate() + * ivas_mcmasa_split_brate() * - * Set SCE bitrate for McMASA mono separated channel + * Split the total bitrate to elements in McMASA *--------------------------------------------------------------------------*/ -/*! r: McMASA SCE bitrate */ -int32_t ivas_mcmasa_mono_brate( - const int32_t ivas_total_brate /* i : IVAS total bitrate */ +void ivas_mcmasa_split_brate( + const uint8_t separateChannelEnabled, /* i : Transport running in "separate channel" mode */ + const int32_t ivas_total_brate, /* i : Total bitrate available to be split */ + const int16_t nSCE, /* i : Number of SCEs in use (0 or 1) */ + const int16_t nCPE, /* i : Number of CPEs in use (0 or 1) */ + int32_t *brate_sce, /* o : Pointer to SCE element bitrate */ + int32_t *brate_cpe /* o : Pointer to CPE element bitrate */ ) { - /* 25% of total bitrate is used for SCE below 96 kb/s (separated mono channel), otherwise 30% */ - if ( ivas_total_brate < IVAS_96k ) + if ( separateChannelEnabled ) { - return ( const int32_t )( MCMASA_MONOBITRATIO_64k * ivas_total_brate ); + /* 25% of total bitrate is used for SCE below 96 kb/s (separated mono channel), otherwise 30% */ + if ( ivas_total_brate < IVAS_96k ) + { + *brate_sce = (int32_t) ( MCMASA_MONOBITRATIO_64k * ivas_total_brate ); + } + else + { + *brate_sce = (int32_t) ( MCMASA_MONOBITRATIO * ivas_total_brate ); + } + + *brate_cpe = ivas_total_brate - *brate_sce; } else { - return ( const int32_t )( MCMASA_MONOBITRATIO * ivas_total_brate ); + *brate_sce = nSCE > 0 ? ivas_total_brate / ( nCPE + nSCE ) : 0; + *brate_cpe = nCPE > 0 ? ivas_total_brate / ( nCPE + nSCE ) : 0; } + + return; } diff --git a/lib_com/ivas_mct_com.c b/lib_com/ivas_mct_com.c index 97d7636a03..97c5f5dd8c 100644 --- a/lib_com/ivas_mct_com.c +++ b/lib_com/ivas_mct_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -35,7 +35,7 @@ #include "ivas_cnst.h" #include "ivas_prot.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" #include @@ -66,11 +66,6 @@ void splitAvailableBitsMCT( int16_t min_chan_bits[MCT_MAX_CHANNELS], min_bits_tot, remaining_bits; int16_t core[MCT_MAX_CHANNELS]; MCT_CHAN_MODE mct_chan_mode[MCT_MAX_CHANNELS]; - int16_t num_lfe; - int16_t lfe_channel; - - num_lfe = 0; - lfe_channel = -1; min_bits_tot = 0; for ( i = 0; i < nchan; i++ ) @@ -85,19 +80,12 @@ void splitAvailableBitsMCT( mct_chan_mode[i] = ( (Decoder_State *) sts[i] )->mct_chan_mode; core[i] = ( (Decoder_State *) sts[i] )->core; } - - if ( mct_chan_mode[i] == MCT_CHAN_MODE_LFE ) - { - num_lfe++; - lfe_channel = i; - assert( lfe_channel == LFE_CHANNEL ); - } } - for ( i = 0; i < nchan; i++ ) { - if ( mct_chan_mode[i] != MCT_CHAN_MODE_LFE && mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE ) + if ( + mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE ) { min_chan_bits[i] = 0; @@ -129,7 +117,8 @@ void splitAvailableBitsMCT( bits_frame_channel = &( (Decoder_State *) sts[i] )->bits_frame_channel; } - if ( mct_chan_mode[i] != MCT_CHAN_MODE_LFE && mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE ) + if ( + mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE ) { assert( split_ratio[i] >= 1 && split_ratio[i] < BITRATE_MCT_RATIO_RANGE ); *bits_frame_channel = split_ratio[i] * remaining_bits / BITRATE_MCT_RATIO_RANGE + min_chan_bits[i]; @@ -163,7 +152,8 @@ void splitAvailableBitsMCT( bits_frame_channel = &( (Decoder_State *) sts[i] )->bits_frame_channel; } - if ( mct_chan_mode[i] != MCT_CHAN_MODE_LFE && mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE ) + if ( + mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE ) { *bits_frame_channel -= diff * split_ratio[i] / BITRATE_MCT_RATIO_RANGE; *bits_frame_channel = max( min_chan_bits[i], *bits_frame_channel ); diff --git a/lib_com/ivas_mdct_core_com.c b/lib_com/ivas_mdct_core_com.c index fd80b2d054..afb5303a7a 100644 --- a/lib_com/ivas_mdct_core_com.c +++ b/lib_com/ivas_mdct_core_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -35,7 +35,7 @@ #include "ivas_cnst.h" #include "ivas_prot.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * ivas_mdct_tcx10_bit_distribution() diff --git a/lib_com/ivas_mdct_imdct.c b/lib_com/ivas_mdct_imdct.c index 036f89201f..5580973ed0 100644 --- a/lib_com/ivas_mdct_imdct.c +++ b/lib_com/ivas_mdct_imdct.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,19 +38,20 @@ #include "debug.h" #endif #include "ivas_stat_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------------------------* * Local constants *------------------------------------------------------------------------------------------*/ + #define IVAS_IMDCT_SCALING_GAIN 2115.165304808f /*-----------------------------------------------------------------------------------------* * Function ivas_tda() * - * Time domain alias implementation + * Time domain aliasing *-----------------------------------------------------------------------------------------*/ void ivas_tda( @@ -67,6 +68,8 @@ void ivas_tda( pOut[i] = -pIn[len_by_2 - i - 1] + pIn[len_by_2 + i]; pOut[len_by_2 + i] = pIn[length * 2 - i - 1] + pIn[length + i]; } + + return; } diff --git a/lib_com/ivas_mdft_imdft.c b/lib_com/ivas_mdft_imdft.c index 61797d6746..a9f5bac532 100644 --- a/lib_com/ivas_mdft_imdft.c +++ b/lib_com/ivas_mdft_imdft.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #endif #include "ivas_rom_com.h" #include -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------------------------* @@ -82,6 +82,11 @@ static void ivas_get_mdft_twid_factors( case IVAS_160_PT_LEN: *ppTwid = &ivas_mdft_coeff_cos_twid_160[0]; break; +#ifdef PARAMMC_SHORT_ENC_MDFT + case IVAS_120_PT_LEN: + *ppTwid = &ivas_mdft_coeff_cos_twid_120[0]; + break; +#endif case IVAS_80_PT_LEN: *ppTwid = &ivas_mdft_coeff_cos_twid_80[0]; break; diff --git a/lib_com/ivas_pca_tools.c b/lib_com/ivas_pca_tools.c index 21f3c0c1ec..63285dabb1 100644 --- a/lib_com/ivas_pca_tools.c +++ b/lib_com/ivas_pca_tools.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include #include #include "ivas_rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" #include "prot.h" diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h index 148b2b515b..da54a53e21 100644 --- a/lib_com/ivas_prot.h +++ b/lib_com/ivas_prot.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -105,17 +105,12 @@ ivas_error mct_enc_reconfigure( Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */ const uint16_t b_nchan_change /* i : flag indicating different channel count */ ); -#ifdef SBA_BR_SWITCHING -ivas_error ivas_sba_enc_reinit( - Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */ -); -#endif -#ifdef SBA_BR_SWITCHING -int16_t get_sba_reinit_flag( - int32_t ivas_total_bitrate, /* i: current bitrate */ - int32_t last_ivas_total_brate /* i: previous bitrate */ +ivas_error ivas_spar_md_enc_init +( + ivas_spar_md_enc_state_t *hMdEnc, /* o : MD encoder handle */ + const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */ + const int16_t sba_order /* i : Ambisonic (SBA) order */ ); -#endif ivas_error ivas_sba_enc_reconfigure( Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */ ); @@ -129,14 +124,17 @@ void destroy_cpe_enc( ); void ivas_mct_enc_close( - MCT_ENC_HANDLE hMCT /* i/o: MCT encoder structure */ + MCT_ENC_HANDLE *hMCT /* i/o: MCT encoder structure */ ); ivas_error ivas_corecoder_enc_reconfig( Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */ const int16_t nSCE_old, /* i : number of SCEs in previous frame */ const int16_t nCPE_old, /* i : number of CPEs in previous frame */ - const int16_t nchan_transport_old /* i : number of TCs in previous frame */ + const int16_t nchan_transport_old, /* i : number of TCs in previous frame */ + const int32_t brate_SCE, /* i : bitrate to be set for the SCEs */ + const int32_t brate_CPE, /* i : bitrate to be set for the CPEs */ + const MC_MODE last_mc_mode /* i : switching between MC modes: last mode */ ); ivas_error ivas_sce_enc( @@ -172,7 +170,6 @@ ivas_error pre_proc_front_ivas( const int16_t n, /* i : channel number */ float old_inp_12k8[], /* o : buffer of old input signal */ float old_inp_16k[], /* o : buffer of old input signal @16kHz */ - float *Etot, /* o : total energy */ float *ener, /* o : residual energy from Levinson-Durbin */ float *relE, /* o : frame relative energy */ float A[NB_SUBFR16k * ( M + 1 )], /* o : A(z) unquantized for the 4 subframes */ @@ -204,8 +201,8 @@ ivas_error pre_proc_front_ivas( const int16_t flag_16k_smc, /* i : flag to indicate if the OL SMC is run at 16 kHz */ const int16_t front_vad_flag, /* i : front-VAD flag to overwrite VAD decision */ const int16_t force_front_vad, /* i : flag to force VAD decision */ - const int16_t front_vad_dtx_flag /* i : front-VAD DTX flag to overwrite VAD decision*/ - ,const int32_t ivas_total_brate /* i : IVAS total bitrate */ + const int16_t front_vad_dtx_flag, /* i : front-VAD DTX flag to overwrite VAD decision*/ + const int32_t ivas_total_brate /* i : IVAS total bitrate */ ); ivas_error pre_proc_ivas( @@ -292,7 +289,7 @@ ivas_error stereo_dmx_evs_init_encoder( ); void stereo_dmx_evs_close_encoder( - STEREO_DMX_EVS_ENC_HANDLE hStereoDmxEVS /* i/o: Stereo downmix for EVS encoder handle */ + STEREO_DMX_EVS_ENC_HANDLE *hStereoDmxEVS /* i/o: Stereo downmix for EVS encoder handle */ ); ivas_error ivas_dec( @@ -344,9 +341,11 @@ void ivas_mct_dec_close( ivas_error ivas_corecoder_dec_reconfig( Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ const int16_t nSCE_old, /* i : number of SCEs in previous frame */ - const int16_t nCPE_old, /* i : number of CPEs in previous frame */ - const int16_t nchan_transport_old, /* i : number of TCs in previous frame */ - const int16_t sba_dirac_stereo_flag_old /* i : signal stereo output for SBA DirAC in previous frame */ + int16_t nCPE_old, /* i : number of CPEs in previous frame */ + const int16_t nchan_transport_old, /* i : number of TCs in previous frame */ + const int16_t sba_dirac_stereo_flag_old, /* i : signal stereo rendering using DFT upmix in previous frame */ + const int32_t brate_SCE, /* i : bitrate to be set for the SCEs */ + const int32_t brate_CPE /* i : bitrate to be set for the CPEs */ ); ivas_error ivas_hp20_dec_reconfig( @@ -406,7 +405,6 @@ ivas_error ivas_core_enc( const int16_t n_CoreChannels, /* i : number of core channels to be coded */ float old_inp_12k8[CPE_CHANNELS][L_INP_12k8], /* i : buffer of old input signal */ float old_inp_16k[CPE_CHANNELS][L_INP], /* i : buffer of old input signal */ - const float Etot[CPE_CHANNELS], /* i : total energy */ float ener[CPE_CHANNELS], /* i : residual energy from Levinson-Durbin */ float A[CPE_CHANNELS][NB_SUBFR16k * ( M + 1 )], /* i : A(z) unquantized for the 4 subframes */ float Aw[CPE_CHANNELS][NB_SUBFR16k * ( M + 1 )], /* i : weighted A(z) unquantized for subframes */ @@ -505,7 +503,8 @@ void stereo_tcx_core_dec( const int16_t last_element_mode, /* i : last element mode */ const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */ STEREO_CNG_DEC_HANDLE hStereoCng, /* i : Stereo CNG handle */ - const int16_t nchan_out /* i : number of output channels */ + const int16_t nchan_out, /* i : number of output channels */ + const IVAS_FORMAT ivas_format /* i : IVAS format */ ); void stereo_tcx_init_dec( @@ -614,6 +613,13 @@ void set_transient_stereo( float currFlatness[] /* i/o: current flatness */ ); +/*! r: preliminary flag to force ACELP */ +int16_t transient_analysis( + TRAN_DET_HANDLE hTranDet, /* i : handle transient detection */ + const float cor_map_LT[], /* i : LT correlation map */ + const float multi_harm_limit /* i : multi harminic threshold */ +); + void ivas_post_proc( SCE_DEC_HANDLE hSCE, /* i/o: SCE decoder structure */ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */ @@ -658,33 +664,6 @@ MC_LS_SETUP ivas_mc_map_output_config_to_mc_ls_setup( const AUDIO_CONFIG output_config /* i : output audio configuration */ ); -/*! r: limiter struct handle */ -IVAS_LIMITER_HANDLE ivas_limiter_open( - const int16_t num_channels, /* i : number of I/O channels */ - const int32_t sampling_rate /* i : sampling rate for processing */ -); - -void ivas_limiter_close( - IVAS_LIMITER_HANDLE* phLimiter /* i/o: pointer to limiter handle, can be NULL */ -); - -void ivas_limiter_dec -( - IVAS_LIMITER_HANDLE hLimiter, /* i/o: limiter struct handle */ - float output[MAX_OUTPUT_CHANNELS][L_FRAME48k], /* i/o: input/output buffer */ - const int16_t num_channels, /* i : number of channels to be processed */ - const int16_t output_frame, /* i : number of samples per channel in the buffer */ - const int16_t BER_detect /* i : BER detect flag */ -); - -void limiter_process( - IVAS_LIMITER_HANDLE hLimiter, /* i/o: limiter struct handle */ - const int16_t output_frame, /* i : number of samples to be processed per channel in the I/O buffer */ - const float threshold, /* i : signal amplitude above which limiting starts to be applied */ - const int16_t BER_detect, /* i : BER detect flag */ - int16_t *strong_saturation_cnt /* i/o: counter of strong saturations (can be NULL) */ -); - void smooth_dft2td_transition( CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */ float output[CPE_CHANNELS][L_FRAME48k], /* i/o: synthesis @external Fs */ @@ -728,15 +707,48 @@ void ivas_imdft( const int16_t length /* i : signal length */ ); +void TonalMdctConceal_create_concealment_noise( + float concealment_noise[L_FRAME48k], + CPE_DEC_HANDLE hCPE, + const int16_t L_frameTCX, + const int16_t L_frame, + const int16_t idchan, + const int16_t subframe_idx, + const int16_t core, + const float crossfade_gain, + const TONALMDCTCONC_NOISE_GEN_MODE noise_gen_mode +); + +void TonalMdctConceal_whiten_noise_shape( + Decoder_State *st, + const int16_t L_frame, + const TONALMDCTCONC_NOISE_SHAPE_WHITENING_MODE +); + +/*! r: IGF start line */ +int16_t get_igf_startline( + Decoder_State *st, /* i : decoder state */ + const int16_t L_frame, /* i : length of the frame */ + const int16_t L_frameTCX /* i : full band frame length */ +); + +float rand_triangular_signed( + int16_t *seed ); + +void dtx_read_padding_bits( + DEC_CORE_HANDLE st, + const int16_t num_bits +); + /*----------------------------------------------------------------------------------* - * ISm prototypes + * ISM prototypes *----------------------------------------------------------------------------------*/ ivas_error ivas_ism_config( - const int32_t ism_total_brate, /* i : ISms total bitrate */ - const int16_t num_trans_ch, /* i : number of trans channels */ - const int16_t num_obj, /* i : number of objects */ + const int32_t ism_total_brate, /* i : ISM total bitrate */ + const int16_t nchan_transport, /* i : number of transport channels */ + const int16_t nchan_ism, /* i : number of objects */ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ const int16_t localVAD[MAX_NUM_OBJECTS], /* i : local VAD flag */ const int16_t ism_imp[], /* i : ISM importance flags */ @@ -758,6 +770,8 @@ int16_t ism_quant_meta( const float val, /* i : scalar value to quantize */ float *valQ, /* o : quantized value */ const float borders[], /* i : level borders */ + const float q_step, /* i : quantization step */ + const float q_step_border, /* i : quantization step at the border */ const int16_t cbsize /* i : codebook size */ ); @@ -765,22 +779,27 @@ int16_t ism_quant_meta( float ism_dequant_meta( const int16_t idx, /* i : quantizer index */ const float borders[], /* i : level borders */ + const float q_step, /* i : quantization step */ + const float q_step_border, /* i : quantization step at the border */ const int16_t cbsize /* i : codebook size */ ); -ivas_error set_ism_metadata( - ISM_METADATA_HANDLE hIsmMeta, /* i/o: ISM metadata handle */ - float azimuth, /* i : azimuth */ - float elevation /* i : elevation */ +ivas_error ivas_set_ism_metadata( + ISM_METADATA_HANDLE hIsmMeta, /* o : ISM metadata handle */ + const float azimuth, /* i : azimuth value */ + const float elevation, /* i : elevation value */ + const float radius_meta, /* i : radius */ + const float yaw, /* i : yaw */ + const float pitch /* i : pitch */ ); -ivas_error create_ism_metadata_enc( +ivas_error ivas_ism_metadata_enc_create( Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */ const int16_t n_ISms, /* i : number of objects */ int32_t element_brate_tmp[] /* o : element bitrate per object */ ); -ivas_error create_ism_metadata_dec( +ivas_error ivas_ism_metadata_dec_create( Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ const int16_t n_ISms, /* i : number of objects */ int32_t element_brate_tmp[] /* o : element bitrate per object */ @@ -794,7 +813,8 @@ ivas_error ivas_ism_enc( ); ivas_error ivas_ism_metadata_enc( - const int32_t ism_total_brate, /* i : ISms total bitrate */ + const int32_t ism_total_brate, /* i : ISM total bitrate */ + const int16_t nchan_ism, /* i : number of ISM channels */ const int16_t nchan_transport, /* i : number of transport channels */ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ SCE_ENC_HANDLE hSCE[], /* i/o: SCE encoder handles */ @@ -802,18 +822,23 @@ ivas_error ivas_ism_metadata_enc( int16_t nb_bits_metadata[], /* o : number of metadata bits */ const int16_t localVAD[], /* i : VAD flag */ const int16_t ism_mode, /* i : ISM mode */ - const PARAM_ISM_CONFIG_HANDLE hParamIsm /* i : Param ISM Config Handle */ + const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Config Handle */ + const int16_t ism_extended_metadata_flag /* i : Extended metadata flag */ ); ivas_error ivas_ism_metadata_dec( - const int32_t ism_total_brate, /* i : ISms total bitrate */ + const int32_t ism_total_brate, /* i : ISM total bitrate */ + const int16_t nchan_ism, /* i : number of ISM channels */ int16_t *nchan_transport, /* o : number of transport channels */ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ SCE_DEC_HANDLE hSCE[], /* i/o: SCE decoder handles */ const int16_t bfi, /* i : bfi flag */ - int16_t nb_bits_metadata[], /* o : number of metadata bits */ + int16_t nb_bits_metadata[], /* o : number of metadata bits */ ISM_MODE ism_mode, /* i : ISM mode */ - const PARAM_ISM_CONFIG_HANDLE hParamIsm /* i : Param ISM Config Handle */ + ISM_DTX_DATA_DEC hISMDTX, /* i/o: ISM DTX structure */ + const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Config Handle */ + int16_t *ism_extended_metadata_flag, /* i/o: Extended metadata active in renderer */ + int16_t *ism_extmeta_cnt /* i/o: Number of change frames observed */ ); @@ -838,10 +863,14 @@ void ivas_param_ism_enc( ); void ivas_param_ism_enc_close( - DIRAC_ENC_HANDLE hDirAC, /* i/o: encoder DirAC handle */ + DIRAC_ENC_HANDLE *hDirAC, /* i/o: encoder DirAC handle */ const int32_t input_Fs /* i : input sampling_rate */ ); +void ivas_ism_metadata_close( + ISM_METADATA_HANDLE hIsmMetaData[] /* i/o : object metadata handles */ +); + void ivas_param_ism_stereo_dmx( Encoder_Struct *st_ivas, /* i : IVAS encoder structure */ float data[MAX_NUM_OBJECTS][L_FRAME48k], /* i/o: input signal/stereo dmx */ @@ -850,6 +879,8 @@ void ivas_param_ism_stereo_dmx( void ivas_param_ism_config( PARAM_ISM_CONFIG_HANDLE hParamIsm /* i/o: IVAS Param ISM Config Structure */ + , + const int16_t nchan_ism /* i : number of ISM channels */ ); ivas_error ivas_ism_enc_config( @@ -857,8 +888,9 @@ ivas_error ivas_ism_enc_config( ); ivas_error ivas_ism_dec_config( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - const int16_t num_obj /* i : number of objects in the bitstream */ + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ + , + const ISM_MODE last_ism_mode /* i/o: last ISM mode */ ); ivas_error ivas_param_ism_dec_open( @@ -866,7 +898,7 @@ ivas_error ivas_param_ism_dec_open( ); void ivas_param_ism_dec_close( - DIRAC_DEC_HANDLE hDirAC, /* i/o: decoder DirAC handle */ + DIRAC_DEC_HANDLE *hDirAC, /* i/o: decoder DirAC handle */ const AUDIO_CONFIG output_config /* i : output audio configuration */ ); @@ -879,6 +911,94 @@ void ivas_param_ism_params_to_masa_param_mapping( Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ ); + +/*----------------------------------------------------------------------------------* + * ISM DTX prototypes + *----------------------------------------------------------------------------------*/ + +ivas_error ivas_ism_dtx_open( + Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */ +); + +/*! r: indication of DTX frame */ +int16_t ivas_ism_dtx_enc( + ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */ + SCE_ENC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */ + const int32_t ivas_total_brate, /* i : IVAS total bitrate */ + const int16_t nchan_ism, /* i : number of objects */ + const int16_t nchan_transport, /* i : number of transport channels */ + int16_t vad_flag[MAX_NUM_OBJECTS], /* i : VAD flag */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + int16_t md_diff_flag[], /* o : metadata differential flag */ + int16_t *sid_flag /* o : indication of SID frame */ +); + +ivas_error ivas_ism_dtx_dec( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + int16_t *nb_bits_metadata /* o : number of metadata bits */ +); + +void ivas_ism_metadata_sid_enc( + ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */ + const int16_t flag_noisy_speech, /* i : noisy speech flag */ + const int16_t nchan_ism, /* i : number of objects */ + const int16_t nchan_transport, /* i : number of transport channels */ + const ISM_MODE ism_mode, /* i : ISM mode */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + const int16_t sid_flag, /* i : indication of SID frame */ + const int16_t md_diff_flag[], /* i : metadata differental flag */ + BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */ + int16_t nb_bits_metadata[] /* o : number of metadata bits */ +); + +void ivas_ism_metadata_sid_dec( + SCE_DEC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */ + const int32_t ism_total_brate, /* i : ISms total bitrate */ + const int16_t bfi, /* i : bfi flag */ + const int16_t nchan_ism, /* i : number of objects */ + const int16_t nchan_transport, /* i : number of transport channels */ + const ISM_MODE ism_mode, /* i : ISM mode */ + int16_t *flag_noisy_speech, /* o : noisy speech flag */ + int16_t *sce_id_dtx, /* o : SCE DTX ID */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + int16_t nb_bits_metadata[] /* o : number of metadata bits */ +); + +void ivas_ism_get_sce_id_dtx( + ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */ + SCE_ENC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */ + const int16_t nchan_transport, /* i : number of transport channels */ + const int16_t input_frame /* i : input frame length per channel */ +); + +void ivas_param_ism_compute_noisy_speech_flag( + Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */ +); + +void ivas_ism_coh_estim_dtx_enc( + ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */ + SCE_ENC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */ + const int16_t nchan_transport, /* i : number of transport channels */ + const int16_t input_frame /* i : input frame length */ +); + +void update_last_metadata( + const int16_t nchan_ism, /* i : number of objects */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + const int16_t updt_flag[] /* i : last metadata update flag */ +); + +void ivas_get_ism_sid_quan_bitbudget( + const int16_t nchan_ism, /* i : number of objects */ + int16_t *nBits_azimuth, /* o : number of Q bits for azimuth */ + int16_t *nBits_elevation, /* o : number of Q bits for elevation */ + float *q_step, /* o : quantization step */ + float *q_step_border, /* o : quantization step at the border */ + int16_t *nBits_coh, /* o : number of Q bits for coherence */ + int16_t *nBits_sce_id /* o : number of Q bits for sce_id_dtx */ +); + + /*----------------------------------------------------------------------------------* * DFT Stereo prototypes *----------------------------------------------------------------------------------*/ @@ -927,10 +1047,8 @@ float stereo_dft_enc_synthesize( void stereo_dft_enc_process( CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */ -#ifdef FIX_ITD_CNG const int16_t vad_flag_dtx[], /* i: VAD dtx flags */ const int16_t vad_hover_flag[], /* i: VAD hangover flags */ -#endif const int16_t input_frame /* i : input frame length */ ); @@ -979,11 +1097,7 @@ void stereo_dft_dequantize_itd( void stereo_dft_enc_sid_calc_coh( STEREO_DFT_ENC_DATA_HANDLE hStereoDft, /* i/o: DFT stereo handle */ -#ifdef FIX_ITD_CNG float prev_cohBand[2*(STEREO_DFT_BAND_MAX/2)], /* i/o: Previous coherence */ -#else - float coh_crossfade[STEREO_DFT_BAND_MAX / 2], /* i/o: Coherence crossfade memory */ -#endif int16_t *td_active, /* i/o: TD stereo mode indicator */ int16_t *first_SID, /* i/o: First SID indicator */ float *cohBand /* i/o: Coherence per band */ @@ -1008,7 +1122,8 @@ ivas_error stereo_dft_dec_create( STEREO_DFT_DEC_DATA_HANDLE *hStereoDft, /* i/o: decoder DFT stereo handle */ const int32_t element_brate, /* i : element bitrate */ const int32_t output_Fs, /* i : output sampling rate */ - const int16_t sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */ + const int16_t sba_dirac_stereo_flag, /* i : signal stereo output for SBA DirAC */ + const int16_t nchan_transport /* i : number of transport channels */ ); void stereo_dft_dec_reset( @@ -1051,7 +1166,12 @@ void stereo_dft_dec( float DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* i/o: DFT buffers */ float *input_mem, /* i/o: mem of buffer DFT analysis */ STEREO_CNG_DEC_HANDLE hStereoCng, /* i/o: Stereo CNG data structure */ - const int16_t sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */ + const int16_t sba_dirac_stereo_flag, /* i : signal stereo output for SBA DirAC */ + const int16_t sba_mono_flag, /* i : signal mono output for SBA DirAC */ + ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD handle for upmixing */ + const int16_t cross_fade_start_offset, /* i : SPAR mixer delay compensation */ + const int32_t output_Fs, /* i : Fs for delay calculation */ + const int16_t nchan_transport /* i : number of transpor channels */ ); void stereo_dft_res_ecu( @@ -1135,12 +1255,9 @@ void stereo_dft_dec_read_BS( void stereo_dft_dec_smooth_parameters( STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder DFT stereo handle */ - const int16_t prev_sid_nodata /* i : Previous SID/No data indicator */ -#ifdef FIX_ITD_CNG - , + const int16_t prev_sid_nodata, /* i : Previous SID/No data indicator */ const int16_t active_frame_counter, /* i : Active frame counter */ const int32_t element_brate /* i : Element bitrate */ -#endif ); void stereo_dft_generate_res_pred( @@ -1296,10 +1413,8 @@ void stereo_dft_enc_compute_itd( float *DFT_R, const int16_t k_offset, const int16_t input_frame, -#ifdef FIX_ITD_CNG const int16_t vad_flag_dtx[], const int16_t vad_hover_flag[], -#endif float *bin_nrgL, float *bin_nrgR ); @@ -1716,6 +1831,7 @@ void tdm_ol_pitch_comparison( void tdm_configure_enc( CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */ + const float Etot_last[CPE_CHANNELS], /* i/o: Energy of last frame */ const int16_t tdm_SM_or_LRTD_Pri, /* i : channel combination scheme flag in TD stereo OR LRTD primary channel */ const int16_t tdm_ratio_idx, /* i : ratio index */ const int16_t tdm_ratio_idx_SM, /* i : ratio index in SM mode */ @@ -1807,18 +1923,18 @@ void tdm_low_rate_dec( void tdm_SCh_LSF_intra_pred( const int32_t element_brate, /* i : element bitrate */ const float *tdm_lsfQ_PCh, /* i : primary channel LSFs */ - float *pred_lsf_secondary /* o : predicted secondary channel LSFs */ + float *pred_lsf_SCh /* o : predicted secondary channel LSFs */ ); #ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE void tdm_SCh_lsf_reuse( - const int16_t enc_dec, /* i : encoder/decoder flag */ - const int32_t element_brate, /* i : element bitrate */ + const int16_t enc_dec, /* i : encoder/decoder flag */ + const int32_t element_brate, /* i : element bitrate */ float lsf_new[M], /* i/o: LSFs at the end of the frame */ float lsp_new[M], /* i/o: LSPs at the end of the frame */ const float tdm_lsfQ_PCh[M], /* i : primary channel LSFs */ const float lsf_wgts[M], /* i : LSF weights */ - int16_t beta_index[] /* i/o: quantization index */ + int16_t *beta_index /* i/o: quantization index */ ); #endif #endif @@ -1855,10 +1971,8 @@ void deindex_lvq_SHB( void stereo_td_itd_mdct_stereo( CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder handle */ -#ifdef FIX_ITD_CNG const int16_t vad_flag_dtx[], /* i: VAD dtx flags */ const int16_t vad_hover_flag[], /* i: VAD hangover flags */ -#endif const int16_t input_frame /* i : frame length */ ); @@ -2073,7 +2187,6 @@ void decoder_tcx_imdct( float synthFB[], const int16_t bfi, /* i : Bad frame indicator */ const int16_t frame_cnt, /* i : frame counter in the super frame */ - const int16_t isLFE, /* i : is LFE */ const int16_t sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */ ); @@ -2282,6 +2395,23 @@ void sns_shape_spectrum( const int16_t L_frame /* i : frame length */ ); +#ifdef SNS_MSVQ +int16_t quantize_sns( + float sns_in[CPE_CHANNELS][NB_DIV][M], + float snsQ_out[CPE_CHANNELS][NB_DIV][M], + Encoder_State **sts, + int16_t *indices, + int16_t *zero_side_flag, + int16_t *sns_stereo_mode +); + +void dequantize_sns( + int16_t indices[CPE_CHANNELS][NPRM_LPC_NEW], + float snsQ_out[CPE_CHANNELS][NB_DIV][M], + Decoder_State **sts +); +#endif + void sns_avq_cod( const float *sns, /* i : Input sns vectors */ const float *snsmid, /* i : Input mid-sns vectors */ @@ -2303,7 +2433,11 @@ void sns_avq_cod_stereo( void sns_avq_dec( int16_t *index, /* i : Quantization indices */ +#ifdef SNS_MSVQ + float SNS_Q[NB_DIV][M], /* o : Quantized SNS vectors */ +#else float *SNS_Q, /* o : Quantized SNS vectors */ +#endif const int16_t numlpc /* i : Number of sets of lpc */ ); @@ -2417,11 +2551,8 @@ void stereo_cng_upd_counters( const int32_t element_mode, /* i : element mode */ const int16_t nbands, /* i : Number of bands in active */ const float sidSideGain[], /* i : SID side gains */ - const int16_t burst_ho_count /* i : Hang-over count */ -#ifdef FIX_ITD_CNG - , + const int16_t burst_ho_count, /* i : Hang-over count */ int16_t *coh_fade_counter /* i : Coherence fade counter */ -#endif ); void stereo_cng_init_dec( @@ -2580,6 +2711,7 @@ ivas_error stereo_memory_dec( const int16_t nb_bits_metadata, /* i : number of metadata bits */ const int32_t output_Fs, /* i : output sampling rate */ const IVAS_FORMAT ivas_format, /* i : IVAS format */ + const MC_MODE mc_mode, /* i : MC mode */ const int16_t nchan_transport /* i : number of transport channels */ ); @@ -2640,7 +2772,6 @@ void ivas_mdct_core_whitening_enc( int16_t tnsSize[CPE_CHANNELS][NB_DIV], /* o : size of TNS */ int16_t p_param[CPE_CHANNELS][NB_DIV], /* o : pointer to parameter array */ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */ - int16_t *LFE_off, /* o : flag if LFE has content */ const int16_t mct_on, /* i : flag mct block (1) or stereo (0) */ const int16_t nChannels /* i : total number of coded channels */ ); @@ -2652,16 +2783,12 @@ void ivas_mct_core_enc( const int16_t nChannels, /* i : number of channels to be coded */ const int32_t ivas_total_brate, /* i : IVAS total bitrate */ const int16_t switch_bw, /* i : flag bandwidth switch occurance */ - const int16_t lfe_bits /* i : bits spent for LFE */ -#ifdef FIX_I1_113 - , + const int16_t lfe_bits, /* i : bits spent for LFE */ const int16_t sba_order /* i : Ambisonic (SBA) order */ -#endif ); void ivas_mdct_quant_coder( CPE_ENC_HANDLE hCPE, /* i/o: Encoder CPE handle */ - const int16_t LFE_off, /* i : flag if LFE has content */ int16_t tnsBits[CPE_CHANNELS][NB_DIV], /* i : bits needed for TNS parameters */ int16_t tnsSize[CPE_CHANNELS][NB_DIV], /* i : size of TNS */ int16_t p_param[CPE_CHANNELS][NB_DIV], /* i : pointer to parameter array */ @@ -2712,7 +2839,6 @@ void ivas_mdct_dec_side_bits_frame_channel( int16_t param_lpc[MCT_MAX_CHANNELS][NPRM_LPC_NEW], /* o : lpc_parameters */ int16_t p_param[CPE_CHANNELS][NB_DIV], /* o : pointer to param buffer */ Decoder_State *st0, /* i : pointer to bitstream handle */ - int16_t *LFE_off, /* o : flag if LFE has content */ int16_t nTnsBitsTCX10[CPE_CHANNELS][NB_DIV], /* o : number of bits for TNS */ int16_t param[CPE_CHANNELS][DEC_NPRM_DIV * NB_DIV], /* i/o: parameters buffer */ const int16_t MCT_flag, /* i : hMCT handle allocated (1) or not (0) */ @@ -2732,7 +2858,6 @@ void ivas_mct_side_bits( void ivas_mdct_core_invQ( CPE_DEC_HANDLE hCPE, /* i/o: CPE handle */ - const int16_t LFE_off, /* i : flag if LFE content */ int16_t nTnsBitsTCX10[CPE_CHANNELS][NB_DIV], /* i : number of TNS bits */ int16_t p_param[CPE_CHANNELS][NB_DIV], /* i : pointer to param buffer */ int16_t param_lpc[CPE_CHANNELS][NPRM_LPC_NEW], /* i : lpc parameters */ @@ -2750,14 +2875,12 @@ void ivas_mdct_core_reconstruct( CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */ float *x[][NB_DIV], /* i/o: pointers to synthesis @internal_FS */ float signal_outFB[CPE_CHANNELS][L_FRAME_PLUS], /* o : synthesis @output_FS */ - const int16_t LFE_off, /* i : flag if LFE content */ int16_t fUseTns[CPE_CHANNELS][NB_DIV], /* i : flage TNS enabled */ const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0) */ ); void ivas_mdct_core_tns_ns( CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */ - const int16_t LFE_off, /* i : flag if LFE has content */ int16_t fUseTns[CPE_CHANNELS][NB_DIV], /* i : two entries for each channel in TCX10 */ STnsData tnsData[CPE_CHANNELS][NB_DIV], /* o : TNS parameter */ float *x[CPE_CHANNELS][NB_DIV], /* o : synthesis @internal_FS */ @@ -3054,18 +3177,22 @@ void ivas_dirac_param_est_enc( float data_f[][L_FRAME48k], float **pp_fr_real, float **pp_fr_imag, - const int16_t input_frame - , + const int16_t input_frame, const SBA_MODE sba_mode ); + /*----------------------------------------------------------------------------------* - * SBA mode prototypes + * SBA format prototypes *----------------------------------------------------------------------------------*/ /*! r: SBA format mode */ SBA_MODE ivas_sba_mode_select( +#ifndef LBR_SBA const int32_t ivas_total_brate /* i : IVAS total bitrate */ +#else + void +#endif ); void ivas_sba_config( @@ -3078,11 +3205,10 @@ void ivas_sba_config( int16_t *nCPE, /* o : number of CPEs */ int16_t *element_mode /* o : element mode of the core coder */ ); -#ifdef SBA_BR_SWITCHING -ivas_error ivas_sba_dec_reinit( + +void ivas_sba_set_cna_cng_flag( Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ ); -#endif ivas_error ivas_sba_dec_reconfigure( Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ @@ -3094,14 +3220,13 @@ void ivas_init_dec_get_num_cldfb_instances( int16_t *numCldfbSyntheses /* o : number of CLDFB synthesis instances */ ); -#ifdef BRATE_SWITCHING_RENDERING ivas_error ivas_cldfb_dec_reconfig( Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ const int16_t nchan_transport_old, /* i : number of TCs in previous frame */ int16_t numCldfbAnalyses_old, /* i : number of CLDFB analysis instances in previous frame */ const int16_t numCldfbSyntheses_old /* i : number of CLDFB synthesis instances in previous frame */ ); -#endif + /*! r: Ambisonic (SBA) order */ int16_t ivas_sba_get_order( const int16_t nb_channels, /* i : Number of ambisonic channels */ @@ -3114,10 +3239,6 @@ int16_t ivas_sba_get_analysis_order( const int16_t sba_order /* i : Ambisonic (SBA) order */ ); -int16_t ivas_sba_get_order_transport( - const int16_t nchan_transport /* i : Number of transport channels */ -); - /*! r: number of Ambisonic channels */ int16_t ivas_sba_get_nchan( const int16_t sba_order, /* i : Ambisonic (SBA) order */ @@ -3148,15 +3269,6 @@ void ivas_sba_getTCs( const int16_t input_frame /* i : frame length */ ); -ivas_error ivas_sba_linear_renderer( - float output_f[][L_FRAME48k], /* i/o: synthesized core-coder transport channels/DirAC output */ - const int16_t output_frame, /* i : output frame length per channel */ - const int16_t nchan_in, /* i : number of input ambisonics channels */ - const AUDIO_CONFIG output_config, /* i : output audio configuration */ - const IVAS_OUTPUT_SETUP output_setup, /* i : output format setup */ - const float hoa_dec_mtx[] /* i : HOA decoding mtx */ -); - int16_t ivas_sba_remapTCs( float sba_data[][L_FRAME48k], /* i/o: SBA signals */ Decoder_Struct *st_ivas, /* i/o: decoder struct */ @@ -3166,31 +3278,35 @@ int16_t ivas_sba_remapTCs( void ivas_sba_dirac_stereo_dec( Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ float output[CPE_CHANNELS][L_FRAME48k], /* o : output synthesis signal */ - const int16_t output_frame /* i : output frame length per channel */ + const int16_t output_frame, /* i : output frame length per channel */ + const int16_t mcmasa /* i : McMASA flag */ ); void ivas_sba_dirac_stereo_config( STEREO_DFT_CONFIG_DATA_HANDLE hConfig /* o : DFT stereo configuration */ ); -void ivas_sba_dirac_stereo_smooth_parameters( - STEREO_DFT_DEC_DATA_HANDLE hStereoDft /* i/o: encoder DFT stereo handle */ +int16_t ivas_get_sba_dirac_stereo_flag( + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ ); -ivas_error ivas_sba_get_hoa_dec_matrix( - const IVAS_OUTPUT_SETUP hOutSetup, /* i : target output setup */ - float **hoa_dec_mtx, /* o : ALLRAD decoder matrix */ - const int16_t ambisonics_order /* i : Ambisonics order */ +void ivas_sba_dirac_stereo_smooth_parameters( + STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: encoder DFT stereo handle */ + ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD handle for upmixing */ + const int16_t cross_fade_start_offset, /* i : SPAR mixer delay compensation */ + const int32_t output_Fs /* i : Fs for delay calculation */ ); -void ivas_sba_mtx_mult( - float output_f[][L_FRAME48k], /* i/o: synthesized core-corder transport channels/DirAC output */ - const int16_t output_frame, /* i : frame length per channel */ - const int16_t nchan_in, /* i : Number of ambisonic channels */ - const IVAS_OUTPUT_SETUP output_setup, /* i : Output configuration */ - const float *mtx_hoa_decoder /* o : HOA decoding matrix */ +void ivas_sba2mc_cldfb( + IVAS_OUTPUT_SETUP hInSetup, /* i : Format of input layout */ + float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: cldfb real part */ + float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: cldfb imag part */ + const int16_t nb_channels_out, /* i : nb of output channels */ + const int16_t nb_bands, /* i : nb of CLDFB bands to process */ + const float *hoa_dec_mtx /* i : HOA decoding mtx */ ); + /*----------------------------------------------------------------------------------* * DirAC prototypes *----------------------------------------------------------------------------------*/ @@ -3204,7 +3320,7 @@ ivas_error ivas_dirac_enc_reconfigure( ); void ivas_dirac_enc_close( - DIRAC_ENC_HANDLE hDirAC, /* i/o: encoder DirAC handle */ + DIRAC_ENC_HANDLE *hDirAC, /* i/o: encoder DirAC handle */ const int32_t input_Fs /* i : input sampling_rate */ ); @@ -3256,7 +3372,7 @@ ivas_error ivas_dirac_dec_config( ); void ivas_dirac_dec_close( - DIRAC_DEC_HANDLE hDirAC /* i/o: decoder DirAC handle */ + DIRAC_DEC_HANDLE *hDirAC /* i/o: decoder DirAC handle */ ); void ivas_dirac_dec_read_BS( @@ -3278,55 +3394,27 @@ void ivas_dirac_dec( const int16_t i_sf ); -ivas_error ivas_dirac_dec_init_binaural_data( - Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +#ifdef FIX_417_TD_DECORR_BRATE_SW +ivas_error ivas_td_decorr_reconfig_dec( + const IVAS_FORMAT ivas_format, /* i : IVAS format */ + const int32_t ivas_total_brate, /* i : total IVAS bitrate */ + const int16_t nchan_transport, /* i : number of transport channels */ + const int32_t output_Fs, /* i : output sampling rate */ + ivas_td_decorr_state_t **hTdDecorr, /* i/o: TD decorrelator handle */ + uint16_t *useTdDecorr /* i/o: TD decorrelator flag */ ); -void ivas_dirac_dec_close_binaural_data( - DIRAC_DEC_BIN_HANDLE *hBinaural /* i/o: decoder DirAC binaural data handle */ +/*! r: Configured reqularization factor value */ +float configure_reqularization_factor( + const IVAS_FORMAT ivas_format, /* i : IVAS format */ + const int32_t ivas_total_brate /* i : total IVAS bitrate */ ); - -void ivas_dirac_dec_binaural( +#else +ivas_error ivas_dirac_dec_init_binaural_data( Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - float output_f[][L_FRAME48k], /* i/o: synthesized core-coder transport channels/DirAC output */ - const int16_t nchan_transport /* i : number of transport channels */ -); - -ivas_error ivas_binaural_reverb_open( - REVERB_STRUCT_HANDLE *hReverbPr, /* i/o: binaural reverb handle */ - const int16_t numBins, /* i : number of CLDFB bins */ - const int16_t numCldfbSlotsPerFrame, /* i : number of CLDFB slots per frame */ - ivas_roomAcoustics_t *roomAcoustics, /* i/o: room acoustics parameters */ - const AUDIO_CONFIG output_config, /* i : output audio configuration */ - const int32_t sampling_rate, /* i : sampling rate */ - const RENDERER_TYPE renderer_type /* i : renderer type */ -); - -void ivas_binaural_reverb_close( - REVERB_STRUCT_HANDLE *hReverb /* i/o: binaural reverb handle */ -); - -void ivas_binaural_reverb_setReverbTimes( - REVERB_STRUCT_HANDLE hReverb, /* i/o: binaural reverb handle */ - const int32_t output_Fs, /* i : sampling_rate */ - const float *revTimes, /* i : reverberation times T60 for each CLDFB bin in seconds */ - const float *revEnes /* i : spectrum for reverberated sound at each CLDFB bin */ -); - -void ivas_binaural_reverb_setPreDelay( - REVERB_STRUCT_HANDLE hReverb, /* i/o: binaural reverb handle */ - const int16_t delaySamples /* i : reverb pre-delay in CLDFB slots */ -); - -void ivas_binaural_reverb_processFrame( - REVERB_STRUCT_HANDLE hReverb, /* i/o: binaural reverb handle */ - const int16_t numInChannels, /* i : num input channels to be processed */ - float inReal[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : input CLDFB data real */ - float inImag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : input CLDFB data imag */ - float outReal[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : output CLDFB data real */ - float outImag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : output CLDFB data imag */ - const uint8_t offsetSamplesIO /* i : number of offset samples */ + HRTFS_PARAMBIN_HANDLE hHrtfParambin /* i : HRTF structure for rendering */ ); +#endif void computeDiffuseness_mdft( float **buffer_intensity[DIRAC_NUM_DIMS], @@ -3354,7 +3442,7 @@ void computeDiffuseness( float *diffuseness ); -void ivas_dirac_dec_onset_detection_open( +ivas_error ivas_dirac_dec_onset_detection_open( const int16_t num_channels, const int16_t num_freq_bands, const int16_t max_band_decorr, @@ -3370,7 +3458,7 @@ void ivas_dirac_dec_onset_detection_process( DIRAC_ONSET_DETECTION_STATE h_dirac_onset_detection_state ); -void ivas_dirac_dec_decorr_open( +ivas_error ivas_dirac_dec_decorr_open( DIRAC_DECORR_PARAMS **ph_freq_domain_decorr_ap_params, DIRAC_DECORR_STATE **ph_freq_domain_decorr_ap_state, const int16_t num_freq_bands, @@ -3403,7 +3491,7 @@ void ivas_dirac_dec_decorr_close( ); -void ivas_dirac_dec_output_synthesis_open( +ivas_error ivas_dirac_dec_output_synthesis_open( DIRAC_DEC_HANDLE hDirAC, /* i/o: DirAC handle */ const RENDERER_TYPE renderer_type, /* i : renderer type */ const int16_t nchan_transport, /* i : number of transport channels */ @@ -3426,8 +3514,7 @@ void ivas_dirac_dec_output_synthesis_process_slot( const float *p_Rmat, /* i : rotation matrix */ const VBAP_HANDLE hVBAPdata, /* i : VBAP structure */ const IVAS_OUTPUT_SETUP hOutSetup, /* i : output setup structure */ - const int16_t nchan_transport, /* i : number of transport channels */ - const int16_t index_slot + const int16_t nchan_transport /* i : number of transport channels */ ); void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd( @@ -3480,8 +3567,6 @@ void ivas_dirac_dec_compute_directional_responses( DIRAC_DEC_HANDLE hDirAC, /* i/o: DirAC handle */ const VBAP_HANDLE hVBAPdata, /* i : VBAP structure */ const MASA_DECODER_HANDLE hMasa, /* i : MASA decoder structure */ - const int16_t direction_idx, /* i : index for direction (azi and ele) */ - const int16_t subframe_idx, /* i : subframe index */ const float *surCohRatio, const int16_t shd_rot_max_order, /* i : split-order rotation method */ const float *p_Rmat /* i : rotation matrix */ @@ -3524,8 +3609,12 @@ ivas_error ivas_param_mc_enc_open( Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */ ); +ivas_error ivas_param_mc_enc_reconfig( + Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */ +); + void ivas_param_mc_enc_close( - PARAM_MC_ENC_HANDLE hParamMC, /* i/o: Parametric MC encoder handle */ + PARAM_MC_ENC_HANDLE *hParamMC, /* i/o: Parametric MC encoder handle */ const int32_t input_Fs /* i : input sampling rate */ ); @@ -3540,6 +3629,10 @@ ivas_error ivas_param_mc_dec_open( Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ ); +ivas_error ivas_param_mc_dec_reconfig( + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +); + void ivas_param_mc_dec_close( PARAM_MC_DEC_HANDLE *hParamMC /* i/o: Parametric MC decoder handle */ ); @@ -3672,7 +3765,7 @@ int16_t svd( const int16_t nChannelsC /* i : number of columns in the matrix to be decomposed */ ); -void ivas_dirac_dec_output_synthesis_cov_open( +ivas_error ivas_dirac_dec_output_synthesis_cov_open( DIRAC_OUTPUT_SYNTHESIS_PARAMS *h_dirac_output_synthesis_params, /* i/o: handle for the covariance synthesis parameters */ DIRAC_OUTPUT_SYNTHESIS_COV_STATE *h_dirac_output_synthesis_state, /* i/o: handle for the covariance synthesis state */ const int16_t max_band_decorr, /* i : uppermost frequency band where decorrelation is applied */ @@ -3751,12 +3844,14 @@ void FdCngDecodeDiracMDCTStereoSID( ivas_error ivas_spar_enc_open( Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */ + ,const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ ); void ivas_spar_enc_close( - SPAR_ENC_HANDLE hSpar, /* i/o: SPAR encoder handle */ + SPAR_ENC_HANDLE *hSpar, /* i/o: SPAR encoder handle */ const int32_t input_Fs, /* i : input sampling rate */ - const int16_t nchan_inp /* i : number of input channels */ + const int16_t nchan_inp, /* i : number of input channels */ + const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ ); ivas_error ivas_spar_enc( @@ -3768,12 +3863,14 @@ ivas_error ivas_spar_enc( ); ivas_error ivas_spar_dec_open( - Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */ + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ ); void ivas_spar_dec_close( - SPAR_DEC_HANDLE hSpar, /* i/o: SPAR decoder handle */ - const int32_t output_Fs /* i : output sampling rate */ + SPAR_DEC_HANDLE *hSpar, /* i/o: SPAR decoder handle */ + const int32_t output_Fs, /* i : output sampling rate */ + const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ ); ivas_error ivas_spar_dec( @@ -3797,6 +3894,15 @@ void ivas_sba_upmixer_renderer( const int16_t output_frame /* i : output frame length */ ); +ivas_error ivas_sba_linear_renderer( + float output_f[][L_FRAME48k], /* i/o: synthesized core-coder transport channels/DirAC output */ + const int16_t output_frame, /* i : output frame length per channel */ + const int16_t nchan_in, /* i : number of input ambisonics channels */ + const AUDIO_CONFIG output_config, /* i : output audio configuration */ + const IVAS_OUTPUT_SETUP output_setup, /* i : output format setup */ + const float hoa_dec_mtx[] /* i : HOA decoding mtx */ +); + void ivas_sba_mix_matrix_determiner( SPAR_DEC_HANDLE hSpar, /* i/o: SPAR decoder handle */ float output[][L_FRAME48k], /* i/o: transport/output audio channels */ @@ -3805,14 +3911,6 @@ void ivas_sba_mix_matrix_determiner( const int16_t output_frame /* i : output frame length */ ); -void ivas_sba_prototype_renderer( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder struct */ - float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : Input audio in CLDFB domain, real */ - float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : Input audio in CLDFB domain, imag */ - const int16_t firstSubframe, /* i : First subframe to map */ - const int16_t nSubframes /* i : Number of subframes to map */ -); - /* AGC */ /*! r: AGC enable flag */ int16_t ivas_agc_enc_get_flag( @@ -3912,7 +4010,6 @@ void ivas_spar_set_bitrate_config( const int16_t num_bands /* i : number of bands */ ); -#ifdef FIX_I1_113 void ivas_spar_bitrate_dist( int32_t core_brates_act[], /* o : bitrates per core-coder */ const int16_t nAvailBits, /* i : number of available bits */ @@ -3920,13 +4017,42 @@ void ivas_spar_bitrate_dist( const int16_t sba_order, /* i : Ambisonic (SBA) order */ const int16_t bwidth /* i : audio bandwidth */ ); -#endif -void ivas_mdct( const float *pIn, float *pOut, const int16_t length ); -void ivas_dct_windowing( const int16_t fade_len, const int16_t full_len, const int16_t dct_len, const int16_t zero_pad_len, const float *pWindow_coeffs, const int16_t frame_len, float *pOut_buf, float *pBuffer_prev, float *pTemp_lfe ); -void ivas_tda( const float *pIn, float *pOut, const int16_t length ); -void ivas_imdct( const float *pIn, float *pOut, const int16_t length ); -void ivas_itda( const float *re, float *pOut, const int16_t length ); +void ivas_mdct( + const float *pIn, + float *pOut, + const int16_t length +); + +void ivas_dct_windowing( + const int16_t fade_len, + const int16_t full_len, + const int16_t dct_len, + const int16_t zero_pad_len, + const float *pWindow_coeffs, + const int16_t frame_len, + float *pOut_buf, + float *pBuffer_prev, + float *pTemp_lfe +); + +void ivas_tda( + const float *pIn, + float *pOut, + const int16_t length +); + +void ivas_imdct( + const float *pIn, + float *pOut, + const int16_t length +); + +void ivas_itda( + const float *re, + float *pOut, + const int16_t length +); void ivas_spar_get_cldfb_gains( SPAR_DEC_HANDLE hSpar, @@ -3968,6 +4094,10 @@ ivas_error ivas_spar_md_enc_process( const int16_t dtx_vad, const int16_t nchan_inp, const int16_t sba_order /* i : Ambisonic (SBA) order */ +#ifdef LBR_SBA + , + float *prior_mixer[IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH] /* i : prior mixer_matrix */ +#endif ); void ivas_compute_spar_params( @@ -3981,6 +4111,9 @@ void ivas_compute_spar_params( const int16_t num_ch, const int16_t bands_bw, const int16_t active_w, +#ifdef LBR_SBA + const int16_t active_w_vlbr, +#endif ivas_spar_md_com_cfg *hSparCfg, ivas_spar_md_t *hSparMd, float *pWscale, @@ -4024,13 +4157,19 @@ void ivas_get_spar_md_from_dirac( const int16_t order, const int16_t dtx_vad, float Wscale_d[IVAS_MAX_NUM_BANDS] +#ifdef LBR_SBA + , + const uint8_t useLowerRes, + const int16_t active_w_vlbr +#endif ); ivas_error ivas_spar_md_dec_open( ivas_spar_md_dec_state_t **hMdDec_out, /* i/o: SPAR MD decoder handle */ const DECODER_CONFIG_HANDLE hDecoderConfig, /* i : configuration structure */ const int16_t num_channels, /* i : number of internal channels */ - const int16_t sba_order /* i : SBA order */ + const int16_t sba_order, /* i : SBA order */ + const int16_t sid_format /* i : SID format */ ); void ivas_spar_md_dec_close( @@ -4066,6 +4205,10 @@ void ivas_spar_to_dirac( ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */ const int16_t dtx_vad, /* i : DTX frame flag */ const int16_t num_bands_out /* i : number of output bands */ +#ifdef LBR_SBA + , + const int16_t bw /* i : band joining factor */ +#endif ); void ivas_spar_update_md_hist( @@ -4095,6 +4238,10 @@ ivas_error ivas_spar_covar_enc_open( ivas_filterbank_t *pFb, /* i/o: FB handle */ const int32_t input_Fs, /* i : input sampling rate */ const int16_t nchan_inp /* i : number of input channels */ +#ifdef LBR_SBA_EXTRA_COV_SMOOTH + , + const int32_t ivas_total_brate /* i : IVAS total bitrate */ +#endif ); void ivas_spar_covar_enc_close( @@ -4113,7 +4260,7 @@ void ivas_enc_cov_handler_process( const int16_t end_band, const int16_t nchan_inp, const int16_t dtx_vad, - const int16_t transient_det + const int16_t transient_det[2] ); ivas_error ivas_spar_covar_smooth_enc_open( @@ -4121,6 +4268,10 @@ ivas_error ivas_spar_covar_smooth_enc_open( const ivas_cov_smooth_cfg_t *cov_smooth_cfg, /* i : SPAR config. handle */ ivas_filterbank_t *pFb, /* i/o: FB handle */ const int16_t nchan_inp /* i : number of input channels */ +#ifdef LBR_SBA_EXTRA_COV_SMOOTH + , + const int32_t ivas_total_brate /* i : IVAS total bitrate */ +#endif ); void ivas_spar_covar_smooth_enc_close( @@ -4135,27 +4286,28 @@ void ivas_cov_smooth_process( const int16_t start_band, const int16_t end_band, const int16_t num_ch, - const int16_t transient_det + const int16_t transient_det[2] ); /* Transient detector module */ -ivas_error ivas_spar_transient_det_open( - ivas_trans_det_state_t **hTranDet, /* i/o: SPAR TD handle */ +ivas_error ivas_transient_det_open( + ivas_trans_det_state_t **hTranDet, /* i/o: Transient detector handle */ const int32_t sampling_rate /* i : sampling rate */ ); -void ivas_spar_transient_det_close( - ivas_trans_det_state_t **hTranDet /* i/o: SPAR TD handle */ +void ivas_transient_det_close( + ivas_trans_det_state_t **hTranDet /* i/o: Transient detector handle */ ); -int16_t ivas_transient_det_process( +void ivas_transient_det_process( ivas_trans_det_state_t *hTranDet, /* i/o: SPAR TD handle */ float *pIn_pcm, /* i : input audio channels */ - const int16_t frame_len /* i : frame length in samples */ + const int16_t frame_len, /* i : frame length in samples */ + int16_t transient_det[2] /* o : transient det outputs */ ); void ivas_td_decorr_get_ducking_gains( - ivas_trans_det_state_t *hTranDet, /* i/o: SPAR TD handle */ + ivas_trans_det_state_t *hTranDet, /* i/o: Transient detector handle */ float *pIn_pcm, float *pIn_duck_gains, float *pOut_duck_gains, @@ -4163,15 +4315,15 @@ void ivas_td_decorr_get_ducking_gains( const int16_t tdet_flag ); -ivas_error ivas_spar_td_decorr_dec_open( - ivas_td_decorr_state_t **hTdDecorr, /* i/o: SPAR Covar. decoder handle */ +ivas_error ivas_td_decorr_dec_open( + ivas_td_decorr_state_t **hTdDecorr, /* i/o: TD decorrelator handle */ const int32_t output_Fs, /* i : output sampling rate */ const int16_t nchan_internal, /* i : number of internal channels */ const int16_t ducking_flag /* i : ducking flag */ ); -void ivas_spar_td_decorr_dec_close( - ivas_td_decorr_state_t **hTdDecorr /* i/o: SPAR Covar. decoder handle */ +void ivas_td_decorr_dec_close( + ivas_td_decorr_state_t **hTdDecorr /* i/o: TD decorrelator handle */ ); void ivas_td_decorr_process( @@ -4351,7 +4503,6 @@ ivas_error ivas_deindex_real_index( float *quant, const int16_t num_ch_dim2 ); - void ivas_spar_get_uniform_quant_strat( ivas_spar_md_com_cfg *pSpar_md_com_cfg, const int16_t table_idx @@ -4398,7 +4549,7 @@ ivas_error ivas_masa_dec_open( ); void ivas_masa_dec_close( - MASA_DECODER_HANDLE hMasa /* i/o: MASA metadata structure */ + MASA_DECODER_HANDLE *hMasa /* i/o: MASA metadata structure */ ); ivas_error ivas_masa_decode( @@ -4416,9 +4567,7 @@ ivas_error ivas_masa_enc_open( ); void ivas_masa_enc_close( - MASA_ENCODER_HANDLE hMasa, /* i/o: MASA metadata structure */ - const int16_t nchan_transport, /* i : Number of transport channels */ - const IVAS_FORMAT ivas_format /* i : IVAS format */ + MASA_ENCODER_HANDLE *hMasa /* i/o: MASA metadata structure */ ); void ivas_masa_enc_reconfigure( @@ -4429,7 +4578,7 @@ ivas_error ivas_masa_dec_reconfigure( Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ ); -void ivas_masa_encode( +ivas_error ivas_masa_encode( MASA_ENCODER_HANDLE hMasa, /* i/o: MASA encoder structure */ IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */ BSTR_ENC_HANDLE hMetaData, /* i/o: Metadata bitstream handle */ @@ -4500,6 +4649,7 @@ void masa_sample_rate_band_correction( int16_t *band_mapping, /* i/o: Band mapping used and modified */ IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: QMetadata structure for modification */ const int32_t sampling_rate /* i : sampling rate */ + , MASA_DECODER_EXT_OUT_META_HANDLE hExtOutMeta /* i/o: MASA decoder metadata ext out buffer */ ); void invdct4_transform( @@ -4530,23 +4680,8 @@ void ivas_spar_param_to_masa_param_mapping( ); -/*----------------------------------------------------------------------------------* - * output setup prototypes - *----------------------------------------------------------------------------------*/ - -/*! r: number of output channels */ -int16_t audioCfg2channels( - const AUDIO_CONFIG output_config /* i : output audio configuration */ -); - -void ivas_output_init( - IVAS_OUTPUT_SETUP *hOutSetup, /* o : output setup structure */ - const AUDIO_CONFIG output_config /* i : output audio configuration */ -); - - /*---------------------------------------------------------------------------------* - * Binaural Renderer Prototypes + * Binaural FastConv Renderer Prototypes *-----------------------------------------------------------------------------------*/ ivas_error ivas_binRenderer_open( @@ -4557,11 +4692,12 @@ void ivas_binRenderer_close( BINAURAL_RENDERER_HANDLE *hBinRenderer /* i/o: decoder binaural renderer handle */ ); +#ifdef DEBUGGING void ivas_binaural_cldfb( Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ float output_f[][L_FRAME48k] /* i/o: synthesized core-coder transport channels/DirAC output */ ); - +#endif void ivas_binRenderer( BINAURAL_RENDERER_HANDLE hBinRenderer, /* i/o: binaural renderer handle */ HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i/o: head track handle */ @@ -4588,309 +4724,48 @@ void ivas_binaural_add_LFE( float output_f[][L_FRAME48k] /* i/o: synthesized core-coder transport channels/DirAC output */ ); -void QuatToRotMat( - const IVAS_QUATERNION quat, /* i : quaternion describing the rotation */ - float Rmat[3][3] /* o : real-space rotation matrix for this rotation */ -); -void Quat2Euler( - const IVAS_QUATERNION quat, /* i : quaternion describing the rotation */ - float *yaw, /* o : yaw */ - float *pitch, /* o : pitch */ - float *roll /* o : roll */ -); +/*----------------------------------------------------------------------------------* + * renderer prototypes + *----------------------------------------------------------------------------------*/ -#ifdef SPLIT_REND_WITH_HEAD_ROT -void Quat2EulerDegree( - const IVAS_QUATERNION quat, /* i : quaternion describing the rotation */ - float *yaw, /* o : yaw */ - float *pitch, /* o : pitch */ - float *roll /* o : roll */ +ivas_error ivas_ism_renderer_open( + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ ); -#endif -void SHrotmatgen( - float SHrotmat[SBA_NHARM_HOA3][SBA_NHARM_HOA3], /* o : SHD rotation matrix */ - float Rmat[3][3], /* i : real-space rotation matrix */ - const int16_t order /* i : ambisonics order */ +void ivas_ism_render( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + float output_f[][L_FRAME48k], /* i/o: core-coder transport channels/object output */ + const int16_t output_frame /* i : output frame length per channel */ ); -void rotateAziEle( - float azi_in, /* i : output elevation */ - float ele_in, /* i : input elevation */ - int16_t *azi, /* o : rotated azimuth */ - int16_t *ele, /* o : rotated elevation */ - float Rmat[3][3], /* i : real-space rotation matrix */ - const int16_t isPlanar /* i : is roation planar and elevation meaningless? */ +void ivas_ism_get_stereo_gains( + const float azimuth, /* i : object azimuth */ + const float elevation, /* i : object elevation */ + float *left_gain, /* o : left channel gain */ + float *right_gain /* o : right channel gain */ ); -void rotateAziEle_DirAC( - int16_t *azi, /* i/o: array of azimuth values */ - int16_t *ele, /* i/o: array of elevation values */ - const int16_t band1, /* i : bands to work on (lower limit) */ - const int16_t band2, /* i : bands to work on (upper bound) */ - const float *p_Rmat /* i : pointer to real-space rotation matrix */ -); - -ivas_error ivas_headTrack_open( - HEAD_TRACK_DATA_HANDLE *hHeadTrackData /* o : head track handle */ -); - -void rotateFrame_shd( - HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i : head track handle */ - float output[][L_FRAME48k], /* i/o: unrotated HOA3 signal buffer in TD */ - const int16_t subframe_len, /* i : subframe length per channel */ - const IVAS_OUTPUT_SETUP hTransSetup, /* i : format for rotation */ - const int16_t subframe_idx /* i : subframe index */ -); - -void rotateFrame_sd( - HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i : head track handle */ - float output[][L_FRAME48k], /* i/o: unrotated SD signal buffer in TD */ - const int16_t subframe_len, /* i : subframe length per channel */ - const IVAS_OUTPUT_SETUP hTransSetup, /* i : format for rotation */ - const EFAP_HANDLE hEFAPdata, /* i : EFAP structure */ - const int16_t subframe_idx /* i : subframe index */ -); - -void rotateFrame_shd_cldfb( - float Cldfb_RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: unrotated HOA3 signal buffer in cldfb domain real part */ - float Cldfb_ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: unrotated HOA3 signal buffer in cldfb domain imag part */ - float Rmat[3][3], /* i : real-space rotation matrix */ - const int16_t nInChannels, /* i : number of channels */ - const int16_t shd_rot_max_order /* i : split-order rotation method */ -); - -void rotateFrame_sd_cldfb( - HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i : head track handle */ - float Cldfb_RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: unrotated HOA3 signal buffer in cldfb domain real part */ - float Cldfb_ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: unrotated HOA3 signal buffer in cldfb domain imag part */ - const IVAS_OUTPUT_SETUP_HANDLE hOutputSetup, /* i : output format setup number of channels */ - const EFAP_HANDLE hEFAPdata, /* i : EFAP structure */ - const int16_t nb_band /* i : number of CLDFB bands to process */ -); - -#ifdef SPLIT_REND_WITH_HEAD_ROT - -/*----------------------------------------------------------------------------------* - * Split renderer prototypes - *----------------------------------------------------------------------------------*/ - -void ivas_set_split_rend_setup( - IVAS_DEC_SPLIT_REND_WRAPPER *hSplitBinRend, - IVAS_SPLIT_REND_CONFIG_DATA *hSplitBinConfig, - HEAD_TRACK_DATA_HANDLE hHeadTrackData, - IVAS_SPLIT_REND_BITS_HANDLE hSplitRendBits ); - -void ivas_init_split_rend_handles( - SPLIT_REND_WRAPPER *hSplitRendWrapper ); -void ivas_init_split_post_rend_handles( - SPLIT_POST_REND_WRAPPER *hSplitRendWrapper ); - -ivas_error ivas_split_renderer_open( SPLIT_REND_WRAPPER *hSplitBinRend, - const IVAS_SPLIT_REND_CONFIG_DATA *pSplitRendConfig, - const int32_t output_Fs, - const int16_t is_cldfb_in, - const int16_t is_pcm_out); - -void ivas_split_renderer_close( - SPLIT_REND_WRAPPER *hSplitBinRend); - -ivas_error ivas_splitBinLCLDEncOpen( - BIN_HR_SPLIT_LCLD_ENC_HANDLE *hSplitBinLCLDEnc, - int32_t iSampleRate, - int32_t iChannels, - int32_t iDataRate ); - -void ivas_splitBinLCLDEncClose( - BIN_HR_SPLIT_LCLD_ENC_HANDLE *hSplitBinLCLDEnc ); - -void ivas_splitBinLCLDEncProcess( - BIN_HR_SPLIT_LCLD_ENC_HANDLE hSplitBinLCLDEnc, - float Cldfb_In_Real[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - float Cldfb_In_Imag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - const int32_t available_bits, - ivas_split_rend_bits_t *pBits ); - -ivas_error ivas_splitBinLCLDDecOpen( - BIN_HR_SPLIT_LCLD_DEC_HANDLE *hSplitBinLCLDDec, - int32_t iSampleRate, - int32_t iChannels ); - -void ivas_splitBinLCLDDecClose( - BIN_HR_SPLIT_LCLD_DEC_HANDLE *hSplitBinLCLDDec ); - -void ivas_splitBinLCLDDecProcess( - BIN_HR_SPLIT_LCLD_DEC_HANDLE hSplitBinLCLDDec, - ivas_split_rend_bits_t *pBits, - float Cldfb_Out_Real[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - float Cldfb_Out_Imag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX] ); - -ivas_error ivas_splitBinPreRendOpen( - BIN_HR_SPLIT_PRE_REND_HANDLE *hBinHrSplitPreRend, - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData -#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG - , - const int32_t output_Fs -#endif -); - -ivas_error ivas_splitBinPostRendOpen( - BIN_HR_SPLIT_POST_REND_HANDLE *hBinHrSplitPostRend, - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, - const int32_t output_Fs -#ifndef SPLIT_REND_LC3PLUS - ,const int16_t is_cldfb_in -#endif - ); - -void ivas_init_multi_bin_pose_data( - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData ); -void ivas_renderSplitGetMultiBinPoseData( - const IVAS_SPLIT_REND_CONFIG_DATA *pSplit_rend_config, - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, - const IVAS_SPLIT_REND_ROT_AXIS rot_axis); -#ifdef SPLIT_REND_TD_POSE_CORRECTION -void ivas_renderSplitUpdateTdCorrectionPoseData( - const IVAS_SPLIT_REND_CONFIG_DATA *pSplit_rend_config, - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, - const IVAS_SPLIT_REND_ROT_AXIS rot_axis); -#endif - -ivas_error ivas_renderMultiBinToSplitBinaural( - SPLIT_REND_WRAPPER *hSplitBin, - const IVAS_QUATERNION headPositions[MAX_PARAM_SPATIAL_SUBFRAMES], - const int32_t SplitRendBitRate, - ivas_split_rend_bits_t *pBits, - float Cldfb_In_BinReal[][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - float Cldfb_In_BinImag[][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - const int16_t max_bands, - float out[][L_FRAME48k], - const int16_t low_res_pre_rend_rot, - const int16_t pcm_out -); - -void ivas_rend_CldfbSplitPreRendProcess( - const BIN_HR_SPLIT_PRE_REND_HANDLE hBinHrSplitPreRend, - const IVAS_QUATERNION headPositions[MAX_PARAM_SPATIAL_SUBFRAMES], - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, - float Cldfb_In_BinReal[][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - float Cldfb_In_BinImag[][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - ivas_split_rend_bits_t *pBits, - const int32_t target_md_bits, - const int16_t low_res_pre_rend_rot); - -#ifdef SPLIT_REND_TD_POSE_CORRECTION -void ivas_rend_TdSplitPreRendProcess( - const IVAS_QUATERNION headPositions[MAX_PARAM_SPATIAL_SUBFRAMES], - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, - ivas_split_rend_bits_t *pBits -); -#endif - -void ivas_rend_CldfbSplitPostRendProcess( - BIN_HR_SPLIT_POST_REND_HANDLE hBinHrSplitPostRend, - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, - const IVAS_QUATERNION QuaternionsPost[MAX_PARAM_SPATIAL_SUBFRAMES], - float Cldfb_RealBuffer_Binaural[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - float Cldfb_ImagBuffer_Binaural[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - float output[][L_FRAME48k], - const int16_t is_cldfb_in ); - -void ivas_splitBinPreRendClose( - BIN_HR_SPLIT_PRE_REND_HANDLE *hBinHrSplitPreRend ); - -void ivas_splitBinPostRendClose( - BIN_HR_SPLIT_POST_REND_HANDLE *hBinHrSplitPostRend ); - -void ivas_splitBinPostRendMdDec( - ivas_split_rend_bits_t *pBits, - BIN_HR_SPLIT_POST_REND_HANDLE hBinHrSplitPostRend, - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, -#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG - BIN_HR_SPLIT_PRE_REND_HANDLE hBinHrSplitPreRend, -#endif - const int16_t num_md_bands); - -#ifdef SPLIT_REND_TD_POSE_CORRECTION -void ivas_rend_TdSplitPostRendProcess( - ivas_split_rend_bits_t *pBits, - IVAS_QUATERNION headPosition[MAX_PARAM_SPATIAL_SUBFRAMES], - MULTI_BIN_REND_POSE_DATA *multiBinPoseData ); -#endif - -#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG -void ivas_log_cldfb2wav_data( - float Cldfb_In_Real[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - float Cldfb_In_Imag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - HANDLE_CLDFB_FILTER_BANK *cldfbSyn, - const int16_t num_chs, - const int16_t num_freq_bands, - const int32_t output_Fs, - const int16_t start_slot_idx, - const int16_t md_band_idx, - const char *filename ); -#endif - -void ivas_SplitRenderer_GetRotMd( - BIN_HR_SPLIT_PRE_REND_HANDLE hBinHrSplitPreRend, /* i/o: binaural renderer handle */ - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, - float Cldfb_RealBuffer_Ref_Binaural[][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : Reference Binaural signals */ - float Cldfb_ImagBuffer_Ref_Binaural[][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : Reference Binaural signals */ - int16_t low_res); - -void ivas_SplitRenderer_PostRenderer( - BIN_HR_SPLIT_POST_REND_HANDLE hBinPostRenderer, /* i/o: binaural renderer handle */ - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, - float Cldfb_RealBuffer_Ref_Binaural[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o : Reference/out Binaural signals */ - float Cldfb_ImagBuffer_Ref_Binaural[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o : Reference/out Binaural signals */ - const IVAS_QUATERNION Quaternions_act[MAX_PARAM_SPATIAL_SUBFRAMES]); - -#endif - -/*----------------------------------------------------------------------------------* - * renderer prototypes - *----------------------------------------------------------------------------------*/ - -ivas_error ivas_ism_renderer_open( - Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ -); - -void ivas_ism_render( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - float output_f[][L_FRAME48k], /* i/o: core-coder transport channels/object output */ - const int16_t output_frame /* i : output frame length per channel */ -); - -void ivas_mc2sba( - IVAS_OUTPUT_SETUP hIntSetup, /* i : Format of decoder output */ - float buffer_td[][L_FRAME48k], /* i/o: MC signals (on input) and the HOA3 (on output) */ - const int16_t output_frame, /* i : output frame length per channel */ - const int16_t sba_order, /* i : SBA order */ - const float gain_lfe /* i : gain for LFE, 0=ignore LFE */ -); - -void ivas_sba2mc_cldfb( - IVAS_OUTPUT_SETUP hInSetup, /* i : Format of input layout */ - float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: cldfb real part */ - float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: cldfb imag part */ - const int16_t nb_channels_out, /* i : nb of output channels */ - const int16_t nb_bands, /* i : nb of CLDFB bands to process */ - const float *hoa_dec_mtx /* i : HOA decoding mtx */ +void ivas_mc2sba( + IVAS_OUTPUT_SETUP hIntSetup, /* i : Format of decoder output */ + float buffer_td[][L_FRAME48k], /* i/o: MC signals (on input) and the HOA3 (on output) */ + const int16_t output_frame, /* i : output frame length per channel */ + const int16_t sba_order, /* i : SBA order */ + const float gain_lfe /* i : gain for LFE, 0=ignore LFE */ ); void ivas_ism2sba( float buffer_td[][L_FRAME48k], /* i/o: TD signal buffers */ ISM_RENDERER_HANDLE hIsmRendererData, /* i/o: renderer data */ const ISM_METADATA_HANDLE hIsmMetaData[], /* i : object metadata */ - const int16_t num_objects, /* i : number of objects */ + const int16_t nchan_ism, /* i : number of objects */ const int16_t output_frame, /* i : output frame length per channel */ const int16_t sba_order /* i : SBA order */ ); /*----------------------------------------------------------------------------------* - * Amplitude Panning (EFAP, VBAP) prototypes + * Amplitude Panning VBAP prototypes *----------------------------------------------------------------------------------*/ void panning_wrap_angles( @@ -4900,26 +4775,6 @@ void panning_wrap_angles( float *ele_wrapped /* o : wrapped elevation component */ ); -ivas_error efap_init_data( - EFAP_HANDLE *hEFAPdata, /* i/o: handle for EFAP data structure that will be initialized */ - const float *speaker_node_azi_deg, /* i : vector of speaker node azimuths (positive left) */ - const float *speaker_node_ele_deg, /* i : vector of speaker node elevations (positive up) */ - const int16_t num_speaker_nodes, /* i : number of speaker nodes in the set */ - const int16_t efap_mode /* i : indicates whether EFAP or EFIP is used */ -); - -void efap_free_data( - EFAP_HANDLE *hEFAPdata /* i/o: EFAP handle to be freed */ -); - -void efap_determine_gains( - EFAP_HANDLE hEFAPdata, /* i : EFAP structure */ - float *gains, /* o : gain vector for speaker nodes for given direction */ - const float azi_deg, /* i : azimuth in degrees for panning direction (positive left) */ - const float ele_deg, /* i : elevation in degrees for panning direction (positive up) */ - const int16_t efap_mode /* i : indicates whether EFAP or EFIP is used */ -); - ivas_error vbap_init_data( VBAP_HANDLE *hVBAPdata, /* i/o: handle for VBAP data structure that will be initialized */ const float *speaker_node_azi_deg, /* i : vector of speaker node azimuths (positive left) */ @@ -5007,10 +4862,18 @@ ivas_error ivas_mcmasa_enc_open( ); void ivas_mcmasa_enc_close( - MCMASA_ENC_HANDLE hMcMasa, /* i/o: encoder McMASA handle */ + MCMASA_ENC_HANDLE *hMcMasa, /* i/o: encoder McMASA handle */ const int32_t input_Fs /* i : input sampling rate */ ); +ivas_error ivas_mcmasa_enc_reconfig( + Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */ +); + +ivas_error ivas_mcmasa_dec_reconfig( + Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */ +); + void ivas_mcmasa_setNumTransportChannels( int16_t* nchan_transport, /* o : Pointer to number of transport channels to be set */ int16_t* element_mode, /* o : Pointer to element mode to be set */ @@ -5023,9 +4886,13 @@ void ivas_mcmasa_set_separate_channel_mode( const int32_t ivas_total_brate /* i : Total bitrate of IVAS */ ); -/*! r: McMASA SCE bitrate */ -int32_t ivas_mcmasa_mono_brate( - const int32_t ivas_total_brate /* i : IVAS total bitrate */ +void ivas_mcmasa_split_brate( + const uint8_t separateChannelEnabled, /* i : Transport running in "separate channel" mode */ + const int32_t ivas_total_brate, /* i : Total bitrate available to be split */ + const int16_t nSCE, /* i : Number of SCEs in use (0 or 1) */ + const int16_t nCPE, /* i : Number of CPEs in use (0 or 1) */ + int32_t *brate_sce, /* o : Pointer to SCE element bitrate */ + int32_t *brate_cpe /* o : Pointer to CPE element bitrate */ ); void ivas_mcmasa_enc( @@ -5051,6 +4918,13 @@ void ivas_mcmasa_param_est_enc( const int16_t nchan_inp /* i : Number of input channels */ ); +void ivas_mcmasa_dmx_modify( + const int16_t n_samples, /* i : input frame length in samples */ + float dmx[][L_FRAME48k + NS2SA( 48000, IVAS_FB_ENC_DELAY_NS )], /* i/o: downmix signal to be transformed into another format */ + const int16_t n_chnls_dmx_old, /* i : number of downmix channels in the old format */ + const int16_t n_chnls_dmx_new /* i : number of downmix channels in the target format */ +); + void v_multc_acc( const float x[], /* i : Input vector */ const float c, /* i : Constant */ @@ -5072,12 +4946,10 @@ void computeReferencePower_enc( float Cldfb_ImagBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], /* i : Imag part of input signal */ float *reference_power, /* o : Estimated power */ const int16_t enc_param_start_band, /* i : first band to process */ - const int16_t num_freq_bands /* i : Number of frequency bands */ - , + const int16_t num_freq_bands, /* i : Number of frequency bands */ const SBA_MODE sba_mode /* i : SBA mode */ ); - ivas_error ivas_mono_dmx_renderer_open( Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ ); @@ -5102,6 +4974,7 @@ void ivas_lfe_synth_with_filters( const int16_t lfeChannelIndex /* i : LFE channel index */ ); + /*----------------------------------------------------------------------------------* * LFE Coding prototypes *----------------------------------------------------------------------------------*/ @@ -5112,7 +4985,7 @@ ivas_error ivas_create_lfe_enc( ); void ivas_lfe_enc_close( - LFE_ENC_HANDLE hLFE /* i/o: LFE encoder handle */ + LFE_ENC_HANDLE *hLFE /* i/o: LFE encoder handle */ ); void ivas_lfe_enc( @@ -5125,11 +4998,11 @@ void ivas_lfe_enc( ivas_error ivas_create_lfe_dec( LFE_DEC_HANDLE *hLFE_out, /* o : IVAS LFE decoder structure */ const int32_t output_Fs, /* i : output sampling rate */ - const float add_delay_s /* i : additional LFE delay to sync with binaural filter */ + const int32_t binauralization_delay_ns /* i : additional LFE delay to sync with binaural renderer */ ); void ivas_lfe_dec_close( - LFE_DEC_HANDLE hLFE /* i/o: LFE encoder handle */ + LFE_DEC_HANDLE *hLFE /* i/o: LFE encoder handle */ ); void ivas_lfe_dec( @@ -5176,288 +5049,17 @@ void ivas_filter_process( * TD Binaural Object renderer *----------------------------------------------------------------------------------*/ -ivas_error ivas_HRTF_binary_open( - TDREND_HRFILT_FiltSet_t **hHrtfTD /* i/o: TD renderer HRTF handle */ -); - -void ivas_HRTF_binary_close( - TDREND_HRFILT_FiltSet_t **hHrtfTD /* i/o: TD renderer HRTF handle */ -); - -void DefaultBSplineModel( - TDREND_HRFILT_FiltSet_t *HrFiltSet_p, /* o : Loaded HR filter set */ - const int32_t output_Fs /* i : Output sampling rate */ -); - ivas_error ivas_td_binaural_open( Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ ); -void ivas_td_binaural_close( - BINAURAL_TD_OBJECT_RENDERER_HANDLE *hBinRendererTd /* i/o: TD binaural object renderer handle */ -); - -void ObjRenderIVASFrame( +ivas_error ivas_td_binaural_renderer( Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ float output[][L_FRAME48k], /* i/o: SCE channels / Binaural synthesis */ const int16_t output_frame /* i : output frame length */ ); -void BSplineModelEvalAlloc( - ModelParams_t *model, /* i : Model parameters */ - ModelEval_t *modelEval /* i/o: Model evaluation structure */ -); - -#ifdef SPLIT_REND_LC3PLUS -void ObjRenderIvasFrame_splitBinaural( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - float output[][L_FRAME48k], /* i/o: SCE channels / Binaural synthesis */ - const int16_t output_frame /* i : output frame length */ -); -#endif - -/* ----- Object renderer - hrfilt ----- */ - -void GetFilterFromAngle( - TDREND_HRFILT_FiltSet_t *HrFiltSet_p, /* i/o: HR filter set structure */ - const float Elev, /* i : Elevation, degrees */ - float Azim, /* i : Azimuth, degrees */ -#ifdef FIX_ITD - float *LeftFilter, /* o : Left HR filter */ - float *RightFilter, /* o : Right HR filter */ - int16_t *itd /* o : ITD value */ -#else - SFX_SpatBin_Params_t *SfxSpatBinParams_p /* i/o: Currently used HR filter */ -#endif -); - -void HRTF_model_precalc( - ModelParams_t *model /* i/o: HRTF Model parameters */ -); - -void BSplineModelEvalDealloc( - ModelParams_t *model, /* i : Model parameters */ - ModelEval_t *modelEval /* i : Model evaluation structure */ -); - -void BSplineModelEvalITDDealloc( - ModelParamsITD_t *model /* i : Model parameters */ -); - -#ifdef TDREND_HRTF_TABLE_METHODS -void TDREND_HRFILT_SetFiltSet( - TDREND_HRFILT_FiltSet_t *HrFiltSet_p, /* i/o: HR hilter set structure */ - FILE *f_hrtf /* i : File handle for HR filter parameters */ -); -#endif - -ivas_error TDREND_REND_RenderSourceHRFilt( - TDREND_SRC_t *Src_p, /* i/o: The source to be rendered */ -#ifdef FIX_ITD - const float *hrf_left_delta, /* i: Left filter interpolation delta */ - const float *hrf_right_delta, /* i: Right filter interpolation delta */ - const int16_t intp_count, /* i: Interpolation count */ -#else -#ifdef TDREND_HRTF_TABLE_METHODS - BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ -#endif -#endif - float output_buf[][L_SPATIAL_SUBFR_48k], /* o : Output buffer */ -#ifdef FIX_ITD - const int16_t subframe_length /* i : Subframe length in use */ -#else - const int16_t subframe_length, /* i : Subframe length in use */ - const int32_t output_Fs /* i : Output sample rate */ -#endif -); - -/* ----- Object renderer - sources ----- */ - -ivas_error TDREND_MIX_SRC_SetPos( - BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ - const int16_t SrcInd, /* i : Source index */ - const float *Vec_p /* i : Position vector */ -); - -ivas_error TDREND_MIX_SRC_SetDir( - BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ - const int16_t SrcInd, /* i : Source index */ - const float *Vec_p /* i : Direction vector */ -); - -ivas_error TDREND_MIX_SRC_SetDirAtten( - BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ - const int16_t SrcInd, /* i : Source index */ - const TDREND_DirAtten_t *DirAtten_p /* i : Directional attenuation specifier */ -); - -ivas_error TDREND_MIX_SRC_SetPlayState( - BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ - const int16_t SrcInd, /* i : Source index */ - const TDREND_PlayStatus_t PlayStatus /* i : Play state */ -); - -void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( - BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ - TDREND_SRC_REND_t *SrcRend_p, /* i/o: Source object */ - TDREND_SRC_SPATIAL_t *SrcSpatial_p, /* i : Spatial aspects of source */ -#ifdef FIX_ITD - float *hrf_left_prev, /* o: Left filter */ - float *hrf_right_prev, /* o: Right filter */ - float *hrf_left_delta, /* o: Left filter interpolation delta */ - float *hrf_right_delta, /* o: Right filter interpolation delta */ - int16_t *intp_count, /* o: Interpolation count */ - int16_t *filterlength, /* o: Length of filters */ - int16_t *itd, /* o: ITD value */ - float *Gain, /* o: Gain value */ - TDREND_SRC_t *Src_p, - const int16_t subframe_idx /* i : Subframe index to 5 ms subframe */ -#else - const int32_t output_Fs /* i : Output sample rate */ -#endif -); - -ivas_error TDREND_SRC_Alloc( - TDREND_SRC_t **Src_pp /* i/o: Source */ -); - -void TDREND_SRC_Dealloc( - TDREND_SRC_t *Src_p /* i/o: Source to deallocate */ -); - -void TDREND_SRC_Init( - TDREND_SRC_t *Src_p, /* i/o: Source to initialize */ -#ifdef FIX_ITD - const TDREND_PosType_t PosType /* i : Position type specifier */ -#else - const TDREND_PosType_t PosType, /* i : Position type specifier */ - const int32_t output_Fs /* i : Output sampling rate */ -#endif -); - -/* ----- Object renderer - vec ----- */ - -void TDREND_SPATIAL_VecInit( - float *Pos_p, /* o : Output vector */ - const float PosX, /* i : X value */ - const float PosY, /* i : Y value */ - const float PosZ /* i : Z value */ -); - -/*! r: Euclidian norm value */ -float TDREND_SPATIAL_VecNorm( - const float *Vec_p /* i : Vector for norm calculation */ -); - -void TDREND_SPATIAL_VecNormalize( - const float *Vec_p, /* i : Input vector */ - float *VecNorm_p /* o : Output vector */ -); - -void TDREND_SPATIAL_VecMapToNewCoordSystem( - const float *Vec_p, /* i : Input vector */ - const float *TranslVec_p, /* i : Translation vector */ - const float *DirVec_p, /* i : Direction vector */ - const float *UpVec_p, /* i : Up vector */ - const float *RightVec_p, /* i : Right vector */ - float *MappedVec_p /* o : Transformed vector */ -); - -/*! r: Flag if the orientation has been updated */ -int16_t TDREND_SPATIAL_EvalOrthonormOrient( - float *FrontVecON_p, /* o : Normalized front vector */ - float *UpVecON_p, /* o : Normalized up vector */ - float *RightVecON_p, /* o : Normalized right vector */ - const float *FrontVec_p, /* i : Input front vector */ - const float *UpVec_p /* i : Input up vector */ -); - -/* ----- Object renderer - mix ----- */ - -ivas_error TDREND_MIX_AddSrc( - BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ - int16_t *SrcInd, /* o : Source index */ -#ifdef FIX_ITD - const TDREND_PosType_t PosType /* i : Position type (absolute/relative) */ -#else - const TDREND_PosType_t PosType, /* i : Position type (absolute/relative) */ - const int32_t output_Fs /* i : Output sampling rate */ -#endif -); - -ivas_error TDREND_MIX_SetDistAttenModel( - BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ - const TDREND_DistAttenModel_t DistAttenModel /* i : Distance attenuation model */ -); -void TDREND_MIX_LIST_SetPos( - BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ - const float *Pos_p /* i : Listener's position */ -); - -ivas_error TDREND_MIX_LIST_SetOrient( - BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ - const float *FrontVec_p, /* i : Listener's orientation front vector */ - const float *UpVec_p /* i : Listener's orientation up vector */ -); - -void TDREND_MIX_Dealloc( - BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd /* i/o: TD renderer handle */ -); - -ivas_error TDREND_MIX_Init( - BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ - TDREND_HRFILT_FiltSet_t **hHrtfTD, /* i/o: HRTF data (initialized in case of NULL) */ - const TDREND_MixSpatSpec_t *MixSpatSpec_p, /* i : Mixer spatial specification */ - const int32_t output_Fs /* i : Output sampling rate */ -); - - /* ----- Object renderer - sfx ----- */ -#ifndef FIX_ITD -ivas_error TDREND_SFX_SpatBin_Initialize( - SFX_SpatBin_t *SfxSpatBin_p, /* i/o: Spatial parameters handle */ - const int32_t output_Fs /* i : Output sampling rate */ -); - -void TDREND_SFX_SpatBin_SetParams( - SFX_SpatBin_t *SfxSpatBin_p, /* i/o: Spatial parameters struct to be updated */ - const SFX_SpatBin_Params_t *NewParam_p, /* i : New parameters struct */ - const int32_t output_Fs /* i : Output sample rate */ -); - -void TDREND_SFX_SpatBin_Execute_Main( - SFX_SpatBin_t *SfxSpatBin_p, /* i/o: Spatial parameters handle */ - const float *InBuffer_p, /* i : Input buffer */ - const int16_t subframe_length, /* i : subframe length */ - float *LeftOutBuffer_p, /* o : Rendered left channel */ - float *RightOutBuffer_p, /* o : Rendered right channel */ - int16_t *NoOfUsedInputSamples_p, /* o : Number of input samples actually used */ - int16_t *NoOfDeliveredOutputSamples_p, /* o : Number of output samples actually rendered */ - const int32_t output_Fs /* i : Output sample rate */ -); -#endif - -#ifdef FIX_ITD -void TDREND_Apply_ITD( - float *input, /* i: Input SCE subframe to be time adjusted */ - float *out_left, /* o: Output left channels with ITD applied */ - float *out_right, /* o: Output right channels with ITD applied */ - int16_t *previtd, /*i/o: Previous ITD value */ - const int16_t itd, /* i: Current subframe ITD value */ - float *mem_itd, /*i/o: ITD buffer memory */ - const int16_t length /* i: Subframe length */ -); - -void TDREND_firfilt( - float *signal, /* i/o: Input signal / Filtered signal */ - float *filter, /* i/o: FIR filter */ - const float *filter_delta, /* i : FIR filter delta */ - const int16_t intp_count, /* i : interpolation count */ - float *mem, /* i/o: filter memory */ - const int16_t subframe_length, /* i : Length of signal */ - const int16_t filterlength /* i : Filter length */ -); -#endif /*----------------------------------------------------------------------------------* * Filter-bank (FB) Mixer *----------------------------------------------------------------------------------*/ @@ -5475,12 +5077,14 @@ ivas_error ivas_fb_set_cfg( ivas_error ivas_FB_mixer_open( IVAS_FB_MIXER_HANDLE *hFbMixer, /* i/o: FB mixer handle */ const int32_t sampling_rate, /* i : sampling rate */ - IVAS_FB_CFG *fb_cfg /* i : FB config. handle */ + IVAS_FB_CFG *fb_cfg, /* i : FB config. handle */ + const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ ); void ivas_FB_mixer_close( IVAS_FB_MIXER_HANDLE *hFbMixer, /* i/o: FB mixer handle */ - const int32_t sampling_rate /* i : sampling rate in Hz */ + const int32_t sampling_rate, /* i : sampling rate in Hz */ + const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ ); void ivas_fb_mixer_pcm_ingest( @@ -5533,302 +5137,6 @@ int16_t ivas_get_num_bands_from_bw_idx( ); -/*----------------------------------------------------------------------------------* - * Crend renderer - *----------------------------------------------------------------------------------*/ - -ivas_error ivas_crend_init_from_rom( - Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ -); - -ivas_error ivas_crend_open( - Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ -); - -ivas_error ivas_crend_close( - Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ -); - -ivas_error ivas_crend_process( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - float output[][L_FRAME48k] /* i/o: input/output audio channels */ -); - - -/*----------------------------------------------------------------------------------* - * Renderer configuration - *----------------------------------------------------------------------------------*/ - -ivas_error ivas_render_config_open( - RENDER_CONFIG_HANDLE *hRenderConfig /* i/o: Renderer config handle */ -); - -void ivas_render_config_close( - RENDER_CONFIG_HANDLE *hRenderConfig /* i/o: Renderer config handle */ -); - -ivas_error ivas_render_config_init_from_rom( - RENDER_CONFIG_HANDLE *hRenderConfig, /* i/o: Renderer config handle */ - const int16_t room_flag_on /* i : room effect on/off flag */ -); - -/*----------------------------------------------------------------------------------* - * Reverberator - *----------------------------------------------------------------------------------*/ - -ivas_error ivas_reverb_open( - REVERB_HANDLE *hReverb, /* i/o: Reverberator handle */ - const AUDIO_CONFIG input_audio_config, /* i : reverb. input audio configuration */ - const HRTFS_HANDLE hHrtf, /* i : HRTF handle */ - RENDER_CONFIG_DATA *pConfig, /* i : Reverb configuration */ - const int32_t output_Fs /* i : output sampling rate */ -); - -void ivas_reverb_close( - REVERB_HANDLE *hReverb /* i/o: Reverberator handle */ -); - -ivas_error ivas_reverb_process( - REVERB_HANDLE hReverb, /* i/o: reverb state */ - const AUDIO_CONFIG input_audio_config, /* i : reverb. input audio configuration */ - const int16_t mix_signals, /* i : add reverb to output signal */ - float pcm_in[][L_FRAME48k], /* i : the PCM audio to apply reverb on */ - float pcm_out[][L_FRAME48k], /* o : the PCM audio with reverb applied */ - const int16_t i_ts -); - -void ivas_rev_delay_line_init( - ivas_rev_delay_line_t *pDelay, /* o : the delay line to initialize */ - float *memory_buffer, /* i : the memory buffer to use for the delay line */ - const uint16_t delay, /* i : the delay */ - const uint16_t maxdelay /* i : maximum delay to be supported */ -); - -/* !r: sample gotten out of delay line, and amplified by set gain */ -float ivas_rev_delay_line_get_sample( - ivas_rev_delay_line_t *pDelay /* i/o: the delay line */ -); - -void ivas_rev_delay_line_feed_sample( - ivas_rev_delay_line_t *pDelay, /* i : the delay line */ - float input /* i : the sample to feed */ -); - -void ivas_rev_delay_line_get_sample_blk( - ivas_rev_delay_line_t *pDelay, /* i : the delay line */ - const uint16_t blk_size, /* i : number of samples in the data block */ - float *output /* i/o: amples gotten out of delay line, and amplified by set gainin */ -); - -void ivas_rev_delay_line_feed_sample_blk( - ivas_rev_delay_line_t *pDelay, /* i/o: the delay line */ - const uint16_t blk_size, /* i : number of samples in the input data block */ - float *input /* i : the samples to feed */ -); - -void ivas_reverb_iir_filt_init( - ivas_rev_iir_filter_t *iirFilter, /* o : IIR filter */ - const uint16_t maxTaps /* i : maximum number of filter taps */ -); - -void ivas_reverb_iir_filt_set( - ivas_rev_iir_filter_t *iirFilter, /* i/o: IIR filter */ - uint16_t nr_taps, /* i : number of IIR filter taps */ - const float *coefA, /* i : A filter coefficients to set */ - const float *coefB /* i : the B filter coefficients to set */ -); - -void ivas_reverb_iir_filt_2taps_feed_blk( - ivas_rev_iir_filter_t *iirFilter, /* i/o: IIR filter */ - const uint16_t blk_size, /* i : size */ - const float *input, /* i : input buffer */ - float *output /* i : output buffer */ -); - -uint16_t int_log2( - uint32_t powerOf2 -); - -int16_t ivas_reverb_t2f_f2t_init( - ivas_reverb_t2f_f2t_t *t2f_f2t, - const int16_t fft_size, - const int16_t block_size -); - -void ivas_reverb_t2f_f2t_ClearHistory( - ivas_reverb_t2f_f2t_t *t2f_f2t -); - -void ivas_reverb_t2f_f2t_in( - ivas_reverb_t2f_f2t_t *t2f_f2t, - float *input_L, - float *input_R, float *buffer_L, - float *buffer_R -); - -void ivas_reverb_t2f_f2t_out( - ivas_reverb_t2f_f2t_t *t2f_f2t, - float *buffer_L, - float *buffer_R, - float *output_L, - float *output_R -); - -int16_t ivas_reverb_fft_filter_init( - ivas_reverb_fft_filter_t *fft_filter, - const int16_t fft_size -); - -void ivas_reverb_fft_filter_ComplexMul( - ivas_reverb_fft_filter_t *fft_filter, - float *buffer -); - -void ivas_reverb_fft_filter_CrossMix( - float *buffer0, - float *buffer1, - const int16_t fft_size -); - -void ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( - rv_fftwf_type_complex *spectrum, - float *fft_real, - const int16_t fft_size -); - -void ivas_reverb_define_window_fft( - float *pWindow, - const int16_t transitionStart, - const int16_t transitionLength, - const int16_t spectrumLength -); - -int16_t ivas_reverb_calc_color_filters( - const float *pTargetL, - const float *pTargetR, - const float *pWindow, - const int16_t fft_size, - const float delay, - rv_fftwf_type_complex *pBeqL, - rv_fftwf_type_complex *pBeqR -); - -int16_t ivas_reverb_calc_correl_filters( - const float *pTargetICC, - const float *pWindow, - const int16_t fft_size, - const float delay, - rv_fftwf_type_complex *pU, - rv_fftwf_type_complex *pV -); - -void ivas_reverb_calc_color_levels( - const int32_t output_Fs, - const int16_t freq_count, - const int16_t loop_count, - const float *pFc, - const float *pAcoustic_dsr, - const float *pHrtf_avg_pwr_L, - const float *pHrtf_avg_pwr_R, - const int16_t *pLoop_delays, - const float *pT60_filter_coeff, - float *pTarget_color_L, - float *pTarget_color_R -); - -void ivas_reverb_prepare_cldfb_params( - ivas_roomAcoustics_t *pInput_params, - const AUDIO_CONFIG input_audio_config, - const int16_t use_brir, - const int32_t output_Fs, - float *pOutput_t60, - float *pOutput_ene ); - -void ivas_reverb_interpolate_acoustic_data( - const int16_t input_table_size, - const float *pInput_fc, - const float *pInput_t60, - const float *pInput_dsrR, - const int16_t output_table_size, - const float *pOutput_fc, - float *pOutput_t60, - float *pOutput_dsr -); - -void ivas_reverb_get_hrtf_set_properties( - float **ppHrtf_set_L_re, - float **ppHrtf_set_L_im, - float **ppHrtf_set_R_re, - float **ppHrtf_set_R_im, - const AUDIO_CONFIG input_audio_config, - const int16_t hrtf_count, - const int16_t in_freq_count, - const int16_t out_freq_count, - float *pOut_avg_pwr_L, - float *pOut_avg_pwr_R, - float *pOut_i_a_coherence -); - - -/* Orientation tracking */ -void ivas_orient_trk_Init( - ivas_orient_trk_state_t *pOTR -); - -ivas_error ivas_orient_trk_SetTrackingType( - ivas_orient_trk_state_t *pOTR, - OTR_TRACKING_T trackingType -); - -ivas_error ivas_orient_trk_SetAbsoluteOrientation( - ivas_orient_trk_state_t *pOTR, - float yaw, - float pitch, - float roll -); - -ivas_error ivas_orient_trk_Process( - ivas_orient_trk_state_t *pOTR -); - -ivas_error ivas_orient_trk_GetTrackedOrientation( - ivas_orient_trk_state_t *pOTR, - float *yaw, - float *pitch, - float *roll -); - -void TonalMdctConceal_create_concealment_noise( - float concealment_noise[L_FRAME48k], - CPE_DEC_HANDLE hCPE, - const int16_t L_frameTCX, - const int16_t L_frame, - const int16_t idchan, - const int16_t subframe_idx, - const int16_t core, - const float crossfade_gain, - const TONALMDCTCONC_NOISE_GEN_MODE noise_gen_mode -); - -void TonalMdctConceal_whiten_noise_shape( - Decoder_State *st, - const int16_t L_frame, - const TONALMDCTCONC_NOISE_SHAPE_WHITENING_MODE -); - -int16_t get_igf_startline( - Decoder_State *st, - int16_t L_frame, - int16_t L_frameTCX -); - -float rand_triangular_signed( - int16_t *seed ); - /* clang-format on */ -void dtx_read_padding_bits( - DEC_CORE_HANDLE st, - int16_t num_bits ); - #endif /* IVAS_PROT_H */ diff --git a/lib_com/ivas_qmetadata_com.c b/lib_com/ivas_qmetadata_com.c index ee8cfd2f2f..0f2491bad3 100644 --- a/lib_com/ivas_qmetadata_com.c +++ b/lib_com/ivas_qmetadata_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include "ivas_prot.h" #include "prot.h" #include "cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------* * Local constants @@ -65,7 +65,7 @@ ivas_error ivas_qmetadata_open( ) { /* allocate MetaData handle */ - if ( ( *hQMetaData = (IVAS_QMETADATA_HANDLE) count_malloc( sizeof( IVAS_QMETADATA ) ) ) == NULL ) + if ( ( *hQMetaData = (IVAS_QMETADATA_HANDLE) malloc( sizeof( IVAS_QMETADATA ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for Q MetaData" ); } @@ -98,9 +98,8 @@ ivas_error ivas_qmetadata_allocate_memory( const int16_t coherence_flag /* i : new coherence coding status */ ) { - int16_t dir; + int16_t j, dir; uint8_t do_realloc; - uint8_t reservationFailed = 0; #ifdef DEBUGGING assert( hQMetaData != NULL ); @@ -126,68 +125,63 @@ ivas_error ivas_qmetadata_allocate_memory( hQMetaData->no_directions = ndirs; hQMetaData->coherence_flag = coherence_flag; - hQMetaData->q_direction = (IVAS_QDIRECTION *) count_malloc( sizeof( IVAS_QDIRECTION ) * ndirs ); - reservationFailed = hQMetaData->q_direction == NULL; + if ( ( hQMetaData->q_direction = (IVAS_QDIRECTION *) malloc( sizeof( IVAS_QDIRECTION ) * ndirs ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for Q MetaData" ); + } + - if ( !reservationFailed ) + for ( dir = 0; dir < hQMetaData->no_directions; dir++ ) { - for ( dir = 0; dir < hQMetaData->no_directions; dir++ ) + hQMetaData->q_direction[dir].cfg.nbands = nbands; + if ( nbands == 0 ) { - hQMetaData->q_direction[dir].cfg.nbands = nbands; - if ( nbands == 0 ) - { - hQMetaData->q_direction[dir].band_data = NULL; - } - else + hQMetaData->q_direction[dir].band_data = NULL; + } + else + { + if ( ( hQMetaData->q_direction[dir].band_data = (IVAS_QDIRECTION_BAND_DATA *) malloc( sizeof( IVAS_QDIRECTION_BAND_DATA ) * hQMetaData->q_direction[dir].cfg.nbands ) ) == NULL ) { - hQMetaData->q_direction[dir].band_data = (IVAS_QDIRECTION_BAND_DATA *) count_malloc( sizeof( IVAS_QDIRECTION_BAND_DATA ) * hQMetaData->q_direction[dir].cfg.nbands ); - { - int16_t j; - for ( j = 0; j < nbands; j++ ) - { - set_zero( hQMetaData->q_direction[dir].band_data[j].elevation, MAX_PARAM_SPATIAL_SUBFRAMES ); - set_zero( hQMetaData->q_direction[dir].band_data[j].azimuth, MAX_PARAM_SPATIAL_SUBFRAMES ); - } - } - - - reservationFailed |= hQMetaData->q_direction[dir].band_data == NULL; + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for Q MetaData" ); } - if ( coherence_flag ) + for ( j = 0; j < nbands; j++ ) { - hQMetaData->q_direction[dir].coherence_band_data = (IVAS_QDIRECTION_BAND_COHERENCE_DATA *) count_malloc( sizeof( IVAS_QDIRECTION_BAND_COHERENCE_DATA ) * hQMetaData->q_direction[dir].cfg.nbands ); - reservationFailed |= hQMetaData->q_direction[dir].coherence_band_data == NULL; + set_zero( hQMetaData->q_direction[dir].band_data[j].elevation, MAX_PARAM_SPATIAL_SUBFRAMES ); + set_zero( hQMetaData->q_direction[dir].band_data[j].azimuth, MAX_PARAM_SPATIAL_SUBFRAMES ); } - else - { - hQMetaData->q_direction[dir].coherence_band_data = NULL; - } - - /* These default values are set here to get them conveniently in one place */ - hQMetaData->q_direction[dir].cfg.nblocks = MAX_PARAM_SPATIAL_SUBFRAMES; - hQMetaData->q_direction[dir].cfg.search_effort = 3; - hQMetaData->q_direction[dir].cfg.start_band = 0; - hQMetaData->q_direction[dir].cfg.mc_ls_setup = MC_LS_SETUP_INVALID; } if ( coherence_flag ) { - hQMetaData->surcoh_band_data = (IVAS_SURROUND_COHERENCE_BAND_DATA *) count_malloc( sizeof( IVAS_SURROUND_COHERENCE_BAND_DATA ) * hQMetaData->q_direction[0].cfg.nbands ); - reservationFailed |= hQMetaData->surcoh_band_data == NULL; + hQMetaData->q_direction[dir].coherence_band_data = (IVAS_QDIRECTION_BAND_COHERENCE_DATA *) malloc( sizeof( IVAS_QDIRECTION_BAND_COHERENCE_DATA ) * hQMetaData->q_direction[dir].cfg.nbands ); } else { - hQMetaData->surcoh_band_data = NULL; + hQMetaData->q_direction[dir].coherence_band_data = NULL; } + + /* These default values are set here to get them conveniently in one place */ + hQMetaData->q_direction[dir].cfg.nblocks = MAX_PARAM_SPATIAL_SUBFRAMES; + hQMetaData->q_direction[dir].cfg.search_effort = 3; + hQMetaData->q_direction[dir].cfg.start_band = 0; + hQMetaData->q_direction[dir].cfg.mc_ls_setup = MC_LS_SETUP_INVALID; } - } - if ( reservationFailed ) - { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Q MetaData\n" ) ); + if ( coherence_flag ) + { + if ( ( hQMetaData->surcoh_band_data = (IVAS_SURROUND_COHERENCE_BAND_DATA *) malloc( sizeof( IVAS_SURROUND_COHERENCE_BAND_DATA ) * hQMetaData->q_direction[0].cfg.nbands ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for Q MetaData" ); + } + } + else + { + hQMetaData->surcoh_band_data = NULL; + } } + return IVAS_ERR_OK; } @@ -215,23 +209,23 @@ static void ivas_qmetadata_free_memory( { if ( hQMetaData->q_direction[dir].band_data != NULL ) { - count_free( hQMetaData->q_direction[dir].band_data ); + free( hQMetaData->q_direction[dir].band_data ); hQMetaData->q_direction[dir].band_data = NULL; } if ( hQMetaData->q_direction[dir].coherence_band_data != NULL ) { - count_free( hQMetaData->q_direction[dir].coherence_band_data ); + free( hQMetaData->q_direction[dir].coherence_band_data ); hQMetaData->q_direction[dir].coherence_band_data = NULL; } } - count_free( hQMetaData->q_direction ); + free( hQMetaData->q_direction ); hQMetaData->q_direction = NULL; } if ( hQMetaData->surcoh_band_data != NULL ) { - count_free( hQMetaData->surcoh_band_data ); + free( hQMetaData->surcoh_band_data ); hQMetaData->surcoh_band_data = NULL; } @@ -256,7 +250,7 @@ void ivas_qmetadata_close( ivas_qmetadata_free_memory( *hQMetaData ); - count_free( *hQMetaData ); + free( *hQMetaData ); *hQMetaData = NULL; return; diff --git a/lib_com/ivas_qspherical_com.c b/lib_com/ivas_qspherical_com.c index cf88d4da30..039dea53eb 100644 --- a/lib_com/ivas_qspherical_com.c +++ b/lib_com/ivas_qspherical_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include "ivas_prot.h" #include "prot.h" #include "cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------- diff --git a/lib_com/ivas_rom_com.c b/lib_com/ivas_rom_com.c index c824c94a40..2103609beb 100644 --- a/lib_com/ivas_rom_com.c +++ b/lib_com/ivas_rom_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include "cnst.h" #include "ivas_cnst.h" #include "ivas_rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /* clang-format off */ @@ -669,10 +669,10 @@ const float tdm_LSF_MEAN_RE_USE[M] = 3299.107307F, 3686.249102F, 4034.473656F, 4393.818819F, 4781.683038F, 5155.954294F, 5542.569582F, 5927.377309F }; -const float tdm_Beta_Q1bit_re_use_132[2] = { 0.97F, 0.75F }; -const float tdm_Beta_Q1bit_re_use_164[2] = { 0.95F, 0.71F }; -const float tdm_Beta_Q1bit_re_use_244_320[2] = { 0.93F, 0.73F }; -const float tdm_Beta_Q1bit_re_use_480[2] = { 0.97F, 0.77F }; +const float tdm_Beta_Q1bit_re_use_13k2[2] = { 0.97F, 0.75F }; +const float tdm_Beta_Q1bit_re_use_16k4[2] = { 0.95F, 0.71F }; +const float tdm_Beta_Q1bit_re_use_24k4_32k[2] = { 0.93F, 0.73F }; +const float tdm_Beta_Q1bit_re_use_48k[2] = { 0.97F, 0.77F }; const float tdm_RE_USE_adaptive_beta_prd_diag_3[15 + 16 + 15] = { @@ -903,6 +903,24 @@ const ivas_spar_br_table_t ivas_spar_br_table_consts[IVAS_SPAR_BR_TABLE_LEN] = { /* When AGC is ON additional (AGC_BITS_PER_CH+1) bits may be taken from each core-coder channel so minimum core-coder bitrate per channel can be min core-coder bitrates as per the table - AGC_BITS_PER_CH */ +#ifdef LBR_SBA + /* preferred tuning (3.2/4.9kbps) with/out TDD */ + { 13200, 0, SBA_FOA_ORDER, FB, 24000, 1, WYXZ, 1, 0, +#ifdef LBR_SBA_PLANAR + { { 11000, 9600, 13150 } }, +#else + { { 10000, 8300, 13150 } }, +#endif + { { 15, 1, 5, 1 },{ 15, 1, 3, 1 },{ 7, 1, 3, 1 } }, 0, 0, 0 }, + + { 16400, 0, SBA_FOA_ORDER, FB, 24000, 1, WYXZ, 1, 0, +#ifdef LBR_SBA_PLANAR + { { 14200, 12800, 16350 } }, +#else + { { 13200, 11500, 16350 } }, +#endif + { { 15, 1, 5, 1 },{ 15, 1, 3, 1 },{ 7, 1, 3, 1 } }, 0, 0, 0 }, +#endif { 24400, 0, SBA_FOA_ORDER, FB, 24000, 1, WYXZ, 1, 0,{ { 16400, 14850, 24350 } }, { { 15, 1, 5, 1 },{ 15, 1, 3, 1 },{ 7, 1, 3, 1 } }, 0, 0, 0 }, @@ -3980,6 +3998,30 @@ const float ivas_cos_twiddle_160[IVAS_160_PT_LEN >> 1] = 0.0760120586092433f, 0.0564205163668375f, 0.0368072229413588f, 0.0171797396307788f }; +#ifdef PARAMMC_SHORT_ENC_MDFT +const float ivas_mdft_coeff_cos_twid_120[IVAS_120_PT_LEN + 1] = +{ + 1.0000000000f, 0.9999143276f, 0.9996573250f, 0.9992290362f, 0.9986295348f, 0.9978589232f, 0.9969173337f, + 0.9958049276f, 0.9945218954f, 0.9930684570f, 0.9914448614f, 0.9896513868f, 0.9876883406f, 0.9855560591f, + 0.9832549076f, 0.9807852804f, 0.9781476007f, 0.9753423205f, 0.9723699204f, 0.9692309097f, 0.9659258263f, + 0.9624552365f, 0.9588197349f, 0.9550199445f, 0.9510565163f, 0.9469301295f, 0.9426414911f, 0.9381913359f, + 0.9335804265f, 0.9288095529f, 0.9238795325f, 0.9187912101f, 0.9135454576f, 0.9081431738f, 0.9025852843f, + 0.8968727415f, 0.8910065242f, 0.8849876375f, 0.8788171127f, 0.8724960071f, 0.8660254038f, 0.8594064115f, + 0.8526401644f, 0.8457278217f, 0.8386705679f, 0.8314696123f, 0.8241261886f, 0.8166415552f, 0.8090169944f, + 0.8012538127f, 0.7933533403f, 0.7853169309f, 0.7771459615f, 0.7688418321f, 0.7604059656f, 0.7518398075f, + 0.7431448255f, 0.7343225094f, 0.7253743710f, 0.7163019434f, 0.7071067812f, 0.6977904598f, 0.6883545757f, + 0.6788007455f, 0.6691306064f, 0.6593458151f, 0.6494480483f, 0.6394390020f, 0.6293203910f, 0.6190939493f, + 0.6087614290f, 0.5983246006f, 0.5877852523f, 0.5771451900f, 0.5664062369f, 0.5555702330f, 0.5446390350f, + 0.5336145159f, 0.5224985647f, 0.5112930861f, 0.5000000000f, 0.4886212415f, 0.4771587603f, 0.4656145203f, + 0.4539904997f, 0.4422886902f, 0.4305110968f, 0.4186597375f, 0.4067366431f, 0.3947438564f, 0.3826834324f, + 0.3705574375f, 0.3583679495f, 0.3461170571f, 0.3338068592f, 0.3214394653f, 0.3090169944f, 0.2965415750f, + 0.2840153447f, 0.2714404499f, 0.2588190451f, 0.2461532930f, 0.2334453639f, 0.2206974350f, 0.2079116908f, + 0.1950903220f, 0.1822355255f, 0.1693495038f, 0.1564344650f, 0.1434926220f, 0.1305261922f, 0.1175373975f, + 0.1045284633f, 0.0915016187f, 0.0784590957f, 0.0654031292f, 0.0523359562f, 0.0392598158f, 0.0261769483f, + 0.0130895956f, 0.0000000000f +}; +#endif + const float ivas_sin_twiddle_80[IVAS_80_PT_LEN >> 1] = { -0.00490871880799799f, -0.0441642771270674f, -0.0833517373318975f, -0.122410675199216f, @@ -5530,5 +5572,611 @@ const int16_t ivas_num_active_bands[FB - WB + 1] = IVAS_16K_12BANDS_ACTIVE_BANDS, IVAS_FB_BANDS_12, IVAS_FB_BANDS_12 }; +#ifdef SNS_MSVQ +const int16_t ivas_sns_cdbks_tcx20_levels[SNS_MSVQ_NSTAGES_TCX20] = { 128, 64, 32, 32 }; +const int16_t ivas_sns_cdbks_tcx20_bits[SNS_MSVQ_NSTAGES_TCX20] = { 7, 6, 5, 5 }; + +/* codebooks trained for no adaptive tilt */ +const float ivas_sns_cdbk_tcx20_stage1[ 128 * 16 ] = { + -3.24881770f, -1.99497051f, -0.04725080f, 1.02318508f, 1.51589220f, 1.44649178f, 1.27858728f, 1.15137095f, 0.98029724f, 0.69167126f, 0.33414576f, 0.11759238f, -0.27510520f, -0.63610342f, -1.05394049f, -1.28304590f, + -3.24340413f, -4.15075396f, -2.86242117f, -1.11561919f, 1.12899983f, 1.98341478f, 0.56638511f, -0.05841474f, -0.14875192f, 0.31098029f, 1.87121037f, 0.91347082f, 1.02548459f, 1.98227488f, 1.30278860f, 0.49435585f, + 1.23065598f, 0.87793778f, 0.28294330f, 0.02972172f, 0.42574775f, 0.83386805f, 0.95758438f, 1.21299710f, 1.15042593f, 1.00234403f, 0.60083169f, -0.06520030f, -1.53941239f, -2.26801783f, -2.42116011f, -2.31126766f, + 0.06088614f, 0.02623315f, -0.61781539f, -1.23181247f, -1.40815590f, -1.42831471f, -1.44033232f, -1.33353337f, -0.99555917f, -0.36554180f, 0.55314618f, 1.56114474f, 2.01339157f, 1.99106535f, 1.51097476f, 1.10422329f, + -0.46337128f, -1.76230281f, -2.14514561f, -1.74284853f, -0.74943182f, 0.04642704f, 0.99955801f, 1.04344919f, 1.33994604f, 1.17515394f, 1.38810800f, 1.59087304f, 0.68196542f, -0.13955087f, -0.49622391f, -0.76660607f, + -2.07291483f, -1.16133507f, -1.23972694f, -1.55319745f, -1.53709378f, -0.89687815f, -0.30493476f, 0.53566030f, 0.90463531f, 1.12789938f, 1.18233130f, 1.05231063f, 0.85029894f, 0.96079862f, 1.14041844f, 1.01172838f, + 2.12762247f, 0.85938708f, 0.01404337f, -0.21119526f, -0.23292897f, -0.20800178f, 0.17965021f, 0.51517794f, 0.58450068f, 0.57289696f, 0.08413189f, -0.34604446f, -0.63957268f, -0.82541169f, -1.16686648f, -1.30738935f, + 1.40474083f, 0.32307263f, 0.16419111f, 0.38346550f, 0.50108274f, 0.37590359f, 0.08846238f, -0.23008300f, -0.45942672f, -0.45977478f, -0.43670746f, -0.36727746f, -0.35363526f, -0.33341415f, -0.31539698f, -0.28520292f, + -1.63093109f, 0.32670603f, 1.08393314f, 0.58998372f, 0.53843053f, 0.88612683f, 0.92734321f, 0.85881168f, 0.60801083f, 0.37502839f, -0.29325438f, -0.61636624f, -0.51913318f, -0.70035895f, -0.99754553f, -1.43678500f, + -1.93833343f, -0.69005518f, -0.75170110f, -1.07591216f, -1.13136476f, -0.91057037f, -0.96360579f, -0.81544927f, -0.72636191f, -0.36468519f, 0.13935276f, 1.01589488f, 1.62003238f, 2.00743696f, 2.33078654f, 2.25453582f, + 0.79346182f, 0.75880356f, 0.99941121f, 1.41339988f, 1.42679902f, 1.10135650f, 0.67724856f, 0.16701926f, -0.44226147f, -0.83565024f, -0.96240506f, -0.97710726f, -1.05267194f, -1.07354671f, -1.04194230f, -0.95191489f, + 1.32136151f, -0.10247792f, -0.44723017f, -0.36075427f, -0.71183851f, -0.78401615f, 0.03854040f, 0.61579422f, 0.72990899f, 0.74660263f, 0.27260947f, -0.45511245f, -0.57501743f, -0.20707029f, -0.10728071f, 0.02598055f, + -2.38997175f, -0.94335853f, 0.22486968f, 0.68758389f, 0.77400708f, 0.48551812f, 0.16770824f, 0.18451833f, 0.33722182f, 0.44300618f, 0.45730356f, 0.25903292f, 0.07348018f, -0.18351294f, -0.34985810f, -0.22754861f, + -0.04011386f, -2.74627791f, -2.64617639f, -2.12344376f, -1.04417531f, -1.19773434f, -1.09890378f, -1.14847926f, -1.25163399f, -1.37182360f, -0.92453053f, 0.26852562f, 2.49004087f, 5.03865317f, 3.18845554f, 4.60761675f, + 1.14142799f, 2.34150710f, 1.12597821f, 0.18025034f, -0.06854703f, 0.11882225f, -0.04029384f, -0.10117108f, -1.28130702f, -1.15721800f, 0.11730029f, 0.68335719f, -0.86449861f, -0.91274565f, -0.63726145f, -0.64560064f, + 0.13591417f, 1.45701293f, 0.18328994f, -1.33736241f, -1.63073739f, -1.11748160f, 0.33426081f, 1.38341076f, 1.23963779f, 1.15857921f, -0.19884512f, -0.46649971f, -0.23043753f, -0.16721531f, -0.08938742f, -0.65413930f, + -3.20422583f, -2.18732518f, -1.06476764f, -0.35148934f, 0.10909386f, 0.39065642f, 0.55826648f, 0.44049157f, 0.21409388f, 0.73508456f, 0.80931151f, 0.46688874f, 0.41272044f, 0.76516296f, 1.00398863f, 0.90204888f, + -2.87971458f, -4.23728027f, -0.84454748f, -0.07411834f, 0.21882417f, -1.73386520f, 0.44502397f, -0.29845675f, 0.51877264f, 1.16767994f, -0.80604089f, 1.51749444f, 2.06387385f, 2.42941495f, 1.48054035f, 1.03239888f, + 0.41502416f, 1.92937242f, 2.34493885f, 2.24663449f, 1.97723622f, 1.21219002f, 0.63995779f, 0.11201995f, -0.55860561f, -1.24739776f, -1.54711086f, -1.65155024f, -1.60927011f, -1.56104438f, -1.42473910f, -1.27765585f, + 0.97567115f, -1.33363678f, -2.33351304f, -2.63770798f, -2.22869213f, -1.57504148f, -1.07402035f, -0.47932319f, 0.18065985f, 0.66105619f, 1.18623833f, 1.66207325f, 1.92650802f, 1.89672632f, 1.54070829f, 1.63229361f, + -1.83309029f, -1.12088085f, -0.69053368f, -0.04697322f, 0.16614312f, 0.20653379f, 0.18628141f, 0.29156151f, 0.23415032f, 0.18998435f, 0.46020416f, 0.73218863f, 0.60617333f, 0.33402310f, 0.20549266f, 0.07874144f, + 1.16879643f, -0.94945093f, -1.28153207f, -1.43119528f, -1.63599975f, -1.48906283f, -0.72189452f, 0.19212127f, 0.62604095f, 0.71399312f, 0.84540884f, 0.67919451f, 0.73724815f, 0.94849167f, 0.74181449f, 0.85602585f, + 3.95026110f, 1.56392643f, -0.09370037f, -1.55546296f, -0.28400433f, 2.65160213f, 1.72026891f, -1.03325487f, -2.07533128f, -1.61929448f, -0.37408941f, -0.62936182f, -0.97909452f, -0.16160269f, -0.16361090f, -0.91725088f, + 0.53671249f, -1.03786958f, -1.08801981f, -0.37356699f, -0.22489401f, 0.02309705f, 0.14784551f, 0.19793732f, 0.12472343f, 0.09506024f, 0.05869315f, 0.14383214f, 0.10038818f, 0.25076267f, 0.40789510f, 0.63740306f, + -1.95841389f, 0.03478956f, 1.04981544f, 1.45141888f, 1.01368780f, 1.76553008f, 0.97518033f, 0.87744500f, 1.11998177f, 1.49531245f, 0.43867723f, -1.39588091f, -2.49552623f, -2.06407734f, -1.18465117f, -1.12328885f, + -1.17302983f, 0.17875585f, 0.89193716f, 1.29461477f, 1.14616923f, 0.04577007f, -0.87252250f, -0.55960184f, -0.58720665f, -0.52949712f, -0.37526793f, 0.00605696f, -0.15490600f, 0.06404177f, 0.40280720f, 0.22187871f, + 0.64131376f, 1.75231910f, 2.22508888f, 1.98484418f, 0.78172753f, -0.67005650f, -0.79535378f, 0.16537851f, 0.46442966f, -0.37889506f, -1.24009244f, -0.92537177f, -0.87140953f, -1.04472250f, -1.06971265f, -1.01948730f, + 0.34969434f, 1.41127416f, 0.95134631f, -0.49521902f, -1.13459218f, -1.02414143f, -0.54470763f, 0.04902381f, -0.01765934f, -0.09518271f, -0.07199094f, -0.00398826f, 0.14565429f, 0.17470642f, 0.18302401f, 0.12275814f, + -0.44981302f, -0.20165042f, -0.00073479f, 0.26315901f, 0.44473473f, 0.36317865f, 0.17484972f, 0.03171990f, 0.07343634f, 0.04543774f, -0.09709362f, -0.05624873f, -0.00866747f, -0.02410679f, -0.21651202f, -0.34168925f, + -1.24451525f, -1.23251652f, -1.59614073f, -2.03789978f, -1.96213854f, -1.71444999f, -1.60613134f, -1.51978903f, -1.00014591f, 0.04117804f, 1.34166006f, 2.42925461f, 2.88303472f, 2.83027230f, 2.48737677f, 1.90095093f, + 1.96467234f, 1.49818482f, 0.23737321f, -0.11314831f, -0.14050512f, -0.25201114f, -0.17389748f, -0.07042668f, -0.18426976f, -0.34937744f, -0.42674607f, -0.50442879f, -0.58679768f, -0.52836378f, -0.35445903f, -0.01579900f, + -0.99933612f, 1.11819495f, 1.29449512f, -0.02576221f, -0.61170357f, 0.30864176f, 0.87998806f, 0.96699269f, 0.98082342f, 1.27485776f, 0.52941745f, -1.29529727f, -1.88922976f, -1.36858904f, -0.37094568f, -0.79254774f, + -2.00039877f, -0.30176543f, 0.62981832f, 1.66518235f, 1.71899440f, 1.30408052f, 0.82774193f, 1.00586191f, 0.86017140f, 0.54233910f, -0.13420070f, -0.66585251f, -0.96492148f, -1.18998336f, -1.56871158f, -1.72835605f, + -2.69937742f, -3.72437438f, -3.23623013f, -0.25624354f, 1.96357307f, 2.46814215f, 3.53069303f, -1.06174110f, -1.09336853f, -0.07686535f, 1.29279961f, 1.80354460f, 1.27988399f, -0.42606045f, -0.44754574f, 0.68316996f, + -0.09822772f, 1.26120245f, 1.70052823f, 1.56502837f, 1.15694639f, 0.88838189f, 0.57465867f, 0.31853596f, 0.03466567f, -0.25958767f, -0.49911919f, -0.76007985f, -1.16055649f, -1.53569625f, -1.61195549f, -1.57472513f, + -1.14376495f, -1.43799067f, -1.45325578f, -1.52444742f, -1.38528757f, -1.09797958f, -0.89118095f, -0.62608417f, -0.00250085f, 0.94458366f, 1.51363028f, 1.81223868f, 1.83008829f, 1.56737959f, 1.18148735f, 0.71308420f, + -0.16148812f, -2.04769833f, -2.09471486f, -1.43005703f, -0.50205979f, -0.54822778f, 1.68195446f, 4.00061129f, 1.03275735f, 0.41847912f, 0.66770340f, -0.11822564f, -0.63042447f, -0.32785779f, -0.23825248f, 0.29750055f, + -3.59916102f, -3.16769339f, -2.44843270f, -2.08077491f, -1.31387103f, -0.17348440f, 0.36398119f, 1.21172207f, 1.38864588f, 1.46347831f, 1.46684451f, 1.84157730f, 1.58044756f, 1.35394187f, 1.27155115f, 0.84122764f, + 1.12168796f, 1.77011301f, 0.80501182f, -0.65059510f, -0.86885740f, -0.21223750f, 0.66413611f, 0.77827963f, 0.37800197f, -0.26796888f, -0.97801860f, -0.64966444f, -0.50047252f, -0.44549810f, -0.47750530f, -0.46641261f, + 1.69417025f, 0.14170351f, -0.30309571f, -0.50074499f, -0.60597114f, -0.65756500f, -0.62775844f, -0.41013834f, -0.07761611f, 0.16510349f, 0.25158511f, 0.34758291f, 0.28289899f, 0.29273919f, 0.09829950f, -0.09119332f, + -0.86153928f, 1.09981825f, 0.79441249f, 0.41436072f, 0.25807562f, -0.33355863f, -0.51983659f, -0.25841284f, 0.00191053f, 0.13240503f, 0.19942573f, 0.24363814f, 0.08478089f, -0.15773770f, -0.37897853f, -0.71876393f, + -3.54840520f, -3.31670990f, -2.41138986f, -1.93012869f, -1.20864357f, -0.47291818f, -0.18678664f, 0.02177990f, 0.31458995f, 0.70059621f, 1.23845973f, 1.82707181f, 2.12918865f, 2.27071260f, 2.36659938f, 2.20598371f, + -1.13771731f, 0.39368618f, 0.69608234f, 1.45165188f, 1.41884327f, 1.47720631f, 0.71071536f, 0.51669579f, 0.07379070f, -0.91725636f, -1.46431524f, -2.01818354f, -0.45034354f, -0.20458063f, -0.61685389f, 0.07057863f, + 1.94180196f, -0.43938181f, -1.45235723f, -1.62714803f, -0.56602083f, 0.17861664f, -0.11574800f, -0.55042921f, -0.26385634f, 0.14973980f, 0.40358646f, 0.57744006f, 0.91363053f, 0.71399177f, -0.04044356f, 0.17657766f, + -2.29623160f, 0.37017475f, -0.14625619f, 1.40510672f, -0.18688173f, 0.98162341f, -0.08351923f, 0.30727120f, 0.21088276f, 0.00882905f, 0.20930156f, 0.07859582f, 0.11868622f, 0.19357924f, -0.59940040f, -0.57176126f, + 0.32770546f, -2.17703619f, -2.14694909f, -1.21327174f, -0.09787592f, -0.38390569f, -0.54684876f, -0.76275935f, -1.00614562f, -1.06555455f, -0.70232123f, -0.12667989f, 0.23719344f, 0.82854727f, 3.01646153f, 5.81943998f, + 1.74451794f, 2.61728252f, 2.50084081f, 2.14806463f, 1.03256213f, -0.14230845f, -0.89600957f, -1.26996454f, -1.47590648f, -1.42717085f, -1.20779572f, -0.98498624f, -0.82778555f, -0.73610012f, -0.59428320f, -0.48095729f, + -1.63200590f, 0.23028801f, -0.00907184f, -0.79978843f, -1.00748376f, -0.12526203f, 0.79168097f, 0.90826744f, 0.57548955f, 0.65151547f, 0.37307684f, -0.12047965f, -0.13538324f, 0.00756611f, 0.31705141f, -0.02546129f, + -2.96255244f, -1.89398578f, -1.11705055f, -0.49587679f, -0.64879460f, 0.52145289f, -0.11691144f, 1.02365070f, 0.12124424f, 1.06613244f, 2.03450026f, 1.32855094f, 0.54450823f, -0.09583278f, -0.09304639f, 0.78401059f, + -2.74846388f, -3.29381816f, -1.69589747f, 0.09992536f, 1.19730664f, -0.16362356f, -0.15703004f, 0.55042720f, 0.31568131f, 0.18156842f, 0.68590339f, 1.08986889f, 1.58662197f, 1.58930878f, 0.65286724f, 0.10935410f, + 2.40977200f, 1.75366309f, 0.74979137f, 0.75357579f, 0.58888421f, 0.34045829f, 0.41658500f, 0.41731179f, 0.35825939f, 0.03048901f, -0.69808452f, -1.34206657f, -1.51950247f, -1.45414323f, -1.40318331f, -1.40180996f, + -0.45462369f, -0.79464966f, -0.73449499f, -0.64030961f, -0.59804980f, -0.52688087f, -0.50966580f, -0.32241860f, -0.22751147f, -0.05981052f, 0.18569777f, 0.50293633f, 0.68570837f, 0.93799600f, 1.18364242f, 1.37243415f, + 0.71230959f, -0.15258830f, -0.30639043f, -0.10789426f, 0.13596677f, 0.06139692f, -0.05906250f, -0.09243858f, 0.16058801f, 0.19962984f, -0.02914953f, -0.05986174f, -0.00798730f, -0.03679071f, -0.19035654f, -0.22737122f, + 0.20985119f, 0.67531452f, -0.76482923f, -1.95548615f, -2.01335569f, -1.31859418f, -0.44117933f, 0.43598020f, 0.63898416f, 0.59260283f, 0.59660664f, 0.64364003f, 0.57962656f, 0.72198795f, 0.77431143f, 0.62453906f, + 3.37266827f, 1.16546541f, 0.15487771f, 0.57979973f, 1.63054771f, 1.04524609f, -0.13961184f, -0.53246008f, -0.51061506f, -0.83238697f, -1.04232388f, -0.96061103f, -0.90339873f, -0.99671658f, -1.06027762f, -0.97020325f, + -2.45339028f, 0.22870307f, 0.50079654f, 0.82545821f, -0.45080889f, -0.16537387f, -0.25306064f, -0.33349906f, 0.26143456f, 0.09313222f, 0.86160665f, 0.75164534f, -1.22179547f, -0.18801375f, 1.02457992f, 0.51858541f, + -1.46171297f, 0.63898461f, 2.15634917f, 1.94818588f, 2.12627540f, 1.70759626f, 1.43815259f, 0.82410049f, 0.20479176f, -0.43378728f, -0.89783731f, -1.30555797f, -1.66597981f, -1.80440934f, -1.79291067f, -1.68224086f, + -0.10170911f, 1.63842605f, 2.05629785f, 1.72760611f, 0.13751598f, -1.26847816f, -1.58069540f, -1.04510855f, -0.88231099f, -0.68616151f, -0.59891556f, -0.49054331f, -0.18451655f, 0.19151542f, 0.64619056f, 0.44088718f, + -0.86655238f, 0.59030963f, 1.14256838f, 1.66795450f, 1.50058628f, 1.34944192f, 0.08257813f, 0.24901720f, -0.18852178f, -0.03650931f, -0.27994508f, -1.06110568f, -2.06900429f, -1.73358377f, -0.24057835f, -0.10665549f, + 1.50872779f, 1.31070374f, 0.39357214f, -0.46407462f, -0.92397447f, -1.13436545f, -1.23237146f, -1.13209159f, -1.03095318f, -0.62563255f, -0.17705075f, 0.30244717f, 0.51989500f, 0.80258928f, 0.87034201f, 1.01223693f, + -0.30437289f, -0.88801487f, -0.86107707f, -0.28285107f, 0.28699382f, 0.45911485f, 0.48852566f, 0.45550239f, 0.58082722f, 0.55866427f, 0.31299044f, 0.14102370f, 0.07480087f, -0.08720185f, -0.35323153f, -0.58169395f, + -2.81842263f, -2.50111842f, -2.46829445f, -2.46942172f, -2.16241013f, -1.43881623f, -1.42903221f, -0.83291045f, 0.08734224f, 1.62875243f, 2.38321450f, 2.57841755f, 2.43444406f, 2.45552669f, 2.52427006f, 2.02845861f, + 3.37066045f, 1.49218725f, 0.55470586f, 0.13748306f, -0.13402053f, -0.39589325f, -0.44410867f, -0.48568748f, -0.51085663f, -0.42397560f, -0.53871831f, -0.60800303f, -0.57632384f, -0.50071998f, -0.46558245f, -0.47114696f, + -0.62183100f, 1.32484675f, 1.39280525f, 0.63916764f, 0.07573329f, 0.57096453f, 0.11014546f, -0.13955579f, -0.60839590f, -0.77966466f, -1.07179154f, -1.77671234f, -0.71411508f, 0.13441149f, 0.72184010f, 0.74215154f, + -2.90081845f, -3.29359883f, -1.89249569f, 2.35796037f, 2.47210792f, 0.89083303f, 1.25230145f, 1.03281210f, 1.34506489f, 0.48347288f, -0.08158884f, 0.21388757f, 0.05047384f, -0.37546417f, -0.70672331f, -0.84822525f, + -0.68878586f, -3.17765901f, -2.72677654f, -0.83696096f, 1.93901658f, 2.45806994f, 0.77003930f, 0.58220309f, 0.28500621f, -0.15305225f, 0.53711675f, 0.20321993f, 0.20435459f, 0.27124049f, 0.02126411f, 0.31170327f, + 1.03813940f, 1.60082720f, 1.24608760f, 0.78739775f, 0.96747591f, 1.10068123f, 1.15134869f, 0.74915981f, 0.42167811f, 0.15553718f, -0.33259317f, -0.97385519f, -1.61082594f, -2.05590168f, -2.15737100f, -2.08778582f, + -0.64496025f, 0.35212582f, -0.04908282f, -1.05504457f, -1.19731005f, -0.73315350f, -0.66929749f, -0.60130627f, -0.33236585f, 0.23014025f, 0.69893111f, 1.09565077f, 1.08466375f, 0.94366305f, 0.65639554f, 0.22095053f, + 0.48358349f, -0.37847120f, -1.02753771f, -0.73518795f, -0.11326269f, 0.53003780f, 0.88038488f, 0.88882395f, 0.97329253f, 0.69212641f, 0.87373175f, 0.80871682f, -0.03656343f, -0.94980974f, -1.26081773f, -1.62904720f, + -2.23244251f, -1.79490434f, -1.96001543f, -2.27380061f, -2.07255037f, -1.46415033f, -1.04393033f, 0.20282312f, 1.57244767f, 1.97591827f, 1.77648956f, 1.75160994f, 1.62357252f, 1.47414518f, 1.35930993f, 1.10547779f, + 0.79628045f, 0.95200921f, 0.49234542f, 0.09199320f, -0.05724590f, -0.07118046f, -0.04634766f, -0.00096416f, -0.17970825f, -0.09563800f, -0.01779017f, 0.13120319f, -0.03610489f, -0.35895498f, -0.62415601f, -0.97574095f, + 1.23786391f, -0.05332070f, 0.12142715f, 0.41317442f, 0.15674045f, -0.23609842f, -0.45604039f, -0.60612644f, -0.72063869f, -0.65773356f, -0.45446098f, -0.19856125f, -0.01567566f, 0.31093945f, 0.48567017f, 0.67284050f, + -0.38959317f, 0.48417975f, 0.67846195f, 0.96883427f, 0.97152360f, 0.77479838f, 0.58711345f, 0.71066957f, 0.54730033f, 0.30078955f, -0.00792413f, -0.23889729f, -0.71320215f, -1.17067509f, -1.60334166f, -1.90003738f, + -0.58748774f, -1.47663922f, -1.69196885f, -1.58982061f, -1.20534794f, -0.84425696f, -0.58959522f, -0.30927859f, 0.05320947f, 0.43265601f, 0.78002809f, 1.13478063f, 1.29240277f, 1.39914925f, 1.52607187f, 1.67609674f, + 0.21900175f, 0.90198746f, 1.47152638f, 1.60585024f, 1.28627552f, 0.62955762f, -0.10179136f, -0.53979665f, -0.95849172f, -1.05549774f, -0.93249423f, -0.63224235f, -0.54606380f, -0.47048197f, -0.44721628f, -0.43012290f, + 1.16598857f, -0.44883323f, -0.35990019f, 0.55867022f, 0.76350144f, 0.40336553f, -0.17899520f, -0.32789312f, 0.39266043f, 1.31706823f, 0.14239671f, -1.37351682f, -1.43994906f, -0.44961849f, 0.22694761f, -0.39189263f, + -2.38540927f, -1.62852954f, -0.88269400f, -0.07377225f, 0.58356450f, 0.88990527f, 0.91596948f, 0.64591793f, 0.36616944f, 0.38677852f, 0.46220080f, 0.31194777f, 0.22940934f, 0.16539664f, 0.07914516f, -0.06599966f, + 0.72463355f, -0.52958069f, -1.48068920f, -1.78301927f, -1.84235585f, -1.64970240f, -1.53867955f, -1.38956832f, -1.22397576f, -0.84685537f, -0.05213558f, 1.07240247f, 1.81984926f, 2.69693629f, 2.99963897f, 3.02310102f, + 1.19409909f, 2.68519772f, 1.98964488f, 0.67968388f, -0.01774621f, -0.15701839f, -0.09104235f, 0.24620030f, -0.83163859f, -1.22467182f, -1.23467957f, -1.15083406f, -0.63344301f, -0.72619249f, -0.46989224f, -0.25766714f, + -0.36982280f, 1.17012486f, 0.65527007f, -0.63203416f, -0.41714099f, 0.81639854f, 0.54164978f, 0.77650051f, 0.59880614f, 0.82660687f, -1.04749065f, -0.62911908f, -0.34368981f, -0.45351210f, -0.51314098f, -0.97940604f, + -2.68285677f, -0.85691687f, -0.20235026f, -0.01759520f, -0.00179021f, 0.11451343f, 0.27056934f, 0.20577824f, -0.23029364f, 0.11388472f, -0.05166620f, 0.07283122f, 0.56553984f, 0.81068091f, 1.04931803f, 0.84035365f, + -1.52932955f, -1.34785922f, -0.57071683f, -0.20686289f, 0.08155976f, -0.47381873f, -0.77622457f, -0.57310159f, -0.22137986f, 0.13834100f, 0.49481460f, 0.80177416f, 0.88568748f, 1.02957744f, 1.20356068f, 1.06397834f, + 0.85311314f, 1.33739225f, 1.91363915f, 1.93231248f, 2.08304754f, 1.71778606f, 0.86773094f, 0.43475180f, 0.03661492f, -0.61728713f, -1.15699401f, -1.66982248f, -1.98244609f, -2.00151078f, -1.93416224f, -1.81416574f, + 1.60126279f, -0.81833805f, -1.38880039f, -1.40634796f, -1.32149763f, -1.28036492f, -1.07256373f, -0.72500244f, -0.46550137f, -0.10403512f, 0.28677127f, 0.67644278f, 1.00944110f, 1.34460513f, 1.63359356f, 2.03033498f, + -1.12256198f, -1.95155583f, -1.32316561f, -0.63266570f, -0.15627220f, 0.07123786f, 0.13550620f, 0.25890778f, 0.47783453f, 0.57057758f, 0.68332609f, 0.73453078f, 0.66233264f, 0.62861164f, 0.56744294f, 0.39591321f, + 0.06875844f, -0.77557401f, -1.05293353f, -1.03197877f, -0.85111938f, -0.61756528f, -0.16943921f, 0.22208891f, 0.49771452f, 0.66450860f, 0.73241467f, 0.72611275f, 0.63156506f, 0.52604468f, 0.30774149f, 0.12166125f, + 3.80400584f, 1.75988157f, 0.24665703f, -1.24851564f, -1.25633571f, 0.32422259f, 2.13094918f, 0.70439664f, -1.53713254f, -1.71622823f, -1.08819715f, -0.50716458f, -0.74087437f, -0.99402032f, -0.10491345f, 0.22326928f, + -0.65058475f, -0.32678303f, -0.20547132f, -0.11041511f, -0.11848885f, -0.20790889f, -0.31102714f, -0.27474061f, -0.20625644f, -0.08260245f, 0.09887987f, 0.33251986f, 0.41319745f, 0.49892877f, 0.56061378f, 0.59013885f, + -2.39642240f, -0.73872271f, 0.49057636f, 1.16325658f, 0.79747808f, 1.34021740f, 0.82073194f, 1.17831994f, 1.25881141f, 0.84489551f, -0.77511278f, -1.30893620f, -1.25529283f, -0.65601516f, -0.34679935f, -0.41698601f, + -0.54371008f, 0.45990001f, 0.73230478f, 1.41706822f, 1.07142705f, 0.82233755f, -0.15928811f, -0.34139895f, -0.08643862f, -0.24274513f, -0.48172279f, -0.46452865f, -0.44837803f, -0.43356299f, -0.59008965f, -0.71117480f, + -0.36854343f, 1.40608712f, 2.13291678f, 1.80061219f, 1.15989238f, -0.32896337f, -0.86683083f, -0.45937605f, -0.17796119f, -0.40226921f, -0.30363529f, -1.08494615f, -0.97269428f, -0.91102639f, -0.31526836f, -0.30799363f, + 0.16771127f, 1.28284008f, 0.25724837f, -1.11750032f, -1.04368583f, 0.13121741f, 0.10609539f, 0.02437401f, -0.56098948f, -0.38744327f, 0.07855531f, 0.20548373f, 0.06560664f, 0.24342662f, 0.39885137f, 0.14820870f, + 0.20792769f, -0.15663987f, -0.04445993f, 0.27319064f, 0.51281629f, 0.57962552f, 0.54535177f, 0.41567183f, 0.41718141f, 0.20916435f, -0.10574785f, -0.26957618f, -0.44861183f, -0.55143961f, -0.71969549f, -0.86475851f, + -2.53854175f, -2.10301056f, -1.97482174f, -2.12277877f, -1.80824545f, -1.32660134f, -1.25816793f, -0.90711327f, -0.59056817f, -0.05426883f, 0.60446374f, 1.61001048f, 2.40601840f, 3.00689095f, 3.60110855f, 3.45562566f, + 1.07778822f, 2.19172459f, 1.44013405f, 0.27222350f, 0.03173527f, -0.04691321f, 0.06376916f, 0.63907484f, -0.17949007f, 0.10010871f, -0.52495472f, -0.90729516f, -0.89428983f, -1.02410889f, -1.09546364f, -1.14404292f, + 0.76276530f, 1.59524592f, 1.47474021f, 0.18145014f, 0.13550913f, 0.88510912f, 1.03412929f, 1.01111065f, 0.77539585f, 0.20329499f, -1.35508663f, -1.83340559f, -1.40465488f, -1.14514789f, -1.16420913f, -1.15624650f, + -2.56605999f, -0.69575164f, 0.80693890f, 1.72778867f, 2.34339014f, 2.09042055f, 1.74382199f, 1.18476481f, 0.71416221f, 0.16808900f, -0.19808303f, -0.77842890f, -1.40866559f, -1.73499872f, -1.76586854f, -1.63151971f, + -0.32618212f, -2.76955063f, -2.78043449f, 0.51956703f, 4.34383806f, 1.88716237f, 4.47289205f, -0.68129863f, -1.52511041f, -1.32636741f, 0.65997777f, -0.52682311f, -0.69581956f, -0.43799624f, -0.50098243f, -0.31287245f, + 1.11744895f, 0.76474262f, 0.68913317f, 0.77356058f, 0.73021025f, 0.55480731f, 0.41334472f, 0.23384124f, 0.00040865f, -0.18384701f, -0.30336471f, -0.46628578f, -0.73968976f, -1.02792872f, -1.19473003f, -1.36165137f, + -1.09856438f, -2.65937422f, -2.23447552f, -2.36127808f, -1.92601400f, -1.29606162f, -0.86847602f, -0.41112389f, 0.27059515f, 0.62653494f, 1.25539083f, 2.16718498f, 2.40401093f, 1.97246907f, 1.87623832f, 2.28294385f, + -2.23812017f, -3.37112518f, -3.06489410f, -2.44639779f, -1.77205118f, -0.96847500f, 3.20788062f, 2.74986128f, 2.48376367f, 3.58855607f, 1.46558359f, 0.58208141f, 0.58647621f, -0.03336968f, -0.01161197f, -0.75815742f, + -3.34068874f, -3.31330139f, -3.27624195f, -3.18776773f, -2.60176738f, -1.35466356f, -0.47112724f, 0.80847853f, 1.80958348f, 2.21285031f, 2.26554713f, 2.76880679f, 2.60017886f, 2.04062204f, 1.67575322f, 1.36373732f, + 0.04677635f, 1.13691098f, 1.30914680f, 0.25672818f, 0.15799852f, 0.60568291f, 0.31771628f, 0.07597951f, -0.26589647f, -0.54972118f, -0.86844552f, -0.61094603f, -0.47072310f, -0.40511943f, -0.38309528f, -0.35299238f, + 0.22528620f, 0.31743905f, 0.31483553f, 0.17720192f, 0.16231355f, -0.06831057f, -0.29693139f, -0.45560458f, -0.21127731f, -0.08624191f, -0.20781580f, -0.12232125f, 0.08133224f, 0.09984234f, 0.03187445f, 0.03837752f, + 0.45404525f, 1.31244734f, 1.09193858f, 0.46595512f, 0.31516414f, -0.08250116f, -0.64154502f, -0.86897307f, -0.92275973f, -0.84086567f, -0.63886704f, -0.14652849f, 0.08165072f, 0.18249933f, 0.18288233f, 0.05545734f, + -2.78701578f, -2.31409561f, -1.68556203f, -1.40144529f, -0.74842449f, -0.07375189f, -0.20211385f, 0.09260002f, 0.29898930f, 0.66465229f, 0.75558861f, 0.96729187f, 1.14177838f, 1.55174084f, 1.99705535f, 1.74271247f, + -0.10464683f, -0.94242352f, -0.57955843f, 1.29762166f, 1.68516688f, 1.09852539f, 0.72099378f, 0.51323036f, -0.24285175f, -0.55888513f, -0.50577021f, -0.46366004f, -0.55836815f, -0.58550721f, -0.50078205f, -0.27308479f, + 3.45286440f, 0.59611628f, -0.69351346f, -1.14674518f, -1.07854543f, -0.89938730f, -0.76263547f, -0.52068670f, -0.36216337f, -0.17157688f, -0.01447939f, 0.15778389f, 0.27944020f, 0.35739675f, 0.34083744f, 0.46529411f, + -1.28927442f, 0.10726691f, 0.86158650f, 0.06273348f, -0.04085696f, 1.13928101f, 0.37886132f, 0.13576595f, -0.53530704f, -0.37566277f, -0.10613359f, -0.03059598f, -0.04857175f, -0.00612681f, 0.00516239f, -0.25812835f, + 2.89076531f, -0.04664344f, -1.93237643f, -2.19996964f, -1.86412035f, -1.18315371f, -1.10120931f, -1.31680378f, -1.30399765f, -1.28669610f, -0.94489947f, -0.60614659f, 1.58599312f, 0.95842154f, 2.94815038f, 5.40268579f, + 3.83455417f, 3.13869337f, 1.72510455f, 1.17236146f, 0.33356711f, 0.11348813f, -0.29704182f, -1.13829975f, -1.48383443f, -1.43388842f, -1.35163818f, -1.16938088f, -1.02627819f, -0.92590386f, -0.82058768f, -0.67091549f, + -0.93172509f, 0.85237993f, 1.34276319f, 0.25174685f, -0.79705618f, -0.63895111f, 0.21118680f, 0.97143052f, 0.70458966f, -0.18635616f, -0.52911893f, -1.85150883f, -0.43982599f, 0.04075634f, 0.50586277f, 0.49382650f, + -3.79516923f, -3.31533743f, -1.55672619f, 0.02918112f, 0.69887327f, 0.58481500f, 1.07030510f, 1.26562384f, 1.20349632f, 1.07269840f, 0.89773042f, 0.88137053f, 0.60964812f, 0.28884498f, 0.12262285f, -0.05797732f, + -0.08660073f, -3.36745835f, -3.82012977f, -2.75147711f, -0.36352096f, 0.85747874f, 1.11140604f, 0.65593665f, 0.35792228f, 0.54619342f, 0.99489751f, 1.28924616f, 0.96663509f, 1.40602119f, 1.12645860f, 1.07699149f, + 1.92634136f, 2.07569243f, 1.90024169f, 1.55333140f, 1.00662166f, 0.59662392f, 0.41735113f, 0.03712017f, -0.30033462f, -0.70147399f, -1.26150322f, -1.36946469f, -1.49306813f, -1.53593901f, -1.47859712f, -1.37294294f, + 0.41088895f, -0.68758389f, -0.85837881f, -0.86844724f, -0.85475992f, -0.88373397f, -0.82636157f, -0.54233624f, -0.33497780f, -0.06884329f, 0.24209832f, 0.60199869f, 0.83678079f, 1.05727685f, 1.27867768f, 1.49770152f, + -0.45442780f, -0.39381771f, -0.35575987f, -0.28279611f, -0.03460671f, 0.02188475f, -0.06207990f, -0.02068513f, 0.24104453f, 0.35743869f, 0.26392307f, 0.33209979f, 0.34550175f, 0.24362296f, 0.00439669f, -0.20573886f, + -1.38047831f, 0.78167658f, 0.42055729f, -0.93786054f, -1.72548724f, -1.52410071f, -0.47028251f, 0.81491117f, 0.82382622f, 0.46806997f, 0.95867097f, 0.52433344f, -0.02522016f, 0.39885676f, 0.61128096f, 0.26124617f, + 1.92925285f, 1.70790963f, 1.15526536f, 0.66461298f, 0.67490541f, 0.23892474f, -0.12861693f, -0.33635752f, -0.52286346f, -0.56868795f, -0.86695874f, -0.88842939f, -0.86631615f, -0.80495760f, -0.73812023f, -0.64956301f, + -0.46329214f, 0.55823622f, 0.34966614f, -0.14855330f, -0.35757896f, -0.52459469f, -0.85251369f, -0.95064429f, -0.99468342f, -0.76192580f, -0.41419015f, 0.12436151f, 0.64925405f, 1.13684199f, 1.33630964f, 1.31330685f, + 0.86356450f, 0.34381018f, -0.02085849f, 1.83539444f, 2.32518759f, 1.67398143f, 1.25867313f, 1.20615444f, 0.52697956f, -0.09144588f, -0.76159106f, -1.51187022f, -1.92351238f, -1.95050372f, -1.91438733f, -1.85957587f, + 1.24350337f, 2.40332737f, 1.88241131f, 1.35749721f, -0.42200494f, -1.44428015f, -1.39178301f, -0.93577948f, -0.61036359f, -0.51298915f, -0.79745508f, 0.00259692f, 0.20231677f, -0.31281818f, -0.31072767f, -0.35345154f, + -1.27391584f, 0.23665237f, 1.44085187f, 2.06602253f, 1.71605896f, 0.13376293f, -0.37509412f, 0.40922525f, 0.84118074f, 0.94717998f, -0.77859633f, -1.07717911f, -1.15385313f, -1.14774662f, -0.82654451f, -1.15800495f, + 1.30848084f, 0.08937934f, -0.37852967f, -0.65194579f, -0.75067573f, -0.79649158f, -0.77379985f, -0.60797455f, -0.51295495f, -0.32714998f, -0.08812522f, 0.24492207f, 0.48331843f, 0.72894883f, 0.89967800f, 1.13292004f, + -1.59837663f, -0.80221740f, -0.23176726f, 0.53351299f, 0.66646844f, 0.70631763f, 0.72180374f, 0.68847102f, 0.63073539f, 0.46683184f, 0.29870291f, 0.24285644f, -0.04345483f, -0.36903735f, -0.77735195f, -1.13349493f, + -3.27008180f, -3.34427840f, -3.19628867f, -2.98677397f, -2.40944350f, -1.63513906f, -1.40569428f, -0.88190894f, -0.25273952f, 0.84351501f, 1.96278949f, 2.92570176f, 3.17223429f, 3.47899460f, 3.70716828f, 3.29194486f, + 2.58466208f, 2.01534437f, 1.28252767f, 0.44865967f, -0.33100837f, -0.81011259f, -1.06701187f, -1.12743988f, -1.21505758f, -0.99337144f, -0.66853937f, -0.46093443f, -0.22132067f, 0.00996599f, 0.24481197f, 0.30882455f, + -0.62864502f, 1.04984327f, 1.56877053f, 0.77975000f, 0.01037804f, 0.92352492f, 1.12297462f, 0.76284403f, -0.16106015f, -0.21398417f, -0.62673537f, -1.68917053f, -1.60748063f, -0.79116243f, -0.06290217f, -0.43694470f +}; +const float ivas_sns_cdbk_tcx20_stage2[ 64 * 16 ] = { + -0.14487037f, 0.32346300f, 0.29798679f, -0.52393127f, -0.25671033f, 0.85717754f, -0.09030235f, -0.41110330f, -0.32938564f, -0.36580017f, -0.13142117f, -0.06404494f, 0.10671000f, 0.18731030f, 0.26606878f, 0.27885301f, + 0.52707061f, 0.35016312f, 0.54090507f, 0.82023896f, 0.46675870f, -0.60012182f, -0.76783382f, -0.39198749f, -0.17916696f, -0.17307722f, -0.10507731f, -0.09327542f, -0.12176361f, -0.12715624f, -0.11980175f, -0.02587481f, + -0.71420988f, -0.65927011f, -0.35007906f, -0.01478187f, 0.15375095f, 0.11149616f, 0.08819131f, 0.11537168f, 0.18041243f, 0.28846009f, 0.61920238f, 0.78709602f, 0.49945852f, -0.03863360f, -0.42339912f, -0.64306599f, + -0.81717379f, 0.06122156f, 0.05823003f, 0.10166328f, 0.27940347f, 0.24198679f, 0.13036228f, 0.07594383f, 0.21865219f, 0.19571948f, 0.11860502f, 0.04836758f, -0.03211315f, -0.14926357f, -0.23274285f, -0.29886216f, + -0.68529960f, -0.60305257f, -0.55080408f, -0.31252031f, 0.02732556f, 0.58303818f, 0.67638004f, 0.45008305f, 0.44400610f, 0.24064307f, 0.01598330f, -0.02342002f, -0.05864021f, -0.08903495f, -0.06326312f, -0.05142446f, + 0.89939472f, 0.31232066f, -0.27153630f, -0.52911639f, -0.58173141f, -0.63610440f, -0.61689761f, -0.43424024f, -0.23705022f, -0.00031150f, 0.15363335f, 0.19705513f, 0.25413198f, 0.35648787f, 0.53897823f, 0.59498626f, + 0.29798691f, 0.08114488f, 0.25286730f, -0.14155021f, -0.55163298f, -0.91534601f, -0.57551866f, 0.56064647f, 0.80731933f, -0.19474923f, -0.20126966f, 0.06517040f, 0.06866947f, 0.09059095f, 0.13444783f, 0.22122305f, + -0.19554741f, -1.08027678f, -0.01182563f, 0.56474090f, 0.41996725f, 0.08237738f, 0.08022205f, 0.10168343f, 0.06794579f, -0.08037661f, -0.20594204f, -0.13493371f, -0.05614077f, 0.03317273f, 0.14216415f, 0.27276933f, + -0.23050462f, -0.75246507f, -0.69868854f, -0.48346371f, -0.40917848f, -0.36594095f, -0.07600729f, 0.12198463f, 0.35806061f, 0.42664099f, 0.36253664f, 0.28721164f, 0.28501428f, 0.31580309f, 0.39290382f, 0.46609294f, + -0.67820482f, -0.00872112f, 0.40025028f, 0.70327670f, 0.42493234f, -0.57698003f, -0.97061329f, -0.62910745f, -0.24969320f, -0.09521511f, 0.04433478f, 0.16549806f, 0.17050527f, 0.26401941f, 0.52200672f, 0.51371134f, + 1.15515222f, -0.29885937f, -0.45759359f, -0.16519237f, -0.04117621f, -0.07252194f, -0.02430911f, -0.04766781f, -0.02328497f, -0.05048145f, -0.05153410f, -0.06528098f, -0.04522347f, -0.01163017f, 0.03517569f, 0.16442759f, + 1.26308471f, 0.47631737f, 0.20702857f, 0.04885555f, 0.01820924f, -0.04929548f, -0.00848071f, -0.02414509f, -0.04549576f, -0.16589601f, -0.22069993f, -0.30533811f, -0.30611208f, -0.31300078f, -0.32636395f, -0.24866742f, + -0.64451248f, -0.26649107f, 0.11640199f, 0.09050698f, -0.25875099f, -0.58989672f, -0.18201608f, 0.56293201f, 0.69520096f, 0.55973258f, 0.03137457f, -0.53909145f, -0.42689946f, 0.14106379f, 0.40632407f, 0.30412130f, + 0.15140746f, 0.14125954f, -0.08456824f, -0.13219101f, 0.06042009f, 0.33575532f, 0.35779441f, 0.19239547f, -0.11511443f, -0.41291307f, -0.06796502f, 0.62883409f, 0.54647417f, -0.03056743f, -0.64102233f, -0.92999908f, + -0.20214866f, 0.33358969f, 0.69126333f, 0.34454972f, 0.05105591f, 0.16949466f, 0.15791728f, -0.06633089f, -0.02155995f, 0.20242418f, 0.31712646f, 0.04823767f, -0.30694375f, -0.55917643f, -0.61612875f, -0.54337052f, + 0.11822897f, -0.04039421f, 0.70914148f, 0.55687588f, 0.06691609f, -0.01671241f, 0.38831368f, 0.48498674f, 0.23982281f, -0.11333950f, -0.44950589f, -0.59143612f, -0.55439378f, -0.42178388f, -0.28206333f, -0.09465644f, + -0.14336086f, 0.05638831f, -0.01441642f, -0.42382782f, -0.38698654f, 0.24817171f, 0.77752198f, 0.25906019f, -0.48986881f, -0.97798705f, -0.62796677f, 0.10790457f, 0.39301453f, 0.49075265f, 0.45648021f, 0.27511976f, + 0.57860103f, -0.01948333f, -0.01550826f, 0.52219942f, 0.68939814f, 0.35139876f, -0.01666617f, -0.21673535f, -0.47658403f, -0.68042929f, -0.65034996f, -0.34910948f, -0.19976833f, -0.03318456f, 0.13815711f, 0.37806438f, + 0.37246276f, -0.08878862f, -0.58662283f, -0.58539914f, -0.25552364f, 0.03268078f, 0.23525090f, 0.52779846f, 0.89804404f, 0.85582758f, 0.41881201f, -0.00512611f, -0.24135956f, -0.44973199f, -0.57601809f, -0.55230687f, + -0.32189259f, -0.20721675f, -0.09742343f, -0.05501794f, -0.02597120f, -0.10341441f, -0.07152803f, 0.00321003f, 0.14348106f, 0.13459909f, 0.13417173f, 0.08360042f, 0.09862647f, 0.09372765f, 0.07551569f, 0.11553216f, + 0.23782332f, 0.49257946f, 0.16314649f, -0.21082378f, -0.15908458f, 0.19948076f, 0.80829724f, 0.74048420f, 0.31470714f, -0.11736674f, -0.41702302f, -0.38958905f, -0.30642209f, -0.41287171f, -0.48993898f, -0.45339847f, + -0.64636094f, -0.04385833f, 0.14399510f, -0.43842603f, -0.73607781f, -0.26594508f, 0.62882301f, 0.35001150f, 0.28828962f, 0.02070640f, 0.04274640f, 0.10066767f, 0.01277906f, 0.02855391f, 0.23224313f, 0.28185233f, + 0.47046627f, 0.94887935f, 0.24713839f, -0.23737461f, -0.23876072f, -0.07439994f, -0.09495447f, -0.13384673f, -0.10919962f, 0.11561096f, 0.34750397f, 0.22863541f, -0.07880257f, -0.39830725f, -0.49574485f, -0.49684374f, + -0.40909559f, -0.18655327f, 0.13106838f, 0.38799987f, 0.49861722f, 0.83281701f, 0.69114756f, 0.20069371f, -0.12792677f, -0.35587040f, -0.42614275f, -0.34440943f, -0.28876141f, -0.27425834f, -0.22103645f, -0.10828931f, + -1.18999475f, -0.19958884f, -0.14983643f, 0.01470880f, -0.02795637f, -0.14641321f, -0.31784893f, -0.46245588f, -0.18208072f, 0.19701783f, 0.59261157f, 0.51921614f, 0.35016513f, 0.38054069f, 0.38692917f, 0.23498570f, + 0.09958109f, -0.26177154f, -0.09010091f, 0.31898761f, 0.75461690f, 0.12276914f, -0.81281416f, -0.78184322f, -0.24358470f, 0.82758568f, 0.36579631f, -0.14176577f, -0.08975069f, -0.12652615f, 0.12350150f, -0.06468093f, + 0.08899403f, -0.19355344f, -0.19424186f, -0.07670148f, -0.01129831f, -0.12185644f, -0.22497393f, -0.43014230f, -0.38336267f, -0.26093033f, -0.06975312f, 0.14762185f, 0.34014822f, 0.41134546f, 0.45027987f, 0.52842445f, + 0.21499436f, 0.50168679f, 0.45504898f, 0.25411634f, -0.47901658f, -0.45717782f, -0.14093183f, 0.17265389f, 0.11115764f, -0.41915721f, -0.31922857f, 0.22345448f, 0.48226916f, 0.07143490f, -0.26830399f, -0.40300051f, + 0.12687524f, 0.05171471f, -0.07690770f, 0.26252085f, 0.27712144f, 0.23952572f, 0.03309903f, 0.01500629f, 0.06484326f, 0.06571283f, -0.16817282f, -0.63246792f, -0.98935090f, -0.44804742f, 0.39837118f, 0.78015619f, + -0.27518648f, -0.48420415f, -0.24141667f, 0.57134912f, 0.65714603f, 0.42293616f, -0.10408493f, -0.38791089f, -0.61076554f, -0.57292363f, -0.09457207f, 0.54285737f, 0.61562883f, 0.23132651f, -0.13569709f, -0.13448269f, + -0.44830103f, 0.90540056f, 0.00072142f, -0.39226111f, -0.46186317f, -0.43645456f, -0.37826714f, -0.24360826f, -0.04123674f, 0.14260549f, 0.22801709f, 0.22668095f, 0.21516528f, 0.17002730f, 0.24853909f, 0.26483493f, + 0.82582984f, -0.18396730f, -0.69977925f, -0.51672827f, 0.33935958f, 1.15275754f, 0.74107352f, 0.01951258f, -0.25558033f, -0.43304939f, -0.34099848f, -0.20947442f, -0.14398117f, -0.10182217f, -0.18238069f, -0.01077166f, + -0.05956926f, -0.06776164f, 0.03443600f, -0.24779379f, -0.39446507f, 0.19355305f, 0.85153169f, -0.02976018f, -0.70253585f, 0.23290277f, 0.42513902f, -0.02301892f, -0.00892405f, -0.00056059f, -0.02586520f, -0.17730813f, + -0.10475355f, -0.12240226f, 0.23596905f, 0.84034179f, 1.10352903f, -0.04380181f, -0.55005573f, -0.07517667f, 0.38548284f, 0.23177362f, -0.44010180f, -0.37858708f, -0.16160512f, -0.18482124f, -0.37409253f, -0.36169852f, + -0.66969186f, 0.05371874f, -0.03936352f, -0.29928720f, -0.41624260f, -0.41299981f, -0.08577629f, 0.31675281f, 0.52331795f, 0.62411866f, 0.60734652f, 0.31853824f, 0.22382100f, -0.00426635f, -0.24809569f, -0.49189053f, + 0.42558925f, -0.08740923f, -0.12413315f, 0.07160194f, 0.21621681f, 0.18737853f, 0.20692231f, 0.06594840f, 0.06316038f, -0.01455973f, -0.09736051f, -0.19278266f, -0.20576965f, -0.20479396f, -0.19511934f, -0.11488934f, + 0.36293062f, -0.57831316f, -0.52476107f, -0.18291608f, 0.05956296f, 0.17827873f, 0.56052629f, 0.90619512f, 0.33375509f, -0.31016948f, -0.35518802f, -0.18057272f, -0.07051228f, -0.11858827f, -0.10671145f, 0.02648366f, + -0.47233802f, -0.10696118f, -0.17385597f, -0.31283671f, -0.54242892f, -0.48720345f, -0.41705631f, -0.17742297f, 0.04283104f, -0.05195671f, -0.10468624f, -0.03852503f, 0.06812391f, 0.59475499f, 1.17499043f, 1.00457125f, + 0.33658160f, 0.35011487f, 0.45187233f, -0.02492518f, -0.55350758f, -0.59303580f, -0.31109052f, 0.13779098f, 0.55888251f, 0.84708841f, 0.47270673f, -0.43127783f, -0.54032183f, -0.34904867f, -0.17752966f, -0.17430036f, + 0.44845114f, -0.49717161f, -0.47780018f, 0.51116217f, 0.25239415f, -0.46774617f, -0.37660723f, -0.11699702f, 0.09542037f, -0.01250943f, 0.20050057f, 0.40176439f, 0.32380431f, 0.15297561f, -0.14232876f, -0.29531216f, + 0.58997624f, 0.33423174f, -0.49272429f, -0.77991590f, -0.63691990f, -0.16375248f, 0.20892044f, 0.18843065f, 0.17599488f, 0.14061586f, 0.15322675f, 0.18367503f, 0.13457790f, 0.01264192f, -0.03498125f, -0.01399761f, + 0.11883889f, -0.17653462f, -0.07102121f, -0.16170325f, -0.31396815f, -0.45007863f, -0.66549732f, -0.56194237f, -0.04368741f, 0.74826150f, 1.05944395f, 0.45896665f, 0.13555009f, 0.05510292f, 0.02009383f, -0.15182464f, + 0.07240272f, -0.58533213f, -0.60637060f, -0.30890106f, -0.02128210f, 0.09681284f, 0.16938452f, 0.09862013f, 0.19046479f, 0.19100352f, 0.26416808f, 0.26993362f, 0.23648423f, 0.09763257f, -0.04637479f, -0.11864633f, + 1.00841842f, 0.48487093f, -0.06341281f, -0.08270476f, 0.05744570f, 0.01750478f, -0.34725114f, -0.56805040f, -0.46574885f, -0.30005483f, -0.09520550f, 0.06924440f, 0.18895007f, 0.12019539f, -0.01497133f, -0.00923003f, + -0.11951983f, -0.09981565f, -0.02725746f, -0.30082482f, 0.20230754f, 0.13666509f, -0.43246623f, 0.35244293f, 0.18119722f, 1.02992782f, -0.88125774f, 0.02331986f, 0.31122766f, -0.27229286f, 0.03194423f, -0.13559793f, + 0.30038871f, 0.08947897f, -0.39317595f, -0.46247446f, -0.42411556f, -0.42404287f, -0.31600225f, -0.23970776f, -0.22563637f, -0.14999339f, 0.24040805f, 0.88216954f, 0.90562440f, 0.49896646f, -0.00532430f, -0.27656328f, + -1.03852817f, -0.43685628f, 0.97570249f, 0.40073542f, -0.16567993f, -0.21536660f, 0.12504130f, 0.05185039f, 0.10097880f, 0.11493671f, 0.11604106f, 0.09278894f, 0.06924125f, -0.04393053f, -0.08352009f, -0.06343456f, + 0.63612744f, 0.65518210f, 0.45922163f, 0.32046049f, 0.42927283f, 0.43905062f, 0.21015594f, -0.14220340f, -0.37678678f, -0.46507109f, -0.45569496f, -0.37686899f, -0.32849396f, -0.33044372f, -0.35635326f, -0.31755504f, + 0.41636915f, 0.62005731f, 0.06636205f, -0.59228655f, 0.33311937f, 0.75787668f, 0.00941011f, -0.45161756f, -0.65103077f, -1.10958672f, -1.02188609f, -0.67703448f, 0.33622739f, 1.61684726f, 0.14432118f, 0.20285196f, + -0.54161629f, 0.29651460f, 0.48390239f, 0.54479388f, 0.45539891f, 0.27213590f, -0.06343843f, -0.24873747f, -0.31972562f, -0.38332671f, -0.30589718f, -0.21560606f, -0.11351916f, -0.04853252f, 0.04142231f, 0.14623145f, + -0.21538006f, -0.50670918f, -0.02385513f, 0.35315677f, 0.10824776f, 0.03860134f, 0.48712274f, 0.49283326f, 0.39503514f, 0.30292369f, 0.35920722f, 0.11075640f, -0.28306221f, -0.52442456f, -0.56662428f, -0.52782887f, + 0.24246654f, 0.15496835f, 0.07742345f, -0.00816546f, -0.02214009f, -0.12207666f, -0.09321134f, -0.14020839f, -0.02096415f, 0.02403039f, -0.00227972f, -0.07257466f, -0.06385085f, -0.03120190f, -0.01017645f, 0.08796095f, + 0.55718201f, 0.39817200f, 0.01585643f, -0.42726280f, -0.49946467f, -0.23926890f, 0.12647764f, 0.16539668f, -0.09322228f, -0.28903514f, -0.36248464f, -0.37621498f, -0.21830881f, 0.12546719f, 0.47757747f, 0.63913280f, + 0.07202509f, -0.30917825f, 0.26796130f, 0.18122649f, -0.74238320f, -0.65070972f, 0.20487278f, -0.03910861f, -0.13788223f, -0.13927704f, 0.30951126f, 0.22564689f, 0.18217460f, 0.23128586f, 0.20552209f, 0.13831273f, + 0.81154454f, 0.16848402f, -0.17973760f, -0.10712113f, -0.08562767f, -0.33154566f, -0.24733460f, -0.19259111f, 0.09705231f, 0.36926093f, 0.39058223f, 0.34681425f, 0.16685070f, -0.13716590f, -0.45775544f, -0.61170978f, + -1.33280729f, -0.16122649f, -0.09275794f, 0.58345947f, 0.61239977f, 0.50766167f, 0.06032890f, 0.13414746f, 0.18885722f, 0.13865434f, 0.23772269f, -0.25267260f, -0.54709895f, -0.31230173f, 0.07737009f, 0.15826345f, + -1.08561454f, -0.71787872f, -0.33522393f, 0.09636394f, 0.26521236f, 0.37639836f, 0.31311513f, 0.09537412f, -0.07885832f, -0.23990515f, -0.16502660f, 0.10895014f, 0.26463981f, 0.29732376f, 0.35578048f, 0.44934924f, + -0.29274363f, 0.08361693f, 0.01766194f, -0.22807328f, -0.16950675f, 0.28608384f, 0.00299181f, 0.07025513f, -0.20633117f, 0.48438844f, 0.91263549f, 0.04231580f, -0.66916627f, -0.44689801f, 0.06041835f, 0.05235140f, + 0.18067823f, -0.43833102f, -0.91255750f, -0.38799121f, 0.28155095f, 0.40506215f, 0.07352559f, -0.10582149f, -0.13688260f, -0.20626464f, -0.13280234f, -0.02533342f, 0.03247104f, 0.20876704f, 0.46466759f, 0.69926172f, + 0.51511088f, 0.81421556f, 0.82445640f, 0.01131859f, -0.32041051f, -0.39839079f, -0.43152495f, -0.42594915f, -0.41684800f, -0.38010709f, -0.25091606f, -0.15334343f, -0.03594408f, 0.06862608f, 0.21814936f, 0.36155722f, + -0.74835512f, -0.03907167f, -0.02730968f, 0.01017743f, 0.06598847f, 0.36210429f, 0.29611340f, 0.34006521f, 0.09628113f, -0.15142368f, -0.62878543f, -0.79996695f, -0.45331571f, 0.20593004f, 0.80186308f, 0.66970511f, + -0.25432502f, 0.38418428f, 0.43145928f, 0.30498956f, 0.19189249f, -0.25021553f, -0.53882666f, -0.61584834f, -0.43654724f, -0.03402395f, 0.45760398f, 0.60327277f, 0.53610474f, 0.16098234f, -0.30297334f, -0.63772932f, + -0.42321919f, 0.85086362f, 0.60159420f, 0.08633772f, -0.28445894f, -0.22512885f, 0.23909004f, 0.20046697f, 0.01484137f, -0.11652413f, -0.12017169f, -0.26922922f, -0.26311675f, -0.18921524f, -0.06712212f, -0.03500777f, + 0.58209071f, -0.26533411f, -0.20240535f, 0.27577532f, 0.65478295f, 0.66491349f, 0.41026256f, 0.22123940f, 0.15813271f, 0.07048989f, -0.03133192f, -0.19389440f, -0.34519672f, -0.53017394f, -0.73238212f, -0.73696843f +}; +const float ivas_sns_cdbk_tcx20_stage3[ 32 * 16 ] = { + -0.08443224f, -0.18703635f, -0.02297765f, 0.35108322f, -0.47365404f, 0.60080101f, -0.14560352f, 0.01413276f, 0.01222370f, 0.01369841f, 0.05509108f, 0.03233707f, 0.01187713f, -0.08225931f, -0.08910713f, -0.00617424f, + -0.45134081f, -0.18205893f, -0.21886586f, -0.27082278f, -0.18872267f, -0.08438255f, 0.11808124f, 0.11472340f, 0.08049694f, 0.05868671f, 0.08856118f, 0.10686811f, 0.14792971f, 0.16522330f, 0.21823435f, 0.29738868f, + -0.11328915f, 0.10130429f, -0.14943437f, 0.15645630f, 0.63935450f, 0.37821704f, -0.21310801f, -0.24867988f, -0.01659672f, 0.03328198f, -0.08180066f, -0.05657044f, 0.10906149f, 0.03196869f, -0.22137928f, -0.34878580f, + 0.05458665f, -0.05919364f, -0.13460386f, 0.10683925f, 0.02486665f, -0.03996090f, -0.07800776f, -0.00646458f, -0.21155480f, -0.27387617f, 0.02240932f, 0.70908553f, -0.66258796f, -0.11916859f, 0.46104817f, 0.20658280f, + -0.18236160f, -0.42556974f, -0.01518583f, 0.40249814f, 0.16028064f, -0.31751965f, -0.32775039f, -0.07115151f, 0.14131570f, 0.25092515f, 0.30150209f, 0.11921413f, 0.03049898f, 0.00963513f, -0.00838672f, -0.06794450f, + 0.43233298f, 0.11411029f, -0.14415844f, -0.34176452f, -0.41588457f, -0.29962161f, 0.10637969f, 0.23407196f, 0.10305969f, -0.00062410f, 0.02900924f, 0.03866877f, 0.08640844f, 0.05154612f, 0.00161694f, 0.00484903f, + -0.21512794f, 0.25425865f, 0.27105566f, -0.05213586f, -0.05906940f, -0.26548344f, -0.44413633f, 0.03920286f, 0.46845996f, 0.41236263f, -0.31903770f, -0.32961136f, 0.22647316f, 0.19335126f, -0.03700087f, -0.14356117f, + 0.21924285f, -0.02083234f, -0.21264229f, -0.32008443f, 0.85787441f, -0.31109029f, -0.11710511f, 0.15258065f, -0.05422604f, 0.04703640f, 0.03138786f, 0.00284139f, -0.14128648f, -0.12246651f, -0.12553053f, 0.11430042f, + -0.06983219f, 0.15566395f, 0.00257636f, -0.43107600f, -0.19146497f, 0.19866667f, 0.23130140f, -0.15042179f, -0.31509935f, -0.19492938f, 0.13173040f, 0.34976123f, 0.35522809f, 0.15128504f, -0.03897684f, -0.18441264f, + 0.03835343f, -0.41781092f, -0.09130119f, 0.23649600f, 0.31864720f, 0.31965077f, 0.31997092f, 0.09379415f, -0.07805132f, -0.17350540f, -0.16066354f, -0.15534991f, -0.10595695f, -0.07769963f, -0.06267573f, -0.00389790f, + -0.06072967f, -0.08529762f, -0.25895528f, -0.11410745f, -0.03994694f, 0.00520744f, 0.13029546f, 0.20924505f, 0.20033325f, 0.00128218f, -0.48912530f, -0.29001748f, 0.59798769f, 0.57708579f, -0.00334114f, -0.37991599f, + 0.67709987f, 0.24479940f, 0.09839041f, 0.09240624f, 0.04874621f, -0.07903978f, -0.10677716f, -0.20070119f, -0.12618873f, -0.06680438f, -0.05551493f, -0.11559282f, -0.11011740f, -0.12021879f, -0.12904082f, -0.05144612f, + -0.24390844f, -0.02971498f, 0.26491058f, 0.32477805f, 0.15268137f, -0.03230336f, -0.09305650f, -0.07114758f, -0.26964124f, -0.44939594f, -0.31245133f, 0.05828219f, 0.30712838f, 0.31280972f, 0.10713241f, -0.02610336f, + 0.19735739f, -0.09060264f, 0.00825537f, -0.36599055f, 0.05585799f, 0.37908316f, -0.38413173f, 0.35027949f, 0.34555851f, -0.34241207f, -0.18091006f, 0.16295794f, 0.08399265f, -0.12258257f, -0.08886776f, -0.00784505f, + 0.18552089f, -0.05448505f, -0.06090343f, 0.28995307f, -0.00222442f, -0.38233148f, -0.18031475f, 0.21268787f, 0.02073848f, -0.18932508f, -0.18523794f, -0.18812600f, -0.12671694f, 0.01228197f, 0.22055935f, 0.42792350f, + 0.12799222f, 0.22968936f, 0.03802711f, -0.14099927f, -0.08635323f, 0.16987494f, 0.35348472f, 0.04505467f, -0.26388915f, -0.34916901f, -0.22942166f, -0.17684250f, -0.08724829f, -0.00054213f, 0.12610262f, 0.24423959f, + -0.08038187f, -0.16879152f, -0.00176772f, 0.35376535f, -0.37011098f, -0.36320739f, 0.66636341f, -0.06773157f, -0.07814045f, -0.04765960f, -0.03365673f, 0.02181851f, 0.03254002f, 0.03483427f, 0.02717800f, 0.07494827f, + -0.34868864f, 0.17040333f, 0.25260784f, 0.10076787f, 0.06839398f, -0.02800665f, -0.06848675f, -0.16826923f, -0.07268923f, 0.01087754f, 0.05460110f, 0.00431011f, 0.03885215f, 0.00975901f, -0.01527130f, -0.00916121f, + 0.18571700f, 0.08336153f, 0.02979922f, -0.39409904f, -0.12098272f, 0.43026379f, -0.26722488f, -0.41282119f, 0.02970150f, 0.49897713f, 0.10843837f, -0.24094187f, -0.08115504f, 0.00006204f, 0.10433840f, 0.04656578f, + 0.00538329f, -0.07750994f, -0.10910098f, 0.04048538f, 0.03334399f, 0.28342260f, 0.14581840f, -0.24746813f, -0.34416074f, 0.06151045f, 0.68745611f, 0.19063398f, -0.23771814f, -0.28316033f, -0.12688702f, -0.02204889f, + -0.60521242f, -0.06124017f, 0.11564466f, 0.07475615f, 0.11824730f, 0.14189819f, 0.27204580f, 0.27978428f, 0.25196977f, 0.13866750f, 0.00205101f, -0.10150602f, -0.11644945f, -0.18929950f, -0.17648802f, -0.14486907f, + 0.06856566f, -0.13844197f, -0.26691240f, -0.18845012f, -0.05126065f, 0.00304429f, 0.11414309f, 0.06950182f, 0.19286717f, 0.29037166f, 0.27053650f, 0.17652627f, 0.09171994f, -0.09001258f, -0.24528745f, -0.29691120f, + -0.13004111f, 0.35130055f, 0.29363124f, -0.18853208f, -0.39468716f, -0.19791109f, -0.04383464f, 0.00894901f, 0.12616722f, 0.23070746f, 0.26441755f, 0.01948829f, -0.23089364f, -0.30363455f, -0.02382649f, 0.21869951f, + 0.11164215f, 0.03116967f, -0.06353187f, 0.16924336f, -0.01461062f, -0.19152070f, 0.03686445f, 0.20477538f, -0.03967336f, -0.32744743f, -0.17088429f, 0.63829176f, 0.35280729f, -0.43549735f, -0.27277762f, -0.02885087f, + -0.30725406f, 0.74701729f, -0.39274145f, 0.04302180f, 0.07483049f, -0.03413902f, 0.09344659f, 0.09169015f, 0.04345559f, -0.04477331f, -0.00176985f, -0.03585142f, -0.03405962f, -0.07575575f, -0.09739054f, -0.06972689f, + 0.28265268f, -0.39222951f, -0.42695953f, -0.10897533f, 0.07424889f, 0.08797478f, 0.00908971f, -0.13637855f, -0.12075776f, -0.04977985f, 0.06395383f, 0.09442120f, 0.15174794f, 0.13939497f, 0.13041070f, 0.20118587f, + -0.06637296f, 0.10778732f, -0.07433513f, -0.03524749f, -0.17212396f, -0.11995773f, 0.04291853f, -0.06480863f, -0.07793575f, 0.16559639f, 0.16476497f, -0.45667097f, -0.18714125f, 0.71725922f, 0.42534599f, -0.36907862f, + 0.15419735f, 0.13519411f, 0.37767798f, 0.23431801f, -0.02281061f, -0.05079690f, 0.14170781f, 0.09854410f, 0.01337290f, -0.01979078f, -0.01296254f, -0.03126860f, -0.07566643f, -0.16863998f, -0.32784959f, -0.44522679f, + -0.24074183f, 0.08320241f, 0.21818929f, 0.23760260f, 0.19352113f, 0.17458723f, -0.14563963f, -0.24861723f, -0.22656746f, -0.05362363f, 0.00368164f, -0.25389215f, -0.34172497f, -0.16702059f, 0.23332537f, 0.53371777f, + 0.03933551f, -0.61436501f, 0.74997308f, -0.14605678f, -0.06355008f, -0.07845237f, 0.03677743f, -0.01381658f, 0.03542562f, 0.01940321f, 0.04277388f, 0.01439240f, 0.05417023f, -0.03165523f, -0.04388511f, -0.00047013f, + 0.19660049f, -0.03582845f, -0.21224511f, -0.09633821f, 0.02140122f, 0.06690902f, 0.14753796f, 0.23491232f, 0.40075372f, 0.33318442f, -0.21453422f, -0.44835823f, -0.31995723f, -0.14770359f, -0.02720588f, 0.10087175f, + 0.22313452f, 0.23174662f, 0.13588360f, -0.01979092f, -0.17483898f, -0.36387601f, -0.35104947f, -0.34545228f, -0.17072761f, 0.01654692f, 0.12560464f, 0.14070090f, 0.18025650f, 0.13082045f, 0.10588357f, 0.13515746f +}; +const float ivas_sns_cdbk_tcx20_stage4[ 32 * 16 ] = { + -0.01178932f, -0.08216325f, 0.00009975f, 0.07861932f, 0.10639093f, 0.10607783f, -0.11972309f, 0.01910820f, -0.05635505f, 0.02765448f, -0.08840101f, -0.09623400f, 0.34917350f, -0.19835894f, -0.46938213f, 0.43528268f, + -0.08636054f, 0.13923351f, -0.15932705f, -0.10849641f, -0.02303533f, -0.23968519f, -0.02192257f, 0.50128910f, 0.27139459f, -0.07262939f, -0.06622134f, -0.01073419f, -0.04308095f, -0.05629457f, -0.03175020f, 0.00762044f, + 0.24815560f, 0.14657944f, 0.07172491f, 0.02302382f, 0.01991109f, -0.10204469f, -0.24960876f, -0.07085594f, 0.12223419f, 0.06999865f, 0.10986748f, 0.13492392f, 0.05865008f, -0.10366906f, -0.23987720f, -0.23901358f, + -0.15438243f, -0.04559005f, 0.16760111f, 0.26289859f, 0.24002732f, 0.06333052f, -0.04293731f, 0.16191749f, 0.12993586f, -0.15916904f, -0.24049436f, -0.13688115f, -0.13764233f, -0.11140102f, -0.01899323f, 0.02178000f, + -0.09362153f, -0.06475772f, -0.01949932f, -0.04249530f, -0.05109865f, 0.07410551f, -0.01006480f, 0.04753318f, -0.02781557f, 0.07745214f, 0.06146913f, -0.16546467f, -0.41512457f, 0.10097607f, 0.66727071f, -0.13886467f, + -0.07368760f, 0.36035427f, 0.21605884f, -0.01438276f, -0.11360433f, -0.05644934f, 0.03063785f, -0.05006328f, -0.07521149f, -0.13595728f, -0.01277458f, 0.04492285f, 0.01200858f, -0.04176021f, -0.04570247f, -0.04438907f, + 0.09516185f, -0.01929782f, 0.00494854f, -0.09763747f, -0.07344490f, 0.12994610f, 0.48094184f, -0.48192847f, -0.05573409f, 0.26426544f, -0.27655157f, -0.08642901f, 0.08435032f, 0.13304512f, -0.05782422f, -0.04381160f, + -0.09313450f, 0.05540574f, 0.01201341f, -0.06726039f, -0.10451812f, 0.02669040f, -0.05484815f, 0.07449424f, -0.34344135f, 0.56109258f, -0.27428709f, -0.09301413f, 0.41965904f, -0.13902794f, 0.18473846f, -0.16456202f, + 0.08693855f, 0.01453042f, -0.11107078f, 0.06241724f, 0.10204906f, -0.07064796f, -0.13846291f, 0.08293345f, -0.10757619f, -0.22863306f, 0.03213009f, 0.19644778f, 0.16452805f, 0.34110370f, 0.09006750f, -0.51675482f, + -0.18423905f, 0.01384230f, 0.26714303f, -0.40934167f, 0.39275996f, -0.01237613f, -0.25919307f, -0.08619564f, -0.04046283f, -0.01126873f, -0.01664395f, 0.01744563f, 0.10282249f, 0.09607820f, 0.04998616f, 0.07964328f, + -0.02274322f, 0.17908332f, -0.02788687f, 0.00807798f, -0.14435131f, -0.02676761f, 0.10369709f, -0.23851723f, 0.57714821f, -0.24897036f, -0.18048434f, 0.02001729f, -0.12740088f, -0.09982727f, 0.00840552f, 0.22051971f, + 0.13771932f, -0.17471600f, 0.18563016f, 0.18284665f, 0.11307352f, 0.20075992f, -0.03584593f, -0.25044388f, -0.20529947f, -0.11730357f, 0.05388263f, 0.08544750f, 0.04416102f, -0.02585125f, -0.09278592f, -0.10127474f, + 0.08834726f, 0.11313223f, -0.16483942f, -0.28318232f, -0.23943962f, -0.10440104f, -0.03978272f, -0.07375089f, -0.00562577f, 0.02329676f, 0.14600550f, 0.17681015f, 0.14410817f, 0.09264978f, 0.05695417f, 0.06971767f, + 0.14265864f, -0.42999794f, -0.17884255f, -0.08097949f, -0.04680661f, -0.04620171f, 0.02411542f, 0.04266824f, 0.15894248f, 0.24773695f, 0.15192868f, -0.01414995f, -0.13102813f, -0.07567236f, 0.04332535f, 0.19230306f, + -0.21142675f, -0.18455704f, -0.13706857f, -0.09760966f, -0.00844340f, 0.14865602f, 0.20607338f, 0.12012844f, -0.00914924f, -0.14368559f, -0.00265126f, 0.10043210f, 0.09154737f, 0.03443178f, 0.02422327f, 0.06909914f, + 0.18450361f, 0.00435351f, 0.27864126f, 0.17704943f, -0.20479796f, -0.29862599f, -0.17089168f, -0.09881143f, 0.04783000f, 0.14260548f, -0.02349078f, -0.20487241f, -0.13745683f, 0.05546335f, 0.10019847f, 0.14830206f, + 0.10317471f, -0.16998911f, 0.09734737f, 0.06796242f, -0.01161580f, -0.18371589f, -0.08936939f, 0.07107444f, -0.09565406f, -0.23557438f, 0.42834066f, 0.31175412f, -0.11511657f, -0.28572113f, -0.06889545f, 0.17599802f, + 0.11312034f, 0.08666296f, 0.02086535f, 0.12656018f, -0.12520471f, 0.04702581f, 0.39113807f, 0.09775371f, -0.00094471f, 0.08191930f, 0.07626151f, -0.13554986f, -0.29383511f, -0.25857022f, -0.15738811f, -0.06981449f, + 0.07590872f, 0.10290609f, -0.14618577f, 0.13491216f, 0.33869686f, -0.04072549f, -0.30046897f, -0.07243681f, 0.07180300f, 0.23060158f, 0.21642544f, -0.13575731f, -0.31781641f, -0.19431392f, -0.02233810f, 0.05878895f, + -0.11105764f, -0.05437616f, -0.00379085f, 0.08951467f, 0.39169243f, -0.38233560f, 0.34492699f, -0.09947370f, -0.08648526f, -0.03340088f, -0.02593483f, 0.11572014f, 0.01899877f, -0.03965890f, -0.06421047f, -0.06012863f, + -0.01630162f, 0.17784241f, -0.29989778f, 0.10469439f, 0.14861228f, -0.00722859f, -0.10711587f, -0.18435390f, -0.22539717f, -0.21441284f, 0.00336383f, 0.04362196f, 0.03914130f, 0.10650815f, 0.16959322f, 0.26133027f, + -0.45700261f, 0.07282251f, 0.00944859f, 0.03968330f, -0.02457975f, 0.11148291f, -0.02109853f, -0.18417192f, 0.02503845f, 0.10733751f, 0.21565042f, 0.09727523f, 0.00466877f, -0.01572810f, -0.00245341f, 0.02162664f, + 0.01471341f, -0.09796256f, 0.37685840f, -0.27373841f, -0.22809280f, 0.20207443f, 0.12508033f, 0.16172866f, 0.15442152f, -0.03971152f, -0.03731565f, 0.04320052f, -0.02493079f, -0.08894232f, -0.13155708f, -0.15582618f, + -0.04063466f, 0.14873431f, 0.10076527f, -0.09442471f, 0.02133939f, -0.04747602f, 0.02176493f, 0.52606315f, -0.60183613f, -0.05056878f, 0.18858100f, -0.00936749f, -0.17007143f, -0.00822640f, 0.01473704f, 0.00062041f, + -0.01851982f, 0.07661957f, -0.30452796f, 0.64817852f, -0.21819667f, -0.15094971f, -0.02014064f, 0.04976562f, 0.03988913f, 0.00229505f, -0.01596447f, -0.00497683f, 0.01888521f, 0.00912230f, -0.04741494f, -0.06406442f, + -0.18646693f, -0.25658854f, 0.20567339f, 0.06671960f, -0.24836724f, -0.23737029f, 0.03275858f, 0.09293590f, 0.06861982f, 0.01487215f, 0.10808605f, 0.17546010f, 0.16832370f, 0.12557457f, -0.00949461f, -0.12073619f, + -0.08559046f, -0.16350668f, -0.28729498f, 0.01179878f, 0.06195939f, 0.06121501f, -0.29667937f, -0.19145944f, 0.41150010f, 0.18707789f, -0.21406932f, 0.19248440f, 0.16889573f, 0.10825101f, 0.07412737f, -0.03870938f, + 0.00652202f, -0.15316918f, 0.25343593f, -0.09299964f, -0.22861167f, 0.06865193f, 0.02064443f, -0.10488496f, -0.18017250f, -0.21898191f, -0.08742146f, 0.02608617f, 0.05046582f, 0.08687786f, 0.21515984f, 0.33839723f, + 0.12533507f, 0.27191291f, 0.06056226f, -0.10872799f, 0.01799135f, 0.17589055f, -0.05514906f, -0.01148984f, 0.01373578f, -0.08944541f, -0.35717808f, -0.38014180f, 0.05531840f, 0.30742910f, 0.08016039f, -0.10620357f, + -0.01190022f, -0.24441497f, -0.07461266f, 0.02317252f, 0.05704737f, 0.16442883f, 0.06955004f, 0.05748732f, 0.05251523f, 0.22879327f, 0.21860705f, -0.37376474f, 0.03987437f, 0.33071525f, -0.23228300f, -0.30521565f, + -0.00581916f, 0.24592784f, -0.27266538f, -0.28914327f, 0.09129356f, 0.42079957f, 0.05815983f, 0.01136363f, 0.03980200f, -0.04215296f, 0.01465284f, 0.03859289f, -0.13354970f, -0.16935580f, -0.05814064f, 0.05023468f, + 0.44241891f, -0.06885632f, -0.14130761f, -0.04771012f, -0.00863562f, 0.00586591f, 0.12381405f, 0.08059256f, -0.06764947f, -0.22513354f, -0.10536820f, 0.02669478f, 0.01147300f, -0.01584685f, -0.02845628f, 0.01810479f +}; + +const float *const ivas_sns_cdbks_tcx20[SNS_MSVQ_NSTAGES_TCX20] = { ivas_sns_cdbk_tcx20_stage1, ivas_sns_cdbk_tcx20_stage2, ivas_sns_cdbk_tcx20_stage3, ivas_sns_cdbk_tcx20_stage4 }; + +const float ivas_sns_means_tcx20[M] = { + 0.9155f , 1.2408f , 1.0050f , 0.5846f, + 0.2472f , 0.1902f , 0.0984f , 0.1039f, + -0.0139f , -0.0856f , -0.4157f , -0.6148f, + -0.7026f , -0.7216f , -0.8052f , -1.0262f +}; + +const int16_t ivas_sns_cdbks_tcx10_levels[SNS_MSVQ_NSTAGES_TCX10] = { 128, 32, 8 }; +const int16_t ivas_sns_cdbks_tcx10_bits[SNS_MSVQ_NSTAGES_TCX10] = { 7, 5, 3 }; + +const float ivas_sns_cdbk_tcx10_stage1[ 128 * 16 ] = { + 0.06343891f, -0.00651786f, -0.56994713f, -0.98772396f, -1.35099293f, -1.24848646f, -1.20301995f, -0.81089507f, -0.06563095f, 1.11147581f, 1.73933309f, 1.65859611f, 1.26237806f, 0.68028141f, 0.12449909f, -0.39678907f, + -1.34007175f, -1.50272189f, -2.07958791f, -2.38322761f, -2.22156614f, -1.96435669f, -1.68760863f, -1.23664935f, -0.28772180f, 0.87765579f, 1.83822720f, 1.95281398f, 2.33671266f, 2.76119687f, 2.75790597f, 2.17899850f, + -0.51450332f, 0.69692757f, 1.90898730f, 1.89179379f, 1.41350404f, 0.03604267f, 0.02251128f, -1.04270018f, -0.97981089f, -0.36225564f, 0.14171617f, -0.32050715f, -0.56272675f, -0.38710633f, -0.74842203f, -1.19345103f, + 0.61027733f, -0.25705654f, -0.30960961f, 0.11651829f, 0.08424358f, -0.04474594f, -0.21961636f, -0.26522327f, -0.31681379f, -0.23903185f, -0.07879718f, 0.00383111f, 0.09522293f, 0.15157026f, 0.24747985f, 0.42175137f, + 0.06215930f, 0.74417332f, -0.05737044f, -0.84302341f, -0.79474372f, -0.48758880f, 0.00597663f, 0.39113473f, 0.94133689f, 1.03804127f, 0.53832521f, -0.22235026f, -0.44306288f, -0.22065599f, -0.22880587f, -0.42354568f, + -1.79298887f, -1.27561542f, -0.40453013f, 0.23597108f, 1.02842032f, 1.26211371f, 0.67302878f, 0.34945977f, 0.47749022f, 0.37809966f, 0.32913783f, 0.24544337f, -0.10938763f, -0.26555659f, -0.53889493f, -0.59219154f, + 1.13009762f, 0.63132036f, 0.20308733f, 0.12539517f, -0.05215684f, -0.59255734f, -0.72324525f, -0.47416068f, -0.34730473f, -0.17547668f, -0.01869868f, -0.01336213f, -0.03177292f, -0.01470495f, 0.12726970f, 0.22627027f, + 0.77990892f, 0.11720033f, -0.36217078f, -0.11533103f, -0.09211988f, -0.10379850f, 0.04466728f, 0.23851356f, 0.32838480f, 0.57072608f, 0.78005115f, 0.64032724f, 0.04609407f, -0.53665387f, -1.07338898f, -1.26240993f, + 0.71007500f, 1.67092184f, 0.87004285f, -0.47652190f, -0.41457815f, 1.09228787f, 1.43629613f, 1.29941339f, 0.74914490f, -0.87973861f, -1.00898687f, -0.76690679f, -0.87310138f, -0.89762148f, -1.11083002f, -1.39989674f, + 0.93106313f, -0.58060200f, -1.42018765f, -1.93078113f, -1.40332079f, -1.01406592f, -0.68270775f, -0.12421160f, -0.12818640f, 0.46306788f, 0.74384671f, 1.78170251f, 1.49298768f, 0.36128067f, 0.32905160f, 1.18106291f, + -0.34612942f, -0.05241863f, 0.63278953f, 1.64696186f, 1.83789559f, 1.82381570f, 1.71656555f, 1.45437140f, 1.06980287f, 0.39137818f, -0.16457688f, -0.79497784f, -1.78896933f, -2.38820658f, -2.55386733f, -2.48443600f, + -1.86975241f, -1.08195483f, -0.57202727f, -0.39808906f, -0.40936508f, 0.09703771f, 0.81017115f, 0.38629167f, 0.19481800f, 0.19706778f, -0.03872708f, -0.18683058f, 0.37148725f, 0.91055817f, 0.85929760f, 0.73001606f, + 0.13134993f, -0.43834896f, -0.42233235f, -0.34270675f, -0.42348478f, -0.62064185f, -0.67185252f, -0.57602218f, -0.46183286f, -0.05757593f, 0.38429775f, 0.63679540f, 0.59933007f, 0.44800121f, 0.69922041f, 1.11580320f, + -3.26282616f, -2.43458949f, -1.60312382f, -1.18490625f, -0.63841390f, -0.06739227f, 0.57790279f, 1.01010243f, 0.95682720f, 0.75035821f, 0.76084039f, 0.55166704f, 0.83933875f, 1.36392702f, 1.32925064f, 1.05103737f, + 2.94202112f, 3.01169534f, 2.23272878f, 2.33910012f, 1.97620433f, 1.92572769f, -0.00413067f, -1.30712114f, -1.48714461f, -1.62849896f, -1.56921600f, -1.60110814f, -1.73339679f, -1.81275951f, -1.69381023f, -1.59029306f, + -2.29630904f, -1.61967905f, -0.50968315f, 0.70826746f, 1.31943393f, 1.58078613f, 1.31857322f, 0.52237224f, 0.09330352f, 0.13994471f, 0.02623813f, -0.21467602f, -0.33140340f, -0.32793129f, -0.24016399f, -0.16907333f, + 1.17007844f, 1.46542856f, 1.12327460f, 0.78468376f, 0.28858044f, -0.24345469f, -0.36619581f, -0.30604001f, -0.24486928f, -0.39076408f, -0.42628982f, -0.47126418f, -0.48974406f, -0.58899141f, -0.61209496f, -0.69233731f, + 1.07869290f, -1.09624499f, -1.92296142f, -2.03260639f, -0.72727691f, 0.59938120f, 1.09296276f, -0.23244761f, -0.74213456f, -0.00394467f, 0.65433789f, 0.15922442f, 0.10516506f, 0.08483738f, 1.10833114f, 1.87468404f, + -0.45930662f, 0.49568081f, 0.92195224f, 1.70200988f, 1.24720421f, 1.19845895f, 0.75959352f, 0.23323360f, -0.27099240f, -1.38259199f, -2.25979609f, -0.92875900f, -0.06647214f, -0.58552485f, -0.33254823f, -0.27214292f, + -0.34979667f, 0.75395625f, 0.28769469f, -0.85592098f, -0.65167816f, 0.61099639f, 0.60402617f, 0.14561560f, -0.35073645f, -0.56010271f, -0.46661447f, -0.33527423f, -0.00166125f, 0.46634881f, 0.62977271f, 0.07337395f, + -0.41325825f, -0.71696540f, -0.72218212f, -0.64886200f, -0.33204525f, -0.13777071f, -0.05902665f, 0.08826462f, 0.09668422f, 0.34870144f, 0.76742933f, 1.02820877f, 0.66254418f, 0.26837143f, -0.04920095f, -0.18089312f, + -3.00863529f, -3.40420466f, -1.94263495f, -0.42577604f, 1.34874808f, 1.22039392f, -0.16945247f, -0.55999693f, 0.06330206f, 1.23795253f, 0.30477631f, 0.53425336f, 1.62154688f, 1.44462099f, 0.96061888f, 0.77448714f, + 1.81574209f, 1.72942805f, 0.78817895f, 0.12550764f, -0.50423190f, -0.81032090f, -0.83940826f, -0.95575724f, -0.70482913f, -0.32127670f, -0.08073867f, -0.13170408f, -0.16649118f, -0.08610719f, -0.03381103f, 0.17581953f, + -0.84693001f, -0.20800644f, 0.25371425f, 0.56604831f, 0.68467374f, 0.74501557f, 0.69436428f, 0.53975035f, 0.44393852f, 0.30580817f, 0.06566139f, -0.27742827f, -0.57148395f, -0.67328070f, -0.81658998f, -0.90525565f, + -0.44018762f, 0.22712975f, 1.11402502f, 1.98499541f, 1.52065113f, 0.79057891f, 0.55313940f, 0.32776632f, 0.39113088f, 0.10707747f, -0.20138118f, -0.67412788f, -1.34113027f, -1.39661518f, -1.43118002f, -1.53187281f, + -0.71632657f, -0.79492959f, -1.11328698f, -1.41494496f, -1.48929785f, -1.40383584f, -1.26657215f, -1.11367689f, -0.76426307f, 0.01056535f, 0.85354567f, 1.27473730f, 1.64108006f, 2.08311127f, 2.27822947f, 1.93586484f, + 2.05008554f, 2.18328135f, 1.98567996f, 2.35703511f, 2.27653310f, 2.41056123f, 1.36801069f, 0.12761937f, -0.59913124f, -1.45799255f, -1.89092221f, -1.99613693f, -2.20251841f, -2.33272106f, -2.21702011f, -2.06236397f, + -0.88997509f, -0.45675689f, 0.38059457f, 0.51582524f, 0.11775375f, -0.01509768f, -0.18542670f, -0.33776632f, -0.39018689f, -0.33129536f, -0.13149667f, 0.00113524f, 0.03060501f, 0.32190251f, 0.62848970f, 0.74169479f, + 1.19033790f, 0.59193623f, -0.18758267f, -0.71960274f, -0.81756997f, -0.65024529f, -0.64463404f, -0.82612299f, -0.84513928f, -0.45206413f, -0.04059069f, 0.00434486f, 0.50165507f, 1.00958611f, 0.97568033f, 0.91001135f, + -2.25864394f, -2.18529992f, -1.67272884f, -1.18053068f, -0.96703519f, -0.83661833f, -0.59641534f, -0.08623307f, 0.57868270f, 1.39398557f, 2.00205076f, 1.91429603f, 1.37348845f, 1.02732012f, 0.88340938f, 0.61027091f, + 1.13384373f, 2.01444926f, 1.64076134f, 0.39967630f, 0.11211256f, 0.60599786f, 0.41069653f, -0.08528479f, -0.18299306f, -0.80418851f, -1.03743576f, -1.04941914f, -0.88831874f, -0.76292972f, -0.67716107f, -0.82980704f, + -1.17168042f, -0.44794963f, 0.01219570f, -0.09679638f, 0.01681223f, 0.42983884f, 0.69873962f, 1.14025903f, 1.28455301f, 0.60046712f, -0.18327995f, -0.56883208f, -0.60793720f, -0.38487681f, -0.31833900f, -0.40317432f, + 0.85846316f, 0.89573242f, -0.03759975f, -0.56845446f, -0.63431292f, -0.69230128f, -0.59890012f, -0.27699442f, -0.10781577f, 0.38926803f, 0.44176667f, 0.74409936f, 0.51508281f, -0.44324047f, -0.56579214f, 0.08099815f, + -3.15663729f, -3.79941004f, -3.31993311f, -2.54887019f, -1.08297819f, 1.57490155f, 2.29511481f, 2.21386433f, 2.04448334f, 1.39028095f, 1.22351492f, 1.20294900f, 1.33557966f, 1.22044095f, 0.22504752f, -0.81835038f, + 2.10765319f, 2.66375515f, 1.73697111f, 0.50664812f, -0.22472176f, -0.63409486f, -0.65405139f, -0.71248479f, -0.73053296f, -0.87990271f, -0.82710167f, -0.73244187f, -0.64629112f, -0.47294253f, -0.23431056f, -0.26615160f, + -0.03257826f, 0.53214066f, -0.00109639f, -0.42211164f, -0.51464982f, -0.59747387f, -0.63145473f, -0.49761105f, -0.36163571f, 0.00923799f, 0.32394200f, 0.34648466f, 0.32420111f, 0.44177392f, 0.52684150f, 0.55398991f, + 0.38342101f, 0.05503415f, -0.69210895f, -1.40291256f, -1.20627913f, -0.22810180f, 0.91689677f, 1.67212414f, 1.26349034f, 0.48698570f, 0.10567292f, 0.13423949f, -0.02515828f, -0.41152165f, -0.51320898f, -0.53857267f, + -2.82653388f, -3.73292024f, -3.01554952f, 0.33800837f, 1.63071077f, 3.70049918f, 1.52548217f, -0.51327972f, -0.09119392f, 0.92240352f, 2.33190356f, 1.84268123f, -0.37179294f, -0.94969237f, -1.13179438f, 0.34106773f, + 1.56686851f, 0.88339322f, 0.31264631f, -0.04528796f, -0.42838354f, -0.20342114f, 0.40102389f, 0.54537791f, 0.35383369f, -0.18334298f, -0.75234358f, -0.76217615f, -0.36188398f, -0.46147282f, -0.54662536f, -0.31820590f, + 1.24862641f, 0.57117898f, 0.32856394f, 0.39564440f, 0.31824468f, 0.20893064f, 0.02628416f, -0.15359328f, -0.37616872f, -0.26748355f, -0.12954661f, -0.12215355f, -0.31835718f, -0.55834118f, -0.61233860f, -0.55948996f, + -0.59446013f, 0.48100057f, 1.20941553f, 0.41887505f, 0.63264306f, 1.37297652f, 1.40760513f, 0.91551762f, 0.67322895f, -0.90761879f, -1.23123057f, -0.97622159f, -0.96118737f, -0.53857839f, -0.69473239f, -1.20723297f, + -0.59728936f, -1.63533369f, -2.00769344f, -1.93041740f, -1.52949359f, -0.77428525f, -0.21146300f, 0.18478098f, 0.44962772f, 0.95017605f, 1.24326918f, 1.36658626f, 1.25105966f, 1.00442735f, 1.03660313f, 1.19944572f, + 0.32910504f, 1.16199966f, 2.05499236f, 2.56854877f, 2.45081012f, 1.66017811f, 1.01838813f, 0.51773322f, -0.06505376f, -1.14261830f, -1.77930778f, -1.94467446f, -1.83142606f, -1.76577923f, -1.67433287f, -1.55856482f, + -2.64386625f, -1.44973884f, -0.70503582f, -0.39387129f, -0.07345342f, 0.04530383f, 0.12054861f, 0.18110856f, 0.21747675f, 0.44785123f, 0.60100453f, 0.60149054f, 0.48165166f, 0.67654040f, 0.91879547f, 0.97419414f, + 0.52841759f, -0.23803980f, -0.77847320f, -1.06415798f, -1.29095335f, -0.94613842f, 0.01856631f, 0.57516289f, 0.58685158f, 0.24351075f, -0.23807950f, -0.16772309f, 0.27674343f, 0.40698887f, 0.73162063f, 1.35570347f, + -2.57939825f, -1.65066455f, -0.80960514f, -0.40285025f, -0.02550543f, 0.48071345f, 0.90391140f, 1.61193038f, 1.46090124f, 0.72305123f, 0.34664153f, 0.08297581f, -0.07460306f, 0.06306698f, -0.00946438f, -0.12110157f, + 1.93616583f, 2.87229439f, 2.28910932f, 1.18636717f, 0.28185288f, 0.08337698f, 0.52019726f, -0.70876138f, -1.13139506f, -1.42927692f, -1.07719650f, -0.84569529f, -1.10761102f, -1.14612879f, -0.78606400f, -0.93723475f, + -0.83260061f, -1.02726632f, -0.72610655f, 0.18186308f, 0.34897446f, 0.12845730f, 0.04139028f, 0.52688618f, 0.69166145f, 0.76853602f, 0.83316573f, 0.74702270f, 0.29499833f, -0.33104569f, -0.74851736f, -0.89741947f, + 2.77837874f, 1.31099865f, 0.62870774f, 0.35471489f, 0.05642577f, -0.02869061f, 0.19231930f, 0.50340721f, 0.36258783f, -0.06924684f, -0.52796695f, -0.75396481f, -0.89969036f, -1.23296254f, -1.40215690f, -1.27286039f, + -2.03034497f, -1.73876167f, -1.42952672f, -1.24259095f, -0.92252541f, -0.61137126f, -0.50926746f, -0.37515247f, -0.01804868f, 0.44616051f, 0.86247078f, 1.09558380f, 1.34244283f, 1.77606518f, 1.80302809f, 1.55183866f, + -0.13073542f, 0.74480506f, 1.75612393f, 1.94677409f, 1.45854395f, 0.14973385f, 0.41257896f, 0.78276795f, 0.53033406f, -0.97322979f, -1.31039960f, -1.18457724f, -1.39195239f, -0.74765434f, -0.89874803f, -1.14436551f, + -0.34864040f, 0.37594126f, 1.12760599f, 0.69668388f, 0.42042319f, 0.18779444f, -0.10969643f, -0.21695083f, -0.15889803f, -0.31866683f, -0.31049579f, -0.24646351f, -0.37724204f, -0.33366480f, -0.20076896f, -0.18696143f, + -0.21183487f, 0.60232151f, 0.88716970f, 0.69703105f, 0.10878166f, -0.60737034f, -0.81172315f, -0.92047926f, -0.64811892f, -0.24324457f, 0.15840527f, 0.21438269f, 0.31129327f, 0.53391758f, 0.13740501f, -0.20793704f, + -4.29885487f, -4.07150539f, -2.63799263f, -0.36599561f, 1.44131158f, 1.45858072f, -0.19422385f, -1.06386090f, -0.33862479f, 1.91691551f, 0.64172657f, 0.73115700f, 2.00475202f, 1.65789788f, 1.59229150f, 1.52642575f, + 2.70538594f, 1.21062684f, 0.58857880f, 0.37060452f, 0.32021415f, 0.15108056f, -0.18531087f, -0.47434646f, -0.64590620f, -0.70151444f, -0.68058335f, -0.63299041f, -0.53628956f, -0.62363375f, -0.52279857f, -0.34311771f, + -1.21504940f, -0.39554896f, 0.66755826f, 1.39859234f, 1.07486796f, 1.12290637f, 1.04295204f, 1.14165077f, 1.23441664f, 0.53720217f, -1.08842200f, -1.71470800f, -1.43192570f, -1.01274229f, -0.48508172f, -0.87666906f, + 0.79744189f, 0.76166108f, 0.24454768f, -0.10831092f, 0.07052421f, 0.61249105f, 1.01239329f, 0.92265182f, 0.79053239f, 0.48135056f, 0.14383439f, -0.46575922f, -0.96925167f, -1.31622221f, -1.46252773f, -1.51535724f, + 0.81612871f, -1.33697557f, -1.87521893f, -0.34596308f, 1.89973642f, 0.17905631f, -0.58156390f, -1.21825474f, -1.35128034f, -0.86896364f, -0.55987250f, -0.57592082f, -0.20226923f, 0.35191711f, 1.77194975f, 3.89749413f, + 1.63600586f, 1.88172004f, 2.47282363f, 2.31646225f, 1.68082996f, 0.43732883f, 0.54619537f, 0.53604274f, -0.42499034f, -1.38097531f, -1.67316581f, -1.66333999f, -1.66730967f, -1.61301407f, -1.62366867f, -1.46094527f, + -1.13086259f, -0.59286092f, -0.77851750f, -1.03233519f, -1.00728739f, -0.89574050f, -0.77142682f, -0.49554543f, -0.07881573f, 0.54315382f, 0.97530238f, 1.12272839f, 0.97460042f, 0.97504778f, 1.10466703f, 1.08789246f, + 2.01814493f, 0.44413768f, -0.35041288f, -0.98686383f, -1.26200527f, -1.52732432f, -1.48571248f, -1.19925108f, -0.92116223f, -0.35166881f, 0.13444272f, 0.18334560f, 0.92894956f, 1.08294765f, 1.35106569f, 1.94136698f, + -1.70233870f, -1.07878027f, -0.41699769f, -0.44160483f, -0.44460656f, -0.07853597f, -0.00754784f, 0.33653711f, 1.01426686f, 1.48915964f, 0.89682530f, 0.27439080f, 0.11875833f, 0.11843921f, 0.03694301f, -0.11490828f, + 2.92061289f, 2.48313078f, 1.67219449f, 1.01289511f, 0.89753859f, 0.94593326f, 0.70215728f, 0.23868842f, -0.29061326f, -1.00973596f, -1.40595256f, -1.63034802f, -1.68974684f, -1.71427450f, -1.62221007f, -1.51026992f, + -0.53491548f, -0.78055602f, -0.76775254f, 0.10333314f, 0.89464100f, 1.39260245f, 1.42278905f, 1.08133696f, 0.66191720f, 0.26667076f, 0.06990779f, -0.05792125f, -0.54825802f, -0.97098851f, -1.11014442f, -1.12266153f, + 0.08434699f, -0.45396949f, -0.94011771f, -1.20989965f, -1.27570370f, -1.00735662f, -0.43812010f, 0.32116477f, 0.90682311f, 1.07490930f, 1.04265682f, 0.83531254f, 0.64508330f, 0.31821119f, 0.09966431f, -0.00300507f, + -3.45239663f, -3.47846075f, -3.31323927f, -2.90259299f, -2.36355887f, -1.50192157f, -0.92288952f, -0.22530010f, 0.43258717f, 1.44935400f, 2.42148671f, 2.40769873f, 2.68306011f, 3.17878912f, 2.96783805f, 2.61954501f, + 0.48284645f, 1.41799541f, 1.97243102f, 1.59009976f, 1.22294070f, 0.43320660f, -0.04294311f, -0.31344005f, -0.66525145f, -1.13038241f, -1.07639821f, -0.88736938f, -0.84264379f, -0.79497080f, -0.64026957f, -0.72585115f, + -0.53516472f, -0.76920408f, -0.88526173f, -0.38845075f, -0.11227754f, 0.13805981f, 0.30967527f, 0.39937585f, 0.29135651f, 0.31552367f, 0.32154879f, 0.11114380f, 0.10183365f, 0.23587895f, 0.26513073f, 0.20083182f, + -0.82074713f, 0.00036242f, 0.05382877f, -0.93967714f, -1.34393534f, -0.63769734f, 0.72309703f, 0.71909478f, 0.67996995f, 0.71025231f, 0.03684615f, -0.42385779f, 0.20909277f, 0.74865506f, 0.36478854f, -0.08007303f, + -3.48156475f, -2.62401860f, -1.04625145f, 0.48561624f, 1.08462887f, 1.17430353f, 0.89095108f, 0.61098007f, 0.50455996f, 0.68603781f, 0.79217569f, 0.58623668f, 0.26474313f, 0.08681209f, -0.00104191f, -0.01416800f, + 0.84688039f, 0.96543736f, 0.75181222f, 0.42822852f, 0.24904957f, 0.14177234f, -0.40028407f, -0.85658294f, -0.99971434f, -0.98122097f, -0.75656716f, -0.49934498f, -0.24276416f, 0.09868884f, 0.51868958f, 0.73591908f, + -0.06813618f, -0.46119843f, -0.30096714f, 0.02701580f, 0.39106072f, 0.62007470f, 0.37968778f, 0.26617731f, 0.19689970f, 0.13864013f, 0.13523990f, 0.07059597f, -0.06298216f, -0.21734863f, -0.46878891f, -0.64597009f, + 0.51769554f, 1.42736951f, 1.88530137f, 0.81872770f, 0.32102451f, 1.12825115f, 1.21494458f, 1.01472394f, 0.70810844f, -0.50467729f, -1.98880367f, -2.08711611f, -1.72264586f, -0.93580475f, -0.50571272f, -1.29138527f, + 0.60536537f, -0.70354528f, -1.21617652f, -1.24262631f, -1.19828977f, -1.12565262f, -1.02203112f, -0.75894521f, -0.36826442f, 0.22795933f, 0.70544758f, 0.89015550f, 1.16228260f, 1.29703247f, 1.33542695f, 1.41186140f, + 1.04571798f, 1.61006483f, 1.19302962f, 0.57809989f, 0.71546259f, 1.30149630f, 1.62036473f, 1.44726990f, 1.32882491f, 0.70680094f, -0.39181833f, -1.57019972f, -2.33882246f, -2.53038720f, -2.43836110f, -2.27754281f, + -1.70543716f, -1.02771491f, -0.55943640f, -0.54366014f, 0.38503076f, 1.17876631f, 0.37193454f, -0.12189347f, 0.01303672f, -0.31900986f, -0.63608524f, -0.16956145f, 0.42659413f, 0.80300802f, 1.20767125f, 0.69675704f, + 1.23368326f, -0.17372473f, -0.75359852f, -0.99565343f, -0.84904797f, -0.66289765f, -0.45993622f, -0.17721316f, 0.04972474f, 0.35539595f, 0.55580381f, 0.47907626f, 0.35782172f, 0.37623101f, 0.34327632f, 0.32105845f, + -2.18352213f, -1.61901373f, -1.19957932f, -1.19527760f, -1.04950866f, -0.80750101f, -0.01092868f, 0.85242547f, 1.12490981f, 0.83609667f, 0.69994996f, 0.68985497f, 0.89390672f, 1.14712210f, 1.06776086f, 0.75330468f, + 2.33432113f, 2.91068592f, 2.96537876f, 2.14989074f, 1.35332201f, -0.15166191f, -0.61009155f, -1.11607408f, -1.38841709f, -1.32795548f, -1.18652766f, -1.19841345f, -1.27066378f, -1.28720326f, -1.20653804f, -0.97005218f, + -1.23488338f, -0.82668707f, -0.18190692f, 0.80577567f, 1.40765006f, 1.57572199f, 0.77649472f, 0.06817818f, -0.35316133f, -0.31163295f, -0.22814807f, -0.08516639f, -0.14974413f, -0.40747307f, -0.44196718f, -0.41305033f, + 1.49614141f, 2.17073361f, 1.21828130f, 0.24082715f, -0.04653730f, -0.02674890f, 0.07730547f, -0.75552212f, -0.53247648f, 0.68923075f, 0.51413502f, -1.15304142f, -1.36047405f, -1.08476009f, -0.71333064f, -0.73376398f, + -0.89704242f, -1.73833976f, -1.54624918f, -0.75197415f, -0.28436966f, -0.17513881f, -0.18327761f, -0.08090335f, 0.17526730f, 0.62711579f, 0.87938919f, 0.73687059f, 0.73766468f, 0.77613800f, 0.76077200f, 0.96407748f, + -0.74442989f, 0.06393849f, 0.79593747f, 2.27945407f, 2.65112193f, 2.16937280f, 1.04534068f, 0.40390110f, -0.66651353f, -1.35166042f, -1.46612345f, -0.64581600f, -0.65681647f, -1.60629861f, -1.31557834f, -0.95583049f, + 1.36402643f, 1.80223774f, 0.69837068f, -0.49496040f, -0.78242114f, -0.27168915f, 0.02445085f, -0.20866271f, -0.30035706f, -0.41170635f, -0.35841577f, -0.34242299f, -0.28692410f, -0.02094657f, -0.05934480f, -0.35123483f, + -1.08520561f, -0.84120058f, -0.40604501f, -0.30838475f, -0.39817946f, -0.45244145f, -0.46460261f, -0.31407296f, -0.03689281f, 0.38084328f, 0.75874597f, 0.64589942f, 0.68713572f, 0.85059140f, 0.70295555f, 0.28085506f, + -3.41901495f, -4.05624120f, -2.77833774f, -0.25403214f, 1.87889428f, 1.49402114f, -0.04104013f, -0.12322346f, 0.66403332f, 2.05218773f, 0.76725378f, 0.75987949f, 1.64445951f, 1.18046450f, 0.23904189f, -0.00834539f, + 2.34563559f, 1.85433514f, 0.92188091f, 0.00938003f, -0.66632165f, -1.24128642f, -1.45925477f, -1.45794931f, -1.45009658f, -1.08637380f, -0.53948104f, -0.13215543f, 0.79501605f, 0.54741060f, 0.55538134f, 1.00387907f, + 0.18830608f, 0.82743615f, 0.71353361f, 0.08375013f, 0.72945362f, 1.56781385f, 0.82203061f, -0.15761113f, -1.14514559f, -0.94404839f, -0.45524505f, -0.03539938f, -0.38522988f, -0.55123197f, -0.43254198f, -0.82587158f, + 0.28717168f, 1.26620628f, 1.79284485f, 0.74811924f, 0.75340319f, 0.55244948f, 0.46108770f, 0.62189892f, 0.63524206f, -0.36020964f, -0.49840190f, -0.49783437f, -1.24630499f, -1.48121128f, -1.52882801f, -1.50563245f, + 0.77651863f, -0.09801613f, -0.65368548f, -1.42314584f, -1.95826046f, -2.20248886f, -1.97940063f, -1.63600078f, -1.05805019f, -0.03308653f, 1.18890487f, 1.59425997f, 1.56951997f, 1.72023665f, 1.99206238f, 2.20063258f, + 1.86036810f, 1.95524352f, 1.65802754f, 0.51762484f, 0.32278641f, 1.41534130f, 1.58480385f, 1.00644422f, -0.43304110f, -1.52615221f, -1.54409319f, -1.50951389f, -1.44095494f, -1.33336688f, -1.41459830f, -1.11891940f, + -0.48994782f, -0.25738925f, -0.03744629f, -0.08936731f, -0.21819055f, -0.21749988f, -0.57009207f, -0.68163031f, -0.77904329f, -0.92638722f, -0.49253451f, -0.11015934f, 0.49328977f, 1.25069491f, 1.61419932f, 1.51150480f, + 2.17925129f, 0.65744215f, -0.14102877f, -0.68226531f, -0.86240255f, -0.96233313f, -0.77240075f, -0.60150667f, -0.43620670f, -0.12974041f, 0.06940761f, 0.29313968f, 0.32005914f, 0.04484663f, 0.20342365f, 0.82031433f, + -2.73276927f, -1.95293295f, -1.25302447f, -1.26607638f, -1.03464322f, -0.41097672f, 0.11299908f, 0.61306244f, 1.35234054f, 1.98785456f, 1.65758988f, 0.94482039f, 0.67093436f, 0.60201696f, 0.38959545f, 0.31920903f, + 1.99599002f, 1.78113188f, 1.60094449f, 1.49585133f, 1.05949606f, 0.38027999f, -0.00956917f, -0.37696778f, -0.58734884f, -0.88374264f, -1.14734587f, -1.24114441f, -1.17843206f, -1.09199503f, -0.92371805f, -0.87342960f, + -1.37903570f, -0.79248227f, 0.13536234f, 0.47656459f, 0.43589978f, 0.88461367f, 1.02738581f, 0.55354663f, 0.25049941f, -0.28501314f, -0.80941419f, -0.81019030f, -0.45648923f, 0.11389766f, 0.39621982f, 0.25863532f, + 2.10361489f, 0.37593562f, -0.16944555f, -0.32212923f, -0.22241176f, -0.24351656f, -0.27375398f, 0.02762124f, 0.11073362f, 0.23273069f, 0.27063497f, 0.08607178f, -0.19792432f, -0.48410706f, -0.59195084f, -0.70210352f, + -3.28081022f, -2.84286219f, -2.41405615f, -2.18965898f, -1.85813828f, -1.04835079f, -0.44771380f, 0.59206456f, 1.50301948f, 2.07448941f, 2.16550955f, 1.89856464f, 1.75678779f, 1.60095964f, 1.36941840f, 1.12077632f, + 1.20650745f, 1.87107653f, 1.86883453f, 1.42456949f, 0.48789223f, -0.72412798f, -1.11112426f, -1.49029508f, -1.30798779f, -1.39394685f, -1.21186297f, -0.51923241f, 0.01995250f, 0.34176002f, 0.40195072f, 0.13603383f, + 1.27785134f, 0.88553037f, 0.16900733f, -0.27809430f, -1.01525323f, -1.49395836f, -1.43232130f, -1.19784251f, -0.74210861f, -0.08619940f, 0.47709237f, 0.55331864f, 0.84110624f, 0.88279667f, 0.58250791f, 0.57656718f, + 0.33221429f, 1.11386403f, 0.75316099f, -0.54031614f, -1.07863165f, -0.21932249f, 1.22065947f, 1.15034668f, 1.03141160f, -0.31201434f, -1.38480174f, -0.81360834f, -0.27523041f, 0.24071536f, -0.19254386f, -1.02590322f, + -1.49213877f, -2.62687029f, -1.76800978f, 0.37484393f, 2.24342021f, 1.70797214f, 0.00785579f, -0.16576749f, 0.40170467f, 1.53774796f, 0.29192482f, 0.32972463f, 0.96040034f, 0.07052406f, -0.75744205f, -1.11588939f, + 1.68310221f, 0.62723214f, -0.21848789f, -0.50907306f, -0.77679516f, -0.86027718f, -0.37120564f, 0.20445818f, 0.27312526f, -0.13982446f, -0.56141448f, -0.66669228f, 0.06397763f, 0.19621457f, 0.32877219f, 0.72688794f, + 0.71839263f, 0.21641507f, 0.34358239f, 1.05799089f, 1.05814284f, 0.52787967f, 0.14046002f, 0.11966559f, 0.07361240f, -0.17447064f, -0.37909417f, -0.61722985f, -0.71730019f, -0.79744166f, -0.77133987f, -0.79926472f, + -0.02890014f, 0.92802997f, 1.03744813f, 0.32870919f, 0.07886022f, 0.63362031f, 0.46497182f, 0.14157700f, -0.03057580f, -0.54785692f, -1.11970728f, -1.36023434f, -0.91731394f, 0.07493639f, 0.47210281f, -0.15566707f, + -0.69638941f, -0.91666102f, -1.56178072f, -1.95501706f, -1.82786692f, -1.74880889f, -1.34684465f, 0.11048340f, 1.37545972f, 1.36714659f, 1.44286472f, 1.29857548f, 1.10826459f, 1.56371080f, 1.18624590f, 0.60061806f, + -0.68066861f, 0.38195183f, 1.51822296f, 2.21510524f, 2.33189221f, 1.97513513f, 1.15635207f, 1.51498823f, 1.49065161f, -0.27868821f, -1.78208773f, -2.20070549f, -2.26038069f, -2.05737950f, -1.59696081f, -1.72742716f, + -2.17324712f, -1.42748120f, -0.47105336f, 0.06399853f, -0.10139724f, -0.33208523f, -0.36226578f, -0.45684329f, -0.45421750f, -0.02950979f, 0.57908509f, 0.82823657f, 0.84044612f, 0.96336259f, 1.18058199f, 1.35238916f, + 0.30637595f, -0.07750454f, -0.01603143f, -0.03845729f, -0.46768884f, -0.33028351f, 0.33893858f, 0.66006523f, 0.64603598f, 0.25681503f, -0.24604284f, -0.37133227f, -0.20588021f, -0.28072164f, -0.22555667f, 0.05126849f, + -1.81904207f, -1.97008939f, -1.38138723f, -0.56721565f, 0.08439254f, 0.50012417f, 0.41461731f, 0.70946239f, 0.65844196f, 0.50418711f, 0.67016347f, 0.85608609f, 0.63818532f, 0.38340644f, 0.22816114f, 0.09050718f, + 3.82551321f, 3.02994002f, 1.79732057f, 1.05862951f, 0.33021546f, 0.01969982f, -0.57482284f, -1.10367492f, -1.21202781f, -1.06293594f, -0.97966329f, -1.01767532f, -1.10340104f, -1.13918652f, -1.02503523f, -0.84289579f, + -2.06530906f, -1.02138773f, 0.19121847f, 0.64135688f, 0.47353945f, 0.29125589f, 0.17346435f, 0.09846354f, 0.14173379f, 0.44108119f, 0.42909595f, 0.13671490f, -0.09429711f, 0.06651142f, 0.02429001f, 0.07226851f, + 1.63249192f, 0.94436017f, 0.65530634f, 0.76476367f, 1.10302458f, 1.20701875f, 0.88073298f, 0.43640158f, -0.07220279f, -0.39214092f, -0.60759685f, -0.87296187f, -1.13810886f, -1.40490240f, -1.54422408f, -1.59196182f, + -2.96354446f, -2.66922503f, -2.35080143f, -1.84250497f, -1.24255764f, -0.53451683f, -0.22318900f, 0.15923121f, 0.44185767f, 0.90571587f, 1.20883041f, 1.21786822f, 1.54160670f, 2.22751201f, 2.21090650f, 1.91281110f, + -0.09062710f, 0.80687377f, 1.69510603f, 2.38364009f, 2.08626387f, 1.00304738f, 0.66997543f, 0.04541459f, -0.35848319f, -0.80600051f, -1.65487629f, -2.04562701f, -2.03869244f, -1.11898388f, 0.04427361f, -0.62130392f, + -0.99015493f, -0.47096904f, 0.39660329f, 1.29486538f, 1.58962509f, 0.33608325f, -0.41798602f, -0.54749259f, -0.00991716f, -0.02240745f, -0.93933104f, -0.69735917f, -0.17095973f, 0.19272004f, 0.29655039f, 0.16013060f, + -0.50032252f, -0.00936927f, 0.13895740f, 0.11955067f, -0.00882381f, -0.31634261f, -0.30280409f, -0.10222302f, -0.04951847f, 0.13870349f, 0.43344396f, 0.56559398f, 0.24092822f, -0.05903140f, -0.12616386f, -0.16257807f, + -4.66891396f, -4.62476618f, -2.72504562f, -0.11626174f, 1.38983931f, 1.37676145f, 0.15183709f, -0.07491020f, 0.54070200f, 1.84266982f, 0.65624201f, 0.70100510f, 1.81013255f, 1.75739872f, 0.97189375f, 1.01141647f, + 3.82513926f, 1.74864093f, 0.71663856f, -0.06702053f, -0.46144066f, -0.68679697f, -0.83513366f, -0.69088271f, -0.63484378f, -0.48492965f, -0.30596681f, -0.27767202f, -0.29901877f, -0.55135905f, -0.55561568f, -0.43973879f, + -1.83506374f, -1.72166910f, -0.66010462f, 1.71984506f, 2.40983158f, 1.81667012f, 1.44944523f, 1.31000271f, 0.86661928f, 0.58345030f, -0.05866711f, -0.37487717f, -0.74598532f, -1.38021702f, -1.58454113f, -1.79473786f, + 0.16939787f, 1.05222199f, 0.60925979f, -0.08245082f, -0.05127361f, -0.01958411f, -0.04649851f, 0.11008216f, 0.21213694f, -0.02520358f, -0.00574917f, -0.04591061f, -0.24174211f, -0.38605009f, -0.52417208f, -0.72446423f, + -0.07063893f, -1.74970518f, -1.79098807f, -1.50819293f, -1.06029380f, -1.44474701f, -1.24662095f, -1.20341521f, -1.18506899f, -0.88327503f, -0.47818767f, 0.53478172f, 1.99588317f, 2.01785324f, 2.86156101f, 5.21105441f, + 1.18577996f, 1.82923029f, 2.00218590f, 1.75897045f, 1.55666666f, 1.15213194f, 1.02264996f, 0.58845201f, 0.39345304f, -0.25590088f, -1.11168611f, -1.75581078f, -2.05745836f, -2.20440070f, -2.14031291f, -1.96395016f, + -0.49703383f, -0.62650520f, -0.98853522f, -1.16849765f, -1.02786508f, -0.51447634f, -0.02538523f, 0.08704333f, 0.03359763f, 0.17774887f, 0.30484412f, 0.32520735f, 0.62948522f, 1.14552041f, 1.22336987f, 0.92148234f, + -0.07188198f, 0.18500810f, -0.22096354f, -0.56851679f, -0.98832362f, -1.20304996f, -1.11943691f, -1.09383807f, -0.85446062f, -0.29360582f, 0.44439822f, 0.64306330f, 1.09971537f, 1.50142342f, 1.36382024f, 1.17664847f, + -1.21730935f, -1.48884440f, -1.78500620f, -1.57607634f, -0.82775565f, -0.09612994f, 0.49933981f, 1.06136160f, 1.31463011f, 1.46090638f, 1.14896512f, 0.64320117f, 0.39111587f, 0.36061229f, 0.18325675f, -0.07226660f, + 2.30575156f, 2.37005513f, 1.37776397f, 0.78509487f, 0.18022242f, -0.13093354f, 0.22126477f, -0.11444642f, -0.35716968f, -0.59492665f, -0.35765935f, -0.44655201f, -1.03213345f, -1.27074059f, -1.44000075f, -1.49558947f, + -1.00874079f, -1.64011865f, -1.86084729f, -1.06805908f, 0.07222945f, 1.36179475f, 1.87160360f, 1.76248472f, 1.52374330f, 1.04119855f, 0.73448166f, 0.13768018f, -0.49711929f, -0.73696841f, -0.89885406f, -0.79450886f +}; +const float ivas_sns_cdbk_tcx10_stage2[ 32 * 16 ] = { + 0.30627323f, 0.48836579f, -0.02716944f, -0.47680077f, -0.52992614f, -0.25467720f, -0.13298242f, -0.14929291f, -0.14808149f, 0.08665801f, 0.28830653f, 0.27526330f, 0.09942358f, -0.01755061f, 0.03315580f, 0.15903469f, + 0.40931263f, -0.04412117f, -0.08826419f, 0.38716891f, 0.51515595f, 0.42227845f, 0.34963425f, 0.26800736f, 0.03770000f, -0.19967080f, -0.31044249f, -0.32623294f, -0.38445978f, -0.38085950f, -0.38590829f, -0.26929836f, + -0.16037262f, -0.37557223f, -0.41481262f, -0.12384627f, 0.25702942f, 0.29593484f, 0.04534352f, -0.04349856f, -0.11439445f, -0.20184919f, 0.03250628f, 0.58473249f, 1.07468564f, 0.31789485f, -0.43837532f, -0.73540590f, + -0.72021067f, 0.08601834f, 0.36444345f, 0.07734969f, -0.03855524f, -0.02016363f, 0.22787880f, 0.23660595f, -0.06162934f, -0.60111840f, -0.53416841f, -0.01411490f, 0.31545914f, 0.35328934f, 0.27371155f, 0.05520477f, + 0.17033204f, -0.13395098f, -0.17486207f, -0.16431307f, -0.15028250f, -0.16217158f, 0.20788205f, 0.78892741f, 0.82887028f, 0.27828798f, -0.09961411f, -0.26525390f, -0.29531330f, -0.31862369f, -0.30357092f, -0.20634333f, + 0.66971623f, 0.62862982f, 0.51073654f, 0.36780819f, 0.09494981f, -0.26895298f, -0.43607248f, -0.52929484f, -0.50226353f, -0.28888748f, -0.08077826f, 0.07870787f, -0.04066089f, -0.15014043f, -0.07631337f, 0.02281584f, + -0.14637266f, -0.46934298f, -0.43556714f, -0.11250329f, 0.02177593f, -0.06273200f, -0.10608254f, -0.23883852f, -0.34273025f, -0.21064510f, 0.01000878f, 0.26290329f, 0.36940740f, 0.45606583f, 0.50057089f, 0.50408231f, + -0.63822919f, -0.37848043f, -0.12025765f, 0.46869706f, 0.60287599f, 0.40487467f, 0.32284423f, 0.21760285f, 0.02923608f, 0.00961581f, 0.09146575f, 0.01422525f, -0.19921025f, -0.27268562f, -0.30705403f, -0.24552069f, + 1.00438179f, 0.03452909f, -0.36528888f, -0.16282387f, -0.17507552f, -0.16366972f, 0.01988929f, 0.04208138f, -0.09195065f, -0.12550201f, -0.13827904f, -0.15519976f, -0.13718296f, -0.04187317f, 0.11795197f, 0.33801187f, + -0.29872646f, -0.05673935f, 0.22627715f, 0.35384240f, 0.40583411f, 0.05342130f, -0.33165017f, -0.58372192f, -0.59880799f, -0.13860904f, 0.35292935f, 0.42680564f, 0.12541820f, -0.05244271f, 0.02304693f, 0.09312233f, + -0.62056798f, -0.65569894f, -0.39193684f, -0.23470135f, -0.10487732f, -0.02415277f, 0.10485475f, 0.27475842f, 0.33639795f, 0.28659695f, 0.29816270f, 0.35486347f, 0.22178257f, 0.06294332f, 0.00371302f, 0.08786182f, + -0.24167361f, 0.39335919f, 0.45401345f, -0.01359878f, -0.02799250f, 0.03219280f, -0.03498926f, 0.13917253f, 0.56998817f, 0.30076805f, -0.02861530f, -0.08301223f, -0.23268793f, -0.25582563f, -0.40349390f, -0.56760551f, + -0.25453749f, 0.20141031f, 0.13622118f, 0.02192458f, 0.01884274f, 0.35426017f, 0.30533029f, -0.04383371f, -0.03213904f, 0.48723585f, 0.26916690f, -0.57914714f, -0.86274497f, -0.46431975f, 0.21456299f, 0.22776732f, + 0.10091242f, -0.00486621f, 0.15438553f, 0.58933636f, 0.58327809f, 0.15020643f, -0.13942120f, -0.30560120f, -0.39802935f, -0.42014770f, -0.43506227f, -0.49122908f, -0.24162334f, 0.07789107f, 0.33589368f, 0.44407700f, + -0.86901291f, -0.12649490f, 0.37769660f, 0.32335451f, -0.09778731f, -0.30169760f, -0.11330902f, 0.06975956f, 0.10852794f, 0.10187023f, 0.01908335f, -0.02063501f, -0.02583787f, 0.01976747f, 0.15814638f, 0.37656868f, + 0.04263499f, 0.02090495f, 0.31860242f, 0.23302977f, -0.33090591f, -0.80333458f, -0.73651770f, -0.34102413f, 0.01204330f, 0.27818705f, 0.45925162f, 0.49138398f, 0.30213637f, 0.14165342f, -0.01743260f, -0.07061291f, + -0.33546750f, 0.07559517f, -0.29917689f, -0.73625773f, -0.65250278f, -0.17791468f, 0.36283358f, 0.41870726f, 0.25167625f, 0.10475438f, 0.03036614f, -0.11264997f, 0.02694511f, 0.35023967f, 0.42385566f, 0.26899640f, + 0.35439950f, 0.67540976f, 0.38662754f, 0.00957348f, -0.04081569f, 0.08980026f, 0.24456400f, 0.16454453f, -0.17326799f, -0.44054817f, -0.46528410f, -0.40046956f, -0.28220380f, -0.18741583f, -0.03688613f, 0.10197206f, + 0.42543134f, 0.16124378f, -0.11664388f, -0.16052109f, -0.14380996f, -0.20548992f, -0.07681681f, -0.05550879f, -0.19682147f, -0.44926335f, -0.31008693f, 0.10843293f, 0.56978845f, 0.55547148f, 0.11319503f, -0.21860065f, + -0.29805544f, -0.51653600f, -0.50993841f, -0.23042275f, 0.24667415f, 0.49673729f, 0.44572321f, 0.45012593f, 0.15926189f, -0.25316153f, -0.34302757f, -0.25146569f, -0.04585493f, 0.07882198f, 0.19017230f, 0.38094576f, + 0.32844224f, 0.41193928f, 0.40958218f, 0.23076367f, -0.27298459f, -0.73724149f, -0.33139249f, 0.20850941f, 0.29246785f, 0.02387269f, -0.22298162f, -0.22401730f, -0.10602946f, -0.10948655f, -0.04914188f, 0.14769834f, + -0.17579666f, 0.35780877f, 0.71235588f, 0.55448086f, 0.37958752f, 0.25325181f, 0.00067976f, -0.17449727f, -0.19933258f, -0.18272217f, -0.13825657f, -0.13482936f, -0.26973501f, -0.36527057f, -0.38046021f, -0.23726392f, + 0.18763378f, -0.33806505f, -0.40345471f, -0.16420458f, -0.35258917f, -0.57440801f, -0.40444473f, 0.03937379f, 0.28301143f, 0.24202773f, 0.11450746f, -0.01201630f, 0.15584175f, 0.29186178f, 0.39454798f, 0.54037647f, + 0.22483690f, -0.44980090f, -0.04869487f, 0.59069175f, 0.53952189f, -0.08294351f, -0.50222392f, -0.24118691f, 0.23316504f, 0.15935219f, -0.04441873f, 0.04368785f, -0.01936622f, -0.19829407f, -0.17269697f, -0.03162974f, + 0.86145933f, 0.21872440f, 0.03989593f, 0.02383014f, -0.09253274f, -0.16857595f, -0.11671737f, 0.08021353f, 0.06125647f, 0.12344152f, 0.23383136f, 0.23023986f, 0.00554465f, -0.33666994f, -0.57850362f, -0.58543742f, + 0.51765053f, 0.14453794f, -0.21849231f, -0.46766148f, 0.28518641f, 0.98554209f, 0.04290847f, -0.60417524f, -0.40619174f, 0.07096948f, -0.07934046f, -0.11108689f, 0.01736604f, 0.02182622f, -0.13816306f, -0.06087569f, + 0.48940455f, -0.48846716f, -0.76449136f, -0.43167975f, -0.08214146f, 0.11409731f, 0.23323066f, 0.14717357f, 0.03539665f, 0.18939153f, 0.30742449f, 0.25985980f, 0.09542412f, -0.02333196f, -0.07732568f, -0.00396539f, + -0.11187535f, 0.22479868f, 0.00043228f, -0.32181417f, -0.15096473f, 0.43016822f, 0.70121781f, 0.35219596f, -0.12050155f, -0.23287073f, 0.15265180f, 0.19690580f, -0.06424055f, -0.21596133f, -0.38579166f, -0.45435087f, + -0.22289529f, -0.33733328f, 0.06840735f, 0.09280703f, 0.04636627f, 0.21910935f, -0.03558133f, 0.03650325f, 0.61258277f, 0.50575298f, -0.41287364f, -0.69151766f, -0.55346043f, 0.16231747f, 0.54407303f, -0.03425754f, + -0.01396139f, 0.41256481f, 0.28386076f, -0.13079544f, -0.35049882f, -0.37139357f, -0.26190236f, -0.28543916f, -0.36404168f, -0.41216213f, -0.30446824f, -0.16554805f, 0.07635435f, 0.40718475f, 0.72148357f, 0.75876291f, + -0.78143464f, 0.05520810f, 0.09851993f, -0.35088396f, -0.29183273f, 0.13535467f, 0.10630173f, -0.35151176f, -0.27502696f, 0.15923208f, 0.34325564f, 0.26263384f, 0.39924614f, 0.42088604f, 0.20935571f, -0.13930422f, + -0.20363163f, -0.21557857f, -0.16300691f, -0.04183005f, -0.11100316f, -0.05771045f, 0.03898740f, 0.01316220f, 0.17362802f, 0.74914331f, 0.94477958f, 0.44778038f, -0.09421183f, -0.32736334f, -0.50631884f, -0.64682642f +}; +const float ivas_sns_cdbk_tcx10_stage3[ 8 * 16 ] = { + 0.15213764f, -0.12778955f, 0.09362990f, -0.08343056f, -0.25379718f, 0.12518895f, 0.29943288f, -0.09857322f, -0.34816031f, -0.24349585f, -0.11266650f, -0.05996015f, 0.03254247f, 0.15532134f, 0.23410563f, 0.23551447f, + -0.16242282f, -0.11097776f, -0.31747514f, -0.25628076f, 0.13836003f, 0.29861681f, 0.10506779f, 0.11734717f, 0.26608658f, 0.05454060f, -0.14603348f, -0.19239843f, 0.04173306f, 0.20966631f, 0.07432020f, -0.12015035f, + -0.05086737f, 0.14763099f, -0.10027459f, -0.32093478f, -0.17515530f, -0.18641303f, -0.27141947f, -0.07787662f, 0.00378069f, -0.04285463f, 0.10140687f, 0.34974771f, 0.30832793f, 0.10107726f, 0.07691200f, 0.13691240f, + -0.19149570f, -0.03034820f, 0.22501633f, 0.07949802f, -0.27147765f, -0.19613243f, 0.27922429f, 0.35035416f, 0.10414276f, 0.00614821f, 0.06550601f, 0.11675054f, 0.03695278f, -0.13039057f, -0.22716902f, -0.21657951f, + 0.26536712f, -0.20814302f, -0.25065997f, 0.11971631f, 0.27275427f, 0.17786545f, -0.00254739f, -0.12770659f, -0.22797897f, 0.00768447f, 0.21340357f, 0.19482691f, 0.04586545f, -0.11847485f, -0.17809566f, -0.18387694f, + 0.25667429f, 0.24654641f, 0.10151031f, -0.02938848f, -0.14360442f, -0.13987667f, -0.20754252f, -0.19670735f, 0.17496815f, 0.41594389f, 0.13093074f, -0.20541061f, -0.16236246f, 0.04068170f, -0.03728146f, -0.24508149f, + -0.08722397f, 0.02295918f, 0.00051204f, 0.07408103f, 0.14389321f, 0.06786859f, 0.00359252f, 0.11717038f, 0.08740562f, 0.00119184f, -0.07592203f, -0.11362449f, -0.31422561f, -0.38910675f, -0.02291088f, 0.48433932f, + -0.18216919f, 0.06012195f, 0.24774113f, 0.41673922f, 0.28902704f, -0.14711768f, -0.20580810f, -0.08400793f, -0.06024452f, -0.19915854f, -0.17662518f, -0.08993148f, 0.01116638f, 0.13122555f, 0.08011919f, -0.09107791f +}; + +const float *const ivas_sns_cdbks_tcx10[SNS_MSVQ_NSTAGES_TCX10] = { ivas_sns_cdbk_tcx10_stage1, ivas_sns_cdbk_tcx10_stage2, ivas_sns_cdbk_tcx10_stage3}; + +const float ivas_sns_means_tcx10[M] = { + 0.9510f , 1.1892f , 0.8969f , 0.3467f, + 0.1347f , 0.1074f , 0.0504f , -0.0790f, + -0.1305f , -0.3713f , -0.5611f , -0.5757f, + -0.4801f , -0.4108f , -0.4564f , -0.6112f +}; + +const int16_t ivas_sns_cdbks_side_tcx20_levels[SNS_MSVQ_NSTAGES_SIDE] = { 32, 32 }; +const int16_t ivas_sns_cdbks_side_tcx20_bits[SNS_MSVQ_NSTAGES_SIDE] = { 5, 5 }; +const int16_t ivas_sns_cdbks_side_tcx10_levels[SNS_MSVQ_NSTAGES_SIDE] = { 32, 8 }; +const int16_t ivas_sns_cdbks_side_tcx10_bits[SNS_MSVQ_NSTAGES_SIDE] = { 5, 3 }; + +const float ivas_sns_means_side_tcx20[M] = { + -0.0181f , 0.0044f , 0.0133f , 0.0096f, + 0.0073f , 0.0038f , 0.0058f , 0.0015f, + -0.0046f , -0.0096f , -0.0099f , -0.0173f, + -0.0075f , 0.0049f , 0.0023f , 0.0141f +}; + +const float ivas_sns_cdbks_side_tcx20_stage1[ 32 * 16 ] = { + -0.09561560f, -0.07036320f, 0.02878750f, 0.03511974f, 0.17132389f, -0.03138941f, -0.33178799f, -0.21216198f, -0.04445341f, 0.02221417f, 0.02283919f, 0.03233147f, 0.08941267f, 0.12190493f, 0.12476806f, 0.13706984f, + 0.00109929f, 0.08875231f, 0.22238215f, 0.21457590f, 0.10015343f, 0.04638508f, 0.03393346f, -0.00874452f, -0.04376851f, -0.07742100f, -0.07534945f, -0.10337673f, -0.10407952f, -0.11112585f, -0.09133646f, -0.09207950f, + -0.24818594f, 0.26921203f, 0.44107852f, 0.17248048f, 0.64417785f, 0.17680036f, 0.13990282f, -0.00956079f, 0.26766161f, -0.03617849f, -0.51006953f, -0.14559280f, 0.04585566f, -0.32296828f, -0.43440915f, -0.45020472f, + -0.02603883f, -0.10893371f, -0.10500311f, -0.11573136f, -0.10145701f, 0.08950274f, 0.26393655f, 0.16421642f, 0.06653788f, 0.02055681f, 0.03165200f, -0.00660730f, -0.02920382f, -0.04413712f, -0.04586630f, -0.05342379f, + 0.42792206f, 0.05873236f, -0.03519993f, -0.02404930f, -0.02129021f, -0.02228539f, -0.05794333f, -0.05329147f, -0.02713142f, -0.02536622f, -0.01781476f, -0.04129741f, -0.03786846f, -0.04699464f, -0.04049980f, -0.03562223f, + 0.02055988f, 0.02639971f, 0.00689886f, 0.00418128f, -0.01634280f, 0.00921734f, 0.00364626f, -0.03176210f, -0.04382792f, -0.01247039f, 0.02183370f, -0.00002241f, -0.00402301f, -0.00566646f, 0.00978385f, 0.01159419f, + 0.19157117f, 0.21950742f, 0.18377101f, -0.02875442f, -0.28243126f, -0.54171973f, -0.31264637f, -0.03676636f, 0.00528891f, -0.04001921f, 0.08505054f, 0.06946939f, 0.13428842f, 0.15810925f, 0.11903950f, 0.07624180f, + -0.30190937f, -0.29575446f, -0.26060885f, -0.18754051f, -0.14798754f, -0.10966049f, -0.13245975f, -0.11017279f, -0.08153340f, -0.06447313f, 0.04034392f, 0.17641778f, 0.25731939f, 0.31027339f, 0.40673221f, 0.50101364f, + -0.47842978f, -0.03818905f, 0.07056377f, 0.03300345f, 0.02730699f, 0.05007915f, 0.02893237f, 0.02226785f, 0.04222222f, 0.04128904f, 0.03830734f, 0.01743857f, 0.03607951f, 0.02582752f, 0.04198512f, 0.04131589f, + -0.02242885f, 0.01802990f, -0.00361209f, 0.02714255f, 0.04843318f, 0.04306928f, 0.02675985f, 0.07964815f, 0.10019006f, 0.05262710f, 0.00113825f, -0.04747375f, -0.04988074f, -0.05204562f, -0.09989329f, -0.12170389f, + 0.28967652f, 0.36512749f, 0.38343313f, 0.37459919f, 0.29419461f, 0.21272806f, 0.14963422f, 0.11987446f, -0.00354946f, -0.11817788f, -0.21991893f, -0.37389500f, -0.43897693f, -0.47312318f, -0.36222971f, -0.19939667f, + -0.29847367f, -0.28024953f, -0.23616334f, -0.19456539f, -0.16497910f, -0.12215408f, -0.05213406f, 0.03088777f, 0.11427925f, 0.17777695f, 0.21315635f, 0.18382103f, 0.20758797f, 0.19478448f, 0.14014366f, 0.08628162f, + -0.01005369f, -0.03186180f, -0.07995901f, -0.10893772f, -0.11257191f, -0.10933952f, -0.06260446f, 0.01592879f, 0.06618622f, 0.08792663f, 0.09779631f, 0.06871009f, 0.06158038f, 0.04699408f, 0.04045205f, 0.02975352f, + -0.12591171f, -0.31330699f, -0.09207505f, 0.04353844f, 0.05691547f, 0.02830292f, 0.05190188f, 0.05663181f, 0.05579546f, 0.05136184f, 0.06373287f, 0.03243363f, 0.03631576f, 0.02886726f, 0.02108611f, 0.00441022f, + 0.51424359f, 0.44825357f, 0.27826391f, 0.14692419f, 0.04486213f, 0.01374316f, -0.05577450f, -0.06790050f, -0.10394906f, -0.14111342f, -0.16141165f, -0.18795338f, -0.17689540f, -0.18030471f, -0.19451666f, -0.17647134f, + 0.01250082f, -0.03513855f, -0.10558904f, -0.13589106f, -0.16642959f, -0.12403555f, -0.11639493f, -0.13504470f, -0.12448111f, -0.08902796f, 0.02742439f, 0.14597597f, 0.22586358f, 0.24372767f, 0.18517594f, 0.19136417f, + 0.00690369f, -0.06536790f, -0.04560492f, 0.17183296f, 0.06108150f, -0.14297504f, -0.10743566f, 0.00028842f, -0.00000737f, 0.01948888f, 0.04144583f, 0.01034213f, 0.01186359f, 0.01904016f, 0.01513936f, 0.00396440f, + -0.02696488f, -0.05930555f, -0.05635944f, 0.04417762f, 0.20483421f, 0.24818872f, 0.08337011f, -0.03555721f, -0.04496794f, -0.05268211f, -0.05177582f, -0.06105043f, -0.04493356f, -0.04903822f, -0.04844764f, -0.04948792f, + 0.09934599f, 0.20097988f, 0.02959104f, 0.10059414f, 0.36489123f, 0.42345991f, 0.31306867f, 0.19189664f, 0.02025838f, -0.16920767f, -0.19221388f, -0.36590851f, -0.24124038f, -0.21069901f, -0.24782116f, -0.31699542f, + -0.38302159f, -0.20867958f, -0.06199247f, 0.00929974f, -0.08763027f, 0.01230753f, 0.12845035f, 0.27194101f, 0.35480151f, 0.36726532f, 0.20142240f, -0.03957218f, -0.10891503f, -0.16235951f, -0.15207841f, -0.14123875f, + 0.29448433f, 0.27467021f, 0.21093907f, 0.02636253f, -0.10971996f, -0.06520899f, -0.09114815f, -0.19988466f, -0.25173695f, -0.21777001f, -0.19036007f, -0.10825290f, 0.00468462f, 0.07695453f, 0.14592570f, 0.20006079f, + -0.09613522f, -0.07305197f, 0.23140183f, -0.01276782f, -0.05046178f, -0.03690868f, 0.01854782f, -0.00516658f, -0.01794740f, 0.01127293f, 0.02845775f, 0.00246563f, -0.00285605f, -0.00274282f, 0.00447526f, 0.00141708f, + 0.09853152f, 0.23398475f, 0.15560679f, 0.01939291f, -0.05095939f, -0.10951335f, -0.08366621f, -0.03852663f, -0.00171258f, -0.01619636f, -0.02703945f, -0.04625883f, -0.03573599f, -0.03656223f, -0.03486191f, -0.02648302f, + -0.05407938f, -0.18042914f, -0.31075117f, -0.36223570f, -0.35545274f, -0.26114190f, -0.21540173f, -0.18652814f, -0.10764184f, -0.04326102f, 0.10627938f, 0.32432791f, 0.40043785f, 0.56193174f, 0.40395999f, 0.27998606f, + -0.22375901f, -0.11453094f, -0.06437672f, 0.02966050f, -0.06882505f, -0.02229970f, 0.00519106f, 0.04139490f, -0.21099529f, -0.00965469f, 0.01906172f, 0.06535794f, 0.27085374f, 0.36298568f, 0.13009871f, -0.21016295f, + 0.18023915f, 0.15936182f, 0.13064987f, 0.09848966f, 0.08230524f, 0.11068418f, 0.11168088f, 0.11505046f, 0.13567778f, 0.12259236f, 0.03115883f, -0.14115321f, -0.20420262f, -0.27855554f, -0.34034745f, -0.31363132f, + -0.12817652f, 0.06412346f, 0.23407500f, 0.37946648f, 0.31127015f, 0.27044470f, 0.18591463f, 0.13643852f, 0.07403884f, -0.00928348f, -0.10609226f, -0.26765738f, -0.35056732f, -0.38530570f, -0.26185421f, -0.14683496f, + -0.63004591f, -0.58451443f, -0.16857245f, -0.08058005f, -0.09034904f, 0.00601978f, 0.10036174f, 0.10417477f, 0.14447621f, 0.13945086f, 0.18409447f, 0.20139949f, 0.10118410f, 0.12033491f, 0.20454736f, 0.24801829f, + 0.09650912f, 0.15979369f, -0.02778062f, -0.21860304f, -0.09723043f, 0.03923136f, 0.06141602f, 0.00600025f, -0.03251321f, -0.01956117f, -0.01004770f, -0.01435564f, 0.01114831f, 0.01113413f, 0.01304939f, 0.02180959f, + -0.00555466f, -0.14717213f, -0.37968771f, -0.12250216f, 0.03497204f, 0.13708345f, 0.03564652f, 0.00785509f, 0.04438533f, 0.06495152f, 0.07142555f, 0.05800545f, 0.06370878f, 0.05930816f, 0.05015268f, 0.02742217f, + 0.24931986f, 0.21084678f, 0.15421842f, 0.14679305f, 0.11899038f, 0.10112391f, 0.08120544f, 0.01848917f, -0.03021656f, -0.11872087f, -0.17582510f, -0.27756371f, -0.26300284f, -0.17730239f, -0.07164775f, 0.03329224f, + -0.17764482f, -0.15058551f, -0.12627503f, -0.06547272f, -0.05935809f, -0.01277874f, 0.01723090f, -0.00829920f, -0.02788840f, 0.01142219f, 0.05531784f, 0.04254613f, 0.04730144f, 0.07050022f, 0.15526930f, 0.22871460f +}; + +const float ivas_sns_cdbks_side_tcx20_stage2[ 32 * 16 ] = { + -0.01387178f, 0.00066194f, 0.01705500f, 0.00585076f, 0.05625865f, -0.08189174f, -0.29272907f, 0.00394582f, 0.14068978f, 0.03888049f, 0.01046905f, 0.03828706f, 0.04214951f, 0.02083198f, 0.00583650f, 0.00757601f, + -0.07101791f, -0.10250166f, 0.03818920f, 0.09162373f, 0.11895681f, 0.13465195f, 0.05088923f, -0.11144198f, -0.13846971f, -0.20720284f, -0.25737659f, -0.15071919f, 0.03249921f, 0.08124332f, 0.17587328f, 0.31480317f, + 0.07163217f, 0.02904662f, 0.01959293f, 0.00805967f, 0.02343380f, 0.02069451f, 0.03232257f, 0.02206815f, 0.03462995f, 0.01790113f, -0.03778174f, -0.14048245f, -0.21681559f, -0.11035045f, 0.05755451f, 0.16849432f, + -0.10816723f, -0.02739052f, -0.08241511f, -0.08220118f, -0.07911491f, 0.04976754f, 0.10255540f, 0.23875558f, 0.25687913f, 0.03165525f, -0.15819986f, -0.14652796f, -0.00803674f, -0.00055281f, -0.01439374f, 0.02738701f, + -0.02270156f, 0.02799492f, 0.14119353f, -0.06753253f, -0.07348415f, 0.16270911f, -0.00726861f, -0.06576199f, -0.02852827f, -0.01072544f, -0.02385080f, 0.01259492f, -0.00575096f, -0.00670975f, -0.01412345f, -0.01805497f, + -0.09730804f, -0.09207854f, -0.06155676f, -0.01193574f, 0.00669004f, 0.04165295f, 0.00840306f, -0.01763756f, -0.08511468f, -0.12564582f, -0.06302424f, 0.13694410f, 0.25188182f, 0.15335399f, 0.00198570f, -0.04661036f, + -0.20229607f, 0.27055253f, 0.05937269f, 0.00423687f, 0.02212468f, -0.00979552f, -0.02654450f, -0.02737173f, -0.03263414f, -0.01695365f, -0.02587673f, -0.00157241f, -0.00766337f, -0.00946241f, 0.00474761f, -0.00086382f, + 0.06446543f, -0.26714355f, 0.12269745f, 0.02565502f, -0.00628892f, 0.00430942f, 0.00862473f, -0.00170779f, 0.00617105f, -0.00718104f, -0.01871731f, 0.01193483f, 0.00860795f, 0.00997801f, 0.02026700f, 0.01832765f, + -0.00061741f, -0.03771131f, -0.03643531f, -0.01560727f, 0.00567664f, -0.00566226f, -0.00287572f, 0.03281006f, 0.04750282f, 0.01895354f, -0.01051254f, 0.01765380f, 0.01259038f, 0.00436097f, -0.01332776f, -0.01679868f, + 0.06930783f, 0.05302917f, 0.06102093f, 0.13367091f, 0.13415662f, 0.00542245f, -0.09926086f, -0.18333294f, -0.21849319f, -0.08349384f, 0.02026711f, 0.05881583f, 0.01345789f, 0.01158885f, 0.01962784f, 0.00421544f, + 0.00361302f, -0.05045316f, -0.00509374f, 0.19082766f, -0.18804365f, -0.05470887f, 0.00052718f, -0.02162397f, -0.00194290f, 0.00166374f, 0.00419055f, 0.02490528f, 0.02211515f, 0.02768455f, 0.02704636f, 0.01929285f, + 0.02476472f, -0.00405085f, -0.02659682f, -0.08596413f, -0.06315428f, -0.06855039f, -0.07500519f, -0.05011866f, -0.06108486f, -0.00618761f, 0.05634272f, 0.08835189f, 0.05894742f, 0.06729406f, 0.07762828f, 0.06738369f, + 0.13702164f, 0.08497052f, 0.07105828f, 0.04681336f, 0.02464482f, 0.00482884f, -0.01068152f, -0.00650854f, 0.01424842f, -0.00735400f, -0.04158832f, -0.02704081f, -0.04141575f, -0.06089035f, -0.09289456f, -0.09521199f, + -0.16780678f, 0.06667456f, 0.18201515f, 0.07399154f, -0.01999438f, 0.05535422f, 0.03900328f, -0.12016656f, -0.10793461f, 0.12328733f, 0.37944090f, 0.03265145f, -0.16138072f, -0.15224770f, -0.10548425f, -0.11740339f, + -0.01321210f, -0.01125461f, -0.03726540f, 0.00275729f, -0.04632781f, -0.24449670f, 0.09996640f, 0.11060024f, 0.00843480f, 0.01020953f, 0.01323100f, 0.03866782f, 0.01652133f, 0.01477176f, 0.01931947f, 0.01807687f, + 0.04427139f, 0.07762448f, -0.03500615f, -0.18353333f, 0.15726631f, 0.06121580f, -0.02944487f, -0.01882019f, -0.02386520f, 0.00077271f, -0.01038885f, 0.00869168f, -0.00564164f, -0.00937383f, -0.01500538f, -0.01876296f, + 0.13690793f, 0.01111401f, -0.03351651f, -0.01725554f, -0.07761571f, -0.12250939f, -0.07631311f, -0.01738486f, 0.14254332f, 0.21322328f, 0.14586930f, 0.03233900f, -0.08363281f, -0.12036013f, -0.07612890f, -0.05727984f, + 0.02949784f, -0.12225020f, -0.24763790f, 0.09504104f, 0.18885156f, 0.02619185f, 0.01292378f, 0.03000215f, 0.00909582f, -0.00936785f, -0.02571287f, 0.00889712f, -0.00234566f, -0.00169068f, 0.00871879f, -0.00021486f, + -0.03852054f, -0.03889437f, -0.08884280f, -0.06896184f, 0.02214326f, 0.10225505f, 0.12832898f, 0.08401269f, 0.06576567f, 0.08182152f, 0.07603111f, 0.04006712f, -0.04791395f, -0.09454805f, -0.10354215f, -0.11920167f, + 0.00938218f, 0.04681937f, 0.08173506f, 0.03766262f, 0.00645705f, -0.03830769f, -0.01180921f, 0.28211251f, 0.02788724f, -0.25197511f, -0.12812732f, 0.01575526f, 0.01158131f, -0.01435589f, -0.04416799f, -0.03064940f, + 0.06374854f, 0.12417689f, 0.09544838f, -0.13379816f, -0.26304159f, -0.06323982f, 0.03308697f, 0.06602140f, 0.04869582f, 0.02626429f, 0.00579212f, 0.01966626f, -0.00288156f, -0.00594553f, -0.00083407f, -0.01315989f, + -0.01689007f, -0.05224654f, -0.05732359f, 0.00797541f, -0.01178359f, -0.06878838f, -0.08592686f, -0.01631491f, -0.01215461f, 0.04690048f, 0.18175850f, 0.26923595f, 0.13470179f, -0.02451530f, -0.12744548f, -0.16718270f, + -0.02187075f, -0.05395855f, -0.02263713f, -0.00045869f, 0.07200871f, 0.08343703f, 0.05673476f, -0.01486174f, 0.02824052f, 0.09407959f, 0.06117651f, -0.48782246f, -0.01849447f, 0.15501071f, 0.05869060f, 0.01072538f, + 0.38479396f, -0.04937867f, -0.07935772f, -0.02506650f, -0.02316760f, -0.02067798f, 0.02695150f, -0.00054291f, -0.05256493f, -0.03399701f, -0.04629317f, -0.01085654f, -0.01817534f, -0.02213798f, -0.01605045f, -0.01347864f, + -0.23847427f, -0.06501920f, -0.01803515f, -0.00348509f, 0.04039109f, 0.01940591f, 0.01835329f, 0.03075053f, 0.03001602f, 0.02853897f, 0.01016726f, 0.03707260f, 0.02160199f, 0.03493100f, 0.03506401f, 0.01872098f, + 0.03862266f, 0.02890076f, 0.02592629f, 0.04317070f, 0.03495444f, -0.02192080f, -0.03469867f, -0.01962511f, -0.02362473f, -0.09521267f, -0.13881717f, -0.03271523f, 0.01372571f, 0.05875682f, 0.06459397f, 0.05796305f, + -0.01487374f, 0.01485744f, 0.01264233f, 0.04546350f, 0.00733058f, 0.08289797f, 0.17793293f, 0.03071348f, -0.11739129f, -0.07170388f, -0.04800450f, -0.00719781f, -0.01613242f, -0.02445791f, -0.03329781f, -0.03877884f, + 0.06919396f, -0.04913878f, -0.23414589f, -0.32278902f, -0.15262688f, -0.02830432f, 0.05881428f, 0.05602689f, 0.08630162f, 0.08206753f, 0.05235369f, 0.05459854f, 0.02224523f, 0.07894449f, 0.13055514f, 0.09590365f, + -0.13456165f, -0.02675728f, 0.10718846f, 0.16038985f, 0.13314470f, 0.04370885f, 0.00879630f, 0.02004215f, 0.04004457f, 0.01767300f, -0.03006764f, -0.02489721f, -0.06793547f, -0.08666415f, -0.07647774f, -0.08362676f, + -0.01963376f, -0.05985601f, -0.06123515f, 0.00802984f, 0.03197310f, 0.08198580f, -0.04518129f, -0.25550460f, -0.02763673f, 0.10534295f, 0.06276998f, 0.04687612f, 0.02909544f, 0.03184387f, 0.04253063f, 0.02859974f, + -0.05005194f, 0.08455623f, 0.27160784f, 0.05333258f, -0.06395559f, -0.12989814f, -0.07303311f, -0.05166257f, -0.03661287f, -0.00149673f, -0.00090933f, 0.02163393f, 0.00899793f, -0.00065646f, -0.01328460f, -0.01856715f, + 0.08465235f, 0.18910437f, -0.17964239f, -0.01596332f, -0.01786381f, -0.02173723f, 0.00655794f, -0.00747303f, -0.01909382f, -0.01073786f, -0.01461080f, 0.01419150f, 0.00349640f, -0.00567498f, -0.00358136f, -0.00162392f +}; + +const float *const ivas_sns_cdbks_side_tcx20[SNS_MSVQ_NSTAGES_SIDE] = { ivas_sns_cdbks_side_tcx20_stage1, ivas_sns_cdbks_side_tcx20_stage2 }; + +const float ivas_sns_means_side_tcx10[M] = { + -0.0085f , 0.0070f , 0.0074f , 0.0045f, + -0.0038f , 0.0071f , 0.0040f , -0.0068f, + -0.0104f , -0.0095f , -0.0259f , -0.0163f, + 0.0127f , 0.0087f , 0.0036f , 0.0262f +}; + +const float ivas_sns_cdbks_side_tcx10_stage1[ 32 * 16 ] = { + -0.23085418f, -0.21005449f, -0.18570241f, -0.13606880f, -0.11948469f, -0.10308038f, -0.11104958f, -0.15882089f, -0.13896854f, -0.06621316f, 0.05217852f, 0.11795393f, 0.15762859f, 0.26837024f, 0.37542593f, 0.48873907f, + 0.13745600f, 0.20131847f, 0.22182278f, 0.29526068f, 0.24656821f, 0.13757111f, 0.07460669f, 0.03134436f, -0.06561883f, -0.17480962f, -0.24070771f, -0.31627147f, -0.28865063f, -0.14849001f, -0.03399112f, -0.07740884f, + -0.13299250f, -0.14002491f, -0.11936499f, -0.04179630f, -0.03438902f, 0.04431344f, 0.06951552f, 0.01403797f, 0.05531963f, -0.01394528f, -0.09745552f, 0.00448586f, 0.26823524f, 0.23321159f, 0.06675539f, -0.17590634f, + 0.06191756f, 0.11582434f, 0.13192343f, 0.09527126f, 0.08193836f, 0.01139745f, 0.03044540f, 0.11065563f, 0.07578016f, -0.02083963f, -0.07297648f, -0.08340844f, -0.07282079f, -0.12840160f, -0.18605485f, -0.15065167f, + -0.03483375f, -0.04038755f, -0.07410056f, -0.06961358f, -0.04495163f, -0.12359739f, -0.20954724f, -0.19583867f, -0.14529606f, 0.00841374f, 0.12968518f, 0.22831580f, 0.23147392f, 0.13653895f, 0.09511995f, 0.10861877f, + 0.06658553f, 0.21860187f, 0.09436141f, -0.09071645f, -0.07082980f, 0.04518200f, 0.04859027f, -0.03547180f, -0.06006165f, -0.02756024f, 0.00158143f, -0.01511772f, -0.04477551f, -0.04937419f, -0.04159366f, -0.03940128f, + 0.02864506f, -0.04039106f, -0.15284948f, -0.42538299f, -0.19236357f, 0.03104685f, 0.02253710f, 0.02311004f, 0.04867318f, 0.06745871f, 0.09338212f, 0.09710035f, 0.07856015f, 0.09301454f, 0.11632315f, 0.11113598f, + 0.14528623f, 0.29868967f, 0.46429789f, 0.54323288f, 0.40204138f, 0.26355278f, 0.17207026f, 0.09889195f, -0.00279626f, -0.16206412f, -0.29083020f, -0.40501466f, -0.54537297f, -0.46768767f, -0.27766915f, -0.23662804f, + -0.38143153f, -0.38286102f, -0.37711911f, -0.29609917f, -0.25719669f, -0.20628984f, -0.15545466f, -0.08387721f, -0.03028209f, 0.14307072f, 0.32718172f, 0.40216059f, 0.39369890f, 0.30234268f, 0.29650354f, 0.30565312f, + 0.35958422f, 0.51604595f, 0.41116626f, 0.13914238f, -0.03378266f, -0.13855653f, -0.18788816f, -0.17389274f, -0.14739128f, -0.16521614f, -0.14451729f, -0.13567903f, -0.09514774f, -0.07488226f, -0.06811874f, -0.06086662f, + -0.66004345f, -0.31718869f, -0.22177390f, -0.12449418f, -0.09939825f, 0.07331022f, 0.21408044f, 0.21558931f, 0.11208625f, 0.04257974f, -0.01807639f, 0.09442548f, 0.06053141f, 0.06888331f, 0.20357028f, 0.35591847f, + -0.16304924f, -0.12420037f, -0.04222860f, 0.05588216f, 0.18467874f, 0.32957705f, 0.39156897f, 0.27848510f, 0.13897139f, -0.02741662f, -0.14580317f, -0.19651482f, -0.22072919f, -0.18213237f, -0.12846721f, -0.14862176f, + -0.17887269f, -0.40659902f, -0.02516902f, 0.09601495f, 0.06138763f, 0.02130781f, 0.05102018f, 0.04939750f, 0.05199909f, 0.05639114f, 0.06766195f, 0.07106289f, 0.04938017f, 0.02276475f, 0.00986626f, 0.00238653f, + 0.35668951f, 0.22742896f, -0.06232152f, -0.18667516f, -0.28394315f, -0.31893226f, -0.28501785f, -0.19154472f, -0.14625471f, -0.07293625f, 0.05620192f, 0.15269426f, 0.20840665f, 0.19892856f, 0.16095072f, 0.18632539f, + -0.04935166f, -0.11272268f, 0.08233717f, 0.29988006f, 0.19331526f, 0.14054174f, 0.08680898f, -0.01410902f, -0.04313985f, -0.03494681f, -0.04540697f, -0.07243925f, -0.09250963f, -0.09472804f, -0.10148439f, -0.14204503f, + 0.18485137f, 0.25341568f, 0.21009944f, 0.20568550f, 0.20518381f, 0.27019582f, 0.21216885f, 0.00546777f, -0.00044021f, -0.10735443f, -0.20735090f, -0.14224940f, -0.09351389f, -0.09761419f, -0.36078632f, -0.53775866f, + -0.37281135f, -0.49261999f, -0.36727842f, -0.16577288f, -0.02238290f, 0.00199674f, -0.01679564f, 0.04714198f, 0.10589472f, 0.16394573f, 0.18921056f, 0.20782063f, 0.19861654f, 0.19447370f, 0.17625681f, 0.15230414f, + 0.06686853f, 0.05611921f, 0.03365910f, 0.02756852f, 0.08295478f, 0.06008045f, -0.03273553f, -0.04364718f, -0.01449926f, -0.16865975f, -0.29690154f, -0.15022460f, -0.01812698f, 0.04654261f, 0.11587511f, 0.23512676f, + 0.05629958f, -0.04922929f, -0.24893641f, -0.04282766f, 0.05664299f, 0.06157661f, 0.05406340f, 0.01868661f, -0.00352496f, -0.00155314f, 0.04576544f, 0.04384907f, 0.01829060f, 0.01451148f, 0.01064548f, -0.03425997f, + 0.00489548f, -0.00560306f, 0.00615573f, -0.00441324f, 0.02514502f, 0.02634783f, 0.01098806f, 0.01133668f, 0.06739798f, 0.14368795f, 0.11283267f, 0.01118776f, -0.08555990f, -0.10393666f, -0.11315265f, -0.10730981f, + -0.15112519f, -0.11783557f, -0.13754019f, -0.07632290f, -0.06121828f, -0.06360113f, -0.05018035f, -0.00549590f, 0.05908192f, 0.04630727f, 0.02538631f, -0.00811102f, -0.02567731f, 0.08327373f, 0.21071206f, 0.27234661f, + 0.56834545f, 0.15133540f, -0.01992277f, -0.04770211f, -0.05432411f, -0.02191499f, -0.02550971f, -0.03144176f, -0.02317891f, -0.02811835f, -0.04327235f, -0.06018613f, -0.07647819f, -0.07349573f, -0.08821391f, -0.12592196f, + -0.03137272f, -0.03974785f, -0.03770784f, -0.05600026f, -0.03191645f, -0.04815164f, -0.04304812f, 0.02455638f, 0.06207261f, 0.02331568f, -0.01876696f, -0.04473163f, -0.02498340f, 0.06425271f, 0.11960865f, 0.08262092f, + 0.45973777f, 0.45999547f, 0.38173824f, 0.22785755f, 0.16821465f, 0.17382620f, 0.20517627f, 0.04061839f, -0.12685907f, -0.26643193f, -0.37356030f, -0.36765140f, -0.32336919f, -0.29335060f, -0.29318189f, -0.07275984f, + -0.07969188f, -0.23669686f, -0.42690692f, -0.49932686f, -0.40006183f, -0.28450852f, -0.22942850f, -0.12475617f, -0.03421007f, 0.12993786f, 0.27530393f, 0.32731838f, 0.50859567f, 0.47553443f, 0.32383390f, 0.27506335f, + 0.34046042f, 0.28909102f, 0.17226731f, 0.06244214f, 0.10377957f, 0.13146006f, 0.03081777f, -0.02599206f, -0.11020633f, -0.20031818f, -0.27040991f, -0.19266314f, -0.09502591f, -0.17705982f, -0.16383079f, 0.10518781f, + -0.43345226f, 0.01054419f, 0.06653837f, 0.02899912f, 0.04789640f, 0.03995846f, 0.02631173f, 0.04744618f, 0.05142942f, 0.03249742f, 0.03044055f, 0.03518159f, 0.01592359f, 0.00998224f, -0.00417209f, -0.00552518f, + -0.35779590f, -0.24084024f, -0.08920896f, -0.01964746f, -0.04518980f, 0.07193759f, 0.22722040f, 0.28999718f, 0.39417664f, 0.30171530f, 0.12526317f, 0.00759665f, -0.11081727f, -0.17325866f, -0.19301481f, -0.18813416f, + -0.16184582f, -0.19051919f, -0.19758934f, -0.16274525f, -0.19869541f, -0.22576659f, -0.13506612f, 0.01672518f, 0.13044875f, 0.26035967f, 0.27598891f, 0.22195891f, 0.13262193f, 0.13096192f, 0.10021772f, 0.00294471f, + 0.07825952f, 0.06525092f, 0.17527642f, 0.02096373f, -0.24373383f, -0.29324959f, -0.11558339f, -0.03040273f, 0.01406029f, 0.04150557f, 0.06984124f, 0.07372710f, 0.06551062f, 0.06332513f, 0.02509070f, -0.00984142f, + 0.08701726f, 0.12843394f, 0.16700094f, 0.15034452f, 0.12947411f, -0.01656238f, -0.15483649f, -0.18970569f, -0.18557831f, -0.09352705f, -0.01998975f, -0.00988876f, 0.00753489f, 0.01530672f, 0.00965047f, -0.02467425f, + 0.26197082f, 0.21849905f, 0.21673972f, 0.16654799f, 0.18547759f, 0.16177425f, 0.16111117f, 0.20927596f, 0.18073438f, 0.03535012f, -0.14032550f, -0.22486416f, -0.33259461f, -0.40957544f, -0.38613800f, -0.30398287f +}; + +const float ivas_sns_cdbks_side_tcx10_stage2[ 8 * 16 ] = { + -0.13993218f, -0.02453874f, 0.12672628f, 0.02785695f, 0.06681568f, 0.12811808f, 0.07492973f, -0.01977524f, -0.05822869f, -0.07547464f, -0.06553072f, -0.05473233f, -0.04357434f, -0.00634272f, 0.03406826f, 0.02961442f, + -0.06711216f, -0.11444162f, -0.09789788f, -0.09123304f, -0.12190348f, -0.00995424f, 0.10989921f, 0.11555575f, 0.06002452f, 0.03801973f, 0.02047622f, 0.01721280f, 0.02414692f, 0.02829613f, 0.03827912f, 0.05063187f, + 0.05523005f, 0.03052467f, 0.03910551f, 0.05802321f, 0.02158461f, 0.03249705f, 0.04015871f, -0.00878163f, -0.05597684f, -0.02391125f, 0.03722223f, 0.06349026f, 0.02718346f, -0.07380323f, -0.12743287f, -0.11511406f, + 0.11202279f, 0.20074913f, 0.04546646f, -0.10844616f, -0.14193153f, -0.08529745f, -0.03252409f, 0.03394947f, 0.04414551f, 0.00658101f, -0.01249852f, -0.01845361f, -0.01335408f, -0.01042434f, -0.00769413f, -0.01229041f, + -0.04167890f, -0.07371348f, -0.14826543f, 0.02126701f, 0.16009313f, 0.11910639f, 0.05602141f, 0.08082496f, 0.12544839f, 0.05415940f, -0.03080142f, -0.04070302f, -0.06024186f, -0.07129750f, -0.07769974f, -0.07251926f, + -0.07457123f, -0.04115197f, -0.04049765f, -0.06857318f, -0.04225051f, -0.03861733f, -0.05120942f, -0.08876715f, -0.05537668f, 0.03678654f, 0.09038235f, 0.06681871f, 0.08915640f, 0.13108744f, 0.08129597f, 0.00548771f, + -0.05294641f, 0.03370244f, 0.16024587f, 0.17199155f, 0.02454307f, -0.13278320f, -0.13945295f, -0.04199699f, 0.00678627f, 0.02029543f, 0.00856028f, 0.00137417f, -0.01135502f, -0.03017687f, -0.02257884f, 0.00379131f, + 0.20898804f, -0.01113044f, -0.08488316f, -0.01088633f, 0.03304903f, -0.01306932f, -0.05782260f, -0.07100917f, -0.06682249f, -0.05645623f, -0.04781041f, -0.03500698f, -0.01196148f, 0.03266111f, 0.08176223f, 0.11039842f +}; + +const float *const ivas_sns_cdbks_side_tcx10[SNS_MSVQ_NSTAGES_SIDE] = { ivas_sns_cdbks_side_tcx10_stage1, ivas_sns_cdbks_side_tcx10_stage2 }; + +#endif // SNS_MSVQ /* clang-format on */ diff --git a/lib_com/ivas_rom_com.h b/lib_com/ivas_rom_com.h index 2b3755087c..9e3c431e70 100644 --- a/lib_com/ivas_rom_com.h +++ b/lib_com/ivas_rom_com.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,7 +37,6 @@ #include "options.h" #include "cnst.h" #include "ivas_cnst.h" -#include "typedef.h" #include "stat_com.h" #include "ivas_stat_com.h" #ifdef DEBUGGING @@ -116,10 +115,10 @@ extern const float tdm_LSF_MEAN_RE_USE_OUT[M]; extern const float tdm_LSF_MEAN_RE_USE_IN[M]; extern const float tdm_LSF_MEAN_RE_USE[M]; -extern const float tdm_Beta_Q1bit_re_use_132[2]; -extern const float tdm_Beta_Q1bit_re_use_164[2]; -extern const float tdm_Beta_Q1bit_re_use_244_320[2]; -extern const float tdm_Beta_Q1bit_re_use_480[2]; +extern const float tdm_Beta_Q1bit_re_use_13k2[2]; +extern const float tdm_Beta_Q1bit_re_use_16k4[2]; +extern const float tdm_Beta_Q1bit_re_use_24k4_32k[2]; +extern const float tdm_Beta_Q1bit_re_use_48k[2]; extern const float tdm_RE_USE_adaptive_beta_prd_diag_3[15 + 16 + 15]; #endif @@ -319,6 +318,7 @@ extern const float McMASA_LFEGain_vectors[64]; extern const float ism_azimuth_borders[4]; extern const float ism_elevation_borders[4]; + /*----------------------------------------------------------------------------------* * Param ISM ROM tables *----------------------------------------------------------------------------------*/ @@ -364,6 +364,9 @@ extern const float ivas_cos_twiddle_80[IVAS_80_PT_LEN >> 1]; extern const float ivas_mdft_coeff_cos_twid_240[IVAS_240_PT_LEN + 1]; extern const float ivas_mdft_coeff_cos_twid_160[IVAS_160_PT_LEN + 1]; +#ifdef PARAMMC_SHORT_ENC_MDFT +extern const float ivas_mdft_coeff_cos_twid_120[IVAS_120_PT_LEN + 1]; +#endif extern const float ivas_mdft_coeff_cos_twid_80[IVAS_80_PT_LEN + 1]; extern const float ivas_mdft_coeff_cos_twid_40[IVAS_40_PT_LEN + 1]; extern const float ivas_mdft_coeff_cos_twid_960[IVAS_960_PT_LEN + 1]; @@ -400,5 +403,32 @@ extern const float ivas_fb_resp_cheby_ramp_16del[IVAS_FB_1MS_16K_SAMP + 1]; extern const int16_t ivas_num_active_bands[FB - WB + 1]; +#ifdef SNS_MSVQ +/*------------------------------------------------------------------------------------------* + * SNS MSVQ codebooks and means + *------------------------------------------------------------------------------------------*/ +extern const int16_t ivas_sns_cdbks_tcx20_levels[]; +extern const int16_t ivas_sns_cdbks_tcx20_bits[]; + +extern const int16_t ivas_sns_cdbks_tcx10_levels[]; +extern const int16_t ivas_sns_cdbks_tcx10_bits[]; + +extern const float *const ivas_sns_cdbks_tcx20[]; +extern const float *const ivas_sns_cdbks_tcx10[]; + +extern const float ivas_sns_means_tcx20[]; +extern const float ivas_sns_means_tcx10[]; + +extern const int16_t ivas_sns_cdbks_side_tcx20_levels[]; +extern const int16_t ivas_sns_cdbks_side_tcx20_bits[]; +extern const int16_t ivas_sns_cdbks_side_tcx10_levels[]; +extern const int16_t ivas_sns_cdbks_side_tcx10_bits[]; + +extern const float *const ivas_sns_cdbks_side_tcx20[]; +extern const float ivas_sns_means_side_tcx20[]; +extern const float *const ivas_sns_cdbks_side_tcx10[]; +extern const float ivas_sns_means_side_tcx10[]; +#endif + /* IVAS_ROM_COM_H */ #endif diff --git a/lib_com/ivas_sba_config.c b/lib_com/ivas_sba_config.c index 64635577b4..1dc3c4faed 100644 --- a/lib_com/ivas_sba_config.c +++ b/lib_com/ivas_sba_config.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* @@ -55,9 +55,12 @@ /*! r: SBA format mode */ SBA_MODE ivas_sba_mode_select( +#ifndef LBR_SBA const int32_t ivas_total_brate /* i : IVAS total bitrate */ +#endif ) { +#ifndef LBR_SBA SBA_MODE sba_mode; if ( ivas_total_brate == IVAS_13k2 || ivas_total_brate == IVAS_16k4 ) @@ -70,32 +73,10 @@ SBA_MODE ivas_sba_mode_select( } return sba_mode; -} - -#ifdef SBA_BR_SWITCHING -/*-------------------------------------------------------------------* - * get_sba_reinit_flag() - * - * Get SBA reinitialisation flag - *-------------------------------------------------------------------*/ - -int16_t get_sba_reinit_flag( - int32_t ivas_total_bitrate, /* i : Current bitrate */ - int32_t last_ivas_total_brate /* i : Previous bitrate */ -) -{ - int16_t sba_reinit_flag; - - sba_reinit_flag = 0; - if ( ivas_total_bitrate != last_ivas_total_brate && ( last_ivas_total_brate > IVAS_SID_5k2 ) && ( ivas_total_bitrate > IVAS_SID_5k2 ) ) - { - sba_reinit_flag = 1; - } - - return sba_reinit_flag; -} +#else + return SBA_MODE_SPAR; #endif - +} /*-------------------------------------------------------------------* * ivas_sba_config() * @@ -224,33 +205,6 @@ int16_t ivas_sba_get_analysis_order( } -/*-------------------------------------------------------------------* - * ivas_sba_get_order_transport() - * - * Get effective Ambisonic order from number of transport channels - *-------------------------------------------------------------------*/ - -int16_t ivas_sba_get_order_transport( - const int16_t nchan_transport /* i : Number of transport channels */ -) -{ - int16_t sba_order; - - sba_order = SBA_FOA_ORDER; - - if ( nchan_transport > 6 ) - { - sba_order = SBA_HOA3_ORDER; - } - else if ( nchan_transport > 4 ) - { - sba_order = SBA_HOA2_ORDER; - } - - return ( sba_order ); -} - - /*-------------------------------------------------------------------* * ivas_sba_get_nchan() * diff --git a/lib_com/ivas_sns_com.c b/lib_com/ivas_sns_com.c index cc0f07ffe0..e4515a9854 100644 --- a/lib_com/ivas_sns_com.c +++ b/lib_com/ivas_sns_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------- diff --git a/lib_com/ivas_spar_com.c b/lib_com/ivas_spar_com.c index 31db5f1bbc..da731676db 100644 --- a/lib_com/ivas_spar_com.c +++ b/lib_com/ivas_spar_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "ivas_rom_com.h" #include "cnst.h" #include -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------------------------* @@ -59,8 +59,11 @@ #define IVAS_REMIX_MULT_FAC ( 0.5f ) -#define IVAS_ACTIVEW_DM_F ( 1.0f ) -#define IVAS_ACTIVEW_DM_F_DTX ( 0.25f ) +#define IVAS_ACTIVEW_DM_F ( 1.0f ) +#define IVAS_ACTIVEW_DM_F_DTX ( 0.25f ) +#ifdef LBR_SBA +#define IVAS_ACTIVEW_DM_F_VLBR ( 0.25f ) +#endif #define IVAS_LIN_ACTIVEW_QUAD_ACTIVEW_THRESH ( 3.0f ) #define IVAS_P_NORM_SCALING ( 1.0f ) @@ -76,11 +79,20 @@ *------------------------------------------------------------------------------------------*/ -static void ivas_get_pred_coeffs( float *pppCov_mat_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], float ppPred_coeffs_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS], float ppDM_Fv_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS], const int16_t in_chans, const int16_t start_band, const int16_t end_band, const int16_t active_w, const int16_t dtx_vad, const int16_t from_dirac ); +static void ivas_get_pred_coeffs( float *pppCov_mat_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], float ppPred_coeffs_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS], float ppDM_Fv_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS], const int16_t in_chans, const int16_t start_band, const int16_t end_band, const int16_t active_w, +#ifdef LBR_SBA + const int16_t active_w_vlbr, +#endif + const int16_t dtx_vad, + const int16_t from_dirac ); static void ivas_reorder_array( float in_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH][IVAS_MAX_NUM_BANDS], const int16_t in_chans, const int16_t order[IVAS_SPAR_MAX_CH], float ***mixer_mat, const int16_t start_band, const int16_t end_band ); -static void ivas_get_Wscaling_factor( float *pppCov_mat_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], float pred_coeffs_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS], float ***mixer_mat, const int16_t start_band, const int16_t end_band, const int16_t dtx_vad, const int16_t num_ch, const int16_t *pNum_dmx, const int16_t bands_bw, const int16_t active_w, float *pWscale ); +static void ivas_get_Wscaling_factor( float *pppCov_mat_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], float pred_coeffs_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS], float ***mixer_mat, const int16_t start_band, const int16_t end_band, const int16_t dtx_vad, const int16_t num_ch, const int16_t *pNum_dmx, const int16_t bands_bw, const int16_t active_w, +#ifdef LBR_SBA + const int16_t active_w_vlbr, +#endif + float *pWscale ); static void ivas_calc_post_pred_per_band( float *pppCov_mat_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], float ***mixer_mat, const int16_t num_ch, const int16_t num_dmx, const int16_t band_idx, float postpred_cov_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH] ); @@ -338,8 +350,11 @@ void ivas_spar_config( { ivas_total_brate = IVAS_32k; } - +#ifdef LBR_SBA + assert( ivas_total_brate == IVAS_32k || ivas_total_brate == IVAS_24k4 || ivas_total_brate == IVAS_16k4 || ivas_total_brate == IVAS_13k2 ); +#else assert( ivas_total_brate == IVAS_32k || ivas_total_brate == IVAS_24k4 ); +#endif if ( ivas_total_brate == IVAS_32k ) { *core_nominal_brate = ACELP_24k40; @@ -348,6 +363,16 @@ void ivas_spar_config( { *core_nominal_brate = ACELP_16k40; } +#ifdef LBR_SBA + else if ( ivas_total_brate == IVAS_16k4 ) + { + *core_nominal_brate = ACELP_13k20; + } + else if ( ivas_total_brate == IVAS_13k2 ) + { + *core_nominal_brate = ACELP_9k60; + } +#endif } return; @@ -427,7 +452,11 @@ int16_t ivas_get_sba_num_TCs( { nchan_transport = 1; } +#ifndef LBR_SBA else if ( ivas_sba_mode_select( ivas_total_brate ) == SBA_MODE_DIRAC ) +#else + else if ( ivas_sba_mode_select() == SBA_MODE_DIRAC ) +#endif { nchan_transport = 1; } @@ -456,6 +485,9 @@ static void ivas_get_pred_coeffs( const int16_t start_band, const int16_t end_band, const int16_t active_w, +#ifdef LBR_SBA + const int16_t active_w_vlbr, +#endif const int16_t dtx_vad, const int16_t from_dirac ) { @@ -546,7 +578,11 @@ static void ivas_get_pred_coeffs( } else { +#ifdef LBR_SBA + dm_f_local = ( active_w_vlbr ) ? IVAS_ACTIVEW_DM_F_VLBR : IVAS_ACTIVEW_DM_F; +#else dm_f_local = IVAS_ACTIVEW_DM_F; +#endif } for ( b = start_band; b < end_band; b++ ) @@ -645,6 +681,9 @@ static void ivas_get_Wscaling_factor( const int16_t *pNum_dmx, const int16_t bands_bw, const int16_t active_w, +#ifdef LBR_SBA + const int16_t active_w_vlbr, +#endif float *pWscale ) { int16_t b, ch; @@ -657,7 +696,11 @@ static void ivas_get_Wscaling_factor( } else { +#ifdef LBR_SBA + dm_f_local = ( active_w_vlbr ) ? IVAS_ACTIVEW_DM_F_SCALE_VLBR : IVAS_ACTIVEW_DM_F_SCALE; +#else dm_f_local = IVAS_ACTIVEW_DM_F_SCALE; +#endif } for ( b = start_band; b < end_band; b++ ) @@ -1538,6 +1581,9 @@ void ivas_compute_spar_params( const int16_t num_ch, const int16_t bands_bw, const int16_t active_w, +#ifdef LBR_SBA + const int16_t active_w_vlbr, +#endif ivas_spar_md_com_cfg *hSparCfg, ivas_spar_md_t *hSparMd, float *pWscale, @@ -1546,7 +1592,11 @@ void ivas_compute_spar_params( float pred_coeffs_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS]; int16_t b, i, ndm; - ivas_get_pred_coeffs( cov_real, pred_coeffs_re, dm_fv_re, num_ch, start_band, end_band, active_w, dtx_vad, from_dirac ); + ivas_get_pred_coeffs( cov_real, pred_coeffs_re, dm_fv_re, num_ch, start_band, end_band, active_w, +#ifdef LBR_SBA + active_w_vlbr, +#endif + dtx_vad, from_dirac ); #ifdef SPAR_HOA_DBG /*fprintf(stderr, "\n\n Prediction Coefficients:\n"); @@ -1578,7 +1628,11 @@ void ivas_compute_spar_params( #endif ivas_get_Wscaling_factor( cov_real, pred_coeffs_re, mixer_mat, start_band, end_band, dtx_vad, num_ch, - hSparCfg->num_dmx_chans_per_band, bands_bw, active_w, pWscale ); + hSparCfg->num_dmx_chans_per_band, bands_bw, active_w, +#ifdef LBR_SBA + active_w_vlbr, +#endif + pWscale ); for ( b = start_band; b < end_band; b++ ) { @@ -1648,7 +1702,13 @@ void ivas_get_spar_md_from_dirac( const int16_t end_band, const int16_t order, const int16_t dtx_vad, - float Wscale_d[IVAS_MAX_NUM_BANDS] ) + float Wscale_d[IVAS_MAX_NUM_BANDS] +#ifdef LBR_SBA + , + const uint8_t useLowerRes, + const int16_t active_w_vlbr +#endif +) { int16_t num_ch, band, i, j; int16_t block, ch; @@ -1684,7 +1744,11 @@ void ivas_get_spar_md_from_dirac( ppMixer_mat[i] = pMixer_mat[i]; } +#ifdef LBR_SBA + if ( ( start_band >= 6 && hSpar_md_cfg->nchan_transport <= 2 && ( dtx_vad == 1 ) ) || ( useLowerRes && start_band >= 3 && hSpar_md_cfg->nchan_transport <= 2 && ( dtx_vad == 1 ) ) ) +#else if ( start_band >= 6 && hSpar_md_cfg->nchan_transport <= 2 && ( dtx_vad == 1 ) ) +#endif { float P_norm[3]; int16_t idx; @@ -1743,6 +1807,12 @@ void ivas_get_spar_md_from_dirac( { ivas_dirac_dec_get_response( (int16_t) azi_dirac[band][i_ts], (int16_t) ele_dirac[band][i_ts], response_avg, order ); } +#ifdef LBR_SBA + else if ( useLowerRes ) + { + ivas_dirac_dec_get_response( (int16_t) azi_dirac[band][0], (int16_t) ele_dirac[band][0], response_avg, order ); + } +#endif else { for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; block++ ) @@ -1905,7 +1975,11 @@ void ivas_get_spar_md_from_dirac( #endif ivas_compute_spar_params( pCov_real, dm_fv_re, i_ts, ppMixer_mat, start_band, end_band, dtx_vad, - num_ch, 1, hSpar_md_cfg->active_w, hSpar_md_cfg, hSpar_md, Wscale, 1 ); + num_ch, 1, hSpar_md_cfg->active_w, +#ifdef LBR_SBA + active_w_vlbr, +#endif + hSpar_md_cfg, hSpar_md, Wscale, 1 ); if ( mixer_mat != NULL ) { @@ -2149,7 +2223,6 @@ void ivas_spar_set_bitrate_config( } -#ifdef FIX_I1_113 /*-----------------------------------------------------------------------------------------* * Function ivas_spar_bitrate_dist() * @@ -2239,4 +2312,3 @@ void ivas_spar_bitrate_dist( return; } -#endif diff --git a/lib_com/ivas_spar_com_quant_util.c b/lib_com/ivas_spar_com_quant_util.c index c095e20107..355e02ca76 100644 --- a/lib_com/ivas_spar_com_quant_util.c +++ b/lib_com/ivas_spar_com_quant_util.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "ivas_prot.h" #include "ivas_rom_com.h" #include -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------------------------* * Function ivas_quantise_real_values() diff --git a/lib_com/ivas_stat_com.h b/lib_com/ivas_stat_com.h index 79d29ea575..22feb9b164 100644 --- a/lib_com/ivas_stat_com.h +++ b/lib_com/ivas_stat_com.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,9 +41,15 @@ /*----------------------------------------------------------------------------------* - * Declaration of ISm common (encoder & decoder) structure + * Declaration of ISM common (encoder & decoder) structure *----------------------------------------------------------------------------------*/ - +typedef struct +{ + int16_t last_angle1_idx; /* last frame index of coded azimuth/yaw */ + int16_t angle1_diff_cnt; /* FEC counter of consecutive differentially azimuth/yaw coded frames */ + int16_t last_angle2_idx; /* last frame index of coded elevation/pitch */ + int16_t angle2_diff_cnt; /* FEC counter of consecutive differentially elevation/pitch coded frames */ +} ISM_METADATA_ANGLE, *ISM_METADATA_ANGLE_HANDLE; /* ISM metadata handle (storage for one frame of read ISM metadata) */ typedef struct { @@ -52,11 +58,23 @@ typedef struct float azimuth; /* azimuth value read from the input metadata file */ float elevation; /* azimuth value read from the input metadata file */ - - int16_t last_azimuth_idx; /* last frame index of coded azimuth */ - int16_t azimuth_diff_cnt; /* FEC counter of consecutive differentially azimuth coded frames */ - int16_t last_elevation_idx; /* last frame index of coded elevation */ - int16_t elevation_diff_cnt; /* FEC counter of consecutive differentially elevation coded frames */ + float radius; + float yaw; /* azimuth orientation value read from the input metadata file */ + float pitch; /* elevation orientation value read from the input metadata file */ + ISM_METADATA_ANGLE position_angle; /* Angle structs for azimuth and elevation */ + ISM_METADATA_ANGLE orientation_angle; /* Angle structs for yaw and pitch */ + int16_t last_radius_idx; /* last frame index of coded radius */ + int16_t radius_diff_cnt; /* FEC counter of consecutive differentially radius coded frames */ + + float last_azimuth; /* MD smoothing in DTX- last Q azimuth value */ + float last_elevation; /* MD smoothing in DTX - last Q elevation value */ + float last_true_azimuth; /* MD smoothing in DTX- last true Q azimuth value */ + float last_true_elevation; /* MD smoothing in DTX- last true Q elevation value */ + +#ifdef FIX_387_ISM_MD_FEC + int16_t ism_md_fec_cnt_enc; /* counter of continuous frames where MD are not transmitted */ + int16_t ism_md_inc_diff_cnt; /* counter of continuous frames where MD are transmitted in inactive segments when MD significantly changes */ +#endif } ISM_METADATA_FRAME, *ISM_METADATA_HANDLE; @@ -130,7 +148,6 @@ typedef struct ivas_param_ism_data_structure int16_t nbands; int16_t nblocks[MAX_PARAM_ISM_NBANDS]; int16_t band_grouping[MAX_PARAM_ISM_NBANDS + 1]; - int16_t num_obj; int16_t azi_index[MAX_NUM_OBJECTS]; int16_t ele_index[MAX_NUM_OBJECTS]; @@ -655,6 +672,32 @@ typedef struct ivas_trans_det_state_t } ivas_trans_det_state_t; +/*----------------------------------------------------------------------------------* + * Time domain decorrelator + *----------------------------------------------------------------------------------*/ + +typedef struct ivas_td_decorr_APD_filt_state_t +{ + int16_t order[IVAS_MAX_DECORR_APD_SECTIONS]; + int16_t idx[IVAS_MAX_DECORR_APD_SECTIONS]; + float coeffs[IVAS_MAX_DECORR_APD_SECTIONS]; + float *state[IVAS_MAX_DECORR_APD_SECTIONS]; + +} ivas_td_decorr_APD_filt_state_t; + +typedef struct ivas_td_decorr_state_t +{ + ivas_trans_det_state_t *pTrans_det; + float *look_ahead_buf; + ivas_td_decorr_APD_filt_state_t APD_filt_state[IVAS_MAX_DECORR_CHS]; + + int16_t num_apd_outputs; + int16_t num_apd_sections; + int16_t ducking_flag; + +} ivas_td_decorr_state_t; + + /*----------------------------------------------------------------------------------* * Filter Bank (FB) structures *----------------------------------------------------------------------------------*/ diff --git a/lib_com/ivas_stereo_dft_com.c b/lib_com/ivas_stereo_dft_com.c index 2b889dde0a..1b7f0101ef 100644 --- a/lib_com/ivas_stereo_dft_com.c +++ b/lib_com/ivas_stereo_dft_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #include "ivas_prot.h" #include "prot.h" #include "cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------- * stereo_dft_config() diff --git a/lib_com/ivas_stereo_eclvq_com.c b/lib_com/ivas_stereo_eclvq_com.c index 76fcff1395..ff78a66eba 100644 --- a/lib_com/ivas_stereo_eclvq_com.c +++ b/lib_com/ivas_stereo_eclvq_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,7 +37,7 @@ #include "ivas_cnst.h" #include #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------- * ECSQ_init_instance() diff --git a/lib_com/ivas_stereo_ica_com.c b/lib_com/ivas_stereo_ica_com.c index b35c438d2e..f2fd09eca3 100644 --- a/lib_com/ivas_stereo_ica_com.c +++ b/lib_com/ivas_stereo_ica_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" #include "rom_com.h" #include "ivas_rom_com.h" diff --git a/lib_com/ivas_stereo_mdct_bands_com.c b/lib_com/ivas_stereo_mdct_bands_com.c index 16149941e4..19a1295f2d 100644 --- a/lib_com/ivas_stereo_mdct_bands_com.c +++ b/lib_com/ivas_stereo_mdct_bands_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #include "ivas_prot.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local union @@ -225,6 +225,9 @@ void stereo_mdct_init_igf_start_band( { int16_t i, bitRateIndex, igfStartLine; const int16_t *swb_offset; +#ifdef DEBUGGING + stbParams->sfbIgfStart = 0; +#endif bitRateIndex = IGF_MapBitRateToIndex( element_brate, bwidth, IVAS_CPE_MDCT, 0 ); swb_offset = &swb_offset_LB_new[bitRateIndex][1]; diff --git a/lib_com/ivas_stereo_mdct_stereo_com.c b/lib_com/ivas_stereo_mdct_stereo_com.c index cbb1423cd1..c9151b72df 100644 --- a/lib_com/ivas_stereo_mdct_stereo_com.c +++ b/lib_com/ivas_stereo_mdct_stereo_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -34,7 +34,7 @@ #include "options.h" #include "ivas_cnst.h" #include "ivas_prot.h" -#include "wmops.h" +#include "wmc_auto.h" #include /*-------------------------------------------------------------------* diff --git a/lib_com/ivas_stereo_psychlpc_com.c b/lib_com/ivas_stereo_psychlpc_com.c index 8a50caaa29..aa24ef6b80 100644 --- a/lib_com/ivas_stereo_psychlpc_com.c +++ b/lib_com/ivas_stereo_psychlpc_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -36,7 +36,7 @@ #include "ivas_prot.h" #include "prot.h" #include "ivas_prot.h" -#include "wmops.h" +#include "wmc_auto.h" #include /*-------------------------------------------------------------------* diff --git a/lib_com/ivas_stereo_td_bit_alloc.c b/lib_com/ivas_stereo_td_bit_alloc.c index 7d5b0afb55..b1fa0a49c8 100644 --- a/lib_com/ivas_stereo_td_bit_alloc.c +++ b/lib_com/ivas_stereo_td_bit_alloc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "ivas_rom_com.h" #include "ivas_cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* @@ -487,7 +487,7 @@ void td_stereo_param_updt( static void tdm_SCh_LSF_intra_pred_zero_bits( const float *tdm_lsfQ_PCh, /* i : primary channel LSFs */ - float *pred_lsf_secondary, /* o : predicted secondary channel LSFs */ + float *pred_lsf_SCh, /* o : predicted secondary channel LSFs */ const float *lsf_mean, /* i : secondary channel mean LSFs */ const float beta /* i : pull to average beta factor */ ) @@ -497,7 +497,7 @@ static void tdm_SCh_LSF_intra_pred_zero_bits( /* pulling the LSFs closer to the average */ for ( i = 0; i < M; i++ ) { - pred_lsf_secondary[i] = beta * tdm_lsfQ_PCh[i] + ( 1.0f - beta ) * lsf_mean[i]; + pred_lsf_SCh[i] = beta * tdm_lsfQ_PCh[i] + ( 1.0f - beta ) * lsf_mean[i]; } return; @@ -511,7 +511,7 @@ static void tdm_SCh_LSF_intra_pred_zero_bits( *-------------------------------------------------------------------*/ static void tdm_SCh_LSF_intra_pred_tri_diag_mat( - float *lsf_secondary, /* i/o: secondary channel LSFs */ + float *lsf_SCh, /* i/o: secondary channel LSFs */ const float *lsf_mean_in, /* i : secondary channel mean LSFs (in) */ const float *lsf_mean_out, /* i : secondary channel mean LSFs (out) */ const float *prd_diag_3 /* i : secondary channel mean LSFs */ @@ -522,37 +522,38 @@ static void tdm_SCh_LSF_intra_pred_tri_diag_mat( const float *prd_ptr; float *lsf_tmp_ptr1; float *lsf_tmp_ptr2; - float *lsf_second_ptr; + float *lsf_SCh_ptr; prd_ptr = prd_diag_3; - v_sub( lsf_secondary, lsf_mean_in, lsf_tmp, M ); + v_sub( lsf_SCh, lsf_mean_in, lsf_tmp, M ); lsf_tmp_ptr1 = lsf_tmp; - lsf_second_ptr = lsf_secondary; + lsf_SCh_ptr = lsf_SCh; lsf_tmp_ptr2 = lsf_tmp_ptr1; - *lsf_second_ptr = ( *lsf_tmp_ptr1++ ) * ( *prd_ptr++ ); - ( *lsf_second_ptr++ ) += ( *lsf_tmp_ptr1 ) * ( *prd_ptr++ ); + *lsf_SCh_ptr = ( *lsf_tmp_ptr1++ ) * ( *prd_ptr++ ); + ( *lsf_SCh_ptr++ ) += ( *lsf_tmp_ptr1 ) * ( *prd_ptr++ ); for ( i = 1; i < M - 1; i++ ) { lsf_tmp_ptr1 = lsf_tmp_ptr2; - *lsf_second_ptr = ( *lsf_tmp_ptr1++ ) * ( *prd_ptr++ ); + *lsf_SCh_ptr = ( *lsf_tmp_ptr1++ ) * ( *prd_ptr++ ); lsf_tmp_ptr2 = lsf_tmp_ptr1; - *lsf_second_ptr += ( *lsf_tmp_ptr1++ ) * ( *prd_ptr++ ); - ( *lsf_second_ptr++ ) += ( *lsf_tmp_ptr1 ) * ( *prd_ptr++ ); + *lsf_SCh_ptr += ( *lsf_tmp_ptr1++ ) * ( *prd_ptr++ ); + ( *lsf_SCh_ptr++ ) += ( *lsf_tmp_ptr1 ) * ( *prd_ptr++ ); } lsf_tmp_ptr1 = lsf_tmp_ptr2; - *lsf_second_ptr = ( *lsf_tmp_ptr1++ ) * ( *prd_ptr++ ); - *lsf_second_ptr += ( *lsf_tmp_ptr1 ) * ( *prd_ptr ); + *lsf_SCh_ptr = ( *lsf_tmp_ptr1++ ) * ( *prd_ptr++ ); + *lsf_SCh_ptr += ( *lsf_tmp_ptr1 ) * ( *prd_ptr ); - v_add( lsf_secondary, lsf_mean_out, lsf_secondary, M ); + v_add( lsf_SCh, lsf_mean_out, lsf_SCh, M ); return; } + /*-------------------------------------------------------------------* * tdm_SCh_LSF_intra_pred() * @@ -562,7 +563,7 @@ static void tdm_SCh_LSF_intra_pred_tri_diag_mat( void tdm_SCh_LSF_intra_pred( const int32_t element_brate, /* i : element bitrate */ const float *tdm_lsfQ_PCh, /* i : primary channel LSFs */ - float *pred_lsf_secondary /* o : predicted secondary channel LSFs */ + float *pred_lsf_SCh /* o : predicted secondary channel LSFs */ ) { float fixed_beta; @@ -588,15 +589,45 @@ void tdm_SCh_LSF_intra_pred( fixed_beta = 0.91F; } - tdm_SCh_LSF_intra_pred_zero_bits( tdm_lsfQ_PCh, pred_lsf_secondary, tdm_LSF_MEAN_PRED_QNT, fixed_beta ); + tdm_SCh_LSF_intra_pred_zero_bits( tdm_lsfQ_PCh, pred_lsf_SCh, tdm_LSF_MEAN_PRED_QNT, fixed_beta ); - tdm_SCh_LSF_intra_pred_tri_diag_mat( pred_lsf_secondary, tdm_LSF_MEAN_PRED_QNT_IN, tdm_LSF_MEAN_PRED_QNT_OUT, tdm_PRED_QNT_fixed_beta_prd_diag_3 ); + tdm_SCh_LSF_intra_pred_tri_diag_mat( pred_lsf_SCh, tdm_LSF_MEAN_PRED_QNT_IN, tdm_LSF_MEAN_PRED_QNT_OUT, tdm_PRED_QNT_fixed_beta_prd_diag_3 ); return; } #ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE + +/*-------------------------------------------------------------------* + * tdm_SCh_LSF_intra_pred_one_bit_dec() + * + * + *-------------------------------------------------------------------*/ + +static void tdm_SCh_LSF_intra_pred_one_bit_dec( + const float *tdm_lsfQ_PCh, /* i : primary channel LSFs */ + float *pred_lsf_SCh, /* o : predicted secondary channel LSFs */ + const float *lsf_mean, /* i : secondary channel mean LSFs */ + const float *Beta_Q_x, /* i : beta quantization values */ + const int16_t beta_index /* i : the quantization bits for beta (-1 if beta fixed)*/ +) +{ + int16_t i; + float beta; + + beta = Beta_Q_x[beta_index]; + + /* pulling the LSFs closer to the avergae */ + for ( i = 0; i < M; i++ ) + { + pred_lsf_SCh[i] = beta * tdm_lsfQ_PCh[i] + ( 1.0f - beta ) * lsf_mean[i]; + } + + return; +} + + /*-------------------------------------------------------------------* * tdm_SCh_LSF_intra_pred_one_bit_enc() * @@ -604,29 +635,28 @@ void tdm_SCh_LSF_intra_pred( *-------------------------------------------------------------------*/ static void tdm_SCh_LSF_intra_pred_one_bit_enc( - const float *lsf_secondary, /* i : secondary channel LSFs */ - const float *tdm_lsfQ_PCh, /* i : primary channel LSFs */ - float *pred_lsf_secondary, /* o : predicted secondary channel LSFs */ - const float *lsf_mean, /* i : secondary channel mean LSFs */ - const float *lsf_wgts_new, /* i : Improved wgts for LSFs */ - const float *Beta_Q_x, /* i : beta quantization values */ - int16_t *beta_index /* o : the quantization bits for beta (-1 if beta fixed) */ + const float *lsf_SCh, /* i : secondary channel LSFs */ + const float *tdm_lsfQ_PCh, /* i : primary channel LSFs */ + float *pred_lsf_SCh, /* o : predicted secondary channel LSFs */ + const float *lsf_mean, /* i : secondary channel mean LSFs */ + const float *lsf_wgts_new, /* i : Improved wgts for LSFs */ + const float *Beta_Q_x, /* i : beta quantization values */ + int16_t *beta_index /* o : the quantization bits for beta (-1 if beta fixed) */ ) { int16_t i; float A_temp[M]; float B_temp[M]; float WD[2]; - float beta; for ( i = 0; i < M; i++ ) { - A_temp[i] = lsf_secondary[i] - lsf_mean[i]; + A_temp[i] = lsf_SCh[i] - lsf_mean[i]; B_temp[i] = lsf_mean[i] - tdm_lsfQ_PCh[i]; } - WD[0] = 0.; - WD[1] = 0.; + WD[0] = 0.f; + WD[1] = 0.f; for ( i = 0; i < M; i++ ) { WD[0] += lsf_wgts_new[i] * SQR( A_temp[i] ) + 2.0f * Beta_Q_x[0] * lsf_wgts_new[i] * A_temp[i] * B_temp[i] + lsf_wgts_new[i] * SQR( Beta_Q_x[0] ) * SQR( B_temp[i] ); @@ -635,49 +665,14 @@ static void tdm_SCh_LSF_intra_pred_one_bit_enc( if ( WD[0] < WD[1] ) { - beta = Beta_Q_x[0]; *beta_index = 0; } else { - beta = Beta_Q_x[1]; *beta_index = 1; } - /* pulling the LSFs closer to the avergae */ - for ( i = 0; i < M; i++ ) - { - pred_lsf_secondary[i] = beta * tdm_lsfQ_PCh[i] + ( 1.0f - beta ) * lsf_mean[i]; - } - - return; -} - - -/*-------------------------------------------------------------------* - * tdm_SCh_LSF_intra_pred_one_bit_dec() - * - * - *-------------------------------------------------------------------*/ - -static void tdm_SCh_LSF_intra_pred_one_bit_dec( - const float *tdm_lsfQ_PCh, /* i : primary channel LSFs */ - float *pred_lsf_secondary, /* o : predicted secondary channel LSFs */ - const float *lsf_mean, /* i : secondary channel mean LSFs */ - const float *Beta_Q_x, /* i : beta quantization values */ - const int16_t beta_index /* i : the quantization bits for beta (-1 if beta fixed)*/ -) -{ - int16_t i; - float beta; - - beta = Beta_Q_x[beta_index]; - - /* pulling the LSFs closer to the avergae */ - for ( i = 0; i < M; i++ ) - { - pred_lsf_secondary[i] = beta * tdm_lsfQ_PCh[i] + ( 1.0f - beta ) * lsf_mean[i]; - } + tdm_SCh_LSF_intra_pred_one_bit_dec( tdm_lsfQ_PCh, pred_lsf_SCh, tdm_LSF_MEAN_RE_USE, Beta_Q_x, *beta_index ); return; } @@ -696,26 +691,26 @@ void tdm_SCh_lsf_reuse( float lsp_new[M], /* i/o: LSPs at the end of the frame */ const float tdm_lsfQ_PCh[M], /* i : primary channel LSFs */ const float lsf_wgts[M], /* i : LSF weights */ - int16_t beta_index[] /* i/o: quantization index */ + int16_t *beta_index /* i/o: quantization index */ ) { const float *Beta_Q1bit_re_use; if ( element_brate <= IVAS_13k2 ) { - Beta_Q1bit_re_use = &tdm_Beta_Q1bit_re_use_132[0]; + Beta_Q1bit_re_use = tdm_Beta_Q1bit_re_use_13k2; } else if ( element_brate <= IVAS_16k4 ) { - Beta_Q1bit_re_use = &tdm_Beta_Q1bit_re_use_164[0]; + Beta_Q1bit_re_use = tdm_Beta_Q1bit_re_use_16k4; } else if ( element_brate <= IVAS_32k ) { - Beta_Q1bit_re_use = &tdm_Beta_Q1bit_re_use_244_320[0]; + Beta_Q1bit_re_use = tdm_Beta_Q1bit_re_use_24k4_32k; } else { - Beta_Q1bit_re_use = &tdm_Beta_Q1bit_re_use_480[0]; + Beta_Q1bit_re_use = tdm_Beta_Q1bit_re_use_48k; } if ( enc_dec == ENC ) @@ -729,7 +724,7 @@ void tdm_SCh_lsf_reuse( tdm_SCh_LSF_intra_pred_tri_diag_mat( lsf_new, tdm_LSF_MEAN_RE_USE_IN, tdm_LSF_MEAN_RE_USE_OUT, tdm_RE_USE_adaptive_beta_prd_diag_3 ); - lsf2lsp( lsf_new, lsp_new, M, 12800 ); + lsf2lsp( lsf_new, lsp_new, M, INT_FS_12k8 ); return; } diff --git a/lib_dec/ivas_td_decorr.c b/lib_com/ivas_td_decorr.c similarity index 72% rename from lib_dec/ivas_td_decorr.c rename to lib_com/ivas_td_decorr.c index 29b748e4c7..0215bfcf56 100644 --- a/lib_dec/ivas_td_decorr.c +++ b/lib_com/ivas_td_decorr.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #endif #include "math.h" #include -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------------------------* @@ -67,7 +67,7 @@ static const float ivas_hadamard_decorr_APD_coeff[IVAS_APD_16_SECT][IVAS_APD_16_ /* For R = 3.^([0:obj.parm_APD_nSections-1]/4); */ -const float ivas_three_pow_frac[IVAS_MAX_DECORR_APD_SECTIONS] = { +static const float ivas_three_pow_frac[IVAS_MAX_DECORR_APD_SECTIONS] = { 1.000000000000000f, 1.316074013710022f, 1.732050776481628f, @@ -87,92 +87,191 @@ const float ivas_three_pow_frac[IVAS_MAX_DECORR_APD_SECTIONS] = { }; +#ifdef FIX_417_TD_DECORR_BRATE_SW +#define IVAS_TDET_DUCK_MULT_FAC_PARA_BIN ( 2.0f ) +#define IVAS_TDET_DUCK_MULT_FAC_PARA_BIN_LOW_BR ( 3.0f ) +#endif + /*------------------------------------------------------------------------------------------* * Local functions declaration *------------------------------------------------------------------------------------------*/ static int16_t ivas_get_APD_filt_orders( const int16_t num_out_chans, const int32_t output_Fs, int16_t *APD_filt_orders ); -static ivas_error ivas_td_decorr_init( ivas_td_decorr_state_t *hTdDecorr, const int16_t num_out_chans, const int16_t ducking_flag ); + +static void ivas_td_decorr_init( ivas_td_decorr_state_t *hTdDecorr, const int16_t num_out_chans, const int16_t ducking_flag ); +#ifdef FIX_417_TD_DECORR_BRATE_SW /*------------------------------------------------------------------------- - * ivas_spar_td_decorr_dec_open() + * ivas_td_decorr_reconfig_dec() * - * Allocate and initialize SPAR time domain decorrelator handle + * Allocate and initialize time domain decorrelator handle *------------------------------------------------------------------------*/ -ivas_error ivas_spar_td_decorr_dec_open( - ivas_td_decorr_state_t **hTdDecorr, /* i/o: SPAR Covar. decoder handle */ - const int32_t output_Fs, /* i : output sampling rate */ - const int16_t nchan_internal, /* i : number of internal channels */ - const int16_t ducking_flag /* i : ducking flag */ +ivas_error ivas_td_decorr_reconfig_dec( + const IVAS_FORMAT ivas_format, /* i : IVAS format */ + const int32_t ivas_total_brate, /* i : total IVAS bitrate */ + const int16_t nchan_transport, /* i : number of transport channels */ + const int32_t output_Fs, /* i : output sampling rate */ + ivas_td_decorr_state_t **hTdDecorr, /* i/o: TD decorrelator handle */ + uint16_t *useTdDecorr /* i/o: TD decorrelator flag */ +) +{ + uint16_t useTdDecorr_new; + ivas_error error; + + useTdDecorr_new = 0; + if ( ivas_format == SBA_FORMAT ) + { + if ( nchan_transport == 1 ) + { + useTdDecorr_new = 1; + } + } + else if ( ivas_format == MASA_FORMAT ) + { + if ( ( ivas_total_brate < IVAS_48k && nchan_transport == 1 ) || ivas_total_brate < MASA_STEREO_MIN_BITRATE ) + { + useTdDecorr_new = 1; + } + } + else if ( ivas_format == MC_FORMAT ) + { + if ( ivas_total_brate < IVAS_48k && nchan_transport == 1 ) + { + useTdDecorr_new = 1; + } + } + + if ( *useTdDecorr != useTdDecorr_new ) + { + *useTdDecorr = useTdDecorr_new; + + if ( *useTdDecorr ) + { + if ( ivas_total_brate >= IVAS_13k2 && ivas_format == SBA_FORMAT ) + { + if ( *hTdDecorr == NULL ) + { + if ( ( error = ivas_td_decorr_dec_open( hTdDecorr, output_Fs, 3, 1 ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + if ( ivas_total_brate < IVAS_24k4 ) + { + ( *hTdDecorr )->pTrans_det->duck_mult_fac = IVAS_TDET_DUCK_MULT_FAC_PARA_BIN_LOW_BR; + } + else + { + ( *hTdDecorr )->pTrans_det->duck_mult_fac = IVAS_TDET_DUCK_MULT_FAC_PARA_BIN; + } + } + else + { + if ( *hTdDecorr == NULL ) + { + if ( ( error = ivas_td_decorr_dec_open( hTdDecorr, output_Fs, 3, 0 ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else + { + ivas_td_decorr_init( *hTdDecorr, 3, 0 ); + } + } + } + else + { + ivas_td_decorr_dec_close( hTdDecorr ); + } + } + + return IVAS_ERR_OK; +} +#endif + + +/*------------------------------------------------------------------------- + * ivas_td_decorr_dec_open() + * + * Allocate and initialize time domain decorrelator handle + *------------------------------------------------------------------------*/ + +ivas_error ivas_td_decorr_dec_open( + ivas_td_decorr_state_t **hTdDecorr, /* i/o: TD decorrelator handle */ + const int32_t output_Fs, /* i : output sampling rate */ + const int16_t nchan_internal, /* i : number of internal channels */ + const int16_t ducking_flag /* i : ducking flag */ ) { int16_t i, j, len; int16_t num_out_chans; - ivas_td_decorr_state_t *hCovState; + ivas_td_decorr_state_t *hTdDecorr_loc; ivas_error error; num_out_chans = nchan_internal - 1; error = IVAS_ERR_OK; - if ( ( hCovState = (ivas_td_decorr_state_t *) count_malloc( sizeof( ivas_td_decorr_state_t ) ) ) == NULL ) + if ( ( hTdDecorr_loc = (ivas_td_decorr_state_t *) malloc( sizeof( ivas_td_decorr_state_t ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR COV decoder" ); } - if ( ( hCovState->look_ahead_buf = (float *) count_malloc( sizeof( float ) * (int16_t) ( output_Fs * IVAS_DECORR_PARM_LOOKAHEAD_TAU ) ) ) == NULL ) + if ( ( hTdDecorr_loc->look_ahead_buf = (float *) malloc( sizeof( float ) * (int16_t) ( output_Fs * IVAS_DECORR_PARM_LOOKAHEAD_TAU ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR COV decoder" ); } - set_f( hCovState->look_ahead_buf, 0, (int16_t) ( output_Fs * IVAS_DECORR_PARM_LOOKAHEAD_TAU ) ); + set_f( hTdDecorr_loc->look_ahead_buf, 0, (int16_t) ( output_Fs * IVAS_DECORR_PARM_LOOKAHEAD_TAU ) ); - hCovState->num_apd_sections = ivas_get_APD_filt_orders( num_out_chans, output_Fs, hCovState->APD_filt_state[0].order ); + hTdDecorr_loc->num_apd_sections = ivas_get_APD_filt_orders( num_out_chans, output_Fs, hTdDecorr_loc->APD_filt_state[0].order ); for ( j = 0; j < num_out_chans; j++ ) { - for ( i = 0; i < hCovState->num_apd_sections; i++ ) + for ( i = 0; i < hTdDecorr_loc->num_apd_sections; i++ ) { - len = hCovState->APD_filt_state[0].order[i]; + len = hTdDecorr_loc->APD_filt_state[0].order[i]; - if ( ( hCovState->APD_filt_state[j].state[i] = (float *) count_malloc( sizeof( float ) * len ) ) == NULL ) + if ( ( hTdDecorr_loc->APD_filt_state[j].state[i] = (float *) malloc( sizeof( float ) * len ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR COV decoder" ); } - set_f( hCovState->APD_filt_state[j].state[i], 0, len ); + set_f( hTdDecorr_loc->APD_filt_state[j].state[i], 0, len ); } } - ivas_td_decorr_init( hCovState, num_out_chans, ducking_flag ); + ivas_td_decorr_init( hTdDecorr_loc, num_out_chans, ducking_flag ); if ( ducking_flag ) { - if ( ( error = ivas_spar_transient_det_open( &hCovState->pTrans_det, output_Fs ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_transient_det_open( &hTdDecorr_loc->pTrans_det, output_Fs ) ) != IVAS_ERR_OK ) { return error; } } else { - hCovState->pTrans_det = NULL; + hTdDecorr_loc->pTrans_det = NULL; } - *hTdDecorr = hCovState; + *hTdDecorr = hTdDecorr_loc; return error; } /*------------------------------------------------------------------------- - * ivas_spar_td_decorr_dec_close() + * ivas_td_decorr_dec_close() * - * Deallocate SPAR time domain decorrelator handle + * Deallocate time domain decorrelator handle *------------------------------------------------------------------------*/ -void ivas_spar_td_decorr_dec_close( - ivas_td_decorr_state_t **hTdDecorr /* i/o: SPAR Covar. decoder handle */ +void ivas_td_decorr_dec_close( + ivas_td_decorr_state_t **hTdDecorr /* i/o: TD decorrelator handle */ ) { int16_t i, j; @@ -182,24 +281,24 @@ void ivas_spar_td_decorr_dec_close( return; } - count_free( ( *hTdDecorr )->look_ahead_buf ); + free( ( *hTdDecorr )->look_ahead_buf ); ( *hTdDecorr )->look_ahead_buf = NULL; for ( j = 0; j < ( *hTdDecorr )->num_apd_outputs; j++ ) { for ( i = 0; i < ( *hTdDecorr )->num_apd_sections; i++ ) { - count_free( ( *hTdDecorr )->APD_filt_state[j].state[i] ); + free( ( *hTdDecorr )->APD_filt_state[j].state[i] ); ( *hTdDecorr )->APD_filt_state[j].state[i] = NULL; } } if ( ( *hTdDecorr )->pTrans_det != NULL ) { - ivas_spar_transient_det_close( &( *hTdDecorr )->pTrans_det ); + ivas_transient_det_close( &( *hTdDecorr )->pTrans_det ); } - count_free( ( *hTdDecorr ) ); + free( ( *hTdDecorr ) ); ( *hTdDecorr ) = NULL; return; @@ -275,7 +374,7 @@ static int16_t ivas_get_APD_filt_orders( * TD decorr Initialisation function *-----------------------------------------------------------------------------------------*/ -static ivas_error ivas_td_decorr_init( +static void ivas_td_decorr_init( ivas_td_decorr_state_t *hTdDecorr, const int16_t num_out_chans, const int16_t ducking_flag ) @@ -295,7 +394,7 @@ static ivas_error ivas_td_decorr_init( } } - return IVAS_ERR_OK; + return; } diff --git a/lib_com/ivas_tools.c b/lib_com/ivas_tools.c index 69ebb519aa..ec87ccf095 100644 --- a/lib_com/ivas_tools.c +++ b/lib_com/ivas_tools.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include #include "prot.h" #include "ivas_prot.h" -#include "wmops.h" +#include "wmc_auto.h" #include "ivas_rom_com.h" /*--------------------------------------------------------------- @@ -144,16 +144,6 @@ uint32_t ivas_syn_output( } } -#ifdef DEC_TO_REND_FLOAT_DUMP - for ( i = 0; i < output_frame; ++i ) - { - for ( n = 0; n < n_channels; ++n ) - { - dbgwrite( &synth[n][i], sizeof( float ), 1, 1, "./float_out.raw" ); - } - } -#endif - return noClipping; } @@ -1007,6 +997,25 @@ void lls_interp_n( return; } +/* helper function for panning_wrap_angles */ +static float wrap_azi( + const float azi_deg ) +{ + float azi = azi_deg; + + /* Wrap azimuth value */ + while ( azi > 180 ) + { + azi -= 360.0f; + } + + while ( azi <= -180 ) + { + azi += 360; + } + + return azi; +} /*-------------------------------------------------------------------* * panning_wrap_angles() @@ -1016,7 +1025,6 @@ void lls_interp_n( * elevation = [-90, 90] * Considers direction changes from large elevation values *-------------------------------------------------------------------*/ - void panning_wrap_angles( const float azi_deg, /* i : azimuth in degrees for panning direction (positive left) */ const float ele_deg, /* i : elevation in degrees for panning direction (positive up) */ @@ -1029,56 +1037,52 @@ void panning_wrap_angles( azi = azi_deg; ele = ele_deg; - /* Special case when elevation is a multiple of 90; azimuth is irrelevant */ - if ( ( ele != 0 ) && ( fmodf( ele, 90 ) == 0 ) ) + if ( fabsf( ele ) < 90 ) { - azi = 0; - while ( fabsf( ele ) > 90 ) - { - ele -= 360; - } + *ele_wrapped = ele; + *azi_wrapped = wrap_azi( azi ); + return; } else { - /* Wrap elevation and adjust azimuth accordingly */ - while ( fabsf( ele ) > 90 ) + /* Special case when elevation is a multiple of 90; azimuth is irrelevant */ + if ( ( fmodf( ele, 90 ) == 0 ) && ( fmodf( ele, 180 ) != 0 ) ) { - /* Flip to other hemisphere */ - azi += 180; - - /* Compensate elevation accordingly */ - if ( ele > 90 ) + *azi_wrapped = 0; + while ( ele > 90 ) { - ele -= 180; + ele -= 360; } - else if ( ele < -90 ) + while ( ele < -90 ) { - ele += 180; + ele += 360; } + *ele_wrapped = ele; } - - /* Wrap azimuth value */ - while ( fabsf( azi ) > 180 ) + else { - azi = fmodf( azi + 180, 360 ); - if ( azi < 0 ) + /* Wrap elevation and adjust azimuth accordingly */ + while ( fabsf( ele ) > 90 ) { - azi += 360; + /* Flip to other hemisphere */ + azi += 180; + + /* Compensate elevation accordingly */ + if ( ele > 90 ) + { + ele = 180 - ele; + } + else if ( ele < -90 ) + { + ele = -180 - ele; + } } - azi -= 180; + *azi_wrapped = wrap_azi( azi ); + *ele_wrapped = ele; } - } - /* Set -180 to 180 for deduplication purposes; angles are otherwise identical */ - if ( azi == -180 ) - { - azi = 180; + return; } - - *azi_wrapped = azi; - *ele_wrapped = ele; - - return; } /*-------------------------------------------------------------------------* diff --git a/lib_com/ivas_transient_det.c b/lib_com/ivas_transient_det.c index 0b398ec9d1..1e8f53c7ca 100644 --- a/lib_com/ivas_transient_det.c +++ b/lib_com/ivas_transient_det.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -36,7 +36,7 @@ #include "debug.h" #endif #include "math.h" -#include "wmops.h" +#include "wmc_auto.h" #include "prot.h" #include "ivas_cnst.h" #include "ivas_prot.h" @@ -84,8 +84,8 @@ *-----------------------------------------------------------------------------------------*/ static void ivas_transient_det_init( - ivas_trans_det_state_t *hTranDet, /* i/o: SPAR TD handle */ - const int32_t sampling_rate /* i : sampling rate */ + ivas_trans_det_state_t *hTranDet, /* i/o: Transient detector handle */ + const int32_t sampling_rate /* i : sampling rate */ ) { float filt_coeff_arr[3][IVAS_BIQUAD_FILT_LEN << 1] = { { 0 } }; @@ -159,19 +159,19 @@ static void ivas_transient_det_init( /*------------------------------------------------------------------------- - * ivas_spar_transient_det_open() + * ivas_transient_det_open() * * Allocate and initialize SPAR TD handle *------------------------------------------------------------------------*/ -ivas_error ivas_spar_transient_det_open( - ivas_trans_det_state_t **hTranDet_in, /* i/o: SPAR TD handle */ - const int32_t sampling_rate /* i : sampling rate */ +ivas_error ivas_transient_det_open( + ivas_trans_det_state_t **hTranDet_in, /* i/o: Transient detector handle */ + const int32_t sampling_rate /* i : sampling rate */ ) { ivas_trans_det_state_t *hTranDet; - if ( ( hTranDet = (ivas_trans_det_state_t *) count_malloc( sizeof( ivas_trans_det_state_t ) ) ) == NULL ) + if ( ( hTranDet = (ivas_trans_det_state_t *) malloc( sizeof( ivas_trans_det_state_t ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR TD\n" ); } @@ -185,13 +185,13 @@ ivas_error ivas_spar_transient_det_open( /*------------------------------------------------------------------------- - * ivas_spar_transient_det_close() + * ivas_transient_det_close() * - * Deallocate and initialize SPAR TD handle + * Deallocate and initialize Transient detector handle *------------------------------------------------------------------------*/ -void ivas_spar_transient_det_close( - ivas_trans_det_state_t **hTranDet /* i/o: SPAR TD handle */ +void ivas_transient_det_close( + ivas_trans_det_state_t **hTranDet /* i/o: Transient detector handle */ ) { if ( hTranDet == NULL || *hTranDet == NULL ) @@ -199,7 +199,7 @@ void ivas_spar_transient_det_close( return; } - count_free( *hTranDet ); + free( *hTranDet ); *hTranDet = NULL; return; @@ -211,28 +211,39 @@ void ivas_spar_transient_det_close( * * Transient detection process call *-----------------------------------------------------------------------------------------*/ - -int16_t ivas_transient_det_process( - ivas_trans_det_state_t *hTranDet, /* i/o: SPAR TD handle */ - float *pIn_pcm, /* i : input audio channels */ - const int16_t frame_len /* i : frame length in samples */ +void ivas_transient_det_process( + ivas_trans_det_state_t *hTranDet, /* i/o: SPAR TD handle */ + float *pIn_pcm, /* i : input audio channels */ + const int16_t frame_len, /* i : frame length in samples */ + int16_t transient_det[2] /* o: transient det outputs */ ) { + float in_duck_gain[L_FRAME48k]; + int16_t num_sf, sf, sf_samp, idx; float mem = hTranDet->in_duck_gain; - int16_t trans; - ivas_td_decorr_get_ducking_gains( hTranDet, pIn_pcm, NULL, NULL, frame_len, IVAS_TDET_ONLY ); + ivas_td_decorr_get_ducking_gains( hTranDet, pIn_pcm, in_duck_gain, NULL, frame_len, IVAS_TDET_ONLY ); + transient_det[0] = 0; + transient_det[1] = 0; if ( mem - hTranDet->in_duck_gain > IVAS_TDET_PARM_TRANS_THR ) { - trans = 1; + transient_det[0] = 1; } - else + + num_sf = 16; + sf_samp = frame_len / num_sf; + for ( sf = 1; sf <= num_sf; sf++ ) { - trans = 0; + idx = ( sf_samp * sf ) - 1; + if ( ( mem - in_duck_gain[idx] ) > ( IVAS_TDET_PARM_TRANS_THR * 1.1f ) ) + { + transient_det[1] = 1; + } + mem = in_duck_gain[idx]; } - return trans; + return; } @@ -269,7 +280,7 @@ static float ivas_calc_duck_gain( *-----------------------------------------------------------------------------------------*/ void ivas_td_decorr_get_ducking_gains( - ivas_trans_det_state_t *hTranDet, + ivas_trans_det_state_t *hTranDet, /* i/o: Transient detector handle */ float *pIn_pcm, float *pIn_duck_gains, float *pOut_duck_gains, @@ -301,11 +312,12 @@ void ivas_td_decorr_get_ducking_gains( /* env slow */ ivas_filter_process( &hTranDet->env_slow, e_slow, frame_len ); - if ( tdet_flag == IVAS_TDET_ONLY ) + if ( tdet_flag ) { for ( i = 0; i < frame_len; i++ ) { in_duck_gain = ivas_calc_duck_gain( in_duck_gain, in_duck_coeff, e_slow[i], e_fast[i], duck_mult_fac ); + pIn_duck_gains[i] = in_duck_gain; } hTranDet->in_duck_gain = in_duck_gain; } diff --git a/lib_com/lag_wind.c b/lib_com/lag_wind.c index dba9f04de4..c4c5e803be 100644 --- a/lib_com/lag_wind.c +++ b/lib_com/lag_wind.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "prot.h" #include "cnst.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_com/lerp.c b/lib_com/lerp.c index 4708dc5ca4..1172710313 100644 --- a/lib_com/lerp.c +++ b/lib_com/lerp.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,7 +37,7 @@ #include #include "options.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------* diff --git a/lib_com/limit_t0.c b/lib_com/limit_t0.c index 33a3ba4231..0a844bbc5d 100644 --- a/lib_com/limit_t0.c +++ b/lib_com/limit_t0.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------* * Local constants diff --git a/lib_com/logqnorm.c b/lib_com/logqnorm.c index 50ecd83898..c8185dd5a2 100644 --- a/lib_com/logqnorm.c +++ b/lib_com/logqnorm.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "prot.h" #include "rom_com.h" #include "prot.h" /* Function prototypes */ -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------------- * logqnorm() diff --git a/lib_com/longarith.c b/lib_com/longarith.c index 2e5604d277..01a20c8417 100644 --- a/lib_com/longarith.c +++ b/lib_com/longarith.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #include #include "options.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* diff --git a/lib_com/low_rate_band_att.c b/lib_com/low_rate_band_att.c index 2ff62af41b..393cae5ff2 100644 --- a/lib_com/low_rate_band_att.c +++ b/lib_com/low_rate_band_att.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * fine_gain_pred() diff --git a/lib_com/lpc_tools.c b/lib_com/lpc_tools.c index 7e84d83fb2..82c8cddbda 100644 --- a/lib_com/lpc_tools.c +++ b/lib_com/lpc_tools.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------* * Local constants diff --git a/lib_com/lsf_dec_bfi.c b/lib_com/lsf_dec_bfi.c index f6da9ffb21..70506b293c 100644 --- a/lib_com/lsf_dec_bfi.c +++ b/lib_com/lsf_dec_bfi.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * routine: lsf_dec_bfi() diff --git a/lib_com/lsf_msvq_ma.c b/lib_com/lsf_msvq_ma.c index 0f091463bd..3396e9fde2 100644 --- a/lib_com/lsf_msvq_ma.c +++ b/lib_com/lsf_msvq_ma.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -45,7 +45,7 @@ #include "rom_com.h" #include "stl.h" #include "basop_proto_func.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * midlsf_dec() diff --git a/lib_com/lsf_tools.c b/lib_com/lsf_tools.c index 3fc93a05f7..5f0916dbd1 100644 --- a/lib_com/lsf_tools.c +++ b/lib_com/lsf_tools.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "prot.h" #include "rom_com.h" #include "basop_proto_func.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local function prototypes @@ -2027,6 +2027,64 @@ int16_t tcxlpc_get_cdk( return cdk; } +#ifdef ERI_FDCNGVQ_LOW_ROM +void dec_FDCNG_MSVQ_stage1( + int16_t j_full, /* i: index full range */ + int16_t n, /* i: dimension to generate */ + const float *invTrfMatrix, /* i: IDCT matrix for synthesis */ + const DCTTYPE idcttype, /* i: specify which IDCT */ + float *uq, /* o: synthesized stage1 vector */ + Word16 *uq_ind /* o: synthesized stage1 vector in BASOP */ +) +{ + int16_t col, segm_ind, j; + float dct_vec[FDCNG_VQ_MAX_LEN]; + float idct_vec[FDCNG_VQ_MAX_LEN]; + const Word8 *cbpW8; + const Word16 *dct_col_shift_tab; + + assert( n <= FDCNG_VQ_MAX_LEN ); + assert( n >= FDCNG_VQ_DCT_MINTRUNC ); + + segm_ind = 0; + for ( col = 1; col <= FDCNG_VQ_DCT_NSEGM; col++ ) + { + if ( j_full >= cdk1_ivas_cum_entries_per_segment[col] ) + { + segm_ind++; + } + } + + j = j_full - cdk1_ivas_cum_entries_per_segment[segm_ind]; /* j is the local segment index */ + + assert( j < cdk1_ivas_entries_per_segment[segm_ind] ); + + /* Word8 column variable Qx storage*/ + cbpW8 = cdk_37bits_ivas_stage1_W8Qx_dct_sections[segm_ind]; /* Word8 storage fixed ptr_init */ + cbpW8 += j * cdk1_ivas_cols_per_segment[segm_ind]; /* adaptive ptr init */ + dct_col_shift_tab = stage1_dct_col_syn_shift[segm_ind]; + + for ( col = 0; col < cdk1_ivas_cols_per_segment[segm_ind]; col++ ) + { + dct_vec[col] = (float) ( ( (Word16) cbpW8[col] ) << dct_col_shift_tab[col] ); + /* LOGIC( 1 );SHIFT( 1 ); ADD( 1 ); + in BASOP: s_and(for W8->W16), shl(), sub() + */ + } + dctT2_N_apply_matrix( (const float *) dct_vec, idct_vec, cdk1_ivas_cols_per_segment[segm_ind], n, invTrfMatrix, FDCNG_VQ_DCT_MAXTRUNC, idcttype ); + + /*scale down to original fdcngvq domain and move to Q0 */ + v_multc( idct_vec, fdcng_dct_scaleF[1], idct_vec, n ); + /* fdcng_dct_scaleF[1] --> 0.0625-->scale down from search Q4 domain to Q0 , + not really relevant for BASOP loop */ + + /*add common mid fdcng vector, in fdcng bands domain */ + v_add( idct_vec, cdk1r_tr_midQ_truncQ, uq, n ); + assert( uq_ind == NULL ); +} +#endif + + /*--------------------------------------------------------------------------* * msvq_dec() * @@ -2042,8 +2100,12 @@ void msvq_dec( const int16_t N, /* i : Vector dimension */ const int16_t maxN, /* i : Codebook dimension */ const int16_t Idx[], /* i : Indices */ - float *uq, /* o : quantized vector */ - Word16 *uq_ind /* o : quantized vector (fixed point) */ +#ifdef ERI_FDCNGVQ_LOW_ROM + const int16_t applyIDCT_flag, /* i : applyIDCT flag */ + const float *invTrfMatrix, /* i: matrix for IDCT synthesis */ +#endif + float *uq, /* o : quantized vector */ + Word16 *uq_ind /* o : quantized vector (fixed point) */ ) { int16_t i, n, maxn, start; @@ -2079,9 +2141,32 @@ void msvq_dec( start = 0; } -#define WMC_TOOL_MAN +#ifdef ERI_FDCNGVQ_LOW_ROM + if ( i == 0 && applyIDCT_flag != 0 ) + { + assert( start == 0 ); + dec_FDCNG_MSVQ_stage1( Idx[0], N, invTrfMatrix, IDCT_T2_XX_24, uq, uq_ind ); /* IDCT_T2 N=24 used for all synthesis */ + } + else + { + v_add( uq + start, cb[i] + Idx[i] * maxn, uq + start, n ); + } + +#define WMC_TOOL_SKIP + IF( uq_ind != NULL ) + { + FOR( j = 0; j < n; ++j ) + { + move16(); + uq_ind[start + j] = add( uq_ind[start + j], (Word16) ( cb[i][Idx[i] * maxn + j] * 2.0f * 1.28f ) ); + } + } +#undef WMC_TOOL_SKIP +#else + v_add( uq + start, cb[i] + Idx[i] * maxn, uq + start, n ); +#define WMC_TOOL_SKIP IF( uq_ind != NULL ) { FOR( j = 0; j < n; ++j ) @@ -2090,7 +2175,8 @@ void msvq_dec( uq_ind[start + j] = add( uq_ind[start + j], (Word16) ( cb[i][Idx[i] * maxn + j] * 2.0f * 1.28f ) ); } } -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP +#endif } return; @@ -2358,3 +2444,197 @@ void a2isf( return; } + +#ifdef ERI_FDCNGVQ_LOW_ROM +/*-------------------------------------------------------------------* + * dctT2_N_apply_matrix() + * + * dct/idct truncated matrix appl. for DCT basis vector lengths of N + *-------------------------------------------------------------------*/ +void dctT2_N_apply_matrix( + const float *input, + float *output, + const int16_t dct_dim, + int16_t fdcngvq_dim, + const float *matrix, + const int16_t matrix_row_dim, + DCTTYPE dcttype ) +{ + int16_t i, j, dim_in, dim_out; + int16_t mat_step_col, mat_step_row, mat_step_col_flag; + const float *pt_x, *pt_A; + float tmp_y[FDCNG_VQ_MAX_LEN]; + float *pt_y; + + /* non-square DCT_N and IDCT_N matrix application, + using a stored format of an IDCT_Nx(FDCNG_VQ_DCT_MAXTRUNC) matrix */ + /* efficiently parallelized in SIMD */ + + assert( dct_dim <= FDCNG_VQ_DCT_MAXTRUNC ); + assert( fdcngvq_dim <= FDCNG_VQ_MAX_LEN ); + + if ( ( dcttype & 1 ) == 0 ) /* even entries are DCTs */ + { + /* DCT_typeII 24,21 -> XX in worst case */ + dim_in = fdcngvq_dim; + dim_out = dct_dim; + mat_step_col = matrix_row_dim; /* matrix maximum storage size dependent, width of first row in matrix */ + mat_step_row = 0; + mat_step_col_flag = 1; + assert( dcttype == DCT_T2_21_XX || dcttype == DCT_T2_24_XX ); + } + else + { + assert( ( dcttype & 1 ) != 0 ); /* idct */ + dim_in = dct_dim; + dim_out = fdcngvq_dim; + mat_step_col = 1; + mat_step_row = matrix_row_dim; + mat_step_col_flag = 0; + assert( dcttype == IDCT_T2_XX_24 ); + } + + pt_y = tmp_y; + for ( i = 0; i < dim_out; i++ ) + { + pt_x = input; + *pt_y = 0; + + /* +i(DCT) or +i*maxTrunc(IDCT) */ +#define WMC_TOOL_SKIP + pt_A = &( matrix[i * ( mat_step_row + mat_step_col_flag )] ); /* ptr indexing */ + PTR_INIT( 1 ); +#undef WMC_TOOL_SKIP + for ( j = 0; j < dim_in; j++ ) + { +#define WMC_TOOL_SKIP + *pt_y += ( *pt_x++ ) * ( *pt_A ); + pt_A += mat_step_col; /* step +maxtrunc or +1 */ /* ptr indexing*/ + MAC( 1 ); +#undef WMC_TOOL_SKIP + } + pt_y++; + } + mvr2r( tmp_y, output, dim_out ); +} + +/*-------------------------------------------------------------------* + * extend_dctN_input() + * + * (inputN, dctN) -> idct(N_ext) idct_N matrix application loop for + * extending, extrapolating a DCT basis vector length of N to N_ext + *-------------------------------------------------------------------*/ + +void extend_dctN_input( + const float *input, /* i: input in fdcng domain */ + const float *dct_input, /* i: input in dctN(fdcng) domain */ + const int16_t in_dim, /* i: in_dim == N */ + float *ext_sig, /* o: extended output in fdcng domain */ + const int16_t out_dim, /* i: output total dim */ + float *matrix, /* i: idct synthesis matrix N rows, n_cols columns */ + const int16_t n_cols, /* i: number of columns == DCT truncation length */ + DCTTYPE dcttype ) /* i: matrix operation type */ +{ + int16_t i, j, i_rev; + const float( *ptr )[FDCNG_VQ_DCT_MAXTRUNC] = (void *) matrix; + + /* stored format is an IDCT_Nx(FDCNG_VQ_DCT_MAXTRUNC) matrix */ + assert( in_dim < FDCNG_VQ_MAX_LEN ); + assert( out_dim <= FDCNG_VQ_MAX_LEN ); + assert( out_dim > in_dim ); + assert( n_cols == FDCNG_VQ_DCT_MAXTRUNC ); /* for *ptr[MAX_TRUNC] adressing*/ + assert( ( dcttype & 1 ) != 0 ); /* idct tables always in use for this basis vector extension */ + + mvr2r( input, ext_sig, in_dim ); /* copy initial part, i.e. only last/tail parts are extended */ + set_f( &( ext_sig[in_dim] ), 0.0, out_dim - in_dim ); + + i_rev = in_dim; /*ptr init*/ + for ( i = in_dim; i < out_dim; i++ ) + { /* for each extension sample */ + /* i = 21 22 23; + i_rev = 20 19 18; for odd dctII reflect basis vector + */ + i_rev--; + + for ( j = 0; j < n_cols; j++ ) /* for each available DCT coeff */ + { + /* DCTcoeff * reflected basis vector */ +#define WMC_TOOL_SKIP + /* pure ptr MAC operations */ + ext_sig[i] += dct_input[j] * ptr[i_rev][j]; /* sum up scaled and extended basis vector */ + MAC( 1 ); +#undef WMC_TOOL_SKIP + } + } +} + + +/* inititate idct24 FDCNG_VQ_DCT_MAXTRUNCx N matrix in RAM from a quantized compressed ROM format */ +void create_IDCT_N_Matrix( float *inv_matrixFloatQ, const int16_t N, const int16_t n_cols, const int16_t alloc_size ) +{ + int16_t c, c1, r, r_flip, W16_val; + int16_t len; + int16_t mat_cpy_size; + const Word16 *absval_ptr; + const Word8 *idx_ptr; + Word16 idx; + float( *ptr )[FDCNG_VQ_DCT_MAXTRUNC] = (void *) inv_matrixFloatQ; /* fixed number of columns pointers, to simplifies adressing in ANSIC */ + + absval_ptr = unique_idctT2_24coeffsQ16; + idx_ptr = idctT2_24_compressed_idx; + len = FDCNG_VQ_MAX_LEN; + + if ( N == FDCNG_VQ_MAX_LEN_WB ) + { + absval_ptr = unique_idctT2_21coeffsQ16; + idx_ptr = idctT2_21_compressed_idx; + len = N; + } + + assert( alloc_size >= ( n_cols * len ) ); /* enough space for the full expanded IDCT matrix */ + assert( N <= len ); + + mat_cpy_size = ( n_cols ) * ( len >> 1 ); /* NB integer division of "len" */ + + if ( ( len & 1 ) != 0 ) + { /* odd sized DCT with a non-reflected center row */ + mat_cpy_size += n_cols; + } + + for ( c = 0; c < mat_cpy_size; c++ ) + { + idx = (Word16) ( idx_ptr[c] ); + W16_val = absval_ptr[abs( idx )]; + + if ( idx < 0 ) + { + W16_val = -( W16_val ); + } + inv_matrixFloatQ[c] = ( +1.52587890625e-05f ) * ( (float) W16_val ); /* 1.0/2.^16 scaling to a float-"Q0" , a scaling that is not done in BASOP */ + } + + /* for even number of coeffs DCT24, + flip symmetry for odd, even is used to save 50% IDCT Table ROM */ + /* for an odd DCT center is not flipped e.g for DCT21 */ + + assert( n_cols == FDCNG_VQ_DCT_MAXTRUNC ); + assert( ( n_cols & 1 ) == 0 ); + + for ( c = 0; c < ( n_cols ); c += 2 ) + { + c1 = c + 1; + r_flip = len - 1; + for ( r = 0; r < ( len / 2 ); r++, r_flip-- ) + { +#define WMC_TOOL_SKIP + ptr[r_flip][c] = ptr[r][c]; /* flipped */ + ptr[r_flip][c1] = -( ptr[r][c1] ); /* flipped and sign swapped */ + MOVE( 2 ); + MULT( 1 ); /* for negate */ +#undef WMC_TOOL_SKIP + } + } +} + + +#endif diff --git a/lib_com/lsp_conv_poly.c b/lib_com/lsp_conv_poly.c index 1f882b5e90..d43d74fb5a 100644 --- a/lib_com/lsp_conv_poly.c +++ b/lib_com/lsp_conv_poly.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_com/mime.h b/lib_com/mime.h index 7ca2689dcf..56f2fb4db9 100644 --- a/lib_com/mime.h +++ b/lib_com/mime.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_com/modif_fs.c b/lib_com/modif_fs.c index a817f0c348..f1ae7c61d4 100644 --- a/lib_com/modif_fs.c +++ b/lib_com/modif_fs.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * modify_Fs() @@ -113,7 +113,7 @@ int16_t modify_Fs( } } -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP /* Retrieve and/or calculate the resampling parameters */ fac_num = cfg_ptr->fac_num; fac_den = (int16_t) ( ( cfg_ptr->fin * fac_num ) / cfg_ptr->fout ); @@ -133,7 +133,7 @@ int16_t modify_Fs( signal = signal_tab + 2 * L_FILT_MAX + L_FRAME48k - mem_len - lg; signal_ana = signal; mem_len_ana = mem_len; -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP } /*-------------------------------------------------------------------* diff --git a/lib_com/move.h b/lib_com/move.h index f0e8238dec..c7bee82cd4 100644 --- a/lib_com/move.h +++ b/lib_com/move.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_com/mslvq_com.c b/lib_com/mslvq_com.c index 4d0593ce56..48384794aa 100644 --- a/lib_com/mslvq_com.c +++ b/lib_com/mslvq_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" #include "ivas_prot.h" /*-----------------------------------------------------------------* diff --git a/lib_com/nelp.c b/lib_com/nelp.c index 63489ea27e..768b92f915 100644 --- a/lib_com/nelp.c +++ b/lib_com/nelp.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * dequantize_uvg() diff --git a/lib_com/options.h b/lib_com/options.h index a04f6da289..829b643763 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,6 @@ /* ################### Start compiler switches ######################## */ #define SUPPORT_JBM_TRACEFILE /* support for JBM tracefile, which is needed for 3GPP objective/subjective testing, but not relevant for real-world implementations */ -#define RAM_COUNTING_TOOL /* tool to automatically count the dynamically alocated static memory consumption */ /* #################### End compiler switches ######################### */ @@ -51,16 +50,14 @@ #ifndef RELEASE #define DEBUGGING /* Activate debugging part of the code */ #endif -/*#define WMOPS*/ /* Activate complexity and memory counters (! the codec must be already instrumented with the WMC Tool (use /ic and /op options) !) */ -/*#define WMOPS_PER_FRAME*/ /* Output complexity in WMOPS per frame to the file "res/wmops" (one float value per frame) */ -/*#define WMOPS_DETAIL*/ /* Activate complexity detail printout for every function. Increases runtime overhead */ -/*#define WMOPS_WC_FRAME_ANALYSIS*/ /* Output WMOPS analysis for worst case frame */ -/*#define RAM_ANALYSIS*/ /* Output memory allocated with count_malloc each frame. Can be parsed and plotted with scripts/mem_analysis.m */ +/*#define WMOPS*/ /* Activate complexity and memory counters */ +/*#define WMOPS_PER_FRAME*/ /* Output per-frame complexity (writes one float value per frame to the file "wmops_analysis") */ +/*#define WMOPS_DETAIL*/ /* Output detailed complexity printout for every function. Increases runtime overhead */ +/*#define WMOPS_WC_FRAME_ANALYSIS*/ /* Output detailed complexity analysis for the worst-case frame */ +/*#define MEM_COUNT_DETAILS*/ /* Output detailed memory analysis for the worst-case frame (writes to the file "mem_analysis.csv") */ #ifdef DEBUGGING -/*#define MEM_COUNT_DETAILS*/ /* RAM counting tool: print per sub-structure details */ - /*#define DEBUG_MODE_INFO*/ /* output most important parameters to the subdirectory "res/" */ #ifdef DEBUG_MODE_INFO /*#define DEBUG_MODE_ACELP*/ /* output most important ACELP core parameters to the subdirectory "res/" */ @@ -71,7 +68,7 @@ /*#define DEBUG_MODE_MDCT*/ /* output most important MDCT parameters to the subdirectory "res/" */ /*#define DEBUG_MODE_PARAM_MC */ /* output Parametric MC paramters to the subdirectory "res/" */ /*#define DEBUG_MODE_PARAM_ISM*/ /* output Parametric ISM paramters to the subdirectory "res/" */ -#define DEBUG_MODE_INFO_TWEAK /* enable command line switch to specify subdirectory for debug info output inside "./res/" */ +/*#define DEBUG_MODE_INFO_TWEAK*/ /* enable command line switch to specify subdirectory for debug info output inside "./res/" */ /*#define DEBUG_MODE_INFO_PLC */ /* define to output PLC related parameters */ /*#define DEBUG_MODE_INFO_ALLRAD*/ /* define to output generated HOA decoding mtx */ /*#define DEBUG_MODE_LFE */ /* define to output LFE relevant parameters */ @@ -86,7 +83,7 @@ /*#define ALLOW_BYTE_EP*/ /* allow byte fer pattern files and check fer pattern file validity */ #define WRAP_AS_EIDXOR /* wraps FER file (as in STL_eid-xor.c/softbit.c) */ -#define DEBUG_FORCE_MDCT_STEREO_MODE /* Force stereo mode decision for MDCT stereo: -stere 3 1 forces L/R coding and -stereo 3 2 forces full M/S coding */ +#define DEBUG_FORCE_MDCT_STEREO_MODE /* Force stereo mode decision for MDCT stereo: -stereo 3 1 forces L/R coding and -stereo 3 2 forces full M/S coding */ /*#define DEBUG_STEREO_DFT_NOCORE*/ /* DFT stereo: by-pass core coder at decoder side*/ /*#define DEBUG_STEREO_DFT_NOSTEREO*/ /* DFT stereo: by-pass stereo processing at encoder and decoder side*/ /*#define DEBUG_STEREO_DFT_NOQRES*/ @@ -117,6 +114,7 @@ /*#define DEBUG_SBA*/ /* debug DIRAC/SPAR in-out */ #ifdef DEBUG_SBA +/*#define DEBUG_LBR_SBA*/ /* debug low bitrate SBA (SPAR+DirAC) */ /*#define DEBUG_SBA_AUDIO_DUMP*/ /* SBA intermediate audio wav file dumping */ /*#define DEBUG_SBA_MD_DUMP*/ /* SBA metadata and variable file dumping */ /*#define DEBUG_SPAR_MD_TARGET_TUNING*/ /* SPAR MD target bitrate tuning debug code */ @@ -139,20 +137,44 @@ #define LSF_RE_USE_SECONDARY_CHANNEL /* TD stereo Secondary channel LSF Q improvement */ #ifdef LSF_RE_USE_SECONDARY_CHANNEL -/*#define LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE */ /* switch to isolate the reuse mode case */ +#define LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE /* switch to isolate the reuse mode case */ #endif #define DISABLE_ADAP_RES_COD_TMP /* temporary fix for IVAS-403, disables adaptive residual coding */ -/*#define ITD_WINNER_GAIN_MODIFY */ /* ITD optimization - WORK IN PROGRESS */ /*#define FIX_I4_OL_PITCH*/ /* fix open-loop pitch used for EVS core switching */ -#define FIX_I1_113 /* under review : MCT bit distribution optimization for SBA high bitrates*/ -#define FIX_124_DONT_ALLOC_PLCINFO_IN_IVAS /* Issue 124: do not allocate unused plc struct in IVAS modes which is only used in EVS mono */ -#define SBA_BR_SWITCHING /* Issue 114: Changes for sba bit rate switching*/ -#define FIX_ITD /* Contribution 16: TD renderer ITD improvement and code cleanup */ -#define BRATE_SWITCHING_RENDERING /* Bitrate switching changes related to the renderers */ -#define FIX_ISM_DECODER_PRINTOUT /* Issue 229: fix ISM decoder printout */ -#define FIX_ITD_CNG /* Eri Contribution 11: Fix for CNG ITD */ -#define FIX_VBR_COMPLEXITY /* Issue 234: fix extremely high complexity numbers for IVAS EVS mode */ -#define FIX_ISM_INACTIVE_BITS /* Issue 230: fix bitbudget distribution in inactive frames in ISM format */ +#define FIX_ISM_DTX_CNG_BWIDTH_ALT /* VA: issue 396 - alternative fix for bw changes on CNG frames in ISM DTX for objects that use the decoder-side noise estimation */ + +#define FIX_398_MASA_DIRECTION_ALIGNMENT /* Nokia: Issue 398: in 2dir MASA, dynamically adjust directions to be consistent */ +#define REND_DEBUGGING_REVISION /* VA: encapsulate rendering debugging options with DEBUGGING */ +#define FIX_419_ISM_MD_FIX /* VA: Issue 419: fix the upper value limitation for parameter angle1_diff_cnt */ + +#define SNS_MSVQ /* FhG: contribution 33 - MSVQ for SNS parameters at stereo mid bitrates */ + +#define FIX_379_GAININTP /* Eri: Adds a gain interpolation for directional/distance gain to handle abrupt changes in metadata (Non BE) */ +#define FIX_387_ISM_MD_FEC /* VA: Issue 387: fix MD discontinuity in ISM FEC */ + +#define FIX_418_SID_BITRATE /* Eri: Issue 418: Using the correct bitrate for unified stereo SID */ +#define PARAMMC_SHORT_ENC_MDFT /* FhG: Issue 410: complexity optimization for parametric Multichannel modes */ +#define FIX_421_TD_INT_TUNE /* Eri: Issue 421: Increase use of interpolation in TD renderer filter transition */ +#define FIX_419_ISM_BRATE_SW_DTX /* VA: issue 419: fix ISM Bitrate Switching with dtx */ +#define FIX_422 /* FhG: Issue 422: re-introduce fix for noisy speech buffer in ParamISM */ + +#define ERI_FDCNGVQ_LOW_ROM /* Eri: Contribution #31 Table ROM saving for IVAS FDCNG-VQ modes */ + +#define FIX_416_ISM_BR_SWITCHING /* FhG: add missing CLDFB reconfig to ISM BR switching */ +#define FIX_SP2A /* VA: Issue 412: Adjust threshold for the S_p2a feature in the tonal detector */ +#define FIX_413_SBA_DTX /* Dlb: Fix for issue 413, SBA DTX CNG in 2TC mode*/ +#define FIX_417_TD_DECORR_BRATE_SW /* VA: Issue 417: fix incorrect use of TD decorrelator in bitrate switching */ + +#define LBR_SBA /* Contribution 47: Master macro for low bitrate SBA (SPAR+DirAC) */ +#ifdef LBR_SBA +#define LBR_SBA_BR_SWITCHING /* Clean up changes for SBA bitrate switching */ +#define LBR_SBA_DM_COV_FIX /* Covariance smoothing and resetting fixes proposed at higher bitrates */ +#ifdef LBR_SBA_DM_COV_FIX +#define LBR_SBA_EXTRA_COV_SMOOTH /* Extra covariance smoothing for low bitrate SBA */ +#endif +/*#define LBR_SBA_PLANAR*/ /* Converting low bitrate SBA modes to Planar */ +#define LBR_ADAP_SMOOTHING +#endif #define SPLIT_REND_WITH_HEAD_ROT #ifdef SPLIT_REND_WITH_HEAD_ROT @@ -169,8 +191,7 @@ //#define USE_DOLBY_HRTFS_WITH_LIB_REND_HOA3 //#define SPLIT_MD_CODING_DEBUG -#define FIX_376_SBA_ROTATE - +#define SPLIT_REND_IVAS_DEC_HT_TR /*CLDFB CODEC SWITCHES -- START*/ #define ENABLE_MS_PRED @@ -178,13 +199,21 @@ #define FORCE_GROUPS_OF_2 #define USE_BIT_COUNT_MERGE_COST #define OPTIMIZE_DPCM_QUANT +#define SPLIT_REND_PLC /*CLDFB CODEC SWITCHES -- END*/ +#define REND_STATIC_MEM_OPT +#define EUALER2QUAT_FIX +#define SBA_CREND_ROT_OPT + +#define ROM_TO_RAM /*switch to convert CQMF decoder tables to RAM*/ +#define SPLIT_REND_CLANG_SAN_FIX +#define SPLIT_REND_CLDFB_HUFF_SAN_FIX #define SPLIT_REND_LC3PLUS /* FhG: split rendering using LC3plus codec */ #define SPLIT_REND_TD_POSE_CORRECTION /* FhG: split rendering using LC3plus codec and time-domain pose correction */ #define FIX_SPLIT_REND_OPEN_ERROR_HANDLING /* adds missing error handling around ivas_split_renderer_open calls */ - +#define SPLIT_REND_LC3PLUS_HBR_DBG ( 128000 ) /* Bitrate per LC3 core */ #endif #define RENAME_GWLPR /* FhG: Rename clashing symbol */ diff --git a/lib_com/parameter_bitmaping.c b/lib_com/parameter_bitmaping.c index 95d5b77bbe..d722c8a3b3 100644 --- a/lib_com/parameter_bitmaping.c +++ b/lib_com/parameter_bitmaping.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #endif #include "stat_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /********************************/ @@ -117,9 +117,9 @@ void GetParameters( { ParamBitMap const *const param = ¶msBitMap->params[iParam]; -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP pSubStruct = param->GetParamValue( pParameter, index, &value ); -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP /* If a function for encoding/decoding value is defined than it should take care of 0 */ if ( param->fZeroAllowed || ( param->EncodeValue != NULL ) ) { @@ -130,9 +130,9 @@ void GetParameters( *( *pStream )++ = value - 1; } ++*pnSize; -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP *pnBits += ( param->nBits != 0 ) ? param->nBits : param->GetNumberOfBits( value, index ); -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP if ( ( param->pSubParamBitMap != NULL ) && ( value > 0 ) ) { GetParameters( param->pSubParamBitMap, value, ( pSubStruct != NULL ) ? pSubStruct : pParameter, pStream, pnSize, pnBits ); @@ -167,9 +167,9 @@ void SetParameters( /* If a function for encoding/decoding value is defined than it should take care of 0 */ value = *( *pStream )++ + ( param->fZeroAllowed || ( param->EncodeValue != NULL ) ? 0 : 1 ); -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP pSubStruct = param->SetParamValue( pParameter, index, value ); -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP ++*pnSize; if ( ( param->pSubParamBitMap != NULL ) && ( value > 0 ) ) { @@ -207,9 +207,9 @@ void WriteToBitstream( TEncodeValue EncodeValue; int16_t value; -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP nBits = ( param->nBits != 0 ) ? param->nBits : param->GetNumberOfBits( **pStream, index ); -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP fShiftValue = !param->fZeroAllowed && ( param->EncodeValue == NULL ); EncodeValue = ( param->EncodeValue == NULL ) ? &FixedWidthEncoding : param->EncodeValue; value = PutIntoBitstream( pStream, EncodeValue, index, hBstr, nBits ) + ( fShiftValue ? 1 : 0 ); diff --git a/lib_com/phase_dispersion.c b/lib_com/phase_dispersion.c index 7e1a1a4b14..a89b98c152 100644 --- a/lib_com/phase_dispersion.c +++ b/lib_com/phase_dispersion.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------* * phase_dispersion() diff --git a/lib_com/ppp.c b/lib_com/ppp.c index 9008e1b441..73570bbd96 100644 --- a/lib_com/ppp.c +++ b/lib_com/ppp.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Interpol_delay() diff --git a/lib_com/pred_lt4.c b/lib_com/pred_lt4.c index 3226c31b57..832c7d0dc5 100644 --- a/lib_com/pred_lt4.c +++ b/lib_com/pred_lt4.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * pred_lt4() diff --git a/lib_com/preemph.c b/lib_com/preemph.c index 32283198cd..5e5eb23416 100644 --- a/lib_com/preemph.c +++ b/lib_com/preemph.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "debug.h" #endif #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------* * preemph() diff --git a/lib_com/prot.h b/lib_com/prot.h index d4a03b00a0..356df80bf0 100644 --- a/lib_com/prot.h +++ b/lib_com/prot.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,15 +37,13 @@ #ifndef PROT_H #define PROT_H +#include +#include #include #include "options.h" #ifdef DEBUGGING #include "debug.h" #endif -#include -#ifndef RAM_COUNTING_TOOL -#include -#endif #include "typedef.h" #include "stat_enc.h" #include "stat_dec.h" @@ -55,28 +53,8 @@ #include "ivas_stat_dec.h" #include "cnst.h" #include "stl.h" -#ifdef RAM_COUNTING_TOOL -#include "mem_count.h" -#endif #include "ivas_error_utils.h" -/*----------------------------------------------------------------------------------* - * Prototypes of RAM counting tool macros - *----------------------------------------------------------------------------------*/ - -#ifdef RAM_COUNTING_TOOL -#define count_malloc( n1 ) MALLOC_FCT_CALL( n1 ) -#define count_calloc( n1, n2 ) CALLOC_FCT_CALL( n1, n2 ) -#define count_free( ptr ) FREE_FCT_CALL( ptr ) -#else -#define count_malloc( n1 ) malloc( n1 ) -#define count_calloc( n1, n2 ) calloc( n1, n2 ) -#define count_free( ptr ) free( ptr ) -#endif - -#define dynamic_malloc( n1 ) malloc( n1 ) -#define dynamic_calloc( n1, n2 ) calloc( n1, n2 ) -#define dynamic_free( n1 ) free( n1 ) /*----------------------------------------------------------------------------------* * Prototypes of global macros @@ -666,20 +644,6 @@ void evs_dec_previewFrame( ); -void read_indices_from_djb( - Decoder_State *st, /* i/o: decoder state structure */ - uint8_t *pt_stream, /* i : bitstream file */ - int16_t *CNG, - const int16_t num_bits, /* i : input frame length in bits */ - const Word16 isAMRWB_IOmode, /* i : AMRWB flag */ - const Word16 core_mode, /* i : core mode for frame */ - const Word16 qbit, /* i : Q bit for AMR-WB IO */ - const Word16 bitstreamformat, - const Word16 amrwb_rfc4867_flag, - const int16_t partialframe, /* i : partial frame information */ - const int16_t next_coder_type /* i : next coder type information */ -); - void getPartialCopyInfo( Decoder_State *st, /* i : decoder state structure */ int16_t *sharpFlag ); @@ -713,12 +677,10 @@ int16_t lev_dur( /*! r: delay value in ns */ int32_t get_delay( - const int16_t enc_dec, /* i : encoder/decoder flag */ - const int32_t io_fs, /* i : input/output sampling frequency */ - const IVAS_FORMAT ivas_format, /* i : IVAS format */ - HANDLE_CLDFB_FILTER_BANK hCldfb, /* i : Handle of Cldfb analysis */ - RENDERER_TYPE renderer_type, /* i : IVAS rendering type */ - const int32_t binaural_latency_ns /* i : binaural renderer HRTF delay in ns */ + const int16_t enc_dec, /* i : encoder/decoder flag */ + const int32_t io_fs, /* i : input/output sampling frequency */ + const IVAS_FORMAT ivas_format, /* i : IVAS format */ + HANDLE_CLDFB_FILTER_BANK hCldfb /* i : Handle of Cldfb analysis */ #ifdef SPLIT_REND_WITH_HEAD_ROT , AUDIO_CONFIG output_config /* i : decoder output config */ @@ -2262,18 +2224,19 @@ void read_next_force( ); #endif ivas_error init_encoder( - Encoder_State *st, /* i/o: state structure */ - const int16_t idchan, /* i : channel ID */ - const int16_t var_SID_rate_flag, /* i : flag for variable SID update rate */ + Encoder_State *st, /* i/o: state structure */ + const int16_t idchan, /* i : channel ID */ + const int16_t var_SID_rate_flag, /* i : flag for variable SID update rate */ const int16_t interval_SID, /* i : interval for SID update */ - const int16_t vad_only_flag /* i : flag to indicate front-VAD structure */ + const int16_t vad_only_flag, /* i : flag to indicate front-VAD structure */ + const ISM_MODE ism_mode /* i : ISM mode */ ); void LPDmem_enc_init( LPD_state_HANDLE hLPDmem /* i/o: LP memories */ ); -void destroy_encoder( +void destroy_cldfb_encoder( Encoder_State *st /* i/o: state structure */ ); ivas_error evs_enc( @@ -2304,7 +2267,6 @@ void pre_proc( float old_inp_16k[], /* i/o: buffer of old input signal @ 16kHz */ float **inp, /* o : ptr. to inp. signal in the current frame*/ float fr_bands[2 * NB_BANDS], /* i : energy in frequency bands */ - float *Etot, /* i : total energy */ float *ener, /* o : residual energy from Levinson-Durbin */ #ifndef FIX_I4_OL_PITCH int16_t pitch_orig[3], /* o : open-loop pitch values for quantization */ @@ -2365,8 +2327,10 @@ ivas_error acelp_core_enc( float pitch_buf[NB_SUBFR16k], /* o : floating pitch for each subframe */ int16_t *unbits, /* o : number of unused bits */ STEREO_TD_ENC_DATA_HANDLE hStereoTD, /* i/o: TD stereo encoder handle */ - const float tdm_lspQ_PCh[M], /* i : Q LSPs for primary channel */ - const float tdm_lsfQ_PCh[M] /* i : Q LSFs for primary channel */ +#ifndef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE + const float tdm_lspQ_PCh[M], /* i : Q LSPs for primary channel */ +#endif + const float tdm_lsfQ_PCh[M] /* i : Q LSFs for primary channel */ ); ivas_error acelp_core_switch_dec_bfi( @@ -2623,6 +2587,11 @@ void InitSWBencBuffer( TD_BWE_ENC_HANDLE hBWE_TD /* i/o: TD BWE data handle */ ); +void InitSWBencBufferStates( + TD_BWE_ENC_HANDLE hBWE_TD, /* i/o: TD BWE data handle */ + float *shb_speech /* o : SHB target signal (6-14kHz) at 16kHz */ +); + void swb_tbe_enc( Encoder_State *st, /* i/o: encoder state structure */ STEREO_ICBWE_ENC_HANDLE hStereoICBWE, /* i/o: IC-BWE state structure */ @@ -3836,11 +3805,8 @@ int16_t dtx_hangover_addition( const int16_t cldfb_subtraction, /* i : */ int16_t *vad_hover_flag, /* o : VAD hangover flag */ VAD_HANDLE hVAD, /* i/o: VAD handle for L or R channel */ - NOISE_EST_HANDLE hNoiseEst /* i : Noise estimation handle */ -#ifdef FIX_ITD_CNG - , - int16_t *rem_dtx_ho /* o : Expected remaining hangover frames */ -#endif + NOISE_EST_HANDLE hNoiseEst, /* i : Noise estimation handle */ + int16_t *rem_dtx_ho /* o : Expected remaining hangover frames */ ); int16_t wb_vad( @@ -3863,8 +3829,11 @@ void bw_detect( const float signal_in[], /* i : input signal */ float *spectrum, /* i : MDCT spectrum */ const float *enerBuffer /* i : energy buffer */ + , + const int16_t mct_on /* i : flag MCT mode */ ); + void set_bw( const int16_t element_mode, /* i : element mode */ const int32_t element_brate, /* i : element bitrate */ @@ -3920,8 +3889,7 @@ void updt_enc( ); void updt_enc_common( - Encoder_State *st, /* i/o: encoder state structure */ - const float Etot /* i : total energy */ + Encoder_State *st /* i/o: encoder state structure */ ); void updt_IO_switch_enc( @@ -4538,6 +4506,10 @@ ivas_error acelp_core_dec( const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */ const int16_t nchan_out, /* i : number of output channels */ STEREO_CNG_DEC_HANDLE hStereoCng /* i : stereo CNG handle */ +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + , + const int16_t read_sid_info /* i : read SID info flag */ +#endif ); void bass_psfilter_init( @@ -5157,7 +5129,7 @@ ivas_error init_decoder( const MC_MODE mc_mode /* i : MC mode */ ); -void destroy_decoder( +void destroy_cldfb_decoder( Decoder_State *st /* o : Decoder static variables structure */ ); @@ -5429,14 +5401,16 @@ void IMDCT( float *acelp_zir ); void hq_hr_dec( - Decoder_State *st, /* i/o: decoder state structure */ - float *t_audio_q, /* o : transform-domain coefficients */ - const int16_t length, /* i : frame length */ - const int16_t num_bits, /* i : number of available bits */ - int16_t *ynrm, /* o : norm quantization index vector */ - int16_t *is_transient, /* o : transient flag */ - int16_t *hqswb_clas, /* o : HQ SWB class */ - float *SWB_fenv /* o : SWB frequency envelopes */ + Decoder_State *st, /* i/o: decoder state structure */ + float *t_audio_q, /* o : transform-domain coefficients */ + const int16_t length, /* i : frame length */ + const int16_t num_bits, /* i : number of available bits */ + int16_t *ynrm, /* o : norm quantization index vector */ + int16_t *is_transient, /* o : transient flag */ + int16_t *hqswb_clas, /* o : HQ SWB class */ + float *SWB_fenv, /* o : SWB frequency envelopes */ + const int16_t core_switching_flag /* i : Core switching flag */ + ); void hdecnrm_context( @@ -5860,10 +5834,11 @@ void env_adj( ); float env_stability( - const int16_t *ynrm, /* i : Norm vector for current frame */ - const int16_t nb_sfm, /* i : Number of sub-bands */ - int16_t *mem_norm, /* i/o: Norm vector memory from past frame */ - int16_t *mem_env_delta /* i/o: Envelope stability memory for smoothing*/ + const int16_t *ynrm, /* i : Norm vector for current frame */ + const int16_t nb_sfm, /* i : Number of sub-bands */ + int16_t *mem_norm, /* i/o: Norm vector memory from past frame */ + int16_t *mem_env_delta, /* i/o: Envelope stability memory for smoothing*/ + const int16_t core_switching_flag /* i : Core switching flag */ ); /*! r: New speech/music state */ @@ -5893,6 +5868,7 @@ ivas_error core_switching_post_dec( float *synth, /* i/o: output synthesis */ float *output, /* i/o: LB synth/upsampled LB synth */ float output_mem[], /* i : OLA memory from last TCX/HQ frame */ + const IVAS_FORMAT ivas_format, /* i : IVAS format */ const int16_t use_cldfb_for_dft, /* i : flag to use of CLDFB for DFT Stereo */ const int16_t output_frame, /* i : frame length */ const int16_t core_switching_flag, /* i : ACELP->HQ switching frame flag */ @@ -7183,8 +7159,7 @@ void WindowSignal( int16_t *L_frame, /* i/o: frame length */ float out[], /* o : output windowed signal */ const int16_t truncate_aldo, /* i : nonzero to truncate long ALDO slope */ - const int16_t fullband, /* i : fullband flag */ - const int16_t isLfe /* i : LFE flag */ + const int16_t fullband /* i : fullband flag */ ); void HBAutocorrelation( @@ -7337,8 +7312,7 @@ void tcx_get_windows( const float **left_win, /* o : left overlap window */ int16_t *right_overlap, /* o : right overlap length */ const float **right_win, /* o : right overlap window */ - const int16_t fullband, /* i : fullband flag */ - const int16_t isLfe /* i : LFE flag */ + const int16_t fullband /* i : fullband flag */ ); void tcx_windowing_analysis( @@ -7873,17 +7847,18 @@ void coder_tcx( ); void coder_tcx_post( - Encoder_State *st, /* i/o: decoder memory state */ - float *A, - const float *Ai ); + Encoder_State *st, /* i/o: encoder memory state */ + float *A, /* o : Quantized LPC coefficients */ + const float *Ai /* i : Unquantized (interpolated) LPC coefficients */ +); void decoder_tcx( - Decoder_State *st, /* i/o: coder memory state */ - int16_t prm[], /* i : parameters */ - float A[], /* i : coefficients NxAz[M+1] */ - Word16 Aind[], /* i : frame-independent coefficients Az[M+1]*/ - float synth[], /* i/o: synth[-M..lg] */ - float synthFB[], + Decoder_State *st, /* i/o: coder memory state */ + int16_t prm[], /* i : parameters */ + float A[], /* i : coefficients NxAz[M+1] */ + Word16 Aind[], /* i : frame-independent coefficients Az[M+1]*/ + float synth[], /* i/o: synth[-M..lg] */ + float synthFB[], /* i/o: encoder memory state */ const int16_t bfi, /* i : Bad frame indicator */ const int16_t frame_cnt, /* i : frame counter in the super_frame */ const int16_t sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */ @@ -7987,7 +7962,7 @@ void writeTCXparam( const int16_t pre_past_flag ); void enc_prm_rf( - Encoder_State *st, /* i/o: decoder memory state */ + Encoder_State *st, /* i/o: encoder memory state */ const int16_t rf_frame_type, const int16_t fec_offset ); @@ -8093,7 +8068,11 @@ void msvq_enc( const float w[], /* i : Weights */ const int16_t N, /* i : Vector dimension */ const int16_t maxN, /* i : Codebook dimension */ - int16_t Idx[] /* o : Indices */ +#ifdef ERI_FDCNGVQ_LOW_ROM + const int16_t applyDCT_flag, /* i : applyDCT flag */ + float *invTrfMatrix, /* i:/o expanded synthesis matrix */ +#endif + int16_t Idx[] /* o : Indices */ ); void msvq_dec( @@ -8104,9 +8083,51 @@ void msvq_dec( const int16_t N, /* i : Vector dimension */ const int16_t maxN, /* i : Codebook dimension */ const int16_t Idx[], /* i : Indices */ - float *uq, /* o : quantized vector */ - Word16 *uq_ind /* o : quantized vector (fixed point) */ -); +#ifdef ERI_FDCNGVQ_LOW_ROM + const int16_t applyIDCT_flag, /* i : applyIDCT flag */ + const float *invTrfMatrix, /* i: synthesis matrix */ +#endif + float *uq, /* o : quantized vector */ + Word16 *uq_ind /* o : quantized vector (fixed point) */ +); + +#ifdef ERI_FDCNGVQ_LOW_ROM +void dec_FDCNG_MSVQ_stage1( + int16_t j_full, /* i: index full range */ + int16_t n, /* i: dimension to generate */ + const float *invTrfMatrix, /* i: synthesis matrix */ + DCTTYPE idcttype, /* i: idct type */ + float *uq, /* o: synthesized stage1 vector */ + Word16 *uq_ind /* o: synthesized stage1 vector in BASOP */ +); + +void create_IDCT_N_Matrix( + float *inv_matrixFloatQ, /* i/o: RAM buffer */ + const int16_t N, /* i: DCT length , number of time samples */ + const int16_t n_cols, /* i: number of dct coeffs (as DCT may be truncated) */ + const int16_t alloc_size /* i: RAM buffer size in elements*/ +); + + +void dctT2_N_apply_matrix( + const float *input, /* i: input in fdcng or DCT(fdcng) domain */ + float *output, /* o: output in DCT(fdcng) or fdcng ordomain */ + const int16_t dct_dim, /* i: dct processing dim possibly truncated */ + int16_t fdcngvq_dim, /* i: fdcng domain length */ + const float *idctT2_N_16matrixQ16, /* i: IDCT matrix */ + const int16_t matrix_1st_dim, /* i: */ + DCTTYPE dcttype ); /* i: matrix operation type */ + +void extend_dctN_input( + const float *input, /* i: input in fdcng domain */ + const float *dct_input, /* i: input in dctN(fdcng) domain */ + const int16_t in_dim, /* i: in_dim==N */ + float *ext_sig, /* o: extended output in fdcng domain */ + const int16_t out_dim, /* i: output total dim */ + float *matrix, /* i: idct matrix of size N rows , n_cols columns*/ + const int16_t n_cols, /* i: number of columns == truncation length */ + DCTTYPE dcttype ); /* i: matrix type */ +#endif void PulseResynchronization( const float *src_exc, /* i : Input excitation buffer */ @@ -8245,14 +8266,14 @@ void lsf_end_enc( ); void lsf_end_dec( - Decoder_State *st, - const int16_t coder_type_org, - const int16_t bwidth, - const int16_t nBits, - float *qlsf, - int16_t *lpc_param, - int16_t *LSF_Q_prediction, /* o : LSF prediction mode */ - int16_t *nb_indices + Decoder_State *st, /* i/o: decoder state structure */ + const int16_t coder_type_org, /* i : coding type */ + const int16_t bwidth, /* i : input signal bandwidth */ + const int16_t nBits, /* i : number of bits used for ISF quantization*/ + float *qlsf, /* o : quantized LSFs in the cosine domain */ + int16_t *lpc_param, /* i : LPC parameters */ + int16_t *LSF_Q_prediction, /* o : LSF prediction mode */ + int16_t *nb_indices /* o : number of indices */ #ifdef LSF_RE_USE_SECONDARY_CHANNEL , const float tdm_lsfQ_PCh[M] /* i : Q LSFs for primary channel */ @@ -8551,9 +8572,10 @@ void generate_comfort_noise_dec( ); void generate_comfort_noise_dec_hf( - float **bufferReal, /* o : Real part of input bands */ - float **bufferImag, /* o : Imaginary part of input bands */ - HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */ + float **bufferReal, /* o : Real part of input bands */ + float **bufferImag, /* o : Imaginary part of input bands */ + HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */ + const int16_t cng_flag /* i : CNG Flag */ ); void generate_masking_noise( @@ -8689,17 +8711,13 @@ void ApplyFdCng( const int16_t concealWholeFrame, /* i : binary flag indicating frame loss */ const int16_t is_music ); -void perform_noise_estimation_dec( - const float *timeDomainInput, - float *power_spectrum, - HANDLE_FD_CNG_DEC hFdCngDec, /* i/o: FD_CNG structure */ - const int16_t element_mode, /* i : element mode type */ - const int16_t bwidth, /* i : audio bandwidth */ - const int16_t L_frame, /* i : frame length at internal Fs */ - const int16_t last_L_frame, /* i : frame length of the last frame at internal Fs */ - const int32_t last_core_brate, /* i : previous frame core bitrate */ - const int16_t VAD /* i : VAD flag in the decoder */ +void generate_comfort_noise_dec( + float **bufferReal, /* o : Real part of input bands */ + float **bufferImag, /* o : Imaginary part of input bands */ + Decoder_State *st, /* i/o: decoder state structure */ + const int16_t nchan_out /* i : number of output channels */ ); + /*! r: CNG energy */ float cng_energy( const int16_t element_mode, /* i : element mode */ @@ -8803,40 +8821,40 @@ void ReadFromBitstream( int16_t **pStream, int16_t *pnSize ); -void const *GetTnsFilterOrder( void const *p, int16_t index, int16_t *pValue ); -void *SetTnsFilterOrder( void *p, int16_t index, int16_t value ); -void const *GetNumOfTnsFilters( void const *p, int16_t index, int16_t *pValue ); -void *SetNumOfTnsFilters( void *p, int16_t index, int16_t value ); -void const *GetTnsEnabled( void const *p, int16_t index, int16_t *pValue ); -void *SetTnsEnabled( void *p, int16_t index, int16_t value ); -void const *GetTnsEnabledSingleFilter( void const *p, int16_t index, int16_t *pValue ); -void *SetTnsEnabledSingleFilter( void *p, int16_t index, int16_t value ); -void const *GetTnsFilterCoeff( void const *p, int16_t index, int16_t *pValue ); -void *SetTnsFilterCoeff( void *p, int16_t index, int16_t value ); - -void const *GetTnsOnWhite( void const *p, int16_t index, int16_t *pValue ); -void *SetTnsOnWhite( void *p, int16_t index, int16_t value ); - -int16_t GetSWBTCX10TnsFilterCoeffBits( int16_t value, int16_t index ); -int16_t EncodeSWBTCX10TnsFilterCoeff( int16_t value, int16_t index ); -int16_t DecodeSWBTCX10TnsFilterCoeff( Decoder_State *st, int16_t index, int16_t *pValue ); -int16_t GetSWBTCX20TnsFilterCoeffBits( int16_t value, int16_t index ); -int16_t EncodeSWBTCX20TnsFilterCoeff( int16_t value, int16_t index ); -int16_t DecodeSWBTCX20TnsFilterCoeff( Decoder_State *st, int16_t index, int16_t *pValue ); - -int16_t GetWBTCX20TnsFilterCoeffBits( int16_t value, int16_t index ); -int16_t EncodeWBTCX20TnsFilterCoeff( int16_t, int16_t index ); -int16_t DecodeWBTCX20TnsFilterCoeff( Decoder_State *st, int16_t index, int16_t *pValue ); - -int16_t GetTnsFilterOrderBitsSWBTCX10( int16_t value, int16_t index ); -int16_t EncodeTnsFilterOrderSWBTCX10( int16_t value, int16_t index ); -int16_t DecodeTnsFilterOrderSWBTCX10( Decoder_State *st, int16_t index, int16_t *pValue ); -int16_t GetTnsFilterOrderBitsSWBTCX20( int16_t value, int16_t index ); -int16_t EncodeTnsFilterOrderSWBTCX20( int16_t value, int16_t index ); -int16_t DecodeTnsFilterOrderSWBTCX20( Decoder_State *st, int16_t index, int16_t *pValue ); -int16_t GetTnsFilterOrderBits( int16_t value, int16_t index ); -int16_t EncodeTnsFilterOrder( int16_t value, int16_t index ); -int16_t DecodeTnsFilterOrder( Decoder_State *st, int16_t index, int16_t *pValue ); +void const *GetTnsFilterOrder( void const *p, const int16_t index, int16_t *pValue ); +void *SetTnsFilterOrder( void *p, const int16_t index, const int16_t value ); +void const *GetNumOfTnsFilters( void const *p, const int16_t index, int16_t *pValue ); +void *SetNumOfTnsFilters( void *p, const int16_t index, const int16_t value ); +void const *GetTnsEnabled( void const *p, const int16_t index, int16_t *pValue ); +void *SetTnsEnabled( void *p, const int16_t index, const int16_t value ); +void const *GetTnsEnabledSingleFilter( void const *p, const int16_t index, int16_t *pValue ); +void *SetTnsEnabledSingleFilter( void *p, const int16_t index, const int16_t value ); +void const *GetTnsFilterCoeff( void const *p, const int16_t index, int16_t *pValue ); +void *SetTnsFilterCoeff( void *p, const int16_t index, const int16_t value ); + +void const *GetTnsOnWhite( void const *p, const int16_t index, int16_t *pValue ); +void *SetTnsOnWhite( void *p, const int16_t index, const int16_t value ); + +int16_t GetSWBTCX10TnsFilterCoeffBits( const int16_t value, const int16_t index ); +int16_t EncodeSWBTCX10TnsFilterCoeff( const int16_t value, const int16_t index ); +int16_t DecodeSWBTCX10TnsFilterCoeff( Decoder_State *st, const int16_t index, int16_t *pValue ); +int16_t GetSWBTCX20TnsFilterCoeffBits( const int16_t value, const int16_t index ); +int16_t EncodeSWBTCX20TnsFilterCoeff( const int16_t value, const int16_t index ); +int16_t DecodeSWBTCX20TnsFilterCoeff( Decoder_State *st, const int16_t index, int16_t *pValue ); + +int16_t GetWBTCX20TnsFilterCoeffBits( const int16_t value, const int16_t index ); +int16_t EncodeWBTCX20TnsFilterCoeff( const int16_t, const int16_t index ); +int16_t DecodeWBTCX20TnsFilterCoeff( Decoder_State *st, const int16_t index, int16_t *pValue ); + +int16_t GetTnsFilterOrderBitsSWBTCX10( const int16_t value, const int16_t index ); +int16_t EncodeTnsFilterOrderSWBTCX10( const int16_t value, const int16_t index ); +int16_t DecodeTnsFilterOrderSWBTCX10( Decoder_State *st, const int16_t index, int16_t *pValue ); +int16_t GetTnsFilterOrderBitsSWBTCX20( const int16_t value, const int16_t index ); +int16_t EncodeTnsFilterOrderSWBTCX20( const int16_t value, const int16_t index ); +int16_t DecodeTnsFilterOrderSWBTCX20( Decoder_State *st, const int16_t index, int16_t *pValue ); +int16_t GetTnsFilterOrderBits( const int16_t value, const int16_t index ); +int16_t EncodeTnsFilterOrder( const int16_t value, const int16_t index ); +int16_t DecodeTnsFilterOrder( Decoder_State *st, const int16_t index, int16_t *pValue ); void ResetTnsData( STnsData *pTnsData ); @@ -9000,26 +9018,29 @@ int16_t BITS_ALLOC_config_acelp( ); ivas_error config_acelp1( - const int16_t enc_dec, /* i : encoder/decoder flag */ - const int32_t total_brate, /* i : total bitrate */ - const int32_t core_brate_inp, /* i : core bitrate */ - const int16_t core, /* i : core */ - const int16_t extl, /* i : extension layer */ - const int32_t extl_brate, /* i : extension layer bitrate */ - const int16_t L_frame, /* i : frame length at internal Fs */ - const int16_t GSC_noisy_speech, /* i : GSC on SWB noisy speech flag */ - ACELP_config *acelp_cfg, /* i : ACELP bit-allocation */ - const int16_t signaling_bits, /* i : number of signaling bits */ - const int16_t coder_type, /* i : coder type */ - const int16_t tc_subfr, /* i : TC subfr ID */ - const int16_t tc_call, /* i : TC call number (0,1,2) */ - int16_t *nBits_es_Pred, /* o : number of bits for Es_pred Q */ - int16_t *unbits, /* o : number of unused bits */ - const int16_t element_mode, /* i : element mode */ - int16_t *uc_two_stage_flag, /* o : flag undicating two-stage UC */ - const int16_t tdm_lp_reuse_flag, /* i : LPC reuse flag (can be 1 only with secondary channel*/ - const int16_t tdm_low_rate_mode, /* i : secondary channel low rate mode flag*/ - const int16_t idchan, /* i : channel id */ + const int16_t enc_dec, /* i : encoder/decoder flag */ + const int32_t total_brate, /* i : total bitrate */ + const int32_t core_brate_inp, /* i : core bitrate */ + const int16_t core, /* i : core */ + const int16_t extl, /* i : extension layer */ + const int32_t extl_brate, /* i : extension layer bitrate */ + const int16_t L_frame, /* i : frame length at internal Fs */ + const int16_t GSC_noisy_speech, /* i : GSC on SWB noisy speech flag */ + ACELP_config *acelp_cfg, /* i : ACELP bit-allocation */ + const int16_t signaling_bits, /* i : number of signaling bits */ + const int16_t coder_type, /* i : coder type */ + const int16_t tc_subfr, /* i : TC subfr ID */ + const int16_t tc_call, /* i : TC call number (0,1,2) */ + int16_t *nBits_es_Pred, /* o : number of bits for Es_pred Q */ + int16_t *unbits, /* o : number of unused bits */ + const int16_t element_mode, /* i : element mode */ + int16_t *uc_two_stage_flag, /* o : flag undicating two-stage UC */ + const int16_t tdm_lp_reuse_flag, /* i : LPC reuse flag (can be 1 only with secondary channel*/ + const int16_t tdm_low_rate_mode, /* i : secondary channel low rate mode flag*/ + const int16_t idchan, /* i : channel id */ +#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE + const int16_t active_cnt, /* i : Active frame counter */ +#endif const int16_t tdm_Pitch_reuse_flag, /* i : primary channel pitch reuse flag */ const int16_t tdm_LRTD_flag, /* i : LRTD stereo mode flag */ const int16_t GSC_IVAS_mode /* i : GSC IVAS mode */ @@ -9527,11 +9548,11 @@ void TonalMDCTConceal_SaveTimeSignal( const int16_t numSamples ); void TonalMDCTConceal_Detect( - const TonalMDCTConcealPtr hTonalMDCTConc, /*IN */ - const float pitchLag, /*IN */ - int16_t *umIndices, /*OUT*/ - const PsychoacousticParameters *psychParamsCurrent, /*IN*/ - const int16_t isLfe ); + const TonalMDCTConcealPtr hTonalMDCTConc, /*IN */ + const float pitchLag, /*IN */ + int16_t *umIndices, /*OUT*/ + const PsychoacousticParameters *psychParamsCurrent /*IN*/ +); void TonalMDCTConceal_Apply( TonalMDCTConcealPtr hTonalMDCTConc, /*IN */ @@ -9663,10 +9684,9 @@ int16_t getTcxonly( ); int16_t getTnsAllowed( - const int32_t total_brate, /* i : total bitrate */ - const int16_t igf, /* i : flag indicating IGF activity*/ - const int16_t element_mode, /* i : IVAS element mode */ - const MCT_CHAN_MODE mct_chan_mode /* i : MCT channel mode */ + const int32_t total_brate, /* i : total bitrate */ + const int16_t igf, /* i : flag indicating IGF activity*/ + const int16_t element_mode /* i : IVAS element mode */ ); int16_t getCtxHm( @@ -9708,8 +9728,7 @@ int16_t getIgfPresent( const int16_t element_mode, /* i : IVAS element mode */ const int32_t total_brate, /* i : total bitrate */ const int16_t bwidth, /* i : audio bandwidth */ - const int16_t rf_mode, /* i : flag to signal the RF mode */ - const int16_t mct_chan_mode /* i : MCT channel mode */ + const int16_t rf_mode /* i : flag to signal the RF mode */ ); int16_t getCnaPresent( @@ -10006,6 +10025,5 @@ void init_tcx_cfg( const int16_t infoIGFStopFreq, const int16_t element_mode, const int16_t ini_frame, - const int16_t MCT_flag, /* i : hMCT handle allocated (1) or not (0) */ - const MCT_CHAN_MODE mct_chan_mode /* i : MCT channel mode */ + const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0) */ ); diff --git a/lib_com/pvq_com.c b/lib_com/pvq_com.c index 750c20adb9..133b7b62f7 100644 --- a/lib_com/pvq_com.c +++ b/lib_com/pvq_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "rom_com.h" #include "prot.h" #include "stl.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local definitions @@ -691,6 +691,8 @@ void srt_vec_ind_f( return; } +#define WMC_TOOL_SKIP + /*-------------------------------------------------------------------* * UMult_32_32() * @@ -814,7 +816,6 @@ Word16 atan2_fx( Word16 man, expo, reciprocal; Word16 angle, w, z; -#define WMC_TOOL_MAN IF( L_sub( x, 0 ) == 0 ) { return 25736; /* EVS_PI/2 in Q14 */ @@ -973,3 +974,5 @@ Word16 atan2_fx( return angle; /* Q14 between 0 and EVS_PI/2 radian. */ } + +#undef WMC_TOOL_SKIP diff --git a/lib_com/range_com.c b/lib_com/range_com.c index 083b95edbb..b01dc7156e 100644 --- a/lib_com/range_com.c +++ b/lib_com/range_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * rc_get_bits2() diff --git a/lib_com/re8_ppv.c b/lib_com/re8_ppv.c index ab48b24ced..f6c5ab6814 100644 --- a/lib_com/re8_ppv.c +++ b/lib_com/re8_ppv.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,8 +41,8 @@ #endif #include "cnst.h" #include "prot.h" -#include "wmops.h" -#include "wmops.h" +#include "wmc_auto.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local function prototypes diff --git a/lib_com/re8_util.c b/lib_com/re8_util.c index e4600774b4..d23ae1c0cd 100644 --- a/lib_com/re8_util.c +++ b/lib_com/re8_util.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* diff --git a/lib_com/realft.c b/lib_com/realft.c index 0c0b8236c5..b7a3fef0d9 100644 --- a/lib_com/realft.c +++ b/lib_com/realft.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #endif #include #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * four1() diff --git a/lib_com/recovernorm.c b/lib_com/recovernorm.c index b5e35de268..52e9edcd2a 100644 --- a/lib_com/recovernorm.c +++ b/lib_com/recovernorm.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "prot.h" #include "cnst.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * recovernorm() diff --git a/lib_com/reordvct.c b/lib_com/reordvct.c index a497f28e4a..182050bfb6 100644 --- a/lib_com/reordvct.c +++ b/lib_com/reordvct.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "debug.h" #endif #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * reordvct() diff --git a/lib_com/residu.c b/lib_com/residu.c index a897f70f25..e220d81c01 100644 --- a/lib_com/residu.c +++ b/lib_com/residu.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------* * residu() diff --git a/lib_com/rom_com.c b/lib_com/rom_com.c index e5f2b7ce0b..6701d39534 100644 --- a/lib_com/rom_com.c +++ b/lib_com/rom_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "rom_com.h" #include "prot.h" #include "basop_util.h" -#include "wmops.h" +#include "wmc_auto.h" /* clang-format off */ @@ -6036,6 +6036,299 @@ const FD_CNG_SETUP FdCngSetup_swb2 = { 640, 320, sizeof(sidPartitions_swb2)/size const int16_t levels_37bits[FD_CNG_stages_37bits] = { 128, 64, 64, 64, 64, 64 }; const int16_t bits_37bits[FD_CNG_stages_37bits] = { 7, 6, 6, 6, 6, 6 }; +#ifdef ERI_FDCNGVQ_LOW_ROM +/* IDCT_MATRIX_ROM: 18*24 Word16 = 432 Word16 */ +/* or compressed IDCT_MATRIX_ROM: 18*24 Word8 + 25 = 230 Word16 + WMOPS (INDIRECT(432) and STORE(432) ) */ + +/* Stage1 Word8 tables 16x8+ 17*10+ 17*16 + 78*18 = = 1974 Word8 -> 987 Word16 */ + +/* ROM storeSizeW8 = W8reduction (3072- (987+230) )/3072 = 1207/3072 --> 39.3 % */ +/* ROM with DCTII-24 in PROM = W8reduction (3072- (987) )/3072 = /3072 --> 31.8 % */ + +/* additional minor Table ROM ( dct_mid points 18 Word16, dct_col_upshifts 52, scaleFactors 2*2 = ~= 74 Word16s */ + + +const Word16 cdk1_ivas_entries_per_segment[FDCNG_VQ_DCT_NSEGM] = { 16, 17, 17, 78 }; +const Word16 cdk1_ivas_cum_entries_per_segment[FDCNG_VQ_DCT_NSEGM + 1] = { 0, 16 ,33, 50, 128 }; +const Word16 /* DCT trunc_len */ cdk1_ivas_cols_per_segment[FDCNG_VQ_DCT_NSEGM] = { FDCNG_VQ_DCT_MINTRUNC, 10, 16, FDCNG_VQ_DCT_MAXTRUNC }; /* 8, 10, 16, 18 */ +const Word16 /* segment inner DCT trunc_len */ cdk1_ivas_trunc_dct_cols_per_segment[FDCNG_VQ_DCT_NSEGM] = { FDCNG_VQ_DCT_MAXTRUNC - FDCNG_VQ_DCT_MINTRUNC, FDCNG_VQ_DCT_MAXTRUNC - 10 , FDCNG_VQ_DCT_MAXTRUNC - 16 , 0 }; + +/* to get back to FDCNG VQ domain for segment S use : idct as follows */ +/* cdk1r_vec[col, row] = cdk1r_tr_midQ_truncQ(col 1:24 ) + invScaleFQ * idctMat( cdk1_ivas_dct_sS_W8[1:col]< #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local constants diff --git a/lib_com/stl.h b/lib_com/stl.h index c699fd899b..234aec9e16 100644 --- a/lib_com/stl.h +++ b/lib_com/stl.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_com/swb_bwe_com.c b/lib_com/swb_bwe_com.c index 4e692fc22b..4efbaa735d 100644 --- a/lib_com/swb_bwe_com.c +++ b/lib_com/swb_bwe_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * WB_BWE_gain_pred() diff --git a/lib_com/swb_bwe_com_hr.c b/lib_com/swb_bwe_com_hr.c index ebad781a99..fbdcf70b93 100644 --- a/lib_com/swb_bwe_com_hr.c +++ b/lib_com/swb_bwe_com_hr.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * swb_hr_nonzero_subband_noise_fill() diff --git a/lib_com/swb_bwe_com_lr.c b/lib_com/swb_bwe_com_lr.c index 963d881cb3..daa7d16737 100644 --- a/lib_com/swb_bwe_com_lr.c +++ b/lib_com/swb_bwe_com_lr.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * hf_parinitiz() diff --git a/lib_com/swb_tbe_com.c b/lib_com/swb_tbe_com.c index cc0c70cbbf..235a3551f6 100644 --- a/lib_com/swb_tbe_com.c +++ b/lib_com/swb_tbe_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" #include "ivas_prot.h" #include @@ -1897,6 +1897,8 @@ void tbe_celp_exc( return; } + assert( bwe_exc != NULL && "BWE excitation is NULL" ); + if ( L_frame == L_FRAME ) { offset = tbe_celp_exc_offset( T0, T0_frac ); diff --git a/lib_com/syn_12k8.c b/lib_com/syn_12k8.c index 4323853f98..15892f62c6 100644 --- a/lib_com/syn_12k8.c +++ b/lib_com/syn_12k8.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------ * syn_12k8() diff --git a/lib_com/syn_filt.c b/lib_com/syn_filt.c index d571b9cb7f..08e687c12c 100644 --- a/lib_com/syn_filt.c +++ b/lib_com/syn_filt.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" #include /*------------------------------------------------------------------* diff --git a/lib_com/tcq_position_arith.c b/lib_com/tcq_position_arith.c index 4c3c49e197..1869562074 100644 --- a/lib_com/tcq_position_arith.c +++ b/lib_com/tcq_position_arith.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "rom_com.h" #include "basop_util.h" #include "basop_proto_func.h" -#include "wmops.h" +#include "wmc_auto.h" static void bitstream_save_bit( TCQ_PBITSTREAM pBS, const int16_t bit ); diff --git a/lib_com/tcx_ltp.c b/lib_com/tcx_ltp.c index 160a6e7875..90dcb1515c 100644 --- a/lib_com/tcx_ltp.c +++ b/lib_com/tcx_ltp.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #endif #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------- * Local constants diff --git a/lib_com/tcx_mdct.c b/lib_com/tcx_mdct.c index d9713c9cfc..e8ac35d07a 100644 --- a/lib_com/tcx_mdct.c +++ b/lib_com/tcx_mdct.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * TCX_MDCT() diff --git a/lib_com/tcx_mdct_window.c b/lib_com/tcx_mdct_window.c index 2d1d474404..0ef69587a8 100644 --- a/lib_com/tcx_mdct_window.c +++ b/lib_com/tcx_mdct_window.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------- * mdct_window_sine() diff --git a/lib_com/tcx_utils.c b/lib_com/tcx_utils.c index 6e868add48..ec219456b0 100644 --- a/lib_com/tcx_utils.c +++ b/lib_com/tcx_utils.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * tcx_get_windows() @@ -59,16 +59,9 @@ void tcx_get_windows( const float **left_win, /* o : left overlap window */ int16_t *right_overlap, /* o : right overlap length */ const float **right_win, /* o : right overlap window */ - const int16_t fullband, /* i : fullband flag */ - const int16_t isLfe /* i : LFE flag */ + const int16_t fullband /* i : fullband flag */ ) { - /* LFE is only FULL_OVERLAP*/ - if ( isLfe ) - { - assert( left_mode == FULL_OVERLAP && right_mode == FULL_OVERLAP ); - } - if ( !fullband ) { /* Left part */ @@ -91,16 +84,8 @@ void tcx_get_windows( } else if ( left_mode == FULL_OVERLAP ) { - if ( isLfe ) - { - *left_overlap = hTcxCfg->tcx_mdct_window_length; - *left_win = hTcxCfg->tcx_mdct_window; - } - else - { - *left_overlap = hTcxCfg->tcx_mdct_window_length; - *left_win = hTcxCfg->tcx_aldo_window_1_trunc; - } + *left_overlap = hTcxCfg->tcx_mdct_window_length; + *left_win = hTcxCfg->tcx_aldo_window_1_trunc; } else { @@ -121,16 +106,8 @@ void tcx_get_windows( } else if ( right_mode == FULL_OVERLAP ) { - if ( isLfe ) - { - *right_overlap = hTcxCfg->tcx_mdct_window_length; - *right_win = hTcxCfg->tcx_mdct_window; - } - else - { - *right_overlap = hTcxCfg->tcx_mdct_window_delay; - *right_win = hTcxCfg->tcx_aldo_window_2; - } + *right_overlap = hTcxCfg->tcx_mdct_window_delay; + *right_win = hTcxCfg->tcx_aldo_window_2; } else { @@ -164,16 +141,8 @@ void tcx_get_windows( } else if ( left_mode == FULL_OVERLAP ) { - if ( isLfe ) - { - *left_overlap = hTcxCfg->tcx_mdct_window_lengthFB; - *left_win = hTcxCfg->tcx_mdct_windowFB; - } - else - { - *left_overlap = hTcxCfg->tcx_mdct_window_lengthFB; - *left_win = hTcxCfg->tcx_aldo_window_1_FB_trunc; - } + *left_overlap = hTcxCfg->tcx_mdct_window_lengthFB; + *left_win = hTcxCfg->tcx_aldo_window_1_FB_trunc; } else { @@ -199,16 +168,8 @@ void tcx_get_windows( } else if ( right_mode == FULL_OVERLAP ) { - if ( isLfe ) - { - *right_overlap = hTcxCfg->tcx_mdct_window_lengthFB; - *right_win = hTcxCfg->tcx_mdct_windowFB; - } - else - { - *right_overlap = hTcxCfg->tcx_mdct_window_delayFB; - *right_win = hTcxCfg->tcx_aldo_window_2_FB; - } + *right_overlap = hTcxCfg->tcx_mdct_window_delayFB; + *right_win = hTcxCfg->tcx_aldo_window_2_FB; } else { @@ -276,8 +237,7 @@ void WindowSignal( int16_t *L_frame, /* i/o: frame length */ float out[], /* o : output windowed signal */ const int16_t truncate_aldo, /* i : nonzero to truncate long ALDO slope */ - const int16_t fullband, /* i : fullband flag */ - const int16_t isLfe /* i : LFE flag */ + const int16_t fullband /* i : fullband flag */ ) { int16_t l, r; @@ -288,7 +248,7 @@ void WindowSignal( * Init * *-----------------------------------------------------------*/ - tcx_get_windows( hTcxCfg, left_overlap_mode, right_overlap_mode, &l, &left_win, &r, &right_win, fullband, isLfe ); + tcx_get_windows( hTcxCfg, left_overlap_mode, right_overlap_mode, &l, &left_win, &r, &right_win, fullband ); /* Init lengths */ @@ -314,7 +274,7 @@ void WindowSignal( tcx_windowing_analysis( in - l / 2 + offset, *L_frame, l, left_win, r, right_win, out ); - if ( left_overlap_mode == FULL_OVERLAP && truncate_aldo && !isLfe ) + if ( left_overlap_mode == FULL_OVERLAP && truncate_aldo ) { /* fade truncated ALDO window to avoid discontinuities */ if ( !fullband ) diff --git a/lib_com/tec_com.c b/lib_com/tec_com.c index 18b2e79b94..346d38292b 100644 --- a/lib_com/tec_com.c +++ b/lib_com/tec_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #include "rom_com.h" #include "prot.h" #include "stat_dec.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------- * Local constants diff --git a/lib_com/tns_base.c b/lib_com/tns_base.c index 94b014b59b..20e679c316 100644 --- a/lib_com/tns_base.c +++ b/lib_com/tns_base.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #include "rom_com.h" #include "prot.h" #include "stat_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------------- @@ -287,67 +287,67 @@ static int16_t DecodeUsingTable( Decoder_State *st, int16_t *pValue, const Codin /* TNS filter coefficients */ -void const *GetTnsFilterCoeff( void const *p, int16_t index, int16_t *pValue ) +void const *GetTnsFilterCoeff( void const *p, const int16_t index, int16_t *pValue ) { *pValue = ( (int16_t const *) p )[index] + INDEX_SHIFT; return NULL; } -void *SetTnsFilterCoeff( void *p, int16_t index, int16_t value ) +void *SetTnsFilterCoeff( void *p, const int16_t index, const int16_t value ) { ( (int16_t *) p )[index] = value - INDEX_SHIFT; return NULL; } -int16_t GetSWBTCX20TnsFilterCoeffBits( int16_t value, int16_t index ) +int16_t GetSWBTCX20TnsFilterCoeffBits( const int16_t value, const int16_t index ) { assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) ); return GetBitsFromTable( value, codesTnsCoeffSWBTCX20[index], nTnsCoeffCodes ); } -int16_t EncodeSWBTCX20TnsFilterCoeff( int16_t value, int16_t index ) +int16_t EncodeSWBTCX20TnsFilterCoeff( const int16_t value, const int16_t index ) { assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) ); return EncodeUsingTable( value, codesTnsCoeffSWBTCX20[index], nTnsCoeffCodes ); } -int16_t DecodeSWBTCX20TnsFilterCoeff( Decoder_State *st, int16_t index, int16_t *pValue ) +int16_t DecodeSWBTCX20TnsFilterCoeff( Decoder_State *st, const int16_t index, int16_t *pValue ) { assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) ); return DecodeUsingTable( st, pValue, codesTnsCoeffSWBTCX20[index], nTnsCoeffCodes ); } -int16_t GetSWBTCX10TnsFilterCoeffBits( int16_t value, int16_t index ) +int16_t GetSWBTCX10TnsFilterCoeffBits( const int16_t value, const int16_t index ) { assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) ); return GetBitsFromTable( value, codesTnsCoeffSWBTCX10[index], nTnsCoeffCodes ); } -int16_t EncodeSWBTCX10TnsFilterCoeff( int16_t value, int16_t index ) +int16_t EncodeSWBTCX10TnsFilterCoeff( const int16_t value, const int16_t index ) { assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) ); return EncodeUsingTable( value, codesTnsCoeffSWBTCX10[index], nTnsCoeffCodes ); } -int16_t DecodeSWBTCX10TnsFilterCoeff( Decoder_State *st, int16_t index, int16_t *pValue ) +int16_t DecodeSWBTCX10TnsFilterCoeff( Decoder_State *st, const int16_t index, int16_t *pValue ) { assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) ); return DecodeUsingTable( st, pValue, codesTnsCoeffSWBTCX10[index], nTnsCoeffCodes ); } -int16_t GetWBTCX20TnsFilterCoeffBits( int16_t value, int16_t index ) +int16_t GetWBTCX20TnsFilterCoeffBits( const int16_t value, const int16_t index ) { assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) ); return GetBitsFromTable( value, codesTnsCoeffWBTCX20[index], nTnsCoeffCodes ); } -int16_t EncodeWBTCX20TnsFilterCoeff( int16_t value, int16_t index ) +int16_t EncodeWBTCX20TnsFilterCoeff( const int16_t value, const int16_t index ) { assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) ); return EncodeUsingTable( value, codesTnsCoeffWBTCX20[index], nTnsCoeffCodes ); } -int16_t DecodeWBTCX20TnsFilterCoeff( Decoder_State *st, int16_t index, int16_t *pValue ) +int16_t DecodeWBTCX20TnsFilterCoeff( Decoder_State *st, const int16_t index, int16_t *pValue ) { assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) ); return DecodeUsingTable( st, pValue, codesTnsCoeffWBTCX20[index], nTnsCoeffCodes ); @@ -356,67 +356,67 @@ int16_t DecodeWBTCX20TnsFilterCoeff( Decoder_State *st, int16_t index, int16_t * /* TNS filter order */ -void const *GetTnsFilterOrder( void const *p, int16_t index, int16_t *pValue ) +void const *GetTnsFilterOrder( void const *p, const int16_t index, int16_t *pValue ) { *pValue = ( (STnsFilter const *) p )[index].order; return ( (STnsFilter const *) p )[index].coefIndex; } -void *SetTnsFilterOrder( void *p, int16_t index, int16_t value ) +void *SetTnsFilterOrder( void *p, const int16_t index, const int16_t value ) { ( (STnsFilter *) p )[index].order = value; return ( (STnsFilter *) p )[index].coefIndex; } -int16_t GetTnsFilterOrderBitsSWBTCX20( int16_t value, int16_t index ) +int16_t GetTnsFilterOrderBitsSWBTCX20( const int16_t value, const int16_t index ) { (void) index; return GetBitsFromTable( value - 1, codesTnsOrderTCX20, nTnsOrderCodes ); } -int16_t EncodeTnsFilterOrderSWBTCX20( int16_t value, int16_t index ) +int16_t EncodeTnsFilterOrderSWBTCX20( const int16_t value, const int16_t index ) { (void) index; return EncodeUsingTable( value - 1, codesTnsOrderTCX20, nTnsOrderCodes ); } -int16_t DecodeTnsFilterOrderSWBTCX20( Decoder_State *st, int16_t index, int16_t *pValue ) +int16_t DecodeTnsFilterOrderSWBTCX20( Decoder_State *st, const int16_t index, int16_t *pValue ) { (void) index; return DecodeUsingTable( st, pValue, codesTnsOrderTCX20, nTnsOrderCodes ); } -int16_t GetTnsFilterOrderBitsSWBTCX10( int16_t value, int16_t index ) +int16_t GetTnsFilterOrderBitsSWBTCX10( const int16_t value, const int16_t index ) { (void) index; return GetBitsFromTable( value - 1, codesTnsOrderTCX10, nTnsOrderCodes ); } -int16_t EncodeTnsFilterOrderSWBTCX10( int16_t value, int16_t index ) +int16_t EncodeTnsFilterOrderSWBTCX10( const int16_t value, const int16_t index ) { (void) index; return EncodeUsingTable( value - 1, codesTnsOrderTCX10, nTnsOrderCodes ); } -int16_t DecodeTnsFilterOrderSWBTCX10( Decoder_State *st, int16_t index, int16_t *pValue ) +int16_t DecodeTnsFilterOrderSWBTCX10( Decoder_State *st, const int16_t index, int16_t *pValue ) { (void) index; return DecodeUsingTable( st, pValue, codesTnsOrderTCX10, nTnsOrderCodes ); } -int16_t GetTnsFilterOrderBits( int16_t value, int16_t index ) +int16_t GetTnsFilterOrderBits( const int16_t value, const int16_t index ) { (void) index; return GetBitsFromTable( value - 1, codesTnsOrder, nTnsOrderCodes ); } -int16_t EncodeTnsFilterOrder( int16_t value, int16_t index ) +int16_t EncodeTnsFilterOrder( const int16_t value, const int16_t index ) { (void) index; return EncodeUsingTable( value - 1, codesTnsOrder, nTnsOrderCodes ); } -int16_t DecodeTnsFilterOrder( Decoder_State *st, int16_t index, int16_t *pValue ) +int16_t DecodeTnsFilterOrder( Decoder_State *st, const int16_t index, int16_t *pValue ) { (void) index; return DecodeUsingTable( st, pValue, codesTnsOrder, nTnsOrderCodes ); @@ -424,13 +424,13 @@ int16_t DecodeTnsFilterOrder( Decoder_State *st, int16_t index, int16_t *pValue /* Number of TNS filters */ -void const *GetNumOfTnsFilters( void const *p, int16_t index, int16_t *pValue ) +void const *GetNumOfTnsFilters( void const *p, const int16_t index, int16_t *pValue ) { *pValue = (int16_t) abs( ( (STnsData const *) p )[index].nFilters ); return ( (STnsData const *) p )[index].filter; } -void *SetNumOfTnsFilters( void *p, int16_t index, int16_t value ) +void *SetNumOfTnsFilters( void *p, const int16_t index, const int16_t value ) { ( (STnsData *) p )[index].nFilters = (int16_t) abs( value ); return ( (STnsData *) p )[index].filter; @@ -438,13 +438,13 @@ void *SetNumOfTnsFilters( void *p, int16_t index, int16_t value ) /* TNS enabled/disabled flag */ -void const *GetTnsEnabled( void const *p, int16_t index, int16_t *pValue ) +void const *GetTnsEnabled( void const *p, const int16_t index, int16_t *pValue ) { *pValue = ( (STnsData const *) p )[index].nFilters != 0 ? 1 : 0; return NULL; } -void *SetTnsEnabled( void *p, int16_t index, int16_t value ) +void *SetTnsEnabled( void *p, const int16_t index, const int16_t value ) { (void) p, (void) index, (void) value; return NULL; @@ -452,25 +452,25 @@ void *SetTnsEnabled( void *p, int16_t index, int16_t value ) /* TNS on whitened spectra flag */ -void const *GetTnsOnWhite( void const *p, int16_t index, int16_t *pValue ) +void const *GetTnsOnWhite( void const *p, const int16_t index, int16_t *pValue ) { *pValue = ( (STnsData const *) p )[index].tnsOnWhitenedSpectra > 0 ? 1 : 0; return NULL; } -void *SetTnsOnWhite( void *p, int16_t index, int16_t value ) +void *SetTnsOnWhite( void *p, const int16_t index, const int16_t value ) { ( (STnsData *) p )[index].tnsOnWhitenedSpectra = value; return NULL; } -void const *GetTnsEnabledSingleFilter( void const *p, int16_t index, int16_t *pValue ) +void const *GetTnsEnabledSingleFilter( void const *p, const int16_t index, int16_t *pValue ) { *pValue = ( (STnsData const *) p )[index].nFilters != 0 ? 1 : 0; return ( (STnsData const *) p )[index].filter; } -void *SetTnsEnabledSingleFilter( void *p, int16_t index, int16_t value ) +void *SetTnsEnabledSingleFilter( void *p, const int16_t index, const int16_t value ) { ( (STnsData *) p )[index].nFilters = value; return ( (STnsData *) p )[index].filter; diff --git a/lib_com/tools.c b/lib_com/tools.c index 2ab9952c0c..db7c5a3f8e 100644 --- a/lib_com/tools.c +++ b/lib_com/tools.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------* * own_random() @@ -1446,8 +1446,7 @@ void polezero_filter( return; } -#define WMC_TOOL_MAN - +#define WMC_TOOL_SKIP static float fleft_shift( float input, const int16_t shift ) { return ( input * (float) pow( 2.0, (double) shift ) ); @@ -1457,7 +1456,7 @@ static float fright_shift( float input, const int16_t shift ) { return ( input * (float) pow( 0.5, (double) shift ) ); } -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP /*--------------------------------------------------------------------------------* @@ -1487,7 +1486,7 @@ float root_a( return 0.0; } -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP /* This next piece of code implements a "norm" function */ /* and returns the shift needed to scale "a" to have a */ /* 1 in the (MSB-1) position. This is equivalent to */ @@ -1506,7 +1505,7 @@ float root_a( mod_a *= 2.0; shift_a++; } -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP shift_a &= 0xfffe; mod_a = fleft_shift( a, shift_a ); @@ -1554,21 +1553,23 @@ float root_a_over_b( { return 0.0; } -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP if ( isinf( a ) ) +#undef WMC_TOOL_SKIP { return FLT_MAX; } +#define WMC_TOOL_SKIP if ( isinf( b ) ) +#undef WMC_TOOL_SKIP { return 0.f; } -#undef WMC_TOOL_MAN a += 0x00000001; b += 0x00000001; -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP /* This next piece of code implements a "norm" function */ /* and returns the shift needed to scale "a" to have a */ /* 1 in the (MSB-1) position. This is equivalent to */ @@ -1587,12 +1588,12 @@ float root_a_over_b( mod_a *= 2.0; shift_a++; } -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP shift_a &= 0xfffe; mod_a = fleft_shift( a, shift_a ); -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP /* This next piece of code implements a "norm" function */ /* and returns the shift needed to scale "b" to have a */ /* 1 in the (MSB-1) position. This is equivalent to */ @@ -1611,7 +1612,7 @@ float root_a_over_b( mod_b *= 2.0; shift_b++; } -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP shift_b &= 0xfffe; mod_b = fleft_shift( b, shift_b ); diff --git a/lib_com/trans_direct.c b/lib_com/trans_direct.c index d6e35d583e..964ba36f76 100644 --- a/lib_com/trans_direct.c +++ b/lib_com/trans_direct.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------- * direct_transform() diff --git a/lib_com/trans_inv.c b/lib_com/trans_inv.c index 18c5fe0431..1eea807b2f 100644 --- a/lib_com/trans_inv.c +++ b/lib_com/trans_inv.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * Local constants diff --git a/lib_com/typedef.h b/lib_com/typedef.h index ec617a5857..9b1ed7bc93 100644 --- a/lib_com/typedef.h +++ b/lib_com/typedef.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_com/vlpc_2st_com.c b/lib_com/vlpc_2st_com.c index 86fdf68c5f..e180454c3e 100644 --- a/lib_com/vlpc_2st_com.c +++ b/lib_com/vlpc_2st_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------* * lsf_weight_2st() diff --git a/lib_com/weight.c b/lib_com/weight.c index e50707b688..6c2e1c291a 100644 --- a/lib_com/weight.c +++ b/lib_com/weight.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * sfm2mqb() diff --git a/lib_com/weight_a.c b/lib_com/weight_a.c index 0eda2133ce..96b8014e41 100644 --- a/lib_com/weight_a.c +++ b/lib_com/weight_a.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "debug.h" #endif #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------ * weight_a() diff --git a/lib_com/wi.c b/lib_com/wi.c index b0d16671b0..7ec30010fe 100644 --- a/lib_com/wi.c +++ b/lib_com/wi.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,11 +40,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" - -#ifdef FIX_VBR_COMPLEXITY -#define WMC_TOOL_MAN -#endif +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local constants @@ -77,18 +73,15 @@ ivas_error DTFS_new( int16_t i; DTFS_STRUCTURE *dtfs = NULL; - dtfs = (DTFS_STRUCTURE *) dynamic_malloc( sizeof( DTFS_STRUCTURE ) ); - - if ( dtfs == NULL ) + if ( ( dtfs = (DTFS_STRUCTURE *) malloc( sizeof( DTFS_STRUCTURE ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DTFS (SC-VBR) structure\n" ) ); } -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP MOVE( 2 ); LOOP( 1 ); MOVE( 2 ); -#endif dtfs->lag = 0; dtfs->nH = 0; dtfs->nH_4kHz = 0; @@ -103,6 +96,8 @@ ivas_error DTFS_new( dtfs->sampling_rate = -1; *dtfs_out = dtfs; +#undef WMC_TOOL_SKIP + return IVAS_ERR_OK; } @@ -119,7 +114,8 @@ void DTFS_copy( ) { int16_t k; -#ifdef FIX_VBR_COMPLEXITY + +#define WMC_TOOL_SKIP LOOP( 1 ); for ( k = 0; k < MAXLAG_WI; k++ ) { @@ -138,21 +134,7 @@ void DTFS_copy( Xout->nH_4kHz = Xinp.nH_4kHz; Xout->upper_cut_off_freq_of_interest = Xinp.upper_cut_off_freq_of_interest; Xout->upper_cut_off_freq = Xinp.upper_cut_off_freq; -#else - for ( k = 0; k < MAXLAG_WI; k++ ) - { - Xout->a[k] = Xinp.a[k]; - } - for ( k = 0; k < MAXLAG_WI; k++ ) - { - Xout->b[k] = Xinp.b[k]; - } - Xout->lag = Xinp.lag; - Xout->nH = Xinp.nH; - Xout->nH_4kHz = Xinp.nH_4kHz; - Xout->upper_cut_off_freq_of_interest = Xinp.upper_cut_off_freq_of_interest; - Xout->upper_cut_off_freq = Xinp.upper_cut_off_freq; -#endif +#undef WMC_TOOL_SKIP return; } @@ -173,7 +155,7 @@ void DTFS_sub( { int16_t i; -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP MULT( 1 ); LOOP( 1 ); for ( i = 0; i <= X1.lag / 2; i++ ) @@ -199,23 +181,7 @@ void DTFS_sub( tmp->nH_4kHz = max( X1.nH_4kHz, X2.nH_4kHz ); tmp->upper_cut_off_freq_of_interest = X1.upper_cut_off_freq_of_interest; tmp->upper_cut_off_freq = X1.upper_cut_off_freq; -#else - for ( i = 0; i <= X1.lag / 2; i++ ) - { - tmp->a[i] = X1.a[i]; - tmp->b[i] = X1.b[i]; - } - for ( i = 0; i <= X2.lag / 2; i++ ) - { - tmp->a[i] -= X2.a[i]; - tmp->b[i] -= X2.b[i]; - } - tmp->lag = max( X1.lag, X2.lag ); - tmp->nH = max( X1.nH, X2.nH ); - tmp->nH_4kHz = max( X1.nH_4kHz, X2.nH_4kHz ); - tmp->upper_cut_off_freq_of_interest = X1.upper_cut_off_freq_of_interest; - tmp->upper_cut_off_freq = X1.upper_cut_off_freq; -#endif +#undef WMC_TOOL_SKIP return; } @@ -240,7 +206,7 @@ static void DTFS_fast_fs_inv( N = X1_DTFS->lag; } -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP /* Populate the dbuf array */ dbuf[1] = X1_DTFS->a[0]; dbuf[2] = 0.0; @@ -276,36 +242,7 @@ static void DTFS_fast_fs_inv( ADD( 1 ); out[i - 1] = dbuf[i] / N_2; } -#else - /* Populate the dbuf array */ - dbuf[1] = X1_DTFS->a[0]; - dbuf[2] = 0.0; - for ( i = 1; i < M_2; i++ ) - { - dbuf[2 * i + 1] = X1_DTFS->a[i] * N_2; - dbuf[2 * i + 2] = X1_DTFS->b[i] * N_2; - } - - if ( N_2 != M_2 ) - { - dbuf[2 * i + 1] = X1_DTFS->a[i] * N_2; - dbuf[2 * i + 2] = X1_DTFS->b[i] * N_2; - i++; - } - - /* Zero-padding in the frequency domain */ - for ( ; i < N_2; i++ ) - { - dbuf[2 * i + 1] = dbuf[2 * i + 2] = 0.0; - } - - realft( dbuf, N_2, -1 ); - - for ( i = 1; i <= N; i++ ) - { - out[i - 1] = dbuf[i] / N_2; - } -#endif +#undef WMC_TOOL_SKIP return; } @@ -333,7 +270,7 @@ static float DTFS_alignment_weight( float pwf = 0.7f, tmplpc[M + 1]; DTFS_STRUCTURE X1_DTFS; -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP FUNC( 2 ); DTFS_copy( &X1_DTFS, refX1_DTFS ); FUNC( 2 ); @@ -351,7 +288,6 @@ static float DTFS_alignment_weight( tmplpc[k] = LPC1[k] * ( tmp *= pwf ); } - FUNC( 3 ); DTFS_zeroFilter( &X1_DTFS, tmplpc, M + 1 ); FUNC( 3 ); @@ -421,55 +357,7 @@ static float DTFS_alignment_weight( maxcorr = wcorr; } } -#else - DTFS_copy( &X1_DTFS, refX1_DTFS ); - DTFS_adjustLag( &X1_DTFS, X2_DTFS.lag ); - DTFS_poleFilter( &X1_DTFS, LPC1, M + 1 ); - tmp = 1.0; - for ( k = 0, tmp = 1.0; k < M + 1; k++ ) - { - tmplpc[k] = LPC1[k] * ( tmp *= pwf ); - } - - - DTFS_zeroFilter( &X1_DTFS, tmplpc, M + 1 ); - DTFS_poleFilter( &X2_DTFS, LPC2, M + 1 ); - for ( k = 0, tmp = 1.0; k < M + 1; k++ ) - { - /* can be stored as a table */ - tmplpc[k] = LPC2[k] * ( tmp *= pwf ); - } - DTFS_zeroFilter( &X2_DTFS, tmplpc, M + 1 ); - maxcorr = (float) -HUGE_VAL; - fshift = Eshift; - Adiff = max( 6, 0.15f * X2_DTFS.lag ); - if ( X2_DTFS.lag < 60 ) - { - diff = 0.25; - } - else - { - diff = 0.5; - } - for ( n = Eshift - Adiff; n <= Eshift + Adiff; n += diff ) - { - corr = tmp = 0.0f; - /* bit-exact optimization - PI2/X2_DTFS.lag should be counted as a single divide */ - tmp1 = (float) ( PI2 * n / X2_DTFS.lag ); - for ( k = 0; k <= min( X2_DTFS.lag >> 1, X2_DTFS.nH_4kHz ); k++, tmp += tmp1 ) - { - /* Not counting math function cos and sin since they will be implemented as look-up tables */ - corr += (float) ( ( X1_DTFS.a[k] * X2_DTFS.a[k] + X1_DTFS.b[k] * X2_DTFS.b[k] ) * cos( tmp ) ); - corr += (float) ( ( X1_DTFS.b[k] * X2_DTFS.a[k] - X1_DTFS.a[k] * X2_DTFS.b[k] ) * sin( tmp ) ); - } - wcorr = (float) ( corr * ( 1.0f - 0.01f * fabs( n - Eshift ) ) ); - if ( wcorr > maxcorr ) - { - fshift = n; - maxcorr = wcorr; - } - } -#endif +#undef WMC_TOOL_SKIP return fshift; } @@ -490,7 +378,7 @@ float DTFS_alignment_full( int16_t k; float maxcorr, corr, tmp, tmp1, fshift, n, diff; -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP LOGIC( 1 ); if ( X1_DTFS.lag < X2_DTFS.lag ) { @@ -536,34 +424,7 @@ float DTFS_alignment_full( maxcorr = corr; } } -#else - if ( X1_DTFS.lag < X2_DTFS.lag ) - { - DTFS_zeroPadd( X2_DTFS.lag, &X1_DTFS ); - } - - maxcorr = (float) -HUGE_VAL; - /* bit-exact optimization - 1/num_steps can be constant => should be counted as a multiply */ - diff = (float) X2_DTFS.lag / num_steps; - - for ( fshift = n = 0.0; n < (float) X2_DTFS.lag; n += diff ) - { - corr = tmp = 0.0f; - tmp1 = (float) ( PI2 * n / X2_DTFS.lag ); - - for ( k = 0; k <= min( X2_DTFS.lag >> 1, X2_DTFS.nH_4kHz ); k++, tmp += tmp1 ) - - { - corr += (float) ( ( X1_DTFS.a[k] * X2_DTFS.a[k] + X1_DTFS.b[k] * X2_DTFS.b[k] ) * cos( tmp ) ); - corr += (float) ( ( X1_DTFS.b[k] * X2_DTFS.a[k] - X1_DTFS.a[k] * X2_DTFS.b[k] ) * sin( tmp ) ); - } - if ( corr > maxcorr ) - { - fshift = n; - maxcorr = corr; - } - } -#endif +#undef WMC_TOOL_SKIP return fshift; } @@ -586,7 +447,7 @@ void DTFS_phaseShift( int16_t k; float tmp, tmp2 = 0.0f; -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP ADD( 1 ); LOOP( 1 ); for ( k = 0; k <= min( X->lag >> 1, X->nH ); k++, tmp2 += ph ) @@ -601,14 +462,7 @@ void DTFS_phaseShift( MAC( 1 ); X->b[k] = (float) ( tmp * sin( tmp2 ) + X->b[k] * cos( tmp2 ) ); } -#else - for ( k = 0; k <= min( X->lag >> 1, X->nH ); k++, tmp2 += ph ) - { - tmp = X->a[k]; - X->a[k] = (float) ( tmp * cos( tmp2 ) - X->b[k] * sin( tmp2 ) ); - X->b[k] = (float) ( tmp * sin( tmp2 ) + X->b[k] * cos( tmp2 ) ); - } -#endif +#undef WMC_TOOL_SKIP return; } @@ -628,11 +482,13 @@ void DTFS_zeroPadd( int16_t i; float diff; -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP LOGIC( 1 ); if ( N == X->lag ) { +#undef WMC_TOOL_SKIP return; +#define WMC_TOOL_SKIP } ADD( 1 ); LOOP( 1 ); @@ -655,24 +511,7 @@ void DTFS_zeroPadd( { X->nH++; } -#else - if ( N == X->lag ) - { - return; - } - for ( i = ( X->lag >> 1 ) + 1; i <= N >> 1; i++ ) - { - X->a[i] = X->b[i] = 0.0; - } - X->lag = N; - /* recompute nH for new lag */ - X->nH = (int16_t) floor( X->upper_cut_off_freq / ( 12800.0 / X->lag ) ); - diff = 12800.0f / X->lag; - if ( X->upper_cut_off_freq - ( diff * X->nH ) >= diff ) - { - X->nH++; - } -#endif +#undef WMC_TOOL_SKIP return; } @@ -718,7 +557,7 @@ void DTFS_to_fs( X->sampling_rate = INT_FS_16k; } -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP X->lag = N; MOVE( 1 ); MULT( 1 ); @@ -813,69 +652,7 @@ void DTFS_to_fs( } X->nH = nH_band; X->nH_4kHz = nH_4kHz; -#else - X->lag = N; - nH_band = (int16_t) floor( X->upper_cut_off_freq / ( 12800.0 / X->lag ) ); - - nH_4kHz = (int16_t) floor( 4000 / ( 12800.0 / X->lag ) ); - diff = 12800.0f / X->lag; - if ( X->upper_cut_off_freq - ( diff * nH_band ) >= diff ) - { - nH_band++; - } - if ( 4000 - ( diff * nH_4kHz ) >= diff ) - { - nH_4kHz++; - } - /* Number of harmonics excluding the ones at 0 and at pi */ - nH = ( N - 1 ) >> 1; - /* The DC component */ - X->a[0] = 0.0; - X->b[0] = 0.0; - for ( n = 0; n < N; n++ ) - { - X->a[0] += x[n]; - } - X->a[0] /= N; - - /* Strictly set the DC componet to zero */ - X->a[0] = 0.0; - - /* The harmonics excluding the one at pi */ - for ( k = 1; k <= nH; k++ ) - { - X->a[k] = x[0]; - X->b[k] = 0.0; - sum = tmp = (float) ( PI2 * k / N ); - for ( n = 1; n < N; n++, sum += tmp ) - { - X->a[k] += (float) ( x[n] * cos( sum ) ); - X->b[k] += (float) ( x[n] * sin( sum ) ); - } - X->a[k] *= ( 2.0f / N ); - X->b[k] *= ( 2.0f / N ); - } - - /* The harmonic at 'pi' */ - if ( N % 2 == 0 ) - { - X->a[k] = 0.0; - tmp = 1.0; - for ( n = 0; n < N; n++, tmp *= -1.0 ) - { - X->a[k] += x[n] * tmp; - } - X->a[k] /= N; - X->b[k] = 0.0; - } - for ( k = nH_band + 1; k <= min( ( X->lag >> 1 ), ( MAXLAG_WI - 1 ) ); k++ ) - { - X->a[k] = 0.0; - X->b[k] = 0.0; - } - X->nH = nH_band; - X->nH_4kHz = nH_4kHz; -#endif +#undef WMC_TOOL_SKIP return; } @@ -897,7 +674,7 @@ void DTFS_fs_inv( float phase, tmp; int16_t k, n; -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP LOOP( 1 ); for ( n = 0; n < N; n++ ) { @@ -915,17 +692,7 @@ void DTFS_fs_inv( x[n] += (float) ( X->a[k] * cos( tmp ) + X->b[k] * sin( tmp ) ); } } -#else - for ( n = 0; n < N; n++ ) - { - x[n] = X->a[0]; - tmp = phase = (float) ( PI2 * n / X->lag + ph0 ); - for ( k = 1; k <= min( X->lag >> 1, X->nH ); k++, tmp += phase ) - { - x[n] += (float) ( X->a[k] * cos( tmp ) + X->b[k] * sin( tmp ) ); - } - } -#endif +#undef WMC_TOOL_SKIP return; } @@ -976,7 +743,7 @@ static void DTFS_transform( IVAS_ERROR( error, "Error creating DTFS structure 3" ); } -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP FUNC( 2 ); DTFS_copy( tmp1_dtfs, X ); FUNC( 2 ); @@ -1087,102 +854,11 @@ static void DTFS_transform( out[i] = sum1; } -#else - DTFS_copy( tmp1_dtfs, X ); - DTFS_copy( tmp2_dtfs, X2 ); - DTFS_fast_fs_inv( tmp1_dtfs, x1_256, 256 ); - DTFS_fast_fs_inv( tmp2_dtfs, x2_256, 256 ); +#undef WMC_TOOL_SKIP - tmp = (float) ( log( 1.0 - WI_THRESHLD ) / ( X.lag - N ) ); - for ( i = 0; i < N; i++ ) - { - if ( FR_flag == 0 ) - { - /* should not be counted inside the loop */ - if ( N - WI_SAMPLE_THLD > X.lag ) - { - /* pre-computed and stored in a table */ - w = (float) ( 1.0 - exp( -( i + 1 ) * tmp ) ); - } - else - { - /* can be a look-up table */ - w = (float) ( i + 1 ) / N; - } - } - else - { - if ( nrg_flag ) - { - w = (float) ( i + 1 ) / N; - } - else - { - if ( N <= tmp2_dtfs->lag ) - { - N = tmp2_dtfs->lag + 1; - } - - N1 = N - tmp2_dtfs->lag; - if ( i < N1 ) - { - w = (float) ( i + 1 ) / N1; - } - else - { - w = 1.0; - } - } - } - - /* add sinc interpolation of two time domain waveforms at - appropriate phase position */ - j = ( LL_OS * 10 + (int16_t) rint_new( phase[i] * LL_OS / PI2 ) ) % LL_OS; - - if ( j < 0 ) - { - j = 0; - } - - k = j % WARP_OS_RATE; - l1 = j / WARP_OS_RATE; - - set_f( x_r_fx, 0.0f, L_FRAME ); - - temp_w = ( 1 - w ); - - for ( j1 = 0; j1 < 12; j1++ ) - { - m = ( 1000 * LL + l1 - OSLENGTH / 2 + j1 ) % LL; - - if ( m < 0 ) - { - m = 0; - } - - x_r_fx[m] = x1_256[m] * temp_w + x2_256[m] * w; - } - - for ( j1 = 0, sum1 = sum2 = 0.0; j1 < OSLENGTH; j1++ ) - { - /* mult or div by constants should be done once outside the loop */ - m = ( 1000 * LL + l1 - OSLENGTH / 2 + j1 ) % LL; - - if ( m < 0 ) - { - m = 0; - } - - sum1 += x_r_fx[m] * sinc[k][j1]; - } - - out[i] = sum1; - } -#endif - - dynamic_free( tmp1_dtfs ); - dynamic_free( tmp2_dtfs ); - dynamic_free( tmp3_dtfs ); + free( tmp1_dtfs ); + free( tmp2_dtfs ); + free( tmp3_dtfs ); return; } @@ -1203,7 +879,7 @@ void DTFS_zeroFilter( float tmp, tmp1, tmp2, sum1, sum2; int16_t k, n; -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP MOVE( 1 ); MULT( 1 ); tmp1 = (float) ( PI2 / X->lag ); @@ -1239,25 +915,7 @@ void DTFS_zeroFilter( MAC( 1 ); X->b[k] = X->b[k] * sum1 + tmp * sum2; } -#else - tmp1 = (float) ( PI2 / X->lag ); - for ( k = 0; k <= min( X->lag >> 1, X->nH ); k++ ) - { - tmp = tmp2 = k * tmp1; - /* Calculate sum1 and sum2 */ - sum1 = 1.0; - sum2 = 0.0; - for ( n = 0; n < N; n++, tmp2 += tmp ) - { - sum1 += (float) ( LPC[n] * cos( tmp2 ) ); - sum2 += (float) ( LPC[n] * sin( tmp2 ) ); - } - /* Calculate the circular convolution */ - tmp = X->a[k]; - X->a[k] = tmp * sum1 - X->b[k] * sum2; - X->b[k] = X->b[k] * sum1 + tmp * sum2; - } -#endif +#undef WMC_TOOL_SKIP return; } @@ -1278,7 +936,7 @@ void DTFS_poleFilter( float tmp, tmp1, tmp2, sum1, sum2; int16_t k, n; -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP MOVE( 1 ); MULT( 1 ); tmp1 = (float) ( PI2 / X->lag ); @@ -1316,26 +974,7 @@ void DTFS_poleFilter( ADD( 1 ); X->b[k] = ( -tmp * sum2 + X->b[k] * sum1 ) / tmp2; } -#else - tmp1 = (float) ( PI2 / X->lag ); - for ( k = 0; k <= min( X->lag >> 1, X->nH ); k++ ) - { - tmp = tmp2 = k * tmp1; - /* Calculate sum1 and sum2 */ - sum1 = 1.0; - sum2 = 0.0; - for ( n = 0; n < N; n++, tmp2 += tmp ) - { - sum1 += (float) ( LPC[n] * cos( tmp2 ) ); - sum2 += (float) ( LPC[n] * sin( tmp2 ) ); - } - /* Calculate the circular convolution */ - tmp = X->a[k]; - tmp2 = sum1 * sum1 + sum2 * sum2; - X->a[k] = ( tmp * sum1 + X->b[k] * sum2 ) / tmp2; - X->b[k] = ( -tmp * sum2 + X->b[k] * sum1 ) / tmp2; - } -#endif +#undef WMC_TOOL_SKIP return; } @@ -1355,14 +994,16 @@ static float DTFS_setEngy( int16_t k; float en1, tmp; -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP FUNC( 1 ); MOVE( 1 ); en1 = DTFS_getEngy( *X_DTFS ); LOGIC( 1 ); if ( en1 == 0.0 ) { +#undef WMC_TOOL_SKIP return 0.0; +#define WMC_TOOL_SKIP } MOVE( 1 ); DIV( 1 ); @@ -1376,19 +1017,7 @@ static float DTFS_setEngy( MULT( 1 ); X_DTFS->b[k] *= tmp; } -#else - en1 = DTFS_getEngy( *X_DTFS ); - if ( en1 == 0.0 ) - { - return 0.0; - } - tmp = (float) sqrt( en2 / en1 ); - for ( k = 0; k <= min( X_DTFS->lag >> 1, X_DTFS->nH ); k++ ) - { - X_DTFS->a[k] *= tmp; - X_DTFS->b[k] *= tmp; - } -#endif +#undef WMC_TOOL_SKIP return en1; } @@ -1408,11 +1037,13 @@ void DTFS_adjustLag( int16_t k; float en, diff; -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP LOGIC( 1 ); if ( N == X_DTFS->lag ) { +#undef WMC_TOOL_SKIP return; +#define WMC_TOOL_SKIP } LOGIC( 1 ); @@ -1459,41 +1090,7 @@ void DTFS_adjustLag( X_DTFS->nH_4kHz++; } } -#else - if ( N == X_DTFS->lag ) - { - return; - } - - if ( N > X_DTFS->lag ) - { - DTFS_zeroPadd( N, X_DTFS ); - } - else - { - en = DTFS_getEngy( *X_DTFS ); - for ( k = ( N >> 1 ) + 1; k <= min( X_DTFS->lag >> 1, X_DTFS->nH ); k++ ) - { - X_DTFS->a[k] = 0.0; - X_DTFS->b[k] = 0.0; - } - DTFS_setEngy( X_DTFS, en ); - X_DTFS->lag = N; - /* recompute nH for new lag */ - X_DTFS->nH = (int16_t) floor( X_DTFS->upper_cut_off_freq / ( 12800.0 / X_DTFS->lag ) ); - - X_DTFS->nH_4kHz = (int16_t) floor( 4000.0 / ( 12800.0 / X_DTFS->lag ) ); - diff = 12800.0f / X_DTFS->lag; - if ( X_DTFS->upper_cut_off_freq - ( diff * X_DTFS->nH ) >= diff ) - { - X_DTFS->nH++; - } - if ( 4000.0 - ( diff * X_DTFS->nH_4kHz ) >= diff ) - { - X_DTFS->nH_4kHz++; - } - } -#endif +#undef WMC_TOOL_SKIP return; } @@ -1513,7 +1110,7 @@ float DTFS_getEngy( float en; en = 0.0f; -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP LOOP( 1 ); for ( k = 1; k <= min( ( X.lag - 1 ) >> 1, X.nH ); k++ ) { @@ -1533,18 +1130,7 @@ float DTFS_getEngy( ADD( 1 ); en += X.a[k] * X.a[k] + X.b[k] * X.b[k]; } -#else - for ( k = 1; k <= min( ( X.lag - 1 ) >> 1, X.nH ); k++ ) - { - en += X.a[k] * X.a[k] + X.b[k] * X.b[k]; - } - en /= 2.0; - en += X.a[0] * X.a[0]; - if ( X.lag % 2 == 0 ) - { - en += X.a[k] * X.a[k] + X.b[k] * X.b[k]; - } -#endif +#undef WMC_TOOL_SKIP return en; } @@ -1563,7 +1149,7 @@ void DTFS_car2pol( int16_t k; float tmp; -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP LOOP( 1 ); for ( k = 1; k <= min( ( X->lag - 1 ) >> 1, X->nH ); k++ ) { @@ -1587,21 +1173,7 @@ void DTFS_car2pol( MOVE( 1 ); X->b[k] = (float) atan2( X->b[k], tmp ); } -#else - for ( k = 1; k <= min( ( X->lag - 1 ) >> 1, X->nH ); k++ ) - { - tmp = X->a[k]; - X->a[k] = (float) ( 0.5f * sqrt( tmp * tmp + X->b[k] * X->b[k] ) ); - X->b[k] = (float) atan2( X->b[k], tmp ); - } - - if ( X->lag % 2 == 0 ) - { - tmp = X->a[k]; - X->a[k] = (float) sqrt( tmp * tmp + X->b[k] * X->b[k] ); - X->b[k] = (float) atan2( X->b[k], tmp ); - } -#endif +#undef WMC_TOOL_SKIP return; } @@ -1620,7 +1192,7 @@ void DTFS_pol2car( int16_t k; float tmp; -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP LOOP( 1 ); for ( k = 1; k <= min( ( X->lag - 1 ) >> 1, X->nH ); k++ ) { @@ -1645,21 +1217,7 @@ void DTFS_pol2car( MULT( 1 ); X->a[k] = (float) ( X->a[k] * cos( tmp ) ); } -#else - for ( k = 1; k <= min( ( X->lag - 1 ) >> 1, X->nH ); k++ ) - { - tmp = X->b[k]; - X->b[k] = (float) ( 2.0f * X->a[k] * sin( tmp ) ); - X->a[k] = (float) ( 2.0f * X->a[k] * cos( tmp ) ); - } - - if ( X->lag % 2 == 0 ) - { - tmp = X->b[k]; - X->b[k] = (float) ( X->a[k] * sin( tmp ) ); - X->a[k] = (float) ( X->a[k] * cos( tmp ) ); - } -#endif +#undef WMC_TOOL_SKIP return; } @@ -1689,7 +1247,7 @@ float DTFS_setEngyHarm( en1 = 0.0f; count = 0; -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP LOGIC( 1 ); if ( f1 == 0.0 ) { @@ -1767,58 +1325,7 @@ float DTFS_setEngyHarm( X->a[k] *= factor; } } -#else - if ( f1 == 0.0 ) - { - en1 += X->a[0] * X->a[0]; - count++; - } - for ( k = 1, tmp = diff; k <= min( ( X->lag - 1 ) >> 1, X->nH ); k++, tmp += diff ) - { - if ( X->a[k] < EPSILON ) - { - X->a[k] = 0; - } - - if ( tmp > f1 && tmp <= f2 ) - { - en1 += X->a[k] * X->a[k]; - count++; - } - } - - if ( count <= 0.0 ) - { - count = 1; - } - - en1 /= count; - - if ( en2 < 0.0 ) - { - en2 = 0.0; - } - - if ( en1 > 0.0 ) - { - factor = (float) sqrt( en2 / en1 ); - } - else - { - factor = 0.0f; - } - if ( g1 == 0.0 ) - { - X->a[k] *= factor; - } - for ( k = 1, tmp = diff; k <= min( ( X->lag - 1 ) >> 1, X->nH ); k++, tmp += diff ) - { - if ( tmp > g1 && tmp <= g2 ) - { - X->a[k] *= factor; - } - } -#endif +#undef WMC_TOOL_SKIP return (float) ( en1 + 1e-20 ); } @@ -1843,7 +1350,7 @@ static void cubicPhase( int16_t n; double diff; -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP ADD( 1 ); N -= (int16_t) L2; @@ -1911,39 +1418,7 @@ static void cubicPhase( ADD( 2 ); phOut[n] = (float) ( phOut[n - 1] + diff ); } -#else - N -= (int16_t) L2; - - if ( N <= 0 ) - { - N = 1; - } - - /* Computation of the coefficients of the cubic phase function */ - f1 = (float) ( PI2 / L1 ); - f2 = (float) ( PI2 / L2 ); - ph1 = (float) fmod( (double) ( ph1 ), PI2 ); - ph2 = (float) fmod( (double) ( ph2 ), PI2 ); - coef[3] = ph1; - coef[2] = f1; - factor = (float) ( anint( ( ph1 - ph2 + 0.5 * N * ( f2 + f1 ) ) / PI2 ) ); - c1 = f2 - f1; - c2 = (float) ( ph2 - ph1 - N * f1 + PI2 * factor ); - coef[0] = ( N * c1 - 2 * c2 ) / ( N * N * N ); - coef[1] = ( c1 - 3 * N * N * coef[0] ) / ( 2 * N ); - - /* Computation of the phase value at each sample point */ - phOut[0] = ph1; - for ( n = 1; n < N; n++ ) - { - phOut[n] = _POLY3( n, coef ); - } - diff = (float) ( PI2 / L2 ); - for ( ; n < N + (int16_t) L2; n++ ) - { - phOut[n] = (float) ( phOut[n - 1] + diff ); - } -#endif +#undef WMC_TOOL_SKIP return; } @@ -1977,7 +1452,7 @@ void DTFS_to_erb( erb = &( erb_WB[0] ); } -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP LOOP( 1 ); for ( i = 0; i < num_erb; i++ ) { @@ -2027,43 +1502,7 @@ void DTFS_to_erb( out[i] /= count[i]; } } -#else - for ( i = 0; i < num_erb; i++ ) - { - count[i] = 0; - out[i] = 0.0; - } - diff = 12800.0f / X.lag; - for ( i = j = 0, freq = 0.0; i <= min( X.lag >> 1, X.nH ); i++, freq += diff ) - { - if ( !( freq <= erb[num_erb] ) ) - { - freq = erb[num_erb]; - } - - for ( ; j < num_erb; j++ ) - { - if ( freq < erb[j + 1] ) - { - if ( X.a[i] < 0.0f ) - { - X.a[i] = 0.0f; - } - - out[j] += X.a[i]; - count[j]++; - break; - } - } - } - for ( i = 0; i < num_erb; i++ ) - { - if ( count[i] > 1 ) - { - out[i] /= count[i]; - } - } -#endif +#undef WMC_TOOL_SKIP return; } @@ -2100,7 +1539,7 @@ void erb_slot( erb = &( erb_WB[0] ); } -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP MOVE( 1 ); MULT( 1 ); nH_band = (int16_t) floor( upper_cut_off_freq / ( 12800.0 / lag ) ); @@ -2160,48 +1599,7 @@ void erb_slot( mfreq[j] /= out[j]; } } -#else - nH_band = (int16_t) floor( upper_cut_off_freq / ( 12800.0 / lag ) ); - - for ( i = 0; i < num_erb; i++ ) - { - out[i] = 0; - mfreq[i] = 0.0; - } - diff = 12800.0f / lag; - if ( upper_cut_off_freq - ( diff * nH_band ) >= diff ) - { - nH_band++; - } - for ( i = j = 0, freq = 0.0; i <= min( lag >> 1, nH_band ); i++, freq += diff ) - { - - if ( !( freq <= erb[num_erb] ) ) - { - freq = erb[num_erb]; - } - - freq = min( freq, upper_cut_off_freq ); - - for ( ; j < num_erb; j++ ) - { - if ( freq < erb[j + 1] ) - { - mfreq[j] += freq; - out[j]++; - break; - } - } - } - - for ( j = 0; j < num_erb; j++ ) - { - if ( out[j] > 1 ) - { - mfreq[j] /= out[j]; - } - } -#endif +#undef WMC_TOOL_SKIP return; } @@ -2239,7 +1637,7 @@ void DTFS_erb_inv( erb = &( erb_WB[0] ); } -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP MOVE( 1 ); f[m] = 0.0; MOVE( 1 ); @@ -2312,57 +1710,7 @@ void DTFS_erb_inv( X->a[0] = 0.0f; } -#else - f[m] = 0.0; - amp[m] = 0.0; - m++; - for ( i = 0; i < num_erb; i++ ) - { - if ( slot[i] != 0 ) - { - f[m] = mfreq[i]; - amp[m] = in[i]; - m++; - } - } - f[m] = upper_cut_off_freq; - amp[m] = 0.0; - m++; - - diff = 12800.0f / X->lag; - - for ( i = 0, j = 1, freq = 0.0; i <= min( X->lag >> 1, X->nH ); i++, freq += diff ) - { - if ( !( freq <= erb[num_erb] ) ) - { - freq = erb[num_erb]; - } - - if ( !( m <= num_erb + 2 ) ) - { - m = num_erb + 2; - } - - if ( freq > upper_cut_off_freq ) - { - freq = upper_cut_off_freq; - } - for ( ; j < m; j++ ) - { - if ( freq <= f[j] ) - { - X->a[i] = amp[j] * ( freq - f[j - 1] ) + amp[j - 1] * ( f[j] - freq ); - if ( f[j] != f[j - 1] ) - { - X->a[i] /= ( f[j] - f[j - 1] ); - } - break; - } - } - - X->a[0] = 0.0f; - } -#endif +#undef WMC_TOOL_SKIP return; } @@ -2385,7 +1733,7 @@ static void LPCPowSpect( float w, tmp, Re, Im; int16_t i, k; -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP LOOP( 1 ); for ( k = 0; k < Nf; k++ ) { @@ -2414,21 +1762,7 @@ static void LPCPowSpect( DIV( 1 ); out[k] = 1.0f / ( Re * Re + Im * Im ); } -#else - for ( k = 0; k < Nf; k++ ) - { - Re = 1.0; - Im = 0.0; - /* Note that freq ranges between [0 UPPER_CUT_OFF_FREQ] */ - tmp = (float) ( freq[k] / 12800.0f * PI2 ); - for ( i = 0, w = tmp; i < Np; i++, w += tmp ) - { - Re += (float) ( LPC[i] * cos( w ) ); - Im -= (float) ( LPC[i] * sin( w ) ); - } - out[k] = 1.0f / ( Re * Re + Im * Im ); - } -#endif +#undef WMC_TOOL_SKIP return; } @@ -2465,7 +1799,7 @@ void erb_diff( AmpCB1 = AmpCB1_WB; } -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP FUNC( 3 ); erb_slot( l, cslot, mfreq, num_erb ); FUNC( 3 ); @@ -2702,165 +2036,7 @@ void erb_diff( MOVE( 1 ); index[1] = mmseindex; -#else - erb_slot( l, cslot, mfreq, num_erb ); - erb_slot( pl, pslot, t_prev_erb, num_erb ); - for ( i = 0, tmp = 1.0f; i < M + 1; i++ ) - { - LPC[i] = curr_lsp[i] * ( tmp *= 0.78f ); - } - LPCPowSpect( mfreq, num_erb, LPC, M + 1, PowSpect ); - - for ( i = 0; i < num_erb; i++ ) - { - t_prev_erb[i] = prev_erb[i]; - } - - if ( pl > l ) - { - tmp = t_prev_erb[0]; - for ( i = 0; i < num_erb; i++ ) - { - if ( pslot[i] < 0 ) - { - pslot[i] = 0; - } - - if ( pslot[i] != 0 ) - { - tmp = t_prev_erb[i]; - } - else - { - t_prev_erb[i] = tmp; - } - } - } - else if ( l > pl ) - { - tmp = t_prev_erb[num_erb - 1]; - for ( i = num_erb - 1; i >= 0; i-- ) - { - if ( pslot[i] != 0 ) - { - tmp = t_prev_erb[i]; - } - else - { - t_prev_erb[i] = tmp; - } - } - } - - for ( i = 0; i < num_erb; i++ ) - { - out[i] = curr_erb[i] - t_prev_erb[i]; - } - - /* First Band Amplitude Search */ - mmse = (float) HUGE_VAL; - mmseindex = -1; - for ( j = 0; j < ERB_CBSIZE1; j++ ) - { - tmp = 0.0; - for ( i = 1; i < 11; i++ ) - { - if ( cslot[i] != 0 ) - { - if ( AmpCB1[j][i - 1] < -t_prev_erb[i] ) - { - tmp1 = PowSpect[i] * SQR( curr_erb[i] ); - } - else - { - tmp1 = (float) ( PowSpect[i] * SQR( out[i] - AmpCB1[j][i - 1] ) ); - } - if ( AmpCB1[j][i - 1] < out[i] ) - { - tmp1 *= 0.9f; - } - tmp += tmp1; - } - } - - if ( tmp < mmse ) - { - mmse = tmp; - mmseindex = j; - } - } - - if ( !( mmseindex < ERB_CBSIZE1 && mmseindex >= 0 ) ) - { - mmseindex = 0; - } - - index[0] = mmseindex; - - /* Second Band Amplitude Search */ - mmse = (float) HUGE_VAL; - mmseindex = -1; - for ( j = 0; j < ERB_CBSIZE2; j++ ) - { - tmp = 0.0; - for ( i = 11; i < num_erb; i++ ) - { - if ( num_erb == NUM_ERB_NB ) - { - if ( cslot[i] != 0 ) - { - if ( AmpCB2_NB[j][i - 11] < -t_prev_erb[i] ) - { - tmp1 = PowSpect[i] * SQR( curr_erb[i] ); - } - else - { - tmp1 = (float) ( PowSpect[i] * SQR( out[i] - AmpCB2_NB[j][i - 11] ) ); - } - - if ( AmpCB2_NB[j][i - 11] < out[i] ) - { - tmp1 *= 0.9f; - } - tmp += tmp1; - } - } - else if ( num_erb == NUM_ERB_WB ) - { - if ( cslot[i] != 0 ) - { - if ( AmpCB2_WB[j][i - 11] < -t_prev_erb[i] ) - { - tmp1 = PowSpect[i] * SQR( curr_erb[i] ); - } - else - { - tmp1 = (float) ( PowSpect[i] * SQR( out[i] - AmpCB2_WB[j][i - 11] ) ); - } - - if ( AmpCB2_WB[j][i - 11] < out[i] ) - { - tmp1 *= 0.9f; - } - tmp += tmp1; - } - } - } - - if ( tmp < mmse ) - { - mmse = tmp; - mmseindex = j; - } - } - - if ( !( mmseindex < ERB_CBSIZE2 && mmseindex >= 0 ) ) - { - mmseindex = 0; - } - - index[1] = mmseindex; -#endif +#undef WMC_TOOL_SKIP return; } @@ -2893,7 +2069,7 @@ void erb_add( AmpCB1 = AmpCB1_WB; } -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP FUNC( 3 ); erb_slot( l, cslot, t_prev_erb, num_erb ); FUNC( 3 ); @@ -3000,84 +2176,7 @@ void erb_add( curr_erb[i] = 0.0f; } } -#else - erb_slot( l, cslot, t_prev_erb, num_erb ); - erb_slot( pl, pslot, t_prev_erb, num_erb ); - - for ( i = 0; i < num_erb; i++ ) - { - t_prev_erb[i] = prev_erb[i]; - } - - if ( pl > l ) - { - tmp = t_prev_erb[0]; - for ( i = 0; i < num_erb; i++ ) - { - if ( !( pslot[i] >= 0 ) ) - { - pslot[i] = 0; - } - - if ( pslot[i] != 0 ) - { - tmp = t_prev_erb[i]; - } - else - { - t_prev_erb[i] = tmp; - } - } - } - else if ( l > pl ) - { - tmp = t_prev_erb[num_erb - 1]; - for ( i = num_erb - 1; i >= 0; i-- ) - { - if ( pslot[i] != 0 ) - { - tmp = t_prev_erb[i]; - } - else - { - t_prev_erb[i] = tmp; - } - } - } - - for ( i = 1; i < 11; i++ ) - { - if ( cslot[i] != 0 ) - { - curr_erb[i] = (float) ( AmpCB1[index[0]][i - 1] + t_prev_erb[i] ); - curr_erb[i] = max( 0.0f, curr_erb[i] ); - } - else - { - curr_erb[i] = 0.0; - } - } - for ( i = 11; i < ( num_erb - 2 ); i++ ) - { - if ( cslot[i] != 0 ) - { - if ( num_erb == NUM_ERB_NB ) - { - curr_erb[i] = (float) ( AmpCB2_NB[index[1]][i - 11] + t_prev_erb[i] ); - curr_erb[i] = max( 0.0f, curr_erb[i] ); - } - else if ( num_erb == NUM_ERB_WB ) - { - curr_erb[i] = (float) ( AmpCB2_WB[index[1]][i - 11] + t_prev_erb[i] ); - curr_erb[i] = max( 0.0f, curr_erb[i] ); - } - } - else - { - curr_erb[i] = 0.0f; - } - } -#endif +#undef WMC_TOOL_SKIP return; } @@ -3106,7 +2205,7 @@ ivas_error WIsyn( error = IVAS_ERR_OK; - if ( ( phase = (float *) dynamic_malloc( N * sizeof( float ) ) ) == NULL ) + if ( ( phase = (float *) malloc( N * sizeof( float ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for WI structure\n" ) ); } @@ -3116,7 +2215,7 @@ ivas_error WIsyn( return IVAS_ERROR( error, "Error creating new DTFS structure\n" ); } -#ifdef FIX_VBR_COMPLEXITY +#define WMC_TOOL_SKIP FUNC( 2 ); DTFS_copy( CURRCW_DTFS, *CURRCW_DTFS_out ); @@ -3187,58 +2286,10 @@ ivas_error WIsyn( MOVE( 1 ); DIV( 1 ); *ph_offset = (float) fmod( (double) ( tmp ), PI2 ); -#else - DTFS_copy( CURRCW_DTFS, *CURRCW_DTFS_out ); +#undef WMC_TOOL_SKIP - /* Calculating the expected alignment shift */ - alignment = (float) ( *ph_offset / PI2 * PREVCW.lag ); - if ( flag == 1 ) - { - alignment *= I; - } - /* Calculating the expected alignment shift */ - tmp = (float) fmod( ( N % ( ( PREVCW.lag + CURRCW_DTFS->lag ) >> 1 ) + alignment ), CURRCW_DTFS->lag ); - - /* Compute the alignment shift */ - if ( FR_flag == 0 ) - { - alignment = DTFS_alignment_weight( PREVCW, *CURRCW_DTFS, tmp, curr_lpc, curr_lpc ); - } - else /* FR case */ - { - alignment = DTFS_alignment_full( PREVCW, *CURRCW_DTFS, CURRCW_DTFS->lag * 2 ); - } - - tmp = (float) ( PI2 * alignment / CURRCW_DTFS->lag ); - DTFS_phaseShift( CURRCW_DTFS, tmp ); - DTFS_phaseShift( CURRCW_DTFS_out, (float) ( PI2 * alignment / CURRCW_DTFS_out->lag ) ); - - /* Compute the cubic phase track and transform to 1-D signal */ - cubicPhase( *ph_offset, tmp, (float) PREVCW.lag, (float) CURRCW_DTFS->lag, N, phase ); - - if ( FR_flag == 0 ) - { - DTFS_transform( PREVCW, *CURRCW_DTFS, phase, out, N, 0 ); - } - else - { - DTFS_transform( PREVCW, *CURRCW_DTFS, phase, out, N, 1 ); - } - - /* Adjust the phase offset and wrap it between 0 and 2pi */ - if ( flag == 2 ) - { - tmp *= I; - } - *ph_offset = (float) fmod( (double) ( tmp ), PI2 ); -#endif - - dynamic_free( phase ); - dynamic_free( CURRCW_DTFS ); + free( phase ); + free( CURRCW_DTFS ); return error; } - -#ifdef FIX_VBR_COMPLEXITY -#undef WMC_TOOL_MAN -#endif diff --git a/lib_com/window.c b/lib_com/window.c index a3bf82ac7e..093dbd4fc6 100644 --- a/lib_com/window.c +++ b/lib_com/window.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,16 +33,17 @@ /*==================================================================================== EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0 ====================================================================================*/ -/* WMC_TOOL_SKIP_FILE (basic ops file) */ #include +#include #include "options.h" #ifdef DEBUGGING #include "debug.h" #endif -#include #include "prot.h" +#define WMC_TOOL_SKIP + /*------------------------------------------------------------------- * ham_cos_window() * @@ -75,3 +76,5 @@ void ham_cos_window( return; } + +#undef WMC_TOOL_SKIP diff --git a/lib_com/window_ola.c b/lib_com/window_ola.c index 7a5b153636..07798af16e 100644 --- a/lib_com/window_ola.c +++ b/lib_com/window_ola.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------------- * window_ola() diff --git a/lib_com/wtda.c b/lib_com/wtda.c index cd8d588ed5..3bd839e5ac 100644 --- a/lib_com/wtda.c +++ b/lib_com/wtda.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "prot.h" #include "rom_com.h" #include -#include "wmops.h" +#include "wmc_auto.h" #ifdef DEBUG_PLOT #include "deb_out.h" #endif diff --git a/lib_debug/debug.c b/lib_debug/debug.c index 3d72aa637b..b21769f8b6 100644 --- a/lib_debug/debug.c +++ b/lib_debug/debug.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,7 +37,6 @@ #include #include #include "options.h" -#include "prot.h" #ifdef DEBUGGING #include "debug.h" #ifdef DEBUG_MODE_INFO @@ -47,6 +46,7 @@ #endif #endif #endif +#include "cnst.h" #include #include #include @@ -54,10 +54,10 @@ #include #else #endif -#include "wmops.h" #ifdef DBG_WAV_WRITER #include "tinywaveout_c.h" #endif +#include "wmc_auto.h" /*-------------------------------------------------------------------* diff --git a/lib_debug/debug.h b/lib_debug/debug.h index 49aae558b0..5b7e455858 100644 --- a/lib_debug/debug.h +++ b/lib_debug/debug.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,9 @@ * Global variables used for debugging *------------------------------------------------------------------------------------------*/ +#ifdef DEBUGGING extern int32_t frame; +#endif #ifdef DEBUGGING extern uint16_t g_nPrintedLines; diff --git a/lib_debug/mem_count.c b/lib_debug/mem_count.c deleted file mode 100644 index 6315390d07..0000000000 --- a/lib_debug/mem_count.c +++ /dev/null @@ -1,933 +0,0 @@ -/* - * Memory Counting Tool - * - * Copyright 2022 VoiceAge Corporation. All Rights Reserved. - * - * This software is protected by copyright law and by international treaties. - * VoiceAge Corporation retains full ownership rights in their respective contributions in the software. - * No license of any kind, including but not limited to patent license, of any foregoing parties is - * hereby granted by implication, estoppel or otherwise. - * - * This software is provided "AS IS", without any express or implied warranties. The software is in the - * development stage. It is intended exclusively for experts who have experience with such software and - * solely for the purpose of inspection. All implied warranties of non-infringement, merchantability - * and/or fitness for a particular purpose are hereby disclaimed and excluded. - * - * Written by : Guy J. Richard - August 2017 - * - */ - -#include -#include "options.h" -#include "mem_count.h" - -#include /* for printf, ... */ -#include /* for stricmp, ... */ -#include /* for alloc, NULL, ... */ -#include /* for tolower */ - -/* Mostly to get a 'int32_t' */ -#if !defined( _MSC_VER ) || _MSC_VER >= 1600 -#include -#else -#include -#endif - -#ifdef RAM_COUNTING_TOOL - -#if defined( _MSC_VER ) && _MSC_VER < 1600 -typedef UINT32 uint32_t; -typedef INT32 int32_t; -typedef UINT64 uint64_t; -typedef INT64 int64_t; -#endif - -#ifndef TRUE -#define TRUE ( 0 == 0 ) -#endif -#ifndef FALSE -#define FALSE 0 -#endif - -#ifdef RAM_ANALYSIS -#include "debug.h" -#endif - -/* How to use the tool notes - ========================= - - The tool measure SRAM memory allocated by malloc(), calloc() and - deallocated by free(). - - In order to run the tool, one needs to: - 1) Prepend 'count_' to all calls to 'malloc', 'calloc' and 'free' except debug files. - 2) Add the following code into e.g. prot.h, so that all files with calls to these functions see it. - #ifdef RAM_COUNTING_TOOL - #define count_malloc(n1) MALLOC_FCT_CALL(n1) - #define count_calloc(n1,n2) CALLOC_FCT_CALL(n1, n2) - #define count_free(ptr) FREE_FCT_CALL(ptr) - #else - #define count_malloc(n1) malloc(n1) - #define count_calloc(n1,n2) calloc(n1, n2) - #define count_free(ptr) free(ptr) - #endif - 3) Call mem_count_init() at the beginning of encoding/decoding - - The first param allows to set a limit on the RAM that can be allocated. - While the codec is running, if memory is requested such that the maximum - is passed (Mem Alloc > Limit), the codec will stop and the summary will - be printed. - - The second param allows to decide the units (bytes, shorts or longs). - Please note that the unit specified is combined with the limit param to - produce the total size that can be allocated. Ex ..init(1000, USE_16BITS); - will set the limit to 1000 x 16 Bits Word (2000 bytes in total). - 4) Call mem_count_summary() at the end of encoding/decoding to print-out the results. - - The first parameter allows to overwrite the initial units configuration. - The Total size allocated (always in bytes internally) will be converted - to the unit selected before being reported. - - The switch 'RAM_COUNTING_TOOL' also has to be defined to enable memory counting. - - There is a define 'MEM_COUNT_DETAILS' in options.h that enables printing per - sub-structure details when DEBUGGING is activated. -*/ - -/*-------------------------------------------------------------------* - * LOCAL CONSTANTS - *-------------------------------------------------------------------*/ - -/* This is the maximum number of allocations for which to keep information. - It can be increased if required. */ -#ifdef SBA_BR_SWITCHING -#define MAX_INFO_RECORDS 15000 -#else -#define MAX_INFO_RECORDS 3000 -#endif -/* This is the length after which the function name - will be truncated when the summary is printed. */ -#define MAX_FUNCTION_NAME_LENGTH 18 - -/* This is the length after which the parameter to - the allocating function will be truncated when - the summary is printed. */ -#define MAX_PARAMS_LENGTH 36 - -/* This is the value (in bytes) towards which the block size - is rounded. For example, a block of 123 bytes, when using - a 32 bits system, will end up taking 124 bytes since - the last unused byte cannot be used for another block. */ -#ifdef MEM_ALIGN_64BITS -#define BLOCK_ROUNDING 8 -#else /* Align on 32 Bits Instead */ -#define BLOCK_ROUNDING 4 -#endif - -#define N_32BITS_BLOCKS ( BLOCK_ROUNDING / sizeof( int32_t ) ) - -/* Special Value to See if Memory was ever written */ -#define MAGIC_VALUE_OOB 0x12A534F0 /* Put Before & After Buffer */ -#define MAGIC_VALUE_USED ( ~MAGIC_VALUE_OOB ) /* To Detect if Memory was Written */ -/* OOB Flags */ -#define OOB_START 0x1 -#define OOB_END 0x2 - -/*-------------------------------------------------------------------* - * LOCAL MACROS - *-------------------------------------------------------------------*/ - -#define ROUND_BLOCK_SIZE( n ) ( ( ( n ) + BLOCK_ROUNDING - 1 ) & ~( BLOCK_ROUNDING - 1 ) ) -#define IS_CALLOC( str ) ( ( size_str[0] ) == 'c' ) - -#define WARNING( msg ) \ - do \ - { \ - printf( "Fct=%s, Ln=%i: %s!\n", func_name, func_lineno, msg ); \ - } while ( 0 ) -#define ERROR( msg ) \ - do \ - { \ - WARNING( msg ); \ - exit( -1 ); \ - } while ( 0 ) - -/*-------------------------------------------------------------------* - * LOCAL TYPES - *-------------------------------------------------------------------*/ - -typedef struct -{ - void *block_ptr; - size_t block_size; - int lineno; - char name[MAX_FUNCTION_NAME_LENGTH + 1]; /* +1 for NUL */ - char params[1 + MAX_PARAMS_LENGTH + 1]; /* +1 for 'm'/'c' alloc & +1 for NUL */ - int used; - int OOB_Flag; - int seq_no; /* To Help Sorting by Order of Creation when all else is identical */ - int noccurances; -} allocator_record; - -typedef allocator_record allocation_list[MAX_INFO_RECORDS]; - -/*-------------------------------------------------------------------* - * LOCAL DATA - *-------------------------------------------------------------------*/ - -static allocation_list Current_Allocations, Peak_Allocations, Freed_Allocations; -static size_t RAM_Limit = NO_RAM_LIMIT; /* Always in Bytes */ -static size_t Current_RAM = 0, Peak_RAM = 0; /* In Bytes */ -static unsigned int Num_Records_Cur_RAM = 0, Num_Records_Peak_RAM = 0, Num_Records_Freed_RAM = 0; -static int Seq_No = 0; - -static size_t Stat_Cnt_Size = USE_BYTES; - -#ifndef DISABLE_NULL_PTR_FREE_WARNING -static allocation_list Missing_Allocations; -static unsigned int Num_Records_Missing_Alloc_Warnings = 0; -#endif - -/*-------------------------------------------------------------------* - * LOCAL CONST DATA - *-------------------------------------------------------------------*/ - -/* Suffix after numeral value printed in the summary */ -/* One char for each size */ -static const char Count_suffix[] = "BsL"; /* Using 's' because 'S' - looks a lot like '5'. */ -/* */ -static const char *Count_Name[] = { "Bytes", "Shorts", "Longs" }; - -/*-------------------------------------------------------------------* - * GLOBAL FUNCTIONS - *-------------------------------------------------------------------*/ - -/* It is not necessary to call dyn_mem_stats_init() since all static - variables are pre-initialised. It can be used to run stats again. */ -void mem_count_init( size_t limit, Counting_Size cnt_size ) -{ - if ( cnt_size != USE_DEFAULT ) - Stat_Cnt_Size = cnt_size; - Current_RAM = Peak_RAM = 0; - RAM_Limit = limit << Stat_Cnt_Size; - Num_Records_Cur_RAM = Num_Records_Peak_RAM = Num_Records_Freed_RAM = 0; -#ifndef DISABLE_NULL_PTR_FREE_WARNING - Num_Records_Missing_Alloc_Warnings = 0; -#endif - Seq_No = 0; -} - -/* This Function basically uses 'malloc' to allocate memory but also - records information about which functions allocated memory, the peak, ... - When, dyn_mem_print_stats() is called, all this info is printed as - well as the memory that has not been de-allocated; it is useful to - find memory leaks. */ -void *mem_alloc( - const char *func_name, - int func_lineno, - size_t size, - char *size_str /* the first char indicates m-alloc or c-alloc */ ) -{ - size_t rounded_size; - void *block_ptr; - char *tmp_ptr; - allocator_record *record_ptr; - size_t n, f; - int32_t fill_value; - int32_t *ptr32; - int32_t mask, temp; - unsigned int check; - - /* Do not Support Empty Requests */ - if ( size == 0 ) - { - ERROR( "Size of Zero not Supported" ); - } - - if ( Num_Records_Cur_RAM == MAX_INFO_RECORDS ) - { - ERROR( "Too Many Allocs. Increase 'MAX_INFO_RECORDS'" ); - } - - /* Round Up Block Size */ - rounded_size = ROUND_BLOCK_SIZE( size ); - - /* Allocate using the standard mem allocator. - Allocate a bit More to Have Room for Signature Values */ - block_ptr = malloc( rounded_size + BLOCK_ROUNDING * 2 ); - - /* the split line is to prevent a 'search/replace' adding a '_' to the name */ - /* We request more memory to have room to put signatures at the start - and end of the allocated buffer to check for OOBounds accesses. */ - /* Stop if it Failed */ - if ( block_ptr == NULL ) - { - ERROR( "Out of System RAM" ); - } - - /* Cannot use #if sizeof(int32_t) to catch this at compile time - because the preprocessor doesn't know anything about types - or sizes. */ - check = sizeof( int32_t ); - if ( check != 4 ) - { - ERROR( "Expecting 'int32_t' to be a 32 Bits Integer" ); - } - - /* Set Signatures and Fill (or Clear) Memory */ - ptr32 = (int32_t *) block_ptr; - /* Signature at Start of Block */ - n = N_32BITS_BLOCKS; - do - { - *ptr32++ = MAGIC_VALUE_OOB; - } while ( --n ); - /* Fill with Pattern or Clear Memory */ - fill_value = MAGIC_VALUE_USED; - if ( IS_CALLOC( size_str ) ) - { - fill_value = 0x00000000; - } - n = size / sizeof( int32_t ); - while ( n-- ) - { - *ptr32++ = fill_value; - } - n = rounded_size - size; - /* When Initializing with '0' */ - /* Need to Adapt the Magic Value */ - f = n % sizeof( int32_t ); - if ( f != 0 ) - { - /* For f=, shift by [1->24, 2->16, 3->8] */ - mask = 0xFFFFFFFF << ( ( sizeof( int32_t ) - f ) * 8 ); /* (1) */ - temp = MAGIC_VALUE_OOB & mask; - if ( fill_value != 0x0 ) - { /* Using M-Alloc */ - /* Merge Fill Value */ - temp += ( ~mask ) & MAGIC_VALUE_USED; - } /* for C-Alloc, the code in (1) hereabove already introduces zeros */ - *ptr32++ = temp; - } - n /= sizeof( int32_t ); - n += N_32BITS_BLOCKS; - /* Signature at End of Block */ - do - { - *ptr32++ = MAGIC_VALUE_OOB; - } while ( --n ); - - /* Adjust Pointer (Magic Value Before and After the Memory Region Requested) */ - tmp_ptr = (char *) block_ptr; - tmp_ptr += BLOCK_ROUNDING; - block_ptr = (void *) tmp_ptr; - - /* Save Information about Function Requesting the RAM */ - record_ptr = &Current_Allocations[Num_Records_Cur_RAM]; - - /* Save Name (and NUL Terminate it) */ - strncpy( record_ptr->name, func_name, MAX_FUNCTION_NAME_LENGTH ); - record_ptr->name[MAX_FUNCTION_NAME_LENGTH] = '\0'; - /* Save Params (and NUL Terminate it) - There string starts with a Marker (either 'm' or 'c') - that indicates the type of allocation requested. */ - strncpy( record_ptr->params, size_str, MAX_PARAMS_LENGTH ); - record_ptr->params[MAX_PARAMS_LENGTH] = '\0'; - /* Save Other Info */ - record_ptr->lineno = func_lineno; - record_ptr->block_ptr = block_ptr; - record_ptr->block_size = size; - record_ptr->used = -1; /* By default do not check mem usage */ - record_ptr->seq_no = ++Seq_No; - record_ptr->noccurances = 1; - - /* Increase # of Records */ - Num_Records_Cur_RAM++; - /* Update Amount of RAM Allocated */ - Current_RAM += rounded_size; - - /* Is this the Worst Case */ - if ( Peak_RAM < Current_RAM ) - { /* Yes */ - /* Update the Peak RAM */ - Peak_RAM = Current_RAM; - /* Keep the Information */ - memmove( Peak_Allocations, Current_Allocations, sizeof( allocator_record ) * Num_Records_Cur_RAM ); - Num_Records_Peak_RAM = Num_Records_Cur_RAM; - } - - /* Limit Busted? */ - if ( RAM_Limit != NO_RAM_LIMIT ) - { - if ( Current_RAM > RAM_Limit ) - { - char info_msg[100]; - - mem_count_summary( USE_DEFAULT ); - - sprintf( info_msg, "Alloc Limit of %lu %s was Passed", (unsigned long) RAM_Limit >> Stat_Cnt_Size, Count_Name[Stat_Cnt_Size] ); - ERROR( info_msg ); - } - } - - return block_ptr; -} - -/* Calculate Memory Usage of Block (Look for Signature) */ -static void mem_set_usage( allocator_record *record_ptr ) -{ - int total_bytes_used; - - size_t n; - int32_t *ptr32; - char *ptr8; - size_t total_bytes; - int32_t fill_value; - - fill_value = MAGIC_VALUE_USED; - if ( ( record_ptr->params[0] ) == 'c' ) - { - fill_value = 0x00000000; - } - - total_bytes = record_ptr->block_size; - - /* Check 4 bytes at a time */ - ptr32 = (int32_t *) record_ptr->block_ptr; - total_bytes_used = 0; - for ( n = total_bytes / sizeof( int32_t ); n > 0; n-- ) - { - if ( *ptr32++ != fill_value ) - total_bytes_used += sizeof( int32_t ); - } - - /* Check Remaining Bytes (If Applicable) */ - ptr8 = (char *) ptr32; - for ( n = total_bytes % sizeof( int32_t ); n > 0; n-- ) - { - if ( *ptr8++ != (char) fill_value ) - total_bytes_used++; - /* Update Value */ - fill_value >>= 8; - } - - /* Save Space Used */ - record_ptr->used = total_bytes_used; -} - -static void mem_check_OOB( allocator_record *record_ptr ) -{ - int32_t *ptr32; - unsigned int OOB_Flag = 0x0; - int32_t mask; - size_t i; - int f; - - ptr32 = (int32_t *) record_ptr->block_ptr - N_32BITS_BLOCKS; - /* Check at Beginning of Block */ - i = N_32BITS_BLOCKS; - do - { - if ( *ptr32++ ^ MAGIC_VALUE_OOB ) - OOB_Flag |= OOB_START; - } while ( --i ); - - /* Advance to End (Snap to lowest 32 Bits) */ - ptr32 += record_ptr->block_size / sizeof( int32_t ); - - /* Calculate Unused Space That has been - added to get to the rounded Block Size */ - i = ROUND_BLOCK_SIZE( record_ptr->block_size ) - record_ptr->block_size; - - /* Partial Check (For Block Size that have been rounded) */ - f = i % sizeof( int32_t ); - if ( f != 0 ) - { - mask = 0xFFFFFFFF << ( ( sizeof( int32_t ) - f ) * 8 ); - if ( ( *ptr32++ ^ MAGIC_VALUE_OOB ) & mask ) - OOB_Flag |= OOB_END; - } - - /* Full Check (all 32 Bits) for Remaining */ - i /= sizeof( int32_t ); - i += N_32BITS_BLOCKS; - do - { - if ( *ptr32++ ^ MAGIC_VALUE_OOB ) - OOB_Flag |= OOB_END; - } while ( --i ); - - record_ptr->OOB_Flag = OOB_Flag; -} - -/* Just to make the code cleaner */ -static int is_same_record( const allocator_record *record_ptr1, allocator_record *record_ptr2 ) -{ - return record_ptr2->block_size == record_ptr1->block_size && - record_ptr2->lineno == record_ptr1->lineno && - strcmp( record_ptr2->name, record_ptr1->name ) == 0 && - strcmp( record_ptr2->params, record_ptr1->params ) == 0 && - record_ptr2->OOB_Flag == record_ptr1->OOB_Flag - ? 1 - : 0; -} - -/* This Function basically uses 'free' and removes the - Information about the memory block from the list of - currently allocated Memory */ -void mem_free( const char *func_name, int func_lineno, void *ptr ) -{ - unsigned int i, j, k; - char *tmp_ptr; - allocator_record *record_ptr, *record_ptr2; - - char info_msg[100]; - - /* Search for the Block Pointer in the List */ - record_ptr = &Current_Allocations[0]; - for ( i = 0; i < Num_Records_Cur_RAM; i++ ) - { - /* Same Pointer? */ - if ( ptr == record_ptr->block_ptr ) - { /* Yes, Found it */ - if ( Num_Records_Freed_RAM == MAX_INFO_RECORDS ) - { - ERROR( "Too Many Allocs. Increase 'MAX_INFO_RECORDS'" ); - } - - for ( j = 0; j < Num_Records_Peak_RAM; j++ ) - { - /* Is this Block Part of the Peak RAM? */ - if ( memcmp( record_ptr, &Peak_Allocations[j], sizeof( *record_ptr ) ) == 0 ) - { - break; /* Stop the 'j' loop */ - } - } - - mem_set_usage( record_ptr ); - mem_check_OOB( record_ptr ); - - /* De-Allocated Block was Part of Peak RAM? */ - if ( j == Num_Records_Peak_RAM ) - { /* No */ - /* Here, in order to avoid filling this list with repetitive blocks */ - /* that are allocated and deallocated repeatedly, we look for a block */ - /* that has the same module, line #, size & same OOB characteristics. */ - /* We then just increase the # of occurances of this block definition. */ - /* The % used will be merged */ - record_ptr2 = &Freed_Allocations[0]; - for ( k = 0; k < Num_Records_Freed_RAM; k++ ) - { - /* Same Block but allocated many times */ - if ( is_same_record( record_ptr2, record_ptr ) ) - { - record_ptr2->noccurances++; - record_ptr2->used += record_ptr->used; - break; - } - record_ptr2++; - } - /* Found it */ - } - else - { - /* Force Add to List */ - k = Num_Records_Freed_RAM; - } - - if ( k == Num_Records_Freed_RAM ) - { /* No */ - /* Add to List */ - memmove( &Freed_Allocations[Num_Records_Freed_RAM], record_ptr, sizeof( allocator_record ) ); - /* Increase # of Records for Deallocated Block List */ - Num_Records_Freed_RAM++; - } - - /* De-Allocated Block was Part of Peak RAM? */ - if ( j != Num_Records_Peak_RAM ) - { /* Yes */ - /* Update Block Info There too (The Info here is Bytes Used and OOB Flags) */ - memmove( &Peak_Allocations[j], record_ptr, sizeof( *record_ptr ) ); - } - - /* First Adjust Pointer to Get to the Start of the Block */ - tmp_ptr = (char *) ptr; - tmp_ptr -= BLOCK_ROUNDING; - ptr = (void *) tmp_ptr; - /* De-allocate using the standard memory facilities */ - fr\ -ee( ptr ); /* the split line is to prevent a 'search/replace' adding a '_' to the name */ - - /* Decrease # of Records */ - Num_Records_Cur_RAM--; - /* Update (decrease) Amount of RAM Allocated */ - Current_RAM -= ROUND_BLOCK_SIZE( record_ptr->block_size ); - - /* Erase the entry (Move the Last One over it) */ - memmove( record_ptr, &Current_Allocations[Num_Records_Cur_RAM], sizeof( allocator_record ) ); - - return; - } - record_ptr++; - } - - /* Not Found, Problem! */ - if ( ptr != NULL ) - { - /* Stop */ - sprintf( info_msg, "Invalid Pointer: '%p'", ptr ); - ERROR( info_msg ); - } -#ifndef DISABLE_NULL_PTR_FREE_WARNING - else - { /* Warn about Freeing of NULL Pointers */ - /* Search to Warn Only Once. */ - record_ptr = &Missing_Allocations[0]; - for ( i = 0; i < Num_Records_Missing_Alloc_Warnings; i++ ) - { - /* Same Name? */ - if ( strncmp( record_ptr->name, func_name, MAX_FUNCTION_NAME_LENGTH ) == 0 ) - { /* Yes */ - /* Same Line Number? */ - if ( record_ptr->lineno == func_lineno ) - { /* Yes */ - /* No Need to Warn Again */ - return; - } - } - record_ptr++; - } - /* Save Name */ - strncpy( record_ptr->name, func_name, MAX_FUNCTION_NAME_LENGTH ); - record_ptr->name[MAX_FUNCTION_NAME_LENGTH] = '\0'; - - /* Save Line No */ - record_ptr->lineno = func_lineno; - /* Save Pointer */ - record_ptr->block_ptr = ptr; - /* Save Size */ - record_ptr->block_size = 0; /* It is an Unknown Block, so there is no size, we put a '0' */ - - Num_Records_Missing_Alloc_Warnings++; - - WARNING( "Trying to Free 'NULL' Pointer" ); - } -#endif -} - -#ifdef MEM_COUNT_DETAILS -/* Used to Sort Block Information Records */ -static int compare_mem_records( const void *ptr1, const void *ptr2 ) -{ - const allocator_record *record_ptr1 = (const allocator_record *) ptr1, - *record_ptr2 = (const allocator_record *) ptr2; - int result; - - /* Sort First by 'Name', then by 'Line No' and finaly by 'Block Size' */ - - /* Compare Function Name */ - result = strcmp( record_ptr1->name, record_ptr2->name ); - /* Same Function Name? */ - if ( result == 0 ) - { /* Yes */ - /* Compare Line Number */ - result = record_ptr1->lineno - record_ptr2->lineno; - /* Same Line Number */ - if ( result == 0 ) - { /* Yes */ - /* Compare Block Size */ - result = record_ptr1->block_size - record_ptr2->block_size; - /* Same Size? */ - if ( result == 0 ) - { - result = record_ptr1->seq_no - record_ptr2->seq_no; - } - } - } - - return result; -} - -static void mem_print_records( allocator_record *record_ptr, int num_records, Counting_Size cnt_size, int print_size ) -{ - int i, sum, total; - char *last_name = NULL; - int single_flag; - char chr = Count_suffix[cnt_size]; - size_t nwords, rounded_block_size; - char nblocks_str[22]; - char quantity_str[22]; - char format_str[50]; - char *tmp_ptr; - int nblocks; - - char *OOB_str[] = { "- ", "beg", "end", "b+e" }; - - strcpy( format_str, "\n %-*s %5i %-*s %3s %3.0f%% %8s" ); - if ( print_size != FALSE ) - strcat( format_str, " %6u" ); - - /* Sort it */ - qsort( record_ptr, num_records, sizeof( allocator_record ), compare_mem_records ); - - single_flag = 0; - - nblocks = 0; - - if ( num_records > 0 ) - { - /* Print Header */ - printf( " %-*s Ln No %-*s OOB Used Quantity%s", MAX_FUNCTION_NAME_LENGTH, "Function Name", MAX_PARAMS_LENGTH, "Parameters ('m' or 'c' alloc)", print_size != FALSE ? " Size" : "" ); - - total = sum = 0; - for ( i = num_records - 1; i >= 0; i-- ) - { - if ( sum == 0 ) - { - last_name = record_ptr->name; - } - - rounded_block_size = ROUND_BLOCK_SIZE( record_ptr->block_size ) >> cnt_size; - nwords = rounded_block_size * record_ptr->noccurances; - - /* Calc Usage (It has already been done for a De-Allocated Block - That was part of the Peak Mem. But not for a Block that is - still allocated (never freed). */ - if ( record_ptr->used < 0 ) - { - mem_set_usage( record_ptr ); - /* Check Out of Bounds Too */ - mem_check_OOB( record_ptr ); - } - - sprintf( quantity_str, "%i", record_ptr->noccurances ); - - /* Print Quantity x Size */ - tmp_ptr = strchr( quantity_str, '\0' ); - *tmp_ptr++ = 'x'; - sprintf( tmp_ptr, "%i", (int) rounded_block_size ); - - printf( format_str, MAX_FUNCTION_NAME_LENGTH, record_ptr->name, record_ptr->lineno, MAX_PARAMS_LENGTH, record_ptr->params, OOB_str[record_ptr->OOB_Flag], ( record_ptr->used * 100.0f / record_ptr->block_size / record_ptr->noccurances ), quantity_str, (uint32_t) nwords ); - /* Count $ of Blocks */ - nblocks += record_ptr->noccurances; - /* Add Size */ - sum += nwords; - /* Advance */ - record_ptr++; - - if ( print_size != FALSE ) - { - /* End Reached or New Function? */ - if ( i == 0 || strcmp( last_name, record_ptr->name ) != 0 ) - { - /* Cumulate Total */ - total += sum; - - if ( i == 0 && total == sum ) - single_flag = 1; -#ifdef MEM_COUNT_TOTAL_PER_FUNC - /* Print 'Total' on the Line if there is only one Function - that allocated all the RAM */ - printf( " %7i%c", sum, chr ); -#endif - /* Reset Sum */ - sum = 0; - } - } - } - /* Print the Total */ - if ( !single_flag && print_size != FALSE ) - { -#ifdef MEM_COUNT_TOTAL_PER_FUNC -#define SPACES 9 -#else -#define SPACES 0 -#endif - - sprintf( nblocks_str, "%i Blocks", nblocks ); - - printf( "\n %*s %*s %*s --------\n", MAX_FUNCTION_NAME_LENGTH, "", MAX_PARAMS_LENGTH, "", SPACES, "" ); - printf( " %-*s %-*s %*s%7i%c\n", MAX_FUNCTION_NAME_LENGTH, "Total", MAX_PARAMS_LENGTH, nblocks_str, SPACES, "", total, chr ); - } - else - printf( "\n" ); - } - else - { - printf( " \n" ); - } -} -#endif - -/* Print Memory Summary. - Return Peak Memory Used (according to Units Specified) */ -size_t mem_count_summary( Counting_Size cnt_size ) -{ - size_t size; -#ifdef MEM_COUNT_DETAILS - unsigned int i, j; - size_t num; - allocation_list Allocations; -#endif - if ( cnt_size == USE_DEFAULT ) - cnt_size = Stat_Cnt_Size; - - size = Peak_RAM >> cnt_size; -#ifdef MEM_COUNT_DETAILS - printf( "\n\n====== STATIC RAM COUNTING TOOL: MEMORY SUMMARY ======\n\n" ); - - printf( " NOTES\n" - " 1) %c = %s, %c = %s (16 Bits Words) & %c = %s (32 Bits Words).\n" - " 2) The '%%' of 'Used' memory is not very reliable for c-alloc.\n" - " 3) The Out Of Bounds (OOB) Checking is primitive as it checks\n" - " only for writing before and past the buffer when it is freed\n" - " or when the summary is printed.\n" - " 4) Quantity Filed format is N x Block Size.\n" - " When it is 1: Size = Block Size\n" - " Otherwise, Size = The Total Size Allocated for the 'N' Blocks.\n" - "\n", - Count_suffix[USE_BYTES], Count_Name[USE_BYTES], Count_suffix[USE_16BITS], Count_Name[USE_16BITS], Count_suffix[USE_32BITS], Count_Name[USE_32BITS] ); - - /* Create a Temporary List of Block to Print */ - /* from all the Block Allocated in the Peak */ - /* Scenario. We want to Merge Entries allocated */ - /* from the exact same code location and having */ - /* the same block size. In order to simplifiy the */ - /* printout. */ - num = 0; - for ( i = 0; i < Num_Records_Peak_RAM; i++ ) - { - /* Check if an Identical Block Before Adding to List */ - for ( j = 0; j < num; j++ ) - { - if ( is_same_record( &Peak_Allocations[i], &Allocations[j] ) ) - { - Allocations[j].noccurances++; - Allocations[j].used += Peak_Allocations[i].used; - break; - } - } - - /* Unique Block? */ - if ( j == num ) - { /* Yes */ - /* Add to List */ - memmove( &Allocations[num++], &Peak_Allocations[i], sizeof( allocator_record ) ); - } - } - /* Print the Peak Allocated */ - printf( " Peak Memory Allocated\n" ); - mem_print_records( &Allocations[0], num, cnt_size, TRUE ); - printf( "\n" ); - - /* Create a Temporary List of Block to Print */ - /* from all the Block Allocated BUT excluding */ - /* blocks that are part of the peak (and that */ - /* are already printed). */ - /* This is done every time the summary is printed */ - /* so that the code can continue to be executed */ - /* and the summary can be printed again with blocks */ - /* that are part of the peak having changed and thus */ - /* those that end up in this 'catch all' category. */ - num = 0; - for ( i = 0; i < Num_Records_Freed_RAM; i++ ) - { - /* Check if Record is in the Peak */ - for ( j = 0; j < Num_Records_Peak_RAM; j++ ) - { - /* Is this Block Part of the Peak RAM OR Still Allocated ? */ - if ( is_same_record( &Freed_Allocations[i], &Peak_Allocations[j] ) ) - { /* Yes */ - break; /* Stop the 'j' loop */ - } - } - /* If part of the Peak, skip it */ - if ( j == Num_Records_Peak_RAM ) - { /* Not Part of Peak */ - /* Check if an Identical Block Before Adding to List */ - for ( j = 0; j < num; j++ ) - { -#ifndef MEM_COUNT_SEPARATE_OTHER_BLOCKS - /* Just Check for Same Size, Params and OOB Result */ - if ( Freed_Allocations[i].block_size == Allocations[j].block_size && - strcmp( Freed_Allocations[i].params, Allocations[j].params ) == 0 && - Freed_Allocations[i].OOB_Flag == Allocations[j].OOB_Flag ) - { - Allocations[j].noccurances += Freed_Allocations[i].noccurances; - Allocations[j].used += Freed_Allocations[i].used; - /* Indicate that Locations are Multiple */ - strncpy( Allocations[j].name, "MULTIPLE LOCATIONS", MAX_FUNCTION_NAME_LENGTH ); - /* Wipe the Line # */ - Allocations[j].lineno = 0; - break; - } -#else - if ( is_same_record( &Freed_Allocations[i], &Allocations[j] ) ) - { - Allocations[j].noccurances++; - Allocations[j].used += Freed_Allocations[i].used; - break; - } -#endif - } - - /* Unique Block? */ - if ( j == num ) - { /* Yes */ - /* Add to List */ - memmove( &Allocations[num++], &Freed_Allocations[i], sizeof( allocator_record ) ); - } - } - } - - if ( num != 0 ) - { - /* Print all Other Block (Those that have been Freed but are not Part - of the Peak Memory). */ - printf( " Other Memory Allocated\n" ); - mem_print_records( &Allocations[0], num, cnt_size, FALSE /*Do not print the size column*/ ); - printf( "\n" ); - } - - /* If we have busted the RAM Limit, we will end up in the - summary function (here) and abort. Hence, no point printing - the memory still allocated, it will be the same as the Peak! */ - if ( RAM_Limit == 0 || Current_RAM <= RAM_Limit ) - { - /* Print the Not Deallocated */ - printf( " Memory Still Allocated\n" ); - mem_print_records( &Current_Allocations[0], Num_Records_Cur_RAM, cnt_size, TRUE ); - printf( "\n" ); - } -#endif - -#ifndef MEM_COUNT_DETAILS - if ( Num_Records_Cur_RAM > 0 ) - { - printf( "\nWarning: Part of the SRAM is still allocated! Activate MEM_COUNT_DETAILS for more details.\n" ); - } -#endif - printf( "Peak SRAM Allocated: %i%c\n\n\n", (int) size, Count_suffix[cnt_size] ); - - return size; -} - -#ifdef DEBUGGING -#ifdef RAM_ANALYSIS -void mem_analyze( void ) -{ - unsigned int i; - char buffer[1024]; - - for ( i = 0; i < Num_Records_Cur_RAM; i++ ) - { - sprintf( buffer, "%s:%d,%ld;", Current_Allocations[i].name, Current_Allocations[i].lineno, Current_Allocations[i].block_size ); - dbgwrite( buffer, sizeof( char ), strlen( buffer ), 1, "mem_analysis.csv" ); - } - sprintf( buffer, "\n" ); - dbgwrite( buffer, sizeof( char ), strlen( buffer ), 1, "mem_analysis.csv" ); - - return; -} -#endif -#endif - -#endif diff --git a/lib_debug/mem_count.h b/lib_debug/mem_count.h deleted file mode 100644 index 38ccb0bac6..0000000000 --- a/lib_debug/mem_count.h +++ /dev/null @@ -1,110 +0,0 @@ -/* - * mem_count.h - * - * Copyright 2022 VoiceAge Corporation. All Rights Reserved. - * - * This software is protected by copyright law and by international treaties. - * VoiceAge Corporation retains full ownership rights in their respective contributions in the software. - * No license of any kind, including but not limited to patent license, of any foregoing parties is - * hereby granted by implication, estoppel or otherwise. - * - * This software is provided "AS IS", without any express or implied warranties. The software is in the - * development stage. It is intended exclusively for experts who have experience with such software and - * solely for the purpose of inspection. All implied warranties of non-infringement, merchantability - * and/or fitness for a particular purpose are hereby disclaimed and excluded. - * - * Written by : Guy J. Richard - August 2017 - * - */ - -#ifndef __MEM_COUNT_H__ -#define __MEM_COUNT_H__ - -#include -#include "options.h" -#include /* for size_t, ... */ - -#ifdef RAM_COUNTING_TOOL -/*-------------------------------------------------------------------* - * Global Constants - *-------------------------------------------------------------------*/ - -#define NO_RAM_LIMIT 0 - -/* Define this when using 64 Bits values in the code (ex: double) */ -/*#define MEM_ALIGN_64BITS */ /* Will Align on 32 Bits if not Defined */ - -/*#define DISABLE_NULL_PTR_FREE_WARNING*/ - -/*#define MEM_COUNT_DETAILS*/ - -/*#define MEM_COUNT_SEPARATE_OTHER_BLOCKS */ /* Print separate lines with location details if the same block is allocated in multiple places and is not a part of the Peak memory */ - /* if not defined, MULTIPLE LOCATIONS is printed instead */ - -/*-------------------------------------------------------------------* - * Global Types - *-------------------------------------------------------------------*/ - -typedef enum -{ - USE_DEFAULT = -1, - USE_BYTES, - USE_16BITS, - USE_32BITS -} Counting_Size; - -/*-------------------------------------------------------------------* - * Global Macros - *-------------------------------------------------------------------*/ - -#define STRINGIFY( x ) #x -#define TO_STRING( x ) STRINGIFY( x ) - -#if ( defined( _WIN32 ) && ( _MSC_VER <= 1800 ) && ( _MSC_VER >= 1300 ) ) -#define __func__ __FUNCTION__ -#elif defined( __STDC_VERSION__ ) && __STDC_VERSION__ < 199901L -#if ( __GNUC__ >= 2 ) -#define __func__ __FUNCTION__ -#else -#define __func__ "" -#endif -#elif defined( __GNUC__ ) -#define __func__ __extension__ __FUNCTION__ -#endif - -/* MALLOC_FCT_CALL, FREE_FCT_CALL, ... are defined here because 'wmc_auto.h' uses */ -/* them to map malloc, free & calloc to a Memory Counting Mechanism. If the WMC Tool */ -/* is not used, then these definitions will have no effect and are harmless. */ -#define MALLOC_FCT_CALL( size ) mem_alloc( __func__, __LINE__, size, "m:" TO_STRING( size ) ) -#define FREE_FCT_CALL( ptr ) mem_free( __func__, __LINE__, ptr ) -#define CALLOC_FCT_CALL( n, sz ) mem_alloc( __func__, __LINE__, ( n ) * ( sz ), "c:" TO_STRING( n ) ", " TO_STRING( sz ) ) - - -/*-------------------------------------------------------------------* - * Prototypes - *-------------------------------------------------------------------*/ - -#ifdef __cplusplus -extern "C" -{ -#endif - - extern void mem_count_init( size_t limit, Counting_Size cnt_size ); - extern size_t mem_count_summary( Counting_Size cnt_size ); - - extern void *mem_alloc( const char *func_name, int func_lineno, size_t size, char *alloc_str ); - extern void mem_free( const char *func_name, int func_lineno, void *ptr ); - -#ifdef DEBUGGING -#ifdef RAM_ANALYSIS - extern void mem_analyze( void ); -#endif -#endif - -#ifdef __cplusplus -} -#endif - -#endif - -#endif diff --git a/lib_debug/memory.c b/lib_debug/memory.c deleted file mode 100644 index afd292ddbc..0000000000 --- a/lib_debug/memory.c +++ /dev/null @@ -1,187 +0,0 @@ -/****************************************************************************************************** - - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository. All Rights Reserved. - - This software is protected by copyright law and by international treaties. - The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository retain full ownership rights in their respective contributions in - the software. This notice grants no license of any kind, including but not limited to patent - license, nor is any license granted by implication, estoppel or otherwise. - - Contributors are required to enter into the IVAS codec Public Collaboration agreement before making - contributions. - - This software is provided "AS IS", without any express or implied warranties. The software is in the - development stage. It is intended exclusively for experts who have experience with such software and - solely for the purpose of inspection. All implied warranties of non-infringement, merchantability - and fitness for a particular purpose are hereby disclaimed and excluded. - - Any dispute, controversy or claim arising under or in relation to providing this software shall be - submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in - accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and - the United Nations Convention on Contracts on the International Sales of Goods. - -*******************************************************************************************************/ - -#include "options.h" -#include -#include -#include -#include - -#include "prot.h" -#include "debug.h" -#include "wmops.h" -#include "rom_enc.h" -#include "rom_dec.h" -#include "rom_com.h" -#include "stat_enc.h" -#include "stat_dec.h" - -#ifdef WMOPS - -/*-------------------------------------------------------------------* - * Memory counting tool - *--------------------------------------------------------------------*/ - -int16_t *ptr_base_stack = 0; /* Pointer to the bottom of stack (base pointer). Stack grows up. */ -int16_t *ptr_max_stack = 0; /* Pointer to the maximum stack pointer (the farest point from the bottom of stack) */ -int32_t wc_frame = 0; /* Frame corresponding to the worst-case stack usage */ -char location_max_stack[256] = "undefined"; -#define MAX_FCT_NAME_LENGTH 30 -typedef struct -{ - char function_name[MAX_FCT_NAME_LENGTH + 1]; - int16_t *stack_ptr; -} caller_info; -int current_calls = 0; -#define MAX_RECORDABLE_CALLS 40 -caller_info stack_callers[2][MAX_RECORDABLE_CALLS]; - - -/*-------------------------------------------------------------------* - * reset_stack() - * - * Initialize/reset the base stack counter.. - *--------------------------------------------------------------------*/ - -void reset_stack() -{ - int16_t something; - - ptr_base_stack = &something; - ptr_max_stack = ptr_base_stack; -} - -/*-------------------------------------------------------------------* - * push_stack() - * - * Check the current stack pointer and update the maximum stack pointer, if new maximum found. - *--------------------------------------------------------------------*/ - -int push_stack( const char *filename, const char *fctname ) -{ - int16_t something; - - (void) *filename; /* to avoid compilation warning */ - - /* Is there room to save the caller's information? */ - if ( current_calls >= MAX_RECORDABLE_CALLS ) - { /* No */ - fprintf( stderr, "memory.c: No more room to store call stack info. Please increase MAX_RECORDABLE_CALLS" ); - exit( -1 ); - } - /* Valid Function Name? */ - if ( fctname[0] == 0 ) - { /* No */ - fprintf( stderr, "memory.c: Invalid function name for call stack info." ); - exit( -1 ); - } - /* Save the Name of the Calling Function in the Table */ - strncpy( stack_callers[0][current_calls].function_name, fctname, MAX_FCT_NAME_LENGTH ); - stack_callers[0][current_calls].function_name[MAX_FCT_NAME_LENGTH] = 0; /* Nul Terminate */ - /* Save the Stack Pointer */ - stack_callers[0][current_calls].stack_ptr = &something; - /* Increase Stack Calling Tree Level */ - current_calls++; - /* Is this the First Time or the Worst Case? */ - if ( &something < ptr_max_stack || ptr_max_stack == NULL ) - { /* Yes */ - /* Save Info about it */ - ptr_max_stack = &something; - wc_frame = frame; - strncpy( location_max_stack, fctname, sizeof( location_max_stack ) - 1 ); - location_max_stack[sizeof( location_max_stack ) - 1] = '\0'; - - /* Save Call Tree */ - memmove( stack_callers[1], stack_callers[0], sizeof( caller_info ) * current_calls ); - - /* Terminate the List (Unless Full) */ - if ( current_calls < MAX_RECORDABLE_CALLS ) - { - stack_callers[1][current_calls].function_name[0] = 0; - } - } - return 0 /* for Now */; -} - -int pop_stack( const char *filename, const char *fctname ) -{ - caller_info *caller_info_ptr; - - (void) *filename; /* to avoid compilation warning */ - - /* Decrease Stack Calling */ - current_calls--; - - /* Get Pointer to Caller Information */ - caller_info_ptr = &stack_callers[0][current_calls]; - - /* Check if Names Match */ - if ( strncmp( caller_info_ptr->function_name, fctname, MAX_FCT_NAME_LENGTH ) != 0 ) - { - fprintf( stderr, "memory.c: Invalid pop_stack()" ); - exit( -1 ); - } - - /* Erase Entry */ - caller_info_ptr->function_name[0] = 0; - - return 0 /* for Now */; -} - -void print_stack_call_tree( void ) -{ - caller_info *caller_info_ptr; - int call_level; - - fprintf( stdout, "Stack Call Tree (frame #%5d) Stack Usage in words\n", wc_frame ); - caller_info_ptr = &stack_callers[1][0]; - for ( call_level = 0; call_level < MAX_RECORDABLE_CALLS; call_level++ ) - { - /* Done? */ - if ( caller_info_ptr->function_name[0] == 0 ) - break; - /* Print Name */ - fprintf( stdout, "%-42s", caller_info_ptr->function_name ); - /* Print Stack Usage (Based on Difference) */ - if ( call_level != 0 ) - { - fprintf( stdout, "%ld\n", ( ( caller_info_ptr - 1 )->stack_ptr - caller_info_ptr->stack_ptr ) * sizeof( int16_t ) / sizeof( float ) ); - } - else - fprintf( stdout, "\n" ); - /* Advance */ - caller_info_ptr++; - } - fprintf( stdout, "\n" ); -} - -#endif /* WMOPS */ diff --git a/lib_debug/sba_debug.c b/lib_debug/sba_debug.c index 68fd39f4c0..040cadf887 100644 --- a/lib_debug/sba_debug.c +++ b/lib_debug/sba_debug.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,10 +37,9 @@ #include #include "options.h" #include "ivas_cnst.h" -#include "prot.h" #include "sba_debug.h" #include -#include "wmops.h" +#include "wmc_auto.h" #ifdef DEBUG_SBA #include #include "tinywaveout_c.h" diff --git a/lib_debug/sba_debug.h b/lib_debug/sba_debug.h index 86e07e5a41..cd4fd58c11 100644 --- a/lib_debug/sba_debug.h +++ b/lib_debug/sba_debug.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_debug/snr.c b/lib_debug/snr.c index a524b35c26..f6e6fa9d52 100644 --- a/lib_debug/snr.c +++ b/lib_debug/snr.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -32,15 +32,15 @@ #include #include "options.h" -#include "rom_com.h" #ifdef DEBUGGING #include "debug.h" #endif #include #include -#include "wmops.h" +#include +#include "wmc_auto.h" #include "cnst.h" -#include "prot.h" +#include "ivas_cnst.h" #ifdef DEBUGGING @@ -79,6 +79,150 @@ static float mem_deemph_y[MAX_INPUT_CHANNELS] = { 0 }; static float mem_synth_snr[MAX_INPUT_CHANNELS][M]; +/*-------------------------------------------------------------------* + * Local functions - they are copies of functions declared in prot.h but + here we do not want to include prot.h due to its dependencies + *--------------------------------------------------------------------*/ + +static void set_f( + float y[], /* i/o: Vector to set */ + const float a, /* i : Value to set the vector to */ + const int16_t N /* i : Lenght of the vector */ +) +{ + int16_t i; + + for ( i = 0; i < N; i++ ) + { + y[i] = a; + } + + return; +} + + +static float sum2_f( + const float *vec, /* i : input vector */ + const int16_t lvec /* i : length of input vector */ +) +{ + int16_t i; + float tmp; + + tmp = 0.0f; + for ( i = 0; i < lvec; i++ ) + { + tmp += vec[i] * vec[i]; + } + + return tmp; +} + + +static void mvr2r( + const float x[], /* i : input vector */ + float y[], /* o : output vector */ + const int16_t n /* i : vector size */ +) +{ + int16_t i; + + if ( n <= 0 ) + { + /* cannot transfer vectors with size 0 */ + return; + } + + if ( y < x ) + { + for ( i = 0; i < n; i++ ) + { + y[i] = x[i]; + } + } + else + { + for ( i = n - 1; i >= 0; i-- ) + { + y[i] = x[i]; + } + } + + return; +} + +static void residu( + const float *a, /* i : LP filter coefficients */ + const int16_t m, /* i : order of LP filter */ + const float *x, /* i : input signal (usually speech) */ + float *y, /* o : output signal (usually residual) */ + const int16_t l /* i : size of filtering */ +) +{ + float s; + int16_t i, j; + + for ( i = 0; i < l; i++ ) + { + s = x[i]; + for ( j = 1; j <= m; j++ ) + { + s += a[j] * x[i - j]; + } + y[i] = s; + } + + return; +} + +static void deemph( + float *signal, /* i/o: signal */ + const float mu, /* i : deemphasis factor */ + const int16_t L, /* i : vector size */ + float *mem /* i/o: memory (y[-1]) */ +) +{ + int16_t i; + + signal[0] = signal[0] + mu * ( *mem ); + for ( i = 1; i < L; i++ ) + { + signal[i] = signal[i] + mu * signal[i - 1]; + } + + *mem = signal[L - 1]; + + if ( ( *mem < 1e-10 ) & ( *mem > -1e-10 ) ) + { + *mem = 0; + } + + return; +} + +static void weight_a( + const float *a, /* i : LP filter coefficients */ + float *ap, /* o : weighted LP filter coefficients */ + const float gamma, /* i : weighting factor */ + const int16_t m /* i : order of LP filter */ +) +{ + float f; + int16_t i; + + ap[0] = a[0]; + f = gamma; + + for ( i = 1; i <= m; i++ ) + { + ap[i] = f * a[i]; + f *= gamma; + } + + return; +} + + /*-------------------------------------------------------------------* * snr() * @@ -252,7 +396,7 @@ void snr_celp( noise2 = sum2_f( &noise[i], L_subfr ) + 0.001f; if ( signal2 < noise2 ) signal2 = noise2; - subframe_snr = 10.0f * (float) log10( signal2 / noise2 ); + subframe_snr = 10.0f * log10f( signal2 / noise2 ); if ( L_frame == L_FRAME ) { diff --git a/lib_debug/wmc_auto.c b/lib_debug/wmc_auto.c new file mode 100644 index 0000000000..029640a1db --- /dev/null +++ b/lib_debug/wmc_auto.c @@ -0,0 +1,1926 @@ +/* + * (C) 2022 copyright VoiceAge Corporation. All Rights Reserved. + * + * This software is protected by copyright law and by international treaties. The source code, and all of its derivations, + * is provided by VoiceAge Corporation under the "ITU-T Software Tools' General Public License". Please, read the license file + * or refer to ITU-T Recommendation G.191 on "SOFTWARE TOOLS FOR SPEECH AND AUDIO CODING STANDARDS". + * + * Any use of this software is permitted provided that this notice is not removed and that neither the authors nor + * VoiceAge Corporation are deemed to have made any representations as to the suitability of this software + * for any purpose nor are held responsible for any defects of this software. THERE IS NO WARRANTY FOR THIS SOFTWARE. + * + * Authors: Guy Richard, Vladimir Malenovsky (Vladimir.Malenovsky@USherbrooke.ca) + */ + +#include +#include +#include +#include +#include + +#ifndef _MSC_VER +#include +#include +#else +#include +#endif + +#include "options.h" +#include "wmc_auto.h" + + +#define WMC_TOOL_SKIP /* Skip the instrumentation of this file, if invoked by accident */ + +#ifdef WMOPS + +/*-------------------------------------------------------------------* + * Complexity counting tool + *--------------------------------------------------------------------*/ + +#define MAX_RECORDS 1024 +#define MAX_CHAR 64 +#define MAX_STACK 64 +#define DOUBLE_MAX 0x80000000 + +struct wmops_record +{ + char label[MAX_CHAR]; + long call_number; + long update_cnt; + int call_tree[MAX_RECORDS]; + double start_selfcnt; + double current_selfcnt; + double max_selfcnt; + double min_selfcnt; + double tot_selfcnt; + double start_cnt; /* The following take into account the decendants */ + double current_cnt; + double max_cnt; + double min_cnt; + double tot_cnt; +#ifdef WMOPS_WC_FRAME_ANALYSIS + int32_t current_call_number; + double wc_cnt; + double wc_selfcnt; + int32_t wc_call_number; +#endif +}; + +double ops_cnt; +double prom_cnt; +double inst_cnt[NUM_INST]; + +static struct wmops_record wmops[MAX_RECORDS]; +static int stack[MAX_STACK]; +static int sptr; +static int num_records; +static int current_record; +static long update_cnt; +static double start_cnt; +static double max_cnt; +static double min_cnt; +static double inst_cnt_wc[NUM_INST]; +static long fnum_cnt_wc; + +static int *heap_allocation_call_tree = NULL, heap_allocation_call_tree_size = 0, heap_allocation_call_tree_max_size = 0; + + +void reset_wmops( void ) +{ + int i, j; + + for ( i = 0; i < MAX_RECORDS; i++ ) + { + strcpy( &wmops[i].label[0], "\0" ); + wmops[i].call_number = 0; + wmops[i].update_cnt = 0; + for ( j = 0; j < MAX_RECORDS; j++ ) + { + wmops[i].call_tree[j] = -1; + } + wmops[i].start_selfcnt = 0.0; + wmops[i].current_selfcnt = 0.0; + wmops[i].max_selfcnt = 0.0; + wmops[i].min_selfcnt = DOUBLE_MAX; + wmops[i].tot_selfcnt = 0.0; + wmops[i].start_cnt = 0.0; + wmops[i].current_cnt = 0.0; + wmops[i].max_cnt = 0.0; + wmops[i].min_cnt = DOUBLE_MAX; + wmops[i].tot_cnt = 0.0; +#ifdef WMOPS_WC_FRAME_ANALYSIS + wmops[i].wc_cnt = 0.0; + wmops[i].wc_selfcnt = 0.0; + wmops[i].current_call_number = 0; +#endif + } + + for ( i = 0; i < MAX_STACK; i++ ) + { + stack[i] = -1; + } + sptr = 0; + num_records = 0; + current_record = -1; + update_cnt = 0; + + max_cnt = 0.0; + min_cnt = DOUBLE_MAX; + start_cnt = 0.0; + ops_cnt = 0.0; +} + + +void push_wmops( const char *label ) +{ + int new_flag; + int i, j; + + /* Check if new function record label */ + new_flag = 1; + for ( i = 0; i < num_records; i++ ) + { + if ( strcmp( wmops[i].label, label ) == 0 ) + { + new_flag = 0; + break; + } + } + + /* Configure new record */ + if ( new_flag ) + { + if ( num_records >= MAX_RECORDS ) + { + fprintf( stdout, "push_wmops(): exceeded MAX_RECORDS count.\n\n" ); + exit( -1 ); + } + strcpy( wmops[i].label, label ); + num_records++; + } + + /* Push current context onto stack */ + if ( current_record >= 0 ) + { + if ( sptr >= MAX_STACK ) + { + fprintf( stdout, "\r push_wmops(): stack exceeded, try inreasing MAX_STACK\n" ); + exit( -1 ); + } + stack[sptr++] = current_record; + + /* accumulate op counts */ + wmops[current_record].current_selfcnt += ops_cnt - wmops[current_record].start_selfcnt; + + /* update call tree */ + for ( j = 0; j < MAX_RECORDS; j++ ) + { + if ( wmops[i].call_tree[j] == current_record ) + { + break; + } + else if ( wmops[i].call_tree[j] == -1 ) + { + wmops[i].call_tree[j] = current_record; + break; + } + } + } + + /* init current record */ + current_record = i; + wmops[current_record].start_selfcnt = ops_cnt; + wmops[current_record].start_cnt = ops_cnt; + wmops[current_record].call_number++; +#ifdef WMOPS_WC_FRAME_ANALYSIS + wmops[current_record].current_call_number++; +#endif + + return; +} + + +void pop_wmops( void ) +{ + + /* Check for underflow */ + if ( current_record < 0 ) + { + fprintf( stdout, "\r pop_wmops(): stack underflow, too many calls to pop_wmops()\n" ); + exit( -1 ); + } + + /* update count of current record */ + wmops[current_record].current_selfcnt += ops_cnt - wmops[current_record].start_selfcnt; + wmops[current_record].current_cnt += ops_cnt - wmops[current_record].start_cnt; + + /* Get back previous context from stack */ + if ( sptr > 0 ) + { + current_record = stack[--sptr]; + wmops[current_record].start_selfcnt = ops_cnt; + } + else + { + current_record = -1; + } + + return; +} + + +void update_wmops( void ) +{ + int i; + double current_cnt; +#ifdef WMOPS_PER_FRAME + static FILE *fid = NULL; + const char filename[] = "wmops_analysis"; + float tmpF; +#endif + + if ( sptr != 0 ) + { + fprintf( stdout, "update_wmops(): Stack must be empty!\n" ); + exit( -1 ); + } + +#ifdef WMOPS_PER_FRAME + /* Check, if the output file has already been opened */ + if ( fid == NULL ) + { + fid = fopen( filename, "wb" ); + + if ( fid == NULL ) + { + fprintf( stderr, "\nCannot open %s!\n\n", filename ); + exit( -1 ); + } + } + + /* Write current complexity to the external file */ + tmpF = (float) ( FAC * wmops[0].current_cnt ); + fwrite( &tmpF, sizeof( float ), 1, fid ); +#endif + +#ifdef WMOPS_WC_FRAME_ANALYSIS + if ( ops_cnt - start_cnt > max_cnt ) + { + for ( i = 0; i < num_records; i++ ) + { + wmops[i].wc_cnt = wmops[i].current_cnt; + wmops[i].wc_selfcnt = wmops[i].current_selfcnt; + wmops[i].wc_call_number = wmops[i].current_call_number; + } + } +#endif + + for ( i = 0; i < num_records; i++ ) + { + wmops[i].tot_selfcnt += wmops[i].current_selfcnt; + wmops[i].tot_cnt += wmops[i].current_cnt; + + if ( wmops[i].current_selfcnt > 0 ) + { + if ( wmops[i].current_selfcnt > wmops[i].max_selfcnt ) + { + wmops[i].max_selfcnt = wmops[i].current_selfcnt; + } + + if ( wmops[i].current_selfcnt < wmops[i].min_selfcnt ) + { + wmops[i].min_selfcnt = wmops[i].current_selfcnt; + } + } + + wmops[i].current_selfcnt = 0; + + if ( wmops[i].current_cnt > 0 ) + { + if ( wmops[i].current_cnt > wmops[i].max_cnt ) + { + wmops[i].max_cnt = wmops[i].current_cnt; + } + + if ( wmops[i].current_cnt < wmops[i].min_cnt ) + { + wmops[i].min_cnt = wmops[i].current_cnt; + } + + wmops[i].update_cnt++; + } + + wmops[i].current_cnt = 0; +#ifdef WMOPS_WC_FRAME_ANALYSIS + wmops[i].current_call_number = 0; +#endif + } + + current_cnt = ops_cnt - start_cnt; + if ( current_cnt > max_cnt ) + { + max_cnt = current_cnt; + + for ( i = 0; i < NUM_INST; i++ ) + { + inst_cnt_wc[i] = inst_cnt[i]; + } + + fnum_cnt_wc = update_cnt + 1; + } + + if ( current_cnt < min_cnt ) + { + min_cnt = current_cnt; + } + + for ( i = 0; i < NUM_INST; i++ ) + { + inst_cnt[i] = 0.0; + } + + start_cnt = ops_cnt; + + /* increment frame counter */ + update_cnt++; + + return; +} + + +void print_wmops( void ) +{ + int i; + + char *sfmts = "%20s %8s %8s %7s %7s\n"; + char *dfmts = "%20s %8.2f %8.3f %7.3f %7.3f\n"; + char *sfmt = "%20s %8s %8s %7s %7s %7s %7s %7s\n"; + char *dfmt = "%20s %8.2f %8.3f %7.3f %7.3f %7.3f %7.3f %7.3f\n"; + +#ifdef WMOPS_WC_FRAME_ANALYSIS + int j, label_len, max_label_len; + char *sfmtt = "%20s %4s %15s\n"; + char *dfmtt = "%20s %4d "; +#endif + + fprintf( stdout, "\n\n --- Complexity analysis [WMOPS] --- \n\n" ); + + fprintf( stdout, "%54s %23s\n", "|------ SELF ------|", "|--- CUMULATIVE ---|" ); + fprintf( stdout, sfmt, " routine", " calls", " min ", " max ", " avg ", " min ", " max ", " avg " ); + fprintf( stdout, sfmt, "---------------", "------", "------", "------", "------", "------", "------", "------" ); + + for ( i = 0; i < num_records; i++ ) + { + fprintf( stdout, dfmt, wmops[i].label, update_cnt == 0 ? 0 : (float) wmops[i].call_number / update_cnt, + wmops[i].min_selfcnt == DOUBLE_MAX ? 0 : FAC * wmops[i].min_selfcnt, + FAC * wmops[i].max_selfcnt, + wmops[i].update_cnt == 0 ? 0 : FAC * wmops[i].tot_selfcnt / wmops[i].update_cnt, + wmops[i].min_cnt == DOUBLE_MAX ? 0 : FAC * wmops[i].min_cnt, + FAC * wmops[i].max_cnt, + wmops[i].update_cnt == 0 ? 0 : FAC * wmops[i].tot_cnt / wmops[i].update_cnt ); + } + + fprintf( stdout, sfmts, "---------------", "------", "------", "------", "------" ); + fprintf( stdout, dfmts, "total", (float) update_cnt, update_cnt == 0 ? 0 : FAC * min_cnt, FAC * max_cnt, update_cnt == 0 ? 0 : FAC * ops_cnt / update_cnt ); + fprintf( stdout, "\n" ); + +#ifdef WMOPS_WC_FRAME_ANALYSIS + /* calculate maximum label length for compact prinout */ + max_label_len = 0; + for ( i = 0; i < num_records; i++ ) + { + label_len = strlen( wmops[i].label ); + if ( label_len > max_label_len ) + { + max_label_len = label_len; + } + } + max_label_len += 4; + + fprintf( stdout, "\nComplexity analysis for the worst-case frame %ld:\n", fnum_cnt_wc ); + fprintf( stdout, "%*s %8s %10s %12s\n", max_label_len, " routine", " calls", " SELF", " CUMULATIVE" ); + fprintf( stdout, "%*s %8s %10s %10s\n", max_label_len, "---------------", "------", "------", "----------" ); + + for ( i = 0; i < num_records; i++ ) + { + fprintf( stdout, "%*s %8d %10.3f %12.3f\n", max_label_len, wmops[i].label, wmops[i].wc_call_number, FAC * wmops[i].wc_selfcnt, FAC * wmops[i].wc_cnt ); + } + + fprintf( stdout, "\nCall Tree:\n\n" ); + fprintf( stdout, sfmtt, " function", "num", "called by: " ); + fprintf( stdout, sfmtt, "---------------", "---", "--------------" ); + + for ( i = 0; i < num_records; i++ ) + { + fprintf( stdout, dfmtt, wmops[i].label, i ); + for ( j = 0; wmops[i].call_tree[j] != -1; j++ ) + { + if ( j != 0 ) + { + fprintf( stdout, ", " ); + } + fprintf( stdout, "%d", wmops[i].call_tree[j] ); + } + fprintf( stdout, "\n" ); + } + + fprintf( stdout, sfmtt, "---------------", "---", "--------------" ); + fprintf( stdout, "\n\n" ); + + fprintf( stdout, "\nInstruction type analysis for the worst-case frame %ld:\n\n", fnum_cnt_wc ); /* added -- JPA */ + for ( i = 0; i < NUM_INST; i++ ) + { + switch ( (enum instructions) i ) + { + case _ADD: + fprintf( stdout, "\tAdds: %12.1f\n", inst_cnt_wc[i] ); + break; + case _ABS: + fprintf( stdout, "\tAbsolutes: %12.1f\n", inst_cnt_wc[i] ); + break; + case _MULT: + fprintf( stdout, "\tMultiplies: %12.1f\n", inst_cnt_wc[i] ); + break; + case _MAC: + fprintf( stdout, "\tMACs: %12.1f\n", inst_cnt_wc[i] ); + break; + case _MOVE: + fprintf( stdout, "\tMoves: %12.1f\n", inst_cnt_wc[i] ); + break; + case _STORE: + fprintf( stdout, "\tStores: %12.1f\n", inst_cnt_wc[i] ); + break; + case _LOGIC: + fprintf( stdout, "\tLogicals: %12.1f\n", inst_cnt_wc[i] ); + break; + case _SHIFT: + fprintf( stdout, "\tShifts: %12.1f\n", inst_cnt_wc[i] ); + break; + case _BRANCH: + fprintf( stdout, "\tBranches: %12.1f\n", inst_cnt_wc[i] ); + break; + case _DIV: + fprintf( stdout, "\tDivisions: %12.1f\n", inst_cnt_wc[i] ); + break; + case _SQRT: + fprintf( stdout, "\tSquare Root: %12.1f\n", inst_cnt_wc[i] ); + break; + case _TRANS: + fprintf( stdout, "\tTrans: %12.1f\n", inst_cnt_wc[i] ); + break; + case _FUNC: + fprintf( stdout, "\tFunc Call: %12.1f\n", inst_cnt_wc[i] ); + break; + case _LOOP: + fprintf( stdout, "\tLoop Init: %12.1f\n", inst_cnt_wc[i] ); + break; + case _INDIRECT: + fprintf( stdout, "\tIndirect Addr: %12.1f\n", inst_cnt_wc[i] ); + break; + case _PTR_INIT: + fprintf( stdout, "\tPointer Init: %12.1f\n", inst_cnt_wc[i] ); + break; + case _TEST: + fprintf( stdout, "\tExtra condit.: %12.1f\n", inst_cnt_wc[i] ); + break; + case _POWER: + fprintf( stdout, "\tExponential: %12.1f\n", inst_cnt_wc[i] ); + break; + case _LOG: + fprintf( stdout, "\tLogarithm: %12.1f\n", inst_cnt_wc[i] ); + break; + case _MISC: + fprintf( stdout, "\tAll other op.: %12.1f\n", inst_cnt_wc[i] ); + break; + default: + fprintf( stdout, "\tERROR: Invalid instruction type: %d\n\n", i ); + } + } +#endif + + return; +} + + +/*-------------------------------------------------------------------* + * Memory counting tool measuring RAM usage (stack and heap) + * + * Maximum RAM is measured by monitoring the total allocated memory (stack and heap) in each frame. + * + * Maximum stack is measured by monitoring the difference between the 'top' and 'bottom' of the stack. The 'bottom' of the stack is updated in each function + * with a macro 'func_start_' which is inserted automatically to all functions during the instrumentation process. + * + * Maximum heap is measured by summing the sizes of all memory blocks allocated by malloc() or calloc() and deallocated by free(). The maximum heap size is + * updated each time when the macros malloc_() or calloc_() is invoked. The macros 'malloc_ and calloc_' are inserted automatically during the instrumentation process. + * As part of heap measurements, intra-frame heap and inter-frame heap are measured separately. Intra-frame heap refers to heap memory which is allocated and deallocated + * within a single frame. Inter-frame heap, on the contrary, refers to heap memory which is reserved for more than one frame. + * + * In order to run the memory counting tool the function reset_mem(cnt_size) must be called at the beginning of the encoding/decoding process. + * The unit in which memory consumption is reported is set via the parameter 'cnt_size'. It can be set to 0 (bytes), 1 (32b words) or 2 (64b words). + * At the end of the encoding/decoding process, 'print_mem()' function may be called to print basic information about memory consumption. If the macro 'MEM_COUNT_DETAILS' + * is activated, detailed information is printed + * + * The macro 'WMOPS' needs to be activated to enable memory counting. To avoid the instrumentation of malloc()/calloc()/free() calls, use + * #define WMC_TOOL_SKIP ... #undef WMC_TOOL_SKIP macro pair around the malloc(), calloc() and free(). + *--------------------------------------------------------------------*/ + +#define MAX_RECORDABLE_CALLS 100 +#define MAX_FUNCTION_NAME_LENGTH 35 /* Maximum length that the function string will be truncated to */ +#define MAX_PARAMS_LENGTH 50 /* Maximum length that the parameter string will be truncated to */ +#define MAX_NUM_RECORDS 300 /* Initial maximum number of memory records -> mightb be increased during runtime, if needed */ +#define MAX_NUM_RECORDS_REALLOC_STEP 50 /* When re-allocating the list of memory records, increase the number of records by this number */ + +/* This is the value (in bytes) towards which the block size is rounded. For example, a block of 123 bytes, when using + a 32 bits system, will end up taking 124 bytes since the last unused byte cannot be used for another block. */ +#ifdef MEM_ALIGN_64BITS +#define BLOCK_ROUNDING 8 /* Align on 64 Bits */ +#else +#define BLOCK_ROUNDING 4 /* Align on 32 Bits */ +#endif + +#define N_32BITS_BLOCKS ( BLOCK_ROUNDING / sizeof( int32_t ) ) + +#define MAGIC_VALUE_OOB 0x12A534F0 /* Signature value which is inserted before and after each allocated memory block, used to detect out-of-bound access */ +#define MAGIC_VALUE_USED ( ~MAGIC_VALUE_OOB ) /* Value used to pre-fill allocated memory blocks, used to calculate actual memory usage */ +#define OOB_START 0x1 /* Flag indicating out-of-bounds access before memory block */ +#define OOB_END 0x2 /* Flag indicating out-of-bounds access after memory block */ + +#define ROUND_BLOCK_SIZE( n ) ( ( ( n ) + BLOCK_ROUNDING - 1 ) & ~( BLOCK_ROUNDING - 1 ) ) +#define IS_CALLOC( str ) ( str[0] == 'c' ) + +#ifdef MEM_COUNT_DETAILS +const char *csv_filename = "mem_analysis.csv"; +static FILE *fid_csv_filename = NULL; +#endif + +typedef struct +{ + char function_name[MAX_FUNCTION_NAME_LENGTH + 1]; + int16_t *stack_ptr; +} caller_info; + +caller_info stack_callers[2][MAX_RECORDABLE_CALLS]; + +typedef struct +{ + char name[MAX_FUNCTION_NAME_LENGTH + 1]; /* +1 for NUL */ + char params[1 + MAX_PARAMS_LENGTH + 1]; /* +1 for 'm'/'c' alloc & +1 for NUL */ + unsigned long hash; + int lineno; + void *block_ptr; + int block_size; + unsigned long total_block_size; /* Cumulative sum of the allocated size in the session */ + unsigned long total_used_size; /* Cumulative sum of the used size in the session */ + int wc_heap_size_intra_frame; /* Worst-Case Intra-Frame Heap Size */ + int wc_heap_size_inter_frame; /* Worst-Case Inter-Frame Heap Size */ + int frame_allocated; /* Frame number in which the Memory Block has been allocated (-1 if not allocated at the moment) */ + int OOB_Flag; + int noccurances; /* Number of times that the memory block has been allocated in a frame */ +} allocator_record; + +allocator_record *allocation_list = NULL; + +static int16_t *ptr_base_stack = 0; /* Pointer to the bottom of stack (base pointer). Stack grows up. */ +static int16_t *ptr_current_stack = 0; /* Pointer to the current stack pointer */ +static int16_t *ptr_max_stack = 0; /* Pointer to the maximum stack pointer (the farest point from the bottom of stack) */ +static int32_t wc_stack_frame = 0; /* Frame corresponding to the worst-case stack usage */ +static int32_t wc_ram_size, wc_ram_frame; +static int32_t current_heap_size; +static int current_calls = 0; +static char location_max_stack[256] = "undefined"; +static int Num_Records, Max_Num_Records; +static size_t Stat_Cnt_Size = USE_BYTES; +static const char *Count_Unit[] = { "bytes", "words", "words" }; + +static int *list_wc_intra_frame_heap, n_items_wc_intra_frame_heap, max_items_wc_intra_frame_heap, size_wc_intra_frame_heap, location_wc_intra_frame_heap; +static int *list_current_inter_frame_heap, n_items_current_inter_frame_heap, max_items_current_inter_frame_heap, size_current_inter_frame_heap; +static int *list_wc_inter_frame_heap, n_items_wc_inter_frame_heap, max_items_wc_inter_frame_heap, size_wc_inter_frame_heap, location_wc_inter_frame_heap; + +/* Local Functions */ +static unsigned long malloc_hash( const char *func_name, int func_lineno, char *size_str ); +allocator_record *get_mem_record( unsigned long *hash, const char *func_name, int func_lineno, char *size_str, int *index_record ); +static void *mem_alloc_block( size_t size, const char *size_str ); + +/*-------------------------------------------------------------------* + * reset_mem() + * + * Initialize/reset memory counting tool (stack and heap) + *--------------------------------------------------------------------*/ + +void reset_mem( Counting_Size cnt_size ) +{ + int16_t something; + size_t tmp_size; + + /* initialize stack pointers */ + ptr_base_stack = &something; + ptr_max_stack = ptr_base_stack; + ptr_current_stack = ptr_base_stack; + + Stat_Cnt_Size = cnt_size; + + /* Check, if sizeof(int32_t) is 4 bytes */ + tmp_size = sizeof( int32_t ); + if ( tmp_size != 4 ) + { + fprintf( stderr, "Error: Expecting 'int32_t' to be a 32 Bits Integer!" ); + exit( -1 ); + } + + /* create allocation list for malloc() memory blocks */ + if ( allocation_list == NULL ) + { + allocation_list = malloc( MAX_NUM_RECORDS * sizeof( allocator_record ) ); + } + + if ( allocation_list == NULL ) + { + fprintf( stderr, "Error: Unable to Create List of Memory Blocks!" ); + exit( -1 ); + } + + Num_Records = 0; + Max_Num_Records = MAX_NUM_RECORDS; + + wc_ram_size = 0; + wc_ram_frame = -1; + current_heap_size = 0; + + /* heap allocation tree */ + heap_allocation_call_tree_max_size = MAX_NUM_RECORDS; + if ( heap_allocation_call_tree == NULL ) + { + heap_allocation_call_tree = (int *) malloc( heap_allocation_call_tree_max_size * sizeof( int ) ); + memset( heap_allocation_call_tree, -1, heap_allocation_call_tree_max_size * sizeof( int ) ); + } + heap_allocation_call_tree_size = 0; + + /* wc intra-frame heap */ + max_items_wc_intra_frame_heap = MAX_NUM_RECORDS; + if ( list_wc_intra_frame_heap == NULL ) + { + list_wc_intra_frame_heap = (int *) malloc( max_items_wc_intra_frame_heap * sizeof( int ) ); + memset( list_wc_intra_frame_heap, -1, max_items_wc_intra_frame_heap * sizeof( int ) ); + } + n_items_wc_intra_frame_heap = 0; + size_wc_intra_frame_heap = 0; + location_wc_intra_frame_heap = -1; + + /* current inter-frame heap */ + max_items_current_inter_frame_heap = MAX_NUM_RECORDS; + if ( list_current_inter_frame_heap == NULL ) + { + list_current_inter_frame_heap = (int *) malloc( max_items_current_inter_frame_heap * sizeof( int ) ); + memset( list_current_inter_frame_heap, -1, max_items_current_inter_frame_heap * sizeof( int ) ); + } + n_items_current_inter_frame_heap = 0; + size_current_inter_frame_heap = 0; + + /* wc inter-frame heap */ + max_items_wc_inter_frame_heap = MAX_NUM_RECORDS; + if ( list_wc_inter_frame_heap == NULL ) + { + list_wc_inter_frame_heap = (int *) malloc( max_items_wc_inter_frame_heap * sizeof( int ) ); + memset( list_wc_inter_frame_heap, -1, max_items_wc_inter_frame_heap * sizeof( int ) ); + } + n_items_wc_inter_frame_heap = 0; + size_wc_inter_frame_heap = 0; + location_wc_inter_frame_heap = -1; + +#ifdef MEM_COUNT_DETAILS + /* Check, if the .csv file has already been opened */ + if ( fid_csv_filename == NULL ) + { + fid_csv_filename = fopen( csv_filename, "wb" ); + + if ( fid_csv_filename == NULL ) + { + fprintf( stderr, "\nCannot open %s!\n\n", csv_filename ); + exit( -1 ); + } + } + else + { + /* reset file */ + rewind( fid_csv_filename ); + } +#endif + + return; +} + +/*-------------------------------------------------------------------* + * reset_stack() + * + * Reset stack pointer + *--------------------------------------------------------------------*/ + +void reset_stack( void ) +{ + int16_t something; + + /* initialize/reset stack pointers */ + ptr_base_stack = &something; + ptr_max_stack = ptr_base_stack; + ptr_current_stack = ptr_base_stack; + + return; +} + +/*-------------------------------------------------------------------* + * push_stack() + * + * Check the current stack pointer and update the maximum stack pointer, if new maximum found. + *--------------------------------------------------------------------*/ + +int push_stack( const char *filename, const char *fctname ) +{ + int16_t something; + int32_t current_stack_size; + + ptr_current_stack = &something; + + (void) *filename; /* to avoid compilation warning */ + + /* Is there room to save the caller's information? */ + if ( current_calls >= MAX_RECORDABLE_CALLS ) + { /* No */ + fprintf( stderr, "No more room to store call stack info. Please increase MAX_RECORDABLE_CALLS" ); + exit( -1 ); + } + + /* Valid Function Name? */ + if ( fctname[0] == 0 ) + { /* No */ + fprintf( stderr, "Invalid function name for call stack info." ); + exit( -1 ); + } + + /* Save the Name of the Calling Function in the Table */ + strncpy( stack_callers[0][current_calls].function_name, fctname, MAX_FUNCTION_NAME_LENGTH ); + stack_callers[0][current_calls].function_name[MAX_FUNCTION_NAME_LENGTH] = 0; /* Nul Terminate */ + + /* Save the Stack Pointer */ + stack_callers[0][current_calls].stack_ptr = ptr_current_stack; + + /* Increase Stack Calling Tree Level */ + current_calls++; + + /* Is this the First Time or the Worst Case? */ + if ( ptr_current_stack < ptr_max_stack || ptr_max_stack == NULL ) + { /* Yes */ + /* Save Info about it */ + ptr_max_stack = ptr_current_stack; + + wc_stack_frame = update_cnt; /* current frame number is stored in the variable update_cnt and updated in the function update_wmops() */ + strncpy( location_max_stack, fctname, sizeof( location_max_stack ) - 1 ); + location_max_stack[sizeof( location_max_stack ) - 1] = '\0'; + + /* Save Call Tree */ + memmove( stack_callers[1], stack_callers[0], sizeof( caller_info ) * current_calls ); + + /* Terminate the List (Unless Full) */ + if ( current_calls < MAX_RECORDABLE_CALLS ) + { + stack_callers[1][current_calls].function_name[0] = 0; + } + } + + /* Check, if This is the New Worst-Case RAM (stack + heap) */ + current_stack_size = (int32_t) ( ( ( ptr_base_stack - ptr_current_stack ) * sizeof( int16_t ) ) ); + + if ( current_stack_size < 0 ) + { + /* prevent negative stack size */ + current_stack_size = 0; + } + + if ( current_stack_size + current_heap_size > wc_ram_size ) + { + wc_ram_size = current_stack_size + current_heap_size; + wc_ram_frame = update_cnt; + } + + return 0 /* for Now */; +} + +/*-------------------------------------------------------------------* + * pop_stack() + * + * Remove stack caller entry from the list + *--------------------------------------------------------------------*/ + +int pop_stack( const char *filename, const char *fctname ) +{ + caller_info *caller_info_ptr; + + (void) *filename; /* to avoid compilation warning */ + + /* Decrease Stack Calling */ + current_calls--; + + /* Get Pointer to Caller Information */ + caller_info_ptr = &stack_callers[0][current_calls]; + + /* Check, if Names Match */ + if ( strncmp( caller_info_ptr->function_name, fctname, MAX_FUNCTION_NAME_LENGTH ) != 0 ) + { + fprintf( stderr, "Invalid usage of pop_stack()" ); + exit( -1 ); + } + + /* Erase Entry */ + caller_info_ptr->function_name[0] = 0; + + /* Retrieve previous stack pointer */ + if ( current_calls == 0 ) + { + ptr_current_stack = ptr_base_stack; + } + else + { + ptr_current_stack = stack_callers[0][current_calls - 1].stack_ptr; + } + + return 0 /* for Now */; +} + +#ifdef MEM_COUNT_DETAILS +/*-------------------------------------------------------------------* + * print_stack_call_tree() + * + * Print detailed information about worst-case stack usage + *--------------------------------------------------------------------*/ + +static void print_stack_call_tree( void ) +{ + caller_info *caller_info_ptr; + int call_level; + char fctname[MAX_FUNCTION_NAME_LENGTH + 1]; + + fprintf( stdout, "\nList of functions when maximum stack size is reached:\n\n" ); + + caller_info_ptr = &stack_callers[1][0]; + for ( call_level = 0; call_level < MAX_RECORDABLE_CALLS; call_level++ ) + { + /* Done? */ + if ( caller_info_ptr->function_name[0] == 0 ) + { + break; + } + + /* Print Name */ + strncpy( fctname, caller_info_ptr->function_name, MAX_FUNCTION_NAME_LENGTH ); + strcat( fctname, "()" ); + fprintf( stdout, "%-42s", fctname ); + + /* Print Stack Usage (Based on Difference) */ + if ( call_level != 0 ) + { + fprintf( stdout, "%lu %s\n", ( ( ( caller_info_ptr - 1 )->stack_ptr - caller_info_ptr->stack_ptr ) * sizeof( int16_t ) ) >> Stat_Cnt_Size, Count_Unit[Stat_Cnt_Size] ); + } + else + { + fprintf( stdout, "%lu %s\n", ( ( ptr_base_stack - caller_info_ptr->stack_ptr ) * sizeof( int16_t ) ) >> Stat_Cnt_Size, Count_Unit[Stat_Cnt_Size] ); + } + + /* Advance */ + caller_info_ptr++; + } + + fprintf( stdout, "\n" ); + + return; +} +#endif + + +/*-------------------------------------------------------------------* + * mem_alloc() + * + * Creates new record, stores auxiliary information about which function allocated the memory, line number, parameters, etc. + * Finally, it allocates physical memory using malloc() + * The function also updates worst-case heap size and worst-case RAM size + *--------------------------------------------------------------------*/ + +void *mem_alloc( + const char *func_name, + int func_lineno, + size_t size, + char *size_str /* the first char indicates m-alloc or c-alloc */ ) +{ + int index_record; + int32_t current_stack_size; + unsigned long hash; + allocator_record *ptr_record; + + if ( size == 0 ) + { + fprintf( stderr, "Fct=%s, Ln=%i: %s!\n", func_name, func_lineno, "Size of Zero not Supported" ); + exit( -1 ); + } + + /* Search for an existing record (that has been de-allocated before) */ + index_record = 0; + while ( ( ptr_record = get_mem_record( &hash, func_name, func_lineno, size_str, &index_record ) ) != NULL ) + { + if ( ptr_record->frame_allocated == -1 ) + { + break; + } + else + { + index_record++; + } + } + + /* Create new record */ + if ( ptr_record == NULL ) + { + if ( Num_Records >= Max_Num_Records ) + { + /* There is no room for a new record -> reallocate memory */ + Max_Num_Records += MAX_NUM_RECORDS_REALLOC_STEP; + allocation_list = realloc( allocation_list, Max_Num_Records * sizeof( allocator_record ) ); + } + + ptr_record = &( allocation_list[Num_Records] ); + + /* Initialize new record */ + ptr_record->hash = hash; + ptr_record->noccurances = 0; + ptr_record->total_block_size = 0; + ptr_record->total_used_size = 0; + ptr_record->frame_allocated = -1; + ptr_record->OOB_Flag = 0; + ptr_record->wc_heap_size_intra_frame = -1; + ptr_record->wc_heap_size_inter_frame = -1; + + index_record = Num_Records; + Num_Records++; + } + + /* Allocate memory block for the new record, add signature before the beginning and after the memory block and fill it with magic value */ + ptr_record->block_ptr = mem_alloc_block( size, size_str ); + + if ( ptr_record->block_ptr == NULL ) + { + fprintf( stderr, "Fct=%s, Ln=%i: %s!\n", func_name, func_lineno, "Error: Cannot Allocate Memory!" ); + exit( -1 ); + } + + /* Save all auxiliary information about the memory block */ + strncpy( ptr_record->name, func_name, MAX_FUNCTION_NAME_LENGTH ); + ptr_record->name[MAX_FUNCTION_NAME_LENGTH] = '\0'; + strncpy( ptr_record->params, size_str, MAX_PARAMS_LENGTH ); /* Note: The size string starts with either 'm' or 'c' to indicate 'm'alloc or 'c'alloc */ + ptr_record->params[MAX_PARAMS_LENGTH] = '\0'; + ptr_record->lineno = func_lineno; + ptr_record->block_size = size; + ptr_record->total_block_size += size; + +#ifdef MEM_COUNT_DETAILS + /* Export heap memory allocation record to the .csv file */ + fprintf( fid_csv_filename, "A,%d,%s,%d,%d\n", update_cnt, ptr_record->name, ptr_record->lineno, ptr_record->block_size ); +#endif + + if ( ptr_record->frame_allocated != -1 ) + { + fprintf( stderr, "Fct=%s, Ln=%i: %s!\n", func_name, func_lineno, "Error: Attempt to Allocate the Same Memory Block with Freeing it First!" ); + exit( -1 ); + } + + ptr_record->frame_allocated = update_cnt; /* Store the current frame number -> later it will be used to determine the total duration */ + + /* Update Heap Size in the current frame */ + current_heap_size += ptr_record->block_size; + + /* Check, if this is the new Worst-Case RAM (stack + heap) */ + current_stack_size = (int32_t) ( ( ( ptr_base_stack - ptr_current_stack ) * sizeof( int16_t ) ) ); + if ( current_stack_size + current_heap_size > wc_ram_size ) + { + wc_ram_size = current_stack_size + current_heap_size; + wc_ram_frame = update_cnt; + } + + /* Add new entry to the heap allocation call tree */ + if ( heap_allocation_call_tree == NULL ) + { + fprintf( stderr, "Error: Heap allocation call tree not created!" ); + exit( -1 ); + } + + /* check, if the maximum size of the call tree has been reached -> resize if so */ + if ( heap_allocation_call_tree_size >= heap_allocation_call_tree_max_size ) + { + heap_allocation_call_tree_max_size += MAX_NUM_RECORDS_REALLOC_STEP; + heap_allocation_call_tree = (int *) realloc( heap_allocation_call_tree, heap_allocation_call_tree_max_size * sizeof( int ) ); + } + + /* push new entry (positive number means push op, neagtive number means pop op; zero index must be converted to 0.01 :-) */ + heap_allocation_call_tree[heap_allocation_call_tree_size++] = index_record; + + return ptr_record->block_ptr; +} + +/*-------------------------------------------------------------------* + * mem_alloc_block() + * + * Physical allocation of memory using malloc(). Appends 'signature' before and after the block, + * pre-fills memory block with magic value + *--------------------------------------------------------------------*/ + +static void *mem_alloc_block( size_t size, const char *size_str ) +{ + size_t rounded_size; + void *block_ptr; + char *tmp_ptr; + size_t n, f; + int32_t fill_value; + int32_t *ptr32; + int32_t mask, temp; + + /* Round Up Block Size */ + rounded_size = ROUND_BLOCK_SIZE( size ); + + /* Allocate memory using the standard malloc() by adding room for Signature Values */ + block_ptr = malloc( rounded_size + BLOCK_ROUNDING * 2 ); + + if ( block_ptr == NULL ) + { + return NULL; + } + + /* Add Signature Before the Start of the Block */ + ptr32 = (int32_t *) block_ptr; + n = N_32BITS_BLOCKS; + do + { + *ptr32++ = MAGIC_VALUE_OOB; + } while ( --n ); + + /* Fill Memory Block with Magic Value or 0 */ + fill_value = MAGIC_VALUE_USED; + if ( IS_CALLOC( size_str ) ) + { + fill_value = 0x00000000; + } + n = size / sizeof( int32_t ); + while ( n-- ) + { + *ptr32++ = fill_value; + } + + /* Fill the Reminder of the Memory Block - After Rounding */ + n = rounded_size - size; + f = n % sizeof( int32_t ); + if ( f != 0 ) + { + /* when filling with '0' need to adapt the magic value */ + /* shift by [1->24, 2->16, 3->8] */ + mask = 0xFFFFFFFF << ( ( sizeof( int32_t ) - f ) * 8 ); /* (1) */ + temp = MAGIC_VALUE_OOB & mask; + if ( fill_value != 0x0 ) + { /* for malloc merge fill value */ + temp += ( ~mask ) & MAGIC_VALUE_USED; + } /* for calloc the code in (1) above already introduces zeros */ + *ptr32++ = temp; + } + n /= sizeof( int32_t ); + n += N_32BITS_BLOCKS; + + /* Add Signature After the End of Block */ + do + { + *ptr32++ = MAGIC_VALUE_OOB; + } while ( --n ); + + /* Adjust the Memory Block Pointer (Magic Value Before and After the Memory Block Requested) */ + tmp_ptr = (char *) block_ptr; + tmp_ptr += BLOCK_ROUNDING; + block_ptr = (void *) tmp_ptr; + + return block_ptr; +} + +/*-------------------------------------------------------------------* + * mem_set_usage() + * + * Calculates actual usage of memory block by checking the magic value that was used to pre-fill + * each memory block during its allocation + *--------------------------------------------------------------------*/ + +static int mem_set_usage( allocator_record *record_ptr ) +{ + int total_bytes_used; + + size_t n; + int32_t *ptr32; + char *ptr8; + size_t total_bytes; + int32_t fill_value; + + fill_value = MAGIC_VALUE_USED; + if ( ( record_ptr->params[0] ) == 'c' ) + { + fill_value = 0x00000000; + } + + total_bytes = record_ptr->block_size; + + /* Check 4 bytes at a time */ + ptr32 = (int32_t *) record_ptr->block_ptr; + total_bytes_used = 0; + for ( n = total_bytes / sizeof( int32_t ); n > 0; n-- ) + { + if ( *ptr32++ != fill_value ) + { + total_bytes_used += sizeof( int32_t ); + } + } + + /* Check remaining bytes (If Applicable) 1 byte at a time */ + ptr8 = (char *) ptr32; + for ( n = total_bytes % sizeof( int32_t ); n > 0; n-- ) + { + if ( *ptr8++ != (char) fill_value ) + { + total_bytes_used++; + } + + /* Update Value */ + fill_value >>= 8; + } + + return total_bytes_used; +} + +/*-------------------------------------------------------------------* + * mem_check_OOB() + * + * Checks, if out-of-bounds access has occured. This is done by inspecting the 'signature' value + * taht has been added before and after the memory block during its allocation + *--------------------------------------------------------------------*/ + +static unsigned int mem_check_OOB( allocator_record *record_ptr ) +{ + int32_t *ptr32; + unsigned int OOB_Flag = 0x0; + int32_t mask; + size_t i; + int f; + + ptr32 = (int32_t *) record_ptr->block_ptr - N_32BITS_BLOCKS; + + /* Check the Signature at the Beginning of Memory Block */ + i = N_32BITS_BLOCKS; + do + { + if ( *ptr32++ ^ MAGIC_VALUE_OOB ) + { + OOB_Flag |= OOB_START; + } + } while ( --i ); + + /* Advance to End (Snap to lowest 32 Bits) */ + ptr32 += record_ptr->block_size / sizeof( int32_t ); + + /* Calculate Unused Space That has been added to get to the rounded Block Size */ + i = ROUND_BLOCK_SIZE( record_ptr->block_size ) - record_ptr->block_size; + + /* Partial Check of Signature at the End of Memory Block (for block size that has been rounded) */ + f = i % sizeof( int32_t ); + if ( f != 0 ) + { + mask = 0xFFFFFFFF << ( ( sizeof( int32_t ) - f ) * 8 ); + if ( ( *ptr32++ ^ MAGIC_VALUE_OOB ) & mask ) + { + OOB_Flag |= OOB_END; + } + } + + /* Full Check of Signature at the End of Memory Block, i.e. all 32 Bits (for the remainder after rounding) */ + i /= sizeof( int32_t ); + i += N_32BITS_BLOCKS; + do + { + if ( *ptr32++ ^ MAGIC_VALUE_OOB ) + { + OOB_Flag |= OOB_END; + } + } while ( --i ); + + return OOB_Flag; +} + +/*-------------------------------------------------------------------* + * malloc_hash() + * + * Calculate hash from function name, line number and malloc size + *--------------------------------------------------------------------*/ + +static unsigned long malloc_hash( const char *func_name, int func_lineno, char *size_str ) +{ + unsigned long hash = 5381; + const char *ptr_str; + + ptr_str = func_name; + while ( ptr_str != NULL && *ptr_str != '\0' ) + { + hash = ( ( hash << 5 ) + hash ) + *ptr_str++; /* hash * 33 + char */ + } + + hash = ( ( hash << 5 ) + hash ) + func_lineno; /* hash * 33 + func_lineno */ + + ptr_str = size_str; + while ( ptr_str != NULL && *ptr_str != '\0' ) + { + hash = ( ( hash << 5 ) + hash ) + *ptr_str++; /* hash * 33 + char */ + } + + return hash; +} + +/*-------------------------------------------------------------------* + * get_mem_record() + * + * Search for memory record in the internal list, return NULL if not found + * Start from index_record + *--------------------------------------------------------------------*/ + +allocator_record *get_mem_record( unsigned long *hash, const char *func_name, int func_lineno, char *size_str, int *index_record ) +{ + int i; + + if ( *index_record < 0 || *index_record > Num_Records ) + { + return NULL; + } + + /* calculate hash */ + *hash = malloc_hash( func_name, func_lineno, size_str ); + + for ( i = *index_record; i < Num_Records; i++ ) + { + /* check, if memory block is not allocated at the moment and the hash matches */ + if ( allocation_list[i].block_ptr == NULL && *hash == allocation_list[i].hash ) + { + *index_record = i; + return &( allocation_list[i] ); + } + } + + /* not found */ + *index_record = -1; + return NULL; +} + + +/*-------------------------------------------------------------------* + * mem_free() + * + * This function de-allocatesd the memory block and frees the mphysical memory with free(). + * It also updates actual and average usage of the memory block. + * + * Note: The record is not removed from the list and may be reused later on in mem_alloc()! + *--------------------------------------------------------------------*/ + +void mem_free( const char *func_name, int func_lineno, void *ptr ) +{ + int i, index_record; + char *tmp_ptr; + allocator_record *ptr_record; + + /* Search for the Block Pointer in the List */ + ptr_record = NULL; + index_record = -1; + for ( i = 0; i < Num_Records; i++ ) + { + if ( ptr == allocation_list[i].block_ptr ) + { /* Yes, Found it */ + ptr_record = &( allocation_list[i] ); + index_record = i; + break; + } + } + + if ( ptr_record == NULL ) + { + fprintf( stderr, "Fct=%s, Ln=%i: %s!\n", func_name, func_lineno, "Error: Unable to Find Record Corresponding to the Allocated Memory Block!" ); + exit( -1 ); + } + + /* Update the Heap Size */ + current_heap_size -= ptr_record->block_size; + + /* Calculate the Actual Usage of the Memory Block (Look for Signature) */ + ptr_record->total_used_size += mem_set_usage( ptr_record ); + + /* Check, if Out-Of-Bounds Access has been Detected */ + ptr_record->OOB_Flag = mem_check_OOB( ptr_record ); + +#ifdef MEM_COUNT_DETAILS + /* Export heap memory de-allocation record to the .csv file */ + fprintf( fid_csv_filename, "D,%d,%s,%d,%d\n", update_cnt, ptr_record->name, ptr_record->lineno, ptr_record->block_size ); +#endif + + /* De-Allocate Memory Block */ + tmp_ptr = (char *) ptr; + tmp_ptr -= BLOCK_ROUNDING; + ptr = (void *) tmp_ptr; + free( ptr ); + + /* Add new entry to the heap allocation call tree */ + if ( heap_allocation_call_tree == NULL ) + { + fprintf( stderr, "Error: Heap allocation call tree not created!" ); + exit( -1 ); + } + + /* check, if the maximum size of the call tree has been reached -> resize if so */ + if ( heap_allocation_call_tree_size >= heap_allocation_call_tree_max_size ) + { + heap_allocation_call_tree_max_size += MAX_NUM_RECORDS_REALLOC_STEP; + heap_allocation_call_tree = (int *) realloc( heap_allocation_call_tree, heap_allocation_call_tree_max_size * sizeof( int ) ); + } + + heap_allocation_call_tree[heap_allocation_call_tree_size++] = -index_record; + + /* Reset memory block pointer (this is checked when updating wc intra-frame and inter-frame memory) */ + ptr_record->block_ptr = NULL; + + return; +} + + +/*-------------------------------------------------------------------* + * update_mem() + * + * This function updates the worst-case intra-frame memory and the worst-case inter-frame memory. + *--------------------------------------------------------------------*/ + +void update_mem( void ) +{ + int i, j, flag_alloc = -1, i_record; + int size_current_intra_frame_heap; + int *list_current_intra_frame_heap = NULL, n_items_current_intra_frame_heap; + allocator_record *ptr_record; + + /* process the heap allocation call tree and prepare lists of intra-frame and inter-frame heap memory blocks for this frame */ + n_items_current_intra_frame_heap = 0; + size_current_intra_frame_heap = 0; + for ( i = 0; i < heap_allocation_call_tree_size; i++ ) + { + /* get the record */ + i_record = heap_allocation_call_tree[i]; + + if ( i_record > 0 ) + { + flag_alloc = 1; + } + else if ( i_record < 0 ) + { + flag_alloc = 0; + i_record = -i_record; + } + ptr_record = &( allocation_list[i_record] ); + + if ( ptr_record->frame_allocated == update_cnt && ptr_record->block_ptr == NULL ) + { + /* intra-frame heap memory */ + if ( list_current_intra_frame_heap == NULL ) + { + list_current_intra_frame_heap = (int *) malloc( heap_allocation_call_tree_size * sizeof( int ) ); + memset( list_current_intra_frame_heap, -1, heap_allocation_call_tree_size * sizeof( int ) ); + } + + /* zero index doesn't have sign to determine whether it's allocated or de-allocated -> we need to search the list */ + if ( i_record == 0 ) + { + flag_alloc = 1; + for ( j = 0; j < n_items_current_intra_frame_heap; j++ ) + { + if ( list_current_intra_frame_heap[j] == i_record ) + { + flag_alloc = 0; + break; + } + } + } + + if ( flag_alloc ) + { + /* add to list */ + list_current_intra_frame_heap[n_items_current_intra_frame_heap++] = i_record; + size_current_intra_frame_heap += ptr_record->block_size; + + /* no need to re-size the list -> the initially allocated size should be large enough */ + } + else + { + /* remove from list */ + for ( j = 0; j < n_items_current_intra_frame_heap; j++ ) + { + if ( list_current_intra_frame_heap[j] == i_record ) + { + break; + } + } + memmove( &list_current_intra_frame_heap[j], &list_current_intra_frame_heap[j + 1], ( n_items_current_intra_frame_heap - j ) * sizeof( int ) ); + n_items_current_intra_frame_heap--; + size_current_intra_frame_heap -= ptr_record->block_size; + + /* reset block size */ + ptr_record->frame_allocated = -1; + ptr_record->block_size = 0; + } + } + else + { + /* inter-frame heap memory */ + + /* zero index doesn't have sign to determine whether it's allocated or de-allocated -> we need to search the list */ + if ( i_record == 0 ) + { + flag_alloc = 1; + for ( j = 0; j < n_items_current_inter_frame_heap; j++ ) + { + if ( list_current_inter_frame_heap[j] == i_record ) + { + flag_alloc = 0; + break; + } + } + } + + if ( flag_alloc ) + { + /* add to list */ + if ( n_items_current_inter_frame_heap >= max_items_current_inter_frame_heap ) + { + /* resize list, if needed */ + max_items_current_inter_frame_heap = n_items_current_inter_frame_heap + MAX_NUM_RECORDS_REALLOC_STEP; + list_current_inter_frame_heap = realloc( list_current_inter_frame_heap, max_items_current_inter_frame_heap * sizeof( int ) ); + } + + list_current_inter_frame_heap[n_items_current_inter_frame_heap++] = i_record; + size_current_inter_frame_heap += ptr_record->block_size; + } + else + { + /* remove from list */ + for ( j = 0; j < n_items_current_inter_frame_heap; j++ ) + { + if ( list_current_inter_frame_heap[j] == i_record ) + { + break; + } + } + memmove( &list_current_inter_frame_heap[j], &list_current_inter_frame_heap[j + 1], ( n_items_current_inter_frame_heap - j ) * sizeof( int ) ); + n_items_current_inter_frame_heap--; + size_current_inter_frame_heap -= ptr_record->block_size; + + /* reset block size */ + ptr_record->frame_allocated = -1; + ptr_record->block_size = 0; + } + } + } + + /* check, if this is the new worst-case for intra-frame heap memory */ + if ( size_current_intra_frame_heap > size_wc_intra_frame_heap ) + { + if ( n_items_current_intra_frame_heap >= max_items_wc_intra_frame_heap ) + { + /* resize the list, if needed */ + max_items_wc_intra_frame_heap = n_items_current_intra_frame_heap + MAX_NUM_RECORDS_REALLOC_STEP; + list_wc_intra_frame_heap = realloc( list_wc_intra_frame_heap, max_items_wc_intra_frame_heap * sizeof( int ) ); + } + + /* copy current-frame list to worst-case list */ + memmove( list_wc_intra_frame_heap, list_current_intra_frame_heap, n_items_current_intra_frame_heap * sizeof( int ) ); + n_items_wc_intra_frame_heap = n_items_current_intra_frame_heap; + size_wc_intra_frame_heap = size_current_intra_frame_heap; + location_wc_intra_frame_heap = update_cnt; + + /* update the wc numbers in all individual records */ + for ( i = 0; i < n_items_wc_intra_frame_heap; i++ ) + { + i_record = list_wc_intra_frame_heap[i]; + ptr_record = &( allocation_list[i_record] ); + ptr_record->wc_heap_size_intra_frame = ptr_record->block_size; + } + } + + /* check, if this is the new worst-case for inter-frame heap memory */ + if ( size_current_inter_frame_heap > size_wc_inter_frame_heap ) + { + if ( n_items_current_inter_frame_heap >= max_items_wc_inter_frame_heap ) + { + /* resize list, if needed */ + max_items_wc_inter_frame_heap = n_items_current_inter_frame_heap + MAX_NUM_RECORDS_REALLOC_STEP; + list_wc_inter_frame_heap = realloc( list_wc_inter_frame_heap, max_items_wc_inter_frame_heap * sizeof( int ) ); + } + + /* copy current-frame list to worst-case list */ + memmove( list_wc_inter_frame_heap, list_current_inter_frame_heap, n_items_current_inter_frame_heap * sizeof( int ) ); + n_items_wc_inter_frame_heap = n_items_current_inter_frame_heap; + size_wc_inter_frame_heap = size_current_inter_frame_heap; + location_wc_inter_frame_heap = update_cnt; + + /* update the wc numbers in all individual records */ + for ( i = 0; i < n_items_wc_inter_frame_heap; i++ ) + { + i_record = list_wc_inter_frame_heap[i]; + ptr_record = &( allocation_list[i_record] ); + ptr_record->wc_heap_size_inter_frame = ptr_record->block_size; + } + } + + /* reset heap allocation call tree */ + heap_allocation_call_tree_size = 0; + + /* de-allocate list of intra-frame heap memory blocks in the current fraeme - it's needed only inside this function */ + if ( list_current_intra_frame_heap ) + { + free( list_current_intra_frame_heap ); + } + + return; +} + +#ifdef MEM_COUNT_DETAILS +/*-------------------------------------------------------------------* + * subst() + * + * Substitute character in string + *--------------------------------------------------------------------*/ + +static void subst( char *s, char from, char to ) +{ + while ( *s == from ) + { + *s++ = to; + } + + return; +} + + +/*-------------------------------------------------------------------* + * mem_count_summary() + * + * Print detailed (per-item) information about heap memory usage + *--------------------------------------------------------------------*/ + +static void mem_count_summary( void ) +{ + int i, j, index, index_record; + size_t length; + char buf[300], format_str[50], name_str[MAX_FUNCTION_NAME_LENGTH + 3], parms_str[MAX_PARAMS_LENGTH + 1], type_str[10], usage_str[20], size_str[20], line_str[10]; + allocator_record *ptr_record, *ptr; + + /* Prepare format string */ + sprintf( format_str, "%%-%ds %%5s %%6s %%-%ds %%20s %%6s ", MAX_FUNCTION_NAME_LENGTH, MAX_PARAMS_LENGTH ); + + if ( n_items_wc_intra_frame_heap > 0 ) + { + /* Intra-Frame Heap Size */ + fprintf( stdout, "\nList of memory blocks when maximum intra-frame heap size is reached:\n\n" ); + + /* Find duplicate records (same hash and worst-case heap size) */ + for ( i = 0; i < n_items_wc_intra_frame_heap; i++ ) + { + index_record = list_wc_intra_frame_heap[i]; + if ( index_record == -1 ) + { + continue; + } + + ptr_record = &( allocation_list[index_record] ); + for ( j = i + 1; j < n_items_wc_intra_frame_heap; j++ ) + { + index = list_wc_intra_frame_heap[j]; + if ( index == -1 ) + { + continue; + } + ptr = &( allocation_list[index] ); + + if ( ptr->hash == ptr_record->hash && ptr->wc_heap_size_intra_frame == ptr_record->wc_heap_size_intra_frame ) + { + ptr_record->noccurances++; + list_wc_intra_frame_heap[j] = -1; + } + } + } + + /* Print Header */ + sprintf( buf, format_str, "Function Name", "Line", "Type", "Function Parameters", "Maximum Size", "Usage" ); + puts( buf ); + length = strlen( buf ); + sprintf( buf, "%0*d\n", (int) length - 1, 0 ); + subst( buf, '0', '-' ); + puts( buf ); + + for ( i = 0; i < n_items_wc_intra_frame_heap; i++ ) + { + index_record = list_wc_intra_frame_heap[i]; + + if ( index_record != -1 ) + { + /* get the record */ + ptr_record = &( allocation_list[index_record] ); + + /* prepare information strings */ + strncpy( name_str, ptr_record->name, MAX_FUNCTION_NAME_LENGTH ); + strcat( name_str, "()" ); + name_str[MAX_FUNCTION_NAME_LENGTH] = '\0'; + strncpy( parms_str, &( ptr_record->params[2] ), MAX_PARAMS_LENGTH ); + parms_str[MAX_PARAMS_LENGTH] = '\0'; + + if ( ptr_record->params[0] == 'm' ) + { + strcpy( type_str, "malloc" ); + } + else + { + strcpy( type_str, "calloc" ); + } + + sprintf( line_str, "%d", ptr_record->lineno ); + + /* prepare average usage & memory size strings */ + sprintf( usage_str, "%d%%", (int) ( ( (float) ptr_record->total_used_size / ( ptr_record->total_block_size + 1 ) ) * 100.0f ) ); + + if ( ptr_record->noccurances > 1 ) + { + sprintf( size_str, "%dx%d %s", ptr_record->noccurances, (int) ( ptr_record->wc_heap_size_intra_frame >> Stat_Cnt_Size ), Count_Unit[Stat_Cnt_Size] ); + } + else + { + sprintf( size_str, "%d %s", (int) ( ptr_record->wc_heap_size_intra_frame >> Stat_Cnt_Size ), Count_Unit[Stat_Cnt_Size] ); + } + + sprintf( buf, format_str, name_str, line_str, type_str, parms_str, size_str, usage_str ); + puts( buf ); + } + } + + fprintf( stdout, "\n" ); + } + + if ( n_items_wc_inter_frame_heap > 0 ) + { + /* Inter-Frame Heap Size */ + fprintf( stdout, "\nList of memory blocks when maximum inter-frame heap size is reached:\n\n" ); + + /* Find duplicate records (same hash and worst-case heap size) */ + for ( i = 0; i < n_items_wc_inter_frame_heap; i++ ) + { + index_record = list_wc_inter_frame_heap[i]; + if ( index_record == -1 ) + { + continue; + } + ptr_record = &( allocation_list[index_record] ); + ptr_record->noccurances = 1; /* reset the counter as some blocks may have been both, intra-frame and inter-frame */ + for ( j = i + 1; j < n_items_wc_inter_frame_heap; j++ ) + { + index = list_wc_inter_frame_heap[j]; + if ( index == -1 ) + { + continue; + } + ptr = &( allocation_list[index] ); + + if ( ptr->hash == ptr_record->hash && ptr->wc_heap_size_inter_frame == ptr_record->wc_heap_size_inter_frame ) + { + ptr_record->noccurances++; + list_wc_inter_frame_heap[j] = -1; + } + } + } + + /* Print Header */ + sprintf( buf, format_str, "Function Name", "Line", "Type", "Function Parameters", "Memory Size", "Usage" ); + puts( buf ); + length = strlen( buf ); + sprintf( buf, "%0*d\n", (int) length - 1, 0 ); + subst( buf, '0', '-' ); + puts( buf ); + + for ( i = 0; i < n_items_wc_inter_frame_heap; i++ ) + { + index_record = list_wc_inter_frame_heap[i]; + + if ( index_record != -1 ) + { + /* get the record */ + ptr_record = &( allocation_list[index_record] ); + + /* prepare information strings */ + strncpy( name_str, ptr_record->name, MAX_FUNCTION_NAME_LENGTH ); + strcat( name_str, "()" ); + name_str[MAX_FUNCTION_NAME_LENGTH] = '\0'; + strncpy( parms_str, &( ptr_record->params[2] ), MAX_PARAMS_LENGTH ); + parms_str[MAX_PARAMS_LENGTH] = '\0'; + + if ( ptr_record->params[0] == 'm' ) + { + strcpy( type_str, "malloc" ); + } + else + { + strcpy( type_str, "calloc" ); + } + + sprintf( line_str, "%d", ptr_record->lineno ); + + /* prepare average usage & memory size strings */ + sprintf( usage_str, "%d%%", (int) ( ( (float) ptr_record->total_used_size / ( ptr_record->total_block_size + 0.1f ) ) * 100.0f + 0.5f ) ); + + if ( ptr_record->noccurances > 1 ) + { + sprintf( size_str, "%dx%d %s", ptr_record->noccurances, (int) ( ptr_record->wc_heap_size_inter_frame >> Stat_Cnt_Size ), Count_Unit[Stat_Cnt_Size] ); + } + else + { + sprintf( size_str, "%d %s", (int) ( ptr_record->wc_heap_size_inter_frame >> Stat_Cnt_Size ), Count_Unit[Stat_Cnt_Size] ); + } + + sprintf( buf, format_str, name_str, line_str, type_str, parms_str, size_str, usage_str ); + puts( buf ); + } + } + + fprintf( stdout, "\n" ); + } + + return; +} + +#endif + +/*-------------------------------------------------------------------* + * print_mem() + * + * Print information about ROM and RAM memory usage + *--------------------------------------------------------------------*/ + +void print_mem( ROM_Size_Lookup_Table Const_Data_PROM_Table[] ) +{ + int i, nElem; + + fprintf( stdout, "\n\n --- Memory usage --- \n\n" ); + + if ( Const_Data_PROM_Table != NULL ) + { + nElem = 0; + while ( strcmp( Const_Data_PROM_Table[nElem].file_spec, "" ) != 0 ) + nElem++; + + for ( i = 0; i < nElem; i++ ) + { + fprintf( stdout, "Program ROM size (%s): %d instruction words\n", Const_Data_PROM_Table[i].file_spec, Const_Data_PROM_Table[i].PROM_size ); + } + + for ( i = 0; i < nElem; i++ ) + { + if ( Const_Data_PROM_Table[i].Get_Const_Data_Size_Func == NULL ) + { + fprintf( stdout, "Error: Cannot retrieve or calculate Table ROM size of (%s)!\n", Const_Data_PROM_Table[i].file_spec ); + } + + fprintf( stdout, "Table ROM (const data) size (%s): %d %s\n", Const_Data_PROM_Table[i].file_spec, Const_Data_PROM_Table[i].Get_Const_Data_Size_Func() >> Stat_Cnt_Size, Count_Unit[Stat_Cnt_Size] ); + } + } + else + { + fprintf( stdout, "Program ROM size: not available\n" ); + fprintf( stdout, "Table ROM (const data) size: not available\n" ); + } + + if ( wc_ram_size > 0 ) + { + fprintf( stdout, "Maximum RAM (stack + heap) size: %d %s in frame %d\n", wc_ram_size >> Stat_Cnt_Size, Count_Unit[Stat_Cnt_Size], wc_ram_frame ); + } + else + { + fprintf( stdout, "Maximum RAM (stack + heap) size: not available\n" ); + } + + /* check, if the stack is empty */ + if ( ptr_current_stack != ptr_base_stack ) + { + fprintf( stderr, "Warning: Stack is not empty.\n" ); + } + + if ( ptr_base_stack - ptr_max_stack > 0 ) + { + fprintf( stdout, "Maximum stack size: %lu %s in frame %d\n", ( ( ptr_base_stack - ptr_max_stack ) * sizeof( int16_t ) ) >> Stat_Cnt_Size, Count_Unit[Stat_Cnt_Size], + wc_stack_frame ); + } + else + { + fprintf( stdout, "Maximum stack size: not available\n" ); + } + + /* last update of intra-frame memory and inter-frame memory, if needed */ + if ( heap_allocation_call_tree_size > 0 ) + { + update_mem(); + } + + /* check, if all memory blocks have been deallocated (freed) */ + for ( i = 0; i < Num_Records; i++ ) + { + if ( allocation_list[i].block_ptr != NULL ) + { + fprintf( stderr, "Fct=%s, Ln=%i: %s!\n", allocation_list[i].name, allocation_list[i].lineno, "Error: Memory Block has not been De-Allocated with free()!" ); + exit( -1 ); + } + } + + if ( n_items_wc_intra_frame_heap > 0 ) + { + fprintf( stdout, "Maximum intra-frame heap size: %d %s in frame %d\n", size_wc_intra_frame_heap >> Stat_Cnt_Size, Count_Unit[Stat_Cnt_Size], location_wc_intra_frame_heap ); + } + else + { + fprintf( stdout, "Maximum intra-frame heap size: 0\n" ); + } + + if ( n_items_wc_inter_frame_heap > 0 ) + { + fprintf( stdout, "Maximum inter-frame heap size: %d %s in frame %d\n", size_wc_inter_frame_heap >> Stat_Cnt_Size, Count_Unit[Stat_Cnt_Size], location_wc_inter_frame_heap ); + } + else + { + fprintf( stdout, "Maximum inter-frame heap size: 0\n" ); + } + +#ifdef MEM_COUNT_DETAILS + /* Print detailed information about worst-case stack usage */ + if ( ptr_base_stack - ptr_max_stack > 0 ) + { + print_stack_call_tree(); + } + + /* Print detailed information about worst-case heap usage */ + mem_count_summary(); +#endif + + if ( Stat_Cnt_Size > 0 ) + { + fprintf( stdout, "\nNote: 1 word = %d bits\n", 8 << Stat_Cnt_Size ); + fprintf( stdout, "This is an optimistic estimate of memory consumption assuming that each variable type is stored with sizeof(type) bits\n" ); + } + + if ( n_items_wc_intra_frame_heap > 0 ) + { + fprintf( stdout, "Intra-frame heap memory is allocated and de-allocated in the same frame\n" ); + } + + /* De-allocate list of heap memory blocks */ + if ( allocation_list != NULL ) + { + free( allocation_list ); + } + + /* De-allocate heap allocation call tree */ + if ( heap_allocation_call_tree != NULL ) + { + free( heap_allocation_call_tree ); + } + + /* De-allocate intra-frame and inter-frame heap lists */ + if ( list_wc_intra_frame_heap != NULL ) + { + free( list_wc_intra_frame_heap ); + } + + if ( list_current_inter_frame_heap != NULL ) + { + free( list_current_inter_frame_heap ); + } + + if ( list_wc_inter_frame_heap != NULL ) + { + free( list_wc_inter_frame_heap ); + } + +#ifdef MEM_COUNT_DETAILS + if ( fid_csv_filename != NULL ) + { + fclose( fid_csv_filename ); + } +#endif + + return; +} + +#endif /* WMOPS */ + +#ifndef WMOPS +int cntr_push_pop = 0; /* global counter for checking balanced push_wmops()/pop_wmops() pairs when WMOPS is not activated */ +#endif diff --git a/lib_debug/wmops.h b/lib_debug/wmc_auto.h similarity index 62% rename from lib_debug/wmops.h rename to lib_debug/wmc_auto.h index f18c990ed5..9e20a4c7c8 100644 --- a/lib_debug/wmops.h +++ b/lib_debug/wmc_auto.h @@ -1,147 +1,43 @@ -/****************************************************************************************************** - - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository. All Rights Reserved. - - This software is protected by copyright law and by international treaties. - The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository retain full ownership rights in their respective contributions in - the software. This notice grants no license of any kind, including but not limited to patent - license, nor is any license granted by implication, estoppel or otherwise. - - Contributors are required to enter into the IVAS codec Public Collaboration agreement before making - contributions. - - This software is provided "AS IS", without any express or implied warranties. The software is in the - development stage. It is intended exclusively for experts who have experience with such software and - solely for the purpose of inspection. All implied warranties of non-infringement, merchantability - and fitness for a particular purpose are hereby disclaimed and excluded. - - Any dispute, controversy or claim arising under or in relation to providing this software shall be - submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in - accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and - the United Nations Convention on Contracts on the International Sales of Goods. - -*******************************************************************************************************/ +/* + * (C) 2022 copyright VoiceAge Corporation. All Rights Reserved. + * + * This software is protected by copyright law and by international treaties. The source code, and all of its derivations, + * is provided by VoiceAge Corporation under the "ITU-T Software Tools' General Public License". Please, read the license file + * or refer to ITU-T Recommendation G.191 on "SOFTWARE TOOLS FOR SPEECH AND AUDIO CODING STANDARDS". + * + * Any use of this software is permitted provided that this notice is not removed and that neither the authors nor + * VoiceAge Corporation are deemed to have made any representations as to the suitability of this software + * for any purpose nor are held responsible for any defects of this software. THERE IS NO WARRANTY FOR THIS SOFTWARE. + * + * Authors: Guy Richard, Vladimir Malenovsky (Vladimir.Malenovsky@USherbrooke.ca) + */ #ifndef WMOPS_H #define WMOPS_H -#include -#include "options.h" - - -/*------------------------------------------------------------------------------------------* - * Memory calculation tool - *------------------------------------------------------------------------------------------*/ - -#ifdef WMOPS - -#ifdef _MSC_VER -#pragma warning( disable : 4033 ) -#pragma warning( disable : 4702 ) -#pragma warning( disable : 4709 ) +#ifndef EXIT_FAILURE +#include /* stdlib is needed for exit() */ #endif -extern int Const_Data_Size_rom_enc( void ); -extern int Const_Data_Size_rom_com( void ); -extern int Const_Data_Size_rom_dec( void ); -extern int Const_Data_Size_ivas_rom_enc( void ); -extern int Const_Data_Size_ivas_rom_com( void ); -extern int Const_Data_Size_ivas_rom_dec( void ); -extern int Const_Data_Size_ivas_spar_rom_com( void ); -extern int Const_Data_Size_ivas_rom_binauralRen( void ); -extern int Const_Data_Size_ivas_rom_TdBinauralR( void ); -extern int Const_Data_Size_ivas_rom_binaural_cr( void ); - -int push_stack( const char *filename, const char *fctname ); -int pop_stack( const char *filename, const char *fctname ); -void reset_stack( void ); -void print_stack_call_tree( void ); +#ifndef EOF +#include /* stdio is needed for fprintf() */ +#endif -#else - -#define push_stack( file, fct ) -#define pop_stack( file, fct ) -#define reset_stack() -#define print_mem_enc( x ) -#define print_mem_dec( x ) -#define print_stack_call_tree() +/* To Prevent "warning: '$' in identifier or number" message under GCC */ +#ifdef __GNUC__ +#pragma GCC system_header #endif -/******************************************************************************************/ - /* Real-time relationships */ #define FRAMES_PER_SECOND 50.0 #define MILLION_CYCLES 1e6 +#define WMOPS_BOOST_FAC ( 1.0f ) /* scaling factor for equalizing the difference between automatic and manual instrumentation */ +#define FAC ( FRAMES_PER_SECOND / MILLION_CYCLES * WMOPS_BOOST_FAC ) +#define NUM_INST 20 /* Total number of instruction types (in enum below) */ -#define WMC_AUTO_WEIGHTING_FACT 0.91f /* constant to equalize difference between automatic and manual instrumentation */ -#define WMOPS_BOOST_FAC ( 1.0f / WMC_AUTO_WEIGHTING_FACT ) /* complexity scaling factor for manually instrumented code */ - -#define FAC ( FRAMES_PER_SECOND / MILLION_CYCLES * WMOPS_BOOST_FAC ) - -/******************************************************************************************/ - - -#define FLC_MSU( c ) MAC( c ) /* multiply and subtract is currently seen as MAC operation */ -#define FLC_MAX( c ) MISC( c ) /* max() is seen as MISC like abs() */ -#define FLC_MIN( c ) MISC( c ) /* min() is seen as MISC like abs() */ -#define FLC_NEG( c ) ADD( c ) /* negation is seen as addion: a = 0 - a */ -#define FLC_CAST( c ) /* type conversion is costfree for the moment, but who knows it for the future ? */ -#define FLC_INLINE_FUNC( c ) /* inline function calls are costfree, parameters/retval are currently not counted */ - /* example: FLC_INLINE_FUNC(3); SET_FLOAT(ptr,value,num); */ -#define FLC_ATAN2( c ) \ - DIV( c ); \ - TRANS( c ) /* atan2 is curently seen as division followed by atan */ - -/* inline function for memset in combination with float pointer */ -#define SET_FLOAT( ptr, value, num ) \ - { \ - int i; \ - LOOP( 1 ); \ - MOVE( num ); \ - for ( i = 0; i < num; i++ ) \ - { \ - ptr[i] = value; \ - } \ - } - -/* inline function for memset in combination with integer */ -#define SET_INT( ptr, value, num ) \ - { \ - int i; \ - LOOP( 1 ); \ - MOVE( num ); \ - for ( i = 0; i < num; i++ ) \ - { \ - ptr[i] = value; \ - } \ - } #ifdef WMOPS -#ifndef WMOPS_DETAIL -#define STACK_DEPTH_FCT_CALL push_stack( __FILE__, __func__ ) /* Define stack counting function for WMC Tool */ - -#define STACK_DEPTH_FCT_RETURN pop_stack( __FILE__, __func__ ) /* Define stack counting function for WMC Tool */ -#else -#define STACK_DEPTH_FCT_CALL ( push_wmops( __func__ ), push_stack( __FILE__, __func__ ) ) /* Define stack counting function for WMC Tool */ - -#define STACK_DEPTH_FCT_RETURN ( pop_wmops(), pop_stack( __FILE__, __func__ ) ) /* Define stack counting function for WMC Tool */ -#endif - -#define ENABLE_WMOPS 1 /* Only for the WMC_Tool */ -#define ENABLE_TREE 0 /* Call tree may be activated by setting this flag to 1 */ -#define NUM_INST 20 /* Total number of instruction types (in enum below) */ - -#define FLC_OPS_COND if ( ops_cnt_activ > 0 ) - enum instructions { _ADD, @@ -165,31 +61,6 @@ enum instructions _LOG, _MISC }; -enum flc_fields -{ - FLC_NOP = 0, - FLC_ADD, - FLC_MULT, - FLC_MAC, - FLC_MOVE, - FLC_STORE, - FLC_LOGIC, - FLC_SHIFT, - FLC_BRANCH, - FLC_DIV, - FLC_SQRT, - FLC_TRANS, - FLC_FUNC, - FLC_LOOP, - FLC_INDIRECT, - FLC_PTR_INIT, - FLC_MISC, - FLC_TEST, - FLC_POWER, - FLC_LOG, - FLC_OPEND -}; - #define _ADD_C 1 #define _ABS_C 1 @@ -235,7 +106,6 @@ enum flc_fields #define ADD( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( _ADD_C * ( x ) ); \ inst_cnt[_ADD] += ( x ); \ @@ -251,7 +121,6 @@ enum flc_fields } #define ABS( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( _ABS_C * ( x ) ); \ inst_cnt[_ABS] += ( x ); \ @@ -267,7 +136,6 @@ enum flc_fields } #define MULT( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( _MULT_C * ( x ) ); \ inst_cnt[_MULT] += ( x ); \ @@ -283,7 +151,6 @@ enum flc_fields } #define MAC( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( _MAC_C * ( x ) ); \ inst_cnt[_MAC] += ( x ); \ @@ -299,7 +166,6 @@ enum flc_fields } #define MOVE( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( _MOVE_C * ( x ) ); \ inst_cnt[_MOVE] += ( x ); \ @@ -315,7 +181,6 @@ enum flc_fields } #define STORE( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( _STORE_C * ( x ) ); \ inst_cnt[_STORE] += ( x ); \ @@ -331,7 +196,6 @@ enum flc_fields } #define LOGIC( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( _LOGIC_C * ( x ) ); \ inst_cnt[_LOGIC] += ( x ); \ @@ -347,7 +211,6 @@ enum flc_fields } #define SHIFT( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( _SHIFT_C * ( x ) ); \ inst_cnt[_SHIFT] += ( x ); \ @@ -363,7 +226,6 @@ enum flc_fields } #define BRANCH( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( _BRANCH_C * ( x ) ); \ inst_cnt[_BRANCH] += ( x ); \ @@ -379,7 +241,6 @@ enum flc_fields } #define DIV( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( _DIV_C * ( x ) ); \ inst_cnt[_DIV] += ( x ); \ @@ -395,7 +256,6 @@ enum flc_fields } #define SQRT( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( _SQRT_C * ( x ) ); \ inst_cnt[_SQRT] += ( x ); \ @@ -411,7 +271,6 @@ enum flc_fields } #define TRANS( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( _TRANS_C * ( x ) ); \ inst_cnt[_TRANS] += ( x ); \ @@ -427,7 +286,6 @@ enum flc_fields } #define LOOP( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( _LOOP_C * ( x ) ); \ inst_cnt[_LOOP] += ( x ); \ @@ -443,7 +301,6 @@ enum flc_fields } #define INDIRECT( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( _INDIRECT_C * ( x ) ); \ inst_cnt[_INDIRECT] += ( x ); \ @@ -459,7 +316,6 @@ enum flc_fields } #define PTR_INIT( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( _PTR_INIT_C * ( x ) ); \ inst_cnt[_PTR_INIT] += ( x ); \ @@ -475,7 +331,6 @@ enum flc_fields } #define TEST( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( _TEST_C * ( x ) ); \ inst_cnt[_TEST] += ( x ); \ @@ -491,7 +346,6 @@ enum flc_fields } #define POWER( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( _POWER_C * ( x ) ); \ inst_cnt[_POWER] += ( x ); \ @@ -507,7 +361,6 @@ enum flc_fields } #define LOG( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( _LOG_C * ( x ) ); \ inst_cnt[_LOG] += ( x ); \ @@ -523,7 +376,6 @@ enum flc_fields } #define MISC( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( _MISC_C * ( x ) ); \ inst_cnt[_MISC] += ( x ); \ @@ -540,7 +392,6 @@ enum flc_fields #define FUNC( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( _FUNC_C + _MOVE_C * ( x ) ); \ inst_cnt[_FUNC]++; \ @@ -558,7 +409,6 @@ enum flc_fields #define DADD( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( 2 * _ADD_C * ( x ) ); \ inst_cnt[_ADD] += ( x ); \ @@ -574,7 +424,6 @@ enum flc_fields } #define DMULT( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( 2 * _MULT_C * ( x ) ); \ inst_cnt[_MULT] += ( x ); \ @@ -590,7 +439,6 @@ enum flc_fields } #define DMAC( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( 2 * _MAC_C * ( x ) ); \ inst_cnt[_MAC] += ( x ); \ @@ -606,7 +454,6 @@ enum flc_fields } #define DMOVE( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( 2 * _MOVE_C * ( x ) ); \ inst_cnt[_MOVE] += ( x ); \ @@ -622,7 +469,6 @@ enum flc_fields } #define DSTORE( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( 2 * _STORE_C * ( x ) ); \ inst_cnt[_STORE] += ( x ); \ @@ -638,7 +484,6 @@ enum flc_fields } #define DLOGIC( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( 2 * _LOGIC_C * ( x ) ); \ inst_cnt[_LOGIC] += ( x ); \ @@ -654,7 +499,6 @@ enum flc_fields } #define DSHIFT( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( 2 * _SHIFT_C * ( x ) ); \ inst_cnt[_SHIFT] += ( x ); \ @@ -670,7 +514,6 @@ enum flc_fields } #define DDIV( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( 2 * _DIV_C * ( x ) ); \ inst_cnt[_DIV] += ( x ); \ @@ -686,7 +529,6 @@ enum flc_fields } #define DSQRT( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( 2 * _SQRT_C * ( x ) ); \ inst_cnt[_SQRT] += ( x ); \ @@ -702,7 +544,6 @@ enum flc_fields } #define DTRANS( x ) \ { \ - FLC_OPS_COND \ { \ ops_cnt += ( 2 * _TRANS_C * ( x ) ); \ inst_cnt[_TRANS] += ( x ); \ @@ -725,19 +566,18 @@ extern int ops_cnt_activ; void reset_wmops( void ); void push_wmops( const char *label ); void pop_wmops( void ); -void wmops_sub_start( const char *label ); -void wmops_sub_end( void ); void update_wmops( void ); +void update_mem( void ); void print_wmops( void ); #else /* WMOPS counting disabled */ #define reset_wmops() -#define push_wmops( x ) -#define pop_wmops() -#define wmops_sub_start( x ) -#define wmops_sub_end() -#define update_wmops() +extern int cntr_push_pop; +#define push_wmops( x ) ( cntr_push_pop++ ) +#define pop_wmops() ( cntr_push_pop-- ) +#define update_wmops() ( assert( cntr_push_pop == 0 ) ) +#define update_mem() #define print_wmops() #define ADD( x ) @@ -774,4 +614,426 @@ void print_wmops( void ); #endif +/* mac & msu (Non Instrumented Versions) */ +#ifndef mac +#define mac( a, b, c ) ( ( a ) + ( b ) * ( c ) ) +#endif +#ifndef mac +#define msu( a, b, c ) ( ( a ) - ( b ) * ( c ) ) +#endif + +#ifndef WMOPS +/* DESACTIVATE the Counting Mechanism */ +#define OP_COUNT_( op, n ) + +/* DESACTIVATE Operation Counter Wrappers */ +#define OP_COUNT_WRAPPER1_( op, val ) ( val ) +#define OP_COUNT_WRAPPER2_( expr ) +#define OP_COUNT_WRAPPER3_( op, expr ) expr + +/* DESACTIVATE Logical & Ternary Operators */ +#define __ +#define _ + +#else + +/* '*ops_cnt_ptr' is Used to Avoid: "warning: operation on 'ops_cnt' may be undefined" with Cygwin gcc Compiler */ +static double *ops_cnt_ptr = &ops_cnt; +#define OP_COUNT_( op, x ) ( *ops_cnt_ptr += ( op##_C * ( x ) ), inst_cnt[op] += ( x ) ) + +/******************************************************************/ +/* NOTES: */ +/* The 'wmc_flag_' flag is global to avoid declaration in every */ +/* function and 'static' to avoid clashing with other modules */ +/* that include this header file. */ +/* */ +/* The declarations of 'wmc_flag_' and 'wops_' in this header */ +/* file prevent the addition of a 'C' file to the Project. */ +/******************************************************************/ + +/* General Purpose Global Flag */ +static int wmc_flag_ = 0; + +/* Operation Counter Wrappers */ +#define OP_COUNT_WRAPPER1_( op, val ) ( op, val ) +#define OP_COUNT_WRAPPER2_( expr ) \ + if ( expr, 0 ) \ + ; \ + else +#define OP_COUNT_WRAPPER3_( op, expr ) \ + if ( op, 0 ) \ + ; \ + else \ + expr + +#endif + +/* Define all Macros without '{' & '}' (None of these should be called externally!) */ +#define ABS_( x ) OP_COUNT_( _ABS, ( x ) / WMOPS_BOOST_FAC ) +#define ADD_( x ) OP_COUNT_( _ADD, ( x ) / WMOPS_BOOST_FAC ) +#define MULT_( x ) OP_COUNT_( _MULT, ( x ) / WMOPS_BOOST_FAC ) +#define MAC_( x ) OP_COUNT_( _MAC, ( x ) / WMOPS_BOOST_FAC ) +#define MOVE_( x ) OP_COUNT_( _MOVE, ( x ) / WMOPS_BOOST_FAC ) +#define STORE_( x ) OP_COUNT_( _STORE, ( x ) / WMOPS_BOOST_FAC ) +#define LOGIC_( x ) OP_COUNT_( _LOGIC, ( x ) / WMOPS_BOOST_FAC ) +#define SHIFT_( x ) OP_COUNT_( _SHIFT, ( x ) / WMOPS_BOOST_FAC ) +#define BRANCH_( x ) OP_COUNT_( _BRANCH, ( x ) / WMOPS_BOOST_FAC ) +#define DIV_( x ) OP_COUNT_( _DIV, ( x ) / WMOPS_BOOST_FAC ) +#define SQRT_( x ) OP_COUNT_( _SQRT, ( x ) / WMOPS_BOOST_FAC ) +#define TRANS_( x ) OP_COUNT_( _TRANS, ( x ) / WMOPS_BOOST_FAC ) +#define POWER_( x ) TRANS_( x ) +#define LOG_( x ) TRANS_( x ) +#define LOOP_( x ) OP_COUNT_( _LOOP, ( x ) / WMOPS_BOOST_FAC ) +#define INDIRECT_( x ) OP_COUNT_( _INDIRECT, ( x ) / WMOPS_BOOST_FAC ) +#define PTR_INIT_( x ) OP_COUNT_( _PTR_INIT, ( x ) / WMOPS_BOOST_FAC ) +#define FUNC_( x ) ( OP_COUNT_( _MOVE, ( x ) / WMOPS_BOOST_FAC ), OP_COUNT_( _FUNC, 1 ) ) +#define MISC_( x ) ABS_( x ) + +/* Math Operations */ +#define abs_ OP_COUNT_WRAPPER1_( ABS_( 1 ), abs ) +#define fabs_ OP_COUNT_WRAPPER1_( ABS_( 1 ), fabs ) +#define labs_ OP_COUNT_WRAPPER1_( ABS_( 1 ), labs ) +#define floor_ OP_COUNT_WRAPPER1_( MISC_( 1 ), floor ) +#define sqrt_ OP_COUNT_WRAPPER1_( SQRT_( 1 ), sqrt ) +#define pow_ OP_COUNT_WRAPPER1_( POWER_( 1 ), pow ) +#define exp_ OP_COUNT_WRAPPER1_( POWER_( 1 ), exp ) +#define log_ OP_COUNT_WRAPPER1_( LOG_( 1 ), log ) +#define log10_ OP_COUNT_WRAPPER1_( LOG_( 1 ), log10 ) +#define cos_ OP_COUNT_WRAPPER1_( TRANS_( 1 ), cos ) +#define sin_ OP_COUNT_WRAPPER1_( TRANS_( 1 ), sin ) +#define tan_ OP_COUNT_WRAPPER1_( TRANS_( 1 ), tan ) +#define acos_ OP_COUNT_WRAPPER1_( TRANS_( 1 ), acos ) +#define asin_ OP_COUNT_WRAPPER1_( TRANS_( 1 ), asin ) +#define atan_ OP_COUNT_WRAPPER1_( TRANS_( 1 ), atan ) +#define atan2_ OP_COUNT_WRAPPER1_( TRANS_( 1 ), atan2 ) +#define cosh_ OP_COUNT_WRAPPER1_( TRANS_( 1 ), cosh ) +#define sinh_ OP_COUNT_WRAPPER1_( TRANS_( 1 ), sinh ) +#define tanh_ OP_COUNT_WRAPPER1_( TRANS_( 1 ), tanh ) +#define fmod_ OP_COUNT_WRAPPER1_( DIV_( 1 ), fmod ) +/* these macros use any local macros already defined */ +/* min/max and their Variants */ +#define min_( a, b ) OP_COUNT_WRAPPER1_( MISC_( 1 ), min( ( a ), ( b ) ) ) +#define max_( a, b ) OP_COUNT_WRAPPER1_( MISC_( 1 ), max( ( a ), ( b ) ) ) +#define MIN_( a, b ) OP_COUNT_WRAPPER1_( MISC_( 1 ), MIN( ( a ), ( b ) ) ) +#define MAX_( a, b ) OP_COUNT_WRAPPER1_( MISC_( 1 ), MAX( ( a ), ( b ) ) ) +#define Min_( a, b ) OP_COUNT_WRAPPER1_( MISC_( 1 ), Min( ( a ), ( b ) ) ) +#define Max_( a, b ) OP_COUNT_WRAPPER1_( MISC_( 1 ), Max( ( a ), ( b ) ) ) +/* Square and its Variants */ +#define sqr_( x ) OP_COUNT_WRAPPER1_( MULT_( 1 ), sqr( ( x ) ) ) +#define Sqr_( x ) OP_COUNT_WRAPPER1_( MULT_( 1 ), Sqr( ( x ) ) ) +#define SQR_( x ) OP_COUNT_WRAPPER1_( MULT_( 1 ), SQR( ( x ) ) ) +#define square_( x ) OP_COUNT_WRAPPER1_( MULT_( 1 ), square( ( x ) ) ) +#define Square_( x ) OP_COUNT_WRAPPER1_( MULT_( 1 ), Square( ( x ) ) ) +#define SQUARE_( x ) OP_COUNT_WRAPPER1_( MULT_( 1 ), SQUARE( ( x ) ) ) +/* Sign and its Variants */ +#define sign_( x ) OP_COUNT_WRAPPER1_( MOVE_( 1 ), sign( ( x ) ) ) +#define Sign_( x ) OP_COUNT_WRAPPER1_( MOVE_( 1 ), Sign( ( x ) ) ) +#define SIGN_( x ) OP_COUNT_WRAPPER1_( MOVE_( 1 ), SIGN( ( x ) ) ) +/* Square Root and its Variants */ +#define sqrtf_( x ) OP_COUNT_WRAPPER1_( SQRT_( 1 ), sqrtf( ( x ) ) ) +/* Invert Square Root and its Variants */ +#define inv_sqrt_( x ) OP_COUNT_WRAPPER1_( SQRT_( 1 ), inv_sqrt( ( x ) ) ) +/* Others */ +#define log_base_2_( x ) OP_COUNT_WRAPPER1_( ( LOG_( 1 ), MULT_( 1 ) ), log_base_2( ( x ) ) ) +#define log2_f_( x ) OP_COUNT_WRAPPER1_( ( LOG_( 1 ), MULT_( 1 ) ), log2_f( ( x ) ) ) +/* The 'wmc_flag_=wmc_flag_' is Used to Avoid: "warning: left-hand operand of comma expression has no effect" + with Cygwin gcc Compiler */ +#define _round_( x ) OP_COUNT_WRAPPER1_( wmc_flag_ = wmc_flag_, _round( ( x ) ) ) +#define round_f_( x ) OP_COUNT_WRAPPER1_( wmc_flag_ = wmc_flag_, round_f( ( x ) ) ) +#define _squant_( x ) OP_COUNT_WRAPPER1_( wmc_flag_ = wmc_flag_, _squant( ( x ) ) ) +/* Set Min/Max */ +#define set_min_( a, b ) OP_COUNT_WRAPPER3_( ( ADD_( 1 ), BRANCH_( 1 ), MOVE_( 1 ) ), set_min( ( a ), ( b ) ) ) +#define set_max_( a, b ) OP_COUNT_WRAPPER3_( ( ADD_( 1 ), BRANCH_( 1 ), MOVE_( 1 ) ), set_max( ( a ), ( b ) ) ) +/* mac & msu (Instrumented Versions) */ +#define mac_( a, b, c ) OP_COUNT_WRAPPER1_( MAC_( 1 ), mac( a, b, c ) ) +#define msu_( a, b, c ) OP_COUNT_WRAPPER1_( MAC_( 1 ), msu( a, b, c ) ) + +/* Functions */ +#define func_( name, x ) OP_COUNT_WRAPPER1_( FUNC_( x ), name ) + +/* Logical Operators */ +#ifndef __ +#define __ ( BRANCH_( 1 ), 1 ) && +#endif + +/* Ternary Operators (? and :) */ +#ifndef _ +#define _ ( BRANCH_( 1 ), 0 ) ? 0: #endif + +/* Flow Control keywords */ +#define if_ \ + OP_COUNT_WRAPPER2_( BRANCH_( 1 ) ) \ + if +#define for_ OP_COUNT_WRAPPER2_( LOOP_(1)) for +#define while_( c ) \ + while \ + OP_COUNT_WRAPPER1_( BRANCH_( 1 ), ( c ) ) /* needs extra "()" if ',' encountered */ +#define do_ \ + do \ + { +#define _while \ + BRANCH_( 1 ); \ + } \ + while + +#define goto_ \ + OP_COUNT_WRAPPER2_( BRANCH_( 1 ) ) \ + goto +#define break_ \ + OP_COUNT_WRAPPER2_( BRANCH_( 1 ) ) \ + break +#define continue_ \ + OP_COUNT_WRAPPER2_( BRANCH_( 1 ) ) \ + continue +#define return_ \ + OP_COUNT_WRAPPER2_( ( wmc_flag_ = stack_tree_level_, STACK_DEPTH_FCT_RETURN ) ) \ + return + +#define switch_ \ + OP_COUNT_WRAPPER2_( ( BRANCH_( 1 ), wmc_flag_ = 1 ) ) \ + switch +#define cost_( n ) OP_COUNT_WRAPPER2_( wmc_flag_ ? ( ADD_( n ), BRANCH_( n ), wmc_flag_ = 0 ) : 0 ); + +#ifdef WMOPS + +#define ACC 2 +#define MUL 1 + +/* Counting Function (should not be called externally!) */ +static void wops_( const char *ops ) +{ + char lm = 0; /* lm: Last Operation is Math */ + static char lo = 0; /* Last Operation */ + + void ( *fct )( const char *ops ) = wops_; + +st: + while ( *ops != '\0' ) + { + switch ( *ops++ ) + { + int cnt; + case '-': + for ( cnt = 0; ops[cnt] == '>'; cnt++ ) + ; + if ( cnt & 1 ) + goto ind; + case '+': + lm = 2; + if ( lo & MUL ) + { + MULT_( -1 ); + MAC_( 1 ); + break; + } + lo = ACC << 2; + case 'U': + case 'D': + ADD_( 1 ); + break; + case '*': + lm = 2; + if ( lo & ACC ) + { + ADD_( -1 ); + MAC_( 1 ); + break; + } + lo = MUL << 2; + MULT_( 1 ); + break; + case '/': + case '%': + lm = 2; + DIV_( 1 ); + break; + case '&': + case '|': + case '^': + lm = 2; + case '~': + LOGIC_( 1 ); + break; + case '<': + case '>': + if ( *ops != ops[-1] ) + goto error; + ops++; + case -85: + case -69: + lm = 2; + SHIFT_( 1 ); + break; + case 'L': + case 'G': + if ( *ops == 't' ) + goto comp; + case 'E': + case 'N': + if ( *ops != 'e' ) + goto error; + comp: + ops++; + ADD_( 1 ); + break; + case '!': + MISC_( 2 ); + break; + case 'M': + MOVE_( 1 ); + break; + case 'S': + STORE_( 1 ); + break; + case 'P': + PTR_INIT_( 1 ); + break; + case '[': + case ']': + goto st; + ind: + ops++; + case 'I': + case '.': + INDIRECT_( 1 ); + break; + case '=': + if ( lm ) + goto st; + case '\0': + /* This Shouldn't Happen */ + /* These are Used to Avoid: "warning: 'name' defined but not used" with Cygwin gcc Compiler */ + wmc_flag_ = wmc_flag_; + ops_cnt_ptr = ops_cnt_ptr; + fct( "" ); + error: + default: + fprintf( stderr, "\r wops: Invalid Counting Operation '%s'\n", ops - 1 ); + exit( -1 ); + } + lm >>= 1; + lo >>= 2; + } + + return; +} + +#endif + +/* All Other Operations */ +#define $( str ) OP_COUNT_WRAPPER2_( wops_( str ) ) + + +/*-------------------------------------------------------------------* + * Memory counting tool + *-------------------------------------------------------------------*/ + +/* Enhanced Const Data Size Counting (Rounding Up to the Nearest 'Integer' Size) */ +#define rsize( item ) ( ( sizeof( item ) + sizeof( int ) - 1 ) / sizeof( int ) * sizeof( int ) ) + +#ifdef _MSC_VER +/* Disable "warning C4210: nonstandard extension used : function given file scope" with Visual Studio Compiler */ +#pragma warning( disable : 4210 ) +#endif + +/* Const Data Size and PROM Size Wrapper Functions */ +#define Const_Data_Size_Func( file ) Const_Data_Size_##file( void ) +#define Get_Const_Data_Size( file, val_ptr ) \ + { \ + extern int Const_Data_Size_##file( void ); \ + *( val_ptr ) = Const_Data_Size_##file(); \ + } +#define PROM_Size_Func( file ) PROM_Size_##file( void ) +#define Get_PROM_Size( file, val_ptr ) \ + { \ + int PROM_Size_##file( void ); \ + *( val_ptr ) = PROM_Size_##file(); \ + } + +/* ROM Size Lookup Table - contains information about PROM size and Const Data Size in all source files */ +/* The print_mem() function looks for this table to print the results of Const Data usage and PROM usage */ +typedef struct ROM_Size_Lookup_Table +{ + const char file_spec[255]; + int PROM_size; + int ( *Get_Const_Data_Size_Func )( void ); +} ROM_Size_Lookup_Table; + +/* The WMC tool inserts the following declaration during the innstrumentation process in the .c file where the function print_mem() is located */ +/* and modifies it to print_mem(Const_Data_PROM_Table) */ + +/* #ifdef WMOPS + * ROM_Size_Lookup_Table Const_Data_PROM_Table[] = + * { + * {"../lib_enc/rom_enc.c", 0, NULL}, + * {"../lib_com/*.c", 0, NULL}, + * {"", -1, NULL} + * }; + * #endif + */ + +/*#define MEM_ALIGN_64BITS */ /* Define this when using 64 Bits values in the code (ex: double), otherwise it will align on 32 Bits */ +/*#define MEM_COUNT_DETAILS*/ + +typedef enum +{ + USE_BYTES = 0, + USE_16BITS = 1, + USE_32BITS = 2 +} Counting_Size; + +#if ( defined( _WIN32 ) && ( _MSC_VER <= 1800 ) && ( _MSC_VER >= 1300 ) ) +#define __func__ __FUNCTION__ +#elif defined( __STDC_VERSION__ ) && __STDC_VERSION__ < 199901L +#if ( __GNUC__ >= 2 ) +#define __func__ __FUNCTION__ +#else +#define __func__ "" +#endif +#elif defined( __GNUC__ ) +#define __func__ __extension__ __FUNCTION__ +#endif + + +#ifdef WMOPS + +void *mem_alloc( const char *func_name, int func_lineno, size_t size, char *alloc_str ); +void mem_free( const char *func_name, int func_lineno, void *ptr ); + +#define malloc_( size ) mem_alloc( __func__, __LINE__, size, "m:" #size ) +#define calloc_( n, size ) mem_alloc( __func__, __LINE__, ( n ) * ( size ), "c:" #n ", " #size ) +#define free_( ptr ) mem_free( __func__, __LINE__, ptr ) + +void reset_mem( Counting_Size cnt_size ); +void print_mem( ROM_Size_Lookup_Table Const_Data_PROM_Table[] ); + +int push_stack( const char *filename, const char *fctname ); +int pop_stack( const char *filename, const char *fctname ); + +#ifdef WMOPS_DETAIL +#define STACK_DEPTH_FCT_CALL ( push_wmops( __FUNCTION__ ), push_stack( __FILE__, __FUNCTION__ ) ) /* add push_wmops() in all function calls */ +#define STACK_DEPTH_FCT_RETURN ( pop_wmops(), pop_stack( __FILE__, __FUNCTION__ ) ) /* add pop_wmops() in all function returns */ +#else +#define STACK_DEPTH_FCT_CALL push_stack( __FILE__, __FUNCTION__ ) +#define STACK_DEPTH_FCT_RETURN pop_stack( __FILE__, __FUNCTION__ ) +#endif + +void reset_stack( void ); +#define func_start_ int stack_tree_level_ = STACK_DEPTH_FCT_CALL; + +#else +#define malloc_( n1 ) malloc( n1 ) +#define calloc_( n1, n2 ) calloc( n1, n2 ) +#define free_( ptr ) free( ptr ) +#define reset_mem( cnt_size ) +#define print_mem( Const_Data_PROM_Table ) + +#define push_stack( file, fct ) +#define pop_stack( file, fct ) +#define reset_stack() +#define func_start_ + +#endif + +#endif /* WMOPS_H */ diff --git a/lib_debug/wmops.c b/lib_debug/wmops.c deleted file mode 100644 index fe75a207ff..0000000000 --- a/lib_debug/wmops.c +++ /dev/null @@ -1,503 +0,0 @@ -/****************************************************************************************************** - - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository. All Rights Reserved. - - This software is protected by copyright law and by international treaties. - The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository retain full ownership rights in their respective contributions in - the software. This notice grants no license of any kind, including but not limited to patent - license, nor is any license granted by implication, estoppel or otherwise. - - Contributors are required to enter into the IVAS codec Public Collaboration agreement before making - contributions. - - This software is provided "AS IS", without any express or implied warranties. The software is in the - development stage. It is intended exclusively for experts who have experience with such software and - solely for the purpose of inspection. All implied warranties of non-infringement, merchantability - and fitness for a particular purpose are hereby disclaimed and excluded. - - Any dispute, controversy or claim arising under or in relation to providing this software shall be - submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in - accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and - the United Nations Convention on Contracts on the International Sales of Goods. - -*******************************************************************************************************/ - -#include -#include -#include -#include -#include "options.h" -#ifdef DEBUGGING -#include "debug.h" -#endif -#include "wmops.h" - - -/*-------------------------------------------------------------------* - * WMOPS counting tool - *--------------------------------------------------------------------*/ - -#ifdef WMOPS - -#define MAX_RECORDS 1024 -#define MAX_CHAR 64 -#define MAX_STACK 64 -#define DOUBLE_MAX 0x80000000; - -struct wmops_record -{ - char label[MAX_CHAR]; - int32_t call_number; - int32_t update_cnt; - int call_tree[MAX_RECORDS]; - double start_selfcnt; - double current_selfcnt; - double max_selfcnt; - double min_selfcnt; - double tot_selfcnt; - double start_cnt; /* The following take into account the decendants */ - double current_cnt; - double max_cnt; - double min_cnt; - double tot_cnt; -#ifdef WMOPS_WC_FRAME_ANALYSIS - int32_t current_call_number; - double wc_cnt; - double wc_selfcnt; - int32_t wc_call_number; -#endif -}; - -double ops_cnt; -double prom_cnt; -double inst_cnt[NUM_INST]; - -int ops_cnt_activ = 1; - -static struct wmops_record wmops[MAX_RECORDS]; -static int stack[MAX_STACK]; -static int sptr; -static int num_records; -static int current_record; -static int32_t update_cnt; -static double start_cnt; -static double max_cnt; -static double min_cnt; -static double inst_cnt_wc[NUM_INST]; -static int32_t fnum_cnt_wc; - - -void reset_wmops( void ) -{ - int i, j; - - for ( i = 0; i < MAX_RECORDS; i++ ) - { - strcpy( &wmops[i].label[0], "\0" ); - wmops[i].call_number = 0; - wmops[i].update_cnt = 0; - for ( j = 0; j < MAX_RECORDS; j++ ) - { - wmops[i].call_tree[j] = -1; - } - wmops[i].start_selfcnt = 0.0; - wmops[i].current_selfcnt = 0.0; - wmops[i].max_selfcnt = 0.0; - wmops[i].min_selfcnt = DOUBLE_MAX; - wmops[i].tot_selfcnt = 0.0; - wmops[i].start_cnt = 0.0; - wmops[i].current_cnt = 0.0; - wmops[i].max_cnt = 0.0; - wmops[i].min_cnt = DOUBLE_MAX; - wmops[i].tot_cnt = 0.0; -#ifdef WMOPS_WC_FRAME_ANALYSIS - wmops[i].wc_cnt = 0.0; - wmops[i].wc_selfcnt = 0.0; - wmops[i].current_call_number = 0; -#endif - } - - for ( i = 0; i < MAX_STACK; i++ ) - { - stack[i] = -1; - } - sptr = 0; - num_records = 0; - current_record = -1; - update_cnt = 0; - - max_cnt = 0.0; - min_cnt = DOUBLE_MAX; - start_cnt = 0.0; - ops_cnt = 0.0; -} - - -void push_wmops( const char *label ) -{ - int new_flag; - int i, j; - - /* Check if new function record label */ - new_flag = 1; - for ( i = 0; i < num_records; i++ ) - { - if ( strcmp( wmops[i].label, label ) == 0 ) - { - new_flag = 0; - break; - } - } - - /* Configure new record */ - if ( new_flag ) - { - if ( num_records >= MAX_RECORDS ) - { - fprintf( stdout, "push_wmops(): exceeded MAX_RECORDS count.\n\n" ); - exit( -1 ); - } - strcpy( wmops[i].label, label ); - num_records++; - } - - /* Push current context onto stack */ - if ( current_record >= 0 ) - { - if ( sptr >= MAX_STACK ) - { - fprintf( stdout, "\r push_wmops(): stack exceeded, try inreasing MAX_STACK\n" ); - exit( -1 ); - } - stack[sptr++] = current_record; - - /* accumulate op counts */ - wmops[current_record].current_selfcnt += ops_cnt - wmops[current_record].start_selfcnt; - - /* update call tree */ - for ( j = 0; j < MAX_RECORDS; j++ ) - { - if ( wmops[i].call_tree[j] == current_record ) - { - break; - } - else if ( wmops[i].call_tree[j] == -1 ) - { - wmops[i].call_tree[j] = current_record; - break; - } - } - } - - /* init current record */ - current_record = i; - wmops[current_record].start_selfcnt = ops_cnt; - wmops[current_record].start_cnt = ops_cnt; - wmops[current_record].call_number++; -#ifdef WMOPS_WC_FRAME_ANALYSIS - wmops[current_record].current_call_number++; -#endif -} - -void wmops_sub_start( const char *label ) -{ -#ifndef WMOPS_DETAIL - push_wmops( label ); -#endif -} - -void pop_wmops( void ) -{ - - /* Check for underflow */ - if ( current_record < 0 ) - { - fprintf( stdout, "\r pop_wmops(): stack underflow, too many calls to pop_wmops()\n" ); - exit( -1 ); - } - - /* update count of current record */ - wmops[current_record].current_selfcnt += ops_cnt - wmops[current_record].start_selfcnt; - wmops[current_record].current_cnt += ops_cnt - wmops[current_record].start_cnt; - - /* Get back previous context from stack */ - if ( sptr > 0 ) - { - current_record = stack[--sptr]; - wmops[current_record].start_selfcnt = ops_cnt; - } - else - { - current_record = -1; - } -} - -void wmops_sub_end( void ) -{ -#ifndef WMOPS_DETAIL - pop_wmops(); -#endif -} - -void update_wmops( void ) -{ - int i; - double current_cnt; - - if ( sptr != 0 ) - { - fprintf( stdout, "update_wmops(): Stack must be empty!\n" ); - exit( -1 ); - } - -#ifdef WMOPS_PER_FRAME /* output complexity in WMOPS per frame - note that "frame" number was already incremented before calling this function */ - { - float tmpF = (float) ( FAC * wmops[0].current_cnt ); - dbgwrite( &tmpF, 4, 1, 1, "res/wmops" ); - } -#endif - -#ifdef WMOPS_WC_FRAME_ANALYSIS - if ( ops_cnt - start_cnt > max_cnt ) - { - for ( i = 0; i < num_records; i++ ) - { - wmops[i].wc_cnt = wmops[i].current_cnt; - wmops[i].wc_selfcnt = wmops[i].current_selfcnt; - wmops[i].wc_call_number = wmops[i].current_call_number; - } - } -#endif - - for ( i = 0; i < num_records; i++ ) - { - wmops[i].tot_selfcnt += wmops[i].current_selfcnt; - wmops[i].tot_cnt += wmops[i].current_cnt; - - if ( wmops[i].current_selfcnt > 0 ) - { - if ( wmops[i].current_selfcnt > wmops[i].max_selfcnt ) - { - wmops[i].max_selfcnt = wmops[i].current_selfcnt; - } - - if ( wmops[i].current_selfcnt < wmops[i].min_selfcnt ) - { - wmops[i].min_selfcnt = wmops[i].current_selfcnt; - } - } - - wmops[i].current_selfcnt = 0; - - if ( wmops[i].current_cnt > 0 ) - { - if ( wmops[i].current_cnt > wmops[i].max_cnt ) - { - wmops[i].max_cnt = wmops[i].current_cnt; - } - - if ( wmops[i].current_cnt < wmops[i].min_cnt ) - { - wmops[i].min_cnt = wmops[i].current_cnt; - } - - wmops[i].update_cnt++; - } - - wmops[i].current_cnt = 0; -#ifdef WMOPS_WC_FRAME_ANALYSIS - wmops[i].current_call_number = 0; -#endif - } - - current_cnt = ops_cnt - start_cnt; - if ( current_cnt > max_cnt ) - { - max_cnt = current_cnt; - - for ( i = 0; i < NUM_INST; i++ ) - { - inst_cnt_wc[i] = inst_cnt[i]; - } - - fnum_cnt_wc = update_cnt; - } - - if ( current_cnt < min_cnt ) - { - min_cnt = current_cnt; - } - - for ( i = 0; i < NUM_INST; i++ ) - { - inst_cnt[i] = 0.0; - } - - - start_cnt = ops_cnt; - update_cnt++; -} - - -void print_wmops( void ) -{ - int i, label_len, max_label_len; - - char *sfmts = "%*s %8s %8s %7s %7s\n"; - char *dfmts = "%*s %8.2f %8.3f %7.3f %7.3f\n"; - char *sfmt = "%*s %8s %8s %7s %7s %7s %7s %7s\n"; - char *dfmt = "%*s %8.2f %8.3f %7.3f %7.3f %7.3f %7.3f %7.3f\n"; - -#if ENABLE_TREE - int j; - char *sfmtt = "%20s %4s %15s\n"; - char *dfmtt = "%20s %4d "; -#endif - - /* fprintf( stdout, "\nProgram Memory Analysis: %12.0f words\n", prom_cnt ); */ - /* fprintf (stdout, "\nInstruction Type Analysis (for worst case frame):\n\n"); */ - fprintf( stdout, "\nInstruction Type Analysis (for worst case frame number %d):\n\n", fnum_cnt_wc ); /* added -- JPA */ - for ( i = 0; i < NUM_INST; i++ ) - { - switch ( (enum instructions) i ) - { - case _ADD: - fprintf( stdout, "\tAdds: %12.1f\n", inst_cnt_wc[i] ); - break; - case _ABS: - fprintf( stdout, "\tAbsolutes: %12.1f\n", inst_cnt_wc[i] ); - break; - case _MULT: - fprintf( stdout, "\tMultiplies: %12.1f\n", inst_cnt_wc[i] ); - break; - case _MAC: - fprintf( stdout, "\tMACs: %12.1f\n", inst_cnt_wc[i] ); - break; - case _MOVE: - fprintf( stdout, "\tMoves: %12.1f\n", inst_cnt_wc[i] ); - break; - case _STORE: - fprintf( stdout, "\tStores: %12.1f\n", inst_cnt_wc[i] ); - break; - case _LOGIC: - fprintf( stdout, "\tLogicals: %12.1f\n", inst_cnt_wc[i] ); - break; - case _SHIFT: - fprintf( stdout, "\tShifts: %12.1f\n", inst_cnt_wc[i] ); - break; - case _BRANCH: - fprintf( stdout, "\tBranches: %12.1f\n", inst_cnt_wc[i] ); - break; - case _DIV: - fprintf( stdout, "\tDivisions: %12.1f\n", inst_cnt_wc[i] ); - break; - case _SQRT: - fprintf( stdout, "\tSquare Root: %12.1f\n", inst_cnt_wc[i] ); - break; - case _TRANS: - fprintf( stdout, "\tTrans: %12.1f\n", inst_cnt_wc[i] ); - break; - case _FUNC: - fprintf( stdout, "\tFunc Call: %12.1f\n", inst_cnt_wc[i] ); - break; - case _LOOP: - fprintf( stdout, "\tLoop Init: %12.1f\n", inst_cnt_wc[i] ); - break; - case _INDIRECT: - fprintf( stdout, "\tIndirect Addr: %12.1f\n", inst_cnt_wc[i] ); - break; - case _PTR_INIT: - fprintf( stdout, "\tPointer Init: %12.1f\n", inst_cnt_wc[i] ); - break; - case _TEST: - fprintf( stdout, "\tExtra condit.: %12.1f\n", inst_cnt_wc[i] ); - break; - case _POWER: - fprintf( stdout, "\tExponential: %12.1f\n", inst_cnt_wc[i] ); - break; - case _LOG: - fprintf( stdout, "\tLogarithm: %12.1f\n", inst_cnt_wc[i] ); - break; - case _MISC: - fprintf( stdout, "\tAll other op.: %12.1f\n", inst_cnt_wc[i] ); - break; - default: - fprintf( stdout, "\tERROR: Invalid instruction type: %d\n\n", i ); - } - } - - max_label_len = 0; - for ( i = 0; i < num_records; i++ ) - { - label_len = strlen( wmops[i].label ); - if ( label_len > max_label_len ) - { - max_label_len = label_len; - } - } - max_label_len += 4; - -#ifdef WMOPS_WC_FRAME_ANALYSIS - fprintf( stdout, "\n\nWeighted MOPS Analysis for worst case frame number %d ( WMOPS boost factor %4.2f ):\n", fnum_cnt_wc, WMOPS_BOOST_FAC ); - fprintf( stdout, "%*s %8s %10s %12s\n", max_label_len, " routine", " calls", " SELF", " CUMULATIVE" ); - fprintf( stdout, "%*s %8s %10s %10s\n", max_label_len, "---------------", "------", "------", "----------" ); - - for ( i = 0; i < num_records; i++ ) - { - fprintf( stdout, "%*s %8d %10.3f %12.3f\n", max_label_len, wmops[i].label, wmops[i].wc_call_number, FAC * wmops[i].wc_selfcnt, FAC * wmops[i].wc_cnt ); - } - -#endif - - fprintf( stdout, "\n\nWeighted MOPS Analysis ( WMOPS boost factor %4.2f ):\n", WMOPS_BOOST_FAC ); - fprintf( stdout, "%*s %34s %23s\n", max_label_len, "", "|------ SELF ------|", "|--- CUMULATIVE ---|" ); - fprintf( stdout, sfmt, max_label_len, " routine", " calls", " min ", " max ", " avg ", " min ", " max ", " avg " ); - fprintf( stdout, sfmt, max_label_len, "---------------", "------", "------", "------", "------", "------", "------", "------" ); - for ( i = 0; i < num_records; i++ ) - { - fprintf( stdout, dfmt, max_label_len, wmops[i].label, - update_cnt == 0 ? 0.0f : (float) wmops[i].call_number / update_cnt, - wmops[i].update_cnt == 0 ? 0.0f : FAC * wmops[i].min_selfcnt, FAC * wmops[i].max_selfcnt, - wmops[i].update_cnt == 0 ? 0.0f : FAC * wmops[i].tot_selfcnt / wmops[i].update_cnt, - wmops[i].update_cnt == 0 ? 0.0f : FAC * wmops[i].min_cnt, FAC * wmops[i].max_cnt, - wmops[i].update_cnt == 0 ? 0.0f : FAC * wmops[i].tot_cnt / wmops[i].update_cnt ); - } - fprintf( stdout, sfmts, max_label_len, "---------------", "------", "------", "------", "------" ); - fprintf( stdout, dfmts, max_label_len, "total", (float) update_cnt, FAC * min_cnt, FAC * max_cnt, FAC * ops_cnt / update_cnt ); - fprintf( stdout, "\n" ); - -#if ENABLE_TREE - - fprintf( stdout, "\nCall Tree:\n\n" ); - fprintf( stdout, sfmtt, " function", "num", "called by: " ); - fprintf( stdout, sfmtt, "---------------", "---", "--------------" ); - - for ( i = 0; i < num_records; i++ ) - { - fprintf( stdout, dfmtt, wmops[i].label, i ); - for ( j = 0; wmops[i].call_tree[j] != -1; j++ ) - { - if ( j != 0 ) - { - fprintf( stdout, ", " ); - } - fprintf( stdout, "%d", wmops[i].call_tree[j] ); - } - fprintf( stdout, "\n" ); - } - - fprintf( stdout, sfmtt, "---------------", "---", "--------------" ); - fprintf( stdout, "\n\n" ); - -#endif -} - -#endif /* WMOPS */ diff --git a/lib_dec/ACcontextMapping_dec.c b/lib_dec/ACcontextMapping_dec.c index 10fb369741..5139106d9f 100644 --- a/lib_dec/ACcontextMapping_dec.c +++ b/lib_dec/ACcontextMapping_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "rom_com.h" #include "ivas_rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" #include "ivas_prot.h" /* Range coder header file */ #include diff --git a/lib_dec/FEC.c b/lib_dec/FEC.c index 3267092e7e..8118e07748 100644 --- a/lib_dec/FEC.c +++ b/lib_dec/FEC.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "rom_com.h" #include "rom_dec.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local function prototypes @@ -522,7 +522,7 @@ static void gain_dec_bfi( } -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP /*-------------------------------------------------------------------* * pulseRes_preCalc() * @@ -577,4 +577,4 @@ static void pulseRes_preCalc( return; } -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP diff --git a/lib_dec/FEC_HQ_core.c b/lib_dec/FEC_HQ_core.c index 53eca76982..988689b76d 100644 --- a/lib_dec/FEC_HQ_core.c +++ b/lib_dec/FEC_HQ_core.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "rom_dec.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local prototypes diff --git a/lib_dec/FEC_HQ_phase_ecu.c b/lib_dec/FEC_HQ_phase_ecu.c index a84a9d272b..e4fddda6d2 100644 --- a/lib_dec/FEC_HQ_phase_ecu.c +++ b/lib_dec/FEC_HQ_phase_ecu.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "rom_com.h" #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local constants diff --git a/lib_dec/FEC_adapt_codebook.c b/lib_dec/FEC_adapt_codebook.c index 5ffd9a1fde..961dfc6a5d 100644 --- a/lib_dec/FEC_adapt_codebook.c +++ b/lib_dec/FEC_adapt_codebook.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_dec.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------- * FEC_synchro_exc() diff --git a/lib_dec/FEC_clas_estim.c b/lib_dec/FEC_clas_estim.c index 7a27532f17..4acd3dab9c 100644 --- a/lib_dec/FEC_clas_estim.c +++ b/lib_dec/FEC_clas_estim.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "prot.h" #include "rom_com.h" #include "stat_dec.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_dec/FEC_lsf_estim.c b/lib_dec/FEC_lsf_estim.c index f971ec4434..dce8b83515 100644 --- a/lib_dec/FEC_lsf_estim.c +++ b/lib_dec/FEC_lsf_estim.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * FEC_lsf_estim() diff --git a/lib_dec/FEC_pitch_estim.c b/lib_dec/FEC_pitch_estim.c index e2f6491cc3..3076f7bcaa 100644 --- a/lib_dec/FEC_pitch_estim.c +++ b/lib_dec/FEC_pitch_estim.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #endif #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------* * FEC_pitch_estim() diff --git a/lib_dec/FEC_scale_syn.c b/lib_dec/FEC_scale_syn.c index 66fae0fc05..7d43ad3a9a 100644 --- a/lib_dec/FEC_scale_syn.c +++ b/lib_dec/FEC_scale_syn.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" #define SCLSYN_LAMBDA 0.3f diff --git a/lib_dec/LD_music_post_filter.c b/lib_dec/LD_music_post_filter.c index f19e737595..87984e873a 100644 --- a/lib_dec/LD_music_post_filter.c +++ b/lib_dec/LD_music_post_filter.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_dec/TonalComponentDetection.c b/lib_dec/TonalComponentDetection.c index 230dfe4086..fedfe0c2e6 100644 --- a/lib_dec/TonalComponentDetection.c +++ b/lib_dec/TonalComponentDetection.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -46,7 +46,7 @@ #include "prot.h" #include "cnst.h" #include "stat_com.h" -#include "wmops.h" +#include "wmc_auto.h" #include "ivas_prot.h" diff --git a/lib_dec/acelp_core_dec.c b/lib_dec/acelp_core_dec.c index 4c52cdb811..c89c5f53b0 100644 --- a/lib_dec/acelp_core_dec.c +++ b/lib_dec/acelp_core_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -48,7 +48,7 @@ #ifdef LSF_RE_USE_SECONDARY_CHANNEL #include "ivas_rom_com.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * acelp_core_dec() @@ -77,6 +77,10 @@ ivas_error acelp_core_dec( const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */ const int16_t nchan_out, /* i : number of output channels */ STEREO_CNG_DEC_HANDLE hStereoCng /* i : stereo CNG handle */ +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + , + const int16_t read_sid_info /* i : read SID info flag */ +#endif ) { float old_exc[L_EXC_DEC], *exc; /* excitation signal buffer */ @@ -131,7 +135,7 @@ ivas_error acelp_core_dec( return error; } - wmops_sub_start( "acelp_core_dec" ); + push_wmops( "acelp_core_dec" ); output_frame = (int16_t) ( st->output_Fs / FRAMES_PER_SEC ); @@ -179,7 +183,7 @@ ivas_error acelp_core_dec( set_f( synth, 0, output_frame ); /* They are however read in a few places which causes errors in the valgrind tests. Simplest solution from a code perspective was to set them to zero. */ /* CN generation done in DFT domain */ - wmops_sub_end(); + pop_wmops(); return error; } @@ -512,7 +516,11 @@ ivas_error acelp_core_dec( } else { +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT if ( st->core_brate == SID_2k40 && st->element_mode != IVAS_CPE_MDCT ) +#else + if ( st->core_brate == SID_2k40 && st->element_mode != IVAS_CPE_MDCT && st->read_sid_info ) +#endif { FdCng_decodeSID( st ); *sid_bw = 0; @@ -529,6 +537,22 @@ ivas_error acelp_core_dec( ApplyFdCng( syn, NULL, realBuffer, imagBuffer, st, 0, ( st->coder_type == AUDIO && !st->GSC_noisy_speech ) ); } +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + if ( !read_sid_info ) +#else + if ( !st->read_sid_info ) + // if (!st->read_sid_info && st->cng_ism_flag) /* read_sid_info can only be 0 in ParamISM mode */ +#endif + { + float noise_lvl_highest; + + noise_lvl_highest = st->hFdCngDec->hFdCngCom->cngNoiseLevel[st->hFdCngDec->hFdCngCom->stopFFTbin - st->hFdCngDec->hFdCngCom->startBand - 1]; + for ( int16_t b = st->hFdCngDec->hFdCngCom->stopFFTbin - st->hFdCngDec->hFdCngCom->startBand; b < st->hFdCngDec->hFdCngCom->stopBand; b++ ) + { + st->hFdCngDec->hFdCngCom->cngNoiseLevel[b] = noise_lvl_highest; + } + } + generate_comfort_noise_dec( NULL, NULL, st, nchan_out ); FdCng_exc( st->hFdCngDec->hFdCngCom, &st->CNG_mode, st->L_frame, st->lsp_old, st->first_CNG, st->lspCNG, Aq, lsp_new, lsf_new, exc, exc2, bwe_exc ); @@ -603,11 +627,19 @@ ivas_error acelp_core_dec( nb_bits = -1; } +#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE + config_acelp1( DEC, st->total_brate, st->core_brate, st->core, st->extl_orig, st->extl_brate_orig, st->L_frame, st->GSC_noisy_speech, &( st->acelp_cfg ), st->next_bit_pos, st->coder_type, tc_subfr_tmp, 1, &nb_bits, unbits, st->element_mode, &uc_two_stage_flag, tdm_lp_reuse_flag, tdm_low_rate_mode, st->idchan, st->active_cnt, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode ); +#else config_acelp1( DEC, st->total_brate, st->core_brate, st->core, st->extl_orig, st->extl_brate_orig, st->L_frame, st->GSC_noisy_speech, &( st->acelp_cfg ), st->next_bit_pos, st->coder_type, tc_subfr_tmp, 1, &nb_bits, unbits, st->element_mode, &uc_two_stage_flag, tdm_lp_reuse_flag, tdm_low_rate_mode, st->idchan, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode ); +#endif if ( st->coder_type == TRANSITION && tc_subfr < L_SUBFR && st->L_frame == L_FRAME ) /* ISfm: why is this called again after above */ { +#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE + config_acelp1( DEC, st->total_brate, st->core_brate, st->core, st->extl_orig, st->extl_brate_orig, st->L_frame, -1, &( st->acelp_cfg ), st->next_bit_pos, st->coder_type, tc_subfr, 2, &nb_bits, unbits, st->element_mode, &uc_two_stage_flag, tdm_lp_reuse_flag, tdm_low_rate_mode, st->idchan, st->active_cnt, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode ); +#else config_acelp1( DEC, st->total_brate, st->core_brate, st->core, st->extl_orig, st->extl_brate_orig, st->L_frame, -1, &( st->acelp_cfg ), st->next_bit_pos, st->coder_type, tc_subfr, 2, &nb_bits, unbits, st->element_mode, &uc_two_stage_flag, tdm_lp_reuse_flag, tdm_low_rate_mode, st->idchan, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode ); +#endif } } @@ -639,25 +671,34 @@ ivas_error acelp_core_dec( if ( !tdm_lp_reuse_flag ) { - lsf_dec( st, tc_subfr, Aq, &LSF_Q_prediction, lsf_new, lsp_new, lsp_mid, tdm_low_rate_mode #ifdef LSF_RE_USE_SECONDARY_CHANNEL - , - tdm_lsfQ_PCh + lsf_dec( st, tc_subfr, Aq, &LSF_Q_prediction, lsf_new, lsp_new, lsp_mid, tdm_low_rate_mode, tdm_lsfQ_PCh ); +#else + lsf_dec( st, tc_subfr, Aq, &LSF_Q_prediction, lsf_new, lsp_new, lsp_mid, tdm_low_rate_mode ); #endif - ); } else { const float *pt_interp_2; + #ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE - int16_t beta_index[1]; + if ( st->active_cnt != 1 ) + { + int16_t beta_index; - beta_index[0] = get_next_indice( st, TDM_IC_LSF_PRED_BITS ); - tdm_SCh_lsf_reuse( DEC, st->element_brate, lsf_new, lsp_new, tdm_lsfQ_PCh, NULL, beta_index ); + beta_index = get_next_indice( st, TDM_IC_LSF_PRED_BITS ); + tdm_SCh_lsf_reuse( DEC, st->element_brate, lsf_new, lsp_new, tdm_lsfQ_PCh, NULL, &beta_index ); + } + else + { + mvr2r( tdm_lspQ_PCh, lsp_new, M ); + mvr2r( tdm_lsfQ_PCh, lsf_new, M ); + } #else mvr2r( tdm_lspQ_PCh, lsp_new, M ); mvr2r( tdm_lsfQ_PCh, lsf_new, M ); #endif + if ( st->rate_switching_reset ) { /* extrapolation in case of unstable LSF convert */ @@ -1114,7 +1155,7 @@ ivas_error acelp_core_dec( st->lp_noise = st->hFdCngDec->lp_noise; } - if ( st->element_mode != IVAS_CPE_TD ) + if ( st->element_mode != IVAS_CPE_TD && !st->cng_ism_flag ) { /*Noise estimate*/ ApplyFdCng( syn, NULL, realBuffer, imagBuffer, st, 0, ( st->coder_type == AUDIO && !st->GSC_noisy_speech ) ); @@ -1290,7 +1331,7 @@ ivas_error acelp_core_dec( /*WB/SWB-FD_CNG*/ if ( ( st->core_brate == FRAME_NO_DATA || st->core_brate == SID_2k40 ) && ( st->cng_type == FD_CNG ) && ( st->hFdCngDec->hFdCngCom->numCoreBands < st->cldfbSyn->no_channels ) ) { - generate_comfort_noise_dec_hf( realBuffer, imagBuffer, st->hFdCngDec->hFdCngCom ); + generate_comfort_noise_dec_hf( realBuffer, imagBuffer, st->hFdCngDec->hFdCngCom, st->cng_ism_flag ); if ( st->hFdCngDec->hFdCngCom->regularStopBand < st->cldfbSyn->no_channels ) { @@ -1432,6 +1473,6 @@ ivas_error acelp_core_dec( st->hTdCngDec->ho_16k_lsp[st->hTdCngDec->ho_circ_ptr] = ( st->L_frame == L_FRAME ? 0 : 1 ); } - wmops_sub_end(); + pop_wmops(); return error; } diff --git a/lib_dec/acelp_core_switch_dec.c b/lib_dec/acelp_core_switch_dec.c index be34a95e31..4a49d6b2db 100644 --- a/lib_dec/acelp_core_switch_dec.c +++ b/lib_dec/acelp_core_switch_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local function prototypes @@ -158,7 +158,11 @@ ivas_error acelp_core_switch_dec( * Excitation decoding *----------------------------------------------------------------*/ +#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE + config_acelp1( DEC, st->total_brate, cbrate, st->core, -1, -1, st->last_L_frame, -1, &( st->acelp_cfg ), st->next_bit_pos, GENERIC, -1, -1, &decode_bwe /* dummy */, &i, st->element_mode, &i /*dummy*/, 0, 0, st->idchan, st->active_cnt, 0, 0, 0 /*st->GSC_IVAS_mode*/ ); +#else config_acelp1( DEC, st->total_brate, cbrate, st->core, -1, -1, st->last_L_frame, -1, &( st->acelp_cfg ), st->next_bit_pos, GENERIC, -1, -1, &decode_bwe /* dummy */, &i, st->element_mode, &i /*dummy*/, 0, 0, st->idchan, 0, 0, 0 /*st->GSC_IVAS_mode*/ ); +#endif decod_gen_voic_core_switch( st, L_frame_for_cs, 0, Aq, exc, cbrate ); diff --git a/lib_dec/amr_wb_dec.c b/lib_dec/amr_wb_dec.c index 29c4f939ed..5252b26564 100644 --- a/lib_dec/amr_wb_dec.c +++ b/lib_dec/amr_wb_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------* * amr_wb_dec() diff --git a/lib_dec/ari_dec.c b/lib_dec/ari_dec.c index fe97e69a52..31df466f00 100644 --- a/lib_dec/ari_dec.c +++ b/lib_dec/ari_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #include "prot.h" #include "stat_com.h" #include "basop_util.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------- diff --git a/lib_dec/ari_hm_dec.c b/lib_dec/ari_hm_dec.c index 78f14e4a28..3ba6a886fb 100644 --- a/lib_dec/ari_hm_dec.c +++ b/lib_dec/ari_hm_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "basop_util.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * DecodeIndex() diff --git a/lib_dec/arith_coder_dec.c b/lib_dec/arith_coder_dec.c index 793edcef26..09f1698133 100644 --- a/lib_dec/arith_coder_dec.c +++ b/lib_dec/arith_coder_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -45,7 +45,7 @@ #include "rom_com.h" #include "basop_util.h" #include "basop_proto_func.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------* * tcx_arith_decode() @@ -170,9 +170,9 @@ void tcx_arith_decode_envelope( gamma_w = 1.0f; gamma_uw = 1.0f / st->gamma; -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP tcx_arith_render_envelope( A_ind, L_frame, L_spec, FL2WORD16( hTcxCfg->preemph_fac ), FL2WORD16( gamma_w ), FL2WORD16( 0.5f * gamma_uw ), env ); -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP if ( use_hm ) { diff --git a/lib_dec/avq_dec.c b/lib_dec/avq_dec.c index 99aabbb04c..ec74ea5389 100644 --- a/lib_dec/avq_dec.c +++ b/lib_dec/avq_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "prot.h" #include "cnst.h" -#include "wmops.h" +#include "wmc_auto.h" #include /*-------------------------------------------------------------------* diff --git a/lib_dec/bass_psfilter.c b/lib_dec/bass_psfilter.c index 85c595460c..0a0eabd115 100644 --- a/lib_dec/bass_psfilter.c +++ b/lib_dec/bass_psfilter.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -46,7 +46,7 @@ #include "debug.h" #endif #include -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local constants diff --git a/lib_dec/cng_dec.c b/lib_dec/cng_dec.c index 415ac27b3a..6d02f18309 100644 --- a/lib_dec/cng_dec.c +++ b/lib_dec/cng_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local function prototypes @@ -109,13 +109,13 @@ void CNG_dec( } else { - lsf_dec( st, 0, Aq, &LSF_Q_prediction, lsf_new, lsp_new, 0, 0 #ifdef LSF_RE_USE_SECONDARY_CHANNEL - , - NULL -#endif - ); + lsf_dec( st, 0, Aq, &LSF_Q_prediction, lsf_new, lsp_new, 0, 0, NULL ); + } +#else + lsf_dec( st, 0, Aq, &LSF_Q_prediction, lsf_new, lsp_new, 0, 0 ); } +#endif } else { diff --git a/lib_dec/core_dec_init.c b/lib_dec/core_dec_init.c index 90827ca0ee..aa8f576cec 100644 --- a/lib_dec/core_dec_init.c +++ b/lib_dec/core_dec_init.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------* * open_decoder_LPD() @@ -190,7 +190,7 @@ void open_decoder_LPD( { if ( !is_init || st->element_mode != IVAS_CPE_MDCT ) { - init_tcx_cfg( st->hTcxCfg, total_brate, st->sr_core, st->output_Fs, st->L_frame, st->bwidth, st->hTcxDec->L_frameTCX, st->fscale, encoderLookahead, encoderLookaheadFB, st->preemph_fac, st->tcxonly, st->rf_flag, st->igf, st->hIGFDec->infoIGFStopFreq, st->element_mode, st->ini_frame, MCT_flag, st->mct_chan_mode ); + init_tcx_cfg( st->hTcxCfg, total_brate, st->sr_core, st->output_Fs, st->L_frame, st->bwidth, st->hTcxDec->L_frameTCX, st->fscale, encoderLookahead, encoderLookaheadFB, st->preemph_fac, st->tcxonly, st->rf_flag, st->igf, st->hIGFDec->infoIGFStopFreq, st->element_mode, st->ini_frame, MCT_flag ); } else { @@ -279,7 +279,7 @@ void open_decoder_LPD( st->last_core_bfi = ACELP_CORE; } - if ( st->element_mode != IVAS_CPE_DFT && st->last_codec_mode == MODE1 && st->last_core == ACELP_CORE ) + if ( ( ( st->element_mode != IVAS_CPE_DFT ) || ( st->element_mode == IVAS_CPE_DFT && st->prev_bfi ) ) && st->last_codec_mode == MODE1 && st->last_core == ACELP_CORE ) { /* Switching from Mode 1 ACELP */ st->last_core_bfi = ACELP_CORE; @@ -670,6 +670,12 @@ void open_decoder_LPD( st->last_tns_active = 0; st->second_last_tns_active = 0; st->second_last_core = -1; + + if ( st->hTcxCfg != NULL && + st->element_mode != EVS_MONO ) + { + st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( is_init ? total_brate : st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode ); + } if ( hTcxDec != NULL ) { hTcxDec->tcxltp_second_last_pitch = st->old_fpitch; diff --git a/lib_dec/core_dec_reconf.c b/lib_dec/core_dec_reconf.c index 201ccc0cb3..7734d13177 100644 --- a/lib_dec/core_dec_reconf.c +++ b/lib_dec/core_dec_reconf.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "prot.h" #include "rom_com.h" #include "rom_dec.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * reconfig_decoder_LPD() diff --git a/lib_dec/core_dec_switch.c b/lib_dec/core_dec_switch.c index c1f8e590fb..ef0a12696f 100644 --- a/lib_dec/core_dec_switch.c +++ b/lib_dec/core_dec_switch.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #endif #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------* * mode_switch_decoder_LPD() @@ -91,7 +91,7 @@ void mode_switch_decoder_LPD( switchWB = 1; /*force init when coming from MODE1*/ } - st->igf = getIgfPresent( st->element_mode, total_brate, bwidth, st->rf_flag, st->mct_chan_mode ); + st->igf = getIgfPresent( st->element_mode, total_brate, bwidth, st->rf_flag ); if ( st->hIGFDec != NULL ) { @@ -140,7 +140,7 @@ void mode_switch_decoder_LPD( if ( st->hTcxCfg != NULL ) { st->hTcxCfg->pCurrentTnsConfig = NULL; - st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( total_brate, st->igf, st->element_mode, st->mct_chan_mode ); + st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( total_brate, st->igf, st->element_mode ); } if ( st->hTcxCfg->fIsTNSAllowed && st->hIGFDec != NULL && st->hTcxCfg != NULL ) diff --git a/lib_dec/core_switching_dec.c b/lib_dec/core_switching_dec.c index 8762f20ac3..9ae8550e40 100644 --- a/lib_dec/core_switching_dec.c +++ b/lib_dec/core_switching_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,14 +44,14 @@ #include "rom_com.h" #include "prot.h" #include "ivas_cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local prototypes *---------------------------------------------------------------------*/ static void core_switch_lb_upsamp( Decoder_State *st, float *output ); -static void smoothTransitionMdctStereoDtx( float synth[], const int16_t output_frame, const int16_t delay_comp ); +static void smoothTransitionDtxToTcx( float synth[], const int16_t output_frame, const int16_t delay_comp ); /*---------------------------------------------------------------------* * core_switching_pre_dec() @@ -70,6 +70,7 @@ ivas_error core_switching_pre_dec( { int16_t i, oldLenClasBuff, newLenClasBuff; ivas_error error; + float tmp; error = IVAS_ERR_OK; @@ -401,7 +402,7 @@ ivas_error core_switching_pre_dec( } } - if ( st->core == HQ_CORE && ( st->last_core == ACELP_CORE || st->last_core == AMR_WB_CORE ) ) + if ( st->core == HQ_CORE && ( st->last_core == ACELP_CORE || st->last_core == AMR_WB_CORE || ( ( st->element_mode != EVS_MONO ) && ( st->last_core != HQ_CORE ) ) ) ) { set_f( st->hHQ_core->prev_env, 0, SFM_N_WB ); set_f( st->hHQ_core->prev_normq, 0, SFM_N_WB ); @@ -418,8 +419,34 @@ ivas_error core_switching_pre_dec( set_f( st->hHQ_core->prev_coeff_out, 0, L_HQ_WB_BWE ); } - set_f( st->hHQ_core->old_out, 0, output_frame ); - set_f( st->hHQ_core->old_outLB, 0, L_FRAME16k ); + if ( st->element_mode != EVS_MONO ) + { + /* Estimate mem_env_delta to reinit env_stab */ + tmp = max( 0, ENV_STAB_EST1 + ( ENV_STAB_EST2 * st->stab_fac_smooth_lt ) + ( ENV_STAB_EST3 * st->log_energy_diff_lt ) ); + st->hHQ_core->mem_env_delta = (int16_t) min( MAX16B, (int32_t) ( tmp * ( 1 << 12 ) ) ); /* Convert to Q12 and handle saturation */ + + if ( st->last_core != TCX_20_CORE && st->last_core != TCX_10_CORE ) + { + set_f( st->hHQ_core->old_out, 0, output_frame ); + set_f( st->hHQ_core->old_outLB, 0, L_FRAME16k ); + } + + st->hHQ_core->no_att_hangover = 0; + st->hHQ_core->energy_lt = 300.0f; + + set_s( st->hHQ_core->old_is_transient, 0, 3 ); + set_f( st->hHQ_core->prev_noise_level, 0.0f, 2 ); + st->hHQ_core->prev_R = 0; + set_s( st->hHQ_core->mem_norm + 1, 39, SFM_N_ENV_STAB - 1 ); + st->hHQ_core->prev_hqswb_clas = HQ_NORMAL; + st->hHQ_core->prev_ni_ratio = 0.5f; + set_f( st->hHQ_core->prev_En_sb, 0.0f, NB_SWB_SUBBANDS ); + } + else + { + set_f( st->hHQ_core->old_out, 0, output_frame ); + set_f( st->hHQ_core->old_outLB, 0, L_FRAME16k ); + } } /* handle switching cases where preecho_sb was not called in the last frame (memory not up to date) */ @@ -529,6 +556,7 @@ ivas_error core_switching_post_dec( float *synth, /* i/o: output synthesis */ float *output, /* i/o: LB synth/upsampled LB synth */ float output_mem[], /* i : OLA memory from last TCX/HQ frame */ + const IVAS_FORMAT ivas_format, /* i : IVAS format */ const int16_t use_cldfb_for_dft, /* i : flag to use of CLDFB for DFT Stereo */ const int16_t output_frame, /* i : frame length */ const int16_t core_switching_flag, /* i : ACELP->HQ switching flag */ @@ -650,10 +678,10 @@ ivas_error core_switching_post_dec( synth[i + delay_comp] = ( synth[i + delay_comp] * i + ( tmpDelta - i ) * st->previoussynth[i + delay_comp] ) / tmpDelta; } - if ( st->element_mode == IVAS_CPE_MDCT && st->last_core_brate <= SID_2k40 && st->core_brate > SID_2k40 ) + if ( ( st->element_mode == IVAS_CPE_MDCT || ( ivas_format == ISM_FORMAT && st->core == TCX_20_CORE /* <- means TCX in general, TCX10 is forbidden after ACELP */ ) ) && st->last_core_brate <= SID_2k40 && st->core_brate > SID_2k40 ) { /* smooth transitions to avoid pops in car noise items */ - smoothTransitionMdctStereoDtx( synth, output_frame, delay_comp ); + smoothTransitionDtxToTcx( synth, output_frame, delay_comp ); } /* Reset memories of CLDFBs */ @@ -1001,7 +1029,7 @@ void bandwidth_switching_detect( { st->bws_cnt1 = 0; } - else if ( st->total_brate > ACELP_9k60 && st->last_core_brate < ACELP_9k60 && st->bwidth == SWB && st->last_bwidth == WB ) + else if ( st->total_brate > ACELP_9k60 && st->last_core_brate < ACELP_9k60 && st->bwidth == SWB && st->last_bwidth == WB && st->last_low_rate_mode == 0 ) { st->bws_cnt1++; } @@ -1218,16 +1246,16 @@ static void core_switch_lb_upsamp( } /*---------------------------------------------------------------------* - * smoothTransitionMdctStereoDtx() + * smoothTransitionDtxToTcx() * - * apply smoothing to the transition part for MDCT-Stereo DTX + * apply smoothing to the transition part for inactive to active transitions in DTX *---------------------------------------------------------------------*/ #define TRANSITION_SMOOTHING_LEN_16k 15 #define TRANSITION_SMOOTHING_LEN_32k 31 #define TRANSITION_SMOOTHING_LEN_48k 47 -static void smoothTransitionMdctStereoDtx( +static void smoothTransitionDtxToTcx( float synth[], /* i/o: synthesis */ const int16_t output_frame, /* i : output frame length */ const int16_t delay_comp /* i : delay compensation in samples */ diff --git a/lib_dec/d_gain2p.c b/lib_dec/d_gain2p.c index 7a0cd8ed4f..d2fe3e8757 100644 --- a/lib_dec/d_gain2p.c +++ b/lib_dec/d_gain2p.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,11 +40,10 @@ #include "debug.h" #endif #include -#include "typedef.h" #include "prot.h" #include "cnst.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * Mode2_gain_dec_mless diff --git a/lib_dec/dec2t32.c b/lib_dec/dec2t32.c index 67981738fc..258e36da41 100644 --- a/lib_dec/dec2t32.c +++ b/lib_dec/dec2t32.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*----------------------------------------------------------------------------------* * dec_acelp_2t32() diff --git a/lib_dec/dec4t64.c b/lib_dec/dec4t64.c index 3a0a6a7e50..9f2ab5d1c2 100644 --- a/lib_dec/dec4t64.c +++ b/lib_dec/dec4t64.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "prot.h" #include "ivas_prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local function prototypes diff --git a/lib_dec/dec_LPD.c b/lib_dec/dec_LPD.c index c06bee28f9..af6a937e11 100644 --- a/lib_dec/dec_LPD.c +++ b/lib_dec/dec_LPD.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -46,7 +46,7 @@ #include "cnst.h" #include "basop_proto_func.h" #include "stat_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* diff --git a/lib_dec/dec_ace.c b/lib_dec/dec_ace.c index 24fbf3149f..ee32d67146 100644 --- a/lib_dec/dec_ace.c +++ b/lib_dec/dec_ace.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #endif #include #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * decoder_acelp() diff --git a/lib_dec/dec_acelp.c b/lib_dec/dec_acelp.c index 7ccdee8888..615fa8eae1 100644 --- a/lib_dec/dec_acelp.c +++ b/lib_dec/dec_acelp.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,10 +37,9 @@ #include #include #include "options.h" -#include "typedef.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local function prototypes diff --git a/lib_dec/dec_acelp_tcx_main.c b/lib_dec/dec_acelp_tcx_main.c index b9d3481579..1ab6b52659 100644 --- a/lib_dec/dec_acelp_tcx_main.c +++ b/lib_dec/dec_acelp_tcx_main.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "debug.h" #endif #include "stat_dec.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * decode_frame_type() @@ -295,7 +295,7 @@ void dec_acelp_tcx_frame( float old_bwe_exc[( PIT16k_MAX + ( L_FRAME16k + 1 ) + L_SUBFR16k ) * 2]; /* excitation buffer */ float *ptr_bwe_exc; /* pointer to BWE excitation signal in the current frame */ - wmops_sub_start( "dec_acelp_tcx_frame" ); + push_wmops( "dec_acelp_tcx_frame" ); start_bit_pos = st->next_bit_pos; if ( st->rf_flag == 1 ) @@ -479,6 +479,6 @@ void dec_acelp_tcx_frame( st->last_coder_type = INACTIVE; } - wmops_sub_end(); + pop_wmops(); return; } diff --git a/lib_dec/dec_amr_wb.c b/lib_dec/dec_amr_wb.c index 79c9b8d951..29fe0a253e 100644 --- a/lib_dec/dec_amr_wb.c +++ b/lib_dec/dec_amr_wb.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * decod_amr_wb() diff --git a/lib_dec/dec_gen_voic.c b/lib_dec/dec_gen_voic.c index 0151abcbba..c8220be861 100644 --- a/lib_dec/dec_gen_voic.c +++ b/lib_dec/dec_gen_voic.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * decod_gen_voic() @@ -285,8 +285,8 @@ ivas_error decod_gen_voic( } } - dynamic_free( PREVP ); - dynamic_free( CURRP ); + free( PREVP ); + free( CURRP ); } } diff --git a/lib_dec/dec_higher_acelp.c b/lib_dec/dec_higher_acelp.c index 32b5b70514..1990de9363 100644 --- a/lib_dec/dec_higher_acelp.c +++ b/lib_dec/dec_higher_acelp.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------* * transf_cdbk_dec() diff --git a/lib_dec/dec_nelp.c b/lib_dec/dec_nelp.c index 2cdcd126db..8516f4cfd1 100644 --- a/lib_dec/dec_nelp.c +++ b/lib_dec/dec_nelp.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * decod_nelp() diff --git a/lib_dec/dec_pit_exc.c b/lib_dec/dec_pit_exc.c index 547e321aaf..2b67a6042f 100644 --- a/lib_dec/dec_pit_exc.c +++ b/lib_dec/dec_pit_exc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * dec_pit_exc() diff --git a/lib_dec/dec_post.c b/lib_dec/dec_post.c index 9c90fcac62..6c5cd0423b 100644 --- a/lib_dec/dec_post.c +++ b/lib_dec/dec_post.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local constants diff --git a/lib_dec/dec_ppp.c b/lib_dec/dec_ppp.c index c6a274bef4..b36f9190a1 100644 --- a/lib_dec/dec_ppp.c +++ b/lib_dec/dec_ppp.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------- * decod_ppp() diff --git a/lib_dec/dec_prm.c b/lib_dec/dec_prm.c index 4027b7f95b..d2e9aa26ef 100644 --- a/lib_dec/dec_prm.c +++ b/lib_dec/dec_prm.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* diff --git a/lib_dec/dec_tcx.c b/lib_dec/dec_tcx.c old mode 100755 new mode 100644 index 14865adc37..9896d1d8c0 --- a/lib_dec/dec_tcx.c +++ b/lib_dec/dec_tcx.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -45,7 +45,7 @@ #include #include "stat_com.h" #include "cnst.h" -#include "wmops.h" +#include "wmc_auto.h" #include "ivas_rom_com.h" #ifdef DEBUG_PLOT #include "deb_out.h" @@ -107,7 +107,8 @@ void decoder_tcx( decoder_tcx_tns( st, L_frame_glob, L_spec, L_frame, L_frameTCX, &x[0], fUseTns, &tnsData, bfi, frame_cnt, 0 ); decoder_tcx_imdct( st, L_frame_glob, L_frameTCX_glob, L_spec, tcx_offset, tcx_offsetFB, L_frame, L_frameTCX, left_rect, &x[0], &xn_buf[0], MDCT_IV, - fUseTns, &synth[0], &synthFB[0], bfi, frame_cnt, 0, sba_dirac_stereo_flag ); + fUseTns, &synth[0], &synthFB[0], bfi, frame_cnt, + sba_dirac_stereo_flag ); return; } @@ -152,11 +153,7 @@ void decoder_tcx_post( if ( bfi && !st->use_partial_copy ) { /* run lpc gain compensation not for waveform adjustment */ -#ifdef FIX_124_DONT_ALLOC_PLCINFO_IN_IVAS if ( !st->enablePlcWaveadjust || ( st->hPlcInfo != NULL && st->hPlcInfo->concealment_method == TCX_TONAL ) ) -#else - if ( !st->enablePlcWaveadjust || st->hPlcInfo->concealment_method == TCX_TONAL ) -#endif { float gainHelperFB = hTcxDec->gainHelper; float stepCompensateFB = hTcxDec->stepCompensate * st->L_frame / hTcxDec->L_frameTCX; @@ -334,7 +331,13 @@ void IMDCT( /* number of zero for ALDO windows*/ nz = NS2SA( st->output_Fs, N_ZERO_MDCT_NS ) * L_frame / L_frameTCX; - if ( ( L_frameTCX == hTcxDec->L_frameTCX >> 1 || st->mct_chan_mode == MCT_CHAN_MODE_LFE ) && ( st->tcxonly ) ) + if ( st->element_mode != EVS_MONO && frame_cnt == 0 && !bfi && st->prev_bfi && ( st->last_core_bfi == TCX_20_CORE || st->last_core_bfi == TCX_10_CORE ) && !hTcxCfg->last_aldo ) + { + v_multc( old_syn_overl, hTcxDec->conceal_eof_gain * st->last_concealed_gain_syn_deemph, old_syn_overl, overlap ); + } + + if ( ( L_frameTCX == hTcxDec->L_frameTCX >> 1 ) && + ( st->tcxonly ) ) { /* Mode decision in PLC @@ -353,7 +356,6 @@ void IMDCT( if ( ( !bfi && hTcxCfg->tcx_last_overlap_mode != FULL_OVERLAP ) || ( bfi && ( hTcxCfg->tcx_last_overlap_mode != FULL_OVERLAP ) && ( hTcxCfg->tcx_curr_overlap_mode != FULL_OVERLAP ) ) ) { - assert( st->mct_chan_mode != MCT_CHAN_MODE_LFE ); /* minimum or half overlap, two transforms, grouping into one window */ L_win = L_frame >> 1; L_ola = ( hTcxCfg->tcx_last_overlap_mode == MIN_OVERLAP ) ? tcx_mdct_window_min_length : tcx_mdct_window_half_length; @@ -391,7 +393,7 @@ void IMDCT( /* To assure that no garbage values are passed to overlap */ set_zero( xn_buf + L_frame + tcx_offset + ( L_ola >> 1 ), overlap - tcx_offset - ( L_ola >> 1 ) ); } - else if ( !bfi && ( frame_cnt == 0 ) && ( hTcxCfg->tcx_curr_overlap_mode == FULL_OVERLAP ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + else if ( !bfi && ( frame_cnt == 0 ) && ( hTcxCfg->tcx_curr_overlap_mode == FULL_OVERLAP ) ) { /* special overlap attempt, two transforms, grouping into one window */ @@ -552,7 +554,9 @@ void IMDCT( /* Window and overlap-add past frame if past frame is TCX */ if ( ( frame_cnt != 0 ) || ( st->last_core_bfi > ACELP_CORE ) ) { - if ( ( ( L_frameTCX == hTcxDec->L_frameTCX >> 1 || st->mct_chan_mode == MCT_CHAN_MODE_LFE ) && ( st->tcxonly ) ) || ( hTcxCfg->tcx_last_overlap_mode == TRANSITION_OVERLAP ) ) + if ( ( ( L_frameTCX == hTcxDec->L_frameTCX >> 1 ) && + ( st->tcxonly ) ) || + ( hTcxCfg->tcx_last_overlap_mode == TRANSITION_OVERLAP ) ) { if ( !bfi && ( frame_cnt > 0 ) && ( index == 0 ) && ( hTcxCfg->tcx_curr_overlap_mode == FULL_OVERLAP ) && ( st->last_core != ACELP_CORE ) ) { @@ -615,7 +619,7 @@ void IMDCT( } } - if ( !aldo && ( ( ( L_frameTCX == hTcxDec->L_frameTCX >> 1 ) && frame_cnt > 0 ) || L_frameTCX != ( hTcxDec->L_frameTCX >> 1 ) ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( !aldo && ( ( ( L_frameTCX == hTcxDec->L_frameTCX >> 1 ) && frame_cnt > 0 ) || L_frameTCX != ( hTcxDec->L_frameTCX >> 1 ) ) ) { /* Compute windowed synthesis in case of switching to ALDO windows in next frame */ mvr2r( xn_buf + L_frame - nz, old_out, nz + overlap ); @@ -1558,7 +1562,6 @@ void decoder_tcx_imdct( float synthFB[], const int16_t bfi, /* i : Bad frame indicator */ const int16_t frame_cnt, /* i : frame counter in the super frame */ - const int16_t isLFE, /* i : is LFE */ const int16_t sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */ ) { @@ -1590,7 +1593,8 @@ void decoder_tcx_imdct( hTcxCfg->tcx_last_overlap_mode = hTcxCfg->tcx_curr_overlap_mode; } - if ( !isLFE && st->igf ) + if ( + st->igf ) { proc = st->hIGFDec->flatteningTrigger; @@ -1688,7 +1692,10 @@ void decoder_tcx_imdct( if ( st->element_mode != IVAS_CPE_DFT && !sba_dirac_stereo_flag ) { - IMDCT( xn_bufFB, hTcxDec->syn_Overl, hTcxDec->syn_Overl_TDAC, xn_buf, st->mct_chan_mode == MCT_CHAN_MODE_LFE ? hTcxCfg->tcx_mdct_window : hTcxCfg->tcx_aldo_window_1_trunc, st->mct_chan_mode == MCT_CHAN_MODE_LFE ? hTcxCfg->tcx_mdct_window : hTcxCfg->tcx_aldo_window_2, hTcxCfg->tcx_mdct_window_half, hTcxCfg->tcx_mdct_window_minimum, hTcxCfg->tcx_mdct_window_trans, hTcxCfg->tcx_mdct_window_half_length, hTcxCfg->tcx_mdct_window_min_length, index, + IMDCT( xn_bufFB, hTcxDec->syn_Overl, hTcxDec->syn_Overl_TDAC, xn_buf, + hTcxCfg->tcx_aldo_window_1_trunc, + hTcxCfg->tcx_aldo_window_2, + hTcxCfg->tcx_mdct_window_half, hTcxCfg->tcx_mdct_window_minimum, hTcxCfg->tcx_mdct_window_trans, hTcxCfg->tcx_mdct_window_half_length, hTcxCfg->tcx_mdct_window_min_length, index, kernelType, left_rect, tcx_offset, overlap, L_frame, L_frameTCX, max( L_frameTCX, L_spec ) >> 1, L_frame_glob, frame_cnt, bfi, st->hHQ_core->old_outLB, 0, st, 0, acelp_zir ); } @@ -1708,7 +1715,9 @@ void decoder_tcx_imdct( if ( st->element_mode != EVS_MONO ) { - IMDCT( x_tmp, hTcxDec->syn_OverlFB, hTcxDec->syn_Overl_TDACFB, xn_bufFB, st->mct_chan_mode == MCT_CHAN_MODE_LFE ? hTcxCfg->tcx_mdct_windowFB : hTcxCfg->tcx_aldo_window_1_FB_trunc, st->mct_chan_mode == MCT_CHAN_MODE_LFE ? hTcxCfg->tcx_mdct_windowFB : hTcxCfg->tcx_aldo_window_2_FB, hTcxCfg->tcx_mdct_window_halfFB, hTcxCfg->tcx_mdct_window_minimumFB, hTcxCfg->tcx_mdct_window_transFB, hTcxCfg->tcx_mdct_window_half_lengthFB, hTcxCfg->tcx_mdct_window_min_lengthFB, index, + IMDCT( x_tmp, hTcxDec->syn_OverlFB, hTcxDec->syn_Overl_TDACFB, xn_bufFB, + hTcxCfg->tcx_aldo_window_1_FB_trunc, hTcxCfg->tcx_aldo_window_2_FB, + hTcxCfg->tcx_mdct_window_halfFB, hTcxCfg->tcx_mdct_window_minimumFB, hTcxCfg->tcx_mdct_window_transFB, hTcxCfg->tcx_mdct_window_half_lengthFB, hTcxCfg->tcx_mdct_window_min_lengthFB, index, kernelType, left_rect, tcx_offsetFB, overlapFB, L_frameTCX, L_frameTCX, max( L_frameTCX, L_spec ) >> 1, L_frameTCX_glob, frame_cnt, bfi, st->hHQ_core->old_out, 1, st, FSCALE_DENOM * L_frameTCX_glob / L_frame_glob, acelp_zir ); } else diff --git a/lib_dec/dec_tran.c b/lib_dec/dec_tran.c index 7120211fb6..875ce5eabf 100644 --- a/lib_dec/dec_tran.c +++ b/lib_dec/dec_tran.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * decod_tran() diff --git a/lib_dec/dec_uv.c b/lib_dec/dec_uv.c index 2839521091..63c4b1d3bd 100644 --- a/lib_dec/dec_uv.c +++ b/lib_dec/dec_uv.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,7 +37,7 @@ #include #include "options.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * decod_unvoiced() diff --git a/lib_dec/decision_matrix_dec.c b/lib_dec/decision_matrix_dec.c index cb604dc5f7..84e6e9573e 100644 --- a/lib_dec/decision_matrix_dec.c +++ b/lib_dec/decision_matrix_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "stat_dec.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------* * decision_matrix_dec() diff --git a/lib_dec/dlpc_avq.c b/lib_dec/dlpc_avq.c index 2a89cdb35c..b4a95fd74d 100644 --- a/lib_dec/dlpc_avq.c +++ b/lib_dec/dlpc_avq.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #include "options.h" #include "prot.h" #include "ivas_prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------* * dlpc_avq() diff --git a/lib_dec/dlpc_stoch.c b/lib_dec/dlpc_stoch.c index 21b1ab2d8d..9a86d06224 100644 --- a/lib_dec/dlpc_stoch.c +++ b/lib_dec/dlpc_stoch.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "prot.h" #include "rom_com.h" #include "basop_proto_func.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------* * lpc_unquantize() @@ -81,32 +81,31 @@ void lpc_unquantize( { if ( st->sr_core == INT_FS_16k && coder_type == UNVOICED ) { - lsf_end_dec( st, GENERIC, 1 - st->narrowBand /* st->bwidth */, ENDLSF_NBITS, &lsf[M], param_lpc, LSF_Q_prediction, &nb_indices #ifdef LSF_RE_USE_SECONDARY_CHANNEL - , - NULL + lsf_end_dec( st, GENERIC, 1 - st->narrowBand /* st->bwidth */, ENDLSF_NBITS, &lsf[M], param_lpc, LSF_Q_prediction, &nb_indices, NULL ); +#else + lsf_end_dec( st, GENERIC, 1 - st->narrowBand /* st->bwidth */, ENDLSF_NBITS, &lsf[M], param_lpc, LSF_Q_prediction, &nb_indices ); #endif - ); } else { if ( st->core == TCX_20_CORE ) { - lsf_end_dec( st, AUDIO, 1 - st->narrowBand /* st->bwidth */, ENDLSF_NBITS, &lsf[M], param_lpc, LSF_Q_prediction, &nb_indices #ifdef LSF_RE_USE_SECONDARY_CHANNEL - , - NULL + lsf_end_dec( st, AUDIO, 1 - st->narrowBand /* st->bwidth */, ENDLSF_NBITS, &lsf[M], param_lpc, LSF_Q_prediction, &nb_indices, NULL ); +#else + lsf_end_dec( st, AUDIO, 1 - st->narrowBand /* st->bwidth */, ENDLSF_NBITS, &lsf[M], param_lpc, LSF_Q_prediction, &nb_indices ); #endif - ); } else { - lsf_end_dec( st, coder_type, 1 - st->narrowBand /* st->bwidth */, ENDLSF_NBITS, &lsf[M], param_lpc, LSF_Q_prediction, &nb_indices #ifdef LSF_RE_USE_SECONDARY_CHANNEL - , - NULL -#endif + lsf_end_dec( st, coder_type, 1 - st->narrowBand /* st->bwidth */, ENDLSF_NBITS, &lsf[M], param_lpc, LSF_Q_prediction, &nb_indices, NULL ); +#else + lsf_end_dec( st, coder_type, 1 - st->narrowBand /* st->bwidth */, ENDLSF_NBITS, &lsf[M], param_lpc, LSF_Q_prediction, &nb_indices + ); +#endif } } diff --git a/lib_dec/er_dec_acelp.c b/lib_dec/er_dec_acelp.c index 4e0d5c9b48..7024cfb3f8 100644 --- a/lib_dec/er_dec_acelp.c +++ b/lib_dec/er_dec_acelp.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #endif #include #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * con_acelp() diff --git a/lib_dec/er_dec_tcx.c b/lib_dec/er_dec_tcx.c index 6710e2a6ff..1ce3bf2035 100644 --- a/lib_dec/er_dec_tcx.c +++ b/lib_dec/er_dec_tcx.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -45,7 +45,7 @@ #include #include "prot.h" #include "rom_dec.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------* * con_tcx() diff --git a/lib_dec/er_scale_syn.c b/lib_dec/er_scale_syn.c index 1ae7f57104..d6d048b234 100644 --- a/lib_dec/er_scale_syn.c +++ b/lib_dec/er_scale_syn.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include #include "prot.h" #include "cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /*----------------------------------------------------------------------------------* diff --git a/lib_dec/er_sync_exc.c b/lib_dec/er_sync_exc.c index 3a66e83129..b28a172715 100644 --- a/lib_dec/er_sync_exc.c +++ b/lib_dec/er_sync_exc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include #include "prot.h" #include "cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_dec/er_util.c b/lib_dec/er_util.c index f907781c29..5326f28e90 100644 --- a/lib_dec/er_util.c +++ b/lib_dec/er_util.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "prot.h" #include "cnst.h" #include "stat_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* @@ -318,8 +318,7 @@ int16_t GetPLCModeDecision( { TonalMDCTConceal_Detect( st->hTonalMDCTConc, ( hTcxDec->tcxltp_last_gain_unmodified > 0 ) ? st->old_fpitch : 0, &numIndices, - ( st->element_mode == IVAS_CPE_MDCT ? &( st->hTcxCfg->psychParamsTCX20 ) : st->hTcxCfg->psychParamsCurrent ), - st->mct_chan_mode == MCT_CHAN_MODE_LFE ); + ( st->element_mode == IVAS_CPE_MDCT ? &( st->hTcxCfg->psychParamsTCX20 ) : st->hTcxCfg->psychParamsCurrent ) ); if ( ( numIndices > 10 ) || ( ( numIndices > 5 ) && ( fabs( hTcxDec->tcxltp_third_last_pitch - hTcxDec->tcxltp_second_last_pitch ) < 0.5f ) ) || ( ( numIndices > 0 ) && ( ( st->last_good <= UNVOICED_TRANSITION ) || ( hTcxDec->tcxltp_last_gain_unmodified <= 0.4f ) ) && ( fabs( hTcxDec->tcxltp_third_last_pitch - hTcxDec->tcxltp_second_last_pitch ) < 0.5f ) ) ) { diff --git a/lib_dec/evs_dec.c b/lib_dec/evs_dec.c index 299e6a31ce..8ea2d71159 100644 --- a/lib_dec/evs_dec.c +++ b/lib_dec/evs_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" #ifdef DEBUG_PLOT #include "deb_out.h" #endif @@ -86,7 +86,7 @@ ivas_error evs_dec( error = IVAS_ERR_OK; - wmops_sub_start( "evs_dec" ); + push_wmops( "evs_dec" ); /*------------------------------------------------------------------* * Initialization *-----------------------------------------------------------------*/ @@ -261,7 +261,11 @@ ivas_error evs_dec( if ( st->core == ACELP_CORE ) { /* ACELP core decoder */ +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + if ( ( error = acelp_core_dec( st, NULL, synth, NULL, bwe_exc_extended, voice_factors, old_syn_12k8_16k, sharpFlag, pitch_buf, &unbits, &sid_bw, NULL, NULL, NULL, 0, EVS_MONO, 0, 0, 1, NULL, 1 ) ) != IVAS_ERR_OK ) +#else if ( ( error = acelp_core_dec( st, NULL, synth, NULL, bwe_exc_extended, voice_factors, old_syn_12k8_16k, sharpFlag, pitch_buf, &unbits, &sid_bw, NULL, NULL, NULL, 0, EVS_MONO, 0, 0, 1, NULL ) ) != IVAS_ERR_OK ) +#endif { return error; } @@ -276,7 +280,7 @@ ivas_error evs_dec( * Postprocessing for ACELP/MDCT core switching *---------------------------------------------------------------------*/ - if ( ( error = core_switching_post_dec( st, synth, NULL, NULL, 0, output_frame, core_switching_flag, 0, -1, EVS_MONO ) ) != IVAS_ERR_OK ) + if ( ( error = core_switching_post_dec( st, synth, NULL, NULL, 0, MONO_FORMAT, output_frame, core_switching_flag, 0, -1, EVS_MONO ) ) != IVAS_ERR_OK ) { return error; } @@ -285,7 +289,7 @@ ivas_error evs_dec( /*---------------------------------------------------------------------* * Pre-processing for bandwidth switching *---------------------------------------------------------------------*/ - wmops_sub_start( "BWE_decoding" ); + push_wmops( "BWE_decoding" ); bw_switching_pre_proc( st, old_syn_12k8_16k, -1, 1 ); @@ -356,7 +360,7 @@ ivas_error evs_dec( swb_CNG_dec( st, synth, hb_synth, sid_bw ); } - wmops_sub_end(); + pop_wmops(); /*----------------------------------------------------------------* * Delay ACELP core synthesis to be synchronized with the components of bandwidth extension layers @@ -975,6 +979,6 @@ ivas_error evs_dec( } #endif - wmops_sub_end(); + pop_wmops(); return error; } diff --git a/lib_dec/fd_cng_dec.c b/lib_dec/fd_cng_dec.c index ce25292957..cae9b6945f 100644 --- a/lib_dec/fd_cng_dec.c +++ b/lib_dec/fd_cng_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -35,7 +35,6 @@ ====================================================================================*/ #include -#include "typedef.h" #include #include "options.h" #ifdef DEBUGGING @@ -45,7 +44,7 @@ #include "prot.h" #include "ivas_prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" #include "ivas_prot.h" #include "ivas_rom_dec.h" @@ -59,6 +58,14 @@ #define CNA_ACT_DN_FACT 0.7 /* downward updating factor for CNA during active frames */ #define FIRST_CNA_NOISE_UPD_FRAMES 5 /* minimum number of CN initialization frames */ + +/*------------------------------------------------------------------- + * Local fucntions declarations + *-------------------------------------------------------------------*/ + +static void perform_noise_estimation_dec( const float *timeDomainInput, float *power_spectrum, HANDLE_FD_CNG_DEC hFdCngDec, const int16_t element_mode, const int16_t bwidth, const int16_t L_frame, const int16_t last_L_frame, const int32_t last_core_brate, const int16_t VAD ); + + /*------------------------------------------------------------------- * createFdCngDec() * @@ -76,8 +83,7 @@ ivas_error createFdCngDec( *hFdCngDec = NULL; /* Allocate memory */ - hs = (HANDLE_FD_CNG_DEC) count_malloc( sizeof( FD_CNG_DEC ) ); - if ( hs == NULL ) + if ( ( hs = (HANDLE_FD_CNG_DEC) malloc( sizeof( FD_CNG_DEC ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for FD CNG DEC structure" ); } @@ -352,7 +358,7 @@ void deleteFdCngDec( if ( hsDec != NULL ) { deleteFdCngCom( &( hsDec->hFdCngCom ) ); - count_free( hsDec ); + free( hsDec ); *hFdCngDec = NULL; } @@ -385,7 +391,7 @@ void ApplyFdCng( int16_t L_frame, last_L_frame; int32_t sr_core; - wmops_sub_start( "ApplyFdCng" ); + push_wmops( "ApplyFdCng" ); /* limit L_frame and core Fs values for MDCT-Stereo modes which can have higher core sampling than 16kHz, but use a downsampled buffer */ L_frame = min( st->L_frame, L_FRAME16k ); @@ -419,7 +425,7 @@ void ApplyFdCng( ( *timeDomainInput( -FLT_MAX ) && *( timeDomainInput + hFdCngCom->frameSize - 1 ) < FLT_MAX && *( timeDomainInput + hFdCngCom->frameSize - 1 ) > ( -FLT_MAX ) ) ) && - ( ( ( ( st->element_mode != IVAS_CPE_TD && st->element_mode != IVAS_CPE_DFT && hFdCngDec->flag_dtx_mode ) || !st->VAD ) && + ( ( ( ( st->element_mode != IVAS_CPE_TD && st->element_mode != IVAS_CPE_DFT && hFdCngDec->flag_dtx_mode ) || !st->VAD || ( st->ini_frame < 100 && st->is_ism_format ) ) && !( st->cng_type == LP_CNG && hFdCngDec->flag_dtx_mode ) && ( is_music == 0 ) ) || ( st->element_mode == IVAS_CPE_TD ) ) && ( !st->BER_detect ) ) @@ -608,7 +614,7 @@ void ApplyFdCng( break; } - wmops_sub_end(); + pop_wmops(); return; } @@ -620,7 +626,7 @@ void ApplyFdCng( * Perform noise estimation at the decoder *-------------------------------------------------------------------*/ -void perform_noise_estimation_dec( +static void perform_noise_estimation_dec( const float *timeDomainInput, float *power_spectrum, HANDLE_FD_CNG_DEC hFdCngDec, /* i/o: FD_CNG structure containing all buffers and variables */ @@ -960,10 +966,20 @@ void FdCng_decodeSID( float v[32]; int16_t indices[32]; HANDLE_FD_CNG_COM hFdCngCom; +#ifdef ERI_FDCNGVQ_LOW_ROM + float *invTrfMatrix; + float tmpRAM[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC]; +#endif +#ifndef ERI_FDCNGVQ_LOW_ROM const float *const *codebooks = ( st->element_mode == EVS_MONO ) ? cdk_37bits : cdk_37bits_ivas; +#endif const float gain_q_offset = ( st->element_mode == EVS_MONO ) ? GAIN_Q_OFFSET_EVS : GAIN_Q_OFFSET_IVAS; +#ifdef ERI_FDCNGVQ_LOW_ROM + invTrfMatrix = (float *) tmpRAM; +#endif + hFdCngCom = ( st->hFdCngDec )->hFdCngCom; sidNoiseEst = hFdCngCom->sidNoiseEst; @@ -981,7 +997,21 @@ void FdCng_decodeSID( index = get_next_indice( st, 7 ); /* MSVQ decoder */ + +#ifdef ERI_FDCNGVQ_LOW_ROM + if ( st->element_mode != EVS_MONO ) + { + create_IDCT_N_Matrix( invTrfMatrix, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, sizeof( tmpRAM ) / ( sizeof( float ) ) ); + msvq_dec( cdk_37bits_ivas, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, 1, invTrfMatrix, v, NULL ); + } + else + { /* Legacy EVS_MONO MSVQ tables */ + msvq_dec( cdk_37bits, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, 0, NULL, v, NULL ); + } + +#else msvq_dec( codebooks, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, v, NULL ); +#endif /* Decode gain */ gain = ( (float) index - gain_q_offset ) / 1.5f; @@ -1085,7 +1115,7 @@ void generate_comfort_noise_dec( c2 = (float) sqrt( 1 - hFdCngCom->coherence ); seed2 = &( hFdCngCom->seed2 ); - if ( st->element_mode == IVAS_CPE_MDCT && st->idchan == 1 ) + if ( ( st->element_mode == IVAS_CPE_MDCT && st->idchan == 1 ) || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) ) { seed2 = &( hFdCngCom->seed3 ); } @@ -1095,7 +1125,7 @@ void generate_comfort_noise_dec( if ( hFdCngCom->startBand == 0 ) { - if ( st->element_mode == IVAS_CPE_MDCT ) + if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) ) { rand_gauss( &tmp1, seed ); rand_gauss( &tmp2, seed2 ); @@ -1120,7 +1150,7 @@ void generate_comfort_noise_dec( for ( ; ptr_level < cngNoiseLevel + hFdCngCom->stopFFTbin - hFdCngCom->startBand; ptr_level++ ) { /* Real part in FFT bins */ - if ( st->element_mode == IVAS_CPE_MDCT ) + if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) ) { rand_gauss( &tmp1, seed ); rand_gauss( &tmp2, seed2 ); @@ -1134,7 +1164,7 @@ void generate_comfort_noise_dec( ptr_r += 2; /* Imaginary part in FFT bins */ - if ( st->element_mode == IVAS_CPE_MDCT ) + if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) ) { rand_gauss( &tmp1, seed ); rand_gauss( &tmp2, seed2 ); @@ -1212,7 +1242,7 @@ void generate_comfort_noise_dec( for ( i = 0; i < hFdCngCom->numSlots; i++ ) { /* Real part in CLDFB band */ - if ( st->element_mode == IVAS_CPE_MDCT ) + if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) ) { rand_gauss( &tmp1, seed ); rand_gauss( &tmp2, seed2 ); @@ -1225,7 +1255,7 @@ void generate_comfort_noise_dec( bufferReal[i][j] *= (float) sqrt( ( scaleCldfb * *ptr_level ) * 0.5f ); /* Imaginary part in CLDFB band */ - if ( st->element_mode == IVAS_CPE_MDCT ) + if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) ) { rand_gauss( &tmp1, seed ); rand_gauss( &tmp2, seed2 ); @@ -1322,16 +1352,29 @@ void generate_comfort_noise_dec( *-------------------------------------------------------------------*/ void generate_comfort_noise_dec_hf( - float **bufferReal, /* o : Real part of input bands */ - float **bufferImag, /* o : Imaginary part of input bands */ - HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */ + float **bufferReal, /* o : Real part of input bands */ + float **bufferImag, /* o : Imaginary part of input bands */ + HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */ + const int16_t cng_coh_flag /* i : CNG Flag for coherence handling */ ) { int16_t i, j; float *ptr_level; + int16_t *seed = &( hFdCngCom->seed ); float scale = CLDFB_SCALING / hFdCngCom->scalingFactor; + int16_t *seed2 = &( hFdCngCom->seed ); + float tmp1, tmp2, c1 = 0.f, c2 = 0.f; + + if ( cng_coh_flag ) + { + seed2 = &( hFdCngCom->seed3 ); + + c1 = (float) sqrt( hFdCngCom->coherence ); // VE!!!!! all occurences of "(float) sqrt()" should be replaced by "sqrtf()" + c2 = (float) sqrt( 1 - hFdCngCom->coherence ); + } + ptr_level = hFdCngCom->cngNoiseLevel + hFdCngCom->stopFFTbin - hFdCngCom->startBand; /* Generate Gaussian random noise in real and imaginary parts of the CLDFB bands @@ -1343,12 +1386,29 @@ void generate_comfort_noise_dec_hf( { for ( i = 0; i < hFdCngCom->numSlots; i++ ) { - /* Real part in CLDFB band */ - rand_gauss( &bufferReal[i][j], seed ); - bufferReal[i][j] *= (float) sqrt( ( scale * *ptr_level ) * 0.5f ); - /* Imaginary part in CLDFB band */ - rand_gauss( &bufferImag[i][j], seed ); - bufferImag[i][j] *= (float) sqrt( ( scale * *ptr_level ) * 0.5f ); + if ( cng_coh_flag ) + { + /* Real part in CLDFB band */ + rand_gauss( &tmp1, seed ); + rand_gauss( &tmp2, seed2 ); + bufferReal[i][j] = tmp1 * c1 + tmp2 * c2; + bufferReal[i][j] *= (float) sqrt( ( scale * *ptr_level ) * 0.5f ); + + /* Imaginary part in CLDFB band */ + rand_gauss( &tmp1, seed ); + rand_gauss( &tmp2, seed2 ); + bufferImag[i][j] = tmp1 * c1 + tmp2 * c2; + bufferImag[i][j] *= (float) sqrt( ( scale * *ptr_level ) * 0.5f ); + } + else + { + /* Real part in CLDFB band */ + rand_gauss( &bufferReal[i][j], seed ); + bufferReal[i][j] *= (float) sqrt( ( scale * *ptr_level ) * 0.5f ); + /* Imaginary part in CLDFB band */ + rand_gauss( &bufferImag[i][j], seed ); + bufferImag[i][j] *= (float) sqrt( ( scale * *ptr_level ) * 0.5f ); + } } ptr_level++; } @@ -1771,7 +1831,7 @@ void generate_masking_noise_dirac( int16_t *seed = &( hFdCngCom->seed ); float scale; - wmops_sub_start( "fd_cng_dirac" ); + push_wmops( "fd_cng_dirac" ); /* Init */ scale = 0.f; @@ -1930,7 +1990,7 @@ void generate_masking_noise_dirac( } } - wmops_sub_end(); + pop_wmops(); return; } @@ -1956,6 +2016,16 @@ void FdCngDecodeMDCTStereoSID( int16_t indices[FD_CNG_stages_37bits]; int16_t N, i, ch, p, stages; int16_t is_out_ms; +#ifdef ERI_FDCNGVQ_LOW_ROM + float *invTrfMatrix; + float tmpRAM[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC]; +#endif + + +#ifdef ERI_FDCNGVQ_LOW_ROM + invTrfMatrix = (float *) tmpRAM; + create_IDCT_N_Matrix( invTrfMatrix, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, sizeof( tmpRAM ) / ( sizeof( float ) ) ); +#endif is_out_ms = 0; if ( hCPE->hCoreCoder[0]->cng_sba_flag ) @@ -1999,7 +2069,11 @@ void FdCngDecodeMDCTStereoSID( } /* MSVQ decoder */ +#ifdef ERI_FDCNGVQ_LOW_ROM + msvq_dec( cdk_37bits_ivas, NULL, NULL, stages, N, FD_CNG_maxN_37bits, indices, 1, invTrfMatrix, ms_ptr[ch], NULL ); +#else msvq_dec( cdk_37bits_ivas, NULL, NULL, stages, N, FD_CNG_maxN_37bits, indices, ms_ptr[ch], NULL ); +#endif } dtx_read_padding_bits( sts[1], ( IVAS_SID_5k2 - 4400 ) / FRAMES_PER_SEC ); @@ -2043,7 +2117,7 @@ void FdCngDecodeMDCTStereoSID( /*------------------------------------------------------------------- * FdCngDecodeDiracMDCTStereoSID() * - * Decode FD-Cng parameters for CNG in 2TC DirAC mode from the bitstream + * Decode FD-CNG parameters for CNG in 2TC DirAC mode from the bitstream *-------------------------------------------------------------------*/ void FdCngDecodeDiracMDCTStereoSID( @@ -2058,6 +2132,16 @@ void FdCngDecodeDiracMDCTStereoSID( float gain[CPE_CHANNELS]; int16_t indices[FD_CNG_stages_37bits]; int16_t N, i, ch, p; +#ifdef ERI_FDCNGVQ_LOW_ROM + float *invTrfMatrix; + float tmpRAM[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC]; +#endif + + +#ifdef ERI_FDCNGVQ_LOW_ROM + invTrfMatrix = (float *) tmpRAM; /* dynamically filled */ + create_IDCT_N_Matrix( invTrfMatrix, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, sizeof( tmpRAM ) / ( sizeof( float ) ) ); +#endif for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { @@ -2080,7 +2164,11 @@ void FdCngDecodeDiracMDCTStereoSID( gain[1] = gain[0]; /* MSVQ decoder */ +#ifdef ERI_FDCNGVQ_LOW_ROM + msvq_dec( cdk_37bits_ivas, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, 1, invTrfMatrix, ms_ptr[0], NULL ); +#else msvq_dec( cdk_37bits_ivas, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, ms_ptr[0], NULL ); +#endif mvr2r( ms_ptr[0], ms_ptr[1], N ); /*inverseMS( N, ms_ptr[0], ms_ptr[1], 1.f );*/ diff --git a/lib_dec/gain_dec.c b/lib_dec/gain_dec.c index dd8a58637c..99eecba56a 100644 --- a/lib_dec/gain_dec.c +++ b/lib_dec/gain_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Es_pred_dec() diff --git a/lib_dec/gaus_dec.c b/lib_dec/gaus_dec.c index fed8ab60ac..a053597722 100644 --- a/lib_dec/gaus_dec.c +++ b/lib_dec/gaus_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local function prototypes diff --git a/lib_dec/gs_dec.c b/lib_dec/gs_dec.c index f1b4e997af..29e134db25 100644 --- a/lib_dec/gs_dec.c +++ b/lib_dec/gs_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "rom_com.h" #include "prot.h" #include "ivas_prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * decod_audio() @@ -111,7 +111,11 @@ void decod_audio( } /* set bit-allocation */ +#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE + config_acelp1( DEC, st->total_brate, st->core_brate, st->core, st->extl_orig, st->extl_brate_orig, st->L_frame, st->GSC_noisy_speech, &( st->acelp_cfg ), st->next_bit_pos, st->coder_type, -1, 1, &nb_bits, NULL, st->element_mode, &nbits /*dummy*/, tdm_lp_reuse_flag, tdm_low_rate_mode, st->idchan, st->active_cnt, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode ); +#else config_acelp1( DEC, st->total_brate, st->core_brate, st->core, st->extl_orig, st->extl_brate_orig, st->L_frame, st->GSC_noisy_speech, &( st->acelp_cfg ), st->next_bit_pos, st->coder_type, -1, 1, &nb_bits, NULL, st->element_mode, &nbits /*dummy*/, tdm_lp_reuse_flag, tdm_low_rate_mode, st->idchan, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode ); +#endif /*---------------------------------------------------------------* * Decode energy dynamics diff --git a/lib_dec/gs_dec_amr_wb.c b/lib_dec/gs_dec_amr_wb.c index 956e065031..1d41f367f4 100644 --- a/lib_dec/gs_dec_amr_wb.c +++ b/lib_dec/gs_dec_amr_wb.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_dec/hdecnrm.c b/lib_dec/hdecnrm.c index f1a119a867..1f247ef1f0 100644 --- a/lib_dec/hdecnrm.c +++ b/lib_dec/hdecnrm.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "prot.h" #include "rom_com.h" #include "rom_dec.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------*/ diff --git a/lib_dec/hf_synth.c b/lib_dec/hf_synth.c index 9c0f2c8463..a4d75b4e9a 100644 --- a/lib_dec/hf_synth.c +++ b/lib_dec/hf_synth.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local function prototypes diff --git a/lib_dec/hq_classifier_dec.c b/lib_dec/hq_classifier_dec.c index 38a0230079..10a1a783fc 100644 --- a/lib_dec/hq_classifier_dec.c +++ b/lib_dec/hq_classifier_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * hq_classifier_dec() diff --git a/lib_dec/hq_conf_fec.c b/lib_dec/hq_conf_fec.c index 5e0e6426f2..7d3c79fcf2 100644 --- a/lib_dec/hq_conf_fec.c +++ b/lib_dec/hq_conf_fec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * hq_configure_bfi() diff --git a/lib_dec/hq_core_dec.c b/lib_dec/hq_core_dec.c index 547354eddc..cdb9601679 100644 --- a/lib_dec/hq_core_dec.c +++ b/lib_dec/hq_core_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" #include "ivas_prot.h" @@ -87,7 +87,7 @@ void hq_core_dec( int16_t mdctWindowLength; int16_t mdctWindowLengthFB; - wmops_sub_start( "hq_core_dec" ); + push_wmops( "hq_core_dec" ); /*-------------------------------------------------------------------------- * Initializations *--------------------------------------------------------------------------*/ @@ -249,7 +249,7 @@ void hq_core_dec( else { /* HQ high rate decoder */ - hq_hr_dec( st, t_audio_q, L_spec, num_bits, ynrm, &is_transient, &hqswb_clas, SWB_fenv ); + hq_hr_dec( st, t_audio_q, L_spec, num_bits, ynrm, &is_transient, &hqswb_clas, SWB_fenv, core_switching_flag ); } if ( st->element_mode == EVS_MONO || ( !core_switching_flag && !hq_recovery_flag ) ) @@ -495,7 +495,7 @@ void hq_core_dec( mvr2r( output, st->old_exc + L_EXC_MEM_DEC - st->L_frame, st->L_frame ); } - wmops_sub_end(); + pop_wmops(); return; } diff --git a/lib_dec/hq_env_dec.c b/lib_dec/hq_env_dec.c index d4abecfc5d..e584bfa827 100644 --- a/lib_dec/hq_env_dec.c +++ b/lib_dec/hq_env_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------* * decode_envelope_indices() diff --git a/lib_dec/hq_hr_dec.c b/lib_dec/hq_hr_dec.c index 3eb1108b24..5153af07ea 100644 --- a/lib_dec/hq_hr_dec.c +++ b/lib_dec/hq_hr_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * hq_pred_hb_bws() @@ -100,14 +100,15 @@ static void hq_pred_hb_bws( *--------------------------------------------------------------------------*/ void hq_hr_dec( - Decoder_State *st, /* i/o: decoder state structure */ - float *t_audio_q, /* o : transform-domain coefficients */ - const int16_t length, /* i : frame length */ - const int16_t num_bits, /* i : number of available bits */ - int16_t *ynrm, /* o : norm quantization index vector */ - int16_t *is_transient, /* o : transient flag */ - int16_t *hqswb_clas, /* o : HQ SWB class */ - float *SWB_fenv /* o : SWB frequency envelopes */ + Decoder_State *st, /* i/o: decoder state structure */ + float *t_audio_q, /* o : transform-domain coefficients */ + const int16_t length, /* i : frame length */ + const int16_t num_bits, /* i : number of available bits */ + int16_t *ynrm, /* o : norm quantization index vector */ + int16_t *is_transient, /* o : transient flag */ + int16_t *hqswb_clas, /* o : HQ SWB class */ + float *SWB_fenv, /* o : SWB frequency envelopes */ + const int16_t core_switching_flag /* i : Core switching flag */ ) { int16_t nb_sfm; @@ -193,9 +194,9 @@ void hq_hr_dec( { hHQ_core->mem_env_delta = 0; } - else if ( length == L_FRAME32k ) + else if ( length == L_FRAME32k || ( core_switching_flag && ( st->element_mode != EVS_MONO ) && length == L_SPEC32k_EXT ) ) { - env_stab = env_stability( ynrm, SFM_N_ENV_STAB, hHQ_core->mem_norm, &hHQ_core->mem_env_delta ); + env_stab = env_stability( ynrm, SFM_N_ENV_STAB, hHQ_core->mem_norm, &hHQ_core->mem_env_delta, core_switching_flag && ( st->element_mode != EVS_MONO ) ); } else { @@ -209,13 +210,13 @@ void hq_hr_dec( } else { - if ( length == L_FRAME32k ) + if ( length == L_FRAME32k || ( core_switching_flag && ( st->element_mode != EVS_MONO ) && length == L_SPEC32k_EXT ) ) { hHQ_core->env_stab = env_stab; /* calculated stability */ } else { - hHQ_core->env_stab = env_stability( ynrm, SFM_N_ENV_STAB_WB, hHQ_core->mem_norm_hqfec, &hHQ_core->mem_env_delta_hqfec ); + hHQ_core->env_stab = env_stability( ynrm, SFM_N_ENV_STAB_WB, hHQ_core->mem_norm_hqfec, &hHQ_core->mem_env_delta_hqfec, core_switching_flag && ( st->element_mode != EVS_MONO ) ); } } hHQ_core->env_stab_plc = env_stab_smo( min( hHQ_core->env_stab, 1.0f - stab_trans[L_STAB_TBL - 1] ), hHQ_core->env_stab_state_p, &hHQ_core->envstabplc_hocnt ); diff --git a/lib_dec/hq_lr_dec.c b/lib_dec/hq_lr_dec.c index 5e7584384d..774720844c 100644 --- a/lib_dec/hq_lr_dec.c +++ b/lib_dec/hq_lr_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -46,7 +46,7 @@ #include "prot.h" #include "stl.h" #include "basop_util.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * Local function prototypes @@ -238,7 +238,7 @@ void hq_lr_dec( if ( flag_spt == 1 ) { - /* initalize the desired parameters for SPT */ + /* initialize the desired parameters for SPT */ spt_shorten_domain_band_save( bands, band_start, band_end, band_width, org_band_start, org_band_end, org_band_width ); spt_shorten_domain_pre( band_start, band_end, hHQ_core->prev_SWB_peak_pos, bands, bwe_br, new_band_start, new_band_end, new_band_width ); spt_shorten_domain_set_dec( st, p2a_flags, new_band_start, new_band_end, new_band_width, bands, band_start, band_end, band_width, &bit_budget ); @@ -252,7 +252,7 @@ void hq_lr_dec( return; } -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP /* Estimate number of bits per sub-band */ Q_band_energy = SWB_BWE_LR_Qbe; FOR( i = 0; i < bands; i++ ) @@ -295,7 +295,7 @@ void hq_lr_dec( Ep_tmp_fx[i] = L_shr( L_tmp, sub( 15, exp2 ) ); /*Q13 */ Ep_tmp[i] = (float) ( Ep_tmp_fx[i] / pow( 2.0, 13 ) ); } -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP if ( *is_transient == 0 && inner_frame == L_FRAME8k && st->core_brate <= ACELP_13k20 ) { @@ -306,7 +306,7 @@ void hq_lr_dec( last_bitalloc_max_band[i] = get_next_indice( st, 1 ); } -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP lowband = 6; move16(); trans_bit = 2; @@ -567,7 +567,7 @@ void hq_lr_dec( #endif /* BASOP_NOGLOB */ } } -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP for ( i = 0; i < bands; i++ ) { @@ -578,7 +578,7 @@ void hq_lr_dec( } else if ( *is_transient == 0 && inner_frame == L_FRAME16k ) { -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP bit_budget = sub( bit_budget, 2 ); /* bits in high bands to indicate the last 2 subbands is allocated bits or not */ /* decode the last p2a_bands-1 subbands bit-allocation index of the previous frame */ for ( i = 0; i < 2; i++ ) @@ -839,7 +839,7 @@ void hq_lr_dec( L_band_energy_tmp[i] = L_shl( L_tmp, 1 ); /*Q_band_energy */ } } -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP for ( i = 0; i < bands; i++ ) { @@ -1216,14 +1216,14 @@ static float band_energy_dequant( deng_bits += BITS_DE_CMODE; } -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP /* Get the reference energy */ exp_normd = norm_l( L_qint ); div_s( &rev_qint_fx, 0x4000, round_fx( L_shl( L_qint, exp_normd ) ) ); /* Q14-(29+exp_normd-16)+15 */ Qrev_qint = sub( 14 - ( 29 - 16 ) + 15, exp_normd ); bq0 = (int16_t) round_fx( L_shl( L_mult( eref_fx, rev_qint_fx ), sub( 5, Qrev_qint ) ) ); /* 16-(10+Qrev_qint+1) */ -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP /* Reconstruct quantized spectrum */ bq1[0] = bq2[0] + bq0; @@ -1234,11 +1234,11 @@ static float band_energy_dequant( for ( k = 0; k < bands; k++ ) { -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP L_band_energy[k] = L_mls( L_qint, bq1[k] ); move32(); /* 29+0-15 -> Qbe(Q14) */ band_energy[k] = (float) ( L_band_energy[k] / pow( 2.0f, SWB_BWE_LR_Qbe ) ); -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP } if ( is_transient ) @@ -1309,7 +1309,7 @@ static void mdct_spectrum_fine_gain_dec( Word16 Qgt; Word16 temp_lo_fx, temp_hi_fx; -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP /* Fine gain quantization on only the most significant energy bands */ /*delta = qint / gqlevs; */ exp_normn = norm_l( L_qint ); @@ -1334,7 +1334,7 @@ static void mdct_spectrum_fine_gain_dec( gain_table_fx[i] = shl( gain_table_fx[i], sub( 14, Qgt ) ); /* Qgt -> Q14 */ gain_table[i] = (float) ( gain_table_fx[i] / pow( 2.0f, 14 ) ); } -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP for ( k = bands - Ngq; k < bands; k++ ) { diff --git a/lib_dec/igf_dec.c b/lib_dec/igf_dec.c index 2cded75928..a3eefd226e 100644 --- a/lib_dec/igf_dec.c +++ b/lib_dec/igf_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -45,7 +45,7 @@ #include "cnst.h" #include "stat_dec.h" #include "ivas_prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* @@ -1590,10 +1590,19 @@ void init_igf_dec( return; } + +/*-----------------------------------------------------------------------* + * get_igf_startline() + * + * + *-----------------------------------------------------------------------*/ + +/*! r: IGF start line */ int16_t get_igf_startline( - Decoder_State *st, - int16_t L_frame, - int16_t L_frameTCX ) + Decoder_State *st, /* i : decoder state */ + const int16_t L_frame, /* i : length of the frame */ + const int16_t L_frameTCX /* i : full band frame length */ +) { int16_t igf_startline; diff --git a/lib_dec/igf_scf_dec.c b/lib_dec/igf_scf_dec.c index 29660271b3..f152f637a0 100644 --- a/lib_dec/igf_scf_dec.c +++ b/lib_dec/igf_scf_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #include "debug.h" #endif #include "stat_dec.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* diff --git a/lib_dec/init_dec.c b/lib_dec/init_dec.c index 4b74ccebb9..20bc7a0b84 100644 --- a/lib_dec/init_dec.c +++ b/lib_dec/init_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "ivas_cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*----------------------------------------------------------------------* * init_decoder() @@ -107,6 +107,7 @@ ivas_error init_decoder( st->last_good = UNVOICED_CLAS; st->clas_dec = UNVOICED_CLAS; st->low_rate_mode = 0; + st->last_low_rate_mode = 0; st->lp_gainp = 0.0f; st->lp_gainc = 0.0f; @@ -127,6 +128,9 @@ ivas_error init_decoder( st->stab_fac_smooth = 0.0f; set_f( st->agc_mem2, 0, 2 ); set_f( st->mem_syn3, 0, M ); + st->stab_fac_smooth_lt = 0.0f; + st->log_energy_diff_lt = 0.0f; + st->log_energy_old = 0.0f; mvr2r( GEWB_Ave, st->lsf_old, M ); lsf2lsp( st->lsf_old, st->lsp_old, M, INT_FS_12k8 ); @@ -193,7 +197,7 @@ ivas_error init_decoder( if ( ( idchan == 0 && st->element_mode != IVAS_CPE_MDCT ) || st->element_mode == IVAS_CPE_TD ) { - if ( ( st->hGSCDec = (GSC_DEC_HANDLE) count_malloc( sizeof( GSC_DEC_DATA ) ) ) == NULL ) + if ( ( st->hGSCDec = (GSC_DEC_HANDLE) malloc( sizeof( GSC_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for GSC\n" ) ); } @@ -211,7 +215,7 @@ ivas_error init_decoder( if ( st->output_Fs == 16000 && st->element_mode == EVS_MONO ) { - if ( ( st->hWIDec = (WI_DEC_HANDLE) count_malloc( sizeof( WI_DEC_DATA ) ) ) == NULL ) + if ( ( st->hWIDec = (WI_DEC_HANDLE) malloc( sizeof( WI_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FEC WI\n" ) ); } @@ -230,7 +234,7 @@ ivas_error init_decoder( if ( ( idchan == 0 && st->element_mode != IVAS_CPE_MDCT ) || st->element_mode == IVAS_CPE_TD ) { - if ( ( st->hPFstat = (PFSTAT_HANDLE) count_malloc( sizeof( PFSTAT ) ) ) == NULL ) + if ( ( st->hPFstat = (PFSTAT_HANDLE) malloc( sizeof( PFSTAT ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for NB/formant postflter\n" ) ); } @@ -250,7 +254,7 @@ ivas_error init_decoder( if ( ( idchan == 0 && st->element_mode != IVAS_CPE_MDCT ) || st->element_mode == IVAS_CPE_TD ) { - if ( ( st->hBWE_zero = (ZERO_BWE_DEC_HANDLE) count_malloc( sizeof( ZERO_BWE_DEC_DATA ) ) ) == NULL ) + if ( ( st->hBWE_zero = (ZERO_BWE_DEC_HANDLE) malloc( sizeof( ZERO_BWE_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for zero BWE\n" ) ); } @@ -269,7 +273,7 @@ ivas_error init_decoder( if ( ( idchan == 0 && st->element_mode != IVAS_CPE_MDCT ) || st->element_mode == IVAS_CPE_TD ) { - if ( ( st->hMusicPF = (MUSIC_POSTFILT_HANDLE) count_malloc( sizeof( MUSIC_POSTFILT_DATA ) ) ) == NULL ) + if ( ( st->hMusicPF = (MUSIC_POSTFILT_HANDLE) malloc( sizeof( MUSIC_POSTFILT_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LD music postflter\n" ) ); } @@ -295,7 +299,7 @@ ivas_error init_decoder( if ( idchan == 0 && ( st->element_mode == EVS_MONO || st->element_mode == IVAS_CPE_DFT || st->element_mode == IVAS_CPE_TD ) ) { - if ( ( st->hTdCngDec = (TD_CNG_DEC_HANDLE) count_malloc( sizeof( TD_CNG_DEC_DATA ) ) ) == NULL ) + if ( ( st->hTdCngDec = (TD_CNG_DEC_HANDLE) malloc( sizeof( TD_CNG_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DTX/TD CNG\n" ) ); } @@ -322,9 +326,9 @@ ivas_error init_decoder( set_f( st->old_synth_sw, 0.0f, NS2SA( 48000, FRAME_SIZE_NS - ACELP_LOOK_NS - DELAY_BWE_TOTAL_NS ) ); } - if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT || st->element_mode == IVAS_SCE || st->element_mode == EVS_MONO ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT || st->element_mode == IVAS_SCE || st->element_mode == EVS_MONO ) ) { - if ( ( st->hHQ_core = (HQ_DEC_HANDLE) count_malloc( sizeof( HQ_DEC_DATA ) ) ) == NULL ) + if ( ( st->hHQ_core = (HQ_DEC_HANDLE) malloc( sizeof( HQ_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HQ core\n" ) ); } @@ -335,7 +339,7 @@ ivas_error init_decoder( if ( st->element_mode == EVS_MONO ) { /* HQ NB FEC initialization */ - if ( ( st->hHQ_nbfec = (HQ_NBFEC_HANDLE) count_malloc( sizeof( HQ_NBFEC_DATA ) ) ) == NULL ) + if ( ( st->hHQ_nbfec = (HQ_NBFEC_HANDLE) malloc( sizeof( HQ_NBFEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HQ NB FEC\n" ) ); } @@ -359,7 +363,7 @@ ivas_error init_decoder( if ( idchan == 0 && st->element_mode != IVAS_CPE_MDCT ) { - if ( ( st->hBWE_TD = (TD_BWE_DEC_HANDLE) count_malloc( sizeof( TD_BWE_DEC_DATA ) ) ) == NULL ) + if ( ( st->hBWE_TD = (TD_BWE_DEC_HANDLE) malloc( sizeof( TD_BWE_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD BWE\n" ) ); } @@ -380,7 +384,7 @@ ivas_error init_decoder( if ( idchan == 0 && st->element_mode != IVAS_CPE_MDCT ) { - if ( ( st->hBWE_FD = (FD_BWE_DEC_HANDLE) count_malloc( sizeof( FD_BWE_DEC_DATA ) ) ) == NULL ) + if ( ( st->hBWE_FD = (FD_BWE_DEC_HANDLE) malloc( sizeof( FD_BWE_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FD BWE\n" ) ); } @@ -415,7 +419,7 @@ ivas_error init_decoder( if ( st->element_mode == EVS_MONO ) { - if ( ( st->hBWE_FD_HR = (HR_BWE_DEC_HANDLE) count_malloc( sizeof( HR_BWE_DEC_DATA ) ) ) == NULL ) + if ( ( st->hBWE_FD_HR = (HR_BWE_DEC_HANDLE) malloc( sizeof( HR_BWE_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HR BWE\n" ) ); } @@ -433,7 +437,7 @@ ivas_error init_decoder( if ( st->Opt_AMR_WB || st->element_mode == EVS_MONO ) { - if ( ( st->hAmrwb_IO = (AMRWB_IO_DEC_HANDLE) count_malloc( sizeof( AMRWB_IO_DEC_DATA ) ) ) == NULL ) + if ( ( st->hAmrwb_IO = (AMRWB_IO_DEC_HANDLE) malloc( sizeof( AMRWB_IO_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for AMR-WB IO\n" ) ); } @@ -478,7 +482,7 @@ ivas_error init_decoder( if ( ( idchan == 0 && st->element_mode != IVAS_CPE_MDCT ) || st->element_mode == IVAS_CPE_TD ) { - if ( ( st->hBPF = (BPF_DEC_HANDLE) count_malloc( sizeof( BPF_DEC_DATA ) ) ) == NULL ) + if ( ( st->hBPF = (BPF_DEC_HANDLE) malloc( sizeof( BPF_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for BPF\n" ) ); } @@ -515,16 +519,9 @@ ivas_error init_decoder( } /* open synthesis for output sampling rate */ - if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( ( error = openCldfb( &st->cldfbSyn, CLDFB_SYNTHESIS, st->output_Fs, CLDFB_PROTOTYPE_1_25MS ) ) != IVAS_ERR_OK ) { - if ( ( error = openCldfb( &st->cldfbSyn, CLDFB_SYNTHESIS, st->output_Fs, CLDFB_PROTOTYPE_1_25MS ) ) != IVAS_ERR_OK ) - { - return error; - } - } - else - { - st->cldfbSyn = NULL; + return error; } st->cldfbSynHB = NULL; @@ -553,7 +550,7 @@ ivas_error init_decoder( if ( st->element_mode == EVS_MONO ) { - if ( ( st->hSC_VBR = (SC_VBR_DEC_HANDLE) count_malloc( sizeof( SC_VBR_DEC_DATA ) ) ) == NULL ) + if ( ( st->hSC_VBR = (SC_VBR_DEC_HANDLE) malloc( sizeof( SC_VBR_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SC-VBR\n" ) ); } @@ -581,9 +578,9 @@ ivas_error init_decoder( *-----------------------------------------------------------------*/ /* TCX-LTP */ - if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) ) { - if ( ( st->hTcxLtpDec = (TCX_LTP_DEC_HANDLE) count_malloc( sizeof( TCX_LTP_DEC_DATA ) ) ) == NULL ) + if ( ( st->hTcxLtpDec = (TCX_LTP_DEC_HANDLE) malloc( sizeof( TCX_LTP_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TCX-LTP handle\n" ) ); } @@ -594,10 +591,10 @@ ivas_error init_decoder( } /* TCX core */ - // VE: reduction possible for MCT_CHAN_MODE_LFE channel - see I1-172 + if ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) { - if ( ( st->hTcxDec = (TCX_DEC_HANDLE) count_malloc( sizeof( TCX_DEC_DATA ) ) ) == NULL ) + if ( ( st->hTcxDec = (TCX_DEC_HANDLE) malloc( sizeof( TCX_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hTcxDec\n" ) ); } @@ -613,9 +610,9 @@ ivas_error init_decoder( } /* TCX config. data structure */ - if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) ) { - if ( ( st->hTcxCfg = (TCX_CONFIG_HANDLE) count_malloc( sizeof( TCX_config ) ) ) == NULL ) + if ( ( st->hTcxCfg = (TCX_CONFIG_HANDLE) malloc( sizeof( TCX_config ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hTcxCfg\n" ) ); } @@ -626,9 +623,9 @@ ivas_error init_decoder( } /* Tonal MDCT concealment data structure */ - if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) ) { - if ( ( st->hTonalMDCTConc = (TonalMDCTConcealPtr) count_malloc( sizeof( TonalMDCTConceal_INSTANCE ) ) ) == NULL ) + if ( ( st->hTonalMDCTConc = (TonalMDCTConcealPtr) malloc( sizeof( TonalMDCTConceal_INSTANCE ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TonalMDCTConcealment\n" ) ); } @@ -642,9 +639,9 @@ ivas_error init_decoder( * IGF *-----------------------------------------------------------------*/ - if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) ) { - if ( ( st->hIGFDec = (IGF_DEC_INSTANCE_HANDLE) count_malloc( sizeof( IGFDEC_INSTANCE ) ) ) == NULL ) + if ( ( st->hIGFDec = (IGF_DEC_INSTANCE_HANDLE) malloc( sizeof( IGFDEC_INSTANCE ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for IGF\n" ) ); } @@ -661,13 +658,9 @@ ivas_error init_decoder( * Mode 2 initialization *-----------------------------------------------------------------*/ -#ifdef FIX_124_DONT_ALLOC_PLCINFO_IN_IVAS if ( st->element_mode == EVS_MONO ) -#else - if ( idchan == 0 && st->element_mode != IVAS_CPE_MDCT ) -#endif { - if ( ( st->hPlcInfo = (T_PLCInfo_HANDLE) count_malloc( sizeof( T_PLCInfo ) ) ) == NULL ) + if ( ( st->hPlcInfo = (T_PLCInfo_HANDLE) malloc( sizeof( T_PLCInfo ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for PLC handle\n" ) ); } @@ -679,7 +672,7 @@ ivas_error init_decoder( if ( st->element_mode == EVS_MONO ) { - if ( ( st->hTECDec = (TEC_DEC_HANDLE) count_malloc( sizeof( TEC_DEC_DATA ) ) ) == NULL ) + if ( ( st->hTECDec = (TEC_DEC_HANDLE) malloc( sizeof( TEC_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TEC\n" ) ); } @@ -689,9 +682,6 @@ ivas_error init_decoder( st->hTECDec = NULL; } -#ifndef FIX_124_DONT_ALLOC_PLCINFO_IN_IVAS // the initialziation is done in open_decoder_LPD() - st->enablePlcWaveadjust = 0; -#endif /* Init Core Decoder */ open_decoder_LPD( st, st->total_brate, st->last_total_brate, st->bwidth, 0, st->element_mode, 1 ); @@ -741,6 +731,11 @@ ivas_error init_decoder( st->tdm_LRTD_flag = 0; st->cna_dirac_flag = 0; st->cng_sba_flag = 0; + st->cng_ism_flag = 0; +#ifndef FIX_ISM_DTX_CNG_BWIDTH_ALT + st->read_sid_info = 1; /* by default read the sid info from bitstream */ +#endif + st->is_ism_format = 0; return error; @@ -771,12 +766,12 @@ void reset_preecho_dec( /*----------------------------------------------------------------------* - * destroy_decoder() + * destroy_cldfb_decoder() * * Free memory which was allocated in init_decoder() *----------------------------------------------------------------------*/ -void destroy_decoder( +void destroy_cldfb_decoder( Decoder_State *st /* o : Decoder static variables structure */ ) { diff --git a/lib_dec/inov_dec.c b/lib_dec/inov_dec.c index ce3c2728bc..43c7eb2c7b 100644 --- a/lib_dec/inov_dec.c +++ b/lib_dec/inov_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "prot.h" #include "ivas_prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*----------------------------------------------------------------------* * inov_decode() diff --git a/lib_dec/ivas_agc_dec.c b/lib_dec/ivas_agc_dec.c index 827915efc2..72ae68a57b 100644 --- a/lib_dec/ivas_agc_dec.c +++ b/lib_dec/ivas_agc_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" #ifdef DEBUG_AGC @@ -99,7 +99,7 @@ ivas_error ivas_spar_agc_dec_open( ivas_agc_dec_state_t *hAgc; int16_t output_frame, delay; - if ( ( hAgc = (ivas_agc_dec_state_t *) count_malloc( sizeof( ivas_agc_dec_state_t ) ) ) == NULL ) + if ( ( hAgc = (ivas_agc_dec_state_t *) malloc( sizeof( ivas_agc_dec_state_t ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for AGC decoder" ); } @@ -107,17 +107,17 @@ ivas_error ivas_spar_agc_dec_open( output_frame = (int16_t) ( output_Fs / FRAMES_PER_SEC ); delay = NS2SA( output_Fs, ( IVAS_ENC_DELAY_NS + IVAS_DEC_DELAY_NS ) ); - if ( ( hAgc->agc_com.winFunc = (float *) count_malloc( sizeof( float ) * ( output_frame - delay ) ) ) == NULL ) + if ( ( hAgc->agc_com.winFunc = (float *) malloc( sizeof( float ) * ( output_frame - delay ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for AGC decoder" ); } - if ( ( hAgc->gain_state = (ivas_agc_dec_chan_state_t *) count_malloc( sizeof( ivas_agc_dec_chan_state_t ) * FOA_CHANNELS ) ) == NULL ) + if ( ( hAgc->gain_state = (ivas_agc_dec_chan_state_t *) malloc( sizeof( ivas_agc_dec_chan_state_t ) * FOA_CHANNELS ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for AGC decoder" ); } - if ( ( hAgc->gain_data = (ivas_agc_chan_data_t *) count_malloc( sizeof( ivas_agc_chan_data_t ) * FOA_CHANNELS ) ) == NULL ) + if ( ( hAgc->gain_data = (ivas_agc_chan_data_t *) malloc( sizeof( ivas_agc_chan_data_t ) * FOA_CHANNELS ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for AGC decoder" ); } @@ -142,22 +142,24 @@ void ivas_spar_agc_dec_close( { ivas_agc_dec_state_t *hAgc; + if ( hAgcDec == NULL || *hAgcDec == NULL ) + { + return; + } + hAgc = *hAgcDec; - if ( hAgc != NULL ) - { - count_free( hAgc->agc_com.winFunc ); - hAgc->agc_com.winFunc = NULL; + free( hAgc->agc_com.winFunc ); + hAgc->agc_com.winFunc = NULL; - count_free( hAgc->gain_state ); - hAgc->gain_state = NULL; + free( hAgc->gain_state ); + hAgc->gain_state = NULL; - count_free( hAgc->gain_data ); - hAgc->gain_data = NULL; + free( hAgc->gain_data ); + hAgc->gain_data = NULL; - count_free( hAgc ); - *hAgcDec = NULL; - } + free( *hAgcDec ); + *hAgcDec = NULL; return; } diff --git a/lib_rend/ivas_binauralRenderer.c b/lib_dec/ivas_binRenderer_internal.c similarity index 84% rename from lib_rend/ivas_binauralRenderer.c rename to lib_dec/ivas_binRenderer_internal.c index 0c78625a42..d1942d94f5 100644 --- a/lib_rend/ivas_binauralRenderer.c +++ b/lib_dec/ivas_binRenderer_internal.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,22 +33,23 @@ #include #include "options.h" #include -#include "ivas_prot.h" #include "prot.h" +#include "ivas_prot.h" +#include "ivas_prot_rend.h" #include "cnst.h" #include "ivas_cnst.h" #include "ivas_rom_rend.h" +#include "ivas_rom_dec.h" #include "ivas_rom_com.h" #include "ivas_rom_binauralRenderer.h" #ifdef SPLIT_REND_WITH_HEAD_ROT #include "ivas_rom_dec.h" #include "lib_rend.h" -#include "ivas_lib_rend_internal.h" #endif #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------- @@ -137,7 +138,8 @@ static ivas_error ivas_binRenderer_convModuleOpen( const int16_t renderer_type, const int16_t isLoudspeaker, const AUDIO_CONFIG input_config, - const RENDER_CONFIG_DATA *hRenderConfig + const RENDER_CONFIG_DATA *hRenderConfig, + const HRTFS_FASTCONV_HANDLE hHrtf #ifdef SPLIT_REND_WITH_HEAD_ROT , const int16_t num_poses @@ -155,7 +157,7 @@ static ivas_error ivas_binRenderer_convModuleOpen( * prepare library opening *-----------------------------------------------------------------*/ - if ( ( hBinRenConvModule = (BINRENDERER_CONV_MODULE_HANDLE) count_malloc( sizeof( BINRENDERER_CONV_MODULE ) ) ) == NULL ) + if ( ( hBinRenConvModule = (BINRENDERER_CONV_MODULE_HANDLE) malloc( sizeof( BINRENDERER_CONV_MODULE ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } @@ -209,91 +211,91 @@ static ivas_error ivas_binRenderer_convModuleOpen( } /* allocate memory for filter states */ - if ( ( hBinRenConvModule->filterTapsLeftReal = (float ***) count_malloc( hBinRenderer->conv_band * sizeof( float ** ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterTapsLeftReal = (float ***) malloc( hBinRenderer->conv_band * sizeof( float ** ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } - if ( ( hBinRenConvModule->filterTapsLeftImag = (float ***) count_malloc( hBinRenderer->conv_band * sizeof( float ** ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterTapsLeftImag = (float ***) malloc( hBinRenderer->conv_band * sizeof( float ** ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } - if ( ( hBinRenConvModule->filterTapsRightReal = (float ***) count_malloc( hBinRenderer->conv_band * sizeof( float ** ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterTapsRightReal = (float ***) malloc( hBinRenderer->conv_band * sizeof( float ** ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } - if ( ( hBinRenConvModule->filterTapsRightImag = (float ***) count_malloc( hBinRenderer->conv_band * sizeof( float ** ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterTapsRightImag = (float ***) malloc( hBinRenderer->conv_band * sizeof( float ** ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } for ( bandIdx = 0; bandIdx < hBinRenderer->conv_band; bandIdx++ ) { - if ( ( hBinRenConvModule->filterTapsLeftReal[bandIdx] = (float **) count_malloc( hBinRenderer->nInChannels * sizeof( float * ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterTapsLeftReal[bandIdx] = (float **) malloc( hBinRenderer->nInChannels * sizeof( float * ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } - if ( ( hBinRenConvModule->filterTapsLeftImag[bandIdx] = (float **) count_malloc( hBinRenderer->nInChannels * sizeof( float * ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterTapsLeftImag[bandIdx] = (float **) malloc( hBinRenderer->nInChannels * sizeof( float * ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } - if ( ( hBinRenConvModule->filterTapsRightReal[bandIdx] = (float **) count_malloc( hBinRenderer->nInChannels * sizeof( float * ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterTapsRightReal[bandIdx] = (float **) malloc( hBinRenderer->nInChannels * sizeof( float * ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } - if ( ( hBinRenConvModule->filterTapsRightImag[bandIdx] = (float **) count_malloc( hBinRenderer->nInChannels * sizeof( float * ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterTapsRightImag[bandIdx] = (float **) malloc( hBinRenderer->nInChannels * sizeof( float * ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } } #ifdef SPLIT_REND_WITH_HEAD_ROT - if ( ( hBinRenConvModule->filterStatesLeftReal = (float ****) count_malloc( num_poses * sizeof( float *** ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterStatesLeftReal = (float ****) malloc( num_poses * sizeof( float *** ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } - if ( ( hBinRenConvModule->filterStatesLeftImag = (float ****) count_malloc( num_poses * sizeof( float *** ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterStatesLeftImag = (float ****) malloc( num_poses * sizeof( float *** ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } for ( pos_idx = 0; pos_idx < num_poses; pos_idx++ ) { - if ( ( hBinRenConvModule->filterStatesLeftReal[pos_idx] = (float ***) count_malloc( hBinRenderer->conv_band * sizeof( float ** ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterStatesLeftReal[pos_idx] = (float ***) malloc( hBinRenderer->conv_band * sizeof( float ** ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } - if ( ( hBinRenConvModule->filterStatesLeftImag[pos_idx] = (float ***) count_malloc( hBinRenderer->conv_band * sizeof( float ** ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterStatesLeftImag[pos_idx] = (float ***) malloc( hBinRenderer->conv_band * sizeof( float ** ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } for ( bandIdx = 0; bandIdx < hBinRenderer->conv_band; bandIdx++ ) { - if ( ( hBinRenConvModule->filterStatesLeftReal[pos_idx][bandIdx] = (float **) count_malloc( hBinRenderer->nInChannels * sizeof( float * ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterStatesLeftReal[pos_idx][bandIdx] = (float **) malloc( hBinRenderer->nInChannels * sizeof( float * ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } - if ( ( hBinRenConvModule->filterStatesLeftImag[pos_idx][bandIdx] = (float **) count_malloc( hBinRenderer->nInChannels * sizeof( float * ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterStatesLeftImag[pos_idx][bandIdx] = (float **) malloc( hBinRenderer->nInChannels * sizeof( float * ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } for ( chIdx = 0; chIdx < hBinRenderer->nInChannels; chIdx++ ) { - if ( ( hBinRenConvModule->filterStatesLeftReal[pos_idx][bandIdx][chIdx] = (float *) count_malloc( hBinRenConvModule->numTapsArray[bandIdx] * sizeof( float ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterStatesLeftReal[pos_idx][bandIdx][chIdx] = (float *) malloc( hBinRenConvModule->numTapsArray[bandIdx] * sizeof( float ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } - if ( ( hBinRenConvModule->filterStatesLeftImag[pos_idx][bandIdx][chIdx] = (float *) count_malloc( hBinRenConvModule->numTapsArray[bandIdx] * sizeof( float ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterStatesLeftImag[pos_idx][bandIdx][chIdx] = (float *) malloc( hBinRenConvModule->numTapsArray[bandIdx] * sizeof( float ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } @@ -301,36 +303,36 @@ static ivas_error ivas_binRenderer_convModuleOpen( } } #else - if ( ( hBinRenConvModule->filterStatesLeftReal = (float ***) count_malloc( hBinRenderer->conv_band * sizeof( float ** ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterStatesLeftReal = (float ***) malloc( hBinRenderer->conv_band * sizeof( float ** ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } - if ( ( hBinRenConvModule->filterStatesLeftImag = (float ***) count_malloc( hBinRenderer->conv_band * sizeof( float ** ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterStatesLeftImag = (float ***) malloc( hBinRenderer->conv_band * sizeof( float ** ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } for ( bandIdx = 0; bandIdx < hBinRenderer->conv_band; bandIdx++ ) { - if ( ( hBinRenConvModule->filterStatesLeftReal[bandIdx] = (float **) count_malloc( hBinRenderer->nInChannels * sizeof( float * ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterStatesLeftReal[bandIdx] = (float **) malloc( hBinRenderer->nInChannels * sizeof( float * ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } - if ( ( hBinRenConvModule->filterStatesLeftImag[bandIdx] = (float **) count_malloc( hBinRenderer->nInChannels * sizeof( float * ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterStatesLeftImag[bandIdx] = (float **) malloc( hBinRenderer->nInChannels * sizeof( float * ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } for ( chIdx = 0; chIdx < hBinRenderer->nInChannels; chIdx++ ) { - if ( ( hBinRenConvModule->filterStatesLeftReal[bandIdx][chIdx] = (float *) count_malloc( hBinRenConvModule->numTapsArray[bandIdx] * sizeof( float ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterStatesLeftReal[bandIdx][chIdx] = (float *) malloc( hBinRenConvModule->numTapsArray[bandIdx] * sizeof( float ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } - if ( ( hBinRenConvModule->filterStatesLeftImag[bandIdx][chIdx] = (float *) count_malloc( hBinRenConvModule->numTapsArray[bandIdx] * sizeof( float ) ) ) == NULL ) + if ( ( hBinRenConvModule->filterStatesLeftImag[bandIdx][chIdx] = (float *) malloc( hBinRenConvModule->numTapsArray[bandIdx] * sizeof( float ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) ); } @@ -380,10 +382,10 @@ static ivas_error ivas_binRenderer_convModuleOpen( { if ( isLoudspeaker ) { - hBinRenConvModule->filterTapsLeftReal[bandIdx][chIdx] = leftBRIRReal[bandIdx][tmp]; - hBinRenConvModule->filterTapsLeftImag[bandIdx][chIdx] = leftBRIRImag[bandIdx][tmp]; - hBinRenConvModule->filterTapsRightReal[bandIdx][chIdx] = rightBRIRReal[bandIdx][tmp]; - hBinRenConvModule->filterTapsRightImag[bandIdx][chIdx] = rightBRIRImag[bandIdx][tmp]; + hBinRenConvModule->filterTapsLeftReal[bandIdx][chIdx] = hHrtf->leftBRIRReal[bandIdx][tmp]; + hBinRenConvModule->filterTapsLeftImag[bandIdx][chIdx] = hHrtf->leftBRIRImag[bandIdx][tmp]; + hBinRenConvModule->filterTapsRightReal[bandIdx][chIdx] = hHrtf->rightBRIRReal[bandIdx][tmp]; + hBinRenConvModule->filterTapsRightImag[bandIdx][chIdx] = hHrtf->rightBRIRImag[bandIdx][tmp]; } #ifdef DEBUGGING else @@ -397,18 +399,18 @@ static ivas_error ivas_binRenderer_convModuleOpen( { if ( isLoudspeaker ) { - hBinRenConvModule->filterTapsLeftReal[bandIdx][chIdx] = leftHRIRReal[bandIdx][tmp]; - hBinRenConvModule->filterTapsLeftImag[bandIdx][chIdx] = leftHRIRImag[bandIdx][tmp]; - hBinRenConvModule->filterTapsRightReal[bandIdx][chIdx] = rightHRIRReal[bandIdx][tmp]; - hBinRenConvModule->filterTapsRightImag[bandIdx][chIdx] = rightHRIRImag[bandIdx][tmp]; + hBinRenConvModule->filterTapsLeftReal[bandIdx][chIdx] = hHrtf->leftHRIRReal[bandIdx][tmp]; + hBinRenConvModule->filterTapsLeftImag[bandIdx][chIdx] = hHrtf->leftHRIRImag[bandIdx][tmp]; + hBinRenConvModule->filterTapsRightReal[bandIdx][chIdx] = hHrtf->rightHRIRReal[bandIdx][tmp]; + hBinRenConvModule->filterTapsRightImag[bandIdx][chIdx] = hHrtf->rightHRIRImag[bandIdx][tmp]; } else { /* HOA3 filter coefficients */ - hBinRenConvModule->filterTapsLeftReal[bandIdx][chIdx] = leftHRIRReal_HOA3[bandIdx][chIdx]; - hBinRenConvModule->filterTapsLeftImag[bandIdx][chIdx] = leftHRIRImag_HOA3[bandIdx][chIdx]; - hBinRenConvModule->filterTapsRightReal[bandIdx][chIdx] = rightHRIRReal_HOA3[bandIdx][chIdx]; - hBinRenConvModule->filterTapsRightImag[bandIdx][chIdx] = rightHRIRImag_HOA3[bandIdx][chIdx]; + hBinRenConvModule->filterTapsLeftReal[bandIdx][chIdx] = hHrtf->leftHRIRReal_HOA3[bandIdx][chIdx]; + hBinRenConvModule->filterTapsLeftImag[bandIdx][chIdx] = hHrtf->leftHRIRImag_HOA3[bandIdx][chIdx]; + hBinRenConvModule->filterTapsRightReal[bandIdx][chIdx] = hHrtf->rightHRIRReal_HOA3[bandIdx][chIdx]; + hBinRenConvModule->filterTapsRightImag[bandIdx][chIdx] = hHrtf->rightHRIRImag_HOA3[bandIdx][chIdx]; } } } @@ -444,6 +446,68 @@ static ivas_error ivas_binRenderer_convModuleOpen( return IVAS_ERR_OK; } +/*-------------------------------------------------------------------------* + * ivas_binaural_HRTF_open() + * + * + *-------------------------------------------------------------------------*/ + +static ivas_error ivas_binaural_hrtf_open( + HRTFS_FASTCONV_HANDLE *hHrtfFastConv /* i : fastconv HRTF handle */ +) +{ + int16_t i, j; + if ( hHrtfFastConv != NULL && *hHrtfFastConv != NULL ) + { + /* Tables already loaded from file */ + return IVAS_ERR_OK; + } + else + { + /* Initialise tables from ROM */ + HRTFS_FASTCONV *HrtfFastConv; + + if ( ( HrtfFastConv = (HRTFS_FASTCONV *) malloc( sizeof( HRTFS_FASTCONV ) ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for FastConv HRTF tables" ); + } + + HrtfFastConv->FASTCONV_HRIR_latency_s = FASTCONV_HRIR_latency_s; + HrtfFastConv->FASTCONV_HOA3_latency_s = FASTCONV_HOA3_latency_s; + HrtfFastConv->FASTCONV_BRIR_latency_s = FASTCONV_BRIR_latency_s; + + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < HRTF_LS_CHANNELS; j++ ) + { + mvr2r( leftHRIRReal[i][j], HrtfFastConv->leftHRIRReal[i][j], 7 ); + mvr2r( leftHRIRImag[i][j], HrtfFastConv->leftHRIRImag[i][j], 7 ); + mvr2r( rightHRIRReal[i][j], HrtfFastConv->rightHRIRReal[i][j], 7 ); + mvr2r( rightHRIRImag[i][j], HrtfFastConv->rightHRIRImag[i][j], 7 ); + + mvr2r( leftBRIRReal[i][j], HrtfFastConv->leftBRIRReal[i][j], BINAURAL_NTAPS_MAX ); + mvr2r( leftBRIRImag[i][j], HrtfFastConv->leftBRIRImag[i][j], BINAURAL_NTAPS_MAX ); + mvr2r( rightBRIRReal[i][j], HrtfFastConv->rightBRIRReal[i][j], BINAURAL_NTAPS_MAX ); + mvr2r( rightBRIRImag[i][j], HrtfFastConv->rightBRIRImag[i][j], BINAURAL_NTAPS_MAX ); + } + + for ( j = 0; j < HRTF_SH_CHANNELS; j++ ) + { + mvr2r( leftHRIRReal_HOA3[i][j], HrtfFastConv->leftHRIRReal_HOA3[i][j], 7 ); + mvr2r( leftHRIRImag_HOA3[i][j], HrtfFastConv->leftHRIRImag_HOA3[i][j], 7 ); + mvr2r( rightHRIRReal_HOA3[i][j], HrtfFastConv->rightHRIRReal_HOA3[i][j], 7 ); + mvr2r( rightHRIRImag_HOA3[i][j], HrtfFastConv->rightHRIRImag_HOA3[i][j], 7 ); + } + } + + mvr2r( fastconvReverberationTimes, HrtfFastConv->fastconvReverberationTimes, CLDFB_NO_CHANNELS_MAX ); + mvr2r( fastconvReverberationEneCorrections, HrtfFastConv->fastconvReverberationEneCorrections, CLDFB_NO_CHANNELS_MAX ); + + *hHrtfFastConv = HrtfFastConv; + } + + return IVAS_ERR_OK; +} /*-------------------------------------------------------------------------* * ivas_binaural_obtain_DMX() @@ -590,12 +654,12 @@ ivas_error ivas_rend_openCldfbRend( * prepare library opening *-----------------------------------------------------------------*/ - if ( ( hBinRenderer = (BINAURAL_RENDERER_HANDLE) count_malloc( sizeof( BINAURAL_RENDERER ) ) ) == NULL ) + if ( ( hBinRenderer = (BINAURAL_RENDERER_HANDLE) malloc( sizeof( BINAURAL_RENDERER ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural Renderer\n" ) ); } - if ( ( hBinRenderer->hInputSetup = (IVAS_OUTPUT_SETUP_HANDLE) count_malloc( sizeof( IVAS_OUTPUT_SETUP ) ) ) == NULL ) + if ( ( hBinRenderer->hInputSetup = (IVAS_OUTPUT_SETUP_HANDLE) malloc( sizeof( IVAS_OUTPUT_SETUP ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for output setup Binaural Renderer\n" ) ); } @@ -633,10 +697,12 @@ ivas_error ivas_rend_openCldfbRend( { hBinRenderer->numPoses = 1; } + /* Load HRTF tables */ + ivas_binaural_hrtf_open( &pCldfbRend->hHrtfFastConv ); /* Allocate memories and buffers needed for convolutional module */ if ( ( error = ivas_binRenderer_convModuleOpen( hBinRenderer, RENDERER_BINAURAL_FASTCONV, hBinRenderer->hInputSetup->is_loudspeaker_setup, in_config, hRendCfg, - hBinRenderer->numPoses ) ) != IVAS_ERR_OK ) + pCldfbRend->hHrtfFastConv, hBinRenderer->numPoses ) ) != IVAS_ERR_OK ) { return error; } @@ -670,7 +736,7 @@ ivas_error ivas_binRenderer_open( * prepare library opening *-----------------------------------------------------------------*/ - if ( ( hBinRenderer = (BINAURAL_RENDERER_HANDLE) count_malloc( sizeof( BINAURAL_RENDERER ) ) ) == NULL ) + if ( ( hBinRenderer = (BINAURAL_RENDERER_HANDLE) malloc( sizeof( BINAURAL_RENDERER ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural Renderer\n" ) ); } @@ -731,12 +797,20 @@ ivas_error ivas_binRenderer_open( hBinRenderer->render_lfe = 1; } + /* Load HRTF tables */ + ivas_binaural_hrtf_open( &st_ivas->hHrtfFastConv ); + if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM && ( st_ivas->hIntSetup.is_loudspeaker_setup == 0 ) ) { IVAS_OUTPUT_SETUP out_setup; /* Allocate memories and buffers needed for convolutional module in CICP19 */ - if ( ( error = ivas_binRenderer_convModuleOpen( hBinRenderer, st_ivas->renderer_type, 1, AUDIO_CONFIG_7_1_4, st_ivas->hRenderConfig + if ( ( error = ivas_binRenderer_convModuleOpen( hBinRenderer, + st_ivas->renderer_type, + 1, + AUDIO_CONFIG_7_1_4, + st_ivas->hRenderConfig, + st_ivas->hHrtfFastConv #ifdef SPLIT_REND_WITH_HEAD_ROT , hBinRenderer->numPoses @@ -748,9 +822,7 @@ ivas_error ivas_binRenderer_open( ivas_output_init( &out_setup, AUDIO_CONFIG_7_1_4 ); -#ifdef BRATE_SWITCHING_RENDERING if ( st_ivas->hoa_dec_mtx == NULL ) -#endif { if ( ( error = ivas_sba_get_hoa_dec_matrix( out_setup, &st_ivas->hoa_dec_mtx, st_ivas->hIntSetup.ambisonics_order ) ) != IVAS_ERR_OK ) { @@ -759,12 +831,17 @@ ivas_error ivas_binRenderer_open( } hBinRenderer->hoa_dec_mtx = st_ivas->hoa_dec_mtx; - st_ivas->binaural_latency_ns = (int32_t) ( FASTCONV_BRIR_latency_s * 1000000000.f ); + st_ivas->binaural_latency_ns = (int32_t) ( st_ivas->hHrtfFastConv->FASTCONV_BRIR_latency_s * 1000000000.f ); } else { /* Allocate memories and buffers needed for convolutional module */ - if ( ( error = ivas_binRenderer_convModuleOpen( hBinRenderer, st_ivas->renderer_type, st_ivas->hIntSetup.is_loudspeaker_setup, st_ivas->hIntSetup.output_config, st_ivas->hRenderConfig + if ( ( error = ivas_binRenderer_convModuleOpen( hBinRenderer, + st_ivas->renderer_type, + st_ivas->hIntSetup.is_loudspeaker_setup, + st_ivas->hIntSetup.output_config, + st_ivas->hRenderConfig, + st_ivas->hHrtfFastConv #ifdef SPLIT_REND_WITH_HEAD_ROT , hBinRenderer->numPoses @@ -774,20 +851,36 @@ ivas_error ivas_binRenderer_open( return error; } - if ( hBinRenderer->ivas_format == MC_FORMAT ) + if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV ) { - st_ivas->binaural_latency_ns = (int32_t) ( FASTCONV_HRIR_latency_s * 1000000000.f ); + if ( hBinRenderer->ivas_format == MC_FORMAT ) + { + st_ivas->binaural_latency_ns = (int32_t) ( st_ivas->hHrtfFastConv->FASTCONV_HRIR_latency_s * 1000000000.f ); + } + else + { + st_ivas->binaural_latency_ns = (int32_t) ( st_ivas->hHrtfFastConv->FASTCONV_HOA3_latency_s * 1000000000.f ); + } } else { - st_ivas->binaural_latency_ns = (int32_t) ( FASTCONV_HOA3_latency_s * 1000000000.f ); + /* same value for MC or HOA both use MC BRIR*/ + st_ivas->binaural_latency_ns = (int32_t) ( st_ivas->hHrtfFastConv->FASTCONV_BRIR_latency_s * 1000000000.f ); } } /* Allocate memories needed for reverb module */ if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM && st_ivas->hRenderConfig->roomAcoustics.late_reverb_on ) { - if ( ( error = ivas_binaural_reverb_open( &( hBinRenderer->hReverb ), hBinRenderer->conv_band, hBinRenderer->timeSlots, &( st_ivas->hRenderConfig->roomAcoustics ), st_ivas->hIntSetup.output_config, st_ivas->hDecoderConfig->output_Fs, RENDERER_BINAURAL_FASTCONV_ROOM ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_binaural_reverb_open( &( hBinRenderer->hReverb ), + hBinRenderer->conv_band, + hBinRenderer->timeSlots, + &( st_ivas->hRenderConfig->roomAcoustics ), + st_ivas->hIntSetup.output_config, + st_ivas->hDecoderConfig->output_Fs, + RENDERER_BINAURAL_FASTCONV_ROOM, + st_ivas->hHrtfFastConv, + st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK ) { return error; } @@ -797,7 +890,7 @@ ivas_error ivas_binRenderer_open( { for ( k = 0; k < hBinRenderer->nInChannels; k++ ) { - hBinRenderer->hReverb->dmxmtx[chIdx][k] = dmxmtx[chIdx][k]; + hBinRenderer->hReverb->dmxmtx[chIdx][k] = dmxmtx_table[chIdx][k]; } } } @@ -865,29 +958,29 @@ static void ivas_binRenderer_convModuleClose( for ( bandIdx = 0; bandIdx < ( *hBinRenderer )->conv_band; bandIdx++ ) { - count_free( hBinRenConvModule->filterTapsLeftReal[bandIdx] ); + free( hBinRenConvModule->filterTapsLeftReal[bandIdx] ); hBinRenConvModule->filterTapsLeftReal[bandIdx] = NULL; - count_free( hBinRenConvModule->filterTapsLeftImag[bandIdx] ); + free( hBinRenConvModule->filterTapsLeftImag[bandIdx] ); hBinRenConvModule->filterTapsLeftImag[bandIdx] = NULL; - count_free( hBinRenConvModule->filterTapsRightReal[bandIdx] ); + free( hBinRenConvModule->filterTapsRightReal[bandIdx] ); hBinRenConvModule->filterTapsRightReal[bandIdx] = NULL; - count_free( hBinRenConvModule->filterTapsRightImag[bandIdx] ); + free( hBinRenConvModule->filterTapsRightImag[bandIdx] ); hBinRenConvModule->filterTapsRightImag[bandIdx] = NULL; } - count_free( hBinRenConvModule->filterTapsLeftReal ); + free( hBinRenConvModule->filterTapsLeftReal ); hBinRenConvModule->filterTapsLeftReal = NULL; - count_free( hBinRenConvModule->filterTapsLeftImag ); + free( hBinRenConvModule->filterTapsLeftImag ); hBinRenConvModule->filterTapsLeftImag = NULL; - count_free( hBinRenConvModule->filterTapsRightReal ); + free( hBinRenConvModule->filterTapsRightReal ); hBinRenConvModule->filterTapsRightReal = NULL; - count_free( hBinRenConvModule->filterTapsRightImag ); + free( hBinRenConvModule->filterTapsRightImag ); hBinRenConvModule->filterTapsRightImag = NULL; #ifdef SPLIT_REND_WITH_HEAD_ROT @@ -897,58 +990,58 @@ static void ivas_binRenderer_convModuleClose( { for ( chIdx = 0; chIdx < ( *hBinRenderer )->nInChannels; chIdx++ ) { - count_free( hBinRenConvModule->filterStatesLeftReal[posIdx][bandIdx][chIdx] ); + free( hBinRenConvModule->filterStatesLeftReal[posIdx][bandIdx][chIdx] ); hBinRenConvModule->filterStatesLeftReal[posIdx][bandIdx][chIdx] = NULL; - count_free( hBinRenConvModule->filterStatesLeftImag[posIdx][bandIdx][chIdx] ); + free( hBinRenConvModule->filterStatesLeftImag[posIdx][bandIdx][chIdx] ); hBinRenConvModule->filterStatesLeftImag[posIdx][bandIdx][chIdx] = NULL; } - count_free( hBinRenConvModule->filterStatesLeftReal[posIdx][bandIdx] ); + free( hBinRenConvModule->filterStatesLeftReal[posIdx][bandIdx] ); hBinRenConvModule->filterStatesLeftReal[posIdx][bandIdx] = NULL; - count_free( hBinRenConvModule->filterStatesLeftImag[posIdx][bandIdx] ); + free( hBinRenConvModule->filterStatesLeftImag[posIdx][bandIdx] ); hBinRenConvModule->filterStatesLeftImag[posIdx][bandIdx] = NULL; } - count_free( hBinRenConvModule->filterStatesLeftReal[posIdx] ); + free( hBinRenConvModule->filterStatesLeftReal[posIdx] ); hBinRenConvModule->filterStatesLeftReal[posIdx] = NULL; - count_free( hBinRenConvModule->filterStatesLeftImag[posIdx] ); + free( hBinRenConvModule->filterStatesLeftImag[posIdx] ); hBinRenConvModule->filterStatesLeftImag[posIdx] = NULL; } - count_free( hBinRenConvModule->filterStatesLeftReal ); + free( hBinRenConvModule->filterStatesLeftReal ); hBinRenConvModule->filterStatesLeftReal = NULL; - count_free( hBinRenConvModule->filterStatesLeftImag ); + free( hBinRenConvModule->filterStatesLeftImag ); hBinRenConvModule->filterStatesLeftImag = NULL; #else for ( bandIdx = 0; bandIdx < ( *hBinRenderer )->conv_band; bandIdx++ ) { for ( chIdx = 0; chIdx < ( *hBinRenderer )->nInChannels; chIdx++ ) { - count_free( hBinRenConvModule->filterStatesLeftReal[bandIdx][chIdx] ); + free( hBinRenConvModule->filterStatesLeftReal[bandIdx][chIdx] ); hBinRenConvModule->filterStatesLeftReal[bandIdx][chIdx] = NULL; - count_free( hBinRenConvModule->filterStatesLeftImag[bandIdx][chIdx] ); + free( hBinRenConvModule->filterStatesLeftImag[bandIdx][chIdx] ); hBinRenConvModule->filterStatesLeftImag[bandIdx][chIdx] = NULL; } - count_free( hBinRenConvModule->filterStatesLeftReal[bandIdx] ); + free( hBinRenConvModule->filterStatesLeftReal[bandIdx] ); hBinRenConvModule->filterStatesLeftReal[bandIdx] = NULL; - count_free( hBinRenConvModule->filterStatesLeftImag[bandIdx] ); + free( hBinRenConvModule->filterStatesLeftImag[bandIdx] ); hBinRenConvModule->filterStatesLeftImag[bandIdx] = NULL; } - count_free( hBinRenConvModule->filterStatesLeftReal ); + free( hBinRenConvModule->filterStatesLeftReal ); hBinRenConvModule->filterStatesLeftReal = NULL; - count_free( hBinRenConvModule->filterStatesLeftImag ); + free( hBinRenConvModule->filterStatesLeftImag ); hBinRenConvModule->filterStatesLeftImag = NULL; #endif - count_free( ( *hBinRenderer )->hBinRenConvModule ); + free( ( *hBinRenderer )->hBinRenConvModule ); ( *hBinRenderer )->hBinRenConvModule = NULL; return; @@ -964,10 +1057,12 @@ void ivas_rend_closeCldfbRend( CLDFB_REND_WRAPPER *pCldfbRend ) { if ( pCldfbRend->hCldfbRend->hInputSetup != NULL ) { - count_free( pCldfbRend->hCldfbRend->hInputSetup ); + free( pCldfbRend->hCldfbRend->hInputSetup ); pCldfbRend->hCldfbRend->hInputSetup = NULL; } ivas_binRenderer_close( &pCldfbRend->hCldfbRend ); + + ivas_HRTF_fastconv_binary_close( &pCldfbRend->hHrtfFastConv ); return; } #endif @@ -1002,7 +1097,7 @@ void ivas_binRenderer_close( ivas_binaural_reverb_close( &( ( *hBinRenderer )->hReverb ) ); } - count_free( *hBinRenderer ); + free( *hBinRenderer ); *hBinRenderer = NULL; return; @@ -1035,7 +1130,14 @@ void ivas_binaural_add_LFE( if ( render_lfe ) { - gain = st_ivas->hHrtf != NULL ? st_ivas->hHrtf->gain_lfe : GAIN_LFE; + if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD ) + { + gain = GAIN_LFE; + } + else + { + gain = ( ( st_ivas->hCrendWrapper != NULL ) && ( st_ivas->hCrendWrapper->hHrtfCrend != NULL ) ) ? st_ivas->hCrendWrapper->hHrtfCrend->gain_lfe : GAIN_LFE; + } for ( idx_lfe = 0; idx_lfe < st_ivas->hIntSetup.num_lfe; idx_lfe++ ) { v_multc( output_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], gain, output_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_frame ); @@ -1049,8 +1151,9 @@ void ivas_binaural_add_LFE( } +#ifdef DEBUGGING /*-------------------------------------------------------------------------* - * ivas_binRenderer_cldfb() + * ivas_binaural_cldfb() * * Perform CLDFB analysis, fastconv binaural rendering and CLDFB synthesis *-------------------------------------------------------------------------*/ @@ -1141,6 +1244,7 @@ void ivas_binaural_cldfb( return; } +#endif /*------------------------------------------------------------------------- * ivas_binRenderer() @@ -1169,12 +1273,12 @@ void ivas_binRenderer( ) { int16_t chIdx, k; - int16_t numTimeSlots = MAX_PARAM_SPATIAL_SUBFRAMES; #ifdef SPLIT_REND_WITH_HEAD_ROT int16_t pos_idx, num_poses; #endif - wmops_sub_start( "fastconv_binaural_rendering" ); + int16_t numTimeSlots = MAX_PARAM_SPATIAL_SUBFRAMES; + push_wmops( "fastconv_binaural_rendering" ); #ifdef SPLIT_REND_WITH_HEAD_ROT num_poses = hBinRenderer->numPoses; #endif @@ -1213,7 +1317,6 @@ void ivas_binRenderer( if ( hHeadTrackData->shd_rot_max_order == -1 ) { QuatToRotMat( hHeadTrackData->Quaternions[hHeadTrackData->num_quaternions++], hHeadTrackData->Rmat ); - rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, hHeadTrackData->Rmat, hBinRenderer->hInputSetup->nchan_out_woLFE, 3 ); } else if ( hHeadTrackData->shd_rot_max_order > 0 ) @@ -1351,7 +1454,7 @@ void ivas_binRenderer( } } - wmops_sub_end(); + pop_wmops(); return; } @@ -1417,7 +1520,7 @@ void ivas_rend_CldfbMultiBinRendProcess( for ( pose_idx = 0; pose_idx < hCldfbRend->numPoses; pose_idx++ ) - + { for ( slot_idx = 0; slot_idx < MAX_PARAM_SPATIAL_SUBFRAMES; slot_idx++ ) { idx = sf_idx * MAX_PARAM_SPATIAL_SUBFRAMES + slot_idx; @@ -1427,6 +1530,7 @@ void ivas_rend_CldfbMultiBinRendProcess( mvr2r( &Cldfb_ImagBuffer_Binaural[pose_idx][ch_idx][slot_idx][0], &Cldfb_Out_Imag[pose_idx][ch_idx][idx][0], hCldfbRend->max_band ); } } + } } return; diff --git a/lib_dec/ivas_core_dec.c b/lib_dec/ivas_core_dec.c index d356a7e093..516e027f90 100644 --- a/lib_dec/ivas_core_dec.c +++ b/lib_dec/ivas_core_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "prot.h" #include "ivas_prot.h" #include "ivas_rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" #ifdef DEBUG_PLOT #include "deb_out.h" #endif @@ -90,6 +90,9 @@ ivas_error ivas_core_dec( int16_t use_cldfb_for_dft; float *p_output_mem; int16_t flag_sec_CNA; +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + int16_t read_sid_info; +#endif int16_t last_element_mode; int16_t nchan_out; float *save_hb_synth; @@ -97,7 +100,7 @@ ivas_error ivas_core_dec( error = IVAS_ERR_OK; - wmops_sub_start( "ivas_core_dec" ); + push_wmops( "ivas_core_dec" ); /*------------------------------------------------------------------* * General initialization @@ -105,6 +108,9 @@ ivas_error ivas_core_dec( use_cldfb_for_dft = 0; tdm_LRTD_flag = -1; +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + read_sid_info = 1; /* read SID by default */ +#endif if ( hSCE != NULL ) { @@ -116,6 +122,15 @@ ivas_error ivas_core_dec( hStereoTD = NULL; p_output_mem = NULL; nchan_out = 1; +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + if ( st_ivas != NULL && st_ivas->ivas_format == ISM_FORMAT ) + { + if ( st_ivas->hISMDTX.sce_id_dtx != hSCE->sce_id ) + { + read_sid_info = 0; + } + } +#endif } else { @@ -181,43 +196,11 @@ ivas_error ivas_core_dec( st->flagGuidedAcelp = 0; } -#ifdef FIX_124_DONT_ALLOC_PLCINFO_IN_IVAS if ( !st->bfi && st->prev_bfi && ( st->last_core_bfi == TCX_20_CORE || st->last_core_bfi == TCX_10_CORE ) && st->hTcxDec != NULL ) { - float gain; - - gain = st->hTcxDec->conceal_eof_gain * st->last_concealed_gain_syn_deemph; - v_multc( st->hHQ_core->old_out, gain, st->hHQ_core->old_out, st->hTcxDec->L_frameTCX ); - v_multc( st->hHQ_core->old_outLB, gain, st->hHQ_core->old_outLB, st->L_frame ); - - if ( !st->hTcxCfg->last_aldo ) - { - v_multc( st->hTcxDec->syn_OverlFB, gain, st->hTcxDec->syn_OverlFB, st->hTcxCfg->tcx_mdct_window_lengthFB ); - v_multc( st->hTcxDec->syn_Overl, gain, st->hTcxDec->syn_Overl, st->hTcxCfg->tcx_mdct_window_length ); - } + v_multc( st->hHQ_core->old_out, st->hTcxDec->conceal_eof_gain * st->last_concealed_gain_syn_deemph, st->hHQ_core->old_out, st->hTcxDec->L_frameTCX ); + v_multc( st->hHQ_core->old_outLB, st->hTcxDec->conceal_eof_gain * st->last_concealed_gain_syn_deemph, st->hHQ_core->old_outLB, st->L_frame ); } -#else - /* PLC: [TCX: Fade-out-recovery] - overlapping part needs to be attenuated for first good frame */ - if ( !st->bfi && st->prev_bfi && ( st->last_core_bfi == TCX_20_CORE || st->last_core_bfi == TCX_10_CORE ) ) - { - float gain; - - gain = ( st->element_mode == IVAS_CPE_MDCT ) ? st->hTcxDec->conceal_eof_gain : ( st->hPlcInfo != NULL ) ? st->hPlcInfo->recovery_gain - : 0.0f; - - if ( ( st->element_mode == IVAS_CPE_MDCT && hMCT == NULL ) || ( st->hPlcInfo != NULL ) ) - { - v_multc( st->hHQ_core->old_out, gain, st->hHQ_core->old_out, st->hTcxDec->L_frameTCX ); - v_multc( st->hHQ_core->old_outLB, gain, st->hHQ_core->old_outLB, st->L_frame ); - - if ( !st->hTcxCfg->last_aldo && st->hTcxDec != NULL ) - { - v_multc( st->hTcxDec->syn_OverlFB, gain, st->hTcxDec->syn_OverlFB, st->hTcxCfg->tcx_mdct_window_lengthFB ); - v_multc( st->hTcxDec->syn_Overl, gain, st->hTcxDec->syn_Overl, st->hTcxCfg->tcx_mdct_window_length ); - } - } - } -#endif set_f( voice_factors[n], 0.f, NB_SUBFR16k ); set_f( hb_synth[n], 0.0f, L_FRAME48k ); @@ -272,7 +255,7 @@ ivas_error ivas_core_dec( hCPE->hStereoCng->flag_cna_fade = 0; } - if ( sba_dirac_stereo_flag && sts[0]->total_brate <= SID_2k40 && sts[0]->cng_type == FD_CNG ) + if ( sba_dirac_stereo_flag && hSCE && sts[0]->total_brate <= SID_2k40 && sts[0]->cng_type == FD_CNG ) { save_hb_synth = hSCE->save_hb_synth; } @@ -364,7 +347,11 @@ ivas_error ivas_core_dec( if ( st->core == ACELP_CORE ) { /* ACELP core decoder */ +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + if ( ( error = acelp_core_dec( st, output[n], synth[n], save_hb_synth, bwe_exc_extended[n], voice_factors[n], old_syn_12k8_16k[n], sharpFlag[n], pitch_buf[n], &unbits[n], &sid_bw[n], hStereoTD, tdm_lspQ_PCh, tdm_lsfQ_PCh, use_cldfb_for_dft, last_element_mode, last_element_brate, flag_sec_CNA, nchan_out, hCPE == NULL ? NULL : hCPE->hStereoCng, read_sid_info ) ) != IVAS_ERR_OK ) +#else if ( ( error = acelp_core_dec( st, output[n], synth[n], save_hb_synth, bwe_exc_extended[n], voice_factors[n], old_syn_12k8_16k[n], sharpFlag[n], pitch_buf[n], &unbits[n], &sid_bw[n], hStereoTD, tdm_lspQ_PCh, tdm_lsfQ_PCh, use_cldfb_for_dft, last_element_mode, last_element_brate, flag_sec_CNA, nchan_out, hCPE == NULL ? NULL : hCPE->hStereoCng ) ) != IVAS_ERR_OK ) +#endif { return error; } @@ -373,7 +360,7 @@ ivas_error ivas_core_dec( if ( ( st->core == TCX_20_CORE || st->core == TCX_10_CORE ) && st->element_mode != IVAS_CPE_MDCT ) { /* TCX decoder */ - stereo_tcx_core_dec( st, frameMode[n], output[n], synth[n], pitch_buf[n], sba_dirac_stereo_flag, hStereoTD, last_element_mode, flag_sec_CNA, hCPE == NULL ? NULL : hCPE->hStereoCng, nchan_out ); + stereo_tcx_core_dec( st, frameMode[n], output[n], synth[n], pitch_buf[n], sba_dirac_stereo_flag, hStereoTD, last_element_mode, flag_sec_CNA, hCPE == NULL ? NULL : hCPE->hStereoCng, nchan_out, st_ivas == NULL ? 0 : st_ivas->ivas_format ); } if ( st->core == HQ_CORE ) @@ -404,7 +391,7 @@ ivas_error ivas_core_dec( { if ( hMCT ) { - wmops_sub_end(); + pop_wmops(); return error; } @@ -473,19 +460,19 @@ ivas_error ivas_core_dec( *---------------------------------------------------------------------*/ /* save synth and output in case of SBA DirAC stereo output as core switching is done outside of core decoder */ - if ( sba_dirac_stereo_flag && !( st->core_brate == SID_2k40 && st->cng_type == FD_CNG ) ) + if ( sba_dirac_stereo_flag && st->element_mode != IVAS_CPE_MDCT && !( st->core_brate == SID_2k40 && st->cng_type == FD_CNG ) ) { mvr2r( synth[n], hSCE->save_synth, output_frame ); } - if ( ( error = core_switching_post_dec( st, synth[n], output[n], p_output_mem, use_cldfb_for_dft, output_frame, 0 /*core_switching_flag*/, sba_dirac_stereo_flag, nchan_out, ( hCPE != NULL ) ? hCPE->last_element_mode : IVAS_SCE ) ) != IVAS_ERR_OK ) + if ( ( error = core_switching_post_dec( st, synth[n], output[n], p_output_mem, ( st_ivas != NULL ) ? st_ivas->ivas_format : UNDEFINED_FORMAT, use_cldfb_for_dft, output_frame, 0 /*core_switching_flag*/, sba_dirac_stereo_flag, nchan_out, ( hCPE != NULL ) ? hCPE->last_element_mode : IVAS_SCE ) ) != IVAS_ERR_OK ) { return error; } /* for FD-CNG we need the delay compensation in the synth, so do this afterwards */ - if ( sba_dirac_stereo_flag && st->core_brate == SID_2k40 && st->cng_type == FD_CNG ) + if ( sba_dirac_stereo_flag && hSCE && st->core_brate == SID_2k40 && st->cng_type == FD_CNG ) { mvr2r( synth[n], hSCE->save_synth, output_frame ); } @@ -692,7 +679,7 @@ ivas_error ivas_core_dec( } } - if ( sba_dirac_stereo_flag ) + if ( sba_dirac_stereo_flag && st->element_mode != IVAS_CPE_MDCT ) { /* for SBA DirAC stereo output DFT Stereo core switching and updates are done in ivas_sba_dirac_stereo_dec() as hCPE is not available at this point */ break; @@ -707,13 +694,16 @@ ivas_error ivas_core_dec( if ( st->element_mode != IVAS_CPE_DFT ) { - if ( st->element_mode != IVAS_CPE_MDCT ) + if ( st->element_mode != IVAS_CPE_MDCT || sba_dirac_stereo_flag ) { - ivas_post_proc( hSCE, hCPE, n, synth[n], NULL, output_frame, 0 ); + ivas_post_proc( hSCE, hCPE, n, synth[n], NULL, output_frame, sba_dirac_stereo_flag ); } /* update OLA buffers - needed for switching to DFT stereo */ - stereo_td2dft_update( hCPE, n, output[n], synth[n], hb_synth[n], output_frame ); + if ( !sba_dirac_stereo_flag ) + { + stereo_td2dft_update( hCPE, n, output[n], synth[n], hb_synth[n], output_frame ); + } } else /* IVAS_CPE_DFT */ { @@ -753,7 +743,7 @@ ivas_error ivas_core_dec( output_debug_mode_info_dec( sts, n_channels, output_frame, pitch_buf ); #endif - wmops_sub_end(); + pop_wmops(); return error; } diff --git a/lib_dec/ivas_corecoder_dec_reconfig.c b/lib_dec/ivas_corecoder_dec_reconfig.c index b8d4e66cf4..9d15f1bdfc 100644 --- a/lib_dec/ivas_corecoder_dec_reconfig.c +++ b/lib_dec/ivas_corecoder_dec_reconfig.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,36 +33,34 @@ #include "options.h" #include "ivas_cnst.h" #include "ivas_prot.h" -#include "ivas_rom_com.h" -#include "ivas_stat_enc.h" -#include "lib_dec.h" #include "prot.h" -#include -#include #include #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * ivas_corecoder_dec_reconfig() * - * Allocate, initalize, and configure SCE/CPE/MCT handles in case of bitrate switching + * Allocate, initialize, and configure SCE/CPE/MCT handles in case of bitrate switching *-------------------------------------------------------------------*/ ivas_error ivas_corecoder_dec_reconfig( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - const int16_t nSCE_old, /* i : number of SCEs in previous frame */ - const int16_t nCPE_old, /* i : number of CPEs in previous frame */ - const int16_t nchan_transport_old, /* i : number of TCs in previous frame */ - const int16_t sba_dirac_stereo_flag_old /* i : signal stereo output for SBA DirAC in previous frame */ + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + const int16_t nSCE_old, /* i : number of SCEs in previous frame */ + int16_t nCPE_old, /* i : number of CPEs in previous frame */ + const int16_t nchan_transport_old, /* i : number of TCs in previous frame */ + const int16_t sba_dirac_stereo_flag_old, /* i : signal stereo rendering using DFT upmix in previous frame */ + const int32_t brate_SCE, /* i : bitrate to be set for the SCEs */ + const int32_t brate_CPE /* i : bitrate to be set for the CPEs */ ) { int16_t n, sce_id, cpe_id, output_frame; int16_t nSCE_existing, nCPE_existing; int32_t ivas_total_brate; + MC_MODE last_mc_mode; DECODER_CONFIG_HANDLE hDecoderConfig; ivas_error error; @@ -72,16 +70,25 @@ ivas_error ivas_corecoder_dec_reconfig( hDecoderConfig = st_ivas->hDecoderConfig; ivas_total_brate = hDecoderConfig->ivas_total_brate; + output_frame = (int16_t) ( hDecoderConfig->output_Fs / FRAMES_PER_SEC ); error = IVAS_ERR_OK; - output_frame = (int16_t) ( hDecoderConfig->output_Fs / FRAMES_PER_SEC ); + if ( st_ivas->ivas_format == MC_FORMAT ) + { + last_mc_mode = ivas_mc_mode_select( ivas_mc_map_output_config_to_mc_ls_setup( st_ivas->transport_config ), st_ivas->hDecoderConfig->last_ivas_total_brate ); /* NB: this assumes that LS config remains the same between frames */ + } + else + { + last_mc_mode = MC_MODE_NONE; + } /*-----------------------------------------------------------------* - * Allocate, initalize, and configure SCE/CPE/MCT handles + * Allocate, initialize, and configure SCE/CPE/MCT handles *-----------------------------------------------------------------*/ /* remove dummy CPE element for DFT stereo-like upmix */ - if ( st_ivas->ivas_format == SBA_FORMAT && sba_dirac_stereo_flag_old && !st_ivas->sba_dirac_stereo_flag ) + if ( ( st_ivas->ivas_format == SBA_FORMAT && sba_dirac_stereo_flag_old && nchan_transport_old == 1 && ( !st_ivas->sba_dirac_stereo_flag || st_ivas->nchan_transport > 1 ) ) || + ( st_ivas->ivas_format == MC_FORMAT && last_mc_mode == MC_MODE_MCMASA && sba_dirac_stereo_flag_old && nchan_transport_old == 1 && ( !st_ivas->sba_dirac_stereo_flag || st_ivas->nchan_transport > 1 ) ) ) { st_ivas->hCPE[0]->hCoreCoder[0] = NULL; st_ivas->hCPE[0]->hCoreCoder[1] = NULL; @@ -90,25 +97,25 @@ ivas_error ivas_corecoder_dec_reconfig( if ( st_ivas->hSCE[0] != NULL ) { - count_free( st_ivas->hSCE[0]->save_synth ); + free( st_ivas->hSCE[0]->save_synth ); st_ivas->hSCE[0]->save_synth = NULL; - count_free( st_ivas->hSCE[0]->save_hb_synth ); + free( st_ivas->hSCE[0]->save_hb_synth ); st_ivas->hSCE[0]->save_hb_synth = NULL; } } - if ( st_ivas->nchan_transport == nchan_transport_old ) + if ( st_ivas->nchan_transport == nchan_transport_old && st_ivas->nSCE == nSCE_old && st_ivas->nCPE == nCPE_old ) { for ( sce_id = 0; sce_id < st_ivas->nSCE; sce_id++ ) { - st_ivas->hSCE[sce_id]->element_brate = ivas_total_brate / st_ivas->nchan_transport; + st_ivas->hSCE[sce_id]->element_brate = brate_SCE; st_ivas->hSCE[sce_id]->hCoreCoder[0]->total_brate = st_ivas->hSCE[sce_id]->element_brate; /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */ } for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) { - st_ivas->hCPE[cpe_id]->element_brate = ( ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS; + st_ivas->hCPE[cpe_id]->element_brate = brate_CPE; /* prepare bitstream buffers */ for ( n = 0; n < CPE_CHANNELS; n++ ) @@ -130,7 +137,6 @@ ivas_error ivas_corecoder_dec_reconfig( nSCE_existing = min( nSCE_old, st_ivas->nSCE ); nCPE_existing = min( nCPE_old, st_ivas->nCPE ); - // VE: TBV - try to reuse the CoreCoder /* destroy superfluous core coder elements */ for ( sce_id = st_ivas->nSCE; sce_id < nSCE_old; sce_id++ ) { @@ -140,10 +146,36 @@ ivas_error ivas_corecoder_dec_reconfig( for ( cpe_id = st_ivas->nCPE; cpe_id < nCPE_old; cpe_id++ ) { + /* don't deallocate first CPE in case of mono/stereo output of 1 TC SBA, only deallocate core coder */ + if ( cpe_id == 0 && st_ivas->sba_dirac_stereo_flag && sba_dirac_stereo_flag_old ) + { + for ( n = 0; n < CPE_CHANNELS; n++ ) + { + if ( st_ivas->hCPE[cpe_id]->hCoreCoder[n] != NULL ) + { + destroy_core_dec( st_ivas->hCPE[cpe_id]->hCoreCoder[n] ); + + free( st_ivas->hCPE[cpe_id]->hCoreCoder[n] ); + st_ivas->hCPE[cpe_id]->hCoreCoder[n] = NULL; + } + } + continue; + } destroy_cpe_dec( st_ivas->hCPE[cpe_id] ); st_ivas->hCPE[cpe_id] = NULL; } + /* the CPE-internal settings depend from ivas_format and mc_mode, so clean-up when switching between mc_modes */ + if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode != last_mc_mode && ( st_ivas->mc_mode == MC_MODE_MCMASA || last_mc_mode == MC_MODE_MCMASA ) ) + { + for ( cpe_id = 0; cpe_id < nCPE_existing; cpe_id++ ) + { + destroy_cpe_dec( st_ivas->hCPE[cpe_id] ); + st_ivas->hCPE[cpe_id] = NULL; + } + nCPE_old = 0; + nCPE_existing = min( nCPE_old, st_ivas->nCPE ); + } if ( st_ivas->nCPE <= 1 && st_ivas->hMCT != NULL ) { ivas_mct_dec_close( &st_ivas->hMCT ); @@ -152,26 +184,31 @@ ivas_error ivas_corecoder_dec_reconfig( /* special case, if we have MCT now and had a single CPE before, remove the MDCT Stereo handles from the first CPE*/ if ( st_ivas->nCPE > 1 && nCPE_old == 1 ) { - count_free( st_ivas->hCPE[0]->hStereoMdct ); + free( st_ivas->hCPE[0]->hStereoMdct ); st_ivas->hCPE[0]->hStereoMdct = NULL; } for ( sce_id = 0; sce_id < nSCE_existing; sce_id++ ) { - st_ivas->hSCE[sce_id]->element_brate = ivas_total_brate / st_ivas->nchan_transport; + st_ivas->hSCE[sce_id]->element_brate = brate_SCE; st_ivas->hSCE[sce_id]->hCoreCoder[0]->total_brate = st_ivas->hSCE[sce_id]->element_brate; /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */ } for ( ; sce_id < st_ivas->nSCE; sce_id++ ) { - if ( ( error = create_sce_dec( st_ivas, sce_id, ivas_total_brate / st_ivas->nchan_transport ) ) != IVAS_ERR_OK ) + if ( ( error = create_sce_dec( st_ivas, sce_id, brate_SCE ) ) != IVAS_ERR_OK ) { return error; } } + if ( st_ivas->sba_dirac_stereo_flag && sba_dirac_stereo_flag_old && st_ivas->nchan_transport == 1 && nSCE_old == 0 ) + { + st_ivas->hCPE[0]->hCoreCoder[0] = st_ivas->hSCE[0]->hCoreCoder[0]; /* don't allocate unnecessary core coder, simply point to core coder of SCE element */ + st_ivas->hCPE[0]->hCoreCoder[1] = NULL; + } for ( cpe_id = 0; cpe_id < nCPE_existing; cpe_id++ ) { - st_ivas->hCPE[cpe_id]->element_brate = ( ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS; + st_ivas->hCPE[cpe_id]->element_brate = brate_CPE; /* prepare bitstream buffers */ for ( n = 0; n < CPE_CHANNELS; n++ ) @@ -181,7 +218,11 @@ ivas_error ivas_corecoder_dec_reconfig( } for ( ; cpe_id < st_ivas->nCPE; cpe_id++ ) { - if ( ( error = create_cpe_dec( st_ivas, cpe_id, ( ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS ) ) != IVAS_ERR_OK ) + if ( st_ivas->mc_mode == MC_MODE_MCMASA && st_ivas->hOutSetup.separateChannelEnabled ) + { + st_ivas->element_mode_init = IVAS_CPE_MDCT; + } + if ( ( error = create_cpe_dec( st_ivas, cpe_id, brate_CPE ) ) != IVAS_ERR_OK ) { return error; } @@ -216,7 +257,7 @@ ivas_error ivas_corecoder_dec_reconfig( /* special case, if we have a single CPE and had MCT before we need to init the MDCT stereo handles here */ if ( st_ivas->nCPE == 1 && nCPE_old > 1 ) { - if ( ( st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct = (STEREO_MDCT_DEC_DATA_HANDLE) count_malloc( sizeof( STEREO_MDCT_DEC_DATA ) ) ) == NULL ) + if ( ( st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct = (STEREO_MDCT_DEC_DATA_HANDLE) malloc( sizeof( STEREO_MDCT_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MDCT Stereo \n" ) ); } @@ -224,7 +265,13 @@ ivas_error ivas_corecoder_dec_reconfig( st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->use_itd = 0; st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->reverse_dmx = 0; st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->smooth_ratio = 1.f; - + set_s( st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->prev_ms_mask[0], 0, MAX_SFB ); + set_s( st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->prev_ms_mask[1], 0, MAX_SFB ); + st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->lastCoh = 1.f; + st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->mdct_stereo_mode[0] = SMDCT_DUAL_MONO; + st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->mdct_stereo_mode[1] = SMDCT_DUAL_MONO; + st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->IGFStereoMode[0] = -1; + st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->IGFStereoMode[1] = -1; for ( n = 0; n < CPE_CHANNELS; n++ ) { /* reset mct_chan_mode */ @@ -234,14 +281,26 @@ ivas_error ivas_corecoder_dec_reconfig( } /* create dummy CPE element for DFT stereo-like upmix */ - if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_dirac_stereo_flag && !sba_dirac_stereo_flag_old ) + if ( ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_dirac_stereo_flag && !sba_dirac_stereo_flag_old ) || + ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA && st_ivas->sba_dirac_stereo_flag && !sba_dirac_stereo_flag_old ) ) { - if ( ( error = create_cpe_dec( st_ivas, 0, ivas_total_brate / ( st_ivas->nSCE + st_ivas->nCPE ) ) ) != IVAS_ERR_OK ) + /* if at least one CPE is already available, only allocate DFT Stereo struct */ + if ( st_ivas->nCPE > 0 ) { - return error; + if ( ( error = stereo_dft_dec_create( &( st_ivas->hCPE[0]->hStereoDft ), st_ivas->hCPE[0]->element_brate, st_ivas->hDecoderConfig->output_Fs, st_ivas->sba_dirac_stereo_flag, st_ivas->nchan_transport ) ) != IVAS_ERR_OK ) + { + return error; + } + } + /* otherwise create extra dummy CPE */ + else + { + if ( ( error = create_cpe_dec( st_ivas, 0, ivas_total_brate / ( st_ivas->nSCE + st_ivas->nCPE ) ) ) != IVAS_ERR_OK ) + { + return error; + } } - // VE: TBV - just reset for now set_f( st_ivas->hCPE[0]->hStereoDft->buff_LBTCX_mem, 0, NS2SA( 16000, STEREO_DFT32MS_OVL_NS ) ); st_ivas->hCPE[0]->hCoreCoder[0] = st_ivas->hSCE[0]->hCoreCoder[0]; /* don't allocate unnecessary core coder, simply point to core coder of SCE element */ @@ -249,7 +308,7 @@ ivas_error ivas_corecoder_dec_reconfig( if ( st_ivas->hSCE[0]->save_synth == NULL ) { - if ( ( st_ivas->hSCE[0]->save_synth = (float *) count_malloc( sizeof( float ) * output_frame ) ) == NULL ) + if ( ( st_ivas->hSCE[0]->save_synth = (float *) malloc( sizeof( float ) * output_frame ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for stereo output\n" ) ); } @@ -258,7 +317,7 @@ ivas_error ivas_corecoder_dec_reconfig( if ( st_ivas->hSCE[0]->save_hb_synth == NULL ) { - if ( ( st_ivas->hSCE[0]->save_hb_synth = (float *) count_malloc( sizeof( float ) * output_frame ) ) == NULL ) + if ( ( st_ivas->hSCE[0]->save_hb_synth = (float *) malloc( sizeof( float ) * output_frame ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate HB memory for stereo output\n" ) ); } @@ -270,37 +329,9 @@ ivas_error ivas_corecoder_dec_reconfig( * Set CNA/CNG flags *-----------------------------------------------------------------*/ - /// VE: this could be merged with part of ivas_init_decoder() - if ( st_ivas->ivas_format == SBA_FORMAT ) + if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT ) { - if ( st_ivas->sba_mode == SBA_MODE_SPAR && st_ivas->nchan_transport == 1 ) - { - /* skip as done in init function */ - } - else if ( st_ivas->nchan_transport == 1 && ( ( st_ivas->renderer_type == RENDERER_DIRAC && st_ivas->hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) || ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) ) ) - { - st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag = 1; - st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag = 1; - } - else if ( st_ivas->nchan_transport == 2 ) - { - for ( n = 0; n < CPE_CHANNELS; n++ ) - { - st_ivas->hCPE[0]->hCoreCoder[n]->cna_dirac_flag = 0; - st_ivas->hCPE[0]->hCoreCoder[n]->cng_sba_flag = 1; - } - } - else - { - for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) - { - for ( n = 0; n < CPE_CHANNELS; n++ ) - { - st_ivas->hCPE[cpe_id]->hCoreCoder[n]->cna_dirac_flag = 0; - st_ivas->hCPE[cpe_id]->hCoreCoder[n]->cng_sba_flag = 0; - } - } - } + ivas_sba_set_cna_cng_flag( st_ivas ); } /* special case, if the decoder goes from 1TC DTX to 2TC active frame (in case the bitstream started with an SBA SID frame), allocate DTX memories */ @@ -345,7 +376,7 @@ ivas_error ivas_hp20_dec_reconfig( old_mem_hp20_out = st_ivas->mem_hp20_out; st_ivas->mem_hp20_out = NULL; - if ( ( st_ivas->mem_hp20_out = (float **) count_malloc( nchan_hp20 * sizeof( float * ) ) ) == NULL ) + if ( ( st_ivas->mem_hp20_out = (float **) malloc( nchan_hp20 * sizeof( float * ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HP20 filter memory\n" ) ); } @@ -358,7 +389,7 @@ ivas_error ivas_hp20_dec_reconfig( /* create additional hp20 memories */ for ( ; i < nchan_hp20; i++ ) { - if ( ( st_ivas->mem_hp20_out[i] = (float *) count_malloc( L_HP20_MEM * sizeof( float ) ) ) == NULL ) + if ( ( st_ivas->mem_hp20_out[i] = (float *) malloc( L_HP20_MEM * sizeof( float ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HP20 filter memory\n" ) ); } @@ -366,7 +397,7 @@ ivas_error ivas_hp20_dec_reconfig( set_f( st_ivas->mem_hp20_out[i], 0.0f, L_HP20_MEM ); } - count_free( old_mem_hp20_out ); + free( old_mem_hp20_out ); old_mem_hp20_out = NULL; } else if ( nchan_hp20 < nchan_hp20_old ) @@ -375,7 +406,7 @@ ivas_error ivas_hp20_dec_reconfig( old_mem_hp20_out = st_ivas->mem_hp20_out; st_ivas->mem_hp20_out = NULL; - if ( ( st_ivas->mem_hp20_out = (float **) count_malloc( nchan_hp20 * sizeof( float * ) ) ) == NULL ) + if ( ( st_ivas->mem_hp20_out = (float **) malloc( nchan_hp20 * sizeof( float * ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HP20 filter memory\n" ) ); } @@ -388,11 +419,11 @@ ivas_error ivas_hp20_dec_reconfig( /* remove superfluous hp20 memories */ for ( ; i < nchan_hp20_old; i++ ) { - count_free( old_mem_hp20_out[i] ); + free( old_mem_hp20_out[i] ); old_mem_hp20_out[i] = NULL; } - count_free( old_mem_hp20_out ); + free( old_mem_hp20_out ); old_mem_hp20_out = NULL; } @@ -400,7 +431,6 @@ ivas_error ivas_hp20_dec_reconfig( } -#ifdef BRATE_SWITCHING_RENDERING /*-------------------------------------------------------------------* * ivas_cldfb_dec_reconfig() * @@ -427,7 +457,6 @@ ivas_error ivas_cldfb_dec_reconfig( if ( st_ivas->ivas_format == SBA_FORMAT && nchan_transport_old == 1 && numCldfbAnalyses_old == 2 && st_ivas->nchan_transport > 1 ) { deleteCldfb( &( st_ivas->cldfbAnaDec[1] ) ); - st_ivas->cldfbAnaDec[1] = NULL; numCldfbAnalyses_old--; } @@ -447,7 +476,6 @@ ivas_error ivas_cldfb_dec_reconfig( for ( i = numCldfbAnalyses; i < numCldfbAnalyses_old; i++ ) { deleteCldfb( &( st_ivas->cldfbAnaDec[i] ) ); - st_ivas->cldfbAnaDec[i] = NULL; } } else if ( numCldfbAnalyses_old < numCldfbAnalyses ) @@ -469,7 +497,6 @@ ivas_error ivas_cldfb_dec_reconfig( for ( i = numCldfbSyntheses; i < numCldfbSyntheses_old; i++ ) { deleteCldfb( &( st_ivas->cldfbSynDec[i] ) ); - st_ivas->cldfbSynDec[i] = NULL; } } else if ( numCldfbSyntheses_old < numCldfbSyntheses ) @@ -484,6 +511,11 @@ ivas_error ivas_cldfb_dec_reconfig( } } + /* CLDFB Interpolation weights */ + if ( st_ivas->sba_mode == SBA_MODE_SPAR && ( numCldfbAnalyses_old != numCldfbAnalyses || numCldfbSyntheses_old != numCldfbSyntheses || nchan_transport_old != st_ivas->nchan_transport ) && numCldfbAnalyses != 0 && numCldfbSyntheses != 0 ) + { + ivas_spar_get_cldfb_gains( st_ivas->hSpar, st_ivas->cldfbAnaDec[0], st_ivas->cldfbSynDec[0], hDecoderConfig ); + } + return IVAS_ERR_OK; } -#endif diff --git a/lib_dec/ivas_cpe_dec.c b/lib_dec/ivas_cpe_dec.c index 12b8fcb899..186d1c4c7d 100644 --- a/lib_dec/ivas_cpe_dec.c +++ b/lib_dec/ivas_cpe_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" #include @@ -80,7 +80,7 @@ ivas_error ivas_cpe_dec( error = IVAS_ERR_OK; - wmops_sub_start( "ivas_cpe_dec" ); + push_wmops( "ivas_cpe_dec" ); ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; @@ -103,7 +103,7 @@ ivas_error ivas_cpe_dec( * dynamically allocate data structures depending on the actual stereo mode *----------------------------------------------------------------*/ - if ( ( error = stereo_memory_dec( ivas_total_brate, hCPE, nb_bits_metadata, st_ivas->hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->nchan_transport ) ) != IVAS_ERR_OK ) + if ( ( error = stereo_memory_dec( ivas_total_brate, hCPE, nb_bits_metadata, st_ivas->hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->mc_mode, st_ivas->nchan_transport ) ) != IVAS_ERR_OK ) { return error; } @@ -291,7 +291,6 @@ ivas_error ivas_cpe_dec( } } else - { /* subtract metadata bitbudget */ /* IVAS_fmToDo: TBC whether it is not better to distribute the metadata bits equally between 2 channels */ sts[0]->bits_frame_channel -= nb_bits_metadata; @@ -361,7 +360,7 @@ ivas_error ivas_cpe_dec( if ( hCPE->element_mode != IVAS_CPE_DFT || ( hCPE->nchan_out == 1 && hCPE->hStereoDft->hConfig->res_cod_mode == STEREO_DFT_RES_COD_OFF ) ) { - if ( ( error = ivas_core_dec( st_ivas, NULL, hCPE, st_ivas->hMCT, n_channels, output, outputHB, NULL, 0 ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_core_dec( st_ivas, NULL, hCPE, st_ivas->hMCT, n_channels, output, outputHB, NULL, st_ivas->sba_dirac_stereo_flag ) ) != IVAS_ERR_OK ) { return error; } @@ -369,7 +368,7 @@ ivas_error ivas_cpe_dec( if ( st_ivas->hMCT ) { - wmops_sub_end(); + pop_wmops(); return error; } @@ -406,7 +405,7 @@ ivas_error ivas_cpe_dec( } else { - stereo_dft_dec( hCPE->hStereoDft, sts[0], DFT, hCPE->input_mem[1], hCPE->hStereoCng, 0 ); + stereo_dft_dec( hCPE->hStereoDft, sts[0], DFT, hCPE->input_mem[1], hCPE->hStereoCng, 0, 0, 0, 0, 0, 0 ); } /* synthesis iFFT */ @@ -444,10 +443,6 @@ ivas_error ivas_cpe_dec( } } } - else if ( hCPE->element_mode == IVAS_CPE_MDCT && hCPE->nchan_out == 1 && ( is_DTXrate( ivas_total_brate ) == 0 || ( is_DTXrate( ivas_total_brate ) == 1 && is_DTXrate( st_ivas->hDecoderConfig->last_ivas_total_brate ) == 0 ) ) ) - { - applyDmxMdctStereo( hCPE, output, output_frame ); - } /*----------------------------------------------------------------* * Update parameters for stereo CNA @@ -459,7 +454,15 @@ ivas_error ivas_cpe_dec( * Synthesis synchronization between CPE modes *----------------------------------------------------------------*/ - synchro_synthesis( ivas_total_brate, hCPE, output, output_frame, 0 ); + if ( !st_ivas->sba_dirac_stereo_flag ) + { + synchro_synthesis( ivas_total_brate, hCPE, output, output_frame, 0 ); + } + + if ( hCPE->element_mode == IVAS_CPE_MDCT && hCPE->nchan_out == 1 && ( is_DTXrate( ivas_total_brate ) == 0 || ( is_DTXrate( ivas_total_brate ) == 1 && is_DTXrate( st_ivas->hDecoderConfig->last_ivas_total_brate ) == 0 ) ) ) + { + applyDmxMdctStereo( hCPE, output, output_frame ); + } #ifndef DEBUG_STEREO_DFT_OUTRESPRED /*----------------------------------------------------------------* @@ -521,7 +524,7 @@ ivas_error ivas_cpe_dec( } #endif - wmops_sub_end(); + pop_wmops(); return error; } @@ -550,7 +553,7 @@ ivas_error create_cpe_dec( * Allocate CPE handle *-----------------------------------------------------------------*/ - if ( ( hCPE = (CPE_DEC_HANDLE) count_malloc( sizeof( CPE_DEC_DATA ) ) ) == NULL ) + if ( ( hCPE = (CPE_DEC_HANDLE) malloc( sizeof( CPE_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CPE\n" ) ); } @@ -581,7 +584,7 @@ ivas_error create_cpe_dec( hCPE->lt_es_em = 0.0f; /* Note: nchan_out is considered to be related to the structure. This is nchan_out for CPE and for MASA_format is always 2. */ - if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT || ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) ) + if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MC_FORMAT ) { hCPE->nchan_out = CPE_CHANNELS; } @@ -610,13 +613,13 @@ ivas_error create_cpe_dec( if ( st_ivas->ivas_format == STEREO_FORMAT || st_ivas->ivas_format == MASA_FORMAT || ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) || st_ivas->sba_dirac_stereo_flag ) { - if ( ( hCPE->input_mem[i] = (float *) count_malloc( sizeof( float ) * NS2SA( output_Fs, STEREO_DFT32MS_OVL_NS ) ) ) == NULL ) + if ( ( hCPE->input_mem[i] = (float *) malloc( sizeof( float ) * NS2SA( output_Fs, STEREO_DFT32MS_OVL_NS ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DFT stereo memory\n" ) ); } set_zero( hCPE->input_mem[i], NS2SA( output_Fs, STEREO_DFT32MS_OVL_NS ) ); - if ( ( hCPE->input_mem_LB[i] = (float *) count_malloc( sizeof( float ) * STEREO_DFT32MS_OVL_16k ) ) == NULL ) + if ( ( hCPE->input_mem_LB[i] = (float *) malloc( sizeof( float ) * STEREO_DFT32MS_OVL_16k ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DFT stereo memory\n" ) ); } @@ -624,14 +627,14 @@ ivas_error create_cpe_dec( if ( i == 0 ) { - if ( ( hCPE->input_mem_BPF[0] = (float *) count_malloc( sizeof( float ) * STEREO_DFT32MS_OVL_16k ) ) == NULL ) + if ( ( hCPE->input_mem_BPF[0] = (float *) malloc( sizeof( float ) * STEREO_DFT32MS_OVL_16k ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DFT stereo memory\n" ) ); } set_zero( hCPE->input_mem_BPF[0], STEREO_DFT32MS_OVL_16k ); } - if ( ( hCPE->output_mem[i] = (float *) count_malloc( sizeof( float ) * NS2SA( output_Fs, STEREO_DFT32MS_OVL_NS ) ) ) == NULL ) + if ( ( hCPE->output_mem[i] = (float *) malloc( sizeof( float ) * NS2SA( output_Fs, STEREO_DFT32MS_OVL_NS ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DFT stereo memory\n" ) ); } @@ -639,7 +642,7 @@ ivas_error create_cpe_dec( if ( i < hCPE->nchan_out ) { - if ( ( hCPE->prev_synth_chs[i] = (float *) count_malloc( sizeof( float ) * NS2SA( output_Fs, FRAME_SIZE_NS ) ) ) == NULL ) + if ( ( hCPE->prev_synth_chs[i] = (float *) malloc( sizeof( float ) * NS2SA( output_Fs, FRAME_SIZE_NS ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DFT stereo memory\n" ) ); } @@ -669,13 +672,13 @@ ivas_error create_cpe_dec( for ( n = 0; n < CPE_CHANNELS; n++ ) { - if ( st_ivas->sba_dirac_stereo_flag ) + if ( st_ivas->sba_dirac_stereo_flag && st_ivas->nchan_transport == 1 ) { /* for SBA DirAC stereo output CPE element is only used for upmix, core coder is found in SCE element used for core decoding */ break; } - if ( ( st = (DEC_CORE_HANDLE) count_malloc( sizeof( Decoder_State ) ) ) == NULL ) + if ( ( st = (DEC_CORE_HANDLE) malloc( sizeof( Decoder_State ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CoreCoder structure\n" ) ); } @@ -684,10 +687,6 @@ ivas_error create_cpe_dec( st->total_brate = hCPE->element_brate / ( CPE_CHANNELS ); /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */ st->mct_chan_mode = MCT_CHAN_MODE_REGULAR; - if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT && ( n + cpe_id * CPE_CHANNELS ) == LFE_CHANNEL ) - { - st->mct_chan_mode = MCT_CHAN_MODE_LFE; - } if ( ( error = init_decoder( st, n, st_ivas->mc_mode ) ) != IVAS_ERR_OK ) { @@ -701,9 +700,9 @@ ivas_error create_cpe_dec( * DFT stereo initialization *-----------------------------------------------------------------*/ - if ( hCPE->element_mode == IVAS_CPE_DFT || st_ivas->sba_dirac_stereo_flag ) + if ( hCPE->element_mode == IVAS_CPE_DFT || ( st_ivas->sba_dirac_stereo_flag && hCPE->cpe_id == 0 ) ) { - if ( ( error = stereo_dft_dec_create( &( hCPE->hStereoDft ), hCPE->element_brate, output_Fs, st_ivas->sba_dirac_stereo_flag ) ) != IVAS_ERR_OK ) + if ( ( error = stereo_dft_dec_create( &( hCPE->hStereoDft ), hCPE->element_brate, output_Fs, st_ivas->sba_dirac_stereo_flag, st_ivas->nchan_transport ) ) != IVAS_ERR_OK ) { return error; } @@ -715,7 +714,7 @@ ivas_error create_cpe_dec( if ( hCPE->element_mode != IVAS_CPE_MDCT && hCPE->nchan_out == 1 ) { - if ( ( hCPE->hStereoDftDmx = (STEREO_DFT_DMX_DATA_HANDLE) count_malloc( sizeof( STEREO_DFT_DMX_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoDftDmx = (STEREO_DFT_DMX_DATA_HANDLE) malloc( sizeof( STEREO_DFT_DMX_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Stereo DFT mono output\n" ) ); } @@ -729,7 +728,7 @@ ivas_error create_cpe_dec( if ( ( hCPE->element_mode != IVAS_CPE_MDCT || ( st_ivas->ivas_format == STEREO_FORMAT && hCPE->element_brate <= MAX_MDCT_ITD_BRATE ) ) && hCPE->nchan_out != 1 ) { - if ( ( hCPE->hStereoTCA = (STEREO_TCA_DEC_HANDLE) count_malloc( sizeof( STEREO_TCA_DEC_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoTCA = (STEREO_TCA_DEC_HANDLE) malloc( sizeof( STEREO_TCA_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Stereo TCA\n" ) ); } @@ -743,7 +742,7 @@ ivas_error create_cpe_dec( if ( hCPE->element_mode != IVAS_CPE_MDCT && !( hCPE->element_mode == IVAS_CPE_DFT && hCPE->nchan_out == 1 ) ) { - if ( ( hCPE->hStereoICBWE = (STEREO_ICBWE_DEC_HANDLE) count_malloc( sizeof( STEREO_ICBWE_DEC_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoICBWE = (STEREO_ICBWE_DEC_HANDLE) malloc( sizeof( STEREO_ICBWE_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Stereo ICBWE\n" ) ); } @@ -757,7 +756,7 @@ ivas_error create_cpe_dec( if ( hCPE->element_mode == IVAS_CPE_TD ) { - if ( ( hCPE->hStereoTD = (STEREO_TD_DEC_DATA_HANDLE) count_malloc( sizeof( STEREO_TD_DEC_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoTD = (STEREO_TD_DEC_DATA_HANDLE) malloc( sizeof( STEREO_TD_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD Stereo\n" ) ); } @@ -771,7 +770,7 @@ ivas_error create_cpe_dec( if ( hCPE->element_mode == IVAS_CPE_MDCT && st_ivas->nCPE == 1 ) { - if ( ( hCPE->hStereoMdct = (STEREO_MDCT_DEC_DATA_HANDLE) count_malloc( sizeof( STEREO_MDCT_DEC_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoMdct = (STEREO_MDCT_DEC_DATA_HANDLE) malloc( sizeof( STEREO_MDCT_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Stereo MDCT\n" ) ); } @@ -802,7 +801,7 @@ ivas_error create_cpe_dec( if ( hCPE->element_mode == IVAS_CPE_TD || hCPE->element_mode == IVAS_CPE_DFT ) { - if ( ( hCPE->hStereoCng = (STEREO_CNG_DEC_HANDLE) count_malloc( sizeof( STEREO_CNG_DEC ) ) ) == NULL ) + if ( ( hCPE->hStereoCng = (STEREO_CNG_DEC_HANDLE) malloc( sizeof( STEREO_CNG_DEC ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Stereo CNG\n" ) ); } @@ -828,6 +827,12 @@ void destroy_cpe_dec( int16_t n; Decoder_State *st; + /* make sure we deallocate a potential distinct hTcxCfg for a MCT LFE channel (can only happen in rs) */ /*TODO Check this again with LFE clean up!*/ + if ( hCPE->hCoreCoder[1] != NULL && hCPE->hCoreCoder[1]->hTcxCfg != hCPE->hCoreCoder[0]->hTcxCfg ) + { + hCPE->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_IGNORE; + } + for ( n = 0; n < CPE_CHANNELS; n++ ) { st = hCPE->hCoreCoder[n]; @@ -836,7 +841,7 @@ void destroy_cpe_dec( { destroy_core_dec( st ); - count_free( st ); + free( st ); st = NULL; } } @@ -849,31 +854,31 @@ void destroy_cpe_dec( if ( hCPE->hStereoDftDmx != NULL ) { - count_free( hCPE->hStereoDftDmx ); + free( hCPE->hStereoDftDmx ); hCPE->hStereoDftDmx = NULL; } if ( hCPE->hStereoTD != NULL ) { - count_free( hCPE->hStereoTD ); + free( hCPE->hStereoTD ); hCPE->hStereoTD = NULL; } if ( hCPE->hStereoMdct != NULL ) { - count_free( hCPE->hStereoMdct ); + free( hCPE->hStereoMdct ); hCPE->hStereoMdct = NULL; } if ( hCPE->hStereoTCA != NULL ) { - count_free( hCPE->hStereoTCA ); + free( hCPE->hStereoTCA ); hCPE->hStereoTCA = NULL; } if ( hCPE->hStereoICBWE != NULL ) { - count_free( hCPE->hStereoICBWE ); + free( hCPE->hStereoICBWE ); hCPE->hStereoICBWE = NULL; } @@ -881,29 +886,29 @@ void destroy_cpe_dec( { for ( n = 0; n < CPE_CHANNELS; n++ ) { - count_free( hCPE->input_mem_LB[n] ); + free( hCPE->input_mem_LB[n] ); hCPE->input_mem_LB[n] = NULL; - count_free( hCPE->input_mem[n] ); + free( hCPE->input_mem[n] ); hCPE->input_mem[n] = NULL; - count_free( hCPE->output_mem[n] ); + free( hCPE->output_mem[n] ); hCPE->output_mem[n] = NULL; if ( hCPE->prev_synth_chs[n] != NULL ) { - count_free( hCPE->prev_synth_chs[n] ); + free( hCPE->prev_synth_chs[n] ); hCPE->prev_synth_chs[n] = NULL; } } - count_free( hCPE->input_mem_BPF[0] ); + free( hCPE->input_mem_BPF[0] ); hCPE->input_mem_BPF[0] = NULL; } if ( hCPE->hStereoCng != NULL ) { - count_free( hCPE->hStereoCng ); + free( hCPE->hStereoCng ); hCPE->hStereoCng = NULL; } - count_free( hCPE ); + free( hCPE ); return; } @@ -954,7 +959,7 @@ static void read_stereo_mode_and_bwidth( hCPE->element_mode = IVAS_CPE_MDCT; break; case SID_SBA_1TC: - assert( "Forbidden value for SID format in CPE (SBA 1TC), should have already been adressed earlier" ); + assert( !"Forbidden value for SID format in CPE (SBA 1TC), should have already been adressed earlier" ); break; case SID_MASA_1TC: hCPE->element_mode = IVAS_SCE; diff --git a/lib_dec/ivas_dec.c b/lib_dec/ivas_dec.c index 6bea587839..0bb1addf2f 100644 --- a/lib_dec/ivas_dec.c +++ b/lib_dec/ivas_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,11 +37,12 @@ #include "rom_com.h" #include "prot.h" #include "ivas_prot.h" +#include "ivas_prot_rend.h" #include "ivas_rom_com.h" #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* @@ -71,7 +72,7 @@ ivas_error ivas_dec( error = IVAS_ERR_OK; - wmops_sub_start( "ivas_dec" ); + push_wmops( "ivas_dec" ); /*----------------------------------------------------------------* * IVAS decoder setup @@ -155,13 +156,27 @@ ivas_error ivas_dec( else if ( st_ivas->ivas_format == ISM_FORMAT ) { /* Metadata decoding and configuration */ - if ( st_ivas->ism_mode == ISM_MODE_PARAM ) + if ( ivas_total_brate == IVAS_SID_5k2 || ivas_total_brate == FRAME_NO_DATA ) + { + if ( ( error = ivas_ism_dtx_dec( st_ivas, nb_bits_metadata ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else if ( st_ivas->ism_mode == ISM_MODE_PARAM ) { - ivas_ism_metadata_dec( ivas_total_brate, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hDirAC->hParamIsm ); + // VE: call ivas_ism_metadata_dec() with 'st_ivas' - TBD + if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ) ) != IVAS_ERR_OK ) + { + return error; + } } else /* ISM_MODE_DISC */ { - ivas_ism_metadata_dec( ivas_total_brate, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, NULL ); + if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, NULL, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ) ) != IVAS_ERR_OK ) + { + return error; + } } for ( n = 0; n < st_ivas->nchan_transport; n++ ) @@ -181,6 +196,7 @@ ivas_error ivas_dec( if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC ) { ivas_param_ism_params_to_masa_param_mapping( st_ivas ); + ivas_dirac_dec_binaural( st_ivas, output, st_ivas->nchan_transport ); } else if ( st_ivas->renderer_type == RENDERER_MONO_DOWNMIX ) @@ -210,10 +226,18 @@ ivas_error ivas_dec( /* Convert to CICPxx; used also for ISM->CICP19->binaural_room rendering */ ivas_ism_render( st_ivas, output, output_frame ); } +#ifdef REND_DEBUGGING_REVISION +#ifdef DEBUGGING else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV ) +#else + else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) +#endif +#else + else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV ) +#endif { /* Convert to Ambisonics; used also for ISM->HOA3->binaural rendering */ - ivas_ism2sba( output, st_ivas->hIsmRendererData, st_ivas->hIsmMetaData, st_ivas->nchan_transport, output_frame, st_ivas->hIntSetup.ambisonics_order ); + ivas_ism2sba( output, st_ivas->hIsmRendererData, st_ivas->hIsmMetaData, st_ivas->nchan_ism, output_frame, st_ivas->hIntSetup.ambisonics_order ); } /* Binaural rendering */ @@ -236,20 +260,33 @@ ivas_error ivas_dec( else { #endif - ObjRenderIVASFrame( st_ivas, output, output_frame ); + if ( ( error = ivas_td_binaural_renderer( st_ivas, output, output_frame ) ) != IVAS_ERR_OK ) + { + return error; + } #ifdef SPLIT_REND_LC3PLUS } #endif } else if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) { - ivas_crend_process( st_ivas, output ); + if ( ( error = ivas_rend_crendProcess( st_ivas->hCrendWrapper, AUDIO_CONFIG_7_1_4, AUDIO_CONFIG_BINAURAL_ROOM, NULL, NULL, NULL, NULL, output, output_Fs +#ifdef SPLIT_REND_WITH_HEAD_ROT + , + 0 +#endif + ) ) != IVAS_ERR_OK ) + { + return error; + } ivas_binaural_add_LFE( st_ivas, output_frame, output ); } +#ifdef DEBUGGING else if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) { ivas_binaural_cldfb( st_ivas, output ); } +#endif } } else if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT ) @@ -314,7 +351,17 @@ ivas_error ivas_dec( return error; } } - +#ifdef DEBUG_LBR_SBA + /* SCE Decoder Output */ + for ( int t = 0; t < 960; t++ ) + { + for ( int c = 0; c < st_ivas->nchan_transport; c++ ) + { + float val = output[c][t] / MAX16B_FLT; + dbgwrite( &val, sizeof( float ), 1, 1, "int_dec_core_out.raw" ); + } + } +#endif #ifdef DEBUG_SBA_AUDIO_DUMP /* Dump audio signal after core-decoding */ ivas_spar_dump_signal_wav( output_frame, NULL, output, st_ivas->nchan_transport, spar_foa_dec_wav[0], "core-decoding" ); @@ -323,8 +370,21 @@ ivas_error ivas_dec( nchan_remapped = st_ivas->nchan_transport; if ( st_ivas->sba_dirac_stereo_flag ) { - nchan_remapped = CPE_CHANNELS; - ivas_sba_dirac_stereo_dec( st_ivas, output, output_frame ); + nchan_remapped = nchan_out; + + if ( st_ivas->sba_mode == SBA_MODE_SPAR ) + { + ivas_agc_dec_process( st_ivas->hSpar->hAgcDec, output, output, st_ivas->hSpar->hMdDec->spar_md_cfg.nchan_transport, output_frame ); + + if ( st_ivas->hSpar->hPCA != NULL ) + { + ivas_pca_dec( st_ivas->hSpar->hPCA, output_frame, st_ivas->hSpar->hMdDec->spar_md_cfg.nchan_transport, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->hDecoderConfig->last_ivas_total_brate, st_ivas->bfi, output ); + } + + ivas_spar_dec_gen_umx_mat( st_ivas->hSpar->hMdDec, st_ivas->nchan_transport, IVAS_MAX_NUM_BANDS, st_ivas->bfi ); + } + + ivas_sba_dirac_stereo_dec( st_ivas, output, output_frame, st_ivas->ivas_format == MC_FORMAT ); } else if ( st_ivas->ivas_format == MASA_FORMAT && ivas_total_brate < MASA_STEREO_MIN_BITRATE && ( ivas_total_brate > IVAS_SID_5k2 || ( ivas_total_brate <= IVAS_SID_5k2 && st_ivas->nCPE > 0 && st_ivas->hCPE[0]->nchan_out == 1 ) ) ) { @@ -371,14 +431,17 @@ ivas_error ivas_dec( { if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC ) { - ivas_sba_linear_renderer( output, output_frame, nchan_remapped, output_config, st_ivas->hOutSetup, st_ivas->hoa_dec_mtx ); + if ( ( error = ivas_sba_linear_renderer( output, output_frame, nchan_remapped, output_config, st_ivas->hOutSetup, st_ivas->hoa_dec_mtx ) ) != IVAS_ERR_OK ) + { + return error; + } } else if ( st_ivas->renderer_type == RENDERER_DIRAC ) { ivas_dirac_dec( st_ivas, output, nchan_remapped, NULL, NULL, -1 ); } } - else /* SBA_MODE_SPAR */ + else if ( !st_ivas->sba_dirac_stereo_flag && nchan_out != 1 ) { ivas_sba_upmixer_renderer( st_ivas, output, output_frame ); /* Note: ivas_sba_linear_renderer() or ivas_dirac_dec() are called internally */ } @@ -390,7 +453,6 @@ ivas_error ivas_dec( /* LFE channel decoder */ if ( st_ivas->mc_mode == MC_MODE_MCT ) { - st_ivas->hCPE[1]->hCoreCoder[1]->hTcxCfg = st_ivas->hCPE[1]->hCoreCoder[0]->hTcxCfg; ivas_lfe_dec( st_ivas->hLFE, st, output_frame, st_ivas->bfi, output_lfe_ch ); } @@ -420,13 +482,17 @@ ivas_error ivas_dec( /* Rendering */ if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) { - ivas_crend_process( st_ivas, output ); - ivas_binaural_add_LFE( st_ivas, output_frame, output ); - } - if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) - { + if ( ( error = ivas_rend_crendProcess( st_ivas->hCrendWrapper, st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hDecoderConfig, st_ivas->hHeadTrackData, &st_ivas->hIntSetup, st_ivas->hEFAPdata, output, output_Fs +#ifdef SPLIT_REND_WITH_HEAD_ROT + , + 0 +#endif + ) ) != IVAS_ERR_OK ) + { + return error; + } + ivas_binaural_add_LFE( st_ivas, output_frame, output ); - ivas_binaural_cldfb( st_ivas, output ); } else if ( st_ivas->renderer_type == RENDERER_MC ) { @@ -438,7 +504,11 @@ ivas_error ivas_dec( } else if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD ) { - ObjRenderIVASFrame( st_ivas, output, output_frame ); + if ( ( ivas_td_binaural_renderer( st_ivas, output, output_frame ) ) != IVAS_ERR_OK ) + { + return error; + } + ivas_binaural_add_LFE( st_ivas, output_frame, output ); } } @@ -541,7 +611,7 @@ ivas_error ivas_dec( if ( st_ivas->sba_dirac_stereo_flag ) /* use the flag to trigger the DFT upmix */ { - ivas_sba_dirac_stereo_dec( st_ivas, output, output_frame ); + ivas_sba_dirac_stereo_dec( st_ivas, output, output_frame, 1 ); } /* HP filtering */ @@ -595,7 +665,7 @@ ivas_error ivas_dec( hSplitBinRend->hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural, max_band, output, 1, 0 ); - dynamic_free( st_ivas->splitBinRend.hMultiBinCldfbData ); + free( st_ivas->splitBinRend.hMultiBinCldfbData ); } #endif /*----------------------------------------------------------------* @@ -618,6 +688,7 @@ ivas_error ivas_dec( if ( !st_ivas->bfi ) /* do not update if first frame(s) are lost or NO_DATA */ { st_ivas->hDecoderConfig->last_ivas_total_brate = ivas_total_brate; + st_ivas->last_active_ivas_total_brate = ( ivas_total_brate <= IVAS_SID_5k2 ) ? st_ivas->last_active_ivas_total_brate : ivas_total_brate; } if ( st_ivas->ini_frame < MAX_FRAME_COUNTER && !( st_ivas->bfi && st_ivas->ini_frame == 0 ) ) /* keep "st_ivas->ini_frame = 0" until first good received frame */ @@ -639,6 +710,6 @@ ivas_error ivas_dec( } #endif - wmops_sub_end(); + pop_wmops(); return error; } diff --git a/lib_dec/ivas_decision_matrix_dec.c b/lib_dec/ivas_decision_matrix_dec.c index a62e1d29eb..e5be65ae24 100644 --- a/lib_dec/ivas_decision_matrix_dec.c +++ b/lib_dec/ivas_decision_matrix_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "ivas_prot.h" #include "prot.h" #include "ivas_cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------* * ivas_decision_matrix_dec() @@ -134,7 +134,7 @@ void ivas_decision_matrix_dec( } else if ( st->element_mode == IVAS_SCE && st->low_rate_mode ) { - /* ISm Low-rate mode -> always WB, ACELP core, IC coder_type */ + /* ISM Low-rate mode -> always WB, ACELP core, IC coder_type */ st->core = ACELP_CORE; } else if ( st->element_mode == IVAS_CPE_MDCT ) @@ -167,7 +167,7 @@ void ivas_decision_matrix_dec( { if ( st->element_mode == IVAS_SCE && st->low_rate_mode ) { - /* ISm Low-rate mode */ + /* ISM Low-rate mode */ st->bwidth = WB; st->coder_type = INACTIVE; *sharpFlag = 0; diff --git a/lib_dec/ivas_dirac_dec.c b/lib_dec/ivas_dirac_dec.c index e7301685fd..1e452a08f6 100644 --- a/lib_dec/ivas_dirac_dec.c +++ b/lib_dec/ivas_dirac_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,45 +37,29 @@ #include "cnst.h" #include "prot.h" #include "ivas_prot.h" +#include "ivas_prot_rend.h" #include "ivas_cnst.h" #include "ivas_rom_com.h" #include "ivas_rom_dec.h" #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------* * Local function prototypes *-----------------------------------------------------------------------*/ -static void ivas_dirac_alloc_mem( DIRAC_DEC_HANDLE hDirAC, const RENDERER_TYPE renderer_type, DIRAC_DEC_STACK_MEM_HANDLE hDirAC_mem ); + +static ivas_error ivas_dirac_alloc_mem( DIRAC_DEC_HANDLE hDirAC, const RENDERER_TYPE renderer_type, DIRAC_DEC_STACK_MEM_HANDLE hDirAC_mem ); static void ivas_dirac_free_mem( DIRAC_DEC_STACK_MEM_HANDLE hDirAC_mem ); -static void initDiffuseResponses( - float *diffuse_response_function, - const int16_t num_channels, - AUDIO_CONFIG output_config, - IVAS_OUTPUT_SETUP hOutSetup, - const int16_t ambisonics_order, - const IVAS_FORMAT ivas_format, - int16_t *num_ele_spk_no_diffuse_rendering, - AUDIO_CONFIG transport_config ); +static void initDiffuseResponses( float *diffuse_response_function, const int16_t num_channels, AUDIO_CONFIG output_config, IVAS_OUTPUT_SETUP hOutSetup, const int16_t ambisonics_order, const IVAS_FORMAT ivas_format, int16_t *num_ele_spk_no_diffuse_rendering, AUDIO_CONFIG transport_config ); static void computeIntensityVector_dec( float Cldfb_RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], float Cldfb_ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], const int16_t num_frequency_bands, float *intensity_real_x, float *intensity_real_y, float *intensity_real_z ); -static void protoSignalComputation_shd( - float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], - float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], - float *proto_direct_buffer_f, - float *proto_diffuse_buffer_f, - float *reference_power, - const int16_t slot_index, - const int16_t num_inputs, - const int16_t num_outputs_diff, - const int16_t num_freq_bands, - float *p_Rmat ); +static void protoSignalComputation_shd( float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], float *proto_direct_buffer_f, float *proto_diffuse_buffer_f, float *reference_power, const int16_t slot_index, const int16_t num_inputs, const int16_t num_outputs_diff, const int16_t num_freq_bands, float *p_Rmat ); static void protoSignalComputation1( float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], float *proto_frame_f, float *proto_direct_buffer_f, float *reference_power, float *proto_power_smooth, const int16_t slot_index, const int16_t num_outputs_diff, const int16_t num_freq_bands ); @@ -85,7 +69,6 @@ static void protoSignalComputation4( float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRA static void ivas_dirac_dec_compute_diffuse_proto( DIRAC_DEC_HANDLE hDirAC, const int16_t slot_idx ); - static void computeDirectionAngles( float *intensity_real_x, float *intensity_real_y, float *intensity_real_z, const int16_t num_frequency_bands, int16_t *azimuth, int16_t *elevation ); static void ivas_masa_init_stereotype_detection( MASA_STEREO_TYPE_DETECT *stereo_type_detect ); @@ -94,6 +77,8 @@ static void ivas_masa_stereotype_detection( MASA_STEREO_TYPE_DETECT *stereo_type static void ivas_lfe_synth_with_cldfb( MCMASA_LFE_SYNTH_DATA_HANDLE hMasaLfeSynth, float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], float RealBufferLfe[MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], float ImagBufferLfe[MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], const int16_t slot_index, const int16_t subframe_index, const int16_t nchan_transport ); +static void rotateAziEle_DirAC( int16_t *azi, int16_t *ele, const int16_t band1, const int16_t band2, const float *p_Rmat ); + /*------------------------------------------------------------------------- * ivas_dirac_dec_open() @@ -125,8 +110,8 @@ ivas_error ivas_dirac_dec_open( *-------------------------------------------------------------------------*/ ivas_error ivas_dirac_dec_config( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - const DIRAC_CONFIG_FLAG flag_config /* i/ : Flag determining if we open or reconfigure the DirAC decoder */ + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + const DIRAC_CONFIG_FLAG flag_config_inp /* i/ : Flag determining if we open or reconfigure the DirAC decoder */ ) { DIRAC_DEC_HANDLE hDirAC; @@ -145,7 +130,9 @@ ivas_error ivas_dirac_dec_config( int32_t output_Fs, ivas_total_brate; ivas_error error; int16_t nchan_transport_orig; + DIRAC_CONFIG_FLAG flag_config; + flag_config = ( flag_config_inp == DIRAC_RECONFIGURE_MODE ) ? DIRAC_RECONFIGURE : flag_config_inp; error = IVAS_ERR_OK; hDirAC = NULL; @@ -162,12 +149,12 @@ ivas_error ivas_dirac_dec_config( * prepare library opening *-----------------------------------------------------------------*/ - if ( ( hDirAC = (DIRAC_DEC_HANDLE) count_malloc( sizeof( DIRAC_DEC_DATA ) ) ) == NULL ) + if ( ( hDirAC = (DIRAC_DEC_HANDLE) malloc( sizeof( DIRAC_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); } - if ( ( hDirAC->hConfig = (DIRAC_CONFIG_DATA_HANDLE) count_malloc( sizeof( DIRAC_CONFIG_DATA ) ) ) == NULL ) + if ( ( hDirAC->hConfig = (DIRAC_CONFIG_DATA_HANDLE) malloc( sizeof( DIRAC_CONFIG_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC Config\n" ) ); } @@ -197,7 +184,7 @@ ivas_error ivas_dirac_dec_config( if ( flag_config == DIRAC_RECONFIGURE && st_ivas->ivas_format == SBA_FORMAT ) { int16_t tmp1, tmp2, tmp3; - ivas_sba_config( st_ivas->hDecoderConfig->last_ivas_total_brate, st_ivas->sba_analysis_order, -1, &nchan_transport_old, st_ivas->sba_planar, &tmp1, &tmp2, &tmp3 ); + ivas_sba_config( ivas_total_brate, st_ivas->sba_analysis_order, -1, &nchan_transport_old, st_ivas->sba_planar, &tmp1, &tmp2, &tmp3 ); } /*-----------------------------------------------------------------* @@ -310,7 +297,10 @@ ivas_error ivas_dirac_dec_config( if ( flag_config == DIRAC_OPEN ) { hDirAC->num_freq_bands = (int16_t) ( output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ); - hDirAC->frequency_axis = (float *) count_malloc( hDirAC->num_freq_bands * sizeof( float ) ); + if ( ( hDirAC->frequency_axis = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } set_f( hDirAC->frequency_axis, 0.0f, hDirAC->num_freq_bands ); ivas_dirac_dec_get_frequency_axis( hDirAC->frequency_axis, output_Fs, hDirAC->num_freq_bands ); @@ -320,7 +310,10 @@ ivas_error ivas_dirac_dec_config( { if ( ( flag_config == DIRAC_RECONFIGURE && hDirAC->masa_stereo_type_detect == NULL ) || flag_config == DIRAC_OPEN ) { - hDirAC->masa_stereo_type_detect = (MASA_STEREO_TYPE_DETECT *) count_malloc( sizeof( MASA_STEREO_TYPE_DETECT ) ); + if ( ( hDirAC->masa_stereo_type_detect = (MASA_STEREO_TYPE_DETECT *) malloc( sizeof( MASA_STEREO_TYPE_DETECT ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } } ivas_masa_init_stereotype_detection( hDirAC->masa_stereo_type_detect ); } @@ -328,7 +321,7 @@ ivas_error ivas_dirac_dec_config( { if ( flag_config == DIRAC_RECONFIGURE && hDirAC->masa_stereo_type_detect != NULL ) { - count_free( hDirAC->masa_stereo_type_detect ); + free( hDirAC->masa_stereo_type_detect ); } hDirAC->masa_stereo_type_detect = NULL; } @@ -388,22 +381,34 @@ ivas_error ivas_dirac_dec_config( if ( flag_config == DIRAC_OPEN ) { num_outputs_dir_old = hDirAC->num_outputs_dir; - hDirAC->proto_index_dir = (int16_t *) count_malloc( sizeof( int16_t ) * hDirAC->num_outputs_dir ); + if ( ( hDirAC->proto_index_dir = (int16_t *) malloc( sizeof( int16_t ) * hDirAC->num_outputs_dir ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } num_outputs_diff_old = hDirAC->num_outputs_diff; - hDirAC->proto_index_diff = (int16_t *) count_malloc( sizeof( int16_t ) * hDirAC->num_outputs_diff ); + if ( ( hDirAC->proto_index_diff = (int16_t *) malloc( sizeof( int16_t ) * hDirAC->num_outputs_diff ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } } if ( hDirAC->num_outputs_dir != num_outputs_dir_old && flag_config == DIRAC_RECONFIGURE ) { - count_free( hDirAC->proto_index_dir ); - hDirAC->proto_index_dir = (int16_t *) count_malloc( sizeof( int16_t ) * hDirAC->num_outputs_dir ); + free( hDirAC->proto_index_dir ); + if ( ( hDirAC->proto_index_dir = (int16_t *) malloc( sizeof( int16_t ) * hDirAC->num_outputs_dir ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } } set_s( hDirAC->proto_index_dir, 0, hDirAC->num_outputs_dir ); if ( hDirAC->num_outputs_diff != num_outputs_diff_old && flag_config == DIRAC_RECONFIGURE ) { - count_free( hDirAC->proto_index_diff ); - hDirAC->proto_index_diff = (int16_t *) count_malloc( sizeof( int16_t ) * hDirAC->num_outputs_diff ); + free( hDirAC->proto_index_diff ); + if ( ( hDirAC->proto_index_diff = (int16_t *) malloc( sizeof( int16_t ) * hDirAC->num_outputs_diff ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } } set_s( hDirAC->proto_index_diff, 0, hDirAC->num_outputs_diff ); @@ -523,14 +528,20 @@ ivas_error ivas_dirac_dec_config( /* direct/diffuse responses */ if ( flag_config == DIRAC_OPEN ) { - hDirAC->diffuse_response_function = (float *) count_malloc( sizeof( float ) * hDirAC->num_outputs_dir ); + if ( ( hDirAC->diffuse_response_function = (float *) malloc( sizeof( float ) * hDirAC->num_outputs_dir ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } } /* reallocate static memory */ else if ( flag_config == DIRAC_RECONFIGURE && hDirAC->num_outputs_dir != num_outputs_dir_old ) { - count_free( hDirAC->diffuse_response_function ); + free( hDirAC->diffuse_response_function ); hDirAC->diffuse_response_function = NULL; - hDirAC->diffuse_response_function = (float *) count_malloc( sizeof( float ) * hDirAC->num_outputs_dir ); + if ( ( hDirAC->diffuse_response_function = (float *) malloc( sizeof( float ) * hDirAC->num_outputs_dir ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } } if ( ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_PSD_LS ) || ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_PSD_SHD ) || ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_MONO ) ) @@ -548,13 +559,19 @@ ivas_error ivas_dirac_dec_config( { if ( flag_config == DIRAC_OPEN ) { - hDirAC->hoa_encoder = (float *) count_malloc( nchan_out_woLFE * hDirAC->num_outputs_diff * sizeof( float ) ); + if ( ( hDirAC->hoa_encoder = (float *) malloc( nchan_out_woLFE * hDirAC->num_outputs_diff * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } } else if ( flag_config == DIRAC_RECONFIGURE && hDirAC->hoa_encoder && ( hDirAC->num_outputs_diff != num_outputs_diff_old ) ) { - count_free( hDirAC->hoa_encoder ); + free( hDirAC->hoa_encoder ); hDirAC->hoa_encoder = NULL; - hDirAC->hoa_encoder = (float *) count_malloc( nchan_out_woLFE * hDirAC->num_outputs_diff * sizeof( float ) ); + if ( ( hDirAC->hoa_encoder = (float *) malloc( nchan_out_woLFE * hDirAC->num_outputs_diff * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } } set_f( hDirAC->hoa_encoder, 0.0f, nchan_out_woLFE * hDirAC->num_outputs_diff ); compute_hoa_encoder_mtx( ls_azimuth, ls_elevation, hDirAC->hoa_encoder, hDirAC->num_outputs_diff, hDirAC->hOutSetup.ambisonics_order ); @@ -563,7 +580,7 @@ ivas_error ivas_dirac_dec_config( { if ( flag_config == DIRAC_RECONFIGURE && hDirAC->hoa_encoder ) { - count_free( hDirAC->hoa_encoder ); + free( hDirAC->hoa_encoder ); } hDirAC->hoa_encoder = NULL; } @@ -576,10 +593,11 @@ ivas_error ivas_dirac_dec_config( if ( hDirAC->panningConf == DIRAC_PANNING_VBAP ) { - if ( flag_config == DIRAC_RECONFIGURE && st_ivas->hVBAPdata ) + if ( flag_config == DIRAC_RECONFIGURE && st_ivas->hVBAPdata != NULL ) { vbap_free_data( &( st_ivas->hVBAPdata ) ); } + if ( ( error = vbap_init_data( &( st_ivas->hVBAPdata ), ls_azimuth, ls_elevation, nchan_out_woLFE ) ) != IVAS_ERR_OK ) { return error; @@ -587,13 +605,13 @@ ivas_error ivas_dirac_dec_config( } else if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_MONO ) { - if ( flag_config == DIRAC_RECONFIGURE && st_ivas->hVBAPdata ) + if ( flag_config == DIRAC_RECONFIGURE && st_ivas->hVBAPdata != NULL ) { vbap_free_data( &( st_ivas->hVBAPdata ) ); } hDirAC->hoa_decoder = NULL; } - else if ( flag_config == DIRAC_RECONFIGURE && st_ivas->hVBAPdata ) + else if ( flag_config == DIRAC_RECONFIGURE && st_ivas->hVBAPdata != NULL ) { vbap_free_data( &( st_ivas->hVBAPdata ) ); } @@ -608,7 +626,7 @@ ivas_error ivas_dirac_dec_config( { if ( st_ivas->hoa_dec_mtx != NULL ) { - count_free( st_ivas->hoa_dec_mtx ); + free( st_ivas->hoa_dec_mtx ); st_ivas->hoa_dec_mtx = NULL; } if ( ( error = ivas_sba_get_hoa_dec_matrix( hDirAC->hOutSetup, &st_ivas->hoa_dec_mtx, hDirAC->hOutSetup.ambisonics_order ) ) != IVAS_ERR_OK ) @@ -636,15 +654,18 @@ ivas_error ivas_dirac_dec_config( if ( ( flag_config == DIRAC_OPEN && hDirAC->proto_signal_decorr_on ) || ( flag_config == DIRAC_RECONFIGURE && ( hDirAC->proto_signal_decorr_on && !proto_signal_decorr_on_old ) ) ) { - ivas_dirac_dec_decorr_open( &( hDirAC->h_freq_domain_decorr_ap_params ), - &( hDirAC->h_freq_domain_decorr_ap_state ), - hDirAC->num_freq_bands, - hDirAC->num_outputs_diff, - hDirAC->num_protos_diff, - hDirAC->synthesisConf, - hDirAC->frequency_axis, - nchan_transport > 2 ? 4 : nchan_transport, - output_Fs ); + if ( ( error = ivas_dirac_dec_decorr_open( &( hDirAC->h_freq_domain_decorr_ap_params ), + &( hDirAC->h_freq_domain_decorr_ap_state ), + hDirAC->num_freq_bands, + hDirAC->num_outputs_diff, + hDirAC->num_protos_diff, + hDirAC->synthesisConf, + hDirAC->frequency_axis, + nchan_transport > 2 ? 4 : nchan_transport, + output_Fs ) ) != IVAS_ERR_OK ) + { + return error; + } } else if ( flag_config == DIRAC_RECONFIGURE && ( !hDirAC->proto_signal_decorr_on && proto_signal_decorr_on_old ) ) { @@ -652,33 +673,43 @@ ivas_error ivas_dirac_dec_config( } else if ( flag_config == DIRAC_RECONFIGURE && hDirAC->proto_signal_decorr_on && proto_signal_decorr_on_old ) { - if ( ( nchan_transport != nchan_transport_old ) || ( hDirAC->num_outputs_diff != num_outputs_diff_old ) ) + if ( nchan_transport != nchan_transport_old || hDirAC->num_outputs_diff != num_outputs_diff_old || flag_config_inp == DIRAC_RECONFIGURE_MODE ) { /* close and reopen the decorrelator */ ivas_dirac_dec_decorr_close( &hDirAC->h_freq_domain_decorr_ap_params, &hDirAC->h_freq_domain_decorr_ap_state ); - ivas_dirac_dec_decorr_open( &( hDirAC->h_freq_domain_decorr_ap_params ), - &( hDirAC->h_freq_domain_decorr_ap_state ), - hDirAC->num_freq_bands, - hDirAC->num_outputs_diff, - hDirAC->num_protos_diff, - hDirAC->synthesisConf, - hDirAC->frequency_axis, - nchan_transport > 2 ? 4 : nchan_transport, - output_Fs ); + if ( ( error = ivas_dirac_dec_decorr_open( &( hDirAC->h_freq_domain_decorr_ap_params ), + &( hDirAC->h_freq_domain_decorr_ap_state ), + hDirAC->num_freq_bands, + hDirAC->num_outputs_diff, + hDirAC->num_protos_diff, + hDirAC->synthesisConf, + hDirAC->frequency_axis, + nchan_transport > 2 ? 4 : nchan_transport, + output_Fs ) ) != IVAS_ERR_OK ) + { + return error; + } } } /* output synthesis */ if ( flag_config == DIRAC_OPEN ) { - ivas_dirac_dec_output_synthesis_open( hDirAC, st_ivas->renderer_type, nchan_transport, output_Fs ); + if ( ( ivas_dirac_dec_output_synthesis_open( hDirAC, st_ivas->renderer_type, nchan_transport, output_Fs ) ) != IVAS_ERR_OK ) + { + return error; + } hDirAC->h_output_synthesis_psd_params.use_onset_filters = hDirAC->proto_signal_decorr_on; } else if ( ( flag_config == DIRAC_RECONFIGURE ) && ( ( nchan_transport != nchan_transport_old ) || ( hDirAC->num_outputs_diff != num_outputs_diff_old ) ) ) { ivas_dirac_dec_output_synthesis_close( hDirAC ); - ivas_dirac_dec_output_synthesis_open( hDirAC, st_ivas->renderer_type, nchan_transport, output_Fs ); + + if ( ( ivas_dirac_dec_output_synthesis_open( hDirAC, st_ivas->renderer_type, nchan_transport, output_Fs ) ) != IVAS_ERR_OK ) + { + return error; + } hDirAC->h_output_synthesis_psd_params.use_onset_filters = hDirAC->proto_signal_decorr_on; } @@ -695,7 +726,7 @@ ivas_error ivas_dirac_dec_config( { if ( flag_config == DIRAC_RECONFIGURE && hDirAC->proto_frame_f ) { - count_free( hDirAC->proto_frame_f ); + free( hDirAC->proto_frame_f ); } hDirAC->proto_frame_f = NULL; } @@ -703,13 +734,19 @@ ivas_error ivas_dirac_dec_config( { if ( flag_config == DIRAC_OPEN || ( flag_config == DIRAC_RECONFIGURE && hDirAC->proto_frame_f == NULL ) ) { - hDirAC->proto_frame_f = (float *) count_malloc( sizeof( float ) * 2 * hDirAC->num_protos_diff * hDirAC->num_freq_bands ); + if ( ( hDirAC->proto_frame_f = (float *) malloc( sizeof( float ) * 2 * hDirAC->num_protos_diff * hDirAC->num_freq_bands ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } } else if ( flag_config == DIRAC_RECONFIGURE && ( hDirAC->num_protos_diff != num_protos_diff_old ) ) { proto_frame_f_old = hDirAC->proto_frame_f; - count_free( proto_frame_f_old ); - hDirAC->proto_frame_f = (float *) count_malloc( sizeof( float ) * 2 * hDirAC->num_protos_diff * hDirAC->num_freq_bands ); + free( proto_frame_f_old ); + if ( ( hDirAC->proto_frame_f = (float *) malloc( sizeof( float ) * 2 * hDirAC->num_protos_diff * hDirAC->num_freq_bands ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } } } @@ -726,13 +763,19 @@ ivas_error ivas_dirac_dec_config( { for ( j = 0; j < DIRAC_NO_COL_AVG_DIFF; j++ ) { - hDirAC->buffer_intensity_real[i][j] = (float *) count_malloc( CLDFB_NO_CHANNELS_MAX * sizeof( float ) ); + if ( ( hDirAC->buffer_intensity_real[i][j] = (float *) malloc( CLDFB_NO_CHANNELS_MAX * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } set_f( hDirAC->buffer_intensity_real[i][j], 0.0f, CLDFB_NO_CHANNELS_MAX ); } } if ( hDirAC->buffer_energy == NULL ) { - hDirAC->buffer_energy = (float *) count_malloc( DIRAC_NO_COL_AVG_DIFF * CLDFB_NO_CHANNELS_MAX * sizeof( float ) ); + if ( ( hDirAC->buffer_energy = (float *) malloc( DIRAC_NO_COL_AVG_DIFF * CLDFB_NO_CHANNELS_MAX * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } } set_f( hDirAC->buffer_energy, 0.0f, DIRAC_NO_COL_AVG_DIFF * CLDFB_NO_CHANNELS_MAX ); } @@ -744,14 +787,14 @@ ivas_error ivas_dirac_dec_config( { if ( flag_config == DIRAC_RECONFIGURE && hDirAC->buffer_intensity_real[i][j] ) { - count_free( hDirAC->buffer_intensity_real[i][j] ); + free( hDirAC->buffer_intensity_real[i][j] ); } hDirAC->buffer_intensity_real[i][j] = NULL; } } if ( hDirAC->buffer_energy != NULL ) { - count_free( hDirAC->buffer_energy ); + free( hDirAC->buffer_energy ); hDirAC->buffer_energy = NULL; } } @@ -764,7 +807,10 @@ ivas_error ivas_dirac_dec_config( { ivas_dirac_free_mem( &( hDirAC->stack_mem ) ); } - ivas_dirac_alloc_mem( hDirAC, st_ivas->renderer_type, &( hDirAC->stack_mem ) ); + if ( ( error = ivas_dirac_alloc_mem( hDirAC, st_ivas->renderer_type, &( hDirAC->stack_mem ) ) ) != IVAS_ERR_OK ) + { + return error; + } mvs2s( DirAC_block_grouping, hDirAC->block_grouping, MAX_PARAM_SPATIAL_SUBFRAMES + 1 ); @@ -775,10 +821,15 @@ ivas_error ivas_dirac_dec_config( hDirAC->dirac_read_idx = 0; hDirAC->spar_to_dirac_write_idx = 0; - if ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->mc_mode == MC_MODE_MCMASA ) + if ( st_ivas->mc_mode == MC_MODE_MCMASA ) { hDirAC->dirac_md_buffer_length = MAX_PARAM_SPATIAL_SUBFRAMES; } + else if ( st_ivas->ivas_format == MASA_FORMAT ) + { + hDirAC->dirac_md_buffer_length = MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR; + hDirAC->dirac_bs_md_write_idx = DELAY_MASA_PARAM_DEC_SFR; + } else { int16_t num_slots_in_subfr; @@ -802,45 +853,121 @@ ivas_error ivas_dirac_dec_config( } } - hDirAC->azimuth = (int16_t **) count_malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ); - hDirAC->elevation = (int16_t **) count_malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ); - hDirAC->diffuseness_vector = (float **) count_malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ); - hDirAC->energy_ratio1 = (float **) count_malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ); - hDirAC->spreadCoherence = (float **) count_malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ); - hDirAC->surroundingCoherence = (float **) count_malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ); + if ( ( hDirAC->azimuth = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } + + if ( ( hDirAC->elevation = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } + + if ( ( hDirAC->diffuseness_vector = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } + + if ( ( hDirAC->energy_ratio1 = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } + + if ( ( hDirAC->spreadCoherence = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } + + if ( ( hDirAC->surroundingCoherence = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } + for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) { - hDirAC->azimuth[i] = (int16_t *) count_malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ); + if ( ( hDirAC->azimuth[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } set_s( hDirAC->azimuth[i], 0, hDirAC->num_freq_bands ); - hDirAC->elevation[i] = (int16_t *) count_malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ); + + if ( ( hDirAC->elevation[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } set_s( hDirAC->elevation[i], 0, hDirAC->num_freq_bands ); - hDirAC->diffuseness_vector[i] = (float *) count_malloc( hDirAC->num_freq_bands * sizeof( float ) ); + + if ( ( hDirAC->diffuseness_vector[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } set_f( hDirAC->diffuseness_vector[i], 1.0f, hDirAC->num_freq_bands ); - hDirAC->energy_ratio1[i] = (float *) count_malloc( hDirAC->num_freq_bands * sizeof( float ) ); + if ( ( hDirAC->energy_ratio1[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } set_f( hDirAC->energy_ratio1[i], 0.0f, hDirAC->num_freq_bands ); - hDirAC->spreadCoherence[i] = (float *) count_malloc( hDirAC->num_freq_bands * sizeof( float ) ); + + if ( ( hDirAC->spreadCoherence[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } set_f( hDirAC->spreadCoherence[i], 0.0f, hDirAC->num_freq_bands ); - hDirAC->surroundingCoherence[i] = (float *) count_malloc( hDirAC->num_freq_bands * sizeof( float ) ); + + if ( ( hDirAC->surroundingCoherence[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } set_f( hDirAC->surroundingCoherence[i], 0.0f, hDirAC->num_freq_bands ); } if ( st_ivas->ivas_format == MASA_FORMAT ) { - hDirAC->azimuth2 = (int16_t **) count_malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ); - hDirAC->elevation2 = (int16_t **) count_malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ); - hDirAC->energy_ratio2 = (float **) count_malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ); - hDirAC->spreadCoherence2 = (float **) count_malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ); + if ( ( hDirAC->azimuth2 = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } + + if ( ( hDirAC->elevation2 = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } + + if ( ( hDirAC->energy_ratio2 = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } + + if ( ( hDirAC->spreadCoherence2 = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } + for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) { - hDirAC->azimuth2[i] = (int16_t *) count_malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ); + if ( ( hDirAC->azimuth2[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } set_s( hDirAC->azimuth2[i], 0, hDirAC->num_freq_bands ); - hDirAC->elevation2[i] = (int16_t *) count_malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ); + + if ( ( hDirAC->elevation2[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } set_s( hDirAC->elevation2[i], 0, hDirAC->num_freq_bands ); - hDirAC->energy_ratio2[i] = (float *) count_malloc( hDirAC->num_freq_bands * sizeof( float ) ); + if ( ( hDirAC->energy_ratio2[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } set_f( hDirAC->energy_ratio2[i], 0.0f, hDirAC->num_freq_bands ); - hDirAC->spreadCoherence2[i] = (float *) count_malloc( hDirAC->num_freq_bands * sizeof( float ) ); + + if ( ( hDirAC->spreadCoherence2[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } set_f( hDirAC->spreadCoherence2[i], 0.0f, hDirAC->num_freq_bands ); } } @@ -869,15 +996,23 @@ ivas_error ivas_dirac_dec_config( *------------------------------------------------------------------------*/ void ivas_dirac_dec_close( - DIRAC_DEC_HANDLE hDirAC /* i/o: decoder DirAC handle */ + DIRAC_DEC_HANDLE *hDirAC_out /* i/o: decoder DirAC handle */ ) { int16_t i, j; + DIRAC_DEC_HANDLE hDirAC; + + if ( hDirAC_out == NULL || *hDirAC_out == NULL ) + { + return; + } + + hDirAC = *hDirAC_out; /* Config & CLDFB */ if ( hDirAC->hConfig != NULL ) { - count_free( hDirAC->hConfig ); + free( hDirAC->hConfig ); hDirAC->hConfig = NULL; } @@ -895,32 +1030,32 @@ void ivas_dirac_dec_close( /* free frequency axis buffer */ if ( hDirAC->frequency_axis != NULL ) { - count_free( hDirAC->frequency_axis ); + free( hDirAC->frequency_axis ); hDirAC->frequency_axis = NULL; } if ( hDirAC->diffuse_response_function != NULL ) { - count_free( hDirAC->diffuse_response_function ); + free( hDirAC->diffuse_response_function ); hDirAC->diffuse_response_function = NULL; } if ( hDirAC->hoa_encoder != NULL ) { - count_free( hDirAC->hoa_encoder ); + free( hDirAC->hoa_encoder ); hDirAC->hoa_encoder = NULL; } /* prototype indexing */ if ( hDirAC->proto_index_dir != NULL ) { - count_free( hDirAC->proto_index_dir ); + free( hDirAC->proto_index_dir ); hDirAC->proto_index_dir = NULL; } if ( hDirAC->proto_index_diff != NULL ) { - count_free( hDirAC->proto_index_diff ); + free( hDirAC->proto_index_diff ); hDirAC->proto_index_dir = NULL; } @@ -930,7 +1065,7 @@ void ivas_dirac_dec_close( /* free prototype signal buffers */ if ( hDirAC->proto_frame_f != NULL ) { - count_free( hDirAC->proto_frame_f ); + free( hDirAC->proto_frame_f ); hDirAC->proto_frame_f = NULL; } @@ -940,14 +1075,14 @@ void ivas_dirac_dec_close( { if ( hDirAC->buffer_intensity_real[i][j] != NULL ) { - count_free( hDirAC->buffer_intensity_real[i][j] ); + free( hDirAC->buffer_intensity_real[i][j] ); hDirAC->buffer_intensity_real[i][j] = NULL; } } } if ( hDirAC->buffer_energy != NULL ) { - count_free( hDirAC->buffer_energy ); + free( hDirAC->buffer_energy ); hDirAC->buffer_energy = NULL; } @@ -955,34 +1090,34 @@ void ivas_dirac_dec_close( { if ( hDirAC->azimuth[i] != NULL ) { - count_free( hDirAC->azimuth[i] ); + free( hDirAC->azimuth[i] ); hDirAC->azimuth[i] = NULL; } if ( hDirAC->elevation[i] != NULL ) { - count_free( hDirAC->elevation[i] ); + free( hDirAC->elevation[i] ); hDirAC->elevation[i] = NULL; } if ( hDirAC->diffuseness_vector[i] != NULL ) { - count_free( hDirAC->diffuseness_vector[i] ); + free( hDirAC->diffuseness_vector[i] ); hDirAC->diffuseness_vector[i] = NULL; } } if ( hDirAC->azimuth != NULL ) { - count_free( hDirAC->azimuth ); + free( hDirAC->azimuth ); hDirAC->azimuth = NULL; } if ( hDirAC->elevation != NULL ) { - count_free( hDirAC->elevation ); + free( hDirAC->elevation ); hDirAC->elevation = NULL; } if ( hDirAC->diffuseness_vector != NULL ) { - count_free( hDirAC->diffuseness_vector ); + free( hDirAC->diffuseness_vector ); hDirAC->diffuseness_vector = NULL; } @@ -992,11 +1127,11 @@ void ivas_dirac_dec_close( { if ( hDirAC->azimuth2[i] != NULL ) { - count_free( hDirAC->azimuth2[i] ); + free( hDirAC->azimuth2[i] ); hDirAC->azimuth2[i] = NULL; } } - count_free( hDirAC->azimuth2 ); + free( hDirAC->azimuth2 ); hDirAC->azimuth2 = NULL; } @@ -1006,11 +1141,11 @@ void ivas_dirac_dec_close( { if ( hDirAC->elevation2[i] != NULL ) { - count_free( hDirAC->elevation2[i] ); + free( hDirAC->elevation2[i] ); hDirAC->elevation2[i] = NULL; } } - count_free( hDirAC->elevation2 ); + free( hDirAC->elevation2 ); hDirAC->elevation2 = NULL; } @@ -1020,11 +1155,11 @@ void ivas_dirac_dec_close( { if ( hDirAC->energy_ratio1[i] != NULL ) { - count_free( hDirAC->energy_ratio1[i] ); + free( hDirAC->energy_ratio1[i] ); hDirAC->energy_ratio1[i] = NULL; } } - count_free( hDirAC->energy_ratio1 ); + free( hDirAC->energy_ratio1 ); hDirAC->energy_ratio1 = NULL; } @@ -1034,11 +1169,11 @@ void ivas_dirac_dec_close( { if ( hDirAC->energy_ratio2[i] != NULL ) { - count_free( hDirAC->energy_ratio2[i] ); + free( hDirAC->energy_ratio2[i] ); hDirAC->energy_ratio2[i] = NULL; } } - count_free( hDirAC->energy_ratio2 ); + free( hDirAC->energy_ratio2 ); hDirAC->energy_ratio2 = NULL; } @@ -1048,11 +1183,11 @@ void ivas_dirac_dec_close( { if ( hDirAC->spreadCoherence[i] != NULL ) { - count_free( hDirAC->spreadCoherence[i] ); + free( hDirAC->spreadCoherence[i] ); hDirAC->spreadCoherence[i] = NULL; } } - count_free( hDirAC->spreadCoherence ); + free( hDirAC->spreadCoherence ); hDirAC->spreadCoherence = NULL; } @@ -1062,11 +1197,11 @@ void ivas_dirac_dec_close( { if ( hDirAC->spreadCoherence2[i] != NULL ) { - count_free( hDirAC->spreadCoherence2[i] ); + free( hDirAC->spreadCoherence2[i] ); hDirAC->spreadCoherence2[i] = NULL; } } - count_free( hDirAC->spreadCoherence2 ); + free( hDirAC->spreadCoherence2 ); hDirAC->spreadCoherence2 = NULL; } @@ -1076,23 +1211,24 @@ void ivas_dirac_dec_close( { if ( hDirAC->surroundingCoherence[i] != NULL ) { - count_free( hDirAC->surroundingCoherence[i] ); + free( hDirAC->surroundingCoherence[i] ); hDirAC->surroundingCoherence[i] = NULL; } } - count_free( hDirAC->surroundingCoherence ); + free( hDirAC->surroundingCoherence ); hDirAC->surroundingCoherence = NULL; } if ( hDirAC->masa_stereo_type_detect != NULL ) { - count_free( hDirAC->masa_stereo_type_detect ); + free( hDirAC->masa_stereo_type_detect ); hDirAC->masa_stereo_type_detect = NULL; } ivas_dirac_free_mem( &( hDirAC->stack_mem ) ); - count_free( hDirAC ); + free( *hDirAC_out ); + *hDirAC_out = NULL; return; } @@ -1104,7 +1240,7 @@ void ivas_dirac_dec_close( * Allocate stack memory for DirAC renderer *------------------------------------------------------------------------*/ -static void ivas_dirac_alloc_mem( +static ivas_error ivas_dirac_alloc_mem( DIRAC_DEC_HANDLE hDirAC, const RENDERER_TYPE renderer_type, DIRAC_DEC_STACK_MEM_HANDLE hDirAC_mem ) @@ -1131,17 +1267,35 @@ static void ivas_dirac_alloc_mem( hDirAC_mem->frame_dec_f = NULL; if ( hDirAC->synthesisConf != DIRAC_SYNTHESIS_GAIN_SHD ) { - hDirAC_mem->cy_auto_dir_smooth = (float *) malloc( sizeof( float ) * size ); + if ( ( hDirAC_mem->cy_auto_dir_smooth = (float *) malloc( sizeof( float ) * size ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) ); + } set_zero( hDirAC_mem->cy_auto_dir_smooth, size ); - hDirAC_mem->proto_power_smooth = (float *) malloc( sizeof( float ) * size ); + + if ( ( hDirAC_mem->proto_power_smooth = (float *) malloc( sizeof( float ) * size ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) ); + } set_zero( hDirAC_mem->proto_power_smooth, size ); - hDirAC_mem->proto_power_diff_smooth = (float *) malloc( sizeof( float ) * size ); + + if ( ( hDirAC_mem->proto_power_diff_smooth = (float *) malloc( sizeof( float ) * size ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) ); + } set_zero( hDirAC_mem->proto_power_diff_smooth, size ); - hDirAC_mem->direct_responses_square = (float *) malloc( sizeof( float ) * size ); + + if ( ( hDirAC_mem->direct_responses_square = (float *) malloc( sizeof( float ) * size ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) ); + } set_zero( hDirAC_mem->direct_responses_square, size ); if ( hDirAC->proto_signal_decorr_on && ( renderer_type != RENDERER_BINAURAL_PARAMETRIC && renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM && renderer_type != RENDERER_STEREO_PARAMETRIC ) ) { - hDirAC_mem->frame_dec_f = (float *) malloc( sizeof( float ) * 2 * num_outputs_diff * num_freq_bands ); + if ( ( hDirAC_mem->frame_dec_f = (float *) malloc( sizeof( float ) * 2 * num_outputs_diff * num_freq_bands ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) ); + } } } hDirAC->h_output_synthesis_psd_state.proto_power_smooth = hDirAC_mem->proto_power_smooth; @@ -1150,23 +1304,36 @@ static void ivas_dirac_alloc_mem( hDirAC->h_output_synthesis_psd_state.direct_responses_square = hDirAC_mem->direct_responses_square; /* Target and smoothed nrg factors/gains */ - hDirAC_mem->cy_cross_dir_smooth = (float *) malloc( sizeof( float ) * size ); + if ( ( hDirAC_mem->cy_cross_dir_smooth = (float *) malloc( sizeof( float ) * size ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) ); + } set_zero( hDirAC_mem->cy_cross_dir_smooth, size ); + if ( hDirAC->synthesisConf != DIRAC_SYNTHESIS_GAIN_SHD ) { - hDirAC_mem->cy_auto_diff_smooth = (float *) malloc( sizeof( float ) * size ); + if ( ( hDirAC_mem->cy_auto_diff_smooth = (float *) malloc( sizeof( float ) * size ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) ); + } set_zero( hDirAC_mem->cy_auto_diff_smooth, size ); } else { - hDirAC_mem->cy_auto_diff_smooth = (float *) malloc( sizeof( float ) * num_outputs_diff * num_freq_bands_diff ); + if ( ( hDirAC_mem->cy_auto_diff_smooth = (float *) malloc( sizeof( float ) * num_outputs_diff * num_freq_bands_diff ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) ); + } set_zero( hDirAC_mem->cy_auto_diff_smooth, num_outputs_diff * num_freq_bands_diff ); } hDirAC->h_output_synthesis_psd_state.cy_cross_dir_smooth = hDirAC_mem->cy_cross_dir_smooth; hDirAC->h_output_synthesis_psd_state.cy_auto_diff_smooth = hDirAC_mem->cy_auto_diff_smooth; /*Responses (gains/factors)*/ - hDirAC_mem->direct_responses = (float *) malloc( sizeof( float ) * size ); + if ( ( hDirAC_mem->direct_responses = (float *) malloc( sizeof( float ) * size ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) ); + } set_zero( hDirAC_mem->direct_responses, size ); hDirAC->h_output_synthesis_psd_state.direct_responses = hDirAC_mem->direct_responses; @@ -1175,16 +1342,26 @@ static void ivas_dirac_alloc_mem( hDirAC_mem->proto_diffuse_buffer_f = NULL; if ( renderer_type != RENDERER_BINAURAL_PARAMETRIC && renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM && renderer_type != RENDERER_STEREO_PARAMETRIC ) { - hDirAC_mem->proto_direct_buffer_f = (float *) malloc( sizeof( float ) * 2 * MAX_PARAM_SPATIAL_SUBFRAMES * num_protos_dir * num_freq_bands ); + if ( ( hDirAC_mem->proto_direct_buffer_f = (float *) malloc( sizeof( float ) * 2 * MAX_PARAM_SPATIAL_SUBFRAMES * num_protos_dir * num_freq_bands ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) ); + } + if ( hDirAC->proto_signal_decorr_on ) { if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_PSD_SHD ) { - hDirAC_mem->proto_diffuse_buffer_f = (float *) malloc( sizeof( float ) * 2 * MAX_PARAM_SPATIAL_SUBFRAMES * size ); + if ( ( hDirAC_mem->proto_diffuse_buffer_f = (float *) malloc( sizeof( float ) * 2 * MAX_PARAM_SPATIAL_SUBFRAMES * size ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) ); + } } else { - hDirAC_mem->proto_diffuse_buffer_f = (float *) malloc( sizeof( float ) * 2 * MAX_PARAM_SPATIAL_SUBFRAMES * num_outputs_diff * num_freq_bands ); + if ( ( hDirAC_mem->proto_diffuse_buffer_f = (float *) malloc( sizeof( float ) * 2 * MAX_PARAM_SPATIAL_SUBFRAMES * num_outputs_diff * num_freq_bands ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) ); + } } } } @@ -1196,8 +1373,15 @@ static void ivas_dirac_alloc_mem( hDirAC_mem->diffuse_power_factor = NULL; if ( renderer_type != RENDERER_BINAURAL_PARAMETRIC && renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM && renderer_type != RENDERER_STEREO_PARAMETRIC ) { - hDirAC_mem->direct_power_factor = (float *) malloc( sizeof( float ) * num_freq_bands ); - hDirAC_mem->diffuse_power_factor = (float *) malloc( sizeof( float ) * num_freq_bands ); + if ( ( hDirAC_mem->direct_power_factor = (float *) malloc( sizeof( float ) * num_freq_bands ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) ); + } + + if ( ( hDirAC_mem->diffuse_power_factor = (float *) malloc( sizeof( float ) * num_freq_bands ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) ); + } } hDirAC->h_output_synthesis_psd_state.direct_power_factor = hDirAC_mem->direct_power_factor; hDirAC->h_output_synthesis_psd_state.diffuse_power_factor = hDirAC_mem->diffuse_power_factor; @@ -1208,10 +1392,16 @@ static void ivas_dirac_alloc_mem( { if ( renderer_type != RENDERER_BINAURAL_PARAMETRIC && renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM && renderer_type != RENDERER_STEREO_PARAMETRIC ) { - hDirAC_mem->reference_power = (float *) malloc( sizeof( float ) * 2 * num_freq_bands ); + if ( ( hDirAC_mem->reference_power = (float *) malloc( sizeof( float ) * 2 * num_freq_bands ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) ); + } if ( hDirAC->proto_signal_decorr_on ) { - hDirAC_mem->onset_filter = (float *) malloc( sizeof( float ) * num_outputs_diff * num_freq_bands ); + if ( ( hDirAC_mem->onset_filter = (float *) malloc( sizeof( float ) * num_outputs_diff * num_freq_bands ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) ); + } } } } @@ -1219,15 +1409,22 @@ static void ivas_dirac_alloc_mem( { if ( num_protos_dir > 2 ) { - hDirAC_mem->reference_power = (float *) malloc( sizeof( float ) * 5 * num_freq_bands ); + if ( ( hDirAC_mem->reference_power = (float *) malloc( sizeof( float ) * 5 * num_freq_bands ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) ); + } } + if ( hDirAC->proto_signal_decorr_on ) { - hDirAC_mem->onset_filter = (float *) malloc( sizeof( float ) * 2 * num_freq_bands ); + if ( ( hDirAC_mem->onset_filter = (float *) malloc( sizeof( float ) * 2 * num_freq_bands ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) ); + } } } - return; + return IVAS_ERR_OK; } @@ -1511,35 +1708,38 @@ void ivas_qmetadata_to_dirac( if ( hMasa != NULL && ivas_total_brate > IVAS_SID_5k2 ) { + int16_t meta_write_index; band_mapping = hMasa->data.band_mapping; - for ( band = 0; band < hMasa->config.numCodingBands; ++band ) + for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; ++block ) { - for ( b = MASA_band_grouping_24[band_mapping[band]]; b < MASA_band_grouping_24[band_mapping[band + 1]]; ++b ) + meta_write_index = ( hDirAC->dirac_bs_md_write_idx + block ) % hDirAC->dirac_md_buffer_length; + + for ( band = 0; band < hMasa->config.numCodingBands; ++band ) { - for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; ++block ) + for ( b = MASA_band_grouping_24[band_mapping[band]]; b < MASA_band_grouping_24[band_mapping[band + 1]]; ++b ) { - hDirAC->azimuth[block][b] = (int16_t) q_direction->band_data[band].azimuth[block]; - hDirAC->elevation[block][b] = (int16_t) q_direction->band_data[band].elevation[block]; - hDirAC->energy_ratio1[block][b] = q_direction->band_data[band].energy_ratio[block]; - hDirAC->diffuseness_vector[block][b] = 1.0f - q_direction->band_data[band].energy_ratio[block]; + hDirAC->azimuth[meta_write_index][b] = (int16_t) q_direction->band_data[band].azimuth[block]; + hDirAC->elevation[meta_write_index][b] = (int16_t) q_direction->band_data[band].elevation[block]; + hDirAC->energy_ratio1[meta_write_index][b] = q_direction->band_data[band].energy_ratio[block]; + hDirAC->diffuseness_vector[meta_write_index][b] = 1.0f - q_direction->band_data[band].energy_ratio[block]; if ( q_direction->coherence_band_data != NULL ) { - hDirAC->spreadCoherence[block][b] = q_direction->coherence_band_data[band].spread_coherence[block] / 255.0f; + hDirAC->spreadCoherence[meta_write_index][b] = q_direction->coherence_band_data[band].spread_coherence[block] / 255.0f; } else { - hDirAC->spreadCoherence[block][b] = 0.0f; + hDirAC->spreadCoherence[meta_write_index][b] = 0.0f; } if ( hQMetaData->surcoh_band_data != NULL ) { - hDirAC->surroundingCoherence[block][b] = hQMetaData->surcoh_band_data[band].surround_coherence[block] / 255.0f; + hDirAC->surroundingCoherence[meta_write_index][b] = hQMetaData->surcoh_band_data[band].surround_coherence[block] / 255.0f; } else { - hDirAC->surroundingCoherence[block][b] = 0.0f; + hDirAC->surroundingCoherence[meta_write_index][b] = 0.0f; } } } @@ -1548,29 +1748,43 @@ void ivas_qmetadata_to_dirac( if ( hQMetaData->no_directions == 2 ) { q_direction = &( hQMetaData->q_direction[1] ); - for ( band = 0; band < hMasa->config.numCodingBands; ++band ) + for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; ++block ) { - for ( b = MASA_band_grouping_24[band_mapping[band]]; b < MASA_band_grouping_24[band_mapping[band + 1]]; ++b ) + meta_write_index = ( hDirAC->dirac_bs_md_write_idx + block ) % hDirAC->dirac_md_buffer_length; + + for ( band = 0; band < hMasa->config.numCodingBands; ++band ) { - for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; ++block ) + for ( b = MASA_band_grouping_24[band_mapping[band]]; b < MASA_band_grouping_24[band_mapping[band + 1]]; ++b ) { - hDirAC->azimuth2[block][b] = (int16_t) q_direction->band_data[band].azimuth[block]; - hDirAC->elevation2[block][b] = (int16_t) q_direction->band_data[band].elevation[block]; - hDirAC->energy_ratio2[block][b] = q_direction->band_data[band].energy_ratio[block]; - hDirAC->diffuseness_vector[block][b] -= q_direction->band_data[band].energy_ratio[block]; + hDirAC->azimuth2[meta_write_index][b] = (int16_t) q_direction->band_data[band].azimuth[block]; + hDirAC->elevation2[meta_write_index][b] = (int16_t) q_direction->band_data[band].elevation[block]; + hDirAC->energy_ratio2[meta_write_index][b] = q_direction->band_data[band].energy_ratio[block]; + hDirAC->diffuseness_vector[meta_write_index][b] -= q_direction->band_data[band].energy_ratio[block]; if ( q_direction->coherence_band_data != NULL ) { - hDirAC->spreadCoherence2[block][b] = q_direction->coherence_band_data[band].spread_coherence[block] / 255.0f; + hDirAC->spreadCoherence2[meta_write_index][b] = q_direction->coherence_band_data[band].spread_coherence[block] / 255.0f; } else { - hDirAC->spreadCoherence2[block][b] = 0.0f; + hDirAC->spreadCoherence2[meta_write_index][b] = 0.0f; } } } } } + else if ( hDirAC->azimuth2 != NULL && hDirAC->elevation2 != NULL && hDirAC->energy_ratio2 != NULL && hDirAC->spreadCoherence2 != NULL ) + { + /* zero out old dir2 data */ + for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; ++block ) + { + meta_write_index = ( hDirAC->dirac_bs_md_write_idx + block ) % hDirAC->dirac_md_buffer_length; + set_s( hDirAC->azimuth2[meta_write_index], 0, hDirAC->num_freq_bands ); + set_s( hDirAC->elevation2[meta_write_index], 0, hDirAC->num_freq_bands ); + set_zero( hDirAC->energy_ratio2[meta_write_index], hDirAC->num_freq_bands ); + set_zero( hDirAC->spreadCoherence2[meta_write_index], hDirAC->num_freq_bands ); + } + } } else /* SBA mode/SID/Zero frame*/ { @@ -1834,10 +2048,12 @@ void ivas_dirac_dec( float *reference_power, *reference_power_smooth; float *onset_filter, *onset_filter_subframe, *p_onset_filter = NULL; uint16_t coherence_flag; - wmops_sub_start( "ivas_dirac_dec" ); + + push_wmops( "ivas_dirac_dec" ); /* Initialize aux buffers */ hDirAC = st_ivas->hDirAC; + DirAC_mem = st_ivas->hDirAC->stack_mem; reference_power = DirAC_mem.reference_power; @@ -1858,7 +2074,7 @@ void ivas_dirac_dec( { int16_t n, tmp[IVAS_SPAR_MAX_CH * L_FRAME48k]; char file_name[50] = { 0 }; - const int16_t output_frame = st_ivas->->hDecoderConfig->output_Fs / FRAMES_PER_SEC; + const int16_t output_frame = st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC; for ( n = 0; n < nchan_transport; n++ ) { @@ -1908,6 +2124,7 @@ void ivas_dirac_dec( for ( slot_idx = 0; slot_idx < hDirAC->subframe_nbslots; slot_idx++ ) { index_slot = subframe_idx * hDirAC->subframe_nbslots + slot_idx; + /* Todo: This access to azimuth & elevation may use wrong indices as access should probably be based on hDirAC->dirac_read_idx */ rotateAziEle_DirAC( hDirAC->azimuth[index_slot], hDirAC->elevation[index_slot], num_freq_bands, hDirAC->num_freq_bands, p_Rmat ); } } @@ -1933,7 +2150,7 @@ void ivas_dirac_dec( for ( i = 0; i < hDirAC->num_freq_bands; i++ ) { dirEne = hDirAC->h_output_synthesis_psd_state.direct_power_factor[i]; - surCohEner = hDirAC->h_output_synthesis_psd_state.diffuse_power_factor[i] * hDirAC->surroundingCoherence[subframe_idx][i]; + surCohEner = hDirAC->h_output_synthesis_psd_state.diffuse_power_factor[i] * hDirAC->surroundingCoherence[hDirAC->dirac_read_idx][i]; hDirAC->h_output_synthesis_psd_state.diffuse_power_factor[i] -= surCohEner; hDirAC->h_output_synthesis_psd_state.direct_power_factor[i] += surCohEner; @@ -1971,8 +2188,6 @@ void ivas_dirac_dec( ivas_dirac_dec_compute_directional_responses( hDirAC, st_ivas->hVBAPdata, st_ivas->hMasa, - subframe_idx, - subframe_idx, surCohRatio, st_ivas->hHeadTrackData->shd_rot_max_order, p_Rmat ); @@ -1982,8 +2197,6 @@ void ivas_dirac_dec( ivas_dirac_dec_compute_directional_responses( hDirAC, st_ivas->hVBAPdata, st_ivas->hMasa, - subframe_idx, - subframe_idx, surCohRatio, 0, 0 ); @@ -2141,7 +2354,6 @@ void ivas_dirac_dec( hDirAC->buffer_intensity_real[1][index - 1], hDirAC->buffer_intensity_real[2][index - 1], num_freq_bands, - hDirAC->azimuth[hDirAC->dirac_estimator_idx], hDirAC->elevation[hDirAC->dirac_estimator_idx] ); @@ -2155,7 +2367,7 @@ void ivas_dirac_dec( hDirAC->dirac_estimator_idx = ( hDirAC->dirac_estimator_idx + 1 ) % hDirAC->dirac_md_buffer_length; } -#if DEBUG_MODE_DIRAC +#ifdef DEBUG_MODE_DIRAC { static FILE *fp_direction_vector = NULL, *fp_diffuseness = NULL, *fp_referencePower = NULL; @@ -2282,8 +2494,7 @@ void ivas_dirac_dec( p_Rmat, st_ivas->hVBAPdata, hDirAC->hOutSetup, - nchan_transport, - index_slot ); + nchan_transport ); } else { @@ -2293,8 +2504,7 @@ void ivas_dirac_dec( 0, st_ivas->hVBAPdata, hDirAC->hOutSetup, - nchan_transport, - index_slot ); + nchan_transport ); } if ( hDirAC->synthesisConf != DIRAC_SYNTHESIS_GAIN_SHD ) @@ -2359,8 +2569,6 @@ void ivas_dirac_dec( Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer, Cldfb_ImagBuffer ); - - #ifdef SPLIT_REND_WITH_HEAD_ROT if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB ) { @@ -2382,7 +2590,6 @@ void ivas_dirac_dec( } } #endif - /* Inverse CLDFB*/ for ( ch = 0; ch < st_ivas->hDecoderConfig->nchan_out; ch++ ) { @@ -2539,7 +2746,7 @@ void ivas_dirac_dec( } } - wmops_sub_end(); + pop_wmops(); return; } @@ -3276,6 +3483,7 @@ static void protoSignalComputation4( return; } + /*------------------------------------------------------------------------- * ivas_dirac_dec_compute_diffuse_proto() * @@ -3283,8 +3491,9 @@ static void protoSignalComputation4( *------------------------------------------------------------------------*/ static void ivas_dirac_dec_compute_diffuse_proto( - DIRAC_DEC_HANDLE hDirAC, /* i/o: DirAC handle */ - const int16_t slot_idx ) + DIRAC_DEC_HANDLE hDirAC, /* i/o: DirAC handle */ + const int16_t slot_idx /* i : slot index */ +) { int16_t k, l; int16_t num_freq_bands, num_freq_bands_diff; @@ -3292,7 +3501,6 @@ static void ivas_dirac_dec_compute_diffuse_proto( float *p_proto_diff, *p_power_smooth, *proto_frame_dec_f; DIRAC_OUTPUT_SYNTHESIS_PARAMS *h_dirac_output_synthesis_params; DIRAC_OUTPUT_SYNTHESIS_STATE *h_dirac_output_synthesis_state; - int16_t m; float *p_hoa_enc; @@ -3404,6 +3612,7 @@ static void computeDirectionAngles( return; } + /*------------------------------------------------------------------------- * ivas_masa_init_stereotype_detection() * @@ -3566,6 +3775,7 @@ static void computeIntensityVector_dec( */ int16_t i; float real, img; + for ( i = 0; i < num_frequency_bands; ++i ) { real = Cldfb_RealBuffer[0][0][i]; @@ -3644,3 +3854,48 @@ static void ivas_lfe_synth_with_cldfb( return; } + + +/*------------------------------------------------------------------------- + * rotateAziEle_DirAC() + * + * Apply rotation to DirAC DOAs + *------------------------------------------------------------------------*/ + +static void rotateAziEle_DirAC( + int16_t *azi, /* i/o: array of azimuth values */ + int16_t *ele, /* i/o: array of elevation values */ + const int16_t band1, /* i : bands to work on (lower limit) */ + const int16_t band2, /* i : bands to work on (upper bound) */ + const float *p_Rmat /* i : pointer to real-space rotation matrix */ +) +{ + int16_t b; + float dv_0, dv_1, dv_2; + float dv_r_0, dv_r_1, dv_r_2; + float w; + + push_wmops( "rotateAziEle_DirAC" ); + + for ( b = band1; b < band2; b++ ) + { + + /*Conversion spherical to cartesian coordinates*/ + w = cosf( ele[b] * PI_OVER_180 ); + dv_0 = w * cosf( azi[b] * PI_OVER_180 ); + dv_1 = w * sinf( azi[b] * PI_OVER_180 ); + dv_2 = sinf( ele[b] * PI_OVER_180 ); + + dv_r_0 = p_Rmat[0] * dv_0 + p_Rmat[1] * dv_1 + p_Rmat[2] * dv_2; + dv_r_1 = p_Rmat[3] * dv_0 + p_Rmat[4] * dv_1 + p_Rmat[5] * dv_2; + dv_r_2 = p_Rmat[6] * dv_0 + p_Rmat[7] * dv_1 + p_Rmat[8] * dv_2; + + /*Conversion spherical to cartesian coordinates*/ + azi[b] = (int16_t) ( atan2f( dv_r_1, dv_r_0 ) * _180_OVER_PI ); + ele[b] = (int16_t) ( atan2f( dv_r_2, sqrtf( dv_r_0 * dv_r_0 + dv_r_1 * dv_r_1 ) ) * _180_OVER_PI ); + } + + pop_wmops(); + + return; +} diff --git a/lib_dec/ivas_dirac_decorr_dec.c b/lib_dec/ivas_dirac_decorr_dec.c index 437bdf8a64..bcaa6cf2a1 100644 --- a/lib_dec/ivas_dirac_decorr_dec.c +++ b/lib_dec/ivas_dirac_decorr_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------- @@ -70,10 +70,10 @@ static void lattice2allpass( const int16_t filter_length, const float *lattice_c /*------------------------------------------------------------------------- * ivas_dirac_dec_decorr_open() * - * + * Allocate and initialize TD decorrelator decoder handle *------------------------------------------------------------------------*/ -void ivas_dirac_dec_decorr_open( +ivas_error ivas_dirac_dec_decorr_open( DIRAC_DECORR_PARAMS **ph_freq_domain_decorr_ap_params, DIRAC_DECORR_STATE **ph_freq_domain_decorr_ap_state, const int16_t num_freq_bands, @@ -91,6 +91,7 @@ void ivas_dirac_dec_decorr_open( int16_t split_frequencies_bands[DIRAC_DECORR_NUM_SPLIT_BANDS + 1] = { 0, 0, 0, 23768 }; int16_t *split_freq_ptr; float cur_lattice_delta_phi, lattice_coeffs[2 * DIRAC_MAX_DECORR_FILTER_LEN]; + ivas_error error; /* pointers to structs for allocation */ DIRAC_DECORR_PARAMS *freq_domain_decorr_ap_params = NULL; @@ -101,8 +102,15 @@ void ivas_dirac_dec_decorr_open( *-----------------------------------------------------------------*/ /* allocate structs */ - freq_domain_decorr_ap_params = (DIRAC_DECORR_PARAMS *) count_malloc( sizeof( DIRAC_DECORR_PARAMS ) ); - freq_domain_decorr_ap_state = (DIRAC_DECORR_STATE *) count_malloc( sizeof( DIRAC_DECORR_STATE ) ); + if ( ( freq_domain_decorr_ap_params = (DIRAC_DECORR_PARAMS *) malloc( sizeof( DIRAC_DECORR_PARAMS ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) ); + } + + if ( ( freq_domain_decorr_ap_state = (DIRAC_DECORR_STATE *) malloc( sizeof( DIRAC_DECORR_STATE ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) ); + } /*-----------------------------------------------------------------* * check input parameters @@ -164,7 +172,6 @@ void ivas_dirac_dec_decorr_open( } } - /*-----------------------------------------------------------------* * open sub-modules *-----------------------------------------------------------------*/ @@ -173,21 +180,17 @@ void ivas_dirac_dec_decorr_open( if ( synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) { /*Onset detector up to Nyquist and not only up to max_band_decorr*/ - ivas_dirac_dec_onset_detection_open( - num_protos_diff, - num_freq_bands, - num_freq_bands, - &freq_domain_decorr_ap_params->h_onset_detection_power_params, - &freq_domain_decorr_ap_state->h_onset_detection_power_state ); + if ( ( error = ivas_dirac_dec_onset_detection_open( num_protos_diff, num_freq_bands, num_freq_bands, &freq_domain_decorr_ap_params->h_onset_detection_power_params, &freq_domain_decorr_ap_state->h_onset_detection_power_state ) ) != IVAS_ERR_OK ) + { + return error; + } } else { - ivas_dirac_dec_onset_detection_open( - num_protos_diff, - num_freq_bands, - freq_domain_decorr_ap_params->max_band_decorr, - &freq_domain_decorr_ap_params->h_onset_detection_power_params, - &freq_domain_decorr_ap_state->h_onset_detection_power_state ); + if ( ( error = ivas_dirac_dec_onset_detection_open( num_protos_diff, num_freq_bands, freq_domain_decorr_ap_params->max_band_decorr, &freq_domain_decorr_ap_params->h_onset_detection_power_params, &freq_domain_decorr_ap_state->h_onset_detection_power_state ) ) != IVAS_ERR_OK ) + { + return error; + } } /*-----------------------------------------------------------------* @@ -215,7 +218,10 @@ void ivas_dirac_dec_decorr_open( } } - freq_domain_decorr_ap_params->split_frequency_bands = (int16_t *) count_malloc( sizeof( int16_t ) * ( freq_domain_decorr_ap_params->num_split_frequency_bands + 1 ) ); + if ( ( freq_domain_decorr_ap_params->split_frequency_bands = (int16_t *) malloc( sizeof( int16_t ) * ( freq_domain_decorr_ap_params->num_split_frequency_bands + 1 ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) ); + } mvs2s( &split_frequencies_bands[0], freq_domain_decorr_ap_params->split_frequency_bands, freq_domain_decorr_ap_params->num_split_frequency_bands + 1 ); /* calc buffer size and allocate arrays */ @@ -232,18 +238,50 @@ void ivas_dirac_dec_decorr_open( if ( num_outputs_diff > 0 ) { buffer_size_decorr = ( ap_pre_delay[split_band_index_start] + ap_filter_length[split_band_index_start] ); - freq_domain_decorr_ap_state->decorr_buffer = (float *) count_malloc( sizeof( float ) * 2 * buffer_size_decorr * num_outputs_diff * freq_domain_decorr_ap_params->max_band_decorr ); + if ( ( freq_domain_decorr_ap_state->decorr_buffer = (float *) malloc( sizeof( float ) * 2 * buffer_size_decorr * num_outputs_diff * freq_domain_decorr_ap_params->max_band_decorr ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) ); + } set_f( freq_domain_decorr_ap_state->decorr_buffer, 0.0f, 2 * buffer_size_decorr * num_outputs_diff * freq_domain_decorr_ap_params->max_band_decorr ); - freq_domain_decorr_ap_params->filter_coeff_num_real = (float *) count_malloc( sizeof( float ) * ( ap_filter_length[split_band_index_start] + 1 ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff ); - freq_domain_decorr_ap_params->filter_coeff_den_real = (float *) count_malloc( sizeof( float ) * ( ap_filter_length[split_band_index_start] + 1 ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff ); - freq_domain_decorr_ap_params->phase_coeff_real = (float *) count_malloc( sizeof( float ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff ); - freq_domain_decorr_ap_params->phase_coeff_imag = (float *) count_malloc( sizeof( float ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff ); - freq_domain_decorr_ap_state->direct_energy_smooth = (float *) count_malloc( sizeof( float ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff ); - freq_domain_decorr_ap_state->reverb_energy_smooth = (float *) count_malloc( sizeof( float ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff ); + if ( ( freq_domain_decorr_ap_params->filter_coeff_num_real = (float *) malloc( sizeof( float ) * ( ap_filter_length[split_band_index_start] + 1 ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) ); + } - freq_domain_decorr_ap_params->pre_delay = (int16_t *) count_malloc( sizeof( int16_t ) * freq_domain_decorr_ap_params->num_split_frequency_bands ); - freq_domain_decorr_ap_params->filter_length = (int16_t *) count_malloc( sizeof( int16_t ) * freq_domain_decorr_ap_params->num_split_frequency_bands ); + if ( ( freq_domain_decorr_ap_params->filter_coeff_den_real = (float *) malloc( sizeof( float ) * ( ap_filter_length[split_band_index_start] + 1 ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) ); + } + + if ( ( freq_domain_decorr_ap_params->phase_coeff_real = (float *) malloc( sizeof( float ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) ); + } + + if ( ( freq_domain_decorr_ap_params->phase_coeff_imag = (float *) malloc( sizeof( float ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) ); + } + + if ( ( freq_domain_decorr_ap_state->direct_energy_smooth = (float *) malloc( sizeof( float ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) ); + } + + if ( ( freq_domain_decorr_ap_state->reverb_energy_smooth = (float *) malloc( sizeof( float ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) ); + } + + if ( ( freq_domain_decorr_ap_params->pre_delay = (int16_t *) malloc( sizeof( int16_t ) * freq_domain_decorr_ap_params->num_split_frequency_bands ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) ); + } + if ( ( freq_domain_decorr_ap_params->filter_length = (int16_t *) malloc( sizeof( int16_t ) * freq_domain_decorr_ap_params->num_split_frequency_bands ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) ); + } set_f( freq_domain_decorr_ap_state->direct_energy_smooth, 0.0f, freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff ); set_f( freq_domain_decorr_ap_state->reverb_energy_smooth, 0.0f, freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff ); @@ -280,7 +318,7 @@ void ivas_dirac_dec_decorr_open( *ph_freq_domain_decorr_ap_params = freq_domain_decorr_ap_params; *ph_freq_domain_decorr_ap_state = freq_domain_decorr_ap_state; - return; + return IVAS_ERR_OK; } @@ -315,7 +353,7 @@ void ivas_dirac_dec_decorr_process( float *filter_coeff_num_real, *filter_coeff_den_real, *decorr_buffer_start_ptr, *decorr_buffer_ptr; float input_real, input_imag, filter_frame_imag, filter_frame_real; - wmops_sub_start( "dirac_decorr_process" ); + push_wmops( "dirac_decorr_process" ); /* check handles */ if ( h_freq_domain_decorr_ap_params == NULL || h_freq_domain_decorr_ap_state == NULL ) @@ -571,7 +609,7 @@ void ivas_dirac_dec_decorr_process( } /*end of decorrelator*/ - wmops_sub_end(); + pop_wmops(); return; } @@ -617,13 +655,13 @@ void ivas_dirac_dec_decorr_close( if ( dirac_onset_detection_state->onset_detector_1 != NULL ) { - count_free( dirac_onset_detection_state->onset_detector_1 ); + free( dirac_onset_detection_state->onset_detector_1 ); dirac_onset_detection_state->onset_detector_1 = NULL; } if ( dirac_onset_detection_state->onset_detector_2 != NULL ) { - count_free( dirac_onset_detection_state->onset_detector_2 ); + free( dirac_onset_detection_state->onset_detector_2 ); dirac_onset_detection_state->onset_detector_2 = NULL; } @@ -634,78 +672,78 @@ void ivas_dirac_dec_decorr_close( /* free decorrelation buffer */ if ( ( *ph_freq_domain_decorr_ap_state )->decorr_buffer != NULL ) { - count_free( ( *ph_freq_domain_decorr_ap_state )->decorr_buffer ); + free( ( *ph_freq_domain_decorr_ap_state )->decorr_buffer ); ( *ph_freq_domain_decorr_ap_state )->decorr_buffer = NULL; } /* free ducker smoothed direct energy buffer */ if ( ( *ph_freq_domain_decorr_ap_state )->direct_energy_smooth != NULL ) { - count_free( ( *ph_freq_domain_decorr_ap_state )->direct_energy_smooth ); + free( ( *ph_freq_domain_decorr_ap_state )->direct_energy_smooth ); ( *ph_freq_domain_decorr_ap_state )->direct_energy_smooth = NULL; } /* free ducker smoothed reverb energy buffer */ if ( ( *ph_freq_domain_decorr_ap_state )->reverb_energy_smooth != NULL ) { - count_free( ( *ph_freq_domain_decorr_ap_state )->reverb_energy_smooth ); + free( ( *ph_freq_domain_decorr_ap_state )->reverb_energy_smooth ); ( *ph_freq_domain_decorr_ap_state )->reverb_energy_smooth = NULL; } /* free pre-delay param buffer */ if ( ( *ph_freq_domain_decorr_ap_params )->pre_delay != NULL ) { - count_free( ( *ph_freq_domain_decorr_ap_params )->pre_delay ); + free( ( *ph_freq_domain_decorr_ap_params )->pre_delay ); ( *ph_freq_domain_decorr_ap_params )->pre_delay = NULL; } /* free filter length param buffer */ if ( ( *ph_freq_domain_decorr_ap_params )->filter_length != NULL ) { - count_free( ( *ph_freq_domain_decorr_ap_params )->filter_length ); + free( ( *ph_freq_domain_decorr_ap_params )->filter_length ); ( *ph_freq_domain_decorr_ap_params )->filter_length = NULL; } /* free filter coeff param buffers */ if ( ( *ph_freq_domain_decorr_ap_params )->filter_coeff_num_real != NULL ) { - count_free( ( *ph_freq_domain_decorr_ap_params )->filter_coeff_num_real ); + free( ( *ph_freq_domain_decorr_ap_params )->filter_coeff_num_real ); ( *ph_freq_domain_decorr_ap_params )->filter_coeff_num_real = NULL; } /* free pre-delay param buffer */ if ( ( *ph_freq_domain_decorr_ap_params )->filter_coeff_den_real != NULL ) { - count_free( ( *ph_freq_domain_decorr_ap_params )->filter_coeff_den_real ); + free( ( *ph_freq_domain_decorr_ap_params )->filter_coeff_den_real ); ( *ph_freq_domain_decorr_ap_params )->filter_coeff_den_real = NULL; } /* free pre-delay param buffer */ if ( ( *ph_freq_domain_decorr_ap_params )->phase_coeff_imag != NULL ) { - count_free( ( *ph_freq_domain_decorr_ap_params )->phase_coeff_imag ); + free( ( *ph_freq_domain_decorr_ap_params )->phase_coeff_imag ); ( *ph_freq_domain_decorr_ap_params )->phase_coeff_imag = NULL; } /* free pre-delay param buffer */ if ( ( *ph_freq_domain_decorr_ap_params )->phase_coeff_real != NULL ) { - count_free( ( *ph_freq_domain_decorr_ap_params )->phase_coeff_real ); + free( ( *ph_freq_domain_decorr_ap_params )->phase_coeff_real ); ( *ph_freq_domain_decorr_ap_params )->phase_coeff_real = NULL; } /* free pre-delay param buffer */ if ( ( *ph_freq_domain_decorr_ap_params )->split_frequency_bands != NULL ) { - count_free( ( *ph_freq_domain_decorr_ap_params )->split_frequency_bands ); + free( ( *ph_freq_domain_decorr_ap_params )->split_frequency_bands ); ( *ph_freq_domain_decorr_ap_params )->split_frequency_bands = NULL; } /* free pointers to state and parameter structs */ - count_free( *ph_freq_domain_decorr_ap_params ); + free( *ph_freq_domain_decorr_ap_params ); *ph_freq_domain_decorr_ap_params = NULL; - count_free( *ph_freq_domain_decorr_ap_state ); + free( *ph_freq_domain_decorr_ap_state ); *ph_freq_domain_decorr_ap_state = NULL; return; diff --git a/lib_dec/ivas_dirac_onsets_dec.c b/lib_dec/ivas_dirac_onsets_dec.c index 67209cc052..c094b45ff6 100644 --- a/lib_dec/ivas_dirac_onsets_dec.c +++ b/lib_dec/ivas_dirac_onsets_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------- @@ -51,7 +51,7 @@ * onset detection *------------------------------------------------------------------------*/ -void ivas_dirac_dec_onset_detection_open( +ivas_error ivas_dirac_dec_onset_detection_open( const int16_t num_protos_diff, const int16_t num_freq_bands, const int16_t max_band_decorr, @@ -69,14 +69,20 @@ void ivas_dirac_dec_onset_detection_open( dirac_onset_detection_params->max_band_decorr = max_band_decorr; /* memory allocation */ - dirac_onset_detection_state->onset_detector_1 = (float *) count_malloc( sizeof( float ) * num_protos_diff * dirac_onset_detection_params->max_band_decorr ); - dirac_onset_detection_state->onset_detector_2 = (float *) count_malloc( sizeof( float ) * num_protos_diff * dirac_onset_detection_params->max_band_decorr ); + if ( ( dirac_onset_detection_state->onset_detector_1 = (float *) malloc( sizeof( float ) * num_protos_diff * dirac_onset_detection_params->max_band_decorr ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for onset detection\n" ) ); + } + if ( ( dirac_onset_detection_state->onset_detector_2 = (float *) malloc( sizeof( float ) * num_protos_diff * dirac_onset_detection_params->max_band_decorr ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for onset detection\n" ) ); + } /* init to zero */ set_zero( dirac_onset_detection_state->onset_detector_1, num_protos_diff * dirac_onset_detection_params->max_band_decorr ); set_zero( dirac_onset_detection_state->onset_detector_2, num_protos_diff * dirac_onset_detection_params->max_band_decorr ); - return; + return IVAS_ERR_OK; } diff --git a/lib_dec/ivas_dirac_output_synthesis_cov.c b/lib_dec/ivas_dirac_output_synthesis_cov.c index decca34452..a2fc9ee821 100644 --- a/lib_dec/ivas_dirac_output_synthesis_cov.c +++ b/lib_dec/ivas_dirac_output_synthesis_cov.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -48,7 +48,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" #include "rom_dec.h" @@ -58,7 +58,7 @@ * Sets up the state and parameters for the Covariance Synthesis *-------------------------------------------------------------------*/ -void ivas_dirac_dec_output_synthesis_cov_open( +ivas_error ivas_dirac_dec_output_synthesis_cov_open( DIRAC_OUTPUT_SYNTHESIS_PARAMS *h_dirac_output_synthesis_params, /* i/o: handle for the covariance synthesis parameters */ DIRAC_OUTPUT_SYNTHESIS_COV_STATE *h_dirac_output_synthesis_state, /* i/o: hanlde for the covariance synthesis state */ const int16_t max_band_decorr, /* i : uppermost frequency band where decorrelation is applied */ @@ -80,15 +80,27 @@ void ivas_dirac_dec_output_synthesis_cov_open( /* buffer length and interpolator */ h_dirac_output_synthesis_params->alpha_synthesis = NULL; - h_dirac_output_synthesis_params->proto_matrix = (float *) count_malloc( nchan_out * nchan_in * sizeof( float ) ); + if ( ( h_dirac_output_synthesis_params->proto_matrix = (float *) malloc( nchan_out * nchan_in * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis covariance\n" ) ); + } /* cov buffers */ for ( idx = 0; idx < num_param_bands; idx++ ) { - h_dirac_output_synthesis_state->cx_old[idx] = (float *) count_malloc( nchan_in * nchan_in * sizeof( float ) ); - h_dirac_output_synthesis_state->cy_old[idx] = (float *) count_malloc( nchan_out * nchan_out * sizeof( float ) ); - h_dirac_output_synthesis_state->mixing_matrix_old[idx] = (float *) count_malloc( nchan_out * nchan_in * sizeof( float ) ); + if ( ( h_dirac_output_synthesis_state->cx_old[idx] = (float *) malloc( nchan_in * nchan_in * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis covariance\n" ) ); + } + if ( ( h_dirac_output_synthesis_state->cy_old[idx] = (float *) malloc( nchan_out * nchan_out * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis covariance\n" ) ); + } + if ( ( h_dirac_output_synthesis_state->mixing_matrix_old[idx] = (float *) malloc( nchan_out * nchan_in * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis covariance\n" ) ); + } set_zero( h_dirac_output_synthesis_state->cx_old[idx], nchan_in * nchan_in ); set_zero( h_dirac_output_synthesis_state->cy_old[idx], nchan_out * nchan_out ); set_zero( h_dirac_output_synthesis_state->mixing_matrix_old[idx], nchan_out * nchan_in ); @@ -101,7 +113,10 @@ void ivas_dirac_dec_output_synthesis_cov_open( } for ( idx = 0; idx < num_param_bands_residual; idx++ ) { - h_dirac_output_synthesis_state->mixing_matrix_res_old[idx] = (float *) count_malloc( nchan_out * nchan_out * sizeof( float ) ); + if ( ( h_dirac_output_synthesis_state->mixing_matrix_res_old[idx] = (float *) malloc( nchan_out * nchan_out * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis covariance\n" ) ); + } set_zero( h_dirac_output_synthesis_state->mixing_matrix_res_old[idx], nchan_out * nchan_out ); } for ( ; idx < CLDFB_NO_CHANNELS_MAX; idx++ ) @@ -114,7 +129,11 @@ void ivas_dirac_dec_output_synthesis_cov_open( *-----------------------------------------------------------------*/ /* compute interpolator */ - h_dirac_output_synthesis_params->interpolator = (float *) count_malloc( interp_length * sizeof( float ) ); + if ( ( h_dirac_output_synthesis_params->interpolator = (float *) malloc( interp_length * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis covariance\n" ) ); + } + for ( idx = 1; idx <= interp_length; ++idx ) { h_dirac_output_synthesis_params->interpolator[idx - 1] = (float) idx / (float) interp_length; @@ -122,7 +141,7 @@ void ivas_dirac_dec_output_synthesis_cov_open( mvr2r( proto_matrix, h_dirac_output_synthesis_params->proto_matrix, nchan_in * nchan_out ); - return; + return IVAS_ERR_OK; } @@ -171,7 +190,6 @@ void ivas_dirac_dec_output_synthesis_cov_close( DIRAC_OUTPUT_SYNTHESIS_COV_STATE *h_dirac_output_synthesis_state /* i/o: handle for the covariance synthesis state */ ) { - int16_t idx; /*-----------------------------------------------------------------* @@ -181,21 +199,21 @@ void ivas_dirac_dec_output_synthesis_cov_close( /* free interpolator */ if ( h_dirac_output_synthesis_params->interpolator != NULL ) { - count_free( h_dirac_output_synthesis_params->interpolator ); + free( h_dirac_output_synthesis_params->interpolator ); h_dirac_output_synthesis_params->interpolator = NULL; } /* free alpha */ if ( h_dirac_output_synthesis_params->alpha_synthesis != NULL ) { - count_free( h_dirac_output_synthesis_params->alpha_synthesis ); + free( h_dirac_output_synthesis_params->alpha_synthesis ); h_dirac_output_synthesis_params->alpha_synthesis = NULL; } /* free proto_matrix */ if ( h_dirac_output_synthesis_params->proto_matrix != NULL ) { - count_free( h_dirac_output_synthesis_params->proto_matrix ); + free( h_dirac_output_synthesis_params->proto_matrix ); h_dirac_output_synthesis_params->proto_matrix = NULL; } @@ -204,25 +222,25 @@ void ivas_dirac_dec_output_synthesis_cov_close( { if ( h_dirac_output_synthesis_state->cx_old[idx] != NULL ) { - count_free( h_dirac_output_synthesis_state->cx_old[idx] ); + free( h_dirac_output_synthesis_state->cx_old[idx] ); h_dirac_output_synthesis_state->cx_old[idx] = NULL; } if ( h_dirac_output_synthesis_state->cy_old[idx] != NULL ) { - count_free( h_dirac_output_synthesis_state->cy_old[idx] ); + free( h_dirac_output_synthesis_state->cy_old[idx] ); h_dirac_output_synthesis_state->cy_old[idx] = NULL; } if ( h_dirac_output_synthesis_state->mixing_matrix_old[idx] != NULL ) { - count_free( h_dirac_output_synthesis_state->mixing_matrix_old[idx] ); + free( h_dirac_output_synthesis_state->mixing_matrix_old[idx] ); h_dirac_output_synthesis_state->mixing_matrix_old[idx] = NULL; } if ( h_dirac_output_synthesis_state->mixing_matrix_res_old[idx] != NULL ) { - count_free( h_dirac_output_synthesis_state->mixing_matrix_res_old[idx] ); + free( h_dirac_output_synthesis_state->mixing_matrix_res_old[idx] ); h_dirac_output_synthesis_state->mixing_matrix_res_old[idx] = NULL; } } @@ -452,7 +470,7 @@ int16_t computeMixingMatrices( float mat_mult_buffer2[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS]; float mat_mult_buffer3[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS]; - wmops_sub_start( "dirac_cov_mix_mat" ); + push_wmops( "dirac_cov_mix_mat" ); set_zero( svd_s_buffer, MAX_OUTPUT_CHANNELS ); for ( i = 0; i < MAX_OUTPUT_CHANNELS; i++ ) @@ -665,7 +683,7 @@ int16_t computeMixingMatrices( mvr2r( mat_mult_buffer3, mixing_matrix, lengthCy * lengthCx ); } - wmops_sub_end(); + pop_wmops(); return out; } @@ -706,7 +724,7 @@ int16_t computeMixingMatricesResidual( float mat_mult_buffer2[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS]; float mat_mult_buffer3[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS]; - wmops_sub_start( "dirac_cov_mix_mat_r" ); + push_wmops( "dirac_cov_mix_mat_r" ); /*-----------------------------------------------------------------* * Decomposition of Cy @@ -864,7 +882,7 @@ int16_t computeMixingMatricesResidual( mvr2r( mat_mult_buffer3, mixing_matrix, lengthCy * lengthCx ); - wmops_sub_end(); + pop_wmops(); return out; } @@ -910,7 +928,7 @@ int16_t computeMixingMatricesISM( float mat_mult_buffer3[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS]; int16_t nL, nC; - wmops_sub_start( "dirac_cov_mix_mat" ); + push_wmops( "dirac_cov_mix_mat" ); out = EXIT_SUCCESS; lengthCx = num_inputs; @@ -1047,7 +1065,7 @@ int16_t computeMixingMatricesISM( mvr2r( mat_mult_buffer3, mixing_matrix, lengthCy * lengthCx ); } - wmops_sub_end(); + pop_wmops(); return out; } diff --git a/lib_dec/ivas_dirac_output_synthesis_dec.c b/lib_dec/ivas_dirac_output_synthesis_dec.c index 79c04f824b..362b63c04b 100644 --- a/lib_dec/ivas_dirac_output_synthesis_dec.c +++ b/lib_dec/ivas_dirac_output_synthesis_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------- * Local constants @@ -86,7 +86,7 @@ static void normalizePanningGains( float *direct_response, const int16_t num_cha * *------------------------------------------------------------------------*/ -void ivas_dirac_dec_output_synthesis_open( +ivas_error ivas_dirac_dec_output_synthesis_open( DIRAC_DEC_HANDLE hDirAC, /* i/o: DirAC handle */ RENDERER_TYPE renderer_type, /* i : renderer type */ const int16_t nchan_transport, /* i : number of transport channels*/ @@ -126,22 +126,34 @@ void ivas_dirac_dec_output_synthesis_open( dirac_output_synthesis_state->diffuse_responses_square = NULL; if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_MONO ) { - dirac_output_synthesis_state->diffuse_responses_square = (float *) count_malloc( 2 * sizeof( float ) ); + if ( ( dirac_output_synthesis_state->diffuse_responses_square = (float *) malloc( 2 * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) ); + } } else if ( hDirAC->synthesisConf != DIRAC_SYNTHESIS_GAIN_SHD ) { - dirac_output_synthesis_state->diffuse_responses_square = (float *) count_malloc( hDirAC->hOutSetup.nchan_out_woLFE * sizeof( float ) ); + if ( ( dirac_output_synthesis_state->diffuse_responses_square = (float *) malloc( hDirAC->hOutSetup.nchan_out_woLFE * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) ); + } } /* prototype power buffers */ dirac_output_synthesis_state->proto_power_smooth_prev = NULL; if ( hDirAC->synthesisConf != DIRAC_SYNTHESIS_GAIN_SHD ) { - dirac_output_synthesis_state->proto_power_smooth_prev = (float *) count_malloc( hDirAC->num_freq_bands * hDirAC->num_protos_dir * sizeof( float ) ); + if ( ( dirac_output_synthesis_state->proto_power_smooth_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_protos_dir * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) ); + } } if ( dirac_output_synthesis_params->max_band_decorr > 0 && ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_PSD_LS || hDirAC->synthesisConf == DIRAC_SYNTHESIS_PSD_SHD ) ) { - dirac_output_synthesis_state->proto_power_diff_smooth_prev = (float *) count_malloc( dirac_output_synthesis_params->max_band_decorr * hDirAC->hOutSetup.nchan_out_woLFE * sizeof( float ) ); + if ( ( dirac_output_synthesis_state->proto_power_diff_smooth_prev = (float *) malloc( dirac_output_synthesis_params->max_band_decorr * hDirAC->hOutSetup.nchan_out_woLFE * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) ); + } } else { @@ -149,41 +161,74 @@ void ivas_dirac_dec_output_synthesis_open( } /* buffer length and interpolator */ - dirac_output_synthesis_params->interpolator = (float *) count_malloc( hDirAC->subframe_nbslots * sizeof( float ) ); + if ( ( dirac_output_synthesis_params->interpolator = (float *) malloc( hDirAC->subframe_nbslots * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) ); + } /* target PSD buffers */ - dirac_output_synthesis_state->cy_cross_dir_smooth_prev = (float *) count_malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) ); + if ( ( dirac_output_synthesis_state->cy_cross_dir_smooth_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) ); + } + if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) { dirac_output_synthesis_state->cy_auto_dir_smooth_prev = NULL; - dirac_output_synthesis_state->cy_auto_diff_smooth_prev = (float *) count_malloc( dirac_output_synthesis_params->max_band_decorr * hDirAC->num_outputs_diff * sizeof( float ) ); + if ( ( dirac_output_synthesis_state->cy_auto_diff_smooth_prev = (float *) malloc( dirac_output_synthesis_params->max_band_decorr * hDirAC->num_outputs_diff * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) ); + } } else { - dirac_output_synthesis_state->cy_auto_dir_smooth_prev = (float *) count_malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) ); + if ( ( dirac_output_synthesis_state->cy_auto_dir_smooth_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) ); + } + if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_PSD_SHD ) { - dirac_output_synthesis_state->cy_auto_diff_smooth_prev = (float *) count_malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) ); + if ( ( dirac_output_synthesis_state->cy_auto_diff_smooth_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) ); + } } else { - dirac_output_synthesis_state->cy_auto_diff_smooth_prev = (float *) count_malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_diff * sizeof( float ) ); + if ( ( dirac_output_synthesis_state->cy_auto_diff_smooth_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_diff * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) ); + } } } /* direct and diffuse gain buffers */ - dirac_output_synthesis_state->gains_dir_prev = (float *) count_malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) ); + if ( ( dirac_output_synthesis_state->gains_dir_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) ); + } + if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) { - dirac_output_synthesis_state->gains_diff_prev = (float *) count_malloc( dirac_output_synthesis_params->max_band_decorr * hDirAC->num_outputs_diff * sizeof( float ) ); + if ( ( dirac_output_synthesis_state->gains_diff_prev = (float *) malloc( dirac_output_synthesis_params->max_band_decorr * hDirAC->num_outputs_diff * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) ); + } } else if ( hDirAC->synthesisConf != DIRAC_SYNTHESIS_PSD_SHD && hDirAC->synthesisConf != DIRAC_SYNTHESIS_MONO ) { - dirac_output_synthesis_state->gains_diff_prev = (float *) count_malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_diff * sizeof( float ) ); + if ( ( dirac_output_synthesis_state->gains_diff_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_diff * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) ); + } } else { - dirac_output_synthesis_state->gains_diff_prev = (float *) count_malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) ); + if ( ( dirac_output_synthesis_state->gains_diff_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) ); + } } /*-----------------------------------------------------------------* @@ -194,15 +239,27 @@ void ivas_dirac_dec_output_synthesis_open( if ( !( renderer_type == RENDERER_BINAURAL_PARAMETRIC || renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) ) { computeAlphaSynthesis( temp_alpha_synthesis, DIRAC_AVG_LENGTH_SYNTH_MS, DIRAC_ALPHA_MAX, &dirac_output_synthesis_params->numAlphas, hDirAC->slot_size, hDirAC->num_freq_bands, hDirAC->frequency_axis, output_Fs ); - dirac_output_synthesis_params->alpha_synthesis = (float *) count_malloc( dirac_output_synthesis_params->numAlphas * sizeof( float ) ); + if ( ( dirac_output_synthesis_params->alpha_synthesis = (float *) malloc( dirac_output_synthesis_params->numAlphas * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) ); + } mvr2r( temp_alpha_synthesis, dirac_output_synthesis_params->alpha_synthesis, dirac_output_synthesis_params->numAlphas ); computeAlphaSynthesis( temp_alpha_synthesis, DIRAC_AVG_LENGTH_SYNTH_MS_FAST, DIRAC_ALPHA_MAX_FAST, &dirac_output_synthesis_params->numAlphasFast, hDirAC->slot_size, hDirAC->num_freq_bands, hDirAC->frequency_axis, output_Fs ); - dirac_output_synthesis_params->alpha_synthesis_fast = (float *) count_malloc( dirac_output_synthesis_params->numAlphasFast * sizeof( float ) ); + if ( ( dirac_output_synthesis_params->alpha_synthesis_fast = (float *) malloc( dirac_output_synthesis_params->numAlphasFast * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) ); + } mvr2r( temp_alpha_synthesis, dirac_output_synthesis_params->alpha_synthesis_fast, dirac_output_synthesis_params->numAlphasFast ); - dirac_output_synthesis_state->reference_power_smooth_prev = (float *) count_malloc( hDirAC->num_freq_bands * sizeof( float ) ); - dirac_output_synthesis_state->direction_smoothness_prev = (float *) count_malloc( hDirAC->num_freq_bands * sizeof( float ) ); + if ( ( dirac_output_synthesis_state->reference_power_smooth_prev = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) ); + } + if ( ( dirac_output_synthesis_state->direction_smoothness_prev = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) ); + } set_zero( dirac_output_synthesis_state->reference_power_smooth_prev, hDirAC->num_freq_bands ); set_zero( dirac_output_synthesis_state->direction_smoothness_prev, hDirAC->num_freq_bands ); } @@ -276,7 +333,7 @@ void ivas_dirac_dec_output_synthesis_open( dirac_output_synthesis_params->diffuse_compensation_factor_decorr = 0.f; } - return; + return IVAS_ERR_OK; } @@ -367,79 +424,79 @@ void ivas_dirac_dec_output_synthesis_close( /* free interpolator */ if ( ( dirac_output_synthesis_params )->interpolator != NULL ) { - count_free( ( dirac_output_synthesis_params )->interpolator ); + free( ( dirac_output_synthesis_params )->interpolator ); ( dirac_output_synthesis_params )->interpolator = NULL; } /* free alpha */ if ( ( dirac_output_synthesis_params )->alpha_synthesis != NULL ) { - count_free( ( dirac_output_synthesis_params )->alpha_synthesis ); + free( ( dirac_output_synthesis_params )->alpha_synthesis ); ( dirac_output_synthesis_params )->alpha_synthesis = NULL; } if ( ( dirac_output_synthesis_params )->alpha_synthesis_fast != NULL ) { - count_free( ( dirac_output_synthesis_params )->alpha_synthesis_fast ); + free( ( dirac_output_synthesis_params )->alpha_synthesis_fast ); ( dirac_output_synthesis_params )->alpha_synthesis_fast = NULL; } if ( ( dirac_output_synthesis_state )->reference_power_smooth_prev != NULL ) { - count_free( ( dirac_output_synthesis_state )->reference_power_smooth_prev ); + free( ( dirac_output_synthesis_state )->reference_power_smooth_prev ); ( dirac_output_synthesis_state )->reference_power_smooth_prev = NULL; } if ( ( dirac_output_synthesis_state )->direction_smoothness_prev != NULL ) { - count_free( ( dirac_output_synthesis_state )->direction_smoothness_prev ); + free( ( dirac_output_synthesis_state )->direction_smoothness_prev ); ( dirac_output_synthesis_state )->direction_smoothness_prev = NULL; } if ( ( dirac_output_synthesis_state )->diffuse_responses_square != NULL ) { - count_free( ( dirac_output_synthesis_state )->diffuse_responses_square ); + free( ( dirac_output_synthesis_state )->diffuse_responses_square ); ( dirac_output_synthesis_state )->diffuse_responses_square = NULL; } /* free power buffers */ if ( ( dirac_output_synthesis_state )->proto_power_smooth_prev != NULL ) { - count_free( ( dirac_output_synthesis_state )->proto_power_smooth_prev ); + free( ( dirac_output_synthesis_state )->proto_power_smooth_prev ); ( dirac_output_synthesis_state )->proto_power_smooth_prev = NULL; } if ( ( dirac_output_synthesis_state )->proto_power_diff_smooth_prev != NULL ) { - count_free( ( dirac_output_synthesis_state )->proto_power_diff_smooth_prev ); + free( ( dirac_output_synthesis_state )->proto_power_diff_smooth_prev ); ( dirac_output_synthesis_state )->proto_power_diff_smooth_prev = NULL; } /* free target power buffers */ if ( ( dirac_output_synthesis_state )->cy_auto_dir_smooth_prev != NULL ) { - count_free( ( dirac_output_synthesis_state )->cy_auto_dir_smooth_prev ); + free( ( dirac_output_synthesis_state )->cy_auto_dir_smooth_prev ); ( dirac_output_synthesis_state )->cy_auto_dir_smooth_prev = NULL; } if ( ( dirac_output_synthesis_state )->cy_cross_dir_smooth_prev != NULL ) { - count_free( ( dirac_output_synthesis_state )->cy_cross_dir_smooth_prev ); + free( ( dirac_output_synthesis_state )->cy_cross_dir_smooth_prev ); ( dirac_output_synthesis_state )->cy_cross_dir_smooth_prev = NULL; } if ( ( dirac_output_synthesis_state )->cy_auto_diff_smooth_prev != NULL ) { - count_free( ( dirac_output_synthesis_state )->cy_auto_diff_smooth_prev ); + free( ( dirac_output_synthesis_state )->cy_auto_diff_smooth_prev ); ( dirac_output_synthesis_state )->cy_auto_diff_smooth_prev = NULL; } /* free gain buffers */ if ( ( dirac_output_synthesis_state )->gains_dir_prev != NULL ) { - count_free( ( dirac_output_synthesis_state )->gains_dir_prev ); + free( ( dirac_output_synthesis_state )->gains_dir_prev ); ( dirac_output_synthesis_state )->gains_dir_prev = NULL; } if ( ( dirac_output_synthesis_state )->gains_diff_prev != NULL ) { - count_free( ( dirac_output_synthesis_state )->gains_diff_prev ); + free( ( dirac_output_synthesis_state )->gains_diff_prev ); ( dirac_output_synthesis_state )->gains_diff_prev = NULL; } @@ -460,8 +517,8 @@ void ivas_dirac_dec_output_synthesis_process_slot( const float *p_Rmat, /* i : rotation matrix */ const VBAP_HANDLE hVBAPdata, /* i : VBAP structure */ const IVAS_OUTPUT_SETUP hOutSetup, /* i : output setup structure */ - const int16_t nchan_transport, /* i : number of transport channels*/ - const int16_t index_slot ) + const int16_t nchan_transport /* i : number of transport channels*/ +) { int16_t num_freq_bands, num_channels_dir; int16_t num_freq_bands_diff, num_channels_diff; @@ -499,8 +556,7 @@ void ivas_dirac_dec_output_synthesis_process_slot( ivas_dirac_dec_compute_directional_responses( hDirAC, hVBAPdata, NULL, - index_slot, - index_slot / MAX_PARAM_SPATIAL_SUBFRAMES, NULL, + NULL, 2, p_Rmat ); @@ -945,7 +1001,7 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls( int16_t alphaMaxBin; int16_t alphaMaxBinFast; - wmops_sub_start( "dirac_out_synth_sfr" ); + push_wmops( "dirac_out_synth_sfr" ); h_dirac_output_synthesis_params = &( hDirAC->h_output_synthesis_psd_params ); h_dirac_output_synthesis_state = &( hDirAC->h_output_synthesis_psd_state ); @@ -1248,7 +1304,7 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls( set_zero( h_dirac_output_synthesis_state->cy_cross_dir_smooth, num_freq_bands * nchan_out_woLFE ); set_zero( h_dirac_output_synthesis_state->cy_auto_diff_smooth, num_freq_bands * nchan_out_woLFE ); - wmops_sub_end(); + pop_wmops(); return; } @@ -1277,7 +1333,7 @@ static void ivas_dirac_dec_get_response_split_order( float dv_0, dv_1, dv_2, dv_r_0, dv_r_1, dv_r_2; float w; - wmops_sub_start( "ivas_dirac_dec_get_response_split_order" ); + push_wmops( "ivas_dirac_dec_get_response_split_order" ); index_azimuth = ( azimuth + 180 ) % 360; index_elevation = elevation + 90; @@ -1411,7 +1467,7 @@ static void ivas_dirac_dec_get_response_split_order( response[b] = c; } - wmops_sub_end(); + pop_wmops(); return; } @@ -1427,8 +1483,6 @@ void ivas_dirac_dec_compute_directional_responses( DIRAC_DEC_HANDLE hDirAC, /* i/o: DirAC handle */ const VBAP_HANDLE hVBAPdata, /* i : VBAP structure */ const MASA_DECODER_HANDLE hMasa, /* i : MASA decoder structure */ - const int16_t direction_idx, /* i : index for direction (azi and ele), can slot index (>2TCs) or subrame index (<=2TCs) */ - const int16_t subframe_idx, /* i : subframe index */ const float *surCohRatio, const int16_t shd_rot_max_order, /* i : split-order rotation method */ const float *p_Rmat /* i : rotation matrix */ @@ -1465,8 +1519,8 @@ void ivas_dirac_dec_compute_directional_responses( elevation = hDirAC->elevation[hDirAC->dirac_read_idx]; if ( hDirAC->numSimultaneousDirections == 2 ) { - azimuth2 = hDirAC->azimuth2[direction_idx]; - elevation2 = hDirAC->elevation2[direction_idx]; + azimuth2 = hDirAC->azimuth2[hDirAC->dirac_read_idx]; + elevation2 = hDirAC->elevation2[hDirAC->dirac_read_idx]; } codingBand = -1; @@ -1518,17 +1572,18 @@ void ivas_dirac_dec_compute_directional_responses( hDirAC->synthesisConf == DIRAC_SYNTHESIS_PSD_SHD || hDirAC->synthesisConf == DIRAC_SYNTHESIS_MONO ) { /* Synthesize the first direction */ - spreadCoherencePanningHoa( azimuth[k], elevation[k], hDirAC->spreadCoherence[subframe_idx][k], direct_response_hoa, num_channels_dir, hDirAC->hOutSetup.ambisonics_order ); + spreadCoherencePanningHoa( azimuth[k], elevation[k], hDirAC->spreadCoherence[hDirAC->dirac_read_idx][k], direct_response_hoa, num_channels_dir, hDirAC->hOutSetup.ambisonics_order ); /* Synthesize the second direction and combine the gains */ if ( hDirAC->numSimultaneousDirections == 2 ) { - spreadCoherencePanningHoa( azimuth2[k], elevation2[k], hDirAC->spreadCoherence2[subframe_idx][k], direct_response_dir2, num_channels_dir, hDirAC->hOutSetup.ambisonics_order ); + spreadCoherencePanningHoa( azimuth2[k], elevation2[k], hDirAC->spreadCoherence2[hDirAC->dirac_read_idx][k], direct_response_dir2, num_channels_dir, hDirAC->hOutSetup.ambisonics_order ); /* Combine gains from the two directions */ - totalDirect = hDirAC->energy_ratio1[subframe_idx][k] + hDirAC->energy_ratio2[subframe_idx][k] + EPSILON; - directRatio[0] = hDirAC->energy_ratio1[subframe_idx][k] / totalDirect; - directRatio[1] = hDirAC->energy_ratio2[subframe_idx][k] / totalDirect; + totalDirect = hDirAC->energy_ratio1[hDirAC->dirac_read_idx][k] + hDirAC->energy_ratio2[hDirAC->dirac_read_idx][k] + EPSILON; + directRatio[0] = hDirAC->energy_ratio1[hDirAC->dirac_read_idx][k] / totalDirect; + directRatio[1] = hDirAC->energy_ratio2[hDirAC->dirac_read_idx][k] / totalDirect; + for ( l = 0; l < num_channels_dir; l++ ) { direct_response_hoa[l] *= directRatio[0]; @@ -1576,20 +1631,20 @@ void ivas_dirac_dec_compute_directional_responses( else if ( hDirAC->panningConf == DIRAC_PANNING_VBAP ) /*VBAP*/ { /* Synthesize the first direction */ - spreadCoherencePanningVbap( azimuth[k], elevation[k], hDirAC->spreadCoherence[subframe_idx][k], direct_response_ls, num_channels_dir, hVBAPdata ); + spreadCoherencePanningVbap( azimuth[k], elevation[k], hDirAC->spreadCoherence[hDirAC->dirac_read_idx][k], direct_response_ls, num_channels_dir, hVBAPdata ); normalizePanningGains( direct_response_ls, num_channels_dir ); /* Synthesize the second direction and combine the gains */ if ( hDirAC->numSimultaneousDirections == 2 ) { - spreadCoherencePanningVbap( azimuth2[k], elevation2[k], hDirAC->spreadCoherence2[subframe_idx][k], direct_response_dir2, num_channels_dir, hVBAPdata ); + spreadCoherencePanningVbap( azimuth2[k], elevation2[k], hDirAC->spreadCoherence2[hDirAC->dirac_read_idx][k], direct_response_dir2, num_channels_dir, hVBAPdata ); normalizePanningGains( direct_response_dir2, num_channels_dir ); /* Combine gains from the two directions */ - totalDirect = hDirAC->energy_ratio1[subframe_idx][k] + hDirAC->energy_ratio2[subframe_idx][k] + EPSILON; - directRatio[0] = hDirAC->energy_ratio1[subframe_idx][k] / totalDirect; - directRatio[1] = hDirAC->energy_ratio2[subframe_idx][k] / totalDirect; + totalDirect = hDirAC->energy_ratio1[hDirAC->dirac_read_idx][k] + hDirAC->energy_ratio2[hDirAC->dirac_read_idx][k] + EPSILON; + directRatio[0] = hDirAC->energy_ratio1[hDirAC->dirac_read_idx][k] / totalDirect; + directRatio[1] = hDirAC->energy_ratio2[hDirAC->dirac_read_idx][k] / totalDirect; for ( l = 0; l < num_channels_dir; l++ ) { direct_response_ls[l] *= directRatio[0]; diff --git a/lib_dec/ivas_entropy_decoder.c b/lib_dec/ivas_entropy_decoder.c index cc3fab8656..2f8e9bc3bf 100644 --- a/lib_dec/ivas_entropy_decoder.c +++ b/lib_dec/ivas_entropy_decoder.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #endif #include "ivas_rom_com.h" #include -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------------------------* diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index 566cbfaf30..b040734f98 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,9 +33,9 @@ #include "options.h" #include "ivas_cnst.h" #include "ivas_prot.h" +#include "ivas_prot_rend.h" #include "ivas_rom_com.h" #include "ivas_stat_enc.h" -#include "lib_dec.h" #include "prot.h" #include #include @@ -43,7 +43,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* @@ -51,6 +51,7 @@ *-------------------------------------------------------------------*/ static ivas_error ivas_read_format( Decoder_Struct *st_ivas, int16_t *num_bits_read ); + static ivas_error doSanityChecks_IVAS( Decoder_Struct *st_ivas ); @@ -65,7 +66,7 @@ ivas_error ivas_dec_setup( ) { int16_t k, idx, num_bits_read; - int16_t num_obj, element_mode_flag; + int16_t nchan_ism, element_mode_flag; Decoder_State *st; int32_t ivas_total_brate; ivas_error error; @@ -101,15 +102,20 @@ ivas_error ivas_dec_setup( { /* read the number of objects */ st_ivas->nchan_transport = 1; - num_obj = 1; + nchan_ism = 1; k = (int16_t) ( ( ivas_total_brate / FRAMES_PER_SEC ) - 1 ); - while ( st_ivas->bit_stream[k] && num_obj < MAX_NUM_OBJECTS ) + while ( st_ivas->bit_stream[k] && nchan_ism < MAX_NUM_OBJECTS ) { - num_obj++; + nchan_ism++; k--; } - ivas_ism_dec_config( st_ivas, num_obj ); + st_ivas->nchan_ism = nchan_ism; + + if ( ( error = ivas_ism_dec_config( st_ivas, st_ivas->ism_mode ) ) != IVAS_ERR_OK ) + { + return error; + } } else if ( st_ivas->ivas_format == SBA_FORMAT ) { @@ -125,26 +131,12 @@ ivas_error ivas_dec_setup( st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, st_ivas->sba_order ); num_bits_read += SBA_ORDER_BITS; - if ( st_ivas->ini_frame > 0 && ivas_total_brate != st_ivas->hDecoderConfig->last_ivas_total_brate && ivas_total_brate > IVAS_SID_5k2 ) + if ( st_ivas->ini_frame > 0 && ivas_total_brate != st_ivas->last_active_ivas_total_brate && ivas_total_brate > IVAS_SID_5k2 ) { -#ifdef SBA_BR_SWITCHING - if ( get_sba_reinit_flag( ivas_total_brate, st_ivas->hDecoderConfig->last_ivas_total_brate ) ) + if ( ( error = ivas_sba_dec_reconfigure( st_ivas ) ) != IVAS_ERR_OK ) { - if ( ( error = ivas_sba_dec_reinit( st_ivas ) ) != IVAS_ERR_OK ) - { - return error; - } - } - else - { -#endif - if ( ( error = ivas_sba_dec_reconfigure( st_ivas ) ) != IVAS_ERR_OK ) - { - return error; - } -#ifdef SBA_BR_SWITCHING + return error; } -#endif } else { @@ -236,6 +228,9 @@ ivas_error ivas_dec_setup( case SID_MDCT_STEREO: st_ivas->element_mode_init = IVAS_CPE_MDCT; break; + case SID_ISM: + st_ivas->element_mode_init = IVAS_SCE; + break; case SID_MASA_1TC: st_ivas->element_mode_init = IVAS_SCE; st_ivas->nchan_transport = 1; @@ -258,6 +253,42 @@ ivas_error ivas_dec_setup( st_ivas->element_mode_init = IVAS_CPE_MDCT; break; } + + if ( st_ivas->ini_frame > 0 && st_ivas->ivas_format == SBA_FORMAT ) + { + int16_t nchan_transport_old, nchan_transport; + SBA_MODE sba_mode_old; +#ifndef LBR_SBA + int32_t last_ivas_total_brate; + + last_ivas_total_brate = st_ivas->last_active_ivas_total_brate; + sba_mode_old = ivas_sba_mode_select( last_ivas_total_brate ); +#else + sba_mode_old = ivas_sba_mode_select(); +#endif + nchan_transport_old = st_ivas->nchan_transport; + nchan_transport = ( st_ivas->sid_format == SID_SBA_2TC ) ? 2 : 1; + + if ( ( nchan_transport_old != nchan_transport ) || ( sba_mode_old != st_ivas->sba_mode ) ) + { + /*Setting the default bitrate for the reconfig function*/ + if ( st_ivas->sid_format == SID_SBA_2TC ) + { + st_ivas->hDecoderConfig->ivas_total_brate = IVAS_48k; + } + else + { + st_ivas->hDecoderConfig->ivas_total_brate = ( st_ivas->sba_mode == SBA_MODE_SPAR ) ? IVAS_24k4 : IVAS_13k2; + } + + if ( ( error = ivas_sba_dec_reconfigure( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + st_ivas->last_active_ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; + st_ivas->hDecoderConfig->ivas_total_brate = ivas_total_brate; + } + } } /*-------------------------------------------------------------------* @@ -269,7 +300,7 @@ ivas_error ivas_dec_setup( { if ( ( error = doSanityChecks_IVAS( st_ivas ) ) != IVAS_ERR_OK ) { - return IVAS_ERROR( error, "Sanitiy checks failed" ); + return IVAS_ERROR( error, "Sanity checks failed" ); } if ( ( error = ivas_init_decoder( st_ivas ) ) != IVAS_ERR_OK ) @@ -293,6 +324,7 @@ ivas_error ivas_dec_setup( st->next_bit_pos = num_bits_read; st->total_brate = ACELP_8k00; /* only temporary initialization - this is needed for get_next_indice() in the frame following NO_DATA frame */ } + return error; } @@ -355,8 +387,11 @@ static ivas_error ivas_read_format( else { st_ivas->ivas_format = SBA_FORMAT; - +#ifndef LBR_SBA st_ivas->sba_mode = ivas_sba_mode_select( ivas_total_brate ); +#else + st_ivas->sba_mode = ivas_sba_mode_select(); +#endif } ( *num_bits_read )++; break; @@ -382,7 +417,6 @@ static ivas_error ivas_read_format( break; case SID_ISM: st_ivas->ivas_format = ISM_FORMAT; - ivas_ism_dec_config( st_ivas, 1 ); /* currently DTX supported for 1ISM only */ break; case SID_MULTICHANNEL: st_ivas->ivas_format = MC_FORMAT; @@ -574,6 +608,20 @@ ivas_error ivas_init_decoder_front( { return error; } + if ( ( error = ivas_HRTF_CRend_binary_open( &( st_ivas->hSetOfHRTF ) ) ) != IVAS_ERR_OK ) + { + return error; + } + + if ( ( error = ivas_HRTF_fastconv_binary_open( &st_ivas->hHrtfFastConv ) ) != IVAS_ERR_OK ) + { + return error; + } + + if ( ( error = ivas_HRTF_parambin_binary_open( &st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK ) + { + return error; + } } /*-------------------------------------------------------------------* @@ -591,9 +639,9 @@ ivas_error ivas_init_decoder_front( return error; } - if ( ivas_render_config_init_from_rom( &st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM ) != IVAS_ERR_OK ) + if ( ( error = ivas_render_config_init_from_rom( &st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM ) ) != IVAS_ERR_OK ) { - return IVAS_ERR_INTERNAL_FATAL; + return error; } } @@ -613,9 +661,9 @@ ivas_error ivas_init_decoder( { int16_t i, k, n; int16_t sce_id, cpe_id; - int16_t numCldfbAnalyses; - int16_t numCldfbSyntheses; + int16_t numCldfbAnalyses, numCldfbSyntheses; int32_t output_Fs, ivas_total_brate; + int32_t binauralization_delay_ns; AUDIO_CONFIG output_config; DECODER_CONFIG_HANDLE hDecoderConfig; ivas_error error; @@ -628,6 +676,7 @@ ivas_error ivas_init_decoder( ivas_total_brate = hDecoderConfig->ivas_total_brate; hDecoderConfig->last_ivas_total_brate = ivas_total_brate; + st_ivas->last_active_ivas_total_brate = ivas_total_brate; if ( output_config == AUDIO_CONFIG_EXTERNAL ) { @@ -655,6 +704,7 @@ ivas_error ivas_init_decoder( if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) { ivas_mcmasa_setNumTransportChannels( &( st_ivas->nchan_transport ), &( st_ivas->element_mode_init ), ivas_total_brate ); + ivas_mcmasa_set_separate_channel_mode( &( st_ivas->hOutSetup.separateChannelEnabled ), &( st_ivas->hOutSetup.separateChannelIndex ), ivas_total_brate ); } @@ -662,7 +712,10 @@ ivas_error ivas_init_decoder( if ( output_config == AUDIO_CONFIG_LS_CUSTOM ) { - ivas_ls_custom_output_init( st_ivas ); + if ( ( error = ivas_ls_custom_output_init( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } } ivas_output_init( &( st_ivas->hIntSetup ), st_ivas->intern_config ); @@ -670,6 +723,7 @@ ivas_error ivas_init_decoder( if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) { ivas_mcmasa_set_separate_channel_mode( &( st_ivas->hIntSetup.separateChannelEnabled ), &( st_ivas->hIntSetup.separateChannelIndex ), ivas_total_brate ); + if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_LS_CUSTOM && st_ivas->hOutSetup.separateChannelEnabled ) { st_ivas->hLsSetupCustom->separate_ch_found = 0; @@ -690,7 +744,54 @@ ivas_error ivas_init_decoder( } /*-----------------------------------------------------------------* - * Allocate and initalize SCE/CPE and other handles + * Set head/orientation tracking + *-----------------------------------------------------------------*/ + + if ( st_ivas->hDecoderConfig->Opt_Headrotation ) + { + if ( st_ivas->hDecoderConfig->orientation_tracking == IVAS_ORIENT_TRK_NONE ) + { + if ( ( error = ivas_orient_trk_SetTrackingType( st_ivas->hHeadTrackData->OrientationTracker, OTR_TRACKING_NONE ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else if ( st_ivas->hDecoderConfig->orientation_tracking == IVAS_ORIENT_TRK_AVG ) + { + if ( ( error = ivas_orient_trk_SetTrackingType( st_ivas->hHeadTrackData->OrientationTracker, OTR_TRACKING_AVG_ORIENT ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else if ( st_ivas->hDecoderConfig->orientation_tracking == IVAS_ORIENT_TRK_REF ) + { + if ( ( error = ivas_orient_trk_SetTrackingType( st_ivas->hHeadTrackData->OrientationTracker, OTR_TRACKING_REF_ORIENT ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else if ( st_ivas->hDecoderConfig->orientation_tracking == IVAS_ORIENT_TRK_REF_VEC ) + { + if ( ( error = ivas_orient_trk_SetTrackingType( st_ivas->hHeadTrackData->OrientationTracker, OTR_TRACKING_REF_VEC ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else if ( st_ivas->hDecoderConfig->orientation_tracking == IVAS_ORIENT_TRK_REF_VEC_LEV ) + { + if ( ( error = ivas_orient_trk_SetTrackingType( st_ivas->hHeadTrackData->OrientationTracker, OTR_TRACKING_REF_VEC_LEV ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else + { + return IVAS_ERR_WRONG_MODE; + } + } + + /*-----------------------------------------------------------------* + * Allocate and initialize SCE/CPE and other handles *-----------------------------------------------------------------*/ if ( st_ivas->ivas_format == MONO_FORMAT ) @@ -743,11 +844,13 @@ ivas_error ivas_init_decoder( st_ivas->nSCE = st_ivas->nchan_transport; /* "st_ivas->nchan_transport" is known from ivas_dec_setup */ st_ivas->nCPE = 0; + st_ivas->ism_extmeta_active = -1; + st_ivas->ism_extmeta_cnt = 0; if ( st_ivas->ism_mode == ISM_MODE_PARAM ) { - st_ivas->nchan_transport = 2; - st_ivas->nSCE = 2; + st_ivas->nchan_transport = MAX_PARAM_ISM_WAVE; + st_ivas->nSCE = MAX_PARAM_ISM_WAVE; if ( ( error = ivas_param_ism_dec_open( st_ivas ) ) != IVAS_ERR_OK ) { @@ -755,7 +858,7 @@ ivas_error ivas_init_decoder( } } - if ( ( error = create_ism_metadata_dec( st_ivas, st_ivas->nSCE, element_brate_tmp ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_ism_metadata_dec_create( st_ivas, st_ivas->nSCE, element_brate_tmp ) ) != IVAS_ERR_OK ) { return error; } @@ -768,6 +871,17 @@ ivas_error ivas_init_decoder( } reset_indices_dec( st_ivas->hSCE[sce_id]->hCoreCoder[0] ); + + st_ivas->hSCE[sce_id]->hCoreCoder[0]->is_ism_format = 1; + } + +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + st_ivas->hISMDTX.sce_id_dtx = 0; +#endif + + if ( st_ivas->ism_mode == ISM_MODE_PARAM ) + { + st_ivas->hSCE[1]->hCoreCoder[0]->hFdCngDec->hFdCngCom->seed3 = st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->seed2; } } else if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT ) @@ -789,7 +903,7 @@ ivas_error ivas_init_decoder( { if ( st_ivas->sba_mode == SBA_MODE_SPAR ) { - if ( ( error = ivas_spar_dec_open( st_ivas ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_spar_dec_open( st_ivas, 0 ) ) != IVAS_ERR_OK ) { return error; } @@ -829,37 +943,16 @@ ivas_error ivas_init_decoder( ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( st_ivas->hDecoderConfig->output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ), st_ivas->hSpar->dirac_to_spar_md_bands, st_ivas->hQMetaData->useLowerBandRes, st_ivas->hSpar->enc_param_start_band, 0 ); } + st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); } - else + else /* SBA_MODE_DIRAC */ { if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, st_ivas->sba_mode, -1 ) ) != IVAS_ERR_OK ) { return error; } - st_ivas->sba_dirac_stereo_flag = ( st_ivas->nchan_transport == 1 && output_config == AUDIO_CONFIG_STEREO ); - - if ( ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC ) && st_ivas->hOutSetup.is_loudspeaker_setup ) - { - int16_t ambisonics_order; - - ambisonics_order = ivas_sba_get_order_transport( st_ivas->nchan_transport ); // VE: is it needed ? - - if ( ( error = ivas_sba_get_hoa_dec_matrix( st_ivas->hOutSetup, &st_ivas->hoa_dec_mtx, ambisonics_order ) ) != IVAS_ERR_OK ) - { - return error; - } - } - else if ( ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) && !st_ivas->hIntSetup.is_loudspeaker_setup ) - { - IVAS_OUTPUT_SETUP out_setup; - - ivas_output_init( &out_setup, AUDIO_CONFIG_7_1_4 ); - if ( ( error = ivas_sba_get_hoa_dec_matrix( out_setup, &st_ivas->hoa_dec_mtx, st_ivas->hIntSetup.ambisonics_order ) ) != IVAS_ERR_OK ) - { - return error; - } - } + st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); } } @@ -896,7 +989,7 @@ ivas_error ivas_init_decoder( } /* create CPE element for DFT Stereo like upmix */ - if ( st_ivas->sba_dirac_stereo_flag ) + if ( st_ivas->sba_dirac_stereo_flag && st_ivas->nCPE == 0 ) { if ( ( error = create_cpe_dec( st_ivas, cpe_id, ivas_total_brate / ( st_ivas->nSCE + st_ivas->nCPE ) ) ) != IVAS_ERR_OK ) { @@ -916,24 +1009,7 @@ ivas_error ivas_init_decoder( } /* set CNA/CNG flags */ - if ( st_ivas->sba_mode == SBA_MODE_SPAR && st_ivas->nchan_transport == 1 ) - { - st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag = 0; /* Todo: Check if these can be enabled */ - st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag = 0; - } - else if ( st_ivas->nchan_transport == 1 && ( ( st_ivas->renderer_type == RENDERER_DIRAC && st_ivas->hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) || ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC ) ) ) - { - st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag = 1; - st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag = 1; - } - else if ( st_ivas->nchan_transport == 2 ) - { - for ( n = 0; n < CPE_CHANNELS; n++ ) - { - st_ivas->hCPE[0]->hCoreCoder[n]->cna_dirac_flag = 0; /* Todo: Check if these can be enabled */ - st_ivas->hCPE[0]->hCoreCoder[n]->cng_sba_flag = 1; - } - } + ivas_sba_set_cna_cng_flag( st_ivas ); } else if ( st_ivas->ivas_format == MC_FORMAT ) { @@ -947,6 +1023,7 @@ ivas_error ivas_init_decoder( return error; } } + st_ivas->nchan_transport = ivas_mc_ls_setup_get_num_channels( ivas_mc_map_output_config_to_mc_ls_setup( st_ivas->transport_config ) ); st_ivas->nSCE = 0; st_ivas->nCPE = st_ivas->nchan_transport / 2; @@ -1010,6 +1087,8 @@ ivas_error ivas_init_decoder( } else if ( st_ivas->mc_mode == MC_MODE_MCMASA ) { + int32_t brate_sce, brate_cpe; + ivas_mcmasa_setNumTransportChannels( &( st_ivas->nchan_transport ), &( st_ivas->element_mode_init ), ivas_total_brate ); if ( ( error = ivas_qmetadata_open( &( st_ivas->hQMetaData ) ) ) != IVAS_ERR_OK ) @@ -1022,7 +1101,7 @@ ivas_error ivas_init_decoder( return error; } - st_ivas->sba_dirac_stereo_flag = ( st_ivas->nchan_transport == 1 && output_config == AUDIO_CONFIG_STEREO ); + st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); if ( st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_MCMASA_MONO_STEREO ) { @@ -1046,21 +1125,13 @@ ivas_error ivas_init_decoder( } } + ivas_mcmasa_split_brate( st_ivas->hOutSetup.separateChannelEnabled, ivas_total_brate, st_ivas->nSCE, st_ivas->nCPE, &brate_sce, &brate_cpe ); + for ( sce_id = 0; sce_id < st_ivas->nSCE; sce_id++ ) { - if ( st_ivas->hOutSetup.separateChannelEnabled ) - { - if ( ( error = create_sce_dec( st_ivas, sce_id, ivas_mcmasa_mono_brate( ivas_total_brate ) ) ) != IVAS_ERR_OK ) - { - return error; - } - } - else + if ( ( error = create_sce_dec( st_ivas, sce_id, brate_sce ) ) != IVAS_ERR_OK ) { - if ( ( error = create_sce_dec( st_ivas, sce_id, ivas_total_brate / ( st_ivas->nSCE + st_ivas->nCPE ) ) ) != IVAS_ERR_OK ) - { - return error; - } + return error; } reset_indices_dec( st_ivas->hSCE[sce_id]->hCoreCoder[0] ); @@ -1068,23 +1139,11 @@ ivas_error ivas_init_decoder( for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) { - if ( st_ivas->hOutSetup.separateChannelEnabled ) - { - st_ivas->element_mode_init = IVAS_CPE_MDCT; + st_ivas->element_mode_init = IVAS_CPE_MDCT; /* element_mode_init was IVAS_SCE for SCE initialization */ - if ( ( error = create_cpe_dec( st_ivas, cpe_id, ivas_total_brate - st_ivas->hSCE[0]->element_brate ) ) != IVAS_ERR_OK ) - { - return error; - } - } - else + if ( ( error = create_cpe_dec( st_ivas, cpe_id, brate_cpe ) ) != IVAS_ERR_OK ) { - st_ivas->element_mode_init = IVAS_CPE_MDCT; - - if ( ( error = create_cpe_dec( st_ivas, cpe_id, ivas_total_brate / ( st_ivas->nSCE + st_ivas->nCPE ) ) ) != IVAS_ERR_OK ) - { - return error; - } + return error; } for ( n = 0; n < CPE_CHANNELS; n++ ) @@ -1130,7 +1189,7 @@ ivas_error ivas_init_decoder( if ( n > 0 ) { - if ( ( st_ivas->mem_hp20_out = (float **) count_malloc( n * sizeof( float * ) ) ) == NULL ) + if ( ( st_ivas->mem_hp20_out = (float **) malloc( n * sizeof( float * ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HP20 filter memory\n" ) ); } @@ -1142,7 +1201,7 @@ ivas_error ivas_init_decoder( for ( i = 0; i < n; i++ ) { - if ( ( st_ivas->mem_hp20_out[i] = (float *) count_malloc( L_HP20_MEM * sizeof( float ) ) ) == NULL ) + if ( ( st_ivas->mem_hp20_out[i] = (float *) malloc( L_HP20_MEM * sizeof( float ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HP20 filter memory\n" ) ); } @@ -1174,24 +1233,36 @@ ivas_error ivas_init_decoder( if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB ) { #ifdef FIX_SPLIT_REND_OPEN_ERROR_HANDLING - error = ivas_split_renderer_open( &st_ivas->splitBinRend.splitrend, - &st_ivas->hRenderConfig->split_rend_config, - hDecoderConfig->output_Fs, 1, 0 ); - if(error != IVAS_ERR_OK) + error = +#endif + ivas_split_renderer_open( &st_ivas->splitBinRend.splitrend, + &st_ivas->hRenderConfig->split_rend_config, + hDecoderConfig->output_Fs, +#ifdef SPLIT_REND_LC3PLUS + 0, +#endif + 1, 0 ); + +#ifdef FIX_SPLIT_REND_OPEN_ERROR_HANDLING + if ( error != IVAS_ERR_OK ) { return error; } -#else - ivas_split_renderer_open( &st_ivas->splitBinRend.splitrend, - &st_ivas->hRenderConfig->split_rend_config, - hDecoderConfig->output_Fs, 1, 0 ); #endif } #endif } else if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC ) { - if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas ) ) != IVAS_ERR_OK ) + if ( st_ivas->renderer_type != RENDERER_STEREO_PARAMETRIC ) + { + if ( ( error = ivas_dirac_dec_binaural_copy_hrtfs( &st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas, st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK ) { return error; } @@ -1205,9 +1276,9 @@ ivas_error ivas_init_decoder( if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on ) { - if ( ( st_ivas->hCrend = (CREND_HANDLE) count_malloc( sizeof( CREND_DATA ) ) ) == NULL ) + if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hDecoderConfig->output_config, NULL, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK ) { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR Crend\n" ); + return error; } } @@ -1233,18 +1304,17 @@ ivas_error ivas_init_decoder( } #endif #ifdef FIX_SPLIT_REND_OPEN_ERROR_HANDLING - error = ivas_split_renderer_open( &st_ivas->splitBinRend.splitrend, - &st_ivas->hRenderConfig->split_rend_config, - hDecoderConfig->output_Fs, 0, 0 ); - if(error != IVAS_ERR_OK) + error = +#endif + ivas_split_renderer_open( &st_ivas->splitBinRend.splitrend, + &st_ivas->hRenderConfig->split_rend_config, + hDecoderConfig->output_Fs, 1, 0, 0 ); + +#ifdef FIX_SPLIT_REND_OPEN_ERROR_HANDLING + if ( error != IVAS_ERR_OK ) { return error; } -#else - ivas_split_renderer_open( &st_ivas->splitBinRend.splitrend, - &st_ivas->hRenderConfig->split_rend_config, - hDecoderConfig->output_Fs, 0, 0 ); - #endif } #endif @@ -1265,10 +1335,26 @@ ivas_error ivas_init_decoder( } else if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) { - if ( ivas_crend_open( st_ivas ) != IVAS_ERR_OK ) + if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM && st_ivas->ivas_format == MC_FORMAT && st_ivas->hDecoderConfig->Opt_Headrotation ) + { + if ( ( error = efap_init_data( &( st_ivas->hEFAPdata ), st_ivas->hIntSetup.ls_azimuth, st_ivas->hIntSetup.ls_elevation, st_ivas->hIntSetup.nchan_out_woLFE, EFAP_MODE_EFAP ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hDecoderConfig->output_config, + st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hDecoderConfig->output_Fs +#ifdef SPLIT_REND_WITH_HEAD_ROT + , + 1 +#endif + ) ) != IVAS_ERR_OK ) { - return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "ivas_crend_open failed" ); + return error; } + + st_ivas->binaural_latency_ns = st_ivas->hCrendWrapper->binaural_latency_ns; } if ( st_ivas->ivas_format == ISM_FORMAT && @@ -1291,17 +1377,24 @@ ivas_error ivas_init_decoder( if ( st_ivas->mc_mode == MC_MODE_MCT ) { - if ( ( error = ivas_create_lfe_dec( &st_ivas->hLFE, output_Fs, st_ivas->hHrtf != NULL ? st_ivas->hHrtf->latency_s : 0 ) ) != IVAS_ERR_OK ) + binauralization_delay_ns = st_ivas->binaural_latency_ns; + if ( st_ivas->hBinRenderer != NULL ) { - return error; + if ( st_ivas->hBinRenderer->render_lfe ) + { + /* Account for filterbank delay */ + binauralization_delay_ns += IVAS_FB_DEC_DELAY_NS; + } + else + { + binauralization_delay_ns = 0; + } } - /* reuse core-coder buffers for LFE decoder */ - cpe_id = LFE_CHANNEL / CPE_CHANNELS; - n = LFE_CHANNEL % CPE_CHANNELS; - - st_ivas->hLFE->prevsynth_buf = &st_ivas->hCPE[cpe_id]->hCoreCoder[n]->old_synth_sw[0]; - st_ivas->hLFE->prior_out_buffer = &st_ivas->hCPE[cpe_id]->hCoreCoder[n]->previoussynth[0]; + if ( ( error = ivas_create_lfe_dec( &st_ivas->hLFE, output_Fs, binauralization_delay_ns ) ) != IVAS_ERR_OK ) + { + return error; + } set_zero( st_ivas->hLFE->prevsynth_buf, LFE_PLC_BUFLEN ); set_zero( st_ivas->hLFE->prior_out_buffer, L_FRAME48k ); @@ -1338,7 +1431,7 @@ ivas_error ivas_init_decoder( } /* CLDFB Interpolation weights */ - if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR ) + if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR && !st_ivas->sba_dirac_stereo_flag && st_ivas->hDecoderConfig->nchan_out != 1 ) { ivas_spar_get_cldfb_gains( st_ivas->hSpar, st_ivas->cldfbAnaDec[0], st_ivas->cldfbSynDec[0], hDecoderConfig ); } @@ -1347,8 +1440,10 @@ ivas_error ivas_init_decoder( * Allocate and initialize limiter struct *-----------------------------------------------------------------*/ - st_ivas->hLimiter = ivas_limiter_open( hDecoderConfig->nchan_out, output_Fs ); - + if ( ( st_ivas->hLimiter = ivas_limiter_open( hDecoderConfig->nchan_out, output_Fs ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Failed to open limiter handle" ); + } return error; } @@ -1364,131 +1459,131 @@ void destroy_core_dec( DEC_CORE_HANDLE hCoreCoder /* i/o: core decoder structure */ ) { - destroy_decoder( hCoreCoder ); + destroy_cldfb_decoder( hCoreCoder ); if ( hCoreCoder->hGSCDec != NULL ) { - count_free( hCoreCoder->hGSCDec ); + free( hCoreCoder->hGSCDec ); hCoreCoder->hGSCDec = NULL; } if ( hCoreCoder->hPFstat != NULL ) { - count_free( hCoreCoder->hPFstat ); + free( hCoreCoder->hPFstat ); hCoreCoder->hPFstat = NULL; } if ( hCoreCoder->hMusicPF != NULL ) { - count_free( hCoreCoder->hMusicPF ); + free( hCoreCoder->hMusicPF ); hCoreCoder->hMusicPF = NULL; } if ( hCoreCoder->hBPF != NULL ) { - count_free( hCoreCoder->hBPF ); + free( hCoreCoder->hBPF ); hCoreCoder->hBPF = NULL; } if ( hCoreCoder->hBWE_zero != NULL ) { - count_free( hCoreCoder->hBWE_zero ); + free( hCoreCoder->hBWE_zero ); hCoreCoder->hBWE_zero = NULL; } if ( hCoreCoder->hTdCngDec != NULL ) { - count_free( hCoreCoder->hTdCngDec ); + free( hCoreCoder->hTdCngDec ); hCoreCoder->hTdCngDec = NULL; } if ( hCoreCoder->hSC_VBR != NULL ) { - count_free( hCoreCoder->hSC_VBR ); + free( hCoreCoder->hSC_VBR ); hCoreCoder->hSC_VBR = NULL; } if ( hCoreCoder->hAmrwb_IO != NULL ) { - count_free( hCoreCoder->hAmrwb_IO ); + free( hCoreCoder->hAmrwb_IO ); hCoreCoder->hAmrwb_IO = NULL; } if ( hCoreCoder->hBWE_TD != NULL ) { - count_free( hCoreCoder->hBWE_TD ); + free( hCoreCoder->hBWE_TD ); hCoreCoder->hBWE_TD = NULL; } if ( hCoreCoder->hBWE_FD != NULL ) { - count_free( hCoreCoder->hBWE_FD ); + free( hCoreCoder->hBWE_FD ); hCoreCoder->hBWE_FD = NULL; } if ( hCoreCoder->hBWE_FD_HR != NULL ) { - count_free( hCoreCoder->hBWE_FD_HR ); + free( hCoreCoder->hBWE_FD_HR ); hCoreCoder->hBWE_FD_HR = NULL; } if ( hCoreCoder->hWIDec != NULL ) { - count_free( hCoreCoder->hWIDec ); + free( hCoreCoder->hWIDec ); hCoreCoder->hWIDec = NULL; } if ( hCoreCoder->hTECDec != NULL ) { - count_free( hCoreCoder->hTECDec ); + free( hCoreCoder->hTECDec ); hCoreCoder->hTECDec = NULL; } if ( hCoreCoder->hTcxLtpDec != NULL ) { - count_free( hCoreCoder->hTcxLtpDec ); + free( hCoreCoder->hTcxLtpDec ); hCoreCoder->hTcxLtpDec = NULL; } if ( hCoreCoder->hTcxDec != NULL ) { - count_free( hCoreCoder->hTcxDec ); + free( hCoreCoder->hTcxDec ); hCoreCoder->hTcxDec = NULL; } - if ( hCoreCoder->hTcxCfg != NULL && hCoreCoder->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( hCoreCoder->hTcxCfg != NULL ) { - count_free( hCoreCoder->hTcxCfg ); + free( hCoreCoder->hTcxCfg ); hCoreCoder->hTcxCfg = NULL; } if ( hCoreCoder->hTonalMDCTConc != NULL ) { - count_free( hCoreCoder->hTonalMDCTConc ); + free( hCoreCoder->hTonalMDCTConc ); hCoreCoder->hTonalMDCTConc = NULL; } if ( hCoreCoder->hIGFDec != NULL ) { - count_free( hCoreCoder->hIGFDec ); + free( hCoreCoder->hIGFDec ); hCoreCoder->hIGFDec = NULL; } if ( hCoreCoder->hPlcInfo != NULL ) { - count_free( hCoreCoder->hPlcInfo ); + free( hCoreCoder->hPlcInfo ); hCoreCoder->hPlcInfo = NULL; } if ( hCoreCoder->hHQ_core != NULL ) { - count_free( hCoreCoder->hHQ_core ); + free( hCoreCoder->hHQ_core ); hCoreCoder->hHQ_core = NULL; } if ( hCoreCoder->hHQ_nbfec != NULL ) { - count_free( hCoreCoder->hHQ_nbfec ); + free( hCoreCoder->hHQ_nbfec ); hCoreCoder->hHQ_nbfec = NULL; } @@ -1563,8 +1658,11 @@ void ivas_initialize_handles_dec( st_ivas->hIsmRendererData = NULL; st_ivas->hBinRendererTd = NULL; st_ivas->hMonoDmxRenderer = NULL; - st_ivas->hCrend = NULL; - st_ivas->hHrtf = NULL; + st_ivas->hCrendWrapper = NULL; + st_ivas->hReverb = NULL; + st_ivas->hSetOfHRTF = NULL; + st_ivas->hHrtfFastConv = NULL; + st_ivas->hHrtfParambin = NULL; st_ivas->hoa_dec_mtx = NULL; st_ivas->hHeadTrackData = NULL; @@ -1586,7 +1684,7 @@ void ivas_destroy_dec( Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */ ) { - int16_t i, n; + int16_t i; /* CLDFB handles */ for ( i = 0; i < MAX_INTERN_CHANNELS; i++ ) @@ -1594,7 +1692,6 @@ void ivas_destroy_dec( if ( st_ivas->cldfbAnaDec[i] != NULL ) { deleteCldfb( &( st_ivas->cldfbAnaDec[i] ) ); - st_ivas->cldfbAnaDec[i] = NULL; } } @@ -1603,7 +1700,6 @@ void ivas_destroy_dec( if ( st_ivas->cldfbSynDec[i] != NULL ) { deleteCldfb( &( st_ivas->cldfbSynDec[i] ) ); - st_ivas->cldfbSynDec[i] = NULL; } } @@ -1623,7 +1719,7 @@ void ivas_destroy_dec( if ( st_ivas->hCPE[i] != NULL ) { /* set pointer to NULL as core coder already deallocated in destroy_sce_dec() */ - if ( st_ivas->sba_dirac_stereo_flag ) + if ( st_ivas->sba_dirac_stereo_flag && st_ivas->nchan_transport == 1 ) { st_ivas->hCPE[i]->hCoreCoder[0] = NULL; st_ivas->hCPE[i]->hCoreCoder[1] = NULL; @@ -1633,76 +1729,60 @@ void ivas_destroy_dec( } } - /* LFE handle */ - if ( st_ivas->hLFE != NULL ) - { - ivas_lfe_dec_close( st_ivas->hLFE ); - st_ivas->hLFE = NULL; - } - /* HP20 filter handles */ if ( st_ivas->mem_hp20_out != NULL ) { for ( i = 0; i < getNumChanSynthesis( st_ivas ); i++ ) { - count_free( st_ivas->mem_hp20_out[i] ); + free( st_ivas->mem_hp20_out[i] ); st_ivas->mem_hp20_out[i] = NULL; } - count_free( st_ivas->mem_hp20_out ); + free( st_ivas->mem_hp20_out ); st_ivas->mem_hp20_out = NULL; } /* ISM metadata handles */ - for ( n = 0; n < MAX_NUM_OBJECTS; n++ ) - { - if ( st_ivas->hIsmMetaData[n] != NULL ) - { - count_free( st_ivas->hIsmMetaData[n] ); - st_ivas->hIsmMetaData[n] = NULL; - } - } + ivas_ism_metadata_close( st_ivas->hIsmMetaData ); - /* ISm renderer handle */ + /* ISM renderer handle */ if ( st_ivas->hIsmRendererData != NULL ) { - count_free( st_ivas->hIsmRendererData ); + free( st_ivas->hIsmRendererData ); st_ivas->hIsmRendererData = NULL; } /* DirAC handle */ - if ( st_ivas->hDirAC != NULL ) + if ( st_ivas->ivas_format == ISM_FORMAT ) { - if ( st_ivas->ivas_format == ISM_FORMAT ) - { - ivas_param_ism_dec_close( st_ivas->hDirAC, st_ivas->hDecoderConfig->output_config ); - } - else - { - ivas_dirac_dec_close( st_ivas->hDirAC ); - } - st_ivas->hDirAC = NULL; + ivas_param_ism_dec_close( &( st_ivas->hDirAC ), st_ivas->hDecoderConfig->output_config ); } - - /* Spar handle */ - if ( st_ivas->hSpar != NULL ) + else { - ivas_spar_dec_close( st_ivas->hSpar, st_ivas->hDecoderConfig->output_Fs ); - st_ivas->hSpar = NULL; + ivas_dirac_dec_close( &( st_ivas->hDirAC ) ); } + /* SPAR handle */ + ivas_spar_dec_close( &( st_ivas->hSpar ), st_ivas->hDecoderConfig->output_Fs, 0 ); + /* HOA decoder matrix */ if ( st_ivas->hoa_dec_mtx != NULL ) { - count_free( st_ivas->hoa_dec_mtx ); + free( st_ivas->hoa_dec_mtx ); st_ivas->hoa_dec_mtx = NULL; } + /* MASA decoder structure */ + ivas_masa_dec_close( &( st_ivas->hMasa ) ); + /* Qmetadata handle */ ivas_qmetadata_close( &st_ivas->hQMetaData ); /* MCT handle */ ivas_mct_dec_close( &st_ivas->hMCT ); + /* LFE handle */ + ivas_lfe_dec_close( &( st_ivas->hLFE ) ); + /* Parametric MC handle */ ivas_param_mc_dec_close( &st_ivas->hParamMC ); @@ -1726,7 +1806,15 @@ void ivas_destroy_dec( ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin ); /* Crend handle */ - ivas_crend_close( st_ivas ); + ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) +#ifdef SPLIT_REND_WITH_HEAD_ROT + , + 1 +#endif + ); + + /* Reverb handle */ + ivas_reverb_close( &st_ivas->hReverb ); /* LS config converter handle */ ivas_ls_setup_conversion_close( &st_ivas->hLsSetUpConversion ); @@ -1734,30 +1822,19 @@ void ivas_destroy_dec( /* Custom LS configuration handle */ if ( st_ivas->hLsSetupCustom != NULL ) { - count_free( st_ivas->hLsSetupCustom ); + free( st_ivas->hLsSetupCustom ); st_ivas->hLsSetupCustom = NULL; } - /* MASA decoder structure */ - if ( st_ivas->hMasa != NULL ) - { - ivas_masa_dec_close( st_ivas->hMasa ); - st_ivas->hMasa = NULL; - } - /* Downmix structure */ if ( st_ivas->hMonoDmxRenderer != NULL ) { - count_free( st_ivas->hMonoDmxRenderer ); + free( st_ivas->hMonoDmxRenderer ); st_ivas->hMonoDmxRenderer = NULL; } /* Head track data handle */ - if ( st_ivas->hHeadTrackData != NULL ) - { - count_free( st_ivas->hHeadTrackData ); - st_ivas->hHeadTrackData = NULL; - } + ivas_headTrack_close( &st_ivas->hHeadTrackData ); /* Time Domain binaural renderer handle */ if ( st_ivas->hBinRendererTd != NULL ) @@ -1766,17 +1843,20 @@ void ivas_destroy_dec( } else if ( st_ivas->hHrtfTD != NULL ) { - /* Case when HRTF filter is mistakenly specified but TD renderer was not active */ - if ( st_ivas->hHrtfTD->ModelParams.UseItdModel && !st_ivas->hHrtfTD->ModelParams.modelROM ) - { - BSplineModelEvalITDDealloc( &st_ivas->hHrtfTD->ModelParamsITD ); - } - BSplineModelEvalDealloc( &st_ivas->hHrtfTD->ModelParams, &st_ivas->hHrtfTD->ModelEval ); ivas_HRTF_binary_close( &st_ivas->hHrtfTD ); } + /* CRend binaural renderer handle */ + ivas_HRTF_CRend_binary_close( &st_ivas->hSetOfHRTF ); + + /* Fastconv HRTF filters */ + ivas_HRTF_fastconv_binary_close( &st_ivas->hHrtfFastConv ); + + /* Parametric binauralizer HRTF filters */ + ivas_HRTF_parambin_binary_close( &st_ivas->hHrtfParambin ); + /* Config. Renderer */ ivas_render_config_close( &( st_ivas->hRenderConfig ) ); @@ -1785,19 +1865,19 @@ void ivas_destroy_dec( if ( st_ivas->hDecoderConfig != NULL ) { - count_free( st_ivas->hDecoderConfig ); + free( st_ivas->hDecoderConfig ); st_ivas->hDecoderConfig = NULL; } /* main IVAS handle */ - count_free( st_ivas ); + free( st_ivas ); return; } /*-------------------------------------------------------------------* - * ivas_init_dec_get_num_cldfb_analyses() + * ivas_init_dec_get_num_cldfb_instances() * * Return number of CLDFB analysis & synthesis instances *-------------------------------------------------------------------*/ @@ -1901,19 +1981,27 @@ void ivas_init_dec_get_num_cldfb_instances( case RENDERER_BINAURAL_FASTCONV_ROOM: if ( st_ivas->sba_mode == SBA_MODE_SPAR ) { - *numCldfbAnalyses = st_ivas->hSpar->hFbMixer->fb_cfg->num_in_chans; - - if ( st_ivas->hOutSetup.is_loudspeaker_setup && st_ivas->renderer_type == RENDERER_DIRAC ) - { - *numCldfbSyntheses = st_ivas->hOutSetup.nchan_out_woLFE; - } - else if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_FOA ) + if ( st_ivas->sba_dirac_stereo_flag ) { - *numCldfbSyntheses = st_ivas->hSpar->hFbMixer->fb_cfg->num_out_chans; + *numCldfbAnalyses = 0; + *numCldfbSyntheses = 0; } else { - *numCldfbSyntheses = MAX_OUTPUT_CHANNELS; + *numCldfbAnalyses = st_ivas->hSpar->hFbMixer->fb_cfg->num_in_chans; + + if ( st_ivas->hOutSetup.is_loudspeaker_setup && st_ivas->renderer_type == RENDERER_DIRAC ) + { + *numCldfbSyntheses = st_ivas->hOutSetup.nchan_out_woLFE; + } + else if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_FOA ) + { + *numCldfbSyntheses = st_ivas->hSpar->hFbMixer->fb_cfg->num_out_chans; + } + else + { + *numCldfbSyntheses = MAX_OUTPUT_CHANNELS; + } } } else if ( st_ivas->mc_mode == MC_MODE_PARAMMC ) @@ -1998,7 +2086,7 @@ static ivas_error doSanityChecks_IVAS( /* Verify ISM output configuration */ if ( output_config == AUDIO_CONFIG_INVALID ) { - return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration specified for ISm" ); + return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration specified for ISM" ); } } else if ( st_ivas->ivas_format == SBA_FORMAT ) @@ -2039,35 +2127,11 @@ static ivas_error doSanityChecks_IVAS( } #ifdef DEBUGGING - if ( st_ivas->hDecoderConfig->forceSubframeBinauralization ) - { - /* Note about resolution of Binaural Renderers: * - * - Parametric Binaural Renderer: 20 ms by default, can be forced to subframe (5 ms) resolution * - * - FastConv Binaural Renderer: 5 ms by default * - * - TD objects Binaural Renderer: 20 ms by default */ - - if ( !( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM -#ifdef SPLIT_REND_WITH_HEAD_ROT - || output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB -#endif - ) || - !( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MC_FORMAT || st_ivas->ivas_format == ISM_FORMAT ) ) - { - return IVAS_ERROR( IVAS_ERR_WRONG_PARAMS, "Wrong set-up: Forced subframe resolution parametric binauralization activated for non-binaural output." ); - } - } -#endif - -#ifdef DEBUGGING - if ( ( st_ivas->hDecoderConfig->Opt_HRTF_binary || st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) && ( ( st_ivas->ivas_format != MC_FORMAT && st_ivas->ivas_format != ISM_FORMAT ) || output_config != AUDIO_CONFIG_BINAURAL || ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_PARAM ) || ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode != MC_MODE_MCT ) ) ) -#else - if ( st_ivas->hDecoderConfig->Opt_HRTF_binary && ( ( st_ivas->ivas_format != MC_FORMAT && st_ivas->ivas_format != ISM_FORMAT ) || output_config != AUDIO_CONFIG_BINAURAL || ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_PARAM ) ) ) -#endif + if ( ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) && ( ( st_ivas->ivas_format != MC_FORMAT && st_ivas->ivas_format != ISM_FORMAT ) || output_config != AUDIO_CONFIG_BINAURAL || ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_PARAM ) || ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode != MC_MODE_MCT ) ) ) { return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration: Time Domain object renderer not supported in this configuration" ); } -#ifdef DEBUGGING if ( ( st_ivas->hHrtfTD != NULL && st_ivas->hDecoderConfig->force_rend == FORCE_CLDFB_RENDERER ) ) { return IVAS_ERROR( IVAS_ERR_INVALID_FORCE_MODE, "Incorrect debug configuration: Cannot force CLDFB renderer in combination with TD renderer HRTF file" ); diff --git a/lib_dec/ivas_ism_dec.c b/lib_dec/ivas_ism_dec.c new file mode 100644 index 0000000000..ff305b434c --- /dev/null +++ b/lib_dec/ivas_ism_dec.c @@ -0,0 +1,361 @@ +/****************************************************************************************************** + + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository. All Rights Reserved. + + This software is protected by copyright law and by international treaties. + The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository retain full ownership rights in their respective contributions in + the software. This notice grants no license of any kind, including but not limited to patent + license, nor is any license granted by implication, estoppel or otherwise. + + Contributors are required to enter into the IVAS codec Public Collaboration agreement before making + contributions. + + This software is provided "AS IS", without any express or implied warranties. The software is in the + development stage. It is intended exclusively for experts who have experience with such software and + solely for the purpose of inspection. All implied warranties of non-infringement, merchantability + and fitness for a particular purpose are hereby disclaimed and excluded. + + Any dispute, controversy or claim arising under or in relation to providing this software shall be + submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in + accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and + the United Nations Convention on Contracts on the International Sales of Goods. + +*******************************************************************************************************/ + +#include +#include "options.h" +#include "ivas_prot.h" +#include "ivas_prot_rend.h" +#ifdef DEBUGGING +#include "debug.h" +#endif +#include "wmc_auto.h" + + +/*-------------------------------------------------------------------------* + * ivas_ism_bitrate_switching() + * + * + *-------------------------------------------------------------------------*/ + +static ivas_error ivas_ism_bitrate_switching( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + const int16_t nchan_transport_old, /* i : last number of transport channels */ + const ISM_MODE last_ism_mode /* i : last ISM mode */ +) +{ + ivas_error error; + int32_t element_brate_tmp[MAX_NUM_OBJECTS]; + int16_t nSCE_old, nCPE_old; +#ifdef FIX_416_ISM_BR_SWITCHING + int16_t numCldfbAnalyses_old, numCldfbSyntheses_old, ism_mode; +#endif + + error = IVAS_ERR_OK; + + nCPE_old = st_ivas->nCPE; + nSCE_old = st_ivas->nSCE; + +#ifdef FIX_416_ISM_BR_SWITCHING + /* we have to temporarily set the ism mode back to the old one, otherwise this can give wrong results*/ + ism_mode = st_ivas->ism_mode; + st_ivas->ism_mode = last_ism_mode; + ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old ); + st_ivas->ism_mode = ism_mode; +#endif + + if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->nchan_ism, NULL, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK ) + { + return error; + } + + st_ivas->nSCE = st_ivas->nchan_transport; + + /*-----------------------------------------------------------------* + * Allocate, initialize, and configure SCE/CPE/MCT handles + *-----------------------------------------------------------------*/ + + if ( ( error = ivas_corecoder_dec_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old, 0, st_ivas->hDecoderConfig->ivas_total_brate / st_ivas->nchan_transport, ( st_ivas->hDecoderConfig->ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS ) ) != IVAS_ERR_OK ) + { + return error; + } + + /*-----------------------------------------------------------------* + * HP20 memories + *-----------------------------------------------------------------*/ + + if ( ( error = ivas_hp20_dec_reconfig( st_ivas, nchan_transport_old ) ) != IVAS_ERR_OK ) + { + return error; + } + + /*-----------------------------------------------------------------* + * Initialize the needed renderer struct and destroy the unnecessary renderer struct + *-----------------------------------------------------------------*/ + + /* select the renderer */ + ivas_renderer_select( st_ivas ); + ivas_output_init( &( st_ivas->hIntSetup ), st_ivas->intern_config ); + if ( ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) && ( st_ivas->ism_mode == ISM_MODE_DISC ) ) + { + ivas_output_init( &( st_ivas->hIntSetup ), st_ivas->hDecoderConfig->output_config ); + } + + if ( st_ivas->ism_mode != last_ism_mode ) + { + /* EFAP handle */ + efap_free_data( &st_ivas->hEFAPdata ); + } + + /*-----------------------------------------------------------------* + * Switching between ParamISM and DiscISM + *-----------------------------------------------------------------*/ + + /* switching from ParamISM to DiscISM */ + if ( st_ivas->ism_mode == ISM_MODE_DISC && last_ism_mode == ISM_MODE_PARAM ) + { + /* Deallocate the ParamISM struct */ + ivas_param_ism_dec_close( &( st_ivas->hDirAC ), st_ivas->hDecoderConfig->output_config ); + + if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL ) + { + /* close the parametric binaural renderer */ + ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin ); + + /* Open the TD Binaural renderer */ + if ( ( error = ivas_td_binaural_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else + { + /* close the ISM renderer and reinitialize */ + if ( st_ivas->hIsmRendererData != NULL ) + { + free( st_ivas->hIsmRendererData ); + st_ivas->hIsmRendererData = NULL; + } + + if ( ( error = ivas_ism_renderer_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM ) + { + /* close the parametric binaural renderer */ + ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin ); + + /* Open Crend Binaural renderer */ + if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), + st_ivas->intern_config, + st_ivas->hOutSetup.output_config, + st_ivas->hRenderConfig, + st_ivas->hSetOfHRTF, + st_ivas->hDecoderConfig->output_Fs +#ifdef SPLIT_REND_WITH_HEAD_ROT + , + 1 +#endif + ) ) != IVAS_ERR_OK ) + { + return error; + } + + st_ivas->binaural_latency_ns = st_ivas->hCrendWrapper->binaural_latency_ns; + } + } + + /* switching from Discrete ISM to ParamISM */ + if ( st_ivas->ism_mode == ISM_MODE_PARAM && last_ism_mode == ISM_MODE_DISC ) + { + /* Allocate and initialize the ParamISM struct */ + if ( ( error = ivas_param_ism_dec_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + + if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL ) + { + /* open the parametric binaural renderer */ + if ( ( error = ivas_dirac_dec_binaural_copy_hrtfs( &st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK ) + { + return error; + } + + if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas, st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK ) + { + return error; + } + + /* Close the TD Binaural renderer */ + if ( st_ivas->hBinRendererTd != NULL ) + { + ivas_td_binaural_close( &st_ivas->hBinRendererTd ); + } + + if ( st_ivas->hHrtfTD != NULL ) + { + st_ivas->hHrtfTD = NULL; + } + } + else + { + /* Close the ISM renderer */ + if ( st_ivas->hIsmRendererData != NULL ) + { + free( st_ivas->hIsmRendererData ); + st_ivas->hIsmRendererData = NULL; + } + } + + if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM ) + { + /* open the parametric binaural renderer */ + if ( ( error = ivas_dirac_dec_binaural_copy_hrtfs( &st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK ) + { + return error; + } + + if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas, st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK ) + { + return error; + } + + /* close the crend binaural renderer */ + ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) +#ifdef SPLIT_REND_WITH_HEAD_ROT + , + 1 +#endif + ); + } + } + +#ifdef FIX_416_ISM_BR_SWITCHING + /*-----------------------------------------------------------------* + * CLDFB instances + *-----------------------------------------------------------------*/ + + if ( ( error = ivas_cldfb_dec_reconfig( st_ivas, nchan_transport_old, numCldfbAnalyses_old, numCldfbSyntheses_old ) ) != IVAS_ERR_OK ) + { + return error; + } +#endif + + return error; +} + + +/*------------------------------------------------------------------------- + * ivas_ism_dec_config() + * + * - select ISM format mode + * - reconfigure the ISM format decoder + *-------------------------------------------------------------------------*/ + +ivas_error ivas_ism_dec_config( + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ + , + const ISM_MODE last_ism_mode /* i/o: last ISM mode */ +) +{ + int32_t ivas_total_brate; + ivas_error error; + int16_t nchan_transport_old; + + error = IVAS_ERR_OK; + + ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; + + + /* Assumes that num of input objects are constant */ + nchan_transport_old = st_ivas->nchan_ism; + + if ( last_ism_mode == ISM_MODE_PARAM ) + { + nchan_transport_old = MAX_PARAM_ISM_WAVE; + } + + if ( !st_ivas->bfi && ivas_total_brate != IVAS_SID_5k2 && ivas_total_brate != FRAME_NO_DATA ) + { + /* select ISM format mode */ + st_ivas->ism_mode = ivas_ism_mode_select( st_ivas->nchan_ism, ivas_total_brate ); + + st_ivas->nchan_transport = st_ivas->nchan_ism; + if ( st_ivas->ism_mode == ISM_MODE_PARAM ) + { + st_ivas->nchan_transport = MAX_PARAM_ISM_WAVE; + if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) + { + st_ivas->hDecoderConfig->nchan_out = st_ivas->nchan_ism; + } + } + + if ( st_ivas->ini_active_frame != 0 ) + { + /* ISM bit-rate switching */ + { + if ( ( st_ivas->ism_mode != last_ism_mode ) || ( st_ivas->hDecoderConfig->ivas_total_brate != st_ivas->hDecoderConfig->last_ivas_total_brate ) ) + { + if ( ( error = ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode ) ) != IVAS_ERR_OK ) + { + return error; + } + } + } + } + } + else if ( !st_ivas->bfi && ivas_total_brate == IVAS_SID_5k2 ) + { + st_ivas->nchan_transport = st_ivas->nchan_ism; + if ( st_ivas->ism_mode == ISM_MODE_PARAM ) + { + st_ivas->nchan_transport = MAX_PARAM_ISM_WAVE; + if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) + { + st_ivas->hDecoderConfig->nchan_out = st_ivas->nchan_ism; + } + } + + /* ISM mode switching */ + if ( st_ivas->ism_mode != last_ism_mode ) + { + if ( ( error = ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode ) ) != IVAS_ERR_OK ) + { + return error; + } + } + } + + switch ( st_ivas->nchan_ism ) + { + case 1: + st_ivas->transport_config = AUDIO_CONFIG_ISM1; + break; + case 2: + st_ivas->transport_config = AUDIO_CONFIG_ISM2; + break; + case 3: + st_ivas->transport_config = AUDIO_CONFIG_ISM3; + break; + case 4: + st_ivas->transport_config = AUDIO_CONFIG_ISM4; + break; + default: + st_ivas->transport_config = AUDIO_CONFIG_INVALID; + break; + } + + return error; +} diff --git a/lib_dec/ivas_ism_dtx_dec.c b/lib_dec/ivas_ism_dtx_dec.c new file mode 100644 index 0000000000..7eb6c115ea --- /dev/null +++ b/lib_dec/ivas_ism_dtx_dec.c @@ -0,0 +1,200 @@ +/****************************************************************************************************** + + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository. All Rights Reserved. + + This software is protected by copyright law and by international treaties. + The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository retain full ownership rights in their respective contributions in + the software. This notice grants no license of any kind, including but not limited to patent + license, nor is any license granted by implication, estoppel or otherwise. + + Contributors are required to enter into the IVAS codec Public Collaboration agreement before making + contributions. + + This software is provided "AS IS", without any express or implied warranties. The software is in the + development stage. It is intended exclusively for experts who have experience with such software and + solely for the purpose of inspection. All implied warranties of non-infringement, merchantability + and fitness for a particular purpose are hereby disclaimed and excluded. + + Any dispute, controversy or claim arising under or in relation to providing this software shall be + submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in + accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and + the United Nations Convention on Contracts on the International Sales of Goods. + +*******************************************************************************************************/ + +#include +#include "options.h" +#include "ivas_prot.h" +#include "prot.h" +#ifdef DEBUGGING +#include "debug.h" +#endif +#include "wmc_auto.h" + +#ifndef FIX_ISM_DTX_CNG_BWIDTH_ALT +/*-------------------------------------------------------------------* + * ivas_ism_preprocessing() + * + * + *-------------------------------------------------------------------*/ + +static void ivas_ism_preprocessing( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + const int16_t sce_id /* i : SCE # identifier */ +) +{ + Decoder_State *st; + + st = st_ivas->hSCE[sce_id]->hCoreCoder[0]; + + { + /* reset the bitstream to at least read the cng type and bandwidth for non transmitted SCE */ + st->bit_stream = st_ivas->hSCE[0]->hCoreCoder[0]->bit_stream; + st->next_bit_pos = 0; /* note: needed in paramISM -> discISM switching */ + + if ( sce_id == st_ivas->hISMDTX.sce_id_dtx ) + { + st->read_sid_info = 1; /* read the sid info from bitstream */ + } + else + { + st->read_sid_info = 0; /* do not read the sid info from bitstream but use the estimated noise */ + } + + st->cng_ism_flag = 1; + } + + return; +} +#endif + +/*-------------------------------------------------------------------* + * ivas_ism_dtx_dec() + * + * ISM DTX Metadata decoding routine + *-------------------------------------------------------------------*/ + +ivas_error ivas_ism_dtx_dec( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + int16_t *nb_bits_metadata /* o : number of metadata bits */ +) +{ + int16_t ch, pos, nchan_ism, nchan_ism_prev; + int32_t ivas_total_brate; + int16_t md_diff_flag[MAX_NUM_OBJECTS]; + int16_t idx, flag_noisy_speech, sce_id_dtx; + ISM_MODE last_ism_mode, ism_mode_bstr; + ivas_error error; +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + Decoder_State *st; +#endif + + ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; + + + nchan_ism_prev = st_ivas->nchan_ism; + + if ( !st_ivas->bfi && ivas_total_brate == IVAS_SID_5k2 ) + { + /* read number of objects */ + nchan_ism = 1; + pos = (int16_t) ( ( ivas_total_brate / FRAMES_PER_SEC ) - 1 - SID_FORMAT_NBITS ); + + while ( get_indice( st_ivas->hSCE[0]->hCoreCoder[0], pos, 1 ) == 1 && nchan_ism < MAX_NUM_OBJECTS ) + { + ( nchan_ism )++; + pos--; + } + st_ivas->nchan_ism = nchan_ism; + pos--; + + if ( nchan_ism != nchan_ism_prev ) + { + /* IVAS_fmToDo: more work needed when the number of transported objects is not constant */ + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "wrong number of objects signalled!" ); + } + + last_ism_mode = st_ivas->ism_mode; + + /* read ism_mode */ + if ( nchan_ism > 2 ) + { + pos -= nchan_ism; /* SID metadata flags */ + + idx = get_indice( st_ivas->hSCE[0]->hCoreCoder[0], pos, 1 ); + ism_mode_bstr = (ISM_MODE) ( idx + 1 ); + st_ivas->ism_mode = ism_mode_bstr; + } + + if ( ( error = ivas_ism_dec_config( st_ivas, last_ism_mode ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else + { + nchan_ism = nchan_ism_prev; + } + + /* Metadata decoding and dequantization */ + ivas_ism_metadata_sid_dec( st_ivas->hSCE, ivas_total_brate, st_ivas->bfi, nchan_ism, st_ivas->nchan_transport, st_ivas->ism_mode, + &flag_noisy_speech, &sce_id_dtx, st_ivas->hIsmMetaData, nb_bits_metadata ); + + if ( ivas_total_brate == IVAS_SID_5k2 && !st_ivas->bfi ) + { + if ( st_ivas->hDirAC != NULL ) + { + st_ivas->hDirAC->hParamIsm->flag_noisy_speech = flag_noisy_speech; + } + + st_ivas->hISMDTX.sce_id_dtx = sce_id_dtx; + } + + set_s( md_diff_flag, 1, nchan_ism ); + + if ( st_ivas->ism_mode == ISM_MODE_PARAM ) + { + for ( ch = 0; ch < nchan_ism; ch++ ) + { + st_ivas->hDirAC->azimuth_values[ch] = st_ivas->hIsmMetaData[ch]->azimuth; + st_ivas->hDirAC->elevation_values[ch] = st_ivas->hIsmMetaData[ch]->elevation; + } + } + + update_last_metadata( nchan_ism, st_ivas->hIsmMetaData, md_diff_flag ); + + st_ivas->hISMDTX.ism_dtx_hangover_cnt = 0; + + if ( ivas_total_brate == IVAS_SID_5k2 && !st_ivas->bfi ) + { + for ( ch = 0; ch < st_ivas->nchan_transport; ch++ ) + { + nb_bits_metadata[ch] = nb_bits_metadata[sce_id_dtx]; + } + } + + if ( !st_ivas->bfi ) + { + for ( ch = 0; ch < st_ivas->nchan_transport; ch++ ) + { +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + st = st_ivas->hSCE[ch]->hCoreCoder[0]; + st->bit_stream = st_ivas->hSCE[0]->hCoreCoder[0]->bit_stream; + st->next_bit_pos = 0; /* note: needed in paramISM -> discISM switching */ + st->cng_ism_flag = 1; +#else + ivas_ism_preprocessing( st_ivas, ch ); // VE: after the acceptance of switches, replace the function call by its content +#endif + } + } + + return IVAS_ERR_OK; +} diff --git a/lib_dec/ivas_ism_metadata_dec.c b/lib_dec/ivas_ism_metadata_dec.c index 6b9f8ec8ba..7a61424a1f 100644 --- a/lib_dec/ivas_ism_metadata_dec.c +++ b/lib_dec/ivas_ism_metadata_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,69 +37,143 @@ #include "ivas_rom_com.h" #include "prot.h" #include "ivas_stat_enc.h" +#include #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" + + +/*-----------------------------------------------------------------------* + * Local functions + *-----------------------------------------------------------------------*/ + +static void decode_angle_indices( DEC_CORE_HANDLE st0, ISM_METADATA_ANGLE_HANDLE angle, int16_t *flag_abs_azimuth ); + +static int16_t decode_radius( DEC_CORE_HANDLE st0, int16_t *last_radius_idx, int16_t *flag_abs_radius ); + +/*-------------------------------------------------------------------------* + * Local constants + *-------------------------------------------------------------------------*/ + +#define IVAS_ISM_DTX_HO_MAX 5 + +#define CNG_MD_MAX_DIFF_AZIMUTH 5 +#define CNG_MD_MAX_DIFF_ELEVATION 5 + + +/*-------------------------------------------------------------------* + * ism_metadata_smooth() + * + * Smooth the metadata evolution + *-------------------------------------------------------------------*/ + +static void ism_metadata_smooth( + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + const int32_t ism_total_brate, /* i : ISms total bitrate */ + const int16_t nchan_ism /* i : number of objects */ +) +{ + ISM_METADATA_HANDLE hIsmMetaData; + int16_t ch; + float diff; + + for ( ch = 0; ch < nchan_ism; ch++ ) + { + hIsmMetaData = hIsmMeta[ch]; + + /* smooth azimuth */ + diff = hIsmMetaData->last_true_azimuth - hIsmMetaData->last_azimuth; + + if ( diff > ISM_AZIMUTH_MAX ) + { + diff -= ( ISM_AZIMUTH_MAX - ISM_AZIMUTH_MIN ); + hIsmMetaData->last_azimuth += ( ISM_AZIMUTH_MAX - ISM_AZIMUTH_MIN ); + } + else if ( diff < ISM_AZIMUTH_MIN ) + { + diff += ( ISM_AZIMUTH_MAX - ISM_AZIMUTH_MIN ); + } + + if ( ism_total_brate > IVAS_SID_5k2 && fabsf( diff ) > IVAS_ISM_DTX_HO_MAX * CNG_MD_MAX_DIFF_AZIMUTH ) + { + /* skip the smoothing */ + } + else if ( fabsf( diff ) > CNG_MD_MAX_DIFF_AZIMUTH ) + { + hIsmMetaData->azimuth = hIsmMetaData->last_azimuth + sign( diff ) * CNG_MD_MAX_DIFF_AZIMUTH; + } + else if ( diff != 0 ) + { + hIsmMetaData->azimuth = hIsmMetaData->last_true_azimuth; + } + + if ( hIsmMetaData->azimuth > ISM_AZIMUTH_MAX ) + { + hIsmMetaData->azimuth -= ( ISM_AZIMUTH_MAX - ISM_AZIMUTH_MIN ); + } + + /* smooth elevation */ + diff = hIsmMetaData->last_true_elevation - hIsmMetaData->last_elevation; + + if ( ism_total_brate > IVAS_SID_5k2 && diff > IVAS_ISM_DTX_HO_MAX * CNG_MD_MAX_DIFF_ELEVATION ) + { + /* skip the smoothing */ + } + else if ( fabsf( diff ) > CNG_MD_MAX_DIFF_ELEVATION ) + { + hIsmMetaData->elevation = hIsmMetaData->last_elevation + sign( diff ) * CNG_MD_MAX_DIFF_ELEVATION; + } + } + + return; +} /*-------------------------------------------------------------------------* * ivas_ism_metadata_dec() * - * decode and dequantize ISm metadata + * decode and dequantize ISM metadata *-------------------------------------------------------------------------*/ ivas_error ivas_ism_metadata_dec( - const int32_t ism_total_brate, /* i : ISms total bitrate */ - int16_t *nchan_transport, /* o : number of transport channels */ - ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ - SCE_DEC_HANDLE hSCE[], /* i/o: SCE decoder handles */ - const int16_t bfi, /* i : bfi flag */ - int16_t nb_bits_metadata[], /* o : number of metadata bits */ - ISM_MODE ism_mode, /* i : ISM mode */ - const PARAM_ISM_CONFIG_HANDLE hParamIsm /* i : Param ISM Config Handle */ + const int32_t ism_total_brate, /* i : ISM total bitrate */ + const int16_t nchan_ism, /* i : number of ISM channels */ + int16_t *nchan_transport, /* o : number of transport channels */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + SCE_DEC_HANDLE hSCE[], /* i/o: SCE decoder handles */ + const int16_t bfi, /* i : bfi flag */ + int16_t nb_bits_metadata[], /* o : number of metadata bits */ + ISM_MODE ism_mode, /* i : ISM mode */ + ISM_DTX_DATA_DEC hISMDTX, /* i/o: ISM DTX structure */ + const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Config Handle */ + int16_t *ism_extmeta_active, /* i/o: Extended metadata active in renderer*/ + int16_t *ism_extmeta_cnt /* i/o: Number of change frames observed*/ ) { - int16_t ch, nb_bits_start = 0, last_bit_pos, sgn, diff; + int16_t ch, nb_bits_start = 0, last_bit_pos; + int16_t idx_radius; int32_t element_brate[MAX_NUM_OBJECTS], total_brate[MAX_NUM_OBJECTS]; DEC_CORE_HANDLE st0; - int16_t idx_azimuth, nbits_diff_azimuth, flag_abs_azimuth; - int16_t idx_elevation, nbits_diff_elevation; + int16_t ism_extmeta_bitstream; + float yaw, pitch, radius; + int16_t flag_abs_radius; + int16_t flag_abs_orientation; + int16_t flag_abs_position; + int16_t idx_angle1; + int16_t idx_angle2; int16_t next_bit_pos_orig; uint16_t i, bstr_meta[MAX_BITS_METADATA], *bstr_orig; ISM_METADATA_HANDLE hIsmMetaData; int16_t nchan_transport_prev, ism_metadata_flag_global; int16_t localVAD[MAX_NUM_OBJECTS]; int16_t ism_imp[MAX_NUM_OBJECTS]; - int16_t num_obj = 0, nbands, nblocks; + int16_t nbands, nblocks; + int16_t md_diff_flag[MAX_NUM_OBJECTS]; ivas_error error; - error = IVAS_ERR_OK; + push_wmops( "ism_meta_dec" ); - wmops_sub_start( "ism_meta_dec" ); - - if ( ism_total_brate == IVAS_SID_5k2 || ism_total_brate == FRAME_NO_DATA ) - { - /* no metadata decoding in CNG */ - for ( ch = 0; ch < *nchan_transport; ch++ ) - { - hIsmMeta[ch]->ism_metadata_flag = 0; - } - - /* set padding bits as metadata bits to keep later bitrate checks valid */ - nb_bits_metadata[0] = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC; - -#ifdef DEBUGGING - /* sanity check */ - if ( *nchan_transport != 1 ) - { - return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "\n!!! Error: SID/CNG frame not expect for decoding more than 1 object. Exiting.\n\n" ); - } -#endif - - wmops_sub_end(); - return error; - } /* initialization */ st0 = hSCE[0]->hCoreCoder[0]; @@ -110,6 +184,7 @@ ivas_error ivas_ism_metadata_dec( bstr_orig = st0->bit_stream; next_bit_pos_orig = st0->next_bit_pos; st0->next_bit_pos = 0; + ism_extmeta_bitstream = 0; /* reverse the bitstream for easier reading of indices */ for ( i = 0; i < min( MAX_BITS_METADATA, last_bit_pos ); i++ ) @@ -122,25 +197,21 @@ ivas_error ivas_ism_metadata_dec( if ( !bfi ) { /*----------------------------------------------------------------* - * Read ISm common signaling + * Read ISM common signaling *----------------------------------------------------------------*/ - /* read number of objects */ - num_obj = 1; - while ( get_next_indice( st0, 1 ) == 1 && num_obj < MAX_NUM_OBJECTS ) - { - ( num_obj )++; - } + /* number of objects was read in ivas_dec_setup() */ + st0->next_bit_pos += nchan_ism; - ism_mode = ivas_ism_mode_select( num_obj, ism_total_brate ); + ism_mode = ivas_ism_mode_select( nchan_ism, ism_total_brate ); if ( ism_mode == ISM_MODE_PARAM ) { - hParamIsm->num_obj = num_obj; + *nchan_transport = MAX_PARAM_ISM_WAVE; } else if ( ism_mode == ISM_MODE_DISC ) { - *nchan_transport = num_obj; + *nchan_transport = nchan_ism; } if ( *nchan_transport != nchan_transport_prev ) @@ -149,7 +220,28 @@ ivas_error ivas_ism_metadata_dec( return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "wrong number of objects signalled!" ); } - /* Read ISm present flags (one per object) */ + /* read extended metadata presence flag */ + if ( ism_total_brate >= ISM_EXTENDED_METADATA_BRATE ) + { + ism_extmeta_bitstream = get_next_indice( st0, ISM_EXTENDED_METADATA_BITS ); + } + /* Apply hysteresis in case rate switching causes fluctuation in presence of extended metadata */ + if ( *ism_extmeta_active == -1 || *ism_extmeta_active == ism_extmeta_bitstream ) /* If first frame or bitstream matches internal state */ + { + *ism_extmeta_active = ism_extmeta_bitstream; + *ism_extmeta_cnt = 0; + } + else + { + ( *ism_extmeta_cnt )++; + if ( *ism_extmeta_cnt == ISM_METADATA_RS_MAX_FRAMES ) /* ISM_METADATA_RS_MAX_FRAMES change frames observed - update state */ + { + *ism_extmeta_active = ism_extmeta_bitstream; + *ism_extmeta_cnt = 0; + } + } + + /* Read ISM present flags (one per object) */ for ( ch = 0; ch < *nchan_transport; ch++ ) { ism_imp[ch] = get_next_indice( st0, ISM_METADATA_FLAG_BITS ); @@ -166,7 +258,7 @@ ivas_error ivas_ism_metadata_dec( ism_metadata_flag_global |= hIsmMeta[ch]->ism_metadata_flag; } - for ( ; ch < num_obj; ch++ ) + for ( ; ch < nchan_ism; ch++ ) { hIsmMeta[ch]->ism_metadata_flag = 1; ism_metadata_flag_global |= hIsmMeta[ch]->ism_metadata_flag; @@ -199,166 +291,64 @@ ivas_error ivas_ism_metadata_dec( nb_bits_start = st0->next_bit_pos; } - for ( ch = 0; ch < num_obj; ch++ ) + for ( ch = 0; ch < nchan_ism; ch++ ) { hIsmMetaData = hIsmMeta[ch]; if ( ism_mode == ISM_MODE_DISC ) { nb_bits_start = st0->next_bit_pos; } - - flag_abs_azimuth = 0; + flag_abs_position = 0; + flag_abs_orientation = 0; + flag_abs_radius = 0; if ( hIsmMeta[ch]->ism_metadata_flag ) { - /*----------------------------------------------------------------* - * Azimuth decoding and dequantization - *----------------------------------------------------------------*/ - - /* Decode azimuth index */ - if ( get_next_indice( st0, 1 ) == 1 ) /* azimuth_abs_flag */ - { - idx_azimuth = get_next_indice( st0, ISM_AZIMUTH_NBITS ); - flag_abs_azimuth = 1; - } - else - { - diff = 0; - sgn = 1; - - if ( get_next_indice( st0, 1 ) == 0 ) - { - nbits_diff_azimuth = 1; - } - else - { - nbits_diff_azimuth = 1; - - if ( get_next_indice( st0, 1 ) == 1 ) /* negative sign */ - { - sgn = -1; - } - - nbits_diff_azimuth++; - - /* read until the stop bit */ - while ( ( nbits_diff_azimuth < ISM_AZIMUTH_NBITS - 1 ) && ( get_next_indice( st0, 1 ) == 1 ) ) - { - diff++; - nbits_diff_azimuth++; - } - - if ( nbits_diff_azimuth < ISM_AZIMUTH_NBITS - 1 ) - { - /* count stop bit */ - nbits_diff_azimuth++; - } - } - - idx_azimuth = hIsmMetaData->last_azimuth_idx + sgn * diff; - } - - /* azimuth is on a circle - check for diff coding for -180° -> 180° and vice versa changes */ - if ( idx_azimuth > ( 1 << ISM_AZIMUTH_NBITS ) - 1 ) - { - idx_azimuth -= ( 1 << ISM_AZIMUTH_NBITS ) - 1; /* +180° -> -180° */ - } - else if ( idx_azimuth < 0 ) - { - idx_azimuth += ( 1 << ISM_AZIMUTH_NBITS ) - 1; /* -180° -> +180° */ - } - - /* +180° == -180° */ - if ( idx_azimuth == ( 1 << ISM_AZIMUTH_NBITS ) - 1 ) - { - idx_azimuth = 0; - } - - /* sanity check in case of FER or BER */ - if ( idx_azimuth < 0 || idx_azimuth > ( 1 << ISM_AZIMUTH_NBITS ) - 1 ) - { - idx_azimuth = hIsmMetaData->last_azimuth_idx; - } - - /* Azimuth dequantization */ + decode_angle_indices( st0, &( hIsmMetaData->position_angle ), &flag_abs_position ); + idx_angle1 = hIsmMetaData->position_angle.last_angle1_idx; + idx_angle2 = hIsmMetaData->position_angle.last_angle2_idx; + /* Azimuth/Elevation dequantization */ if ( ism_mode == ISM_MODE_PARAM ) { - hParamIsm->azi_index[ch] = idx_azimuth; + hParamIsm->azi_index[ch] = idx_angle1; + hParamIsm->ele_index[ch] = idx_angle2; } else /* ISM_MODE_DISC */ { - hIsmMetaData->azimuth = ism_dequant_meta( idx_azimuth, ism_azimuth_borders, 1 << ISM_AZIMUTH_NBITS ); - } - - /*----------------------------------------------------------------* - * Elevation decoding and dequantization - *----------------------------------------------------------------*/ + hIsmMetaData->azimuth = ism_dequant_meta( idx_angle1, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS ); + hIsmMetaData->elevation = ism_dequant_meta( idx_angle2, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS ); - /* Decode elevation index */ - if ( flag_abs_azimuth == 0 && get_next_indice( st0, 1 ) == 1 ) /* elevation_abs_flag */ - { - idx_elevation = get_next_indice( st0, ISM_ELEVATION_NBITS ); - } - else - { - diff = 0; - sgn = 1; - - if ( get_next_indice( st0, 1 ) == 0 ) + /* radius/raw/pitch dequantization */ + if ( ism_extmeta_bitstream ) { - nbits_diff_elevation = 1; + decode_angle_indices( st0, &( hIsmMetaData->orientation_angle ), &flag_abs_orientation ); + idx_angle1 = hIsmMetaData->orientation_angle.last_angle1_idx; + idx_angle2 = hIsmMetaData->orientation_angle.last_angle2_idx; + yaw = ism_dequant_meta( idx_angle1, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS ); + pitch = ism_dequant_meta( idx_angle2, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS ); + + idx_radius = decode_radius( st0, &hIsmMetaData->last_radius_idx, &flag_abs_radius ); + radius = usdequant( idx_radius, ISM_RADIUS_MIN, ISM_RADIUS_DELTA ); + if ( *ism_extmeta_active == 1 ) + { + hIsmMetaData->yaw = yaw; + hIsmMetaData->pitch = pitch; + hIsmMetaData->radius = radius; + } } else { - nbits_diff_elevation = 1; - - if ( get_next_indice( st0, 1 ) == 1 ) /* negative sign */ + if ( *ism_extmeta_active == 0 ) { - sgn = -1; - } - - nbits_diff_elevation++; - - /* read until the stop bit */ - while ( ( nbits_diff_elevation < ISM_ELEVATION_NBITS ) && ( get_next_indice( st0, 1 ) == 1 ) ) - { - diff++; - nbits_diff_elevation++; - } - - if ( nbits_diff_elevation < ISM_ELEVATION_NBITS ) - { - /* count stop bit */ - nbits_diff_elevation++; + hIsmMetaData->yaw = 0.0f; + hIsmMetaData->pitch = 0.0f; + hIsmMetaData->radius = 1.0f; } } - - idx_elevation = hIsmMetaData->last_elevation_idx + sgn * diff; - } - - /* sanity check in case of FER or BER */ - if ( idx_elevation < 0 || idx_elevation > ( 1 << ISM_ELEVATION_NBITS ) - 1 ) - { - idx_elevation = hIsmMetaData->last_elevation_idx; } - - /* Elevation dequantization */ - if ( ism_mode == ISM_MODE_PARAM ) - { - hParamIsm->ele_index[ch] = idx_elevation; - } - else /* ISM_MODE_DISC */ - { - hIsmMetaData->elevation = ism_dequant_meta( idx_elevation, ism_elevation_borders, 1 << ISM_ELEVATION_NBITS ); - } - - /*----------------------------------------------------------------* - * Final updates - *----------------------------------------------------------------*/ - - /* updates */ - hIsmMetaData->last_azimuth_idx = idx_azimuth; - hIsmMetaData->last_elevation_idx = idx_elevation; + /* save for smoothing metadata evolution */ + hIsmMetaData->last_true_azimuth = hIsmMetaData->azimuth; + hIsmMetaData->last_true_elevation = hIsmMetaData->elevation; } /* save number of metadata bits read */ @@ -421,12 +411,7 @@ ivas_error ivas_ism_metadata_dec( } else /* BFI */ { - /* "*nISms", "hIsmMeta->azimuth" and "hIsmMeta->elevation" are recycled from the last frame */ - for ( ch = 0; ch < *nchan_transport; ch++ ) - { - hIsmMeta[ch]->ism_metadata_flag = hIsmMeta[ch]->last_ism_metadata_flag; - } - for ( ; ch < num_obj; ch++ ) + for ( ch = 0; ch < nchan_ism; ch++ ) { hIsmMeta[ch]->last_ism_metadata_flag = hIsmMeta[ch]->ism_metadata_flag; } @@ -435,35 +420,45 @@ ivas_error ivas_ism_metadata_dec( if ( ism_mode == ISM_MODE_PARAM ) { - for ( ch = 0; ch < num_obj; ch++ ) + for ( ch = 0; ch < nchan_ism; ch++ ) { hParamIsm->azi_index[ch] = hParamIsm->azi_index[ch] + hParamIsm->last_az_sgn[ch] * hParamIsm->last_az_diff[ch]; - /*hParamIsm->azi_index[ch] = hParamIsm->azi_index[ch] % hParamIsm->az_alpha[ch];*/ - hParamIsm->azi_index[ch] = hParamIsm->azi_index[ch]; hParamIsm->ele_index[ch] = hParamIsm->ele_index[ch] + hParamIsm->last_el_sgn[ch] * hParamIsm->last_el_diff[ch]; - /*hParamIsm->ele_index[ch] = hParamIsm->ele_index[ch] % hParamIsm->ele_alpha;*/ - hParamIsm->ele_index[ch] = hParamIsm->ele_index[ch]; - hIsmMeta[ch]->last_azimuth_idx = hParamIsm->azi_index[ch]; - hIsmMeta[ch]->last_elevation_idx = hParamIsm->ele_index[ch]; + hIsmMeta[ch]->position_angle.last_angle1_idx = hParamIsm->azi_index[ch]; + hIsmMeta[ch]->position_angle.last_angle2_idx = hParamIsm->ele_index[ch]; } } } + if ( hISMDTX.ism_dtx_hangover_cnt < IVAS_ISM_DTX_HO_MAX ) + { + ism_metadata_smooth( hIsmMeta, ism_total_brate, nchan_ism ); + hISMDTX.ism_dtx_hangover_cnt += 1; + } + /*----------------------------------------------------------------* * Configuration and decision about bitrates per channel *----------------------------------------------------------------*/ if ( !bfi ) { - ivas_ism_config( ism_total_brate, *nchan_transport, num_obj, hIsmMeta, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata ); + if ( ( error = ivas_ism_config( ism_total_brate, *nchan_transport, nchan_ism, hIsmMeta, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata ) ) != IVAS_ERR_OK ) + { + return error; + } for ( ch = 0; ch < *nchan_transport; ch++ ) { hIsmMeta[ch]->last_ism_metadata_flag = hIsmMeta[ch]->ism_metadata_flag; +#ifdef FIX_419_ISM_BRATE_SW_DTX + hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0; +#endif if ( ism_mode == ISM_MODE_DISC ) { +#ifndef FIX_419_ISM_BRATE_SW_DTX hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0; +#endif if ( hIsmMeta[ch]->ism_metadata_flag == 0 && localVAD[ch] == 0 && ism_metadata_flag_global ) { hSCE[ch]->hCoreCoder[0]->low_rate_mode = 1; @@ -474,7 +469,7 @@ ivas_error ivas_ism_metadata_dec( hSCE[ch]->hCoreCoder[0]->total_brate = total_brate[ch]; } - for ( ; ch < num_obj; ch++ ) + for ( ; ch < nchan_ism; ch++ ) { hIsmMeta[ch]->last_ism_metadata_flag = hIsmMeta[ch]->ism_metadata_flag; } @@ -483,58 +478,479 @@ ivas_error ivas_ism_metadata_dec( { for ( ch = 0; ch < *nchan_transport; ch++ ) { - hSCE[ch]->element_brate = hSCE[ch]->last_element_brate; hSCE[ch]->hCoreCoder[0]->total_brate = hSCE[ch]->hCoreCoder[0]->last_total_brate; } } + /*----------------------------------------------------------------* + * Set bitsream pointers + *----------------------------------------------------------------*/ + /* set the bitstream pointer to its original position */ st0->bit_stream = bstr_orig; st0->next_bit_pos = next_bit_pos_orig; - /* set bitstream pointers for each ISm */ + /* set bitstream pointers for each ISM */ for ( ch = 1; ch < *nchan_transport; ch++ ) { hSCE[ch]->hCoreCoder[0]->bit_stream = hSCE[ch - 1]->hCoreCoder[0]->bit_stream + ( hSCE[ch - 1]->hCoreCoder[0]->total_brate / FRAMES_PER_SEC ); } - wmops_sub_end(); + /*----------------------------------------------------------------* + * Updates + *----------------------------------------------------------------*/ + + set_s( md_diff_flag, 1, nchan_ism ); + + update_last_metadata( nchan_ism, hIsmMeta, md_diff_flag ); + + for ( ch = 0; ch < *nchan_transport; ch++ ) + { + hSCE[ch]->hCoreCoder[0]->cng_ism_flag = 0; + } - return error; + pop_wmops(); + + return IVAS_ERR_OK; } /*------------------------------------------------------------------------- - * create_ism_metadata_dec() + * ivas_ism_metadata_dec_create() * - * Create, allocate, initialize and configure IVAS decoder ISM handles + * Create, allocate, initialize and configure IVAS decoder ISM metadata handles *-------------------------------------------------------------------------*/ -ivas_error create_ism_metadata_dec( +ivas_error ivas_ism_metadata_dec_create( Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ const int16_t n_ISms, /* i : number of objects */ int32_t element_brate_tmp[] /* o : element bitrate per object */ ) { int16_t ch; + ivas_error error; - /* allocate ISm metadata handles */ + /* allocate ISM metadata handles */ for ( ch = 0; ch < MAX_NUM_OBJECTS; ch++ ) { - if ( ( st_ivas->hIsmMetaData[ch] = (ISM_METADATA_HANDLE) count_malloc( sizeof( ISM_METADATA_FRAME ) ) ) == NULL ) + if ( ( st_ivas->hIsmMetaData[ch] = (ISM_METADATA_HANDLE) malloc( sizeof( ISM_METADATA_FRAME ) ) ) == NULL ) { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ISm MetaData\n" ) ); + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ISM MetaData\n" ) ); } st_ivas->hIsmMetaData[ch]->last_ism_metadata_flag = 0; - st_ivas->hIsmMetaData[ch]->last_azimuth_idx = 0; - st_ivas->hIsmMetaData[ch]->last_elevation_idx = 1 << ( ISM_ELEVATION_NBITS - 1 ); + st_ivas->hIsmMetaData[ch]->position_angle.last_angle1_idx = 0; + st_ivas->hIsmMetaData[ch]->position_angle.last_angle2_idx = 1 << ( ISM_ELEVATION_NBITS - 1 ); + st_ivas->hIsmMetaData[ch]->orientation_angle.last_angle1_idx = 0; + st_ivas->hIsmMetaData[ch]->orientation_angle.last_angle2_idx = 1 << ( ISM_ELEVATION_NBITS - 1 ); + st_ivas->hIsmMetaData[ch]->last_radius_idx = 8; /* Init to radius 1.0 */ + + st_ivas->hIsmMetaData[ch]->last_true_azimuth = 0; + st_ivas->hIsmMetaData[ch]->last_true_elevation = 0; ivas_ism_reset_metadata( st_ivas->hIsmMetaData[ch] ); } - ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, n_ISms, n_ISms, NULL, NULL, NULL, element_brate_tmp, NULL, NULL ); + if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, n_ISms, n_ISms, NULL, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK ) + { + return error; + } + + st_ivas->hISMDTX.ism_dtx_hangover_cnt = IVAS_ISM_DTX_HO_MAX; return IVAS_ERR_OK; } + + +/*------------------------------------------------------------------------- + * decode_angle_indices() + * + * Decoding of an angle + *-------------------------------------------------------------------------*/ + +static void decode_angle_indices( + DEC_CORE_HANDLE st0, /* i/o: bitstream handle */ + ISM_METADATA_ANGLE_HANDLE angle, /* i/o: angle handle */ + int16_t *flag_abs_angle1 /* o : Azimuth/yaw encoding mode */ +) +{ + int16_t idx_angle1, nbits_diff_angle1, diff, sgn; + int16_t idx_angle2, nbits_diff_angle2; + + /*----------------------------------------------------------------* + * Azimuth/yaw decoding and dequantization + *----------------------------------------------------------------*/ + + /* Decode azimuth/yaw index */ + if ( get_next_indice( st0, 1 ) == 1 ) /* azimuth_abs_flag */ + { + idx_angle1 = get_next_indice( st0, ISM_AZIMUTH_NBITS ); + *flag_abs_angle1 = 1; + } + else + { + diff = 0; + sgn = 1; + + if ( get_next_indice( st0, 1 ) == 0 ) + { + nbits_diff_angle1 = 1; + } + else + { + nbits_diff_angle1 = 1; + + if ( get_next_indice( st0, 1 ) == 1 ) /* negative sign */ + { + sgn = -1; + } + + nbits_diff_angle1++; + + /* read until the stop bit */ + while ( ( nbits_diff_angle1 < ISM_AZIMUTH_NBITS - 1 ) && ( get_next_indice( st0, 1 ) == 1 ) ) + { + diff++; + nbits_diff_angle1++; + } + + if ( nbits_diff_angle1 < ISM_AZIMUTH_NBITS - 1 ) + { + /* count stop bit */ + nbits_diff_angle1++; + } + } + idx_angle1 = angle->last_angle1_idx + sgn * diff; + } + + /* azimuth/yaw is on a circle - check for diff coding for -180° -> 180° and vice versa changes */ + if ( idx_angle1 > ( 1 << ISM_AZIMUTH_NBITS ) - 1 ) + { + idx_angle1 -= ( 1 << ISM_AZIMUTH_NBITS ) - 1; /* +180° -> -180° */ + } + else if ( idx_angle1 < 0 ) + { + idx_angle1 += ( 1 << ISM_AZIMUTH_NBITS ) - 1; /* -180° -> +180° */ + } + + /* +180° == -180° */ + if ( idx_angle1 == ( 1 << ISM_AZIMUTH_NBITS ) - 1 ) + { + idx_angle1 = 0; + } + + /* sanity check in case of FER or BER */ + if ( idx_angle1 < 0 || idx_angle1 > ( 1 << ISM_AZIMUTH_NBITS ) - 1 ) + { + idx_angle1 = angle->last_angle1_idx; + } + + /*----------------------------------------------------------------* + * Elevation/pitch decoding and dequantization + *----------------------------------------------------------------*/ + + /* Decode elevation/pitch index */ + if ( *flag_abs_angle1 == 0 && get_next_indice( st0, 1 ) == 1 ) /* elevation_abs_flag */ + { + idx_angle2 = get_next_indice( st0, ISM_ELEVATION_NBITS ); + } + else + { + diff = 0; + sgn = 1; + + if ( get_next_indice( st0, 1 ) == 0 ) + { + nbits_diff_angle2 = 1; + } + else + { + nbits_diff_angle2 = 1; + + if ( get_next_indice( st0, 1 ) == 1 ) /* negative sign */ + { + sgn = -1; + } + + nbits_diff_angle2++; + + /* read until the stop bit */ + while ( ( nbits_diff_angle2 < ISM_ELEVATION_NBITS ) && ( get_next_indice( st0, 1 ) == 1 ) ) + { + diff++; + nbits_diff_angle2++; + } + + if ( nbits_diff_angle2 < ISM_ELEVATION_NBITS ) + { + /* count stop bit */ + nbits_diff_angle2++; + } + } + + idx_angle2 = angle->last_angle2_idx + sgn * diff; + } + + /* sanity check in case of FER or BER */ + if ( idx_angle2 < 0 || idx_angle2 > ( 1 << ISM_ELEVATION_NBITS ) - 1 ) + { + idx_angle2 = angle->last_angle2_idx; + } + + /*----------------------------------------------------------------* + * Final updates + *----------------------------------------------------------------*/ + + angle->last_angle1_idx = idx_angle1; + angle->last_angle2_idx = idx_angle2; + + return; +} + + +/*------------------------------------------------------------------------- + * decode_radius() + * + * Radius decoding and dequantization + *-------------------------------------------------------------------------*/ + +static int16_t decode_radius( + DEC_CORE_HANDLE st0, /* i/o: bitstream handle */ + int16_t *last_radius_idx, /* i/o: last radius index */ + int16_t *flag_abs_radius /* o : Radius encoding mode */ +) +{ + int16_t idx_radius, nbits_diff_radius, diff, sgn; + + /* Decode radius index */ + if ( get_next_indice( st0, 1 ) == 1 ) /* elevation_abs_flag */ + { + *flag_abs_radius = 1; + idx_radius = get_next_indice( st0, ISM_RADIUS_NBITS ); + } + else + { + diff = 0; + sgn = 1; + + if ( get_next_indice( st0, 1 ) == 0 ) + { + nbits_diff_radius = 1; + } + else + { + nbits_diff_radius = 1; + + if ( get_next_indice( st0, 1 ) == 1 ) /* negative sign */ + { + sgn = -1; + } + + nbits_diff_radius++; + + /* read until the stop bit */ + while ( ( nbits_diff_radius < ISM_RADIUS_NBITS ) && ( get_next_indice( st0, 1 ) == 1 ) ) + { + diff++; + nbits_diff_radius++; + } + + if ( nbits_diff_radius < ISM_RADIUS_NBITS ) + { + /* count stop bit */ + nbits_diff_radius++; + } + } + idx_radius = *last_radius_idx + sgn * diff; + } + + /* sanity check in case of FER or BER */ + if ( idx_radius < 0 || idx_radius > ( 1 << ISM_RADIUS_NBITS ) - 1 ) + { + idx_radius = *last_radius_idx; + } + + /* Final updates */ + *last_radius_idx = idx_radius; + + return idx_radius; +} + + +/*-------------------------------------------------------------------* + * ivas_ism_metadata_sid_dec() + * + * Decode ISM metadata in SID frame + *-------------------------------------------------------------------*/ + +void ivas_ism_metadata_sid_dec( + SCE_DEC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */ + const int32_t ism_total_brate, /* i : ISms total bitrate */ + const int16_t bfi, /* i : bfi flag */ + const int16_t nchan_ism, /* i : number of objects */ + const int16_t nchan_transport, /* i : number of transport channels*/ + const ISM_MODE ism_mode, /* i : ISM mode */ + int16_t *flag_noisy_speech, /* o : noisy speech flag */ + int16_t *sce_id_dtx, /* o : SCE DTX ID */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + int16_t nb_bits_metadata[] /* o : number of metadata bits */ +) +{ + int16_t i, ch, last_bit_pos; + float q_step, q_step_border; + int16_t idx, idx_azimuth, idx_elevation; + int16_t nBits_azimuth, nBits_elevation, nBits_coh, nBits_sce_id; + int16_t md_diff_flag[MAX_NUM_OBJECTS]; + ISM_MODE ism_mode_bstr; + DEC_CORE_HANDLE st0; + ISM_METADATA_HANDLE hIsmMetaData; + int16_t next_bit_pos_orig; + uint16_t bstr_meta[IVAS_SID_5k2 / FRAMES_PER_SEC], *bstr_orig; + + if ( ism_total_brate == FRAME_NO_DATA ) + { + ism_metadata_smooth( hIsmMeta, ism_total_brate, nchan_ism ); + + return; + } + + /* initialization */ + st0 = hSCE[0]->hCoreCoder[0]; + + last_bit_pos = (int16_t) ( ( ism_total_brate / FRAMES_PER_SEC ) - 1 - SID_FORMAT_NBITS ); + bstr_orig = st0->bit_stream; + next_bit_pos_orig = st0->next_bit_pos; + st0->next_bit_pos = 0; + + /* reverse the bitstream for easier reading of indices */ + for ( i = 0; i < min( MAX_BITS_METADATA, last_bit_pos ); i++ ) + { + bstr_meta[i] = st0->bit_stream[last_bit_pos - i]; + } + st0->bit_stream = bstr_meta; + st0->total_brate = ism_total_brate; /* needed for BER detection in get_next_indice() */ + + if ( !bfi ) + { + /*----------------------------------------------------------------* + * ISm common signaling + *----------------------------------------------------------------*/ + + /* number of objects was already read in ivas_ism_get_dtx_dec() */ + /* update the position in the bitstream */ + st0->next_bit_pos += nchan_ism; + + /* read SID metadata flag( one per object ) */ + for ( ch = 0; ch < nchan_ism; ch++ ) + { + md_diff_flag[ch] = get_next_indice( st0, 1 ); + } + + /*----------------------------------------------------------------* + * Set quantization bits based on the number of coded objects + *----------------------------------------------------------------*/ + + ivas_get_ism_sid_quan_bitbudget( nchan_ism, &nBits_azimuth, &nBits_elevation, &q_step, &q_step_border, &nBits_coh, &nBits_sce_id ); + + /*----------------------------------------------------------------* + * Spatial parameters, loop over TCs - 1 + *----------------------------------------------------------------*/ + + *flag_noisy_speech = 0; + *sce_id_dtx = 0; + + /* read ISM mode flag to explicitly signal number of spatial parameters */ + if ( nchan_ism > 2 ) + { + idx = get_next_indice( st0, 1 ); + ism_mode_bstr = (ISM_MODE) ( idx + 1 ); + /* note: ISM mode was already read and used for configuration in in ivas_ism_dtx_dec() */ + + if ( ism_mode_bstr == ISM_MODE_PARAM ) + { + /* read noisy speech flag */ + *flag_noisy_speech = get_next_indice( st0, 1 ); + nBits_sce_id = 1; + } + } + + if ( nchan_transport > 1 ) + { + /* read sce id */ + *sce_id_dtx = get_next_indice( st0, nBits_sce_id ); + + /* decode the coherence */ + for ( ch = 0; ch < nchan_transport; ch++ ) + { + if ( ch == *sce_id_dtx ) + { + hSCE[ch]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence = 1.0f; + continue; + } + + idx = get_next_indice( st0, nBits_coh ); + hSCE[ch]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence = (float) ( idx ) / (float) ( ( 1 << nBits_coh ) - 1 ); + } + } +#ifndef FIX_ISM_DTX_CNG_BWIDTH_ALT + else + { + *sce_id_dtx = 0; + } +#endif + + if ( ism_mode == ISM_MODE_PARAM ) + { + hSCE[*sce_id_dtx]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence = hSCE[!*sce_id_dtx]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence; + } + + /*----------------------------------------------------------------* + * Metadata decoding and dequantization, loop over all objects + *----------------------------------------------------------------*/ + + for ( ch = 0; ch < nchan_ism; ch++ ) + { + hIsmMetaData = hIsmMeta[ch]; + + if ( md_diff_flag[ch] == 1 ) + { + /* Azimuth decoding */ + idx_azimuth = get_next_indice( st0, nBits_azimuth ); + hIsmMetaData->azimuth = ism_dequant_meta( idx_azimuth, ism_azimuth_borders, q_step, q_step_border, 1 << nBits_azimuth ); + + /* Elevation decoding */ + idx_elevation = get_next_indice( st0, nBits_elevation ); + hIsmMetaData->elevation = ism_dequant_meta( idx_elevation, ism_elevation_borders, q_step, q_step_border, 1 << nBits_elevation ); + + /* update last indexes to correspond to active frames coding */ + if ( nBits_azimuth > ISM_AZIMUTH_NBITS ) + { + hIsmMetaData->position_angle.last_angle1_idx = idx_azimuth >> ( nBits_azimuth - ISM_AZIMUTH_NBITS ); + hIsmMetaData->position_angle.last_angle2_idx = idx_elevation >> ( nBits_elevation - ISM_ELEVATION_NBITS ); + } + else + { + hIsmMetaData->position_angle.last_angle1_idx = idx_azimuth << ( ISM_AZIMUTH_NBITS - nBits_azimuth ); + hIsmMetaData->position_angle.last_angle2_idx = idx_elevation << ( ISM_ELEVATION_NBITS - nBits_elevation ); + } + + /* save for smoothing metadata evolution */ + hIsmMetaData->last_true_azimuth = hIsmMetaData->azimuth; + hIsmMetaData->last_true_elevation = hIsmMetaData->elevation; + } + } + + /* take into account padding bits as metadata bits to keep later bitrate checks valid */ + nb_bits_metadata[*sce_id_dtx] = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC; + + /* set the bitstream pointer to its original position */ + st0->bit_stream = bstr_orig; + st0->next_bit_pos = next_bit_pos_orig; + } + + /* smooth the metadata evolution */ + ism_metadata_smooth( hIsmMeta, ism_total_brate, nchan_ism ); + + return; +} diff --git a/lib_dec/ivas_ism_param_dec.c b/lib_dec/ivas_ism_param_dec.c index 8ebf27afb5..244bf1f398 100644 --- a/lib_dec/ivas_ism_param_dec.c +++ b/lib_dec/ivas_ism_param_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -35,13 +35,14 @@ #include #include "options.h" #include "ivas_prot.h" +#include "ivas_prot_rend.h" #include "prot.h" #include "ivas_rom_com.h" #include "ivas_rom_dec.h" #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------* @@ -50,6 +51,8 @@ static void ivas_param_ism_dec_dequant_DOA( DIRAC_DEC_HANDLE hDirAC /* i/o: decoder DirAC handle */ + , + const int16_t nchan_ism /* i : number of ISM channels */ ) { int16_t i; @@ -57,13 +60,13 @@ static void ivas_param_ism_dec_dequant_DOA( hParamIsm = hDirAC->hParamIsm; - assert( hParamIsm->num_obj <= MAX_NUM_OBJECTS ); + assert( nchan_ism <= MAX_NUM_OBJECTS ); /* Get the azimuth and elevation values */ - for ( i = 0; i < hParamIsm->num_obj; i++ ) + for ( i = 0; i < nchan_ism; i++ ) { - hDirAC->azimuth_values[i] = ism_dequant_meta( hParamIsm->azi_index[i], ism_azimuth_borders, 1 << ISM_AZIMUTH_NBITS ); - hDirAC->elevation_values[i] = ism_dequant_meta( hParamIsm->ele_index[i], ism_elevation_borders, 1 << ISM_ELEVATION_NBITS ); + hDirAC->azimuth_values[i] = ism_dequant_meta( hParamIsm->azi_index[i], ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS ); + hDirAC->elevation_values[i] = ism_dequant_meta( hParamIsm->ele_index[i], ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS ); } return; @@ -156,7 +159,9 @@ static void ivas_ism_get_proto_matrix( static void ivas_param_ism_compute_mixing_matrix( - DIRAC_DEC_HANDLE hDirAC, /* i/o: decoder DirAC handle */ + const int16_t nchan_ism, /* i : number of ISM channels */ + DIRAC_DEC_HANDLE hDirAC, /* i/o: decoder DirAC handle */ + ISM_DTX_DATA_DEC hISMDTX, /* i : ISM DTX handle */ float Cldfb_RealBuffer_in[PARAM_ISM_MAX_DMX][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float Cldfb_ImagBuffer_in[PARAM_ISM_MAX_DMX][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float direct_response[MAX_NUM_OBJECTS][PARAM_ISM_MAX_CHAN], @@ -181,12 +186,12 @@ static void ivas_param_ism_compute_mixing_matrix( proto_matrix = hDirAC->hParamIsmRendering->proto_matrix; - assert( ( hDirAC->hParamIsm->num_obj == 3 ) || ( hDirAC->hParamIsm->num_obj == 4 ) ); + assert( ( nchan_ism == 3 ) || ( nchan_ism == 4 ) ); assert( nchan_transport == 2 ); - if ( hDirAC->hParamIsm->flag_noisy_speech ) + if ( hDirAC->hParamIsm->flag_noisy_speech || hISMDTX.dtx_flag ) { - num_wave = hDirAC->hParamIsm->num_obj; + num_wave = nchan_ism; } else { @@ -206,7 +211,7 @@ static void ivas_param_ism_compute_mixing_matrix( { set_zero( cy_diag_tmp[w], nchan_out_woLFE ); - if ( hDirAC->hParamIsm->flag_noisy_speech ) + if ( hDirAC->hParamIsm->flag_noisy_speech || hISMDTX.dtx_flag ) { dir_res_ptr = direct_response[w]; } @@ -245,9 +250,9 @@ static void ivas_param_ism_compute_mixing_matrix( set_zero( cy_diag, nchan_out_woLFE ); for ( w = 0; w < num_wave; w++ ) { - if ( hDirAC->hParamIsm->flag_noisy_speech ) + if ( hDirAC->hParamIsm->flag_noisy_speech || hISMDTX.dtx_flag ) { - direct_power[w] = ( 1.0f / hDirAC->hParamIsm->num_obj ) * ref_power; + direct_power[w] = ( 1.0f / nchan_ism ) * ref_power; } else { @@ -326,11 +331,11 @@ static ivas_error ivas_param_ism_rendering_init( } /* memory allocation for proto matrix and interpolator */ - if ( ( hParamIsmRendering->proto_matrix = (float *) count_malloc( hOutSetup.nchan_out_woLFE * nchan_transport * sizeof( float ) ) ) == NULL ) + if ( ( hParamIsmRendering->proto_matrix = (float *) malloc( hOutSetup.nchan_out_woLFE * nchan_transport * sizeof( float ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for proto matrix\n" ) ); } - if ( ( hParamIsmRendering->interpolator = (float *) count_malloc( subframe_nbslots * sizeof( float ) ) ) == NULL ) + if ( ( hParamIsmRendering->interpolator = (float *) malloc( subframe_nbslots * sizeof( float ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for interpolator\n" ) ); } @@ -393,46 +398,36 @@ ivas_error ivas_param_ism_dec_open( IVAS_OUTPUT_SETUP hOutSetup; AUDIO_CONFIG output_config; int32_t output_Fs; - int16_t nchan_out; ivas_error error; error = IVAS_ERR_OK; - wmops_sub_start( "ivas_param_ism_dec_open" ); + push_wmops( "ivas_param_ism_dec_open" ); /*-----------------------------------------------------------------* * prepare library opening *-----------------------------------------------------------------*/ - if ( ( hDirAC = (DIRAC_DEC_HANDLE) count_malloc( sizeof( DIRAC_DEC_DATA ) ) ) == NULL ) + if ( ( hDirAC = (DIRAC_DEC_HANDLE) malloc( sizeof( DIRAC_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); } /* Assign memory to Param Object handle */ - if ( ( hDirAC->hParamIsm = (PARAM_ISM_CONFIG_HANDLE) count_malloc( sizeof( PARAM_ISM_CONFIG_DATA ) ) ) == NULL ) + if ( ( hDirAC->hParamIsm = (PARAM_ISM_CONFIG_HANDLE) malloc( sizeof( PARAM_ISM_CONFIG_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM\n" ) ); } - if ( ( hDirAC->hParamIsmRendering = (PARAM_ISM_RENDERING_HANDLE) count_malloc( sizeof( PARAM_ISM_RENDERING_DATA ) ) ) == NULL ) + if ( ( hDirAC->hParamIsmRendering = (PARAM_ISM_RENDERING_HANDLE) malloc( sizeof( PARAM_ISM_RENDERING_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); } output_Fs = st_ivas->hDecoderConfig->output_Fs; output_config = st_ivas->hDecoderConfig->output_config; - nchan_out = st_ivas->hDecoderConfig->nchan_out; - if ( output_config == AUDIO_CONFIG_EXTERNAL ) - { - hDirAC->hParamIsm->num_obj = nchan_out; - } - else - { - hDirAC->hParamIsm->num_obj = MAX_NUM_OBJECTS; - } - ivas_param_ism_config( hDirAC->hParamIsm ); + ivas_param_ism_config( hDirAC->hParamIsm, st_ivas->nchan_ism ); /*-----------------------------------------------------------------* * set input parameters @@ -464,7 +459,7 @@ ivas_error ivas_param_ism_dec_open( if ( output_config == AUDIO_CONFIG_EXTERNAL ) { /* nchan_out is essential for memory initialization for CLDFB Synthesis */ - st_ivas->hIntSetup.nchan_out_woLFE = hDirAC->hParamIsm->num_obj; + st_ivas->hIntSetup.nchan_out_woLFE = st_ivas->nchan_ism; st_ivas->hIntSetup.is_loudspeaker_setup = 1; } @@ -500,41 +495,114 @@ ivas_error ivas_param_ism_dec_open( if ( ( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM ) ) { hDirAC->dirac_md_buffer_length = MAX_PARAM_SPATIAL_SUBFRAMES; - hDirAC->azimuth = (int16_t **) count_malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ); - hDirAC->elevation = (int16_t **) count_malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ); - hDirAC->azimuth2 = (int16_t **) count_malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ); - hDirAC->elevation2 = (int16_t **) count_malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ); - hDirAC->energy_ratio1 = (float **) count_malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ); - hDirAC->spreadCoherence = (float **) count_malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ); - hDirAC->energy_ratio2 = (float **) count_malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ); - hDirAC->spreadCoherence2 = (float **) count_malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ); - hDirAC->surroundingCoherence = (float **) count_malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ); + if ( ( hDirAC->azimuth = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + } + + if ( ( hDirAC->elevation = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + } + + if ( ( hDirAC->azimuth2 = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + } + + if ( ( hDirAC->elevation2 = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + } + + if ( ( hDirAC->energy_ratio1 = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + } + + if ( ( hDirAC->spreadCoherence = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + } + + if ( ( hDirAC->energy_ratio2 = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + } + + if ( ( hDirAC->spreadCoherence2 = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + } + + if ( ( hDirAC->surroundingCoherence = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + } + for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ ) { - hDirAC->azimuth[i] = (int16_t *) count_malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ); + if ( ( hDirAC->azimuth[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + } set_s( hDirAC->azimuth[i], 0, hDirAC->num_freq_bands ); - hDirAC->elevation[i] = (int16_t *) count_malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ); + + if ( ( hDirAC->elevation[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + } set_s( hDirAC->elevation[i], 0, hDirAC->num_freq_bands ); - hDirAC->azimuth2[i] = (int16_t *) count_malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ); + + if ( ( hDirAC->azimuth2[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + } set_s( hDirAC->azimuth2[i], 0, hDirAC->num_freq_bands ); - hDirAC->elevation2[i] = (int16_t *) count_malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ); + + if ( ( hDirAC->elevation2[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + } set_s( hDirAC->elevation2[i], 0, hDirAC->num_freq_bands ); - hDirAC->energy_ratio1[i] = (float *) count_malloc( hDirAC->num_freq_bands * sizeof( float ) ); + + if ( ( hDirAC->energy_ratio1[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + } set_f( hDirAC->energy_ratio1[i], 0.0f, hDirAC->num_freq_bands ); - hDirAC->spreadCoherence[i] = (float *) count_malloc( hDirAC->num_freq_bands * sizeof( float ) ); + + if ( ( hDirAC->spreadCoherence[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + } set_f( hDirAC->spreadCoherence[i], 0.0f, hDirAC->num_freq_bands ); - hDirAC->energy_ratio2[i] = (float *) count_malloc( hDirAC->num_freq_bands * sizeof( float ) ); + + if ( ( hDirAC->energy_ratio2[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + } set_f( hDirAC->energy_ratio2[i], 0.0f, hDirAC->num_freq_bands ); - hDirAC->spreadCoherence2[i] = (float *) count_malloc( hDirAC->num_freq_bands * sizeof( float ) ); + + if ( ( hDirAC->spreadCoherence2[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + } set_f( hDirAC->spreadCoherence2[i], 0.0f, hDirAC->num_freq_bands ); - hDirAC->surroundingCoherence[i] = (float *) count_malloc( hDirAC->num_freq_bands * sizeof( float ) ); + + if ( ( hDirAC->surroundingCoherence[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) ); + } set_f( hDirAC->surroundingCoherence[i], 0.0f, hDirAC->num_freq_bands ); } } + st_ivas->hISMDTX.dtx_flag = 0; + st_ivas->hDirAC = hDirAC; - wmops_sub_end(); + pop_wmops(); return error; } @@ -546,16 +614,24 @@ ivas_error ivas_param_ism_dec_open( *-------------------------------------------------------------------------*/ void ivas_param_ism_dec_close( - DIRAC_DEC_HANDLE hDirAC, /* i/o: decoder DirAC handle */ - AUDIO_CONFIG output_config /* i : output audio configuration */ + DIRAC_DEC_HANDLE *hDirAC_out, /* i/o: decoder DirAC handle */ + AUDIO_CONFIG output_config /* i : output audio configuration */ ) { int16_t i; + DIRAC_DEC_HANDLE hDirAC; + + if ( hDirAC_out == NULL || *hDirAC_out == NULL ) + { + return; + } + + hDirAC = *hDirAC_out; /* Config & CLDFB */ if ( hDirAC->hParamIsm != NULL ) { - count_free( hDirAC->hParamIsm ); + free( hDirAC->hParamIsm ); hDirAC->hParamIsm = NULL; } @@ -565,25 +641,25 @@ void ivas_param_ism_dec_close( { if ( hDirAC->azimuth[i] != NULL ) { - count_free( hDirAC->azimuth[i] ); + free( hDirAC->azimuth[i] ); hDirAC->azimuth[i] = NULL; } if ( hDirAC->elevation[i] != NULL ) { - count_free( hDirAC->elevation[i] ); + free( hDirAC->elevation[i] ); hDirAC->elevation[i] = NULL; } } if ( hDirAC->azimuth != NULL ) { - count_free( hDirAC->azimuth ); + free( hDirAC->azimuth ); hDirAC->azimuth = NULL; } if ( hDirAC->elevation != NULL ) { - count_free( hDirAC->elevation ); + free( hDirAC->elevation ); hDirAC->elevation = NULL; } @@ -593,11 +669,11 @@ void ivas_param_ism_dec_close( { if ( hDirAC->azimuth2[i] != NULL ) { - count_free( hDirAC->azimuth2[i] ); + free( hDirAC->azimuth2[i] ); hDirAC->azimuth2[i] = NULL; } } - count_free( hDirAC->azimuth2 ); + free( hDirAC->azimuth2 ); hDirAC->azimuth2 = NULL; } @@ -607,11 +683,11 @@ void ivas_param_ism_dec_close( { if ( hDirAC->elevation2[i] != NULL ) { - count_free( hDirAC->elevation2[i] ); + free( hDirAC->elevation2[i] ); hDirAC->elevation2[i] = NULL; } } - count_free( hDirAC->elevation2 ); + free( hDirAC->elevation2 ); hDirAC->elevation2 = NULL; } @@ -621,11 +697,11 @@ void ivas_param_ism_dec_close( { if ( hDirAC->energy_ratio1[i] != NULL ) { - count_free( hDirAC->energy_ratio1[i] ); + free( hDirAC->energy_ratio1[i] ); hDirAC->energy_ratio1[i] = NULL; } } - count_free( hDirAC->energy_ratio1 ); + free( hDirAC->energy_ratio1 ); hDirAC->energy_ratio1 = NULL; } @@ -635,11 +711,11 @@ void ivas_param_ism_dec_close( { if ( hDirAC->energy_ratio2[i] != NULL ) { - count_free( hDirAC->energy_ratio2[i] ); + free( hDirAC->energy_ratio2[i] ); hDirAC->energy_ratio2[i] = NULL; } } - count_free( hDirAC->energy_ratio2 ); + free( hDirAC->energy_ratio2 ); hDirAC->energy_ratio2 = NULL; } @@ -649,11 +725,11 @@ void ivas_param_ism_dec_close( { if ( hDirAC->spreadCoherence[i] != NULL ) { - count_free( hDirAC->spreadCoherence[i] ); + free( hDirAC->spreadCoherence[i] ); hDirAC->spreadCoherence[i] = NULL; } } - count_free( hDirAC->spreadCoherence ); + free( hDirAC->spreadCoherence ); hDirAC->spreadCoherence = NULL; } @@ -663,11 +739,11 @@ void ivas_param_ism_dec_close( { if ( hDirAC->spreadCoherence2[i] != NULL ) { - count_free( hDirAC->spreadCoherence2[i] ); + free( hDirAC->spreadCoherence2[i] ); hDirAC->spreadCoherence2[i] = NULL; } } - count_free( hDirAC->spreadCoherence2 ); + free( hDirAC->spreadCoherence2 ); hDirAC->spreadCoherence2 = NULL; } @@ -677,11 +753,11 @@ void ivas_param_ism_dec_close( { if ( hDirAC->surroundingCoherence[i] != NULL ) { - count_free( hDirAC->surroundingCoherence[i] ); + free( hDirAC->surroundingCoherence[i] ); hDirAC->surroundingCoherence[i] = NULL; } } - count_free( hDirAC->surroundingCoherence ); + free( hDirAC->surroundingCoherence ); hDirAC->surroundingCoherence = NULL; } } @@ -691,23 +767,24 @@ void ivas_param_ism_dec_close( /* Param ISM Rendering */ if ( hDirAC->hParamIsmRendering->interpolator != NULL ) { - count_free( hDirAC->hParamIsmRendering->interpolator ); + free( hDirAC->hParamIsmRendering->interpolator ); hDirAC->hParamIsmRendering->interpolator = NULL; } if ( hDirAC->hParamIsmRendering->proto_matrix != NULL ) { - count_free( hDirAC->hParamIsmRendering->proto_matrix ); + free( hDirAC->hParamIsmRendering->proto_matrix ); hDirAC->hParamIsmRendering->proto_matrix = NULL; } } if ( hDirAC->hParamIsmRendering != NULL ) { - count_free( hDirAC->hParamIsmRendering ); + free( hDirAC->hParamIsmRendering ); hDirAC->hParamIsmRendering = NULL; } - count_free( hDirAC ); + free( *hDirAC_out ); + *hDirAC_out = NULL; return; } @@ -726,6 +803,7 @@ void ivas_param_ism_dec( { int16_t ch, nchan_transport, nchan_out, nchan_out_woLFE, i; int16_t subframe_idx, slot_idx, index_slot, bin_idx; + int32_t ivas_total_brate; /* CLDFB Input Buffers */ float Cldfb_RealBuffer_in[PARAM_ISM_MAX_DMX][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; @@ -752,7 +830,7 @@ void ivas_param_ism_dec( nchan_transport = st_ivas->nchan_transport; if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) { - nchan_out = st_ivas->hDirAC->hParamIsm->num_obj; + nchan_out = st_ivas->nchan_ism; nchan_out_woLFE = nchan_out; st_ivas->hDecoderConfig->nchan_out = nchan_out; } @@ -762,19 +840,29 @@ void ivas_param_ism_dec( nchan_out_woLFE = st_ivas->hIntSetup.nchan_out_woLFE; } + ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; + hSetup = st_ivas->hIntSetup; - wmops_sub_start( "ivas_param_ism_dec" ); + push_wmops( "ivas_param_ism_dec" ); /* Frame-level Processing */ /* De-quantization */ - ivas_param_ism_dec_dequant_DOA( hDirAC ); - ivas_param_ism_dec_dequant_powrat( hDirAC ); + if ( !( ivas_total_brate == IVAS_SID_5k2 || ivas_total_brate == FRAME_NO_DATA ) ) + { + ivas_param_ism_dec_dequant_DOA( hDirAC, st_ivas->nchan_ism ); + ivas_param_ism_dec_dequant_powrat( hDirAC ); + st_ivas->hISMDTX.dtx_flag = 0; + } + else + { + st_ivas->hISMDTX.dtx_flag = 1; + } /* obtain the direct response using EFAP */ if ( !( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) ) { - for ( i = 0; i < hDirAC->hParamIsm->num_obj; i++ ) + for ( i = 0; i < st_ivas->nchan_ism; i++ ) { efap_determine_gains( st_ivas->hEFAPdata, direct_response[i], hDirAC->azimuth_values[i], hDirAC->elevation_values[i], EFAP_MODE_EFAP ); } @@ -783,7 +871,7 @@ void ivas_param_ism_dec( { int16_t j; - for ( i = 0; i < hDirAC->hParamIsm->num_obj; i++ ) + for ( i = 0; i < st_ivas->nchan_ism; i++ ) { for ( j = 0; j < nchan_out_woLFE; j++ ) { @@ -832,7 +920,7 @@ void ivas_param_ism_dec( } /* Compute mixing matrix */ - ivas_param_ism_compute_mixing_matrix( hDirAC, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, direct_response, nchan_transport, nchan_out_woLFE, 0, CLDFB_NO_COL_MAX, mixing_matrix ); + ivas_param_ism_compute_mixing_matrix( st_ivas->nchan_ism, hDirAC, st_ivas->hISMDTX, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, direct_response, nchan_transport, nchan_out_woLFE, 0, CLDFB_NO_COL_MAX, mixing_matrix ); /* subframe loop for synthesis*/ for ( subframe_idx = 0; subframe_idx < hDirAC->nb_subframes; subframe_idx++ ) @@ -901,7 +989,7 @@ void ivas_param_ism_dec( ivas_param_ism_update_mixing_matrix( hDirAC, mixing_matrix, nchan_transport, nchan_out_woLFE ); /* store MetaData parameters */ - for ( ch = 0; ch < hDirAC->hParamIsm->num_obj; ch++ ) + for ( ch = 0; ch < st_ivas->nchan_ism; ch++ ) { if ( st_ivas->hDirAC->azimuth_values[ch] > 180.0f ) { @@ -915,7 +1003,7 @@ void ivas_param_ism_dec( st_ivas->hIsmMetaData[ch]->elevation = st_ivas->hDirAC->elevation_values[ch]; } - wmops_sub_end(); + pop_wmops(); return; } @@ -938,47 +1026,85 @@ void ivas_param_ism_params_to_masa_param_mapping( int16_t azimuth[2]; int16_t elevation[2]; float power_ratio[2]; + int32_t ivas_total_brate; + hDirAC = st_ivas->hDirAC; nBins = hDirAC->num_freq_bands; - ivas_param_ism_dec_dequant_DOA( hDirAC ); - ivas_param_ism_dec_dequant_powrat( hDirAC ); - if ( hDirAC->hParamIsm->num_obj > 1 ) - { - hDirAC->numSimultaneousDirections = 2; - for ( band_idx = 0; band_idx < hDirAC->hParamIsm->nbands; band_idx++ ) - { - brange[0] = hDirAC->hParamIsm->band_grouping[band_idx]; - brange[1] = hDirAC->hParamIsm->band_grouping[band_idx + 1]; + ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; - azimuth[0] = (int16_t) roundf( hDirAC->azimuth_values[hDirAC->hParamIsm->obj_indices[band_idx][0][0]] ); - elevation[0] = (int16_t) roundf( hDirAC->elevation_values[hDirAC->hParamIsm->obj_indices[band_idx][0][0]] ); - power_ratio[0] = hDirAC->power_ratios[band_idx][0][0]; + if ( !( ivas_total_brate == IVAS_SID_5k2 || ivas_total_brate == FRAME_NO_DATA ) ) + { + ivas_param_ism_dec_dequant_DOA( hDirAC, st_ivas->nchan_ism ); + ivas_param_ism_dec_dequant_powrat( hDirAC ); + st_ivas->hISMDTX.dtx_flag = 0; + } + else + { + st_ivas->hISMDTX.dtx_flag = 1; + } - azimuth[1] = (int16_t) roundf( hDirAC->azimuth_values[hDirAC->hParamIsm->obj_indices[band_idx][0][1]] ); - elevation[1] = (int16_t) roundf( hDirAC->elevation_values[hDirAC->hParamIsm->obj_indices[band_idx][0][1]] ); - power_ratio[1] = hDirAC->power_ratios[band_idx][0][1]; + if ( st_ivas->nchan_ism > 1 ) + { + if ( st_ivas->hISMDTX.dtx_flag ) + { + float energy_ratio; + energy_ratio = powf( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence, 2.0f ); + hDirAC->numSimultaneousDirections = 1; + azimuth[0] = (int16_t) roundf( hDirAC->azimuth_values[0] ); + elevation[0] = (int16_t) roundf( hDirAC->elevation_values[0] ); for ( sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ ) { - for ( bin_idx = brange[0]; bin_idx < brange[1]; bin_idx++ ) + for ( bin_idx = 0; bin_idx < nBins; bin_idx++ ) { hDirAC->azimuth[sf_idx][bin_idx] = azimuth[0]; hDirAC->elevation[sf_idx][bin_idx] = elevation[0]; - hDirAC->energy_ratio1[sf_idx][bin_idx] = power_ratio[0]; - hDirAC->azimuth2[sf_idx][bin_idx] = azimuth[1]; - hDirAC->elevation2[sf_idx][bin_idx] = elevation[1]; - hDirAC->energy_ratio2[sf_idx][bin_idx] = power_ratio[1]; + + hDirAC->energy_ratio1[sf_idx][bin_idx] = energy_ratio; + + hDirAC->spreadCoherence[sf_idx][bin_idx] = 0.0f; + hDirAC->surroundingCoherence[sf_idx][bin_idx] = 0.0; } } } - for ( sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ ) + else { - for ( bin_idx = 0; bin_idx < nBins; bin_idx++ ) + hDirAC->numSimultaneousDirections = 2; + for ( band_idx = 0; band_idx < hDirAC->hParamIsm->nbands; band_idx++ ) { - hDirAC->spreadCoherence[sf_idx][bin_idx] = 0.0f; - hDirAC->spreadCoherence2[sf_idx][bin_idx] = 0.0f; - hDirAC->surroundingCoherence[sf_idx][bin_idx] = 0.0; + brange[0] = hDirAC->hParamIsm->band_grouping[band_idx]; + brange[1] = hDirAC->hParamIsm->band_grouping[band_idx + 1]; + + azimuth[0] = (int16_t) roundf( hDirAC->azimuth_values[hDirAC->hParamIsm->obj_indices[band_idx][0][0]] ); + elevation[0] = (int16_t) roundf( hDirAC->elevation_values[hDirAC->hParamIsm->obj_indices[band_idx][0][0]] ); + power_ratio[0] = hDirAC->power_ratios[band_idx][0][0]; + + azimuth[1] = (int16_t) roundf( hDirAC->azimuth_values[hDirAC->hParamIsm->obj_indices[band_idx][0][1]] ); + elevation[1] = (int16_t) roundf( hDirAC->elevation_values[hDirAC->hParamIsm->obj_indices[band_idx][0][1]] ); + power_ratio[1] = hDirAC->power_ratios[band_idx][0][1]; + + for ( sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ ) + { + for ( bin_idx = brange[0]; bin_idx < brange[1]; bin_idx++ ) + { + hDirAC->azimuth[sf_idx][bin_idx] = azimuth[0]; + hDirAC->elevation[sf_idx][bin_idx] = elevation[0]; + hDirAC->energy_ratio1[sf_idx][bin_idx] = power_ratio[0]; + hDirAC->azimuth2[sf_idx][bin_idx] = azimuth[1]; + hDirAC->elevation2[sf_idx][bin_idx] = elevation[1]; + hDirAC->energy_ratio2[sf_idx][bin_idx] = power_ratio[1]; + } + } + } + for ( sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ ) + { + for ( bin_idx = 0; bin_idx < nBins; bin_idx++ ) + { + hDirAC->spreadCoherence[sf_idx][bin_idx] = 0.0f; + hDirAC->spreadCoherence2[sf_idx][bin_idx] = 0.0f; + hDirAC->surroundingCoherence[sf_idx][bin_idx] = 0.0; + } } } } @@ -1002,221 +1128,3 @@ void ivas_param_ism_params_to_masa_param_mapping( return; } - - -/*-------------------------------------------------------------------------* - * ivas_ism_bitrate_switching() - * - * - *-------------------------------------------------------------------------*/ - -static ivas_error ivas_ism_bitrate_switching( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - const int16_t nchan_transport_old, /* i : last number of transport channels */ - const ISM_MODE last_ism_mode, /* i : last ISM mode */ - const int16_t num_obj /* i : number of objects in the bitstream */ -) -{ - ivas_error error; - int32_t element_brate_tmp[MAX_NUM_OBJECTS]; - - error = IVAS_ERR_OK; - - ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, num_obj, NULL, NULL, NULL, element_brate_tmp, NULL, NULL ); - st_ivas->nSCE = st_ivas->nchan_transport; - - ivas_corecoder_dec_reconfig( st_ivas, nchan_transport_old, 0, nchan_transport_old, 0 ); - - ivas_hp20_dec_reconfig( st_ivas, nchan_transport_old ); - - /* Initialize the needed renderer struct and destroy the unnecessary renderer struct */ - - /* select the renderer */ - ivas_renderer_select( st_ivas ); - ivas_output_init( &( st_ivas->hIntSetup ), st_ivas->intern_config ); - if ( ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) && ( st_ivas->ism_mode == ISM_MODE_DISC ) ) - { - ivas_output_init( &( st_ivas->hIntSetup ), st_ivas->hDecoderConfig->output_config ); - } - - if ( st_ivas->ism_mode != last_ism_mode ) - { - /* EFAP handle */ - efap_free_data( &st_ivas->hEFAPdata ); - } - - if ( st_ivas->ism_mode == ISM_MODE_DISC && last_ism_mode == ISM_MODE_PARAM ) - { - /* switching from ParamISM to DiscISM */ - - /* Deallocate the ParamISM struct */ - if ( st_ivas->hDirAC != NULL ) - { - ivas_param_ism_dec_close( st_ivas->hDirAC, st_ivas->hDecoderConfig->output_config ); - st_ivas->hDirAC = NULL; - } - - if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL ) - { - /* close the parametric binaural renderer */ - ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin ); - - /* Open the TD Binaural renderer */ - ivas_td_binaural_open( st_ivas ); - } - else - { - /* close the ISM renderer and reinitialize */ - if ( st_ivas->hIsmRendererData != NULL ) - { - count_free( st_ivas->hIsmRendererData ); - st_ivas->hIsmRendererData = NULL; - } - ivas_ism_renderer_open( st_ivas ); - } - - if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM ) - { - /* close the parametric binaural renderer */ - ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin ); - - /* Open Crend Binaural renderer */ - ivas_crend_open( st_ivas ); - } - } - - if ( st_ivas->ism_mode == ISM_MODE_PARAM && last_ism_mode == ISM_MODE_DISC ) - { - /* switching from Discrete ISM to ParamISM */ - - /* Allocate and initialize the ParamISM struct */ - ivas_param_ism_dec_open( st_ivas ); - - if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL ) - { - /* open the parametric binaural renderer */ - ivas_dirac_dec_init_binaural_data( st_ivas ); - - /* Close the TD Binaural renderer */ - if ( st_ivas->hBinRendererTd != NULL ) - { - ivas_td_binaural_close( &st_ivas->hBinRendererTd ); - } - - if ( st_ivas->hHrtfTD != NULL ) - { - st_ivas->hHrtfTD = NULL; - } - } - else - { - /* Close the ISM renderer */ - if ( st_ivas->hIsmRendererData != NULL ) - { - count_free( st_ivas->hIsmRendererData ); - st_ivas->hIsmRendererData = NULL; - } - } - - if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM ) - { - /* open the parametric binaural renderer */ - ivas_dirac_dec_init_binaural_data( st_ivas ); - - /* close the crend binaural renderer */ - ivas_crend_close( st_ivas ); - - if ( st_ivas->hHrtf != NULL ) - { - st_ivas->hHrtf = NULL; - } - } - } - - return error; -} - -/*------------------------------------------------------------------------- - * ivas_ism_dec_config() - * - * - select ISM format mode - * - reconfigure the ISM format decoder - *-------------------------------------------------------------------------*/ - -/*! r : ISM format mode */ -ivas_error ivas_ism_dec_config( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - const int16_t num_obj /* i : number of objects in the bitstream */ -) -{ - int32_t ivas_total_brate; - ISM_MODE last_ism_mode; - ivas_error error; - int16_t nchan_transport_old; - - error = IVAS_ERR_OK; - - ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; - - /* store last frame ISM mode */ - last_ism_mode = st_ivas->ism_mode; - /* Assumes that num of input objects are constant */ - nchan_transport_old = num_obj; - if ( last_ism_mode == ISM_MODE_PARAM ) - { - nchan_transport_old = 2; - } - - if ( !st_ivas->bfi && ivas_total_brate != IVAS_SID_5k2 && ivas_total_brate != FRAME_NO_DATA ) - { - /* select ISM format mode */ - st_ivas->ism_mode = ivas_ism_mode_select( num_obj, ivas_total_brate ); - - st_ivas->nchan_transport = num_obj; - if ( st_ivas->ism_mode == ISM_MODE_PARAM ) - { - st_ivas->nchan_transport = 2; - if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) - { - st_ivas->hDecoderConfig->nchan_out = num_obj; - } - } - - if ( st_ivas->ini_active_frame != 0 ) - { - /* ISM bit-rate switching */ - if ( st_ivas->hDecoderConfig->last_ivas_total_brate != IVAS_SID_5k2 && st_ivas->hDecoderConfig->last_ivas_total_brate != FRAME_NO_DATA ) - { - if ( ( st_ivas->ism_mode != last_ism_mode ) || ( st_ivas->hDecoderConfig->ivas_total_brate != st_ivas->hDecoderConfig->last_ivas_total_brate ) ) - { - ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode, num_obj ); - } - } - } - } - else if ( !st_ivas->bfi && ivas_total_brate == IVAS_SID_5k2 ) - { - st_ivas->nchan_transport = num_obj; - } - - switch ( num_obj ) - { - case 1: - st_ivas->transport_config = AUDIO_CONFIG_ISM1; - break; - case 2: - st_ivas->transport_config = AUDIO_CONFIG_ISM2; - break; - case 3: - st_ivas->transport_config = AUDIO_CONFIG_ISM3; - break; - case 4: - st_ivas->transport_config = AUDIO_CONFIG_ISM4; - break; - default: - st_ivas->transport_config = AUDIO_CONFIG_INVALID; - break; - } - - return error; -} diff --git a/lib_dec/ivas_ism_renderer.c b/lib_dec/ivas_ism_renderer.c index f27d49b111..1e60143cb4 100644 --- a/lib_dec/ivas_ism_renderer.c +++ b/lib_dec/ivas_ism_renderer.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -29,12 +29,13 @@ the United Nations Convention on Contracts on the International Sales of Goods. *******************************************************************************************************/ -// VE2AT: move to lib_rend ? + #include #include "options.h" #include "ivas_cnst.h" -#include "ivas_prot.h" #include "prot.h" +#include "ivas_prot.h" +#include "ivas_prot_rend.h" #include "ivas_stat_com.h" #include "ivas_rom_com.h" #include "ivas_rom_dec.h" @@ -42,7 +43,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------------* @@ -61,7 +62,7 @@ ivas_error ivas_ism_renderer_open( error = IVAS_ERR_OK; - if ( ( st_ivas->hIsmRendererData = (ISM_RENDERER_HANDLE) count_malloc( sizeof( ISM_RENDERER_DATA ) ) ) == NULL ) + if ( ( st_ivas->hIsmRendererData = (ISM_RENDERER_HANDLE) malloc( sizeof( ISM_RENDERER_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ISM renderer\n" ) ); } @@ -82,7 +83,7 @@ ivas_error ivas_ism_renderer_open( interpolator_length = (uint16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC ); for ( i = 0; i < interpolator_length; i++ ) { - st_ivas->hIsmRendererData->interpolator[i] = (float) i / ( (float) interpolator_length ); + st_ivas->hIsmRendererData->interpolator[i] = (float) i / ( (float) interpolator_length - 1 ); } return error; @@ -106,11 +107,11 @@ void ivas_ism_render( float tmp_output_f[MAX_OUTPUT_CHANNELS][L_FRAME48k]; float gains[MAX_NUM_OBJECTS][MAX_OUTPUT_CHANNELS]; float g1, g2; - int16_t num_objects, nchan_out_woLFE, lfe_index; + int16_t nchan_ism, nchan_out_woLFE, lfe_index; int16_t azimuth, elevation; float Rmat[3][3]; - num_objects = st_ivas->nchan_transport; + nchan_ism = st_ivas->nchan_ism; nchan_out_woLFE = st_ivas->hIntSetup.nchan_out_woLFE; lfe_index = 0; @@ -120,7 +121,7 @@ void ivas_ism_render( set_f( tmp_output_f[j], 0.0f, output_frame ); } - for ( i = 0; i < num_objects; i++ ) + for ( i = 0; i < nchan_ism; i++ ) { mvr2r( output_f[i], input_f[i], output_frame ); } @@ -136,40 +137,14 @@ void ivas_ism_render( QuatToRotMat( st_ivas->hHeadTrackData->Quaternions[st_ivas->hHeadTrackData->num_quaternions++], Rmat ); } - for ( i = 0; i < num_objects; i++ ) + for ( i = 0; i < nchan_ism; i++ ) { if ( st_ivas->intern_config == AUDIO_CONFIG_STEREO ) { - float aziRad, eleRad; - float y, mappedX, aziRadMapped, A, A2, A3; - const float LsAngleRad = 30.0f * PI_OVER_180; - - /* Convert azi and ele to an azi value of the cone of confusion */ - aziRad = st_ivas->hIsmMetaData[i]->azimuth * PI_OVER_180; - eleRad = st_ivas->hIsmMetaData[i]->elevation * PI_OVER_180; - y = ( sinf( aziRad ) * cosf( eleRad ) ); - mappedX = sqrtf( max( 0.0f, 1.0f - ( y * y ) ) ); - aziRadMapped = atan2f( y, mappedX ); - - /* Determine the amplitude panning gains */ - if ( aziRadMapped >= LsAngleRad ) - { /* Left side */ - gains[i][0] = 1.0f; - gains[i][1] = 0.0f; - } - else if ( aziRadMapped <= -LsAngleRad ) - { /* Right side */ - gains[i][0] = 0.0f; - gains[i][1] = 1.0f; - } - else /* Tangent panning law */ - { - A = tanf( aziRadMapped ) / tanf( LsAngleRad ); - A2 = ( A - 1.0f ) / max( 0.001f, A + 1.0f ); - A3 = 1.0f / ( A2 * A2 + 1.0f ); - gains[i][0] = sqrtf( A3 ); - gains[i][1] = sqrtf( 1.0f - A3 ); - } + ivas_ism_get_stereo_gains( st_ivas->hIsmMetaData[i]->azimuth, + st_ivas->hIsmMetaData[i]->elevation, + &gains[i][0], + &gains[i][1] ); } else { @@ -180,8 +155,9 @@ void ivas_ism_render( } else { - azimuth = (int16_t) ( st_ivas->hIsmMetaData[i]->azimuth + 0.5f ); - elevation = (int16_t) ( st_ivas->hIsmMetaData[i]->elevation + 0.5f ); + // TODO tmu review when #215 is resolved + azimuth = (int16_t) floorf( st_ivas->hIsmMetaData[i]->azimuth + 0.5f ); + elevation = (int16_t) floorf( st_ivas->hIsmMetaData[i]->elevation + 0.5f ); if ( st_ivas->hIntSetup.is_planar_setup ) { @@ -211,6 +187,7 @@ void ivas_ism_render( st_ivas->hIsmRendererData->prev_gains[i][j] = gains[i][j]; } } + /* Move to output skipping LFE */ for ( j = 0, j2 = 0; j < nchan_out_woLFE; j++, j2++ ) { @@ -220,5 +197,54 @@ void ivas_ism_render( } mvr2r( tmp_output_f[j], output_f[j2], output_frame ); } + + return; +} + + +/*-------------------------------------------------------------------------* + * ivas_ism_get_stereo_gains() + * + * + *-------------------------------------------------------------------------*/ + +void ivas_ism_get_stereo_gains( + const float azimuth, /* i : object azimuth */ + const float elevation, /* i : object elevation */ + float *left_gain, /* o : left channel gain */ + float *right_gain /* o : right channel gain */ +) +{ + float aziRad, eleRad; + float y, mappedX, aziRadMapped, A, A2, A3; + const float LsAngleRad = 30.0f * PI_OVER_180; + + /* Convert azi and ele to an azi value of the cone of confusion */ + aziRad = azimuth * PI_OVER_180; + eleRad = elevation * PI_OVER_180; + y = ( sinf( aziRad ) * cosf( eleRad ) ); + mappedX = sqrtf( max( 0.0f, 1.0f - ( y * y ) ) ); + aziRadMapped = atan2f( y, mappedX ); + + /* Determine the amplitude panning gains */ + if ( aziRadMapped >= LsAngleRad ) + { /* Left side */ + *left_gain = 1.0f; + *right_gain = 0.0f; + } + else if ( aziRadMapped <= -LsAngleRad ) + { /* Right side */ + *left_gain = 0.0f; + *right_gain = 1.0f; + } + else /* Tangent panning law */ + { + A = tanf( aziRadMapped ) / tanf( LsAngleRad ); + A2 = ( A - 1.0f ) / max( 0.001f, A + 1.0f ); + A3 = 1.0f / ( A2 * A2 + 1.0f ); + *left_gain = sqrtf( A3 ); + *right_gain = sqrtf( 1.0f - A3 ); + } + return; } diff --git a/lib_dec/ivas_lfe_dec.c b/lib_dec/ivas_lfe_dec.c index a909801b8f..5c250286ee 100644 --- a/lib_dec/ivas_lfe_dec.c +++ b/lib_dec/ivas_lfe_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include "ivas_prot.h" #include "ivas_rom_com.h" #include "math.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------------------------* @@ -350,9 +350,9 @@ void ivas_lfe_dec( *-------------------------------------------------------------------------*/ ivas_error ivas_create_lfe_dec( - LFE_DEC_HANDLE *hLFE_out, /* o : IVAS LFE decoder structure */ - const int32_t output_Fs, /* i : output sampling rate */ - const float add_delay_s /* i : additional LFE delay to sync with binaural filter */ + LFE_DEC_HANDLE *hLFE_out, /* o : IVAS LFE decoder structure */ + const int32_t output_Fs, /* i : output sampling rate */ + const int32_t binauralization_delay_ns /* i : additional LFE delay to sync with binaural renderer */ ) { float low_pass_delay_dec_out, block_offset_s; @@ -361,6 +361,7 @@ ivas_error ivas_create_lfe_dec( LFE_DEC_HANDLE hLFE; float lfe_addl_delay_s; int16_t i, j; + int16_t add_delay_sa; low_pass_delay_dec_out = 0; block_offset_s = 0; @@ -371,7 +372,7 @@ ivas_error ivas_create_lfe_dec( * Allocate LFE handle *-----------------------------------------------------------------*/ - if ( ( hLFE = (LFE_DEC_HANDLE) count_malloc( sizeof( LFE_DEC_DATA ) ) ) == NULL ) + if ( ( hLFE = (LFE_DEC_HANDLE) malloc( sizeof( LFE_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LFE\n" ) ); } @@ -380,7 +381,7 @@ ivas_error ivas_create_lfe_dec( * LFE Window: allocate and initialize *-----------------------------------------------------------------*/ - if ( ( hLFE->pWindow_state = (LFE_WINDOW_HANDLE) count_malloc( sizeof( LFE_WINDOW_DATA ) ) ) == NULL ) + if ( ( hLFE->pWindow_state = (LFE_WINDOW_HANDLE) malloc( sizeof( LFE_WINDOW_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LFE window structure\n" ) ); } @@ -436,12 +437,13 @@ ivas_error ivas_create_lfe_dec( lfe_addl_delay_s = block_offset_s - hLFE->lfe_block_delay_s; lfe_addl_delay_s = max( 0.0f, lfe_addl_delay_s ); - hLFE->lfe_addl_delay = (int16_t) ( lfe_addl_delay_s * output_Fs ) + (int16_t) roundf( add_delay_s * output_Fs ); - hLFE->lfe_block_delay_s += lfe_addl_delay_s + add_delay_s; + add_delay_sa = (int16_t) roundf( (float) binauralization_delay_ns * output_Fs / 1000000000.f ); + hLFE->lfe_addl_delay = (int16_t) ( lfe_addl_delay_s * output_Fs ) + add_delay_sa; + hLFE->lfe_block_delay_s += lfe_addl_delay_s + add_delay_sa / output_Fs; if ( hLFE->lfe_addl_delay > 0 ) { - if ( ( hLFE->lfe_delay_buf = (float *) count_malloc( hLFE->lfe_addl_delay * sizeof( float ) ) ) == NULL ) + if ( ( hLFE->lfe_delay_buf = (float *) malloc( hLFE->lfe_addl_delay * sizeof( float ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LFE additional delay buffer\n" ) ); } @@ -475,19 +477,25 @@ ivas_error ivas_create_lfe_dec( *-------------------------------------------------------------------------*/ void ivas_lfe_dec_close( - LFE_DEC_HANDLE hLFE /* i/o: LFE decoder handle */ + LFE_DEC_HANDLE *hLFE /* i/o: LFE decoder handle */ ) { - count_free( hLFE->pWindow_state ); - hLFE->pWindow_state = NULL; + if ( hLFE == NULL || *hLFE == NULL ) + { + return; + } - if ( hLFE->lfe_delay_buf != NULL ) + free( ( *hLFE )->pWindow_state ); + ( *hLFE )->pWindow_state = NULL; + + if ( ( *hLFE )->lfe_delay_buf != NULL ) { - count_free( hLFE->lfe_delay_buf ); - hLFE->lfe_delay_buf = NULL; + free( ( *hLFE )->lfe_delay_buf ); + ( *hLFE )->lfe_delay_buf = NULL; } - count_free( hLFE ); + free( ( *hLFE ) ); + ( *hLFE ) = NULL; return; } diff --git a/lib_dec/ivas_lfe_plc.c b/lib_dec/ivas_lfe_plc.c index 71d1aa7a5e..7e63c2d539 100644 --- a/lib_dec/ivas_lfe_plc.c +++ b/lib_dec/ivas_lfe_plc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------------------------* * Local constants diff --git a/lib_rend/ivas_ls_custom_dec.c b/lib_dec/ivas_ls_custom_dec.c similarity index 93% rename from lib_rend/ivas_ls_custom_dec.c rename to lib_dec/ivas_ls_custom_dec.c index 28bd8c1dd8..ef3698ab8c 100644 --- a/lib_rend/ivas_ls_custom_dec.c +++ b/lib_dec/ivas_ls_custom_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -29,7 +29,6 @@ the United Nations Convention on Contracts on the International Sales of Goods. *******************************************************************************************************/ - #include #include "options.h" #include "ivas_prot.h" @@ -37,7 +36,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------* @@ -51,7 +50,7 @@ ivas_error ivas_ls_custom_open( ) { /* Allocate handle */ - if ( ( *hLsSetupCustom = (LSSETUP_CUSTOM_HANDLE) count_malloc( sizeof( LSSETUP_CUSTOM_STRUCT ) ) ) == NULL ) + if ( ( *hLsSetupCustom = (LSSETUP_CUSTOM_HANDLE) malloc( sizeof( LSSETUP_CUSTOM_STRUCT ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Custom LS layout memory\n" ) ); } @@ -92,8 +91,8 @@ void ivas_ls_custom_setup( hOutSetup->num_lfe = hLsSetupCustom->num_lfe; hOutSetup->index_lfe[0] = hLsSetupCustom->lfe_idx[0]; /* IVAS_OUTPUT_SETUP only supports 1 LFE */ - hOutSetup->is_loudspeaker_setup = true; - hOutSetup->is_planar_setup = (uint8_t) hLsSetupCustom->is_planar_setup; + hOutSetup->is_loudspeaker_setup = TRUE; + hOutSetup->is_planar_setup = (int8_t) hLsSetupCustom->is_planar_setup; return; } diff --git a/lib_dec/ivas_masa_dec.c b/lib_dec/ivas_masa_dec.c index 3df3784405..2c87109f6e 100644 --- a/lib_dec/ivas_masa_dec.c +++ b/lib_dec/ivas_masa_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,12 +42,13 @@ #include "debug.h" #endif #include -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------* * Local constants *-----------------------------------------------------------------------*/ -#define SPAR_META_DELAY_SUBFRAMES 2 /* Number of subframes to delay the SPAR metadata */ +#define SPAR_META_DELAY_SUBFRAMES 2 /* Number of subframes to delay the SPAR metadata */ +#define SPH_IDX_FRONT ( MASA_NO_POINTS_EQUATOR / 2 ) /* Spherical index corresponding to front direction for setting as default value */ /*-----------------------------------------------------------------------* * Local function prototypes @@ -57,12 +58,13 @@ static int16_t quantize_theta( float x, int16_t no_cb, float *xhat ); static uint16_t index_theta_phi_16( float theta, float phi, SPHERICAL_GRID_DATA *Sph_Grid16 ); static int16_t quantize_phi_masa( float phi, int16_t flag_delta, float *phi_hat, const int16_t n ); static void index_16bits( IVAS_QMETADATA_HANDLE hQMetaData, SPHERICAL_GRID_DATA *Sph_Grid16 ); +static void create_masa_ext_out_meta( MASA_DECODER *hMasa, IVAS_QMETADATA_HANDLE hQMetaData, const int16_t nchan_transport ); static void replicate_subframes( IVAS_QMETADATA_HANDLE hQMetaData ); static void restore_lowbitrate_masa( IVAS_QMETADATA_HANDLE hQMetaData, const int16_t low_bitrate_mode, const int16_t numCodingBands ); -static void init_lfe_synth_data( Decoder_Struct *st_ivas, MASA_DECODER_HANDLE hMasa ); +static ivas_error init_lfe_synth_data( Decoder_Struct *st_ivas, MASA_DECODER_HANDLE hMasa ); static void compute_foa_cov_matrix( float foaCov[FOA_CHANNELS][FOA_CHANNELS], float inCov[FOA_CHANNELS][FOA_CHANNELS], float mixMtx[FOA_CHANNELS][FOA_CHANNELS] ); @@ -169,7 +171,6 @@ ivas_error ivas_masa_decode( return error; } - /* If we are under metadata bit budget limit and joined subframes is not signalled, then read LBR mode. */ if ( hMasa->config.max_metadata_bits < MINIMUM_BIT_BUDGET_NORMAL_META && hMasa->config.joinedSubframes == FALSE ) { @@ -236,7 +237,6 @@ ivas_error ivas_masa_decode( return error; } - hQMetaData->numTwoDirBands = hMasa->config.numTwoDirBands; hQMetaData->useLowerRes = 0; @@ -254,8 +254,7 @@ ivas_error ivas_masa_decode( } tmp_elem_mode = -1; - *nb_bits_read += ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), st_ivas->nchan_transport, &tmp_elem_mode, ivas_format, - SBA_MODE_NONE ); + *nb_bits_read += ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), st_ivas->nchan_transport, &tmp_elem_mode, ivas_format, SBA_MODE_NONE ); if ( st_ivas->nchan_transport == 2 ) { @@ -276,8 +275,7 @@ ivas_error ivas_masa_decode( } if ( st_ivas->hDirAC != NULL ) { - ivas_qmetadata_to_dirac( hQMetaData, st_ivas->hDirAC, hMasa, ivas_total_brate, - SBA_MODE_NONE, 0 ); + ivas_qmetadata_to_dirac( hQMetaData, st_ivas->hDirAC, hMasa, ivas_total_brate, SBA_MODE_NONE, 0 ); } st->next_bit_pos = next_bit_pos_orig; @@ -306,6 +304,11 @@ ivas_error ivas_masa_decode( } } + if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) + { + create_masa_ext_out_meta( hMasa, hQMetaData, st_ivas->nchan_transport ); + } + return error /* *nb_bits_read*/; } @@ -321,8 +324,11 @@ ivas_error ivas_masa_dec_open( ) { MASA_DECODER_HANDLE hMasa; + ivas_error error; + + error = IVAS_ERR_OK; - if ( ( hMasa = (MASA_DECODER_HANDLE) count_malloc( sizeof( MASA_DECODER ) ) ) == NULL ) + if ( ( hMasa = (MASA_DECODER_HANDLE) malloc( sizeof( MASA_DECODER ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA decoder\n" ) ); } @@ -337,17 +343,26 @@ ivas_error ivas_masa_dec_open( /* Create spherical grid only for external output */ if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) { - hMasa->data.sph_grid16 = (SPHERICAL_GRID_DATA *) count_malloc( sizeof( SPHERICAL_GRID_DATA ) ); + if ( ( hMasa->data.sph_grid16 = (SPHERICAL_GRID_DATA *) malloc( sizeof( SPHERICAL_GRID_DATA ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA decoder\n" ) ); + } + generate_gridEq( hMasa->data.sph_grid16 ); + if ( ( hMasa->data.extOutMeta = (MASA_DECODER_EXT_OUT_META *) malloc( sizeof( MASA_DECODER_EXT_OUT_META ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA decoder\n" ) ); + } } else { hMasa->data.sph_grid16 = NULL; + hMasa->data.extOutMeta = NULL; } if ( st_ivas->mc_mode == MC_MODE_MCMASA ) { - init_lfe_synth_data( st_ivas, hMasa ); + error = init_lfe_synth_data( st_ivas, hMasa ); } else { @@ -356,7 +371,7 @@ ivas_error ivas_masa_dec_open( st_ivas->hMasa = hMasa; - return IVAS_ERR_OK; + return error; } @@ -367,44 +382,59 @@ ivas_error ivas_masa_dec_open( *-----------------------------------------------------------------------*/ void ivas_masa_dec_close( - MASA_DECODER_HANDLE hMasa /* i/o: MASA metadata structure */ + MASA_DECODER_HANDLE *hMasa_out /* i/o: MASA metadata structure */ ) { + MASA_DECODER_HANDLE hMasa; + + if ( hMasa_out == NULL || *hMasa_out == NULL ) + { + return; + } + + hMasa = *hMasa_out; + /* Free spherical grid memory if in use */ if ( hMasa->data.sph_grid16 != NULL ) { - count_free( hMasa->data.sph_grid16 ); + free( hMasa->data.sph_grid16 ); hMasa->data.sph_grid16 = NULL; } + if ( hMasa->data.extOutMeta != NULL ) + { + free( hMasa->data.extOutMeta ); + hMasa->data.extOutMeta = NULL; + } + if ( hMasa->hMasaLfeSynth != NULL ) { if ( hMasa->hMasaLfeSynth->lfeSynthRingBuffer != NULL ) { - count_free( hMasa->hMasaLfeSynth->lfeSynthRingBuffer ); + free( hMasa->hMasaLfeSynth->lfeSynthRingBuffer ); hMasa->hMasaLfeSynth->lfeSynthRingBuffer = NULL; } if ( hMasa->hMasaLfeSynth->lfeSynthRingBuffer2 != NULL ) { - count_free( hMasa->hMasaLfeSynth->lfeSynthRingBuffer2 ); + free( hMasa->hMasaLfeSynth->lfeSynthRingBuffer2 ); hMasa->hMasaLfeSynth->lfeSynthRingBuffer2 = NULL; } if ( hMasa->hMasaLfeSynth->delayBuffer_syncLp != NULL ) { - count_free( hMasa->hMasaLfeSynth->delayBuffer_syncLp ); + free( hMasa->hMasaLfeSynth->delayBuffer_syncLp ); hMasa->hMasaLfeSynth->delayBuffer_syncLp = NULL; } if ( hMasa->hMasaLfeSynth->delayBuffer_syncDirAC != NULL ) { - count_free( hMasa->hMasaLfeSynth->delayBuffer_syncDirAC ); + free( hMasa->hMasaLfeSynth->delayBuffer_syncDirAC ); hMasa->hMasaLfeSynth->delayBuffer_syncDirAC = NULL; } - count_free( hMasa->hMasaLfeSynth ); + free( hMasa->hMasaLfeSynth ); hMasa->hMasaLfeSynth = NULL; } - count_free( hMasa ); - hMasa = NULL; + free( *hMasa_out ); + *hMasa_out = NULL; return; } @@ -425,7 +455,6 @@ static ivas_error ivas_masa_dec_config( ivas_error error; error = IVAS_ERR_OK; - hMasa = st_ivas->hMasa; ivas_masa_set_elements( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->mc_mode, st_ivas->nchan_transport, st_ivas->hQMetaData, &st_ivas->element_mode_init, &st_ivas->nSCE, &st_ivas->nCPE ); @@ -440,7 +469,6 @@ static ivas_error ivas_masa_dec_config( return error; } - st_ivas->hQMetaData->numTwoDirBands = st_ivas->hMasa->config.numTwoDirBands; st_ivas->hQMetaData->useLowerRes = 0; @@ -461,7 +489,15 @@ static ivas_error ivas_masa_dec_config( ivas_set_qmetadata_maxbit_req( st_ivas->hQMetaData, st_ivas->ivas_format ); - masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, st_ivas->hQMetaData, st_ivas->hDecoderConfig->output_Fs ); + if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) + { + /* need to apply the sampling rate correction also for the EXT output MASA meta buffer */ + masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, st_ivas->hQMetaData, st_ivas->hDecoderConfig->output_Fs, hMasa->data.extOutMeta ); + } + else + { + masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, st_ivas->hQMetaData, st_ivas->hDecoderConfig->output_Fs, NULL ); + } return error; } @@ -792,7 +828,7 @@ static void restore_lowbitrate_masa( } -static void init_lfe_synth_data( +static ivas_error init_lfe_synth_data( Decoder_Struct *st_ivas, /* i : IVAS decoder struct */ MASA_DECODER_HANDLE hMasa /* i/o: MASA decoder structure */ ) @@ -803,7 +839,10 @@ static void init_lfe_synth_data( output_Fs = st_ivas->hDecoderConfig->output_Fs; output_config = st_ivas->hDecoderConfig->output_config; - hMasa->hMasaLfeSynth = (MCMASA_LFE_SYNTH_DATA_HANDLE) count_malloc( sizeof( MCMASA_LFE_SYNTH_DATA ) ); + if ( ( hMasa->hMasaLfeSynth = (MCMASA_LFE_SYNTH_DATA_HANDLE) malloc( sizeof( MCMASA_LFE_SYNTH_DATA ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA decoder\n" ) ); + } hMasa->hMasaLfeSynth->transportEneSmooth = 0.0f; hMasa->hMasaLfeSynth->protoLfeEneSmooth = 0.0f; @@ -827,7 +866,10 @@ static void init_lfe_synth_data( /* Ring buffer for the filterbank of the LFE synthesis. * The filterbank is using moving average lowpass filter with the crossover of 120 Hz. */ bufferSize = (int16_t) ( ( output_Fs / FRAMES_PER_SEC ) / MAX_PARAM_SPATIAL_SUBFRAMES ); - hMasa->hMasaLfeSynth->lfeSynthRingBuffer = (float *) count_malloc( bufferSize * sizeof( float ) ); + if ( ( hMasa->hMasaLfeSynth->lfeSynthRingBuffer = (float *) malloc( bufferSize * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA decoder\n" ) ); + } set_zero( hMasa->hMasaLfeSynth->lfeSynthRingBuffer, bufferSize ); hMasa->hMasaLfeSynth->ringBufferLoPointer = 0; hMasa->hMasaLfeSynth->ringBufferHiPointer = bufferSize / 2; @@ -837,7 +879,10 @@ static void init_lfe_synth_data( /* Ring buffer for additional lowpass filter for the LFE signal. * Moving average lowpass filter with the crossover of 240 Hz. */ bufferSize /= 2; - hMasa->hMasaLfeSynth->lfeSynthRingBuffer2 = (float *) count_malloc( bufferSize * sizeof( float ) ); + if ( ( hMasa->hMasaLfeSynth->lfeSynthRingBuffer2 = (float *) malloc( bufferSize * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA decoder\n" ) ); + } set_zero( hMasa->hMasaLfeSynth->lfeSynthRingBuffer2, bufferSize ); hMasa->hMasaLfeSynth->ringBufferLoPointer2 = 0; hMasa->hMasaLfeSynth->lowpassSum2 = 0.0f; @@ -845,13 +890,19 @@ static void init_lfe_synth_data( /* Delay buffer for matching the delay of the lowpass filter */ bufferSize /= 2; /* The delay of the moving average lowpass filter is bufferSize / 2 */ - hMasa->hMasaLfeSynth->delayBuffer_syncLp = (float *) count_malloc( bufferSize * sizeof( float ) ); + if ( ( hMasa->hMasaLfeSynth->delayBuffer_syncLp = (float *) malloc( bufferSize * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA decoder\n" ) ); + } set_zero( hMasa->hMasaLfeSynth->delayBuffer_syncLp, bufferSize ); hMasa->hMasaLfeSynth->delayBuffer_syncLp_size = bufferSize; /* Delay buffer for syncing with DirAC rendering */ bufferSize = NS2SA( output_Fs, IVAS_FB_DEC_DELAY_NS ) - hMasa->hMasaLfeSynth->ringBufferSize / 2 - hMasa->hMasaLfeSynth->ringBufferSize2 / 2; - hMasa->hMasaLfeSynth->delayBuffer_syncDirAC = (float *) count_malloc( bufferSize * sizeof( float ) ); + if ( ( hMasa->hMasaLfeSynth->delayBuffer_syncDirAC = (float *) malloc( bufferSize * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA decoder\n" ) ); + } set_zero( hMasa->hMasaLfeSynth->delayBuffer_syncDirAC, bufferSize ); hMasa->hMasaLfeSynth->delayBuffer_syncDirAC_size = bufferSize; @@ -870,7 +921,10 @@ static void init_lfe_synth_data( /* Delay buffer for syncing with DirAC rendering */ bufferSize = NS2SA( output_Fs, IVAS_FB_DEC_DELAY_NS ); - hMasa->hMasaLfeSynth->delayBuffer_syncDirAC = (float *) count_malloc( bufferSize * sizeof( float ) ); + if ( ( hMasa->hMasaLfeSynth->delayBuffer_syncDirAC = (float *) malloc( bufferSize * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA decoder\n" ) ); + } set_zero( hMasa->hMasaLfeSynth->delayBuffer_syncDirAC, bufferSize ); hMasa->hMasaLfeSynth->delayBuffer_syncDirAC_size = bufferSize; @@ -886,7 +940,7 @@ static void init_lfe_synth_data( hMasa->hMasaLfeSynth->delayBuffer_syncDirAC = NULL; } - return; + return IVAS_ERR_OK; } @@ -1023,6 +1077,9 @@ ivas_error ivas_masa_dec_reconfigure( uint16_t *bit_stream; Decoder_State **sts; int32_t ivas_total_brate, last_ivas_total_brate; +#ifdef FIX_417_TD_DECORR_BRATE_SW + int16_t numCldfbAnalyses_old, numCldfbSyntheses_old; +#endif ivas_error error; error = IVAS_ERR_OK; @@ -1030,8 +1087,12 @@ ivas_error ivas_masa_dec_reconfigure( ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; last_ivas_total_brate = st_ivas->hDecoderConfig->last_ivas_total_brate; +#ifdef FIX_417_TD_DECORR_BRATE_SW + ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old ); +#endif + /*-----------------------------------------------------------------* - * Allocate and initalize SCE/CPE and other handles + * Allocate and initialize SCE/CPE and other handles *-----------------------------------------------------------------*/ bit_stream = st_ivas->hSCE[0] != NULL ? st_ivas->hSCE[0]->hCoreCoder[0]->bit_stream : st_ivas->hCPE[0]->hCoreCoder[0]->bit_stream; @@ -1087,6 +1148,33 @@ ivas_error ivas_masa_dec_reconfigure( } } +#ifdef FIX_417_TD_DECORR_BRATE_SW + /*-----------------------------------------------------------------* + * TD Decorrelator + *-----------------------------------------------------------------*/ + + if ( st_ivas->hDiracDecBin != NULL ) + { + if ( ( error = ivas_td_decorr_reconfig_dec( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hDecoderConfig->output_Fs, &( st_ivas->hDiracDecBin->hTdDecorr ), &( st_ivas->hDiracDecBin->useTdDecorr ) ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + /*-----------------------------------------------------------------* + * CLDFB instances + *-----------------------------------------------------------------*/ + + if ( ( error = ivas_cldfb_dec_reconfig( st_ivas, st_ivas->nchan_transport, numCldfbAnalyses_old, numCldfbSyntheses_old ) ) != IVAS_ERR_OK ) + { + return error; + } + + /*-----------------------------------------------------------------* + * Set-up MASA coding elements and bitrates + *-----------------------------------------------------------------*/ +#endif + ivas_masa_set_elements( ivas_total_brate, st_ivas->mc_mode, st_ivas->nchan_transport, st_ivas->hQMetaData, &tmp, &tmp, &tmp ); return error; @@ -1357,3 +1445,135 @@ static void compute_foa_cov_matrix( return; } + +static void create_masa_ext_out_meta( + MASA_DECODER *hMasa, + IVAS_QMETADATA_HANDLE hQMetaData, + const int16_t nchan_transport ) +{ + const uint8_t ivasmasaFormatDescriptor[8] = { 0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 }; /* "IVASMASA" */ + int16_t i, sf, b_old, b_new, dir; + MASA_DECRIPTIVE_META *descMeta; + int16_t *bandMap; + uint8_t numCodingBands; + uint8_t numDirections; + MASA_DECODER_EXT_OUT_META *extOutMeta; + + numDirections = hMasa->config.numberOfDirections; + numCodingBands = hMasa->config.numCodingBands; + bandMap = hMasa->data.band_mapping; + extOutMeta = hMasa->data.extOutMeta; + descMeta = &hMasa->data.extOutMeta->descriptiveMeta; + + /* Construct descriptive meta */ + for ( i = 0; i < 8; i++ ) + { + descMeta->formatDescriptor[i] = ivasmasaFormatDescriptor[i]; + } + descMeta->numberOfDirections = numDirections - 1; + descMeta->numberOfChannels = (uint8_t) ( nchan_transport - 1 ); + /* Following correspond to "unknown" values until transmission is implemented */ + descMeta->sourceFormat = 0x0u; + descMeta->transportDefinition = 0x0u; + descMeta->channelAngle = 0x0u; + descMeta->channelDistance = 0x0u; + descMeta->channelLayout = 0x0u; + + /* Construct spatial metadata from qmetadata */ + for ( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ ) + { + for ( dir = 0; dir < numDirections; dir++ ) + { + /* Spherical index */ + for ( b_old = 0; b_old < numCodingBands; b_old++ ) + { + for ( b_new = bandMap[b_old]; b_new < bandMap[b_old + 1]; b_new++ ) + { + extOutMeta->directionIndex[dir][sf][b_new] = hQMetaData->q_direction[dir].band_data[b_old].spherical_index[sf]; + } + } + + /* Direct-to-total ratio */ + for ( b_old = 0; b_old < numCodingBands; b_old++ ) + { + for ( b_new = bandMap[b_old]; b_new < bandMap[b_old + 1]; b_new++ ) + { + extOutMeta->directToTotalRatio[dir][sf][b_new] = (uint8_t) floorf( hQMetaData->q_direction[dir].band_data[b_old].energy_ratio[sf] * UINT8_MAX ); + } + } + + /* Spread coherence */ + if ( hQMetaData->q_direction[dir].coherence_band_data != NULL ) + { + for ( b_old = 0; b_old < numCodingBands; b_old++ ) + { + for ( b_new = bandMap[b_old]; b_new < bandMap[b_old + 1]; b_new++ ) + { + extOutMeta->spreadCoherence[dir][sf][b_new] = hQMetaData->q_direction[dir].coherence_band_data[b_old].spread_coherence[sf]; + } + } + } + else + { + for ( i = 0; i < MASA_FREQUENCY_BANDS; i++ ) + { + extOutMeta->spreadCoherence[dir][sf][i] = 0; + } + } + } + + /* Fill second direction with zero energy data for EXT output */ + if ( numDirections == 1 ) + { + for ( i = 0; i < MASA_FREQUENCY_BANDS; i++ ) + { + extOutMeta->directionIndex[1][sf][i] = SPH_IDX_FRONT; + } + + for ( i = 0; i < MASA_FREQUENCY_BANDS; i++ ) + { + extOutMeta->directToTotalRatio[1][sf][i] = 0; + } + + for ( i = 0; i < MASA_FREQUENCY_BANDS; i++ ) + { + extOutMeta->spreadCoherence[1][sf][i] = 0; + } + } + + /* Common spatial meta */ + /* Diffuse-to-total ratio = 1 - sum(direct-to-total ratios) */ + for ( b_old = 0; b_old < numCodingBands; b_old++ ) + { + for ( b_new = bandMap[b_old]; b_new < bandMap[b_old + 1]; b_new++ ) + { + extOutMeta->diffuseToTotalRatio[sf][b_new] = UINT8_MAX; + for ( dir = 0; dir < numDirections; dir++ ) + { + extOutMeta->diffuseToTotalRatio[sf][b_new] -= (uint8_t) floorf( hQMetaData->q_direction[dir].band_data[b_old].energy_ratio[sf] * UINT8_MAX ); + } + } + } + + /* Surround coherence */ + if ( hQMetaData->surcoh_band_data != NULL ) + { + for ( b_old = 0; b_old < numCodingBands; b_old++ ) + { + for ( b_new = bandMap[b_old]; b_new < bandMap[b_old + 1]; b_new++ ) + { + extOutMeta->surroundCoherence[sf][b_new] = hQMetaData->surcoh_band_data[b_old].surround_coherence[sf]; + } + } + } + else + { + for ( i = 0; i < MASA_FREQUENCY_BANDS; i++ ) + { + extOutMeta->surroundCoherence[sf][i] = 0; + } + } + } + + return; +} diff --git a/lib_dec/ivas_mc_param_dec.c b/lib_dec/ivas_mc_param_dec.c index e33a0596eb..9b1dbfd764 100644 --- a/lib_dec/ivas_mc_param_dec.c +++ b/lib_dec/ivas_mc_param_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -32,11 +32,13 @@ #include #include "options.h" +#include #include "cnst.h" #include "rom_enc.h" #include "rom_com.h" #include "prot.h" #include "ivas_prot.h" +#include "ivas_prot_rend.h" #include "ivas_cnst.h" #include "ivas_rom_com.h" #include "ivas_rom_dec.h" @@ -47,7 +49,7 @@ #ifdef DEBUG_PLOT #include "deb_out.h" #endif -#include "wmops.h" +#include "wmc_auto.h" #include "rom_dec.h" /*-----------------------------------------------------------------------* @@ -56,13 +58,24 @@ #define PARAM_MC_LOCAL_SZ_LFE_MAP 5 +/*-----------------------------------------------------------------------* + * Local typedefs + *-----------------------------------------------------------------------*/ + +typedef struct parameter_band_mapping_struct +{ + int16_t n_source_bands[20]; + int16_t source_band_idx[20][4]; + float source_band_factor[20][4]; + +} PARAM_MC_PARAMETER_BAND_MAPPING; + /*-----------------------------------------------------------------------* * Local function prototypes *-----------------------------------------------------------------------*/ static void ivas_param_mc_dec_init( PARAM_MC_DEC_HANDLE hParamMC, const int16_t nchan_in, const int16_t nchan_out ); - static void param_mc_protoSignalComputation( float RealBuffer[PARAM_MC_MAX_TRANSPORT_CHANS][PARAM_MC_MAX_NSLOTS][CLDFB_NO_CHANNELS_MAX], float ImagBuffer[PARAM_MC_MAX_TRANSPORT_CHANS][PARAM_MC_MAX_NSLOTS][CLDFB_NO_CHANNELS_MAX], float *proto_frame_f, const PARAM_MC_DIFF_PROTO_INFO *diff_proto_info, const int16_t slot_index, const int16_t num_freq_bands ); static void ivas_param_mc_dec_copy_diffuse_proto( PARAM_MC_DEC_HANDLE hParamMC, float Cldfb_buffer_real[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float Cldfb_buffer_imag[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], const int16_t nY, const int16_t slot_idx ); @@ -83,11 +96,13 @@ static void param_mc_compute_interpolator( const uint16_t bAttackPresent, const static void param_mc_set_num_synth_bands( const int32_t output_Fs, PARAM_MC_DEC_HANDLE hParamMC ); -static void param_mc_get_diff_proto_info( const float *proto_mtx, const uint16_t nchan_transport, const uint16_t nchan_out_cov, PARAM_MC_DIFF_PROTO_INFO *p_diff_proto_info ); +static ivas_error param_mc_get_diff_proto_info( const float *proto_mtx, const uint16_t nchan_transport, const uint16_t nchan_out_cov, PARAM_MC_DIFF_PROTO_INFO *p_diff_proto_info ); static void ivas_param_mc_mc2sba_cldfb( IVAS_OUTPUT_SETUP hTransSetup, float *hoa_encoder, const int16_t slot_idx, float Cldfb_RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], float Cldfb_ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], const int16_t nBands, const float gain_lfe ); -void ivas_param_mc_bs_decode_parameter_values( uint16_t bit_buffer[], int16_t *bit_pos, const int16_t max_bits, int16_t *BER_detect, HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC, HANDLE_PARAM_MC_PARAMETER_CODING_INFO hParamCodingInfo, const int16_t map_size_wo_lfe, const int16_t map_size, const int16_t num_lfe_bands, const int16_t band_step, const int16_t num_param_bands, float *value_buffer ); +static void ivas_param_mc_get_param_band_mapping( const int16_t n_target_bands, const int16_t *target_band_grouping, const int16_t n_source_bands, const int16_t *source_band_grouping, PARAM_MC_PARAMETER_BAND_MAPPING *parameter_band_mapping ); + +static void ivas_param_mc_bs_decode_parameter_values( uint16_t bit_buffer[], int16_t *bit_pos, const int16_t max_bits, int16_t *BER_detect, HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC, HANDLE_PARAM_MC_PARAMETER_CODING_INFO hParamCodingInfo, const int16_t map_size_wo_lfe, const int16_t map_size, const int16_t num_lfe_bands, const int16_t band_step, const int16_t num_param_bands, float *value_buffer ); /*------------------------------------------------------------------------- * ivas_param_mc_dec_open() @@ -120,12 +135,12 @@ ivas_error ivas_param_mc_dec_open( * prepare library opening *-----------------------------------------------------------------*/ - if ( ( hParamMC = (PARAM_MC_DEC_HANDLE) count_malloc( sizeof( PARAM_MC_DEC_DATA ) ) ) == NULL ) + if ( ( hParamMC = (PARAM_MC_DEC_HANDLE) malloc( sizeof( PARAM_MC_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) ); } - if ( ( hParamMC->hMetadataPMC = (HANDLE_IVAS_PARAM_MC_METADATA) count_malloc( sizeof( IVAS_PARAM_MC_METADATA ) ) ) == NULL ) + if ( ( hParamMC->hMetadataPMC = (HANDLE_IVAS_PARAM_MC_METADATA) malloc( sizeof( IVAS_PARAM_MC_METADATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC metadata \n" ) ); } @@ -216,8 +231,14 @@ ivas_error ivas_param_mc_dec_open( ivas_param_mc_metadata_open( mc_ls_setup, hTransportSetup.index_lfe[0], ivas_total_brate, hParamMC->hMetadataPMC ); /* init arrays for quantized parameters */ - hParamMC->icc_q = (float *) count_malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe * sizeof( float ) ); - hParamMC->icld_q = (float *) count_malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe * sizeof( float ) ); + if ( ( hParamMC->icc_q = (float *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) ); + } + if ( ( hParamMC->icld_q = (float *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) ); + } set_f( hParamMC->icld_q, PARAM_MC_DEFAULT_MIN_ILD, hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe ); set_f( hParamMC->icc_q, 0.0f, hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe ); @@ -249,7 +270,6 @@ ivas_error ivas_param_mc_dec_open( hParamMC->max_param_band_abs_cov = ( k++ ); } - /*-----------------------------------------------------------------* * open sub-modules *-----------------------------------------------------------------*/ @@ -266,11 +286,16 @@ ivas_error ivas_param_mc_dec_open( /* convert the ls conv dmx matrix into column order matrix format (nchan_out_cldfb x nchan_out) */ if ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_LS_CONV_COV || hParamMC->synthesis_conf == PARAM_MC_SYNTH_MONO_STEREO ) { - hParamMC->ls_conv_dmx_matrix = (float *) count_malloc( nchan_out_transport * nchan_out_cov * sizeof( float ) ); + if ( ( hParamMC->ls_conv_dmx_matrix = (float *) malloc( nchan_out_transport * nchan_out_cov * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) ); + } + for ( k = 0; k < nchan_out_transport; k++ ) { mvr2r( st_ivas->hLsSetUpConversion->dmxMtx[k], &hParamMC->ls_conv_dmx_matrix[k * nchan_out_cov], nchan_out_cov ); } + /* convert ParamMC parameter bands to SFB */ if ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_MONO_STEREO ) { @@ -288,7 +313,10 @@ ivas_error ivas_param_mc_dec_open( } } - hParamMC->proto_matrix_int = (float *) count_malloc( nchan_out_transport * nchan_transport * sizeof( float ) ); + if ( ( hParamMC->proto_matrix_int = (float *) malloc( nchan_out_transport * nchan_transport * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) ); + } mvr2r( ivas_param_mc_conf[config_index].dmx_fac, hParamMC->proto_matrix_int, nchan_transport * nchan_out_transport ); if ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_LS_CONV_COV || hParamMC->synthesis_conf == PARAM_MC_SYNTH_MONO_STEREO ) @@ -333,9 +361,15 @@ ivas_error ivas_param_mc_dec_open( else { hParamMC->num_outputs_diff = nchan_out_cov; - hParamMC->diff_proto_info = (PARAM_MC_DIFF_PROTO_INFO *) count_malloc( sizeof( PARAM_MC_DIFF_PROTO_INFO ) ); + if ( ( hParamMC->diff_proto_info = (PARAM_MC_DIFF_PROTO_INFO *) malloc( sizeof( PARAM_MC_DIFF_PROTO_INFO ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) ); + } - param_mc_get_diff_proto_info( proto_matrix, nchan_transport, nchan_out_cov, hParamMC->diff_proto_info ); + if ( ( error = param_mc_get_diff_proto_info( proto_matrix, nchan_transport, nchan_out_cov, hParamMC->diff_proto_info ) ) != IVAS_ERR_OK ) + { + return error; + } /* decorrelation */ hParamMC->h_freq_domain_decorr_ap_params = NULL; @@ -343,15 +377,18 @@ ivas_error ivas_param_mc_dec_open( ivas_dirac_dec_get_frequency_axis( frequency_axis, output_Fs, hParamMC->num_freq_bands ); - ivas_dirac_dec_decorr_open( &( hParamMC->h_freq_domain_decorr_ap_params ), - &( hParamMC->h_freq_domain_decorr_ap_state ), - hParamMC->num_freq_bands, - hParamMC->num_outputs_diff, - hParamMC->diff_proto_info->num_protos_diff, - DIRAC_SYNTHESIS_COV_MC_LS, - frequency_axis, - nchan_transport, - output_Fs ); + if ( ( error = ivas_dirac_dec_decorr_open( &( hParamMC->h_freq_domain_decorr_ap_params ), + &( hParamMC->h_freq_domain_decorr_ap_state ), + hParamMC->num_freq_bands, + hParamMC->num_outputs_diff, + hParamMC->diff_proto_info->num_protos_diff, + DIRAC_SYNTHESIS_COV_MC_LS, + frequency_axis, + nchan_transport, + output_Fs ) ) != IVAS_ERR_OK ) + { + return error; + } hParamMC->h_output_synthesis_params.use_onset_filters = 0; hParamMC->max_band_decorr = hParamMC->h_freq_domain_decorr_ap_params->max_band_decorr; @@ -370,21 +407,27 @@ ivas_error ivas_param_mc_dec_open( } /* output synthesis */ - ivas_dirac_dec_output_synthesis_cov_open( &( hParamMC->h_output_synthesis_params ), - &( hParamMC->h_output_synthesis_cov_state ), - hParamMC->max_band_decorr, - PARAM_MC_MAX_NSLOTS, - hParamMC->hMetadataPMC->num_parameter_bands, - max_param_band_residual, - nchan_transport, - nchan_out_cov, - proto_matrix ); + if ( ( error = ivas_dirac_dec_output_synthesis_cov_open( &( hParamMC->h_output_synthesis_params ), + &( hParamMC->h_output_synthesis_cov_state ), + hParamMC->max_band_decorr, + PARAM_MC_MAX_NSLOTS, + hParamMC->hMetadataPMC->num_parameter_bands, + max_param_band_residual, + nchan_transport, + nchan_out_cov, + proto_matrix ) ) != IVAS_ERR_OK ) + { + return error; + } /* Head rotation */ if ( ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) && st_ivas->hDecoderConfig->Opt_Headrotation ) { - hParamMC->hoa_encoder = (float *) count_malloc( st_ivas->hTransSetup.nchan_out_woLFE * MAX_INTERN_CHANNELS * sizeof( float ) ); + if ( ( hParamMC->hoa_encoder = (float *) malloc( st_ivas->hTransSetup.nchan_out_woLFE * MAX_INTERN_CHANNELS * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) ); + } compute_hoa_encoder_mtx( st_ivas->hTransSetup.ls_azimuth, st_ivas->hTransSetup.ls_elevation, hParamMC->hoa_encoder, st_ivas->hTransSetup.nchan_out_woLFE, HEAD_ROTATION_HOA_ORDER ); } @@ -394,8 +437,15 @@ ivas_error ivas_param_mc_dec_open( if ( hParamMC->max_band_decorr > 0 ) { - hParamMC->proto_frame_f = (float *) count_malloc( 2 * hParamMC->diff_proto_info->num_protos_diff * hParamMC->num_freq_bands * sizeof( float ) ); - hParamMC->proto_frame_dec_f = (float *) count_malloc( 2 * nchan_out_cov * hParamMC->num_freq_bands * sizeof( float ) ); + if ( ( hParamMC->proto_frame_f = (float *) malloc( 2 * hParamMC->diff_proto_info->num_protos_diff * hParamMC->num_freq_bands * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) ); + } + + if ( ( hParamMC->proto_frame_dec_f = (float *) malloc( 2 * nchan_out_cov * hParamMC->num_freq_bands * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) ); + } } else { @@ -410,6 +460,516 @@ ivas_error ivas_param_mc_dec_open( return error; } + +/*------------------------------------------------------------------------- + * ivas_param_mc_get_param_band_mapping() + * + * + *-------------------------------------------------------------------------*/ + +static void ivas_param_mc_get_param_band_mapping( + const int16_t n_target_bands, + const int16_t *target_band_grouping, + const int16_t n_source_bands, + const int16_t *source_band_grouping, + PARAM_MC_PARAMETER_BAND_MAPPING *parameter_band_mapping ) +{ + int16_t target_band_idx; + int16_t source_band_idx = 0; + int16_t source_band_cnt_total; + + for ( target_band_idx = 0; target_band_idx < n_target_bands; target_band_idx++ ) + { + int16_t upper = target_band_grouping[target_band_idx + 1]; + int16_t lower = target_band_grouping[target_band_idx]; + int16_t source_band_in_target_band_cnt = 0; + float norm_fac = 1.0f; + source_band_cnt_total = 0; + for ( source_band_idx = 0; source_band_idx < n_source_bands; source_band_idx++ ) + { + /* find lowest corresponding source band*/ + if ( source_band_grouping[source_band_idx] <= lower && source_band_grouping[source_band_idx + 1] >= lower ) + { + do + { + int16_t source_bands_in_target_band = min( source_band_grouping[source_band_idx + 1], upper ) - max( source_band_grouping[source_band_idx], lower ); + if ( source_bands_in_target_band ) + { + source_band_cnt_total += source_bands_in_target_band; + parameter_band_mapping->source_band_idx[target_band_idx][source_band_in_target_band_cnt] = source_band_idx; + parameter_band_mapping->source_band_factor[target_band_idx][source_band_in_target_band_cnt++] = (float) source_bands_in_target_band; + } + source_band_idx++; + } while ( source_band_grouping[source_band_idx] <= upper && source_band_idx < n_source_bands ); + break; + } + } + norm_fac = 1.0f / ( (float) source_band_cnt_total ); + for ( source_band_idx = 0; source_band_idx < source_band_in_target_band_cnt; source_band_idx++ ) + { + + parameter_band_mapping->source_band_factor[target_band_idx][source_band_idx] *= norm_fac; + } + parameter_band_mapping->n_source_bands[target_band_idx] = source_band_in_target_band_cnt; + } + + return; +} + + +/*------------------------------------------------------------------------- + * ivas_param_mc_dec_reconfig() + * + * Reconfiguration of ParamMC decoder + *-------------------------------------------------------------------------*/ + +ivas_error ivas_param_mc_dec_reconfig( + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +) +{ + int16_t k, nchan_transport; + PARAM_MC_DEC_HANDLE hParamMC; + IVAS_OUTPUT_SETUP hTransportSetup; + int16_t nchan_out_transport; + int16_t nchan_out_cov; + float proto_matrix[MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS]; + float proto_mtx_norm; + int16_t max_param_band_residual; + uint16_t config_index; + MC_LS_SETUP mc_ls_setup; + float frequency_axis[CLDFB_NO_CHANNELS_MAX]; + int32_t output_Fs, ivas_total_brate; + ivas_error error; + int16_t nchan_transport_old; + int16_t num_param_bands_old; + PARAM_MC_PARAMETER_BAND_MAPPING parameter_band_mapping; + int16_t band_grouping_old[20 + 1]; + + error = IVAS_ERR_OK; + hParamMC = st_ivas->hParamMC; + + /* save important config information from the previous state */ + nchan_transport_old = st_ivas->nchan_transport; + num_param_bands_old = hParamMC->hMetadataPMC->num_parameter_bands; + + /*-----------------------------------------------------------------* + * prepare library opening + *-----------------------------------------------------------------*/ + + output_Fs = st_ivas->hDecoderConfig->output_Fs; + ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; + + hTransportSetup = st_ivas->hTransSetup; + mc_ls_setup = ivas_mc_map_output_config_to_mc_ls_setup( st_ivas->transport_config ); + nchan_out_transport = st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe; + hParamMC->hoa_encoder = NULL; + + if ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_LS_CONV_COV || hParamMC->synthesis_conf == PARAM_MC_SYNTH_MONO_STEREO ) + { + nchan_out_cov = st_ivas->hOutSetup.nchan_out_woLFE + st_ivas->hOutSetup.num_lfe; + } + else + { + nchan_out_cov = nchan_out_transport; + } + + st_ivas->nchan_transport = ivas_param_mc_getNumTransportChannels( ivas_total_brate, mc_ls_setup ); + config_index = ivas_param_mc_get_configuration_index( mc_ls_setup, ivas_total_brate ); + nchan_transport = st_ivas->nchan_transport; + + switch ( nchan_transport ) + { + case 4: + case 3: + st_ivas->nCPE = 2; + st_ivas->nSCE = 0; + st_ivas->element_mode_init = IVAS_CPE_MDCT; + break; + case 2: + st_ivas->nCPE = 1; + st_ivas->nSCE = 0; + st_ivas->element_mode_init = IVAS_CPE_MDCT; + + break; +#ifdef DEBUGGING + default: + assert( 0 && "Number of TC not supported for Parametric MC!" ); +#endif + } + + /*-----------------------------------------------------------------* + * set input parameters + *-----------------------------------------------------------------*/ + + hParamMC->slot_size = (int16_t) ( output_Fs / FRAMES_PER_SEC ) / CLDFB_NO_COL_MAX; + hParamMC->subframe_nbslots = CLDFB_NO_COL_MAX / PARAM_MC_NSUBFRAMES_DEC; + + hParamMC->num_freq_bands = (int16_t) ( output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ); + hParamMC->max_band_energy_compensation = hParamMC->num_freq_bands; + + /* deallocate the full icc map, gets newly allocated in the metadata open function */ + + for ( k = 0; k < 2; k++ ) + { +#ifdef DEBUGGING + assert( hParamMC->hMetadataPMC->icc_map_full[k] != NULL ); +#endif + if ( hParamMC->hMetadataPMC->icc_map_full[k] != NULL ) + { + free( hParamMC->hMetadataPMC->icc_map_full[k] ); + hParamMC->hMetadataPMC->icc_map_full[k] = NULL; + } + } + + mvs2s( hParamMC->band_grouping, band_grouping_old, hParamMC->hMetadataPMC->num_parameter_bands + 1 ); + + ivas_param_mc_metadata_open( mc_ls_setup, hTransportSetup.index_lfe[0], ivas_total_brate, hParamMC->hMetadataPMC ); + + /* Band Grouping */ + if ( hParamMC->hMetadataPMC->num_parameter_bands == 20 ) + { + mvs2s( param_mc_band_grouping_20, hParamMC->band_grouping, 20 + 1 ); + } + else if ( hParamMC->hMetadataPMC->num_parameter_bands == 14 ) + { + mvs2s( param_mc_band_grouping_14, hParamMC->band_grouping, 14 + 1 ); + } + else if ( hParamMC->hMetadataPMC->num_parameter_bands == 10 ) + { + mvs2s( param_mc_band_grouping_10, hParamMC->band_grouping, 10 + 1 ); + } + else + { + assert( 0 && "nbands must be 20, 14, or 10!" ); + } + + ivas_param_mc_get_param_band_mapping( hParamMC->hMetadataPMC->num_parameter_bands, hParamMC->band_grouping, num_param_bands_old, band_grouping_old, ¶meter_band_mapping ); + + if ( nchan_transport_old != nchan_transport || num_param_bands_old != hParamMC->hMetadataPMC->num_parameter_bands ) + { + float *ild_q_old = hParamMC->icld_q; + float *icc_q_old = hParamMC->icc_q; + + + /* init arrays for the quantized parameters */ + if ( ( hParamMC->icc_q = (float *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) ); + } + if ( ( hParamMC->icld_q = (float *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) ); + } + set_f( hParamMC->icld_q, PARAM_MC_DEFAULT_MIN_ILD, hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe ); + set_f( hParamMC->icc_q, 0.0f, hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe ); + + /* map old to new parameter banding, only for same number of TCs, needs some more thought for a changing number of TCs */ + if ( num_param_bands_old != hParamMC->hMetadataPMC->num_parameter_bands && nchan_transport_old == nchan_transport ) + { + int16_t new_param_band_idx, param_idx, source_param_idx; + int16_t num_param_lfe; + float *p_icc_new = hParamMC->icc_q; + float *p_ild_new = hParamMC->icld_q; + + /* ICC */ + num_param_lfe = hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe; + for ( new_param_band_idx = 0; new_param_band_idx < hParamMC->hMetadataPMC->num_parameter_bands; new_param_band_idx++ ) + { + for ( param_idx = 0; param_idx < num_param_lfe; param_idx++ ) + { + *p_icc_new = 0.0f; + for ( source_param_idx = 0; source_param_idx < parameter_band_mapping.n_source_bands[new_param_band_idx]; source_param_idx++ ) + { + *p_icc_new += icc_q_old[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx] * num_param_lfe + param_idx] * parameter_band_mapping.source_band_factor[new_param_band_idx][source_param_idx]; + } + p_icc_new++; + } + } + + /* ILD */ + num_param_lfe = hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe; + for ( new_param_band_idx = 0; new_param_band_idx < hParamMC->hMetadataPMC->num_parameter_bands; new_param_band_idx++ ) + { + for ( param_idx = 0; param_idx < num_param_lfe; param_idx++ ) + { + *p_ild_new = 0.0f; + for ( source_param_idx = 0; source_param_idx < parameter_band_mapping.n_source_bands[new_param_band_idx]; source_param_idx++ ) + { + *p_ild_new += powf( 10.0f, ild_q_old[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx] * num_param_lfe + param_idx] / 10.0f ) * parameter_band_mapping.source_band_factor[new_param_band_idx][source_param_idx]; + } + *p_ild_new = 10.0f * log10f( *p_ild_new ); + p_ild_new++; + } + } + } + free( ild_q_old ); + free( icc_q_old ); + } + + param_mc_set_num_synth_bands( output_Fs, hParamMC ); + + + /* set max parameter band for abs cov */ + k = 0; + while ( hParamMC->band_grouping[k] <= PARAM_MC_MAX_BAND_ABS_COV_DEC ) + { + hParamMC->max_param_band_abs_cov = ( k++ ); + } + + /*-----------------------------------------------------------------* + * open sub-modules + *-----------------------------------------------------------------*/ + + /* prototype signal computation */ + + if ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_MONO_STEREO ) + { + if ( nchan_transport_old != nchan_transport ) + { + if ( st_ivas->hLsSetUpConversion != NULL ) + { + ivas_ls_setup_conversion_close( &st_ivas->hLsSetUpConversion ); + } + + if ( ( error = ivas_ls_setup_conversion_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + + /* convert the ls conv dmx matrix into column order matrix format (nchan_out_cldfb x nchan_out) */ + free( hParamMC->ls_conv_dmx_matrix ); + if ( ( hParamMC->ls_conv_dmx_matrix = (float *) malloc( nchan_out_transport * nchan_out_cov * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) ); + } + for ( k = 0; k < nchan_out_transport; k++ ) + { + mvr2r( st_ivas->hLsSetUpConversion->dmxMtx[k], &hParamMC->ls_conv_dmx_matrix[k * nchan_out_cov], nchan_out_cov ); + } + } + /* convert ParamMC parameter bands to SFB */ + + st_ivas->hLsSetUpConversion->sfbCnt = hParamMC->num_param_bands_synth; + for ( k = 0; k <= hParamMC->num_param_bands_synth; k++ ) + { + st_ivas->hLsSetUpConversion->sfbOffset[k] = PARAM_MC_BAND_TO_MDCT_BAND_RATIO * hParamMC->band_grouping[k]; + } + for ( ; k < MAX_SFB + 2; k++ ) + { + st_ivas->hLsSetUpConversion->sfbOffset[k] = 0; + } + } + + if ( nchan_transport_old != nchan_transport ) + { + free( hParamMC->proto_matrix_int ); + if ( ( hParamMC->proto_matrix_int = (float *) malloc( nchan_out_transport * nchan_transport * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) ); + } + mvr2r( ivas_param_mc_conf[config_index].dmx_fac, hParamMC->proto_matrix_int, nchan_transport * nchan_out_transport ); + } + + if ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_LS_CONV_COV || hParamMC->synthesis_conf == PARAM_MC_SYNTH_MONO_STEREO ) + { + matrix_product( hParamMC->ls_conv_dmx_matrix, nchan_out_cov, nchan_out_transport, 0, + ivas_param_mc_conf[config_index].dmx_fac, nchan_out_transport, nchan_transport, 0, + proto_matrix ); + + if ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_MONO_STEREO ) + { + proto_mtx_norm = 1.f; + for ( k = 0; k < nchan_transport * nchan_out_cov; k++ ) + { + proto_mtx_norm = max( fabsf( proto_mtx_norm ), fabsf( proto_matrix[k] ) ); + } + proto_mtx_norm = 1.f / proto_mtx_norm; + + /* transfer flattened proto_matrix to 2D in hLsSetupConversion->dmxMtx */ + for ( k = 0; k < nchan_transport; k++ ) + { + for ( int16_t i = 0; i < nchan_out_cov; i++ ) + { + st_ivas->hLsSetUpConversion->dmxMtx[k][i] = proto_matrix[k * nchan_out_cov + i] * proto_mtx_norm; + } + } + } + } + else + { + mvr2r( ivas_param_mc_conf[config_index].dmx_fac, proto_matrix, nchan_out_transport * nchan_transport ); + } + + if ( nchan_transport_old != nchan_transport && hParamMC->synthesis_conf != PARAM_MC_SYNTH_MONO_STEREO ) + { + int16_t i; + int16_t len; + + /* close decorrelator */ + ivas_dirac_dec_decorr_close( &hParamMC->h_freq_domain_decorr_ap_params, &hParamMC->h_freq_domain_decorr_ap_state ); + + /* deallocate diffuse prototype info */ + if ( hParamMC->diff_proto_info ) + { + for ( i = 0; i < hParamMC->diff_proto_info->num_protos_diff; i++ ) + { + free( hParamMC->diff_proto_info->source_chan_idx[i] ); + hParamMC->diff_proto_info->source_chan_idx[i] = NULL; + + free( hParamMC->diff_proto_info->proto_fac[i] ); + hParamMC->diff_proto_info->proto_fac[i] = NULL; + } + + free( hParamMC->diff_proto_info->source_chan_idx ); + hParamMC->diff_proto_info->source_chan_idx = NULL; + + free( hParamMC->diff_proto_info->proto_fac ); + hParamMC->diff_proto_info->proto_fac = NULL; + + free( hParamMC->diff_proto_info->proto_index_diff ); + hParamMC->diff_proto_info->proto_index_diff = NULL; + + free( hParamMC->diff_proto_info->num_source_chan_diff ); + hParamMC->diff_proto_info->num_source_chan_diff = NULL; + + free( hParamMC->diff_proto_info ); + hParamMC->diff_proto_info = NULL; + } + + hParamMC->num_outputs_diff = nchan_out_cov; + if ( ( hParamMC->diff_proto_info = (PARAM_MC_DIFF_PROTO_INFO *) malloc( sizeof( PARAM_MC_DIFF_PROTO_INFO ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) ); + } + + if ( ( param_mc_get_diff_proto_info( proto_matrix, nchan_transport, nchan_out_cov, hParamMC->diff_proto_info ) ) != IVAS_ERR_OK ) + { + return error; + } + + /* decorrelation */ + hParamMC->h_freq_domain_decorr_ap_params = NULL; + hParamMC->h_freq_domain_decorr_ap_state = NULL; + + ivas_dirac_dec_get_frequency_axis( frequency_axis, output_Fs, hParamMC->num_freq_bands ); + + if ( ( error = ivas_dirac_dec_decorr_open( &( hParamMC->h_freq_domain_decorr_ap_params ), + &( hParamMC->h_freq_domain_decorr_ap_state ), + hParamMC->num_freq_bands, + hParamMC->num_outputs_diff, + hParamMC->diff_proto_info->num_protos_diff, + DIRAC_SYNTHESIS_COV_MC_LS, + frequency_axis, + nchan_transport, + output_Fs ) ) != IVAS_ERR_OK ) + { + return error; + } + + hParamMC->h_output_synthesis_params.use_onset_filters = 0; + hParamMC->max_band_decorr = hParamMC->h_freq_domain_decorr_ap_params->max_band_decorr; + /* init decorrelation */ + if ( hParamMC->max_band_decorr > 0 ) + { + + len = hParamMC->diff_proto_info->num_protos_diff * hParamMC->h_freq_domain_decorr_ap_params->h_onset_detection_power_params.max_band_decorr; + + /* init onsetDetectionPower */ + set_zero( hParamMC->h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_1, len ); + set_zero( hParamMC->h_freq_domain_decorr_ap_state->h_onset_detection_power_state.onset_detector_2, len ); + } + } + hParamMC->max_band_energy_compensation = hParamMC->band_grouping[hParamMC->hMetadataPMC->nbands_coded]; + max_param_band_residual = 0; + + for ( k = hParamMC->hMetadataPMC->num_parameter_bands; k >= 0; k-- ) + { + if ( hParamMC->band_grouping[k] <= hParamMC->max_band_decorr ) + { + max_param_band_residual = k; + assert( hParamMC->band_grouping[k] == hParamMC->max_band_decorr ); + break; + } + } + + if ( nchan_transport_old != nchan_transport || num_param_bands_old != hParamMC->hMetadataPMC->num_parameter_bands ) + { + DIRAC_OUTPUT_SYNTHESIS_COV_STATE cov_state_old = hParamMC->h_output_synthesis_cov_state; + DIRAC_OUTPUT_SYNTHESIS_PARAMS params_old = hParamMC->h_output_synthesis_params; + float tmp_buf[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS]; + + set_zero( tmp_buf, MAX_CICP_CHANNELS * MAX_CICP_CHANNELS ); + + /* output synthesis */ + if ( ( error = ivas_dirac_dec_output_synthesis_cov_open( &( hParamMC->h_output_synthesis_params ), + &( hParamMC->h_output_synthesis_cov_state ), + hParamMC->max_band_decorr, + PARAM_MC_MAX_NSLOTS, + hParamMC->hMetadataPMC->num_parameter_bands, + max_param_band_residual, + nchan_transport, + nchan_out_cov, + proto_matrix ) ) != IVAS_ERR_OK ) + { + return error; + } + + ivas_dirac_dec_output_synthesis_cov_init( &( hParamMC->h_output_synthesis_cov_state ), nchan_transport, nchan_out_cov, hParamMC->hMetadataPMC->num_parameter_bands, max_param_band_residual ); + + + /* map old to new parameter banding, only for same number of TCs, needs some more thought for changing number of TCs */ + if ( num_param_bands_old != hParamMC->hMetadataPMC->num_parameter_bands && nchan_transport_old == nchan_transport ) + { + int16_t new_param_band_idx, source_param_idx; + + + for ( new_param_band_idx = 0; new_param_band_idx < hParamMC->hMetadataPMC->num_parameter_bands; new_param_band_idx++ ) + { + for ( source_param_idx = 0; source_param_idx < parameter_band_mapping.n_source_bands[new_param_band_idx]; source_param_idx++ ) + { + /* Cx */ + v_multc( cov_state_old.cx_old[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], parameter_band_mapping.source_band_factor[new_param_band_idx][source_param_idx], tmp_buf, nchan_transport_old * nchan_transport_old ); + v_add( tmp_buf, hParamMC->h_output_synthesis_cov_state.cx_old[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.cx_old[new_param_band_idx], nchan_transport_old * nchan_transport_old ); + /* Cy */ + v_multc( cov_state_old.cy_old[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], parameter_band_mapping.source_band_factor[new_param_band_idx][source_param_idx], tmp_buf, nchan_out_cov * nchan_out_cov ); + v_add( tmp_buf, hParamMC->h_output_synthesis_cov_state.cy_old[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.cy_old[new_param_band_idx], nchan_out_cov * nchan_out_cov ); + /* mixing matrix*/ + v_multc( cov_state_old.mixing_matrix_old[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], parameter_band_mapping.source_band_factor[new_param_band_idx][source_param_idx], tmp_buf, nchan_transport_old * nchan_out_cov ); + v_add( tmp_buf, hParamMC->h_output_synthesis_cov_state.mixing_matrix_old[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_old[new_param_band_idx], nchan_transport_old * nchan_out_cov ); + } + } + for ( new_param_band_idx = 0; new_param_band_idx < max_param_band_residual; new_param_band_idx++ ) + { + for ( source_param_idx = 0; source_param_idx < parameter_band_mapping.n_source_bands[new_param_band_idx]; source_param_idx++ ) + { + /* residual mixing matrix*/ + v_multc( cov_state_old.mixing_matrix_res_old[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], parameter_band_mapping.source_band_factor[new_param_band_idx][source_param_idx], tmp_buf, nchan_out_cov * nchan_out_cov ); + v_add( tmp_buf, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old[new_param_band_idx], nchan_out_cov * nchan_out_cov ); + } + } + } + + ivas_dirac_dec_output_synthesis_cov_close( ¶ms_old, &cov_state_old ); + } + + /*-----------------------------------------------------------------* + * memory allocation + *-----------------------------------------------------------------*/ + + if ( hParamMC->max_band_decorr > 0 && nchan_transport_old != nchan_transport ) + { + free( hParamMC->proto_frame_f ); + if ( ( hParamMC->proto_frame_f = (float *) malloc( 2 * hParamMC->diff_proto_info->num_protos_diff * hParamMC->num_freq_bands * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) ); + } + set_zero( hParamMC->proto_frame_f, 2 * hParamMC->diff_proto_info->num_protos_diff * hParamMC->num_freq_bands ); + } + + return error; +} + + /*------------------------------------------------------------------------- * param_mc_get_num_cldfb_syntheses() * @@ -487,19 +1047,19 @@ void ivas_param_mc_dec_close( { ivas_param_mc_metadata_close( hParamMC->hMetadataPMC ); - count_free( hParamMC->hMetadataPMC ); + free( hParamMC->hMetadataPMC ); hParamMC->hMetadataPMC = NULL; } if ( hParamMC->icc_q != NULL ) { - count_free( hParamMC->icc_q ); + free( hParamMC->icc_q ); hParamMC->icc_q = NULL; } if ( hParamMC->icld_q != NULL ) { - count_free( hParamMC->icld_q ); + free( hParamMC->icld_q ); hParamMC->icld_q = NULL; } @@ -508,26 +1068,26 @@ void ivas_param_mc_dec_close( { for ( i = 0; i < hParamMC->diff_proto_info->num_protos_diff; i++ ) { - count_free( hParamMC->diff_proto_info->source_chan_idx[i] ); + free( hParamMC->diff_proto_info->source_chan_idx[i] ); hParamMC->diff_proto_info->source_chan_idx[i] = NULL; - count_free( hParamMC->diff_proto_info->proto_fac[i] ); + free( hParamMC->diff_proto_info->proto_fac[i] ); hParamMC->diff_proto_info->proto_fac[i] = NULL; } - count_free( hParamMC->diff_proto_info->source_chan_idx ); + free( hParamMC->diff_proto_info->source_chan_idx ); hParamMC->diff_proto_info->source_chan_idx = NULL; - count_free( hParamMC->diff_proto_info->proto_fac ); + free( hParamMC->diff_proto_info->proto_fac ); hParamMC->diff_proto_info->proto_fac = NULL; - count_free( hParamMC->diff_proto_info->proto_index_diff ); + free( hParamMC->diff_proto_info->proto_index_diff ); hParamMC->diff_proto_info->proto_index_diff = NULL; - count_free( hParamMC->diff_proto_info->num_source_chan_diff ); + free( hParamMC->diff_proto_info->num_source_chan_diff ); hParamMC->diff_proto_info->num_source_chan_diff = NULL; - count_free( hParamMC->diff_proto_info ); + free( hParamMC->diff_proto_info ); hParamMC->diff_proto_info = NULL; } @@ -536,36 +1096,36 @@ void ivas_param_mc_dec_close( /* free prototype signal buffers */ if ( hParamMC->proto_frame_f != NULL ) { - count_free( hParamMC->proto_frame_f ); + free( hParamMC->proto_frame_f ); hParamMC->proto_frame_f = NULL; } if ( hParamMC->proto_frame_dec_f != NULL ) { - count_free( hParamMC->proto_frame_dec_f ); + free( hParamMC->proto_frame_dec_f ); hParamMC->proto_frame_dec_f = NULL; } if ( hParamMC->ls_conv_dmx_matrix != NULL ) { - count_free( hParamMC->ls_conv_dmx_matrix ); + free( hParamMC->ls_conv_dmx_matrix ); hParamMC->ls_conv_dmx_matrix = NULL; } if ( hParamMC->proto_matrix_int != NULL ) { - count_free( hParamMC->proto_matrix_int ); + free( hParamMC->proto_matrix_int ); hParamMC->proto_matrix_int = NULL; } if ( hParamMC->hoa_encoder != NULL ) { - count_free( hParamMC->hoa_encoder ); + free( hParamMC->hoa_encoder ); hParamMC->hoa_encoder = NULL; } - count_free( hParamMC ); - hParamMC = NULL; + free( *hParamMC_out ); + *hParamMC_out = NULL; return; } @@ -599,7 +1159,7 @@ void ivas_param_mc_dec_read_BS( int16_t ild_map_size_wo_lfe; HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC; - wmops_sub_start( "param_mc_read_bs" ); + push_wmops( "param_mc_read_bs" ); /* Inits */ *nb_bits = 0; @@ -761,7 +1321,6 @@ void ivas_param_mc_dec_read_BS( *nb_bits = bit_pos; - } /* if ( !st->bfi ) */ if ( st->bfi ) @@ -771,7 +1330,7 @@ void ivas_param_mc_dec_read_BS( hMetadataPMC->attackIndex = 0; } - wmops_sub_end(); + pop_wmops(); return; } @@ -822,7 +1381,7 @@ void ivas_param_mc_dec( hParamMC = st_ivas->hParamMC; assert( hParamMC ); - wmops_sub_start( "param_mc_dec" ); + push_wmops( "param_mc_dec" ); set_s( channel_active, 0, MAX_CICP_CHANNELS ); nchan_transport = st_ivas->nchan_transport; @@ -1118,7 +1677,7 @@ void ivas_param_mc_dec( /* update */ hParamMC->hMetadataPMC->last_coded_bwidth = hParamMC->hMetadataPMC->coded_bwidth; param_mc_update_mixing_matrices( hParamMC, mixing_matrix, mixing_matrix_res, nchan_transport, nchan_out_cov ); - wmops_sub_end(); + pop_wmops(); return; } @@ -1330,6 +1889,7 @@ static int16_t ivas_param_mc_uniform_decoder( return n_bits; } + /*------------------------------------------------------------------------- * ivas_param_mc_range_decoder_LC() * @@ -1388,6 +1948,7 @@ static int16_t ivas_param_mc_range_decoder_LC( return cur_bit_pos; } + /*------------------------------------------------------------------------- * param_mc_compute_interpolator() * @@ -1463,9 +2024,11 @@ static void remove_lfe_from_cy( } ptrCy += nY; } + return; } + /*------------------------------------------------------------------------- * ivas_param_mc_get_mixing_matrices() * @@ -1842,6 +2405,7 @@ static void ivas_param_mc_get_mono_stereo_mixing_matrices( return; } + /*------------------------------------------------------------------------- * param_mc_update_mixing_matrices() * @@ -1876,6 +2440,7 @@ static void param_mc_update_mixing_matrices( return; } + /*------------------------------------------------------------------------- * ivas_param_mc_dequantize_cov() * @@ -2085,13 +2650,14 @@ static void param_mc_set_num_synth_bands( return; } + /*-------------------------------------------------------------------------* * param_mc_get_diff_proto_info() * * calculated the diffuse prototype information *-------------------------------------------------------------------------*/ -static void param_mc_get_diff_proto_info( +static ivas_error param_mc_get_diff_proto_info( const float *proto_mtx, /* i : protoype matrix for the synthesis */ const uint16_t nchan_transport, /* i : number of transport channels */ const uint16_t nchan_out_cov, /* i : number if output channels of the covariance synthesis */ @@ -2107,9 +2673,16 @@ static void param_mc_get_diff_proto_info( /* Initializations */ max_num_src_chan = 0; set_zero( proto_fac, MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS ); - p_diff_proto_info->proto_index_diff = (int16_t *) count_malloc( nchan_out_cov * sizeof( int16_t ) ); + if ( ( p_diff_proto_info->proto_index_diff = (int16_t *) malloc( nchan_out_cov * sizeof( int16_t ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) ); + } set_s( p_diff_proto_info->proto_index_diff, 0, nchan_out_cov ); - p_diff_proto_info->num_source_chan_diff = (int16_t *) count_malloc( nchan_out_cov * sizeof( int16_t ) ); + + if ( ( p_diff_proto_info->num_source_chan_diff = (int16_t *) malloc( nchan_out_cov * sizeof( int16_t ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) ); + } set_s( p_diff_proto_info->num_source_chan_diff, 0, nchan_out_cov ); /* we have at least one prototype, copy the first one */ @@ -2168,17 +2741,28 @@ static void param_mc_get_diff_proto_info( } } - /* set up the prototype info struct */ - p_diff_proto_info->source_chan_idx = (int16_t **) count_malloc( p_diff_proto_info->num_protos_diff * sizeof( int16_t * ) ); - p_diff_proto_info->proto_fac = (float **) count_malloc( p_diff_proto_info->num_protos_diff * sizeof( float * ) ); + if ( ( p_diff_proto_info->source_chan_idx = (int16_t **) malloc( p_diff_proto_info->num_protos_diff * sizeof( int16_t * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) ); + } + if ( ( p_diff_proto_info->proto_fac = (float **) malloc( p_diff_proto_info->num_protos_diff * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) ); + } for ( cur_diff_proto = 0; cur_diff_proto < p_diff_proto_info->num_protos_diff; cur_diff_proto++ ) { float *proto_fac_ptr; - p_diff_proto_info->source_chan_idx[cur_diff_proto] = (int16_t *) count_malloc( max_num_src_chan * sizeof( int16_t ) ); - p_diff_proto_info->proto_fac[cur_diff_proto] = (float *) count_malloc( max_num_src_chan * sizeof( float ) ); + if ( ( p_diff_proto_info->source_chan_idx[cur_diff_proto] = (int16_t *) malloc( max_num_src_chan * sizeof( int16_t ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) ); + } + if ( ( p_diff_proto_info->proto_fac[cur_diff_proto] = (float *) malloc( max_num_src_chan * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) ); + } proto_fac_ptr = proto_fac + cur_diff_proto; for ( cur_transport_ch = 0; cur_transport_ch < nchan_transport; cur_transport_ch++ ) @@ -2193,8 +2777,7 @@ static void param_mc_get_diff_proto_info( } } - - return; + return IVAS_ERR_OK; } @@ -2280,7 +2863,7 @@ static void ivas_param_mc_mc2sba_cldfb( * reads and decodes a sequence of Parametric MC parameters from the bitstream *-------------------------------------------------------------------------*/ -void ivas_param_mc_bs_decode_parameter_values( +static void ivas_param_mc_bs_decode_parameter_values( uint16_t bit_buffer[], /* i : bitstream buffer */ int16_t *bit_pos, /* i/o: current bitstream buffer position */ const int16_t max_bits, /* i : maximum available bits in the buffer */ diff --git a/lib_dec/ivas_mcmasa_dec.c b/lib_dec/ivas_mcmasa_dec.c new file mode 100755 index 0000000000..59d215e22c --- /dev/null +++ b/lib_dec/ivas_mcmasa_dec.c @@ -0,0 +1,159 @@ +/****************************************************************************************************** + +(C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., +Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, +Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other +contributors to this repository. All Rights Reserved. + +This software is protected by copyright law and by international treaties. +The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, +Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., +Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, +Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other +contributors to this repository retain full ownership rights in their respective contributions in +the software. This notice grants no license of any kind, including but not limited to patent +license, nor is any license granted by implication, estoppel or otherwise. + +Contributors are required to enter into the IVAS codec Public Collaboration agreement before making +contributions. + +This software is provided "AS IS", without any express or implied warranties. The software is in the +development stage. It is intended exclusively for experts who have experience with such software and +solely for the purpose of inspection. All implied warranties of non-infringement, merchantability +and fitness for a particular purpose are hereby disclaimed and excluded. + +Any dispute, controversy or claim arising under or in relation to providing this software shall be +submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in +accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and +the United Nations Convention on Contracts on the International Sales of Goods. + +*******************************************************************************************************/ + +#include "options.h" +#include +#include "ivas_cnst.h" +#include "ivas_prot.h" +#include "ivas_prot_rend.h" +#include "prot.h" +#ifdef DEBUGGING +#include "debug.h" +#endif +#include "wmc_auto.h" + + +/*------------------------------------------------------------------------- + * ivas_mcmasa_dec_reconfig() + * + * Reconfigure McMASA decoder + *------------------------------------------------------------------------*/ + +ivas_error ivas_mcmasa_dec_reconfig( + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +) +{ + ivas_error error; + int32_t ivas_total_brate; + + ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; + + /* close the old MASA instance */ + ivas_masa_dec_close( &( st_ivas->hMasa ) ); + + /* get new McMASA settings */ + ivas_mcmasa_setNumTransportChannels( &( st_ivas->nchan_transport ), &( st_ivas->element_mode_init ), ivas_total_brate ); + ivas_mcmasa_set_separate_channel_mode( &( st_ivas->hOutSetup.separateChannelEnabled ), &( st_ivas->hOutSetup.separateChannelIndex ), ivas_total_brate ); + + /* transport channel settings may affect renderer */ + ivas_renderer_select( st_ivas ); + + /* renderer change may affect internal config */ + ivas_output_init( &( st_ivas->hIntSetup ), st_ivas->intern_config ); + ivas_mcmasa_set_separate_channel_mode( &( st_ivas->hIntSetup.separateChannelEnabled ), &( st_ivas->hIntSetup.separateChannelIndex ), ivas_total_brate ); + + if ( ( error = ivas_masa_dec_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + + st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); + + if ( st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_MCMASA_MONO_STEREO ) + { + if ( st_ivas->hDirAC == NULL ) + { + if ( ( error = ivas_dirac_dec_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else + { + if ( ( error = ivas_dirac_dec_config( st_ivas, DIRAC_RECONFIGURE ) ) != IVAS_ERR_OK ) + { + return error; + } + } + } + + /*-------------------------------------------------------------------* + * Close binaural rendering handles and re-allocate proper ones + * in McMASA renderer_type can be only RENDERER_BINAURAL_PARAMETRIC, RENDERER_BINAURAL_PARAMETRIC_ROOM + *--------------------------------------------------------------------*/ + + if ( st_ivas->hBinRenderer != NULL ) + { + ivas_binRenderer_close( &st_ivas->hBinRenderer ); + } + + if ( st_ivas->hDiracDecBin == NULL && ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) ) + { + /* open parametric binaural renderer */ + if ( st_ivas->renderer_type != RENDERER_STEREO_PARAMETRIC ) + { + if ( ( error = ivas_dirac_dec_binaural_copy_hrtfs( &st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas, st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else if ( st_ivas->hDiracDecBin != NULL ) + { + if ( st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM ) + { + /* close unneeded renderer */ + ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin ); + } + else + { +#ifdef FIX_417_TD_DECORR_BRATE_SW + /* if necessary, close/open td-decorrs */ + if ( ( error = ivas_td_decorr_reconfig_dec( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hDecoderConfig->output_Fs, &( st_ivas->hDiracDecBin->hTdDecorr ), &( st_ivas->hDiracDecBin->useTdDecorr ) ) ) != IVAS_ERR_OK ) + { + return error; + } + + /* regularization factor is bitrate-dependent */ + st_ivas->hDiracDecBin->reqularizationFactor = configure_reqularization_factor( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate ); +#else + /* the decision for useTdDecorr is done in ivas_dirac_dec_init_binaural_data(). here, comparing against the same condition. */ + if ( st_ivas->hDiracDecBin->useTdDecorr != ( ivas_total_brate < IVAS_48k && st_ivas->nchan_transport == 1 ) ) + { + /* st_ivas->hDiracDecBin->useTdDecorr will change => close and re-open. */ + ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin ); + if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas, st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK ) + { + return error; + } + } +#endif + } + } + + return error; +} diff --git a/lib_dec/ivas_mct_core_dec.c b/lib_dec/ivas_mct_core_dec.c index d7459efabd..6c5e6575a6 100644 --- a/lib_dec/ivas_mct_core_dec.c +++ b/lib_dec/ivas_mct_core_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" #include "cnst.h" #include "basop_proto_func.h" #include "stat_com.h" @@ -70,7 +70,7 @@ void ivas_mct_side_bits( Decoder_State *st, *sts[MCT_MAX_CHANNELS]; nf_side_bits = 0; - nChannels = hMCT->nchan_out_woLFE + hMCT->num_lfe; + nChannels = hMCT->nchan_out_woLFE; /*initializations */ for ( cpe_id = 0, i = 0; cpe_id < nCPE; cpe_id++ ) @@ -88,7 +88,8 @@ void ivas_mct_side_bits( for ( ch = 0; ch < nChannels; ch++ ) { st = sts[ch]; - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE || st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -108,15 +109,14 @@ void ivas_mct_side_bits( availableBits = 0; ivas_mct_dec_mct( hMCT, sts, nChannels ); - /* availableBits = ((hMCT->mc_bitrate/50) - sts[0]->next_bit_pos); - availableBits -= NBBITS_MCT_RATIO * nChannels;*/ /*read channel bitrate ratios from bitstream*/ for ( ch = 0; ch < nChannels; ch++ ) { st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && hMCT->LFE_off ) || st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { chBitRatios[ch] = 0; st->bits_frame_channel = 0; @@ -183,13 +183,13 @@ void ivas_mct_core_dec( float nrg[MCT_MAX_CHANNELS]; #endif - wmops_sub_start( "mct_decoding" ); + push_wmops( "mct_decoding" ); /*--------------------------------------------------------------------------------* * Initializations *--------------------------------------------------------------------------------*/ - nChannels = hMCT->nchan_out_woLFE + hMCT->num_lfe; + nChannels = hMCT->nchan_out_woLFE; /*initializations */ for ( cpe_id = 0, i = 0; cpe_id < nCPE; cpe_id++ ) @@ -203,7 +203,8 @@ void ivas_mct_core_dec( for ( ch = 0, i = 0; ch < nChannels; ch++ ) { - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -232,7 +233,8 @@ void ivas_mct_core_dec( { st = sts[ch]; - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) /*indicates LFE */ + if ( + sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) /*indicates LFE */ { continue; } @@ -269,7 +271,7 @@ void ivas_mct_core_dec( apply_MCT_dec( hMCT, sts, x ); } - wmops_sub_end(); + pop_wmops(); return; } diff --git a/lib_dec/ivas_mct_dec.c b/lib_dec/ivas_mct_dec.c index b4a4da3e3c..845a5a6bd8 100644 --- a/lib_dec/ivas_mct_dec.c +++ b/lib_dec/ivas_mct_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,15 +39,24 @@ #include "rom_com.h" #include "prot.h" #include "ivas_prot.h" +#include "ivas_prot_rend.h" #include "ivas_rom_com.h" #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" #ifdef DEBUG_PLOT #include "deb_out.h" #endif + +/*-----------------------------------------------------------------------* + * Local function prototypes + *-----------------------------------------------------------------------*/ + +static ivas_error ivas_mc_dec_reconfig( Decoder_Struct *st_ivas ); + + /*--------------------------------------------------------------------------* * ivas_mct_dec() * @@ -77,10 +86,9 @@ ivas_error ivas_mct_dec( int32_t ivas_total_brate; ivas_error error; - error = IVAS_ERR_OK; - - wmops_sub_start( "ivas_mct_dec" ); + push_wmops( "ivas_mct_dec" ); + error = IVAS_ERR_OK; nCPE = st_ivas->nCPE; hMCT = st_ivas->hMCT; @@ -98,10 +106,6 @@ ivas_error ivas_mct_dec( } } - if ( !st_ivas->bfi ) - { - hMCT->LFE_off = 0; /* in case of PLC, stick to LFE_off of previous frame; otherwise, the update happens in ivas_mdct_dec_side_bits_frame_channel() */ - } for ( cpe_id = 0; cpe_id < nCPE; cpe_id++ ) { @@ -123,9 +127,9 @@ ivas_error ivas_mct_dec( if ( !st_ivas->bfi ) { - ivas_mdct_dec_side_bits_frame_channel( st_ivas->hCPE[cpe_id], param_lpc[cpe_id], p_param[cpe_id], st_ivas->hCPE[0]->hCoreCoder[0], - &hMCT->LFE_off, nTnsBitsTCX10[cpe_id], param[cpe_id], 1, - ( ( cpe_id + 1 ) * CPE_CHANNELS > st_ivas->nchan_transport ) ); + ivas_mdct_dec_side_bits_frame_channel( st_ivas->hCPE[cpe_id], param_lpc[cpe_id], p_param[cpe_id], st_ivas->hCPE[0]->hCoreCoder[0], nTnsBitsTCX10[cpe_id], param[cpe_id], 1, + ( ( cpe_id + 1 ) * CPE_CHANNELS > hMCT->nchan_out_woLFE ) ); + st_ivas->BER_detect |= st_ivas->hCPE[cpe_id]->hCoreCoder[0]->BER_detect; st_ivas->BER_detect |= st_ivas->hCPE[cpe_id]->hCoreCoder[1]->BER_detect; @@ -148,7 +152,8 @@ ivas_error ivas_mct_dec( set_zero( x[n][1], L_FRAME48k / 2 ); } - ivas_mdct_core_invQ( st_ivas->hCPE[cpe_id], hMCT->LFE_off, nTnsBitsTCX10[cpe_id], p_param[cpe_id], param_lpc[cpe_id], param[cpe_id], + ivas_mdct_core_invQ( st_ivas->hCPE[cpe_id], + nTnsBitsTCX10[cpe_id], p_param[cpe_id], param_lpc[cpe_id], param[cpe_id], fUseTns[cpe_id], tnsData[cpe_id], x, x, Aq[cpe_id], NULL, 1 ); st_ivas->BER_detect |= st_ivas->hCPE[cpe_id]->hCoreCoder[0]->BER_detect; @@ -158,6 +163,18 @@ ivas_error ivas_mct_dec( /* MCT core decoder */ ivas_mct_core_dec( hMCT, st_ivas->hCPE, nCPE, output ); + /* for sba to stereo output disable any further processing for TCs > 2 as it is not needed*/ + if ( st_ivas->sba_dirac_stereo_flag ) + { + for ( cpe_id = 1; cpe_id < nCPE; cpe_id++ ) + { + for ( n = 0; n < CPE_CHANNELS; n++ ) + { + st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_IGNORE; + } + } + } + /* MCT reconstruction and CoreCoder updates */ for ( cpe_id = 0; cpe_id < nCPE; cpe_id++ ) { @@ -169,7 +186,8 @@ ivas_error ivas_mct_dec( x[n][1] = &output[n + cpe_id * CPE_CHANNELS][L_FRAME48k / 2]; } - ivas_mdct_core_tns_ns( hCPE, hMCT->LFE_off, fUseTns[cpe_id], tnsData[cpe_id], x, Aq[cpe_id], 1 ); + ivas_mdct_core_tns_ns( hCPE, + fUseTns[cpe_id], tnsData[cpe_id], x, Aq[cpe_id], 1 ); } if ( st_ivas->renderer_type == RENDERER_MC ) @@ -204,7 +222,8 @@ ivas_error ivas_mct_dec( x[n][1] = &output[n + cpe_id * CPE_CHANNELS][L_FRAME48k / 2]; } - ivas_mdct_core_reconstruct( hCPE, x, synth, hMCT->LFE_off, fUseTns[cpe_id], 1 ); + ivas_mdct_core_reconstruct( hCPE, x, synth, + fUseTns[cpe_id], 1 ); /*----------------------------------------------------------------* * CoreCoder Post-processing and updates @@ -212,13 +231,14 @@ ivas_error ivas_mct_dec( for ( n = 0; n < CPE_CHANNELS; n++ ) { - if ( sts[n]->mct_chan_mode == MCT_CHAN_MODE_LFE ) + + if ( st_ivas->sba_dirac_stereo_flag ) { - break; + ivas_post_proc( NULL, hCPE, n, synth[n], NULL, output_frame, 1 ); } /* Postprocessing for ACELP/MDCT core switching and synchronization */ - if ( ( error = core_switching_post_dec( sts[n], synth[n], output[cpe_id * CPE_CHANNELS + n], hCPE->output_mem[1], 0, output_frame, 0 /*core_switching_flag*/, 0, -1, hCPE->last_element_mode ) ) != IVAS_ERR_OK ) + if ( ( error = core_switching_post_dec( sts[n], synth[n], output[cpe_id * CPE_CHANNELS + n], hCPE->output_mem[1], st_ivas->ivas_format, 0, output_frame, 0 /*core_switching_flag*/, st_ivas->sba_dirac_stereo_flag, -1, hCPE->last_element_mode ) ) != IVAS_ERR_OK ) { return error; } @@ -239,7 +259,10 @@ ivas_error ivas_mct_dec( /* synthesis synchronization between stereo modes */ - synchro_synthesis( ivas_total_brate, hCPE, output + cpe_id * CPE_CHANNELS, output_frame, 0 ); + if ( !st_ivas->sba_dirac_stereo_flag ) + { + synchro_synthesis( ivas_total_brate, hCPE, output + cpe_id * CPE_CHANNELS, output_frame, 0 ); + } #ifdef DEBUG_PLOT for ( n = 0; n < CPE_CHANNELS; n++ ) @@ -249,6 +272,21 @@ ivas_error ivas_mct_dec( } #endif } + /* move channels after LFE to correct output for multi-channel MCT */ + if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ) + { + float tmp[L_FRAME48k]; + + /*save center channel output*/ + mvr2r( output[hMCT->nchan_out_woLFE - 1], tmp, output_frame ); + + for ( n = hMCT->nchan_out_woLFE - 1; n >= LFE_CHANNEL; n-- ) + { + mvr2r( output[n - 1], output[n + 1], output_frame ); + } + mvr2r( tmp, output[LFE_CHANNEL - 1], output_frame ); + set_zero( output[LFE_CHANNEL], output_frame ); + } #ifdef DEBUG_MODE_INFO for ( cpe_id = 0; cpe_id < nCPE; cpe_id++ ) @@ -263,7 +301,7 @@ ivas_error ivas_mct_dec( } #endif - wmops_sub_end(); + pop_wmops(); return error; } @@ -284,11 +322,11 @@ ivas_error create_mct_dec( int16_t max_blocks; int16_t cpe_id; - /*-----------------------------------------------------------------* + /*--------------------------------------------------------- --------* * Allocate MCT handle *-----------------------------------------------------------------*/ - if ( ( hMCT = (MCT_DEC_HANDLE) count_malloc( sizeof( MCT_DEC_DATA ) ) ) == NULL ) + if ( ( hMCT = (MCT_DEC_HANDLE) malloc( sizeof( MCT_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CPE\n" ) ); } @@ -298,20 +336,13 @@ ivas_error create_mct_dec( *-----------------------------------------------------------------*/ /* Determine active channels */ - if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ) - { - hMCT->num_lfe = st_ivas->hTransSetup.num_lfe; - hMCT->nchan_out_woLFE = st_ivas->nchan_transport - hMCT->num_lfe; /* LFE channel is coded separately */ - } - else if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) + if ( ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) || st_ivas->ivas_format == SBA_FORMAT ) { - hMCT->num_lfe = 0; hMCT->nchan_out_woLFE = st_ivas->nchan_transport; } - else if ( st_ivas->ivas_format == SBA_FORMAT ) + else if ( st_ivas->mc_mode == MC_MODE_MCT ) { - hMCT->num_lfe = 0; - hMCT->nchan_out_woLFE = st_ivas->nchan_transport; + hMCT->nchan_out_woLFE = st_ivas->nchan_transport - st_ivas->hTransSetup.num_lfe; } else { @@ -326,14 +357,11 @@ ivas_error create_mct_dec( for ( n = 0; n < CPE_CHANNELS; n++ ) { st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_REGULAR; - if ( ( hMCT->num_lfe > 0 ) && ( ( n + cpe_id * CPE_CHANNELS ) == LFE_CHANNEL ) ) - { - st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_LFE; - } } } /* in case we have an uneven number of transport channels, indicate last channel ID as inactive */ - if ( ( hMCT->nchan_out_woLFE + hMCT->num_lfe ) % 2 ) + if ( ( hMCT->nchan_out_woLFE ) % + 2 ) { st_ivas->hCPE[st_ivas->nCPE - 1]->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_IGNORE; } @@ -343,7 +371,7 @@ ivas_error create_mct_dec( for ( n = 0; n < max_blocks; n++ ) { - if ( ( hMCT->hBlockData[n] = (MCT_DEC_BLOCK_DATA_HANDLE) count_malloc( sizeof( MCT_DEC_BLOCK_DATA ) ) ) == NULL ) + if ( ( hMCT->hBlockData[n] = (MCT_DEC_BLOCK_DATA_HANDLE) malloc( sizeof( MCT_DEC_BLOCK_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MCT block data structure\n" ) ); } @@ -356,7 +384,7 @@ ivas_error create_mct_dec( * MDCT stereo initialization *-----------------------------------------------------------------*/ - if ( ( hMCT->hBlockData[n]->hStereoMdct = (STEREO_MDCT_DEC_DATA_HANDLE) count_malloc( sizeof( STEREO_MDCT_DEC_DATA ) ) ) == NULL ) + if ( ( hMCT->hBlockData[n]->hStereoMdct = (STEREO_MDCT_DEC_DATA_HANDLE) malloc( sizeof( STEREO_MDCT_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MDCT Stereo \n" ) ); } @@ -413,20 +441,13 @@ ivas_error mct_dec_reconfigure( if ( b_nchan_change ) { /* Determine active channels */ - if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ) - { - hMCT->num_lfe = st_ivas->hTransSetup.num_lfe; - hMCT->nchan_out_woLFE = st_ivas->nchan_transport - hMCT->num_lfe; /* LFE channel is coded separately */ - } - else if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) + if ( ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) || st_ivas->ivas_format == SBA_FORMAT ) { - hMCT->num_lfe = 0; hMCT->nchan_out_woLFE = st_ivas->nchan_transport; } - else if ( st_ivas->ivas_format == SBA_FORMAT ) + else if ( st_ivas->mc_mode == MC_MODE_MCT ) { - hMCT->num_lfe = 0; - hMCT->nchan_out_woLFE = st_ivas->nchan_transport; + hMCT->nchan_out_woLFE = st_ivas->nchan_transport - st_ivas->hTransSetup.num_lfe; } else { @@ -440,15 +461,12 @@ ivas_error mct_dec_reconfigure( for ( n = 0; n < CPE_CHANNELS; n++ ) { st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_REGULAR; - if ( ( hMCT->num_lfe > 0 ) && ( ( n + cpe_id * CPE_CHANNELS ) == LFE_CHANNEL ) ) - { - st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_LFE; - } } } /* in case we have an uneven number of transport channels, indicate last channel ID as inactive */ - if ( ( hMCT->nchan_out_woLFE + hMCT->num_lfe ) % 2 ) + if ( ( hMCT->nchan_out_woLFE ) % + 2 ) { st_ivas->hCPE[st_ivas->nCPE - 1]->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_IGNORE; } @@ -458,16 +476,18 @@ ivas_error mct_dec_reconfigure( * run into a number of problems */ for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) { + st_ivas->hCPE[cpe_id]->element_brate = cp_bitrate; for ( n = 0; n < CPE_CHANNELS; n++ ) { st = st_ivas->hCPE[cpe_id]->hCoreCoder[n]; st->total_brate = st_ivas->hCPE[cpe_id]->element_brate; - if ( !( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) ) + if ( !( + ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) ) { st->bits_frame_nominal = (int16_t) ( st_ivas->hCPE[cpe_id]->element_brate / FRAMES_PER_SEC ); - st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_flag, st->mct_chan_mode ); + st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_flag ); if ( st->igf ) { IGFDecSetMode( st->hIGFDec, st_ivas->hCPE[cpe_id]->element_brate, st->bwidth, st->element_mode, -1, -1, st->rf_flag ); @@ -485,7 +505,7 @@ ivas_error mct_dec_reconfigure( { if ( hMCT->hBlockData[n] == NULL ) { - if ( ( hMCT->hBlockData[n] = (MCT_DEC_BLOCK_DATA_HANDLE) count_malloc( sizeof( MCT_BLOCK_DATA ) ) ) == NULL ) + if ( ( hMCT->hBlockData[n] = (MCT_DEC_BLOCK_DATA_HANDLE) malloc( sizeof( MCT_BLOCK_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MCT block data structure\n" ) ); } @@ -495,7 +515,7 @@ ivas_error mct_dec_reconfigure( hMCT->hBlockData[n]->ch2 = 0; /* MDCT stereo initialization */ - if ( ( hMCT->hBlockData[n]->hStereoMdct = (STEREO_MDCT_DEC_DATA_HANDLE) count_malloc( sizeof( STEREO_MDCT_ENC_DATA ) ) ) == NULL ) + if ( ( hMCT->hBlockData[n]->hStereoMdct = (STEREO_MDCT_DEC_DATA_HANDLE) malloc( sizeof( STEREO_MDCT_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MDCT Stereo \n" ) ); } @@ -512,11 +532,11 @@ ivas_error mct_dec_reconfigure( { if ( hMCT->hBlockData[n]->hStereoMdct != NULL ) { - count_free( hMCT->hBlockData[n]->hStereoMdct ); + free( hMCT->hBlockData[n]->hStereoMdct ); hMCT->hBlockData[n]->hStereoMdct = NULL; } - count_free( hMCT->hBlockData[n] ); + free( hMCT->hBlockData[n] ); hMCT->hBlockData[n] = NULL; } } @@ -565,16 +585,16 @@ void ivas_mct_dec_close( { if ( ( *hMCT )->hBlockData[n]->hStereoMdct != NULL ) { - count_free( ( *hMCT )->hBlockData[n]->hStereoMdct ); + free( ( *hMCT )->hBlockData[n]->hStereoMdct ); ( *hMCT )->hBlockData[n]->hStereoMdct = NULL; } - count_free( ( *hMCT )->hBlockData[n] ); + free( ( *hMCT )->hBlockData[n] ); ( *hMCT )->hBlockData[n] = NULL; } } - count_free( *hMCT ); + free( *hMCT ); *hMCT = NULL; return; @@ -622,8 +642,7 @@ ivas_error ivas_mc_dec_config( { if ( st_ivas->hDecoderConfig->last_ivas_total_brate != st_ivas->hDecoderConfig->ivas_total_brate || st_ivas->transport_config != signaled_config || last_mc_mode != st_ivas->mc_mode ) { - /*ivas_mc_dec_reconfigure( st_ivas );*/ - return IVAS_ERROR( IVAS_ERR_RECONFIGURE_NOT_SUPPORTED, "Error: MC format switching not supported yet!!!\n\n" ); + ivas_mc_dec_reconfig( st_ivas ); } } @@ -632,3 +651,524 @@ ivas_error ivas_mc_dec_config( return error; } + + +/*------------------------------------------------------------------------- + * ivas_mc_dec_reconfig() + * + * reconfigure the MC format decoder + *-------------------------------------------------------------------------*/ + +static ivas_error ivas_mc_dec_reconfig( + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +) +{ + int16_t nchan_transport_old, nSCE_old, nCPE_old, sba_dirac_stereo_flag_old, nchan_hp20_old; + int16_t numCldfbAnalyses_old, numCldfbSyntheses_old; + int32_t new_brate_SCE, new_brate_CPE, ivas_total_brate; + RENDERER_TYPE renderer_type_old; + Decoder_State *st; + ivas_error error; + MC_MODE mc_mode, last_mc_mode; + + error = IVAS_ERR_OK; + + ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; + nchan_transport_old = st_ivas->nchan_transport; + + last_mc_mode = ivas_mc_mode_select( ivas_mc_map_output_config_to_mc_ls_setup( st_ivas->transport_config ), st_ivas->hDecoderConfig->last_ivas_total_brate ); /* NB: this assumes that LS config remains the same between frames */ + + /* we have to temporally set the current mc_mode back to the previous one to make sure the following call to + ivas_init_dec_get_num_cldfb_instances() returns the correct counts */ + mc_mode = st_ivas->mc_mode; + st_ivas->mc_mode = last_mc_mode; + ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old ); + st_ivas->mc_mode = mc_mode; + + nSCE_old = st_ivas->nSCE; + nCPE_old = st_ivas->nCPE; + sba_dirac_stereo_flag_old = st_ivas->sba_dirac_stereo_flag; + + /* special handling needed for the hp20 buffers for McMASA */ + if ( last_mc_mode == MC_MODE_MCMASA ) + { + nchan_hp20_old = getNumChanSynthesis( st_ivas ); + } + else + { + nchan_hp20_old = nchan_transport_old; + } + st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); + + /* renderer might have changed, reselect */ + renderer_type_old = st_ivas->renderer_type; + ivas_renderer_select( st_ivas ); + + /* side effect of the renderer selection can be a changed internal config */ + ivas_output_init( &( st_ivas->hIntSetup ), st_ivas->intern_config ); + + if ( st_ivas->mc_mode == MC_MODE_MCT ) + { + st_ivas->nchan_transport = ivas_mc_ls_setup_get_num_channels( ivas_mc_map_output_config_to_mc_ls_setup( st_ivas->transport_config ) ); + st_ivas->nSCE = 0; + st_ivas->nCPE = st_ivas->nchan_transport / 2; + + if ( last_mc_mode != MC_MODE_MCT ) + { + /*De-allocate handles for other MC modes*/ + if ( st_ivas->hParamMC != NULL ) + { + ivas_param_mc_dec_close( &st_ivas->hParamMC ); + + /* remove ls conversion if it was allocated by ParamMC */ + ivas_ls_setup_conversion_close( &st_ivas->hLsSetUpConversion ); + } + + /* De-allocate McMasa-related handles */ + ivas_masa_dec_close( &( st_ivas->hMasa ) ); + ivas_qmetadata_close( &st_ivas->hQMetaData ); + + /* init LS conversion if the renderer type asks for it */ + if ( st_ivas->renderer_type == RENDERER_MC && st_ivas->hLsSetUpConversion == NULL ) + { + if ( ( error = ivas_ls_setup_conversion_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + } + } + } + else if ( st_ivas->mc_mode == MC_MODE_PARAMMC ) + { + if ( last_mc_mode != MC_MODE_PARAMMC ) + { + /* remove old ls conversion for MCT if open, gets reopened correctly within ivas_param_mc_dec_open when needed */ + if ( renderer_type_old == RENDERER_MC && st_ivas->hLsSetUpConversion != NULL ) + { + ivas_ls_setup_conversion_close( &st_ivas->hLsSetUpConversion ); + } + + if ( ( error = ivas_param_mc_dec_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else + { + if ( ( error = ivas_param_mc_dec_reconfig( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + /* De-allocate McMasa-related handles */ + ivas_masa_dec_close( &( st_ivas->hMasa ) ); + ivas_qmetadata_close( &st_ivas->hQMetaData ); + + if ( last_mc_mode == MC_MODE_MCT ) + { + if ( st_ivas->hMCT != NULL && st_ivas->nchan_transport <= CPE_CHANNELS ) + { + ivas_mct_dec_close( &st_ivas->hMCT ); + } + + /* LFE handle */ + ivas_lfe_dec_close( &( st_ivas->hLFE ) ); + } + } + else if ( st_ivas->mc_mode == MC_MODE_MCMASA ) + { + ivas_mcmasa_setNumTransportChannels( &( st_ivas->nchan_transport ), &( st_ivas->element_mode_init ), ivas_total_brate ); + + if ( last_mc_mode != MC_MODE_MCMASA ) + { + if ( ( error = ivas_qmetadata_open( &( st_ivas->hQMetaData ) ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + if ( ( error = ivas_mcmasa_dec_reconfig( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + + /* ls conversion */ + if ( st_ivas->hLsSetUpConversion != NULL ) + { + ivas_ls_setup_conversion_close( &st_ivas->hLsSetUpConversion ); + } + + if ( st_ivas->hParamMC != NULL ) + { + ivas_param_mc_dec_close( &st_ivas->hParamMC ); + st_ivas->hParamMC = NULL; + } + + if ( last_mc_mode == MC_MODE_MCT ) + { + ivas_mct_dec_close( &st_ivas->hMCT ); + + /* LFE handle */ + ivas_lfe_dec_close( &( st_ivas->hLFE ) ); + } + } + + if ( st_ivas->mc_mode != MC_MODE_MCMASA ) + { + if ( st_ivas->nchan_transport == 1 ) + { + st_ivas->element_mode_init = IVAS_SCE; + } + else + { + st_ivas->element_mode_init = IVAS_CPE_MDCT; + } + } + + /*-----------------------------------------------------------------* + * Reconfigure core coder + *-----------------------------------------------------------------*/ + + /* special case: MCT->ParamMC with more than 2 TC, CPE 1 stays, but has the wrong mct_chan_mode in channel 1 + and might have IGF static memory not allocated and the bit stream index list not set, + set correct mct_chan_mode and init missing static mem (IGF, HQ) and some config (TNS) do it here since it is _very_ MC specific */ + if ( last_mc_mode == MC_MODE_MCT && st_ivas->mc_mode == MC_MODE_PARAMMC && st_ivas->nchan_transport > CPE_CHANNELS ) + { + st = st_ivas->hCPE[1]->hCoreCoder[1]; + + if ( st_ivas->nchan_transport == 3 ) + { + st->mct_chan_mode = MCT_CHAN_MODE_IGNORE; + } + else + { + st->mct_chan_mode = MCT_CHAN_MODE_REGULAR; + } + + if ( st->hIGFDec == NULL ) + { + if ( ( st->hIGFDec = (IGF_DEC_INSTANCE_HANDLE) malloc( sizeof( IGFDEC_INSTANCE ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for IGF\n" ) ); + } + + st->igf = 0; + init_igf_dec( st->hIGFDec ); + } + + if ( st->hHQ_core == NULL ) + { + + if ( ( st->hHQ_core = (HQ_DEC_HANDLE) malloc( sizeof( HQ_DEC_DATA ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HQ core\n" ) ); + } + + /* HQ core initialization */ + HQ_core_dec_init( st->hHQ_core ); + } + + /* check if we have a doubly used hTxcCfg, if so, allocate a distint one for the old MCT LFE channel */ + if ( st->hTcxCfg == st_ivas->hCPE[1]->hCoreCoder[0]->hTcxCfg ) + { + if ( ( st->hTcxCfg = (TCX_CONFIG_HANDLE) malloc( sizeof( TCX_config ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hTcxCfg\n" ) ); + } + } + + st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( ivas_total_brate, st->igf, st->element_mode ); + } + if ( st_ivas->mc_mode == MC_MODE_MCMASA ) + { + uint8_t separateChannelEnabled; + int16_t separateChannelIndex; + ivas_mcmasa_set_separate_channel_mode( &separateChannelEnabled, &separateChannelIndex, ivas_total_brate ); + ivas_mcmasa_split_brate( separateChannelEnabled, ivas_total_brate, st_ivas->nSCE, st_ivas->nCPE, &new_brate_SCE, &new_brate_CPE ); + } + else if ( st_ivas->mc_mode == MC_MODE_MCT ) + { + new_brate_SCE = 0; + new_brate_CPE = ( ivas_total_brate / ( st_ivas->nchan_transport - 1 ) ) * CPE_CHANNELS; + } + else + { + new_brate_SCE = 0; /* ivas_total_brate / st_ivas->nchan_transport;*/ + new_brate_CPE = ( ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS; + } + + if ( ( error = ivas_corecoder_dec_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old, sba_dirac_stereo_flag_old, new_brate_SCE, new_brate_CPE ) ) != IVAS_ERR_OK ) + { + return error; + } + + if ( last_mc_mode == MC_MODE_MCT && st_ivas->mc_mode == MC_MODE_PARAMMC && st_ivas->nchan_transport > CPE_CHANNELS ) + { + st = st_ivas->hCPE[1]->hCoreCoder[1]; + + /* TCX-LTP */ + if ( st->hTcxLtpDec == NULL ) + { + if ( ( st->hTcxLtpDec = (TCX_LTP_DEC_HANDLE) malloc( sizeof( TCX_LTP_DEC_DATA ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TCX-LTP handle\n" ) ); + } + tcxltp_dec_init( st->hTcxLtpDec, 0, st->last_codec_mode, st->element_mode, st->pit_max, st->sr_core ); + } + } + + + /*-----------------------------------------------------------------* + * re-configure HP20 memories + *-----------------------------------------------------------------*/ + + if ( ( error = ivas_hp20_dec_reconfig( st_ivas, nchan_hp20_old ) ) != IVAS_ERR_OK ) + { + return error; + } + + +#ifndef FIX_417_TD_DECORR_BRATE_SW + /*-----------------------------------------------------------------* + * CLDFB instances + *-----------------------------------------------------------------*/ + + if ( ( error = ivas_cldfb_dec_reconfig( st_ivas, nchan_transport_old, numCldfbAnalyses_old, numCldfbSyntheses_old ) ) != IVAS_ERR_OK ) + { + return error; + } +#endif + /*-----------------------------------------------------------------* + * Allocate the LFE handle that is coded seperately after the allocation of the core coders + *-----------------------------------------------------------------*/ + + if ( st_ivas->mc_mode == MC_MODE_MCT && st_ivas->hLFE == NULL ) + { + int32_t binauralization_delay_ns = st_ivas->binaural_latency_ns; + if ( st_ivas->hBinRenderer != NULL ) + { + if ( st_ivas->hBinRenderer->render_lfe ) + { + /* Account for filterbank delay */ + binauralization_delay_ns += IVAS_FB_DEC_DELAY_NS; + } + else + { + binauralization_delay_ns = 0; + } + } + + if ( ( error = ivas_create_lfe_dec( &st_ivas->hLFE, st_ivas->hDecoderConfig->output_Fs, binauralization_delay_ns ) ) != IVAS_ERR_OK ) + { + return error; + } + + + set_zero( st_ivas->hLFE->prevsynth_buf, LFE_PLC_BUFLEN ); + set_zero( st_ivas->hLFE->prior_out_buffer, L_FRAME48k ); + } + + /*-----------------------------------------------------------------* + * Reconfigure renderers + *-----------------------------------------------------------------*/ + + if ( st_ivas->mc_mode == MC_MODE_MCMASA ) + { + if ( ( st_ivas->renderer_type != RENDERER_DISABLE ) && ( st_ivas->renderer_type != RENDERER_MCMASA_MONO_STEREO ) ) + { + if ( st_ivas->hDirAC != NULL ) + { + /* reconfigure existing DirAC dec */ + if ( ( error = ivas_dirac_dec_config( st_ivas, DIRAC_RECONFIGURE ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else + { + /* init a new DirAC dec */ + if ( ( error = ivas_dirac_dec_config( st_ivas, DIRAC_OPEN ) ) != IVAS_ERR_OK ) + { + return error; + } + } + } + else if ( st_ivas->renderer_type == RENDERER_DISABLE && st_ivas->hDirAC != NULL ) + { + ivas_dirac_dec_close( &( st_ivas->hDirAC ) ); + } + } + + if ( renderer_type_old != st_ivas->renderer_type ) + { + AUDIO_CONFIG output_config; + + output_config = st_ivas->hDecoderConfig->output_config; + + /* binaural renderers*/ + if ( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM ) + { + /* remove unneeded binaural renderers */ + if ( st_ivas->hBinRenderer != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV && st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV_ROOM ) ) + { + ivas_binRenderer_close( &st_ivas->hBinRenderer ); + } + + if ( ( st_ivas->hCrendWrapper != NULL ) && ( st_ivas->hCrendWrapper->hCrend != NULL ) && ( st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV && st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD || st_ivas->hRenderConfig->roomAcoustics.late_reverb_on == 0 ) ) ) + { + ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) +#ifdef SPLIT_REND_WITH_HEAD_ROT + , + 1 +#endif + ); + } + + if ( st_ivas->hBinRendererTd != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD ) ) + { + ivas_td_binaural_close( &st_ivas->hBinRendererTd ); + } + + if ( st_ivas->hDiracDecBin != NULL ) + { + if ( st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM && st_ivas->renderer_type != RENDERER_STEREO_PARAMETRIC ) + { + ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin ); + } + else + { + /* useTdDecorr may change => close and re-open */ + ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin ); + + if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas, st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK ) + { + return error; + } + } + } + + /* init necessary new renderers */ + if ( st_ivas->hBinRenderer == NULL && ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) ) + { + if ( ( error = ivas_binRenderer_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else if ( st_ivas->hDiracDecBin == NULL && ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC ) ) + { + if ( st_ivas->renderer_type != RENDERER_STEREO_PARAMETRIC ) + { + if ( ( error = ivas_dirac_dec_binaural_copy_hrtfs( &st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas, st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else if ( st_ivas->hBinRendererTd == NULL && st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD ) + { + if ( ( error = ivas_td_binaural_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + + if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on ) + { + if ( ( error = ivas_rend_initCrendWrapper( &st_ivas->hCrendWrapper +#ifdef SPLIT_REND_WITH_HEAD_ROT + , + 1 +#endif + ) ) != IVAS_ERR_OK ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend Wrapper\n" ); + } +#ifdef SPLIT_REND_WITH_HEAD_ROT + st_ivas->hCrendWrapper->hCrend[0] = NULL; + st_ivas->hCrendWrapper->hHrtfCrend = NULL; + if ( ( st_ivas->hCrendWrapper->hCrend[0] = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend\n" ); + } +#else + st_ivas->hCrendWrapper->hCrend = NULL; + st_ivas->hCrendWrapper->hHrtfCrend = NULL; + if ( ( st_ivas->hCrendWrapper->hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend\n" ); + } +#endif + } + } + else if ( st_ivas->hCrendWrapper == NULL && ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) ) + { + if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), + st_ivas->intern_config, + st_ivas->hDecoderConfig->output_config, + st_ivas->hRenderConfig, + st_ivas->hSetOfHRTF, + st_ivas->hDecoderConfig->output_Fs +#ifdef SPLIT_REND_WITH_HEAD_ROT + , + 1 +#endif + ) ) != IVAS_ERR_OK ) + { + return error; + } + st_ivas->binaural_latency_ns = st_ivas->hCrendWrapper->binaural_latency_ns; + } + } + /* mono/stereo */ + else if ( output_config == AUDIO_CONFIG_MONO || output_config == AUDIO_CONFIG_STEREO ) + { + /* nothing should happen here... */ + } + /* LS */ + else if ( output_config == AUDIO_CONFIG_5_1 || output_config == AUDIO_CONFIG_5_1_2 || output_config == AUDIO_CONFIG_5_1_4 || output_config == AUDIO_CONFIG_7_1 || output_config == AUDIO_CONFIG_7_1_4 || output_config == AUDIO_CONFIG_LS_CUSTOM ) + { +#ifdef DEBUGGING + assert( st_ivas->renderer_type == RENDERER_MC || st_ivas->renderer_type == RENDERER_MC_PARAMMC || st_ivas->renderer_type == RENDERER_DIRAC || st_ivas->renderer_type == RENDERER_DISABLE ); +#endif + } +#ifdef DEBUGGING + else if ( output_config == AUDIO_CONFIG_FOA || output_config == AUDIO_CONFIG_HOA2 || output_config == AUDIO_CONFIG_HOA3 ) + { + /* FOA/HOA output */ + /* Nothing to do, renderer is always RENDERER_SBA_LINEAR_ENC */ + assert( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC && renderer_type_old == RENDERER_SBA_LINEAR_ENC ); + } +#endif + } + +#ifdef FIX_417_TD_DECORR_BRATE_SW + /*-----------------------------------------------------------------* + * TD Decorrelator + *-----------------------------------------------------------------*/ + + if ( st_ivas->hDiracDecBin != NULL ) + { + if ( ( error = ivas_td_decorr_reconfig_dec( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hDecoderConfig->output_Fs, &( st_ivas->hDiracDecBin->hTdDecorr ), &( st_ivas->hDiracDecBin->useTdDecorr ) ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + /*-----------------------------------------------------------------* + * CLDFB instances + *-----------------------------------------------------------------*/ + + if ( ( error = ivas_cldfb_dec_reconfig( st_ivas, nchan_transport_old, numCldfbAnalyses_old, numCldfbSyntheses_old ) ) != IVAS_ERR_OK ) + { + return error; + } +#endif + + return error; +} diff --git a/lib_dec/ivas_mct_dec_mct.c b/lib_dec/ivas_mct_dec_mct.c index 6b8f9b74fa..987a9cc72f 100644 --- a/lib_dec/ivas_mct_dec_mct.c +++ b/lib_dec/ivas_mct_dec_mct.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -35,7 +35,7 @@ #include "ivas_cnst.h" #include "ivas_prot.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" #include #include "stat_enc.h" @@ -49,9 +49,7 @@ static void indexToChannelPair( MCT_DEC_BLOCK_DATA_HANDLE hBlock, const int16_t nChannels, - const int16_t pairIdx, - Decoder_State **sts /* i/o: decoder state structure */ -) + const int16_t pairIdx ) { int16_t ch1, ch2; int16_t tmpIdx = 0; @@ -60,10 +58,6 @@ static void indexToChannelPair( { for ( ch1 = 0; ch1 < ch2; ch1++ ) { - if ( sts[ch1]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch2]->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - continue; - } if ( tmpIdx == pairIdx ) { @@ -105,7 +99,8 @@ void ivas_mct_dec_mct( /*first get core and overlap info for all channels*/ for ( ch = 0; ch < nchan; ch++ ) { - if ( ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE ) && hMCT->currBlockDataCnt && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) + if ( + hMCT->currBlockDataCnt && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { hMCT->mc_global_ild[ch] = get_next_indice( sts[0], SMDCT_GLOBAL_ILD_BITS ); } @@ -119,7 +114,8 @@ void ivas_mct_dec_mct( { for ( ch = 0; ch < nchan; ch++ ) { - if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { hMCT->lowE_ch[ch] = get_next_indice( sts[0], 1 ); } @@ -128,7 +124,8 @@ void ivas_mct_dec_mct( for ( ch = 0; ch < nchan; ch++ ) { - if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { nchan_active++; } @@ -141,7 +138,7 @@ void ivas_mct_dec_mct( /*get channel pair index from BS*/ channelPairIndex = get_next_indice( sts[0], hMCT->bitsChannelPairIndex ); - indexToChannelPair( hBlock, nchan, channelPairIndex, sts ); + indexToChannelPair( hBlock, nchan, channelPairIndex ); /*point to decoder states of actual channels to read block pair bits*/ p_st[0] = sts[hBlock->ch1]; @@ -170,7 +167,8 @@ static void applyGlobalILD( int16_t nSubframes, L_subframeTCX; float qratio; - for ( ch = 0; ch < ( hMCT->nchan_out_woLFE + hMCT->num_lfe ); ch++ ) + for ( ch = 0; ch < ( hMCT->nchan_out_woLFE ); + ch++ ) { nSubframes = ( sts[ch]->core == TCX_20_CORE ) ? 1 : NB_DIV; L_subframeTCX = sts[ch]->hTcxDec->L_frameTCX / nSubframes; @@ -252,7 +250,7 @@ void mctStereoIGF_dec( float *p_x[CPE_CHANNELS][NB_DIV]; int16_t singleChEle[MCT_MAX_CHANNELS]; - set_s( singleChEle, 1, ( hMCT->nchan_out_woLFE + hMCT->num_lfe ) ); + set_s( singleChEle, 1, ( hMCT->nchan_out_woLFE ) ); for ( b = 0; b < hMCT->currBlockDataCnt; b++ ) { @@ -305,9 +303,10 @@ void mctStereoIGF_dec( } - if ( sum_s( singleChEle, ( hMCT->nchan_out_woLFE + hMCT->num_lfe ) ) != 0 ) + if ( sum_s( singleChEle, ( hMCT->nchan_out_woLFE ) ) != 0 ) { - for ( ch = 0; ch < ( hMCT->nchan_out_woLFE + hMCT->num_lfe ); ch++ ) + for ( ch = 0; ch < ( hMCT->nchan_out_woLFE ); + ch++ ) { if ( singleChEle[ch] ) { @@ -316,7 +315,7 @@ void mctStereoIGF_dec( { continue; } - if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE || st->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } diff --git a/lib_dec/ivas_mdct_core_dec.c b/lib_dec/ivas_mdct_core_dec.c index 3e186d61b8..843c739fbc 100644 --- a/lib_dec/ivas_mdct_core_dec.c +++ b/lib_dec/ivas_mdct_core_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -35,10 +35,13 @@ #include "options.h" #include "prot.h" #include "rom_com.h" +#ifdef SNS_MSVQ +#include "ivas_rom_com.h" +#endif #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" #include "cnst.h" #include "basop_proto_func.h" #include "stat_com.h" @@ -49,9 +52,9 @@ /*-----------------------------------------------------------------* - * Function mdct_read_IGF_bits() * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - * read IGF side bits * + * Function mdct_read_IGF_bits() + * + * read IGF side bits *-----------------------------------------------------------------*/ void mdct_read_IGF_bits( @@ -90,9 +93,9 @@ void mdct_read_IGF_bits( /*-----------------------------------------------------------------* - * Function dec_prm_tcx_sidebits() * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - * decode TCX side parameters * + * Function dec_prm_tcx_sidebits() + * + * decode TCX side parameters *-----------------------------------------------------------------*/ static void dec_prm_tcx_sidebits( @@ -162,22 +165,11 @@ static void dec_prm_tcx_sidebits( getTCXWindowing( st->core, st->last_core, st->element_mode, st->hTcxCfg, st0 ); st->hTcxDec->kernel_type[0] = st->hTcxDec->kernel_type[1] = MDCT_IV; - if ( st->element_mode == IVAS_CPE_MDCT && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) - { - st->hTcxDec->kernel_type[0] = get_next_indice( st0, st->last_core_from_bs != ACELP_CORE ? 2 : 1 ); - if ( st->core == TCX_10_CORE ) - { - st->hTcxDec->kernel_type[1] = 2 * ( st->hTcxDec->kernel_type[0] & 1 ) + get_next_indice( st0, 1 ); - } - } - - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) + st->hTcxDec->kernel_type[0] = get_next_indice( st0, st->last_core_from_bs != ACELP_CORE ? 2 : 1 ); + if ( st->core == TCX_10_CORE ) { - st->hTcxCfg->tcx_curr_overlap_mode = FULL_OVERLAP; - st->hTcxCfg->tcx_last_overlap_mode = FULL_OVERLAP; - st->hTcxCfg->last_aldo = 0; + st->hTcxDec->kernel_type[1] = 2 * ( st->hTcxDec->kernel_type[0] & 1 ) + get_next_indice( st0, 1 ); } - if ( st->core == TCX_20_CORE ) { st->transform_type[0] = st->transform_type[1] = TCX_20; @@ -212,18 +204,18 @@ static void dec_prm_tcx_sidebits( /*-----------------------------------------------------------------* - * Function dec_prm_tcx_spec() * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - * decode TCX core parameters * + * Function dec_prm_tcx_spec() + * + * decode TCX core parameters *-----------------------------------------------------------------*/ static void dec_prm_tcx_spec( - Decoder_State *st, /* i/o: decoder memory state */ - int16_t param[], /* o : decoded parameters */ - int16_t *total_nbbits, /* i/o: number of bits / decoded bits */ - int16_t *bitsRead, /* o : number of read bits */ + Decoder_State *st, /* i/o: decoder memory state */ + int16_t param[], /* o : decoded parameters */ + int16_t *total_nbbits, /* i/o: number of bits / decoded bits */ + int16_t *bitsRead, /* o : number of read bits */ int16_t p_param[NB_DIV], /* o : pointer to parameters for next round of bs reading*/ - int16_t nTnsBitsTCX10[NB_DIV] /* i : number of TNS bits per TCX10 subframe*/ + int16_t nTnsBitsTCX10[NB_DIV] /* i : number of TNS bits per TCX10 subframe */ ) { int16_t nSubframes; @@ -288,9 +280,9 @@ static void dec_prm_tcx_spec( /*-----------------------------------------------------------------* - * Function ivas_mdct_dec_side_bits_frame_channel() * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - * Initialize TCX and read TCX side parameters * + * Function ivas_mdct_dec_side_bits_frame_channel() + * + * Initialize TCX and read TCX side parameters *-----------------------------------------------------------------*/ void ivas_mdct_dec_side_bits_frame_channel( @@ -298,7 +290,6 @@ void ivas_mdct_dec_side_bits_frame_channel( int16_t param_lpc[MCT_MAX_CHANNELS][NPRM_LPC_NEW], /* o : lpc_parameters */ int16_t p_param[CPE_CHANNELS][NB_DIV], /* o : pointer to param buffer */ Decoder_State *st0, /* i : pointer to bitstream handle */ - int16_t *LFE_off, /* o : flag if LFE has content */ int16_t nTnsBitsTCX10[CPE_CHANNELS][NB_DIV], /* o : number of bits for TNS */ int16_t param[CPE_CHANNELS][DEC_NPRM_DIV * NB_DIV], /* i/o: parameters buffer */ const int16_t MCT_flag, /* i : hMCT handle allocated (1) or not (0)*/ @@ -340,11 +331,7 @@ void ivas_mdct_dec_side_bits_frame_channel( continue; } st = sts[ch]; - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - *LFE_off = get_next_indice( st0, 1 ); - } - else if ( MCT_flag ) + if ( MCT_flag ) { tmp = get_next_indice( st0, 1 ); if ( tmp ) @@ -362,7 +349,7 @@ void ivas_mdct_dec_side_bits_frame_channel( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && *LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { sts[ch]->coder_type = INACTIVE; sts[ch]->side_bits_frame_channel = 0; @@ -384,13 +371,113 @@ void ivas_mdct_dec_side_bits_frame_channel( * SNS parameters *--------------------------------------------------------------------------------*/ +#ifdef SNS_MSVQ + sns_low_br_mode = 0; + skipped_first_channel = 0; + if ( !MCT_flag && sts[0]->sr_core == 25600 && ( ( hCPE->element_brate == IVAS_48k || hCPE->element_brate == IVAS_64k ) ) ) + { + param_lpc[0][0] = SNS_STEREO_MODE_LR; + param_lpc[0][1] = SNS_STEREO_MODE_LR; + param_lpc[0][2] = 0; + param_lpc[0][3] = 0; + if ( sts[0]->core == sts[1]->core ) + { + int16_t nSubframes; + nSubframes = ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV; + + for ( int16_t n = 0; n < nSubframes; ++n ) + { + param_lpc[0][n] = get_next_indice( st0, 1 ); + } + + /* zero side flags only get transmitted if needed */ + for ( int16_t n = 0; n < nSubframes; ++n ) + { + if ( param_lpc[0][n] == SNS_STEREO_MODE_MS ) + { + param_lpc[0][n + SNS_STEREO_MODE_OFFSET_INDICES / 2] = get_next_indice( st0, 1 ); + } + } + } + for ( ch = 0; ch < CPE_CHANNELS; ++ch ) + { + int16_t nSubframes; + int16_t idxIndices; + + st = sts[ch]; + nSubframes = ( st->core == TCX_20_CORE ) ? 1 : NB_DIV; + idxIndices = 0; + + for ( int16_t n = 0; n < nSubframes; ++n ) + { + const int16_t is_side = ch == 1 && param_lpc[0][n] == SNS_STEREO_MODE_MS; + const int16_t *bits = ( nSubframes == 1 ) ? ivas_sns_cdbks_tcx20_bits : ivas_sns_cdbks_tcx10_bits; + int16_t nStages = ( ( nSubframes == 1 ) ? SNS_MSVQ_NSTAGES_TCX20 : SNS_MSVQ_NSTAGES_TCX10 ); + + if ( is_side ) + { + /* check for zero-side flag */ + if ( param_lpc[0][n + SNS_STEREO_MODE_OFFSET_INDICES / 2] ) + { + continue; + } + nStages = SNS_MSVQ_NSTAGES_SIDE; + bits = ( nSubframes == 1 ) ? ivas_sns_cdbks_side_tcx20_bits : ivas_sns_cdbks_side_tcx10_bits; + } + for ( int16_t j = 0; j < nStages; ++j ) + { + /* plus one in index for stereo mode storage! */ + param_lpc[ch][j + idxIndices + SNS_STEREO_MODE_OFFSET_INDICES] = get_next_indice( st0, bits[j] ); + } + idxIndices += nStages; + } + } + } + else + { + for ( ch = 0; ch < CPE_CHANNELS; ch++ ) + { + st = sts[ch]; + + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + { + skipped_first_channel = 1; + continue; + } + + start_bit_pos_sns = st0->next_bit_pos; + + if ( ch == 0 || skipped_first_channel ) + { + /* read SNS stereo mode */ + param_lpc[0][0] = get_next_indice( st0, 1 ) << 1; + + /* read low br mode flag (if it is possible to be non-zero) */ + if ( sts[0]->element_brate == IVAS_48k && !( ( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) ) ) + { + sns_low_br_mode = get_next_indice( st0, 1 ); + } + } + + tmp = ch; + if ( ch == 1 && param_lpc[0][0] == 2 ) + { + tmp = 3; + } + + getLPCparam( st, ¶m_lpc[ch][0], st0, tmp, sns_low_br_mode && !( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) ); + + st->side_bits_frame_channel += st0->next_bit_pos - start_bit_pos_sns; + } + } +#else skipped_first_channel = 0; sns_low_br_mode = 0; for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && *LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { skipped_first_channel = 1; continue; @@ -404,7 +491,7 @@ void ivas_mdct_dec_side_bits_frame_channel( param_lpc[0][0] = get_next_indice( st0, 1 ) << 1; /* read low br mode flag (if it is possible to be non-zero) */ - if ( sts[0]->element_brate == IVAS_48k && !( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) ) + if ( sts[0]->element_brate == IVAS_48k && !( ( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) ) ) { sns_low_br_mode = get_next_indice( st0, 1 ); } @@ -420,6 +507,7 @@ void ivas_mdct_dec_side_bits_frame_channel( st->side_bits_frame_channel += st0->next_bit_pos - start_bit_pos_sns; } +#endif // SNS_MSVQ } return; @@ -427,14 +515,13 @@ void ivas_mdct_dec_side_bits_frame_channel( /*-----------------------------------------------------------------* - * ivas_mdct_core_invQ() * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - * Inverse processing steps up to inverse quantization * + * ivas_mdct_core_invQ() + * + * Inverse processing steps up to inverse quantization *-----------------------------------------------------------------*/ void ivas_mdct_core_invQ( CPE_DEC_HANDLE hCPE, /* i/o: CPE handle */ - const int16_t LFE_off, /* i : flag if LFE content */ int16_t nTnsBitsTCX10[CPE_CHANNELS][NB_DIV], /* i : number of TNS bits */ int16_t p_param[CPE_CHANNELS][NB_DIV], /* i : pointer to param buffer */ int16_t param_lpc[CPE_CHANNELS][NPRM_LPC_NEW], /* i : lpc parameters */ @@ -456,7 +543,11 @@ void ivas_mdct_core_invQ( int16_t *prm[CPE_CHANNELS]; /* LPC */ Word16 Aind[CPE_CHANNELS][M + 1]; +#ifdef SNS_MSVQ + float sns[CPE_CHANNELS][NB_DIV][M]; +#else float lsf[CPE_CHANNELS][( NB_DIV + 1 ) * M]; +#endif /* TCX */ float xn_buf[L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX]; int16_t tcx_offset[CPE_CHANNELS]; @@ -474,7 +565,7 @@ void ivas_mdct_core_invQ( float concealment_noise[CPE_CHANNELS][L_FRAME48k]; TONALMDCTCONC_NOISE_GEN_MODE noise_gen_mode_bfi; - wmops_sub_start( "mdct_core_invQ" ); + push_wmops( "mdct_core_invQ" ); sts = hCPE->hCoreCoder; bfi = sts[0]->bfi; @@ -521,7 +612,7 @@ void ivas_mdct_core_invQ( { st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) /* indicates LFE with no content, or odd number of channels */ + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { st->total_brate = st->bits_frame_channel; continue; @@ -575,12 +666,6 @@ void ivas_mdct_core_invQ( /* PLC: [Common: mode decision] * PLC: Decide which Concealment to use. Update pitch lags if needed */ st->core = GetPLCModeDecision( st ); - - /*disable ACELP_PLC for LFE channel */ - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - st->core = st->last_core; - } } if ( ( !st->bfi || st->hTcxCfg->psychParamsCurrent == NULL ) && st->core > ACELP_CORE ) @@ -629,6 +714,33 @@ void ivas_mdct_core_invQ( * LPC PARAMETERS *--------------------------------------------------------------------------------*/ +#ifdef SNS_MSVQ + if ( bfi == 0 ) + { + if ( !MCT_flag && sts[0]->sr_core == 25600 && ( ( hCPE->element_brate == IVAS_48k || hCPE->element_brate == IVAS_64k ) ) ) + { + dequantize_sns( param_lpc, sns, sts ); + } + else + { + if ( sts[0]->core == TCX_20_CORE && sts[1]->core == TCX_20_CORE && sts[0]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) + { + sns_avq_dec_stereo( param_lpc[0], param_lpc[1], &sns[0][0][0], &sns[1][0][0] ); + } + else + { + for ( ch = 0; ch < CPE_CHANNELS; ch++ ) + { + st = sts[ch]; + if ( st->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) + { + sns_avq_dec( param_lpc[ch], sns[ch], st->numlpc ); + } + } + } + } + } +#else if ( bfi == 0 ) { if ( sts[0]->core == TCX_20_CORE && sts[1]->core == TCX_20_CORE && sts[0]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) @@ -647,6 +759,8 @@ void ivas_mdct_core_invQ( } } } +#endif + /*--------------------------------------------------------------* * Rate switching @@ -670,7 +784,7 @@ void ivas_mdct_core_invQ( { st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) /* indicates LFE with no content, or odd number of channels */ + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { set_f( x[ch][0], 0.f, st->hTcxCfg->tcx_coded_lines ); /* usually set in decoder_tcx_invQ(), needed for concealment */ @@ -690,7 +804,11 @@ void ivas_mdct_core_invQ( /* Stability Factor */ if ( !bfi ) { +#ifdef SNS_MSVQ + mvr2r( sns[ch][k], &Aq[ch][k * M], M ); +#else mvr2r( &lsf[ch][( k + 1 ) * M], &Aq[ch][k * M], M ); +#endif } else { @@ -720,36 +838,29 @@ void ivas_mdct_core_invQ( { TonalMdctConceal_create_concealment_noise( concealment_noise[ch], hCPE, L_frameTCX[ch], L_frame[ch], ch, k, st->core, st->hTcxDec->cummulative_damping_tcx, noise_gen_mode_bfi ); } + decoder_tcx_noisefilling( st, concealment_noise[ch], Aq[ch], L_frameTCX_global[ch], L_spec[ch], L_frame[ch], L_frameTCX[ch], x[ch][k], NULL, &tmp_concealment_method, gain_tcx, prm_sqQ, nf_seed, bfi, MCT_flag, k ); - decoder_tcx_noiseshaping_igf( st, L_spec[ch], L_frame[ch], L_frameTCX[ch], left_rect[ch], x[ch][k], - NULL, &tmp_concealment_method, bfi ); + decoder_tcx_noiseshaping_igf( st, L_spec[ch], L_frame[ch], L_frameTCX[ch], left_rect[ch], x[ch][k], NULL, &tmp_concealment_method, bfi ); } } - - - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) /*indicates LFE with no content*/ - { - set_f( &x[ch][0][MCT_LFE_MAX_LINE], 0.f, st->hTcxCfg->tcx_coded_lines - MCT_LFE_MAX_LINE ); - } } - wmops_sub_end(); + pop_wmops(); return; } /*-----------------------------------------------------------------* - * ivas_mdct_core_reconstruct() * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - * reconstruct time signal * + * ivas_mdct_core_reconstruct() + * + * reconstruct time signal *-----------------------------------------------------------------*/ void ivas_mdct_core_reconstruct( CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */ float *x[][NB_DIV], /* i/o: synthesis @internal_FS */ float signal_outFB[CPE_CHANNELS][L_FRAME_PLUS], /* o : synthesis @output_FS */ - const int16_t LFE_off, /* i : flag if LFE content */ int16_t fUseTns[CPE_CHANNELS][NB_DIV], /* i : flage TNS enabled */ const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0)*/ ) @@ -773,7 +884,6 @@ void ivas_mdct_core_reconstruct( int16_t pitch[CPE_CHANNELS][NB_SUBFR16k]; float pit_gain[CPE_CHANNELS][NB_SUBFR16k]; - int16_t isLFE; int16_t skip_decoding; set_f( xn_buf, 0, L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX ); @@ -788,17 +898,11 @@ void ivas_mdct_core_reconstruct( st = sts[ch]; skip_decoding = 0; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) /* indicates LFE with no content, or odd number of channels */ + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { skip_decoding = 1; } - isLFE = 0; - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - isLFE = 1; - } - nSubframes[ch] = ( st->core == TCX_20_CORE ) ? 1 : NB_DIV; synth = synth_buf + st->hTcxDec->old_synth_len; synthFB = synth_bufFB + st->hTcxDec->old_synth_lenFB; @@ -823,7 +927,8 @@ void ivas_mdct_core_reconstruct( decoder_tcx_imdct( st, L_frame_global[ch], L_frame_globalTCX[ch], L_spec[ch], tcx_offset[ch], tcx_offsetFB[ch], L_frame[ch], L_frameTCX[ch], left_rect[ch], &x[ch][k][0], xn_buf, ( ( hCPE->nchan_out == 1 && st->hTcxDec->kernel_type[k] == MDST_IV ) || st->hTcxCfg->tcx_last_overlap_mode == TRANSITION_OVERLAP ) ? MDCT_IV : st->hTcxDec->kernel_type[k], - fUseTns[ch][k], &synth[k * L_frame[ch]], &synthFB[k * L_frameTCX[ch]], bfi, k, isLFE, 0 ); + fUseTns[ch][k], &synth[k * L_frame[ch]], &synthFB[k * L_frameTCX[ch]], bfi, k, + 0 ); } else { @@ -943,7 +1048,6 @@ void ivas_mdct_core_reconstruct( if ( !bfi && !MCT_flag && hCPE->element_mode == IVAS_CPE_MDCT ) { int16_t i; - float nrgL, nrgR, xcorr; nrgL = nrgR = xcorr = EPSILON; @@ -964,14 +1068,13 @@ void ivas_mdct_core_reconstruct( /*-----------------------------------------------------------------* - * ivas_mdct_core_tns_ns() * - * ~~~~~~~~~~~~~~~~~~~~~~~ * - * reconstruct time signal * + * ivas_mdct_core_tns_ns() + * + * reconstruct time signal *-----------------------------------------------------------------*/ void ivas_mdct_core_tns_ns( CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */ - const int16_t LFE_off, /* i : flag if LFE has content */ int16_t fUseTns[CPE_CHANNELS][NB_DIV], /* i : two entries for each channel in TCX10 */ STnsData tnsData[CPE_CHANNELS][NB_DIV], /* o : TNS parameter */ float *x[CPE_CHANNELS][NB_DIV], /* o : synthesis @internal_FS */ @@ -999,6 +1102,7 @@ void ivas_mdct_core_tns_ns( set_f( xn_buf, 0, L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX ); + /* TNS, ITF, IMDCT and updates */ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { @@ -1008,7 +1112,8 @@ void ivas_mdct_core_tns_ns( L_frameTCX_glob[ch] = st->hTcxDec->L_frameTCX / nSubframes[ch]; L_spec[ch] = st->hTcxCfg->tcx_coded_lines / nSubframes[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) || ( st->bfi && st->core == ACELP_CORE ) ) /* indicates LFE with no content, or odd number of channels */ + if ( + ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) || ( st->bfi && st->core == ACELP_CORE ) ) /* indicates LFE with no content, or odd number of channels */ { if ( st->hTonalMDCTConc != NULL ) { @@ -1063,14 +1168,12 @@ void ivas_mdct_core_tns_ns( } } - decoder_tcx_tns( st, L_frame_global[ch], L_spec[ch], L_frame[ch], L_frameTCX[ch], &x[ch][k][0], - fUseTns[ch][k], &tnsData[ch][k], bfi, k, 1 ); + decoder_tcx_tns( st, L_frame_global[ch], L_spec[ch], L_frame[ch], L_frameTCX[ch], &x[ch][k][0], fUseTns[ch][k], &tnsData[ch][k], bfi, k, 1 ); sns_shape_spectrum( x[ch][k], st->hTcxCfg->psychParamsCurrent, &sns_int_scf[0], st->hTcxCfg->psychParamsCurrent->nBins ); v_multc( x[ch][k] + st->hTcxCfg->psychParamsCurrent->nBins, sns_int_scf[FDNS_NPTS - 1], x[ch][k] + st->hTcxCfg->psychParamsCurrent->nBins, L_spec[ch] - st->hTcxCfg->psychParamsCurrent->nBins ); - decoder_tcx_tns( st, L_frame_global[ch], L_spec[ch], L_frame[ch], L_frameTCX[ch], &x[ch][k][0], - fUseTns[ch][k], &tnsData[ch][k], bfi, k, 0 ); + decoder_tcx_tns( st, L_frame_global[ch], L_spec[ch], L_frame[ch], L_frameTCX[ch], &x[ch][k][0], fUseTns[ch][k], &tnsData[ch][k], bfi, k, 0 ); } if ( bfi && st->tonal_mdct_plc_active ) diff --git a/lib_dec/ivas_mono_dmx_renderer.c b/lib_dec/ivas_mono_dmx_renderer.c index 20b677075e..d4dcb7ac73 100644 --- a/lib_dec/ivas_mono_dmx_renderer.c +++ b/lib_dec/ivas_mono_dmx_renderer.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -29,7 +29,7 @@ the United Nations Convention on Contracts on the International Sales of Goods. *******************************************************************************************************/ -// VE2AT: move to lib_rend ? + #include #include "options.h" #include @@ -39,7 +39,7 @@ #include "ivas_cnst.h" #include "ivas_rom_com.h" #include "ivas_rom_dec.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------- @@ -63,7 +63,7 @@ ivas_error ivas_mono_dmx_renderer_open( { MONO_DOWNMIX_RENDERER_HANDLE hDownmix; - if ( ( hDownmix = (MONO_DOWNMIX_RENDERER_HANDLE) count_malloc( sizeof( MONO_DOWNMIX_RENDERER_STRUCT ) ) ) == NULL ) + if ( ( hDownmix = (MONO_DOWNMIX_RENDERER_HANDLE) malloc( sizeof( MONO_DOWNMIX_RENDERER_STRUCT ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for downmixing\n" ) ); } @@ -124,10 +124,11 @@ void ivas_mono_downmix_render_passive( return; } + /*------------------------------------------------------------------------- * ivas_mono_stereo_downmix_mcmasa() * - * Downmix process + * Downmix process in McMASA *------------------------------------------------------------------------*/ void ivas_mono_stereo_downmix_mcmasa( @@ -165,4 +166,6 @@ void ivas_mono_stereo_downmix_mcmasa( /* Move to output */ mvr2r( dmx_tmp, output_f[0], output_frame ); } + + return; } diff --git a/lib_debug/segsnr.c b/lib_dec/ivas_objectRenderer_internal.c similarity index 55% rename from lib_debug/segsnr.c rename to lib_dec/ivas_objectRenderer_internal.c index 561a4e239d..f1c1fc04f2 100644 --- a/lib_debug/segsnr.c +++ b/lib_dec/ivas_objectRenderer_internal.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -30,74 +30,51 @@ *******************************************************************************************************/ +#include +#include "options.h" +#include "prot.h" +#include "ivas_prot.h" +#include "ivas_prot_rend.h" #include +#include "ivas_rom_com.h" #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" -#include -#include "options.h" -#include "prot.h" +#include "wmc_auto.h" -#define WMC_TOOL_MAN -#ifdef OUTPUT_SNR -/*_____________________________________________________________________ - | | - | FUNCTION NAME segsnr | - | Computes the segmential signal-to-noise ratio between the | - | signal x and its estimate xe of length n samples. The segment | - | length is nseg samples. | - | - | INPUT - | x[0:n-1] Signal of n samples. - | xe[0:n-1] Estimated signal of n samples. - | n Signal length. - | nseg Segment length, must be a submultiple of n. - | - | RETURN VALUE - | snr Segmential signal to noise ratio in dB. - |_____________________________________________________________________| -*/ +/*---------------------------------------------------------------------* + * ivas_td_binaural_open() + * + * Open and initialize TD Object binaural renderer + *---------------------------------------------------------------------*/ -float segsnr( float x[], float xe[], int16_t n, int16_t nseg ) +ivas_error ivas_td_binaural_open( + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +) { - float snr = 0.0f; - float signal, noise, error, fac; - int16_t i, j; - LOOP( 1 ); - for ( i = 0; i < n; i += nseg ) - { - signal = 1e-6f; - MOVE( 2 ); - noise = 1e-6f; - LOOP( 1 ); - for ( j = 0; j < nseg; j++ ) - { - signal += ( *x ) * ( *x ); - MAC( 1 ); - error = *x++ - *xe++; - ADD( 1 ); - noise += error * error; - MAC( 1 ); - } - snr += (float) log10( signal / noise ); - TRANS( 1 ); - DIV( 1 ); - ADD( 1 ); - } - fac = ( (float) ( 10 * nseg ) ) / (float) n; - DIV( 1 ); - MULT( 1 ); - snr = fac * snr; - MULT( 1 ); - ADD( 1 ); - BRANCH( 1 ); - if ( snr < -99.0f ) - { - snr = -99.0f; - MOVE( 1 ); - } - return ( snr ); + return ivas_td_binaural_open_unwrap( &st_ivas->hHrtfTD, st_ivas->hDecoderConfig->output_Fs, st_ivas->nchan_transport, st_ivas->ivas_format, + st_ivas->transport_config, st_ivas->hRenderConfig->directivity, st_ivas->hTransSetup, &st_ivas->hBinRendererTd, &st_ivas->binaural_latency_ns ); +} + + +/*---------------------------------------------------------------------* + * ivas_td_binaural_renderer() + * + * Receives the current frames for the object streams, updates metadata + * and renders the current frame. + *---------------------------------------------------------------------*/ + +ivas_error ivas_td_binaural_renderer( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + float output[][L_FRAME48k], /* i/o: SCE channels / Binaural synthesis */ + const int16_t output_frame /* i : output frame length */ +) +{ + return ivas_td_binaural_renderer_unwrap( + st_ivas->hReverb, + st_ivas->transport_config, + st_ivas->hBinRendererTd, st_ivas->nchan_transport, LFE_CHANNEL, st_ivas->ivas_format, + st_ivas->hIsmMetaData, st_ivas->hDecoderConfig->Opt_Headrotation, ( st_ivas->hHeadTrackData != NULL ) ? st_ivas->hHeadTrackData->Quaternions : NULL, + ( st_ivas->hHeadTrackData != NULL ) ? st_ivas->hHeadTrackData->Pos : NULL, output, output_frame ); } -#endif diff --git a/lib_dec/ivas_out_setup_conversion.c b/lib_dec/ivas_out_setup_conversion.c index 55f53bae73..2fb04af8d7 100644 --- a/lib_dec/ivas_out_setup_conversion.c +++ b/lib_dec/ivas_out_setup_conversion.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -29,19 +29,20 @@ the United Nations Convention on Contracts on the International Sales of Goods. *******************************************************************************************************/ -// VE2AT: move to lib_rend ? -#include + #include #include "options.h" #include -#include "ivas_prot.h" +#include #include "prot.h" +#include "ivas_prot.h" +#include "ivas_prot_rend.h" +#include "ivas_rom_com.h" +#include "ivas_rom_rend.h" #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" -#include "ivas_rom_com.h" -#include "ivas_rom_dec.h" +#include "wmc_auto.h" /*----------------------------------------------------------------------------------* @@ -317,7 +318,7 @@ ivas_error ivas_ls_setup_conversion_open( output_frame = (int16_t) ( output_Fs / FRAMES_PER_SEC ); /* Allocate memory to the handle */ - if ( ( hLsSetUpConversion = (LSSETUP_CONVERSION_HANDLE) count_malloc( sizeof( LSSETUP_CONVERSION_STRUCT ) ) ) == NULL ) + if ( ( hLsSetUpConversion = (LSSETUP_CONVERSION_HANDLE) malloc( sizeof( LSSETUP_CONVERSION_STRUCT ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LS configuration Conversion Handle \n" ) ); } @@ -331,8 +332,14 @@ ivas_error ivas_ls_setup_conversion_open( hLsSetUpConversion->sfbCnt = (int16_t) ( output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ); for ( chIdx = 0; chIdx < outChannels; chIdx++ ) { - hLsSetUpConversion->targetEnergyPrev[chIdx] = (float *) count_malloc( ( hLsSetUpConversion->sfbCnt ) * sizeof( float ) ); - hLsSetUpConversion->dmxEnergyPrev[chIdx] = (float *) count_malloc( ( hLsSetUpConversion->sfbCnt ) * sizeof( float ) ); + if ( ( hLsSetUpConversion->targetEnergyPrev[chIdx] = (float *) malloc( ( hLsSetUpConversion->sfbCnt ) * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LS configuration Conversion Handle \n" ) ); + } + if ( ( hLsSetUpConversion->dmxEnergyPrev[chIdx] = (float *) malloc( ( hLsSetUpConversion->sfbCnt ) * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LS configuration Conversion Handle \n" ) ); + } set_f( hLsSetUpConversion->targetEnergyPrev[chIdx], 0.0f, hLsSetUpConversion->sfbCnt ); set_f( hLsSetUpConversion->dmxEnergyPrev[chIdx], 0.0f, hLsSetUpConversion->sfbCnt ); } @@ -347,8 +354,15 @@ ivas_error ivas_ls_setup_conversion_open( inChannels = st_ivas->nchan_transport; /*Initialization of MDCT bands with TCX20 resolution */ ivas_lssetupconversion_mdct_init_bands( output_frame, TCX_20_CORE, &hLsSetUpConversion->sfbOffset[0], &hLsSetUpConversion->sfbCnt ); - hLsSetUpConversion->targetEnergyPrev[0] = (float *) count_malloc( ( MAX_SFB + 2 ) * sizeof( float ) ); - hLsSetUpConversion->dmxEnergyPrev[0] = (float *) count_malloc( ( MAX_SFB + 2 ) * sizeof( float ) ); + if ( ( hLsSetUpConversion->targetEnergyPrev[0] = (float *) malloc( ( MAX_SFB + 2 ) * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LS configuration Conversion Handle \n" ) ); + } + if ( ( hLsSetUpConversion->dmxEnergyPrev[0] = (float *) malloc( ( MAX_SFB + 2 ) * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LS configuration Conversion Handle \n" ) ); + } + for ( chIdx = 1; chIdx < MAX_CICP_CHANNELS; chIdx++ ) { hLsSetUpConversion->targetEnergyPrev[chIdx] = NULL; @@ -363,7 +377,7 @@ ivas_error ivas_ls_setup_conversion_open( for ( chIdx = 0; chIdx < inChannels; chIdx++ ) { /* Allocate memory depending on the number of output channels */ - if ( ( hLsSetUpConversion->dmxMtx[chIdx] = (float *) count_malloc( outChannels * sizeof( float ) ) ) == NULL ) + if ( ( hLsSetUpConversion->dmxMtx[chIdx] = (float *) malloc( outChannels * sizeof( float ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for temp dmx matrix \n" ) ); } @@ -418,24 +432,24 @@ void ivas_ls_setup_conversion_close( { if ( ( *hLsSetUpConversion )->dmxMtx[idx] != NULL ) { - count_free( ( *hLsSetUpConversion )->dmxMtx[idx] ); + free( ( *hLsSetUpConversion )->dmxMtx[idx] ); ( *hLsSetUpConversion )->dmxMtx[idx] = NULL; } if ( ( *hLsSetUpConversion )->targetEnergyPrev[idx] != NULL ) { - count_free( ( *hLsSetUpConversion )->targetEnergyPrev[idx] ); + free( ( *hLsSetUpConversion )->targetEnergyPrev[idx] ); ( *hLsSetUpConversion )->targetEnergyPrev[idx] = NULL; } if ( ( *hLsSetUpConversion )->dmxEnergyPrev[idx] != NULL ) { - count_free( ( *hLsSetUpConversion )->dmxEnergyPrev[idx] ); + free( ( *hLsSetUpConversion )->dmxEnergyPrev[idx] ); ( *hLsSetUpConversion )->dmxEnergyPrev[idx] = NULL; } } - count_free( *hLsSetUpConversion ); + free( *hLsSetUpConversion ); *hLsSetUpConversion = NULL; return; @@ -460,7 +474,7 @@ void ivas_ls_setup_conversion( float dmxCoeff, tmpVal; float output_tmp[MAX_OUTPUT_CHANNELS][L_FRAME48k]; - wmops_sub_start( "LS_Renderer" ); + push_wmops( "LS_Renderer" ); hLsSetUpConversion = st_ivas->hLsSetUpConversion; @@ -499,7 +513,7 @@ void ivas_ls_setup_conversion( mvr2r( output_tmp[chOutIdx], output[chOutIdx], output_frame ); } - wmops_sub_end(); + pop_wmops(); return; } @@ -535,7 +549,7 @@ void ivas_ls_setup_conversion_process_mdct( LSSETUP_CONVERSION_HANDLE hLsSetUpConversion; CPE_DEC_HANDLE hCPE[MCT_MAX_BLOCKS]; - wmops_sub_start( "LS_Renderer_MDCT" ); + push_wmops( "LS_Renderer_MDCT" ); /* Assign all the declared variables */ inChannels = st_ivas->nchan_transport; @@ -586,7 +600,9 @@ void ivas_ls_setup_conversion_process_mdct( { dmxCoeff = hLsSetUpConversion->dmxMtx[chInIdx][chOutIdx]; - if ( !( chInIdx == LFE_CHANNEL && st_ivas->hMCT->LFE_off ) && mct_chan_mode[chInIdx] != MCT_CHAN_MODE_IGNORE ) + if ( + chInIdx != LFE_CHANNEL && + mct_chan_mode[chInIdx] != MCT_CHAN_MODE_IGNORE ) { /* Step 1: Compute the target energy and DMX signal (possible since we have all signals in TCX20 resolution) */ if ( dmxCoeff ) @@ -679,7 +695,9 @@ void ivas_ls_setup_conversion_process_mdct( /* Step 4: Perform equalization */ for ( chInIdx = 0; chInIdx < inChannels; chInIdx++ ) { - if ( !( chInIdx == LFE_CHANNEL && st_ivas->hMCT->LFE_off ) && mct_chan_mode[chInIdx] != MCT_CHAN_MODE_IGNORE ) + if ( + chInIdx != LFE_CHANNEL && + mct_chan_mode[chInIdx] != MCT_CHAN_MODE_IGNORE ) { if ( transform_type[chInIdx][0] == TCX_20 ) { @@ -736,7 +754,7 @@ void ivas_ls_setup_conversion_process_mdct( } } - wmops_sub_end(); + pop_wmops(); return; } @@ -1096,7 +1114,7 @@ void ivas_lssetupconversion_process_param_mc( float Cldfb_ImagBuffer_tmp[MAX_CICP_CHANNELS][CLDFB_NO_CHANNELS_MAX]; LSSETUP_CONVERSION_HANDLE hLsSetUpConversion; - wmops_sub_start( "LS_Renderer_Process_Param_MC" ); + push_wmops( "LS_Renderer_Process_Param_MC" ); /* inits */ inChannels = st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe; @@ -1199,6 +1217,6 @@ void ivas_lssetupconversion_process_param_mc( } } - wmops_sub_end(); + pop_wmops(); return; } diff --git a/lib_dec/ivas_output_config.c b/lib_dec/ivas_output_config.c new file mode 100644 index 0000000000..bd4a3242d1 --- /dev/null +++ b/lib_dec/ivas_output_config.c @@ -0,0 +1,449 @@ +/****************************************************************************************************** + + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository. All Rights Reserved. + + This software is protected by copyright law and by international treaties. + The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository retain full ownership rights in their respective contributions in + the software. This notice grants no license of any kind, including but not limited to patent + license, nor is any license granted by implication, estoppel or otherwise. + + Contributors are required to enter into the IVAS codec Public Collaboration agreement before making + contributions. + + This software is provided "AS IS", without any express or implied warranties. The software is in the + development stage. It is intended exclusively for experts who have experience with such software and + solely for the purpose of inspection. All implied warranties of non-infringement, merchantability + and fitness for a particular purpose are hereby disclaimed and excluded. + + Any dispute, controversy or claim arising under or in relation to providing this software shall be + submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in + accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and + the United Nations Convention on Contracts on the International Sales of Goods. + +*******************************************************************************************************/ + +#include +#include "options.h" +#include "ivas_cnst.h" +#include "ivas_prot.h" +#ifdef SPLIT_REND_WITH_HEAD_ROT +#include "ivas_prot_rend.h" +#endif +#include "ivas_stat_dec.h" +#ifdef DEBUGGING +#include "debug.h" +#include +#endif +#include "wmc_auto.h" + + +/*-------------------------------------------------------------------------* + * ivas_renderer_select() + * + * Select and configure IVAS renderer parameters + *-------------------------------------------------------------------------*/ + +void ivas_renderer_select( + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +) +{ + RENDERER_TYPE *renderer_type; + AUDIO_CONFIG *internal_config; + AUDIO_CONFIG output_config; + AUDIO_CONFIG transport_config; + + int16_t nchan_internal; + + renderer_type = &( st_ivas->renderer_type ); + internal_config = &( st_ivas->intern_config ); + output_config = st_ivas->hDecoderConfig->output_config; + transport_config = st_ivas->transport_config; + + /* disabled rendering by default */ + *renderer_type = RENDERER_DISABLE; + + /*-----------------------------------------------------------------* + * Binaural rendering configurations + *-----------------------------------------------------------------*/ + + if ( st_ivas->hDecoderConfig->Opt_Headrotation ) + { + st_ivas->hHeadTrackData->shd_rot_max_order = -1; + } + + if ( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM +#ifdef SPLIT_REND_WITH_HEAD_ROT + || output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB +#endif + ) + { + if ( st_ivas->ivas_format == ISM_FORMAT ) + { + if ( st_ivas->ism_mode == ISM_MODE_PARAM ) + { + if ( output_config == AUDIO_CONFIG_BINAURAL ) + { + *renderer_type = RENDERER_BINAURAL_PARAMETRIC; + } + else + { + *renderer_type = RENDERER_BINAURAL_PARAMETRIC_ROOM; + } + } + else /* ISM_MODE_DISC */ + { + if ( output_config == AUDIO_CONFIG_BINAURAL || st_ivas->hRenderConfig->roomAcoustics.use_brir == 0 ) + { +#ifdef DEBUGGING + if ( st_ivas->hDecoderConfig->force_rend == FORCE_CLDFB_RENDERER ) + { + *renderer_type = RENDERER_BINAURAL_FASTCONV; + *internal_config = AUDIO_CONFIG_HOA3; /* Render ISM to HOA3 before binauralization*/ + } + else + { + *renderer_type = RENDERER_BINAURAL_OBJECTS_TD; + *internal_config = AUDIO_CONFIG_BINAURAL; + } +#else + *renderer_type = RENDERER_BINAURAL_OBJECTS_TD; + *internal_config = AUDIO_CONFIG_BINAURAL; +#endif + } + else + { + *renderer_type = RENDERER_BINAURAL_MIXER_CONV_ROOM; +#ifdef DEBUGGING + if ( st_ivas->hRenderConfig->renderer_type_override == RENDER_TYPE_OVERRIDE_FASTCONV ) + { + *renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM; + } +#endif + *internal_config = AUDIO_CONFIG_7_1_4; + } + } + } + else if ( st_ivas->ivas_format == MASA_FORMAT || ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->nchan_transport <= 2 ) ) + { + *internal_config = output_config; + if ( output_config == AUDIO_CONFIG_BINAURAL +#ifdef SPLIT_REND_WITH_HEAD_ROT + || output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB +#endif + ) + { + *renderer_type = RENDERER_BINAURAL_PARAMETRIC; + } + else + { + *renderer_type = RENDERER_BINAURAL_PARAMETRIC_ROOM; + } + } + else if ( st_ivas->ivas_format == SBA_FORMAT ) + { + *internal_config = AUDIO_CONFIG_HOA3; + + if ( output_config == AUDIO_CONFIG_BINAURAL +#ifdef SPLIT_REND_WITH_HEAD_ROT + || output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB +#endif + ) + { + *renderer_type = RENDERER_BINAURAL_FASTCONV; + } + else + { + *renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM; + } + + if ( st_ivas->hDecoderConfig->Opt_Headrotation ) + { + + nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order ); + if ( nchan_internal == 2 ) + { + st_ivas->hHeadTrackData->shd_rot_max_order = 1; + } + else if ( nchan_internal == 4 || nchan_internal == 3 ) + { + st_ivas->hHeadTrackData->shd_rot_max_order = 0; + } + else if ( nchan_internal == 6 || nchan_internal == 5 ) + { + st_ivas->hHeadTrackData->shd_rot_max_order = 2; + } + else if ( nchan_internal == 8 || nchan_internal == 7 ) + { + st_ivas->hHeadTrackData->shd_rot_max_order = 3; + } + } + } + else if ( st_ivas->ivas_format == MC_FORMAT ) + { + if ( st_ivas->mc_mode == MC_MODE_MCMASA ) + { + *internal_config = output_config; + if ( output_config == AUDIO_CONFIG_BINAURAL ) + { + *renderer_type = RENDERER_BINAURAL_PARAMETRIC; + } + else + { + *renderer_type = RENDERER_BINAURAL_PARAMETRIC_ROOM; + } + } + else + { + *internal_config = transport_config; + if ( output_config == AUDIO_CONFIG_BINAURAL ) + { +#ifdef DEBUGGING + if ( ( ( ( st_ivas->transport_config == AUDIO_CONFIG_5_1 || st_ivas->transport_config == AUDIO_CONFIG_7_1 ) && st_ivas->hDecoderConfig->Opt_Headrotation ) || ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) ) && ( st_ivas->mc_mode == MC_MODE_MCT ) && !( st_ivas->hDecoderConfig->force_rend == FORCE_CLDFB_RENDERER ) ) +#else + if ( ( st_ivas->transport_config == AUDIO_CONFIG_5_1 || st_ivas->transport_config == AUDIO_CONFIG_7_1 ) && st_ivas->hDecoderConfig->Opt_Headrotation && ( st_ivas->mc_mode == MC_MODE_MCT ) ) +#endif + { + *renderer_type = RENDERER_BINAURAL_OBJECTS_TD; + } + else + { + if ( st_ivas->mc_mode == MC_MODE_MCT ) + { + *renderer_type = RENDERER_BINAURAL_MIXER_CONV; + } + else + { + *renderer_type = RENDERER_BINAURAL_FASTCONV; + } + +#ifdef DEBUGGING + if ( st_ivas->hRenderConfig->renderer_type_override == RENDER_TYPE_OVERRIDE_CREND ) + { + *renderer_type = RENDERER_BINAURAL_MIXER_CONV; + } + else if ( st_ivas->hRenderConfig->renderer_type_override == RENDER_TYPE_OVERRIDE_FASTCONV ) + { + *renderer_type = RENDERER_BINAURAL_FASTCONV; + } +#endif + if ( st_ivas->hDecoderConfig->Opt_Headrotation ) + { + /* force HOA3 domain for rotation*/ + *internal_config = AUDIO_CONFIG_HOA3; + } + } + } + else /* AUDIO_CONFIG_BINAURAL_ROOM */ + { + if ( st_ivas->mc_mode == MC_MODE_MCT ) + { + *renderer_type = RENDERER_BINAURAL_MIXER_CONV_ROOM; + } + else + { + *renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM; + } +#ifdef DEBUGGING + if ( st_ivas->hRenderConfig->renderer_type_override == RENDER_TYPE_OVERRIDE_CREND ) + { + *renderer_type = RENDERER_BINAURAL_MIXER_CONV_ROOM; + } + else if ( st_ivas->hRenderConfig->renderer_type_override == RENDER_TYPE_OVERRIDE_FASTCONV ) + { + *renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM; + } +#endif + } + } + } + } + + /*-----------------------------------------------------------------* + * Non-binaural rendering configurations + *-----------------------------------------------------------------*/ + + else if ( st_ivas->ivas_format == STEREO_FORMAT ) + { + if ( output_config != AUDIO_CONFIG_STEREO && output_config != AUDIO_CONFIG_MONO ) + { + *renderer_type = RENDERER_MC; + } + } + else if ( st_ivas->ivas_format == ISM_FORMAT ) + { + if ( st_ivas->ism_mode == ISM_MODE_PARAM ) + { + *renderer_type = RENDERER_PARAM_ISM; + if ( output_config == AUDIO_CONFIG_MONO ) + { + *renderer_type = RENDERER_MONO_DOWNMIX; + } + else if ( output_config == AUDIO_CONFIG_STEREO ) + { + *renderer_type = RENDERER_DISABLE; + } + else if ( output_config == AUDIO_CONFIG_FOA || output_config == AUDIO_CONFIG_HOA2 || output_config == AUDIO_CONFIG_HOA3 ) + { + *renderer_type = RENDERER_SBA_LINEAR_ENC; + *internal_config = AUDIO_CONFIG_7_1_4; + } + } + else /* ISM_MODE_DISC */ + { + *renderer_type = RENDERER_TD_PANNING; + if ( output_config == AUDIO_CONFIG_MONO ) + { + *renderer_type = RENDERER_MONO_DOWNMIX; + } + else if ( output_config == AUDIO_CONFIG_FOA || output_config == AUDIO_CONFIG_HOA2 || output_config == AUDIO_CONFIG_HOA3 ) + { + *renderer_type = RENDERER_SBA_LINEAR_ENC; + } + else if ( output_config == AUDIO_CONFIG_EXTERNAL ) + { + *renderer_type = RENDERER_DISABLE; + } + } + } + else if ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == SBA_FORMAT ) + { + *renderer_type = RENDERER_DIRAC; + + if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR && + ( output_config != AUDIO_CONFIG_5_1 && output_config != AUDIO_CONFIG_5_1_2 && output_config != AUDIO_CONFIG_5_1_4 && output_config != AUDIO_CONFIG_7_1 && output_config != AUDIO_CONFIG_7_1_4 && output_config != AUDIO_CONFIG_LS_CUSTOM && output_config != AUDIO_CONFIG_MONO && output_config != AUDIO_CONFIG_STEREO ) ) + { + if ( output_config == AUDIO_CONFIG_HOA2 || output_config == AUDIO_CONFIG_FOA ) + { + *internal_config = output_config; + } + else if ( output_config == AUDIO_CONFIG_MONO || output_config == AUDIO_CONFIG_STEREO ) + { + *internal_config = AUDIO_CONFIG_FOA; + } + else + { + *internal_config = AUDIO_CONFIG_HOA3; + } + st_ivas->renderer_type = RENDERER_SBA_LINEAR_DEC; + } + else if ( ( st_ivas->ivas_format == MASA_FORMAT && output_config == AUDIO_CONFIG_MONO && st_ivas->nchan_transport == 1 ) || + ( st_ivas->ivas_format == SBA_FORMAT && ( output_config == AUDIO_CONFIG_STEREO || output_config == AUDIO_CONFIG_MONO ) ) ) + { + *renderer_type = RENDERER_DISABLE; + } + else if ( ( st_ivas->ivas_format == MASA_FORMAT && output_config == AUDIO_CONFIG_MONO && st_ivas->hDecoderConfig->ivas_total_brate < MASA_STEREO_MIN_BITRATE && st_ivas->hDecoderConfig->ivas_total_brate > IVAS_SID_5k2 ) ) + { + *renderer_type = RENDERER_DISABLE; + } + else if ( st_ivas->ivas_format == MASA_FORMAT && output_config == AUDIO_CONFIG_STEREO ) + { + *renderer_type = RENDERER_STEREO_PARAMETRIC; + } + else if ( st_ivas->ivas_format == MASA_FORMAT && output_config == AUDIO_CONFIG_EXTERNAL ) + { + *renderer_type = RENDERER_DISABLE; + } + else if ( st_ivas->ivas_format == SBA_FORMAT && output_config == AUDIO_CONFIG_MONO ) + { + *renderer_type = RENDERER_SBA_LINEAR_DEC; + } + } + else if ( st_ivas->ivas_format == MC_FORMAT ) + { + *internal_config = transport_config; + if ( st_ivas->mc_mode == MC_MODE_MCT && *internal_config != output_config ) + { + if ( output_config != AUDIO_CONFIG_FOA && output_config != AUDIO_CONFIG_HOA2 && output_config != AUDIO_CONFIG_HOA3 ) + { + *renderer_type = RENDERER_MC; + } + else + { + *renderer_type = RENDERER_SBA_LINEAR_ENC; + } + } + else if ( st_ivas->mc_mode == MC_MODE_PARAMMC ) + { + if ( output_config == AUDIO_CONFIG_FOA || output_config == AUDIO_CONFIG_HOA2 || output_config == AUDIO_CONFIG_HOA3 ) + { + *renderer_type = RENDERER_SBA_LINEAR_ENC; + } + else + { + *renderer_type = RENDERER_MC_PARAMMC; + } + } + else if ( st_ivas->mc_mode == MC_MODE_MCMASA ) + { + *internal_config = output_config; + /* No rendering for 1TC to Mono or Stereo and 2TC to Stereo */ + if ( output_config == AUDIO_CONFIG_MONO || output_config == AUDIO_CONFIG_STEREO ) + { + if ( st_ivas->nchan_transport == 1 ) + { + *renderer_type = RENDERER_DISABLE; + } + else if ( output_config == AUDIO_CONFIG_STEREO && st_ivas->nchan_transport == 2 && !st_ivas->hOutSetup.separateChannelEnabled ) + { + *renderer_type = RENDERER_DISABLE; + } + else + { + *renderer_type = RENDERER_MCMASA_MONO_STEREO; + } + } + else + { + *renderer_type = RENDERER_DIRAC; + if ( output_config == AUDIO_CONFIG_FOA || output_config == AUDIO_CONFIG_HOA2 || output_config == AUDIO_CONFIG_HOA3 ) + { + *renderer_type = RENDERER_SBA_LINEAR_ENC; + *internal_config = transport_config; + } + else if ( transport_config == AUDIO_CONFIG_5_1 && ( output_config == AUDIO_CONFIG_7_1 || output_config == AUDIO_CONFIG_5_1_4 ) ) + { + *internal_config = transport_config; + } + } + } + } + + return; +} + +#ifdef SPLIT_REND_WITH_HEAD_ROT +void ivas_set_split_rend_setup( IVAS_DEC_SPLIT_REND_WRAPPER *hSplitBinRend, IVAS_SPLIT_REND_CONFIG_DATA *hSplitBinConfig, HEAD_TRACK_DATA_HANDLE hHeadTrackData, IVAS_SPLIT_REND_BITS_HANDLE hSplitRendBits ) +{ + hSplitRendBits->bits_written = 0; + hSplitRendBits->bits_read = 0; + hSplitBinRend->hSplitRendBits = hSplitRendBits; + + hSplitBinRend->hMultiBinCldfbData = (IVAS_DEC_SPLIT_REND_MULTI_BIN_CLDFB_DATA_HANDLE) malloc( sizeof( IVAS_DEC_SPLIT_REND_MULTI_BIN_CLDFB_DATA ) ); + + ivas_renderSplitGetMultiBinPoseData( + hSplitBinConfig, + &hSplitBinRend->splitrend.multiBinPoseData, + hHeadTrackData->sr_pose_pred_axis ); + +#ifdef SPLIT_REND_IVAS_DEC_HT_TR + if ( hHeadTrackData != NULL ) + { + int16_t sf; + for ( sf = 1; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ ) + { + hHeadTrackData->Quaternions[sf] = hHeadTrackData->Quaternions[0]; + } + } +#endif + + return; +} +#endif diff --git a/lib_dec/ivas_pca_dec.c b/lib_dec/ivas_pca_dec.c index ef5694d656..4444a73cee 100644 --- a/lib_dec/ivas_pca_dec.c +++ b/lib_dec/ivas_pca_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #endif #include #include "ivas_cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------* diff --git a/lib_dec/ivas_post_proc.c b/lib_dec/ivas_post_proc.c index 1dce7978c2..da00426116 100644 --- a/lib_dec/ivas_post_proc.c +++ b/lib_dec/ivas_post_proc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------- * ivas_post_proc() @@ -81,7 +81,7 @@ void ivas_post_proc( output_Fs = sts[0]->output_Fs; - if ( ( sts[n]->element_mode != IVAS_CPE_DFT && !sba_dirac_stereo_flag ) || ( sts[n]->element_mode == IVAS_CPE_DFT && hCPE->nchan_out == 1 && hCPE->hStereoDft->hConfig->res_cod_mode == STEREO_DFT_RES_COD_OFF ) ) + if ( ( sts[n]->element_mode != IVAS_CPE_DFT && !( sba_dirac_stereo_flag && sts[n]->element_mode != IVAS_CPE_MDCT ) ) || ( sts[n]->element_mode == IVAS_CPE_DFT && hCPE->nchan_out == 1 && hCPE->hStereoDft->hConfig->res_cod_mode == STEREO_DFT_RES_COD_OFF ) ) { if ( sts[n]->hTcxLtpDec != NULL ) { @@ -102,6 +102,11 @@ void ivas_post_proc( mvr2r( sts[n]->prev_synth_buffer, sts[n]->hTcxDec->FBTCXdelayBuf, 0 ); mvr2r( sts[n]->delay_buf_out, sts[n]->hTcxDec->FBTCXdelayBuf + 0, delay_comp ); } + else if ( sba_dirac_stereo_flag && sts[n]->element_mode == IVAS_CPE_MDCT ) + { + int16_t numZeros = (int16_t) ( NS2SA( output_Fs, N_ZERO_MDCT_NS ) ); + mvr2r( sts[n]->hHQ_core->old_out + numZeros, sts[n]->hTcxDec->FBTCXdelayBuf, delay_comp ); + } tcx_ltp_post( sts[n], hTcxLtpDec, sts[n]->core, output_frame, NS2SA( output_Fs, ACELP_LOOK_NS ) + delay_comp, synth, sts[n]->hTcxDec->FBTCXdelayBuf ); } diff --git a/lib_dec/ivas_qmetadata_dec.c b/lib_dec/ivas_qmetadata_dec.c index 059ba752e7..9c6597fdcb 100644 --- a/lib_dec/ivas_qmetadata_dec.c +++ b/lib_dec/ivas_qmetadata_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #include "ivas_prot.h" #include "ivas_rom_com.h" #include "ivas_rom_dec.h" -#include "wmops.h" +#include "wmc_auto.h" #include "prot.h" /*-----------------------------------------------------------------------* @@ -3114,7 +3114,7 @@ int16_t read_surround_coherence( float error_ratio_surr; int16_t idx_ER[MASA_MAXIMUM_CODING_SUBBANDS]; int16_t bits_sur_coherence, bits_GR; - int16_t j, d, k; + int16_t j, d, k, idx; uint16_t byteBuffer; uint16_t idx_sur_coh[MASA_MAXIMUM_CODING_SUBBANDS]; IVAS_QDIRECTION *q_direction; @@ -3133,7 +3133,8 @@ int16_t read_surround_coherence( if ( hQMetaData->no_directions == 2 ) { d += hQMetaData->twoDirBands[j]; - error_ratio_surr = 1.0f - q_direction[0].band_data[j].energy_ratio[0] - q_direction[1].band_data[max( d - 1, 0 )].energy_ratio[0] * hQMetaData->twoDirBands[j]; + idx = max( d - 1, 0 ); + error_ratio_surr = 1.0f - q_direction[0].band_data[j].energy_ratio[0] - q_direction[1].band_data[idx].energy_ratio[0] * hQMetaData->twoDirBands[j]; } else { diff --git a/lib_dec/ivas_qspherical_dec.c b/lib_dec/ivas_qspherical_dec.c index c37d03e5a9..c56217326a 100644 --- a/lib_dec/ivas_qspherical_dec.c +++ b/lib_dec/ivas_qspherical_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -36,7 +36,7 @@ #include "ivas_prot.h" #include "ivas_rom_com.h" #include "ivas_stat_dec.h" -#include "wmops.h" +#include "wmc_auto.h" #include "prot.h" diff --git a/lib_dec/ivas_range_uni_dec.c b/lib_dec/ivas_range_uni_dec.c index de9b3a4559..db0fbddeab 100644 --- a/lib_dec/ivas_range_uni_dec.c +++ b/lib_dec/ivas_range_uni_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include #include "options.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" #ifdef DEBUGGING #include "debug.h" #endif diff --git a/lib_dec/ivas_rom_dec.c b/lib_dec/ivas_rom_dec.c index efab9efedd..3608022efe 100644 --- a/lib_dec/ivas_rom_dec.c +++ b/lib_dec/ivas_rom_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #include "cnst.h" #include "ivas_cnst.h" #include -#include "wmops.h" +#include "wmc_auto.h" #include "ivas_stat_dec.h" /* clang-format off */ @@ -231,11 +231,24 @@ const int16_t cna_init_bands[MAX_CNA_NBANDS + 1] = 1, 4, 14, 33, 67, 171, 320 }; -const float max_smooth_gains[SBA_DIRAC_STEREO_NUM_BANDS] = +const float max_smooth_gains1[SBA_DIRAC_STEREO_NUM_BANDS] = { - 0.98f, 0.97f, 0.95f, 0.9f, 0.9f + 0.98f, 0.97f, 0.95f, 0.9f, 0.9f, 0.9f, 0.9f, 0.9f, 0.9f, 0.9f, 0.9f, 0.9f }; +const float min_smooth_gains1[SBA_DIRAC_STEREO_NUM_BANDS] = +{ + 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f +}; + +const float max_smooth_gains2[SBA_DIRAC_STEREO_NUM_BANDS] = +{ + 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.9f, 0.9f, 0.9f}; + +const float min_smooth_gains2[SBA_DIRAC_STEREO_NUM_BANDS] = +{ + 0.5f, 0.5f, 0.5, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.3f, 0.3f, 0.3f +}; /*------------------------------------------------------------------------- * ECLVQ Stereo ROM tables @@ -516,41 +529,13 @@ const int16_t sba_map_tc[8] = /*----------------------------------------------------------------------------------* * FASTCONV and PARAMETRIC binaural renderer ROM tables *----------------------------------------------------------------------------------*/ -// VE2AT: move to in ivas_rom_dec ? -const float surCohEne[MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS] = -{ - 3.0903f, 2.0053f, 1.0860f, 0.8072f, 0.7079f -}; - -const float spreadCohEne05[MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS] = -{ - 2.3988f, 1.7783f, 1.1220f, 1.1220f, 1.1220f -}; -const float spreadCohEne1[MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS] = -{ - 1.5975f, 1.1220f, 1.1220f, 1.1220f, 1.1220f -}; - -const float lowBitRateBinauralEQ[LOW_BIT_RATE_BINAURAL_EQ_BINS] = -{ - 0.979f, 0.893f, 0.762f, 0.615f, 0.52f, 0.48f, 0.477f, 0.477f, 0.48f, 0.501f, 0.546f, 0.602f, 0.652f, 0.664f, 0.652f, 0.639f, 0.635f -}; - -const float diffuseFieldCoherenceDifferenceX[BINAURAL_COHERENCE_DIFFERENCE_BINS] = +const float dmxmtx_table[BINAURAL_CHANNELS][11] = { - 0.047421f, 0.19773f, 0.22582f, 0.10637f, 0.0087111f, 0.012028f, 0.031972f, 0.019668f, 0.0079928f + { 1.0f, 0.0f, 0.70709997f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f }, + { 0.0f, 1.0f, 0.70709997f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f }, }; -const float diffuseFieldCoherenceDifferenceY[BINAURAL_COHERENCE_DIFFERENCE_BINS] = -{ - -0.095628f, -0.30569f, -0.34427f, -0.15425f, -0.044628f, -0.057224f, -0.050835f, -0.035214f, -0.02215f -}; - -const float diffuseFieldCoherenceDifferenceZ[BINAURAL_COHERENCE_DIFFERENCE_BINS] = -{ - 0.048207f, 0.10796f, 0.11845f, 0.047886f, 0.035917f, 0.045196f, 0.018863f, 0.015547f, 0.014157f -}; #ifdef SPLIT_REND_WITH_HEAD_ROT /*----------------------------------------------------------------------* diff --git a/lib_dec/ivas_rom_dec.h b/lib_dec/ivas_rom_dec.h index 0cbf968d4b..9e56cbc403 100644 --- a/lib_dec/ivas_rom_dec.h +++ b/lib_dec/ivas_rom_dec.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -60,7 +60,6 @@ extern const float dft_ap_gains[5][3]; extern const int16_t dft_ap_delays[3][3]; extern const float dft_res_pred_weights[][STEREO_DFT_BAND_MAX]; - extern const float dft_win232ms_8k[75]; extern const float dft_win232ms_12k8[120]; extern const float dft_win232ms_16k[150]; @@ -70,7 +69,11 @@ extern const float dft_win232ms_48k[450]; extern const float dft_win_8k[70]; extern const int16_t cna_init_bands[MAX_CNA_NBANDS + 1]; -extern const float max_smooth_gains[SBA_DIRAC_STEREO_NUM_BANDS]; + +extern const float min_smooth_gains1[SBA_DIRAC_STEREO_NUM_BANDS]; +extern const float max_smooth_gains1[SBA_DIRAC_STEREO_NUM_BANDS]; +extern const float min_smooth_gains2[SBA_DIRAC_STEREO_NUM_BANDS]; +extern const float max_smooth_gains2[SBA_DIRAC_STEREO_NUM_BANDS]; /*----------------------------------------------------------------------------------* @@ -110,51 +113,13 @@ extern const float ap_split_frequencies[DIRAC_DECORR_NUM_SPLIT_BANDS + 1]; extern const int16_t sba_map_tc[8]; -/*----------------------------------------------------------------------------------* - * LS Configuration Converter ROM tables - *----------------------------------------------------------------------------------*/ - -/* Downmix matrices */ -extern const float ls_conversion_cicpX_mono[12][1]; -extern const float ls_conversion_cicpX_stereo[12][2]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp12_cicp6[]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp14_cicp6[]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp14_cicp12[]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp16_cicp6[]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp16_cicp14[]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp19_cicp6[]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp19_cicp12[]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp19_cicp14[]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp19_cicp16[]; - -/* Upmix matrices */ -extern const LS_CONVERSION_MATRIX ls_conversion_cicp12_cicp14[]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp12_cicp16[]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp12_cicp19[]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp14_cicp19[]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp16_cicp19[]; - -/* Mapping table of input config : output config with corresponding matrix */ -extern const LS_CONVERSION_MAPPING ls_conversion_mapping[]; - /*----------------------------------------------------------------------------------* * FASTCONV and PARAMETRIC binaural renderer ROM tables *----------------------------------------------------------------------------------*/ -/* These are equalization values for spread and surround coherent sounds, approximating the spectrum - * for such sounds at anechoic multichannel listening. */ -extern const float surCohEne[MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS]; -extern const float spreadCohEne05[MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS]; -extern const float spreadCohEne1[MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS]; - -/* Values for low-bit-rate equalization */ -extern const float lowBitRateBinauralEQ[LOW_BIT_RATE_BINAURAL_EQ_BINS]; +extern const float dmxmtx_table[BINAURAL_CHANNELS][11]; -/* Diffuse field binaural coherence directional adjustment values */ -extern const float diffuseFieldCoherenceDifferenceX[BINAURAL_COHERENCE_DIFFERENCE_BINS]; -extern const float diffuseFieldCoherenceDifferenceY[BINAURAL_COHERENCE_DIFFERENCE_BINS]; -extern const float diffuseFieldCoherenceDifferenceZ[BINAURAL_COHERENCE_DIFFERENCE_BINS]; #ifdef SPLIT_REND_WITH_HEAD_ROT /*----------------------------------------------------------------------* diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c index ff95da482c..35cf1e2044 100644 --- a/lib_dec/ivas_sba_dec.c +++ b/lib_dec/ivas_sba_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,369 +37,33 @@ #include "ivas_cnst.h" #include "prot.h" #include "ivas_prot.h" +#include "ivas_prot_rend.h" +#include "ivas_rom_com.h" #include "ivas_rom_dec.h" #include #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" -#ifdef SBA_BR_SWITCHING /*-------------------------------------------------------------------* - * ivas_sba_dec_reinit() + * ivas_sba_set_cna_cng_flag() * - * Reinitialisation of IVAS SBA decoder + * Set CNA/CNG flags in IVAS SBA decoder *-------------------------------------------------------------------*/ -ivas_error ivas_sba_dec_reinit( +void ivas_sba_set_cna_cng_flag( Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ ) { - int16_t i, k, n; - int16_t sce_id, cpe_id; - int16_t numCldfbAnalyses; - int16_t numCldfbSyntheses; - int32_t output_Fs, ivas_total_brate; - AUDIO_CONFIG output_config; - DECODER_CONFIG_HANDLE hDecoderConfig; - ivas_error error; - - error = IVAS_ERR_OK; - - output_Fs = st_ivas->hDecoderConfig->output_Fs; - hDecoderConfig = st_ivas->hDecoderConfig; - output_config = hDecoderConfig->output_config; - ivas_total_brate = hDecoderConfig->ivas_total_brate; - - hDecoderConfig->last_ivas_total_brate = ivas_total_brate; - /*------------------------------------------------------------------------------------------* - * Closing Decoder handles before Reinitialisation - *------------------------------------------------------------------------------------------*/ - /* Qmetadata handle */ - ivas_qmetadata_close( &st_ivas->hQMetaData ); - - /* DirAC handle */ - if ( st_ivas->hDirAC != NULL ) - { - if ( st_ivas->ivas_format == ISM_FORMAT ) - { - ivas_param_ism_dec_close( st_ivas->hDirAC, st_ivas->hDecoderConfig->output_config ); - } - else - { - ivas_dirac_dec_close( st_ivas->hDirAC ); - } - st_ivas->hDirAC = NULL; - } - - /* Spar handle */ - if ( st_ivas->hSpar != NULL ) - { - ivas_spar_dec_close( st_ivas->hSpar, st_ivas->hDecoderConfig->output_Fs ); - st_ivas->hSpar = NULL; - } - - /* SCE handles */ - for ( i = 0; i < MAX_SCE; i++ ) - { - if ( st_ivas->hSCE[i] != NULL ) - { - destroy_sce_dec( st_ivas->hSCE[i] ); - st_ivas->hSCE[i] = NULL; - } - } - - /* CPE handles */ - for ( i = 0; i < MAX_CPE; i++ ) - { - if ( st_ivas->hCPE[i] != NULL ) - { - /* set pointer to NULL as core coder already deallocated in destroy_sce_dec() */ - if ( st_ivas->sba_dirac_stereo_flag ) - { - st_ivas->hCPE[i]->hCoreCoder[0] = NULL; - st_ivas->hCPE[i]->hCoreCoder[1] = NULL; - } - destroy_cpe_dec( st_ivas->hCPE[i] ); - st_ivas->hCPE[i] = NULL; - } - } - - /* MCT handle */ - ivas_mct_dec_close( &st_ivas->hMCT ); - - /* HP20 filter handles */ - if ( st_ivas->mem_hp20_out != NULL ) - { - for ( i = 0; i < getNumChanSynthesis( st_ivas ); i++ ) - { - count_free( st_ivas->mem_hp20_out[i] ); - st_ivas->mem_hp20_out[i] = NULL; - } - count_free( st_ivas->mem_hp20_out ); - st_ivas->mem_hp20_out = NULL; - } - - /* HOA decoder matrix */ - if ( st_ivas->hoa_dec_mtx != NULL ) - { - count_free( st_ivas->hoa_dec_mtx ); - st_ivas->hoa_dec_mtx = NULL; - } - - /* Parametric MC handle */ - ivas_param_mc_dec_close( &st_ivas->hParamMC ); - - /* EFAP handle */ - efap_free_data( &st_ivas->hEFAPdata ); - - /* VBAP handle */ - vbap_free_data( &( st_ivas->hVBAPdata ) ); - - /* Fastconv binaural renderer handle */ - ivas_binRenderer_close( &st_ivas->hBinRenderer ); -#ifdef SPLIT_REND_WITH_HEAD_ROT - ivas_split_renderer_close( &st_ivas->splitBinRend.splitrend ); -#endif - - /* Parametric binaural renderer handle */ - ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin ); - - /* Crend handle */ - ivas_crend_close( st_ivas ); - - /* LS config converter handle */ - ivas_ls_setup_conversion_close( &st_ivas->hLsSetUpConversion ); - - /* Custom LS configuration handle */ - if ( st_ivas->hLsSetupCustom != NULL ) - { - count_free( st_ivas->hLsSetupCustom ); - st_ivas->hLsSetupCustom = NULL; - } - - /* MASA decoder structure */ - if ( st_ivas->hMasa != NULL ) - { - ivas_masa_dec_close( st_ivas->hMasa ); - st_ivas->hMasa = NULL; - } - - /* Downmix structure */ - if ( st_ivas->hMonoDmxRenderer != NULL ) - { - count_free( st_ivas->hMonoDmxRenderer ); - st_ivas->hMonoDmxRenderer = NULL; - } - - /* Head track data handle */ - if ( st_ivas->hHeadTrackData != NULL ) - { - count_free( st_ivas->hHeadTrackData ); - st_ivas->hHeadTrackData = NULL; - } - - /* Time Domain binaural renderer handle */ - if ( st_ivas->hBinRendererTd != NULL ) - { - ivas_td_binaural_close( &st_ivas->hBinRendererTd ); - } - else if ( st_ivas->hHrtfTD != NULL ) - { - /* Case when HRTF filter is mistakenly specified but TD renderer was not active */ - if ( st_ivas->hHrtfTD->ModelParams.UseItdModel && !st_ivas->hHrtfTD->ModelParams.modelROM ) - { - BSplineModelEvalITDDealloc( &st_ivas->hHrtfTD->ModelParamsITD ); - } - - BSplineModelEvalDealloc( &st_ivas->hHrtfTD->ModelParams, &st_ivas->hHrtfTD->ModelEval ); - - ivas_HRTF_binary_close( &st_ivas->hHrtfTD ); - } - - /* Config. Renderer */ - ivas_render_config_close( &( st_ivas->hRenderConfig ) ); - - for ( i = 0; i < MAX_INTERN_CHANNELS; i++ ) - { - if ( st_ivas->cldfbAnaDec[i] != NULL ) - { - deleteCldfb( &( st_ivas->cldfbAnaDec[i] ) ); - st_ivas->cldfbAnaDec[i] = NULL; - } - } - - for ( i = 0; i < MAX_OUTPUT_CHANNELS; i++ ) - { - if ( st_ivas->cldfbSynDec[i] != NULL ) - { - deleteCldfb( &( st_ivas->cldfbSynDec[i] ) ); - st_ivas->cldfbSynDec[i] = NULL; - } - } - - /*------------------------------------------------------------------------------------------* - * Reopening Decoder handles for Reinitialisation - *------------------------------------------------------------------------------------------*/ - - /* Allocate and initialize Custom loudspeaker layout handle */ - if ( st_ivas->hDecoderConfig->Opt_LsCustom ) - { - if ( ( error = ivas_ls_custom_open( &( st_ivas->hLsSetupCustom ) ) ) != IVAS_ERR_OK ) - { - return error; - } - } - - /* Allocate and initialize Head-Tracking handle */ - if ( st_ivas->hDecoderConfig->Opt_Headrotation ) - { - if ( ( error = ivas_headTrack_open( &( st_ivas->hHeadTrackData ) ) ) != IVAS_ERR_OK ) - { - return error; - } - } - - /* Allocate HRTF binary handle */ - if ( st_ivas->hDecoderConfig->Opt_HRTF_binary ) - { - if ( ( error = ivas_HRTF_binary_open( &( st_ivas->hHrtfTD ) ) ) != IVAS_ERR_OK ) - { - return error; - } - } - - st_ivas->sba_dirac_stereo_flag = 0; - /*Reconfigure output paramaters*/ - ivas_sba_config( ivas_total_brate, st_ivas->sba_analysis_order, -1, &( st_ivas->nchan_transport ), st_ivas->sba_planar, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init ); - ivas_renderer_select( st_ivas ); - ivas_output_init( &( st_ivas->hIntSetup ), st_ivas->intern_config ); - if ( ( error = ivas_qmetadata_open( &( st_ivas->hQMetaData ) ) ) != IVAS_ERR_OK ) - { - return error; - } - if ( st_ivas->sba_mode == SBA_MODE_SPAR ) - { - if ( ( error = ivas_spar_dec_open( st_ivas ) ) != IVAS_ERR_OK ) - { - return error; - } - - if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC && st_ivas->hOutSetup.is_loudspeaker_setup ) - { - if ( ( error = ivas_sba_get_hoa_dec_matrix( st_ivas->hOutSetup, &st_ivas->hoa_dec_mtx, st_ivas->hIntSetup.ambisonics_order ) ) != IVAS_ERR_OK ) - { - return error; - } - } - - if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, st_ivas->sba_mode, IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ) ) != IVAS_ERR_OK ) - { - return error; - } - - if ( hDecoderConfig->output_config != AUDIO_CONFIG_FOA ) - { - if ( ( error = ivas_dirac_dec_open( st_ivas ) ) != IVAS_ERR_OK ) - { - return error; - } + int16_t n, cpe_id; - for ( k = 0; k < DIRAC_MAX_NBANDS; k++ ) - { - st_ivas->hSpar->dirac_to_spar_md_bands[k] = st_ivas->hDirAC->dirac_to_spar_md_bands[k]; - } - st_ivas->hSpar->enc_param_start_band = st_ivas->hDirAC->hConfig->enc_param_start_band; - } - else - { - int16_t band_grouping[IVAS_MAX_NUM_BANDS + 1]; - - st_ivas->hSpar->enc_param_start_band = min( IVAS_MAX_NUM_BANDS, SPAR_DIRAC_SPLIT_START_BAND ); - - ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( st_ivas->hDecoderConfig->output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ), - st_ivas->hSpar->dirac_to_spar_md_bands, st_ivas->hQMetaData->useLowerBandRes, st_ivas->hSpar->enc_param_start_band, 0 ); - } - } - else - { - if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, st_ivas->sba_mode, -1 ) ) != IVAS_ERR_OK ) - { - return error; - } - - st_ivas->sba_dirac_stereo_flag = ( st_ivas->nchan_transport == 1 && output_config == AUDIO_CONFIG_STEREO ); - - if ( ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC ) && st_ivas->hOutSetup.is_loudspeaker_setup ) - { - int16_t ambisonics_order; - - ambisonics_order = ivas_sba_get_order_transport( st_ivas->nchan_transport ); // VE: is it needed ? - - if ( ( error = ivas_sba_get_hoa_dec_matrix( st_ivas->hOutSetup, &st_ivas->hoa_dec_mtx, ambisonics_order ) ) != IVAS_ERR_OK ) - { - return error; - } - } - else if ( ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) && !st_ivas->hIntSetup.is_loudspeaker_setup ) - { - IVAS_OUTPUT_SETUP out_setup; - - ivas_output_init( &out_setup, AUDIO_CONFIG_7_1_4 ); - if ( ( error = ivas_sba_get_hoa_dec_matrix( out_setup, &st_ivas->hoa_dec_mtx, st_ivas->hIntSetup.ambisonics_order ) ) != IVAS_ERR_OK ) - { - return error; - } - } - } - if ( st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV && st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM && - st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_SBA_LINEAR_DEC && st_ivas->sba_mode != SBA_MODE_SPAR ) - { - if ( ( error = ivas_dirac_dec_open( st_ivas ) ) != IVAS_ERR_OK ) - { - return error; - } - } - for ( sce_id = 0; sce_id < st_ivas->nSCE; sce_id++ ) - { - if ( ( error = create_sce_dec( st_ivas, sce_id, ivas_total_brate / st_ivas->nchan_transport ) ) != IVAS_ERR_OK ) - { - return error; - } - - reset_indices_dec( st_ivas->hSCE[sce_id]->hCoreCoder[0] ); - } - - for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) - { - if ( ( error = create_cpe_dec( st_ivas, cpe_id, ( ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS ) ) != IVAS_ERR_OK ) - { - return error; - } - - for ( n = 0; n < CPE_CHANNELS; n++ ) - { - reset_indices_dec( st_ivas->hCPE[cpe_id]->hCoreCoder[n] ); - } - } - - /* create CPE element for DFT Stereo like upmix */ - if ( st_ivas->sba_dirac_stereo_flag ) - { - if ( ( error = create_cpe_dec( st_ivas, cpe_id, ivas_total_brate / ( st_ivas->nSCE + st_ivas->nCPE ) ) ) != IVAS_ERR_OK ) - { - return error; - } - - st_ivas->hCPE[0]->hCoreCoder[0] = st_ivas->hSCE[0]->hCoreCoder[0]; /* don't allocate unnecessary core coder, simply point to core coder of SCE element */ - } - - /* set CNA/CNG flags */ if ( st_ivas->sba_mode == SBA_MODE_SPAR && st_ivas->nchan_transport == 1 ) { - st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag = 0; /* Todo: Check if these can be enabled */ - st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag = 0; + /* skip as done in init function */ + /* st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag = 0; */ /* Todo: Check if these can be enabled */ + /* st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag = 0; */ } else if ( st_ivas->nchan_transport == 1 && ( ( st_ivas->renderer_type == RENDERER_DIRAC && st_ivas->hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) || ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC ) ) ) { @@ -414,167 +78,24 @@ ivas_error ivas_sba_dec_reinit( st_ivas->hCPE[0]->hCoreCoder[n]->cng_sba_flag = 1; } } - - if ( st_ivas->nCPE > 1 ) - { - if ( ( error = create_mct_dec( st_ivas ) ) != IVAS_ERR_OK ) - { - return error; - } - } - /* set number of output channels used for synthesis/decoding */ - n = getNumChanSynthesis( st_ivas ); - - if ( n > 0 ) - { - if ( ( st_ivas->mem_hp20_out = (float **) count_malloc( n * sizeof( float * ) ) ) == NULL ) - { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HP20 filter memory\n" ) ); - } - } else { - st_ivas->mem_hp20_out = NULL; - } - - for ( i = 0; i < n; i++ ) - { - if ( ( st_ivas->mem_hp20_out[i] = (float *) count_malloc( L_HP20_MEM * sizeof( float ) ) ) == NULL ) - { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HP20 filter memory\n" ) ); - } - - set_f( st_ivas->mem_hp20_out[i], 0.0f, L_HP20_MEM ); - } - if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM -#ifdef SPLIT_REND_WITH_HEAD_ROT - || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB -#endif - ) - { - if ( ( error = ivas_render_config_open( &( st_ivas->hRenderConfig ) ) ) != IVAS_ERR_OK ) + for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) { - return error; - } - if ( ivas_render_config_init_from_rom( &st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_ROOM ) != IVAS_ERR_OK ) - { - return IVAS_ERR_INTERNAL_FATAL; - } - } - if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) - { -#ifdef SPLIT_REND_WITH_HEAD_ROT - if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB ) - { - ivas_renderSplitGetMultiBinPoseData( - &st_ivas->hRenderConfig->split_rend_config, - &st_ivas->splitBinRend.splitrend.multiBinPoseData, - st_ivas->hHeadTrackData->sr_pose_pred_axis ); - } -#endif - if ( ( error = ivas_binRenderer_open( st_ivas ) ) != IVAS_ERR_OK ) - { - return error; - } -#ifdef SPLIT_REND_WITH_HEAD_ROT - if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB ) - { -#ifdef FIX_SPLIT_REND_OPEN_ERROR_HANDLING - error = ivas_split_renderer_open( &st_ivas->splitBinRend.splitrend, - &st_ivas->hRenderConfig->split_rend_config, - hDecoderConfig->output_Fs, 1, 0 ); - if(error != IVAS_ERR_OK) + for ( n = 0; n < CPE_CHANNELS; n++ ) { - return error; + st_ivas->hCPE[cpe_id]->hCoreCoder[n]->cna_dirac_flag = 0; + st_ivas->hCPE[cpe_id]->hCoreCoder[n]->cng_sba_flag = 0; } -#else - ivas_split_renderer_open( &st_ivas->splitBinRend.splitrend, - &st_ivas->hRenderConfig->split_rend_config, - hDecoderConfig->output_Fs, 1, 0 ); -#endif - } -#endif - } - else if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC ) - { - if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas ) ) != IVAS_ERR_OK ) - { - return error; - } - } - else if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD ) - { - if ( ( error = ivas_td_binaural_open( st_ivas ) ) != IVAS_ERR_OK ) - { - return error; - } - - if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on ) - { - if ( ( st_ivas->hCrend = (CREND_HANDLE) count_malloc( sizeof( CREND_DATA ) ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR Crend\n" ); - } - } - } - else if ( st_ivas->renderer_type == RENDERER_MC ) - { - if ( ( error = ivas_ls_setup_conversion_open( st_ivas ) ) != IVAS_ERR_OK ) - { - return error; } } - else if ( st_ivas->renderer_type == RENDERER_MONO_DOWNMIX ) - { - if ( ( error = ivas_mono_dmx_renderer_open( st_ivas ) ) != IVAS_ERR_OK ) - { - return error; - } - } - else if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) - { - if ( ivas_crend_open( st_ivas ) != IVAS_ERR_OK ) - { - return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "ivas_crend_open failed" ); - } - } - ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses, &numCldfbSyntheses ); - - for ( i = 0; i < numCldfbAnalyses; i++ ) - { - if ( ( error = openCldfb( &( st_ivas->cldfbAnaDec[i] ), CLDFB_ANALYSIS, output_Fs, CLDFB_PROTOTYPE_5_00MS ) ) != IVAS_ERR_OK ) - { - return error; - } - } - for ( ; i < MAX_INTERN_CHANNELS; i++ ) - { - st_ivas->cldfbAnaDec[i] = NULL; - } - - for ( i = 0; i < numCldfbSyntheses; i++ ) - { - if ( ( error = openCldfb( &( st_ivas->cldfbSynDec[i] ), CLDFB_SYNTHESIS, output_Fs, CLDFB_PROTOTYPE_5_00MS ) ) != IVAS_ERR_OK ) - { - return error; - } - } - for ( ; i < MAX_OUTPUT_CHANNELS; i++ ) - { - st_ivas->cldfbSynDec[i] = NULL; - } - /* CLDFB Interpolation weights */ - if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR ) - { - ivas_spar_get_cldfb_gains( st_ivas->hSpar, st_ivas->cldfbAnaDec[0], st_ivas->cldfbSynDec[0], hDecoderConfig ); - } - return error; + return; } -#endif + /*-------------------------------------------------------------------* - * ivas_sba_dec_decoder() + * ivas_sba_dec_reconfigure() * * Reconfigure IVAS SBA decoder *-------------------------------------------------------------------*/ @@ -583,326 +104,315 @@ ivas_error ivas_sba_dec_reconfigure( Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ ) { -#ifdef BRATE_SWITCHING_RENDERING int16_t nchan_transport_old, nSCE_old, nCPE_old, nchan_hp20_old; -#else - int16_t i, nchan_transport_old, nSCE_old, nCPE_old, nchan_hp20_old; -#endif AUDIO_CONFIG intern_config_old; -#ifdef BRATE_SWITCHING_RENDERING int16_t numCldfbAnalyses_old, numCldfbSyntheses_old; -#else - int16_t numCldfbAnalyses_old, numCldfbAnalyses, numCldfbSyntheses, numCldfbSyntheses_old; -#endif int16_t sba_dirac_stereo_flag_old; - int32_t ivas_total_brate, last_ivas_total_brate; +#ifndef LBR_SBA_BR_SWITCHING + SBA_MODE sba_mode_old; + int32_t last_ivas_total_brate; +#endif + int32_t ivas_total_brate; + RENDERER_TYPE old_renderer_type; DECODER_CONFIG_HANDLE hDecoderConfig; ivas_error error; - +#ifndef LBR_SBA_BR_SWITCHING + int16_t band_grouping[IVAS_MAX_NUM_BANDS + 1]; +#endif error = IVAS_ERR_OK; hDecoderConfig = st_ivas->hDecoderConfig; ivas_total_brate = hDecoderConfig->ivas_total_brate; - last_ivas_total_brate = hDecoderConfig->last_ivas_total_brate; - +#ifndef LBR_SBA_BR_SWITCHING + last_ivas_total_brate = st_ivas->last_active_ivas_total_brate; +#ifndef LBR_SBA + sba_mode_old = ivas_sba_mode_select( last_ivas_total_brate ); +#else + sba_mode_old = ivas_sba_mode_select(); +#endif + st_ivas->sba_mode = sba_mode_old; +#endif /*-----------------------------------------------------------------* * Set SBA high-level parameters * Save old SBA high-level parameters *-----------------------------------------------------------------*/ ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old ); -#ifndef BRATE_SWITCHING_RENDERING - numCldfbAnalyses = 0; -#endif - nchan_hp20_old = getNumChanSynthesis( st_ivas ); - nSCE_old = st_ivas->nSCE; nCPE_old = st_ivas->nCPE; nchan_transport_old = st_ivas->nchan_transport; sba_dirac_stereo_flag_old = st_ivas->sba_dirac_stereo_flag; st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, st_ivas->sba_order ); - - ivas_sba_config( ivas_total_brate, st_ivas->sba_analysis_order, -1, &st_ivas->nchan_transport, st_ivas->sba_planar, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init ); - - - /*-----------------------------------------------------------------* - * Renderer selection - *-----------------------------------------------------------------*/ - - /* renderer might have changed */ - intern_config_old = st_ivas->intern_config; - ivas_renderer_select( st_ivas ); - - /* side effect of the renderer selection can be a changed internal config */ - if ( st_ivas->intern_config != intern_config_old ) - { - ivas_output_init( &( st_ivas->hIntSetup ), st_ivas->intern_config ); - } - -#ifdef BRATE_SWITCHING_RENDERING - /*-------------------------------------------------------------------* - * Reallocate and initialize binaural rendering handles - *--------------------------------------------------------------------*/ - - if ( st_ivas->hBinRenderer == NULL && ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) ) - { - /* open fastconv binaural renderer */ - if ( ( error = ivas_binRenderer_open( st_ivas ) ) != IVAS_ERR_OK ) - { - return error; - } - } - else if ( st_ivas->hBinRenderer != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV && st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV_ROOM ) ) - { - ivas_binRenderer_close( &st_ivas->hBinRenderer ); - } - - if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC ) - { - /* open parametric binaural renderer */ - if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas ) ) != IVAS_ERR_OK ) - { - return error; - } - } - else if ( st_ivas->hDiracDecBin != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM && st_ivas->renderer_type != RENDERER_STEREO_PARAMETRIC ) ) - { - ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin ); - } +#ifndef LBR_SBA_BR_SWITCHING +#ifndef LBR_SBA + st_ivas->sba_mode = ivas_sba_mode_select( ivas_total_brate ); +#else + st_ivas->sba_mode = ivas_sba_mode_select(); +#endif #endif - /*-----------------------------------------------------------------* - * hDirAC decoder handle configuration + * Allocate, initialize, and configure SBA handles *-----------------------------------------------------------------*/ - +#ifndef LBR_SBA_BR_SWITCHING if ( st_ivas->sba_mode != SBA_MODE_SPAR ) { - st_ivas->sba_dirac_stereo_flag = ( st_ivas->nchan_transport == 1 && hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ); + ivas_spar_dec_close( &( st_ivas->hSpar ), hDecoderConfig->output_Fs, 0 ); if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, st_ivas->sba_mode, -1 ) ) != IVAS_ERR_OK ) { return error; } + + st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); } else { +#endif int16_t sba_order_internal; + SPAR_DEC_HANDLE hSpar; + hSpar = st_ivas->hSpar; sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); - ivas_spar_config( hDecoderConfig->ivas_total_brate, sba_order_internal, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->hSpar->core_nominal_brate, st_ivas->sid_format ); - if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, hDecoderConfig->ivas_total_brate, st_ivas->sba_analysis_order, st_ivas->sba_mode, IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ) ) != IVAS_ERR_OK ) + if ( hSpar != NULL ) { - return error; - } - } + if ( ( hSpar->hPCA != NULL ) && ( ( hDecoderConfig->ivas_total_brate != PCA_BRATE ) || ( sba_order_internal != 1 ) ) ) + { + free( st_ivas->hSpar->hPCA ); + hSpar->hPCA = NULL; + } - if ( st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_SBA_LINEAR_DEC && ( last_ivas_total_brate > IVAS_SID_5k2 || st_ivas->nchan_transport != nchan_transport_old ) && ( st_ivas->sba_mode != SBA_MODE_SPAR ) ) - { - if ( st_ivas->hDirAC != NULL ) - { - if ( ( error = ivas_dirac_dec_config( st_ivas, DIRAC_RECONFIGURE ) ) != IVAS_ERR_OK ) + if ( nchan_transport_old != ivas_get_sba_num_TCs( ivas_total_brate, sba_order_internal ) ) { - return error; + + ivas_spar_dec_close( &( st_ivas->hSpar ), hDecoderConfig->output_Fs, 1 ); + + if ( ( error = ivas_spar_dec_open( st_ivas, 1 ) ) != IVAS_ERR_OK ) + { + return error; + } } + + ivas_spar_config( ivas_total_brate, sba_order_internal, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &hSpar->core_nominal_brate, st_ivas->sid_format ); } else { - if ( ( error = ivas_dirac_dec_config( st_ivas, DIRAC_OPEN ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_spar_dec_open( st_ivas, 0 ) ) != IVAS_ERR_OK ) { return error; } } + + hSpar = st_ivas->hSpar; + st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas ); +#ifndef LBR_SBA_BR_SWITCHING } - else if ( st_ivas->renderer_type == RENDERER_DISABLE || ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC && st_ivas->sba_mode != SBA_MODE_SPAR ) ) +#endif + if ( st_ivas->nchan_transport == 1 ) { - if ( st_ivas->hDirAC != NULL ) - { - ivas_dirac_dec_close( st_ivas->hDirAC ); - st_ivas->hDirAC = NULL; - } - - if ( st_ivas->hVBAPdata != NULL ) - { - vbap_free_data( &( st_ivas->hVBAPdata ) ); - } + st_ivas->element_mode_init = IVAS_SCE; + } + else + { + st_ivas->element_mode_init = IVAS_CPE_MDCT; } /*-----------------------------------------------------------------* - * Allocate, initalize, and configure SCE/CPE/MCT handles - *-----------------------------------------------------------------*/ - - ivas_corecoder_dec_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old, sba_dirac_stereo_flag_old ); - - /*-----------------------------------------------------------------* - * HP20 memories - *-----------------------------------------------------------------*/ - - ivas_hp20_dec_reconfig( st_ivas, nchan_hp20_old ); - - /*-----------------------------------------------------------------* - * CLDFB instances + * Renderer selection *-----------------------------------------------------------------*/ -#ifdef BRATE_SWITCHING_RENDERING - ivas_cldfb_dec_reconfig( st_ivas, nchan_transport_old, numCldfbAnalyses_old, numCldfbSyntheses_old ); -#else - ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses, &numCldfbSyntheses ); + /* renderer might have changed */ + intern_config_old = st_ivas->intern_config; + old_renderer_type = st_ivas->renderer_type; + ivas_renderer_select( st_ivas ); - /* special case, if there was one transport channel in the previous frame and more than one in the current frame, - remove the second CLDFB here, it was for CNA/CNG */ - if ( nchan_transport_old == 1 && numCldfbAnalyses_old == 2 && st_ivas->nchan_transport > 1 ) + /* side effect of the renderer selection can be a changed internal config */ + if ( st_ivas->intern_config != intern_config_old ) { - deleteCldfb( &( st_ivas->cldfbAnaDec[1] ) ); - st_ivas->cldfbAnaDec[1] = NULL; - numCldfbAnalyses_old--; + ivas_output_init( &( st_ivas->hIntSetup ), st_ivas->intern_config ); } -#ifdef BRATE_SWITCHING_RENDERING - /* resample CLDFB analysis instances */ - for ( i = 0; i < min( numCldfbAnalyses, numCldfbAnalyses_old ); i++ ) + /*-------------------------------------------------------------------* + * Reallocate and initialize binaural rendering handles + *--------------------------------------------------------------------*/ + + if ( st_ivas->hBinRenderer == NULL && ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) ) { - if ( ( st_ivas->cldfbAnaDec[i]->no_channels * st_ivas->cldfbAnaDec[i]->no_col ) != ( hDecoderConfig->output_Fs / FRAMES_PER_SEC ) ) +#ifdef SPLIT_REND_WITH_HEAD_ROT + if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB ) { - resampleCldfb( st_ivas->cldfbAnaDec[i], hDecoderConfig->output_Fs ); + ivas_renderSplitGetMultiBinPoseData( + &st_ivas->hRenderConfig->split_rend_config, + &st_ivas->splitBinRend.splitrend.multiBinPoseData, + st_ivas->hHeadTrackData->sr_pose_pred_axis ); } - } #endif - - /* Analysis*/ - if ( numCldfbAnalyses_old > numCldfbAnalyses ) - { - /* delete superfluous CLDFB synthesis instances */ - for ( i = numCldfbAnalyses; i < numCldfbAnalyses_old; i++ ) + /* open fastconv binaural renderer */ + if ( ( error = ivas_binRenderer_open( st_ivas ) ) != IVAS_ERR_OK ) { - deleteCldfb( &( st_ivas->cldfbAnaDec[i] ) ); - st_ivas->cldfbAnaDec[i] = NULL; + return error; } - } - else if ( numCldfbAnalyses_old < numCldfbAnalyses ) - { - /* create additional CLDFB synthesis instances */ - for ( i = numCldfbAnalyses_old; i < numCldfbAnalyses; i++ ) +#ifdef SPLIT_REND_WITH_HEAD_ROT + if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB ) { - if ( ( error = openCldfb( &( st_ivas->cldfbAnaDec[i] ), CLDFB_ANALYSIS, hDecoderConfig->output_Fs, CLDFB_PROTOTYPE_5_00MS ) ) != IVAS_ERR_OK ) +#ifdef FIX_SPLIT_REND_OPEN_ERROR_HANDLING + error = +#endif + ivas_split_renderer_open( &st_ivas->splitBinRend.splitrend, + &st_ivas->hRenderConfig->split_rend_config, + hDecoderConfig->output_Fs, +#ifdef SPLIT_REND_LC3PLUS + 0, +#endif + 1, 0 ); +#ifdef FIX_SPLIT_REND_OPEN_ERROR_HANDLING + if ( error != IVAS_ERR_OK ) { return error; } +#endif } +#endif } - - /* Synthesis */ - if ( numCldfbSyntheses_old > numCldfbSyntheses ) + else if ( st_ivas->hBinRenderer != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV && st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV_ROOM ) ) { - /* delete superfluous CLDFB synthesis instances */ - for ( i = numCldfbSyntheses; i < numCldfbSyntheses_old; i++ ) - { - deleteCldfb( &( st_ivas->cldfbSynDec[i] ) ); - st_ivas->cldfbSynDec[i] = NULL; - } + ivas_binRenderer_close( &st_ivas->hBinRenderer ); +#ifdef SPLIT_REND_WITH_HEAD_ROT + ivas_split_renderer_close( &st_ivas->splitBinRend.splitrend ); +#endif } - else if ( numCldfbSyntheses_old < numCldfbSyntheses ) + + if ( st_ivas->renderer_type != old_renderer_type ) { - /* create additional CLDFB synthesis instances */ - for ( i = numCldfbSyntheses_old; i < numCldfbSyntheses; i++ ) + if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC ) { - if ( ( error = openCldfb( &( st_ivas->cldfbSynDec[i] ), CLDFB_SYNTHESIS, hDecoderConfig->output_Fs, CLDFB_PROTOTYPE_5_00MS ) ) != IVAS_ERR_OK ) + if ( st_ivas->renderer_type != RENDERER_STEREO_PARAMETRIC ) + { + if ( ( error = ivas_dirac_dec_binaural_copy_hrtfs( &st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas, st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK ) { return error; } } } + else if ( st_ivas->hDiracDecBin != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM && st_ivas->renderer_type != RENDERER_STEREO_PARAMETRIC ) ) + { + ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin ); + } +#ifndef LBR_SBA_BR_SWITCHING + if ( ( ( st_ivas->renderer_type != RENDERER_DISABLE ) && ( st_ivas->renderer_type != RENDERER_SBA_LINEAR_DEC ) ) || ( sba_mode_old != st_ivas->sba_mode ) || ( ( st_ivas->sba_mode == SBA_MODE_SPAR ) && ( ( hDecoderConfig->output_config != AUDIO_CONFIG_FOA ) && ( st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_STEREO ) && ( st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_MONO ) ) ) ) +#else + if ( ( ( st_ivas->renderer_type != RENDERER_DISABLE ) && ( st_ivas->renderer_type != RENDERER_SBA_LINEAR_DEC ) ) || ( ( hDecoderConfig->output_config != AUDIO_CONFIG_FOA ) && ( st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_STEREO ) && ( st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_MONO ) ) ) #endif - -#ifndef BRATE_SWITCHING_RENDERING - /*-------------------------------------------------------------------* - * Reallocate and initialize binaural rendering handles - *--------------------------------------------------------------------*/ - - if ( ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) && st_ivas->hBinRenderer == NULL ) { - /* open fastconv binaural renderer */ - if ( ( error = ivas_binRenderer_open( st_ivas ) ) != IVAS_ERR_OK ) + DIRAC_CONFIG_FLAG flag_config; + + flag_config = DIRAC_OPEN; + if ( st_ivas->hDirAC != NULL ) { - return error; + flag_config = DIRAC_RECONFIGURE_MODE; +#ifndef LBR_SBA_BR_SWITCHING + if ( ( sba_mode_old == st_ivas->sba_mode ) && ( st_ivas->sba_mode != SBA_MODE_SPAR ) ) + { + flag_config = DIRAC_RECONFIGURE; + } +#endif } -#ifdef SPLIT_REND_WITH_HEAD_ROT -#ifdef FIX_SPLIT_REND_OPEN_ERROR_HANDLING - error = ivas_split_renderer_open( &st_ivas->splitBinRend.splitrend, st_ivas->hDecoderConfig->output_Fs, st_ivas->hDecoderConfig->Opt_splitRendMode, 1 ); - if(error != IVAS_ERR_OK) + + if ( ( error = ivas_dirac_dec_config( st_ivas, flag_config ) ) != IVAS_ERR_OK ) { return error; } -#else - ivas_split_renderer_open( &st_ivas->splitBinRend.splitrend, st_ivas->hDecoderConfig->output_Fs, st_ivas->hDecoderConfig->Opt_splitRendMode, 1 ); -#endif -#endif } - else if ( st_ivas->hBinRenderer != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV && st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV_ROOM ) ) +#ifndef LBR_SBA_BR_SWITCHING + if ( st_ivas->sba_mode == SBA_MODE_SPAR ) { - ivas_binRenderer_close( &st_ivas->hBinRenderer ); -#ifdef SPLIT_REND_WITH_HEAD_ROT - ivas_split_renderer_close( &st_ivas->splitBinRend.splitrend ); #endif - } - - if ( st_ivas->hDiracDecBin == NULL && ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC ) ) - { - /* open parametric binaural renderer */ - if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, st_ivas->sba_mode, IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ) ) != IVAS_ERR_OK ) { return error; } +#ifndef LBR_SBA_BR_SWITCHING } - else if ( st_ivas->hDiracDecBin != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM && st_ivas->renderer_type != RENDERER_STEREO_PARAMETRIC ) ) +#endif +#ifndef LBR_SBA_BR_SWITCHING + if ( ( ( hDecoderConfig->output_config == AUDIO_CONFIG_FOA ) || ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) || ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO ) ) && ( ( sba_mode_old != st_ivas->sba_mode ) && ( st_ivas->sba_mode == SBA_MODE_SPAR ) ) ) { - ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin ); + ivas_dirac_dec_close( &( st_ivas->hDirAC ) ); + + st_ivas->hSpar->enc_param_start_band = min( IVAS_MAX_NUM_BANDS, SPAR_DIRAC_SPLIT_START_BAND ); + + ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( st_ivas->hDecoderConfig->output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ), + st_ivas->hSpar->dirac_to_spar_md_bands, st_ivas->hQMetaData->useLowerBandRes, st_ivas->hSpar->enc_param_start_band, 0 ); } #endif +#ifndef LBR_SBA_BR_SWITCHING + else if ( st_ivas->renderer_type == RENDERER_DISABLE || ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC && st_ivas->sba_mode != SBA_MODE_SPAR ) ) +#else + if ( st_ivas->renderer_type == RENDERER_DISABLE ) +#endif + { + ivas_dirac_dec_close( &( st_ivas->hDirAC ) ); - return error; -} + vbap_free_data( &( st_ivas->hVBAPdata ) ); + } +#ifndef LBR_SBA_BR_SWITCHING + if ( st_ivas->hDirAC != NULL && st_ivas->sba_mode == SBA_MODE_SPAR ) +#else + if ( st_ivas->hDirAC != NULL ) +#endif + { + mvs2s( st_ivas->hDirAC->dirac_to_spar_md_bands, st_ivas->hSpar->dirac_to_spar_md_bands, DIRAC_MAX_NBANDS ); + st_ivas->hSpar->enc_param_start_band = st_ivas->hDirAC->hConfig->enc_param_start_band; + } + /*-----------------------------------------------------------------* + * Allocate, initialize, and configure SCE/CPE/MCT handles + *-----------------------------------------------------------------*/ -#ifdef DEBUG_MODE_DIRAC -/*-----------------------------------------------------------------------* - * Debugging function - *-----------------------------------------------------------------------*/ + if ( ( error = ivas_corecoder_dec_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old, sba_dirac_stereo_flag_old, st_ivas->hDecoderConfig->ivas_total_brate / st_ivas->nchan_transport, ( st_ivas->hDecoderConfig->ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS ) ) != IVAS_ERR_OK ) + { + return error; + } -static void debug_mode_dirac( - float output[MAX_OUTPUT_CHANNELS][L_FRAME48k], - const int16_t nchan_transport, - const int16_t output_frame ) -{ - int16_t i, n; - int16_t tmp[L_FRAME48k]; - char file_name[50] = { 0 }; + /*-----------------------------------------------------------------* + * HP20 memories + *-----------------------------------------------------------------*/ -#ifdef DEBUG_MODE_DIRAC_NOCORE - for ( n = 0; n < nchan_transport; n++ ) + if ( ( error = ivas_hp20_dec_reconfig( st_ivas, nchan_hp20_old ) ) != IVAS_ERR_OK ) { - sprintf( file_name, "./res/ivas_dirac_enc_%d.%d.pcm", n, (int16_t) ( output_frame * 0.05 ) ); - dbgread( tmp, sizeof( int16_t ), output_frame, file_name ); - for ( i = 0; i < output_frame; i++ ) - { - output[n][i] = (float) ( tmp[i] ); - } + return error; } -#else - for ( n = 0; n < nchan_transport; n++ ) + +#ifdef FIX_417_TD_DECORR_BRATE_SW + /*-----------------------------------------------------------------* + * TD Decorrelator + *-----------------------------------------------------------------*/ + + if ( st_ivas->hDiracDecBin != NULL ) { - for ( i = 0; i < output_frame; i++ ) + if ( ( error = ivas_td_decorr_reconfig_dec( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hDecoderConfig->output_Fs, &( st_ivas->hDiracDecBin->hTdDecorr ), &( st_ivas->hDiracDecBin->useTdDecorr ) ) ) != IVAS_ERR_OK ) { - tmp[i] = (int16_t) ( output[n][i] + 0.5f ); + return error; } - - sprintf( file_name, "./res/ivas_dirac_dec_%d.%d.pcm", n, (int16_t) ( output_frame * 0.05 ) ); - dbgwrite( tmp, sizeof( int16_t ), output_frame, 1, file_name ); } #endif - return; + /*-----------------------------------------------------------------* + * CLDFB instances + *-----------------------------------------------------------------*/ + + if ( ( error = ivas_cldfb_dec_reconfig( st_ivas, nchan_transport_old, numCldfbAnalyses_old, numCldfbSyntheses_old ) ) != IVAS_ERR_OK ) + { + return error; + } + + return error; } -#endif diff --git a/lib_dec/ivas_sba_dirac_stereo_dec.c b/lib_dec/ivas_sba_dirac_stereo_dec.c index e4ab91a7d7..0894920480 100644 --- a/lib_dec/ivas_sba_dirac_stereo_dec.c +++ b/lib_dec/ivas_sba_dirac_stereo_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,45 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" + + +/*-------------------------------------------------------------------* + * ivas_get_sba_dirac_stereo_flag() + * + * Set sba_dirac_stereo_flag + *-------------------------------------------------------------------*/ + +int16_t ivas_get_sba_dirac_stereo_flag( + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +) +{ + int16_t sba_dirac_stereo_flag; + AUDIO_CONFIG output_config; + + sba_dirac_stereo_flag = 0; + output_config = st_ivas->hDecoderConfig->output_config; + + if ( st_ivas->ivas_format == SBA_FORMAT || ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) ) + { + if ( st_ivas->sba_mode == SBA_MODE_SPAR ) + { + if ( output_config == AUDIO_CONFIG_STEREO || ( output_config == AUDIO_CONFIG_MONO && st_ivas->nchan_transport == 1 ) ) + { + sba_dirac_stereo_flag = 1; + } + } + else + { + if ( st_ivas->nchan_transport == 1 && output_config == AUDIO_CONFIG_STEREO ) + { + sba_dirac_stereo_flag = 1; + } + } + } + + return sba_dirac_stereo_flag; +} /*-------------------------------------------------------------------* @@ -90,7 +128,8 @@ void ivas_sba_dirac_stereo_config( static int16_t ivas_sba_dirac_stereo_band_config( int16_t *band_limits, /* o : DFT band limits */ const int32_t output_Fs, /* i : output sampling rate */ - const int16_t NFFT /* i : analysis/synthesis window length */ + const int16_t NFFT, /* i : analysis/synthesis window length */ + const int16_t spar_flag /* i : SPAR or DirAC band grouping */ ) { int16_t i; @@ -98,6 +137,16 @@ static int16_t ivas_sba_dirac_stereo_band_config( int16_t nbands, num_cldfb_bands; nbands = SBA_DIRAC_STEREO_NUM_BANDS; + + if ( spar_flag ) + { + nbands = IVAS_MAX_NUM_BANDS; + } + else + { + nbands = 5; + } + num_cldfb_bands = (int16_t) ( output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ); bins_per_cldfb_band = NFFT / ( 2 * num_cldfb_bands ); @@ -105,7 +154,19 @@ static int16_t ivas_sba_dirac_stereo_band_config( band_limits[0] = 1; for ( i = 1; i < nbands; i++ ) { - band_limits[i] = DirAC_band_grouping_5[i] * bins_per_cldfb_band; + if ( spar_flag ) + { + band_limits[i] = DirAC_band_grouping_12[i] * bins_per_cldfb_band; + } + else + { + band_limits[i] = DirAC_band_grouping_5[i] * bins_per_cldfb_band; + } + if ( band_limits[i] >= NFFT / 2 ) + { + nbands = i; + break; + } } band_limits[nbands] = NFFT / 2; @@ -158,33 +219,35 @@ static void map_params_dirac_to_stereo( float synth[], /* i : decoded downmix signal */ float DFT[STEREO_DFT_BUF_MAX], /* i/o: DFT buffer */ const uint8_t b_wide_panning, /* i : flag indicating wider panning */ - const int16_t L_frame /* i : core signal length */ - + const int16_t L_frame, /* i : core signal length */ + const int16_t mcmasa /* i : McMASA flag */ ) { - int16_t i, b, k, block; + int16_t i, b, k; int16_t k_offset; - int16_t nbands, nBlocks, block_len; + int16_t nbands, nBlocks; + int16_t block; + int16_t block_len; int16_t azimuth[MAX_PARAM_SPATIAL_SUBFRAMES][SBA_DIRAC_STEREO_NUM_BANDS]; int16_t elevation[MAX_PARAM_SPATIAL_SUBFRAMES][SBA_DIRAC_STEREO_NUM_BANDS]; float diffuseness[SBA_DIRAC_STEREO_NUM_BANDS]; + float block_nrg[MAX_PARAM_SPATIAL_SUBFRAMES]; + float nrg_norm1, nrg_norm2; + float *pSynth; float surrCoh[SBA_DIRAC_STEREO_NUM_BANDS]; + float *pDFT; float subframe_band_nrg[NB_DIV][SBA_DIRAC_STEREO_NUM_BANDS]; float smooth_long_avg[NB_DIV][SBA_DIRAC_STEREO_NUM_BANDS]; float smooth_short_avg[NB_DIV][SBA_DIRAC_STEREO_NUM_BANDS]; - float block_nrg[MAX_PARAM_SPATIAL_SUBFRAMES]; - float nrg_norm1, nrg_norm2; + float *side_gain, *res_pred_gain; - float *pSynth, *pDFT; IVAS_QDIRECTION *q_direction; - nBlocks = MAX_PARAM_SPATIAL_SUBFRAMES; - nbands = SBA_DIRAC_STEREO_NUM_BANDS; + nbands = hStereoDft->nbands; k_offset = STEREO_DFT_OFFSET; side_gain = hStereoDft->side_gain + k_offset * STEREO_DFT_BAND_MAX; res_pred_gain = hStereoDft->res_pred_gain + k_offset * STEREO_DFT_BAND_MAX; - q_direction = &( hQMetaData->q_direction[0] ); /* gain smoothing factor */ @@ -233,99 +296,102 @@ static void map_params_dirac_to_stereo( } /* apply upper bounds depending on band */ - hStereoDft->smooth_fac[0][b] = min( max_smooth_gains[b], hStereoDft->smooth_fac[0][b] ); - hStereoDft->smooth_fac[1][b] = min( max_smooth_gains[b], hStereoDft->smooth_fac[1][b] ); + hStereoDft->smooth_fac[0][b] = max( hStereoDft->min_smooth_gains[b], min( hStereoDft->max_smooth_gains[b], hStereoDft->smooth_fac[0][b] ) ); + hStereoDft->smooth_fac[1][b] = max( hStereoDft->min_smooth_gains[b], min( hStereoDft->max_smooth_gains[b], hStereoDft->smooth_fac[1][b] ) ); } pDFT += STEREO_DFT32MS_N_MAX; } - /* calculate block energies for side gain weighting (combine angles of 2 DirAC blocks to side gain for 1 DFT Stereo subframe; 4 blocks and 2 subframes overall) */ - pSynth = synth; - block_len = L_frame / nBlocks; - for ( block = 0; block < nBlocks; block++ ) - { - block_nrg[block] = 0.f; - for ( i = 0; i < block_len; i++ ) - { - block_nrg[block] += pSynth[i] * pSynth[i]; - } - block_nrg[block] = sqrtf( block_nrg[block] ); - pSynth += block_len; - } - nrg_norm1 = 1 / ( block_nrg[0] + block_nrg[1] + EPSILON ); - nrg_norm2 = 1 / ( block_nrg[2] + block_nrg[3] + EPSILON ); - - /* extract DirAC parameters from metadata */ - for ( b = 0; b < nbands; b++ ) + if ( mcmasa ) { - diffuseness[b] = 1.0f - q_direction->band_data[b].energy_ratio[0]; - if ( hQMetaData->surcoh_band_data != NULL ) - { - surrCoh[b] = hQMetaData->surcoh_band_data[b].surround_coherence[0] / 255.0f; - } - else - { - surrCoh[b] = 0.0f; - } - + /* calculate block energies for side gain weighting (combine angles of 2 DirAC blocks to side gain for 1 DFT Stereo subframe; 4 blocks and 2 subframes overall) */ + pSynth = synth; + block_len = L_frame / nBlocks; for ( block = 0; block < nBlocks; block++ ) { - int16_t block_metadata; - - if ( hQMetaData->useLowerRes ) - { - block_metadata = 0; - } - else - { - block_metadata = block; - } - if ( q_direction->band_data[b].azimuth[block_metadata] < 0.f ) + block_nrg[block] = 0.f; + for ( i = 0; i < block_len; i++ ) { - q_direction->band_data[b].azimuth[block_metadata] += 360.f; + block_nrg[block] += pSynth[i] * pSynth[i]; } - azimuth[block][b] = (int16_t) q_direction->band_data[b].azimuth[block_metadata]; - elevation[block][b] = (int16_t) q_direction->band_data[b].elevation[block_metadata]; + block_nrg[block] = sqrtf( block_nrg[block] ); + pSynth += block_len; } - } + nrg_norm1 = 1 / ( block_nrg[0] + block_nrg[1] + EPSILON ); + nrg_norm2 = 1 / ( block_nrg[2] + block_nrg[3] + EPSILON ); - /* map angles (azi, ele), surround coherence, and diffuseness to DFT Stereo side and prediction gains */ - for ( b = 0; b < hStereoDft->nbands; b++ ) - { - /* combine angles of first 2 blocks to side gain of first subframe */ - side_gain[b] = 0.f; - for ( block = 0; block < nBlocks / 2; block++ ) + /* extract DirAC parameters from metadata */ + for ( b = 0; b < nbands; b++ ) { - if ( b_wide_panning == 1 ) + diffuseness[b] = 1.0f - q_direction->band_data[b].energy_ratio[0]; + if ( hQMetaData->surcoh_band_data != NULL ) { - /* panning between left and ride, saturate at the stereo ls positions (+/- 30deg azi) */ - side_gain[b] += nrg_norm1 * block_nrg[block] * get_panning( azimuth[block][b], elevation[block][b] ); + surrCoh[b] = hQMetaData->surcoh_band_data[b].surround_coherence[0] / 255.0f; } else { - side_gain[b] += nrg_norm1 * block_nrg[block] * sinf( azimuth[block][b] * EVS_PI / 180 ) * cosf( elevation[block][b] * EVS_PI / 180 ); + surrCoh[b] = 0.0f; + } + + for ( block = 0; block < nBlocks; block++ ) + { + int16_t block_metadata; + + if ( hQMetaData->useLowerRes ) + { + block_metadata = 0; + } + else + { + block_metadata = block; + } + if ( q_direction->band_data[b].azimuth[block_metadata] < 0.f ) + { + q_direction->band_data[b].azimuth[block_metadata] += 360.f; + } + azimuth[block][b] = (int16_t) q_direction->band_data[b].azimuth[block_metadata]; + elevation[block][b] = (int16_t) q_direction->band_data[b].elevation[block_metadata]; } } - /* combine angles of last 2 blocks to side gain of second subframe */ - side_gain[b + STEREO_DFT_BAND_MAX] = 0.f; - for ( block = nBlocks / 2; block < nBlocks; block++ ) + /* map angles (azi, ele), surround coherence, and diffuseness to DFT Stereo side and prediction gains */ + for ( b = 0; b < hStereoDft->nbands; b++ ) { - if ( b_wide_panning == 1 ) + /* combine angles of first 2 blocks to side gain of first subframe */ + side_gain[b] = 0.f; + for ( block = 0; block < nBlocks / 2; block++ ) { - /* panning between left and ride, saturate at the stereo ls positions (+/- 30deg azi) */ - side_gain[b + STEREO_DFT_BAND_MAX] += nrg_norm2 * block_nrg[block] * get_panning( azimuth[block][b], elevation[block][b] ); + if ( b_wide_panning == 1 ) + { + /* panning between left and ride, saturate at the stereo ls positions (+/- 30deg azi) */ + side_gain[b] += nrg_norm1 * block_nrg[block] * get_panning( azimuth[block][b], elevation[block][b] ); + } + else + { + side_gain[b] += nrg_norm1 * block_nrg[block] * sinf( azimuth[block][b] * EVS_PI / 180 ) * cosf( elevation[block][b] * EVS_PI / 180 ); + } } - else + + /* combine angles of last 2 blocks to side gain of second subframe */ + side_gain[b + STEREO_DFT_BAND_MAX] = 0.f; + for ( block = nBlocks / 2; block < nBlocks; block++ ) { - side_gain[b + STEREO_DFT_BAND_MAX] += nrg_norm2 * block_nrg[block] * sinf( azimuth[block][b] * EVS_PI / 180 ) * cosf( elevation[block][b] * EVS_PI / 180 ); + if ( b_wide_panning == 1 ) + { + /* panning between left and ride, saturate at the stereo ls positions (+/- 30deg azi) */ + side_gain[b + STEREO_DFT_BAND_MAX] += nrg_norm2 * block_nrg[block] * get_panning( azimuth[block][b], elevation[block][b] ); + } + else + { + side_gain[b + STEREO_DFT_BAND_MAX] += nrg_norm2 * block_nrg[block] * sinf( azimuth[block][b] * EVS_PI / 180 ) * cosf( elevation[block][b] * EVS_PI / 180 ); + } } - } - side_gain[b] *= sqrtf( 1.f - diffuseness[b] ); - side_gain[b + STEREO_DFT_BAND_MAX] *= sqrtf( 1.f - diffuseness[b] ); - res_pred_gain[b] = diffuseness[b] * ( 1.0f - surrCoh[b] ); - res_pred_gain[b + STEREO_DFT_BAND_MAX] = diffuseness[b] * ( 1.0f - surrCoh[b] ); + side_gain[b] *= sqrtf( 1.f - diffuseness[b] ); + side_gain[b + STEREO_DFT_BAND_MAX] *= sqrtf( 1.f - diffuseness[b] ); + res_pred_gain[b] = diffuseness[b] * ( 1.0f - surrCoh[b] ); + res_pred_gain[b + STEREO_DFT_BAND_MAX] = diffuseness[b] * ( 1.0f - surrCoh[b] ); + } } hStereoDft->frame_nodata = 0; @@ -420,26 +486,109 @@ static void ivas_sba_dirac_stereo_compute_hb_gain( *-------------------------------------------------------------------*/ static void ivas_sba_dirac_stereo_upmix_hb( - float hb_stereo_synth[CPE_CHANNELS][L_FRAME48k], /* i/o: stereo HB synthesis signal */ - float hb_synth[L_FRAME48k], /* i : HB signal */ - float hb_gain[NB_DIV], /* i : side gains for HB signal */ - const int16_t output_frame /* i : output frame length per channel */ + float hb_stereo_synth[CPE_CHANNELS][L_FRAME48k], /* i/o: stereo HB synthesis signal */ + float hb_synth[L_FRAME48k], /* i : HB signal */ + float hb_gain[NB_DIV], /* i : side gains for HB signal */ + const int16_t output_frame, /* i : output frame length per channel */ + const int16_t mcmasa, /* i : McMASA flag */ + const int16_t sba_mono_flag, /* i : flag for mono output */ + const int16_t bwidth, /* i : bandwidth of signal */ + const STEREO_DFT_DEC_DATA_HANDLE hStereoDft /* i : Stereo DFT handle for mixing matrix */ ) { int16_t i; + float gp, gm; + float gain_fac; - for ( i = 0; i < output_frame / 2; i++ ) + if ( !mcmasa ) { - hb_stereo_synth[0][i] = 0.5f * hb_synth[i] + 0.5f * hb_gain[0] * hb_synth[i]; - hb_stereo_synth[1][i] = 0.5f * hb_synth[i] - 0.5f * hb_gain[0] * hb_synth[i]; - } + gain_fac = ( bwidth == FB ) ? 0.25f : 0.33f; /* last matrix element not used for SWB, divide by 3 instead of 4*/ + if ( sba_mono_flag ) + { + gp = hStereoDft->mixer_mat_smooth[0][0][8] + hStereoDft->mixer_mat_smooth[0][0][9] + + hStereoDft->mixer_mat_smooth[0][0][10]; + if ( bwidth == FB ) + { + gp += hStereoDft->mixer_mat_smooth[0][0][11]; + } + for ( i = 0; i < output_frame / 2; i++ ) + { + hb_stereo_synth[0][i] = hb_synth[i] * gain_fac * gp; + } + gp = hStereoDft->mixer_mat_smooth[0][0][8 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][0][9 + IVAS_MAX_NUM_BANDS] + + hStereoDft->mixer_mat_smooth[0][0][10 + IVAS_MAX_NUM_BANDS]; + if ( bwidth == FB ) + { + gp += hStereoDft->mixer_mat_smooth[0][0][11 + IVAS_MAX_NUM_BANDS]; + } + for ( i = output_frame / 2; i < output_frame; i++ ) + { + hb_stereo_synth[0][i] = hb_synth[i] * gain_fac * gp; + } + } + else + { + gp = hStereoDft->mixer_mat_smooth[0][0][8] + hStereoDft->mixer_mat_smooth[1][0][8] + + hStereoDft->mixer_mat_smooth[0][0][9] + hStereoDft->mixer_mat_smooth[1][0][9] + + hStereoDft->mixer_mat_smooth[0][0][10] + hStereoDft->mixer_mat_smooth[1][0][10]; + if ( bwidth == FB ) + { + gp += hStereoDft->mixer_mat_smooth[0][0][11] + hStereoDft->mixer_mat_smooth[1][0][11]; + } + + gm = hStereoDft->mixer_mat_smooth[0][0][8] - hStereoDft->mixer_mat_smooth[1][0][8] + + hStereoDft->mixer_mat_smooth[0][0][9] - hStereoDft->mixer_mat_smooth[1][0][9] + + hStereoDft->mixer_mat_smooth[0][0][10] - hStereoDft->mixer_mat_smooth[1][0][10]; + if ( bwidth == FB ) + { + gm += hStereoDft->mixer_mat_smooth[0][0][11] - hStereoDft->mixer_mat_smooth[1][0][11]; + } + + for ( i = 0; i < output_frame / 2; i++ ) + { + hb_stereo_synth[0][i] = 0.5f * hb_synth[i] * gain_fac * gp; + hb_stereo_synth[1][i] = 0.5f * hb_synth[i] * gain_fac * gm; + } + + gp = hStereoDft->mixer_mat_smooth[0][0][8 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][0][8 + IVAS_MAX_NUM_BANDS] + + hStereoDft->mixer_mat_smooth[0][0][9 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][0][9 + IVAS_MAX_NUM_BANDS] + + hStereoDft->mixer_mat_smooth[0][0][10 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][0][10 + IVAS_MAX_NUM_BANDS]; + if ( bwidth == FB ) + { + gp += hStereoDft->mixer_mat_smooth[0][0][11 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][0][11 + IVAS_MAX_NUM_BANDS]; + } + + gm = hStereoDft->mixer_mat_smooth[0][0][8 + IVAS_MAX_NUM_BANDS] - hStereoDft->mixer_mat_smooth[1][0][8 + IVAS_MAX_NUM_BANDS] + + hStereoDft->mixer_mat_smooth[0][0][9 + IVAS_MAX_NUM_BANDS] - hStereoDft->mixer_mat_smooth[1][0][9 + IVAS_MAX_NUM_BANDS] + + hStereoDft->mixer_mat_smooth[0][0][10 + IVAS_MAX_NUM_BANDS] - hStereoDft->mixer_mat_smooth[1][0][10 + IVAS_MAX_NUM_BANDS]; + if ( bwidth == FB ) + { + gm += hStereoDft->mixer_mat_smooth[0][0][11 + IVAS_MAX_NUM_BANDS] - hStereoDft->mixer_mat_smooth[1][0][11 + IVAS_MAX_NUM_BANDS]; + } - for ( i = output_frame / 2; i < output_frame; i++ ) + for ( i = output_frame / 2; i < output_frame; i++ ) + { + hb_stereo_synth[0][i] = 0.5f * hb_synth[i] * gain_fac * gp; + hb_stereo_synth[1][i] = 0.5f * hb_synth[i] * gain_fac * gm; + } + } + } + else { - hb_stereo_synth[0][i] = 0.5f * hb_synth[i] + 0.5f * hb_gain[1] * hb_synth[i]; - hb_stereo_synth[1][i] = 0.5f * hb_synth[i] - 0.5f * hb_gain[1] * hb_synth[i]; + for ( i = 0; i < output_frame / 2; i++ ) + { + hb_stereo_synth[0][i] = 0.5f * hb_synth[i] + 0.5f * hb_gain[0] * hb_synth[i]; + hb_stereo_synth[1][i] = 0.5f * hb_synth[i] - 0.5f * hb_gain[0] * hb_synth[i]; + } + + for ( i = output_frame / 2; i < output_frame; i++ ) + { + hb_stereo_synth[0][i] = 0.5f * hb_synth[i] + 0.5f * hb_gain[1] * hb_synth[i]; + hb_stereo_synth[1][i] = 0.5f * hb_synth[i] - 0.5f * hb_gain[1] * hb_synth[i]; + } } + return; } @@ -451,9 +600,10 @@ static void ivas_sba_dirac_stereo_upmix_hb( *-------------------------------------------------------------------*/ static void ivas_sba_dirac_stereo_apply_td_stefi( - STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder DFT stereo handle */ - float output[CPE_CHANNELS][L_FRAME48k], /* i/o: output synthesis signal */ - const int16_t output_frame /* i : output frame length per channel */ + STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder DFT stereo handle */ + float output[CPE_CHANNELS][L_FRAME48k], /* i/o: output synthesis signal */ + const int16_t output_frame, /* i : output frame length per channel */ + const int16_t spar_flag /* i : SPAR flag */ ) { int16_t i; @@ -462,7 +612,51 @@ static void ivas_sba_dirac_stereo_apply_td_stefi( float tmp; const float *win_dft; - if ( max( hStereoDft->td_gain[0], hStereoDft->td_gain[1] ) > 0 ) + if ( spar_flag ) + { + win_dft = hStereoDft->win32ms; + dftOvlLen = hStereoDft->dft32ms_ovl; + + float g_W_1, g_Y_1; + float g_W_2, g_Y_2; + float g_L, g_R; + float stefi_L, stefi_R; + + g_W_1 = ( hStereoDft->mixer_mat_smooth[0][1][8] + hStereoDft->mixer_mat_smooth[0][2][8] + hStereoDft->mixer_mat_smooth[0][3][8] ) + ( hStereoDft->mixer_mat_smooth[0][1][9] + hStereoDft->mixer_mat_smooth[0][2][9] + hStereoDft->mixer_mat_smooth[0][3][9] ) + ( hStereoDft->mixer_mat_smooth[0][1][10] + hStereoDft->mixer_mat_smooth[0][2][10] + hStereoDft->mixer_mat_smooth[0][3][10] ); + + g_Y_1 = ( hStereoDft->mixer_mat_smooth[1][1][8] + hStereoDft->mixer_mat_smooth[1][2][8] + hStereoDft->mixer_mat_smooth[1][3][8] ) + ( hStereoDft->mixer_mat_smooth[1][1][9] + hStereoDft->mixer_mat_smooth[1][2][9] + hStereoDft->mixer_mat_smooth[1][3][9] ) + ( hStereoDft->mixer_mat_smooth[1][1][10] + hStereoDft->mixer_mat_smooth[1][2][10] + hStereoDft->mixer_mat_smooth[1][3][10] ); + + g_W_2 = ( hStereoDft->mixer_mat_smooth[0][1][8 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][2][8 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][3][8 + IVAS_MAX_NUM_BANDS] ) + ( hStereoDft->mixer_mat_smooth[0][1][9 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][2][9 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][3][9 + IVAS_MAX_NUM_BANDS] ) + ( hStereoDft->mixer_mat_smooth[0][1][10 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][2][10 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][3][10 + IVAS_MAX_NUM_BANDS] ); + + g_Y_2 = ( hStereoDft->mixer_mat_smooth[1][1][8 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][2][8 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][3][8 + IVAS_MAX_NUM_BANDS] ) + ( hStereoDft->mixer_mat_smooth[1][1][9 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][2][9 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][3][9 + IVAS_MAX_NUM_BANDS] ) + ( hStereoDft->mixer_mat_smooth[1][1][10 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][2][10 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][3][10 + IVAS_MAX_NUM_BANDS] ); + + g_L = 0.16f * ( g_W_1 + g_W_2 - g_Y_1 - g_Y_2 ); + g_R = 0.16f * ( g_W_1 + g_W_2 + g_Y_1 + g_Y_2 ); + + for ( i = 0; i < dftOvlLen; i++ ) + { + win_in = win_dft[STEREO_DFT32MS_STEP * i] * win_dft[STEREO_DFT32MS_STEP * i]; + win_out = 1 - win_in; + + stefi_L = ( win_out * hStereoDft->g_L_prev + win_in * g_L ) * 0.5f * hStereoDft->hb_stefi_sig[i]; + stefi_R = ( win_out * hStereoDft->g_R_prev + win_in * g_R ) * 0.5f * hStereoDft->hb_stefi_sig[i]; + + output[0][i] += stefi_L; + output[1][i] += stefi_R; + } + for ( i = dftOvlLen; i < output_frame; i++ ) + { + + stefi_L = g_L * 0.5f * hStereoDft->hb_stefi_sig[i]; + stefi_R = g_R * 0.5f * hStereoDft->hb_stefi_sig[i]; + + output[0][i] += stefi_L; + output[1][i] += stefi_R; + } + hStereoDft->g_L_prev = g_L; + hStereoDft->g_R_prev = g_R; + } + else if ( max( hStereoDft->td_gain[0], hStereoDft->td_gain[1] ) > 0 ) { win_dft = hStereoDft->win32ms; dftOvlLen = hStereoDft->dft32ms_ovl; @@ -495,35 +689,111 @@ static void ivas_sba_dirac_stereo_apply_td_stefi( *-------------------------------------------------------------------*/ void ivas_sba_dirac_stereo_smooth_parameters( - STEREO_DFT_DEC_DATA_HANDLE hStereoDft /* i/o: decoder DFT stereo handle */ + STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder DFT stereo handle */ + ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD handle for upmixing */ + const int16_t cross_fade_start_offset, /* i : SPAR mixer delay compensation */ + const int32_t output_Fs /* i : Fs for delay calculation */ ) { - int16_t k_offset, b; + int16_t i, j, k, i_sf; + int16_t b; + int16_t k_offset; float *side_gain, *prev_side_gain; float *res_pred_gain, *prev_res_pred_gain; k_offset = STEREO_DFT_OFFSET; - prev_side_gain = hStereoDft->side_gain; side_gain = hStereoDft->side_gain + k_offset * STEREO_DFT_BAND_MAX; prev_res_pred_gain = hStereoDft->res_pred_gain; res_pred_gain = hStereoDft->res_pred_gain + k_offset * STEREO_DFT_BAND_MAX; - /* Smoothing of side and prediction gains between ftrames */ - for ( b = hStereoDft->res_pred_band_min; b < hStereoDft->nbands; b++ ) + if ( !hMdDec ) { - if ( hStereoDft->attackPresent ) + /* Smoothing of side and prediction gains between ftrames */ + for ( b = hStereoDft->res_pred_band_min; b < hStereoDft->nbands; b++ ) { - res_pred_gain[b] *= 0.8f; - res_pred_gain[b + STEREO_DFT_BAND_MAX] *= 0.8f; + if ( hStereoDft->attackPresent ) + { + res_pred_gain[b] *= 0.8f; + res_pred_gain[b + STEREO_DFT_BAND_MAX] *= 0.8f; + } + else + { + side_gain[b] = hStereoDft->smooth_fac[0][b] * prev_side_gain[b] + ( 1.f - hStereoDft->smooth_fac[0][b] ) * side_gain[b]; + side_gain[b + STEREO_DFT_BAND_MAX] = hStereoDft->smooth_fac[1][b] * side_gain[b] + ( 1.f - hStereoDft->smooth_fac[1][b] ) * side_gain[b + STEREO_DFT_BAND_MAX]; + res_pred_gain[b] = hStereoDft->smooth_fac[0][b] * prev_res_pred_gain[b] + ( 1.f - hStereoDft->smooth_fac[0][b] ) * res_pred_gain[b]; + res_pred_gain[b + STEREO_DFT_BAND_MAX] = hStereoDft->smooth_fac[1][b] * res_pred_gain[b] + ( 1.f - hStereoDft->smooth_fac[1][b] ) * res_pred_gain[b + STEREO_DFT_BAND_MAX]; + } } - else + } + + if ( hMdDec != 0 ) + { + float xfade_start_ns; + int16_t xfade_delay_subframes; + int16_t i_hist; + + xfade_start_ns = cross_fade_start_offset / (float) output_Fs * 1000000000.f - IVAS_FB_ENC_DELAY_NS; + xfade_delay_subframes = (int16_t) ( xfade_start_ns / ( FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES ) ); + + i_hist = 4 - xfade_delay_subframes; + + for ( k = 0; k < 2; k++ ) { - side_gain[b] = hStereoDft->smooth_fac[0][b] * prev_side_gain[b] + ( 1.f - hStereoDft->smooth_fac[0][b] ) * side_gain[b]; - side_gain[b + STEREO_DFT_BAND_MAX] = hStereoDft->smooth_fac[1][b] * side_gain[b] + ( 1.f - hStereoDft->smooth_fac[1][b] ) * side_gain[b + STEREO_DFT_BAND_MAX]; - res_pred_gain[b] = hStereoDft->smooth_fac[0][b] * prev_res_pred_gain[b] + ( 1.f - hStereoDft->smooth_fac[0][b] ) * res_pred_gain[b]; - res_pred_gain[b + STEREO_DFT_BAND_MAX] = hStereoDft->smooth_fac[1][b] * res_pred_gain[b] + ( 1.f - hStereoDft->smooth_fac[1][b] ) * res_pred_gain[b + STEREO_DFT_BAND_MAX]; + for ( i_sf = k * 2; i_sf < ( k + 1 ) * 2; i_sf++ ) + { + if ( hStereoDft->first_frame ) + { + for ( i = 0; i < 2; i++ ) + { + for ( j = 0; j < 4; j++ ) + { + for ( b = 0; b < hStereoDft->nbands; b++ ) + { + hStereoDft->mixer_mat_smooth[i][j][b + k * IVAS_MAX_NUM_BANDS] = hMdDec->mixer_mat[i][j][b]; + } + for ( ; b < IVAS_MAX_NUM_BANDS; b++ ) + { + hStereoDft->mixer_mat_smooth[i][j][b + k * IVAS_MAX_NUM_BANDS] = 0.f; + } + } + } + } + else + { + for ( i = 0; i < 2; i++ ) + { + for ( j = 0; j < 4; j++ ) + { + for ( b = 0; b < hStereoDft->nbands; b++ ) + { + float beta = hStereoDft->smooth_fac[k][b]; + hStereoDft->mixer_mat_smooth[i][j][b + k * IVAS_MAX_NUM_BANDS] = + beta * hStereoDft->mixer_mat_smooth[i][j][b + k * IVAS_MAX_NUM_BANDS] + ( 1 - beta ) * hMdDec->mixer_mat_prev[i_hist][i][j][b]; + } + } + } + } + + mvr2r( hMdDec->mixer_mat_prev[1][0][0], hMdDec->mixer_mat_prev[0][0][0], IVAS_MAX_FB_MIXER_OUT_CH * IVAS_MAX_SPAR_FB_MIXER_IN_CH * IVAS_MAX_NUM_BANDS ); + mvr2r( hMdDec->mixer_mat_prev[2][0][0], hMdDec->mixer_mat_prev[1][0][0], IVAS_MAX_FB_MIXER_OUT_CH * IVAS_MAX_SPAR_FB_MIXER_IN_CH * IVAS_MAX_NUM_BANDS ); + mvr2r( hMdDec->mixer_mat_prev[3][0][0], hMdDec->mixer_mat_prev[2][0][0], IVAS_MAX_FB_MIXER_OUT_CH * IVAS_MAX_SPAR_FB_MIXER_IN_CH * IVAS_MAX_NUM_BANDS ); + mvr2r( hMdDec->mixer_mat_prev[4][0][0], hMdDec->mixer_mat_prev[3][0][0], IVAS_MAX_FB_MIXER_OUT_CH * IVAS_MAX_SPAR_FB_MIXER_IN_CH * IVAS_MAX_NUM_BANDS ); + + for ( i = 0; i < 2; i++ ) + { + for ( j = 0; j < 4; j++ ) + { + for ( b = 0; b < hStereoDft->nbands; b++ ) + { + hMdDec->mixer_mat_prev[4][i][j][b] = hMdDec->mixer_mat[i][j][b + i_sf * IVAS_MAX_NUM_BANDS]; + } + } + } + } } + + hStereoDft->first_frame = 0; } return; @@ -539,10 +809,12 @@ void ivas_sba_dirac_stereo_smooth_parameters( void ivas_sba_dirac_stereo_dec( Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ float output[CPE_CHANNELS][L_FRAME48k], /* i/o: output synthesis signal */ - const int16_t output_frame /* i : output frame length per channel */ + const int16_t output_frame, /* i : output frame length per channel */ + const int16_t mcmasa /* i : McMASA flag */ ) { int16_t dtx_flag, fd_cng_flag; + int16_t sba_mono_flag; int16_t memOffset; float tmp_buf[NS2SA( 48000, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS )]; float tmp_synth[L_FRAME16k]; @@ -556,59 +828,104 @@ void ivas_sba_dirac_stereo_dec( hSCE = st_ivas->hSCE[0]; hCPE = st_ivas->hCPE[0]; hStereoDft = hCPE->hStereoDft; - dtx_flag = ( hSCE->hCoreCoder[0]->core_brate <= SID_2k40 ); - fd_cng_flag = ( dtx_flag && hSCE->hCoreCoder[0]->cng_type == FD_CNG ); + + if ( st_ivas->nchan_transport > 1 && !mcmasa ) + { + dtx_flag = 0; + fd_cng_flag = 0; + } + else + { + dtx_flag = ( hSCE->hCoreCoder[0]->core_brate <= SID_2k40 ); + fd_cng_flag = ( dtx_flag && hSCE->hCoreCoder[0]->cng_type == FD_CNG ); + } + sba_mono_flag = ( st_ivas->hDecoderConfig->nchan_out == 1 ) ? 1 : 0; + memOffset = NS2SA( output_frame * FRAMES_PER_SEC, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS ); ivas_sba_dirac_stereo_config( hStereoDft->hConfig ); - hStereoDft->nbands = ivas_sba_dirac_stereo_band_config( hStereoDft->band_limits, st_ivas->hDecoderConfig->output_Fs, hStereoDft->NFFT ); + hStereoDft->nbands = ivas_sba_dirac_stereo_band_config( hStereoDft->band_limits, st_ivas->hDecoderConfig->output_Fs, hStereoDft->NFFT, ( st_ivas->sba_mode == SBA_MODE_SPAR && !mcmasa ) ); stereo_dft_dec_update( hStereoDft, output_frame, 1 /*st_ivas->sba_dirac_stereo_flag*/ ); + if ( st_ivas->nchan_transport > 1 ) + { + stereo_dft_dec_analyze( hCPE, output[0], DFT, 0, output_frame, output_frame, DFT_STEREO_DEC_ANA_FB, 0, 0 ); + stereo_dft_dec_analyze( hCPE, output[1], DFT, 1, output_frame, output_frame, DFT_STEREO_DEC_ANA_FB, 0, 0 ); + hStereoDft->core_hist[0] = hCPE->hCoreCoder[0]->core; + } + else + { + /* nrg calculation for TD Stereo Filling, as done in ICBWE which is not used in this case */ + ivas_sba_dirac_stereo_compute_td_stefi_nrgs( hStereoDft, hSCE->save_hb_synth, hSCE->hCoreCoder[0]->core, output_frame, fd_cng_flag ); - /* nrg calculation for TD Stereo Filling, as done in ICBWE which is not used in this case */ - ivas_sba_dirac_stereo_compute_td_stefi_nrgs( hStereoDft, hSCE->save_hb_synth, hSCE->hCoreCoder[0]->core, output_frame, fd_cng_flag ); - - /* do DFT Stereo core switching (including DFT analysis) here as CPE element was not available in SCE decoder */ - mvr2r( hSCE->save_synth, tmp_synth, hSCE->hCoreCoder[0]->L_frame ); - stereo_dft_dec_core_switching( hCPE, output[0] /*hSCE->save_output*/, hSCE->save_synth, hSCE->save_hb_synth, DFT, output_frame, 0, dtx_flag ); + /* do DFT Stereo core switching (including DFT analysis) here as CPE element was not available in SCE decoder */ + mvr2r( hSCE->save_synth, tmp_synth, hSCE->hCoreCoder[0]->L_frame ); + stereo_dft_dec_core_switching( hCPE, output[0] /*hSCE->save_output*/, hSCE->save_synth, hSCE->save_hb_synth, DFT, output_frame, 0, dtx_flag ); - /* do updates here after skipping this in SCE decoder (needs to be done after core switching) */ - updt_dec_common( hSCE->hCoreCoder[0], NORMAL_HQ_CORE, -1, hSCE->save_synth ); + /* do updates here after skipping this in SCE decoder (needs to be done after core switching) */ + updt_dec_common( hSCE->hCoreCoder[0], NORMAL_HQ_CORE, -1, hSCE->save_synth ); + } /* mapping of DirAC parameters (azimuth, elevation, diffuseness) to DFT Stereo parameters (side gain, prediction gain) */ - map_params_dirac_to_stereo( hStereoDft, st_ivas->hQMetaData, tmp_synth, DFT[0], st_ivas->ivas_format == MC_FORMAT, hSCE->hCoreCoder[0]->L_frame ); + map_params_dirac_to_stereo( hStereoDft, st_ivas->hQMetaData, tmp_synth, DFT[0], + st_ivas->ivas_format == MC_FORMAT, + ( st_ivas->sba_mode != SBA_MODE_SPAR || mcmasa ) ? hSCE->hCoreCoder[0]->L_frame : output_frame, + ( st_ivas->sba_mode != SBA_MODE_SPAR || mcmasa ) ); + + if ( st_ivas->sba_mode == SBA_MODE_SPAR && !mcmasa ) + { + set_f( hStereoDft->res_pred_gain, 1.f, 3 * STEREO_DFT_BAND_MAX ); + } /* DFT Stereo upmix */ - stereo_dft_dec( hStereoDft, hCPE->hCoreCoder[0], DFT, NULL, NULL, 1 /*st_ivas->sba_dirac_stereo_flag*/ ); + stereo_dft_dec( hStereoDft, hCPE->hCoreCoder[0], DFT, NULL, NULL, 1 /*st_ivas->sba_dirac_stereo_flag*/, sba_mono_flag, + ( st_ivas->hSpar != NULL && !mcmasa ) ? st_ivas->hSpar->hMdDec : NULL, + ( st_ivas->hSpar != NULL && !mcmasa ) ? st_ivas->hSpar->hFbMixer->cross_fade_start_offset : 0, + st_ivas->hDecoderConfig->output_Fs, st_ivas->nchan_transport ); /* DFT synthesis */ stereo_dft_dec_synthesize( hCPE, DFT, 0, output[0], output_frame ); - stereo_dft_dec_synthesize( hCPE, DFT, 1, output[1], output_frame ); + if ( !sba_mono_flag ) + { + stereo_dft_dec_synthesize( hCPE, DFT, 1, output[1], output_frame ); + } synchro_synthesis( st_ivas->hDecoderConfig->ivas_total_brate, hCPE, output, output_frame, 1 /*st_ivas->sba_dirac_stereo_flag*/ ); /* output scaling */ - v_multc( output[0], 0.5f, output[0], output_frame ); - v_multc( output[1], 0.5f, output[1], output_frame ); + if ( !sba_mono_flag ) + { + v_multc( output[0], 0.5f, output[0], output_frame ); + v_multc( output[1], 0.5f, output[1], output_frame ); + } /* delay HB synth */ - mvr2r( hSCE->save_hb_synth + output_frame - memOffset, tmp_buf, memOffset ); - mvr2r( hSCE->save_hb_synth, hSCE->save_hb_synth + memOffset, output_frame - memOffset ); - mvr2r( hSCE->prev_hb_synth, hSCE->save_hb_synth, memOffset ); - mvr2r( tmp_buf, hSCE->prev_hb_synth, memOffset ); + if ( st_ivas->nchan_transport == 1 ) + { + mvr2r( hSCE->save_hb_synth + output_frame - memOffset, tmp_buf, memOffset ); + mvr2r( hSCE->save_hb_synth, hSCE->save_hb_synth + memOffset, output_frame - memOffset ); + mvr2r( hSCE->prev_hb_synth, hSCE->save_hb_synth, memOffset ); + mvr2r( tmp_buf, hSCE->prev_hb_synth, memOffset ); + } - if ( ( hCPE->hCoreCoder[0]->core == ACELP_CORE || hCPE->hCoreCoder[0]->last_core == ACELP_CORE ) && !fd_cng_flag ) + if ( ( hCPE->hCoreCoder[0]->core == ACELP_CORE || hCPE->hCoreCoder[0]->last_core == ACELP_CORE ) && !fd_cng_flag && st_ivas->nchan_transport == 1 ) { /* upmix ACELP BWE */ ivas_sba_dirac_stereo_compute_hb_gain( hStereoDft, hb_gain ); - ivas_sba_dirac_stereo_upmix_hb( hb_synth_stereo, hSCE->save_hb_synth, hb_gain, output_frame ); + + ivas_sba_dirac_stereo_upmix_hb( hb_synth_stereo, hSCE->save_hb_synth, hb_gain, output_frame, + ( st_ivas->sba_mode != SBA_MODE_SPAR || mcmasa ), sba_mono_flag, hSCE->hCoreCoder[0]->bwidth, hStereoDft ); + /* add HB to ACELP core */ v_add( output[0], hb_synth_stereo[0], output[0], output_frame ); - v_add( output[1], hb_synth_stereo[1], output[1], output_frame ); + if ( !sba_mono_flag ) + { + v_add( output[1], hb_synth_stereo[1], output[1], output_frame ); - /* apply TD Stereo Filling as is done in ICBWE */ - ivas_sba_dirac_stereo_apply_td_stefi( hStereoDft, output, output_frame ); + /* apply TD Stereo Filling as is done in ICBWE */ + ivas_sba_dirac_stereo_apply_td_stefi( hStereoDft, output, output_frame, ( st_ivas->sba_mode == SBA_MODE_SPAR && !mcmasa ) ); + } } return; diff --git a/lib_dec/ivas_sba_rendering_internal.c b/lib_dec/ivas_sba_rendering_internal.c new file mode 100644 index 0000000000..a80986b39e --- /dev/null +++ b/lib_dec/ivas_sba_rendering_internal.c @@ -0,0 +1,629 @@ +/****************************************************************************************************** + + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository. All Rights Reserved. + + This software is protected by copyright law and by international treaties. + The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository retain full ownership rights in their respective contributions in + the software. This notice grants no license of any kind, including but not limited to patent + license, nor is any license granted by implication, estoppel or otherwise. + + Contributors are required to enter into the IVAS codec Public Collaboration agreement before making + contributions. + + This software is provided "AS IS", without any express or implied warranties. The software is in the + development stage. It is intended exclusively for experts who have experience with such software and + solely for the purpose of inspection. All implied warranties of non-infringement, merchantability + and fitness for a particular purpose are hereby disclaimed and excluded. + + Any dispute, controversy or claim arising under or in relation to providing this software shall be + submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in + accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and + the United Nations Convention on Contracts on the International Sales of Goods. + +*******************************************************************************************************/ + +#include +#include "options.h" +#include "prot.h" +#include "ivas_prot.h" +#include "ivas_prot_rend.h" +#include "ivas_stat_dec.h" +#include "ivas_cnst.h" +#include +#ifdef DEBUGGING +#include "debug.h" +#endif +#include "wmc_auto.h" + + +#ifdef DEBUG_MODE_DIRAC +/*-----------------------------------------------------------------------* + * Local function prototypes + *-----------------------------------------------------------------------*/ + +static void debug_mode_dirac( float output[MAX_OUTPUT_CHANNELS][L_FRAME48k], const int16_t nchan_transport, const int16_t output_frame ); +#endif + + +/*-------------------------------------------------------------------------* + * ivas_sba2MC_cldfb() + * + * SBA signals transformed into MC in CLDFB domain + *-------------------------------------------------------------------------*/ + +void ivas_sba2mc_cldfb( + IVAS_OUTPUT_SETUP hInSetup, /* i : Format of input layout */ + float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: cldfb real part */ + float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: cldfb imag part */ + const int16_t nb_channels_out, /* i : nb of output channels */ + const int16_t nb_bands, /* i : nb of CLDFB bands to process */ + const float *hoa_dec_mtx /* i : HOA decoding mtx */ +) +{ + int16_t iBlock, iBand, n, m; + float realOut[16][MAX_PARAM_SPATIAL_SUBFRAMES * CLDFB_NO_CHANNELS_MAX], imagOut[16][MAX_PARAM_SPATIAL_SUBFRAMES * CLDFB_NO_CHANNELS_MAX]; + float g; + float *p_real, *p_imag, *p_realOut, *p_imagOut; + int16_t nb_channels_in; + + push_wmops( "ivas_sba2mc_cldfb" ); + + nb_channels_in = hInSetup.nchan_out_woLFE; + assert( ( nb_channels_in == 16 ) && ( nb_channels_out == 11 ) && "ivas_sba2mc_cldfb; only HOA3 to CICP19 is for now supported!" ); + + for ( n = 0; n < nb_channels_out; n++ ) + { + set_zero( realOut[n], MAX_PARAM_SPATIAL_SUBFRAMES * nb_bands ); + set_zero( imagOut[n], MAX_PARAM_SPATIAL_SUBFRAMES * nb_bands ); + + for ( m = 0; m < nb_channels_in; m++ ) + { + g = hoa_dec_mtx[SBA_NHARM_HOA3 * n + m]; + p_realOut = realOut[n]; + p_imagOut = imagOut[n]; + for ( iBlock = 0; iBlock < MAX_PARAM_SPATIAL_SUBFRAMES; iBlock++ ) + { + p_real = RealBuffer[m][iBlock]; + p_imag = ImagBuffer[m][iBlock]; + for ( iBand = 0; iBand < nb_bands; iBand++ ) + { + *p_realOut = *p_realOut + g * *( p_real++ ); + *p_imagOut = *p_imagOut + g * *( p_imag++ ); + p_realOut++; + p_imagOut++; + } + } + } + } + + for ( n = 0; n < nb_channels_out; n++ ) + { + p_realOut = realOut[n]; + p_imagOut = imagOut[n]; + for ( iBlock = 0; iBlock < MAX_PARAM_SPATIAL_SUBFRAMES; iBlock++ ) + { + p_real = RealBuffer[n][iBlock]; + p_imag = ImagBuffer[n][iBlock]; + for ( iBand = 0; iBand < nb_bands; iBand++ ) + { + *( p_real++ ) = *p_realOut++; + *( p_imag++ ) = *p_imagOut++; + } + } + } + + pop_wmops(); + + return; +} + + +/*-------------------------------------------------------------------------* + * ivas_mc2sba() + * + * MC signals transformed into SBA in TD domain + *-------------------------------------------------------------------------*/ + +void ivas_mc2sba( + IVAS_OUTPUT_SETUP hIntSetup, /* i : Format of decoder output */ + float buffer_td[][L_FRAME48k], /* i/o: MC signals (on input) and the HOA3 (on output) */ + const int16_t output_frame, /* i : output frame length per channel */ + const int16_t sba_order, /* i : Ambisonic (SBA) order */ + const float gain_lfe /* i : gain for LFE, 0 = ignore LFE */ +) +{ + int16_t i, j, k; + int16_t idx_lfe, idx_in; + float buffer_tmp[16][L_FRAME48k]; + float gains[16]; + int16_t azimuth, elevation; + int16_t sba_num_chans; + + assert( ( sba_order <= 3 ) && "Only order up to 3 is supported!" ); + + /* Init*/ + sba_num_chans = ( sba_order + 1 ) * ( sba_order + 1 ); + for ( j = 0; j < sba_num_chans; j++ ) + { + set_zero( buffer_tmp[j], output_frame ); + } + + /* HOA encoding*/ + idx_lfe = 0; + idx_in = 0; + for ( i = 0; i < hIntSetup.nchan_out_woLFE + hIntSetup.num_lfe; i++ ) + { + if ( ( hIntSetup.num_lfe > 0 ) && ( i == hIntSetup.index_lfe[idx_lfe] ) ) + { + if ( gain_lfe > 0.f ) + { + /* Add LFE to omni W with gain*/ + for ( k = 0; k < output_frame; k++ ) + { + buffer_tmp[0][k] += gain_lfe * buffer_td[i][k]; + } + } + + if ( idx_lfe < ( hIntSetup.num_lfe - 1 ) ) + { + idx_lfe++; + } + } + else + { + azimuth = (int16_t) ( hIntSetup.ls_azimuth[idx_in] ); + elevation = (int16_t) ( hIntSetup.ls_elevation[idx_in] ); + idx_in++; + + /* get HOA response for direction (ACN/SN3D)*/ + ivas_dirac_dec_get_response( + azimuth, + elevation, + gains, + sba_order ); + + for ( j = 0; j < sba_num_chans; j++ ) + { + for ( k = 0; k < output_frame; k++ ) + { + buffer_tmp[j][k] += gains[j] * buffer_td[i][k]; + } + } + } + } + + for ( j = 0; j < sba_num_chans; j++ ) + { + mvr2r( buffer_tmp[j], buffer_td[j], output_frame ); + } + + return; +} + + +/*-------------------------------------------------------------------* + * ivas_sba_remapTCs() + * + * Get TCs from Ambisonics signal in ACN + *-------------------------------------------------------------------*/ + +int16_t ivas_sba_remapTCs( + float sba_data[][L_FRAME48k], /* i/o: SBA signals */ + Decoder_Struct *st_ivas, /* i/o: decoder struct */ + const int16_t output_frame /* i : frame length */ +) +{ + int16_t nchan_remapped; + +#ifdef DEBUG_MODE_DIRAC + debug_mode_dirac( sba_data, st_ivas->nchan_transport, output_frame ); +#endif + + nchan_remapped = st_ivas->nchan_transport; + if ( ( st_ivas->sba_mode != SBA_MODE_SPAR && st_ivas->sba_planar && nchan_remapped >= 3 ) || + ( ( st_ivas->sba_mode == SBA_MODE_SPAR ) && nchan_remapped == 3 ) ) + { + + nchan_remapped++; + if ( st_ivas->sba_mode != SBA_MODE_SPAR ) + { + assert( ( ( st_ivas->nchan_transport == 3 ) || ( st_ivas->nchan_transport == 5 ) || ( st_ivas->nchan_transport == 7 ) ) && "Number of channels must be odd for SBA planar!" ); + } + + if ( nchan_remapped == 4 ) + { + /*For planar A-format channel 2 and 3 are identical -> Z=0*/ + mvr2r( sba_data[2], sba_data[3], output_frame ); + } + } + + if ( st_ivas->nchan_transport >= 3 ) + { + int16_t i = 0; + float temp; + + /*convert WYXZ downmix to WYZX*/ + for ( i = 0; i < output_frame; i++ ) + { + temp = sba_data[2][i]; + sba_data[2][i] = sba_data[3][i]; + sba_data[3][i] = temp; + if ( st_ivas->nchan_transport == 3 ) + { + sba_data[2][i] = 0; + } + } + } + + if ( st_ivas->sba_mode != SBA_MODE_SPAR ) + { + ivas_sba_zero_vert_comp( sba_data, st_ivas->sba_analysis_order, st_ivas->sba_planar, output_frame ); + } + + return ( nchan_remapped ); +} + + +/*-------------------------------------------------------------------------* + * ivas_ism2sba() + * + * ISM transformed into SBA in TD domain. + *-------------------------------------------------------------------------*/ + +void ivas_ism2sba( + float buffer_td[][L_FRAME48k], /* i/o: TD signal buffers */ + ISM_RENDERER_HANDLE hIsmRendererData, /* i/o: renderer data */ + const ISM_METADATA_HANDLE hIsmMetaData[], /* i : object metadata */ + const int16_t nchan_ism, /* i : number of objects */ + const int16_t output_frame, /* i : output frame length per channel */ + const int16_t sba_order /* i : Ambisonic (SBA) order */ +) +{ + int16_t i, j, k; + float buffer_tmp[16][L_FRAME48k]; + float gains[16]; + float g1, g2; + int16_t azimuth, elevation; + int16_t sba_num_chans; + + assert( ( sba_order <= 3 ) && "Only order up to 3 is supported!" ); + assert( hIsmRendererData != NULL && "hIsmRendererData not allocated!" ); + + /* Init*/ + sba_num_chans = ( sba_order + 1 ) * ( sba_order + 1 ); + for ( j = 0; j < sba_num_chans; j++ ) + { + set_zero( buffer_tmp[j], output_frame ); + } + + for ( i = 0; i < nchan_ism; i++ ) + { + // TODO tmu review when #215 is resolved + azimuth = (int16_t) floorf( hIsmMetaData[i]->azimuth + 0.5f ); + elevation = (int16_t) floorf( hIsmMetaData[i]->elevation + 0.5f ); + + /*get HOA gets for direction (ACN/SN3D)*/ + ivas_dirac_dec_get_response( azimuth, elevation, gains, sba_order ); + + for ( j = 0; j < sba_num_chans; j++ ) + { + g1 = 1.f; + g2 = 0.f; + for ( k = 0; k < output_frame; k++ ) + { + buffer_tmp[j][k] += ( g2 * gains[j] + g1 * hIsmRendererData->prev_gains[i][j] ) * buffer_td[i][k]; + g2 += 1.f / ( output_frame - 1 ); + g1 = 1.0f - g2; + } + hIsmRendererData->prev_gains[i][j] = gains[j]; + } + } + + for ( j = 0; j < sba_num_chans; j++ ) + { + mvr2r( buffer_tmp[j], buffer_td[j], output_frame ); + } + + return; +} + + +/*-------------------------------------------------------------------* + * ivas_sba_upmixer_renderer() + * + * SBA upmix & rendering + *-------------------------------------------------------------------*/ + +void ivas_sba_upmixer_renderer( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder struct */ + float output[][L_FRAME48k], /* i/o: transport/output audio channels */ + const int16_t output_frame /* i : output frame length */ +) +{ + int16_t i, nchan_internal; + float temp; + + push_wmops( "ivas_sba_upmixer_renderer" ); + + nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order ); + + if ( st_ivas->nchan_transport >= 3 ) + { + /*convert WYZX downmix to WYXZ*/ + for ( i = 0; i < output_frame; i++ ) + { + temp = output[2][i]; + output[2][i] = output[3][i]; + output[3][i] = temp; + } + } + + /* Upmixer + Renderer */ + ivas_spar_dec_upmixer( st_ivas, output, nchan_internal, output_frame ); + + if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC ) + { + ivas_sba_linear_renderer( output, output_frame, st_ivas->hIntSetup.nchan_out_woLFE, st_ivas->hDecoderConfig->output_config, st_ivas->hOutSetup, st_ivas->hoa_dec_mtx ); + } + + pop_wmops(); + + return; +} + + +/*-------------------------------------------------------------------* + * ivas_sba_mtx_mult() + * + * HOA decoding with LFE insertion + *-------------------------------------------------------------------*/ + +static void ivas_sba_mtx_mult( + float output_f[][L_FRAME48k], /* i/o: synthesized core-coder transport channels/DirAC output */ + const int16_t output_frame, /* i : output frame length per channel */ + const int16_t nchan_in, /* i : Number of ambisonic channels */ + const IVAS_OUTPUT_SETUP output_setup, /* i : Output configuration */ + const float *mtx_hoa_decoder /* i : HOA decoding mtx */ +) +{ + int16_t i, k, ch_idx; + int16_t idx_lfe; + float input_f[16]; + const float *hoa_decoder; + + assert( ( nchan_in >= FOA_CHANNELS ) && "Number of input channels must be at least 4 (FOA)!\n" ); + + for ( i = 0; i < output_frame; i++ ) + { + /* init*/ + idx_lfe = 0; + hoa_decoder = &mtx_hoa_decoder[0]; + for ( k = 0; k < nchan_in; k++ ) + { + input_f[k] = output_f[k][i]; + } + + /* mtx mult with LFE insertion*/ + for ( ch_idx = 0; ch_idx < ( output_setup.nchan_out_woLFE + output_setup.num_lfe ); ch_idx++ ) + { + if ( ( output_setup.num_lfe > 0 ) && ( output_setup.index_lfe[idx_lfe] == ch_idx ) ) + { + /*LFE insertion*/ + output_f[ch_idx][i] = 0.f; + if ( idx_lfe < ( output_setup.num_lfe - 1 ) ) + { + idx_lfe++; + } + } + else + { + /*HOA decoding*/ + output_f[ch_idx][i] = input_f[0] * hoa_decoder[0]; + for ( k = 1; k < nchan_in; k++ ) + { + output_f[ch_idx][i] += input_f[k] * hoa_decoder[k]; + } + hoa_decoder += 16; + } + } + } + + return; +} + + +/*-------------------------------------------------------------------* + * ivas_sba_linear_renderer() + * + * Linear rendering for SBA format + *-------------------------------------------------------------------*/ + +ivas_error ivas_sba_linear_renderer( + float output_f[][L_FRAME48k], /* i/o: synthesized core-coder transport channels/DirAC output */ + const int16_t output_frame, /* i : output frame length per channel */ + const int16_t nchan_in, /* i : number of input ambisonics channels */ + const AUDIO_CONFIG output_config, /* i : output audio configuration */ + const IVAS_OUTPUT_SETUP output_setup, /* i : output format setup */ + const float hoa_dec_mtx[] /* i : HOA decoding mtx */ +) +{ + int16_t i; + float dmx_l; + int16_t nchan_hoa; + ivas_error error; + + error = IVAS_ERR_OK; + + /* Number of channels of HOA depends of transport format which is mixed order xH1V*/ + nchan_hoa = nchan_in; + + if ( nchan_in == 6 ) /*2H1V*/ + { + nchan_hoa = 9; + } + else if ( nchan_in == 8 ) /*3H1V*/ + { + nchan_hoa = 16; + } + + switch ( output_config ) + { + case AUDIO_CONFIG_MONO: + /* If stereo DMX, MONO = W = Cardioids L + R*/ + if ( nchan_in == 2 ) + { + for ( i = 0; i < output_frame; i++ ) + { + output_f[0][i] += output_f[1][i]; + } + } + /* else: do nothing, MONO = W*/ + break; + case AUDIO_CONFIG_STEREO: + assert( ( nchan_in >= 2 ) && "Number of input channels must be at least 2 (for W and Y)!\n" ); + + /* Compute L and R cardioids from SB format except if stereo DMX is transmitted already in this format*/ + if ( nchan_in > 2 ) + { + /*Build L/R cardioids*/ + for ( i = 0; i < output_frame; i++ ) + { + dmx_l = 0.5f * ( output_f[0][i] + output_f[1][i] ); /* cardioid_left = 0.5(W + Y) */ + output_f[1][i] = 0.5f * ( output_f[0][i] - output_f[1][i] ); /* cardioid_right = 0.5(W - Y) */ + output_f[0][i] = dmx_l; + } + } + break; + case AUDIO_CONFIG_5_1: + case AUDIO_CONFIG_7_1: + case AUDIO_CONFIG_5_1_2: + case AUDIO_CONFIG_5_1_4: + case AUDIO_CONFIG_7_1_4: + case AUDIO_CONFIG_LS_CUSTOM: + ivas_sba_mtx_mult( output_f, output_frame, nchan_hoa, output_setup, hoa_dec_mtx ); + break; + case AUDIO_CONFIG_FOA: /* Ambisonics output, order: 1 */ + case AUDIO_CONFIG_HOA2: /* Ambisonics output, order: 2 */ + case AUDIO_CONFIG_HOA3: /* Ambisonics output, order: 3 */ + for ( i = nchan_hoa; i < output_setup.nchan_out_woLFE; i++ ) + { + set_zero( output_f[i], output_frame ); + } + break; + default: + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: illegal output configuration, Exiting.\n" ); + } + + return error; +} + + +/*-------------------------------------------------------------------* + * ivas_sba_mix_matrix_determiner() + * + * Determine SBA mixing matrices + *-------------------------------------------------------------------*/ + +void ivas_sba_mix_matrix_determiner( + SPAR_DEC_HANDLE hSpar, /* i/o: SPAR decoder handle */ + float output[][L_FRAME48k], /* i/o: transport/output audio channels */ + const int16_t bfi, /* i : BFI flag */ + const int16_t nchan_remapped, /* i : num channels after remapping of TCs */ + const int16_t output_frame /* i : output frame length */ +) +{ + int16_t i, ch; + float temp; + int16_t num_bands_out, nchan_transport, nchan_out; + + /* Convert numeric range */ + for ( ch = 0; ch < nchan_remapped; ch++ ) + { + for ( i = 0; i < output_frame; i++ ) + { + temp = output[ch][i]; + temp = floorf( temp + 0.5f ); + + if ( temp > MAX16B_FLT ) + { + temp = MAX16B_FLT; + } + else if ( temp < ( -1.0f * PCM16_TO_FLT_FAC ) ) + { + temp = ( -1.0f * PCM16_TO_FLT_FAC ); + } + temp *= ( 1.0f / PCM16_TO_FLT_FAC ); + output[ch][i] = temp; + } + } + + /* AGC */ + nchan_transport = hSpar->hMdDec->spar_md_cfg.nchan_transport; + nchan_out = nchan_transport; + ivas_agc_dec_process( hSpar->hAgcDec, output, output, nchan_transport, output_frame ); + + /* Convert numeric range back */ + for ( ch = 0; ch < nchan_out; ch++ ) + { + for ( i = 0; i < output_frame; i++ ) + { + output[ch][i] = output[ch][i] * PCM16_TO_FLT_FAC; + } + } + + /* Mixing matrix determiner */ + num_bands_out = hSpar->hFbMixer->pFb->filterbank_num_bands; + ivas_spar_dec_gen_umx_mat( hSpar->hMdDec, nchan_transport, num_bands_out, bfi ); + + return; +} + + +#ifdef DEBUG_MODE_DIRAC +/*-----------------------------------------------------------------------* + * Debugging function + *-----------------------------------------------------------------------*/ + +static void debug_mode_dirac( + float output[MAX_OUTPUT_CHANNELS][L_FRAME48k], + const int16_t nchan_transport, + const int16_t output_frame ) +{ + int16_t i, n; + int16_t tmp[L_FRAME48k]; + char file_name[50] = { 0 }; + +#ifdef DEBUG_MODE_DIRAC_NOCORE + for ( n = 0; n < nchan_transport; n++ ) + { + sprintf( file_name, "./res/ivas_dirac_enc_%d.%d.pcm", n, (int16_t) ( output_frame * 0.05 ) ); + dbgread( tmp, sizeof( int16_t ), output_frame, file_name ); + for ( i = 0; i < output_frame; i++ ) + { + output[n][i] = (float) ( tmp[i] ); + } + } +#else + for ( n = 0; n < nchan_transport; n++ ) + { + for ( i = 0; i < output_frame; i++ ) + { + tmp[i] = (int16_t) ( output[n][i] + 0.5f ); + } + + sprintf( file_name, "./res/ivas_dirac_dec_%d.%d.pcm", n, (int16_t) ( output_frame * 0.05 ) ); + dbgwrite( tmp, sizeof( int16_t ), output_frame, 1, file_name ); + } +#endif + + return; +} +#endif diff --git a/lib_dec/ivas_sce_dec.c b/lib_dec/ivas_sce_dec.c old mode 100644 new mode 100755 index 97ee2e8336..9a940b9b6d --- a/lib_dec/ivas_sce_dec.c +++ b/lib_dec/ivas_sce_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* @@ -67,7 +67,7 @@ ivas_error ivas_sce_dec( error = IVAS_ERR_OK; - wmops_sub_start( "ivas_sce_dec" ); + push_wmops( "ivas_sce_dec" ); hSCE = st_ivas->hSCE[sce_id]; st = hSCE->hCoreCoder[0]; @@ -77,21 +77,37 @@ ivas_error ivas_sce_dec( ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate; last_ivas_total_brate = st_ivas->hDecoderConfig->last_ivas_total_brate; + if ( st_ivas->ivas_format == ISM_FORMAT ) + { + st->cng_type = FD_CNG; + } + /*------------------------------------------------------------------* * Read audio bandwidth info *-----------------------------------------------------------------*/ /* set total_brate - needed in DTX */ - if ( !st_ivas->bfi && ( ivas_total_brate == IVAS_SID_5k2 ) ) + if ( !st_ivas->bfi && ivas_total_brate == IVAS_SID_5k2 ) { st->total_brate = ivas_total_brate - nb_bits_metadata * FRAMES_PER_SEC; assert( st->total_brate == SID_2k40 && "SCE SID must be 2.4kbps!" ); + +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + if ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->hISMDTX.sce_id_dtx != sce_id ) + { + st->total_brate = FRAME_NO_DATA; + } +#endif } +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + else if ( !st_ivas->bfi && ivas_total_brate == FRAME_NO_DATA ) +#else else if ( !st_ivas->bfi && ivas_total_brate <= SID_2k40 ) +#endif { - st->total_brate = ivas_total_brate; + st->total_brate = FRAME_NO_DATA; } - else if ( !st_ivas->bfi && ( last_ivas_total_brate <= SID_2k40 || last_ivas_total_brate == IVAS_SID_5k2 ) ) + else if ( !st_ivas->bfi && st_ivas->ivas_format != ISM_FORMAT && last_ivas_total_brate <= IVAS_SID_5k2 ) { st->total_brate = hSCE->element_brate - nb_bits_metadata * FRAMES_PER_SEC; } @@ -105,7 +121,7 @@ ivas_error ivas_sce_dec( { if ( st->low_rate_mode ) { - /* ISm Low-rate mode -> always WB */ + /* ISM Low-rate mode -> always WB */ st->bwidth = WB; } else if ( hSCE->element_brate < MIN_BRATE_SWB_SCE ) @@ -161,11 +177,22 @@ ivas_error ivas_sce_dec( } /* set "total_brate" */ - if ( !st_ivas->bfi && ( ivas_total_brate == IVAS_SID_5k2 ) ) + if ( !st_ivas->bfi && ivas_total_brate == IVAS_SID_5k2 ) { st->total_brate = ivas_total_brate - nb_bits_metadata * FRAMES_PER_SEC; + +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + if ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->hISMDTX.sce_id_dtx != sce_id ) + { + st->total_brate = FRAME_NO_DATA; + } +#endif } +#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT + else if ( !st_ivas->bfi && ivas_total_brate == FRAME_NO_DATA ) +#else else if ( !st_ivas->bfi && ivas_total_brate <= SID_2k40 ) +#endif { st->total_brate = ivas_total_brate; } @@ -188,7 +215,6 @@ ivas_error ivas_sce_dec( st->flag_ACELP16k = set_ACELP_flag( IVAS_SCE, hSCE->element_brate, st->total_brate, 0, 0, -1, -1 ); } - /*TODO : check if is_SIDrate() can be used here*/ if ( is_DTXrate( ivas_total_brate ) ) { st->VAD = 0; @@ -215,12 +241,11 @@ ivas_error ivas_sce_dec( * Decoder *----------------------------------------------------------------*/ - if ( ( error = ivas_core_dec( NULL, hSCE, NULL, NULL, 1, output, outputHB, NULL, st_ivas->sba_dirac_stereo_flag ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_core_dec( st_ivas, hSCE, NULL, NULL, 1, output, outputHB, NULL, st_ivas->sba_dirac_stereo_flag ) ) != IVAS_ERR_OK ) { return error; } - if ( st_ivas->sba_dirac_stereo_flag && ( st->core_brate > SID_2k40 || st->cng_type == LP_CNG ) ) { /* skip addition of ACELP BWE for now, will be done after upmix */ @@ -285,7 +310,7 @@ ivas_error ivas_sce_dec( #endif - wmops_sub_end(); + pop_wmops(); return error; } @@ -314,7 +339,7 @@ ivas_error create_sce_dec( * Allocate SCE handle *-----------------------------------------------------------------*/ - if ( ( hSCE = (SCE_DEC_HANDLE) count_malloc( sizeof( SCE_DEC_DATA ) ) ) == NULL ) + if ( ( hSCE = (SCE_DEC_HANDLE) malloc( sizeof( SCE_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SCE\n" ) ); } @@ -332,7 +357,7 @@ ivas_error create_sce_dec( * Core Coder, 1 instance: allocate and initialize *-----------------------------------------------------------------*/ - if ( ( st = (DEC_CORE_HANDLE) count_malloc( sizeof( Decoder_State ) ) ) == NULL ) + if ( ( st = (DEC_CORE_HANDLE) malloc( sizeof( Decoder_State ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CoreCoder structure\n" ) ); } @@ -347,7 +372,7 @@ ivas_error create_sce_dec( return error; } - if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) + if ( st_ivas->ivas_format == SBA_FORMAT && ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO || ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO && st_ivas->nchan_transport == 1 ) ) ) { if ( ( error = openCldfb( &st->cldfbSynHB, CLDFB_SYNTHESIS, st->output_Fs, CLDFB_PROTOTYPE_1_25MS ) ) != IVAS_ERR_OK ) { @@ -362,7 +387,7 @@ ivas_error create_sce_dec( /* allocate and initialize "hTdCngDec" - needed in DTX */ if ( sce_id == 0 && st->hTdCngDec == NULL ) { - if ( ( st->hTdCngDec = (TD_CNG_DEC_HANDLE) count_malloc( sizeof( TD_CNG_DEC_DATA ) ) ) == NULL ) + if ( ( st->hTdCngDec = (TD_CNG_DEC_HANDLE) malloc( sizeof( TD_CNG_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DTX/TD CNG\n" ) ); } @@ -376,13 +401,13 @@ ivas_error create_sce_dec( if ( st_ivas->sba_dirac_stereo_flag ) { - if ( ( hSCE->save_synth = (float *) count_malloc( sizeof( float ) * output_frame ) ) == NULL ) + if ( ( hSCE->save_synth = (float *) malloc( sizeof( float ) * output_frame ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for stereo output\n" ) ); } set_zero( hSCE->save_synth, output_frame ); - if ( ( hSCE->save_hb_synth = (float *) count_malloc( sizeof( float ) * output_frame ) ) == NULL ) + if ( ( hSCE->save_hb_synth = (float *) malloc( sizeof( float ) * output_frame ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate HB memory for stereo output\n" ) ); } @@ -419,22 +444,22 @@ void destroy_sce_dec( { destroy_core_dec( st ); - count_free( st ); + free( st ); st = NULL; } if ( hSCE->save_synth != NULL ) { - count_free( hSCE->save_synth ); + free( hSCE->save_synth ); hSCE->save_synth = NULL; } if ( hSCE->save_hb_synth != NULL ) { - count_free( hSCE->save_hb_synth ); + free( hSCE->save_hb_synth ); hSCE->save_hb_synth = NULL; } - count_free( hSCE ); + free( hSCE ); return; } diff --git a/lib_dec/ivas_sns_dec.c b/lib_dec/ivas_sns_dec.c index 444a76cf80..6cf80ec0d1 100644 --- a/lib_dec/ivas_sns_dec.c +++ b/lib_dec/ivas_sns_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -35,7 +35,11 @@ #include "prot.h" #include "ivas_prot.h" #include "rom_com.h" -#include "wmops.h" +#ifdef SNS_MSVQ +#include "ivas_rom_com.h" +#include "ivas_cnst.h" +#endif +#include "wmc_auto.h" /*------------------------------------------------------------------- * sns_1st_dec() @@ -103,14 +107,22 @@ static void sns_2st_dec( *-------------------------------------------------------------------*/ void sns_avq_dec( - int16_t *index, /* i : Quantization indices */ - float *SNS_Q, /* o : Quantized SNS vectors */ + int16_t *index, /* i : Quantization indices */ +#ifdef SNS_MSVQ + float SNS_Q[NB_DIV][M], /* o : Quantized SNS vectors */ +#else + float *SNS_Q, /* o : Quantized SNS vectors */ +#endif const int16_t numlpc /* i : Number of sets of lpc */ ) { int16_t i, nbi, last; int16_t q_type; +#ifdef SNS_MSVQ + /* go from one-based indexing to zero-based indexing */ + last = numlpc - 1; +#else /* Last LPC index */ if ( numlpc == 1 ) { @@ -120,12 +132,18 @@ void sns_avq_dec( { last = M; } +#endif index++; /* Decode last LPC */ +#ifdef SNS_MSVQ + sns_1st_dec( *index++, SNS_Q[last] ); + sns_2st_dec( SNS_Q[last], index ); +#else sns_1st_dec( *index++, &SNS_Q[last] ); sns_2st_dec( &SNS_Q[last], index ); +#endif nbi = 2 + index[0] + index[1]; index += nbi; @@ -136,16 +154,29 @@ void sns_avq_dec( if ( q_type == 0 ) { +#ifdef SNS_MSVQ + sns_1st_dec( *index++, SNS_Q[0] ); + sns_2st_dec( SNS_Q[0], index ); +#else sns_1st_dec( *index++, &SNS_Q[0] ); sns_2st_dec( &SNS_Q[0], index ); +#endif } else if ( q_type == 1 ) { for ( i = 0; i < M; i++ ) { +#ifdef SNS_MSVQ + SNS_Q[0][i] = SNS_Q[0][M + i]; +#else SNS_Q[i] = SNS_Q[M + i]; +#endif } +#ifdef SNS_MSVQ + sns_2st_dec( SNS_Q[0], index ); +#else sns_2st_dec( &SNS_Q[0], index ); +#endif } } @@ -160,10 +191,10 @@ void sns_avq_dec( *-------------------------------------------------------------------*/ void sns_avq_dec_stereo( - int16_t *indexl, /* i : Quantization indices (left channel) */ - int16_t *indexr, /* i : Quantization indices (right channe) */ - float *SNS_Ql, /* o : Quantized SNS vectors (left channel) */ - float *SNS_Qr /* o : Quantized SNS vectors (right channe) */ + int16_t *indexl, /* i : Quantization indices (left channel) */ + int16_t *indexr, /* i : Quantization indices (right channe) */ + float *SNS_Ql, /* o : Quantized SNS vectors (left channel) */ + float *SNS_Qr /* o : Quantized SNS vectors (right channe) */ ) { int16_t i, stereo_mode; @@ -208,3 +239,92 @@ void sns_avq_dec_stereo( return; } + +#ifdef SNS_MSVQ +void dequantize_sns( + int16_t indices[CPE_CHANNELS][NPRM_LPC_NEW], + float snsQ_out[CPE_CHANNELS][NB_DIV][M], + Decoder_State **sts ) +{ + int16_t nSubframes, k, ch; + const float *means; + int16_t sns_stereo_mode[NB_DIV]; + int16_t zero_side_flag[NB_DIV]; + Decoder_State *st; + + sns_stereo_mode[0] = indices[0][0]; + sns_stereo_mode[1] = indices[0][1]; + zero_side_flag[0] = indices[0][2]; + zero_side_flag[1] = indices[0][3]; + + for ( ch = 0; ch < CPE_CHANNELS; ++ch ) + { + int16_t idxIndices; + + st = sts[ch]; + nSubframes = ( st->core == TCX_20_CORE ) ? 1 : NB_DIV; + idxIndices = 0; + + for ( k = 0; k < nSubframes; ++k ) + { + const int16_t is_side = ch == 1 && sns_stereo_mode[k] == SNS_STEREO_MODE_MS; + const float *const *cdbks = ( nSubframes == 1 ) ? ivas_sns_cdbks_tcx20 : ivas_sns_cdbks_tcx10; + int16_t nStages = ( ( nSubframes == 1 ) ? SNS_MSVQ_NSTAGES_TCX20 : SNS_MSVQ_NSTAGES_TCX10 ); + float *snsQ = snsQ_out[ch][k]; + + if ( is_side ) + { + const float *const *side_cdbks = ( st->core == TCX_20_CORE ) ? ivas_sns_cdbks_side_tcx20 : ivas_sns_cdbks_side_tcx10; + if ( zero_side_flag[k] ) + { + set_zero( snsQ, M ); + continue; + } + + nStages = SNS_MSVQ_NSTAGES_SIDE; + means = ( st->core == TCX_20_CORE ) ? ivas_sns_means_side_tcx20 : ivas_sns_means_side_tcx10; +#ifdef ERI_FDCNGVQ_LOW_ROM + msvq_dec( side_cdbks, NULL, NULL, nStages, M, M, &indices[ch][idxIndices + SNS_STEREO_MODE_OFFSET_INDICES], 0, NULL, snsQ, NULL ); +#else + msvq_dec( side_cdbks, NULL, NULL, nStages, M, M, &indices[ch][idxIndices + SNS_STEREO_MODE_OFFSET_INDICES], snsQ, NULL ); +#endif + + v_add( snsQ, means, snsQ, M ); + } + else + { +#ifdef ERI_FDCNGVQ_LOW_ROM + msvq_dec( cdbks, NULL, NULL, nStages, M, M, &indices[ch][idxIndices + SNS_STEREO_MODE_OFFSET_INDICES], 0, NULL, snsQ, NULL ); +#else + msvq_dec( cdbks, NULL, NULL, nStages, M, M, &indices[ch][idxIndices + SNS_STEREO_MODE_OFFSET_INDICES], snsQ, NULL ); +#endif + } + idxIndices += nStages; + } + } + + if ( sns_stereo_mode[0] == SNS_STEREO_MODE_MS || sns_stereo_mode[1] == SNS_STEREO_MODE_MS ) + { + nSubframes = ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV; + for ( k = 0; k < nSubframes; ++k ) + { + if ( sns_stereo_mode[k] == SNS_STEREO_MODE_MS ) + { + inverseMS( M, snsQ_out[0][k], snsQ_out[1][k], 1.f ); + } + } + } + + /* add means back */ + for ( ch = 0; ch < CPE_CHANNELS; ++ch ) + { + st = sts[ch]; + nSubframes = ( st->core == TCX_20_CORE ) ? 1 : NB_DIV; + means = ( st->core == TCX_20_CORE ) ? ivas_sns_means_tcx20 : ivas_sns_means_tcx10; + for ( k = 0; k < nSubframes; ++k ) + { + v_add( snsQ_out[ch][k], means, snsQ_out[ch][k], M ); + } + } +} +#endif // SNS_MSVQ diff --git a/lib_dec/ivas_spar_decoder.c b/lib_dec/ivas_spar_decoder.c index 678db72276..ea2da61151 100644 --- a/lib_dec/ivas_spar_decoder.c +++ b/lib_dec/ivas_spar_decoder.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,11 +39,15 @@ #include "prot.h" #include "string.h" #include "ivas_prot.h" +#include "ivas_prot_rend.h" #include "ivas_rom_com.h" +#ifdef LBR_ADAP_SMOOTHING +#include "ivas_rom_dec.h" +#endif #include "ivas_stat_com.h" #include #include -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* @@ -60,7 +64,8 @@ static void ivas_spar_dec_MD( Decoder_Struct *st_ivas, Decoder_State *st0 ); *------------------------------------------------------------------------*/ ivas_error ivas_spar_dec_open( - Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */ + Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */ + const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ ) { SPAR_DEC_HANDLE hSpar; @@ -73,23 +78,27 @@ ivas_error ivas_spar_dec_open( error = IVAS_ERR_OK; sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); num_channels_internal = ivas_sba_get_nchan_metadata( sba_order_internal ); + hSpar = st_ivas->hSpar; - /* SPAR decoder handle */ - if ( ( hSpar = (SPAR_DEC_HANDLE) count_malloc( sizeof( SPAR_DEC_DATA ) ) ) == NULL ) + if ( !spar_reconfig_flag ) { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR decoder" ); + /* SPAR decoder handle */ + if ( ( hSpar = (SPAR_DEC_HANDLE) malloc( sizeof( SPAR_DEC_DATA ) ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR decoder" ); + } } output_Fs = st_ivas->hDecoderConfig->output_Fs; /* TD decorr. */ - if ( ( error = ivas_spar_td_decorr_dec_open( &hSpar->hTdDecorr, output_Fs, num_channels_internal, 1 ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_td_decorr_dec_open( &hSpar->hTdDecorr, output_Fs, num_channels_internal, 1 ) ) != IVAS_ERR_OK ) { return error; } /* MD handle */ - if ( ( error = ivas_spar_md_dec_open( &hSpar->hMdDec, st_ivas->hDecoderConfig, num_channels_internal, sba_order_internal ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_spar_md_dec_open( &hSpar->hMdDec, st_ivas->hDecoderConfig, num_channels_internal, sba_order_internal, st_ivas->sid_format ) ) != IVAS_ERR_OK ) { return error; } @@ -106,7 +115,7 @@ ivas_error ivas_spar_dec_open( fb_cfg->remix_order = remix_order_set[hSpar->hMdDec->spar_md_cfg.remix_unmix_order]; /* FB mixer handle */ - if ( ( error = ivas_FB_mixer_open( &hSpar->hFbMixer, output_Fs, fb_cfg ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_FB_mixer_open( &hSpar->hFbMixer, output_Fs, fb_cfg, spar_reconfig_flag ) ) != IVAS_ERR_OK ) { return error; } @@ -121,7 +130,7 @@ ivas_error ivas_spar_dec_open( hSpar->hPCA = NULL; if ( st_ivas->hDecoderConfig->ivas_total_brate == PCA_BRATE && sba_order_internal == 1 ) { - if ( ( hSpar->hPCA = (PCA_DEC_STATE *) count_malloc( sizeof( PCA_DEC_STATE ) ) ) == NULL ) + if ( ( hSpar->hPCA = (PCA_DEC_STATE *) malloc( sizeof( PCA_DEC_STATE ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for PCA decoder" ); } @@ -180,33 +189,39 @@ ivas_error ivas_spar_dec_open( *------------------------------------------------------------------------*/ void ivas_spar_dec_close( - SPAR_DEC_HANDLE hSpar, /* i/o: SPAR decoder handle */ - const int32_t output_Fs /* i : output sampling rate */ + SPAR_DEC_HANDLE *hSpar, /* i/o: SPAR decoder handle */ + const int32_t output_Fs, /* i : output sampling rate */ + const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ ) { - if ( hSpar != NULL ) + if ( *hSpar == NULL || hSpar == NULL ) { - /* MD handle */ - ivas_spar_md_dec_close( &hSpar->hMdDec ); + return; + } - /* Covar. State handle */ - ivas_spar_td_decorr_dec_close( &hSpar->hTdDecorr ); + /* MD handle */ + ivas_spar_md_dec_close( &( *hSpar )->hMdDec ); - /* FB mixer handle */ - ivas_FB_mixer_close( &hSpar->hFbMixer, output_Fs ); + /* TD decorrelator handle */ + ivas_td_decorr_dec_close( &( *hSpar )->hTdDecorr ); - /* AGC */ - ivas_spar_agc_dec_close( &hSpar->hAgcDec ); + /* FB mixer handle */ + ivas_FB_mixer_close( &( *hSpar )->hFbMixer, output_Fs, spar_reconfig_flag ); - /* PCA */ - if ( hSpar->hPCA != NULL ) - { - count_free( hSpar->hPCA ); - hSpar->hPCA = NULL; - } + /* AGC */ + ivas_spar_agc_dec_close( &( *hSpar )->hAgcDec ); - count_free( hSpar ); - hSpar = NULL; + /* PCA */ + if ( ( *hSpar )->hPCA != NULL ) + { + free( ( *hSpar )->hPCA ); + ( *hSpar )->hPCA = NULL; + } + + if ( !spar_reconfig_flag ) + { + free( ( *hSpar ) ); + ( *hSpar ) = NULL; } return; @@ -231,7 +246,7 @@ ivas_error ivas_spar_dec( uint16_t bstr_meta[MAX_BITS_METADATA], *bit_stream_orig; ivas_error error; - wmops_sub_start( "ivas_spar_decode" ); + push_wmops( "ivas_spar_decode" ); error = IVAS_ERR_OK; hDecoderConfig = st_ivas->hDecoderConfig; @@ -273,7 +288,7 @@ ivas_error ivas_spar_dec( *nb_bits_read += zero_pad_bits; } - wmops_sub_end(); + pop_wmops(); return error; } @@ -626,7 +641,7 @@ static void ivas_spar_dec_MD( DECODER_CONFIG_HANDLE hDecoderConfig = st_ivas->hDecoderConfig; SPAR_DEC_HANDLE hSpar = st_ivas->hSpar; - wmops_sub_start( "ivas_spar_dec_MD" ); + push_wmops( "ivas_spar_dec_MD" ); /*---------------------------------------------------------------------* * Initialization @@ -711,7 +726,7 @@ static void ivas_spar_dec_MD( set_s( hSpar->hMdDec->valid_bands, 0, IVAS_MAX_NUM_BANDS ); } - wmops_sub_end(); + pop_wmops(); return; } @@ -794,18 +809,17 @@ void ivas_spar_get_parameters( weight = ivas_spar_get_cldfb_slot_gain( hSpar, hDecoderConfig, ts, &ts0, &ts1, &weight_20ms ); - split_band = hSpar->hMdDec->spar_md.num_bands; - + split_band = SPAR_DIRAC_SPLIT_START_BAND; for ( spar_band = 0; spar_band < num_spar_bands; spar_band++ ) { for ( out_ch = 0; out_ch < num_ch_out; out_ch++ ) { - for ( in_ch = 0; in_ch < num_ch_in; in_ch++ ) + if ( split_band < IVAS_MAX_NUM_BANDS + /* 20ms cross-fade for Transport channels in all frequency bands */ + && ( 0 == ivas_is_res_channel( out_ch, hSpar->hMdDec->spar_md_cfg.nchan_transport ) ) /* sub-frame processing for missing channels in all frequency bands*/ + ) { - if ( split_band < IVAS_MAX_NUM_BANDS - /* 20ms cross-fade for Transport channels in all frequency bands */ - && ( 0 == ivas_is_res_channel( out_ch, hSpar->hMdDec->spar_md_cfg.nchan_transport ) ) /* sub-frame processing for missing channels in all frequency bands*/ - ) + for ( in_ch = 0; in_ch < num_ch_in; in_ch++ ) { if ( hSpar->i_subframe > 3 ) { @@ -817,7 +831,10 @@ void ivas_spar_get_parameters( par_mat[out_ch][in_ch][spar_band] = hSpar->hMdDec->mixer_mat[out_ch][in_ch][spar_band]; } } - else + } + else + { + for ( in_ch = 0; in_ch < num_ch_in; in_ch++ ) { /* 20ms Transport channel reconstruction with matching encoder/decoder processing */ int16_t prev_idx = SPAR_DIRAC_SPLIT_START_BAND < IVAS_MAX_NUM_BANDS ? 1 : 0; /* if SPAR_DIRAC_SPLIT_START_BAND == IVAS_MAX_NUM_BANDS, then the sub-frame mixer_mat delay line is not active */ @@ -878,6 +895,87 @@ static void ivas_spar_get_skip_mat( } +#ifdef LBR_ADAP_SMOOTHING +static void ivas_spar_calc_smooth_facs( + float *cldfb_in_ts_re[CLDFB_NO_COL_MAX], + float *cldfb_in_ts_im[CLDFB_NO_COL_MAX], + int16_t nbands_spar, + ivas_fb_bin_to_band_data_t *bin2band, + float *smooth_fac, + float smooth_buf[IVAS_MAX_NUM_BANDS][2 * SBA_DIRAC_NRG_SMOOTH_LONG + 1] ) +{ + int16_t b, bin, i, ts; + float subframe_band_nrg[IVAS_MAX_NUM_BANDS]; + float smooth_long_avg[IVAS_MAX_NUM_BANDS]; + float smooth_short_avg[IVAS_MAX_NUM_BANDS]; + + bin = 0; + for ( b = 0; b < nbands_spar; b++ ) + { + if ( b > 0 && bin2band->p_cldfb_map_to_spar_band[bin] < bin2band->p_cldfb_map_to_spar_band[bin - 1] ) + { + break; + } + /* calculate band-wise subframe energies */ + subframe_band_nrg[b] = 0.f; + while ( b == bin2band->p_cldfb_map_to_spar_band[bin] ) + { + for ( ts = 0; ts < MAX_PARAM_SPATIAL_SUBFRAMES; ts++ ) + { + subframe_band_nrg[b] += cldfb_in_ts_re[ts][bin] * cldfb_in_ts_re[ts][bin] + cldfb_in_ts_im[ts][bin] * cldfb_in_ts_im[ts][bin]; + } + bin++; + } + subframe_band_nrg[b] = sqrtf( subframe_band_nrg[b] ); + smooth_buf[b][0] = subframe_band_nrg[b]; + + /* calculate short and long energy averages */ + smooth_short_avg[b] = EPSILON; + for ( i = 0; i < 2 * SBA_DIRAC_NRG_SMOOTH_SHORT; i++ ) + { + smooth_short_avg[b] += smooth_buf[b][i]; + } + + smooth_long_avg[b] = smooth_short_avg[b]; + for ( i = 2 * SBA_DIRAC_NRG_SMOOTH_SHORT; i < 2 * SBA_DIRAC_NRG_SMOOTH_LONG; i++ ) + { + smooth_long_avg[b] += smooth_buf[b][i]; + } + smooth_short_avg[b] /= ( 2 * SBA_DIRAC_NRG_SMOOTH_SHORT ); + smooth_long_avg[b] /= ( 2 * SBA_DIRAC_NRG_SMOOTH_LONG ); + + /* calculate smoothing factor based on energy averages */ + /* reduce factor for higher short-term energy */ + smooth_fac[b] = min( 1.f, smooth_long_avg[b] / smooth_short_avg[b] ); + /* map factor to range [0;1] */ + smooth_fac[b] = max( 0.f, smooth_fac[b] - (float) SBA_DIRAC_NRG_SMOOTH_SHORT / SBA_DIRAC_NRG_SMOOTH_LONG ) * ( (float) SBA_DIRAC_NRG_SMOOTH_LONG / ( SBA_DIRAC_NRG_SMOOTH_LONG - SBA_DIRAC_NRG_SMOOTH_SHORT ) ); + /* compress factor (higher compression in lowest bands) */ + if ( b < 2 ) + { + smooth_fac[b] = powf( smooth_fac[b], 0.25f ); + } + else + { + smooth_fac[b] = powf( smooth_fac[b], 0.5f ); + } + + /* apply upper bounds depending on band */ + smooth_fac[b] = max( min_smooth_gains1[b], min( max_smooth_gains2[b], smooth_fac[b] ) ); + } + + for ( b = 0; b < nbands_spar; b++ ) + { + for ( i = 2 * SBA_DIRAC_NRG_SMOOTH_LONG; i > 0; i-- ) + { + smooth_buf[b][i] = smooth_buf[b][i - 1]; + } + } + + return; +} +#endif + + /*-------------------------------------------------------------------* * ivas_spar_dec_upmixer() * @@ -905,7 +1003,7 @@ void ivas_spar_dec_upmixer( DECODER_CONFIG_HANDLE hDecoderConfig; SPAR_DEC_HANDLE hSpar; - wmops_sub_start( "ivas_spar_dec_upmixer" ); + push_wmops( "ivas_spar_dec_upmixer" ); hSpar = st_ivas->hSpar; hDecoderConfig = st_ivas->hDecoderConfig; @@ -1080,11 +1178,38 @@ void ivas_spar_dec_upmixer( } } +#ifdef LBR_ADAP_SMOOTHING + if ( ( hDecoderConfig->ivas_total_brate < IVAS_24k4 ) && ( ( hDecoderConfig->output_config == AUDIO_CONFIG_HOA2 ) || ( hDecoderConfig->output_config == AUDIO_CONFIG_HOA3 ) ) ) + { + for ( in_ch = 0; in_ch < numch_in; in_ch++ ) + { + ivas_spar_calc_smooth_facs( cldfb_in_ts_re[in_ch], cldfb_in_ts_im[in_ch], num_spar_bands, &hSpar->hFbMixer->pFb->fb_bin_to_band, hSpar->hMdDec->smooth_fac[in_ch], hSpar->hMdDec->smooth_buf[in_ch] ); + } + } +#endif + for ( ts = 0; ts < MAX_PARAM_SPATIAL_SUBFRAMES; ts++ ) { /* determine SPAR parameters for this time slots */ ivas_spar_get_parameters( hSpar, hDecoderConfig, ts + i_sf * MAX_PARAM_SPATIAL_SUBFRAMES, numch_out, numch_in, num_spar_bands, mixer_mat ); +#ifdef LBR_ADAP_SMOOTHING + if ( ( hDecoderConfig->ivas_total_brate < IVAS_24k4 ) && ( ( hDecoderConfig->output_config == AUDIO_CONFIG_HOA2 ) || ( hDecoderConfig->output_config == AUDIO_CONFIG_HOA3 ) ) ) + { + for ( spar_band = 0; spar_band < num_spar_bands; spar_band++ ) + { + for ( out_ch = 0; out_ch < numch_out; out_ch++ ) + { + for ( in_ch = 0; in_ch < numch_in; in_ch++ ) + { + mixer_mat[out_ch][in_ch][spar_band] = ( 1 - hSpar->hMdDec->smooth_fac[in_ch][spar_band] ) * mixer_mat[out_ch][in_ch][spar_band] + hSpar->hMdDec->smooth_fac[in_ch][spar_band] * hSpar->hMdDec->mixer_mat_prev2[out_ch][in_ch][spar_band]; + hSpar->hMdDec->mixer_mat_prev2[out_ch][in_ch][spar_band] = mixer_mat[out_ch][in_ch][spar_band]; + } + } + } + } +#endif + for ( cldfb_band = 0; cldfb_band < num_cldfb_bands; cldfb_band++ ) { float out_re[IVAS_SPAR_MAX_CH]; @@ -1227,7 +1352,7 @@ void ivas_spar_dec_upmixer( } } - wmops_sub_end(); + pop_wmops(); return; } diff --git a/lib_dec/ivas_spar_md_dec.c b/lib_dec/ivas_spar_md_dec.c index 4eed6b8ced..05b863ad96 100644 --- a/lib_dec/ivas_spar_md_dec.c +++ b/lib_dec/ivas_spar_md_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "ivas_prot.h" #include "ivas_rom_com.h" #include -#include "wmops.h" +#include "wmc_auto.h" #include "ivas_stat_dec.h" /*#define ENABLE_DITHER */ /* IVAS_fmToDo: development switch */ @@ -63,11 +63,27 @@ static const int16_t ivas_spar_dec_plc_spatial_target[IVAS_SPAR_MAX_CH] = { 1, 0 * Static functions declaration *------------------------------------------------------------------------------------------*/ -static void ivas_get_spar_matrices( ivas_spar_md_dec_state_t *hMdDec, const int16_t num_bands_out, const int16_t n_ts, const int16_t bw, const int16_t dtx_vad, const int16_t nB, const int16_t sba_order ); +static void ivas_get_spar_matrices( ivas_spar_md_dec_state_t *hMdDec, const int16_t num_bands_out, const int16_t n_ts, const int16_t bw, const int16_t dtx_vad, const int16_t nB, const int16_t sba_order +#ifdef LBR_SBA + , + const int16_t active_w_vlbr +#endif +); -static void ivas_decode_arith_bs( ivas_spar_md_dec_state_t *hMdDec, Decoder_State *st, const uint16_t qsi, const int16_t nB, const int16_t bands_bw, int16_t *pDo_diff, const int16_t freq_diff, const int16_t planarCP ); +static void ivas_decode_arith_bs( ivas_spar_md_dec_state_t *hMdDec, Decoder_State *st, const uint16_t qsi, const int16_t nB, const int16_t bands_bw, int16_t *pDo_diff, const int16_t freq_diff, const int16_t planarCP +#ifdef LBR_SBA + , + const int16_t strat, + const int32_t ivas_total_brate +#endif +); -static void ivas_decode_huffman_bs( ivas_spar_md_dec_state_t *hMdDec, Decoder_State *st, const uint16_t qsi, const int16_t nB, const int16_t bands_bw, const int16_t planarCP ); +static void ivas_decode_huffman_bs( ivas_spar_md_dec_state_t *hMdDec, Decoder_State *st, const uint16_t qsi, const int16_t nB, const int16_t bands_bw, const int16_t planarCP +#ifdef LBR_SBA_PLANAR + , + const int32_t ivas_total_brate +#endif +); static void ivas_fill_band_coeffs_idx( ivas_band_coeffs_ind_t *pBands_idx, const int16_t nB, int16_t *pSymbol_re, ivas_cell_dim_t *pCell_dims, ivas_coeffs_type_t coeff_type, const int16_t planarCP ); @@ -99,137 +115,137 @@ static ivas_error ivas_spar_md_dec_matrix_open( { int16_t i, j; - if ( ( hMdDec->spar_md.band_coeffs = (ivas_band_coeffs_t *) count_malloc( IVAS_MAX_NUM_BANDS * MAX_PARAM_SPATIAL_SUBFRAMES * sizeof( ivas_band_coeffs_t ) ) ) == NULL ) + if ( ( hMdDec->spar_md.band_coeffs = (ivas_band_coeffs_t *) malloc( IVAS_MAX_NUM_BANDS * MAX_PARAM_SPATIAL_SUBFRAMES * sizeof( ivas_band_coeffs_t ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for band_coeffs in SPAR MD" ); } - if ( ( hMdDec->mixer_mat = (float ***) count_malloc( num_channels * sizeof( float ** ) ) ) == NULL ) + if ( ( hMdDec->mixer_mat = (float ***) malloc( num_channels * sizeof( float ** ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } for ( i = 0; i < num_channels; i++ ) { - if ( ( hMdDec->mixer_mat[i] = (float **) count_malloc( num_channels * sizeof( float * ) ) ) == NULL ) + if ( ( hMdDec->mixer_mat[i] = (float **) malloc( num_channels * sizeof( float * ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } for ( j = 0; j < num_channels; j++ ) { - if ( ( hMdDec->mixer_mat[i][j] = (float *) count_malloc( MAX_PARAM_SPATIAL_SUBFRAMES * IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) + if ( ( hMdDec->mixer_mat[i][j] = (float *) malloc( MAX_PARAM_SPATIAL_SUBFRAMES * IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } } } - if ( ( hMdDec->spar_coeffs.C_re = (float ***) count_malloc( num_channels * sizeof( float ** ) ) ) == NULL ) + if ( ( hMdDec->spar_coeffs.C_re = (float ***) malloc( num_channels * sizeof( float ** ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } for ( i = 0; i < num_channels; i++ ) { - if ( ( hMdDec->spar_coeffs.C_re[i] = (float **) count_malloc( num_channels * sizeof( float * ) ) ) == NULL ) + if ( ( hMdDec->spar_coeffs.C_re[i] = (float **) malloc( num_channels * sizeof( float * ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } for ( j = 0; j < num_channels; j++ ) { - if ( ( hMdDec->spar_coeffs.C_re[i][j] = (float *) count_malloc( MAX_PARAM_SPATIAL_SUBFRAMES * IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) + if ( ( hMdDec->spar_coeffs.C_re[i][j] = (float *) malloc( MAX_PARAM_SPATIAL_SUBFRAMES * IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } } } - if ( ( hMdDec->spar_coeffs.P_re = (float ***) count_malloc( num_channels * sizeof( float ** ) ) ) == NULL ) + if ( ( hMdDec->spar_coeffs.P_re = (float ***) malloc( num_channels * sizeof( float ** ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } for ( i = 0; i < num_channels; i++ ) { - if ( ( hMdDec->spar_coeffs.P_re[i] = (float **) count_malloc( num_channels * sizeof( float * ) ) ) == NULL ) + if ( ( hMdDec->spar_coeffs.P_re[i] = (float **) malloc( num_channels * sizeof( float * ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } for ( j = 0; j < num_channels; j++ ) { - if ( ( hMdDec->spar_coeffs.P_re[i][j] = (float *) count_malloc( MAX_PARAM_SPATIAL_SUBFRAMES * IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) + if ( ( hMdDec->spar_coeffs.P_re[i][j] = (float *) malloc( MAX_PARAM_SPATIAL_SUBFRAMES * IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } } } - if ( ( hMdDec->spar_coeffs_prev.C_re = (float ***) count_malloc( num_channels * sizeof( float ** ) ) ) == NULL ) + if ( ( hMdDec->spar_coeffs_prev.C_re = (float ***) malloc( num_channels * sizeof( float ** ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } for ( i = 0; i < num_channels; i++ ) { - if ( ( hMdDec->spar_coeffs_prev.C_re[i] = (float **) count_malloc( num_channels * sizeof( float * ) ) ) == NULL ) + if ( ( hMdDec->spar_coeffs_prev.C_re[i] = (float **) malloc( num_channels * sizeof( float * ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } for ( j = 0; j < num_channels; j++ ) { - if ( ( hMdDec->spar_coeffs_prev.C_re[i][j] = (float *) count_malloc( IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) + if ( ( hMdDec->spar_coeffs_prev.C_re[i][j] = (float *) malloc( IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } } } - if ( ( hMdDec->spar_coeffs_prev.P_re = (float ***) count_malloc( num_channels * sizeof( float ** ) ) ) == NULL ) + if ( ( hMdDec->spar_coeffs_prev.P_re = (float ***) malloc( num_channels * sizeof( float ** ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } for ( i = 0; i < num_channels; i++ ) { - if ( ( hMdDec->spar_coeffs_prev.P_re[i] = (float **) count_malloc( num_channels * sizeof( float * ) ) ) == NULL ) + if ( ( hMdDec->spar_coeffs_prev.P_re[i] = (float **) malloc( num_channels * sizeof( float * ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } for ( j = 0; j < num_channels; j++ ) { - if ( ( hMdDec->spar_coeffs_prev.P_re[i][j] = (float *) count_malloc( IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) + if ( ( hMdDec->spar_coeffs_prev.P_re[i][j] = (float *) malloc( IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } } } - if ( ( hMdDec->spar_coeffs_tar.C_re = (float ***) count_malloc( num_channels * sizeof( float ** ) ) ) == NULL ) + if ( ( hMdDec->spar_coeffs_tar.C_re = (float ***) malloc( num_channels * sizeof( float ** ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } for ( i = 0; i < num_channels; i++ ) { - if ( ( hMdDec->spar_coeffs_tar.C_re[i] = (float **) count_malloc( num_channels * sizeof( float * ) ) ) == NULL ) + if ( ( hMdDec->spar_coeffs_tar.C_re[i] = (float **) malloc( num_channels * sizeof( float * ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } for ( j = 0; j < num_channels; j++ ) { - if ( ( hMdDec->spar_coeffs_tar.C_re[i][j] = (float *) count_malloc( IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) + if ( ( hMdDec->spar_coeffs_tar.C_re[i][j] = (float *) malloc( IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } } } - if ( ( hMdDec->spar_coeffs_tar.P_re = (float ***) count_malloc( num_channels * sizeof( float ** ) ) ) == NULL ) + if ( ( hMdDec->spar_coeffs_tar.P_re = (float ***) malloc( num_channels * sizeof( float ** ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } for ( i = 0; i < num_channels; i++ ) { - if ( ( hMdDec->spar_coeffs_tar.P_re[i] = (float **) count_malloc( num_channels * sizeof( float * ) ) ) == NULL ) + if ( ( hMdDec->spar_coeffs_tar.P_re[i] = (float **) malloc( num_channels * sizeof( float * ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } for ( j = 0; j < num_channels; j++ ) { - if ( ( hMdDec->spar_coeffs_tar.P_re[i][j] = (float *) count_malloc( IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) + if ( ( hMdDec->spar_coeffs_tar.P_re[i][j] = (float *) malloc( IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } @@ -247,10 +263,11 @@ static ivas_error ivas_spar_md_dec_matrix_open( *------------------------------------------------------------------------*/ ivas_error ivas_spar_md_dec_open( - ivas_spar_md_dec_state_t **hMdDec_out, /* i/o: SPAR MD decoder handle */ - const DECODER_CONFIG_HANDLE hDecoderConfig, /* i : configuration structure */ - const int16_t num_channels, /* i : number of internal channels */ - const int16_t sba_order /* i : SBA order */ + ivas_spar_md_dec_state_t **hMdDec_out, /* i/o: SPAR MD decoder handle */ + const DECODER_CONFIG_HANDLE hDecoderConfig, /* i : configuration structure */ + const int16_t num_channels, /* i : number of internal channels */ + const int16_t sba_order, /* i : SBA order */ + const int16_t sid_format /* i : SID format */ ) { ivas_spar_md_dec_state_t *hMdDec; @@ -258,7 +275,7 @@ ivas_error ivas_spar_md_dec_open( error = IVAS_ERR_OK; - if ( ( hMdDec = (ivas_spar_md_dec_state_t *) count_malloc( sizeof( ivas_spar_md_dec_state_t ) ) ) == NULL ) + if ( ( hMdDec = (ivas_spar_md_dec_state_t *) malloc( sizeof( ivas_spar_md_dec_state_t ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD decoder" ); } @@ -269,7 +286,10 @@ ivas_error ivas_spar_md_dec_open( } hMdDec->table_idx = 0; /* just to initialize state variables*/ - + if ( ( hDecoderConfig->ivas_total_brate == IVAS_SID_5k2 ) && ( sid_format == SID_SBA_2TC ) ) + { + hMdDec->table_idx = ivas_get_spar_table_idx( IVAS_48k, sba_order, SPAR_CONFIG_BW, NULL, NULL ); + } if ( ( error = ivas_spar_md_dec_init( hMdDec, hDecoderConfig, num_channels, sba_order ) ) != IVAS_ERR_OK ) { return error; @@ -296,20 +316,21 @@ static void ivas_spar_md_dec_matrix_close( if ( hMdDecoder->spar_md.band_coeffs != NULL ) { - count_free( hMdDecoder->spar_md.band_coeffs ); + free( hMdDecoder->spar_md.band_coeffs ); hMdDecoder->spar_md.band_coeffs = NULL; } + if ( hMdDecoder->mixer_mat != NULL ) { for ( i = 0; i < num_channels; i++ ) { for ( j = 0; j < num_channels; j++ ) { - count_free( hMdDecoder->mixer_mat[i][j] ); + free( hMdDecoder->mixer_mat[i][j] ); } - count_free( hMdDecoder->mixer_mat[i] ); + free( hMdDecoder->mixer_mat[i] ); } - count_free( hMdDecoder->mixer_mat ); + free( hMdDecoder->mixer_mat ); } if ( hMdDecoder->spar_coeffs.C_re != NULL ) @@ -318,11 +339,11 @@ static void ivas_spar_md_dec_matrix_close( { for ( j = 0; j < num_channels; j++ ) { - count_free( hMdDecoder->spar_coeffs.C_re[i][j] ); + free( hMdDecoder->spar_coeffs.C_re[i][j] ); } - count_free( hMdDecoder->spar_coeffs.C_re[i] ); + free( hMdDecoder->spar_coeffs.C_re[i] ); } - count_free( hMdDecoder->spar_coeffs.C_re ); + free( hMdDecoder->spar_coeffs.C_re ); } if ( hMdDecoder->spar_coeffs.P_re != NULL ) @@ -331,11 +352,11 @@ static void ivas_spar_md_dec_matrix_close( { for ( j = 0; j < num_channels; j++ ) { - count_free( hMdDecoder->spar_coeffs.P_re[i][j] ); + free( hMdDecoder->spar_coeffs.P_re[i][j] ); } - count_free( hMdDecoder->spar_coeffs.P_re[i] ); + free( hMdDecoder->spar_coeffs.P_re[i] ); } - count_free( hMdDecoder->spar_coeffs.P_re ); + free( hMdDecoder->spar_coeffs.P_re ); } if ( hMdDecoder->spar_coeffs_prev.C_re != NULL ) @@ -344,11 +365,11 @@ static void ivas_spar_md_dec_matrix_close( { for ( j = 0; j < num_channels; j++ ) { - count_free( hMdDecoder->spar_coeffs_prev.C_re[i][j] ); + free( hMdDecoder->spar_coeffs_prev.C_re[i][j] ); } - count_free( hMdDecoder->spar_coeffs_prev.C_re[i] ); + free( hMdDecoder->spar_coeffs_prev.C_re[i] ); } - count_free( hMdDecoder->spar_coeffs_prev.C_re ); + free( hMdDecoder->spar_coeffs_prev.C_re ); } if ( hMdDecoder->spar_coeffs_prev.P_re != NULL ) @@ -357,11 +378,11 @@ static void ivas_spar_md_dec_matrix_close( { for ( j = 0; j < num_channels; j++ ) { - count_free( hMdDecoder->spar_coeffs_prev.P_re[i][j] ); + free( hMdDecoder->spar_coeffs_prev.P_re[i][j] ); } - count_free( hMdDecoder->spar_coeffs_prev.P_re[i] ); + free( hMdDecoder->spar_coeffs_prev.P_re[i] ); } - count_free( hMdDecoder->spar_coeffs_prev.P_re ); + free( hMdDecoder->spar_coeffs_prev.P_re ); } if ( hMdDecoder->spar_coeffs_tar.C_re != NULL ) @@ -370,11 +391,11 @@ static void ivas_spar_md_dec_matrix_close( { for ( j = 0; j < num_channels; j++ ) { - count_free( hMdDecoder->spar_coeffs_tar.C_re[i][j] ); + free( hMdDecoder->spar_coeffs_tar.C_re[i][j] ); } - count_free( hMdDecoder->spar_coeffs_tar.C_re[i] ); + free( hMdDecoder->spar_coeffs_tar.C_re[i] ); } - count_free( hMdDecoder->spar_coeffs_tar.C_re ); + free( hMdDecoder->spar_coeffs_tar.C_re ); } if ( hMdDecoder->spar_coeffs_tar.P_re != NULL ) @@ -383,11 +404,11 @@ static void ivas_spar_md_dec_matrix_close( { for ( j = 0; j < num_channels; j++ ) { - count_free( hMdDecoder->spar_coeffs_tar.P_re[i][j] ); + free( hMdDecoder->spar_coeffs_tar.P_re[i][j] ); } - count_free( hMdDecoder->spar_coeffs_tar.P_re[i] ); + free( hMdDecoder->spar_coeffs_tar.P_re[i] ); } - count_free( hMdDecoder->spar_coeffs_tar.P_re ); + free( hMdDecoder->spar_coeffs_tar.P_re ); } return; @@ -412,11 +433,8 @@ void ivas_spar_md_dec_close( ivas_spar_md_dec_matrix_close( hMdDecoder, num_channels ); - if ( *hMdDec != NULL ) - { - count_free( *hMdDec ); - *hMdDec = NULL; - } + free( *hMdDec ); + *hMdDec = NULL; return; } @@ -532,6 +550,27 @@ ivas_error ivas_spar_md_dec_init( set_f( hMdDec->spar_md.en_ratio_slow, 0.0f, IVAS_MAX_NUM_BANDS ); set_f( hMdDec->spar_md.ref_pow_slow, 0.0f, IVAS_MAX_NUM_BANDS ); +#ifdef LBR_ADAP_SMOOTHING + for ( i = 0; i < IVAS_SPAR_MAX_CH; i++ ) + { + set_zero( hMdDec->smooth_fac[i], IVAS_MAX_NUM_BANDS ); + } + for ( i = 0; i < IVAS_SPAR_MAX_CH; i++ ) + { + for ( j = 0; j < IVAS_MAX_NUM_BANDS; j++ ) + { + set_zero( hMdDec->smooth_buf[i][j], 2 * SBA_DIRAC_NRG_SMOOTH_LONG + 1 ); + } + } + for ( i = 0; i < IVAS_SPAR_MAX_CH; i++ ) + { + for ( j = 0; j < IVAS_SPAR_MAX_CH; j++ ) + { + set_zero( hMdDec->mixer_mat_prev2[i][j], IVAS_MAX_NUM_BANDS ); + } + } +#endif + return IVAS_ERR_OK; } @@ -616,11 +655,14 @@ void ivas_spar_md_dec_process( ivas_spar_md_dec_state_t *hMdDec; hMdDec = st_ivas->hSpar->hMdDec; - +#ifdef LBR_SBA + int16_t active_w_vlbr; + active_w_vlbr = ( st_ivas->hDecoderConfig->ivas_total_brate < IVAS_24k4 ) ? 1 : 0; +#endif ivas_spar_dec_parse_md_bs( hMdDec, st0, &nB, &bw, &dtx_vad, st_ivas->hDecoderConfig->ivas_total_brate, ivas_spar_br_table_consts[hMdDec->table_idx].usePlanarCoeff, st_ivas->hQMetaData->sba_inactive_mode ); -#ifdef DEBUG_SBA_MD_DUMP +#if 0 { char f_name[100]; int16_t num_bands = nB; @@ -667,9 +709,103 @@ void ivas_spar_md_dec_process( } } #endif +#ifdef DEBUG_LBR_SBA + /* Dumping SPAR HOA Coefficients */ + /*char f_name[100]; + int16_t nbands = 12; + int16_t num_subframes = 1; + int16_t num_elements = 7; + int16_t num_block_group = 1; + int16_t byte_size = sizeof( float ); + sprintf( f_name, "SBA_MD_values_dec_PR.bin" ); + ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false; + + for ( b = 0; b < nbands; b++ ) + { + for ( int16_t sf = 0; sf < num_subframes; sf++ ) + { + for ( int16_t bl = 0; bl < num_block_group; bl++ ) + { + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[0], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[1], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[2], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[3], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[4], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[5], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[6], byte_size, 1, 1, f_name ); + // fprintf(stdout, "%f\t%f\t%f\t%d\t%d\n", dirac_md_kbps, spar_md_kbps, sba_md_kbps, qsi, code_strat ); + } + } + } + nbands = 12; // 6 total, just looking at SPAR + num_subframes = 1; + num_elements = 12; + num_block_group = 1; + byte_size = sizeof( float ); + + sprintf( f_name, "SBA_MD_values_dec_C.bin" ); + ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false; + + for ( b = 0; b < nbands; b++ ) + { + for ( int16_t sf = 0; sf < num_subframes; sf++ ) + { + for ( int16_t bl = 0; bl < num_block_group; bl++ ) + { + for ( int16_t p = 0; p < 4; p++ ) + { + for ( int16_t r = 0; r < 3; r++ ) + { + dbgwrite( &hMdDec->spar_md.band_coeffs[b].C_re[p][r], byte_size, 1, 1, f_name ); + } + } + } + } + } + nbands = 12; // 6 total, just looking at SPAR + num_subframes = 1; + num_elements = 4; + num_block_group = 1; + byte_size = sizeof( float ); + + sprintf( f_name, "SBA_MD_values_dec_P.bin" ); + ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false; + + for ( b = 0; b < nbands; b++ ) + { + for ( int16_t sf = 0; sf < num_subframes; sf++ ) + { + for ( int16_t bl = 0; bl < num_block_group; bl++ ) + { + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[0], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[1], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[2], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[3], byte_size, 1, 1, f_name ); + // fprintf(stdout, "%f\t%f\t%f\t%d\t%d\n", dirac_md_kbps, spar_md_kbps, sba_md_kbps, qsi, code_strat ); + } + } + }*/ +#endif /* SPAR to DirAC conversion */ - ivas_spar_to_dirac( st_ivas, hMdDec, dtx_vad, num_bands_out ); + ivas_spar_to_dirac( st_ivas, hMdDec, dtx_vad, num_bands_out +#ifdef LBR_SBA + , + bw +#endif + ); /* set correct number of bands*/ nB = IVAS_MAX_NUM_BANDS; @@ -677,7 +813,129 @@ void ivas_spar_md_dec_process( { nB = nB >> 1; } +#ifdef DEBUG_LBR_SBA + /* Dumping SPAR Coefficients */ + char f_name[100]; + int16_t nbands = 4; // 6 total, just looking at SPAR + int16_t num_subframes = 1; + int16_t num_elements = 6; + int16_t num_block_group = 1; + int16_t byte_size = sizeof( float ); + + sprintf( f_name, "SBA_MD_values_dec.bin" ); + ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false; + + for ( b = 0; b < nbands; b++ ) + { + for ( int16_t sf = 0; sf < num_subframes; sf++ ) + { + for ( int16_t bl = 0; bl < num_block_group; bl++ ) + { + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[0], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[1], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[2], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[0], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[1], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[2], byte_size, 1, 1, f_name ); + // fprintf(stdout, "%f\t%f\t%f\t%d\t%d\n", dirac_md_kbps, spar_md_kbps, sba_md_kbps, qsi, code_strat ); + } + } + } +#endif +#ifdef DEBUG_LBR_SBA + /* Dumping SPAR HOA Coefficients */ + /*char f_name[100]; + int16_t nbands = 12; + int16_t num_subframes = 1; + int16_t num_elements = 7; + int16_t num_block_group = 1; + int16_t byte_size = sizeof( float ); + sprintf( f_name, "SBA_MD_values_dec_PR.bin" ); + ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false; + + for ( b = 0; b < nbands; b++ ) + { + for ( int16_t sf = 0; sf < num_subframes; sf++ ) + { + for ( int16_t bl = 0; bl < num_block_group; bl++ ) + { + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[0], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[1], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[2], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[3], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[4], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[5], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[6], byte_size, 1, 1, f_name ); + // fprintf(stdout, "%f\t%f\t%f\t%d\t%d\n", dirac_md_kbps, spar_md_kbps, sba_md_kbps, qsi, code_strat ); + } + } + } + nbands = 12; // 6 total, just looking at SPAR + num_subframes = 1; + num_elements = 12; + num_block_group = 1; + byte_size = sizeof( float ); + + sprintf( f_name, "SBA_MD_values_dec_C.bin" ); + ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false; + + for ( b = 0; b < nbands; b++ ) + { + for ( int16_t sf = 0; sf < num_subframes; sf++ ) + { + for ( int16_t bl = 0; bl < num_block_group; bl++ ) + { + for ( int16_t p = 0; p < 4; p++ ) + { + for ( int16_t r = 0; r < 3; r++ ) + { + dbgwrite( &hMdDec->spar_md.band_coeffs[b].C_re[p][r], byte_size, 1, 1, f_name ); + } + } + } + } + } + nbands = 12; // 6 total, just looking at SPAR + num_subframes = 1; + num_elements = 4; + num_block_group = 1; + byte_size = sizeof( float ); + + sprintf( f_name, "SBA_MD_values_dec_P.bin" ); + ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false; + + for ( b = 0; b < nbands; b++ ) + { + for ( int16_t sf = 0; sf < num_subframes; sf++ ) + { + for ( int16_t bl = 0; bl < num_block_group; bl++ ) + { + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[0], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[1], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[2], byte_size, 1, 1, f_name ); + dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[3], byte_size, 1, 1, f_name ); + // fprintf(stdout, "%f\t%f\t%f\t%d\t%d\n", dirac_md_kbps, spar_md_kbps, sba_md_kbps, qsi, code_strat ); + } + } + }*/ +#endif /* expand DirAC MD to all time slots */ for ( i_ts = 1; i_ts < MAX_PARAM_SPATIAL_SUBFRAMES; i_ts++ ) { @@ -703,7 +961,12 @@ void ivas_spar_md_dec_process( } } - ivas_get_spar_matrices( hMdDec, num_bands_out, MAX_PARAM_SPATIAL_SUBFRAMES, bw, dtx_vad, nB, sba_order ); + ivas_get_spar_matrices( hMdDec, num_bands_out, MAX_PARAM_SPATIAL_SUBFRAMES, bw, dtx_vad, nB, sba_order +#ifdef LBR_SBA + , + active_w_vlbr +#endif + ); #ifdef DEBUG_SPAR_DIRAC_WRITE_OUT_PRED_PARS { @@ -716,7 +979,12 @@ void ivas_spar_md_dec_process( fprintf( fid, "%.6f\n", hMdDec->mixer_mat[1][0][band] ); } #endif - +#ifdef LBR_SBA + if ( bw == IVAS_RED_BAND_FACT ) + { + nB = nB << 1; + } +#endif for ( b = nB; b < num_bands_out; b++ ) { hMdDec->valid_bands[b] = 1; @@ -948,7 +1216,12 @@ static void ivas_get_spar_matrices( const int16_t bw, const int16_t dtx_vad, const int16_t nB, - const int16_t sba_order ) + const int16_t sba_order +#ifdef LBR_SBA + , + const int16_t active_w_vlbr +#endif +) { int16_t numch_out, num_bands, dmx_ch, split_band; int16_t i, j, k, m, b, i_ts, active_w; @@ -990,10 +1263,18 @@ static void ivas_get_spar_matrices( } }*/ #endif - +#ifdef LBR_SBA + if ( bw == IVAS_RED_BAND_FACT ) + { + num_bands = num_bands >> 1; + } +#endif active_w = hMdDec->spar_md_cfg.active_w; +#ifdef LBR_SBA + active_w_dm_fac = ( dtx_vad == 0 ) ? IVAS_ACTIVEW_DM_F_SCALE_DTX : ( ( active_w_vlbr ) ? IVAS_ACTIVEW_DM_F_SCALE_VLBR : IVAS_ACTIVEW_DM_F_SCALE ); +#else active_w_dm_fac = ( dtx_vad == 0 ) ? IVAS_ACTIVEW_DM_F_SCALE_DTX : IVAS_ACTIVEW_DM_F_SCALE; - +#endif for ( i_ts = 0; i_ts < n_ts; i_ts++ ) { for ( i = 0; i < numch_out; i++ ) @@ -1004,12 +1285,12 @@ static void ivas_get_spar_matrices( set_zero( &hMdDec->spar_coeffs.P_re[i][j][i_ts * IVAS_MAX_NUM_BANDS], IVAS_MAX_NUM_BANDS ); } } - +#ifndef LBR_SBA if ( bw == IVAS_RED_BAND_FACT ) { num_bands = num_bands >> 1; } - +#endif num_bands = min( num_bands, nB ); for ( b = 0; b < num_bands; b++ ) @@ -1435,6 +1716,9 @@ static void ivas_spar_dec_parse_md_bs( int16_t do_diff[IVAS_MAX_NUM_BANDS]; int16_t planarCP; float quant[IVAS_SPAR_MAX_C_COEFF]; +#ifdef LBR_SBA + int16_t do_repeat[IVAS_MAX_NUM_BANDS]; +#endif *dtx_vad = 1; *bands_bw = 1; @@ -1557,6 +1841,9 @@ static void ivas_spar_dec_parse_md_bs( for ( i = 0; i < *nB; i++ ) { do_diff[i] = 0; +#ifdef LBR_SBA + do_repeat[i] = 0; +#endif } } else if ( strat < 4 ) @@ -1566,10 +1853,39 @@ static void ivas_spar_dec_parse_md_bs( for ( i = 0; i < *nB; i++ ) { do_diff[i] = 0; +#ifdef LBR_SBA + do_repeat[i] = 0; +#endif } no_ec = 1; } else +#ifdef LBR_SBA + if ( ivas_total_brate < IVAS_24k4 ) + { + *bands_bw = 2; + *nB = num_bands / *bands_bw; + + for ( i = 0; i < *nB; i++ ) + { + do_diff[i] = 0; + do_repeat[i] = ( ( strat % 2 ) == ( ( i + 1 ) % 2 ) ); + } + } + else + { + *bands_bw = 1; + *nB = num_bands; + + for ( i = 0; i < *nB; i++ ) + { + do_diff[i] = ( ( ( i + 1 ) & 3 ) != strat - 4 ); + do_repeat[i] = 0; + } + + ivas_map_prior_coeffs_quant( &hMdDec->spar_md_prev, &hMdDec->spar_md_cfg, qsi, *nB ); + } +#else { *bands_bw = 1; *nB = num_bands; @@ -1581,6 +1897,7 @@ static void ivas_spar_dec_parse_md_bs( ivas_map_prior_coeffs_quant( &hMdDec->spar_md_prev, &hMdDec->spar_md_cfg, qsi, *nB ); } +#endif #ifdef SPAR_HOA_DBG fprintf( stdout, "\n\n no_ec = %d, strat = %d\n", no_ec, strat ); #endif @@ -1588,11 +1905,21 @@ static void ivas_spar_dec_parse_md_bs( if ( no_ec == 0 ) { - ivas_decode_arith_bs( hMdDec, st0, qsi, *nB, *bands_bw, do_diff, freq_diff, planarCP ); + ivas_decode_arith_bs( hMdDec, st0, qsi, *nB, *bands_bw, do_diff, freq_diff, planarCP +#ifdef LBR_SBA + , + strat, ivas_total_brate +#endif + ); } else { - ivas_decode_huffman_bs( hMdDec, st0, qsi, *nB, *bands_bw, planarCP ); + ivas_decode_huffman_bs( hMdDec, st0, qsi, *nB, *bands_bw, planarCP +#ifdef LBR_SBA_PLANAR + , + ivas_total_brate +#endif + ); } for ( i = 0; i < *nB; i++ ) @@ -1639,9 +1966,16 @@ static void ivas_spar_dec_parse_md_bs( { hMdDec->spar_md_prev.band_coeffs_idx[i].decd_index_re[j] = hMdDec->spar_md.band_coeffs_idx[i].decd_index_re[j]; } +#ifdef LBR_SBA + hMdDec->valid_bands[*bands_bw * i] |= ( do_diff[i] == 0 && do_repeat[i] == 0 ) ? 1 : 0; + for ( j = 1; j < *bands_bw; j++ ) + { + hMdDec->valid_bands[*bands_bw * i + j] = hMdDec->valid_bands[*bands_bw * i]; + } +#else hMdDec->valid_bands[i] |= ( do_diff[i] == 0 ) ? 1 : 0; +#endif } - #ifdef SPAR_HOA_DBG int16_t b; b = 0; @@ -1732,7 +2066,13 @@ static void ivas_decode_arith_bs( const int16_t bands_bw, int16_t *pDo_diff, const int16_t freq_diff, - const int16_t planarCP ) + const int16_t planarCP +#ifdef LBR_SBA + , + const int16_t strat, + const int32_t ivas_total_brate +#endif +) { int16_t i, j, ndm, ndec; ivas_cell_dim_t pred_cell_dims[IVAS_MAX_NUM_BANDS]; @@ -1747,22 +2087,46 @@ static void ivas_decode_arith_bs( { ndm = hMdDec->spar_md_cfg.num_dmx_chans_per_band[bands_bw * i]; ndec = hMdDec->spar_md_cfg.num_decorr_per_band[bands_bw * i]; - - pred_cell_dims[i].dim1 = ndm + ndec - 1; - if ( hMdDec->spar_hoa_md_flag ) +#ifdef LBR_SBA + if ( ( ivas_total_brate < IVAS_24k4 ) && ( strat > 3 ) && ( ( ( i % 2 == 1 ) && ( strat % 2 == 0 ) ) || ( ( i % 2 == 0 ) && ( strat % 2 == 1 ) ) ) ) + { + pred_cell_dims[i].dim1 = 0; + pred_cell_dims[i].dim2 = 0; + drct_cell_dims[i].dim1 = 0; + drct_cell_dims[i].dim2 = 0; + decd_cell_dims[i].dim1 = 0; + decd_cell_dims[i].dim2 = 0; + decx_cell_dims[i].dim1 = 0; + decx_cell_dims[i].dim2 = 0; + } + else { - if ( i >= SPAR_DIRAC_SPLIT_START_BAND ) +#endif + pred_cell_dims[i].dim1 = ndm + ndec - 1; + if ( hMdDec->spar_hoa_md_flag ) { - pred_cell_dims[i].dim1 -= ( FOA_CHANNELS - 1 ); + if ( i >= SPAR_DIRAC_SPLIT_START_BAND ) + { + pred_cell_dims[i].dim1 -= ( FOA_CHANNELS - 1 ); + } } + pred_cell_dims[i].dim2 = 1; + drct_cell_dims[i].dim1 = ndec; + drct_cell_dims[i].dim2 = ndm - 1; + decd_cell_dims[i].dim1 = ndec; + decd_cell_dims[i].dim2 = 1; + decx_cell_dims[i].dim1 = ( ndec * ( ndec - 1 ) ) >> 1; + decx_cell_dims[i].dim2 = 1; +#ifdef LBR_SBA_PLANAR + if ( ivas_total_brate < IVAS_24k4 ) + { + pred_cell_dims[i].dim1 -= 1; + decd_cell_dims[i].dim1 -= 1; + } +#endif +#ifdef LBR_SBA } - pred_cell_dims[i].dim2 = 1; - drct_cell_dims[i].dim1 = ndec; - drct_cell_dims[i].dim2 = ndm - 1; - decd_cell_dims[i].dim1 = ndec; - decd_cell_dims[i].dim2 = 1; - decx_cell_dims[i].dim1 = ( ndec * ( ndec - 1 ) ) >> 1; - decx_cell_dims[i].dim2 = 1; +#endif } any_diff = 0; @@ -1871,7 +2235,20 @@ static void ivas_decode_arith_bs( ivas_get_band_idx_from_differential( &hMdDec->spar_md, hMdDec->spar_md_cfg.quant_strat->P_r.q_levels, 1, nB, DECD_COEFF ); ivas_get_band_idx_from_differential( &hMdDec->spar_md, hMdDec->spar_md_cfg.quant_strat->P_c.q_levels, 0, nB, DECX_COEFF ); } - +#ifdef LBR_SBA_PLANAR + if ( ivas_total_brate < IVAS_24k4 ) + { + for ( i = 0; i < nB; i++ ) /* restore X PR index, force Z PR, P indices to be zero.*/ + { + if ( ( strat < 3 ) || ( ( strat > 3 ) && ( ( ( i % 2 == 0 ) && ( strat % 2 == 0 ) ) || ( ( i % 2 == 1 ) && ( strat % 2 == 1 ) ) ) ) ) + { + hMdDec->spar_md.band_coeffs_idx[i].pred_index_re[2] = hMdDec->spar_md.band_coeffs_idx[i].pred_index_re[1]; + hMdDec->spar_md.band_coeffs_idx[i].pred_index_re[1] = 0; + } + hMdDec->spar_md.band_coeffs_idx[i].decd_index_re[2] = 0; /* shouldn't be needed */ + } + } +#endif return; } @@ -2050,7 +2427,12 @@ static void ivas_decode_huffman_bs( const uint16_t qsi, const int16_t nB, const int16_t bands_bw, - const int16_t planarCP ) + const int16_t planarCP +#ifdef LBR_SBA_PLANAR + , + const int32_t ivas_total_brate +#endif +) { int16_t i, j; int16_t ndm, ndec; @@ -2075,7 +2457,19 @@ static void ivas_decode_huffman_bs( for ( j = pred_offset; j < pred_dim; j++ ) { - ivas_huffman_decode( &hMdDec->huff_coeffs.pred_huff_re[qsi], st0, &hMdDec->spar_md.band_coeffs_idx[i].pred_index_re[j] ); +#ifdef LBR_SBA_PLANAR + if ( ( j == 1 ) && ( ivas_total_brate < IVAS_24k4 ) ) + { + hMdDec->spar_md.band_coeffs_idx[i].pred_index_re[j] = 0; + } + else + { +#endif + ivas_huffman_decode( &hMdDec->huff_coeffs.pred_huff_re[qsi], st0, + &hMdDec->spar_md.band_coeffs_idx[i].pred_index_re[j] ); +#ifdef LBR_SBA_PLANAR + } +#endif } if ( hMdDec->spar_hoa_md_flag ) @@ -2091,7 +2485,11 @@ static void ivas_decode_huffman_bs( for ( j = 0; j < drct_dim; j++ ) { +#ifdef LBR_SBA_PLANAR + if ( ( planarCP && !keep_planar[(int16_t) floor( j / ( ndm - 1 ) )] ) || ( ( j == 2 ) && ( ivas_total_brate < IVAS_24k4 ) ) ) +#else if ( planarCP && !keep_planar[(int16_t) floor( j / ( ndm - 1 ) )] ) +#endif { hMdDec->spar_md.band_coeffs_idx[i].drct_index_re[j] = 0; } @@ -2527,6 +2925,10 @@ void ivas_spar_to_dirac( ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */ const int16_t dtx_vad, /* i : DTX frame flag */ const int16_t num_bands_out /* i : number of output bands */ +#ifdef LBR_SBA + , + const int16_t bw /* i : band joining factor */ +#endif ) { DIRAC_DEC_HANDLE hDirAC; @@ -2555,12 +2957,21 @@ void ivas_spar_to_dirac( sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); start_band = 0; +#ifdef LBR_SBA + end_band = min( num_bands_out, SPAR_DIRAC_SPLIT_START_BAND ) / bw; + + hDirAC = st_ivas->hDirAC; + dirac_to_spar_md_bands = st_ivas->hSpar->dirac_to_spar_md_bands; + enc_param_start_band = st_ivas->hSpar->enc_param_start_band / bw; + int16_t active_w_vlbr; + active_w_vlbr = ( st_ivas->hDecoderConfig->ivas_total_brate < IVAS_24k4 ) ? 1 : 0; +#else end_band = min( num_bands_out, SPAR_DIRAC_SPLIT_START_BAND ); hDirAC = st_ivas->hDirAC; dirac_to_spar_md_bands = st_ivas->hSpar->dirac_to_spar_md_bands; enc_param_start_band = st_ivas->hSpar->enc_param_start_band; - +#endif if ( hDirAC != NULL ) { band_grouping = hDirAC->band_grouping; @@ -2608,7 +3019,11 @@ void ivas_spar_to_dirac( } else { +#ifdef LBR_SBA + f_scale = ( active_w_vlbr ) ? IVAS_ACTIVEW_DM_F_SCALE_VLBR : IVAS_ACTIVEW_DM_F_SCALE; +#else f_scale = IVAS_ACTIVEW_DM_F_SCALE; +#endif } } else @@ -2716,13 +3131,28 @@ void ivas_spar_to_dirac( } /*read DirAC metadata, convert DirAC to SPAR*/ +#ifdef LBR_SBA + for ( ; band < num_bands_out / bw; band++ ) +#else for ( ; band < num_bands_out; band++ ) +#endif { int16_t dirac_band_idx; dirac_band_idx = dirac_to_spar_md_bands[band] - enc_param_start_band; +#ifdef LBR_SBA + int16_t num_subframes; + num_subframes = MAX_PARAM_SPATIAL_SUBFRAMES; + if ( st_ivas->hQMetaData->useLowerRes ) + { + num_subframes = 1; + } + + for ( block = 0; block < num_subframes; block++ ) +#else for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; block++ ) +#endif { if ( st_ivas->hQMetaData->q_direction->band_data[dirac_band_idx].azimuth[block] < 0.f ) { @@ -2738,7 +3168,12 @@ void ivas_spar_to_dirac( /* DirAC MD averaged over 4 subframes and converted to SPAR format similar to encoder processing */ if ( hMdDec->spar_md_cfg.nchan_transport > 1 ) { - ivas_get_spar_md_from_dirac( azi_dirac, ele_dirac, diffuseness, 1, NULL, &hMdDec->spar_md, &hMdDec->spar_md_cfg, end_band, num_bands_out, ( hMdDec->spar_hoa_md_flag ) ? 1 : sba_order_internal, dtx_vad, NULL ); + ivas_get_spar_md_from_dirac( azi_dirac, ele_dirac, diffuseness, 1, NULL, &hMdDec->spar_md, &hMdDec->spar_md_cfg, end_band, num_bands_out, ( hMdDec->spar_hoa_md_flag ) ? 1 : sba_order_internal, dtx_vad, NULL +#ifdef LBR_SBA + , + st_ivas->hQMetaData->useLowerRes, active_w_vlbr +#endif + ); /* temporarily copy frame-wise prediction coefficients in DirAC bands*/ for ( pred_idx = 0; pred_idx < FOA_CHANNELS - 1; pred_idx++ ) @@ -2749,9 +3184,36 @@ void ivas_spar_to_dirac( } } } +#ifdef LBR_SBA + int16_t num_subframes; + num_subframes = MAX_PARAM_SPATIAL_SUBFRAMES; + if ( st_ivas->hQMetaData->useLowerRes ) + { + num_subframes = 1; + } + ivas_get_spar_md_from_dirac( azi_dirac, ele_dirac, diffuseness, num_subframes, NULL, &hMdDec->spar_md, &hMdDec->spar_md_cfg, + end_band, num_bands_out / bw, ( hMdDec->spar_hoa_md_flag ) ? 1 : sba_order_internal, dtx_vad, NULL, st_ivas->hQMetaData->useLowerRes, active_w_vlbr ); + if ( st_ivas->hQMetaData->useLowerRes && dtx_vad ) + { + for ( band = SPAR_DIRAC_SPLIT_START_BAND; band < IVAS_MAX_NUM_BANDS; band++ ) + { + for ( block = 1; block < MAX_PARAM_SPATIAL_SUBFRAMES; block++ ) + { + for ( int16_t i = 0; i < FOA_CHANNELS - 1; i++ ) /* pred coefficient index (index 0, 1, 2 predicts Y, Z, X respectively) */ + { + hMdDec->spar_md.band_coeffs[band + block * IVAS_MAX_NUM_BANDS].pred_re[i] = hMdDec->spar_md.band_coeffs[band].pred_re[i]; + } + for ( int16_t i = 0; i < FOA_CHANNELS - 1; i++ ) /* pred coefficient index (index 0, 1, 2 predicts Y, Z, X respectively) */ + { + hMdDec->spar_md.band_coeffs[band + block * IVAS_MAX_NUM_BANDS].P_re[i] = hMdDec->spar_md.band_coeffs[band].P_re[i]; + } + } + } + } +#else ivas_get_spar_md_from_dirac( azi_dirac, ele_dirac, diffuseness, MAX_PARAM_SPATIAL_SUBFRAMES, NULL, &hMdDec->spar_md, &hMdDec->spar_md_cfg, end_band, num_bands_out, ( hMdDec->spar_hoa_md_flag ) ? 1 : sba_order_internal, dtx_vad, NULL ); - +#endif /* expand DirAC TC 20ms MD for residual channels to all subframes*/ for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; block++ ) { @@ -2768,7 +3230,11 @@ void ivas_spar_to_dirac( } } +#ifdef LBR_SBA + for ( b = end_band * bw; b < num_bands_out; b++ ) +#else for ( b = end_band; b < num_bands_out; b++ ) +#endif { hMdDec->valid_bands[b] = 1; } diff --git a/lib_dec/ivas_stat_dec.h b/lib_dec/ivas_stat_dec.h index 9514c81504..3302bcbe3a 100644 --- a/lib_dec/ivas_stat_dec.h +++ b/lib_dec/ivas_stat_dec.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -36,41 +36,10 @@ #include #include "options.h" #include "cnst.h" -#include "stat_dec.h" #include "ivas_cnst.h" +#include "stat_dec.h" #include "ivas_stat_com.h" #include "ivas_stat_rend.h" -#include "common_api_types.h" // VE2AT: don't we want to avoid this include in the library? I admit that the rules hefre are not 100% clear to me but introducing it just for IVAS_QUATERNION is not necessry I think - -#ifdef SPLIT_REND_WITH_HEAD_ROT -#include "ivas_CQMFEncoder.h" -#include "ivas_CQMFDecoder.h" -#endif - -/*----------------------------------------------------------------------------------* - * Output configuration for renderer (e.g. DirAC, MASA, Binaural Renderer...) - *----------------------------------------------------------------------------------*/ - -typedef struct ivas_output_setup_structure -{ - AUDIO_CONFIG output_config; - int16_t nchan_out_woLFE; /* number of output audio channels without LFE */ - int16_t ambisonics_order; - int8_t is_loudspeaker_setup; - int8_t is_planar_setup; - int8_t is_binaural_setup; - - int16_t num_lfe; - int16_t index_lfe[1]; - const float *ls_azimuth; - const float *ls_elevation; - - uint8_t separateChannelEnabled; - int16_t separateChannelIndex; - -} IVAS_OUTPUT_SETUP, *IVAS_OUTPUT_SETUP_HANDLE; - - /*----------------------------------------------------------------------------------* * DFT Stereo decoder structure *----------------------------------------------------------------------------------*/ @@ -149,7 +118,6 @@ typedef struct stereo_dft_dec_data_struct float itd[STEREO_DFT_DEC_DFT_NB]; -#ifdef FIX_ITD_CNG float itd_xfade_step; float itd_xfade_target; int16_t itd_xfade_counter; @@ -159,7 +127,6 @@ typedef struct stereo_dft_dec_data_struct float ipd_xfade_step; int16_t ipd_xfade_counter; float ipd_xfade_prev; -#endif /*residual prediction*/ int16_t res_pred_mode[STEREO_DFT_DEC_DFT_NB]; /* residual prediction mode: 0(off), 1(stereo filling only), 2(enhanced stereo filling) */ @@ -233,6 +200,12 @@ typedef struct stereo_dft_dec_data_struct float smooth_buf[SBA_DIRAC_STEREO_NUM_BANDS][SBA_DIRAC_NRG_SMOOTH_LONG + 1]; float smooth_fac[NB_DIV][SBA_DIRAC_STEREO_NUM_BANDS]; + int16_t first_frame; + float mixer_mat_smooth[2][4][2 * IVAS_MAX_NUM_BANDS]; + float g_L_prev; + float g_R_prev; + const float *max_smooth_gains, *min_smooth_gains; + } STEREO_DFT_DEC_DATA, *STEREO_DFT_DEC_DATA_HANDLE; @@ -409,6 +382,19 @@ typedef struct stereo_icbwe_dec_data_structure } STEREO_ICBWE_DEC_DATA, *STEREO_ICBWE_DEC_HANDLE; +/*----------------------------------------------------------------------------------* + * ISM DTX structure + *----------------------------------------------------------------------------------*/ + +typedef struct +{ + int16_t dtx_flag; + int16_t sce_id_dtx; + + int16_t ism_dtx_hangover_cnt; /* hangover counter for ISM DTX decoder */ + +} ISM_DTX_DATA_DEC; + /*----------------------------------------------------------------------------------* * DirAC decoder structure *----------------------------------------------------------------------------------*/ @@ -588,7 +574,6 @@ typedef struct dirac_output_synthesis_cov_state_structure } DIRAC_OUTPUT_SYNTHESIS_COV_STATE; - /* MASA stereo transport signal type detection structure */ typedef struct { @@ -709,7 +694,6 @@ typedef struct ivas_dirac_dec_data_structure float *proto_frame_dec_f; DIRAC_DEC_STACK_MEM stack_mem; - MASA_STEREO_TYPE_DETECT *masa_stereo_type_detect; int16_t num_ele_spk_no_diffuse_rendering; @@ -822,6 +806,12 @@ typedef struct ivas_spar_md_dec_state_t int16_t table_idx; int16_t dtx_vad; int16_t spar_hoa_md_flag; +#ifdef LBR_ADAP_SMOOTHING + float smooth_buf[IVAS_SPAR_MAX_CH][IVAS_MAX_NUM_BANDS][2 * SBA_DIRAC_NRG_SMOOTH_LONG + 1]; + float smooth_fac[IVAS_SPAR_MAX_CH][IVAS_MAX_NUM_BANDS]; + float mixer_mat_prev2[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH][IVAS_MAX_NUM_BANDS]; +#endif + } ivas_spar_md_dec_state_t; @@ -841,28 +831,6 @@ typedef struct ivas_agc_dec_state_t } ivas_agc_dec_state_t; -/* TD decorr */ -typedef struct ivas_td_decorr_APD_filt_state_t -{ - int16_t order[IVAS_MAX_DECORR_APD_SECTIONS]; - int16_t idx[IVAS_MAX_DECORR_APD_SECTIONS]; - float coeffs[IVAS_MAX_DECORR_APD_SECTIONS]; - float *state[IVAS_MAX_DECORR_APD_SECTIONS]; - -} ivas_td_decorr_APD_filt_state_t; - -typedef struct ivas_td_decorr_state_t -{ - ivas_trans_det_state_t *pTrans_det; - float *look_ahead_buf; - ivas_td_decorr_APD_filt_state_t APD_filt_state[IVAS_MAX_DECORR_CHS]; - - int16_t num_apd_outputs; - int16_t num_apd_sections; - int16_t ducking_flag; - -} ivas_td_decorr_state_t; - /* PCA structure */ typedef struct { @@ -987,89 +955,37 @@ typedef struct mct_dec_data_structure MCT_DEC_BLOCK_DATA_HANDLE hBlockData[MCT_MAX_BLOCKS]; int16_t chBitRatios[MCT_MAX_CHANNELS]; - int16_t lowE_ch[MCT_MAX_CHANNELS]; /* note: pointer to local parameter */ - int16_t LFE_off; + int16_t lowE_ch[MCT_MAX_CHANNELS]; /* note: pointer to local parameter */ uint16_t mc_global_ild[MCT_MAX_CHANNELS]; /* note: pointer to local parameter */ - int16_t num_lfe; - } MCT_DEC_DATA, *MCT_DEC_HANDLE; /*----------------------------------------------------------------------------------* - * EFAP structures + * LFE decoder structure *----------------------------------------------------------------------------------*/ -// VE2AT: move to ivas_rom_rend.h ? -typedef struct EFAP_VERTEX -{ - float azi; /* azimuth of the loudspeaker */ - float ele; /* elevation of the loudspeaker */ - float pos[3]; /* [x y z] cartesian coordinate vector */ - int16_t idx; /* integer, that corresponds to the first index for the LS in the 1D output */ - int16_t isNaN; /* used to indicate if the vertex is a virtual speaker */ - EFAP_VTX_DMX_TYPE dmxType; /* virtual speaker downmix type */ - -} EFAP_VERTEX; - -typedef struct EFAP_VERTEX_DATA -{ - EFAP_VERTEX *vertexArray; /* Array of vertices */ - int16_t numVtx; /* Number of vertices */ - int16_t *vtxOrder; /* Array that indicates the order of the vertex ranked by increasing azimuth */ - -} EFAP_VERTEX_DATA; -typedef struct EFAP_POLYSET -{ - int16_t chan[EFAP_MAX_CHAN_NUM]; /* An array indicating the loudspeaker index of the polygon vertices */ - int16_t isNaN[EFAP_MAX_CHAN_NUM]; /* Indicates if one of the vertices isNaN */ - int16_t numChan; /* An integer between 0 and EFAP_MAX_CHAN_NUM corresponding to the number of vertices of the polygon */ - float polyAzi[EFAP_MAX_CHAN_NUM]; /* An array (same length as "chan"), with the azimuth of the channels */ - float polyEle[EFAP_MAX_CHAN_NUM]; /* An array (same length as "chan"), with the elevation of the channels */ - -} EFAP_POLYSET; - -typedef struct EFAP_LS_TRIANGLE -{ - int16_t LS[3]; /* Array indicating the loudspeaker index of the triangle vertices */ - -} EFAP_LS_TRIANGLE; - -typedef struct EFAP_POLYSET_DATA +typedef struct ivas_lfe_dec_data_structure { - EFAP_POLYSET polysetArray[EFAP_MAX_POLY_SET]; /* Array of polygons */ - int16_t numPoly; /* Number of polygons */ - EFAP_LS_TRIANGLE triArray[EFAP_MAX_POLY_SET]; /* Array of triangles */ - int16_t numTri; /* Number of triangles */ - -} EFAP_POLYSET_DATA; + ivas_filters_process_state_t filter_state; + LFE_WINDOW_HANDLE pWindow_state; + const uint16_t *cum_freq_models[IVAS_MAX_NUM_QUANT_STRATS][IVAS_MAX_NUM_DCT_COEF_GROUPS]; + int16_t lfe_dec_indices_coeffs_tbl[IVAS_MAX_NUM_QUANT_STRATS][IVAS_MAX_NUM_DCT_COEF_GROUPS]; + float lfe_block_delay_s; + int16_t lfe_prior_buf_len; + float prior_out_buffer[L_FRAME48k]; -typedef struct EFAP -{ - int16_t numSpk; /* Number of loudspeakers */ - float *aziSpk; /* Loudspeaker azimuths */ - float *eleSpk; /* Loudspeaker elevations */ - EFAP_VERTEX_DATA vtxData; /* Vertex Data, contains all the data concerning the vertex */ - EFAP_POLYSET_DATA polyData; /* Polygon data */ - float **dmTranspose; /* Downmix Matrix used for redistributing the energy of ghosts LS and its transpose */ - float *bufferLong; /* tmp buffer that will be given as a parameter for computing the gain; this is a 1D array of length numVtx */ - float *bufferShort; /* tmp buffer that will be given as a parameter for computing the gain; this is the result of downMixMatrix*bufferLong, length is numSpk */ - int16_t numTot; /* Total number of real + ghost loudspeakers, used later for freeing memory */ + float prevsynth_buf[LFE_PLC_BUFLEN]; + float *lfe_delay_buf; + int16_t lfe_addl_delay; + int16_t bfi_count; -} EFAP, *EFAP_HANDLE; +} LFE_DEC_DATA, *LFE_DEC_HANDLE; +// Note: the following structures are used only in lib_dec but this would likely change in the future /*----------------------------------------------------------------------------------* * VBAP structures *----------------------------------------------------------------------------------*/ -// VE2AT: move to ivas_rom_rend.h ? -enum SpeakerNodeGroup -{ - SPEAKER_NODE_BOTTOM_HALF, - SPEAKER_NODE_HORIZONTAL, - SPEAKER_NODE_TOP_HALF, - SPEAKER_NODE_BACK, - SPEAKER_NODE_ALL -}; /* Defines a single virtual surface triplet of loudspeakers * with a precalculated inverse matrix */ @@ -1080,15 +996,6 @@ typedef struct vbap_vs_triplet_structure } VBAP_VS_TRIPLET; -/* Defines a single speaker node */ -typedef struct vbap_speaker_node_structure -{ - float azi_deg; - float ele_deg; - float unit_vec[3]; - enum SpeakerNodeGroup group; - -} VBAP_SPEAKER_NODE; /* Storage structure for fast runtime triplet search */ typedef struct triplet_search_structure @@ -1099,6 +1006,7 @@ typedef struct triplet_search_structure } VBAP_SEARCH_STRUCT; + /* VBAP data structure. Contains the formed virtual surface arrangement * and supporting data. */ typedef struct vbap_data_structure { @@ -1119,7 +1027,7 @@ typedef struct vbap_data_structure /*----------------------------------------------------------------------------------* * renderer structures *----------------------------------------------------------------------------------*/ -// VE2AT: move to ivas_rom_rend.h ? + typedef struct renderer_struct { float prev_gains[MAX_CICP_CHANNELS - 1][MAX_OUTPUT_CHANNELS]; @@ -1127,6 +1035,34 @@ typedef struct renderer_struct } ISM_RENDERER_DATA, *ISM_RENDERER_HANDLE; +#ifndef SPLIT_REND_WITH_HEAD_ROT +/* Fastconv binaural data structure */ +typedef struct ivas_binaural_rendering_struct +{ + /* Common variables for all modules */ + IVAS_OUTPUT_SETUP_HANDLE hInputSetup; /* pointer to input spatial format for binaural renderer*/ + EFAP_HANDLE hEFAPdata; /* EFAP structure*/ + float *hoa_dec_mtx; /* pointer to HOA decoder mtx */ + int8_t rotInCldfb; /* Flag to enable rotation within bin Renderer in CLDFB*/ + int16_t max_band; /* band upto which rendering is performed */ + int16_t conv_band; /* band upto which convolution in cldfb domain is performed */ + int16_t timeSlots; /* number of time slots of binaural renderer */ + int16_t nInChannels; /* number input channels */ + int8_t render_lfe; /* Flag to render LFE in binaural rendering*/ + IVAS_FORMAT ivas_format; /* format; corresponds to st_ivas->ivas_format, unless the signal gets transormed to a different domain for rendering */ + + /* Convolution module structure */ + BINRENDERER_CONV_MODULE_HANDLE hBinRenConvModule; + + /* Variables related to reverberator module */ + float earlyPartEneCorrection[CLDFB_NO_CHANNELS_MAX]; + REVERB_STRUCT_HANDLE hReverb; + +#ifdef SPLIT_REND_WITH_HEAD_ROT + int16_t numPoses; +#endif +} BINAURAL_RENDERER, *BINAURAL_RENDERER_HANDLE; +#endif /*----------------------------------------------------------------------------------* * MASA decoder structures @@ -1165,11 +1101,25 @@ typedef struct ivas_mcmasa_lfe_synth_struct } MCMASA_LFE_SYNTH_DATA, *MCMASA_LFE_SYNTH_DATA_HANDLE; +typedef struct ivas_masa_decoder_ext_out_meta_struct +{ + MASA_DECRIPTIVE_META descriptiveMeta; + + uint16_t directionIndex[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; + uint8_t directToTotalRatio[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; + uint8_t spreadCoherence[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; + + uint8_t surroundCoherence[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; + uint8_t diffuseToTotalRatio[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; + +} MASA_DECODER_EXT_OUT_META; + typedef struct ivas_masa_decoder_data_struct { int16_t band_mapping[MASA_FREQUENCY_BANDS + 1]; SPHERICAL_GRID_DATA *sph_grid16; + MASA_DECODER_EXT_OUT_META *extOutMeta; float dir_decode_quality; } MASA_DECODER_DATA; @@ -1182,864 +1132,6 @@ typedef struct ivas_masa_decoder_struct } MASA_DECODER, *MASA_DECODER_HANDLE; - -/*----------------------------------------------------------------------------------* - * Binaural Rendering structure - *----------------------------------------------------------------------------------*/ -// VE2AT: move to ivas_rom_rend.h ? -/* Binaural reverberator structure */ -typedef struct ivas_binaural_reverb_struct -{ - float *loopBufReal[CLDFB_NO_CHANNELS_MAX]; - float *loopBufImag[CLDFB_NO_CHANNELS_MAX]; - float preDelayBufferReal[REVERB_PREDELAY_MAX + 1][CLDFB_NO_CHANNELS_MAX]; - float preDelayBufferImag[REVERB_PREDELAY_MAX + 1][CLDFB_NO_CHANNELS_MAX]; - float **tapPointersReal[CLDFB_NO_CHANNELS_MAX][BINAURAL_CHANNELS]; - float **tapPointersImag[CLDFB_NO_CHANNELS_MAX][BINAURAL_CHANNELS]; - - float binauralCoherenceCrossmixGains[CLDFB_NO_CHANNELS_MAX]; - float binauralCoherenceDirectGains[CLDFB_NO_CHANNELS_MAX]; - float reverbEqGains[CLDFB_NO_CHANNELS_MAX]; - float loopAttenuationFactor[CLDFB_NO_CHANNELS_MAX]; - - float *outputBufferReal[CLDFB_NO_CHANNELS_MAX][BINAURAL_CHANNELS]; - float *outputBufferImag[CLDFB_NO_CHANNELS_MAX][BINAURAL_CHANNELS]; - - int16_t numBins; - - int16_t useBinauralCoherence; - int16_t loopBufLength[CLDFB_NO_CHANNELS_MAX]; - int16_t loopBufLengthMax[CLDFB_NO_CHANNELS_MAX]; - int16_t preDelayBufferIndex; - int16_t preDelayBufferLength; - - int16_t taps[CLDFB_NO_CHANNELS_MAX][BINAURAL_CHANNELS]; - int16_t *tapPhaseShiftType[CLDFB_NO_CHANNELS_MAX][BINAURAL_CHANNELS]; - - int16_t blockSize; - uint32_t binRend_RandNext; - int16_t highestBinauralCoherenceBin; - - float dmxmtx[BINAURAL_CHANNELS][MAX_OUTPUT_CHANNELS]; - float foa_enc[MAX_OUTPUT_CHANNELS][FOA_CHANNELS]; - -} REVERB_STRUCT, *REVERB_STRUCT_HANDLE; - -/* Parametric binaural data structure */ -typedef struct ivas_dirac_dec_binaural_data_structure -{ - float ChEnePrev[BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX]; - float ChCrossRePrev[CLDFB_NO_CHANNELS_MAX]; - float ChCrossImPrev[CLDFB_NO_CHANNELS_MAX]; - float ChEne[BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX]; - float ChCrossRe[CLDFB_NO_CHANNELS_MAX]; - float ChCrossIm[CLDFB_NO_CHANNELS_MAX]; - float ChEneOutPrev[BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX]; - float ChCrossReOutPrev[CLDFB_NO_CHANNELS_MAX]; - float ChCrossImOutPrev[CLDFB_NO_CHANNELS_MAX]; - float ChEneOut[BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX]; - float ChCrossReOut[CLDFB_NO_CHANNELS_MAX]; - float ChCrossImOut[CLDFB_NO_CHANNELS_MAX]; - float processMtxRe[BINAURAL_CHANNELS][BINAURAL_CHANNELS + 1][CLDFB_NO_CHANNELS_MAX]; /* +1 refers to SeparateChannel */ - float processMtxIm[BINAURAL_CHANNELS][BINAURAL_CHANNELS + 1][CLDFB_NO_CHANNELS_MAX]; - float processMtxDecRe[BINAURAL_CHANNELS][BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX]; - float processMtxDecIm[BINAURAL_CHANNELS][BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX]; - float diffuseFieldCoherence[CLDFB_NO_CHANNELS_MAX]; - float diffuseFieldCoherenceX[BINAURAL_COHERENCE_DIFFERENCE_BINS]; - float diffuseFieldCoherenceY[BINAURAL_COHERENCE_DIFFERENCE_BINS]; - float diffuseFieldCoherenceZ[BINAURAL_COHERENCE_DIFFERENCE_BINS]; - float earlyPartEneCorrection[CLDFB_NO_CHANNELS_MAX]; - REVERB_STRUCT_HANDLE hReverb; - uint8_t renderStereoOutputInsteadOfBinaural; - float frameMeanDiffuseness[CLDFB_NO_CHANNELS_MAX]; - float processMtxRePrev[BINAURAL_CHANNELS][BINAURAL_CHANNELS + 1][CLDFB_NO_CHANNELS_MAX]; - float processMtxImPrev[BINAURAL_CHANNELS][BINAURAL_CHANNELS + 1][CLDFB_NO_CHANNELS_MAX]; - float processMtxDecRePrev[BINAURAL_CHANNELS][BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX]; - float processMtxDecImPrev[BINAURAL_CHANNELS][BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX]; - uint16_t useSubframeMode; /* 0 = process in 20 ms frames, 1 = process in 5 ms subframes */ - uint16_t useTdDecorr; - ivas_td_decorr_state_t *hTdDecorr; - -} DIRAC_DEC_BIN_DATA, *DIRAC_DEC_BIN_HANDLE; - -typedef struct ivas_binaural_rendering_conv_module_struct -{ - float ***filterTapsLeftReal; - float ***filterTapsLeftImag; - float ***filterTapsRightReal; - float ***filterTapsRightImag; -#ifdef SPLIT_REND_WITH_HEAD_ROT - float ****filterStatesLeftReal; - float ****filterStatesLeftImag; -#else - float ***filterStatesLeftReal; - float ***filterStatesLeftImag; -#endif - - int16_t numTapsArray[BINAURAL_CONVBANDS]; - int16_t numTaps; -} BINRENDERER_CONV_MODULE, *BINRENDERER_CONV_MODULE_HANDLE; - -#ifdef SPLIT_REND_WITH_HEAD_ROT -/* binaural split rendering head rotation data structure */ -typedef struct ivas_binaural_head_rot_split_rendering_md_struct -{ - float pred_mat_re[BINAURAL_CHANNELS][BINAURAL_CHANNELS]; - float pred_mat_im[BINAURAL_CHANNELS][BINAURAL_CHANNELS]; - float gd; - float gd2; - int16_t pred_mat_re_idx[BINAURAL_CHANNELS][BINAURAL_CHANNELS]; - int16_t pred_mat_im_idx[BINAURAL_CHANNELS][BINAURAL_CHANNELS]; - int16_t gd_idx; - int16_t gd2_idx; -} BIN_HR_SPLIT_REND_MD, *BIN_HR_SPLIT_REND_MD_HANDLE; - -typedef struct ivas_split_rend_huffman_cfg_t -{ - const int32_t *codebook; - int16_t min_len; - int16_t max_len; - int16_t sym_len; -} ivas_split_rend_huffman_cfg_t; - -typedef struct ivas_binaural_head_rot_split_rendering_huff_struct -{ - ivas_split_rend_huffman_cfg_t pred; - int16_t pred_idx_trav[IVAS_SPLIT_REND_PRED_QUANT_PNTS]; - int16_t pred_base2_code_len; - ivas_split_rend_huffman_cfg_t gd; - int16_t gd_base2_code_len; - int16_t gd_idx_trav[IVAS_SPLIT_REND_D_QUANT_PNTS]; - ivas_split_rend_huffman_cfg_t p_gd; - int16_t p_gd_base2_code_len; - int16_t p_gd_idx_trav[IVAS_SPLIT_REND_D_QUANT_PNTS]; - ivas_split_rend_huffman_cfg_t p_gd_diff; - int16_t p_gd_diff_base2_code_len; - int16_t p_gd_diff_idx_trav[IVAS_SPLIT_REND_D_QUANT_PNTS]; -} BIN_HR_SPLIT_REND_HUFF, *BIN_HR_SPLIT_REND_HUFF_HANDLE; - -typedef struct ivas_binaural_head_rot_split_pre_rendering_struct -{ - BIN_HR_SPLIT_REND_MD rot_md[MAX_HEAD_ROT_POSES - 1][MAX_PARAM_SPATIAL_SUBFRAMES][MAX_SPLIT_REND_MD_BANDS]; - float fix_pos_rot_mat[MAX_HEAD_ROT_POSES - 1][BINAURAL_CHANNELS][BINAURAL_CHANNELS]; - IVAS_SPLIT_REND_POSE_TYPE pose_type[MAX_HEAD_ROT_POSES - 1]; - BIN_HR_SPLIT_REND_HUFF huff_cfg; -#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG - HANDLE_CLDFB_FILTER_BANK cldfbSynRotBinDec[MAX_HEAD_ROT_POSES + 1][BINAURAL_CHANNELS]; -#endif -} BIN_HR_SPLIT_PRE_REND, *BIN_HR_SPLIT_PRE_REND_HANDLE; - -typedef struct ivas_binaural_head_rot_split_post_rendering_struct -{ - BIN_HR_SPLIT_REND_MD rot_md[MAX_HEAD_ROT_POSES][MAX_PARAM_SPATIAL_SUBFRAMES][MAX_SPLIT_REND_MD_BANDS]; - IVAS_QUATERNION QuaternionsPre[MAX_PARAM_SPATIAL_SUBFRAMES]; - int16_t low_Res; - - float fix_pos_rot_mat[MAX_HEAD_ROT_POSES - 1][BINAURAL_CHANNELS][BINAURAL_CHANNELS]; - IVAS_SPLIT_REND_POSE_TYPE pose_type[MAX_HEAD_ROT_POSES - 1]; - BIN_HR_SPLIT_REND_HUFF huff_cfg; -#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG - float mixer_mat_re[MAX_HEAD_ROT_POSES][MAX_SPLIT_REND_MD_BANDS][BINAURAL_CHANNELS][BINAURAL_CHANNELS]; - float mixer_mat_im[MAX_HEAD_ROT_POSES][MAX_SPLIT_REND_MD_BANDS][BINAURAL_CHANNELS][BINAURAL_CHANNELS]; - float gd_mem[MAX_HEAD_ROT_POSES][MAX_SPLIT_REND_MD_BANDS]; -#else - float mixer_mat_re[1][MAX_SPLIT_REND_MD_BANDS][BINAURAL_CHANNELS][BINAURAL_CHANNELS]; - float mixer_mat_im[1][MAX_SPLIT_REND_MD_BANDS][BINAURAL_CHANNELS][BINAURAL_CHANNELS]; - float gd_mem[1][MAX_SPLIT_REND_MD_BANDS]; -#endif - int16_t cf_flag; - HANDLE_CLDFB_FILTER_BANK cldfbAna[BINAURAL_CHANNELS]; - HANDLE_CLDFB_FILTER_BANK cldfbSyn[BINAURAL_CHANNELS]; -#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG - HANDLE_CLDFB_FILTER_BANK cldfbSynReconsBinDec[MAX_HEAD_ROT_POSES][BINAURAL_CHANNELS]; -#endif -} BIN_HR_SPLIT_POST_REND, *BIN_HR_SPLIT_POST_REND_HANDLE; - -typedef struct ivas_binaural_head_rot_split_rendering_lcld_enc_struct -{ - void *pLcld_enc; - int32_t iChannels; - CQMFEncoder *psCQMFEncoder; - float ***pppfCQMFReal; - float ***pppfCQMFImag; -#ifdef CLDFB_DEBUG - FILE *cldfbIn; - int numFrame; -#endif -} BIN_HR_SPLIT_LCLD_ENC, *BIN_HR_SPLIT_LCLD_ENC_HANDLE; - -typedef struct ivas_binaural_head_rot_split_rendering_lcld_dec_struct -{ - void *pLcld_dec; - int32_t iChannels; - CQMFDecoder *psCQMFDecoder; - float ***pppfDecCQMFReal; - float ***pppfDecCQMFImag; -#ifdef CLDFB_DEBUG - FILE *cldfbOut; - int numFrame; -#endif -} BIN_HR_SPLIT_LCLD_DEC, *BIN_HR_SPLIT_LCLD_DEC_HANDLE; - -typedef struct -{ -#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG - HANDLE_CLDFB_FILTER_BANK cldfbAna[( 1 + MAX_HEAD_ROT_POSES ) * BINAURAL_CHANNELS]; -#else - HANDLE_CLDFB_FILTER_BANK cldfbAna[MAX_HEAD_ROT_POSES * BINAURAL_CHANNELS]; -#endif -} CLDFB_HANDLES_WRAPPER, *CLDFB_HANDLES_WRAPPER_HANDLE; - -#ifdef SPLIT_REND_WITH_HEAD_ROT -typedef struct -{ - int16_t num_poses; - float relative_head_poses[MAX_HEAD_ROT_POSES][3]; - int16_t dof; - int16_t hq_mode; - IVAS_SPLIT_REND_ROT_AXIS rot_axis; -#ifdef SPLIT_REND_TD_POSE_CORRECTION - IVAS_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode; - bool swap_flag[4]; - bool swap_flag_prev[4]; - float gains[MAX_HEAD_ROT_POSES]; - float gains_prev[MAX_HEAD_ROT_POSES]; - float xfade[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES]; -#endif -} MULTI_BIN_REND_POSE_DATA; -#endif - -#ifdef SPLIT_REND_LC3PLUS -/* Forward declaration of TD_OBJECT_RENDERER_HANDLE. - This avoids shifting the entire definition of TD Renderer structs above - this line, which could cause merge conflicts. - Can be cleaned up later. */ -typedef struct ivas_binaural_td_rendering_struct *TD_OBJECT_RENDERER_HANDLE; -#endif - -typedef struct -{ - MULTI_BIN_REND_POSE_DATA multiBinPoseData; - BIN_HR_SPLIT_PRE_REND_HANDLE hBinHrSplitPreRend; - BIN_HR_SPLIT_LCLD_ENC_HANDLE hSplitBinLCLDEnc; - CLDFB_HANDLES_WRAPPER_HANDLE hCldfbHandles; -#ifdef SPLIT_REND_LC3PLUS - IVAS_LC3PLUS_ENC_HANDLE hLc3plusEnc; - TD_OBJECT_RENDERER_HANDLE hTdRendHandles[MAX_HEAD_ROT_POSES - 1]; - float* lc3plusDelayBuffers[MAX_HEAD_ROT_POSES * BINAURAL_CHANNELS]; /* Used to time-align head pose correction metadata with LC3plus-coded reference audio */ - int32_t lc3plusDelaySamples; -#endif -} SPLIT_REND_WRAPPER; - -typedef struct -{ - MULTI_BIN_REND_POSE_DATA multiBinPoseData; - BIN_HR_SPLIT_POST_REND_HANDLE hBinHrSplitPostRend; - BIN_HR_SPLIT_LCLD_DEC_HANDLE hSplitBinLCLDDec; -#ifdef SPLIT_REND_LC3PLUS - IVAS_LC3PLUS_DEC_HANDLE hLc3plusDec; -#endif -} SPLIT_POST_REND_WRAPPER; -#endif - -/* Fastconv binaural data structure */ -typedef struct ivas_binaural_rendering_struct -{ - /* Common variables for all modules */ - IVAS_OUTPUT_SETUP_HANDLE hInputSetup; /* pointer to input spatial format for binaural renderer*/ - EFAP_HANDLE hEFAPdata; /* EFAP structure*/ - float *hoa_dec_mtx; /* pointer to HOA decoder mtx */ - int8_t rotInCldfb; /* Flag to enable rotation within bin Renderer in CLDFB*/ - int16_t max_band; /* band upto which rendering is performed */ - int16_t conv_band; /* band upto which convolution in cldfb domain is performed */ - int16_t timeSlots; /* number of time slots of binaural renderer */ - int16_t nInChannels; /* number input channels */ - int8_t render_lfe; /* Flag to render LFE in binaural rendering*/ - IVAS_FORMAT ivas_format; /* format; corresponds to st_ivas->ivas_format, unless the signal gets transormed to a different domain for rendering */ - /* Convolution module structure */ - BINRENDERER_CONV_MODULE_HANDLE hBinRenConvModule; - - /* Variables related to reverb module */ - float earlyPartEneCorrection[CLDFB_NO_CHANNELS_MAX]; - REVERB_STRUCT_HANDLE hReverb; - -#ifdef SPLIT_REND_WITH_HEAD_ROT - int16_t numPoses; -#endif - -} BINAURAL_RENDERER, *BINAURAL_RENDERER_HANDLE; - - -/*----------------------------------------------------------------------------------* - * Head tracking data structure - *----------------------------------------------------------------------------------*/ -// VE2AT: move to ivas_rom_rend.h ? - -typedef struct ivas_binaural_head_track_struct -{ - int16_t num_quaternions; - IVAS_QUATERNION Quaternions[MAX_PARAM_SPATIAL_SUBFRAMES]; - float Rmat[3][3]; - float Rmat_prev[3][3]; - - uint8_t lrSwitchedNext; - uint8_t lrSwitchedCurrent; - float lrSwitchInterpVal; - - int16_t shd_rot_max_order; -#ifdef SPLIT_REND_WITH_HEAD_ROT - IVAS_SPLIT_REND_ROT_AXIS sr_pose_pred_axis; -#endif - -} HEAD_TRACK_DATA, *HEAD_TRACK_DATA_HANDLE; - - -/*----------------------------------------------------------------------------------* - * TD ISm Object Renderer structure - *----------------------------------------------------------------------------------*/ - -#ifndef FIX_ITD -// VE2AT: move to ivas_rom_rend.h ? -typedef struct -{ - SFX_OpMode_t OpMode; /* Operating mode. This effect can only be TRANSIENT or OFF. */ - int16_t TurningOffEffect; /* Flag showing if the effect is being turned off. */ - int16_t TurningOnEffect; /* Flag showing if the effect is being turned on. */ - int16_t InitializeParams; /* Flag showing if parameters should be initialized the next SetParam call. */ - int16_t FirstUpdate; /* Flag showing if it SetParams has only been called once (TRUE) or more (FALSE). */ - - int32_t TotNoOfOutputSamples; /* The total number of output samples produced since last SetParam call. */ - int32_t MaxTargetTime; /* The maximum allowed target time. Also used for turning the effect on or off. */ - int32_t MaxBlockLength; /* The maximum block length */ - - int16_t TargetTime; /* Time left until the parameters should have reached the new parameters values. */ - float ItdIncrForResampling; /* Resampling factor for adjusting the ITD. */ - float *LeftOldBuffer; /* Buffer with old samples for the Resampling function */ - int16_t NoOfLeftOldBufferSamples; /* Number of samples in LeftOldBuffer */ - float Left_Tf; /* The left fractional delay. */ - float *RightOldBuffer; /* Buffer with old samples for the Resampling function */ - int16_t NoOfRightOldBufferSamples; /* Number of samples in RightOldBuffer */ - float ResampledBufferLeft[SFX_SPAT_BIN_MAX_NO_OF_OUTPUT_SAMPLES + SFX_SPAT_BIN_MAX_FILTER_LENGTH - 1]; /* Buffers getting the resampled output and having the old samples used for HR-filtering */ - float ResampledBufferRight[SFX_SPAT_BIN_MAX_NO_OF_OUTPUT_SAMPLES + SFX_SPAT_BIN_MAX_FILTER_LENGTH - 1]; - int16_t TransientTime; /* Transient time when turning off the effect */ - - int16_t FilterLength; /* HR-filter length */ - - /* HR-filters */ - float *LeftFilter_p; /* Pointer to left filter */ - float *LeftFilterIncr_p; /* Left filter adjustment step */ - float *RightFilter_p; /* Pointer to right filter */ - float *RightFilterIncr_p; /* Right filter adjustment step */ - -#ifdef TDREND_HRTF_TABLE_METHODS - int16_t HrFilterInterpOn; /* Indicates whether to interpolate filter from previous frame */ - float LeftFilterStored[SFX_SPAT_BIN_MAX_FILTER_LENGTH]; /* Stored previous filter for interpolation */ - float RightFilterStored[SFX_SPAT_BIN_MAX_FILTER_LENGTH]; /* Stored previous filter for interpolation */ -#endif - -} SFX_SpatBin_t; - -/* Container struct for setting new parameters in SFX_SpatBin */ -typedef struct -{ - int16_t TurnOn; - int16_t Reset; - /* Rendering parameters */ - float Itd; - int16_t FilterLength; - float *LeftFilter_p; - float *RightFilter_p; - float LeftVolume; - float RightVolume; - -} SFX_SpatBin_Params_t; - -typedef struct TDREND_LIST_Item_s -{ - int16_t Ind; /* Index number of item */ - void *Data_p; /* Pointer to the item data struct */ - struct TDREND_LIST_Item_s *Prev_p; /* Pointer to the prev item */ - struct TDREND_LIST_Item_s *Next_p; /* Pointer to the next item */ - -} TDREND_LIST_Item_t; -#endif - -typedef struct -{ - int16_t modelROM; /* Flag that indicates that the model resides in ROM (controls init/dealloc). */ - int16_t UseItdModel; /* Controls whether ITD model is used. */ - int16_t SplineDegree; /* Degree of the spline functions */ - int16_t K; /* Length of filter */ - int16_t elevDim2; - int16_t elevDim3; - int16_t AlphaN; /* Number of rows in Alpha matrices */ - int16_t num_unique_azim_splines; - int16_t elevSegSamples; - - int16_t elevBsLen[HRTF_MODEL_BSPLINE_NUM_COEFFS]; - int16_t elevBsStart[HRTF_MODEL_BSPLINE_NUM_COEFFS]; - const int16_t *azimDim2; - const int16_t *azimDim3; - const int16_t *azim_start_idx; - const int16_t *azimSegSamples; - const int16_t *azimShapeIdx; - const int16_t *azimShapeSampFactor; - - const float *elevKSeq; /* Array, N x elevDim2 x elevDim3 */ - const float *AlphaL; /* Array, size AlphaN x K */ - const float *AlphaR; /* Array, size AlphaN x K */ - const float *elevBsShape; - float **azimKSeq; /* Array, length azimDim3+1 */ - const float **azimBsShape; - - int16_t azimDim3Max; - int16_t iSecFirst[HRTF_MODEL_N_SECTIONS]; /* Indices for start of sections */ - int16_t iSecLast[HRTF_MODEL_N_SECTIONS]; /* Indices for end of sections */ - const float *EL; /* Array, size (AlphaN*HRTF_MODEL_N_SECTIONS) */ - const float *ER; /* Array, size (AlphaN*HRTF_MODEL_N_SECTIONS) */ - - /* Pointers for allocation of dynamic memory */ - float *AlphaL_dyn; - float *AlphaR_dyn; - float *EL_dyn; - float *ER_dyn; - float *elevBsShape_dyn; - float *elevKSeq_dyn; - int16_t *azimDim2_dyn; - int16_t *azimDim3_dyn; - int16_t *azim_start_idx_dyn; - int16_t *azimSegSamples_dyn; - int16_t *azimShapeIdx_dyn; - int16_t *azimShapeSampFactor_dyn; - float **azimBsShape_dyn; - -} ModelParams_t; - -typedef struct -{ - int16_t N; /* Polynomial degree */ - - int16_t elevDim2; - int16_t elevDim3; - const float *elevKSeq; /* Array, length elevDim3-2 */ - int16_t azimDim2; - int16_t azimDim3; - const float *azimKSeq; /* Array, length azimDim3-2 */ - const float *W; /* Array, size (elevDim3*azimDim3) x K */ - - int16_t azimBsLen[HRTF_MODEL_BSPLINE_NUM_COEFFS]; - int16_t azimBsStart[HRTF_MODEL_BSPLINE_NUM_COEFFS]; - const float *azimBsShape; - int16_t azimSegSamples; - - int16_t elevBsLen[HRTF_MODEL_BSPLINE_NUM_COEFFS]; - int16_t elevBsStart[HRTF_MODEL_BSPLINE_NUM_COEFFS]; - const float *elevBsShape; - int16_t elevSegSamples; - float resamp_factor; - - /* Pointers for allocation of dynamic memory */ - float *elevKSeq_dyn; - float *azimKSeq_dyn; - float *W_dyn; - float *azimBsShape_dyn; - float *elevBsShape_dyn; - -} ModelParamsITD_t; - -typedef struct -{ - float val; - int16_t i; - -} ValueIndex_t; - -/* Shared memory for use when evaluating BSpline HR filter model*/ -typedef struct -{ - float BM[HRTF_MODEL_BSPLINE_NUM_COEFFS_SQ]; - ValueIndex_t BMEnergiesL[HRTF_MODEL_BSPLINE_NUM_COEFFS_SQ]; - ValueIndex_t BMEnergiesR[HRTF_MODEL_BSPLINE_NUM_COEFFS_SQ]; - int16_t UseIndsL[HRTF_MODEL_BSPLINE_NUM_COEFFS_SQ]; - int16_t UseIndsR[HRTF_MODEL_BSPLINE_NUM_COEFFS_SQ]; - float *hrfModL; - float *hrfModR; - float elevBfVec[HRTF_MODEL_BSPLINE_NUM_COEFFS]; - float azimBfVec[HRTF_MODEL_BSPLINE_NUM_COEFFS][HRTF_MODEL_BSPLINE_NUM_COEFFS]; - float BM_ITD[HRTF_MODEL_BSPLINE_NUM_COEFFS_SQ]; - float elevBfVecITD[HRTF_MODEL_BSPLINE_NUM_COEFFS]; - float azimBfVecITD[HRTF_MODEL_BSPLINE_NUM_COEFFS]; - float itdMod; - -} ModelEval_t; - -/* Mixer listener */ -typedef struct -{ - int16_t PoseUpdated; - float Pos[3]; - float Front[3]; - float Up[3]; - float Right[3]; - - int16_t VelUpdated; - float Vel[3]; - -} TDREND_MIX_Listener_t; - -/* HR filter */ -typedef struct TDREND_HRFILT_FiltSet_struct -{ - int32_t SampleRate; /* Sample rate of the HR filter */ - int16_t NumPos; - int16_t NumElev; - float Dist; - float *ItdSet_p; - int16_t FiltLength; - float *Azim_p; - float *Elev_p; - float *ItdSetNominal_p; - float *LeftFiltSet_p; - float *RightFiltSet_p; -#ifdef TDREND_HRTF_TABLE_METHODS - int16_t *AzimStartIdx_p; - int16_t *NumAzim_p; - float *ElevFull_p; - float ElevIncr; -#endif - ModelParams_t ModelParams; - ModelEval_t ModelEval; - ModelParamsITD_t ModelParamsITD; - TDREND_HRFILT_Method_t FilterMethod; /* HR filtering method */ - -} TDREND_HRFILT_FiltSet_t; - - -/* Distance attenuation */ -typedef struct -{ - TDREND_DistAttenModel_t DistAttenModel; - float RefDist; - float MaxDist; - float RollOffFactor; - -} TDREND_DistAtten_t; - -/* Directional attenuation */ -typedef struct -{ - float ConeInnerAngle; - float ConeOuterAngle; - float ConeOuterGain; - -} TDREND_DirAtten_t; - -/* Mixer spatial specification */ -typedef struct -{ - int16_t UseCommonDistAttenModel; /* Common distance attenuation model flag */ - TDREND_DistAttenModel_t DistAttenModel; /* Distance attenuation model */ - -} TDREND_MixSpatSpec_t; - - -typedef struct TDREND_SRC_REND_s -{ - int16_t InputAvailable; - TDREND_PlayStatus_t PlayStatus; - - /* Gains */ - int16_t SrcGainUpdated; - float SrcGain_p[SPAT_BIN_MAX_INPUT_CHANNELS]; - float SrcGainMin_p[SPAT_BIN_MAX_INPUT_CHANNELS]; - float SrcGainMax_p[SPAT_BIN_MAX_INPUT_CHANNELS]; - float DirGain_p[SPAT_BIN_MAX_INPUT_CHANNELS]; - float DistGain_p[SPAT_BIN_MAX_INPUT_CHANNELS]; -#ifndef FIX_ITD - /* HR filtering parameters */ - SFX_SpatBin_t *SfxSpatBin_p; -#endif -} TDREND_SRC_REND_t; - - -/* Source spatial parameters */ -typedef struct -{ - int16_t Updated; - TDREND_PosType_t PosType; - float Pos_p[3 * SPAT_BIN_MAX_INPUT_CHANNELS]; - float Front_p[3 * SPAT_BIN_MAX_INPUT_CHANNELS]; - int16_t DirAttenEnabled; - TDREND_DirAtten_t DirAtten; - int16_t DistAttenEnabled; - TDREND_DistAtten_t DistAtten; - -} TDREND_SRC_SPATIAL_t; - -typedef struct -{ - float *InputFrame_p; /* Input frame pointer */ - TDREND_SRC_SPATIAL_t *SrcSpatial_p; - TDREND_SRC_REND_t *SrcRend_p; -#ifdef FIX_ITD - int16_t itd; - int16_t previtd; - int16_t filterlength; - float mem_itd[ITD_MEM_LEN]; - float hrf_left_prev[SFX_SPAT_BIN_MAX_FILTER_LENGTH]; /* Todo: Should we allocate these buffers with count_malloc instead of the maximum length? */ - float hrf_right_prev[SFX_SPAT_BIN_MAX_FILTER_LENGTH]; - float azim_prev; - float elev_prev; - float mem_hrf_left[SFX_SPAT_BIN_MAX_FILTER_LENGTH - 1]; - float mem_hrf_right[SFX_SPAT_BIN_MAX_FILTER_LENGTH - 1]; - float Gain; -#endif -} TDREND_SRC_t; - -/* Top level TD binaural renderer handle */ -typedef struct ivas_binaural_td_rendering_struct -{ - TDREND_MixSpatSpec_t *TdRend_MixSpatSpec_p; - TDREND_DirAtten_t *DirAtten_p; - int16_t NumOfSrcs; - int16_t MaxSrcInd; - - TDREND_SRC_t *Sources[MAX_NUM_TDREND_CHANNELS]; - - float Gain; /* Mixer gain */ - TDREND_MIX_Listener_t *Listener_p; /* The virtual listener */ - TDREND_HRFILT_FiltSet_t *HrFiltSet_p; /* HR filter set */ - - int16_t UseCommonDistAttenModel; /* Use common dist atten model (TRUE/FALSE) */ - int16_t DistAttenEnabled; /* (TRUE/FALSE) */ - TDREND_DistAttenModel_t DistAttenModel; /* Common distance attenuation model */ - -} BINAURAL_TD_OBJECT_RENDERER, *BINAURAL_TD_OBJECT_RENDERER_HANDLE; - - -/*------------------------------------------------------------------------------------------* - * Crend structures - *------------------------------------------------------------------------------------------*/ -// VE2AT: move to ivas_rom_rend.h ? -typedef struct ivas_hrtfs_structure -{ - float *pOut_to_bin_re[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS]; - float *pOut_to_bin_im[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS]; - float *pOut_to_bin_diffuse_re[BINAURAL_CHANNELS]; - float *pOut_to_bin_diffuse_im[BINAURAL_CHANNELS]; - float latency_s; - uint16_t num_iterations[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS]; - uint16_t num_iterations_diffuse[BINAURAL_CHANNELS]; - uint16_t *pIndex_frequency_max[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS]; - uint16_t *pIndex_frequency_max_diffuse[BINAURAL_CHANNELS]; - uint16_t index_frequency_max_diffuse; - int16_t max_num_ir; - int16_t max_num_iterations; - float inv_diffuse_weight[MAX_INTERN_CHANNELS]; /* inverse diffuse weights array, access one inverse weight by pInvDiffuseWeight[channel] */ - float gain_lfe; - -} HRTFS_DATA, *HRTFS_HANDLE; - -/* Reverberator structures */ - - -typedef struct ivas_roomAcoustics_t -{ - int16_t override; - int16_t use_brir; - int16_t late_reverb_on; - int16_t nBands; /* Number of frequency bands for which reverb properties are provided, integer, range [2..256] */ - float pFc_input[CLDFB_NO_CHANNELS_MAX]; /* Center frequencies for which following values are provided: */ - float pAcoustic_rt60[CLDFB_NO_CHANNELS_MAX]; /* - The room's T60 per center frequency */ - float pAcoustic_dsr[CLDFB_NO_CHANNELS_MAX]; /* - The room's Diffuse to Source Ratio per center frequency */ - float acousticPreDelay; /* Time elapsed between input signal and late reverberation start, float, range [0.001..10] */ - float inputPreDelay; /* Offset in seconds from where DSR is computed in the RIR (0 = at source), float, range [0.001..10] */ - -} ivas_roomAcoustics_t; - -typedef struct ivas_render_config_t -{ -#if ( defined DEBUGGING ) || ( defined SPLIT_REND_WITH_HEAD_ROT ) - ivas_renderTypeOverride renderer_type_override; -#endif - ivas_roomAcoustics_t roomAcoustics; -#ifdef SPLIT_REND_WITH_HEAD_ROT - IVAS_SPLIT_REND_CONFIG_DATA split_rend_config; -#endif -} RENDER_CONFIG_DATA, *RENDER_CONFIG_HANDLE; - - -typedef struct ivas_rev_delay_line_t -{ - float *pBuffer; - uint16_t MaxDelay; - int16_t Delay; - uint16_t BufferPos; - float Gain; - -} ivas_rev_delay_line_t; - -typedef struct ivas_rev_iir_filter_t -{ - uint16_t MaxTaps; - uint16_t nr_taps; - uint16_t isFIR; - float Output; - float CoefA[IVAS_REV_MAX_IIR_FILTER_LENGTH]; - float CoefB[IVAS_REV_MAX_IIR_FILTER_LENGTH]; - float pBuffer[IVAS_REV_MAX_IIR_FILTER_LENGTH]; - -} ivas_rev_iir_filter_t; - - -typedef float rv_fftwf_type_complex[2]; /* complex type of fftwf library */ - -/* Convertion block for FFT filter: from time domain to frequency domain (with OLS) and back */ -typedef struct ivas_reverb_t2f_f2t_t -{ - int16_t fft_size; - int16_t log2_fft_size; - int16_t block_size; - int16_t hist_size; /* rv_fft_size - rv_block_size */ - float fft_history_L[RV_FILTER_MAX_HISTORY]; - float fft_history_R[RV_FILTER_MAX_HISTORY]; - -} ivas_reverb_t2f_f2t_t; - -/* FFT filter with its frequency response coefficients */ -typedef struct ivas_reverb_fft_filter_t -{ - int16_t fft_size; - float fft_spectrum[RV_FILTER_MAX_FFT_SIZE]; - -} ivas_reverb_fft_filter_t; - - -typedef struct ivas_reverb_state_t -{ - RENDER_CONFIG_DATA pConfig; - - /* input downmixer: */ - float dmx_gain; /* downmix gain */ - - /* predelay: */ - ivas_rev_delay_line_t predelay_line; - float *pPredelay_buffer; - - /* jot reverberator: */ - uint16_t nr_of_branches; /* number of feedback loops */ - ivas_rev_delay_line_t delay_line[IVAS_REV_MAX_NR_BRANCHES]; /* feedback loop delays */ - float *loop_delay_buffer[IVAS_REV_MAX_NR_BRANCHES]; /* feedback loop delay sample buffers */ - ivas_rev_iir_filter_t t60[IVAS_REV_MAX_NR_BRANCHES]; /* feedback loop filters */ - float gain_matrix[IVAS_REV_MAX_NR_BRANCHES][IVAS_REV_MAX_NR_BRANCHES]; /* feedback matrix */ - float mixer[BINAURAL_CHANNELS][IVAS_REV_MAX_NR_BRANCHES]; /* output mixer matrix */ - - /* binauralization filters: */ - int16_t do_corr_filter; - ivas_reverb_t2f_f2t_t fft_filter_ols; - ivas_reverb_fft_filter_t fft_filter_correl_0; - ivas_reverb_fft_filter_t fft_filter_correl_1; - ivas_reverb_fft_filter_t fft_filter_color_0; - ivas_reverb_fft_filter_t fft_filter_color_1; - uint16_t fft_size; /* fft processing size */ - uint16_t fft_subblock_size; /* fft block processing size */ - uint16_t num_fft_subblocks; /* number of fft subblocks */ - uint16_t full_block_size; /* full block processing size */ - -} REVERB_DATA, *REVERB_HANDLE; - - -typedef struct ivas_orient_trk_state_t -{ - OTR_TRACKING_T trackingType; - float centerAdaptationRate; - float offCenterAdaptationRate; - float adaptationAngle; - - float alpha; - - float absYaw; /* absolute orientation */ - float absPitch; - float absRoll; - - float absAvgYaw; /* average absolute orientation */ - float absAvgPitch; - float absAvgRoll; - - float refYaw; /* reference orientation */ - float refPitch; - float refRoll; - - float trkYaw; /* tracked orientation */ - float trkPitch; - float trkRoll; - -} ivas_orient_trk_state_t; - - -/* Main Crend structure */ -typedef struct ivas_crend_state_t -{ - float *freq_buffer_re[MAX_INTERN_CHANNELS]; - float *freq_buffer_im[MAX_INTERN_CHANNELS]; - float *freq_buffer_re_diffuse; - float *freq_buffer_im_diffuse; - float *prev_out_buffer[BINAURAL_CHANNELS]; - float *lfe_delay_line; - float m_fYaw; - float m_fPitch; - float m_fRoll; - ivas_orient_trk_state_t *hTrack; - REVERB_HANDLE hReverb; - int16_t delay_line_rw_index; - int16_t diffuse_delay_line_rw_index; - -} CREND_DATA, *CREND_HANDLE; - - -/*----------------------------------------------------------------------------------* - * LFE decoder structure - *----------------------------------------------------------------------------------*/ - -typedef struct ivas_lfe_dec_data_structure -{ - ivas_filters_process_state_t filter_state; - LFE_WINDOW_HANDLE pWindow_state; - const uint16_t *cum_freq_models[IVAS_MAX_NUM_QUANT_STRATS][IVAS_MAX_NUM_DCT_COEF_GROUPS]; - int16_t lfe_dec_indices_coeffs_tbl[IVAS_MAX_NUM_QUANT_STRATS][IVAS_MAX_NUM_DCT_COEF_GROUPS]; - float lfe_block_delay_s; - int16_t lfe_prior_buf_len; - float *prior_out_buffer; - - float *prevsynth_buf; - float *lfe_delay_buf; - int16_t lfe_addl_delay; - int16_t bfi_count; - -} LFE_DEC_DATA, *LFE_DEC_HANDLE; - - -/*----------------------------------------------------------------------------------* - * Limiter structure - *----------------------------------------------------------------------------------*/ - -typedef struct -{ - int16_t max_num_channels; - int16_t num_channels; - float **channel_ptrs; - int32_t sampling_rate; - float gain; - float release_heuristic; - float attack_constant; - int16_t strong_saturation_count; -#ifdef DEBUGGING - int32_t cnt_frames_limited; /* counter of frames in which the limiter is applied */ -#endif - -} IVAS_LIMITER, *IVAS_LIMITER_HANDLE; - - /*----------------------------------------------------------------------------------* * Decoder configuration structure *----------------------------------------------------------------------------------*/ @@ -2054,14 +1146,14 @@ typedef struct decoder_config_structure int16_t Opt_LsCustom; /* indicates whether loudspeaker custom setup is used */ int16_t Opt_HRTF_binary; /* indicates whether HRTF binary file is used */ int16_t Opt_Headrotation; /* indicates whether head-rotation is used */ + int16_t Opt_RendConfigCustom; /* indicates whether Renderer configuration custom setup is used */ int16_t orientation_tracking; /* indicates orientation tracking type */ float no_diegetic_pan; int16_t Opt_AMR_WB; /* flag indicating AMR-WB IO mode */ /* temp. development parameters */ #ifdef DEBUGGING - int16_t forceSubframeBinauralization; /* Flag for forcing Parametric binauralizer to subframe mode */ - int16_t force_rend; /* forced TD/CLDFB binaural renderer (for ISM and MC) */ + int16_t force_rend; /* forced TD/CLDFB binaural renderer (for ISM and MC) */ #endif } DECODER_CONFIG, *DECODER_CONFIG_HANDLE; @@ -2128,6 +1220,7 @@ typedef struct Decoder_Struct /* multichannel modules */ ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS]; /* ISM metadata handles (storage for one frame of read ISM metadata) */ + ISM_DTX_DATA_DEC hISMDTX; /* ISM DTX structure */ ISM_RENDERER_HANDLE hIsmRendererData; /* ISM renderer handle */ DIRAC_DEC_HANDLE hDirAC; /* DirAC handle */ SPAR_DEC_HANDLE hSpar; /* SPAR handle */ @@ -2138,6 +1231,7 @@ typedef struct Decoder_Struct LFE_DEC_HANDLE hLFE; /* LFE handle */ ISM_MODE ism_mode; /* ISM format mode */ + int16_t nchan_ism; /* number of ISM channels */ SBA_MODE sba_mode; /* SBA format mode */ MC_MODE mc_mode; /* MC format mode */ int16_t sba_order; /* Ambisonic (SBA) order */ @@ -2157,17 +1251,23 @@ typedef struct Decoder_Struct EFAP_HANDLE hEFAPdata; /* EFAP structure */ VBAP_HANDLE hVBAPdata; /* VBAP structure */ MONO_DOWNMIX_RENDERER_HANDLE hMonoDmxRenderer; /* Mono downmix structure */ - CREND_HANDLE hCrend; /* Convolution mixer renderer structure */ - HRTFS_HANDLE hHrtf; /* HRTFs handle */ + CREND_WRAPPER_HANDLE hCrendWrapper; + REVERB_HANDLE hReverb; /* Reverb handle */ + HRTFS_CREND_HANDLE hSetOfHRTF; /* Set of HRTFs handle (CRend) */ + HRTFS_FASTCONV_HANDLE hHrtfFastConv; /* FASTCONV HRTF tables for binaural rendering */ + HRTFS_PARAMBIN_HANDLE hHrtfParambin; /* HRTF tables for parametric binauralizer */ LSSETUP_CUSTOM_HANDLE hLsSetupCustom; /* Custom LS configuration handle */ float *hoa_dec_mtx; /* Pointer to decoder matrix for SBA */ HEAD_TRACK_DATA_HANDLE hHeadTrackData; /* Head tracking data structure */ RENDER_CONFIG_DATA *hRenderConfig; /* Renderer config pointer */ - int32_t binaural_latency_ns; /* HRTF binauralization latency in ns */ + int32_t binaural_latency_ns; /* Binauralization latency in ns */ #ifdef DEBUGGING int32_t noClipping; /* number of clipped samples */ #endif + int32_t last_active_ivas_total_brate; + int16_t ism_extmeta_active; /* Extended metadata active in decoder */ + int16_t ism_extmeta_cnt; /* Change frame counter for extended metadata */ #ifdef SPLIT_REND_WITH_HEAD_ROT IVAS_DEC_SPLIT_REND_WRAPPER splitBinRend; diff --git a/lib_dec/ivas_stereo_adapt_GR_dec.c b/lib_dec/ivas_stereo_adapt_GR_dec.c index ec84df9831..7e698f6169 100644 --- a/lib_dec/ivas_stereo_adapt_GR_dec.c +++ b/lib_dec/ivas_stereo_adapt_GR_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,7 +33,7 @@ #include #include "options.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" #include "ivas_prot.h" #include "ivas_rom_com.h" #include "rom_dec.h" diff --git a/lib_dec/ivas_stereo_cng_dec.c b/lib_dec/ivas_stereo_cng_dec.c index ac7f942b2a..2e31375996 100644 --- a/lib_dec/ivas_stereo_cng_dec.c +++ b/lib_dec/ivas_stereo_cng_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------- * Local constants @@ -90,8 +90,12 @@ void stereo_dft_dec_sid_coh( int16_t bits_tmp; int16_t b; +#ifdef FIX_418_SID_BITRATE + nr_of_sid_stereo_bits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; +#else /* TODO: still use old number of bits to keep bitexactness in output */ nr_of_sid_stereo_bits = ( 4400 /*IVAS_SID_5k2*/ - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; +#endif /* If the coherence is not encoded due to lack of bits set alpha to zero which leads to that the coherence */ /* from the previous frame is used. */ @@ -174,7 +178,10 @@ void stereo_dft_dec_sid_coh( ( *nb_bits )++; } +#ifndef FIX_418_SID_BITRATE dtx_read_padding_bits( st, ( IVAS_SID_5k2 - 4400 ) / FRAMES_PER_SEC ); +#endif + return; } @@ -225,7 +232,7 @@ static void stereo_dft_generate_comfort_noise( hFdCngCom = st->hFdCngDec->hFdCngCom; - wmops_sub_start( "DFT_CNG" ); + push_wmops( "DFT_CNG" ); set_f( dmpf, 0.0f, M + 2 ); set_f( Atmp, 0.0f, M + 2 ); @@ -625,7 +632,7 @@ static void stereo_dft_generate_comfort_noise( st->hFdCngDec->ms_last_inactive_bwidth = st->bwidth; } - wmops_sub_end(); + pop_wmops(); return; } diff --git a/lib_dec/ivas_stereo_dft_dec.c b/lib_dec/ivas_stereo_dft_dec.c index 32d3510f80..1fac575de9 100644 --- a/lib_dec/ivas_stereo_dft_dec.c +++ b/lib_dec/ivas_stereo_dft_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -45,7 +45,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* @@ -76,7 +76,7 @@ * Local function prototypes *-------------------------------------------------------------------------*/ -static void stereo_dft_dec_open( STEREO_DFT_DEC_DATA_HANDLE hStereoDft, const int32_t output_Fs ); +static void stereo_dft_dec_open( STEREO_DFT_DEC_DATA_HANDLE hStereoDft, const int32_t output_Fs, const int16_t nchan_transport ); static void stereo_dft_compute_td_stefi_params( STEREO_DFT_DEC_DATA_HANDLE hStereoDft, const float samp_ratio ); @@ -251,7 +251,8 @@ ivas_error stereo_dft_dec_create( STEREO_DFT_DEC_DATA_HANDLE *hStereoDft, /* i/o: decoder DFT stereo handle */ const int32_t element_brate, /* i : element bitrate */ const int32_t output_Fs, /* i : output sampling rate */ - const int16_t sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */ + const int16_t sba_dirac_stereo_flag, /* i : signal stereo output for SBA DirAC */ + const int16_t nchan_transport /* i : number of transport channels */ ) { STEREO_DFT_DEC_DATA_HANDLE hStereoDft_loc; @@ -262,22 +263,22 @@ ivas_error stereo_dft_dec_create( return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: DFT Stereo memory already allocated\n" ); } - if ( ( hStereoDft_loc = (STEREO_DFT_DEC_DATA_HANDLE) count_malloc( sizeof( STEREO_DFT_DEC_DATA ) ) ) == NULL ) + if ( ( hStereoDft_loc = (STEREO_DFT_DEC_DATA_HANDLE) malloc( sizeof( STEREO_DFT_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DFT Stereo\n" ) ); } - if ( ( hStereoDft_loc->hConfig = (STEREO_DFT_CONFIG_DATA_HANDLE) count_malloc( sizeof( STEREO_DFT_CONFIG_DATA ) ) ) == NULL ) + if ( ( hStereoDft_loc->hConfig = (STEREO_DFT_CONFIG_DATA_HANDLE) malloc( sizeof( STEREO_DFT_CONFIG_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DFT Stereo Config\n" ) ); } - if ( ( hStereoDft_loc->hBpf = (BPF_DEC_HANDLE) count_malloc( sizeof( BPF_DEC_DATA ) ) ) == NULL ) + if ( ( hStereoDft_loc->hBpf = (BPF_DEC_HANDLE) malloc( sizeof( BPF_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for BPF handle\n" ) ); } - if ( ( hStereoDft_loc->hTcxLtpDec = (TCX_LTP_DEC_HANDLE) count_malloc( sizeof( TCX_LTP_DEC_DATA ) ) ) == NULL ) + if ( ( hStereoDft_loc->hTcxLtpDec = (TCX_LTP_DEC_HANDLE) malloc( sizeof( TCX_LTP_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TCX-LTP handle\n" ) ); } @@ -293,7 +294,8 @@ ivas_error stereo_dft_dec_create( stereo_dft_config( hStereoDft_loc->hConfig, element_brate, &tmpS, &tmpS ); } - stereo_dft_dec_open( hStereoDft_loc, output_Fs ); + stereo_dft_dec_open( hStereoDft_loc, output_Fs, + nchan_transport ); *hStereoDft = hStereoDft_loc; @@ -309,10 +311,10 @@ ivas_error stereo_dft_dec_create( static void stereo_dft_dec_open( STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder DFT stereo handle */ - const int32_t output_Fs /* i : output sampling rate */ + const int32_t output_Fs, /* i : output sampling rate */ + const int16_t nchan_transport /* i : number of transport channels */ ) { - /*Sizes*/ hStereoDft->N = (int16_t) ( STEREO_DFT_HOP_MAX * output_Fs / 48000 ); @@ -365,6 +367,17 @@ static void stereo_dft_dec_open( hStereoDft->hb_stefi_delay = NS2SA( output_Fs, STEREO_DFT_TD_STEFI_DELAY_NS ); + if ( nchan_transport > 2 ) + { + hStereoDft->min_smooth_gains = min_smooth_gains2; + hStereoDft->max_smooth_gains = max_smooth_gains2; + } + else + { + hStereoDft->min_smooth_gains = min_smooth_gains1; + hStereoDft->max_smooth_gains = max_smooth_gains1; + } + /* reset DFT stereo memories */ stereo_dft_dec_reset( hStereoDft ); @@ -383,6 +396,7 @@ void stereo_dft_dec_reset( ) { int16_t i; + int16_t j, b; /*Configuration*/ set_s( hStereoDft->prm_res, hStereoDft->hConfig->prm_res, STEREO_DFT_DEC_DFT_NB ); @@ -480,7 +494,6 @@ void stereo_dft_dec_reset( set_zero( hStereoDft->smooth_fac[0], SBA_DIRAC_STEREO_NUM_BANDS ); set_zero( hStereoDft->smooth_fac[1], SBA_DIRAC_STEREO_NUM_BANDS ); -#ifdef FIX_ITD_CNG hStereoDft->itd_xfade_target = 0.0f; hStereoDft->itd_xfade_step = 0.0f; hStereoDft->itd_xfade_counter = 0; @@ -490,7 +503,21 @@ void stereo_dft_dec_reset( hStereoDft->ipd_xfade_step = 0.0f; hStereoDft->ipd_xfade_counter = 0; hStereoDft->ipd_xfade_prev = 0.0f; -#endif + + for ( b = 0; b < hStereoDft->nbands; b++ ) + { + for ( i = 0; i < 2; i++ ) + { + for ( j = 0; j < 4; j++ ) + { + hStereoDft->mixer_mat_smooth[i][j][b] = 0.0f; + } + } + } + hStereoDft->first_frame = 1; + hStereoDft->g_L_prev = 0.f; + hStereoDft->g_R_prev = 0.f; + return; } @@ -592,23 +619,23 @@ void stereo_dft_dec_destroy( if ( hStereoDft->hConfig != NULL ) { - count_free( hStereoDft->hConfig ); + free( hStereoDft->hConfig ); hStereoDft->hConfig = NULL; } if ( hStereoDft->hBpf != NULL ) { - count_free( hStereoDft->hBpf ); + free( hStereoDft->hBpf ); hStereoDft->hBpf = NULL; } if ( hStereoDft->hTcxLtpDec != NULL ) { - count_free( hStereoDft->hTcxLtpDec ); + free( hStereoDft->hTcxLtpDec ); hStereoDft->hTcxLtpDec = NULL; } - count_free( hStereoDft ); + free( hStereoDft ); hStereoDft = NULL; return; @@ -652,7 +679,7 @@ void stereo_dft_dec_analyze( int16_t mem_size; int16_t ovl2; - wmops_sub_start( "DFT_analysis" ); + push_wmops( "DFT_analysis" ); hStereoDft = hCPE->hStereoDft; @@ -774,7 +801,7 @@ void stereo_dft_dec_analyze( if ( hCPE->nchan_out == 1 && hCPE->hStereoDft->hConfig->res_cod_mode == STEREO_DFT_RES_COD_OFF ) { - wmops_sub_end(); + pop_wmops(); return; } @@ -925,7 +952,7 @@ void stereo_dft_dec_analyze( } } - wmops_sub_end(); + pop_wmops(); return; } @@ -955,7 +982,7 @@ void stereo_dft_dec_synthesize( int16_t ovl2, flat_portion_end; float ola_buff[STEREO_DFT32MS_OVL2_MAX]; int16_t moffset; - wmops_sub_start( "DFT_synthesis" ); + push_wmops( "DFT_synthesis" ); /*-----------------------------------------------------------------* * Initialization @@ -1081,7 +1108,7 @@ void stereo_dft_dec_synthesize( } #endif - wmops_sub_end(); + pop_wmops(); return; } @@ -1098,7 +1125,12 @@ void stereo_dft_dec( float DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* i/o: DFT buffers */ float *input_mem, /* i/o: mem of buffer DFT analysis */ STEREO_CNG_DEC_HANDLE hStereoCng, /* i/o: Stereo CNG data structure */ - const int16_t sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */ + const int16_t sba_dirac_stereo_flag, /* i : signal stereo output for SBA DirAC */ + const int16_t sba_mono_flag, /* i : signal mono output for SBA DirAC */ + ivas_spar_md_dec_state_t *hMdDec, /* i : SPAR MD handle for upmixing */ + const int16_t cross_fade_start_offset, /* i : SPAR mixer delay compensation */ + const int32_t output_Fs, /* i : Fs for delay calculation */ + const int16_t nchan_transport /* i : number of transpor channels */ ) { int16_t i, k, b, N_div, stop; @@ -1106,6 +1138,7 @@ void stereo_dft_dec( float DFT_R[STEREO_DFT32MS_N_MAX]; float DFT_PRED_RES[STEREO_DFT32MS_N_32k]; float *pDFT_DMX; + float *pDFT_DMX1; float *pDFT_RES; float g, tmp; float *pPredGain; @@ -1129,6 +1162,8 @@ void stereo_dft_dec( HANDLE_FD_CNG_COM hFdCngCom = hFdCngDec->hFdCngCom; int16_t *cna_seed = &( hFdCngCom->seed ); + float DFT_W, DFT_Y; + output_frame = (int16_t) ( st0->output_Fs / FRAMES_PER_SEC ); /*------------------------------------------------------------------* @@ -1170,15 +1205,14 @@ void stereo_dft_dec( /* Smoothing for the current frame */ if ( sba_dirac_stereo_flag ) { - ivas_sba_dirac_stereo_smooth_parameters( hStereoDft ); + ivas_sba_dirac_stereo_smooth_parameters( hStereoDft, + hMdDec, + cross_fade_start_offset, + output_Fs ); } else { -#ifdef FIX_ITD_CNG stereo_dft_dec_smooth_parameters( hStereoDft, hStereoCng->prev_sid_nodata, hStereoCng->active_frame_counter, st0->element_brate ); -#else - stereo_dft_dec_smooth_parameters( hStereoDft, hStereoCng->prev_sid_nodata ); -#endif } } @@ -1199,6 +1233,11 @@ void stereo_dft_dec( { pDFT_DMX = DFT[0] + k * STEREO_DFT32MS_N_MAX; pDFT_RES = DFT[1] + k * STEREO_DFT32MS_N_MAX; + pDFT_DMX1 = 0; + if ( nchan_transport > 1 ) + { + pDFT_DMX1 = DFT[1] + k * STEREO_DFT32MS_N_MAX; + } /*Apply Stereo*/ if ( hStereoDft->hConfig->dmx_active ) @@ -1242,7 +1281,10 @@ void stereo_dft_dec( hStereoDft->past_DMX_pos = ( hStereoDft->past_DMX_pos + STEREO_DFT_PAST_MAX - 1 ) % STEREO_DFT_PAST_MAX; } - stereo_dft_generate_res_pred( hStereoDft, samp_ratio, pDFT_DMX, DFT_PRED_RES, pPredGain, k, DFT[1] + k * STEREO_DFT32MS_N_MAX, &stop, st0->bfi ); + if ( !( sba_dirac_stereo_flag && nchan_transport >= 2 ) ) + { + stereo_dft_generate_res_pred( hStereoDft, samp_ratio, pDFT_DMX, DFT_PRED_RES, pPredGain, k, DFT[1] + k * STEREO_DFT32MS_N_MAX, &stop, st0->bfi ); + } if ( hStereoDft->res_cod_band_max > 0 ) { @@ -1314,7 +1356,7 @@ void stereo_dft_dec( #endif /* No residual coding in inactive frames, instead pDFT_RES is used for the second channel */ - if ( b >= hStereoDft->res_cod_band_max && !hStereoDft->frame_sid_nodata ) + if ( b >= hStereoDft->res_cod_band_max && !hStereoDft->frame_sid_nodata && !( sba_dirac_stereo_flag && hMdDec ) ) { /*filter non-coded frequencies. It removes some MDCT frequency aliasing*/ for ( i = hStereoDft->band_limits[b]; i < hStereoDft->band_limits[b + 1]; i++ ) @@ -1364,10 +1406,139 @@ void stereo_dft_dec( } } } + else if ( sba_dirac_stereo_flag && hMdDec ) + { + + if ( nchan_transport == 1 ) + { + if ( sba_mono_flag ) + { + if ( b == 0 ) + { + i = 0; + + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i]; + DFT_L[2 * i] = DFT_W; + DFT_R[2 * i] = 0.f; + + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1]; + DFT_L[2 * i + 1] = DFT_W; + DFT_R[2 * i + 1] = 0.f; + } + for ( i = hStereoDft->band_limits[b]; i < min( stop, hStereoDft->band_limits[b + 1] ); i++ ) + { + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i] + ( hStereoDft->mixer_mat_smooth[0][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i]; + DFT_L[2 * i] = DFT_W; + DFT_R[2 * i] = 0.f; + + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1] + ( hStereoDft->mixer_mat_smooth[0][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i + 1]; + DFT_L[2 * i + 1] = DFT_W; + DFT_R[2 * i + 1] = 0.f; + } + for ( ; i < hStereoDft->band_limits[b + 1]; i++ ) + { + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i]; + DFT_L[2 * i] = DFT_W; + DFT_R[2 * i] = 0.f; + + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1]; + DFT_L[2 * i + 1] = DFT_W; + DFT_R[2 * i + 1] = 0.f; + } + } + else + { + if ( b == 0 ) + { + i = 0; + + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i]; + DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i]; + + DFT_L[2 * i] = DFT_W + DFT_Y; + DFT_R[2 * i] = DFT_W - DFT_Y; + + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1]; + DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1]; + + DFT_L[2 * i + 1] = DFT_W + DFT_Y; + DFT_R[2 * i + 1] = DFT_W - DFT_Y; + } + for ( i = hStereoDft->band_limits[b]; i < min( stop, hStereoDft->band_limits[b + 1] ); i++ ) + { + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i] + ( hStereoDft->mixer_mat_smooth[0][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i]; + DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i] + ( hStereoDft->mixer_mat_smooth[1][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i]; + + DFT_L[2 * i] = DFT_W + DFT_Y; + DFT_R[2 * i] = DFT_W - DFT_Y; + + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1] + ( hStereoDft->mixer_mat_smooth[0][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i + 1]; + DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1] + ( hStereoDft->mixer_mat_smooth[1][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i + 1]; + + DFT_L[2 * i + 1] = DFT_W + DFT_Y; + DFT_R[2 * i + 1] = DFT_W - DFT_Y; + } + for ( ; i < hStereoDft->band_limits[b + 1]; i++ ) + { + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i]; + DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i]; + + DFT_L[2 * i] = DFT_W + DFT_Y; + DFT_R[2 * i] = DFT_W - DFT_Y; + + DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1]; + DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1]; + + DFT_L[2 * i + 1] = DFT_W + DFT_Y; + DFT_R[2 * i + 1] = DFT_W - DFT_Y; + } + } + } + else if ( nchan_transport >= 2 ) + { + if ( b == 0 ) + { + i = 0; + + DFT_W = pDFT_DMX[2 * i]; + DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i] + pDFT_DMX1[2 * i]; + + DFT_L[2 * i] = DFT_W + DFT_Y; + DFT_R[2 * i] = DFT_W - DFT_Y; + + DFT_W = pDFT_DMX[2 * i + 1]; + DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1] + pDFT_DMX1[2 * i + 1]; + + DFT_L[2 * i + 1] = DFT_W + DFT_Y; + DFT_R[2 * i + 1] = DFT_W - DFT_Y; + } + for ( i = hStereoDft->band_limits[b]; i < hStereoDft->band_limits[b + 1]; i++ ) + { + DFT_W = pDFT_DMX[2 * i]; + DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i] + pDFT_DMX1[2 * i]; + + DFT_L[2 * i] = DFT_W + DFT_Y; + DFT_R[2 * i] = DFT_W - DFT_Y; + + DFT_W = pDFT_DMX[2 * i + 1]; + DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1] + pDFT_DMX1[2 * i + 1]; + + DFT_L[2 * i + 1] = DFT_W + DFT_Y; + DFT_R[2 * i + 1] = DFT_W - DFT_Y; + } + } + else + { + assert( "nhcan_transport must be 1 or 1!" ); + } + } else { + + for ( i = hStereoDft->band_limits[b]; i < min( stop, hStereoDft->band_limits[b + 1] ); i++ ) { + tmp = g * pDFT_DMX[2 * i] + pDFT_RES[2 * i] + DFT_PRED_RES[2 * i]; DFT_L[2 * i] = pDFT_DMX[2 * i] + tmp; @@ -1762,9 +1933,7 @@ void stereo_dft_dec_read_BS( * Initialization *-----------------------------------------------------------------*/ -#ifdef FIX_ITD_CNG k_offset = STEREO_DFT_OFFSET; -#endif if ( ivas_total_brate == IVAS_SID_5k2 ) { @@ -1790,10 +1959,8 @@ void stereo_dft_dec_read_BS( hStereoDft->frame_sid = 0; *nb_bits = 0; *total_brate = 0; -#ifdef FIX_ITD_CNG hStereoDft->itd[k = hStereoDft->prm_res[k_offset] - 1 + k_offset] = hStereoDft->itd_xfade_target; hStereoDft->gipd[hStereoDft->prm_res[k_offset] - 1 + k_offset] = hStereoDft->ipd_xfade_target; -#endif return; } @@ -1824,9 +1991,6 @@ void stereo_dft_dec_read_BS( /*init*/ max_bits = *nb_bits; *nb_bits = 0; -#ifndef FIX_ITD_CNG - k_offset = STEREO_DFT_OFFSET; -#endif N_div = STEREO_DFT_NBDIV; if ( ivas_total_brate > IVAS_SID_5k2 ) @@ -2238,7 +2402,7 @@ void stereo_dft_dec_read_BS( fprintf( pF, "\nGain: %d ", I ); #endif - wmops_sub_start( "residual_decode" ); + push_wmops( "residual_decode" ); if ( I != ECSQ_GLOBAL_GAIN_INDEX_ALL_ZERO ) { ECSQ_init_instance( &ecsq_inst, 0 /*dummy index*/, &range_uni_dec_state ); @@ -2270,7 +2434,7 @@ void stereo_dft_dec_read_BS( } ( *nb_bits ) += n_bits; - wmops_sub_end(); + pop_wmops(); #ifdef DEBUG_MODE_DFT fprintf( pF, "%d (max: %d)", n_bits + STEREO_DFT_RES_GLOBAL_GAIN_BITS, max_bits ); @@ -2427,7 +2591,7 @@ void stereo_dft_generate_res_pred( float g2; int16_t nbands_respred; - wmops_sub_start( "gen_respred" ); + push_wmops( "gen_respred" ); /* smoothing and limiting parameters */ alpha = hStereoDft->wasTransient ? 0 : 0.2f; /* no smoothing after transients */ @@ -2759,7 +2923,7 @@ void stereo_dft_generate_res_pred( } } - wmops_sub_end(); + pop_wmops(); return; } @@ -2773,12 +2937,9 @@ void stereo_dft_generate_res_pred( void stereo_dft_dec_smooth_parameters( STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder DFT stereo handle */ - const int16_t prev_sid_nodata /* i : Previous SID/No data indicator */ -#ifdef FIX_ITD_CNG - , - const int16_t active_frame_counter, /* i : Active frame counter */ - const int32_t element_brate /* i : Element bitrate */ -#endif + const int16_t prev_sid_nodata, /* i : Previous SID/No data indicator */ + const int16_t active_frame_counter, /* i : Active frame counter */ + const int32_t element_brate /* i : Element bitrate */ ) { int16_t k_offset, k, k2, b, N_div; @@ -2800,7 +2961,6 @@ void stereo_dft_dec_smooth_parameters( *( hStereoDft->side_gain + ( ( k + k_offset ) - 1 ) * STEREO_DFT_BAND_MAX + b ) = *( hStereoDft->side_gain + ( k + k_offset ) * STEREO_DFT_BAND_MAX + b ); } -#ifdef FIX_ITD_CNG if ( hStereoDft->frame_sid_nodata ) { /* set new xfade target if new itd received */ @@ -2841,14 +3001,12 @@ void stereo_dft_dec_smooth_parameters( hStereoDft->ipd_xfade_counter = 0; } } -#endif for ( k2 = 1; k2 < hStereoDft->prm_res[k + k_offset]; k2++ ) { hStereoDft->gipd[( k + k_offset ) - k2] = hStereoDft->gipd[k + k_offset]; } -#ifdef FIX_ITD_CNG if ( hStereoDft->frame_sid_nodata ) { /* set new xfade target if new itd received */ @@ -2878,7 +3036,6 @@ void stereo_dft_dec_smooth_parameters( hStereoDft->last_active_element_brate = element_brate; } -#endif for ( k2 = 1; k2 < hStereoDft->prm_res[k + k_offset]; k2++ ) { hStereoDft->itd[( k + k_offset ) - k2] = hStereoDft->itd[k + k_offset]; @@ -2887,7 +3044,6 @@ void stereo_dft_dec_smooth_parameters( return; } -#ifdef FIX_ITD_CNG /* Active frame, "reset" everything "reset" everything if long enough active encoding */ if ( active_frame_counter > STEREO_DFT_ITD_CNG_XFADE_RESET ) { @@ -2898,11 +3054,8 @@ void stereo_dft_dec_smooth_parameters( hStereoDft->ipd_xfade_target = hStereoDft->gipd[STEREO_DFT_NBDIV - 1]; hStereoDft->ipd_xfade_prev = hStereoDft->gipd[STEREO_DFT_NBDIV - 1]; } -#endif -#ifdef FIX_ITD_CNG hStereoDft->last_active_element_brate = element_brate; -#endif for ( k = hStereoDft->prm_res[k_offset] - 1; k < N_div; k += hStereoDft->prm_res[k + k_offset] ) { diff --git a/lib_dec/ivas_stereo_dft_dec_dmx.c b/lib_dec/ivas_stereo_dft_dec_dmx.c index f58b6ddca4..561f9d016b 100644 --- a/lib_dec/ivas_stereo_dft_dec_dmx.c +++ b/lib_dec/ivas_stereo_dft_dec_dmx.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------- @@ -130,11 +130,7 @@ void stereo_dft_unify_dmx( ( st0->core == TCX_20_CORE && ( ( st0->hTcxCfg->tcx_last_overlap_mode == MIN_OVERLAP ) || ( st0->hTcxCfg->tcx_last_overlap_mode == HALF_OVERLAP ) ) ) || ( st0->core == TCX_10_CORE ); /* Smoothing for the current frame */ -#ifdef FIX_ITD_CNG stereo_dft_dec_smooth_parameters( hStereoDft, prev_sid_nodata, st0->hFdCngDec->hFdCngCom->active_frame_counter, st0->element_brate ); -#else - stereo_dft_dec_smooth_parameters( hStereoDft, prev_sid_nodata ); -#endif for ( k = 0; k < N_div; k++ ) { diff --git a/lib_dec/ivas_stereo_dft_plc.c b/lib_dec/ivas_stereo_dft_plc.c index 34eaa2013c..4c026dfb79 100644 --- a/lib_dec/ivas_stereo_dft_plc.c +++ b/lib_dec/ivas_stereo_dft_plc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------- * Local constants diff --git a/lib_dec/ivas_stereo_eclvq_dec.c b/lib_dec/ivas_stereo_eclvq_dec.c index 41ed8924d1..b47c3d219c 100644 --- a/lib_dec/ivas_stereo_eclvq_dec.c +++ b/lib_dec/ivas_stereo_eclvq_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #include "ivas_rom_dec.h" #include #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------- diff --git a/lib_dec/ivas_stereo_esf_dec.c b/lib_dec/ivas_stereo_esf_dec.c index 0ab8bcdb49..ff7e810e88 100644 --- a/lib_dec/ivas_stereo_esf_dec.c +++ b/lib_dec/ivas_stereo_esf_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * init_basic_allpass() diff --git a/lib_dec/ivas_stereo_ica_dec.c b/lib_dec/ivas_stereo_ica_dec.c index 122f739dba..b62857a869 100644 --- a/lib_dec/ivas_stereo_ica_dec.c +++ b/lib_dec/ivas_stereo_ica_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" #include "rom_com.h" #include "ivas_rom_com.h" diff --git a/lib_dec/ivas_stereo_icbwe_dec.c b/lib_dec/ivas_stereo_icbwe_dec.c index 6c3fef9eae..78196eaaa8 100644 --- a/lib_dec/ivas_stereo_icbwe_dec.c +++ b/lib_dec/ivas_stereo_icbwe_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #include "ivas_cnst.h" #include "prot.h" #include "ivas_prot.h" -#include "wmops.h" +#include "wmc_auto.h" #include "rom_com.h" #include "ivas_rom_com.h" #ifdef DEBUGGING diff --git a/lib_dec/ivas_stereo_mdct_core_dec.c b/lib_dec/ivas_stereo_mdct_core_dec.c index d0d05f1fa0..cbeaf2a1e5 100644 --- a/lib_dec/ivas_stereo_mdct_core_dec.c +++ b/lib_dec/ivas_stereo_mdct_core_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------- @@ -50,8 +50,10 @@ *-------------------------------------------------------------------------*/ static void apply_dmx_weights( CPE_DEC_HANDLE hCPE, float *x[CPE_CHANNELS][NB_DIV], int16_t transform_type_left[NB_DIV], int16_t transform_type_right[NB_DIV] ); + static void run_min_stats( Decoder_State **sts, float *x[CPE_CHANNELS][NB_DIV] ); + /*-------------------------------------------------------------------* * convert_coeffs_to_higher_res() * @@ -181,7 +183,7 @@ void stereo_mdct_core_dec( float signal_out_tmp[CPE_CHANNELS][L_FRAME_PLUS]; - wmops_sub_start( "stereo_mdct_core_dec" ); + push_wmops( "stereo_mdct_core_dec" ); /*--------------------------------------------------------------------------------* * Initializations @@ -219,7 +221,8 @@ void stereo_mdct_core_dec( if ( !bfi ) { - ivas_mdct_dec_side_bits_frame_channel( hCPE, param_lpc, p_param, hCPE->hCoreCoder[0], NULL, nTnsBitsTCX10, param, 0, 0 ); + ivas_mdct_dec_side_bits_frame_channel( hCPE, param_lpc, p_param, hCPE->hCoreCoder[0], + nTnsBitsTCX10, param, 0, 0 ); if ( sts[0]->igf ) { @@ -250,7 +253,8 @@ void stereo_mdct_core_dec( } } - ivas_mdct_core_invQ( hCPE, 0, nTnsBitsTCX10, p_param, param_lpc, param, fUseTns, tnsData, x_0, x, Aq, ms_mask, 0 ); + ivas_mdct_core_invQ( hCPE, + nTnsBitsTCX10, p_param, param_lpc, param, fUseTns, tnsData, x_0, x, Aq, ms_mask, 0 ); for ( ch = 0; ch < nChannels; ch++ ) { @@ -343,7 +347,8 @@ void stereo_mdct_core_dec( stereo_decoder_tcx( hCPE->hStereoMdct, ms_mask, x_0[1], x[0], x[1], &hCPE->hStereoMdct->mdct_stereo_mode[0], sts[0]->core, sts[1]->core, sts[0]->igf, L_frameTCX[0], L_frameTCX[1], 0, sts[0]->last_core, sts[1]->last_core, 0 ); } - ivas_mdct_core_tns_ns( hCPE, 0, fUseTns, tnsData, x, Aq, 0 ); + ivas_mdct_core_tns_ns( hCPE, + fUseTns, tnsData, x, Aq, 0 ); if ( st_ivas->renderer_type == RENDERER_MC_PARAMMC && ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) ) { @@ -357,7 +362,8 @@ void stereo_mdct_core_dec( apply_dmx_weights( hCPE, x, sts[0]->transform_type, sts[1]->transform_type ); } - ivas_mdct_core_reconstruct( hCPE, x, signal_outFB_tmp, 0, fUseTns, 0 ); + ivas_mdct_core_reconstruct( hCPE, x, signal_outFB_tmp, + fUseTns, 0 ); mvr2r( signal_out_tmp[0], signal_out[0], L_FRAME48k ); mvr2r( signal_out_tmp[1], signal_out[1], L_FRAME48k ); @@ -365,7 +371,7 @@ void stereo_mdct_core_dec( mvr2r( signal_outFB_tmp[0], signal_outFB[0], hCPE->hCoreCoder[0]->hTcxDec->L_frameTCX ); mvr2r( signal_outFB_tmp[1], signal_outFB[1], hCPE->hCoreCoder[1]->hTcxDec->L_frameTCX ); - wmops_sub_end(); + pop_wmops(); return; } @@ -647,4 +653,6 @@ static void run_min_stats( /* restore VAD (see above) */ st->VAD = save_VAD[ch]; } + + return; } diff --git a/lib_dec/ivas_stereo_mdct_stereo_dec.c b/lib_dec/ivas_stereo_mdct_stereo_dec.c index 67b893a9f2..0e788a0821 100644 --- a/lib_dec/ivas_stereo_mdct_stereo_dec.c +++ b/lib_dec/ivas_stereo_mdct_stereo_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,7 +37,7 @@ #include "ivas_cnst.h" #include "ivas_prot.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* @@ -67,6 +67,7 @@ void parse_stereo_from_bitstream( #ifdef DEBUGGING int16_t nbits_start = st0->next_bit_pos; #endif + if ( !isSBAStereoMode ) { nSubframes = ( sts[0]->core == TCX_10_CORE || ( sts[0]->core != sts[1]->core ) ) ? NB_DIV : 1; @@ -176,6 +177,7 @@ void parse_stereo_from_bitstream( } } } + if ( !mct_on ) { hStereoMdct->split_ratio = SMDCT_EQUAL_RATIO_RANGE; /* Equal bits to both channels */ @@ -327,11 +329,11 @@ void stereo_decoder_tcx( hStereoMdct->reverse_dmx = 0; } - if ( ( nrgRatio > 1.0f ) && ( k < ( ( core_r == TCX_20_CORE ) ? 1 : NB_DIV ) ) ) + if ( ( nrgRatio > 1.0f ) && ( k < ( ( core_r == TCX_10_CORE ) ? NB_DIV : 1 ) ) ) { v_multc( spec_r[k], nrgRatio, spec_r[k], L_frameTCX_r ); } - else if ( ( nrgRatio < 1.0f ) && ( k < ( ( core_l == TCX_20_CORE ) ? 1 : NB_DIV ) ) ) + else if ( ( nrgRatio < 1.0f ) && ( k < ( ( core_l == TCX_10_CORE ) ? NB_DIV : 1 ) ) ) { v_multc( spec_l[k], 1.0f / nrgRatio, spec_l[k], L_frameTCX_l ); } @@ -466,11 +468,22 @@ ivas_error initMdctStereoDtxData( /* Init FD-CNG */ initFdCngDec( st ); +#ifndef FIX_413_SBA_DTX + if ( ch == 1 && st->cng_sba_flag ) + { + st->hFdCngDec->hFdCngCom->seed += 3; + } +#endif + } +#ifdef FIX_413_SBA_DTX + if ( st->first_CNG == 0 ) + { if ( ch == 1 && st->cng_sba_flag ) { st->hFdCngDec->hFdCngCom->seed += 3; } } +#endif if ( st->cldfbAna == NULL ) { @@ -655,7 +668,7 @@ void applyDmxMdctStereo( fade = 0.f; dmx_len = crossfade_len; } - else if ( hCPE->last_element_mode == IVAS_CPE_DFT && hCPE->last_element_brate <= IVAS_24k4 ) + else if ( hCPE->last_element_mode == IVAS_CPE_DFT && hCPE->last_element_brate <= IVAS_32k ) { crossfade_len = NS2SA( hCPE->hCoreCoder[0]->output_Fs, DELAY_CLDFB_NS ); step /= crossfade_len; diff --git a/lib_dec/ivas_stereo_switching_dec.c b/lib_dec/ivas_stereo_switching_dec.c index 56c1cfef54..0a436ec0d2 100644 --- a/lib_dec/ivas_stereo_switching_dec.c +++ b/lib_dec/ivas_stereo_switching_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,8 @@ #include "prot.h" #include "ivas_prot.h" #include "ivas_rom_com.h" -#include "wmops.h" +#include "assert.h" +#include "wmc_auto.h" #include @@ -56,7 +57,7 @@ static ivas_error allocate_CoreCoder_TCX( { if ( st->hTcxDec == NULL ) { - if ( ( st->hTcxDec = (TCX_DEC_HANDLE) count_malloc( sizeof( TCX_DEC_DATA ) ) ) == NULL ) + if ( ( st->hTcxDec = (TCX_DEC_HANDLE) malloc( sizeof( TCX_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for hTcxDec" ) ); } @@ -70,7 +71,7 @@ static ivas_error allocate_CoreCoder_TCX( if ( st->hTcxCfg == NULL ) { - if ( ( st->hTcxCfg = (TCX_CONFIG_HANDLE) count_malloc( sizeof( TCX_config ) ) ) == NULL ) + if ( ( st->hTcxCfg = (TCX_CONFIG_HANDLE) malloc( sizeof( TCX_config ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for hTcxCfg" ) ); } @@ -79,7 +80,7 @@ static ivas_error allocate_CoreCoder_TCX( /* allocated TCX-LTP structure for second channel */ if ( st->hTcxLtpDec == NULL ) { - if ( ( st->hTcxLtpDec = (TCX_LTP_DEC_HANDLE) count_malloc( sizeof( TCX_LTP_DEC_DATA ) ) ) == NULL ) + if ( ( st->hTcxLtpDec = (TCX_LTP_DEC_HANDLE) malloc( sizeof( TCX_LTP_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for TCX-LTP handle\n" ) ); } @@ -90,7 +91,7 @@ static ivas_error allocate_CoreCoder_TCX( /* allocate HQ structure */ if ( st->hHQ_core == NULL ) { - if ( ( st->hHQ_core = (HQ_DEC_HANDLE) count_malloc( sizeof( HQ_DEC_DATA ) ) ) == NULL ) + if ( ( st->hHQ_core = (HQ_DEC_HANDLE) malloc( sizeof( HQ_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for HQ core\n" ) ); } @@ -100,7 +101,7 @@ static ivas_error allocate_CoreCoder_TCX( if ( st->hIGFDec == NULL ) { - if ( ( st->hIGFDec = (IGF_DEC_INSTANCE_HANDLE) count_malloc( sizeof( IGFDEC_INSTANCE ) ) ) == NULL ) + if ( ( st->hIGFDec = (IGF_DEC_INSTANCE_HANDLE) malloc( sizeof( IGFDEC_INSTANCE ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for IGF\n" ) ); } @@ -111,7 +112,7 @@ static ivas_error allocate_CoreCoder_TCX( if ( st->hTonalMDCTConc == NULL ) { - if ( ( st->hTonalMDCTConc = (TonalMDCTConcealPtr) count_malloc( sizeof( TonalMDCTConceal_INSTANCE ) ) ) == NULL ) + if ( ( st->hTonalMDCTConc = (TonalMDCTConcealPtr) malloc( sizeof( TonalMDCTConceal_INSTANCE ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for TonalMDCTConcealment\n" ) ); } @@ -140,7 +141,7 @@ static ivas_error allocate_CoreCoder( if ( st->hGSCDec == NULL ) { - if ( ( st->hGSCDec = (GSC_DEC_HANDLE) count_malloc( sizeof( GSC_DEC_DATA ) ) ) == NULL ) + if ( ( st->hGSCDec = (GSC_DEC_HANDLE) malloc( sizeof( GSC_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for GSC\n" ) ); } @@ -150,7 +151,7 @@ static ivas_error allocate_CoreCoder( if ( st->hPFstat == NULL ) { - if ( ( st->hPFstat = (PFSTAT_HANDLE) count_malloc( sizeof( PFSTAT ) ) ) == NULL ) + if ( ( st->hPFstat = (PFSTAT_HANDLE) malloc( sizeof( PFSTAT ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for NB/formant postflter\n" ) ); } @@ -161,7 +162,7 @@ static ivas_error allocate_CoreCoder( if ( st->hMusicPF == NULL ) { - if ( ( st->hMusicPF = (MUSIC_POSTFILT_HANDLE) count_malloc( sizeof( MUSIC_POSTFILT_DATA ) ) ) == NULL ) + if ( ( st->hMusicPF = (MUSIC_POSTFILT_HANDLE) malloc( sizeof( MUSIC_POSTFILT_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LD music postflter\n" ) ); } @@ -171,7 +172,7 @@ static ivas_error allocate_CoreCoder( if ( st->hBPF == NULL ) { - if ( ( st->hBPF = (BPF_DEC_HANDLE) count_malloc( sizeof( BPF_DEC_DATA ) ) ) == NULL ) + if ( ( st->hBPF = (BPF_DEC_HANDLE) malloc( sizeof( BPF_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for BPF\n" ) ); } @@ -181,7 +182,7 @@ static ivas_error allocate_CoreCoder( if ( st->hBWE_zero == NULL ) { - if ( ( st->hBWE_zero = (ZERO_BWE_DEC_HANDLE) count_malloc( sizeof( ZERO_BWE_DEC_DATA ) ) ) == NULL ) + if ( ( st->hBWE_zero = (ZERO_BWE_DEC_HANDLE) malloc( sizeof( ZERO_BWE_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for zero BWE\n" ) ); } @@ -223,25 +224,25 @@ static void deallocate_CoreCoder_TCX( { if ( st->hTcxDec != NULL ) { - count_free( st->hTcxDec ); + free( st->hTcxDec ); st->hTcxDec = NULL; } if ( st->hTcxCfg != NULL ) { - count_free( st->hTcxCfg ); + free( st->hTcxCfg ); st->hTcxCfg = NULL; } if ( st->hIGFDec != NULL ) { - count_free( st->hIGFDec ); + free( st->hIGFDec ); st->hIGFDec = NULL; } if ( st->hTonalMDCTConc != NULL ) { - count_free( st->hTonalMDCTConc ); + free( st->hTonalMDCTConc ); st->hTonalMDCTConc = NULL; } @@ -261,31 +262,31 @@ static void deallocate_CoreCoder( { if ( st->hGSCDec != NULL ) { - count_free( st->hGSCDec ); + free( st->hGSCDec ); st->hGSCDec = NULL; } if ( st->hPFstat != NULL ) { - count_free( st->hPFstat ); + free( st->hPFstat ); st->hPFstat = NULL; } if ( st->hMusicPF != NULL ) { - count_free( st->hMusicPF ); + free( st->hMusicPF ); st->hMusicPF = NULL; } if ( st->hBPF != NULL ) { - count_free( st->hBPF ); + free( st->hBPF ); st->hBPF = NULL; } if ( st->hBWE_zero != NULL ) { - count_free( st->hBWE_zero ); + free( st->hBWE_zero ); st->hBWE_zero = NULL; } @@ -342,6 +343,7 @@ ivas_error stereo_memory_dec( const int16_t nb_bits_metadata, /* i : number of metadata bits */ const int32_t output_Fs, /* i : output sampling rate */ const IVAS_FORMAT ivas_format, /* i : IVAS format */ + const MC_MODE mc_mode, /* i : MC mode */ const int16_t nchan_transport /* i : number of transport channels*/ ) { @@ -351,6 +353,9 @@ ivas_error stereo_memory_dec( error = IVAS_ERR_OK; + assert( hCPE->last_element_mode >= IVAS_CPE_DFT && "Switching from SCE to CPE is not a valid configuration!" ); + + hCPE->hCoreCoder[0]->element_mode = hCPE->element_mode; hCPE->hCoreCoder[1]->element_mode = hCPE->element_mode; @@ -402,13 +407,13 @@ ivas_error stereo_memory_dec( /* deallocate data structure of the previous CPE mode */ if ( hCPE->hStereoTD != NULL ) { - count_free( hCPE->hStereoTD ); + free( hCPE->hStereoTD ); hCPE->hStereoTD = NULL; } if ( hCPE->hStereoMdct != NULL ) { - count_free( hCPE->hStereoMdct ); + free( hCPE->hStereoMdct ); hCPE->hStereoMdct = NULL; } @@ -416,7 +421,8 @@ ivas_error stereo_memory_dec( deallocate_CoreCoder( hCPE->hCoreCoder[1] ); /* allocate DFT stereo data structure */ - if ( ( error = stereo_dft_dec_create( &( hCPE->hStereoDft ), hCPE->element_brate, output_Fs, 0 ) ) != IVAS_ERR_OK ) + if ( ( error = stereo_dft_dec_create( &( hCPE->hStereoDft ), hCPE->element_brate, output_Fs, 0, + nchan_transport ) ) != IVAS_ERR_OK ) { return error; } @@ -433,7 +439,7 @@ ivas_error stereo_memory_dec( /* allocate ICBWE structure */ if ( hCPE->hStereoICBWE == NULL ) { - if ( ( hCPE->hStereoICBWE = (STEREO_ICBWE_DEC_HANDLE) count_malloc( sizeof( STEREO_ICBWE_DEC_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoICBWE = (STEREO_ICBWE_DEC_HANDLE) malloc( sizeof( STEREO_ICBWE_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Stereo ICBWE \n" ) ); } @@ -445,7 +451,7 @@ ivas_error stereo_memory_dec( st = hCPE->hCoreCoder[0]; if ( st->hHQ_core == NULL ) { - if ( ( st->hHQ_core = (HQ_DEC_HANDLE) count_malloc( sizeof( HQ_DEC_DATA ) ) ) == NULL ) + if ( ( st->hHQ_core = (HQ_DEC_HANDLE) malloc( sizeof( HQ_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HQ core\n" ) ); } @@ -456,7 +462,7 @@ ivas_error stereo_memory_dec( /* allocate TD CNG handle */ if ( st->idchan == 0 && st->hTdCngDec == NULL ) { - if ( ( st->hTdCngDec = (TD_CNG_DEC_HANDLE) count_malloc( sizeof( TD_CNG_DEC_DATA ) ) ) == NULL ) + if ( ( st->hTdCngDec = (TD_CNG_DEC_HANDLE) malloc( sizeof( TD_CNG_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DTX/TD CNG\n" ) ); } @@ -480,7 +486,7 @@ ivas_error stereo_memory_dec( if ( hCPE->hStereoMdct != NULL ) { - count_free( hCPE->hStereoMdct ); + free( hCPE->hStereoMdct ); hCPE->hStereoMdct = NULL; } @@ -498,7 +504,7 @@ ivas_error stereo_memory_dec( return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: TD Stereo memory already allocated\n" ); } - if ( ( hCPE->hStereoTD = (STEREO_TD_DEC_DATA_HANDLE) count_malloc( sizeof( STEREO_TD_DEC_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoTD = (STEREO_TD_DEC_DATA_HANDLE) malloc( sizeof( STEREO_TD_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD Stereo\n" ) ); } @@ -522,7 +528,7 @@ ivas_error stereo_memory_dec( st = hCPE->hCoreCoder[1]; if ( st->hTcxLtpDec != 0 ) { - count_free( st->hTcxLtpDec ); + free( st->hTcxLtpDec ); st->hTcxLtpDec = NULL; } @@ -538,14 +544,14 @@ ivas_error stereo_memory_dec( /* deallocated HQ-core for second channel */ if ( st->hHQ_core != 0 ) { - count_free( st->hHQ_core ); + free( st->hHQ_core ); st->hHQ_core = NULL; } /* allocate DFT stereo mono DMX data structure */ if ( hCPE->nchan_out == 1 && hCPE->hStereoDftDmx == NULL ) { - if ( ( hCPE->hStereoDftDmx = (STEREO_DFT_DMX_DATA_HANDLE) count_malloc( sizeof( STEREO_DFT_DMX_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoDftDmx = (STEREO_DFT_DMX_DATA_HANDLE) malloc( sizeof( STEREO_DFT_DMX_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Stereo DFT mono output\n" ) ); } @@ -555,7 +561,7 @@ ivas_error stereo_memory_dec( /* allocate TCA data structure */ if ( hCPE->nchan_out != 1 && hCPE->hStereoTCA == NULL ) { - if ( ( hCPE->hStereoTCA = (STEREO_TCA_DEC_HANDLE) count_malloc( sizeof( STEREO_TCA_DEC_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoTCA = (STEREO_TCA_DEC_HANDLE) malloc( sizeof( STEREO_TCA_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Stereo TCA\n" ) ); } @@ -574,14 +580,14 @@ ivas_error stereo_memory_dec( /* allocate BWEs for primary channel */ if ( st->hBWE_TD == NULL ) { - if ( ( st->hBWE_TD = (TD_BWE_DEC_HANDLE) count_malloc( sizeof( TD_BWE_DEC_DATA ) ) ) == NULL ) + if ( ( st->hBWE_TD = (TD_BWE_DEC_HANDLE) malloc( sizeof( TD_BWE_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD BWE\n" ) ); } td_bwe_dec_init( st->hBWE_TD, -1, st->output_Fs ); - if ( ( st->hBWE_FD = (FD_BWE_DEC_HANDLE) count_malloc( sizeof( FD_BWE_DEC_DATA ) ) ) == NULL ) + if ( ( st->hBWE_FD = (FD_BWE_DEC_HANDLE) malloc( sizeof( FD_BWE_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FD BWE\n" ) ); } @@ -604,7 +610,7 @@ ivas_error stereo_memory_dec( /* allocate stereo CNG structure */ if ( hCPE->hStereoCng == NULL ) { - if ( ( hCPE->hStereoCng = (STEREO_CNG_DEC_HANDLE) count_malloc( sizeof( STEREO_CNG_DEC ) ) ) == NULL ) + if ( ( hCPE->hStereoCng = (STEREO_CNG_DEC_HANDLE) malloc( sizeof( STEREO_CNG_DEC ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Stereo CNG\n" ) ); } @@ -640,26 +646,26 @@ ivas_error stereo_memory_dec( if ( hCPE->hStereoTD != NULL ) { - count_free( hCPE->hStereoTD ); + free( hCPE->hStereoTD ); hCPE->hStereoTD = NULL; } if ( hCPE->hStereoDftDmx != NULL ) { - count_free( hCPE->hStereoDftDmx ); + free( hCPE->hStereoDftDmx ); hCPE->hStereoDftDmx = NULL; } if ( hCPE->hStereoICBWE != NULL ) { - count_free( hCPE->hStereoICBWE ); + free( hCPE->hStereoICBWE ); hCPE->hStereoICBWE = NULL; } /* de-allocate stereo CNG structure */ if ( hCPE->hStereoCng != NULL ) { - count_free( hCPE->hStereoCng ); + free( hCPE->hStereoCng ); hCPE->hStereoCng = NULL; } @@ -716,7 +722,14 @@ ivas_error stereo_memory_dec( if ( hCPE->last_element_mode == IVAS_CPE_DFT ) { - cpy_tcx_ltp_data( &tcxLtpTmp, hCPE->hCoreCoder[1]->hTcxLtpDec, output_Fs ); + if ( hCPE->nchan_out == 1 ) + { + cpy_tcx_ltp_data( hCPE->hCoreCoder[0]->hTcxLtpDec, hCPE->hCoreCoder[1]->hTcxLtpDec, output_Fs ); + } + else + { + cpy_tcx_ltp_data( &tcxLtpTmp, hCPE->hCoreCoder[1]->hTcxLtpDec, output_Fs ); + } } if ( hCPE->last_element_mode == IVAS_CPE_TD ) @@ -729,7 +742,7 @@ ivas_error stereo_memory_dec( st->hTcxDec->prev_good_synth = st->hTcxDec->old_synthFB + NS2SA( st->output_Fs, PH_ECU_LOOKAHEAD_NS ); /* allocate and initialize MDCT stereo structure */ - if ( ( hCPE->hStereoMdct = (STEREO_MDCT_DEC_DATA_HANDLE) count_malloc( sizeof( STEREO_MDCT_DEC_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoMdct = (STEREO_MDCT_DEC_DATA_HANDLE) malloc( sizeof( STEREO_MDCT_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MDCT Stereo \n" ) ); } @@ -762,21 +775,21 @@ ivas_error stereo_memory_dec( /* deallocate ICBWE structure */ if ( hCPE->hStereoICBWE != NULL ) { - count_free( hCPE->hStereoICBWE ); + free( hCPE->hStereoICBWE ); hCPE->hStereoICBWE = NULL; } /* allocate BWEs for secondary channel */ if ( st->hBWE_TD == NULL ) { - if ( ( st->hBWE_TD = (TD_BWE_DEC_HANDLE) count_malloc( sizeof( TD_BWE_DEC_DATA ) ) ) == NULL ) + if ( ( st->hBWE_TD = (TD_BWE_DEC_HANDLE) malloc( sizeof( TD_BWE_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD BWE\n" ) ); } td_bwe_dec_init( st->hBWE_TD, -1, st->output_Fs ); - if ( ( st->hBWE_FD = (FD_BWE_DEC_HANDLE) count_malloc( sizeof( FD_BWE_DEC_DATA ) ) ) == NULL ) + if ( ( st->hBWE_FD = (FD_BWE_DEC_HANDLE) malloc( sizeof( FD_BWE_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FD BWE\n" ) ); } @@ -791,13 +804,13 @@ ivas_error stereo_memory_dec( { if ( st->hBWE_TD != NULL ) { - count_free( st->hBWE_TD ); + free( st->hBWE_TD ); st->hBWE_TD = NULL; } if ( st->hBWE_FD != NULL ) { - count_free( st->hBWE_FD ); + free( st->hBWE_FD ); st->hBWE_FD = NULL; } } @@ -805,7 +818,7 @@ ivas_error stereo_memory_dec( /* allocate ICBWE structure */ if ( hCPE->hStereoICBWE == NULL ) { - if ( ( hCPE->hStereoICBWE = (STEREO_ICBWE_DEC_HANDLE) count_malloc( sizeof( STEREO_ICBWE_DEC_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoICBWE = (STEREO_ICBWE_DEC_HANDLE) malloc( sizeof( STEREO_ICBWE_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Stereo ICBWE \n" ) ); } @@ -829,7 +842,7 @@ ivas_error stereo_memory_dec( if ( hCPE->hStereoTCA == NULL ) { /* allocate TCA data structure */ - if ( ( hCPE->hStereoTCA = (STEREO_TCA_DEC_HANDLE) count_malloc( sizeof( STEREO_TCA_DEC_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoTCA = (STEREO_TCA_DEC_HANDLE) malloc( sizeof( STEREO_TCA_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Stereo TCA\n" ) ); } @@ -844,7 +857,7 @@ ivas_error stereo_memory_dec( /* de-allocate TCA data structure */ if ( hCPE->hStereoMdct->use_itd == 1 && ivas_total_brate > IVAS_SID_5k2 && hCPE->hStereoTCA != NULL ) { - count_free( hCPE->hStereoTCA ); + free( hCPE->hStereoTCA ); hCPE->hStereoTCA = NULL; hCPE->hStereoMdct->use_itd = 0; } @@ -869,7 +882,7 @@ ivas_error stereo_memory_dec( { if ( hCPE->hStereoDftDmx == NULL ) { - if ( ( hCPE->hStereoDftDmx = (STEREO_DFT_DMX_DATA_HANDLE) count_malloc( sizeof( STEREO_DFT_DMX_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoDftDmx = (STEREO_DFT_DMX_DATA_HANDLE) malloc( sizeof( STEREO_DFT_DMX_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Stereo DFT mono output\n" ) ); } @@ -878,13 +891,13 @@ ivas_error stereo_memory_dec( if ( hCPE->prev_synth_chs[1] != NULL ) { - count_free( hCPE->prev_synth_chs[1] ); + free( hCPE->prev_synth_chs[1] ); hCPE->prev_synth_chs[1] = NULL; } if ( hCPE->hStereoTCA != NULL ) { - count_free( hCPE->hStereoTCA ); + free( hCPE->hStereoTCA ); hCPE->hStereoTCA = NULL; } } @@ -892,14 +905,14 @@ ivas_error stereo_memory_dec( { if ( hCPE->hStereoDftDmx != NULL ) { - count_free( hCPE->hStereoDftDmx ); + free( hCPE->hStereoDftDmx ); hCPE->hStereoDftDmx = NULL; } if ( hCPE->prev_synth_chs[1] == NULL ) { st = hCPE->hCoreCoder[1]; - if ( ( hCPE->prev_synth_chs[1] = (float *) count_malloc( sizeof( float ) * NS2SA( st->output_Fs, FRAME_SIZE_NS ) ) ) == NULL ) + if ( ( hCPE->prev_synth_chs[1] = (float *) malloc( sizeof( float ) * NS2SA( st->output_Fs, FRAME_SIZE_NS ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DFT stereo memory\n" ) ); } @@ -908,7 +921,7 @@ ivas_error stereo_memory_dec( if ( hCPE->hStereoICBWE == NULL && hCPE->element_mode == IVAS_CPE_DFT ) { - if ( ( hCPE->hStereoICBWE = (STEREO_ICBWE_DEC_HANDLE) count_malloc( sizeof( STEREO_ICBWE_DEC_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoICBWE = (STEREO_ICBWE_DEC_HANDLE) malloc( sizeof( STEREO_ICBWE_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Stereo ICBWE \n" ) ); } @@ -918,7 +931,7 @@ ivas_error stereo_memory_dec( if ( hCPE->hStereoTCA == NULL && ( hCPE->element_mode == IVAS_CPE_DFT || hCPE->element_mode == IVAS_CPE_TD ) ) { - if ( ( hCPE->hStereoTCA = (STEREO_TCA_DEC_HANDLE) count_malloc( sizeof( STEREO_TCA_DEC_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoTCA = (STEREO_TCA_DEC_HANDLE) malloc( sizeof( STEREO_TCA_DEC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Stereo TCA\n" ) ); } @@ -931,19 +944,58 @@ ivas_error stereo_memory_dec( if ( hCPE->hStereoTCA != NULL ) { /* note: in MASA, hCPE->hStereoMdct->itd = 0 */ - count_free( hCPE->hStereoTCA ); + free( hCPE->hStereoTCA ); hCPE->hStereoTCA = NULL; } if ( hCPE->hStereoICBWE != NULL ) { - count_free( hCPE->hStereoICBWE ); + free( hCPE->hStereoICBWE ); hCPE->hStereoICBWE = NULL; } } } } + /*--------------------------------------------------------------* + * Bitrate switching in MASA format + *---------------------------------------------------------------*/ + + if ( ivas_format == MC_FORMAT && hCPE->element_mode == IVAS_CPE_MDCT ) + { + if ( mc_mode == MC_MODE_MCT ) + { + /* deallocate the FdCNG handle */ + for ( i = 0; i < CPE_CHANNELS; ++i ) + { + deleteFdCngDec( &hCPE->hCoreCoder[i]->hFdCngDec ); + } + } + else + { + /* allocate the FdCNG handle (for noise estimation for TCX PLC fadeout)*/ + for ( i = 0; i < CPE_CHANNELS; ++i ) + { + if ( hCPE->hCoreCoder[i]->cldfbSyn == NULL ) /* could be NULL when we had the MCT LFE channel */ + { + if ( ( error = openCldfb( &hCPE->hCoreCoder[i]->cldfbSyn, CLDFB_SYNTHESIS, hCPE->hCoreCoder[i]->output_Fs, CLDFB_PROTOTYPE_1_25MS ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + if ( hCPE->hCoreCoder[i]->hFdCngDec == NULL ) + { + if ( ( error = createFdCngDec( &hCPE->hCoreCoder[i]->hFdCngDec ) ) != IVAS_ERR_OK ) + { + return error; + } + initFdCngDec( hCPE->hCoreCoder[i] ); + } + } + } + } + return error; } @@ -975,6 +1027,7 @@ void synchro_synthesis( int16_t dft_mono_brate_switch; int16_t delay_diff; float tmpF; + int16_t nChannels; sts = hCPE->hCoreCoder; output_Fs = sts[0]->output_Fs; @@ -1044,6 +1097,12 @@ void synchro_synthesis( } } + if ( hCPE->nchan_out == 1 && hCPE->last_element_mode == IVAS_CPE_MDCT ) + { + v_add( sts[0]->prev_synth_buffer, sts[1]->prev_synth_buffer, sts[0]->prev_synth_buffer, delay_comp_DFT ); + v_multc( sts[0]->prev_synth_buffer, INV_SQRT_2, sts[0]->prev_synth_buffer, delay_comp_DFT ); + } + if ( use_cldfb_for_last_dft ) { /* delay CLDFB-based mono output (<= 24.4 kbps) to be aligned with DFT-based mono output (32 kbps), needed to avoid discontinuities with TCX-LTP. */ @@ -1051,7 +1110,10 @@ void synchro_synthesis( delay_signal( output[0], output_frame, hCPE->hCoreCoder[0]->hTcxDec->FBTCXdelayBuf, delay_diff ); } - ivas_post_proc( NULL, hCPE, 0, output[0], output, output_frame, sba_dirac_stereo_flag ); + if ( hCPE->element_mode != IVAS_CPE_MDCT ) + { + ivas_post_proc( NULL, hCPE, 0, output[0], output, output_frame, sba_dirac_stereo_flag ); + } /* zero padding in order to synchronize the upmixed DFT stereo synthesis with the TD/MDCT stereo synthesis */ for ( n = 0; n < hCPE->nchan_out; n++ ) @@ -1118,7 +1180,8 @@ void synchro_synthesis( /*----------------------------------------------------------------* * TD/MDCT stereo synchro *----------------------------------------------------------------*/ - + if ( sba_dirac_stereo_flag ) + return; if ( hCPE->element_mode == IVAS_CPE_TD || hCPE->element_mode == IVAS_CPE_MDCT ) { /* handling of DFT->TD switching */ @@ -1139,6 +1202,14 @@ void synchro_synthesis( } } + /* if previous frame had only one channel copy buffers to other channel */ + if ( hCPE->nchan_out == 1 && hCPE->element_mode == IVAS_CPE_MDCT && hCPE->last_element_mode == IVAS_CPE_DFT ) + { + mvr2r( sts[0]->prev_synth_buffer, sts[1]->prev_synth_buffer, delay_comp_TD ); + mvr2r( tmp_out[0], tmp_out[1], delay_cldfb ); + mvr2r( p_output_mem[0], p_output_mem[1], delay_diff ); + } + /*----------------------------------------------------------------* * update DFT synthesis overlap memory @output_Fs; needed for TD->DFT stereo switching *----------------------------------------------------------------*/ @@ -1222,7 +1293,8 @@ void synchro_synthesis( } } - for ( n = 0; n < hCPE->nchan_out; n++ ) + nChannels = ( hCPE->element_mode == IVAS_CPE_MDCT ) ? 2 : hCPE->nchan_out; + for ( n = 0; n < nChannels; n++ ) { if ( hCPE->element_mode == IVAS_CPE_MDCT ) { @@ -1255,7 +1327,7 @@ void synchro_synthesis( } /* cross-fading between DFT OLA memory and TD output */ - for ( n = 0; n < hCPE->nchan_out; n++ ) + for ( n = 0; n < nChannels; n++ ) { if ( hCPE->element_mode == IVAS_CPE_MDCT ) { diff --git a/lib_dec/ivas_stereo_td_dec.c b/lib_dec/ivas_stereo_td_dec.c index f3bd292a8b..605d5ad388 100644 --- a/lib_dec/ivas_stereo_td_dec.c +++ b/lib_dec/ivas_stereo_td_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * stereo_td_init_dec() diff --git a/lib_dec/ivas_svd_dec.c b/lib_dec/ivas_svd_dec.c index ff9852d1df..785a906780 100644 --- a/lib_dec/ivas_svd_dec.c +++ b/lib_dec/ivas_svd_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------* @@ -196,7 +196,7 @@ int16_t svd( float secDiag[MAX_OUTPUT_CHANNELS]; float eps_x = 0.0f, temp; - wmops_sub_start( "svd" ); + push_wmops( "svd" ); set_zero( secDiag, MAX_OUTPUT_CHANNELS ); @@ -252,7 +252,7 @@ int16_t svd( } } while ( condition == 1 ); - wmops_sub_end(); + pop_wmops(); return ( errorMessage ); } diff --git a/lib_dec/ivas_tcx_core_dec.c b/lib_dec/ivas_tcx_core_dec.c index 3ca3033cb4..ab82fb4e07 100644 --- a/lib_dec/ivas_tcx_core_dec.c +++ b/lib_dec/ivas_tcx_core_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "prot.h" #include "rom_com.h" #include "stat_dec.h" -#include "wmops.h" +#include "wmc_auto.h" #include "basop_proto_func.h" #include "stat_com.h" #include "ivas_prot.h" @@ -95,7 +95,13 @@ void stereo_tcx_init_dec( st->hTcxCfg->ctx_hm = getCtxHm( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->rf_flag ); st->hTcxCfg->resq = getResq( st->bits_frame_nominal * FRAMES_PER_SEC ); hTcxDec->tcx_lpc_shaped_ari = getTcxLpcShapedAri( st->bits_frame_nominal * FRAMES_PER_SEC, st->rf_flag, st->element_mode ); - st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_flag, st->mct_chan_mode ); + st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_flag ); + + if ( + st->element_mode != EVS_MONO ) + { + st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode ); + } if ( hTcxLtpDec != NULL ) { hTcxLtpDec->tcxltp = getTcxLtp( st->sr_core ); @@ -155,7 +161,8 @@ void stereo_tcx_core_dec( const int16_t last_element_mode, /* i : last element mode */ const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */ STEREO_CNG_DEC_HANDLE hStereoCng, /* i : Stereo CNG handle */ - const int16_t nchan_out /* i : number of output channels */ + const int16_t nchan_out, /* i : number of output channels */ + const IVAS_FORMAT ivas_format /* i : IVAS format */ ) { int16_t i, k; @@ -191,7 +198,7 @@ void stereo_tcx_core_dec( TCX_LTP_DEC_HANDLE hTcxLtpDec = st->hTcxLtpDec; TCX_DEC_HANDLE hTcxDec = st->hTcxDec; - wmops_sub_start( "stereo_tcx_core_dec" ); + push_wmops( "stereo_tcx_core_dec" ); /*Sanity check*/ assert( !( st->total_brate == FRAME_NO_DATA || st->total_brate == SID_2k40 ) ); /*Active frame*/ @@ -719,7 +726,16 @@ void stereo_tcx_core_dec( if ( st->element_mode != IVAS_CPE_TD ) { - ApplyFdCng( signal_out, NULL, NULL, NULL, st, st->bfi, 0 ); + if ( ivas_format == ISM_FORMAT ) + { + float buffer[L_FRAME16k]; + lerp( signal_outFB, buffer, st->L_frame, hTcxDec->L_frameTCX ); + ApplyFdCng( buffer, NULL, NULL, NULL, st, st->bfi, 0 ); + } + else + { + ApplyFdCng( signal_out, NULL, NULL, NULL, st, st->bfi, 0 ); + } } /* Generate additional comfort noise to mask potential coding artefacts */ @@ -773,7 +789,7 @@ void stereo_tcx_core_dec( #endif - wmops_sub_end(); + pop_wmops(); return; } diff --git a/lib_dec/ivas_td_low_rate_dec.c b/lib_dec/ivas_td_low_rate_dec.c index e610fcf0f3..8ab266345a 100644 --- a/lib_dec/ivas_td_low_rate_dec.c +++ b/lib_dec/ivas_td_low_rate_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "ivas_cnst.h" #include "prot.h" #include "ivas_prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * tdm_low_rate_dec() diff --git a/lib_dec/ivas_vbap.c b/lib_dec/ivas_vbap.c index f0960bd127..cda52c1aec 100644 --- a/lib_dec/ivas_vbap.c +++ b/lib_dec/ivas_vbap.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -29,7 +29,7 @@ the United Nations Convention on Contracts on the International Sales of Goods. *******************************************************************************************************/ -// VE2AT: move to lib_rend ? + #include #include "options.h" #include @@ -40,7 +40,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------* * Local constants @@ -95,6 +95,26 @@ typedef struct connection_option float arc_weighted; } ConnectionOption; +enum SpeakerNodeGroup +{ + SPEAKER_NODE_BOTTOM_HALF, + SPEAKER_NODE_HORIZONTAL, + SPEAKER_NODE_TOP_HALF, + SPEAKER_NODE_BACK, + SPEAKER_NODE_ALL +}; + +/* Defines a single speaker node */ +typedef struct vbap_speaker_node_structure +{ + float azi_deg; + float ele_deg; + float unit_vec[3]; + enum SpeakerNodeGroup group; + +} VBAP_SPEAKER_NODE; + + /*-----------------------------------------------------------------------* * Local function prototypes *-----------------------------------------------------------------------*/ @@ -107,13 +127,13 @@ static int16_t determine_virtual_surface_triplets( const int16_t num_speaker_nod static void determine_initial_search_indices( const int16_t num_triplets, const float triplet_azidegs[VBAP_MAX_NUM_TRIPLETS], int16_t initial_search_indices[VBAP_NUM_SEARCH_SECTORS] ); -static void determine_connections( const int16_t num_speaker_nodes, const VBAP_SPEAKER_NODE *speaker_node_data, int16_t connections[][2], const int16_t max_num_connections, int16_t *group1_count, int16_t *group2_start, int16_t *group2_count ); +static ivas_error determine_connections( const int16_t num_speaker_nodes, const VBAP_SPEAKER_NODE *speaker_node_data, int16_t connections[][2], const int16_t max_num_connections, int16_t *group1_count, int16_t *group2_start, int16_t *group2_count ); static void formulate_horizontal_connections( const VBAP_SPEAKER_NODE *speaker_node_data, const int16_t num_speaker_nodes, int16_t connections[][2], int16_t *connection_write_index ); -static void get_half_sphere_connection_options( const VBAP_SPEAKER_NODE *speaker_node_data, const enum SpeakerNodeGroup group, const int16_t num_speaker_nodes, const int16_t num_non_crossing_planes, const float *non_crossing_plane_elevation_deg, ConnectionOption **connection_options_pr, int16_t *num_connection_options ); +static ivas_error get_half_sphere_connection_options( const VBAP_SPEAKER_NODE *speaker_node_data, const enum SpeakerNodeGroup group, const int16_t num_speaker_nodes, const int16_t num_non_crossing_planes, const float *non_crossing_plane_elevation_deg, ConnectionOption **connection_options_pr, int16_t *num_connection_options ); -static void formulate_half_sphere_connections( const VBAP_SPEAKER_NODE *speaker_node_data, const int16_t num_speaker_nodes, const enum SpeakerNodeGroup group, int16_t connections[][2], int16_t *connection_write_index, const int16_t max_num_connections, const int16_t num_non_crossing_planes, const float *non_crossing_plane_elevation_deg ); +static ivas_error formulate_half_sphere_connections( const VBAP_SPEAKER_NODE *speaker_node_data, const int16_t num_speaker_nodes, const enum SpeakerNodeGroup group, int16_t connections[][2], int16_t *connection_write_index, const int16_t max_num_connections, const int16_t num_non_crossing_planes, const float *non_crossing_plane_elevation_deg ); static int16_t determine_non_crossing_planes( const int16_t num_speaker_nodes, const VBAP_SPEAKER_NODE *node_data, float *non_crossing_plane_elevation_deg ); @@ -153,17 +173,19 @@ ivas_error vbap_init_data( float speaker_node_ele_deg_internal[VBAP_MAX_NUM_SPEAKER_NODES]; VBAP_SPEAKER_NODE speaker_node_data[VBAP_MAX_NUM_SPEAKER_NODES]; VBAP_DATA *vbap; + ivas_error error; - wmops_sub_start( "vbap_init" ); + push_wmops( "vbap_init" ); /* Basic init checks */ if ( num_speaker_nodes > VBAP_MAX_NUM_SPEAKER_NODES || num_speaker_nodes < 3 ) { hVBAPdata = NULL; - wmops_sub_end(); + pop_wmops(); /* TODO: are these two paths correct behaviour or should and error be returned ? */ return IVAS_ERR_OK; } + if ( !speaker_node_azi_deg || !speaker_node_ele_deg ) { hVBAPdata = NULL; @@ -171,7 +193,7 @@ ivas_error vbap_init_data( } /* Allocate VBAP structure */ - if ( ( vbap = (VBAP_HANDLE) count_malloc( sizeof( VBAP_DATA ) ) ) == NULL ) + if ( ( vbap = (VBAP_HANDLE) malloc( sizeof( VBAP_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VBAP data\n" ) ); } @@ -186,7 +208,6 @@ ivas_error vbap_init_data( vbap->num_speaker_nodes = num_speaker_nodes; vbap->num_speaker_nodes_internal = num_speaker_nodes; - /* Check if the speaker node setup needs a virtual top or bottom node (function also increments vbap->num_speaker_nodes_internal when necessary) */ virtual_bottom_type = check_need_of_virtual_speaker_node( vbap, speaker_node_azi_deg, speaker_node_ele_deg, SPEAKER_NODE_BOTTOM_HALF ); @@ -200,7 +221,11 @@ ivas_error vbap_init_data( if ( is_success && virtual_bottom_type != NO_VIRTUAL_SPEAKER_NODE ) { - vbap->bottom_virtual_speaker_node_division_gains = (float *) count_calloc( num_speaker_nodes, sizeof( float ) ); + if ( ( vbap->bottom_virtual_speaker_node_division_gains = (float *) malloc( num_speaker_nodes * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VBAP data\n" ) ); + } + set_zero( vbap->bottom_virtual_speaker_node_division_gains, num_speaker_nodes ); is_success &= vbap->bottom_virtual_speaker_node_division_gains != NULL; speaker_node_azi_deg_internal[vbap->bottom_virtual_speaker_node_index] = 0.0f; speaker_node_ele_deg_internal[vbap->bottom_virtual_speaker_node_index] = -90.0f; @@ -208,7 +233,11 @@ ivas_error vbap_init_data( if ( is_success && virtual_top_type != NO_VIRTUAL_SPEAKER_NODE ) { - vbap->top_virtual_speaker_node_division_gains = (float *) count_calloc( num_speaker_nodes, sizeof( float ) ); + if ( ( vbap->top_virtual_speaker_node_division_gains = (float *) malloc( num_speaker_nodes * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VBAP data\n" ) ); + } + set_zero( vbap->top_virtual_speaker_node_division_gains, num_speaker_nodes ); is_success &= vbap->top_virtual_speaker_node_division_gains != NULL; speaker_node_azi_deg_internal[vbap->top_virtual_speaker_node_index] = 0.0f; speaker_node_ele_deg_internal[vbap->top_virtual_speaker_node_index] = 90.0f; @@ -216,7 +245,11 @@ ivas_error vbap_init_data( if ( is_success && virtual_back_type != NO_VIRTUAL_SPEAKER_NODE ) { - vbap->back_virtual_speaker_node_division_gains = (float *) count_calloc( num_speaker_nodes, sizeof( float ) ); + if ( ( vbap->back_virtual_speaker_node_division_gains = (float *) malloc( num_speaker_nodes * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VBAP data\n" ) ); + } + set_zero( vbap->back_virtual_speaker_node_division_gains, num_speaker_nodes ); is_success &= vbap->back_virtual_speaker_node_division_gains != NULL; speaker_node_azi_deg_internal[vbap->back_virtual_speaker_node_index] = 180.0f; speaker_node_ele_deg_internal[vbap->back_virtual_speaker_node_index] = 0.0f; @@ -227,7 +260,10 @@ ivas_error vbap_init_data( /* Allocate and determine node-node connections */ max_num_connections = ( vbap->num_speaker_nodes_internal - 2 ) * 3; /* Theoretical maximum */ - determine_connections( vbap->num_speaker_nodes_internal, speaker_node_data, connections, max_num_connections, &connection_group1_count, &connection_group2_start, &connection_group2_count ); + if ( ( error = determine_connections( vbap->num_speaker_nodes_internal, speaker_node_data, connections, max_num_connections, &connection_group1_count, &connection_group2_start, &connection_group2_count ) ) != IVAS_ERR_OK ) + { + return error; + } /* Allocate and determine virtual surface speaker node triplets */ if ( is_success ) @@ -263,12 +299,20 @@ ivas_error vbap_init_data( break; } } - vbap->search_struct[0].triplets = (VBAP_VS_TRIPLET *) count_malloc( ( ( speaker_nodes_group1_internal - 2 ) * 2 - ( max( 0, ( speaker_nodes_horiz_internal - 2 ) ) ) ) * sizeof( VBAP_VS_TRIPLET ) ); + + if ( ( vbap->search_struct[0].triplets = (VBAP_VS_TRIPLET *) malloc( ( ( speaker_nodes_group1_internal - 2 ) * 2 - ( max( 0, ( speaker_nodes_horiz_internal - 2 ) ) ) ) * sizeof( VBAP_VS_TRIPLET ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VBAP data\n" ) ); + } is_success &= vbap->search_struct[0].triplets != NULL; + if ( speaker_nodes_group2_internal > 0 ) { vbap->num_search_structs = 2; - vbap->search_struct[1].triplets = (VBAP_VS_TRIPLET *) count_malloc( ( ( speaker_nodes_group2_internal - 2 ) * 2 - ( max( 0, ( speaker_nodes_horiz_internal - 2 ) ) ) ) * sizeof( VBAP_VS_TRIPLET ) ); + if ( ( vbap->search_struct[1].triplets = (VBAP_VS_TRIPLET *) malloc( ( ( speaker_nodes_group2_internal - 2 ) * 2 - ( max( 0, ( speaker_nodes_horiz_internal - 2 ) ) ) ) * sizeof( VBAP_VS_TRIPLET ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VBAP data\n" ) ); + } is_success &= vbap->search_struct[1].triplets != NULL; } else @@ -303,7 +347,7 @@ ivas_error vbap_init_data( determine_virtual_speaker_node_division_gains( vbap->back_virtual_speaker_node_index, vbap->back_virtual_speaker_node_division_gains, connections, virtual_back_type, max_num_connections, num_speaker_nodes ); } - wmops_sub_end(); + pop_wmops(); if ( is_success ) { @@ -335,26 +379,26 @@ void vbap_free_data( if ( ( *hVBAPdata )->bottom_virtual_speaker_node_division_gains != NULL ) { - count_free( ( *hVBAPdata )->bottom_virtual_speaker_node_division_gains ); + free( ( *hVBAPdata )->bottom_virtual_speaker_node_division_gains ); } if ( ( *hVBAPdata )->top_virtual_speaker_node_division_gains != NULL ) { - count_free( ( *hVBAPdata )->top_virtual_speaker_node_division_gains ); + free( ( *hVBAPdata )->top_virtual_speaker_node_division_gains ); } if ( ( *hVBAPdata )->back_virtual_speaker_node_division_gains != NULL ) { - count_free( ( *hVBAPdata )->back_virtual_speaker_node_division_gains ); + free( ( *hVBAPdata )->back_virtual_speaker_node_division_gains ); } if ( ( *hVBAPdata )->search_struct[0].triplets != NULL ) { - count_free( ( *hVBAPdata )->search_struct[0].triplets ); + free( ( *hVBAPdata )->search_struct[0].triplets ); } if ( ( *hVBAPdata )->num_search_structs == 2 && ( *hVBAPdata )->search_struct[1].triplets != NULL ) { - count_free( ( *hVBAPdata )->search_struct[1].triplets ); + free( ( *hVBAPdata )->search_struct[1].triplets ); } - count_free( *hVBAPdata ); + free( *hVBAPdata ); *hVBAPdata = NULL; return; @@ -400,7 +444,7 @@ void vbap_determine_gains( assert( gains != NULL && "VBAP gain determination requires reserved memory for gain output." ); #endif - wmops_sub_start( "vbap_gains" ); + push_wmops( "vbap_gains" ); num_speaker_nodes = hVBAPdata->num_speaker_nodes; bottom_virtual_speaker_node_index = hVBAPdata->bottom_virtual_speaker_node_index; top_virtual_speaker_node_index = hVBAPdata->top_virtual_speaker_node_index; @@ -484,7 +528,7 @@ void vbap_determine_gains( } } - wmops_sub_end(); + pop_wmops(); return; } @@ -662,8 +706,7 @@ static void determine_virtual_speaker_node_division_gains( are distributed to all neighboring real speaker nodes. An amplitude-division instead of energy division is utilized just in case to avoid excessive emphasis on the coherent distributed sound. */ - int16_t c; - int16_t ch; + int16_t c, ch; float sum_val; if ( type == VIRTUAL_SPEAKER_NODE_DISTRIBUTE_ENERGY ) @@ -715,7 +758,7 @@ static void determine_virtual_speaker_node_division_gains( /*! r: virtual speaker node type */ static enum VirtualSpeakerNodeType check_need_of_virtual_speaker_node( VBAP_HANDLE hVBAPdata, /* i/o: VBAP structure */ - const float *speaker_node_azi_deg, /* i : vector of speaker node azimuths */ + const float *speaker_node_azi_deg, /* i : vector of speaker node azimuths */ const float *speaker_node_ele_deg, /* i : vector of speaker node elevations */ enum SpeakerNodeGroup group /* i : group of speaker nodes where this belongs */ ) @@ -945,9 +988,9 @@ static void matrix_inverse_3x3( *-------------------------------------------------------------------------*/ static int16_t check_and_store_triplet( - int16_t chA, /* i : first channel index that forms the loudspeaker triplet */ - int16_t chB, /* i : second channel index that forms the loudspeaker triplet */ - int16_t chC, /* i : third channel index that forms the loudspeaker triplet */ + const int16_t chA, /* i : first channel index that forms the loudspeaker triplet */ + const int16_t chB, /* i : second channel index that forms the loudspeaker triplet */ + const int16_t chC, /* i : third channel index that forms the loudspeaker triplet */ const int16_t num_speaker_nodes, /* i : number of speaker nodes */ const VBAP_SPEAKER_NODE *speaker_node_data, /* i : speaker node data structure */ VBAP_VS_TRIPLET *triplets, /* o : vector of virtual surface triplets */ @@ -1179,7 +1222,7 @@ static void determine_initial_search_indices( * Determine all valid connections between all speaker nodes *-------------------------------------------------------------------------*/ -static void determine_connections( +static ivas_error determine_connections( const int16_t num_speaker_nodes, /* i : number of speaker nodes */ const VBAP_SPEAKER_NODE *speaker_node_data, /* i : speaker node data */ int16_t connections[][2], /* o : vector of connections */ @@ -1193,6 +1236,7 @@ static void determine_connections( int16_t c; int16_t connection_write_index = 0; float non_crossing_plane_elevation_deg[VBAP_MAX_PLANES]; + ivas_error error; set_f( non_crossing_plane_elevation_deg, 0.0f, VBAP_MAX_PLANES ); @@ -1208,20 +1252,31 @@ static void determine_connections( /* Process in different mode based on the grouping. It is enough to check for first node. */ if ( speaker_node_data[0].group == SPEAKER_NODE_ALL ) { - formulate_half_sphere_connections( speaker_node_data, num_speaker_nodes, SPEAKER_NODE_ALL, connections, &connection_write_index, max_num_connections, num_non_crossing_planes, non_crossing_plane_elevation_deg ); + if ( ( error = formulate_half_sphere_connections( speaker_node_data, num_speaker_nodes, SPEAKER_NODE_ALL, connections, &connection_write_index, max_num_connections, num_non_crossing_planes, non_crossing_plane_elevation_deg ) ) != IVAS_ERR_OK ) + { + return error; + } } else { /* The node-node connections are determined in three stages: bottom, horizontal, and top. */ - formulate_half_sphere_connections( speaker_node_data, num_speaker_nodes, SPEAKER_NODE_BOTTOM_HALF, connections, &connection_write_index, max_num_connections, num_non_crossing_planes, non_crossing_plane_elevation_deg ); + if ( ( error = formulate_half_sphere_connections( speaker_node_data, num_speaker_nodes, SPEAKER_NODE_BOTTOM_HALF, connections, &connection_write_index, max_num_connections, num_non_crossing_planes, non_crossing_plane_elevation_deg ) ) != IVAS_ERR_OK ) + { + return error; + } *group2_start = connection_write_index; + formulate_horizontal_connections( speaker_node_data, num_speaker_nodes, connections, &connection_write_index ); *group1_count = connection_write_index; - formulate_half_sphere_connections( speaker_node_data, num_speaker_nodes, SPEAKER_NODE_TOP_HALF, connections, &connection_write_index, max_num_connections, num_non_crossing_planes, non_crossing_plane_elevation_deg ); + + if ( ( error = formulate_half_sphere_connections( speaker_node_data, num_speaker_nodes, SPEAKER_NODE_TOP_HALF, connections, &connection_write_index, max_num_connections, num_non_crossing_planes, non_crossing_plane_elevation_deg ) ) != IVAS_ERR_OK ) + { + return error; + } *group2_count = connection_write_index - *group2_start; } - return; + return IVAS_ERR_OK; } @@ -1424,7 +1479,7 @@ static int16_t check_plane_crossing( * Get list of all potential connections at the half-sphere *-------------------------------------------------------------------------*/ -static void get_half_sphere_connection_options( +static ivas_error get_half_sphere_connection_options( const VBAP_SPEAKER_NODE *speaker_node_data, /* i : speaker node data */ const enum SpeakerNodeGroup group, /* i : speaker node group */ const int16_t num_speaker_nodes, /* i : number of speaker nodes */ @@ -1450,7 +1505,11 @@ static void get_half_sphere_connection_options( } /* Init memory for connection options */ - c_options = (ConnectionOption *) count_malloc( sizeof( ConnectionOption ) * max_num_connection_options ); + if ( ( c_options = (ConnectionOption *) malloc( sizeof( ConnectionOption ) * max_num_connection_options ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VBAP data\n" ) ); + } + for ( c = 0; c < max_num_connection_options; c++ ) { c_options[c].chA = -1; @@ -1505,7 +1564,11 @@ static void get_half_sphere_connection_options( /* Init memory for reordered connection options and order by arc_weighted, * which informs of the preference order of the connections in case they cross */ - c_options_reorder = (ConnectionOption *) count_malloc( sizeof( ConnectionOption ) * ( *num_connection_options ) ); + if ( ( c_options_reorder = (ConnectionOption *) malloc( sizeof( ConnectionOption ) * ( *num_connection_options ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VBAP data\n" ) ); + } + for ( c = 0; c < *num_connection_options; c++ ) { float min_arc_weighted; @@ -1530,18 +1593,19 @@ static void get_half_sphere_connection_options( /* Set reordered connections as output and free temporary data */ *connection_options_pr = c_options_reorder; - count_free( c_options ); + free( c_options ); - return; + return IVAS_ERR_OK; } + /*-------------------------------------------------------------------------* * formulate_half_sphere_connections() * * Formulate half-sphere connections *-------------------------------------------------------------------------*/ -static void formulate_half_sphere_connections( +static ivas_error formulate_half_sphere_connections( const VBAP_SPEAKER_NODE *speaker_node_data, /* i : speaker node data */ const int16_t num_speaker_nodes, /* i : number of speaker nodes */ const enum SpeakerNodeGroup group, /* i : speaker node group */ @@ -1568,19 +1632,23 @@ static void formulate_half_sphere_connections( ConnectionOption *connection_options; int16_t num_connection_options; int16_t half_sphere_first_connection; + ivas_error error; half_sphere_first_connection = *connection_write_index; /* Obtain all connection options (i.e., channel pairs) at the half sphere. The function orders them * in terms of which connection to keep if two connections would cross each other. */ - get_half_sphere_connection_options( - speaker_node_data, - group, - num_speaker_nodes, - num_non_crossing_planes, - non_crossing_plane_elevation_deg, - &connection_options, - &num_connection_options ); + if ( ( error = get_half_sphere_connection_options( + speaker_node_data, + group, + num_speaker_nodes, + num_non_crossing_planes, + non_crossing_plane_elevation_deg, + &connection_options, + &num_connection_options ) ) != IVAS_ERR_OK ) + { + return error; + } set_f( connection_arc, 0.0f, max_num_connections ); for ( c = 0; c < max_num_connections; c++ ) @@ -1676,8 +1744,10 @@ static void formulate_half_sphere_connections( } c_opt++; } - count_free( connection_options ); - return; + + free( connection_options ); + + return IVAS_ERR_OK; } diff --git a/lib_dec/jbm_jb4_circularbuffer.c b/lib_dec/jbm_jb4_circularbuffer.c index a9da400a36..e68b3e170e 100644 --- a/lib_dec/jbm_jb4_circularbuffer.c +++ b/lib_dec/jbm_jb4_circularbuffer.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /* local includes */ #include "jbm_jb4_circularbuffer.h" @@ -70,9 +70,14 @@ struct JB4_CIRCULARBUFFER /* Creates a circular buffer (FIFO) */ -int16_t JB4_CIRCULARBUFFER_Create( JB4_CIRCULARBUFFER_HANDLE *ph ) +ivas_error JB4_CIRCULARBUFFER_Create( JB4_CIRCULARBUFFER_HANDLE *ph ) { - JB4_CIRCULARBUFFER_HANDLE h = count_malloc( sizeof( struct JB4_CIRCULARBUFFER ) ); + JB4_CIRCULARBUFFER_HANDLE h; + + if ( ( h = malloc( sizeof( struct JB4_CIRCULARBUFFER ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM\n" ) ); + } h->data = NULL; h->capacity = 0; @@ -81,7 +86,7 @@ int16_t JB4_CIRCULARBUFFER_Create( JB4_CIRCULARBUFFER_HANDLE *ph ) *ph = h; - return 0; + return IVAS_ERR_OK; } @@ -103,9 +108,9 @@ void JB4_CIRCULARBUFFER_Destroy( if ( h->data ) { - count_free( h->data ); + free( h->data ); } - count_free( h ); + free( h ); *ph = NULL; return; @@ -119,13 +124,17 @@ int16_t JB4_CIRCULARBUFFER_Init( { /* keep one element free to be able to decide between full/empty buffer */ ++capacity; - h->data = count_malloc( capacity * sizeof( JB4_CIRCULARBUFFER_ELEMENT ) ); + + if ( ( h->data = malloc( capacity * sizeof( JB4_CIRCULARBUFFER_ELEMENT ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM\n" ) ); + } h->capacity = capacity; h->writePos = 0; h->readPos = 0; - return 0; + return IVAS_ERR_OK; } diff --git a/lib_dec/jbm_jb4_circularbuffer.h b/lib_dec/jbm_jb4_circularbuffer.h index 2e5a035dab..e14144b329 100644 --- a/lib_dec/jbm_jb4_circularbuffer.h +++ b/lib_dec/jbm_jb4_circularbuffer.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -47,7 +47,7 @@ typedef struct JB4_CIRCULARBUFFER *JB4_CIRCULARBUFFER_HANDLE; typedef int32_t JB4_CIRCULARBUFFER_ELEMENT; -int16_t JB4_CIRCULARBUFFER_Create( JB4_CIRCULARBUFFER_HANDLE *ph ); +ivas_error JB4_CIRCULARBUFFER_Create( JB4_CIRCULARBUFFER_HANDLE *ph ); void JB4_CIRCULARBUFFER_Destroy( JB4_CIRCULARBUFFER_HANDLE *ph ); diff --git a/lib_dec/jbm_jb4_inputbuffer.c b/lib_dec/jbm_jb4_inputbuffer.c index 8eaf547838..925e35dfff 100644 --- a/lib_dec/jbm_jb4_inputbuffer.c +++ b/lib_dec/jbm_jb4_inputbuffer.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,11 +33,9 @@ /*==================================================================================== EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0 ====================================================================================*/ -/* WMC_TOOL_SKIP_FILE (basic ops file) */ /** \file jbm_jb4_inputbuffer.c RTP input buffer with fixed capacity. */ -/* system includes */ #include #include #include "options.h" @@ -46,8 +44,10 @@ #ifdef DEBUGGING #include "debug.h" #endif -/* local includes */ #include "jbm_jb4_inputbuffer.h" +#include "wmc_auto.h" + +#define WMC_TOOL_SKIP /** input buffer with fixed capacity */ @@ -67,10 +67,15 @@ struct JB4_INPUTBUFFER /* Creates a input buffer */ -int16_t JB4_INPUTBUFFER_Create( +ivas_error JB4_INPUTBUFFER_Create( JB4_INPUTBUFFER_HANDLE *ph ) { - JB4_INPUTBUFFER_HANDLE h = count_malloc( sizeof( struct JB4_INPUTBUFFER ) ); + JB4_INPUTBUFFER_HANDLE h; + + if ( ( h = malloc( sizeof( struct JB4_INPUTBUFFER ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM\n" ) ); + } h->data = NULL; h->capacity = 0; @@ -80,7 +85,7 @@ int16_t JB4_INPUTBUFFER_Create( *ph = h; - return 0; + return IVAS_ERR_OK; } @@ -99,9 +104,13 @@ void JB4_INPUTBUFFER_Destroy( { return; } + if ( h->data ) - count_free( h->data ); - count_free( h ); + { + free( h->data ); + } + + free( h ); *ph = NULL; return; @@ -109,7 +118,7 @@ void JB4_INPUTBUFFER_Destroy( /* Initializes a input buffer with a fixed maximum allowed number of elements */ -int16_t JB4_INPUTBUFFER_Init( +ivas_error JB4_INPUTBUFFER_Init( JB4_INPUTBUFFER_HANDLE h, uint16_t capacity, int16_t ( *compareFunction )( const JB4_INPUTBUFFER_ELEMENT first, const JB4_INPUTBUFFER_ELEMENT second, bool *replaceWithNewElementIfEqual ) ) @@ -117,13 +126,17 @@ int16_t JB4_INPUTBUFFER_Init( /* keep one element free to be able to decide between full/empty buffer */ ++capacity; - h->data = count_malloc( capacity * sizeof( JB4_INPUTBUFFER_ELEMENT ) ); + if ( ( h->data = malloc( capacity * sizeof( JB4_INPUTBUFFER_ELEMENT ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM\n" ) ); + } + h->capacity = capacity; h->writePos = 0; h->readPos = 0; h->compareFunction = compareFunction; - return 0; + return IVAS_ERR_OK; } @@ -359,3 +372,5 @@ uint16_t JB4_INPUTBUFFER_Size( return ret; } + +#undef WMC_TOOL_SKIP diff --git a/lib_dec/jbm_jb4_inputbuffer.h b/lib_dec/jbm_jb4_inputbuffer.h index 7ab8086470..6087ecb207 100644 --- a/lib_dec/jbm_jb4_inputbuffer.h +++ b/lib_dec/jbm_jb4_inputbuffer.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -48,14 +48,11 @@ typedef struct JB4_INPUTBUFFER *JB4_INPUTBUFFER_HANDLE; typedef void *JB4_INPUTBUFFER_ELEMENT; -int16_t JB4_INPUTBUFFER_Create( JB4_INPUTBUFFER_HANDLE *ph ); +ivas_error JB4_INPUTBUFFER_Create( JB4_INPUTBUFFER_HANDLE *ph ); void JB4_INPUTBUFFER_Destroy( JB4_INPUTBUFFER_HANDLE *ph ); -int16_t JB4_INPUTBUFFER_Init( - JB4_INPUTBUFFER_HANDLE h, - uint16_t capacity, - int16_t ( *compareFunction )( const JB4_INPUTBUFFER_ELEMENT newElement, const JB4_INPUTBUFFER_ELEMENT arrayElement, bool *replaceWithNewElementIfEqual ) ); +ivas_error JB4_INPUTBUFFER_Init( JB4_INPUTBUFFER_HANDLE h, uint16_t capacity, int16_t ( *compareFunction )( const JB4_INPUTBUFFER_ELEMENT newElement, const JB4_INPUTBUFFER_ELEMENT arrayElement, bool *replaceWithNewElementIfEqual ) ); int16_t JB4_INPUTBUFFER_Enque( JB4_INPUTBUFFER_HANDLE h, JB4_INPUTBUFFER_ELEMENT element, JB4_INPUTBUFFER_ELEMENT *replacedElement ); diff --git a/lib_dec/jbm_jb4_jmf.c b/lib_dec/jbm_jb4_jmf.c index 7b0dd2f188..85e9980e6e 100644 --- a/lib_dec/jbm_jb4_jmf.c +++ b/lib_dec/jbm_jb4_jmf.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -46,7 +46,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /* local includes */ #include "jbm_jb4_jmf.h" @@ -84,19 +84,35 @@ struct JB4_JMF /** helper function to add an entry at back of the buffer */ -static void JB4_JMF_pushBack( JB4_JMF_HANDLE h, int32_t delay, int32_t offset, uint32_t time ); +static void JB4_JMF_pushBack( JB4_JMF_HANDLE h, const int32_t delay, const int32_t offset, const uint32_t time ); + /** helper function to remove an entry from the front of the buffer */ static void JB4_JMF_popFront( JB4_JMF_HANDLE h ); -int16_t JB4_JMF_Create( +ivas_error JB4_JMF_Create( JB4_JMF_HANDLE *ph ) { - JB4_JMF_HANDLE h = count_malloc( sizeof( struct JB4_JMF ) ); + JB4_JMF_HANDLE h; + ivas_error error; + + if ( ( h = malloc( sizeof( struct JB4_JMF ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM\n" ) ); + } - JB4_CIRCULARBUFFER_Create( &h->fifo ); - JB4_CIRCULARBUFFER_Create( &h->offsetFifo ); - JB4_CIRCULARBUFFER_Create( &h->timeStampFifo ); + if ( ( error = JB4_CIRCULARBUFFER_Create( &h->fifo ) ) != IVAS_ERR_OK ) + { + return error; + } + if ( ( JB4_CIRCULARBUFFER_Create( &h->offsetFifo ) ) != IVAS_ERR_OK ) + { + return error; + } + if ( ( JB4_CIRCULARBUFFER_Create( &h->timeStampFifo ) ) != IVAS_ERR_OK ) + { + return error; + } h->timeScale = 1000; h->consideredFraction = 1000; @@ -108,7 +124,7 @@ int16_t JB4_JMF_Create( *ph = h; - return 0; + return IVAS_ERR_OK; } @@ -131,7 +147,7 @@ void JB4_JMF_Destroy( JB4_CIRCULARBUFFER_Destroy( &h->offsetFifo ); JB4_CIRCULARBUFFER_Destroy( &h->timeStampFifo ); - count_free( h ); + free( h ); *ph = NULL; return; @@ -141,10 +157,10 @@ void JB4_JMF_Destroy( /* function to set the window size of the fifo and the fraction which will be considered */ int16_t JB4_JMF_Init( JB4_JMF_HANDLE h, - int16_t timeScale, - uint16_t windowSize, - uint16_t windowDuration, - uint16_t consideredFraction ) + const int16_t timeScale, + const uint16_t windowSize, + const uint16_t windowDuration, + const uint16_t consideredFraction ) { /* check parameters */ @@ -175,8 +191,8 @@ int16_t JB4_JMF_Init( /* function to calculate delay for the current packet */ int16_t JB4_JMF_PushPacket( JB4_JMF_HANDLE h, - uint32_t sysTime, - uint32_t rtpTimeStamp ) + const uint32_t sysTime, + const uint32_t rtpTimeStamp ) { int32_t rtpTimeDiff, sysTimeDiff; int32_t offset, delay; @@ -267,9 +283,9 @@ int16_t JB4_JMF_MinOffset( /* helper function to add entry at back of the buffer */ static void JB4_JMF_pushBack( JB4_JMF_HANDLE h, - int32_t delay, - int32_t offset, - uint32_t time ) + const int32_t delay, + const int32_t offset, + const uint32_t time ) { int32_t minTime, maxTime; uint32_t duration; diff --git a/lib_dec/jbm_jb4_jmf.h b/lib_dec/jbm_jb4_jmf.h index b945c31884..5efff7cd5e 100644 --- a/lib_dec/jbm_jb4_jmf.h +++ b/lib_dec/jbm_jb4_jmf.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -45,13 +45,13 @@ /** handle for jitter measure fifo - a fifo used for windowed measure of network status */ typedef struct JB4_JMF *JB4_JMF_HANDLE; -int16_t JB4_JMF_Create( JB4_JMF_HANDLE *ph ); +ivas_error JB4_JMF_Create( JB4_JMF_HANDLE *ph ); void JB4_JMF_Destroy( JB4_JMF_HANDLE *ph ); -int16_t JB4_JMF_Init( JB4_JMF_HANDLE h, int16_t timeScale, uint16_t windowSize, uint16_t windowDuration, uint16_t consideredFraction ); +int16_t JB4_JMF_Init( JB4_JMF_HANDLE h, const int16_t timeScale, const uint16_t windowSize, const uint16_t windowDuration, const uint16_t consideredFraction ); -int16_t JB4_JMF_PushPacket( JB4_JMF_HANDLE h, uint32_t sysTime, uint32_t rtpTimeStamp ); +int16_t JB4_JMF_PushPacket( JB4_JMF_HANDLE h, const uint32_t sysTime, const uint32_t rtpTimeStamp ); int16_t JB4_JMF_Jitter( const JB4_JMF_HANDLE h, uint32_t *jitter ); diff --git a/lib_dec/jbm_jb4sb.c b/lib_dec/jbm_jb4sb.c index 28dfd43e61..755187b640 100644 --- a/lib_dec/jbm_jb4sb.c +++ b/lib_dec/jbm_jb4sb.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,7 +33,6 @@ /*==================================================================================== EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0 ====================================================================================*/ -/* WMC_TOOL_SKIP_FILE (basic ops file) */ /*! \file jbm_jb4sb.c EVS Jitter Buffer Management Interface */ @@ -46,7 +45,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /* local headers */ #include "jbm_jb4_circularbuffer.h" #include "jbm_jb4_inputbuffer.h" @@ -54,6 +53,7 @@ #include "jbm_jb4sb.h" #include "prot.h" +#define WMC_TOOL_SKIP #define JB4_MIN( a, b ) ( ( a ) > ( b ) ? ( b ) : ( a ) ) #define JB4_MAX( a, b ) ( ( a ) > ( b ) ? ( a ) : ( b ) ) @@ -61,7 +61,7 @@ #define MAXOFFSET 10 /*! Calculates the difference between two RTP timestamps - the diff is positive, if B 'later', negative otherwise */ -static int32_t JB4_rtpTimeStampDiff( uint32_t tsA, uint32_t tsB ); +static int32_t JB4_rtpTimeStampDiff( const uint32_t tsA, const uint32_t tsB ); /* function to calculate different options for the target playout delay */ static void JB4_targetPlayoutDelay( const JB4_HANDLE h, uint32_t *targetMin, uint32_t *targetMax, uint32_t *targetDtx, uint32_t *targetStartUp ); /*! function to do playout adaptation before playing the next data unit */ @@ -88,18 +88,18 @@ static int16_t JB4_inspectBufferForDropping( const JB4_HANDLE h, bool *dropEarly /* function to look into the buffer and check if it makes sense to drop a data unit during DTX */ static int16_t JB4_checkDtxDropping( const JB4_HANDLE h ); /*! function to estimate the short term jitter */ -static void JB4_estimateShortTermJitter( JB4_HANDLE h, uint32_t rcvTime, uint32_t rtpTimeStamp ); +static void JB4_estimateShortTermJitter( JB4_HANDLE h, const uint32_t rcvTime, const uint32_t rtpTimeStamp ); /*! function to pop a data unit from the buffer */ -static void JB4_popFromBuffer( JB4_HANDLE h, uint32_t sysTime, JB4_DATAUNIT_HANDLE *pDataUnit ); +static void JB4_popFromBuffer( JB4_HANDLE h, const uint32_t sysTime, JB4_DATAUNIT_HANDLE *pDataUnit ); /*! function to drop a data unit from the buffer - updates nShrinked */ static void JB4_dropFromBuffer( JB4_HANDLE h ); /*! function to calculate the playout delay based on the current jitter */ /*! @param[in] playTime the system time when the data unit will be played * @param[in] timeStamp the time stamp of the data unit to played * @param[out] delay the calculated playout delay */ -static int16_t JB4_playoutDelay( const JB4_HANDLE h, uint32_t playTime, uint32_t rtpTimeStamp, uint32_t *delay ); +static int16_t JB4_playoutDelay( const JB4_HANDLE h, const uint32_t playTime, const uint32_t rtpTimeStamp, uint32_t *delay ); /*! function to update lastPlayoutDelay and lastTargetTime after popFromBuffer() */ -static void JB4_updateLastTimingMembers( JB4_HANDLE h, uint32_t playTime, uint32_t rtpTimeStamp ); +static void JB4_updateLastTimingMembers( JB4_HANDLE h, const uint32_t playTime, const uint32_t rtpTimeStamp ); /*! function to compare the RTP time stamps of two data units: newElement==arrayElement ? 0 : (newElement>arrayElement ? +1 : -1) */ static int16_t JB4_inputBufferCompareFunction( const JB4_INPUTBUFFER_ELEMENT newElement, const JB4_INPUTBUFFER_ELEMENT arrayElement, bool *replaceWithNewElementIfEqual ); @@ -207,8 +207,9 @@ ivas_error JB4_Create( { int16_t iter; JB4_HANDLE h; + ivas_error error; - if ( ( h = count_malloc( sizeof( struct JB4 ) ) ) == NULL ) + if ( ( h = malloc( sizeof( struct JB4 ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JB4 structure\n" ) ); } @@ -228,12 +229,23 @@ ivas_error JB4_Create( /* internal configuration values - do not change!!! */ h->timeScale = 0; h->frameDuration = 0; + /* jitter buffer configuration values: done in JB4_Init() */ /* short term jitter evaluation */ - JB4_JMF_Create( &h->stJmf ); - JB4_CIRCULARBUFFER_Create( &h->stJitterFifo ); - JB4_CIRCULARBUFFER_Create( &h->stTimeStampFifo ); + if ( ( error = JB4_JMF_Create( &h->stJmf ) ) != IVAS_ERR_OK ) + { + return error; + } + if ( ( error = JB4_CIRCULARBUFFER_Create( &h->stJitterFifo ) ) != IVAS_ERR_OK ) + { + return error; + } + if ( ( error = JB4_CIRCULARBUFFER_Create( &h->stTimeStampFifo ) ) != IVAS_ERR_OK ) + { + return error; + } h->stJitter = 0; + /* jitter buffer data */ h->firstDataUnitPopped = false; h->prevPopSysTime = 0; @@ -266,11 +278,18 @@ ivas_error JB4_Create( move32(); /* members to store the data units */ - JB4_INPUTBUFFER_Create( &h->inputBuffer ); + if ( ( error = JB4_INPUTBUFFER_Create( &h->inputBuffer ) ) != IVAS_ERR_OK ) + { + return error; + } + /* allocate memory for data units */ for ( iter = 0; iter < MAX_JBM_SLOTS; ++iter ) { - h->memorySlots[iter].data = count_malloc( MAX_AU_SIZE ); + if ( ( h->memorySlots[iter].data = malloc( MAX_AU_SIZE ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JB4 structure\n" ) ); + } h->freeMemorySlots[iter] = &h->memorySlots[iter]; } h->nFreeMemorySlots = MAX_JBM_SLOTS; @@ -304,22 +323,23 @@ void JB4_Destroy( for ( i = 0; i < MAX_JBM_SLOTS; ++i ) { - count_free( h->memorySlots[i].data ); + free( h->memorySlots[i].data ); } - count_free( h ); + free( h ); *ph = NULL; return; } -int16_t JB4_Init( +ivas_error JB4_Init( JB4_HANDLE h, - int16_t safetyMargin ) + const int16_t safetyMargin ) { uint16_t ltJmfSize, stFifoSize, stJmfSize, stJmfAllowedLateLoss; uint16_t inputBufferCapacity; + ivas_error error; /* internal timescale is 1000, frame duration is 20ms */ h->timeScale = 1000; /* ms */ @@ -340,9 +360,13 @@ int16_t JB4_Init( JB4_JMF_Init( h->stJmf, h->timeScale, stJmfSize, h->timeScale /* 1s */, (uint16_t) ( 1000 - stJmfAllowedLateLoss ) ); inputBufferCapacity = MAX_JBM_SLOTS - 2; - JB4_INPUTBUFFER_Init( h->inputBuffer, inputBufferCapacity, JB4_inputBufferCompareFunction ); - return 0; + if ( ( error = JB4_INPUTBUFFER_Init( h->inputBuffer, inputBufferCapacity, JB4_inputBufferCompareFunction ) ) != IVAS_ERR_OK ) + { + return error; + } + + return IVAS_ERR_OK; } @@ -383,7 +407,7 @@ void JB4_FreeDataUnit( int16_t JB4_PushDataUnit( JB4_HANDLE h, JB4_DATAUNIT_HANDLE dataUnit, - uint32_t rcvTime ) + const uint32_t rcvTime ) { JB4_DATAUNIT_HANDLE droppedDataUnit = NULL; @@ -551,8 +575,8 @@ int16_t JB4_FECoffset( int16_t JB4_PopDataUnit( JB4_HANDLE h, - uint32_t sysTime, - uint32_t extBufferedTime, + const uint32_t sysTime, + const uint32_t extBufferedTime, JB4_DATAUNIT_HANDLE *pDataUnit, uint32_t *scale, uint32_t *maxScaling ) @@ -574,8 +598,8 @@ int16_t JB4_PopDataUnit( /* Calculates the difference between two RTP timestamps - the diff is positive, if B 'later', negative otherwise */ static int32_t JB4_rtpTimeStampDiff( - uint32_t tsA, - uint32_t tsB ) + const uint32_t tsA, + const uint32_t tsB ) { int32_t ret; /* do not dare to inline this function, casting to int32_t is important here! */ @@ -1058,8 +1082,8 @@ static int16_t JB4_checkDtxDropping( /* function to estimate the short term jitter */ static void JB4_estimateShortTermJitter( JB4_HANDLE h, - uint32_t rcvTime, - uint32_t rtpTimeStamp ) + const uint32_t rcvTime, + const uint32_t rtpTimeStamp ) { uint32_t jitter, duration, maxDuration; int32_t minTime, maxTime; @@ -1121,7 +1145,7 @@ static void JB4_estimateShortTermJitter( /* function to pop a data unit from the buffer */ static void JB4_popFromBuffer( JB4_HANDLE h, - uint32_t sysTime, + const uint32_t sysTime, JB4_DATAUNIT_HANDLE *pDataUnit ) { JB4_DATAUNIT_HANDLE nextDataUnit; @@ -1430,8 +1454,8 @@ static void JB4_dropFromBuffer( /* function to calculate the playout delay based on the current jitter */ static int16_t JB4_playoutDelay( const JB4_HANDLE h, - uint32_t playTime, - uint32_t rtpTimeStamp, + const uint32_t playTime, + const uint32_t rtpTimeStamp, uint32_t *delay ) { int32_t minOffTicks; @@ -1450,8 +1474,8 @@ static int16_t JB4_playoutDelay( /* function to update lastPlayoutDelay and lastTargetTime after popFromBuffer() */ static void JB4_updateLastTimingMembers( JB4_HANDLE h, - uint32_t playTime, - uint32_t rtpTimeStamp ) + const uint32_t playTime, + const uint32_t rtpTimeStamp ) { int32_t minOffTicks; @@ -1508,3 +1532,5 @@ static int16_t JB4_inputBufferCompareFunction( return result; } + +#undef WMC_TOOL_SKIP diff --git a/lib_dec/jbm_jb4sb.h b/lib_dec/jbm_jb4sb.h index bc70413689..54b873b006 100644 --- a/lib_dec/jbm_jb4sb.h +++ b/lib_dec/jbm_jb4sb.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -63,9 +63,6 @@ struct JB4_DATAUNIT uint32_t rcvTime; /** true, if the data unit contains only silence */ bool silenceIndicator; - Word16 isAMRWB_IOmode; - /** for EVS payload */ - Word16 frameTypeIndex; /** Q bit for AMR-WB IO */ Word16 qBit; @@ -88,15 +85,15 @@ ivas_error JB4_Create( JB4_HANDLE *ph ); void JB4_Destroy( JB4_HANDLE *ph ); -int16_t JB4_Init( JB4_HANDLE h, int16_t safetyMargin ); +ivas_error JB4_Init( JB4_HANDLE h, const int16_t safetyMargin ); JB4_DATAUNIT_HANDLE JB4_AllocDataUnit( JB4_HANDLE h ); void JB4_FreeDataUnit( JB4_HANDLE h, JB4_DATAUNIT_HANDLE dataUnit ); -int16_t JB4_PushDataUnit( JB4_HANDLE h, JB4_DATAUNIT_HANDLE dataUnit, uint32_t rcvTime ); +int16_t JB4_PushDataUnit( JB4_HANDLE h, JB4_DATAUNIT_HANDLE dataUnit, const uint32_t rcvTime ); -int16_t JB4_PopDataUnit( JB4_HANDLE h, uint32_t sysTime, uint32_t extBufferedTime, JB4_DATAUNIT_HANDLE *pDataUnit, uint32_t *scale, uint32_t *maxScaling ); +int16_t JB4_PopDataUnit( JB4_HANDLE h, const uint32_t sysTime, const uint32_t extBufferedTime, JB4_DATAUNIT_HANDLE *pDataUnit, uint32_t *scale, uint32_t *maxScaling ); int16_t JB4_getFECoffset( JB4_HANDLE h ); diff --git a/lib_dec/jbm_pcmdsp_apa.c b/lib_dec/jbm_pcmdsp_apa.c index 3968e38974..c816a9d9c8 100644 --- a/lib_dec/jbm_pcmdsp_apa.c +++ b/lib_dec/jbm_pcmdsp_apa.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -47,7 +47,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /* local headers */ #include "jbm_pcmdsp_apa.h" #include "jbm_pcmdsp_similarityestimation.h" @@ -66,11 +66,12 @@ struct apa_state_t { /* output buffer */ - int16_t buf_out[APA_BUF]; + int16_t *buf_out; + uint16_t buf_out_capacity; uint16_t l_buf_out; /* Hann window */ - float win[APA_BUF]; + float win[APA_BUF_PER_CHANNEL]; uint16_t l_halfwin; /* sampling rate [Hz] */ @@ -99,8 +100,8 @@ struct apa_state_t /* search length [samples] */ uint16_t l_search; - uint16_t wss; /* waveform subsampling */ - uint16_t css; /* correlation subsampling */ + uint16_t wss; /* waveform subsampling per channel */ + uint16_t css; /* correlation subsampling per channel */ float targetQuality; uint16_t qualityred; /* quality reduction threshold */ @@ -138,8 +139,9 @@ static bool extend_frm( apa_state_t *ps, const int16_t frm_in[], int16_t frm_out *---------------------------------------------------------------------*/ /* Allocates memory for state struct and initializes elements. */ -uint8_t apa_init( - apa_state_t **pps ) +ivas_error apa_init( + apa_state_t **pps, + const int32_t num_channels ) { apa_state_t *ps = NULL; @@ -150,15 +152,22 @@ uint8_t apa_init( } /* allocate state struct */ - ps = (apa_state_t *) count_malloc( sizeof( apa_state_t ) ); - if ( !ps ) + if ( ( ps = (apa_state_t *) malloc( sizeof( apa_state_t ) ) ) == NULL ) { - return 2; + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM\n" ) ); + } + + ps->num_channels = (uint16_t) num_channels; + ps->buf_out_capacity = (uint16_t) ( APA_BUF_PER_CHANNEL * num_channels ); + if ( ( ps->buf_out = malloc( sizeof( float ) * ps->buf_out_capacity ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM\n" ) ); } + apa_reset( ps ); *pps = ps; - return 0; + return IVAS_ERR_OK; } @@ -186,7 +195,6 @@ void apa_reset( ps->last_pitch = 0; ps->bad_frame_count = 0; ps->good_frame_count = 0; - ps->num_channels = 0; return; } @@ -195,8 +203,7 @@ void apa_reset( /* Sets the audio configuration. */ bool apa_set_rate( apa_state_t *ps, - const int32_t output_Fs, - const int16_t num_channels ) + const int32_t output_Fs ) { /* make sure pointer is valid */ if ( ps == NULL ) @@ -216,8 +223,10 @@ bool apa_set_rate( /* copy rate to state struct */ ps->rate = (uint16_t) output_Fs; - /* set number of channels */ - ps->num_channels = num_channels; + if ( ps->num_channels > APA_MAX_NUM_CHANNELS ) + { + return 1; + } /* * several other parameters depend on the sampling rate @@ -235,8 +244,7 @@ bool apa_set_rate( ps->l_seg = ( ps->rate / 100 ) * ps->num_channels; /* init Hann window */ - /* Note: l_win < APA_BUF is required, which is assured */ - /* because APA_MAX_RATE/100 = l_win = 441 < 2048 = APA_BUF */ + /* Note: l_win < APA_BUF_PER_CHANNEL is required */ /* Length of Hann window should be independent of * number of channels - same window applied to all channels */ ps->l_halfwin = ps->rate / 100; @@ -401,8 +409,11 @@ bool apa_exit( return 0; } + /* deallocate state struct members */ + free( ( *pps )->buf_out ); + /* deallocate state struct */ - count_free( *pps ); + free( *pps ); /* set pointer to NULL */ *pps = NULL; @@ -452,7 +463,7 @@ uint8_t apa_exec( ) { uint16_t i; - int16_t frm_in[APA_BUF]; + int16_t frm_in[APA_BUF]; /* TODO(mcjbm): this buffer could be smaller - always allocates space for 16 channels */ uint16_t l_frm_out; int16_t l_rem; int32_t dl_scaled, dl_copied, l_frm_out_target; @@ -462,6 +473,9 @@ uint8_t apa_exec( statsResetThreshold = 1637; statsResetShift = 2; + /* Convert max_scaling from "per channel" to total */ + maxScaling *= ps->num_channels; + /* make sure no invalid output is used */ *l_out = 0; l_frm_out = 0; @@ -565,7 +579,7 @@ uint8_t apa_exec( /* copy output to internal buffer */ /* avoid buffer overflow: */ /* discard old samples; always keep at least most recent l_frm samples */ - if ( ( ps->l_buf_out + l_frm_out ) > APA_BUF ) + if ( ( ps->l_buf_out + l_frm_out ) > ps->buf_out_capacity ) { int16_t *buf_out_ptr1 = ps->buf_out; int16_t *buf_out_ptr2; @@ -583,7 +597,7 @@ uint8_t apa_exec( ps->l_buf_out = l_rem; } /* append new output samples */ - if ( ( ps->l_buf_out + l_frm_out ) > APA_BUF ) + if ( ( ps->l_buf_out + l_frm_out ) > ps->buf_out_capacity ) { return 5; } @@ -818,7 +832,7 @@ static bool logarithmic_search( do { coeff_max = -FLT_MAX; /* will always be overwritten with result of first correlation */ - for ( i = s_start; i < s_start + inlen; i += css ) + for ( i = s_start; i < s_start + inlen; i += css * ps->num_channels ) { if ( ( wss == 1 ) && ( ps->num_channels == 1 ) ) { @@ -929,7 +943,7 @@ static bool find_synch( /* pass last pitch to search function as prediction value */ *synch_pos = ps->last_pitch; - logarithmic_search( ps, in, s_start, s_len, offset, fixed_pos, corr_len, ps->wss, ps->css * ps->num_channels, synch_pos ); + logarithmic_search( ps, in, s_start, s_len, offset, fixed_pos, corr_len, ps->wss, ps->css, synch_pos ); /* assert synch_pos is cleanly divisible by number of channels */ assert( *synch_pos % ps->num_channels == 0 ); diff --git a/lib_dec/jbm_pcmdsp_apa.h b/lib_dec/jbm_pcmdsp_apa.h index 5cf4e7d8b6..543042f53b 100644 --- a/lib_dec/jbm_pcmdsp_apa.h +++ b/lib_dec/jbm_pcmdsp_apa.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -50,7 +50,9 @@ */ /* size of IO buffers (a_in[], a_out[]) for apa_exec() */ -#define APA_BUF 4096 * 3 +#define APA_BUF_PER_CHANNEL ( 960 * 3 ) +#define APA_MAX_NUM_CHANNELS 16 +#define APA_BUF ( APA_BUF_PER_CHANNEL * APA_MAX_NUM_CHANNELS ) /* min/max sampling rate [Hz] */ #define APA_MIN_RATE 1000 @@ -89,7 +91,8 @@ typedef struct apa_state_t *PCMDSP_APA_HANDLE; /*! Allocates memory for state struct and initializes elements. * @return 0 on success, 1 on failure */ -uint8_t apa_init( apa_state_t **s ); +ivas_error apa_init( apa_state_t **s, + const int32_t num_channels ); /*! Sets state variables to initial value. */ void apa_reset( apa_state_t *s ); @@ -103,7 +106,7 @@ void apa_reset( apa_state_t *s ); * @param[in] output_Fs sample rate [Hz] * @param[in] num_channels number of channels * @return 0 on success, 1 on failure */ -bool apa_set_rate( apa_state_t *ps, const int32_t output_Fs, const int16_t num_channels ); +bool apa_set_rate( apa_state_t *ps, const int32_t output_Fs ); /*! Set scaling. * The scale is given in % and will be valid until changed again. diff --git a/lib_dec/jbm_pcmdsp_fifo.c b/lib_dec/jbm_pcmdsp_fifo.c index 86990618fd..81e833e5e5 100644 --- a/lib_dec/jbm_pcmdsp_fifo.c +++ b/lib_dec/jbm_pcmdsp_fifo.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,15 +43,20 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" #include "jbm_pcmdsp_fifo.h" /* Creates a FIFO. */ -int16_t pcmdsp_fifo_create( +ivas_error pcmdsp_fifo_create( PCMDSP_FIFO_HANDLE *ph ) { - PCMDSP_FIFO_HANDLE h = count_malloc( sizeof( struct PCMDSP_FIFO ) ); + PCMDSP_FIFO_HANDLE h; + + if ( ( h = malloc( sizeof( struct PCMDSP_FIFO ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM\n" ) ); + } h->size = 0; h->capacity = 0; @@ -63,7 +68,7 @@ int16_t pcmdsp_fifo_create( *ph = h; - return 0; + return IVAS_ERR_OK; } @@ -85,33 +90,37 @@ void pcmdsp_fifo_destroy( if ( h->dataBegin ) { - count_free( h->dataBegin ); + free( h->dataBegin ); } - count_free( h ); + free( h ); *ph = NULL; return; } /* Initializes the FIFO with a fixed maximum allowed number audio samples. */ -int16_t pcmdsp_fifo_init( +ivas_error pcmdsp_fifo_init( PCMDSP_FIFO_HANDLE h, - uint16_t nSamples, + uint16_t nSamplesPerChannel, uint16_t nChannels, uint16_t nBytesPerSample ) { - uint16_t nDataBytes; + uint32_t nDataBytes; /* Must be 32-bit, otherwise overflows for multichannel */ - h->capacity = nSamples; + h->capacity = nSamplesPerChannel; h->nBytesPerSampleSet = nChannels * nBytesPerSample; - nDataBytes = nSamples * h->nBytesPerSampleSet; - h->dataBegin = count_malloc( nDataBytes ); + nDataBytes = nSamplesPerChannel * h->nBytesPerSampleSet; + if ( ( h->dataBegin = malloc( nDataBytes ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM\n" ) ); + } + h->dataEnd = h->dataBegin + nDataBytes; h->dataWriteIterator = h->dataBegin; h->dataReadIterator = h->dataBegin; - return 0; + return IVAS_ERR_OK; } @@ -201,7 +210,7 @@ int16_t pcmdsp_fifo_read( /* Returns the number of samples per channel that can be read (number of currently stored samples). */ -uint16_t pcmdsp_fifo_nReadableSamples( +uint16_t pcmdsp_fifo_nReadableSamplesPerChannel( const PCMDSP_FIFO_HANDLE h ) { return h->size; diff --git a/lib_dec/jbm_pcmdsp_fifo.h b/lib_dec/jbm_pcmdsp_fifo.h index bdd186702e..13ffd146f8 100644 --- a/lib_dec/jbm_pcmdsp_fifo.h +++ b/lib_dec/jbm_pcmdsp_fifo.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -66,16 +66,16 @@ struct PCMDSP_FIFO typedef struct PCMDSP_FIFO *PCMDSP_FIFO_HANDLE; -int16_t pcmdsp_fifo_create( PCMDSP_FIFO_HANDLE *ph ); +ivas_error pcmdsp_fifo_create( PCMDSP_FIFO_HANDLE *ph ); void pcmdsp_fifo_destroy( PCMDSP_FIFO_HANDLE *ph ); -int16_t pcmdsp_fifo_init( PCMDSP_FIFO_HANDLE h, uint16_t nSamples, uint16_t nChannels, uint16_t nBytesPerSample ); +ivas_error pcmdsp_fifo_init( PCMDSP_FIFO_HANDLE h, uint16_t nSamplesPerChannel, uint16_t nChannels, uint16_t nBytesPerSample ); int16_t pcmdsp_fifo_write( PCMDSP_FIFO_HANDLE h, const uint8_t *samples, uint16_t nSamplesPerChannel ); int16_t pcmdsp_fifo_read( PCMDSP_FIFO_HANDLE h, uint16_t nSamplesPerChannel, uint8_t *samples ); -uint16_t pcmdsp_fifo_nReadableSamples( const PCMDSP_FIFO_HANDLE h ); +uint16_t pcmdsp_fifo_nReadableSamplesPerChannel( const PCMDSP_FIFO_HANDLE h ); #endif /* JBM_PCMDSP_FIFO_H */ diff --git a/lib_dec/jbm_pcmdsp_similarityestimation.c b/lib_dec/jbm_pcmdsp_similarityestimation.c index 3016fab5e1..f575acc7ad 100644 --- a/lib_dec/jbm_pcmdsp_similarityestimation.c +++ b/lib_dec/jbm_pcmdsp_similarityestimation.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /* local headers */ #include "jbm_pcmdsp_similarityestimation.h" diff --git a/lib_dec/jbm_pcmdsp_similarityestimation.h b/lib_dec/jbm_pcmdsp_similarityestimation.h index 36f64d7297..4dc92f27b7 100644 --- a/lib_dec/jbm_pcmdsp_similarityestimation.h +++ b/lib_dec/jbm_pcmdsp_similarityestimation.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_dec/jbm_pcmdsp_window.c b/lib_dec/jbm_pcmdsp_window.c index 94182e5ad6..f9f71ac802 100644 --- a/lib_dec/jbm_pcmdsp_window.c +++ b/lib_dec/jbm_pcmdsp_window.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #endif #include "jbm_pcmdsp_window.h" #include "cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------* * hannWindow() diff --git a/lib_dec/jbm_pcmdsp_window.h b/lib_dec/jbm_pcmdsp_window.h index cf697b6b9c..67759e9738 100644 --- a/lib_dec/jbm_pcmdsp_window.h +++ b/lib_dec/jbm_pcmdsp_window.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_dec/lead_deindexing.c b/lib_dec/lead_deindexing.c index 246e0df391..830daa8120 100644 --- a/lib_dec/lead_deindexing.c +++ b/lib_dec/lead_deindexing.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "prot.h" #include "rom_com.h" #include "rom_dec.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local function prototypes diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index 92c48768d3..7bd50bdb30 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -32,6 +32,7 @@ #include "lib_dec.h" #include "ivas_prot.h" +#include "ivas_prot_rend.h" #include "prot.h" #include "jbm_jb4sb.h" #include "jbm_pcmdsp_apa.h" @@ -45,9 +46,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#ifdef WMOPS -#include "wmops.h" -#endif +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local structs @@ -55,11 +54,14 @@ struct IVAS_DEC_VOIP { - uint16_t nSamplesFrame; + uint16_t nSamplesFrame; /* Total number of samples in a frame (includes number of channels) */ JB4_HANDLE hJBM; PCMDSP_APA_HANDLE hTimeScaler; PCMDSP_FIFO_HANDLE hFifoAfterTimeScaler; uint16_t lastDecodedWasActive; + int16_t *apaExecBuffer; /* Buffer for APA scaling */ + JB4_DATAUNIT_HANDLE hCurrentDataUnit; /* Points to the currently processed data unit */ + uint16_t *bs_conversion_buf; /* Buffer for bitstream conversion from packed to serial */ #ifdef SUPPORT_JBM_TRACEFILE IVAS_JBM_TRACE_DATA JbmTraceData; #endif @@ -123,7 +125,7 @@ ivas_error IVAS_DEC_Open( * Allocate and initialize IVAS application decoder handle *-----------------------------------------------------------------*/ - if ( ( *phIvasDec = (IVAS_DEC_HANDLE) count_malloc( sizeof( struct IVAS_DEC ) ) ) == NULL ) + if ( ( *phIvasDec = (IVAS_DEC_HANDLE) malloc( sizeof( struct IVAS_DEC ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for IVAS decoder handle" ); } @@ -145,12 +147,12 @@ ivas_error IVAS_DEC_Open( * Initialize IVAS-codec decoder state *-----------------------------------------------------------------*/ - if ( ( hIvasDec->st_ivas = (Decoder_Struct *) count_malloc( sizeof( Decoder_Struct ) ) ) == NULL ) + if ( ( hIvasDec->st_ivas = (Decoder_Struct *) malloc( sizeof( Decoder_Struct ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for IVAS decoder structure" ); } - if ( ( hIvasDec->st_ivas->hDecoderConfig = (DECODER_CONFIG_HANDLE) count_malloc( sizeof( DECODER_CONFIG ) ) ) == NULL ) + if ( ( hIvasDec->st_ivas->hDecoderConfig = (DECODER_CONFIG_HANDLE) malloc( sizeof( DECODER_CONFIG ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for Decoder config structure" ); } @@ -246,9 +248,7 @@ static void init_decoder_config( hDecoderConfig->Opt_LsCustom = 0; hDecoderConfig->Opt_HRTF_binary = 0; hDecoderConfig->Opt_Headrotation = 0; -#ifdef DEBUGGING - hDecoderConfig->forceSubframeBinauralization = 0; -#endif + hDecoderConfig->Opt_RendConfigCustom = 0; hDecoderConfig->orientation_tracking = orientation_tracking; hDecoderConfig->no_diegetic_pan = no_diegetic_pan; @@ -284,7 +284,7 @@ void IVAS_DEC_Close( ( *phIvasDec )->st_ivas = NULL; } - count_free( *phIvasDec ); + free( *phIvasDec ); *phIvasDec = NULL; phIvasDec = NULL; @@ -418,11 +418,8 @@ ivas_error IVAS_DEC_Configure( const IVAS_DEC_AUDIO_CONFIG outputFormat, /* i : output format */ const int16_t customLsOutputEnabled, /* i : enable custom loudspeaker setup handle */ const int16_t hrtfReaderEnabled, /* i : enable HRTF binary file input */ - const int16_t enableHeadRotation /* i : enable head rotation for binaural output */ -#ifdef DEBUGGING - , - const int16_t forceSubframeBinauralization /* i : enable subframe binauralization */ -#endif + const int16_t enableHeadRotation, /* i : enable head rotation for binaural output */ + const int16_t renderConfigEnabled /* i : enable Renderer config. file for binaural output */ ) { Decoder_Struct *st_ivas; @@ -468,12 +465,10 @@ ivas_error IVAS_DEC_Configure( hDecoderConfig->nchan_out = audioCfg2channels( hDecoderConfig->output_config ); } -#ifdef DEBUGGING - hDecoderConfig->forceSubframeBinauralization = forceSubframeBinauralization; -#endif hDecoderConfig->Opt_LsCustom = customLsOutputEnabled; hDecoderConfig->Opt_Headrotation = enableHeadRotation; hDecoderConfig->Opt_HRTF_binary = hrtfReaderEnabled; + hDecoderConfig->Opt_RendConfigCustom = renderConfigEnabled; /* Set decoder parameters to initial values */ if ( ( error = ivas_init_decoder_front( st_ivas ) ) != IVAS_ERR_OK ) @@ -517,44 +512,52 @@ ivas_error IVAS_DEC_EnableVoIP( return IVAS_ERR_UNEXPECTED_NULL_POINTER; } - if ( !hIvasDec->isInitialized ) - { - if ( ( error = ivas_init_decoder( hIvasDec->st_ivas ) ) != IVAS_ERR_OK ) - { - return error; - } - - hIvasDec->st_ivas->hDecoderConfig->ivas_total_brate = ACELP_8k00; - hIvasDec->isInitialized = true; - } hDecoderConfig = hIvasDec->st_ivas->hDecoderConfig; hIvasDec->Opt_VOIP = 1; - hIvasDec->st_ivas->hSCE[0]->hCoreCoder[0]->codec_mode = 0; - hDecoderConfig->nchan_out = 1; /* VoIP only supported in mono */ + + hDecoderConfig->nchan_out = audioCfg2channels( hDecoderConfig->output_config ); + assert( hDecoderConfig->nchan_out > 0 && "EXT output not yet supported in VoIP mode" ); + if ( ( error = input_format_API_to_internal( inputFormat, &hIvasDec->bitstreamformat, &hIvasDec->sdp_hf_only, true ) ) != IVAS_ERR_OK ) { return error; } - hIvasDec->hVoIP = count_malloc( sizeof( IVAS_DEC_VOIP ) ); + hIvasDec->hVoIP = malloc( sizeof( IVAS_DEC_VOIP ) ); + if ( hIvasDec->hVoIP == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate VoIP handle" ); + } + hIvasDec->hVoIP->lastDecodedWasActive = 0; - hIvasDec->hVoIP->nSamplesFrame = (uint16_t) ( hDecoderConfig->output_Fs / FRAMES_PER_SEC ); + hIvasDec->hVoIP->hCurrentDataUnit = NULL; + hIvasDec->hVoIP->nSamplesFrame = (uint16_t) ( hDecoderConfig->output_Fs * hDecoderConfig->nchan_out / FRAMES_PER_SEC ); - /* Copy updated configuration to core coder */ + hIvasDec->hVoIP->apaExecBuffer = malloc( sizeof( int16_t ) * APA_BUF_PER_CHANNEL * hDecoderConfig->nchan_out ); + if ( hIvasDec->hVoIP->apaExecBuffer == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate VoIP handle" ); + } - if ( hIvasDec->hVoIP == NULL ) +#define WMC_TOOL_SKIP + /* Bitstream conversion is not counted towards complexity and memory usage */ + hIvasDec->hVoIP->bs_conversion_buf = malloc( sizeof( uint16_t ) * ( MAX_BITS_PER_FRAME + 4 * 8 ) ); +#undef WMC_TOOL_SKIP + + if ( hIvasDec->hVoIP->bs_conversion_buf == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate VoIP handle" ); } + /* initialize JBM */ if ( ( error = JB4_Create( &hIvasDec->hVoIP->hJBM ) != IVAS_ERR_OK ) != IVAS_ERR_OK ) { return error; } - if ( JB4_Init( hIvasDec->hVoIP->hJBM, jbmSafetyMargin ) != 0 ) + if ( ( error = JB4_Init( hIvasDec->hVoIP->hJBM, jbmSafetyMargin ) ) != IVAS_ERR_OK ) { - return IVAS_ERR_FAILED_ALLOC; + return error; } if ( hDecoderConfig->output_Fs == 8000 ) @@ -582,12 +585,12 @@ ivas_error IVAS_DEC_EnableVoIP( return IVAS_ERR_INIT_ERROR; } - if ( apa_init( &hIvasDec->hVoIP->hTimeScaler ) != 0 || - apa_set_rate( hIvasDec->hVoIP->hTimeScaler, hDecoderConfig->output_Fs, hDecoderConfig->nchan_out ) != 0 || + if ( apa_init( &hIvasDec->hVoIP->hTimeScaler, hDecoderConfig->nchan_out ) != IVAS_ERR_OK || + apa_set_rate( hIvasDec->hVoIP->hTimeScaler, hDecoderConfig->output_Fs ) != 0 || apa_set_complexity_options( hIvasDec->hVoIP->hTimeScaler, wss, css ) != 0 || apa_set_quality( hIvasDec->hVoIP->hTimeScaler, 1, 4, 4 ) != 0 || - pcmdsp_fifo_create( &hIvasDec->hVoIP->hFifoAfterTimeScaler ) != 0 || - pcmdsp_fifo_init( hIvasDec->hVoIP->hFifoAfterTimeScaler, (uint16_t) ( hDecoderConfig->output_Fs * 4 / FRAMES_PER_SEC ) /* 4 frames */, hDecoderConfig->nchan_out, sizeof( int16_t ) ) != 0 ) + pcmdsp_fifo_create( &hIvasDec->hVoIP->hFifoAfterTimeScaler ) != IVAS_ERR_OK || + pcmdsp_fifo_init( hIvasDec->hVoIP->hFifoAfterTimeScaler, (uint16_t) ( hDecoderConfig->output_Fs * 4 / FRAMES_PER_SEC ) /* 4 frames */, hDecoderConfig->nchan_out, sizeof( int16_t ) ) != IVAS_ERR_OK ) { return IVAS_ERR_INIT_ERROR; } @@ -606,7 +609,7 @@ ivas_error IVAS_DEC_FeedFrame_Serial( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ uint16_t *serial, /* i : buffer containing serial input bitstream. Each bit should be stored as a single uint16_t value */ const uint16_t num_bits, /* i : number of bits in input bitstream */ - const int16_t bfi /* i : bad frame indicator flag */ + int16_t bfi /* i : bad frame indicator flag */ ) { ivas_error error; @@ -624,19 +627,61 @@ ivas_error IVAS_DEC_FeedFrame_Serial( return error; } - hIvasDec->st_ivas->hDecoderConfig->ivas_total_brate = ACELP_8k00; + if ( hIvasDec->hVoIP != NULL && hIvasDec->hVoIP->hCurrentDataUnit != NULL ) + { + DEC_CORE_HANDLE st = hIvasDec->st_ivas->hSCE[0]->hCoreCoder[0]; + st->ini_frame = 0; + st->prev_use_partial_copy = 0; + hIvasDec->st_ivas->hDecoderConfig->ivas_total_brate = hIvasDec->hVoIP->hCurrentDataUnit->dataSize * FRAMES_PER_SEC; + } + else + { + hIvasDec->st_ivas->hDecoderConfig->ivas_total_brate = ACELP_8k00; + } } hIvasDec->isInitialized = true; } - if ( !bfi ) + if ( !bfi ) /* TODO(mcjbm): Is this ok for bfi == 2 (partial frame)? Is there enough info to fully configure decoder? */ { hIvasDec->hasBeenFedFirstGoodFrame = true; } + /* Update redundant frame information in EVS (pre- read indices) */ + if ( hIvasDec->mode == IVAS_DEC_MODE_EVS && hIvasDec->hVoIP != NULL && hIvasDec->hVoIP->hCurrentDataUnit != NULL ) + { + DEC_CORE_HANDLE st = hIvasDec->st_ivas->hSCE[0]->hCoreCoder[0]; + st->bit_stream = serial; + + if ( hIvasDec->hVoIP->hCurrentDataUnit->partial_frame || st->prev_use_partial_copy ) + { + st->next_coder_type = hIvasDec->hVoIP->hCurrentDataUnit->nextCoderType; + } + else + { + st->next_coder_type = INACTIVE; + } + + if ( hIvasDec->hVoIP->hCurrentDataUnit->partial_frame == 1 && bfi != 1 ) + { + bfi = 2; + } + } + error = read_indices( hIvasDec->st_ivas, serial, num_bits, &hIvasDec->prev_ft_speech, &hIvasDec->CNG, bfi ); + /* Update redundant frame information in EVS (post- read indices) */ + if ( hIvasDec->mode == IVAS_DEC_MODE_EVS && + hIvasDec->hVoIP != NULL && + hIvasDec->hVoIP->hCurrentDataUnit != NULL && + hIvasDec->hVoIP->hCurrentDataUnit->partial_frame != 0 ) + { + DEC_CORE_HANDLE st = hIvasDec->st_ivas->hSCE[0]->hCoreCoder[0]; + st->codec_mode = MODE2; + st->use_partial_copy = 1; + } + return error; } @@ -650,7 +695,7 @@ ivas_error IVAS_DEC_FeedFrame_Serial( ivas_error IVAS_DEC_GetSamples( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ int16_t *pcmBuf, /* i/o: buffer for decoded PCM output. The memory must already be allocated and be able to hold the expected number of output samples, based on frame size and number of output channels */ - int16_t *nOutSamples /* o : number of samples written to output buffer */ + int16_t *nOutSamples /* o : number of samples per channel written to output buffer */ #ifdef SPLIT_REND_WITH_HEAD_ROT , IVAS_SPLIT_REND_BITS_HANDLE hSplitRendBits @@ -820,15 +865,19 @@ ivas_error IVAS_DEC_GetObjectMetadata( { metadata->azimuth = 0.f; metadata->elevation = 0.f; - metadata->radius = 0.f; + metadata->radius = 1.f; metadata->spread = 0.f; metadata->gainFactor = 1.f; + metadata->yaw = 0.f; + metadata->pitch = 0.f; } else { metadata->azimuth = hIsmMeta->azimuth; metadata->elevation = hIsmMeta->elevation; - metadata->radius = 0.f; + metadata->radius = hIsmMeta->radius; + metadata->yaw = hIsmMeta->yaw; + metadata->pitch = hIsmMeta->pitch; metadata->spread = 0.f; metadata->gainFactor = 1.f; } @@ -844,8 +893,8 @@ ivas_error IVAS_DEC_GetObjectMetadata( *---------------------------------------------------------------------*/ ivas_error IVAS_DEC_GetMasaMetadata( - IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ - IVAS_MASA_QMETADATA_HANDLE *hMasaMetadata /* o : pointer to handle, which will be set to point to metadata from the most recently decoded frame */ + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + MASA_DECODER_EXT_OUT_META_HANDLE *hMasaExtOutMeta /* o : pointer to handle, which will be set to point to metadata from the most recently decoded frame */ ) { if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL ) @@ -858,7 +907,7 @@ ivas_error IVAS_DEC_GetMasaMetadata( return IVAS_ERR_WRONG_MODE; } - *hMasaMetadata = hIvasDec->st_ivas->hQMetaData; + *hMasaExtOutMeta = hIvasDec->st_ivas->hMasa->data.extOutMeta; return IVAS_ERR_OK; } @@ -870,8 +919,9 @@ ivas_error IVAS_DEC_GetMasaMetadata( *---------------------------------------------------------------------*/ ivas_error IVAS_DEC_FeedHeadTrackData( - IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ - IVAS_QUATERNION *orientation /* i : head-tracking data */ + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + IVAS_QUATERNION *orientation, /* i : head-tracking data, listener orientation */ + IVAS_VECTOR3 *Pos /* i : listener position */ #ifdef SPLIT_REND_WITH_HEAD_ROT , IVAS_SPLIT_REND_ROT_AXIS rot_axis @@ -881,7 +931,7 @@ ivas_error IVAS_DEC_FeedHeadTrackData( HEAD_TRACK_DATA_HANDLE hHeadTrackData; int16_t i; - if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL ) + if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || orientation == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; } @@ -896,10 +946,24 @@ ivas_error IVAS_DEC_FeedHeadTrackData( /* Move head-tracking data to the decoder handle */ for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ ) { - hHeadTrackData->Quaternions[i].w = orientation[i].w; - hHeadTrackData->Quaternions[i].x = orientation[i].x; - hHeadTrackData->Quaternions[i].y = orientation[i].y; - hHeadTrackData->Quaternions[i].z = orientation[i].z; + /* check for Euler angle signaling */ +#ifdef SPLIT_REND_WITH_HEAD_ROT +#ifndef EUALER2QUAT_FIX + /* TODO: temp change until Euler2Quat() is fixed*/ + if ( ( hIvasDec->st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB ) && + ( hIvasDec->st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ) +#endif +#endif + { + if ( orientation[i].w == -3.0f ) + { + Euler2Quat( deg2rad( orientation[i].x ), deg2rad( orientation[i].y ), deg2rad( orientation[i].z ), &orientation[i] ); + } + } + ivas_orient_trk_Process( hHeadTrackData->OrientationTracker, orientation[i], FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES, &hHeadTrackData->Quaternions[i] ); + hHeadTrackData->Pos[i].x = Pos[i].x; + hHeadTrackData->Pos[i].y = Pos[i].y; + hHeadTrackData->Pos[i].z = Pos[i].z; } hHeadTrackData->num_quaternions = 0; @@ -911,6 +975,58 @@ ivas_error IVAS_DEC_FeedHeadTrackData( return IVAS_ERR_OK; } +/*---------------------------------------------------------------------* + * IVAS_DEC_FeedRefRotData( ) + * + * Feed the decoder with the reference rotation + *---------------------------------------------------------------------*/ + +ivas_error IVAS_DEC_FeedRefRotData( + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + IVAS_QUATERNION rotation /* i : reference rotation data */ +) +{ + ivas_orient_trk_state_t *pOtr; + + if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || hIvasDec->st_ivas->hHeadTrackData == NULL || hIvasDec->st_ivas->hHeadTrackData->OrientationTracker == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + pOtr = hIvasDec->st_ivas->hHeadTrackData->OrientationTracker; + + pOtr->refRot.w = rotation.w; + pOtr->refRot.x = rotation.x; + pOtr->refRot.z = rotation.z; + pOtr->refRot.y = rotation.y; + + return IVAS_ERR_OK; +} + +/*---------------------------------------------------------------------* + * IVAS_DEC_FeedRefVectorData( ) + * + * Feed the decoder with a reference vector spanning from listenerPos + * to refPos. Only available in OTR_TRACKING_REF_POS and + * OTR_TRACKING_REF_POS_LEV modes. + *---------------------------------------------------------------------*/ + +ivas_error IVAS_DEC_FeedRefVectorData( + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + const IVAS_VECTOR3 listenerPos, /* i : Listener position */ + const IVAS_VECTOR3 refPos /* i : Reference position */ +) +{ + ivas_orient_trk_state_t *pOtr; + + if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || hIvasDec->st_ivas->hHeadTrackData == NULL || hIvasDec->st_ivas->hHeadTrackData->OrientationTracker == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + pOtr = hIvasDec->st_ivas->hHeadTrackData->OrientationTracker; + return ivas_orient_trk_SetReferenceVector( pOtr, listenerPos, refPos ); +} /*---------------------------------------------------------------------* * IVAS_DEC_FeedCustomLsData( ) @@ -988,6 +1104,69 @@ ivas_error IVAS_DEC_GetHrtfHandle( } +/*---------------------------------------------------------------------* + * IVAS_DEC_GetHrtfCRendHandle( ) + * + * + *---------------------------------------------------------------------*/ + +ivas_error IVAS_DEC_GetHrtfCRendHandle( + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF /* o : Set of HRTF handle */ +) +{ + if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || hIvasDec->st_ivas->hSetOfHRTF == NULL ) + { + return IVAS_ERR_WRONG_PARAMS; + } + + *hSetOfHRTF = hIvasDec->st_ivas->hSetOfHRTF; + + return IVAS_ERR_OK; +} + +/*---------------------------------------------------------------------* + * IVAS_DEC_GetHrtfFastConvHandle( ) + * + * + *---------------------------------------------------------------------*/ + +ivas_error IVAS_DEC_GetHrtfFastConvHandle( + IVAS_DEC_HANDLE hIvasDec, /* i/oL IVAS decoder handle */ + IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv /* o : FASTCONV HRTF handle */ +) +{ + if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || hIvasDec->st_ivas->hHrtfFastConv == NULL ) + { + return IVAS_ERR_WRONG_PARAMS; + } + + *hHrtfFastConv = hIvasDec->st_ivas->hHrtfFastConv; + + return IVAS_ERR_OK; +} + +/*---------------------------------------------------------------------* + * IVAS_DEC_GetHrtfParamBinHandle( ) + * + * + *---------------------------------------------------------------------*/ + +ivas_error IVAS_DEC_GetHrtfParamBinHandle( + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin /* o : Parametric binauralizer HRTF handle */ +) +{ + if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || hIvasDec->st_ivas->hHrtfParambin == NULL ) + { + return IVAS_ERR_WRONG_PARAMS; + } + + *hHrtfParambin = hIvasDec->st_ivas->hHrtfParambin; + + return IVAS_ERR_OK; +} + /*---------------------------------------------------------------------* * IVAS_DEC_GetRenderConfig( ) * @@ -1031,6 +1210,7 @@ ivas_error IVAS_DEC_GetRenderConfig( mvr2r( hRCin->roomAcoustics.pFc_input, hRCout->room_acoustics.pFc_input, CLDFB_NO_CHANNELS_MAX ); mvr2r( hRCin->roomAcoustics.pAcoustic_rt60, hRCout->room_acoustics.pAcoustic_rt60, CLDFB_NO_CHANNELS_MAX ); mvr2r( hRCin->roomAcoustics.pAcoustic_dsr, hRCout->room_acoustics.pAcoustic_dsr, CLDFB_NO_CHANNELS_MAX ); + mvr2r( hRCin->directivity, hRCout->directivity, 3 ); #ifdef SPLIT_REND_WITH_HEAD_ROT hRCout->split_rend_config.splitRendBitRate = SPLIT_REND_768k; @@ -1085,6 +1265,7 @@ ivas_error IVAS_DEC_FeedRenderConfig( mvr2r( renderConfig.room_acoustics.pFc_input, hRenderConfig->roomAcoustics.pFc_input, CLDFB_NO_CHANNELS_MAX ); mvr2r( renderConfig.room_acoustics.pAcoustic_rt60, hRenderConfig->roomAcoustics.pAcoustic_rt60, CLDFB_NO_CHANNELS_MAX ); mvr2r( renderConfig.room_acoustics.pAcoustic_dsr, hRenderConfig->roomAcoustics.pAcoustic_dsr, CLDFB_NO_CHANNELS_MAX ); + mvr2r( renderConfig.directivity, hRenderConfig->directivity, 3 ); #ifdef SPLIT_REND_WITH_HEAD_ROT hRenderConfig->split_rend_config.splitRendBitRate = renderConfig.split_rend_config.splitRendBitRate; @@ -1120,14 +1301,24 @@ ivas_error IVAS_DEC_GetDelay( return IVAS_ERR_UNEXPECTED_NULL_POINTER; } + if ( !hIvasDec->hasDecodedFirstGoodFrame ) + { + /* Delay depends on IVAS format, which is unknown until first frame has been decoded */ + return IVAS_ERR_WAITING_FOR_BITSTREAM; + } + st_ivas = hIvasDec->st_ivas; hDecoderConfig = st_ivas->hDecoderConfig; #ifdef SPLIT_REND_WITH_HEAD_ROT - *nSamples = NS2SA( hDecoderConfig->output_Fs, get_delay( DEC, hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->cldfbAnaDec[0], st_ivas->renderer_type, st_ivas->binaural_latency_ns, hDecoderConfig->output_config ) ); + nSamples[1] = NS2SA( hDecoderConfig->output_Fs, get_delay( DEC, hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->cldfbAnaDec[0], hDecoderConfig->output_config ) ); #else - *nSamples = NS2SA( hDecoderConfig->output_Fs, get_delay( DEC, hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->cldfbAnaDec[0], st_ivas->renderer_type, st_ivas->binaural_latency_ns ) ); + nSamples[1] = NS2SA( hDecoderConfig->output_Fs, get_delay( DEC, hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->cldfbAnaDec[0] ) ); #endif + nSamples[2] = (int16_t) roundf( (float) st_ivas->binaural_latency_ns * hDecoderConfig->output_Fs / 1000000000.f ); + + nSamples[0] = nSamples[1] + nSamples[2]; + *timeScale = hDecoderConfig->output_Fs; return IVAS_ERR_OK; @@ -1210,11 +1401,39 @@ static bool isSidFrame( return false; } +static void bsCompactToSerial( const uint8_t *compact, uint16_t *serial, uint16_t num_bits ) +{ +/* Bitstream conversion is not counted towards complexity and memory usage */ +#define WMC_TOOL_SKIP + uint32_t i; + uint8_t byte = 0; + const uint8_t mask = 0x80; + + for ( i = 0; i < num_bits; ++i ) + { + if ( i % 8 == 0 ) + { + byte = compact[i / 8]; + } + + serial[i] = ( byte & mask ) >> 7; + + byte <<= 1; + } + + /* Add 4 padding bytes required by core coder */ + for ( i = 0; i < 4 * 8; ++i ) + { + serial[num_bits + i] = 0; + } +#undef WMC_TOOL_SKIP +} + /*---------------------------------------------------------------------* * IVAS_DEC_VoIP_FeedFrame( ) * - * + * Feed RTP packet into internal jitter buffer *---------------------------------------------------------------------*/ ivas_error IVAS_DEC_VoIP_FeedFrame( @@ -1224,8 +1443,6 @@ ivas_error IVAS_DEC_VoIP_FeedFrame( const uint16_t rtpSequenceNumber, /* i : RTP sequence number (16 bits) */ const uint32_t rtpTimeStamp, /* i : RTP timestamp (32 bits) */ const uint32_t rcvTime_ms, /* i : receive time of the RTP packet in milliseconds */ - const bool isAMRWB_IOmode, /* i : AMRWB flag */ - const uint16_t frameTypeIndex, /* i : core mode for frame */ const bool qBit /* i : Q bit for AMR-WB IO */ ) { @@ -1257,8 +1474,6 @@ ivas_error IVAS_DEC_VoIP_FeedFrame( dataUnit->timeStamp = rtpTimeStamp; dataUnit->partial_frame = 0; dataUnit->partialCopyOffset = partialCopyOffset; - dataUnit->isAMRWB_IOmode = isAMRWB_IOmode; - dataUnit->frameTypeIndex = frameTypeIndex; dataUnit->qBit = qBit; /* add the frame to the JBM */ @@ -1282,8 +1497,6 @@ ivas_error IVAS_DEC_VoIP_FeedFrame( dataUnit->timeStamp = rtpTimeStamp - partialCopyOffset * dataUnit->duration; dataUnit->partial_frame = 1; dataUnit->partialCopyOffset = partialCopyOffset; - dataUnit->isAMRWB_IOmode = isAMRWB_IOmode; - dataUnit->frameTypeIndex = frameTypeIndex; dataUnit->qBit = qBit; /* add the frame to the JBM */ @@ -1306,22 +1519,23 @@ ivas_error IVAS_DEC_VoIP_FeedFrame( ivas_error IVAS_DEC_VoIP_GetSamples( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ - int16_t *nOutSamples, /* o : number of samples written to output buffer */ + uint16_t nSamplesPerChannel, /* i : number of samples per channel requested to be written to output buffer */ int16_t *pcmBuf, /* i/o: buffer for decoded PCM output. The memory must already be allocated and be able to hold the expected number of output samples, based on frame size and number of output channels */ - const uint32_t pcmBufSize, /* i : size of the PCM output buffer */ const uint32_t systemTimestamp_ms /* i : current system timestamp */ +#ifdef SUPPORT_JBM_TRACEFILE + , + JbmTraceFileWriterFn jbmWriterFn, + void *jbmWriter +#endif ) { Decoder_Struct *st_ivas; DECODER_CONFIG_HANDLE hDecoderConfig; - Decoder_State *st; IVAS_DEC_VOIP *hVoIP; uint32_t extBufferedTime_ms, scale, maxScaling; uint16_t nTimeScalerOutSamples; JB4_DATAUNIT_HANDLE dataUnit; - uint16_t bit_stream[MAX_BITS_PER_FRAME + 4 * 8]; int16_t nOutSamplesElse; - uint16_t soundCardFrameSize; uint16_t extBufferedSamples; int16_t timeScalingDone; int16_t result; @@ -1331,20 +1545,19 @@ ivas_error IVAS_DEC_VoIP_GetSamples( st_ivas = hIvasDec->st_ivas; hDecoderConfig = st_ivas->hDecoderConfig; - st = st_ivas->hSCE[0]->hCoreCoder[0]; hVoIP = hIvasDec->hVoIP; - soundCardFrameSize = hVoIP->nSamplesFrame; timeScalingDone = 0; - assert( hVoIP->nSamplesFrame <= pcmBufSize ); - assert( hVoIP->nSamplesFrame <= APA_BUF ); - - st_ivas->hSCE[0]->hCoreCoder[0]->bit_stream = bit_stream; + /* TODO(mcjbm): ringbuffer capacity should be configurable by user */ + if ( nSamplesPerChannel > hVoIP->hFifoAfterTimeScaler->capacity || nSamplesPerChannel == 0 ) + { + return IVAS_ERR_WRONG_PARAMS; + } /* make sure that the FIFO after decoder/scaler contains at least one sound card frame (i.e. 20ms) */ - while ( pcmdsp_fifo_nReadableSamples( hVoIP->hFifoAfterTimeScaler ) < soundCardFrameSize ) + while ( pcmdsp_fifo_nReadableSamplesPerChannel( hVoIP->hFifoAfterTimeScaler ) < nSamplesPerChannel ) { - extBufferedSamples = pcmdsp_fifo_nReadableSamples( hVoIP->hFifoAfterTimeScaler ); + extBufferedSamples = pcmdsp_fifo_nReadableSamplesPerChannel( hVoIP->hFifoAfterTimeScaler ); extBufferedTime_ms = extBufferedSamples * 1000 / hDecoderConfig->output_Fs; dataUnit = NULL; /* pop one access unit from the jitter buffer */ @@ -1371,52 +1584,27 @@ ivas_error IVAS_DEC_VoIP_GetSamples( /* copy bitstream into decoder state */ if ( dataUnit ) { - if ( st->codec_mode != 0 ) - { - read_indices_from_djb( st, dataUnit->data, &hIvasDec->CNG, dataUnit->dataSize, - dataUnit->isAMRWB_IOmode, dataUnit->frameTypeIndex, dataUnit->qBit, hIvasDec->bitstreamformat, hIvasDec->amrwb_rfc4867_flag, - ( dataUnit->partial_frame == TRUE ) ? 1 : 0, dataUnit->nextCoderType ); - - if ( dataUnit->partial_frame != 0 ) - { - st->codec_mode = MODE2; - st->use_partial_copy = 1; - } - } - else /* initialize decoder with first received frame */ - { - /* initialize, since this is needed within read_indices_from_djb, to correctly set st->last_codec_mode */ - st->ini_frame = 0; - st->prev_use_partial_copy = 0; - st_ivas->hDecoderConfig->ivas_total_brate = dataUnit->dataSize * FRAMES_PER_SEC; + hIvasDec->hVoIP->hCurrentDataUnit = dataUnit; - read_indices_from_djb( st, dataUnit->data, &hIvasDec->CNG, dataUnit->dataSize, - dataUnit->isAMRWB_IOmode, dataUnit->frameTypeIndex, dataUnit->qBit, hIvasDec->bitstreamformat, hIvasDec->amrwb_rfc4867_flag, - 0, 0 ); - } + bsCompactToSerial( dataUnit->data, hIvasDec->hVoIP->bs_conversion_buf, dataUnit->dataSize ); + IVAS_DEC_FeedFrame_Serial( hIvasDec, hIvasDec->hVoIP->bs_conversion_buf, dataUnit->dataSize, 0 ); } - else if ( st->codec_mode != 0 ) + else if ( hIvasDec->hasDecodedFirstGoodFrame ) { - read_indices_from_djb( st, NULL, &hIvasDec->CNG, 0, - 0, 0, 0, hIvasDec->bitstreamformat, 0, - 0, 0 ); + /* Decoder has been initialized with first good frame - do PLC */ + IVAS_DEC_FeedFrame_Serial( hIvasDec, hIvasDec->hVoIP->bs_conversion_buf, 0, 1 ); } /* decode */ - if ( st->codec_mode == 0 ) + if ( !hIvasDec->hasBeenFedFirstGoodFrame ) { - /* codec mode to use not known yet */ - set_s( pcmBuf, 0, hVoIP->nSamplesFrame ); + /* codec mode to use not known yet - simply output silence */ + set_s( hVoIP->apaExecBuffer, 0, hVoIP->nSamplesFrame ); /* TODO(mcjbm): Could be optimized: just write directly to output buffer */ } else { - if ( hIvasDec->mode == IVAS_DEC_MODE_EVS ) - { - /* Update total bitrate after reading indices */ - hIvasDec->st_ivas->hDecoderConfig->ivas_total_brate = st->total_brate; - } - if ( ( error = IVAS_DEC_GetSamples( hIvasDec, pcmBuf, &nOutSamplesElse + if ( ( error = IVAS_DEC_GetSamples( hIvasDec, hVoIP->apaExecBuffer, &nOutSamplesElse #ifdef SPLIT_REND_WITH_HEAD_ROT , NULL @@ -1456,29 +1644,36 @@ ivas_error IVAS_DEC_VoIP_GetSamples( { return IVAS_ERR_UNKNOWN; } - result = apa_exec( hVoIP->hTimeScaler, pcmBuf, (uint16_t) ( hVoIP->nSamplesFrame * hDecoderConfig->nchan_out ), (uint16_t) maxScaling, pcmBuf, &nTimeScalerOutSamples ); + result = apa_exec( hVoIP->hTimeScaler, hVoIP->apaExecBuffer, hVoIP->nSamplesFrame, (uint16_t) maxScaling, hVoIP->apaExecBuffer, &nTimeScalerOutSamples ); if ( result != 0 ) { return IVAS_ERR_UNKNOWN; } - assert( nTimeScalerOutSamples <= pcmBufSize ); assert( nTimeScalerOutSamples <= APA_BUF ); /* append scaled samples to FIFO */ - if ( pcmdsp_fifo_write( hVoIP->hFifoAfterTimeScaler, (uint8_t *) pcmBuf, (uint16_t) ( nTimeScalerOutSamples / hDecoderConfig->nchan_out ) ) != 0 ) + if ( pcmdsp_fifo_write( hVoIP->hFifoAfterTimeScaler, (uint8_t *) hVoIP->apaExecBuffer, (uint16_t) ( nTimeScalerOutSamples / hDecoderConfig->nchan_out ) ) != 0 ) { return IVAS_ERR_UNKNOWN; } #ifdef SUPPORT_JBM_TRACEFILE - /* store JBM trace data entry */ - store_JbmData( hVoIP, dataUnit, systemTimestamp_ms, extBufferedSamples, hDecoderConfig->output_Fs ); + /* jbmWriterFn and jbmWriter may be NULL if tracefile writing was not requested on CLI */ + if ( jbmWriterFn != NULL && jbmWriter != NULL ) + { + /* write JBM trace data entry */ + store_JbmData( hVoIP, dataUnit, systemTimestamp_ms, extBufferedSamples, hDecoderConfig->output_Fs ); + if ( ( jbmWriterFn( &hVoIP->JbmTraceData, jbmWriter ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError writing JBM Trace data to file\n" ); + return IVAS_ERR_UNKNOWN; + } + } #endif } - /* fetch one frame for the sound card from FIFO */ - *nOutSamples = (int16_t) soundCardFrameSize; - if ( pcmdsp_fifo_read( hVoIP->hFifoAfterTimeScaler, *nOutSamples, (uint8_t *) pcmBuf ) != 0 ) + /* fetch a user-specified number of samples from FIFO */ + if ( pcmdsp_fifo_read( hVoIP->hFifoAfterTimeScaler, nSamplesPerChannel, (uint8_t *) pcmBuf ) != 0 ) { return IVAS_ERR_UNKNOWN; } @@ -1540,7 +1735,20 @@ static void IVAS_DEC_Close_VoIP( pcmdsp_fifo_destroy( &hVoIP->hFifoAfterTimeScaler ); - count_free( hVoIP ); + if ( hVoIP->apaExecBuffer != NULL ) + { + free( hVoIP->apaExecBuffer ); + } + + if ( hVoIP->bs_conversion_buf != NULL ) + { +#define WMC_TOOL_SKIP + /* Bitstream conversion is not counted towards complexity and memory usage */ + free( hVoIP->bs_conversion_buf ); +#undef WMC_TOOL_SKIP + } + + free( hVoIP ); return; } @@ -1569,31 +1777,18 @@ static void store_JbmData( JbmTraceData = &hVoIP->JbmTraceData; - /* the first sample of the decoded/concealed frame will be played after the samples in the ring buffer */ - JbmTraceData->playTime = systemTimestamp_ms + extBufferedSamples * 1000.0 / output_Fs; - - /* rtpSeqNo;rtpTs;rcvTime;playTime;active\n */ - if ( dataUnit ) + JbmTraceData->systemTimestamp_ms = systemTimestamp_ms; + JbmTraceData->extBufferedSamples = extBufferedSamples; + JbmTraceData->lastDecodedWasActive = hVoIP->lastDecodedWasActive; + JbmTraceData->output_Fs = output_Fs; + JbmTraceData->dataUnit_flag = dataUnit != NULL; + if ( dataUnit != NULL ) { JbmTraceData->sequenceNumber = dataUnit->sequenceNumber; - JbmTraceData->partialCopyOffset = dataUnit->partialCopyOffset; JbmTraceData->timeStamp = dataUnit->timeStamp; JbmTraceData->rcvTime = dataUnit->rcvTime; - JbmTraceData->lastDecodedWasActive = hVoIP->lastDecodedWasActive; - - JbmTraceData->dataUnit_flag = 1; - if ( dataUnit->partial_frame == 1 ) - { - JbmTraceData->partial_frame_flag = 1; - } - else - { - JbmTraceData->partial_frame_flag = 0; - } - } - else - { - JbmTraceData->dataUnit_flag = 0; + JbmTraceData->partial_frame = dataUnit->partial_frame; + JbmTraceData->partialCopyOffset = dataUnit->partialCopyOffset; } return; @@ -1680,7 +1875,7 @@ const char *IVAS_DEC_GetErrorMessage( return "not implemented"; #ifdef SPLIT_REND_LC3PLUS case IVAS_ERR_LC3PLUS_INVALID_BITRATE: - return ivas_error_to_string(IVAS_ERR_LC3PLUS_INVALID_BITRATE); + return ivas_error_to_string( IVAS_ERR_LC3PLUS_INVALID_BITRATE ); #endif case IVAS_ERR_UNKNOWN: default: @@ -1871,16 +2066,44 @@ static ivas_error printConfigInfo_dec( get_channel_config( st_ivas->hDecoderConfig->output_config, &config_str[0] ); fprintf( stdout, "Output configuration: %s\n", config_str ); + if ( st_ivas->hDecoderConfig->Opt_HRTF_binary ) + { + fprintf( stdout, "HRIR/BRIR file: ON\n" ); + } + + if ( st_ivas->hDecoderConfig->Opt_RendConfigCustom ) + { + fprintf( stdout, "Renderer config. file: ON\n" ); + } + if ( st_ivas->hDecoderConfig->Opt_Headrotation ) { fprintf( stdout, "Head rotation: ON\n" ); } + + if ( st_ivas->hDecoderConfig->orientation_tracking != IVAS_ORIENT_TRK_NONE ) + { + switch ( st_ivas->hDecoderConfig->orientation_tracking ) + { + case IVAS_ORIENT_TRK_AVG: + fprintf( stdout, "Orientation tracking: AVG\n" ); + break; + case IVAS_ORIENT_TRK_REF: + fprintf( stdout, "Orientation tracking: REF\n" ); + break; + case IVAS_ORIENT_TRK_REF_VEC: + fprintf( stdout, "Orientation tracking: REF_VEC\n" ); + break; + case IVAS_ORIENT_TRK_REF_VEC_LEV: + fprintf( stdout, "Orientation tracking: REF_VEC_LEV\n" ); + break; + } + } } return IVAS_ERR_OK; } - /*---------------------------------------------------------------------* * IVAS_DEC_PrintConfig( ) * @@ -1899,6 +2122,7 @@ void IVAS_DEC_PrintConfig( #ifdef DEBUGGING +#define WMC_TOOL_SKIP void IVAS_DEC_PrintConfigWithBitstream( IVAS_DEC_HANDLE hIvasDec, const bool quietModeEnabled, @@ -1910,7 +2134,7 @@ void IVAS_DEC_PrintConfigWithBitstream( /* Create a copy of decoder struct that will be modified by preview_indices(), * leaving the original decoder struct unchanged. The additional memory used here * should not be counted towards memory footprint of the decoder. */ - st_ivas = dynamic_malloc( sizeof( Decoder_Struct ) ); + st_ivas = malloc( sizeof( Decoder_Struct ) ); memcpy( st_ivas, hIvasDec->st_ivas, sizeof( Decoder_Struct ) ); preview_indices( st_ivas, bit_stream, num_bits ); @@ -1918,10 +2142,37 @@ void IVAS_DEC_PrintConfigWithBitstream( /* Print config from modified decoder struct */ printConfigInfo_dec( st_ivas, hIvasDec->bitstreamformat, hIvasDec->Opt_VOIP, quietModeEnabled ); - dynamic_free( st_ivas ); + free( st_ivas ); + + return; +} + +void IVAS_DEC_PrintConfigWithVoipBitstream( + IVAS_DEC_HANDLE hIvasDec, + const bool quietModeEnabled, + uint8_t *au, + const uint16_t auSizeBits ) +{ + Decoder_Struct *st_ivas; + uint16_t bit_stream[MAX_BITS_PER_FRAME + 4 * 8]; + + /* Create a copy of decoder struct that will be modified by preview_indices(), + * leaving the original decoder struct unchanged. The additional memory used here + * should not be counted towards memory footprint of the decoder. */ + st_ivas = malloc( sizeof( Decoder_Struct ) ); + memcpy( st_ivas, hIvasDec->st_ivas, sizeof( Decoder_Struct ) ); + + bsCompactToSerial( au, bit_stream, auSizeBits ); + preview_indices( st_ivas, bit_stream, auSizeBits ); + + /* Print config from modified decoder struct */ + printConfigInfo_dec( st_ivas, hIvasDec->bitstreamformat, hIvasDec->Opt_VOIP, quietModeEnabled ); + + free( st_ivas ); return; } +#undef WMC_TOOL_SKIP #endif diff --git a/lib_dec/lib_dec.h b/lib_dec/lib_dec.h index 8964c54c5f..7debd32f50 100644 --- a/lib_dec/lib_dec.h +++ b/lib_dec/lib_dec.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -34,9 +34,7 @@ #define LIB_DEC_H #include "common_api_types.h" -#include "ivas_error.h" #include -#include /*---------------------------------------------------------------------* @@ -106,6 +104,11 @@ typedef enum _IVAS_DEC_BS_FORMAT typedef struct IVAS_DEC *IVAS_DEC_HANDLE; +#ifdef SUPPORT_JBM_TRACEFILE +/* Callback function for JBM tracefile writing */ +typedef ivas_error ( *JbmTraceFileWriterFn )( const void *data, void *writer ); +#endif + /* clang-format off */ /*---------------------------------------------------------------------* @@ -129,11 +132,8 @@ ivas_error IVAS_DEC_Configure( const IVAS_DEC_AUDIO_CONFIG outputFormat, /* i : output format */ const int16_t customLsOutputEnabled, /* i : enable custom loudspeaker setup handle */ const int16_t hrtfReaderEnabled, /* i : enable HRTF binary file input */ - const int16_t enableHeadRotation /* i : enable head rotation for binaural output */ -#ifdef DEBUGGING - , - const int16_t forceSubframeBinauralization /* i : enable subframe binauralization */ -#endif + const int16_t enableHeadRotation, /* i : enable head rotation for binaural output */ + const int16_t renderConfigEnabled /* i : enable Renderer config. file for binaural output */ ); void IVAS_DEC_Close( @@ -148,14 +148,14 @@ ivas_error IVAS_DEC_FeedFrame_Serial( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ uint16_t *serial, /* i : buffer containing serial input bitstream. Each bit should be stored as a single uint16_t value */ const uint16_t num_bits, /* i : number of bits in input bitstream */ - const int16_t bfi /* i : bad frame indicator flag */ + int16_t bfi /* i : bad frame indicator flag */ ); /*! r: decoder error code */ ivas_error IVAS_DEC_GetSamples( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ int16_t *pcmBuf, /* i/o: buffer for decoded PCM output. The memory must already be allocated and be able to hold the expected number of output samples, based on frame size and number of output channels */ - int16_t *nOutSamples /* o : number of samples written to output buffer */ + int16_t *nOutSamples /* o : number of samples per channel written to output buffer */ #ifdef SPLIT_REND_WITH_HEAD_ROT , IVAS_SPLIT_REND_BITS_HANDLE hSplitRendBits /* o : bitstream output for split rendering mode*/ @@ -172,20 +172,33 @@ ivas_error IVAS_DEC_GetObjectMetadata( /*! r: error code */ ivas_error IVAS_DEC_GetMasaMetadata( - IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ - IVAS_MASA_QMETADATA_HANDLE *hMasaMetadata /* o : pointer to handle, which will be set to point to metadata from the most recently decoded frame */ + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + MASA_DECODER_EXT_OUT_META_HANDLE *hMasaExtOutMeta /* o : pointer to handle, which will be set to point to metadata from the most recently decoded frame */ ); /*! r: error code */ ivas_error IVAS_DEC_FeedHeadTrackData( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ - IVAS_QUATERNION *orientation /* i : head-tracking data */ - #ifdef SPLIT_REND_WITH_HEAD_ROT + IVAS_QUATERNION *orientation, /* i : head-tracking data */ + IVAS_VECTOR3 *Pos /* i : listener position */ +#ifdef SPLIT_REND_WITH_HEAD_ROT , IVAS_SPLIT_REND_ROT_AXIS rot_axis /*i : external control for rotation axis for split rendering*/ #endif ); +/*! r: error code */ +ivas_error IVAS_DEC_FeedRefRotData( + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + IVAS_QUATERNION rotation /* i : reference rotation data */ +); +/*! r: error code */ +ivas_error IVAS_DEC_FeedRefVectorData( + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + const IVAS_VECTOR3 listenerPos, /* i : Listener position */ + const IVAS_VECTOR3 refPos /* i : Reference position */ +); + /*! r: error code */ ivas_error IVAS_DEC_VoIP_FeedFrame( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ @@ -194,18 +207,19 @@ ivas_error IVAS_DEC_VoIP_FeedFrame( const uint16_t rtpSequenceNumber, /* i : RTP sequence number (16 bits) */ const uint32_t rtpTimeStamp, /* i : RTP timestamp (32 bits) */ const uint32_t rcvTime_ms, /* i : receive time of the RTP packet in milliseconds */ - const bool isAMRWB_IOmode, /* i : AMRWB flag */ - const uint16_t frameTypeIndex, /* i : core mode for frame */ const bool qBit /* i : Q bit for AMR-WB IO */ ); /*! r: error code */ ivas_error IVAS_DEC_VoIP_GetSamples( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ - int16_t *nOutSamples, /* o : number of samples written to output buffer */ + uint16_t nSamplesPerChannel, /* i : number of samples per channel requested to be written to output buffer */ int16_t *pcmBuf, /* i/o: buffer for decoded PCM output. The memory must already be allocated and be able to hold the expected number of output samples, based on frame size and number of output channels */ - const uint32_t pcmBufSize, /* i : size of the PCM output buffer */ const uint32_t systemTimestamp_ms /* i : current system timestamp */ +#ifdef SUPPORT_JBM_TRACEFILE + , JbmTraceFileWriterFn jbmWriterFn, + void* jbmWriter +#endif ); /* Setter functions - apply changes to decoder configuration */ @@ -217,17 +231,6 @@ ivas_error IVAS_DEC_EnableVoIP( const IVAS_DEC_INPUT_FORMAT inputFormat /* i : format of the input bitstream */ ); -/*! r: error code */ -ivas_error IVAS_DEC_SetHeadrotation( - IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ - const float w, /* i : w-coordinate of head rotation quaternion */ - const float x, /* i : x-coordinate of head rotation quaternion */ - const float y, /* i : y-coordinate of head rotation quaternion */ - const float z, /* i : z-coordinate of head rotation quaternion */ - const uint16_t i /* i : subframe index within current frame */ -); - - #ifdef DEBUGGING bool IVAS_DEC_GetBerDetectFlag( IVAS_DEC_HANDLE hIvasDec /* i : IVAS decoder handle */ @@ -289,6 +292,22 @@ ivas_error IVAS_DEC_GetHrtfHandle( IVAS_DEC_HRTF_HANDLE *hHrtfTD /* o : HRTF handle */ ); +/*! r: error code */ +ivas_error IVAS_DEC_GetHrtfCRendHandle( + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF /* o : Set of HRTF handle */ +); + +ivas_error IVAS_DEC_GetHrtfFastConvHandle( + IVAS_DEC_HANDLE hIvasDec, /* i/oL IVAS decoder handle */ + IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv /* o : FASTCONV HRTF handle */ +); + +ivas_error IVAS_DEC_GetHrtfParamBinHandle( + IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ + IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin /* o : Parametric binauralizer HRTF handle */ +); + /*! r: error code*/ ivas_error IVAS_DEC_GetRenderConfig( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ @@ -345,7 +364,6 @@ const char *IVAS_DEC_GetErrorMessage( ivas_error error /* i : decoder error code enum */ ); - void IVAS_DEC_PrintConfig( const IVAS_DEC_HANDLE hIvasDec, /* i : IVAS decoder handle */ const bool quietModeEnabled, /* i : quiet mode flag: if true, reduces the amount of config info printed */ @@ -359,6 +377,13 @@ void IVAS_DEC_PrintConfigWithBitstream( uint16_t bit_stream[], /* i : bitstream buffer */ const int16_t num_bits /* i : number of bits in bitstream */ ); + +void IVAS_DEC_PrintConfigWithVoipBitstream( + IVAS_DEC_HANDLE hIvasDec, /* i : IVAS decoder handle */ + const bool quietModeEnabled, /* i : quiet mode flag: if true, reduces the amount of config info printed */ + uint8_t *au, /* i : buffer containing input access unit */ + const uint16_t auSizeBits /* i : size of the access unit in bits */ +); #endif void IVAS_DEC_PrintDisclaimer( diff --git a/lib_dec/lp_exc_d.c b/lib_dec/lp_exc_d.c index 046523105f..c436edcf13 100644 --- a/lib_dec/lp_exc_d.c +++ b/lib_dec/lp_exc_d.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * lp_filt_exc_dec() diff --git a/lib_dec/lsf_dec.c b/lib_dec/lsf_dec.c index ffa5e91e2c..6aa31243af 100644 --- a/lib_dec/lsf_dec.c +++ b/lib_dec/lsf_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -47,7 +47,7 @@ #include "ivas_prot.h" #include "ivas_rom_com.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* @@ -264,12 +264,12 @@ void lsf_end_dec( const int16_t bwidth, /* i : input signal bandwidth */ const int16_t nBits_in, /* i : number of bits used for ISF quantization*/ float *qlsf, /* o : quantized LSFs in the cosine domain */ - int16_t *lpc_param, - int16_t *LSF_Q_prediction, /* o : LSF prediction mode */ - int16_t *nb_indices + int16_t *lpc_param, /* i : LPC parameters */ + int16_t *LSF_Q_prediction, /* o : LSF prediction mode */ + int16_t *nb_indices /* o : number of indices */ #ifdef LSF_RE_USE_SECONDARY_CHANNEL , - const float tdm_lsfQ_PCh[M] + const float tdm_lsfQ_PCh[M] /* i : Q LSFs for primary channel */ #endif ) { @@ -295,6 +295,7 @@ void lsf_end_dec( #ifdef LSF_RE_USE_SECONDARY_CHANNEL float pred3[M]; #endif + flag_1bit_gran = ( st->element_mode > EVS_MONO ); nBits = nBits_in; *nb_indices = 0; @@ -343,6 +344,8 @@ void lsf_end_dec( * Select safety_net or predictive mode *--------------------------------------------------------------------------*/ + p_lpc_param = lpc_param; + #ifdef LSF_RE_USE_SECONDARY_CHANNEL if ( st->tdm_LRTD_flag == 0 && st->idchan == 1 && tdm_lsfQ_PCh != NULL ) { @@ -350,7 +353,6 @@ void lsf_end_dec( predmode += 3; } #endif - p_lpc_param = lpc_param; if ( predmode == 0 ) { @@ -579,11 +581,11 @@ void lsf_end_dec( st->BER_detect = st->BER_detect | vq_dec_lvq( 0, qlsf, &lindice[1], stages1, M, mode_lvq_p, levels1[stages1 - 1] ); - if ( predmode == 1 #ifdef LSF_RE_USE_SECONDARY_CHANNEL - || ( predmode == 4 ) + if ( predmode == 1 || ( predmode == 4 ) ) /* MA only */ +#else + if ( predmode == 1 ) /* MA only */ #endif - ) /* MA only */ { mvr2r( qlsf, st->mem_MA, M ); v_add( qlsf, pred1, qlsf, M ); diff --git a/lib_dec/lsf_msvq_ma_dec.c b/lib_dec/lsf_msvq_ma_dec.c index 1fe895b706..ede93bb162 100644 --- a/lib_dec/lsf_msvq_ma_dec.c +++ b/lib_dec/lsf_msvq_ma_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "prot.h" #include "rom_com.h" #include "basop_proto_func.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * lsf_msvq_ma_decprm() @@ -187,7 +187,11 @@ int16_t D_lsf_tcxlpc( NumIndices = 1; +#ifdef ERI_FDCNGVQ_LOW_ROM + msvq_dec( lsf_codebook[narrowband][cdk], lsf_dims, lsf_offs, TCXLPC_NUMSTAGES, M, M, indices + NumIndices, 0, NULL, lsf_q, lsf_q_ind ); +#else msvq_dec( lsf_codebook[narrowband][cdk], lsf_dims, lsf_offs, TCXLPC_NUMSTAGES, M, M, indices + NumIndices, lsf_q, lsf_q_ind ); +#endif NumIndices += TCXLPC_NUMSTAGES; @@ -195,7 +199,12 @@ int16_t D_lsf_tcxlpc( { /* Only add contribution if flag is enabled */ + +#ifdef ERI_FDCNGVQ_LOW_ROM + msvq_dec( lsf_ind_codebook[narrowband][cdk], lsf_ind_dims, lsf_ind_offs, TCXLPC_IND_NUMSTAGES, M, M, indices + NumIndices, 0, NULL, lsf_rem_q, lsf_rem_q_ind ); +#else msvq_dec( lsf_ind_codebook[narrowband][cdk], lsf_ind_dims, lsf_ind_offs, TCXLPC_IND_NUMSTAGES, M, M, indices + NumIndices, lsf_rem_q, lsf_rem_q_ind ); +#endif NumIndices += TCXLPC_IND_NUMSTAGES; /* Add to MA-removed vector */ @@ -264,7 +273,11 @@ int16_t dec_lsf_tcxlpc( } /* Decode independent lsf */ +#ifdef ERI_FDCNGVQ_LOW_ROM + msvq_dec( lsf_codebook[narrowband][cdk], lsf_dims, lsf_offs, TCXLPC_NUMSTAGES, M, M, flag + 1, 0, NULL, lsf_q_ignored, lsf_q_ind ); +#else msvq_dec( lsf_codebook[narrowband][cdk], lsf_dims, lsf_offs, TCXLPC_NUMSTAGES, M, M, flag + 1, lsf_q_ignored, lsf_q_ind ); +#endif /* Update flag */ *flag = lsf_ind_is_active( lsf_q_ind, lsf_means[narrowband], narrowband, cdk ); diff --git a/lib_dec/nelp_dec.c b/lib_dec/nelp_dec.c index 1814031fb2..67d8fb5f8b 100644 --- a/lib_dec/nelp_dec.c +++ b/lib_dec/nelp_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * nelp_decoder() diff --git a/lib_dec/peak_vq_dec.c b/lib_dec/peak_vq_dec.c index 45897b77b3..df238a057f 100644 --- a/lib_dec/peak_vq_dec.c +++ b/lib_dec/peak_vq_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------* diff --git a/lib_dec/pit_dec.c b/lib_dec/pit_dec.c index 9f2ba3bcad..c569e66097 100644 --- a/lib_dec/pit_dec.c +++ b/lib_dec/pit_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*----------------------------------------------------------* * pit_decode() diff --git a/lib_dec/pitch_extr.c b/lib_dec/pitch_extr.c index d90f06af7a..a0370946bd 100644 --- a/lib_dec/pitch_extr.c +++ b/lib_dec/pitch_extr.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -45,7 +45,7 @@ #include "cnst.h" #include "prot.h" #include "basop_util.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------* @@ -151,7 +151,7 @@ void pitch_pred_linear_fit( ml_fx[i] = (int32_t) ( ml[i] / pow( 2.f, -31 + 15 ) ); /* Q16 */ } -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP FOR( i = 0; i < lcor; i++ ) { pg_fx[i] = mult( mult( pg_fx[i], pg_fx[i] ), timeWeight[i] ); /*Q12 'til pg[lcor-1], Q14 'til pg[8]*/ @@ -286,7 +286,7 @@ void pitch_pred_linear_fit( pita = L_shl( L_deposit_l( a1 ), add( add( sum0_q, 16 - 10 + 1 ), sub( tmpa, a_e ) ) ) /*Q16*/; pitb = L_shl_r( L_mult( b1 /*Q15*/, add( no_subfr_pred, nb_subfr ) /*Q0*/ ), add( add( sum0_q, 16 - 12 ), sub( tmpb, b_e ) ) ); pit = L_add( pita, pitb ); /*Q16*/ -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP /* convert pitch back to float precision */ T0 = (float) ( pit * pow( 2.f, -31 + 15 ) ); diff --git a/lib_dec/post_dec.c b/lib_dec/post_dec.c index 0d7bd7e7c7..5bc31d56ee 100644 --- a/lib_dec/post_dec.c +++ b/lib_dec/post_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Function prototypes diff --git a/lib_dec/ppp_dec.c b/lib_dec/ppp_dec.c index 3de25cf680..f9e97edcaa 100644 --- a/lib_dec/ppp_dec.c +++ b/lib_dec/ppp_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* @@ -177,7 +177,7 @@ ivas_error ppp_quarter_decoder( tmp = (float) get_next_indice( st, 3 ); DTFS_phaseShift( CURRCW_Q_DTFS, (float) ( PI2 * ( tmp - 3 ) / CURRCW_Q_DTFS->lag ) ); - dynamic_free( PREVDTFS ); + free( PREVDTFS ); return error; } diff --git a/lib_dec/pvq_core_dec.c b/lib_dec/pvq_core_dec.c index 0ef00c6ae3..115d53ac57 100644 --- a/lib_dec/pvq_core_dec.c +++ b/lib_dec/pvq_core_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "rom_com.h" #include "prot.h" #include "stl.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local prototypes @@ -403,7 +403,7 @@ static void densitySymbolIndexDecode( *index_phi = -1; return; } -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP angle = atan2_fx( SQRT_DIM_fx[r_dim], SQRT_DIM_fx[l_dim] ); #ifndef BASOP_NOGLOB angle = shl( angle, 1 ); @@ -412,7 +412,7 @@ static void densitySymbolIndexDecode( #endif /* BASOP_NOGLOB */ angle = mult_r( angle, 20861 ); c = mult_r( res, angle ); -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP res_c = res - c; if ( c == 0 ) diff --git a/lib_dec/pvq_decode.c b/lib_dec/pvq_decode.c index c9a2bf41ab..a0da5f09ea 100644 --- a/lib_dec/pvq_decode.c +++ b/lib_dec/pvq_decode.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Function pvq_decode() * diff --git a/lib_dec/range_dec.c b/lib_dec/range_dec.c index 55010e0b36..25cfdb2155 100644 --- a/lib_dec/range_dec.c +++ b/lib_dec/range_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local prototypes diff --git a/lib_dec/re8_dec.c b/lib_dec/re8_dec.c index 22a0a538a2..d9a7c750dc 100644 --- a/lib_dec/re8_dec.c +++ b/lib_dec/re8_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "debug.h" #endif #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------------- diff --git a/lib_dec/rom_dec.c b/lib_dec/rom_dec.c index 773990c873..6f0751dc56 100644 --- a/lib_dec/rom_dec.c +++ b/lib_dec/rom_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "debug.h" #endif #include "cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /* clang-format off */ diff --git a/lib_dec/rom_dec.h b/lib_dec/rom_dec.h index 57d8b16179..604bfc2fe0 100644 --- a/lib_dec/rom_dec.h +++ b/lib_dec/rom_dec.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_dec/rst_dec.c b/lib_dec/rst_dec.c index 6b8683767d..f3fbd32165 100644 --- a/lib_dec/rst_dec.c +++ b/lib_dec/rst_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*----------------------------------------------------------------------------------* * CNG_reset_dec() diff --git a/lib_dec/stat_dec.h b/lib_dec/stat_dec.h index d86cd42b72..13fed9573b 100644 --- a/lib_dec/stat_dec.h +++ b/lib_dec/stat_dec.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -934,6 +934,7 @@ typedef struct Decoder_State int16_t ini_frame; /* initialization frames counter */ int16_t prev_coder_type; /* coding type of last frame */ int16_t low_rate_mode; /* low-rate mode flag */ + int16_t last_low_rate_mode; /* previous frame low-rate mode flag */ /*----------------------------------------------------------------------------------* * ACELP core parameters @@ -955,6 +956,9 @@ typedef struct Decoder_State float agc_mem2[2]; /* memory of AGC for saturation control */ int16_t mid_lsf_int; int16_t safety_net; + float stab_fac_smooth_lt; + float log_energy_old; + float log_energy_diff_lt; int16_t GSC_noisy_speech; /* AC mode (GSC) - flag to indicate GSC on SWB noisy speech */ int16_t GSC_IVAS_mode; /* AC mode (GSC) - GSC IVAS mode */ @@ -1341,6 +1345,11 @@ typedef struct Decoder_State /* MCT Channel mode indication: LFE, ignore channel? */ MCT_CHAN_MODE mct_chan_mode; + int16_t cng_ism_flag; /* CNG in ISM format flag */ +#ifndef FIX_ISM_DTX_CNG_BWIDTH_ALT + int16_t read_sid_info; /* For ParamISM, use the transmitted noise */ +#endif + int16_t is_ism_format; /* Indication whether the codec operates in ISM format */ } Decoder_State, *DEC_CORE_HANDLE; diff --git a/lib_dec/stat_noise_uv_dec.c b/lib_dec/stat_noise_uv_dec.c index f9e8ec4f78..2fa711814b 100644 --- a/lib_dec/stat_noise_uv_dec.c +++ b/lib_dec/stat_noise_uv_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "debug.h" #endif #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------* * stat_noise_uv_dec() diff --git a/lib_dec/swb_bwe_dec.c b/lib_dec/swb_bwe_dec.c index fca9267bd0..e7eda534ae 100644 --- a/lib_dec/swb_bwe_dec.c +++ b/lib_dec/swb_bwe_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -45,7 +45,7 @@ #include "rom_com.h" #include "basop_util.h" #include "basop_proto_func.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * para_pred_bws() diff --git a/lib_dec/swb_bwe_dec_hr.c b/lib_dec/swb_bwe_dec_hr.c index edfaaf67be..1c4d5c7f6e 100644 --- a/lib_dec/swb_bwe_dec_hr.c +++ b/lib_dec/swb_bwe_dec_hr.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * swb_bwe_dec_hr() diff --git a/lib_dec/swb_bwe_dec_lr.c b/lib_dec/swb_bwe_dec_lr.c index d10be17f5f..4f29becf24 100644 --- a/lib_dec/swb_bwe_dec_lr.c +++ b/lib_dec/swb_bwe_dec_lr.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "prot.h" #include "rom_com.h" #include "stat_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* diff --git a/lib_dec/swb_tbe_dec.c b/lib_dec/swb_tbe_dec.c index 5b602bbfd6..79fe3b0e68 100644 --- a/lib_dec/swb_tbe_dec.c +++ b/lib_dec/swb_tbe_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "prot.h" #include "rom_com.h" #include "rom_dec.h" -#include "wmops.h" +#include "wmc_auto.h" #include "ivas_prot.h" /*-----------------------------------------------------------------* @@ -535,6 +535,7 @@ void swb_tbe_dec( { tilt_swb_fec = hBWE_TD->tilt_swb_fec; } + /* WB/SWB bandwidth switching */ if ( ( st->tilt_wb > 5 && st->clas_dec == UNVOICED_CLAS ) || st->tilt_wb > 10 ) { @@ -965,6 +966,7 @@ void swb_tbe_dec( /* convert from lsp to lsf */ lsp2lsf( lsp_temp, lsf_shb, LPC_SHB_ORDER, 1 ); } + mvr2r( lsf_diff + 1, hBWE_TD->prev_lsf_diff, LPC_SHB_ORDER - 2 ); hBWE_TD->prev_tilt_para = tilt_para; } @@ -1036,8 +1038,7 @@ void swb_tbe_dec( /* From low band excitation, generate highband excitation */ mvr2r( hBWE_TD->state_syn_shbexc, shaped_shb_excitation, L_SHB_LAHEAD ); GenShapedSHBExcitation( shaped_shb_excitation + L_SHB_LAHEAD, lpc_shb, White_exc16k, hBWE_TD->mem_csfilt, hBWE_TD->mem_genSHBexc_filt_down_shb, hBWE_TD->state_lpc_syn, st->coder_type, bwe_exc_extended, hBWE_TD->bwe_seed, vf_modified, st->extl, &( hBWE_TD->tbe_demph ), &( hBWE_TD->tbe_premph ), lpc_shb_sf, &shb_ener_sf, shb_res_gshape, shb_res_dummy, &vind, formant_fac, hBWE_TD->fb_state_lpc_syn, &( hBWE_TD->fb_tbe_demph ), st->total_brate, st->prev_bfi, st->element_mode, st->flag_ACELP16k, nlExc16k, mixExc16k, st->extl_brate, MSFlag, - NULL, &( hBWE_TD->prev_pow_exc16kWhtnd ), &( hBWE_TD->prev_mix_factor ), NULL, - NULL ); + NULL, &( hBWE_TD->prev_pow_exc16kWhtnd ), &( hBWE_TD->prev_mix_factor ), NULL, NULL ); /* fill-in missing SHB excitation */ if ( ( st->element_mode == IVAS_CPE_TD || st->element_mode == IVAS_CPE_DFT ) && st->last_core_brate <= SID_2k40 ) diff --git a/lib_dec/syn_outp.c b/lib_dec/syn_outp.c index cff7d72374..c28666d1ef 100644 --- a/lib_dec/syn_outp.c +++ b/lib_dec/syn_outp.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * syn_output() diff --git a/lib_dec/tcq_core_dec.c b/lib_dec/tcq_core_dec.c index a7050f9de0..8b0a6f2d40 100644 --- a/lib_dec/tcq_core_dec.c +++ b/lib_dec/tcq_core_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "prot.h" #include "basop_util.h" #include "basop_proto_func.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * tcq_core_LR_enc() @@ -148,7 +148,7 @@ void tcq_core_LR_dec( } } -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP bsub_fx = L_shl( L_add( tcq_arbits, lsbtcq_bits ), 16 ); IF( bsub_fx > 0 ) { @@ -173,7 +173,7 @@ void tcq_core_LR_dec( } srt_vec_ind_fx( Rk_fx, Rk_sort_fx, k_sort, BANDS ); -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP /*read the bits*/ nb_bytes = bit_budget >> 3; @@ -248,10 +248,10 @@ void tcq_core_LR_dec( } if ( surplus_fx != 0 ) { -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP surplus_fx = L_add( Rk_fx[k_sort[k]], surplus_fx ); surplus_fx = L_add( delta_fx, surplus_fx ); -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP } } else @@ -283,10 +283,10 @@ void tcq_core_LR_dec( } if ( surplus_fx != 0 ) { -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP surplus_fx = L_add( Rk_fx[k_sort[k]], surplus_fx ); surplus_fx = L_add( delta_fx, surplus_fx ); -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP } } else @@ -315,7 +315,7 @@ void tcq_core_LR_dec( if ( Rk_fx[k_sort[k]] > 0 && surplus_fx < 0 ) { -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP IF( nzbands <= 1 ) { divider = 0; @@ -335,7 +335,7 @@ void tcq_core_LR_dec( delta_fx = 0; } surplus_fx = L_sub( surplus_fx, delta_fx ); -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP } else { @@ -344,13 +344,13 @@ void tcq_core_LR_dec( } } -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP if ( ( L_sub( surplus_fx, 524288 ) > 0 && sub( input_frame, L_FRAME8k ) == 0 ) || ( L_sub( surplus_fx, 786432 ) > 0 && sub( input_frame, L_FRAME16k ) == 0 ) ) { bit_surplus_fx[0] = Mult_32_16( surplus_fx, 24576 ); /* Q16 */ bit_surplus_fx[1] = Mult_32_16( surplus_fx, 8192 ); /* Q16 */ } -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP else { bit_surplus_fx[0] = surplus_fx; @@ -363,9 +363,9 @@ void tcq_core_LR_dec( { if ( k == k_num[j] ) { -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP Rk_fx[k_sort[k]] = L_add( Rk_fx[k_sort[k]], bit_surplus_fx[j] ); -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP if ( Rk_fx[k_sort[k]] > 0 && USQ_TCQ[k_sort[k]] == 0 ) { /* get number of pulses */ @@ -412,9 +412,9 @@ void tcq_core_LR_dec( decode_magnitude_usq_fx( pardec, band_width[k_sort[k]], pulsesnum, nz, &positions[band_start[k_sort[k]]], &inp_vector[band_start[k_sort[k]]] ); decode_signs_fx( pardec, band_width[k_sort[k]], &inp_vector[band_start[k_sort[k]]] ); -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP nzbands = sub( nzbands, 1 ); -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP } else { diff --git a/lib_dec/tcx_utils_dec.c b/lib_dec/tcx_utils_dec.c index f817c61e03..5db8a20b08 100644 --- a/lib_dec/tcx_utils_dec.c +++ b/lib_dec/tcx_utils_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------- * tcx_decoder_memory_update() diff --git a/lib_dec/tns_base_dec.c b/lib_dec/tns_base_dec.c index b7d977c84f..444c465042 100644 --- a/lib_dec/tns_base_dec.c +++ b/lib_dec/tns_base_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "rom_com.h" #include "prot.h" #include "stat_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* diff --git a/lib_dec/tonalMDCTconcealment.c b/lib_dec/tonalMDCTconcealment.c index a16638da51..041e3a3d2f 100644 --- a/lib_dec/tonalMDCTconcealment.c +++ b/lib_dec/tonalMDCTconcealment.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -45,7 +45,7 @@ #include #include "prot.h" #include "ivas_prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*******************************************************/ @@ -386,15 +386,14 @@ static void CalcMDXT( const TonalMDCTConcealPtr hTonalMDCTConc, const char type, const float *timeSignal, - float *mdxtOutput, - const int16_t isLfe ) + float *mdxtOutput ) { float windowedTimeSignal[L_FRAME_PLUS + 2 * L_MDCT_OVLP_MAX]; int16_t left_overlap, right_overlap; int16_t L_frame; L_frame = hTonalMDCTConc->nSamples; - WindowSignal( hTonalMDCTConc->tcx_cfg, hTonalMDCTConc->tcx_cfg->tcx_offsetFB, FULL_OVERLAP, FULL_OVERLAP, &left_overlap, &right_overlap, timeSignal, &L_frame, windowedTimeSignal, 1, 1, isLfe ); + WindowSignal( hTonalMDCTConc->tcx_cfg, hTonalMDCTConc->tcx_cfg->tcx_offsetFB, FULL_OVERLAP, FULL_OVERLAP, &left_overlap, &right_overlap, timeSignal, &L_frame, windowedTimeSignal, 1, 1 ); if ( type == 'S' ) { @@ -413,8 +412,7 @@ void TonalMDCTConceal_Detect( const TonalMDCTConcealPtr hTonalMDCTConc, const float pitchLag, int16_t *numIndices, - const PsychoacousticParameters *psychParamsCurrent, - const int16_t isLfe ) + const PsychoacousticParameters *psychParamsCurrent ) { float secondLastMDST[L_FRAME_MAX]; /* 32 bits are required */ float secondLastMDCT[L_FRAME_MAX]; /* 32 bits are required */ @@ -431,10 +429,8 @@ void TonalMDCTConceal_Detect( { if ( !hTonalMDCTConc->secondLastBlockData.tonalConcealmentActive ) { - CalcMDXT( hTonalMDCTConc, 'S', hTonalMDCTConc->secondLastPcmOut, secondLastMDST, - isLfe ); - CalcMDXT( hTonalMDCTConc, 'C', hTonalMDCTConc->secondLastPcmOut, secondLastMDCT, - isLfe ); + CalcMDXT( hTonalMDCTConc, 'S', hTonalMDCTConc->secondLastPcmOut, secondLastMDST ); + CalcMDXT( hTonalMDCTConc, 'C', hTonalMDCTConc->secondLastPcmOut, secondLastMDCT ); hTonalMDCTConc->nNonZeroSamples = 0; for ( i = 0; i < hTonalMDCTConc->nSamples; i++ ) { @@ -502,7 +498,7 @@ void TonalMDCTConceal_InsertNoise( float g, nrgNoiseInLastFrame, nrgWhiteNoise, tiltFactor, tilt; float last_block_nrg_correct; - wmops_sub_start( "InsertNoise" ); + push_wmops( "InsertNoise" ); g = 1.0f - crossfadeGain; if ( !hTonalMDCTConc->lastBlockData.blockIsConcealed ) @@ -860,7 +856,7 @@ void TonalMDCTConceal_InsertNoise( *pSeed = rnd; - wmops_sub_end(); + pop_wmops(); return; } @@ -987,7 +983,7 @@ void TonalMdctConceal_create_concealment_noise( float *cngNoiseLevelPtr; float last_scf; - wmops_sub_start( "create_conc_noise" ); + push_wmops( "create_conc_noise" ); hStereoMdct = hCPE->hStereoMdct; st = hCPE->hCoreCoder[idchan]; @@ -1039,7 +1035,7 @@ void TonalMdctConceal_create_concealment_noise( concealment_noise[i] = *rnd; } - wmops_sub_end(); + pop_wmops(); return; } @@ -1118,7 +1114,7 @@ void TonalMdctConceal_create_concealment_noise( st->seed_tcx_plc = *rnd; - wmops_sub_end(); + pop_wmops(); return; } @@ -1135,7 +1131,7 @@ void TonalMdctConceal_whiten_noise_shape( float scfs_int[FDNS_NPTS]; const PsychoacousticParameters *psychParams; - wmops_sub_start( "apply_sns_on_noise_shape" ); + push_wmops( "apply_sns_on_noise_shape" ); scfs_bg = &st->hTonalMDCTConc->scaleFactorsBackground[0]; psychParams = st->hTonalMDCTConc->psychParams; @@ -1176,5 +1172,5 @@ void TonalMdctConceal_whiten_noise_shape( set_zero( hFdCngCom->cngNoiseLevel, stop_idx - start_idx ); } - wmops_sub_end(); + pop_wmops(); } diff --git a/lib_dec/transition_dec.c b/lib_dec/transition_dec.c index 9bcecf40b8..05c7887f4b 100644 --- a/lib_dec/transition_dec.c +++ b/lib_dec/transition_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*----------------------------------------------------------------------* * Local function prototypes diff --git a/lib_dec/updt_dec.c b/lib_dec/updt_dec.c index 2c3eed80e3..81f4027221 100644 --- a/lib_dec/updt_dec.c +++ b/lib_dec/updt_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,8 @@ #include "prot.h" #include "rom_com.h" #include "cnst.h" -#include "wmops.h" +#include +#include "wmc_auto.h" /*-------------------------------------------------------------------* * updt_dec() @@ -413,6 +414,8 @@ void updt_dec_common( ) { int16_t i; + float log_energy, log_energy_diff; + int16_t output_frame; st->last_codec_mode = st->codec_mode; st->last_extl = st->extl; @@ -502,6 +505,22 @@ void updt_dec_common( mvr2r( synth + NS2SA( st->output_Fs, ACELP_LOOK_NS + DELAY_BWE_TOTAL_NS ), st->old_synth_sw, NS2SA( st->output_Fs, FRAME_SIZE_NS - ACELP_LOOK_NS - DELAY_BWE_TOTAL_NS ) ); } + /* Store long-term estimates of stab_fac and log energy diff to estimate env_stab in case of core switch ACELP/TCX->HQ */ + if ( st->element_mode != EVS_MONO ) + { + output_frame = NS2SA( st->output_Fs, FRAME_SIZE_NS ); + log_energy = log2f( ( sum2_f( synth, output_frame ) / output_frame ) + 1.0f ); + log_energy_diff = fabsf( st->log_energy_old - log_energy ); + st->log_energy_old = log_energy; + st->log_energy_diff_lt = ENV_SMOOTH_FAC * log_energy_diff + ( 1.0f - ENV_SMOOTH_FAC ) * st->log_energy_diff_lt; + if ( st->core == HQ_CORE ) + { + st->stab_fac = min( 1, ( STAB_FAC_EST1 + ( STAB_FAC_EST2 * st->hHQ_core->mem_env_delta ) + ( STAB_FAC_EST3 * st->log_energy_diff_lt ) ) ); + st->stab_fac = max( 0, st->stab_fac ); + } + st->stab_fac_smooth_lt = ENV_SMOOTH_FAC * st->stab_fac + ( 1.0f - ENV_SMOOTH_FAC ) * st->stab_fac_smooth_lt; + } + if ( ( st->core_brate <= SID_2k40 && st->cng_type == FD_CNG ) || ( st->tcxonly && st->codec_mode == MODE2 ) ) { /* reset LP memories */ @@ -622,6 +641,8 @@ void updt_dec_common( st->last_bits_frame_nominal = st->bits_frame_nominal; } + st->last_low_rate_mode = st->low_rate_mode; + /*-----------------------------------------------------------------* * Increase the counter of initialization frames * Limit the max number of init. frames diff --git a/lib_dec/vlpc_1st_dec.c b/lib_dec/vlpc_1st_dec.c index 1aa1ab72f2..cc7b33bc9a 100644 --- a/lib_dec/vlpc_1st_dec.c +++ b/lib_dec/vlpc_1st_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include "options.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------* * vlpc_1st_dec() diff --git a/lib_dec/vlpc_2st_dec.c b/lib_dec/vlpc_2st_dec.c index 83163cda78..8ac23141b8 100644 --- a/lib_dec/vlpc_2st_dec.c +++ b/lib_dec/vlpc_2st_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,7 +37,7 @@ #include #include "options.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------* * vlpc_2st_dec() diff --git a/lib_dec/voiced_dec.c b/lib_dec/voiced_dec.c index cda7120103..5c2bcc1f15 100644 --- a/lib_dec/voiced_dec.c +++ b/lib_dec/voiced_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "prot.h" #include "cnst.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * ppp_voiced_decoder() @@ -233,9 +233,9 @@ ivas_error ppp_voiced_decoder( mvr2r( dtfs_temp->a, hSC_VBR->dtfs_dec_a, MAXLAG_WI ); mvr2r( dtfs_temp->b, hSC_VBR->dtfs_dec_b, MAXLAG_WI ); - dynamic_free( TMPDTFS ); - dynamic_free( CURRP_Q_D ); - dynamic_free( dtfs_temp ); + free( TMPDTFS ); + free( CURRP_Q_D ); + free( dtfs_temp ); return error; } diff --git a/lib_dec/waveadjust_fec_dec.c b/lib_dec/waveadjust_fec_dec.c index 222fb66599..99a10e886c 100644 --- a/lib_dec/waveadjust_fec_dec.c +++ b/lib_dec/waveadjust_fec_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* diff --git a/lib_enc/ACcontextMapping_enc.c b/lib_enc/ACcontextMapping_enc.c index 62ab9e7552..a608db5ea2 100644 --- a/lib_enc/ACcontextMapping_enc.c +++ b/lib_enc/ACcontextMapping_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -46,7 +46,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* diff --git a/lib_enc/FEC_enc.c b/lib_enc/FEC_enc.c index 89868e6729..5bf8d1f1f4 100644 --- a/lib_enc/FEC_enc.c +++ b/lib_enc/FEC_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * FEC_encode() diff --git a/lib_enc/SNR_calc.c b/lib_enc/SNR_calc.c index 1ccaad6e0f..6078062ea3 100644 --- a/lib_enc/SNR_calc.c +++ b/lib_enc/SNR_calc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include #include "prot.h" #include "rom_enc.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* diff --git a/lib_enc/acelp_core_enc.c b/lib_enc/acelp_core_enc.c index 857099ed92..0310a713e3 100644 --- a/lib_enc/acelp_core_enc.c +++ b/lib_enc/acelp_core_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -50,7 +50,7 @@ #ifdef LSF_RE_USE_SECONDARY_CHANNEL #include "ivas_rom_com.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * acelp_core_enc() @@ -75,8 +75,10 @@ ivas_error acelp_core_enc( float pitch_buf[NB_SUBFR16k], /* o : floating pitch for each subframe */ int16_t *unbits, /* o : number of unused bits */ STEREO_TD_ENC_DATA_HANDLE hStereoTD, /* i/o: TD stereo encoder handle */ - const float tdm_lspQ_PCh[M], /* i : Q LSPs for primary channel */ - const float tdm_lsfQ_PCh[M] /* i : Q LSFs for primary channel */ +#ifndef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE + const float tdm_lspQ_PCh[M], /* i : Q LSPs for primary channel */ +#endif + const float tdm_lsfQ_PCh[M] /* i : Q LSFs for primary channel */ ) { int16_t i, nBits; /* reserved bits */ @@ -131,7 +133,7 @@ ivas_error acelp_core_enc( return error; } - wmops_sub_start( "acelp_core_enc" ); + push_wmops( "acelp_core_enc" ); /*------------------------------------------------------------------* * Initialization *------------------------------------------------------------------*/ @@ -314,10 +316,13 @@ ivas_error acelp_core_enc( if ( st->core_brate == SID_2k40 ) { - tmpF = cng_energy( st->element_mode, st->bwidth, st->hDtxEnc->CNG_mode, st->hTdCngEnc->CNG_att, exc, st->L_frame ); - i = (int16_t) ( ( tmpF + 2.0f ) * STEP_SID ); - i = min( max( i, 0 ), 127 ); - st->hTdCngEnc->old_enr_index = i; + if ( st->hTdCngEnc != NULL ) + { + tmpF = cng_energy( st->element_mode, st->bwidth, st->hDtxEnc->CNG_mode, st->hTdCngEnc->CNG_att, exc, st->L_frame ); + i = (int16_t) ( ( tmpF + 2.0f ) * STEP_SID ); + i = min( max( i, 0 ), 127 ); + st->hTdCngEnc->old_enr_index = i; + } } } @@ -369,9 +374,14 @@ ivas_error acelp_core_enc( nb_bits = 0; st->acelp_cfg.FEC_mode = 0; uc_two_stage_flag = 0; + if ( !nelp_mode && !ppp_mode ) { +#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE + config_acelp1( ENC, st->total_brate, st->core_brate, st->core, st->extl, st->extl_brate, st->L_frame, st->GSC_noisy_speech, &( st->acelp_cfg ), hBstr->nb_bits_tot, st->coder_type, tc_subfr, 0, &nb_bits, unbits, st->element_mode, &uc_two_stage_flag, tdm_lp_reuse_flag, tdm_low_rate_mode, st->idchan, st->active_cnt, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode ); +#else config_acelp1( ENC, st->total_brate, st->core_brate, st->core, st->extl, st->extl_brate, st->L_frame, st->GSC_noisy_speech, &( st->acelp_cfg ), hBstr->nb_bits_tot, st->coder_type, tc_subfr, 0, &nb_bits, unbits, st->element_mode, &uc_two_stage_flag, tdm_lp_reuse_flag, tdm_low_rate_mode, st->idchan, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode ); +#endif } /*-----------------------------------------------------------------* @@ -416,10 +426,11 @@ ivas_error acelp_core_enc( else { const float *pt_interp_2; + #ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE if ( st->active_cnt != 1 ) { - int16_t beta_index[1]; + int16_t beta_index; float lsf_wgts[M]; /* intra_frame prediction for the LSFs */ @@ -427,15 +438,9 @@ ivas_error acelp_core_enc( Unified_weighting( &st->Bin_E[L_FFT / 2], lsf_new, lsf_wgts, st->bwidth == NB, st->coder_type == UNVOICED, st->sr_core, M ); - tdm_SCh_lsf_reuse( ENC, st->element_brate, lsf_new, lsp_new, tdm_lsfQ_PCh, lsf_wgts, beta_index ); + tdm_SCh_lsf_reuse( ENC, st->element_brate, lsf_new, lsp_new, tdm_lsfQ_PCh, lsf_wgts, &beta_index ); - push_indice( hBstr, IND_IC_LSF_PRED, beta_index[0], TDM_IC_LSF_PRED_BITS ); - } - if ( st->active_cnt == 1 ) - { - mvr2r( lsp_new, st->lsp_old, M ); - lsp2lsf( lsp_new, st->lsf_old, M, st->sr_core ); - lsp2lsf( lsp_new, lsf_new, M, st->sr_core ); + push_indice( hBstr, IND_IC_LSF_PRED, beta_index, TDM_IC_LSF_PRED_BITS ); } #else if ( st->active_cnt != 1 ) @@ -444,19 +449,20 @@ ivas_error acelp_core_enc( mvr2r( tdm_lsfQ_PCh, lsf_new, M ); } #endif + pt_interp_2 = interpol_frac_12k8; if ( tdm_low_rate_mode == 1 && st->coder_type > UNVOICED ) { pt_interp_2 = interpol_frac2; } -#ifndef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE + if ( st->active_cnt == 1 ) { mvr2r( lsp_new, st->lsp_old, M ); lsp2lsf( lsp_new, st->lsf_old, M, st->sr_core ); lsp2lsf( lsp_new, lsf_new, M, st->sr_core ); } -#endif + /* LSP interpolation and conversion of LSPs to A(z) */ int_lsp( st->L_frame, st->lsp_old, lsp_new, Aq, M, pt_interp_2, 0 ); @@ -500,7 +506,11 @@ ivas_error acelp_core_enc( { tc_classif_enc( st->L_frame, &tc_subfr, &position, attack_flag, st->pitch[0], res ); +#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE + config_acelp1( ENC, st->total_brate, st->core_brate, st->core, st->extl, st->extl_brate, st->L_frame, -1, &( st->acelp_cfg ), hBstr->nb_bits_tot, st->coder_type, tc_subfr, 1, NULL, unbits, st->element_mode, &uc_two_stage_flag, tdm_lp_reuse_flag, tdm_low_rate_mode, st->idchan, st->active_cnt, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode ); +#else config_acelp1( ENC, st->total_brate, st->core_brate, st->core, st->extl, st->extl_brate, st->L_frame, -1, &( st->acelp_cfg ), hBstr->nb_bits_tot, st->coder_type, tc_subfr, 1, NULL, unbits, st->element_mode, &uc_two_stage_flag, tdm_lp_reuse_flag, tdm_low_rate_mode, st->idchan, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode ); +#endif } /*---------------------------------------------------------------* @@ -558,7 +568,11 @@ ivas_error acelp_core_enc( lsf_syn_mem_restore( st, tilt_code_bck, gc_threshold_bck, clip_var_bck, next_force_sf_bck, lsp_new, lsp_mid, clip_var, mem_AR, mem_MA, lsp_new_bck, lsp_mid_bck, Bin_E, Bin_E_old, mem_syn_bck, mem_w0_bck, streaklimit, pstreaklen ); /* Configure ACELP bit allocation */ +#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE + config_acelp1( ENC, st->total_brate, st->core_brate, st->core, st->extl, st->extl_brate, st->L_frame, -1, &( st->acelp_cfg ), hBstr->nb_bits_tot, st->coder_type, tc_subfr, 0, &nb_bits, unbits, 0, &uc_two_stage_flag, 0, 0, st->idchan, st->active_cnt, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode ); +#else config_acelp1( ENC, st->total_brate, st->core_brate, st->core, st->extl, st->extl_brate, st->L_frame, -1, &( st->acelp_cfg ), hBstr->nb_bits_tot, st->coder_type, tc_subfr, 0, &nb_bits, unbits, 0, &uc_two_stage_flag, 0, 0, st->idchan, tdm_Pitch_reuse_flag, st->tdm_LRTD_flag, st->GSC_IVAS_mode ); +#endif /* redo LSF quantization */ #ifdef LSF_RE_USE_SECONDARY_CHANNEL @@ -757,7 +771,7 @@ ivas_error acelp_core_enc( } } - wmops_sub_end(); + pop_wmops(); return error; } diff --git a/lib_enc/acelp_core_switch_enc.c b/lib_enc/acelp_core_switch_enc.c index efabd35882..5813968434 100644 --- a/lib_enc/acelp_core_switch_enc.c +++ b/lib_enc/acelp_core_switch_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "rom_enc.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local function prototypes @@ -151,7 +151,11 @@ void acelp_core_switch_enc( * Excitation encoding *----------------------------------------------------------------*/ +#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE + config_acelp1( ENC, st->total_brate, cbrate, st->core, -1, -1, st->last_L_frame, -1, &( st->acelp_cfg ), hBstr->nb_bits_tot, GENERIC, -1, -1, &j, &i, st->element_mode, &i /*dummy*/, 0 /*tdm_lp_reuse_flag*/, 0 /*tdm_low_rate_mode*/, st->idchan, st->active_cnt, 0 /*tdm_Pitch_reuse_flag*/, 0, 0 /*GSC_IVAS_mode*/ ); +#else config_acelp1( ENC, st->total_brate, cbrate, st->core, -1, -1, st->last_L_frame, -1, &( st->acelp_cfg ), hBstr->nb_bits_tot, GENERIC, -1, -1, &j, &i, st->element_mode, &i /*dummy*/, 0 /*tdm_lp_reuse_flag*/, 0 /*tdm_low_rate_mode*/, st->idchan, 0 /*tdm_Pitch_reuse_flag*/, 0, 0 /*GSC_IVAS_mode*/ ); +#endif encod_gen_voic_core_switch( st, st->last_L_frame, inp, Aq, A, T_op, st->voicing, exc, cbrate ); diff --git a/lib_enc/acelp_enc_util.c b/lib_enc/acelp_enc_util.c index 003dadb026..fdbc3a8b09 100644 --- a/lib_enc/acelp_enc_util.c +++ b/lib_enc/acelp_enc_util.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,11 +39,10 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "typedef.h" #include "prot.h" #include "cnst.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * E_ACELP_toeplitz_mul() diff --git a/lib_enc/amr_wb_enc.c b/lib_enc/amr_wb_enc.c index c73e5a8949..c0c0b4f18e 100644 --- a/lib_enc/amr_wb_enc.c +++ b/lib_enc/amr_wb_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "rom_enc.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" #ifdef DEBUG_MODE_INFO extern float snr_[2][320]; @@ -292,12 +292,7 @@ void amr_wb_enc( } /* apply DTX hangover for CNG analysis */ - vad_flag_dtx = dtx_hangover_addition( st, st->vad_flag, st->lp_speech - st->lp_noise, 0, &vad_hover_flag, NULL, NULL -#ifdef FIX_ITD_CNG - , - NULL -#endif - ); + vad_flag_dtx = dtx_hangover_addition( st, st->vad_flag, st->lp_speech - st->lp_noise, 0, &vad_hover_flag, NULL, NULL, NULL ); /*-----------------------------------------------------------------* * Select SID or FRAME_NO_DATA frame if DTX enabled @@ -315,9 +310,7 @@ void amr_wb_enc( { st->fd_cng_reset_flag = 0; } - dtx( st, -1, vad_flag_dtx, inp ); - /*----------------------------------------------------------------* * Noise energy down-ward update and total noise energy estimation * Long-term energies and relative frame energy updates @@ -349,7 +342,8 @@ void amr_wb_enc( * WB, SWB and FB bandwidth detector *----------------------------------------------------------------*/ - bw_detect( st, st->input, NULL, NULL ); + bw_detect( st, st->input, NULL, NULL, + 0 ); /* in AMR_WB IO, limit the maximum band-width to WB */ if ( st->bwidth > WB ) @@ -536,7 +530,8 @@ void amr_wb_enc( updt_enc( st, old_exc, pitch_buf, 0, Aq, isf_new, isp_new, dummy_buf ); /* update main codec paramaters */ - updt_enc_common( st, Etot ); + updt_enc_common( st ); + #ifdef DEBUG_MODE_INFO dbgwrite( &st->codec_mode, sizeof( int16_t ), 1, input_frame, "res/codec" ); diff --git a/lib_enc/analy_lp.c b/lib_enc/analy_lp.c index b4b990634e..c0541e78fd 100644 --- a/lib_enc/analy_lp.c +++ b/lib_enc/analy_lp.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * analy_lp() diff --git a/lib_enc/analy_sp.c b/lib_enc/analy_sp.c index 5828e72483..4a4bcb357d 100644 --- a/lib_enc/analy_sp.c +++ b/lib_enc/analy_sp.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "rom_enc.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" #include #include "ivas_cnst.h" diff --git a/lib_enc/ari_enc.c b/lib_enc/ari_enc.c index 3c6df474f8..405b3a8994 100644 --- a/lib_enc/ari_enc.c +++ b/lib_enc/ari_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------- diff --git a/lib_enc/ari_hm_enc.c b/lib_enc/ari_hm_enc.c index c88ac3812a..46a093369b 100644 --- a/lib_enc/ari_hm_enc.c +++ b/lib_enc/ari_hm_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "basop_util.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * EncodeIndex() diff --git a/lib_enc/arith_coder_enc.c b/lib_enc/arith_coder_enc.c index 553721377c..546e7f07ab 100644 --- a/lib_enc/arith_coder_enc.c +++ b/lib_enc/arith_coder_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -46,7 +46,7 @@ #include "rom_com.h" #include "basop_util.h" #include "basop_proto_func.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local constants @@ -611,9 +611,9 @@ void tcx_arith_encode_envelope( gamma_w = 1.0f; gamma_uw = 1.0f / st->gamma; -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP tcx_arith_render_envelope( A_ind, L_frame, L_spec, FL2WORD16( hTcxCfg->preemph_fac ), FL2WORD16( gamma_w ), FL2WORD16( 0.5f * gamma_uw ), env ); -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP for ( k = 0; k < L_spec; ++k ) { @@ -649,13 +649,13 @@ void tcx_arith_encode_envelope( envelope = (Word16 *) env; tcx_arith_scale_envelope( L_spec, L_spec_core, env, target_bits, low_complexity, envelope, &envelope_e ); -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP tmp = sub( envelope_e, 1 ); FOR( k = 0; k < L_spec; k++ ) { exponents[k] = expfp( negate( envelope[k] ), tmp ); } -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP scale = tcx_arith_rateloop( spectrum, L_spec, envelope, envelope_e, exponents, target_bits, deadzone, deadzone_flags, &( hTcxEnc->tcx_target_bits_fac ) ); /* Final quantization */ diff --git a/lib_enc/avq_cod.c b/lib_enc/avq_cod.c index 601138ccd0..78900b554c 100644 --- a/lib_enc/avq_cod.c +++ b/lib_enc/avq_cod.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local prototypes diff --git a/lib_enc/bass_psfilter_enc.c b/lib_enc/bass_psfilter_enc.c index 3d9a390945..582ed3f22e 100644 --- a/lib_enc/bass_psfilter_enc.c +++ b/lib_enc/bass_psfilter_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* diff --git a/lib_enc/bw_detect.c b/lib_enc/bw_detect.c index a69913eb4a..6de35a211a 100644 --- a/lib_enc/bw_detect.c +++ b/lib_enc/bw_detect.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -46,7 +46,7 @@ #include "rom_com.h" #include "prot.h" #include "ivas_prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local constants @@ -55,8 +55,9 @@ #define ALPHA_BWD 0.75f #define BWD_LT_THRESH 0.6f -#define BWD_COUNT_MAX 100 -#define BWD_COUNT_WIDER_BW 10 +#define BWD_COUNT_MAX 100 +#define BWD_COUNT_WIDER_BW 10 +#define BWD_COUNT_WIDER_BW_MDCT 0 #define CLDFB_ENER_OFFSET 1.6f @@ -71,6 +72,8 @@ void bw_detect( const float signal_in[], /* i : input signal */ float *spectrum, /* i : MDCT spectrum */ const float *enerBuffer /* i : energy buffer */ + , + const int16_t mct_on /* i : flag MCT mode */ ) { int16_t i, j, k, bw_max, bin_width, n_bins; @@ -80,6 +83,13 @@ void bw_detect( const float *pt, *pt1; float max_NB, max_WB, max_SWB, max_FB, mean_NB, mean_WB, mean_SWB, mean_FB; int16_t cldfb_bin_width = 4; + int16_t bwd_count_wider_bw, l_frame; + + bwd_count_wider_bw = BWD_COUNT_WIDER_BW; + if ( st->element_mode == IVAS_CPE_MDCT && ( st->element_brate > IVAS_64k || mct_on ) ) + { + bwd_count_wider_bw = BWD_COUNT_WIDER_BW_MDCT; + } if ( st->input_Fs > 8000 ) { @@ -173,8 +183,14 @@ void bw_detect( } else { - bin_width *= (int16_t) ( ( st->input_Fs / FRAMES_PER_SEC ) / BWD_TOTAL_WIDTH ); - mvr2r( spectrum, spect, (int16_t) ( st->input_Fs / FRAMES_PER_SEC ) ); + l_frame = (int16_t) ( st->input_Fs / FRAMES_PER_SEC ); + if ( st->core == TCX_10_CORE ) + { + l_frame /= 2; + } + + bin_width *= ( l_frame / BWD_TOTAL_WIDTH ); + mvr2r( spectrum, spect, l_frame ); } /*---------------------------------------------------------------------* * compute energy per spectral bins @@ -392,17 +408,17 @@ void bw_detect( /* switching to a higher BW */ if ( st->last_input_bwidth == NB ) { - if ( st->count_WB > BWD_COUNT_WIDER_BW ) + if ( st->count_WB > bwd_count_wider_bw ) { st->input_bwidth = WB; st->count_WB = BWD_COUNT_MAX; - if ( st->count_SWB > BWD_COUNT_WIDER_BW ) + if ( st->count_SWB > bwd_count_wider_bw ) { st->input_bwidth = SWB; st->count_SWB = BWD_COUNT_MAX; - if ( st->count_FB > BWD_COUNT_WIDER_BW ) + if ( st->count_FB > bwd_count_wider_bw ) { st->input_bwidth = FB; st->count_FB = BWD_COUNT_MAX; @@ -413,12 +429,12 @@ void bw_detect( if ( st->last_input_bwidth == WB && st->input_Fs > 16000 ) { - if ( st->count_SWB > BWD_COUNT_WIDER_BW ) + if ( st->count_SWB > bwd_count_wider_bw ) { st->input_bwidth = SWB; st->count_SWB = BWD_COUNT_MAX; - if ( st->count_FB > BWD_COUNT_WIDER_BW ) + if ( st->count_FB > bwd_count_wider_bw ) { st->input_bwidth = FB; st->count_FB = BWD_COUNT_MAX; @@ -428,7 +444,7 @@ void bw_detect( if ( st->last_input_bwidth == SWB && st->input_Fs > 32000 ) { - if ( st->count_FB > BWD_COUNT_WIDER_BW ) + if ( st->count_FB > bwd_count_wider_bw ) { st->input_bwidth = FB; st->count_FB = BWD_COUNT_MAX; @@ -620,22 +636,13 @@ void set_bw_stereo( if ( hCPE->element_mode == IVAS_CPE_MDCT ) { - /* do not check bandwidth in LFE channel */ - if ( sts[0]->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - sts[0]->bwidth = sts[0]->input_bwidth; - } - else if ( sts[1]->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - sts[1]->bwidth = sts[1]->input_bwidth; - } /* ensure that both CPE channels have the same audio band-width */ - else if ( sts[0]->input_bwidth == sts[1]->input_bwidth ) + if ( sts[0]->input_bwidth == sts[1]->input_bwidth ) { sts[0]->bwidth = sts[0]->input_bwidth; sts[1]->bwidth = sts[0]->input_bwidth; } - else if ( sts[0]->input_bwidth != sts[1]->input_bwidth ) + else { sts[0]->bwidth = max( sts[0]->input_bwidth, sts[1]->input_bwidth ); sts[1]->bwidth = max( sts[0]->input_bwidth, sts[1]->input_bwidth ); @@ -672,7 +679,8 @@ int16_t set_bw_mct( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = hCPE[cpe_id]->hCoreCoder[ch]; - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE || st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } diff --git a/lib_enc/cng_enc.c b/lib_enc/cng_enc.c index 20787dd3f7..04d9e41166 100644 --- a/lib_enc/cng_enc.c +++ b/lib_enc/cng_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "rom_enc.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local constants diff --git a/lib_enc/cod2t32.c b/lib_enc/cod2t32.c index 1efef884d4..0d5e548bef 100644 --- a/lib_enc/cod2t32.c +++ b/lib_enc/cod2t32.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local constants diff --git a/lib_enc/cod4t64.c b/lib_enc/cod4t64.c index 2c9ad01e21..79d1814f5c 100644 --- a/lib_enc/cod4t64.c +++ b/lib_enc/cod4t64.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "rom_enc.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local function prototypes diff --git a/lib_enc/cod4t64_fast.c b/lib_enc/cod4t64_fast.c index b67248ebe2..9c16758d47 100644 --- a/lib_enc/cod4t64_fast.c +++ b/lib_enc/cod4t64_fast.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "prot.h" #include "ivas_prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_enc/cod_ace.c b/lib_enc/cod_ace.c index 091146298a..7a5c605d9a 100644 --- a/lib_enc/cod_ace.c +++ b/lib_enc/cod_ace.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "debug.h" #endif #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * coder_acelp() diff --git a/lib_enc/cod_tcx.c b/lib_enc/cod_tcx.c index f60ac1a314..ac24d74bf2 100644 --- a/lib_enc/cod_tcx.c +++ b/lib_enc/cod_tcx.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" #include "ivas_prot.h" #include "ivas_rom_com.h" #ifdef DEBUGGING @@ -73,7 +73,7 @@ void HBAutocorrelation( * Windowing * *-----------------------------------------------------------*/ - WindowSignal( hTcxCfg, hTcxCfg->tcx_offset, left_overlap_mode, right_overlap_mode, &left_overlap, &right_overlap, speech, &L_frame, xn_buf, 1, 0, 0 ); + WindowSignal( hTcxCfg, hTcxCfg->tcx_offset, left_overlap_mode, right_overlap_mode, &left_overlap, &right_overlap, speech, &L_frame, xn_buf, 1, 0 ); /*-----------------------------------------------------------* * Autocorrelation * @@ -134,11 +134,11 @@ void TNSAnalysisStereo( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; - - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } + hTcxEnc = st->hTcxEnc; nSubframes = ( hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV; @@ -382,8 +382,7 @@ void TNSAnalysisStereo( /* individual decision for each channel */ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { - - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -465,10 +464,11 @@ void TNSAnalysisStereo( /* we have the decision, set filter data accordingly */ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } + nSubframes = ( sts[ch]->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV; for ( k = 0; k < nSubframes; k++ ) @@ -501,10 +501,11 @@ void TNSAnalysisStereo( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } + nSubframes = ( st->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV; for ( k = 0; k < nSubframes; k++ ) @@ -970,11 +971,6 @@ void EstimateStereoTCXNoiseLevel( { fac_ns_q = param_core[ch] + n * NPRM_DIV + 1; maxNfCalcBw = min( noiseFillingBorder[ch][n], (int16_t) ( hTcxEnc->measuredBwRatio * (float) L_frame[ch][n] + 0.5f ) ); - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - maxNfCalcBw = min( maxNfCalcBw, MCT_LFE_MAX_LINE ); - } - if ( ( total_brate >= HQ_96k && ( st->element_mode <= IVAS_SCE || st->bwidth < SWB ) ) || total_brate > IVAS_192k ) { fac_ns[ch][n] = 0.0f; @@ -2107,7 +2103,7 @@ void coder_tcx( if ( st->hTcxCfg->tcx_last_overlap_mode == TRANSITION_OVERLAP ) { - WindowSignal( hTcxCfg, hTcxCfg->tcx_offsetFB, hTcxCfg->tcx_last_overlap_mode, hTcxCfg->tcx_curr_overlap_mode, &left_overlap, &right_overlap, st->hTcxEnc->speech_TCX, &L_frame, win, 1, 1, 0 ); + WindowSignal( hTcxCfg, hTcxCfg->tcx_offsetFB, hTcxCfg->tcx_last_overlap_mode, hTcxCfg->tcx_curr_overlap_mode, &left_overlap, &right_overlap, st->hTcxEnc->speech_TCX, &L_frame, win, 1, 1 ); /* Compute MDCT for xn_buf[] */ TCX_MDCT( win, spectrum, left_overlap, L_frame - ( left_overlap + right_overlap ) / 2, right_overlap, st->element_mode ); @@ -2116,7 +2112,7 @@ void coder_tcx( { wtda( st->hTcxEnc->new_speech_TCX, win, NULL, hTcxCfg->tcx_last_overlap_mode, hTcxCfg->tcx_curr_overlap_mode, L_frame ); - WindowSignal( hTcxCfg, hTcxCfg->tcx_offsetFB, hTcxCfg->tcx_last_overlap_mode == ALDO_WINDOW ? FULL_OVERLAP : hTcxCfg->tcx_last_overlap_mode, hTcxCfg->tcx_curr_overlap_mode == ALDO_WINDOW ? FULL_OVERLAP : hTcxCfg->tcx_curr_overlap_mode, &left_overlap, &right_overlap, st->hTcxEnc->speech_TCX, &L_frame, winMDST, 1, 1, 0 ); + WindowSignal( hTcxCfg, hTcxCfg->tcx_offsetFB, hTcxCfg->tcx_last_overlap_mode == ALDO_WINDOW ? FULL_OVERLAP : hTcxCfg->tcx_last_overlap_mode, hTcxCfg->tcx_curr_overlap_mode == ALDO_WINDOW ? FULL_OVERLAP : hTcxCfg->tcx_curr_overlap_mode, &left_overlap, &right_overlap, st->hTcxEnc->speech_TCX, &L_frame, winMDST, 1, 1 ); edct( win, spectrum, L_frame, st->element_mode ); @@ -2181,9 +2177,10 @@ void coder_tcx( *-------------------------------------------------------------------*/ void coder_tcx_post( - Encoder_State *st, - float *A, - const float *Ai ) + Encoder_State *st, /* i/o: encoder memory state */ + float *A, /* o : Quantized LPC coefficients */ + const float *Ai /* i : Unquantized (interpolated) LPC coefficients */ +) { float xn_buf[L_FRAME_MAX]; diff --git a/lib_enc/cod_uv.c b/lib_enc/cod_uv.c index 166a9685dc..2c22ed4188 100644 --- a/lib_enc/cod_uv.c +++ b/lib_enc/cod_uv.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,7 +37,7 @@ #include #include "options.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * gauss_L2: diff --git a/lib_enc/comvad_decision.c b/lib_enc/comvad_decision.c index 4ccd0e4142..240f1754ba 100644 --- a/lib_enc/comvad_decision.c +++ b/lib_enc/comvad_decision.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #include "options.h" #include "prot.h" #include "rom_enc.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* diff --git a/lib_enc/cor_shif.c b/lib_enc/cor_shif.c index d27b097a43..67c11d4b90 100644 --- a/lib_enc/cor_shif.c +++ b/lib_enc/cor_shif.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #include "options.h" #include #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Correlation_shift diff --git a/lib_enc/core_enc_2div.c b/lib_enc/core_enc_2div.c index 65a5c78650..faa7af3587 100644 --- a/lib_enc/core_enc_2div.c +++ b/lib_enc/core_enc_2div.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * core_encode_twodiv() diff --git a/lib_enc/core_enc_init.c b/lib_enc/core_enc_init.c index 009185cc88..774b1398c5 100644 --- a/lib_enc/core_enc_init.c +++ b/lib_enc/core_enc_init.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "prot.h" #include "ivas_prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------* * Local function prototypes @@ -261,7 +261,7 @@ static void init_tcx( hTcxEnc->spectrum[0] = hTcxEnc->spectrum_long; hTcxEnc->spectrum[1] = hTcxEnc->spectrum_long + N_TCX10_MAX; - init_tcx_cfg( st->hTcxCfg, total_brate, st->sr_core, st->input_Fs, st->L_frame, st->bwidth, hTcxEnc->L_frameTCX, st->fscale, st->encoderLookahead_enc, st->encoderLookahead_FB, st->preemph_fac, st->tcxonly, st->rf_mode, st->igf, st->hIGFEnc != NULL ? st->hIGFEnc->infoStopFrequency : 0, st->element_mode, st->ini_frame, MCT_flag, st->mct_chan_mode ); + init_tcx_cfg( st->hTcxCfg, total_brate, st->sr_core, st->input_Fs, st->L_frame, st->bwidth, hTcxEnc->L_frameTCX, st->fscale, st->encoderLookahead_enc, st->encoderLookahead_FB, st->preemph_fac, st->tcxonly, st->rf_mode, st->igf, st->hIGFEnc != NULL ? st->hIGFEnc->infoStopFrequency : 0, st->element_mode, st->ini_frame, MCT_flag ); /* Init TCX target bits correction factor */ hTcxEnc->tcx_target_bits_fac = 1.0f; diff --git a/lib_enc/core_enc_ol.c b/lib_enc/core_enc_ol.c index a761893653..e83fd598b4 100644 --- a/lib_enc/core_enc_ol.c +++ b/lib_enc/core_enc_ol.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "prot.h" #include "rom_com.h" #include "basop_proto_func.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local function prototypes diff --git a/lib_enc/core_enc_reconf.c b/lib_enc/core_enc_reconf.c index 0489d210bc..9dffda0207 100644 --- a/lib_enc/core_enc_reconf.c +++ b/lib_enc/core_enc_reconf.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "prot.h" #include "rom_com.h" #include "rom_enc.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------* * Funtion core_coder_reconfig * diff --git a/lib_enc/core_enc_switch.c b/lib_enc/core_enc_switch.c index f96d0eed57..d6c866d4c5 100644 --- a/lib_enc/core_enc_switch.c +++ b/lib_enc/core_enc_switch.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * core_coder_mode_switch() @@ -95,7 +95,7 @@ void core_coder_mode_switch( st->bits_frame_nominal = (int16_t) ( (float) st->L_frame / (float) st->fscale * (float) FSCALE_DENOM / 128.0f * (float) st->total_brate / 100.0f + 0.49f ); - st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode, st->mct_chan_mode ); + st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode ); /* switch IGF configuration */ if ( st->igf ) @@ -112,7 +112,7 @@ void core_coder_mode_switch( hTcxEnc->tcx_lpc_shaped_ari = getTcxLpcShapedAri( st->total_brate, st->rf_mode, st->element_mode ); st->hTcxCfg->tcxRateLoopOpt = ( st->hTcxCfg->resq && !st->tcxonly ) ? 1 : st->hTcxCfg->tcxRateLoopOpt; - st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->total_brate, st->igf, st->element_mode, st->mct_chan_mode ); + st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->total_brate, st->igf, st->element_mode ); if ( st->hTcxCfg->fIsTNSAllowed ) { @@ -151,7 +151,7 @@ void core_coder_mode_switch( } else { - st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode, st->mct_chan_mode ); + st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode ); init_coder_ace_plus( st, last_total_brate, MCT_flag ); } diff --git a/lib_enc/core_enc_updt.c b/lib_enc/core_enc_updt.c index 987910bcb5..3d5476a894 100644 --- a/lib_enc/core_enc_updt.c +++ b/lib_enc/core_enc_updt.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "prot.h" #include "rom_com.h" #include "cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * core_encode_update() diff --git a/lib_enc/core_switching_enc.c b/lib_enc/core_switching_enc.c index 6102bd5f67..ad52e197b9 100644 --- a/lib_enc/core_switching_enc.c +++ b/lib_enc/core_switching_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "rom_enc.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * core_switching_pre_enc() @@ -401,18 +401,8 @@ void core_switching_post_enc( ( st->last_core == HQ_CORE || st->L_frame != st->last_L_frame || ( st->last_extl != SWB_TBE && st->last_extl != FB_TBE && st->last_core != TCX_20_CORE && st->last_core != TCX_10_CORE ) ) ) { set_f( st->hBWE_TD->state_ana_filt_shb, 0.0f, ( 2 * ALLPASSSECTIONS_STEEP + 1 ) ); - set_f( st->hBWE_TD->old_speech_shb, 0.0f, L_LOOK_16k + L_SUBFR16k ); - set_f( st->hBWE_TD->mem_shb_res, 0.0f, MAX_LEN_MA_FILTER ); - set_f( st->hBWE_TD->old_EnvSHBres, 0.0f, L_FRAME4k ); - st->hBWE_TD->old_mean_EnvSHBres = 0.0f; - st->hBWE_TD->prev_enr_EnvSHBres = 1.0f; - st->hBWE_TD->prev_shb_env_tilt = 0.0f; - st->hBWE_TD->prev_pow_exc16kWhtnd = 1.0f; - st->hBWE_TD->prev_mix_factor = 1.0f; - st->hBWE_TD->prev_Env_error = 0.0f; - + InitSWBencBufferStates( st->hBWE_TD, NULL ); swb_tbe_reset( st->hBWE_TD->mem_csfilt, st->hBWE_TD->mem_genSHBexc_filt_down_shb, st->hBWE_TD->state_lpc_syn, st->hBWE_TD->syn_overlap, st->hBWE_TD->state_syn_shbexc, &( st->hBWE_TD->tbe_demph ), &( st->hBWE_TD->tbe_premph ), st->hBWE_TD->mem_stp_swb, &( st->hBWE_TD->gain_prec_swb ) ); - set_f( st->hBWE_TD->dec_2_over_3_mem, 0.0f, L_FILT_2OVER3 ); set_f( st->hBWE_TD->dec_2_over_3_mem_lp, 0.0f, L_FILT_2OVER3_LP ); } diff --git a/lib_enc/corr_xh.c b/lib_enc/corr_xh.c index bf4d473bda..c317878e17 100644 --- a/lib_enc/corr_xh.c +++ b/lib_enc/corr_xh.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "prot.h" #include "cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * corr_xh() diff --git a/lib_enc/decision_matrix_enc.c b/lib_enc/decision_matrix_enc.c index 3433bdf1b4..9fc2bd17c9 100644 --- a/lib_enc/decision_matrix_enc.c +++ b/lib_enc/decision_matrix_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "stat_enc.h" #include "stat_dec.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------* diff --git a/lib_enc/detect_transient.c b/lib_enc/detect_transient.c index 3eaddbc073..0b73a12e68 100644 --- a/lib_enc/detect_transient.c +++ b/lib_enc/detect_transient.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "prot.h" #include "cnst.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------------- * hp_filter() diff --git a/lib_enc/diffcod.c b/lib_enc/diffcod.c index 3d0c47ca62..fd6646c48a 100644 --- a/lib_enc/diffcod.c +++ b/lib_enc/diffcod.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------*/ /* Function diffcod() */ diff --git a/lib_enc/dtx.c b/lib_enc/dtx.c index 4d05245dba..c99a8faf28 100644 --- a/lib_enc/dtx.c +++ b/lib_enc/dtx.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -45,7 +45,7 @@ #include "prot.h" #include "ivas_prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local constants @@ -90,7 +90,6 @@ void dtx( DTX_ENC_HANDLE hDtxEnc = st->hDtxEnc; int16_t last_br_cng_flag, last_br_flag, br_dtx_flag; - if ( st->dtx_sce_sba != 0 ) { last_br_cng_flag = 1; diff --git a/lib_enc/enc_acelp.c b/lib_enc/enc_acelp.c index 07d63fe25b..5e1401828e 100644 --- a/lib_enc/enc_acelp.c +++ b/lib_enc/enc_acelp.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -35,7 +35,6 @@ ====================================================================================*/ #include -#include "typedef.h" #include #include "options.h" #ifdef DEBUGGING @@ -45,7 +44,7 @@ #include "prot.h" #include "rom_com.h" #include "rom_enc.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* diff --git a/lib_enc/enc_acelp_tcx_main.c b/lib_enc/enc_acelp_tcx_main.c index e087c8cede..5c549b23d2 100644 --- a/lib_enc/enc_acelp_tcx_main.c +++ b/lib_enc/enc_acelp_tcx_main.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * enc_acelp_tcx_main() @@ -64,7 +64,7 @@ void enc_acelp_tcx_main( float old_bwe_exc[( PIT16k_MAX + ( L_FRAME16k + 1 ) + L_SUBFR16k ) * 2]; /* excitation buffer */ float *ptr_bwe_exc; /* pointer to BWE excitation signal in the current frame */ - wmops_sub_start( "enc_acelp_tcx_main" ); + push_wmops( "enc_acelp_tcx_main" ); ptr_bwe_exc = old_bwe_exc + PIT16k_MAX * 2; @@ -129,6 +129,6 @@ void enc_acelp_tcx_main( /* coreSwitching update of Mode 1 parameters in the last frame */ st->last_coder_type = st->coder_type; - wmops_sub_end(); + pop_wmops(); return; } diff --git a/lib_enc/enc_acelpx.c b/lib_enc/enc_acelpx.c index 6c8e783d76..c72f2fa1c3 100644 --- a/lib_enc/enc_acelpx.c +++ b/lib_enc/enc_acelpx.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -35,7 +35,6 @@ ====================================================================================*/ #include -#include "typedef.h" #include #include "options.h" #ifdef DEBUGGING @@ -43,7 +42,7 @@ #endif #include "prot.h" #include "rom_enc.h" -#include "wmops.h" +#include "wmc_auto.h" /* Iterations: nb_pos_ix*16 */ diff --git a/lib_enc/enc_amr_wb.c b/lib_enc/enc_amr_wb.c index 2e88776d8f..bb09c0886b 100644 --- a/lib_enc/enc_amr_wb.c +++ b/lib_enc/enc_amr_wb.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * encod_amr_wb() diff --git a/lib_enc/enc_gain.c b/lib_enc/enc_gain.c index a5728e1f37..607c36f6e9 100644 --- a/lib_enc/enc_gain.c +++ b/lib_enc/enc_gain.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,11 +37,10 @@ #include #include #include "options.h" -#include "typedef.h" #include "prot.h" #include "rom_enc.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /* diff --git a/lib_enc/enc_gen_voic.c b/lib_enc/enc_gen_voic.c index dd642cd470..4c78b484c0 100644 --- a/lib_enc/enc_gen_voic.c +++ b/lib_enc/enc_gen_voic.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * encod_gen_voic() diff --git a/lib_enc/enc_gen_voic_rf.c b/lib_enc/enc_gen_voic_rf.c index e8af6856ad..7ceece404d 100644 --- a/lib_enc/enc_gen_voic_rf.c +++ b/lib_enc/enc_gen_voic_rf.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * reset_rf_indices() diff --git a/lib_enc/enc_higher_acelp.c b/lib_enc/enc_higher_acelp.c index ebda178d8b..5610bdfe4e 100644 --- a/lib_enc/enc_higher_acelp.c +++ b/lib_enc/enc_higher_acelp.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local function prototypes diff --git a/lib_enc/enc_nelp.c b/lib_enc/enc_nelp.c index 11ec6105b9..7d828208b2 100644 --- a/lib_enc/enc_nelp.c +++ b/lib_enc/enc_nelp.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * encod_nelp() diff --git a/lib_enc/enc_pit_exc.c b/lib_enc/enc_pit_exc.c index 900d4021d0..eba203b6a6 100644 --- a/lib_enc/enc_pit_exc.c +++ b/lib_enc/enc_pit_exc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * enc_pit_exc() @@ -64,8 +64,8 @@ void enc_pit_exc( float *pitch_buf, /* i/o: Fractionnal per subframe pitch */ const int16_t nb_subfr, /* i : Number of subframe considered */ float *gpit, /* o : pitch mean gpit */ - const int16_t tdm_Pitch_reuse_flag, /* i : primary channel pitch reuse flag */ - const float tdm_Pri_pitch_buf[] /* i : primary channel pitch buffer */ + const int16_t tdm_Pitch_reuse_flag, /* i : primary channel pitch reuse flag */ + const float tdm_Pri_pitch_buf[] /* i : primary channel pitch buffer */ ) { float xn[PIT_EXC_L_SUBFR]; /* Target vector for pitch search */ diff --git a/lib_enc/enc_ppp.c b/lib_enc/enc_ppp.c index b7668bfb01..823d6cf3cd 100644 --- a/lib_enc/enc_ppp.c +++ b/lib_enc/enc_ppp.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------- * encod_ppp() diff --git a/lib_enc/enc_prm.c b/lib_enc/enc_prm.c index cd606af8fb..758d672d0b 100644 --- a/lib_enc/enc_prm.c +++ b/lib_enc/enc_prm.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* diff --git a/lib_enc/enc_tran.c b/lib_enc/enc_tran.c index ee1768067e..d713584fa7 100644 --- a/lib_enc/enc_tran.c +++ b/lib_enc/enc_tran.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * encod_tran() diff --git a/lib_enc/enc_uv.c b/lib_enc/enc_uv.c index c34419c7df..f6c17e410c 100644 --- a/lib_enc/enc_uv.c +++ b/lib_enc/enc_uv.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * encod_unvoiced() diff --git a/lib_enc/energy.c b/lib_enc/energy.c index e69063b873..f9cb7f6a2e 100644 --- a/lib_enc/energy.c +++ b/lib_enc/energy.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include "prot.h" #include "cnst.h" #include "rom_enc.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * background_update() diff --git a/lib_enc/eval_pit_contr.c b/lib_enc/eval_pit_contr.c index d7eb087e57..5dd3101772 100644 --- a/lib_enc/eval_pit_contr.c +++ b/lib_enc/eval_pit_contr.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local constantes diff --git a/lib_enc/evs_enc.c b/lib_enc/evs_enc.c index 29b610db79..2e2a379ec9 100644 --- a/lib_enc/evs_enc.c +++ b/lib_enc/evs_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local function prototypes @@ -72,7 +72,6 @@ ivas_error evs_enc( float old_inp_12k8[L_INP_12k8], *inp; /* buffer of input signal @ 12k8 */ float old_inp_16k[L_INP]; /* buffer of input signal @ 16kHz */ float fr_bands[2 * NB_BANDS]; /* energy in frequency bands */ - float Etot; /* total energy; correlation shift */ float ener; /* residual energy from Levinson-Durbin */ float A[NB_SUBFR16k * ( M + 1 )]; /* A(z) unquantized for subframes */ float Aw[NB_SUBFR16k * ( M + 1 )]; /* weighted A(z) unquantized for subframes */ @@ -103,7 +102,7 @@ ivas_error evs_enc( error = IVAS_ERR_OK; - wmops_sub_start( "evs_enc" ); + push_wmops( "evs_enc" ); /*------------------------------------------------------------------* * Initialization *-----------------------------------------------------------------*/ @@ -163,15 +162,6 @@ ivas_error evs_enc( if ( st->last_core == AMR_WB_CORE ) { updt_IO_switch_enc( st, input_frame ); - set_f( st->hBWE_TD->old_speech_shb, 0, L_LOOK_16k + L_SUBFR16k ); - set_f( st->hBWE_TD->mem_shb_res, 0.0f, MAX_LEN_MA_FILTER ); - set_f( st->hBWE_TD->old_EnvSHBres, 0.0f, L_FRAME4k ); - st->hBWE_TD->old_mean_EnvSHBres = 0.0f; - st->hBWE_TD->prev_enr_EnvSHBres = 1.0f; - st->hBWE_TD->prev_shb_env_tilt = 0.0f; - st->hBWE_TD->prev_pow_exc16kWhtnd = 1.0f; - st->hBWE_TD->prev_mix_factor = 1.0f; - st->hBWE_TD->prev_Env_error = 0.0f; cldfb_reset_memory( st->cldfbAnaEnc ); cldfb_reset_memory( st->cldfbSynTd ); } @@ -181,12 +171,11 @@ ivas_error evs_enc( *---------------------------------------------------------------------*/ #ifdef FIX_I4_OL_PITCH - pre_proc( st, input_frame, old_inp_12k8, old_inp_16k, &inp, fr_bands, &Etot, &ener, A, Aw, epsP, lsp_new, lsp_mid, &vad_hover_flag, &attack_flag, new_inp_resamp16k, &Voicing_flag, realBuffer, imagBuffer, &hq_core_type ); + pre_proc( st, input_frame, old_inp_12k8, old_inp_16k, &inp, fr_bands, Etot, &ener, A, Aw, epsP, lsp_new, lsp_mid, &vad_hover_flag, &attack_flag, new_inp_resamp16k, &Voicing_flag, realBuffer, imagBuffer, &hq_core_type ); #else - pre_proc( st, input_frame, old_inp_12k8, old_inp_16k, &inp, fr_bands, &Etot, &ener, pitch_orig, A, Aw, epsP, lsp_new, lsp_mid, &vad_hover_flag, &attack_flag, new_inp_resamp16k, &Voicing_flag, realBuffer, imagBuffer, &hq_core_type ); + pre_proc( st, input_frame, old_inp_12k8, old_inp_16k, &inp, fr_bands, &ener, pitch_orig, A, Aw, epsP, lsp_new, lsp_mid, &vad_hover_flag, &attack_flag, new_inp_resamp16k, &Voicing_flag, realBuffer, imagBuffer, &hq_core_type ); #endif - if ( st->mdct_sw == MODE2 ) { st->bits_frame_nominal = (int16_t) ( st->total_brate / FRAMES_PER_SEC ); @@ -253,7 +242,11 @@ ivas_error evs_enc( if ( st->core == ACELP_CORE ) { +#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE + if ( ( error = acelp_core_enc( st, inp, ener, A, Aw, epsP, lsp_new, lsp_mid, vad_hover_flag, attack_flag, bwe_exc_extended, voice_factors, old_syn_12k8_16k, pitch_buf, &unbits, NULL, NULL ) ) != IVAS_ERR_OK ) +#else if ( ( error = acelp_core_enc( st, inp, ener, A, Aw, epsP, lsp_new, lsp_mid, vad_hover_flag, attack_flag, bwe_exc_extended, voice_factors, old_syn_12k8_16k, pitch_buf, &unbits, NULL, NULL, NULL ) ) != IVAS_ERR_OK ) +#endif { return error; } @@ -390,7 +383,7 @@ ivas_error evs_enc( * WB TBE encoding * WB BWE encoding *---------------------------------------------------------------------*/ - wmops_sub_start( "BWE_encoding" ); + push_wmops( "BWE_encoding" ); if ( st->input_Fs >= 16000 && st->bwidth < SWB ) { @@ -426,16 +419,7 @@ ivas_error evs_enc( } else if ( st->input_Fs >= 32000 ) { - set_f( st->hBWE_TD->old_speech_shb, 0.0f, L_LOOK_16k + L_SUBFR16k ); - set_f( shb_speech, 0.0f, L_FRAME16k ); - set_f( st->hBWE_TD->mem_shb_res, 0.0f, MAX_LEN_MA_FILTER ); - set_f( st->hBWE_TD->old_EnvSHBres, 0.0f, L_FRAME4k ); - st->hBWE_TD->old_mean_EnvSHBres = 0.0f; - st->hBWE_TD->prev_enr_EnvSHBres = 1.0f; - st->hBWE_TD->prev_shb_env_tilt = 0.0f; - st->hBWE_TD->prev_pow_exc16kWhtnd = 1.0f; - st->hBWE_TD->prev_mix_factor = 1.0f; - st->hBWE_TD->prev_Env_error = 0.0f; + InitSWBencBufferStates( st->hBWE_TD, shb_speech ); } /* SWB TBE encoder */ @@ -497,7 +481,7 @@ ivas_error evs_enc( swb_CNG_enc( st, shb_speech, old_syn_12k8_16k ); } - wmops_sub_end(); + pop_wmops(); /*---------------------------------------------------------------------* * Channel-aware mode - write signaling information into the bitstream *---------------------------------------------------------------------*/ @@ -509,7 +493,7 @@ ivas_error evs_enc( * Updates *---------------------------------------------------------------------*/ - updt_enc_common( st, Etot ); + updt_enc_common( st ); if ( st->mdct_sw == MODE1 ) { @@ -565,7 +549,7 @@ ivas_error evs_enc( } #endif - wmops_sub_end(); + pop_wmops(); return error; } @@ -706,7 +690,7 @@ static void configure_core_coder( } } - st->igf = getIgfPresent( 0, st->total_brate, st->bwidth, st->rf_mode, st->mct_chan_mode ); + st->igf = getIgfPresent( 0, st->total_brate, st->bwidth, st->rf_mode ); if ( st->core_brate != SID_2k40 && st->core_brate != FRAME_NO_DATA ) { diff --git a/lib_enc/ext_sig_ana.c b/lib_enc/ext_sig_ana.c index 58d1e34a56..80e652cf07 100644 --- a/lib_enc/ext_sig_ana.c +++ b/lib_enc/ext_sig_ana.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" #ifdef DEBUG_PLOT #include "deb_out.h" #endif @@ -215,35 +215,24 @@ void core_signal_analysis_high_bitrate( if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP ) { - if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE ) - { - wtda( hTcxEnc->new_speech_TCX, tcx20Win, NULL, overlap_mode[frameno], overlap_mode[frameno + 1], L_frameTCX ); + wtda( hTcxEnc->new_speech_TCX, tcx20Win, NULL, overlap_mode[frameno], overlap_mode[frameno + 1], L_frameTCX ); - if ( windowed_samples != NULL ) /* store overlap data for later */ - { - assert( frameno == 0 ); - windowed_samples[0] = (float) overlap_mode[frameno]; - windowed_samples[1] = (float) overlap_mode[frameno + 1]; - } - } - else + if ( windowed_samples != NULL ) /* store overlap data for later */ { - /* Windowing of the LFE Signal*/ - WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno], overlap_mode[frameno + 1] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, tcx20Win, - st->element_mode != IVAS_CPE_MDCT /* truncate_aldo */, - 1, 1 ); + assert( frameno == 0 ); + windowed_samples[0] = (float) overlap_mode[frameno]; + windowed_samples[1] = (float) overlap_mode[frameno + 1]; } - if ( st->element_mode != IVAS_CPE_MDCT ) { /* Windowing of the 2xTCX5 subframes or 1xTCX10 or 1xTCX20 */ - WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno], overlap_mode[frameno + 1] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, mdstWin, 1, 1, 0 ); + WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno], overlap_mode[frameno + 1] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, mdstWin, 1, 1 ); } } else { /* Windowing of the 2xTCX5 subframes or 1xTCX10 or 1xTCX20 */ - WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno], overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, tcx20Win, st->element_mode != IVAS_CPE_MDCT, 1, 0 ); + WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno], overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, tcx20Win, st->element_mode != IVAS_CPE_MDCT, 1 ); if ( windowed_samples != NULL ) /* save windowed speech_TCX samples */ { @@ -282,8 +271,7 @@ void core_signal_analysis_high_bitrate( for ( i = 0; i < 2; i++ ) { - assert( st->mct_chan_mode != MCT_CHAN_MODE_LFE ); - WindowSignal( st->hTcxCfg, folding_offset, i == 0 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, i == 1 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, &left_overlap, &right_overlap, tcx20Win + i * tcx5SizeFB, &L_subframe, tcx5Win, st->element_mode != IVAS_CPE_MDCT, 1, 0 ); + WindowSignal( st->hTcxCfg, folding_offset, i == 0 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, i == 1 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, &left_overlap, &right_overlap, tcx20Win + i * tcx5SizeFB, &L_subframe, tcx5Win, st->element_mode != IVAS_CPE_MDCT, 1 ); TCX_MDCT( tcx5Win, hTcxEnc->spectrum[frameno] + i * tcx5SizeFB, left_overlap, L_subframe - ( left_overlap + right_overlap ) / 2, right_overlap, st->element_mode ); @@ -298,7 +286,7 @@ void core_signal_analysis_high_bitrate( { assert( transform_type[frameno] == TCX_10 || transform_type[frameno] == TCX_20 ); - if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP ) { edct( tcx20Win, hTcxEnc->spectrum[frameno], L_subframe, st->element_mode ); @@ -324,12 +312,6 @@ void core_signal_analysis_high_bitrate( v_multc( hTcxEnc->spectrum[frameno] + L_FRAME16k / nSubframes, (float) ( st->bwidth_sw_cnt ) / (float) BWS_TRAN_PERIOD, hTcxEnc->spectrum[frameno] + L_FRAME16k / nSubframes, L_subframe - L_FRAME16k / nSubframes ); } - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - set_f( &hTcxEnc->spectrum[frameno][MCT_LFE_MAX_LINE], 0.f, L_subframe - MCT_LFE_MAX_LINE ); - st->hTcxCfg->tcx_coded_lines = MCT_LFE_MAX_LINE; - } - if ( st->element_mode != IVAS_CPE_MDCT ) { /* For TCX20 at bitrates up to 64 kbps we need the power spectrum */ @@ -345,14 +327,14 @@ void core_signal_analysis_high_bitrate( { L_subframe = L_frameTCX / nSubframes; - if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP ) { wtda_ext( hTcxEnc->new_speech_TCX, mdstWin, overlap_mode[frameno], overlap_mode[frameno + 1], L_frameTCX, 3 ); } else { /* Windowing for the MDST */ - WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno], overlap_mode[frameno + 1] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, mdstWin, 0, 1, st->mct_chan_mode == MCT_CHAN_MODE_LFE ); + WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno], overlap_mode[frameno + 1] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, mdstWin, 0, 1 ); } if ( transform_type[frameno] == TCX_5 ) @@ -383,8 +365,7 @@ void core_signal_analysis_high_bitrate( for ( i = 0; i < 2; i++ ) { - assert( st->mct_chan_mode != MCT_CHAN_MODE_LFE ); - WindowSignal( st->hTcxCfg, folding_offset, i == 0 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, i == 1 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, &left_overlap, &right_overlap, mdstWin + i * tcx5SizeFB, &L_subframe, tcx5Win, 0, 1, 0 ); + WindowSignal( st->hTcxCfg, folding_offset, i == 0 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, i == 1 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, &left_overlap, &right_overlap, mdstWin + i * tcx5SizeFB, &L_subframe, tcx5Win, 0, 1 ); TCX_MDST( tcx5Win, mdst_spectrum[frameno] + i * tcx5SizeFB, left_overlap, L_subframe - ( left_overlap + right_overlap ) / 2, right_overlap, st->element_mode ); /* high-band gain control in case of BWS */ @@ -396,7 +377,7 @@ void core_signal_analysis_high_bitrate( } else /* transform_type[frameno] != TCX_5 */ { - if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP ) { edst( mdstWin, mdst_spectrum[frameno], L_subframe, st->element_mode ); @@ -421,11 +402,6 @@ void core_signal_analysis_high_bitrate( v_multc( mdst_spectrum[frameno] + L_FRAME16k / nSubframes, (float) ( st->bwidth_sw_cnt ) / (float) BWS_TRAN_PERIOD, mdst_spectrum[frameno] + L_FRAME16k / nSubframes, L_subframe - L_FRAME16k / nSubframes ); } } - - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - set_f( &mdst_spectrum[frameno][MCT_LFE_MAX_LINE], 0.f, L_subframe - MCT_LFE_MAX_LINE ); - } } if ( st->element_mode != IVAS_CPE_MDCT ) diff --git a/lib_enc/fd_cng_enc.c b/lib_enc/fd_cng_enc.c index e3a349b2ae..a76b741ca4 100644 --- a/lib_enc/fd_cng_enc.c +++ b/lib_enc/fd_cng_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -46,7 +46,7 @@ #include "prot.h" #include "ivas_prot.h" #include "stat_enc.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * createFdCngEnc() @@ -66,8 +66,7 @@ ivas_error createFdCngEnc( *hFdCngEnc = NULL; /* Allocate memory */ - hs = (HANDLE_FD_CNG_ENC) count_malloc( sizeof( FD_CNG_ENC ) ); - if ( hs == NULL ) + if ( ( hs = (HANDLE_FD_CNG_ENC) malloc( sizeof( FD_CNG_ENC ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for FD CNG ENC structure" ); } @@ -282,7 +281,7 @@ void deleteFdCngEnc( if ( hsEnc != NULL ) { deleteFdCngCom( &( hsEnc->hFdCngCom ) ); - count_free( hsEnc ); + free( hsEnc ); *hFdCngEnc = NULL; } @@ -514,12 +513,24 @@ void FdCng_encodeSID( float w[32]; float preemph_fac = st->preemph_fac; +#ifdef ERI_FDCNGVQ_LOW_ROM + float *invTrfMatrix; + float tmpRAM[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC]; + float dct_target[FDCNG_VQ_DCT_MAXTRUNC]; + float tot_sig_ext[FDCNG_VQ_MAX_LEN]; +#else const float *const *codebooks = ( st->element_mode == EVS_MONO ) ? cdk_37bits : cdk_37bits_ivas; +#endif const float gain_q_offset = ( st->element_mode == EVS_MONO ) ? GAIN_Q_OFFSET_EVS : GAIN_Q_OFFSET_IVAS; /* Init */ N = hFdCngEnc->npartDec; +#ifdef ERI_FDCNGVQ_LOW_ROM + invTrfMatrix = (float *) tmpRAM; /* dynamically filled */ + set_zero( v, FDCNG_VQ_MAX_LEN ); +#endif + /* Convert to LOG */ e = 0.f; for ( i = 0; i < N; i++ ) @@ -545,10 +556,39 @@ void FdCng_encodeSID( /* MSVQ encoder */ set_f( w, 1.0f, N ); +#ifdef ERI_FDCNGVQ_LOW_ROM + if ( st->element_mode != EVS_MONO ) + { + /* DCT domain compressed/truncated indices used for first stage */ + /* quantization with stage1 stored in DCT24 domain, stages 2 through 6 directly dearched + in FDCNG band domain + */ + if ( N == FDCNG_VQ_MAX_LEN_WB ) + { + create_IDCT_N_Matrix( invTrfMatrix, N, FDCNG_VQ_DCT_MAXTRUNC, sizeof( tmpRAM ) / ( sizeof( float ) ) ); + /* truncated DCT21 analysis */ + dctT2_N_apply_matrix( (const float *) v, dct_target, FDCNG_VQ_DCT_MAXTRUNC, N, invTrfMatrix, FDCNG_VQ_DCT_MAXTRUNC, DCT_T2_21_XX ); + /* truncated IDCT21 extension to 24 bands */ + extend_dctN_input( v, dct_target, N, tot_sig_ext, FDCNG_VQ_MAX_LEN, invTrfMatrix, FDCNG_VQ_DCT_MAXTRUNC, IDCT_T2_XX_21 ); + + mvr2r( tot_sig_ext, v, FDCNG_VQ_MAX_LEN ); /* write extended result as input to VQ stage #1 */ + } + create_IDCT_N_Matrix( invTrfMatrix, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, sizeof( tmpRAM ) / ( sizeof( float ) ) ); + msvq_enc( cdk_37bits_ivas, NULL, NULL, v, levels_37bits, FD_CNG_maxC_37bits, FD_CNG_stages_37bits, w, N, FD_CNG_maxN_37bits, 1, invTrfMatrix, indices ); + msvq_dec( cdk_37bits_ivas, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, 1, invTrfMatrix, v, NULL ); + } + else + { /* EVS_MONO tables */ + msvq_enc( cdk_37bits, NULL, NULL, v, levels_37bits, FD_CNG_maxC_37bits, FD_CNG_stages_37bits, w, N, FD_CNG_maxN_37bits, 0, NULL, indices ); + msvq_dec( cdk_37bits, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, 0, NULL, v, NULL ); + } +#else msvq_enc( codebooks, NULL, NULL, v, levels_37bits, FD_CNG_maxC_37bits, FD_CNG_stages_37bits, w, N, FD_CNG_maxN_37bits, indices ); /* MSVQ decoder */ msvq_dec( codebooks, NULL, NULL, FD_CNG_stages_37bits, N, FD_CNG_maxN_37bits, indices, v, NULL ); +#endif + /* Compute gain */ gain = 0.f; @@ -709,11 +749,14 @@ void generate_comfort_noise_enc( /* Perform STFT synthesis */ SynthesisSTFT( fftBuffer, timeDomainOutput, hFdCngCom->olapBufferSynth, hFdCngCom->olapWinSyn, tcx_transition, hFdCngCom, -1, -1 ); - /* update CNG excitation energy for LP_CNG */ - /* calculate the residual signal energy */ - enr = cng_energy( st->element_mode, st->bwidth, st->hDtxEnc->CNG_mode, st->hTdCngEnc->CNG_att, hFdCngCom->exc_cng, hFdCngCom->frameSize ); + if ( st->hTdCngEnc != NULL ) + { + /* update CNG excitation energy for LP_CNG */ + /* calculate the residual signal energy */ + enr = cng_energy( st->element_mode, st->bwidth, st->hDtxEnc->CNG_mode, st->hTdCngEnc->CNG_att, hFdCngCom->exc_cng, hFdCngCom->frameSize ); - st->hTdCngEnc->lp_ener = (float) ( 0.8f * st->hTdCngEnc->lp_ener + 0.2f * pow( 2.0f, enr ) ); + st->hTdCngEnc->lp_ener = (float) ( 0.8f * st->hTdCngEnc->lp_ener + 0.2f * pow( 2.0f, enr ) ); + } /* Overlap-add when previous frame is active */ if ( st->last_core_brate > SID_2k40 && st->codec_mode == MODE2 ) @@ -971,6 +1014,14 @@ void FdCngEncodeMDCTStereoSID( int16_t no_side_flag; int16_t is_inp_ms; +#ifdef ERI_FDCNGVQ_LOW_ROM + float tot_sig_ext[FDCNG_VQ_MAX_LEN], dct_target[CPE_CHANNELS][FDCNG_VQ_DCT_MAXTRUNC]; /* 24 +2*18*/ + float *invTrfMatrix; + float tmpRAM[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC]; /*24*18*/ + invTrfMatrix = (float *) tmpRAM; /* dynamically filled */ +#endif + + is_inp_ms = 0; if ( hCPE->hCoreCoder[0]->cng_sba_flag == 1 ) { @@ -1021,7 +1072,11 @@ void FdCngEncodeMDCTStereoSID( /* Quantize noise shapes */ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { +#ifdef ERI_FDCNGVQ_LOW_ROM + /* Normalize MSVQ input */ +#else /* Normalize MSVW input */ +#endif gain[ch] = 0.f; for ( p = N_GAIN_MIN; p < N_GAIN_MAX; p++ ) { @@ -1034,6 +1089,39 @@ void FdCngEncodeMDCTStereoSID( ms_ptr[ch][p] -= gain[ch]; } +#ifdef ERI_FDCNGVQ_LOW_ROM + } + /* always split channel targetloop */ + + /* extend fdcng envelope from length 21 to a 24 length fdncg domain envelope signal */ + /* High quality cosine smooth basis extension used to not introduce noise in stage#1 DCT24 analysis and subsequent VQ-steps */ + if ( N == FDCNG_VQ_MAX_LEN_WB ) + { + create_IDCT_N_Matrix( invTrfMatrix, N, FDCNG_VQ_DCT_MAXTRUNC, sizeof( tmpRAM ) / ( sizeof( float ) ) ); /*WB: create truncated IDCT21 matrix */ + + for ( ch = 0; ch < CPE_CHANNELS; ch++ ) + { + /* run DCT_N N==21 , truncated at 18/21 ~= 86% , i.e use a bit better better quality in extrapolation , than subsequent DCT24 analysis which is truncated at 75%*/ + + /* truncated DCT 21 analysis */ + dctT2_N_apply_matrix( (const float *) ms_ptr[ch], dct_target[ch], FDCNG_VQ_DCT_MAXTRUNC, N, invTrfMatrix, FDCNG_VQ_DCT_MAXTRUNC, DCT_T2_21_XX ); + + /* extrapolate extend fdcng envelope signal in the fdncg ienvelope/"time" domain using DCT21 basis vectors, + estimated DCT21 coeffs scaling extended basis vectors are used to create extrapolated length 24 input target envelope signal */ + /* this DCT21 extension does not introduce DCT24 coefficient noise for the subsequent dct24 target analysis, and later in IDCT24 synthesis */ + + /* truncated IDCT 21 extension synthesis */ + extend_dctN_input( ms_ptr[ch], dct_target[ch], N, tot_sig_ext, FDCNG_VQ_MAX_LEN, invTrfMatrix /* DCT_N basis vectors */, FDCNG_VQ_DCT_MAXTRUNC, IDCT_T2_XX_21 ); /* use 18 basis vectors*/ + + mvr2r( tot_sig_ext, ms_ptr[ch], FDCNG_VQ_MAX_LEN ); /* write extended result as input to VQ */ + } + } + create_IDCT_N_Matrix( invTrfMatrix, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, sizeof( tmpRAM ) / ( sizeof( float ) ) ); /*always create/set up IDCT24 matrix in RAM */ + + /* end split */ + for ( ch = 0; ch < CPE_CHANNELS; ch++ ) + { +#endif /* MSVQ */ if ( ch ) { @@ -1044,8 +1132,21 @@ void FdCngEncodeMDCTStereoSID( stages = FD_CNG_stages_37bits; } +#ifdef ERI_FDCNGVQ_LOW_ROM + /* DCT24 domain compressed/truncated indices used for first stage */ + /* mid channel quantization using stages 1 through 6 */ + /* & side channel quantization using stages 1 through 4 */ + + { + msvq_enc( cdk_37bits_ivas, NULL, NULL, ms_ptr[ch], levels_37bits, FD_CNG_maxC_37bits, stages, weights, N, FD_CNG_maxN_37bits, 1, invTrfMatrix, indices[ch] ); + msvq_dec( cdk_37bits_ivas, NULL, NULL, stages, N, FD_CNG_maxN_37bits, indices[ch], 1, invTrfMatrix, ms_ptr[ch], NULL ); + } +#else msvq_enc( cdk_37bits_ivas, NULL, NULL, ms_ptr[ch], levels_37bits, FD_CNG_maxC_37bits, stages, weights, N, FD_CNG_maxN_37bits, indices[ch] ); + msvq_dec( cdk_37bits_ivas, NULL, NULL, stages, N, FD_CNG_maxN_37bits, indices[ch], ms_ptr[ch], NULL ); + +#endif } if ( no_side_flag ) @@ -1131,6 +1232,7 @@ void FdCngEncodeMDCTStereoSID( /* pad with zeros to reach common SID frame size */ push_indice( sts[1]->hBstr, IND_ENERGY, 0, ( IVAS_SID_5k2 - 4400 ) / FRAMES_PER_SEC ); + return; } @@ -1158,6 +1260,13 @@ void FdCngEncodeDiracMDCTStereoSID( int16_t indices[CPE_CHANNELS][FD_CNG_stages_37bits]; int16_t gain_idx[CPE_CHANNELS]; int16_t ch, p; +#ifdef ERI_FDCNGVQ_LOW_ROM + float *invTrfMatrix; + float tmpRAM[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC]; + float dct_target[FDCNG_VQ_DCT_MAXTRUNC]; + float tot_sig_ext[FDCNG_VQ_MAX_LEN]; + invTrfMatrix = (float *) tmpRAM; /* dynamically filled */ +#endif /* set pointers and initialize */ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) @@ -1174,7 +1283,11 @@ void FdCngEncodeDiracMDCTStereoSID( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { E[ch] = 0.0f; +#ifdef ERI_FDCNGVQ_LOW_ROM + for ( p = 0; p < NPART; p++ ) /* TBD Note: NPART should likely be N[ch] if N[ch] may change */ +#else for ( p = 0; p < NPART; p++ ) +#endif { ms_ptr[ch][p] = 10.f * log10f( lr_in_ptr[ch][p] + EPSILON ); E[ch] += ms_ptr[ch][p]; @@ -1182,12 +1295,22 @@ void FdCngEncodeDiracMDCTStereoSID( } /* M/S transform on log envelopes */ +#ifdef ERI_FDCNGVQ_LOW_ROM + convertToMS( NPART, ms_ptr[0], ms_ptr[1], 0.5f ); /* TBD Note: NPART should likely be N[0] if N[0] may change */ + + E[0] = sum_f( ms_ptr[0], NPART ); /* TBD Note: NPART should likely be N[0] if N[0] may change */ +#else convertToMS( NPART, ms_ptr[0], ms_ptr[1], 0.5f ); E[0] = sum_f( ms_ptr[0], NPART ); +#endif /* Quantize M noise shape */ +#ifdef ERI_FDCNGVQ_LOW_ROM + /* Normalize MSVQ input */ +#else /* Normalize MSVW input */ +#endif gain[0] = sum_f( ms_ptr[0] + N_GAIN_MIN, N_GAIN_MAX - N_GAIN_MIN ); gain[0] /= (float) ( N_GAIN_MAX - N_GAIN_MIN ); @@ -1197,14 +1320,38 @@ void FdCngEncodeDiracMDCTStereoSID( } /* MSVQ */ +#ifdef ERI_FDCNGVQ_LOW_ROM + /* DCT domain compressed/truncated indices used for first stage */ + /* mid quantization using stages #1 through 6 */ + if ( N[0] == FDCNG_VQ_MAX_LEN_WB ) + { + create_IDCT_N_Matrix( invTrfMatrix, N[0], FDCNG_VQ_DCT_MAXTRUNC, sizeof( tmpRAM ) / ( sizeof( float ) ) ); + /* truncated DCT 21 analysis */ + dctT2_N_apply_matrix( (const float *) ms_ptr[0], dct_target, FDCNG_VQ_DCT_MAXTRUNC, N[0], invTrfMatrix, FDCNG_VQ_DCT_MAXTRUNC, DCT_T2_21_XX ); + /* truncated IDCT21 extension to 24 synthesis */ + extend_dctN_input( ms_ptr[0], dct_target, N[0], tot_sig_ext, FDCNG_VQ_MAX_LEN, invTrfMatrix, FDCNG_VQ_DCT_MAXTRUNC, IDCT_T2_XX_21 ); /* use 18 basis vectors*/ + + mvr2r( tot_sig_ext, ms_ptr[0], FDCNG_VQ_MAX_LEN ); /* write extended result as input to VQ stage #1 */ + } + create_IDCT_N_Matrix( invTrfMatrix, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, sizeof( tmpRAM ) / ( sizeof( float ) ) ); + + msvq_enc( cdk_37bits_ivas, NULL, NULL, ms_ptr[0], levels_37bits, FD_CNG_maxC_37bits, FD_CNG_stages_37bits, weights, N[0], FD_CNG_maxN_37bits, 1, invTrfMatrix, indices[0] ); + msvq_dec( cdk_37bits_ivas, NULL, NULL, FD_CNG_stages_37bits, N[0], FD_CNG_maxN_37bits, indices[0], 1, invTrfMatrix, ms_ptr[0], NULL ); + +#else msvq_enc( cdk_37bits_ivas, NULL, NULL, ms_ptr[0], levels_37bits, FD_CNG_maxC_37bits, FD_CNG_stages_37bits, weights, N[0], FD_CNG_maxN_37bits, indices[0] ); msvq_dec( cdk_37bits_ivas, NULL, NULL, FD_CNG_stages_37bits, N[0], FD_CNG_maxN_37bits, indices[0], ms_ptr[0], NULL ); +#endif /* set S to zero */ set_zero( ms_ptr[1], NPART ); /* compute M gain */ +#ifdef ERI_FDCNGVQ_LOW_ROM + gain[0] = sum_f( ms_ptr[0], NPART ); /* TBD Note: NPART should likely be N[0] if N[0] may change */ +#else gain[0] = sum_f( ms_ptr[0], NPART ); +#endif gain[0] = ( E[0] - gain[0] ) / (float) N[0]; apply_scale( &gain[0], sts[0]->hFdCngEnc->hFdCngCom->CngBandwidth, sts[0]->hDtxEnc->last_active_brate, scaleTableStereo, SIZE_SCALE_TABLE_STEREO ); @@ -1216,7 +1363,11 @@ void FdCngEncodeDiracMDCTStereoSID( gain[1] = gain[0]; /* undo M/S */ +#ifdef ERI_FDCNGVQ_LOW_ROM + convertToMS( NPART, ms_ptr[0], ms_ptr[1], 1.0f ); /* TBD Note: NPART should likely be N[0] if N[0] may change */ +#else convertToMS( NPART, ms_ptr[0], ms_ptr[1], 1.0f ); +#endif /* restore channel noise envelopes */ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) @@ -1224,7 +1375,11 @@ void FdCngEncodeDiracMDCTStereoSID( HANDLE_FD_CNG_ENC hFdCngEnc = sts[ch]->hFdCngEnc; HANDLE_FD_CNG_COM hFdCngCom = hFdCngEnc->hFdCngCom; +#ifdef ERI_FDCNGVQ_LOW_ROM + for ( p = 0; p < NPART; p++ ) /* TBD Note: NPART should likely be N[0] if N[0] may change */ +#else for ( p = 0; p < NPART; p++ ) +#endif { lr_out_ptr[ch][p] = powf( 10.f, ( ms_ptr[ch][p] + gain[ch] ) / 10.f ); } @@ -1263,6 +1418,5 @@ void FdCngEncodeDiracMDCTStereoSID( } push_indice( sts[0]->hBstr, IND_ENERGY, gain_idx[0], 7 ); - return; } diff --git a/lib_enc/find_tar.c b/lib_enc/find_tar.c index b97cd8fd57..008fb17cb9 100644 --- a/lib_enc/find_tar.c +++ b/lib_enc/find_tar.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * find_targets() diff --git a/lib_enc/find_tilt.c b/lib_enc/find_tilt.c index 140c3b84bf..bdfac0569b 100644 --- a/lib_enc/find_tilt.c +++ b/lib_enc/find_tilt.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local constants diff --git a/lib_enc/find_uv.c b/lib_enc/find_uv.c index fcfbfaa497..a80971880f 100644 --- a/lib_enc/find_uv.c +++ b/lib_enc/find_uv.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_enc/find_wsp.c b/lib_enc/find_wsp.c index d2e2575b52..e08918a4de 100644 --- a/lib_enc/find_wsp.c +++ b/lib_enc/find_wsp.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * find_wsp() diff --git a/lib_enc/frame_spec_dif_cor_rate.c b/lib_enc/frame_spec_dif_cor_rate.c index 9b3329c5c1..b0ececfb38 100644 --- a/lib_enc/frame_spec_dif_cor_rate.c +++ b/lib_enc/frame_spec_dif_cor_rate.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #include "options.h" #include #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * frame_spec_dif_cor_rate() diff --git a/lib_enc/gain_enc.c b/lib_enc/gain_enc.c index 41389a6edb..4883ea77b4 100644 --- a/lib_enc/gain_enc.c +++ b/lib_enc/gain_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_enc/gaus_enc.c b/lib_enc/gaus_enc.c index 080f12f707..79b480e516 100644 --- a/lib_enc/gaus_enc.c +++ b/lib_enc/gaus_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_enc/gp_clip.c b/lib_enc/gp_clip.c index 036fcd2bf7..43394c2bf5 100644 --- a/lib_enc/gp_clip.c +++ b/lib_enc/gp_clip.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include #include "prot.h" #include "cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_enc/gs_enc.c b/lib_enc/gs_enc.c index bd8897e554..25f1f8fc76 100644 --- a/lib_enc/gs_enc.c +++ b/lib_enc/gs_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "rom_com.h" #include "prot.h" #include "ivas_prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local function prototypes diff --git a/lib_enc/guided_plc_enc.c b/lib_enc/guided_plc_enc.c index 28dd46c544..cb5e84683d 100644 --- a/lib_enc/guided_plc_enc.c +++ b/lib_enc/guided_plc_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include #include "prot.h" #include "stat_enc.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * coderLookAheadInnovation() diff --git a/lib_enc/hf_cod_amrwb.c b/lib_enc/hf_cod_amrwb.c index e731e13da9..c9cbba3cd4 100644 --- a/lib_enc/hf_cod_amrwb.c +++ b/lib_enc/hf_cod_amrwb.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local function prototypes diff --git a/lib_enc/hq_classifier_enc.c b/lib_enc/hq_classifier_enc.c index f604939d21..a8d798e657 100644 --- a/lib_enc/hq_classifier_enc.c +++ b/lib_enc/hq_classifier_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------* * Local constants diff --git a/lib_enc/hq_core_enc.c b/lib_enc/hq_core_enc.c index bb66182d3d..3fb39b535a 100644 --- a/lib_enc/hq_core_enc.c +++ b/lib_enc/hq_core_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------------- * hq_core_enc() @@ -72,7 +72,7 @@ void hq_core_enc( BSTR_ENC_HANDLE hBstr = st->hBstr; - wmops_sub_start( "hq_core_enc" ); + push_wmops( "hq_core_enc" ); set_f( t_audio, 0, L_FRAME48k ); st->Nb_ACELP_frames = 0; @@ -116,7 +116,7 @@ void hq_core_enc( left_overlap = -1; right_overlap = -1; - WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, TRANSITION_OVERLAP, FULL_OVERLAP, &left_overlap, &right_overlap, st->hTcxEnc->speech_TCX, &L_spec, wtda_audio, 1, 1, 0 ); + WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, TRANSITION_OVERLAP, FULL_OVERLAP, &left_overlap, &right_overlap, st->hTcxEnc->speech_TCX, &L_spec, wtda_audio, 1, 1 ); TCX_MDCT( wtda_audio, t_audio, left_overlap, L_spec - ( left_overlap + right_overlap ) / 2, right_overlap, st->element_mode ); @@ -289,7 +289,7 @@ void hq_core_enc( mvr2r( output, st->hLPDmem->old_exc, L_FRAME16k ); } - wmops_sub_end(); + pop_wmops(); return; } diff --git a/lib_enc/hq_env_enc.c b/lib_enc/hq_env_enc.c index 0ddfc2cb0e..4d57dde164 100644 --- a/lib_enc/hq_env_enc.c +++ b/lib_enc/hq_env_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "prot.h" #include "rom_com.h" #include "rom_enc.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------------------* * encode_envelope_indices() diff --git a/lib_enc/hq_hr_enc.c b/lib_enc/hq_hr_enc.c index 569d616066..d815295a4d 100644 --- a/lib_enc/hq_hr_enc.c +++ b/lib_enc/hq_hr_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "prot.h" #include "rom_enc.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * hq_hr_enc() diff --git a/lib_enc/hq_lr_enc.c b/lib_enc/hq_lr_enc.c index 184dc79e6b..e43baef59d 100644 --- a/lib_enc/hq_lr_enc.c +++ b/lib_enc/hq_lr_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -46,7 +46,7 @@ #include "prot.h" #include "stl.h" #include "basop_util.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* @@ -320,13 +320,13 @@ void hq_lr_enc( if ( flag_spt == 1 ) { - /* initalize the desired parameters for SPT */ + /* initialize the desired parameters for SPT */ spt_shorten_domain_band_save( bands, band_start, band_end, band_width, org_band_start, org_band_end, org_band_width ); spt_shorten_domain_pre( band_start, band_end, hHQ_core->prev_SWB_peak_pos, bands, bwe_br, new_band_start, new_band_end, new_band_width ); spt_shorten_domain_set( hBstr, hHQ_core, t_audio, p2a_flags, new_band_start, new_band_end, new_band_width, bands, band_start, band_end, band_width, &bit_budget ); } -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP /* Estimate number of bits per band */ Q_band_energy = SWB_BWE_LR_Qbe; FOR( i = 0; i < bands; i++ ) @@ -368,11 +368,11 @@ void hq_lr_enc( move32(); /*Q(31-exp2) */ Ep_tmp_fx[i] = L_shr( L_tmp, sub( 15, exp2 ) ); /*Q13 */ } -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP if ( is_transient == 0 && inner_frame == L_FRAME8k && st->core_brate <= ACELP_13k20 ) { -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP lowband = 6; move16(); trans_bit = 2; @@ -640,7 +640,7 @@ void hq_lr_enc( L_band_energy_tmp[i] = L_shl( L_tmp, 1 ); /*Q_band_energy */ } } -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP for ( i = 0; i < bands; i++ ) { @@ -657,7 +657,7 @@ void hq_lr_enc( } else if ( is_transient == 0 && inner_frame == L_FRAME16k ) { -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP bit_budget = sub( bit_budget, 2 ); /* bits in high bands to indicate the last 2 subbands is allocated bits or not */ FOR( i = 0; i < bands; i++ ) { @@ -909,7 +909,7 @@ void hq_lr_enc( L_band_energy_tmp[i] = L_shl( L_tmp, 1 ); /*Q_band_energy */ } } -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP for ( i = 0; i < bands; i++ ) { @@ -1510,7 +1510,7 @@ static float band_energy_quant( for ( k = 0; k < bands; k++ ) L_band_energy[k] = (Word32) ( band_energy[k] * pow( 2.0f, SWB_BWE_LR_Qbe ) ); -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP exp_normd = norm_l( L_qint ); div_s( &rev_qint_fx, 0x4000, round_fx( L_shl( L_qint, exp_normd ) ) ); /* Q14-(29+exp_normd-16)+15 */ Qrev_qint = sub( 14 - ( 29 - 16 ) + 15, exp_normd ); @@ -1522,7 +1522,7 @@ static float band_energy_quant( L_tmp = L_mls( L_band_energy[k], rev_qint_fx ); /* Q14+Qrev_qint-15 */ bq1[k] = round_fx( L_shl( L_tmp, sub( 17, Qrev_qint ) ) ); /* 16-(14+Qrev_qint-15) */ } -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP if ( is_transient ) { @@ -1604,10 +1604,10 @@ static float band_energy_quant( for ( k = 0; k < bands; k++ ) { -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP L_band_energy[k] = L_mls( L_qint, (Word16) bq1[k] ); move32(); /* 29+0-15 -> Qbe(Q14) */ -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP band_energy[k] = (float) ( L_band_energy[k] / pow( 2.0f, SWB_BWE_LR_Qbe ) ); } @@ -1708,7 +1708,7 @@ static void mdct_spectrum_fine_gain_enc( Word16 Qgt; Word16 temp_lo_fx, temp_hi_fx; -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP /* Fine gain quantization on only the most significant energy bands */ /*delta = qint / gqlevs; */ exp_normn = norm_l( L_qint ); @@ -1733,7 +1733,7 @@ static void mdct_spectrum_fine_gain_enc( gain_table_fx[i] = shl( gain_table_fx[i], sub( 14, Qgt ) ); /* Qgt -> Q14 */ gain_table[i] = (float) ( gain_table_fx[i] / pow( 2.0f, 14 ) ); } -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP for ( k = bands - Ngq; k < bands; k++ ) { diff --git a/lib_enc/hvq_enc.c b/lib_enc/hvq_enc.c index d82de6f5f3..42ac52cc3c 100644 --- a/lib_enc/hvq_enc.c +++ b/lib_enc/hvq_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "prot.h" #include "rom_enc.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * hvq_enc() diff --git a/lib_enc/igf_enc.c b/lib_enc/igf_enc.c index e355cd2083..9c68e3fcc7 100644 --- a/lib_enc/igf_enc.c +++ b/lib_enc/igf_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -45,7 +45,7 @@ #include "ivas_prot.h" #include "cnst.h" #include "stat_enc.h" -#include "wmops.h" +#include "wmc_auto.h" #ifdef DEBUG_PLOT #include "deb_out.h" #endif diff --git a/lib_enc/igf_scf_enc.c b/lib_enc/igf_scf_enc.c index b1a3842b8f..f893a8b315 100644 --- a/lib_enc/igf_scf_enc.c +++ b/lib_enc/igf_scf_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "stat_enc.h" #include "stat_com.h" #include "cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* diff --git a/lib_enc/init_enc.c b/lib_enc/init_enc.c index 4e4ab24369..9efd3c7f16 100644 --- a/lib_enc/init_enc.c +++ b/lib_enc/init_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -45,7 +45,7 @@ #include "prot.h" #include "ivas_prot.h" #include "ivas_cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------* * init_encoder() @@ -58,7 +58,8 @@ ivas_error init_encoder( const int16_t idchan, /* i : channel ID */ const int16_t var_SID_rate_flag, /* i : flag for variable SID update rate */ const int16_t interval_SID, /* i : interval for SID update */ - const int16_t vad_only_flag /* i : flag to indicate front-VAD structure */ + const int16_t vad_only_flag, /* i : flag to indicate front-VAD structure */ + const ISM_MODE ism_mode /* i : ISM mode */ ) { int16_t i; @@ -107,7 +108,7 @@ ivas_error init_encoder( if ( !vad_only_flag ) { - if ( ( st->hBstr = (BSTR_ENC_HANDLE) count_malloc( sizeof( BSTR_ENC_DATA ) ) ) == NULL ) + if ( ( st->hBstr = (BSTR_ENC_HANDLE) malloc( sizeof( BSTR_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Bitstream structure\n" ) ); } @@ -256,7 +257,7 @@ ivas_error init_encoder( if ( !vad_only_flag ) { - if ( ( st->hSignalBuf = (SIGNAL_BUFFERS_ENC_HANDLE) count_malloc( sizeof( SIGNAL_BUFFERS_ENC_DATA ) ) ) == NULL ) + if ( ( st->hSignalBuf = (SIGNAL_BUFFERS_ENC_HANDLE) malloc( sizeof( SIGNAL_BUFFERS_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Signal buffers\n" ) ); } @@ -311,7 +312,7 @@ ivas_error init_encoder( if ( idchan == 0 || st->element_mode == IVAS_CPE_TD || st->element_mode == IVAS_CPE_MDCT || st->element_mode == EVS_MONO ) { - if ( ( st->hNoiseEst = (NOISE_EST_HANDLE) count_malloc( sizeof( NOISE_EST_DATA ) ) ) == NULL ) + if ( ( st->hNoiseEst = (NOISE_EST_HANDLE) malloc( sizeof( NOISE_EST_DATA ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Noise estimation\n" ); } @@ -332,7 +333,7 @@ ivas_error init_encoder( if ( ( idchan == 0 || st->element_mode == IVAS_CPE_TD || st->element_mode == IVAS_CPE_MDCT || st->element_mode == EVS_MONO ) && ( !vad_only_flag ) ) { - if ( ( st->hVAD = (VAD_HANDLE) count_malloc( sizeof( VAD_DATA ) ) ) == NULL ) + if ( ( st->hVAD = (VAD_HANDLE) malloc( sizeof( VAD_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VAD\n" ) ); } @@ -348,7 +349,7 @@ ivas_error init_encoder( /* CLDFB-based VAD */ if ( st->element_mode == EVS_MONO ) { - if ( ( st->hVAD_CLDFB = (VAD_CLDFB_HANDLE) count_malloc( sizeof( T_CldfbVadState ) ) ) == NULL ) + if ( ( st->hVAD_CLDFB = (VAD_CLDFB_HANDLE) malloc( sizeof( T_CldfbVadState ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CLDFB VAD\n" ) ); } @@ -366,7 +367,7 @@ ivas_error init_encoder( if ( idchan == 0 || st->element_mode == IVAS_CPE_TD || st->element_mode == IVAS_CPE_MDCT || st->element_mode == EVS_MONO ) { - if ( ( st->hSpMusClas = (SP_MUS_CLAS_HANDLE) count_malloc( sizeof( SP_MUS_CLAS_DATA ) ) ) == NULL ) + if ( ( st->hSpMusClas = (SP_MUS_CLAS_HANDLE) malloc( sizeof( SP_MUS_CLAS_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Speech/music classifier\n" ) ); } @@ -414,7 +415,7 @@ ivas_error init_encoder( if ( ( ( idchan == 0 && st->Opt_DTX_ON ) || st->element_mode == EVS_MONO ) || ( st->element_mode == IVAS_CPE_MDCT && st->Opt_DTX_ON ) ) { - if ( ( st->hDtxEnc = (DTX_ENC_HANDLE) count_malloc( sizeof( DTX_ENC_DATA ) ) ) == NULL ) + if ( ( st->hDtxEnc = (DTX_ENC_HANDLE) malloc( sizeof( DTX_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DTX variables\n" ) ); } @@ -462,9 +463,9 @@ ivas_error init_encoder( * LP-CNG *-----------------------------------------------------------------*/ - if ( ( ( idchan == 0 && st->Opt_DTX_ON && st->element_mode != IVAS_CPE_MDCT ) || st->element_mode == EVS_MONO ) ) + if ( ( ( idchan == 0 && st->Opt_DTX_ON && st->element_mode != IVAS_CPE_MDCT ) || st->element_mode == EVS_MONO ) && !( ism_mode == ISM_MODE_PARAM || ism_mode == ISM_MODE_DISC ) ) { - if ( ( st->hTdCngEnc = (TD_CNG_ENC_HANDLE) count_malloc( sizeof( TD_CNG_ENC_DATA ) ) ) == NULL ) + if ( ( st->hTdCngEnc = (TD_CNG_ENC_HANDLE) malloc( sizeof( TD_CNG_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DTX/TD CNG\n" ) ); } @@ -500,7 +501,7 @@ ivas_error init_encoder( if ( st->Opt_SC_VBR || st->element_mode == EVS_MONO ) { - if ( ( st->hSC_VBR = (SC_VBR_ENC_HANDLE) count_malloc( sizeof( SC_VBR_ENC_DATA ) ) ) == NULL ) + if ( ( st->hSC_VBR = (SC_VBR_ENC_HANDLE) malloc( sizeof( SC_VBR_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SC-VBR\n" ) ); } @@ -521,7 +522,7 @@ ivas_error init_encoder( if ( st->Opt_AMR_WB || st->element_mode == EVS_MONO ) { - if ( ( st->hAmrwb_IO = (AMRWB_IO_ENC_HANDLE) count_malloc( sizeof( AMRWB_IO_ENC_DATA ) ) ) == NULL ) + if ( ( st->hAmrwb_IO = (AMRWB_IO_ENC_HANDLE) malloc( sizeof( AMRWB_IO_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for AMR-WB IO\n" ) ); } @@ -539,7 +540,7 @@ ivas_error init_encoder( if ( ( idchan == 0 && st->element_mode != IVAS_CPE_MDCT ) || st->element_mode == IVAS_CPE_TD ) { - if ( ( st->hLPDmem = (LPD_state_HANDLE) count_malloc( sizeof( LPD_state ) ) ) == NULL ) + if ( ( st->hLPDmem = (LPD_state_HANDLE) malloc( sizeof( LPD_state ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LPDmem\n" ) ); } @@ -560,7 +561,7 @@ ivas_error init_encoder( if ( ( idchan == 0 && st->element_mode != IVAS_CPE_MDCT ) || st->element_mode == IVAS_CPE_TD ) { - if ( ( st->hGSCEnc = (GSC_ENC_HANDLE) count_malloc( sizeof( GSC_ENC_DATA ) ) ) == NULL ) + if ( ( st->hGSCEnc = (GSC_ENC_HANDLE) malloc( sizeof( GSC_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for GSC\n" ) ); } @@ -578,7 +579,7 @@ ivas_error init_encoder( if ( idchan == 0 && st->element_mode != IVAS_CPE_MDCT ) { - if ( ( st->hBWE_TD = (TD_BWE_ENC_HANDLE) count_malloc( sizeof( TD_BWE_ENC_DATA ) ) ) == NULL ) + if ( ( st->hBWE_TD = (TD_BWE_ENC_HANDLE) malloc( sizeof( TD_BWE_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD BWE\n" ) ); } @@ -603,7 +604,7 @@ ivas_error init_encoder( if ( idchan == 0 && st->element_mode != IVAS_CPE_MDCT ) { - if ( ( st->hBWE_FD = (FD_BWE_ENC_HANDLE) count_malloc( sizeof( FD_BWE_ENC_DATA ) ) ) == NULL ) + if ( ( st->hBWE_FD = (FD_BWE_ENC_HANDLE) malloc( sizeof( FD_BWE_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FD BWE\n" ) ); } @@ -621,7 +622,7 @@ ivas_error init_encoder( if ( st->element_mode != IVAS_CPE_TD && st->element_mode != IVAS_CPE_MDCT && idchan == 0 ) { - if ( ( st->hHQ_core = (HQ_ENC_HANDLE) count_malloc( sizeof( HQ_ENC_DATA ) ) ) == NULL ) + if ( ( st->hHQ_core = (HQ_ENC_HANDLE) malloc( sizeof( HQ_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HQ core\n" ) ); } @@ -657,7 +658,7 @@ ivas_error init_encoder( if ( st->Opt_RF_ON || st->element_mode == EVS_MONO ) { - if ( ( st->hRF = (RF_ENC_HANDLE) count_malloc( sizeof( RF_ENC_DATA ) ) ) == NULL ) + if ( ( st->hRF = (RF_ENC_HANDLE) malloc( sizeof( RF_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for RF\n" ) ); } @@ -676,7 +677,7 @@ ivas_error init_encoder( if ( st->element_mode == EVS_MONO ) { - if ( ( st->hTECEnc = (TEC_ENC_HANDLE) count_malloc( sizeof( TEC_ENC_DATA ) ) ) == NULL ) + if ( ( st->hTECEnc = (TEC_ENC_HANDLE) malloc( sizeof( TEC_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TEC\n" ) ); } @@ -694,7 +695,7 @@ ivas_error init_encoder( // VE: reduction possible for MCT_CHAN_MODE_LFE channel - see I1-172 if ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) { - if ( ( st->hTcxEnc = (TCX_ENC_HANDLE) count_malloc( sizeof( TCX_ENC_DATA ) ) ) == NULL ) + if ( ( st->hTcxEnc = (TCX_ENC_HANDLE) malloc( sizeof( TCX_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hTcxEnc\n" ) ); } @@ -711,7 +712,7 @@ ivas_error init_encoder( /* MDCT classifier */ MDCT_classifier_reset( st->hTcxEnc ); - if ( ( st->hTcxCfg = (TCX_CONFIG_HANDLE) count_malloc( sizeof( TCX_config ) ) ) == NULL ) + if ( ( st->hTcxCfg = (TCX_CONFIG_HANDLE) malloc( sizeof( TCX_config ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hTcxCfg\n" ) ); } @@ -726,9 +727,9 @@ ivas_error init_encoder( * IGF *-----------------------------------------------------------------*/ - if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) ) { - if ( ( st->hIGFEnc = (IGF_ENC_INSTANCE_HANDLE) count_malloc( sizeof( IGF_ENC_INSTANCE ) ) ) == NULL ) + if ( ( st->hIGFEnc = (IGF_ENC_INSTANCE_HANDLE) malloc( sizeof( IGF_ENC_INSTANCE ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hIGFEnc\n" ) ); } @@ -746,7 +747,7 @@ ivas_error init_encoder( if ( st->codec_mode == MODE2 || st->element_mode > EVS_MONO ) { - st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode, st->mct_chan_mode ); + st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode ); } else { @@ -756,7 +757,7 @@ ivas_error init_encoder( /* PLC encoder */ if ( st->element_mode == EVS_MONO ) { - if ( ( st->hPlcExt = (PLC_ENC_EVS_HANDLE) count_malloc( sizeof( PLC_ENC_EVS ) ) ) == NULL ) + if ( ( st->hPlcExt = (PLC_ENC_EVS_HANDLE) malloc( sizeof( PLC_ENC_EVS ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hPlcExt\n" ) ); } @@ -800,26 +801,18 @@ ivas_error init_encoder( /*-----------------------------------------------------------------* * Transient detector *-----------------------------------------------------------------*/ - - if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( ( st->hTranDet = (TRAN_DET_HANDLE) malloc( sizeof( TRAN_DET_DATA ) ) ) == NULL ) { - if ( ( st->hTranDet = (TRAN_DET_HANDLE) count_malloc( sizeof( TRAN_DET_DATA ) ) ) == NULL ) - { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Transient Detection\n" ) ); - } + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Transient Detection\n" ) ); + } - if ( st->element_mode > EVS_MONO ) - { - InitTransientDetection( (int16_t) ( st->input_Fs / FRAMES_PER_SEC ), 0, st->hTranDet, 1 ); - } - else - { - InitTransientDetection( (int16_t) ( st->input_Fs / FRAMES_PER_SEC ), NS2SA( st->input_Fs, DELAY_FIR_RESAMPL_NS ), st->hTranDet, 0 ); - } + if ( st->element_mode > EVS_MONO ) + { + InitTransientDetection( (int16_t) ( st->input_Fs / FRAMES_PER_SEC ), 0, st->hTranDet, 1 ); } else { - st->hTranDet = NULL; + InitTransientDetection( (int16_t) ( st->input_Fs / FRAMES_PER_SEC ), NS2SA( st->input_Fs, DELAY_FIR_RESAMPL_NS ), st->hTranDet, 0 ); } /*-----------------------------------------------------------------* @@ -861,32 +854,22 @@ void LPDmem_enc_init( return; } + + /*-----------------------------------------------------------------------* - * destroy_encoder() + * destroy_cldfb_encoder() * * Free memory which was allocated in init_encoder() *-----------------------------------------------------------------------*/ -void destroy_encoder( +void destroy_cldfb_encoder( Encoder_State *st /* i/o: Encoder static variables structure */ ) { - if ( st->cldfbSynTd != NULL ) - { - deleteCldfb( &st->cldfbSynTd ); - } - - if ( st->cldfbAnaEnc != NULL ) - { - deleteCldfb( &st->cldfbAnaEnc ); - } - - if ( st->hFdCngEnc != NULL ) - { - deleteFdCngEnc( &st->hFdCngEnc ); - } + deleteCldfb( &st->cldfbSynTd ); + deleteCldfb( &st->cldfbAnaEnc ); - /* Close Core */ + deleteFdCngEnc( &st->hFdCngEnc ); return; } diff --git a/lib_enc/inov_enc.c b/lib_enc/inov_enc.c index c80057f055..fedc98e103 100644 --- a/lib_enc/inov_enc.c +++ b/lib_enc/inov_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "prot.h" #include "ivas_prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * inov_encode() diff --git a/lib_enc/isf_enc_amr_wb.c b/lib_enc/isf_enc_amr_wb.c index 441c66be9b..c10ee6288b 100644 --- a/lib_enc/isf_enc_amr_wb.c +++ b/lib_enc/isf_enc_amr_wb.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "rom_enc.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------* * Local constants diff --git a/lib_enc/ivas_agc_enc.c b/lib_enc/ivas_agc_enc.c index d8d0f1f772..83dbdad1e1 100644 --- a/lib_enc/ivas_agc_enc.c +++ b/lib_enc/ivas_agc_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "prot.h" #include #include -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------------------------* @@ -152,7 +152,7 @@ ivas_error ivas_spar_agc_enc_open( ivas_agc_enc_state_t *hAgc; int16_t input_frame, delay; - if ( ( hAgc = (ivas_agc_enc_state_t *) count_malloc( sizeof( ivas_agc_enc_state_t ) ) ) == NULL ) + if ( ( hAgc = (ivas_agc_enc_state_t *) malloc( sizeof( ivas_agc_enc_state_t ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR AGC encoder" ); } @@ -160,17 +160,17 @@ ivas_error ivas_spar_agc_enc_open( input_frame = (int16_t) ( input_Fs / FRAMES_PER_SEC ); delay = NS2SA( input_Fs, ( IVAS_ENC_DELAY_NS + IVAS_DEC_DELAY_NS ) ); - if ( ( hAgc->agc_com.winFunc = (float *) count_malloc( sizeof( float ) * ( input_frame - delay ) ) ) == NULL ) + if ( ( hAgc->agc_com.winFunc = (float *) malloc( sizeof( float ) * ( input_frame - delay ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR AGC encoder" ); } - if ( ( hAgc->gain_state = (ivas_agc_enc_chan_state_t *) count_malloc( sizeof( ivas_agc_enc_chan_state_t ) * nchan_inp ) ) == NULL ) + if ( ( hAgc->gain_state = (ivas_agc_enc_chan_state_t *) malloc( sizeof( ivas_agc_enc_chan_state_t ) * nchan_inp ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR AGC encoder" ); } - if ( ( hAgc->gain_data = (ivas_agc_chan_data_t *) count_malloc( sizeof( ivas_agc_chan_data_t ) * nchan_inp ) ) == NULL ) + if ( ( hAgc->gain_data = (ivas_agc_chan_data_t *) malloc( sizeof( ivas_agc_chan_data_t ) * nchan_inp ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR AGC encoder" ); } @@ -195,22 +195,24 @@ void ivas_spar_agc_enc_close( { ivas_agc_enc_state_t *hAgc; + if ( hAgcEnc == NULL || *hAgcEnc == NULL ) + { + return; + } + hAgc = *hAgcEnc; - if ( hAgc != NULL ) - { - count_free( hAgc->agc_com.winFunc ); - hAgc->agc_com.winFunc = NULL; + free( hAgc->agc_com.winFunc ); + hAgc->agc_com.winFunc = NULL; - count_free( hAgc->gain_state ); - hAgc->gain_state = NULL; + free( hAgc->gain_state ); + hAgc->gain_state = NULL; - count_free( hAgc->gain_data ); - hAgc->gain_data = NULL; + free( hAgc->gain_data ); + hAgc->gain_data = NULL; - count_free( hAgc ); - hAgc = NULL; - } + free( *hAgcEnc ); + *hAgcEnc = NULL; return; } @@ -329,7 +331,8 @@ void ivas_agc_enc_process( { int16_t isCompensated = FALSE; actualMaxAbsVal = pState->gain_state[i].lastMaxAbs * pState->gain_state[i].lastGain; - pState->gain_state[i].gainExpVal = (int16_t) ceilf( -logf( actualMaxAbsVal * MDFT_NORM_SCALING ) / logf( pState->agc_com.winFunc[min( offset - 1, MaxAbsValIdx )] ) ); + idx = min( offset - 1, MaxAbsValIdx ); + pState->gain_state[i].gainExpVal = (int16_t) ceilf( -logf( actualMaxAbsVal * MDFT_NORM_SCALING ) / logf( pState->agc_com.winFunc[idx] ) ); while ( !isCompensated ) { diff --git a/lib_enc/ivas_core_enc.c b/lib_enc/ivas_core_enc.c index dc3247cbfb..a7c37a79af 100644 --- a/lib_enc/ivas_core_enc.c +++ b/lib_enc/ivas_core_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "prot.h" #include "ivas_cnst.h" #include "ivas_prot.h" -#include "wmops.h" +#include "wmc_auto.h" #include #ifdef DEBUG_MODE_ACELP @@ -61,7 +61,6 @@ ivas_error ivas_core_enc( const int16_t n_CoreChannels, /* i : number of core channels to be coded */ float old_inp_12k8[CPE_CHANNELS][L_INP_12k8], /* i : buffer of old input signal */ float old_inp_16k[CPE_CHANNELS][L_INP], /* i : buffer of old input signal */ - const float Etot[CPE_CHANNELS], /* i : total energy */ float ener[CPE_CHANNELS], /* i : residual energy from Levinson-Durbin */ float A[CPE_CHANNELS][NB_SUBFR16k * ( M + 1 )], /* i : A(z) unquantized for the 4 subframes */ float Aw[CPE_CHANNELS][NB_SUBFR16k * ( M + 1 )], /* i : weighted A(z) unquantized for subframes */ @@ -105,7 +104,7 @@ ivas_error ivas_core_enc( int32_t element_brate, last_element_brate, input_Fs; ivas_error error; - wmops_sub_start( "ivas_core_enc" ); + push_wmops( "ivas_core_enc" ); error = IVAS_ERR_OK; @@ -220,7 +219,11 @@ ivas_error ivas_core_enc( if ( st->core == ACELP_CORE ) { /* ACELP core encoder */ +#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE + if ( ( error = acelp_core_enc( st, inp[n], ener[n], A[n], Aw[n], epsP[n], lsp_new[n], lsp_mid[n], vad_hover_flag[0], attack_flag[n], bwe_exc_extended[n], voice_factors[n], old_syn_12k8_16k[n], pitch_buf[n], &unbits[n], hStereoTD, tdm_lsfQ_PCh ) ) != IVAS_ERR_OK ) +#else if ( ( error = acelp_core_enc( st, inp[n], ener[n], A[n], Aw[n], epsP[n], lsp_new[n], lsp_mid[n], vad_hover_flag[0], attack_flag[n], bwe_exc_extended[n], voice_factors[n], old_syn_12k8_16k[n], pitch_buf[n], &unbits[n], hStereoTD, tdm_lspQ_PCh, tdm_lsfQ_PCh ) ) != IVAS_ERR_OK ) +#endif { return error; } @@ -260,7 +263,8 @@ ivas_error ivas_core_enc( if ( MCT_flag ) { ivas_mdct_core_whitening_enc( hCPE, old_inp_16k, old_wsp, pitch_buf, hMCT->p_mdst_spectrum_long[cpe_id], hMCT->tnsBits[cpe_id], hMCT->p_orig_spectrum_long[cpe_id], - hMCT->tnsSize[cpe_id], hMCT->p_param[cpe_id], hMCT->hBstr, &hMCT->LFE_off, 1, hMCT->nchan_out_woLFE + hMCT->num_lfe ); + hMCT->tnsSize[cpe_id], hMCT->p_param[cpe_id], hMCT->hBstr, + 1, hMCT->nchan_out_woLFE ); } else { @@ -343,16 +347,7 @@ ivas_error ivas_core_enc( { if ( st->hBWE_TD != NULL ) { - set_f( st->hBWE_TD->old_speech_shb, 0.0f, L_LOOK_16k + L_SUBFR16k ); - set_f( shb_speech, 0.0f, L_FRAME16k ); - set_f( st->hBWE_TD->mem_shb_res, 0.0f, MAX_LEN_MA_FILTER ); - set_f( st->hBWE_TD->old_EnvSHBres, 0.0f, L_FRAME4k ); - st->hBWE_TD->old_mean_EnvSHBres = 0.0f; - st->hBWE_TD->prev_enr_EnvSHBres = 1.0f; - st->hBWE_TD->prev_shb_env_tilt = 0.0f; - st->hBWE_TD->prev_pow_exc16kWhtnd = 1.0f; - st->hBWE_TD->prev_mix_factor = 1.0f; - st->hBWE_TD->prev_Env_error = 0.0f; + InitSWBencBufferStates( st->hBWE_TD, shb_speech ); } } @@ -409,7 +404,10 @@ ivas_error ivas_core_enc( * Common updates *---------------------------------------------------------------------*/ - updt_enc_common( st, Etot[n] ); + if ( !MCT_flag ) /* for MCT do this later, otherwise there can be a problem because TCX quant happens later and might get the wrong last_core on a bit rate switch */ + { + updt_enc_common( st ); + } } @@ -455,6 +453,8 @@ ivas_error ivas_core_enc( dbgwrite( &st->sp_aud_decision1, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "sp_aud_decision1", n, id, ENC ) ); dbgwrite( &st->sp_aud_decision2, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "sp_aud_decision2", n, id, ENC ) ); + dbgwrite( &st->lp_noise, sizeof( float ), 1, input_frame, fname( debug_dir, "lp_noise", n, id, ENC ) ); + #if ( defined DEBUG_MODE_ACELP ) || ( defined DEBUG_MODE_TCX ) if ( st->coder_type == INACTIVE || st->coder_type == UNVOICED ) { @@ -523,7 +523,7 @@ ivas_error ivas_core_enc( } #endif - wmops_sub_end(); + pop_wmops(); return error; } diff --git a/lib_enc/ivas_core_pre_proc.c b/lib_enc/ivas_core_pre_proc.c index acbacc09e0..7a0d25ddfa 100644 --- a/lib_enc/ivas_core_pre_proc.c +++ b/lib_enc/ivas_core_pre_proc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #include "rom_enc.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* @@ -85,7 +85,7 @@ ivas_error pre_proc_ivas( int32_t sr_core_tmp, total_brate_tmp; ivas_error error; - wmops_sub_start( "pre_proc" ); + push_wmops( "pre_proc" ); error = IVAS_ERR_OK; @@ -459,7 +459,7 @@ ivas_error pre_proc_ivas( dbgwrite( inp_16k, sizeof( float ), L_FRAME, 1, fname( debug_dir, "inp_16k", st->idchan, st->id_element, ENC ) ); #endif - wmops_sub_end(); + pop_wmops(); return error; } @@ -659,7 +659,9 @@ ivas_error ivas_compute_core_buffers( * Perform fixed preemphasis (16kHz signal) through 1 - g*z^-1 *-----------------------------------------------------------------*/ - if ( !( ( element_mode == IVAS_CPE_TD && st->idchan == 1 ) || element_mode == IVAS_CPE_MDCT ) ) + if ( + st->tcxonly == 0 && + !( ( element_mode == IVAS_CPE_TD && st->idchan == 1 ) || element_mode == IVAS_CPE_MDCT ) ) { st->mem_preemph_enc = new_inp_16k[L_frame_tmp - 1]; } diff --git a/lib_enc/ivas_core_pre_proc_front.c b/lib_enc/ivas_core_pre_proc_front.c index 828fdf17a1..cf23ddef53 100644 --- a/lib_enc/ivas_core_pre_proc_front.c +++ b/lib_enc/ivas_core_pre_proc_front.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,10 +41,17 @@ #include "rom_com.h" #include "prot.h" #include "ivas_prot.h" -#include "wmops.h" +#include "wmc_auto.h" #include +/*---------------------------------------------------------------* + * Local constants + *---------------------------------------------------------------*/ + +#define SCE_SMC_THR 16000 + + /*-------------------------------------------------------------------* * Local function prototypes *--------------------------------------------------------------------*/ @@ -68,7 +75,6 @@ ivas_error pre_proc_front_ivas( const int16_t n, /* i : channel number */ float old_inp_12k8[], /* o : buffer of old input signal */ float old_inp_16k[], /* o : buffer of old input signal @16kHz */ - float *Etot, /* o : total energy */ float *ener, /* o : residual energy from Levinson-Durbin */ float *relE, /* o : frame relative energy */ float A[NB_SUBFR16k * ( M + 1 )], /* o : A(z) unquantized for the 4 subframes */ @@ -100,13 +106,14 @@ ivas_error pre_proc_front_ivas( const int16_t flag_16k_smc, /* i : flag to indicate if the OL SMC is run at 16 kHz */ const int16_t front_vad_flag, /* i : front-VAD flag to overwrite VAD decision */ const int16_t force_front_vad, /* i : flag to force VAD decision */ - const int16_t front_vad_dtx_flag /* i : front-VAD DTX flag to overwrite VAD decision*/ - , - const int32_t ivas_total_brate /* i : IVAS total bitrate - for setting the DTX */ + const int16_t front_vad_dtx_flag, /* i : front-VAD DTX flag to overwrite VAD decision*/ + const int32_t ivas_total_brate /* i : IVAS total bitrate - for setting the DTX */ + ) { float *inp_12k8, *new_inp_12k8; /* pointers to current frame and new data */ float *wsp; /* weighted input signal buffer */ + float Etot; /* total energy */ float fr_bands[2 * NB_BANDS]; /* energy in frequency bands */ float lf_E[2 * VOIC_BINS]; /* per bin spectrum energy in lf */ float tmpN[NB_BANDS]; /* Temporary noise update */ @@ -157,7 +164,7 @@ ivas_error pre_proc_front_ivas( int16_t LR_vad_flag; ivas_error error; - wmops_sub_start( "pre_proc_front" ); + push_wmops( "pre_proc_front" ); /*------------------------------------------------------------------* * Initialization @@ -408,11 +415,11 @@ ivas_error pre_proc_front_ivas( * Spectral analysis *--------------------------------------------------------------------------*/ - analy_sp( element_mode, hCPE, input_Fs, inp_12k8, st->Bin_E, st->Bin_E_old, fr_bands, lf_E, Etot, st->min_band, st->max_band, band_energies, PS, fft_buff ); + analy_sp( element_mode, hCPE, input_Fs, inp_12k8, st->Bin_E, st->Bin_E_old, fr_bands, lf_E, &Etot, st->min_band, st->max_band, band_energies, PS, fft_buff ); if ( hStereoClassif != NULL ) { - if ( st->lp_speech - *Etot > 25 ) + if ( st->lp_speech - Etot > 25 ) { hStereoClassif->silence_flag = 2; } @@ -427,7 +434,7 @@ ivas_error pre_proc_front_ivas( * SAD (1-signal, 0-noise) *----------------------------------------------------------------*/ - noise_est_pre( *Etot, st->ini_frame, st->hNoiseEst, st->idchan, element_mode, hCPE != NULL ? hCPE->last_element_mode : element_mode ); + noise_est_pre( Etot, st->ini_frame, st->hNoiseEst, st->idchan, element_mode, hCPE != NULL ? hCPE->last_element_mode : element_mode ); if ( element_mode == IVAS_CPE_TD && ( ( abs( hCPE->hStereoTD->tdm_last_ratio_idx - tdm_ratio_idx ) > 5 && st->idchan == 1 ) || abs( hCPE->hStereoTD->tdm_last_inst_ratio_idx - hCPE->hStereoTD->tdm_inst_ratio_idx ) > 10 ) ) { @@ -436,13 +443,6 @@ ivas_error pre_proc_front_ivas( st->vad_flag = wb_vad( st, fr_bands, &i, &i, &i, &snr_sum_he, &localVAD_HE_SAD, &( st->flag_noisy_speech_snr ), NULL, NULL, -1000.0f, -1000.0f ); -#ifdef ITD_WINNER_GAIN_MODIFY - /*Save the local_vad flag for the noise coherence calculation*/ - if ( element_mode == IVAS_CPE_DFT ) - { - hCPE->hStereoDft->local_vad = (short) ( st->vad_flag ); - } -#endif if ( force_front_vad == 1 || front_vad_flag == 1 ) { @@ -450,15 +450,9 @@ ivas_error pre_proc_front_ivas( st->vad_flag = front_vad_flag; st->localVAD = front_vad_flag; } - if ( ( hCPE != NULL && !( lr_vad_enabled && st->idchan == 0 ) ) || hSCE != NULL ) { - *vad_flag_dtx = dtx_hangover_addition( st, st->vad_flag, st->lp_speech - st->lp_noise, 0, vad_hover_flag, NULL, NULL -#ifdef FIX_ITD_CNG - , - NULL -#endif - ); + *vad_flag_dtx = dtx_hangover_addition( st, st->vad_flag, st->lp_speech - st->lp_noise, 0, vad_hover_flag, NULL, NULL, NULL ); } else { @@ -485,7 +479,8 @@ ivas_error pre_proc_front_ivas( if ( st->idchan == 0 && element_mode != IVAS_CPE_MDCT ) { - bw_detect( st, st->input, NULL, enerBuffer ); + bw_detect( st, st->input, NULL, enerBuffer, + 0 ); } if ( element_mode != IVAS_CPE_MDCT ) /* in MDCT stereo, set_bw_stereo() is used instead */ @@ -505,7 +500,7 @@ ivas_error pre_proc_front_ivas( * Correlation correction as a function of total noise level *----------------------------------------------------------------*/ - noise_est_down( fr_bands, st->hNoiseEst->bckr, tmpN, tmpE, st->min_band, st->max_band, &st->hNoiseEst->totalNoise, *Etot, &st->hNoiseEst->Etot_last, &st->hNoiseEst->Etot_v_h2 ); + noise_est_down( fr_bands, st->hNoiseEst->bckr, tmpN, tmpE, st->min_band, st->max_band, &st->hNoiseEst->totalNoise, Etot, &st->hNoiseEst->Etot_last, &st->hNoiseEst->Etot_v_h2 ); if ( lr_vad_enabled && st->idchan == 0 ) { @@ -515,7 +510,7 @@ ivas_error pre_proc_front_ivas( corr_shiftR = correlation_shift( hCPE->hFrontVad[1]->hNoiseEst->totalNoise ); } - *relE = *Etot - st->lp_speech; + *relE = Etot - st->lp_speech; corr_shift = correlation_shift( st->hNoiseEst->totalNoise ); @@ -556,13 +551,11 @@ ivas_error pre_proc_front_ivas( dtx( st, ivas_total_brate, *vad_flag_dtx, inp_12k8 ); -#ifdef FIX_ITD_CNG if ( hCPE != NULL && hCPE->hStereoDft != NULL && st->core_brate == SID_2k40 ) { /* Add another period of expected xcorr updates */ hCPE->hStereoDft->expectedNumUpdates += st->hDtxEnc->max_SID; } -#endif /*----------------------------------------------------------------* * Adjust FD-CNG Noise Estimator @@ -663,7 +656,7 @@ ivas_error pre_proc_front_ivas( * Update estimated noise energy and voicing cut-off frequency *-----------------------------------------------------------------*/ - noise_est( st, old_pitch1, tmpN, epsP, *Etot, *relE, corr_shift, tmpE, fr_bands, cor_map_sum, &ncharX, &sp_div, + noise_est( st, old_pitch1, tmpN, epsP, Etot, *relE, corr_shift, tmpE, fr_bands, cor_map_sum, &ncharX, &sp_div, &non_staX, loc_harm, lf_E, &st->hNoiseEst->harm_cor_cnt, st->hNoiseEst->Etot_l_lp, &dummy /*sp_floor*/, S_map, hStereoClassif, NULL, st->ini_frame ); if ( lr_vad_enabled && st->idchan == 0 ) @@ -696,7 +689,7 @@ ivas_error pre_proc_front_ivas( find_tilt( fr_bands, st->hNoiseEst->bckr, ee, st->pitch, st->voicing, lf_E, corr_shift, st->input_bwidth, st->max_band, hp_E, MODE1, &( st->bckr_tilt_lt ), st->Opt_SC_VBR ); - st->coder_type = find_uv( st, pitch_fr, voicing_fr, inp_12k8, ee, &dE1X, corr_shift, *relE, *Etot, hp_E, &flag_spitch, last_core_orig, hStereoClassif ); + st->coder_type = find_uv( st, pitch_fr, voicing_fr, inp_12k8, ee, &dE1X, corr_shift, *relE, Etot, hp_E, &flag_spitch, last_core_orig, hStereoClassif ); /*-----------------------------------------------------------------* * channel aware mode configuration * @@ -732,7 +725,7 @@ ivas_error pre_proc_front_ivas( * 1st stage speech/music classification (GMM model) *----------------------------------------------------------------*/ - smc_dec = ivas_smc_gmm( st, hStereoClassif, localVAD_HE_SAD, *Etot, lsp_new, *cor_map_sum, epsP, PS, non_staX, *relE, &high_lpn_flag, flag_spitch ); + smc_dec = ivas_smc_gmm( st, hStereoClassif, localVAD_HE_SAD, Etot, lsp_new, *cor_map_sum, epsP, PS, non_staX, *relE, &high_lpn_flag, flag_spitch ); #ifdef DEBUGGING if ( st->idchan == 0 ) @@ -755,19 +748,16 @@ ivas_error pre_proc_front_ivas( * Update of old per-band energy spectrum *----------------------------------------------------------------*/ - long_enr( st, *Etot, localVAD_HE_SAD, high_lpn_flag, NULL, 1, NULL, NULL ); + long_enr( st, Etot, localVAD_HE_SAD, high_lpn_flag, NULL, 1, NULL, NULL ); mvr2r( fr_bands + NB_BANDS, st->hNoiseEst->enrO, NB_BANDS ); if ( lr_vad_enabled && st->idchan == 0 ) { - long_enr( st, *Etot, localVAD_HE_SAD, high_lpn_flag, hCPE->hFrontVad, CPE_CHANNELS, localVAD_HE_SAD_LR, Etot_LR ); + long_enr( st, -1, localVAD_HE_SAD, high_lpn_flag, hCPE->hFrontVad, CPE_CHANNELS, localVAD_HE_SAD_LR, Etot_LR ); mvr2r( fr_bands_LR[0] + NB_BANDS, hCPE->hFrontVad[0]->hNoiseEst->enrO, NB_BANDS ); mvr2r( fr_bands_LR[1] + NB_BANDS, hCPE->hFrontVad[1]->hNoiseEst->enrO, NB_BANDS ); - - hCPE->hFrontVad[0]->hNoiseEst->Etot_last = Etot_LR[0]; - hCPE->hFrontVad[1]->hNoiseEst->Etot_last = Etot_LR[1]; } /*----------------------------------------------------------------* @@ -791,7 +781,7 @@ ivas_error pre_proc_front_ivas( else if ( element_mode != IVAS_CPE_MDCT ) { /* SNR-based speech/music classification */ - if ( ( element_mode >= IVAS_CPE_DFT && element_brate >= IVAS_24k4 ) || ( element_mode == IVAS_SCE && element_brate >= 16000 ) ) + if ( ( element_mode >= IVAS_CPE_DFT && element_brate >= IVAS_24k4 ) || ( element_mode == IVAS_SCE && element_brate >= SCE_SMC_THR ) ) { if ( flag_16k_smc ) { @@ -809,37 +799,30 @@ ivas_error pre_proc_front_ivas( smc_dec = ivas_acelp_tcx20_switching( st, inp_12k8, wsp, non_staX, pitch_fr, voicing_fr, currFlatness, lsp_mid, stab_fac, res_cod_SNR_M, flag_16k_smc ); } } - - /* 2nd stage speech/music classification (ACELP/GSC/TCX core selection) */ - ivas_smc_mode_selection( st, element_brate, smc_dec, *relE, *Etot, attack_flag, inp_12k8, S_map, flag_spitch ); - -#ifdef ITD_WINNER_GAIN_MODIFY - if ( element_mode == IVAS_CPE_DFT ) + /* Switch to ACELP for non-harmonic transient signals */ + else if ( ( ( element_mode >= IVAS_CPE_DFT && element_brate <= IVAS_16k4 ) || ( element_mode == IVAS_SCE && element_brate < SCE_SMC_THR ) ) && ( loc_harm[0] != 1 ) && smc_dec == MUSIC ) { - if ( hCPE->hStereoDft->mus_flag != smc_dec || hCPE->element_mode != hCPE->last_element_mode ) - { - hCPE->hStereoDft->noise_coherence = 0.0f; - set_zero( hCPE->hStereoDft->spd_L_noise, STEREO_DFT_N_32k_ENC / 2 ); - set_zero( hCPE->hStereoDft->spd_R_noise, STEREO_DFT_N_32k_ENC / 2 ); - set_zero( hCPE->hStereoDft->spd_L_noise_min, STEREO_DFT_N_32k_ENC / 2 ); - set_zero( hCPE->hStereoDft->spd_R_noise_min, STEREO_DFT_N_32k_ENC / 2 ); - set_zero( hCPE->hStereoDft->spd_L_noise_max, STEREO_DFT_N_32k_ENC / 2 ); - set_zero( hCPE->hStereoDft->spd_R_noise_max, STEREO_DFT_N_32k_ENC / 2 ); - set_zero( hCPE->hStereoDft->winner_gain_L, STEREO_DFT_N_32k_ENC / 2 ); - set_zero( hCPE->hStereoDft->winner_gain_R, STEREO_DFT_N_32k_ENC / 2 ); - set_f( hCPE->hStereoDft->spd_L_smooth_new, 1.0f, STEREO_DFT_N_32k_ENC / 2 ); - set_f( hCPE->hStereoDft->spd_R_smooth_new, 1.0f, STEREO_DFT_N_32k_ENC / 2 ); - } - if ( smc_dec == MUSIC && st->vad_flag == 1 ) + if ( element_mode == IVAS_SCE ) { - hCPE->hStereoDft->mus_flag = 2; + if ( transient_analysis( st->hTranDet, st->hNoiseEst->cor_map, st->hNoiseEst->multi_harm_limit ) ) + { + smc_dec = SPEECH; + } } - else + else if ( element_mode == IVAS_CPE_DFT ) { - hCPE->hStereoDft->mus_flag = 0; + for ( i = 0; i < CPE_CHANNELS; i++ ) + { + if ( smc_dec != SPEECH && transient_analysis( hCPE->hCoreCoder[i]->hTranDet, st->hNoiseEst->cor_map, st->hNoiseEst->multi_harm_limit ) ) + { + smc_dec = SPEECH; /* overwrite initial music decision, initial SPEECH_MUSIC never changed */ + } + } } } -#endif + + /* 2nd stage speech/music classification (ACELP/GSC/TCX core selection) */ + ivas_smc_mode_selection( st, element_brate, smc_dec, *relE, Etot, attack_flag, inp_12k8, S_map, flag_spitch ); } /*----------------------------------------------------------------* @@ -858,7 +841,7 @@ ivas_error pre_proc_front_ivas( mvr2r( &old_inp_12k8[L_FRAME], st->old_inp_12k8, L_INP_MEM ); - wmops_sub_end(); + pop_wmops(); return error; } diff --git a/lib_enc/ivas_corecoder_enc_reconfig.c b/lib_enc/ivas_corecoder_enc_reconfig.c index dffd53bb93..080ecc2046 100644 --- a/lib_enc/ivas_corecoder_enc_reconfig.c +++ b/lib_enc/ivas_corecoder_enc_reconfig.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -30,30 +30,32 @@ *******************************************************************************************************/ -#include #include #include "options.h" #include "ivas_cnst.h" #include "prot.h" #include "ivas_prot.h" -#include "ivas_stat_enc.h" #ifdef DEBUGGING #include "debug.h" +#include #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * ivas_corecoder_enc_reconfig() * - * Allocate, initalize, and configure SCE/CPE/MCT handles in case of bitrate switching + * Allocate, initialize, and configure SCE/CPE/MCT handles in case of bitrate switching *-------------------------------------------------------------------*/ ivas_error ivas_corecoder_enc_reconfig( - Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */ - const int16_t nSCE_old, /* i : number of SCEs in previous frame */ - const int16_t nCPE_old, /* i : number of CPEs in previous frame */ - const int16_t nchan_transport_old /* i : number of TCs in previous frame */ + Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */ + const int16_t nSCE_old, /* i : number of SCEs in previous frame */ + const int16_t nCPE_old, /* i : number of CPEs in previous frame */ + const int16_t nchan_transport_old, /* i : number of TCs in previous frame */ + const int32_t brate_SCE, /* i : bitrate to be set for the SCEs */ + const int32_t brate_CPE, /* i : bitrate to be set for the CPEs */ + const MC_MODE last_mc_mode /* i : switching between MC modes: last mode */ ) { int16_t n, sce_id, cpe_id; @@ -62,7 +64,6 @@ ivas_error ivas_corecoder_enc_reconfig( BSTR_ENC_HANDLE hBstr, hMetaData; Indice *ind_list, *ind_list_metadata; int16_t nb_bits_tot, next_ind, last_ind; - int32_t ivas_total_brate; ENCODER_CONFIG_HANDLE hEncoderConfig; ivas_error error; @@ -71,7 +72,6 @@ ivas_error ivas_corecoder_enc_reconfig( *-----------------------------------------------------------------*/ hEncoderConfig = st_ivas->hEncoderConfig; - ivas_total_brate = hEncoderConfig->ivas_total_brate; error = IVAS_ERR_OK; len_inp_memory = (int16_t) ( hEncoderConfig->input_Fs / FRAMES_PER_SEC ); @@ -84,18 +84,18 @@ ivas_error ivas_corecoder_enc_reconfig( * Switching between SCE(s)/CPE(s)/MCT *-----------------------------------------------------------------*/ - if ( st_ivas->nchan_transport == nchan_transport_old ) + if ( st_ivas->nchan_transport == nchan_transport_old && st_ivas->nSCE == nSCE_old && st_ivas->nCPE == nCPE_old ) /* in McMASA, nchan_transport may be the same, but nSCE/nCPE differs */ { for ( sce_id = 0; sce_id < st_ivas->nSCE; sce_id++ ) { copy_encoder_config( st_ivas, st_ivas->hSCE[sce_id]->hCoreCoder[0], 0 ); - st_ivas->hSCE[sce_id]->element_brate = ivas_total_brate / st_ivas->nchan_transport; + st_ivas->hSCE[sce_id]->element_brate = brate_SCE; st_ivas->hSCE[sce_id]->hCoreCoder[0]->total_brate = st_ivas->hSCE[sce_id]->element_brate; /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */ } for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) { - st_ivas->hCPE[cpe_id]->element_brate = ( ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS; + st_ivas->hCPE[cpe_id]->element_brate = brate_CPE; /* prepare bitstream buffers */ for ( n = 0; n < CPE_CHANNELS; n++ ) @@ -116,7 +116,25 @@ ivas_error ivas_corecoder_enc_reconfig( } else { + int16_t nchan_transport_real, nchan_transport_old_real; + + nchan_transport_old_real = nchan_transport_old; + nchan_transport_real = st_ivas->nchan_transport; + + /* in SCE+CPE McMASA nchan_transport is still 2, fix the numbers */ + if ( hEncoderConfig->ivas_format == MC_FORMAT && last_mc_mode == MC_MODE_MCMASA ) + { + nchan_transport_old_real = nSCE_old + CPE_CHANNELS * nCPE_old; + } + + if ( hEncoderConfig->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) + { + nchan_transport_real = st_ivas->nSCE + CPE_CHANNELS * st_ivas->nCPE; + } + + /* something in transport changes */ ind_list = NULL; + ind_list_metadata = NULL; hBstr = NULL; hMetaData = NULL; @@ -139,13 +157,39 @@ ivas_error ivas_corecoder_enc_reconfig( #endif /* save bitstream information */ - ind_list = hBstr->ind_list; + ind_list = hBstr->ind_list; /* pointer to the beginning of the global list */ nb_bits_tot = hBstr->nb_bits_tot; next_ind = hBstr->next_ind; last_ind = hBstr->last_ind; - ind_list_metadata = hMetaData->ind_list; + ind_list_metadata = hMetaData->ind_list; /* pointer to the beginning of the global list */ - n_CoreCoder_existing = min( st_ivas->nchan_transport, nchan_transport_old ); + if ( hEncoderConfig->ivas_format == MC_FORMAT && last_mc_mode == MC_MODE_MCMASA && st_ivas->mc_mode == MC_MODE_MCMASA ) + { + /* within McMASA we can modify the transport signals when switching */ + /* copy earlier dmx buffers */ + if ( nSCE_old > 0 ) + { + set_zero( input_buff[0], len_inp_memory ); + mvr2r( st_ivas->hSCE[0]->hCoreCoder[0]->input_buff, input_buff[0], len_inp_memory ); + } + + for ( n = 0; n < CPE_CHANNELS; n++ ) + { + set_zero( input_buff[n + 1], len_inp_memory ); + if ( nCPE_old > 0 ) + { + mvr2r( st_ivas->hCPE[0]->hCoreCoder[n]->input_buff, input_buff[n + 1], len_inp_memory ); + } + } + + ivas_mcmasa_dmx_modify( len_inp_memory, input_buff, nSCE_old + CPE_CHANNELS * nCPE_old, st_ivas->nSCE + CPE_CHANNELS * st_ivas->nCPE ); + + n_CoreCoder_existing = 0; + } + else + { + n_CoreCoder_existing = min( nchan_transport_real, nchan_transport_old_real ); + } /* destroy superfluous core-coder elements */ for ( sce_id = st_ivas->nSCE; sce_id < nSCE_old; sce_id++ ) @@ -167,7 +211,7 @@ ivas_error ivas_corecoder_enc_reconfig( { if ( n_CoreCoder_existing > cpe_id * CPE_CHANNELS + n ) { - mvr2r( st_ivas->hCPE[cpe_id]->hCoreCoder[0]->input_buff, input_buff[( cpe_id - st_ivas->nCPE ) * CPE_CHANNELS + n], len_inp_memory ); + mvr2r( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->input_buff, input_buff[( cpe_id - st_ivas->nCPE ) * CPE_CHANNELS + n], len_inp_memory ); } } @@ -177,14 +221,13 @@ ivas_error ivas_corecoder_enc_reconfig( if ( st_ivas->nCPE <= 1 && st_ivas->hMCT != NULL ) { - ivas_mct_enc_close( st_ivas->hMCT ); - st_ivas->hMCT = NULL; + ivas_mct_enc_close( &( st_ivas->hMCT ) ); } /* special case, if we have MCT now and had a single CPE before, remove the MDCT Stereo handles */ if ( st_ivas->nCPE > 1 && nCPE_old == 1 ) { - count_free( st_ivas->hCPE[0]->hStereoMdct ); + free( st_ivas->hCPE[0]->hStereoMdct ); st_ivas->hCPE[0]->hStereoMdct = NULL; } @@ -196,13 +239,13 @@ ivas_error ivas_corecoder_enc_reconfig( for ( sce_id = 0; sce_id < nSCE_existing; sce_id++ ) { copy_encoder_config( st_ivas, st_ivas->hSCE[sce_id]->hCoreCoder[0], 0 ); - st_ivas->hSCE[sce_id]->element_brate = ivas_total_brate / st_ivas->nchan_transport; + st_ivas->hSCE[sce_id]->element_brate = brate_SCE; st_ivas->hSCE[sce_id]->hCoreCoder[0]->total_brate = st_ivas->hSCE[sce_id]->element_brate; /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */ } for ( sce_id = nSCE_existing; sce_id < st_ivas->nSCE; sce_id++ ) { - if ( ( error = create_sce_enc( st_ivas, sce_id, ivas_total_brate / st_ivas->nchan_transport ) ) != IVAS_ERR_OK ) + if ( ( error = create_sce_enc( st_ivas, sce_id, brate_SCE ) ) != IVAS_ERR_OK ) { return error; } @@ -239,19 +282,36 @@ ivas_error ivas_corecoder_enc_reconfig( for ( cpe_id = 0; cpe_id < nCPE_existing; cpe_id++ ) { - st_ivas->hCPE[cpe_id]->element_brate = ( ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS; + st_ivas->hCPE[cpe_id]->element_brate = brate_CPE; /* prepare bitstream buffers */ for ( n = 0; n < CPE_CHANNELS; n++ ) { copy_encoder_config( st_ivas, st_ivas->hCPE[cpe_id]->hCoreCoder[n], 0 ); st_ivas->hCPE[cpe_id]->hCoreCoder[n]->total_brate = st_ivas->hCPE[cpe_id]->element_brate / ( st_ivas->nCPE > 1 ? 1 : CPE_CHANNELS ); /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */ + + st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->ind_list = ind_list + ( cpe_id * CPE_CHANNELS + n + st_ivas->nSCE ) * MAX_NUM_INDICES; + if ( cpe_id * CPE_CHANNELS + n > 0 || ( st_ivas->mc_mode == MC_MODE_MCMASA && st_ivas->nSCE > 0 ) ) + { + reset_indices_enc( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr, MAX_NUM_INDICES ); + } + else + { + st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->last_ind = last_ind; + st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->nb_bits_tot = nb_bits_tot; + st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->next_ind = next_ind; + } } } for ( cpe_id = nCPE_existing; cpe_id < st_ivas->nCPE; cpe_id++ ) { - if ( ( error = create_cpe_enc( st_ivas, cpe_id, ( ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS ) ) != IVAS_ERR_OK ) + if ( st_ivas->mc_mode == MC_MODE_MCMASA && st_ivas->hMcMasa->separateChannelEnabled ) + { + st_ivas->hEncoderConfig->element_mode_init = IVAS_CPE_MDCT; + } + + if ( ( error = create_cpe_enc( st_ivas, cpe_id, brate_CPE ) ) != IVAS_ERR_OK ) { return error; } @@ -261,15 +321,15 @@ ivas_error ivas_corecoder_enc_reconfig( { if ( n_CoreCoder_existing > cpe_id * CPE_CHANNELS + n ) { - mvr2r( input_buff[n], st_ivas->hCPE[cpe_id]->hCoreCoder[0]->input_buff, len_inp_memory ); + mvr2r( input_buff[n], st_ivas->hCPE[cpe_id]->hCoreCoder[0]->input_buff, len_inp_memory ); /* TODO VoiceAge: Please check if this should be hCoreCoder[n] */ } } /* prepare bitstream buffers */ for ( n = 0; n < CPE_CHANNELS; n++ ) { - st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->ind_list = ind_list + ( cpe_id * CPE_CHANNELS + n ) * MAX_NUM_INDICES; - if ( cpe_id * CPE_CHANNELS + n > 0 ) + st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->ind_list = ind_list + ( cpe_id * CPE_CHANNELS + n + st_ivas->nSCE ) * MAX_NUM_INDICES; + if ( cpe_id * CPE_CHANNELS + n > 0 || ( st_ivas->mc_mode == MC_MODE_MCMASA && st_ivas->nSCE > 0 ) ) { reset_indices_enc( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr, MAX_NUM_INDICES ); } @@ -288,6 +348,22 @@ ivas_error ivas_corecoder_enc_reconfig( } } + if ( last_mc_mode == MC_MODE_MCMASA && st_ivas->mc_mode == MC_MODE_MCMASA ) + { + /* restore modified transport signal */ + if ( st_ivas->nSCE ) + { + mvr2r( input_buff[0], st_ivas->hSCE[0]->hCoreCoder[0]->input_buff, len_inp_memory ); + } + if ( st_ivas->nCPE ) + { + for ( n = 0; n < CPE_CHANNELS; n++ ) + { + mvr2r( input_buff[n + 1], st_ivas->hCPE[0]->hCoreCoder[n]->input_buff, len_inp_memory ); + } + } + } + if ( st_ivas->nCPE > 1 && nCPE_old <= 1 ) { if ( nCPE_old == 1 ) @@ -301,8 +377,7 @@ ivas_error ivas_corecoder_enc_reconfig( st_ivas->hCPE[0]->hCoreCoder[n]->igf = getIgfPresent( st_ivas->hCPE[0]->hCoreCoder[n]->element_mode, st_ivas->hCPE[0]->hCoreCoder[n]->bits_frame_nominal * FRAMES_PER_SEC, st_ivas->hCPE[0]->hCoreCoder[n]->bwidth, - st_ivas->hCPE[0]->hCoreCoder[n]->rf_mode, - st_ivas->hCPE[0]->hCoreCoder[n]->mct_chan_mode ); + st_ivas->hCPE[0]->hCoreCoder[n]->rf_mode ); if ( st_ivas->hCPE[0]->hCoreCoder[n]->igf ) { @@ -333,20 +408,20 @@ ivas_error ivas_corecoder_enc_reconfig( { if ( st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData == NULL ) { - if ( ( st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData = (BSTR_ENC_HANDLE) count_malloc( sizeof( BSTR_ENC_DATA ) ) ) == NULL ) + if ( ( st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData = (BSTR_ENC_HANDLE) malloc( sizeof( BSTR_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MetaData structure\n" ) ); } } - st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData->ind_list = ind_list_metadata; + st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData->ind_list = ind_list_metadata + st_ivas->nSCE * MAX_NUM_INDICES; reset_indices_enc( st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData, MAX_BITS_METADATA ); for ( cpe_id = 0; cpe_id < st_ivas->nCPE - 1; cpe_id++ ) { if ( st_ivas->hCPE[cpe_id]->hMetaData != NULL ) { - count_free( st_ivas->hCPE[cpe_id]->hMetaData ); + free( st_ivas->hCPE[cpe_id]->hMetaData ); st_ivas->hCPE[cpe_id]->hMetaData = NULL; } } @@ -355,7 +430,7 @@ ivas_error ivas_corecoder_enc_reconfig( /* special case, if we have a single CPE and had MCT before we need to init the MDCT stereo handles here */ if ( st_ivas->nCPE == 1 && nCPE_old > 1 ) { - if ( ( st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct = (STEREO_MDCT_ENC_DATA_HANDLE) count_malloc( sizeof( STEREO_MDCT_ENC_DATA ) ) ) == NULL ) + if ( ( st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct = (STEREO_MDCT_ENC_DATA_HANDLE) malloc( sizeof( STEREO_MDCT_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MDCT Stereo \n" ) ); } @@ -369,8 +444,7 @@ ivas_error ivas_corecoder_enc_reconfig( st_ivas->hCPE[0]->hCoreCoder[n]->igf = getIgfPresent( st_ivas->hCPE[0]->hCoreCoder[n]->element_mode, st_ivas->hCPE[0]->hCoreCoder[n]->bits_frame_nominal * FRAMES_PER_SEC, st_ivas->hCPE[0]->hCoreCoder[n]->bwidth, - st_ivas->hCPE[0]->hCoreCoder[n]->rf_mode, - st_ivas->hCPE[0]->hCoreCoder[n]->mct_chan_mode ); + st_ivas->hCPE[0]->hCoreCoder[n]->rf_mode ); if ( st_ivas->hCPE[0]->hCoreCoder[n]->igf ) { @@ -385,6 +459,9 @@ ivas_error ivas_corecoder_enc_reconfig( st_ivas->hCPE[0]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_REGULAR; } +#ifdef DEBUGGING + st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->mdct_stereo_mode_cmdl = hEncoderConfig->stereo_mode_cmdl; +#endif initMdctStereoEncData( st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct, hEncoderConfig->ivas_format, st_ivas->hCPE[st_ivas->nCPE - 1]->element_mode, st_ivas->hCPE[st_ivas->nCPE - 1]->element_brate, hEncoderConfig->max_bwidth, 0, NULL, 1 ); st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->isSBAStereoMode = ( ( hEncoderConfig->ivas_format == SBA_FORMAT ) && ( st_ivas->nchan_transport == 2 ) ); } diff --git a/lib_enc/ivas_cpe_enc.c b/lib_enc/ivas_cpe_enc.c index 470d597b15..72a737e64b 100644 --- a/lib_enc/ivas_cpe_enc.c +++ b/lib_enc/ivas_cpe_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* @@ -65,7 +65,6 @@ ivas_error ivas_cpe_enc( int16_t n, n_CoreChannels; float old_inp_12k8[CPE_CHANNELS][L_INP_12k8]; /* buffer of input signal @ 12k8 */ float old_inp_16k[CPE_CHANNELS][L_INP]; /* buffer of input signal @ 16kHz */ - float Etot[CPE_CHANNELS]; /* total energy; correlation shift */ float ener[CPE_CHANNELS]; /* residual energy from Levinson-Durbin */ float relE[CPE_CHANNELS]; /* frame relative energy */ float A[CPE_CHANNELS][NB_SUBFR16k * ( M + 1 )]; /* A(z) unquantized for subframes */ @@ -96,6 +95,7 @@ ivas_error ivas_cpe_enc( int16_t localVAD_HE_SAD[CPE_CHANNELS]; /* HE-SAD flag without hangover, LR channels */ float band_energies_LR[2 * NB_BANDS]; /* energy in critical bands without minimum noise floor E_MIN */ float orig_input[CPE_CHANNELS][L_FRAME48k]; + float Etot_last[CPE_CHANNELS]; int32_t tmp, input_Fs; int16_t max_bwidth, ivas_format; ENCODER_CONFIG_HANDLE hEncoderConfig; @@ -104,7 +104,7 @@ ivas_error ivas_cpe_enc( error = IVAS_ERR_OK; - wmops_sub_start( "ivas_cpe_enc" ); + push_wmops( "ivas_cpe_enc" ); hCPE = st_ivas->hCPE[cpe_id]; sts = hCPE->hCoreCoder; @@ -154,7 +154,10 @@ ivas_error ivas_cpe_enc( } mvr2r( data_f_ch0, sts[0]->input, input_frame ); - mvr2r( data_f_ch1, sts[1]->input, input_frame ); + if ( data_f_ch1 != NULL ) /*this may happen for cases with odd number of channels*/ + { + mvr2r( data_f_ch1, sts[1]->input, input_frame ); + } /*----------------------------------------------------------------* * Stereo technology selection @@ -296,12 +299,14 @@ ivas_error ivas_cpe_enc( { if ( st_ivas->hMCT ) { + int16_t lfe_bits; + lfe_bits = ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ? st_ivas->hLFE->lfe_bits : 0 ); sts[n]->total_brate = hCPE->element_brate; - if ( sts[n]->mct_chan_mode != MCT_CHAN_MODE_LFE ) - { - sts[n]->bits_frame_nominal = (int16_t) ( hCPE->element_brate / FRAMES_PER_SEC ); - sts[n]->bits_frame_channel = (int16_t) ( ( ivas_total_brate / FRAMES_PER_SEC - ( st_ivas->hMCT->num_lfe == FALSE ? 0 : LFE_BITS ) - nb_bits_metadata ) / st_ivas->hMCT->nchan_out_woLFE ); - } + sts[n]->bits_frame_nominal = (int16_t) ( hCPE->element_brate / FRAMES_PER_SEC ); + sts[n]->bits_frame_channel = (int16_t) ( ( ivas_total_brate / FRAMES_PER_SEC - + lfe_bits - + nb_bits_metadata ) / + st_ivas->hMCT->nchan_out_woLFE ); } else { @@ -315,7 +320,7 @@ ivas_error ivas_cpe_enc( if ( hCPE->element_brate != hCPE->last_element_brate && st_ivas->hMCT == NULL ) { #ifdef DEBUGGING - hCPE->hStereoMdct->mdct_stereo_mode_cmdl = hEncoderConfig->stereo_mode_cmdl; + hCPE->hStereoMdct->mdct_stereo_mode_cmdl = hEncoderConfig->mdct_stereo_mode_cmdl; #endif initMdctStereoEncData( hCPE->hStereoMdct, ivas_format, hCPE->element_mode, hCPE->element_brate, max_bwidth, 0, NULL, 0 ); hCPE->hStereoMdct->isSBAStereoMode = ( ( ivas_format == SBA_FORMAT ) && ( st_ivas->nchan_transport == 2 ) ); @@ -349,11 +354,7 @@ ivas_error ivas_cpe_enc( stereo_dft_enc_update( hCPE->hStereoDft, sts[0]->max_bwidth ); /* DFT stereo processing */ -#ifdef FIX_ITD_CNG stereo_dft_enc_process( hCPE, vad_flag_dtx, vad_hover_flag, input_frame ); -#else - stereo_dft_enc_process( hCPE, input_frame ); -#endif } else if ( hCPE->element_mode == IVAS_CPE_TD ) { @@ -370,14 +371,13 @@ ivas_error ivas_cpe_enc( { sts[1]->bits_frame_channel -= st_ivas->hQMetaData->metadata_max_bits; } + + Etot_last[0] = sts[0]->hNoiseEst->Etot_last; + Etot_last[1] = sts[1]->hNoiseEst->Etot_last; } else if ( hCPE->element_mode == IVAS_CPE_MDCT ) { -#ifdef FIX_ITD_CNG stereo_td_itd_mdct_stereo( hCPE, vad_flag_dtx, vad_hover_flag, input_frame ); -#else - stereo_td_itd_mdct_stereo( hCPE, input_frame ); -#endif } /*----------------------------------------------------------------* @@ -434,7 +434,8 @@ ivas_error ivas_cpe_enc( for ( n = 0; n < n_CoreChannels; n++ ) { - error = pre_proc_front_ivas( NULL, hCPE, hCPE->element_brate, nb_bits_metadata, input_frame, n, old_inp_12k8[n], old_inp_16k[n], &Etot[n], &ener[n], &relE[n], A[n], Aw[n], epsP[n], lsp_new[n], lsp_mid[n], + error = pre_proc_front_ivas( NULL, hCPE, hCPE->element_brate, nb_bits_metadata, input_frame, n, old_inp_12k8[n], old_inp_16k[n], + &ener[n], &relE[n], A[n], Aw[n], epsP[n], lsp_new[n], lsp_mid[n], &vad_hover_flag[n], &attack_flag[n], realBuffer[n], imagBuffer[n], old_wsp[n], pitch_fr[n], voicing_fr[n], &loc_harm[n], &cor_map_sum[n], &vad_flag_dtx[n], enerBuffer[n], fft_buff[n], A[0], lsp_new[0], currFlatness[n], tdm_ratio_idx, fr_bands, Etot_LR, lf_E, localVAD_HE_SAD, band_energies_LR, 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_flag : 0, 0, 0, ivas_total_brate ); @@ -450,6 +451,7 @@ ivas_error ivas_cpe_enc( if ( sts[0]->core_brate == SID_2k40 || sts[0]->core_brate == FRAME_NO_DATA ) { sts[0]->core_brate = -1; + sts[0]->total_brate = hCPE->element_brate; } } @@ -520,15 +522,11 @@ ivas_error ivas_cpe_enc( { tdm_ol_pitch_comparison( hCPE, pitch_fr, voicing_fr ); - tdm_configure_enc( hCPE, tdm_SM_or_LRTD_Pri, tdm_ratio_idx, tdm_ratio_idx_SM, attack_flag[0], nb_bits_metadata ); + tdm_configure_enc( hCPE, Etot_last, tdm_SM_or_LRTD_Pri, tdm_ratio_idx, tdm_ratio_idx_SM, attack_flag[0], nb_bits_metadata ); if ( hEncoderConfig->Opt_DTX_ON ) { -#ifdef FIX_ITD_CNG stereo_cng_upd_counters( hCPE->hStereoCng, hCPE->element_mode, -1, NULL, sts[0]->hTdCngEnc->burst_ho_cnt, NULL ); -#else - stereo_cng_upd_counters( hCPE->hStereoCng, hCPE->element_mode, -1, NULL, sts[0]->hTdCngEnc->burst_ho_cnt ); -#endif } } @@ -581,11 +579,7 @@ ivas_error ivas_cpe_enc( } else { -#ifdef FIX_ITD_CNG stereo_cng_upd_counters( hCPE->hStereoCng, hCPE->element_mode, hCPE->hStereoDft->nbands, hCPE->hStereoDft->sidSideGain, sts[0]->hTdCngEnc->burst_ho_cnt, &hCPE->hStereoDft->coh_fade_counter ); -#else - stereo_cng_upd_counters( hCPE->hStereoCng, hCPE->element_mode, hCPE->hStereoDft->nbands, hCPE->hStereoDft->sidSideGain, sts[0]->hTdCngEnc->burst_ho_cnt ); -#endif } } @@ -629,7 +623,7 @@ ivas_error ivas_cpe_enc( * Core Encoder *----------------------------------------------------------------*/ - if ( ( error = ivas_core_enc( NULL, hCPE, st_ivas->hMCT, n_CoreChannels, old_inp_12k8, old_inp_16k, Etot, ener, A, Aw, epsP, lsp_new, lsp_mid, vad_hover_flag, attack_flag, realBuffer, imagBuffer, old_wsp, loc_harm, cor_map_sum, vad_flag_dtx, enerBuffer, fft_buff, tdm_SM_or_LRTD_Pri, ivas_format, 0 ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_core_enc( NULL, hCPE, st_ivas->hMCT, n_CoreChannels, old_inp_12k8, old_inp_16k, ener, A, Aw, epsP, lsp_new, lsp_mid, vad_hover_flag, attack_flag, realBuffer, imagBuffer, old_wsp, loc_harm, cor_map_sum, vad_flag_dtx, enerBuffer, fft_buff, tdm_SM_or_LRTD_Pri, ivas_format, 0 ) ) != IVAS_ERR_OK ) { return error; } @@ -668,6 +662,12 @@ ivas_error ivas_cpe_enc( hCPE->hFrontVad[0]->ini_frame = min( hCPE->hFrontVad[0]->ini_frame, MAX_FRAME_COUNTER ); } + /* Store previous attack detection flag */ + for ( n = 0; n < CPE_CHANNELS; n++ ) + { + sts[n]->hTranDet->transientDetector.prev_bIsAttackPresent = sts[n]->hTranDet->transientDetector.bIsAttackPresent; + } + #ifdef DEBUG_MODE_INFO if ( hCPE->element_mode == IVAS_CPE_DFT ) { @@ -704,7 +704,7 @@ ivas_error ivas_cpe_enc( } #endif - wmops_sub_end(); + pop_wmops(); return error; } @@ -742,7 +742,7 @@ ivas_error create_cpe_enc( * Allocate CPE handle *-----------------------------------------------------------------*/ - if ( ( hCPE = (CPE_ENC_HANDLE) count_malloc( sizeof( CPE_ENC_DATA ) ) ) == NULL ) + if ( ( hCPE = (CPE_ENC_HANDLE) malloc( sizeof( CPE_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CPE\n" ) ); } @@ -776,7 +776,7 @@ ivas_error create_cpe_enc( { if ( ivas_format == STEREO_FORMAT || ivas_format == MASA_FORMAT || ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) ) { - if ( ( hCPE->input_mem[n] = (float *) count_malloc( sizeof( float ) * NS2SA( input_Fs, STEREO_DFT_OVL_NS ) ) ) == NULL ) + if ( ( hCPE->input_mem[n] = (float *) malloc( sizeof( float ) * NS2SA( input_Fs, STEREO_DFT_OVL_NS ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DFT stereo memory\n" ) ); } @@ -793,7 +793,7 @@ ivas_error create_cpe_enc( * stereo classifier: allocate and initialize *-----------------------------------------------------------------*/ - if ( ( hCPE->hStereoClassif = (STEREO_CLASSIF_HANDLE) count_malloc( sizeof( STEREO_CLASSIF_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoClassif = (STEREO_CLASSIF_HANDLE) malloc( sizeof( STEREO_CLASSIF_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for stereo classifier structure\n" ) ); } @@ -804,9 +804,12 @@ ivas_error create_cpe_enc( * Metadata: allocate and initialize *-----------------------------------------------------------------*/ - if ( !( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ) && ( cpe_id == ( st_ivas->nCPE - 1 ) ) ) + /* we need the meta data handle also if we init as MC_FORMAT/MCT since it might be needed + at a bit rate switch to ParamMC or McMASA and the metadata index list is only really reachable + in the ivas_init_encoder() function and has to be connected to the MD handle there */ + if ( cpe_id == ( st_ivas->nCPE - 1 ) ) { - if ( ( hCPE->hMetaData = (BSTR_ENC_HANDLE) count_malloc( sizeof( BSTR_ENC_DATA ) ) ) == NULL ) + if ( ( hCPE->hMetaData = (BSTR_ENC_HANDLE) malloc( sizeof( BSTR_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MetaData structure\n" ) ); } @@ -818,7 +821,7 @@ ivas_error create_cpe_enc( for ( n = 0; n < CPE_CHANNELS; n++ ) { - if ( ( st = (ENC_CORE_HANDLE) count_malloc( sizeof( Encoder_State ) ) ) == NULL ) + if ( ( st = (ENC_CORE_HANDLE) malloc( sizeof( Encoder_State ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CoreCoder structure\n" ) ); } @@ -826,12 +829,7 @@ ivas_error create_cpe_enc( copy_encoder_config( st_ivas, st, 1 ); st->total_brate = hCPE->element_brate / ( st_ivas->nCPE > 1 ? 1 : CPE_CHANNELS ); /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */ st->mct_chan_mode = MCT_CHAN_MODE_REGULAR; - if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT && ( n + cpe_id * CPE_CHANNELS ) == LFE_CHANNEL ) - { - st->mct_chan_mode = MCT_CHAN_MODE_LFE; - } - - if ( ( error = init_encoder( st, n, hEncoderConfig->var_SID_rate_flag, hEncoderConfig->interval_SID, 0 ) ) != IVAS_ERR_OK ) + if ( ( error = init_encoder( st, n, hEncoderConfig->var_SID_rate_flag, hEncoderConfig->interval_SID, 0, st_ivas->ism_mode ) ) != IVAS_ERR_OK ) { return error; } @@ -852,7 +850,7 @@ ivas_error create_cpe_enc( { if ( hCPE->element_mode == IVAS_CPE_TD || hCPE->element_mode == IVAS_CPE_DFT ) { - if ( ( hCPE->hStereoCng = (STEREO_CNG_ENC_HANDLE) count_malloc( sizeof( STEREO_CNG_ENC ) ) ) == NULL ) + if ( ( hCPE->hStereoCng = (STEREO_CNG_ENC_HANDLE) malloc( sizeof( STEREO_CNG_ENC ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Stereo Cng for Unified/TD \n" ) ); } @@ -905,7 +903,7 @@ ivas_error create_cpe_enc( if ( hCPE->element_mode != IVAS_CPE_MDCT ) { - if ( ( hCPE->hStereoTCA = (STEREO_TCA_ENC_HANDLE) count_malloc( sizeof( STEREO_TCA_ENC_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoTCA = (STEREO_TCA_ENC_HANDLE) malloc( sizeof( STEREO_TCA_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Stereo TCA\n" ) ); } @@ -919,7 +917,7 @@ ivas_error create_cpe_enc( if ( hCPE->element_mode != IVAS_CPE_MDCT ) { - if ( ( hCPE->hStereoICBWE = (STEREO_ICBWE_ENC_HANDLE) count_malloc( sizeof( STEREO_ICBWE_ENC_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoICBWE = (STEREO_ICBWE_ENC_HANDLE) malloc( sizeof( STEREO_ICBWE_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Stereo ICBWE \n" ) ); } @@ -933,7 +931,7 @@ ivas_error create_cpe_enc( if ( hCPE->element_mode == IVAS_CPE_TD ) { - if ( ( hCPE->hStereoTD = (STEREO_TD_ENC_DATA_HANDLE) count_malloc( sizeof( STEREO_TD_ENC_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoTD = (STEREO_TD_ENC_DATA_HANDLE) malloc( sizeof( STEREO_TD_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD Stereo\n" ) ); } @@ -947,7 +945,7 @@ ivas_error create_cpe_enc( if ( hCPE->element_mode == IVAS_CPE_MDCT && st_ivas->nCPE == 1 ) { - if ( ( hCPE->hStereoMdct = (STEREO_MDCT_ENC_DATA_HANDLE) count_malloc( sizeof( STEREO_MDCT_ENC_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoMdct = (STEREO_MDCT_ENC_DATA_HANDLE) malloc( sizeof( STEREO_MDCT_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MDCT Stereo \n" ) ); } @@ -988,7 +986,7 @@ void destroy_cpe_enc( if ( hCPE->hStereoClassif != NULL ) { - count_free( hCPE->hStereoClassif ); + free( hCPE->hStereoClassif ); hCPE->hStereoClassif = NULL; } @@ -996,14 +994,14 @@ void destroy_cpe_enc( { if ( hCPE->input_mem[n] != NULL ) { - count_free( hCPE->input_mem[n] ); + free( hCPE->input_mem[n] ); hCPE->input_mem[n] = NULL; } } if ( hCPE->hMetaData != NULL ) { - count_free( hCPE->hMetaData ); + free( hCPE->hMetaData ); hCPE->hMetaData = NULL; } @@ -1026,7 +1024,7 @@ void destroy_cpe_enc( if ( hCPE->hStereoTD != NULL ) { - count_free( hCPE->hStereoTD ); + free( hCPE->hStereoTD ); hCPE->hStereoTD = NULL; } @@ -1038,19 +1036,19 @@ void destroy_cpe_enc( if ( hCPE->hStereoTCA != NULL ) { - count_free( hCPE->hStereoTCA ); + free( hCPE->hStereoTCA ); hCPE->hStereoTCA = NULL; } if ( hCPE->hStereoICBWE != NULL ) { - count_free( hCPE->hStereoICBWE ); + free( hCPE->hStereoICBWE ); hCPE->hStereoICBWE = NULL; } if ( hCPE->hStereoCng != NULL ) { - count_free( hCPE->hStereoCng ); + free( hCPE->hStereoCng ); hCPE->hStereoCng = NULL; } @@ -1063,7 +1061,7 @@ void destroy_cpe_enc( } } - count_free( hCPE ); + free( hCPE ); return; } diff --git a/lib_enc/ivas_decision_matrix_enc.c b/lib_enc/ivas_decision_matrix_enc.c index de6fe8dc96..b894932958 100644 --- a/lib_enc/ivas_decision_matrix_enc.c +++ b/lib_enc/ivas_decision_matrix_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------* @@ -114,7 +114,7 @@ void ivas_decision_matrix_enc( if ( st->element_mode == IVAS_SCE && st->low_rate_mode ) { - /* ISm low-rate mode */ + /* ISM low-rate mode */ st->core = ACELP_CORE; st->coder_type = INACTIVE; } @@ -391,7 +391,7 @@ void ivas_signaling_enc( } else if ( st->element_mode == IVAS_SCE && st->low_rate_mode ) { - /* ISm Low-rate mode -> do nothing -> always WB, ACELP core, IC coder_type */ + /* ISM Low-rate mode -> do nothing -> always WB, ACELP core, IC coder_type */ } else if ( ( st->element_mode == IVAS_CPE_MDCT && st->idchan == 1 ) || st->core_brate <= SID_2k40 ) { diff --git a/lib_enc/ivas_dirac_enc.c b/lib_enc/ivas_dirac_enc.c index 52b67fe056..f48044d1c7 100644 --- a/lib_enc/ivas_dirac_enc.c +++ b/lib_enc/ivas_dirac_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------- * Local function prototypes @@ -70,12 +70,12 @@ ivas_error ivas_dirac_enc_open( error = IVAS_ERR_OK; - if ( ( hDirAC = (DIRAC_ENC_HANDLE) count_malloc( sizeof( DIRAC_ENC_DATA ) ) ) == NULL ) + if ( ( hDirAC = (DIRAC_ENC_HANDLE) malloc( sizeof( DIRAC_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); } - if ( ( hDirAC->hConfig = (DIRAC_CONFIG_DATA_HANDLE) count_malloc( sizeof( DIRAC_CONFIG_DATA ) ) ) == NULL ) + if ( ( hDirAC->hConfig = (DIRAC_CONFIG_DATA_HANDLE) malloc( sizeof( DIRAC_CONFIG_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC Config\n" ) ); } @@ -104,7 +104,7 @@ ivas_error ivas_dirac_enc_open( return error; } /* Allocate and initialize FB mixer handle */ - if ( ( error = ivas_FB_mixer_open( &( hDirAC->hFbMixer ), input_Fs, fb_cfg ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_FB_mixer_open( &( hDirAC->hFbMixer ), input_Fs, fb_cfg, 0 ) ) != IVAS_ERR_OK ) { return error; } @@ -118,14 +118,17 @@ ivas_error ivas_dirac_enc_open( } dirac_slot_ns = DIRAC_SLOT_ENC_NS; - /* initalize delay for SPAR/DirAC delay synchronization */ + /* initialize delay for SPAR/DirAC delay synchronization */ if ( st_ivas->sba_mode == SBA_MODE_DIRAC ) { hDirAC->num_samples_synchro_delay = NS2SA( input_Fs, IVAS_FB_ENC_DELAY_NS ); for ( i = 0; i < DIRAC_MAX_ANA_CHANS; i++ ) { - hDirAC->sba_synchro_buffer[i] = (float *) count_malloc( hDirAC->num_samples_synchro_delay * sizeof( float ) ); + if ( ( hDirAC->sba_synchro_buffer[i] = (float *) malloc( hDirAC->num_samples_synchro_delay * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } set_zero( hDirAC->sba_synchro_buffer[i], hDirAC->num_samples_synchro_delay ); } } @@ -142,11 +145,17 @@ ivas_error ivas_dirac_enc_open( /* intensity 3-dim */ for ( i = 0; i < DIRAC_NUM_DIMS; i++ ) { - hDirAC->direction_vector_m[i] = (float **) count_malloc( MAX_PARAM_SPATIAL_SUBFRAMES * sizeof( float * ) ); + if ( ( hDirAC->direction_vector_m[i] = (float **) malloc( MAX_PARAM_SPATIAL_SUBFRAMES * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } for ( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ ) { - hDirAC->direction_vector_m[i][j] = (float *) count_malloc( DIRAC_MAX_NBANDS * sizeof( float ) ); + if ( ( hDirAC->direction_vector_m[i][j] = (float *) malloc( DIRAC_MAX_NBANDS * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } set_f( hDirAC->direction_vector_m[i][j], 0.0f, DIRAC_MAX_NBANDS ); } } @@ -154,14 +163,24 @@ ivas_error ivas_dirac_enc_open( hDirAC->no_col_avg_diff = (int16_t) ( DIRAC_NO_COL_AVG_DIFF_NS / dirac_slot_ns ); for ( i = 0; i < DIRAC_NUM_DIMS; i++ ) { - hDirAC->buffer_intensity_real[i] = (float **) count_malloc( hDirAC->no_col_avg_diff * sizeof( float * ) ); + if ( ( hDirAC->buffer_intensity_real[i] = (float **) malloc( hDirAC->no_col_avg_diff * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } for ( j = 0; j < hDirAC->no_col_avg_diff; j++ ) { - hDirAC->buffer_intensity_real[i][j] = (float *) count_malloc( DIRAC_MAX_NBANDS * sizeof( float ) ); + if ( ( hDirAC->buffer_intensity_real[i][j] = (float *) malloc( DIRAC_MAX_NBANDS * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } set_f( hDirAC->buffer_intensity_real[i][j], 0.0f, DIRAC_MAX_NBANDS ); } } - hDirAC->buffer_energy = (float *) count_malloc( DIRAC_MAX_NBANDS * hDirAC->no_col_avg_diff * sizeof( float ) ); + + if ( ( hDirAC->buffer_energy = (float *) malloc( DIRAC_MAX_NBANDS * hDirAC->no_col_avg_diff * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); + } set_f( hDirAC->buffer_energy, 0.0f, DIRAC_MAX_NBANDS * hDirAC->no_col_avg_diff ); if ( st_ivas->hQMetaData->useLowerRes ) @@ -226,26 +245,34 @@ ivas_error ivas_dirac_enc_reconfigure( /*------------------------------------------------------------------------- * ivas_dirac_enc_close() * - * Close DirAC + * Close DirAC encoder handle *------------------------------------------------------------------------*/ void ivas_dirac_enc_close( - DIRAC_ENC_HANDLE hDirAC, /* i/o: encoder DirAC handle */ - const int32_t input_Fs /* i : input sampling rate */ + DIRAC_ENC_HANDLE *hDirAC_out, /* i/o: encoder DirAC handle */ + const int32_t input_Fs /* i : input sampling rate */ ) { int16_t i, j; + DIRAC_ENC_HANDLE hDirAC; + + if ( hDirAC_out == NULL || *hDirAC_out == NULL ) + { + return; + } + + hDirAC = *hDirAC_out; if ( hDirAC->hFbMixer != NULL ) { - ivas_FB_mixer_close( &hDirAC->hFbMixer, input_Fs ); + ivas_FB_mixer_close( &hDirAC->hFbMixer, input_Fs, 0 ); } for ( i = 0; i < DIRAC_MAX_ANA_CHANS; i++ ) { if ( hDirAC->sba_synchro_buffer[i] != NULL ) { - count_free( hDirAC->sba_synchro_buffer[i] ); + free( hDirAC->sba_synchro_buffer[i] ); hDirAC->sba_synchro_buffer[i] = NULL; } } @@ -255,7 +282,7 @@ void ivas_dirac_enc_close( { for ( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ ) { - count_free( hDirAC->direction_vector_m[i][j] ); + free( hDirAC->direction_vector_m[i][j] ); hDirAC->direction_vector_m[i][j] = NULL; } @@ -263,28 +290,29 @@ void ivas_dirac_enc_close( { if ( hDirAC->buffer_intensity_real[i][j] != 0 ) { - count_free( hDirAC->buffer_intensity_real[i][j] ); + free( hDirAC->buffer_intensity_real[i][j] ); hDirAC->buffer_intensity_real[i][j] = NULL; } } - count_free( hDirAC->buffer_intensity_real[i] ); + free( hDirAC->buffer_intensity_real[i] ); hDirAC->buffer_intensity_real[i] = NULL; - count_free( hDirAC->direction_vector_m[i] ); + free( hDirAC->direction_vector_m[i] ); hDirAC->direction_vector_m[i] = NULL; } - count_free( hDirAC->buffer_energy ); + free( hDirAC->buffer_energy ); hDirAC->buffer_energy = NULL; if ( hDirAC->hConfig != NULL ) { - count_free( hDirAC->hConfig ); + free( hDirAC->hConfig ); hDirAC->hConfig = NULL; } - count_free( hDirAC ); + free( *hDirAC_out ); + *hDirAC_out = NULL; return; } @@ -315,7 +343,7 @@ void ivas_dirac_enc( { int16_t i; - wmops_sub_start( "ivas_dirac_enc" ); + push_wmops( "ivas_dirac_enc" ); /*Check if highest band of input signal <= enc_param_start_band: could happen for WB input signal in 4TCs mode*/ if ( hDirAC->band_grouping[hDirAC->hConfig->nbands] <= hDirAC->band_grouping[hDirAC->hConfig->enc_param_start_band] ) @@ -436,7 +464,7 @@ void ivas_dirac_enc( } } - wmops_sub_end(); + pop_wmops(); return; } @@ -460,7 +488,11 @@ void ivas_dirac_enc_spar_delay_synchro( int16_t sce_id, cpe_id, i_chan; /* check last sba_mode */ +#ifndef LBR_SBA if ( ivas_sba_mode_select( st_ivas->hEncoderConfig->last_ivas_total_brate ) == SBA_MODE_SPAR ) +#else + if ( ivas_sba_mode_select() == SBA_MODE_SPAR ) +#endif { /* initializations */ i_chan = 0; @@ -589,7 +621,7 @@ void ivas_dirac_param_est_enc( float reference_power[CLDFB_NO_COL_MAX][DIRAC_NO_FB_BANDS_MAX]; - wmops_sub_start( "dirac_enc_param_est" ); + push_wmops( "dirac_enc_param_est" ); /* Initialization */ l_ts = input_frame / MAX_PARAM_SPATIAL_SUBFRAMES; @@ -865,7 +897,7 @@ void ivas_dirac_param_est_enc( } #endif - wmops_sub_end(); + pop_wmops(); return; } diff --git a/lib_enc/ivas_enc.c b/lib_enc/ivas_enc.c index 7be1f11c49..bc374f88e5 100644 --- a/lib_enc/ivas_enc.c +++ b/lib_enc/ivas_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * ivas_enc() @@ -65,12 +65,9 @@ ivas_error ivas_enc( float data_f[MAX_INPUT_CHANNELS][L_FRAME48k]; /* IVAS_fmToDo: buffer can be allocated dynamically based on the number of analysed channels */ int32_t ivas_total_brate; ivas_error error; -#ifdef SBA_BR_SWITCHING - int16_t sba_reinit_flag; -#endif error = IVAS_ERR_OK; - wmops_sub_start( "ivas_enc" ); + push_wmops( "ivas_enc" ); /*------------------------------------------------------------------* * Initialization - general @@ -87,20 +84,6 @@ ivas_error ivas_enc( n_samples_chan = n_samples / nchan_inp; set_s( nb_bits_metadata, 0, MAX_SCE ); -#ifdef SBA_BR_SWITCHING - sba_reinit_flag = 0; - if ( ivas_format == SBA_FORMAT ) - { - sba_reinit_flag = get_sba_reinit_flag( ivas_total_brate, st_ivas->hEncoderConfig->last_ivas_total_brate ); - if ( sba_reinit_flag ) - { - if ( ( error = ivas_sba_enc_reinit( st_ivas ) ) != IVAS_ERR_OK ) - { - return error; - } - } - } -#endif /*----------------------------------------------------------------* * convert 'short' input data to 'float' @@ -144,11 +127,16 @@ ivas_error ivas_enc( *----------------------------------------------------------------*/ n = getNumChanAnalysis( st_ivas ); + #ifndef DEBUG_SPAR_BYPASS_EVS_CODEC /* bypass EVS coding in float precision, emulating EVS encoder/decoder delay */ for ( i = 0; i < n; i++ ) { - if ( !( ivas_format == MC_FORMAT && i == LFE_CHANNEL ) ) /*TODO: is the HPF needed for LFE channel? */ + if ( ( ivas_format == SBA_FORMAT ) && ( st_ivas->sba_mode == SBA_MODE_SPAR ) ) + { + hp20( data_f[HOA_keep_ind[i]], input_frame, st_ivas->mem_hp20_in[i], input_Fs ); + } + else if ( !( ivas_format == MC_FORMAT && i == LFE_CHANNEL ) ) /*TODO: is the HPF needed for LFE channel? */ { hp20( data_f[i], input_frame, st_ivas->mem_hp20_in[i], input_Fs ); } @@ -176,7 +164,10 @@ ivas_error ivas_enc( else if ( ivas_format == ISM_FORMAT ) { /* select ISM format mode; reconfigure the ISM format encoder */ - ivas_ism_enc_config( st_ivas ); + if ( ( ivas_ism_enc_config( st_ivas ) ) ) + { + return error; + } if ( st_ivas->ism_mode == ISM_MODE_PARAM ) { @@ -205,17 +196,11 @@ ivas_error ivas_enc( /* SBA/MASA configuration */ if ( ivas_format == SBA_FORMAT ) { -#ifndef SBA_BR_SWITCHING - if ( st_ivas->sba_mode == SBA_MODE_DIRAC ) -#else - if ( ( st_ivas->sba_mode == SBA_MODE_DIRAC ) && ( !sba_reinit_flag ) ) -#endif + if ( ( error = ivas_sba_enc_reconfigure( st_ivas ) ) != IVAS_ERR_OK ) { - if ( ( error = ivas_sba_enc_reconfigure( st_ivas ) ) != IVAS_ERR_OK ) - { - return error; - } + return error; } + st = ( st_ivas->nSCE > 0 ) ? st_ivas->hSCE[0]->hCoreCoder[0] : st_ivas->hCPE[0]->hCoreCoder[0]; /* Write SBA planar flag */ @@ -242,15 +227,16 @@ ivas_error ivas_enc( } else { + ivas_masa_estimate_energy( st_ivas->hMasa, data_f, input_frame, st_ivas->nchan_transport ); /* energy-estimation uses TF-resolution: 4x24 */ if ( ( error = ivas_masa_enc_config( st_ivas ) ) != IVAS_ERR_OK ) { return error; } - - ivas_masa_estimate_energy( st_ivas->hMasa, data_f, input_frame, st_ivas->nchan_transport ); - - ivas_masa_encode( st_ivas->hMasa, st_ivas->hQMetaData, hMetaData, &nb_bits_metadata[0], st_ivas->nchan_transport, ivas_format, - ivas_total_brate, hEncoderConfig->Opt_DTX_ON, st_ivas->nchan_transport == 2 ? st_ivas->hCPE[0]->element_mode : -1 ); + if ( ( error = ivas_masa_encode( st_ivas->hMasa, st_ivas->hQMetaData, hMetaData, &nb_bits_metadata[0], st_ivas->nchan_transport, ivas_format, + ivas_total_brate, hEncoderConfig->Opt_DTX_ON, st_ivas->nchan_transport == 2 ? st_ivas->hCPE[0]->element_mode : -1 ) ) != IVAS_ERR_OK ) + { + return error; + } } } else if ( st_ivas->sba_mode == SBA_MODE_SPAR ) @@ -292,7 +278,10 @@ ivas_error ivas_enc( else if ( ivas_format == MC_FORMAT ) { /* select MC format mode; write MC LS setup; reconfigure the MC format encoder */ - ivas_mc_enc_config( st_ivas ); + if ( ( ivas_mc_enc_config( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } hMetaData = ( st_ivas->nSCE > 0 ) ? st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData : st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData; @@ -339,7 +328,10 @@ ivas_error ivas_enc( ivas_mcmasa_enc( st_ivas->hMcMasa, st_ivas->hQMetaData, st_ivas->hMasa, data_f, input_frame, st_ivas->nchan_transport, nchan_inp ); - ivas_masa_encode( st_ivas->hMasa, st_ivas->hQMetaData, hMetaData, &nb_bits_metadata[0], st_ivas->nchan_transport, ivas_format, ivas_total_brate, 0, -1 ); + if ( ( error = ivas_masa_encode( st_ivas->hMasa, st_ivas->hQMetaData, hMetaData, &nb_bits_metadata[0], st_ivas->nchan_transport, ivas_format, ivas_total_brate, 0, -1 ) ) != IVAS_ERR_OK ) + { + return error; + } if ( st_ivas->hMcMasa->separateChannelEnabled ) { @@ -386,6 +378,6 @@ ivas_error ivas_enc( } #endif - wmops_sub_end(); + pop_wmops(); return error; } diff --git a/lib_enc/ivas_enc_cov_handler.c b/lib_enc/ivas_enc_cov_handler.c index 933c2c5de9..a94436ae34 100644 --- a/lib_enc/ivas_enc_cov_handler.c +++ b/lib_enc/ivas_enc_cov_handler.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,7 +37,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------------------------* * Local constants @@ -66,6 +66,10 @@ ivas_error ivas_spar_covar_enc_open( ivas_filterbank_t *pFb, /* i/o: FB handle */ const int32_t input_Fs, /* i : input sampling rate */ const int16_t nchan_inp /* i : number of input channels */ +#ifdef LBR_SBA_EXTRA_COV_SMOOTH + , + const int32_t ivas_total_brate /* i : IVAS total bitrate */ +#endif ) { ivas_enc_cov_handler_state_t *hCovState; @@ -74,7 +78,7 @@ ivas_error ivas_spar_covar_enc_open( error = IVAS_ERR_OK; - if ( ( hCovState = (ivas_enc_cov_handler_state_t *) count_malloc( sizeof( ivas_enc_cov_handler_state_t ) ) ) == NULL ) + if ( ( hCovState = (ivas_enc_cov_handler_state_t *) malloc( sizeof( ivas_enc_cov_handler_state_t ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR COV encoder" ); } @@ -83,7 +87,11 @@ ivas_error ivas_spar_covar_enc_open( cov_smooth_cfg.max_update_rate = MAX_UPDATE_RATE; cov_smooth_cfg.min_pool_size = MIN_POOL_SIZE; +#ifdef LBR_SBA_EXTRA_COV_SMOOTH + if ( ( error = ivas_spar_covar_smooth_enc_open( &hCovState->pCov_state, &cov_smooth_cfg, pFb, nchan_inp, ivas_total_brate ) ) != IVAS_ERR_OK ) +#else if ( ( error = ivas_spar_covar_smooth_enc_open( &hCovState->pCov_state, &cov_smooth_cfg, pFb, nchan_inp ) ) != IVAS_ERR_OK ) +#endif { return error; } @@ -91,7 +99,11 @@ ivas_error ivas_spar_covar_enc_open( cov_smooth_cfg.max_update_rate = MAX_UPDATE_RATE_DTX; cov_smooth_cfg.min_pool_size = MIN_POOL_SIZE_DTX; +#ifdef LBR_SBA_EXTRA_COV_SMOOTH + if ( ( error = ivas_spar_covar_smooth_enc_open( &hCovState->pCov_dtx_state, &cov_smooth_cfg, pFb, nchan_inp, ivas_total_brate ) ) != IVAS_ERR_OK ) +#else if ( ( error = ivas_spar_covar_smooth_enc_open( &hCovState->pCov_dtx_state, &cov_smooth_cfg, pFb, nchan_inp ) ) != IVAS_ERR_OK ) +#endif { return error; } @@ -117,17 +129,19 @@ void ivas_spar_covar_enc_close( { ivas_enc_cov_handler_state_t *hCovState; + if ( hCovEnc == NULL || *hCovEnc == NULL ) + { + return; + } + hCovState = *hCovEnc; - if ( hCovState != NULL ) - { - ivas_spar_covar_smooth_enc_close( &hCovState->pCov_state, nchan_inp ); + ivas_spar_covar_smooth_enc_close( &hCovState->pCov_state, nchan_inp ); - ivas_spar_covar_smooth_enc_close( &hCovState->pCov_dtx_state, nchan_inp ); + ivas_spar_covar_smooth_enc_close( &hCovState->pCov_dtx_state, nchan_inp ); - count_free( hCovState ); - hCovState = NULL; - } + free( *hCovEnc ); + *hCovEnc = NULL; return; } @@ -150,7 +164,7 @@ void ivas_enc_cov_handler_process( const int16_t end_band, const int16_t num_ch, const int16_t dtx_vad, - const int16_t transient_det ) + const int16_t transient_det[2] ) { int16_t i, j; int16_t dtx_cov_flag; @@ -213,7 +227,7 @@ void ivas_enc_cov_handler_process( } else { - if ( transient_det == 0 ) + if ( ( transient_det[0] == 0 ) && ( transient_det[1] == 0 ) ) { ivas_cov_smooth_process( hCovEnc->pCov_dtx_state, cov_dtx_real, pFb, start_band, end_band, num_ch, transient_det ); hCovEnc->prior_dtx_present = 1; diff --git a/lib_enc/ivas_entropy_coder.c b/lib_enc/ivas_entropy_coder.c index a3714821f3..a8f5219f2a 100644 --- a/lib_enc/ivas_entropy_coder.c +++ b/lib_enc/ivas_entropy_coder.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #include "ivas_rom_com.h" #include "math.h" #include -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------------------------* * Local constants diff --git a/lib_enc/ivas_front_vad.c b/lib_enc/ivas_front_vad.c index cc2a4b08d8..be476b1244 100644 --- a/lib_enc/ivas_front_vad.c +++ b/lib_enc/ivas_front_vad.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "prot.h" #include "ivas_prot.h" #include -#include "wmops.h" +#include "wmc_auto.h" #include @@ -83,7 +83,7 @@ ivas_error front_vad( error = IVAS_ERR_OK; - wmops_sub_start( "front_vad" ); + push_wmops( "front_vad" ); if ( hCPE != NULL ) { @@ -110,9 +110,7 @@ ivas_error front_vad( { localVAD_HE_SAD[n] = 0; vad_hover_flag[n] = 0; -#ifdef FIX_ITD_CNG vad_flag_dtx[n] = 1; -#endif } /*------------------------------------------------------------------* @@ -195,12 +193,7 @@ ivas_error front_vad( } /* DTX hangover addition */ - vad_flag_dtx[n] = dtx_hangover_addition( sts[n], hFrontVad->hVAD->vad_flag, hFrontVad->lp_speech - hFrontVad->lp_noise, 0 /* <- no cldfb addition */, &vad_hover_flag[n], hFrontVad->hVAD, hFrontVad->hNoiseEst -#ifdef FIX_ITD_CNG - , - &hFrontVads[n]->rem_dtx_ho -#endif - ); + vad_flag_dtx[n] = dtx_hangover_addition( sts[n], hFrontVad->hVAD->vad_flag, hFrontVad->lp_speech - hFrontVad->lp_noise, 0 /* <- no cldfb addition */, &vad_hover_flag[n], hFrontVad->hVAD, hFrontVad->hNoiseEst, &hFrontVads[n]->rem_dtx_ho ); if ( n_chan == 1 ) { @@ -256,7 +249,7 @@ ivas_error front_vad( mvr2r( Bin_E, Bin_E_out, L_FRAME ); } - wmops_sub_end(); + pop_wmops(); return error; } @@ -274,18 +267,18 @@ ivas_error front_vad_create( { FRONT_VAD_ENC_HANDLE hFrontVad; - if ( ( hFrontVad = (FRONT_VAD_ENC_HANDLE) count_malloc( sizeof( FRONT_VAD_ENC ) ) ) == NULL ) + if ( ( hFrontVad = (FRONT_VAD_ENC_HANDLE) malloc( sizeof( FRONT_VAD_ENC ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for front-VAD structure \n" ) ); } - if ( ( hFrontVad->hNoiseEst = (NOISE_EST_HANDLE) count_malloc( sizeof( NOISE_EST_DATA ) ) ) == NULL ) + if ( ( hFrontVad->hNoiseEst = (NOISE_EST_HANDLE) malloc( sizeof( NOISE_EST_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Noise estimation\n" ) ); } noise_est_init( hFrontVad->hNoiseEst ); - if ( ( hFrontVad->hVAD = (VAD_HANDLE) count_malloc( sizeof( VAD_DATA ) ) ) == NULL ) + if ( ( hFrontVad->hVAD = (VAD_HANDLE) malloc( sizeof( VAD_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VAD\n" ) ); } @@ -304,7 +297,7 @@ ivas_error front_vad_create( hFrontVad->delay_buf = NULL; if ( hFrontVad->delay_samples > 0 ) { - if ( ( hFrontVad->delay_buf = (float *) count_malloc( hFrontVad->delay_samples * sizeof( float ) ) ) == NULL ) + if ( ( hFrontVad->delay_buf = (float *) malloc( hFrontVad->delay_samples * sizeof( float ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VAD delay buffer\n" ) ); } @@ -330,19 +323,19 @@ void front_vad_destroy( { if ( *hFrontVad != NULL ) { - count_free( ( *hFrontVad )->hNoiseEst ); + free( ( *hFrontVad )->hNoiseEst ); ( *hFrontVad )->hNoiseEst = NULL; - count_free( ( *hFrontVad )->hVAD ); + free( ( *hFrontVad )->hVAD ); ( *hFrontVad )->hVAD = NULL; if ( ( *hFrontVad )->delay_buf != NULL ) { - count_free( ( *hFrontVad )->delay_buf ); + free( ( *hFrontVad )->delay_buf ); ( *hFrontVad )->delay_buf = NULL; } - count_free( *hFrontVad ); + free( *hFrontVad ); *hFrontVad = NULL; } @@ -397,7 +390,7 @@ ivas_error front_vad_spar( int16_t old_pitch; ivas_error error; - wmops_sub_start( "front_vad_SPAR" ); + push_wmops( "front_vad_SPAR" ); error = IVAS_ERR_OK; @@ -479,11 +472,10 @@ ivas_error front_vad_spar( /* 1st stage speech/music classification (GMM model) */ /* run only to get 'high_lpn_flag' parameter */ - ivas_smc_gmm( st, NULL /* <-- hStereoClassif */, localVAD_HE_SAD[0], *Etot, lsp_new, cor_map_sum, epsP, PS, non_staX, relE, &high_lpn_flag, flag_spitch ); + ivas_smc_gmm( st, NULL, localVAD_HE_SAD[0], Etot[0], lsp_new, cor_map_sum, epsP, PS, non_staX, relE, &high_lpn_flag, flag_spitch ); /* long-term energy update */ - long_enr( st, *Etot, localVAD_HE_SAD[0], high_lpn_flag, &hFrontVad, 1, localVAD_HE_SAD, Etot ); - hFrontVad->hNoiseEst->Etot_last = Etot[0]; + long_enr( st, -1, localVAD_HE_SAD[0], high_lpn_flag, &hFrontVad, 1, localVAD_HE_SAD, Etot ); /* increase ini_frame counter */ hFrontVad->ini_frame = min( hFrontVad->ini_frame + 1, MAX_FRAME_COUNTER ); @@ -505,7 +497,7 @@ ivas_error front_vad_spar( hSpar->force_front_vad = 0; } - wmops_sub_end(); + pop_wmops(); return error; } diff --git a/lib_enc/ivas_init_enc.c b/lib_enc/ivas_init_enc.c index 18280a60e2..6171cd000a 100644 --- a/lib_enc/ivas_init_enc.c +++ b/lib_enc/ivas_init_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* @@ -184,7 +184,7 @@ int16_t getNumChanAnalysis( n = st_ivas->nSCE + CPE_CHANNELS * st_ivas->nCPE; if ( st_ivas->hEncoderConfig->ivas_format == SBA_FORMAT ) { - n = DIRAC_MAX_ANA_CHANS; + n = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order ); } else if ( st_ivas->hEncoderConfig->ivas_format == MC_FORMAT && ( st_ivas->mc_mode == MC_MODE_PARAMMC || st_ivas->mc_mode == MC_MODE_MCMASA ) ) { @@ -266,12 +266,15 @@ void ivas_initialize_handles_enc( st_ivas->mem_hp20_in = NULL; - /* ISm metadata handles */ + /* ISM metadata handles */ for ( i = 0; i < MAX_NUM_OBJECTS; i++ ) { st_ivas->hIsmMetaData[i] = NULL; } + /* ISM DTX handle */ + st_ivas->hISMDTX = NULL; + /* Q Metadata handle */ st_ivas->hQMetaData = NULL; @@ -336,13 +339,14 @@ ivas_error ivas_init_encoder( /* In IVAS, ensure that minimum coded bandwidth is WB */ hEncoderConfig->max_bwidth = max( hEncoderConfig->max_bwidth, WB ); } - +#ifdef LBR_SBA_BR_SWITCHING + hEncoderConfig->spar_reconfig_flag = 0; +#endif st_ivas->ism_mode = ISM_MODE_NONE; st_ivas->mc_mode = MC_MODE_NONE; st_ivas->sba_mode = SBA_MODE_NONE; st_ivas->nchan_transport = -1; - /*-----------------------------------------------------------------* * Allocate and initialize SCE/CPE and other handles *-----------------------------------------------------------------*/ @@ -401,7 +405,7 @@ ivas_error ivas_init_encoder( st_ivas->ism_mode = ivas_ism_mode_select( hEncoderConfig->nchan_inp, ivas_total_brate ); - if ( ( error = create_ism_metadata_enc( st_ivas, hEncoderConfig->nchan_inp, element_brate_tmp ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_ism_metadata_enc_create( st_ivas, hEncoderConfig->nchan_inp, element_brate_tmp ) ) != IVAS_ERR_OK ) { return error; } @@ -428,6 +432,14 @@ ivas_error ivas_init_encoder( return error; } } + + if ( st_ivas->hEncoderConfig->Opt_DTX_ON ) + { + if ( ( error = ivas_ism_dtx_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + } } else if ( ivas_format == SBA_FORMAT || ivas_format == MASA_FORMAT ) { @@ -438,13 +450,16 @@ ivas_error ivas_init_encoder( if ( ivas_format == SBA_FORMAT ) { +#ifndef LBR_SBA st_ivas->sba_mode = ivas_sba_mode_select( ivas_total_brate ); - +#else + st_ivas->sba_mode = ivas_sba_mode_select(); +#endif st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, st_ivas->hEncoderConfig->sba_order ); if ( st_ivas->sba_mode == SBA_MODE_SPAR ) { - if ( ( error = ivas_spar_enc_open( st_ivas ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_spar_enc_open( st_ivas, 0 ) ) != IVAS_ERR_OK ) { return error; } @@ -522,12 +537,8 @@ ivas_error ivas_init_encoder( else if ( ivas_format == MC_FORMAT ) { st_ivas->mc_mode = ivas_mc_mode_select( hEncoderConfig->mc_input_setup, ivas_total_brate ); - hEncoderConfig->nchan_inp = ivas_mc_ls_setup_get_num_channels( hEncoderConfig->mc_input_setup ); - if ( ( error = ivas_create_lfe_enc( &st_ivas->hLFE, input_Fs ) ) != IVAS_ERR_OK ) - { - return error; - } + hEncoderConfig->nchan_inp = ivas_mc_ls_setup_get_num_channels( hEncoderConfig->mc_input_setup ); if ( st_ivas->mc_mode == MC_MODE_MCT ) { @@ -543,14 +554,18 @@ ivas_error ivas_init_encoder( for ( n = 0; n < CPE_CHANNELS; n++ ) { - if ( cpe_id * CPE_CHANNELS + n == LFE_CHANNEL ) - { - st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->nb_bits_tot = 0; - continue; - } + /* we need the correct bitstream also for the LFE channel since it might become a proper coded channel when + switching to ParamMC and ind_list is only visible here, can't be done later */ st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->ind_list = ind_list[cpe_id * CPE_CHANNELS + n]; reset_indices_enc( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr, MAX_NUM_INDICES ); } + + /* Metadata only initialized for the last CPE index*/ + if ( cpe_id == st_ivas->nCPE - 1 ) + { + st_ivas->hCPE[cpe_id]->hMetaData->ind_list = ind_list_metadata[st_ivas->nSCE]; + reset_indices_enc( st_ivas->hCPE[cpe_id]->hMetaData, MAX_BITS_METADATA ); + } } if ( ( error = create_mct_enc( st_ivas ) ) != IVAS_ERR_OK ) @@ -558,6 +573,11 @@ ivas_error ivas_init_encoder( return error; } + if ( ( error = ivas_create_lfe_enc( &st_ivas->hLFE, input_Fs ) ) != IVAS_ERR_OK ) + { + return error; + } + st_ivas->nchan_transport = ivas_mc_ls_setup_get_num_channels( st_ivas->hEncoderConfig->mc_input_setup ); } else if ( st_ivas->mc_mode == MC_MODE_PARAMMC ) @@ -599,6 +619,8 @@ ivas_error ivas_init_encoder( } else if ( st_ivas->mc_mode == MC_MODE_MCMASA ) { + int32_t brate_sce, brate_cpe; + ivas_mcmasa_setNumTransportChannels( &( st_ivas->nchan_transport ), &( hEncoderConfig->element_mode_init ), ivas_total_brate ); if ( ( error = ivas_qmetadata_open( &( st_ivas->hQMetaData ) ) ) != IVAS_ERR_OK ) @@ -616,21 +638,13 @@ ivas_error ivas_init_encoder( return error; } + ivas_mcmasa_split_brate( st_ivas->hMcMasa->separateChannelEnabled, ivas_total_brate, st_ivas->nSCE, st_ivas->nCPE, &brate_sce, &brate_cpe ); + for ( sce_id = 0; sce_id < st_ivas->nSCE; sce_id++ ) { - if ( st_ivas->hMcMasa->separateChannelEnabled ) - { - if ( ( error = create_sce_enc( st_ivas, sce_id, ivas_mcmasa_mono_brate( ivas_total_brate ) ) ) != IVAS_ERR_OK ) - { - return error; - } - } - else + if ( ( error = create_sce_enc( st_ivas, sce_id, brate_sce ) ) != IVAS_ERR_OK ) { - if ( ( error = create_sce_enc( st_ivas, sce_id, ivas_total_brate / ( st_ivas->nCPE + st_ivas->nSCE ) ) ) != IVAS_ERR_OK ) - { - return error; - } + return error; } /* prepare bitstream buffers */ @@ -643,21 +657,11 @@ ivas_error ivas_init_encoder( for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) { - if ( st_ivas->hMcMasa->separateChannelEnabled ) - { - hEncoderConfig->element_mode_init = IVAS_CPE_MDCT; + hEncoderConfig->element_mode_init = IVAS_CPE_MDCT; - if ( ( error = create_cpe_enc( st_ivas, cpe_id, ivas_total_brate - st_ivas->hSCE[0]->element_brate ) ) != IVAS_ERR_OK ) - { - return error; - } - } - else + if ( ( error = create_cpe_enc( st_ivas, cpe_id, brate_cpe ) ) != IVAS_ERR_OK ) { - if ( ( error = create_cpe_enc( st_ivas, cpe_id, ivas_total_brate / ( st_ivas->nCPE + st_ivas->nSCE ) ) ) != IVAS_ERR_OK ) - { - return error; - } + return error; } /* prepare bitstream buffers */ @@ -692,7 +696,7 @@ ivas_error ivas_init_encoder( if ( n > 0 ) { - if ( ( st_ivas->mem_hp20_in = (float **) count_malloc( n * sizeof( float * ) ) ) == NULL ) + if ( ( st_ivas->mem_hp20_in = (float **) malloc( n * sizeof( float * ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HP20 filter memory\n" ) ); } @@ -704,7 +708,7 @@ ivas_error ivas_init_encoder( for ( i = 0; i < n; i++ ) { - if ( ( st_ivas->mem_hp20_in[i] = (float *) count_malloc( L_HP20_MEM * sizeof( float ) ) ) == NULL ) + if ( ( st_ivas->mem_hp20_in[i] = (float *) malloc( L_HP20_MEM * sizeof( float ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HP20 filter memory\n" ) ); } @@ -726,141 +730,141 @@ void destroy_core_enc( ENC_CORE_HANDLE hCoreCoder /* i/o: core encoder structure */ ) { - destroy_encoder( hCoreCoder ); + destroy_cldfb_encoder( hCoreCoder ); if ( hCoreCoder->hSignalBuf != NULL ) { - count_free( hCoreCoder->hSignalBuf ); + free( hCoreCoder->hSignalBuf ); hCoreCoder->hSignalBuf = NULL; } if ( hCoreCoder->hBstr != NULL ) { - count_free( hCoreCoder->hBstr ); + free( hCoreCoder->hBstr ); hCoreCoder->hBstr = NULL; } if ( hCoreCoder->hLPDmem != NULL ) { - count_free( hCoreCoder->hLPDmem ); + free( hCoreCoder->hLPDmem ); hCoreCoder->hLPDmem = NULL; } if ( hCoreCoder->hTranDet != NULL ) { - count_free( hCoreCoder->hTranDet ); + free( hCoreCoder->hTranDet ); hCoreCoder->hTranDet = NULL; } if ( hCoreCoder->hNoiseEst != NULL ) { - count_free( hCoreCoder->hNoiseEst ); + free( hCoreCoder->hNoiseEst ); hCoreCoder->hNoiseEst = NULL; } if ( hCoreCoder->hVAD != NULL ) { - count_free( hCoreCoder->hVAD ); + free( hCoreCoder->hVAD ); hCoreCoder->hVAD = NULL; } if ( hCoreCoder->hVAD_CLDFB != NULL ) { - count_free( hCoreCoder->hVAD_CLDFB ); + free( hCoreCoder->hVAD_CLDFB ); hCoreCoder->hVAD_CLDFB = NULL; } if ( hCoreCoder->hTdCngEnc != NULL ) { - count_free( hCoreCoder->hTdCngEnc ); + free( hCoreCoder->hTdCngEnc ); hCoreCoder->hTdCngEnc = NULL; } if ( hCoreCoder->hDtxEnc != NULL ) { - count_free( hCoreCoder->hDtxEnc ); + free( hCoreCoder->hDtxEnc ); hCoreCoder->hDtxEnc = NULL; } if ( hCoreCoder->hSpMusClas != NULL ) { - count_free( hCoreCoder->hSpMusClas ); + free( hCoreCoder->hSpMusClas ); hCoreCoder->hSpMusClas = NULL; } if ( hCoreCoder->hGSCEnc != NULL ) { - count_free( hCoreCoder->hGSCEnc ); + free( hCoreCoder->hGSCEnc ); hCoreCoder->hGSCEnc = NULL; } if ( hCoreCoder->hSC_VBR != NULL ) { - count_free( hCoreCoder->hSC_VBR ); + free( hCoreCoder->hSC_VBR ); hCoreCoder->hSC_VBR = NULL; } if ( hCoreCoder->hAmrwb_IO != NULL ) { - count_free( hCoreCoder->hAmrwb_IO ); + free( hCoreCoder->hAmrwb_IO ); hCoreCoder->hAmrwb_IO = NULL; } if ( hCoreCoder->hBWE_TD != NULL ) { - count_free( hCoreCoder->hBWE_TD ); + free( hCoreCoder->hBWE_TD ); hCoreCoder->hBWE_TD = NULL; } if ( hCoreCoder->hBWE_FD != NULL ) { - count_free( hCoreCoder->hBWE_FD ); + free( hCoreCoder->hBWE_FD ); hCoreCoder->hBWE_FD = NULL; } if ( hCoreCoder->hRF != NULL ) { - count_free( hCoreCoder->hRF ); + free( hCoreCoder->hRF ); hCoreCoder->hRF = NULL; } if ( hCoreCoder->hTECEnc != NULL ) { - count_free( hCoreCoder->hTECEnc ); + free( hCoreCoder->hTECEnc ); hCoreCoder->hTECEnc = NULL; } if ( hCoreCoder->hTcxEnc != NULL ) { - count_free( hCoreCoder->hTcxEnc ); + free( hCoreCoder->hTcxEnc ); hCoreCoder->hTcxEnc = NULL; } if ( hCoreCoder->hTcxCfg != NULL ) { - count_free( hCoreCoder->hTcxCfg ); + free( hCoreCoder->hTcxCfg ); hCoreCoder->hTcxCfg = NULL; } if ( hCoreCoder->hIGFEnc != NULL ) { - count_free( hCoreCoder->hIGFEnc ); + free( hCoreCoder->hIGFEnc ); hCoreCoder->hIGFEnc = NULL; } if ( hCoreCoder->hPlcExt != NULL ) { - count_free( hCoreCoder->hPlcExt ); + free( hCoreCoder->hPlcExt ); hCoreCoder->hPlcExt = NULL; } if ( hCoreCoder->hHQ_core != NULL ) { - count_free( hCoreCoder->hHQ_core ); + free( hCoreCoder->hHQ_core ); hCoreCoder->hHQ_core = NULL; } - count_free( hCoreCoder ); + free( hCoreCoder ); return; } @@ -909,98 +913,66 @@ void ivas_destroy_enc( for ( i = 0; i < n; i++ ) { - count_free( st_ivas->mem_hp20_in[i] ); + free( st_ivas->mem_hp20_in[i] ); st_ivas->mem_hp20_in[i] = NULL; } - count_free( st_ivas->mem_hp20_in ); + free( st_ivas->mem_hp20_in ); st_ivas->mem_hp20_in = NULL; } /* ISM metadata handles */ - for ( n = 0; n < MAX_NUM_OBJECTS; n++ ) + ivas_ism_metadata_close( st_ivas->hIsmMetaData ); + + /* ISM DTX Handle */ + if ( st_ivas->hISMDTX != NULL ) { - if ( st_ivas->hIsmMetaData[n] != NULL ) - { - count_free( st_ivas->hIsmMetaData[n] ); - st_ivas->hIsmMetaData[n] = NULL; - } + free( st_ivas->hISMDTX ); + st_ivas->hISMDTX = NULL; } /* Q Metadata handle */ ivas_qmetadata_close( &( st_ivas->hQMetaData ) ); /* DirAC handle */ - if ( st_ivas->hDirAC != NULL ) + if ( ivas_format == ISM_FORMAT ) { - if ( ivas_format == ISM_FORMAT ) - { - ivas_param_ism_enc_close( st_ivas->hDirAC, st_ivas->hEncoderConfig->input_Fs ); - } - else - { - ivas_dirac_enc_close( st_ivas->hDirAC, st_ivas->hEncoderConfig->input_Fs ); - } - st_ivas->hDirAC = NULL; + ivas_param_ism_enc_close( &( st_ivas->hDirAC ), st_ivas->hEncoderConfig->input_Fs ); } - - /* SPAR handle */ - if ( st_ivas->hSpar != NULL ) + else { - ivas_spar_enc_close( st_ivas->hSpar, st_ivas->hEncoderConfig->input_Fs, nchan_inp ); - st_ivas->hSpar = NULL; + ivas_dirac_enc_close( &( st_ivas->hDirAC ), st_ivas->hEncoderConfig->input_Fs ); } + /* SPAR handle */ + ivas_spar_enc_close( &( st_ivas->hSpar ), st_ivas->hEncoderConfig->input_Fs, nchan_inp, 0 ); + /* MASA handle */ - if ( st_ivas->hMasa != NULL ) - { - ivas_masa_enc_close( st_ivas->hMasa, st_ivas->nchan_transport, ivas_format ); - st_ivas->hMasa = NULL; - } + ivas_masa_enc_close( &( st_ivas->hMasa ) ); /* MCT handle */ - if ( st_ivas->hMCT != NULL ) - { - ivas_mct_enc_close( st_ivas->hMCT ); - st_ivas->hMCT = NULL; - } + ivas_mct_enc_close( &( st_ivas->hMCT ) ); + + /* LFE handle */ + ivas_lfe_enc_close( &( st_ivas->hLFE ) ); /* Parametric MC handle */ - if ( st_ivas->hParamMC != NULL ) - { - ivas_param_mc_enc_close( st_ivas->hParamMC, st_ivas->hEncoderConfig->input_Fs ); - st_ivas->hParamMC = NULL; - } + ivas_param_mc_enc_close( &( st_ivas->hParamMC ), st_ivas->hEncoderConfig->input_Fs ); /* Multi-channel MASA handle */ - if ( st_ivas->hMcMasa != NULL ) - { - ivas_mcmasa_enc_close( st_ivas->hMcMasa, st_ivas->hEncoderConfig->input_Fs ); - st_ivas->hMcMasa = NULL; - } + ivas_mcmasa_enc_close( &( st_ivas->hMcMasa ), st_ivas->hEncoderConfig->input_Fs ); /* Stereo downmix for EVS encoder handle */ - if ( st_ivas->hStereoDmxEVS != NULL ) - { - stereo_dmx_evs_close_encoder( st_ivas->hStereoDmxEVS ); - st_ivas->hStereoDmxEVS = NULL; - } - - /* LFE handle */ - if ( st_ivas->hLFE != NULL ) - { - ivas_lfe_enc_close( st_ivas->hLFE ); - st_ivas->hLFE = NULL; - } + stereo_dmx_evs_close_encoder( &( st_ivas->hStereoDmxEVS ) ); /* Encoder configuration handle */ if ( st_ivas->hEncoderConfig != NULL ) { - count_free( st_ivas->hEncoderConfig ); + free( st_ivas->hEncoderConfig ); st_ivas->hEncoderConfig = NULL; } /* main IVAS handle */ - count_free( st_ivas ); + free( st_ivas ); return; } diff --git a/lib_enc/ivas_ism_dtx_enc.c b/lib_enc/ivas_ism_dtx_enc.c new file mode 100644 index 0000000000..aff8b9a0b6 --- /dev/null +++ b/lib_enc/ivas_ism_dtx_enc.c @@ -0,0 +1,407 @@ +/****************************************************************************************************** + + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository. All Rights Reserved. + + This software is protected by copyright law and by international treaties. + The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository retain full ownership rights in their respective contributions in + the software. This notice grants no license of any kind, including but not limited to patent + license, nor is any license granted by implication, estoppel or otherwise. + + Contributors are required to enter into the IVAS codec Public Collaboration agreement before making + contributions. + + This software is provided "AS IS", without any express or implied warranties. The software is in the + development stage. It is intended exclusively for experts who have experience with such software and + solely for the purpose of inspection. All implied warranties of non-infringement, merchantability + and fitness for a particular purpose are hereby disclaimed and excluded. + + Any dispute, controversy or claim arising under or in relation to providing this software shall be + submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in + accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and + the United Nations Convention on Contracts on the International Sales of Goods. + +*******************************************************************************************************/ + +#include +#include +#include "options.h" +#include "ivas_cnst.h" +#include "prot.h" +#include "ivas_prot.h" +#ifdef DEBUGGING +#include "debug.h" +#endif +#include "wmc_auto.h" + + +/*-----------------------------------------------------------------------* + * Local constants + *-----------------------------------------------------------------------*/ + +#define MD_MAX_DIFF_AZIMUTH 10 +#define MD_MAX_DIFF_ELEVATION 10 + + +/*-------------------------------------------------------------------* + * ivas_ism_dtx_open() + * + * Open ISM DTX handle + *-------------------------------------------------------------------*/ + +ivas_error ivas_ism_dtx_open( + Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */ +) +{ + ivas_error error; + ISM_DTX_HANDLE hISMDTX; + int16_t i; + + error = IVAS_ERR_OK; + + /* Assign memory to DirAC handle */ + if ( ( hISMDTX = (ISM_DTX_HANDLE) malloc( sizeof( ISM_DTX_DATA ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ISM DTX Handle \n" ) ); + } + + hISMDTX->dtx_flag = 0; + hISMDTX->sce_id_dtx = 0; + hISMDTX->cnt_SID_ISM = -1; + + for ( i = 0; i < MAX_NUM_OBJECTS; i++ ) + { + set_f( hISMDTX->long_term_energy_stereo_dmx_enc[i], 0.0f, PARAM_ISM_HYS_BUF_SIZE ); + } + + set_f( hISMDTX->coh, 0.0f, MAX_NUM_OBJECTS ); + + st_ivas->hISMDTX = hISMDTX; + + return error; +} + + +/*-------------------------------------------------------------------* + * ivas_ism_get_dtx_enc() + * + * Analysis and decision about DTX in ISM format + *-------------------------------------------------------------------*/ + +/*! r: indication of DTX frame */ +int16_t ivas_ism_dtx_enc( + ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */ + SCE_ENC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */ + const int32_t ivas_total_brate, /* i : IVAS total bitrate */ + const int16_t nchan_ism, /* i : number of objects */ + const int16_t nchan_transport, /* i : number of transport channels */ + int16_t vad_flag[MAX_NUM_OBJECTS], /* i : VAD flag */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + int16_t md_diff_flag[], /* o : metadata differential flag */ + int16_t *sid_flag /* o : indication of SID frame */ +) +{ + int16_t ch, dtx_flag; + int16_t nBits, nBits_MD_max; + int16_t nBits_azimuth, nBits_elevation, nBits_coh, nBits_sce_id; + float lp_noise[MAX_NUM_OBJECTS], lp_noise_variation, lp_noise_mean; + float lp_noise_max; + float tmp1, tmp2; + + /* initialization */ + for ( ch = 0; ch < nchan_transport; ch++ ) + { + hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0; + } + + /*------------------------------------------------------------------* + * compute global ISM DTX flag + *-----------------------------------------------------------------*/ + + /* compute global ISM based on localVAD */ + dtx_flag = 1; + for ( ch = 0; ch < nchan_transport; ch++ ) + { + dtx_flag &= !vad_flag[ch]; + } + + /* compute global ISM based on long-term background noise */ + /* one of the channels is active -> no DTX */ + for ( ch = 0; ch < nchan_transport; ch++ ) + { + lp_noise[ch] = hSCE[ch]->hCoreCoder[0]->lp_noise; + } + + lp_noise_variation = var( lp_noise, nchan_transport ); + lp_noise_mean = mean( lp_noise, nchan_transport ); + + if ( lp_noise_mean > 50 || ( lp_noise_mean > 25 && lp_noise_variation > 32 ) ) + { + dtx_flag = 0; + } + + + /* default DTX is applied at lower bitrates; otherwise DTX is applied only in silence */ + maximum( lp_noise, nchan_transport, &lp_noise_max ); + + if ( !( ( nchan_ism == 1 && ivas_total_brate <= IVAS_24k4 ) || + ( nchan_ism == 2 && ivas_total_brate <= IVAS_48k ) || + ( nchan_ism == 3 && ivas_total_brate <= IVAS_80k ) || + ( nchan_ism == 4 && ivas_total_brate <= IVAS_96k ) || + lp_noise_max < 15 ) ) + { + dtx_flag = 0; + } + + /*------------------------------------------------------------------* + * Reset the bitstream + *-----------------------------------------------------------------*/ + + if ( dtx_flag ) + { + /* reset the bitstream (IVAS format signaling was already written) */ + reset_indices_enc( hSCE[0]->hCoreCoder[0]->hBstr, MAX_NUM_INDICES ); + } + + /*------------------------------------------------------------------* + * decide about SID metadata to be sent or not (per object) + * estimate the MD bit-budget consumption + *-----------------------------------------------------------------*/ + + if ( dtx_flag ) + { + ivas_get_ism_sid_quan_bitbudget( nchan_ism, &nBits_azimuth, &nBits_elevation, &tmp1, &tmp2, &nBits_coh, &nBits_sce_id ); + + nBits = 0; + for ( ch = 0; ch < nchan_ism; ch++ ) + { + /* check difference between current and last metadata */ + md_diff_flag[ch] = 0; + if ( fabsf( hIsmMeta[ch]->azimuth - hIsmMeta[ch]->last_azimuth ) > MD_MAX_DIFF_AZIMUTH ) + { + md_diff_flag[ch] = 1; + } + + if ( fabsf( hIsmMeta[ch]->elevation - hIsmMeta[ch]->last_elevation ) > MD_MAX_DIFF_ELEVATION ) + { + md_diff_flag[ch] = 1; + } + + /* estimate SID metadata bit-budget */ + nBits++; /* number of objects */ + nBits++; /* SID metadata flag */ + if ( md_diff_flag[ch] == 1 ) + { + nBits += nBits_azimuth; + nBits += nBits_elevation; + } + } + + /* calculate maximum available MD bit-budget */ + nBits_MD_max = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC; + nBits_MD_max -= SID_FORMAT_NBITS; + if ( nchan_transport > 1 ) + { + nBits_MD_max -= nBits_sce_id; + } + + for ( ch = 0; ch < nchan_transport - 1; ch++ ) + { + nBits_MD_max -= nBits_coh; /* coherence */ + } + + if ( nchan_ism > 3 ) + { + nBits_MD_max--; /* ism_mode flag */ + } + + /* too many metadata bits -> switch to active coding */ + if ( nBits > nBits_MD_max ) + { + dtx_flag = 0; + } + } + + /*------------------------------------------------------------------* + * set core_brate for all channels + * get 'sid_flag' value + *-----------------------------------------------------------------*/ + + *sid_flag = 0; + + if ( !dtx_flag ) + { + /* at least one of the channels is active -> no DTX */ + for ( ch = 0; ch < nchan_transport; ch++ ) + { + hSCE[ch]->hCoreCoder[0]->core_brate = -1; + set_bw( IVAS_SCE, hSCE[ch]->element_brate, hSCE[ch]->hCoreCoder[0], MODE1 ); + } + + hISMDTX->cnt_SID_ISM = -1; + + /* IVAS format signaling was erased in dtx() */ + if ( hSCE[0]->hCoreCoder[0]->hBstr->nb_bits_tot == 0 ) + { + /* replicate ivas_write_format() */ + push_indice( hSCE[0]->hCoreCoder[0]->hBstr, IND_IVAS_FORMAT, 2 /* == ISM format */, IVAS_FORMAT_SIGNALING_NBITS ); + } + } + else /* ism_dtx_flag == 1 */ + { + for ( ch = 0; ch < nchan_transport; ch++ ) + { + hSCE[ch]->hCoreCoder[0]->cng_type = FD_CNG; + } + + /* * update the global SID counter */ + hISMDTX->cnt_SID_ISM++; + if ( hISMDTX->cnt_SID_ISM >= hSCE[0]->hCoreCoder[0]->hDtxEnc->max_SID ) + { + /* adaptive SID update interval */ + hSCE[0]->hCoreCoder[0]->hDtxEnc->max_SID = hSCE[0]->hCoreCoder[0]->hDtxEnc->interval_SID; + hISMDTX->cnt_SID_ISM = 0; + } + + /* encode SID in one channel only */ + for ( ch = 0; ch < nchan_transport; ch++ ) + { + hSCE[ch]->hCoreCoder[0]->core_brate = FRAME_NO_DATA; + } + + if ( hISMDTX->cnt_SID_ISM == 0 ) + { + hSCE[hISMDTX->sce_id_dtx]->hCoreCoder[0]->core_brate = SID_2k40; + *sid_flag = 1; + } + } + + if ( dtx_flag == 1 && *sid_flag == 0 ) + { + set_s( md_diff_flag, 0, nchan_transport ); + } + + return dtx_flag; +} + +/*-------------------------------------------------------------------* + * ivas_ism_get_sce_id_dtx() + * + * + *-------------------------------------------------------------------*/ + +void ivas_ism_get_sce_id_dtx( + ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */ + SCE_ENC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */ + const int16_t nchan_transport, /* i : number of transport channels */ + const int16_t input_frame /* i : input frame length per channel */ + +) +{ + float tmp_energy[MAX_NUM_OBJECTS]; + int16_t i, j; + + if ( nchan_transport == 1 ) + { + hISMDTX->sce_id_dtx = 0; + + return; + } + + /* Initialize*/ + set_f( tmp_energy, 0.0f, MAX_NUM_OBJECTS ); + + /* compute long term energy parameter */ + for ( j = 0; j < nchan_transport; j++ ) + { + for ( i = 0; i < ( PARAM_ISM_HYS_BUF_SIZE - 1 ); i++ ) + { + hISMDTX->long_term_energy_stereo_dmx_enc[j][i] = hISMDTX->long_term_energy_stereo_dmx_enc[j][i + 1]; + } + + hISMDTX->long_term_energy_stereo_dmx_enc[j][PARAM_ISM_HYS_BUF_SIZE - 1] = sum2_f( hSCE[j]->hCoreCoder[0]->input, input_frame ); + + tmp_energy[j] = sum_f( hISMDTX->long_term_energy_stereo_dmx_enc[j], PARAM_ISM_HYS_BUF_SIZE ); + } + + /* determine the sce_id */ + hISMDTX->sce_id_dtx = 0; + for ( j = 1; j < nchan_transport; j++ ) + { + if ( tmp_energy[j] > tmp_energy[hISMDTX->sce_id_dtx] ) + { + hISMDTX->sce_id_dtx = j; + } + } + + return; +} + + +/*-------------------------------------------------------------------* + * ivas_ism_coh_estim_dtx_enc() + * + * + *-------------------------------------------------------------------*/ + +void ivas_ism_coh_estim_dtx_enc( + ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */ + SCE_ENC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */ + const int16_t nchan_transport, /* i : number of transport channels */ + const int16_t input_frame /* i : input frame length */ + +) +{ + Encoder_State *st, *st_id0; + int16_t sce_id, i; + float acorr_ene[MAX_NUM_OBJECTS], xcorr_ene; + + if ( nchan_transport == 1 ) + { + hISMDTX->coh[0] = 0.f; + return; + } + + /* Compute Coherence */ + acorr_ene[hISMDTX->sce_id_dtx] = 0.0f; + st_id0 = hSCE[hISMDTX->sce_id_dtx]->hCoreCoder[0]; + + for ( i = 0; i < input_frame; i++ ) + { + acorr_ene[hISMDTX->sce_id_dtx] += st_id0->input[i] * st_id0->input[i]; + } + + for ( sce_id = 0; sce_id < nchan_transport; sce_id++ ) + { + if ( sce_id == hISMDTX->sce_id_dtx ) + { + hISMDTX->coh[sce_id] = 1.0f; + continue; + } + + st = hSCE[sce_id]->hCoreCoder[0]; + + acorr_ene[sce_id] = 0.0f; + xcorr_ene = 0.0f; + + for ( i = 0; i < input_frame; i++ ) + { + acorr_ene[sce_id] += st->input[i] * st->input[i]; + xcorr_ene += st_id0->input[i] * st->input[i]; + } + + hISMDTX->coh[sce_id] = fabsf( xcorr_ene ) / ( sqrtf( ( acorr_ene[hISMDTX->sce_id_dtx] * acorr_ene[sce_id] ) + EPSILON ) ); + + /* ensure value of coherence is between [0,1] */ + hISMDTX->coh[sce_id] = check_bounds( hISMDTX->coh[sce_id], 0.0f, 1.0f ); + } + + return; +} diff --git a/lib_enc/ivas_ism_enc.c b/lib_enc/ivas_ism_enc.c index 39d5b42a07..4a56252be8 100644 --- a/lib_enc/ivas_ism_enc.c +++ b/lib_enc/ivas_ism_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* @@ -61,7 +61,6 @@ ivas_error ivas_ism_enc( float old_inp_12k8[MAX_NUM_OBJECTS][1][L_INP_12k8]; /* buffer of input signal @ 12k8 */ float old_inp_16k[MAX_NUM_OBJECTS][1][L_INP]; /* buffer of input signal @ 16kHz */ int16_t vad_flag[MAX_NUM_OBJECTS]; /* VAD flag */ - float Etot[MAX_NUM_OBJECTS][1]; /* total energy; correlation shift */ float ener[MAX_NUM_OBJECTS][1]; /* residual energy from Levinson-Durbin */ float relE[MAX_NUM_OBJECTS][1]; /* frame relative energy */ float A[MAX_NUM_OBJECTS][1][NB_SUBFR16k * ( M + 1 )]; /* A(z) unquantized for subframes */ @@ -86,12 +85,24 @@ ivas_error ivas_ism_enc( float Etot_LR[1]; /* total energy; correlation shift */ float lf_E[1][2 * VOIC_BINS]; /* per bin spectrum energy in lf */ int16_t localVAD_HE_SAD[1]; /* local HE VAD */ - int16_t i, nBits; + int16_t nchan_ism, dtx_flag, sid_flag, flag_noisy_speech; + int16_t md_diff_flag[MAX_NUM_OBJECTS]; ivas_error error; + push_wmops( "ivas_ism_enc" ); + + /*------------------------------------------------------------------* + * Initialization + *-----------------------------------------------------------------*/ + error = IVAS_ERR_OK; - wmops_sub_start( "ivas_ism_enc" ); + dtx_flag = 0; + sid_flag = 0; + flag_noisy_speech = 0; + + nchan_ism = st_ivas->hEncoderConfig->nchan_ism; + set_s( md_diff_flag, 1, nchan_ism ); /*------------------------------------------------------------------* * Preprocesing @@ -148,7 +159,7 @@ ivas_error ivas_ism_enc( *----------------------------------------------------------------*/ error = pre_proc_front_ivas( hSCE, NULL, hSCE->element_brate, nb_bits_metadata[sce_id], input_frame, 0, old_inp_12k8[sce_id][0], old_inp_16k[sce_id][0], - &Etot[sce_id][0], &ener[sce_id][0], &relE[sce_id][0], A[sce_id][0], Aw[sce_id][0], epsP[sce_id][0], lsp_new[sce_id][0], lsp_mid[sce_id][0], + &ener[sce_id][0], &relE[sce_id][0], A[sce_id][0], Aw[sce_id][0], epsP[sce_id][0], lsp_new[sce_id][0], lsp_mid[sce_id][0], &vad_hover_flag[sce_id][0], &attack_flag[sce_id][0], realBuffer[sce_id][0], imagBuffer[sce_id][0], old_wsp[sce_id][0], pitch_fr[sce_id][0], voicing_fr[sce_id][0], &loc_harm[sce_id][0], &cor_map_sum[sce_id][0], &vad_flag_dtx[sce_id][0], enerBuffer[sce_id][0], fft_buff[sce_id][0], A[sce_id][0], lsp_new[sce_id][0], currFlatness[0], 0, fr_bands, Etot_LR, lf_E, localVAD_HE_SAD, NULL, 0, 0, 0, 0, st_ivas->hEncoderConfig->ivas_total_brate ); @@ -157,71 +168,83 @@ ivas_error ivas_ism_enc( return error; } - vad_flag[sce_id] = st->vad_flag; + if ( st_ivas->hEncoderConfig->Opt_DTX_ON ) + { + vad_flag[sce_id] = vad_flag_dtx[sce_id][0]; + } + else + { + vad_flag[sce_id] = st->vad_flag; + } } /*------------------------------------------------------------------* - * Analysis of objects, configuration and decision about bitrates per channel + * DTX analysis *-----------------------------------------------------------------*/ - /* Metadata encoding */ - if ( st_ivas->ism_mode == ISM_MODE_PARAM ) + if ( st_ivas->hEncoderConfig->Opt_DTX_ON ) { - /* Move the Noisy speech buffer */ - for ( i = 0; i < ( PARAM_ISM_HYS_BUF_SIZE - 1 ); i++ ) - { - st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i + 1]; - } + /* compute the dominant sce_id using long term energy */ + ivas_ism_get_sce_id_dtx( st_ivas->hISMDTX, st_ivas->hSCE, st_ivas->nchan_transport, input_frame ); - /* For the current frame, make a decision based on some core-coder flags */ - if ( st_ivas->hSCE[0]->hCoreCoder[0]->flag_noisy_speech_snr && st_ivas->hSCE[1]->hCoreCoder[0]->flag_noisy_speech_snr ) - { - if ( st_ivas->hSCE[0]->hCoreCoder[0]->vad_flag || st_ivas->hSCE[1]->hCoreCoder[0]->vad_flag ) - { - st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = 0; - } - else - { - st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = 1; - } - } - else - { - st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = 0; - } + /* analysis and decision about DTX */ + dtx_flag = ivas_ism_dtx_enc( st_ivas->hISMDTX, st_ivas->hSCE, st_ivas->hEncoderConfig->ivas_total_brate, nchan_ism, st_ivas->nchan_transport, vad_flag, st_ivas->hIsmMetaData, md_diff_flag, &sid_flag ); - /* Do a decision based on hysterisis */ - st_ivas->hDirAC->hParamIsm->flag_noisy_speech = 1; - for ( i = 0; i < PARAM_ISM_HYS_BUF_SIZE; i++ ) + if ( sid_flag ) { - st_ivas->hDirAC->hParamIsm->flag_noisy_speech = st_ivas->hDirAC->hParamIsm->flag_noisy_speech && st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i]; + /* estimate coherence between objects */ + ivas_ism_coh_estim_dtx_enc( st_ivas->hISMDTX, st_ivas->hSCE, st_ivas->nchan_transport, input_frame ); } - ivas_ism_metadata_enc( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, st_ivas->hDirAC->hParamIsm ); +#ifdef DEBUG_MODE_PARAM_ISM + if ( st_ivas->hDirAC != NULL ) + dbgwrite( &( st_ivas->hDirAC->hParamIsm->flag_noisy_speech ), sizeof( int16_t ), 1, 1, "./res/ParamISM_noisy_speech_flag_enc.dat" ); + dbgwrite( &( st_ivas->hISMDTX->dtx_flag ), sizeof( int16_t ), 1, 1, "./res/ParamISM_DTX_CNG_flag_enc.dat" ); + dbgwrite( &( st_ivas->hISMDTX->sce_id_dtx ), sizeof( int16_t ), 1, input_frame, "./res/sce_id_dtx" ); + dbgwrite( &( dtx_flag ), sizeof( int16_t ), 1, input_frame, "./res/dtx_flag" ); +#endif + } + + /*------------------------------------------------------------------* + * Analysis of objects, configuration and decision about bitrates per channel + * Metadata quantization and encoding + *-----------------------------------------------------------------*/ + + if ( st_ivas->ism_mode == ISM_MODE_PARAM ) + { + ivas_param_ism_compute_noisy_speech_flag( st_ivas ); + flag_noisy_speech = st_ivas->hDirAC->hParamIsm->flag_noisy_speech; + } + + if ( dtx_flag ) + { + ivas_ism_metadata_sid_enc( st_ivas->hISMDTX, flag_noisy_speech, nchan_ism, st_ivas->nchan_transport, st_ivas->ism_mode, st_ivas->hIsmMetaData, sid_flag, md_diff_flag, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata ); + } + else if ( st_ivas->ism_mode == ISM_MODE_PARAM ) + { + // VE: call ivas_ism_metadata_enc() with 'st_ivas' - TBD + ivas_ism_metadata_enc( st_ivas->hEncoderConfig->ivas_total_brate, + nchan_ism, + st_ivas->nchan_transport, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, st_ivas->hDirAC->hParamIsm, st_ivas->hEncoderConfig->ism_extended_metadata_flag ); } else /* ISM_MODE_DISC */ { - ivas_ism_metadata_enc( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, NULL ); + ivas_ism_metadata_enc( st_ivas->hEncoderConfig->ivas_total_brate, + nchan_ism, + st_ivas->nchan_transport, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, NULL, st_ivas->hEncoderConfig->ism_extended_metadata_flag ); } + update_last_metadata( nchan_ism, st_ivas->hIsmMetaData, md_diff_flag ); + /*----------------------------------------------------------------* * Write IVAS format signaling in SID frames *----------------------------------------------------------------*/ st = st_ivas->hSCE[0]->hCoreCoder[0]; - if ( st->core_brate == SID_2k40 ) + if ( sid_flag ) { ivas_write_format_sid( st_ivas->hEncoderConfig->ivas_format, IVAS_SCE, st->hBstr ); - - /* write unused bits */ - nBits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; - while ( nBits > 0 ) - { - i = min( nBits, 16 ); - push_indice( st->hBstr, IND_UNUSED, 0, i ); - nBits -= i; - } } /*------------------------------------------------------------------* @@ -263,9 +286,12 @@ ivas_error ivas_ism_enc( * Encoder *----------------------------------------------------------------*/ - if ( ( error = ivas_core_enc( hSCE, NULL, NULL, 1, old_inp_12k8[sce_id], old_inp_16k[sce_id], Etot[sce_id], ener[sce_id], A[sce_id], Aw[sce_id], epsP[sce_id], lsp_new[sce_id], lsp_mid[sce_id], vad_hover_flag[sce_id], attack_flag[sce_id], realBuffer[sce_id], imagBuffer[sce_id], old_wsp[sce_id], loc_harm[sce_id], cor_map_sum[sce_id], vad_flag_dtx[sce_id], enerBuffer[sce_id], fft_buff[sce_id], 0, ISM_FORMAT, 0 ) ) != IVAS_ERR_OK ) + if ( !dtx_flag || ( dtx_flag && sce_id == st_ivas->hISMDTX->sce_id_dtx ) ) { - return error; + if ( ( error = ivas_core_enc( hSCE, NULL, NULL, 1, old_inp_12k8[sce_id], old_inp_16k[sce_id], ener[sce_id], A[sce_id], Aw[sce_id], epsP[sce_id], lsp_new[sce_id], lsp_mid[sce_id], vad_hover_flag[sce_id], attack_flag[sce_id], realBuffer[sce_id], imagBuffer[sce_id], old_wsp[sce_id], loc_harm[sce_id], cor_map_sum[sce_id], vad_flag_dtx[sce_id], enerBuffer[sce_id], fft_buff[sce_id], 0, ISM_FORMAT, 0 ) ) != IVAS_ERR_OK ) + { + return error; + } } /*----------------------------------------------------------------* @@ -274,9 +300,133 @@ ivas_error ivas_ism_enc( /* update input samples buffer */ mvr2r( st->input, st->old_input_signal, input_frame ); + + /* Store previous attack detection flag */ + st->hTranDet->transientDetector.prev_bIsAttackPresent = st->hTranDet->transientDetector.bIsAttackPresent; + } + + if ( dtx_flag ) + { + for ( sce_id = 0; sce_id < st_ivas->nchan_transport; sce_id++ ) + { + if ( sce_id != st_ivas->hISMDTX->sce_id_dtx ) + { + st_ivas->hSCE[sce_id]->hCoreCoder[0]->last_core = st_ivas->hSCE[st_ivas->hISMDTX->sce_id_dtx]->hCoreCoder[0]->last_core; + st_ivas->hSCE[sce_id]->hCoreCoder[0]->last_core_brate = st_ivas->hSCE[st_ivas->hISMDTX->sce_id_dtx]->hCoreCoder[0]->core_brate; + st_ivas->hSCE[sce_id]->hCoreCoder[0]->last_L_frame = st_ivas->hSCE[st_ivas->hISMDTX->sce_id_dtx]->hCoreCoder[0]->last_L_frame; + } + } } - wmops_sub_end(); +#ifdef DEBUG_MODE_INFO + if ( dtx_flag ) + { + float tmpF; + int16_t id, n; + + n = 0; + for ( sce_id = 0; sce_id < st_ivas->nchan_transport; sce_id++ ) + { + if ( sce_id != st_ivas->hISMDTX->sce_id_dtx ) + { + st = st_ivas->hSCE[sce_id]->hCoreCoder[0]; + id = st->id_element; + + dbgwrite( &st->core, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "core", n, id, ENC ) ); + dbgwrite( &st->extl, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "extl", n, id, ENC ) ); + dbgwrite( &st->bwidth, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "bwidth", n, id, ENC ) ); + tmpF = st->total_brate / 1000.0f; + dbgwrite( &tmpF, sizeof( float ), 1, input_frame, fname( debug_dir, "total_brate", n, id, ENC ) ); + tmpF = st->core_brate / 1000.0f; + dbgwrite( &tmpF, sizeof( float ), 1, input_frame, fname( debug_dir, "core_brate", n, id, ENC ) ); + tmpF = st->extl_brate / 1000.0f; + dbgwrite( &tmpF, sizeof( float ), 1, input_frame, fname( debug_dir, "extl_brate", n, id, ENC ) ); + + dbgwrite( &st->coder_type, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "coder_type", n, id, ENC ) ); + dbgwrite( &st->coder_type_raw, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "coder_type_raw", n, id, ENC ) ); + dbgwrite( &st->vad_flag, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "vad_flag", n, id, ENC ) ); + dbgwrite( &st->localVAD, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "localVAD", n, id, ENC ) ); + + dbgwrite( &st->lp_noise, sizeof( float ), 1, input_frame, fname( debug_dir, "lp_noise", n, id, ENC ) ); + } + } + } +#endif + pop_wmops(); + + return error; +} + + +/*------------------------------------------------------------------------- + * ivas_ism_enc_config() + * + * - select ISM format mode + * - reconfigure the ISM format encoder + *-------------------------------------------------------------------------*/ + +ivas_error ivas_ism_enc_config( + Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */ +) +{ + ivas_error error; + ISM_MODE last_ism_mode; + int16_t nchan_transport_old; + int16_t nSCE_old, nCPE_old; + + error = IVAS_ERR_OK; + last_ism_mode = st_ivas->ism_mode; + + /* select ISM format mode */ + st_ivas->ism_mode = ivas_ism_mode_select( st_ivas->hEncoderConfig->nchan_inp, st_ivas->hEncoderConfig->ivas_total_brate ); + + /* ISM bit-rate switching */ + if ( ( st_ivas->ism_mode != last_ism_mode ) || ( st_ivas->hEncoderConfig->ivas_total_brate != st_ivas->hEncoderConfig->last_ivas_total_brate ) ) + { + int32_t element_brate_tmp[MAX_NUM_OBJECTS]; + + nchan_transport_old = st_ivas->nchan_transport; + + /* Reset and Initialize */ + if ( st_ivas->ism_mode == ISM_MODE_PARAM ) + { + st_ivas->nchan_transport = MAX_PARAM_ISM_WAVE; + } + else + { + st_ivas->nchan_transport = st_ivas->hEncoderConfig->nchan_inp; + } + + nCPE_old = st_ivas->nCPE; + nSCE_old = st_ivas->nSCE; + st_ivas->nSCE = st_ivas->nchan_transport; + st_ivas->nCPE = 0; + + if ( ( error = ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hEncoderConfig->nchan_inp, NULL, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK ) + { + return error; + } + + if ( ( error = ivas_corecoder_enc_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old, st_ivas->hEncoderConfig->ivas_total_brate / st_ivas->nchan_transport, ( st_ivas->hEncoderConfig->ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS, MC_MODE_NONE ) ) != IVAS_ERR_OK ) + { + return error; + } + + if ( st_ivas->ism_mode == ISM_MODE_PARAM && last_ism_mode == ISM_MODE_DISC ) + { + /* Allocate and Initialize the memory used by ParamISM when switch from Discrete ISM */ + if ( ( error = ivas_param_ism_enc_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + if ( st_ivas->ism_mode == ISM_MODE_DISC && last_ism_mode == ISM_MODE_PARAM ) + { + /* Deallocate the memory used by ParamISM when switch to Discrete ISM */ + ivas_param_ism_enc_close( &( st_ivas->hDirAC ), st_ivas->hEncoderConfig->input_Fs ); + } + } return error; } diff --git a/lib_enc/ivas_ism_metadata_enc.c b/lib_enc/ivas_ism_metadata_enc.c index c4fcd2dee7..e9e40a574c 100644 --- a/lib_enc/ivas_ism_metadata_enc.c +++ b/lib_enc/ivas_ism_metadata_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,34 +42,52 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------* * Local constants *-----------------------------------------------------------------------*/ -#define ISM_NUM_PARAM 2 /* number of coded metadata parameters */ +#define ISM_NUM_PARAM 5 /* number of coded metadata parameters */ #define ISM_MAX_AZIMUTH_DIFF_IDX ( ISM_AZIMUTH_NBITS - 1 /*zero*/ - 1 /*sign*/ ) #define ISM_MAX_ELEVATION_DIFF_IDX ( ISM_ELEVATION_NBITS - 1 /*zero*/ - 1 /*sign*/ ) +#define ISM_MAX_RADIUS_DIFF_IDX ( ISM_RADIUS_NBITS - 1 /*zero*/ - 1 /*sign*/ ) #define ISM_FEC_MAX 10 +#ifdef FIX_387_ISM_MD_FEC +#define ISM_MD_FEC_DIFF 10 +#define ISM_MD_INC_DIFF_CNT_MAX 6 +#define ISM_MD_FEC_CNT_MAX 25 +#endif #define INTER_OBJECT_PARAM_CHECK ( ( ISM_FEC_MAX / 2 ) - 2 ) /* note: constant must be less than (ISM_FEC_MAX / number of coded parameters) */ +/*-----------------------------------------------------------------------* + * Local function declarations + *-----------------------------------------------------------------------*/ + +static void encode_angle_indices( BSTR_ENC_HANDLE hBstr, ISM_METADATA_ANGLE_HANDLE angle, const int16_t last_ism_metadata_flag, const int16_t ini_frame, const int16_t idx_angle1_abs, const int16_t idx_angle2_abs, int16_t *flag_abs_angle1, int16_t *flag_abs_angle2 ); + +static void encode_radius( BSTR_ENC_HANDLE hBstr, int16_t *last_radius_idx, int16_t *radius_diff_cnt, const int16_t last_ism_metadata_flag, const int16_t idx_radius_abs, int16_t *flag_abs_radius ); + + /*-------------------------------------------------------------------------* - * set_ism_metadata() + * ivas_set_ism_metadata() * - * Set metadata of for one ISM + * Set metadata of one ISM MD handle *-------------------------------------------------------------------------*/ -/*! r: 0 if success */ -ivas_error set_ism_metadata( - ISM_METADATA_HANDLE hIsmMeta, - float azimuth, - float elevation ) +ivas_error ivas_set_ism_metadata( + ISM_METADATA_HANDLE hIsmMeta, /* o : ISM metadata handle */ + const float azimuth, /* i : azimuth value */ + const float elevation, /* i : elevation */ + const float radius_meta, /* i : radius */ + const float yaw, /* i : yaw */ + const float pitch /* i : pitch */ +) { if ( hIsmMeta == NULL ) { @@ -81,6 +99,9 @@ ivas_error set_ism_metadata( /* save read metadata parameters to the internal codec structure */ hIsmMeta->azimuth = azimuth; hIsmMeta->elevation = elevation; + hIsmMeta->radius = radius_meta; + hIsmMeta->yaw = yaw; + hIsmMeta->pitch = pitch; return IVAS_ERR_OK; } @@ -89,7 +110,7 @@ ivas_error set_ism_metadata( /*-------------------------------------------------------------------------* * rate_ism_importance() * - * Rate importance of particular ISm streams + * Rate importance of particular ISM streams *-------------------------------------------------------------------------*/ static void rate_ism_importance( @@ -105,7 +126,6 @@ static void rate_ism_importance( { ctype = hSCE[ch]->hCoreCoder[0]->coder_type_raw; -#ifdef FIX_ISM_INACTIVE_BITS if ( hSCE[ch]->hCoreCoder[0]->tcxonly ) { if ( hSCE[ch]->hCoreCoder[0]->localVAD == 0 ) @@ -117,7 +137,6 @@ static void rate_ism_importance( ctype = GENERIC; } } -#endif if ( hIsmMeta[ch]->ism_metadata_flag == 0 ) { @@ -140,6 +159,7 @@ static void rate_ism_importance( return; } + /*-------------------------------------------------------------------------* * ivas_ism_metadata_enc() * @@ -147,64 +167,53 @@ static void rate_ism_importance( *-------------------------------------------------------------------------*/ ivas_error ivas_ism_metadata_enc( - const int32_t ism_total_brate, /* i : ISms total bitrate */ - const int16_t nchan_transport, /* i : number of transport channels */ - ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ - SCE_ENC_HANDLE hSCE[], /* i/o: SCE encoder handles */ - BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */ - int16_t nb_bits_metadata[], /* o : number of metadata bits */ - const int16_t localVAD[], /* i : VAD flag */ - const int16_t ism_mode, /* i : ISM mode */ - const PARAM_ISM_CONFIG_HANDLE hParamIsm /* i : Param ISM Enc Handle */ + const int32_t ism_total_brate, /* i : ISM total bitrate */ + const int16_t nchan_ism, /* i : number of ISM channels */ + const int16_t nchan_transport, /* i : number of transport channels */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + SCE_ENC_HANDLE hSCE[], /* i/o: SCE encoder handles */ + BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */ + int16_t nb_bits_metadata[], /* o : number of metadata bits */ + const int16_t localVAD[], /* i : VAD flag */ + const int16_t ism_mode, /* i : ISM mode */ + const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Enc Handle */ + const int16_t ism_extended_metadata_flag /* i : Extended metadata flag */ ) { - int16_t i, ch, nb_bits_start = 0, diff; - int16_t idx_azimuth, idx_azimuth_abs = 0, flag_abs_azimuth[MAX_NUM_OBJECTS], nbits_diff_azimuth; - int16_t idx_elevation, idx_elevation_abs = 0, flag_abs_elevation[MAX_NUM_OBJECTS], nbits_diff_elevation; + int16_t i, ch, nb_bits_start = 0; + int16_t flag_abs_azimuth[MAX_NUM_OBJECTS]; + int16_t flag_abs_elevation[MAX_NUM_OBJECTS]; + int16_t idx_angle1_abs = 0; + int16_t idx_angle2_abs = 0; + int16_t flag_abs_yaw[MAX_NUM_OBJECTS]; + int16_t flag_abs_pitch[MAX_NUM_OBJECTS]; + int16_t idx_radius_abs = 0, flag_abs_radius[MAX_NUM_OBJECTS]; float valQ; ISM_METADATA_HANDLE hIsmMetaData; int32_t element_brate[MAX_NUM_OBJECTS], total_brate[MAX_NUM_OBJECTS]; int16_t ism_metadata_flag_global; int16_t ism_imp[MAX_NUM_OBJECTS]; - int16_t num_obj, nbands, nblocks; + int16_t nbands, nblocks; ivas_error error; error = IVAS_ERR_OK; - wmops_sub_start( "ism_meta_enc" ); - - if ( ism_mode == ISM_MODE_PARAM ) - { - num_obj = hParamIsm->num_obj; - } - else if ( ism_mode == ISM_MODE_DISC ) - { - num_obj = nchan_transport; - } - else - { - return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: incorrect ISM mode" ); - } - - if ( num_obj == 1 && ( hSCE[0]->hCoreCoder[0]->core_brate == SID_2k40 || hSCE[0]->hCoreCoder[0]->core_brate == FRAME_NO_DATA ) && ( ism_mode == ISM_MODE_DISC ) ) - { - /* no metadata encoding in CNG */ - wmops_sub_end(); - - return error; - } + push_wmops( "ism_meta_enc" ); /* initialization */ ism_metadata_flag_global = 0; set_s( nb_bits_metadata, 0, nchan_transport ); - set_s( flag_abs_azimuth, 0, num_obj ); - set_s( flag_abs_elevation, 0, num_obj ); + set_s( flag_abs_azimuth, 0, nchan_ism ); + set_s( flag_abs_elevation, 0, nchan_ism ); + set_s( flag_abs_yaw, 0, nchan_ism ); + set_s( flag_abs_pitch, 0, nchan_ism ); + set_s( flag_abs_radius, 0, nchan_ism ); /*----------------------------------------------------------------* * Set Metadata presence / importance flag *----------------------------------------------------------------*/ - for ( ch = 0; ch < num_obj; ch++ ) + for ( ch = 0; ch < nchan_ism; ch++ ) { if ( ism_mode == ISM_MODE_PARAM ) { @@ -212,72 +221,72 @@ ivas_error ivas_ism_metadata_enc( } else if ( ism_mode == ISM_MODE_DISC ) { - hIsmMeta[ch]->ism_metadata_flag = localVAD[ch]; + hIsmMeta[ch]->ism_metadata_flag = localVAD[ch] || hSCE[ch]->hCoreCoder[0]->lp_noise > 10; +#ifdef FIX_387_ISM_MD_FEC + /* in inactive frames, send MD 1) in ISM_MD_INC_DIFF_CNT_MAX consecutive frames when MD significantly change, 2) at least every ISM_MD_FEC_DIFF frames */ if ( hIsmMeta[ch]->ism_metadata_flag == 0 ) { - /* send metadata even in inactive segments when noise is audible and metadata are changing */ - diff = (int16_t) fabsf( hIsmMeta[ch]->azimuth - ism_dequant_meta( hIsmMeta[ch]->last_azimuth_idx, ism_azimuth_borders, 1 << ISM_AZIMUTH_NBITS ) ); - diff = max( diff, (int16_t) fabsf( hIsmMeta[ch]->elevation - ism_dequant_meta( hIsmMeta[ch]->last_elevation_idx, ism_elevation_borders, 1 << ISM_ELEVATION_NBITS ) ) ); - - if ( hSCE[ch]->hCoreCoder[0]->lp_noise > 15 && diff >= 10 ) + if ( ( fabsf( hIsmMeta[ch]->azimuth - hIsmMeta[ch]->last_true_azimuth ) > ISM_MD_FEC_DIFF ) || + ( fabsf( hIsmMeta[ch]->elevation - hIsmMeta[ch]->last_true_elevation ) > ISM_MD_FEC_DIFF ) ) { hIsmMeta[ch]->ism_metadata_flag = 1; + hIsmMeta[ch]->ism_md_inc_diff_cnt = 0; } - } + else if ( hIsmMeta[ch]->ism_md_inc_diff_cnt < ISM_MD_INC_DIFF_CNT_MAX ) + { + hIsmMeta[ch]->ism_metadata_flag = 1; - if ( hSCE[ch]->hCoreCoder[0]->tcxonly ) - { - /* at highest bitrates (with TCX core only) metadata are sent in every frame */ - hIsmMeta[ch]->ism_metadata_flag = 1; + if ( hIsmMeta[ch]->ism_md_inc_diff_cnt % 2 == 0 ) + { + hIsmMeta[ch]->position_angle.angle1_diff_cnt = ISM_FEC_MAX; + } + else + { + hIsmMeta[ch]->position_angle.angle2_diff_cnt = ISM_FEC_MAX; + } + } + else if ( hIsmMeta[ch]->ism_md_fec_cnt_enc == ISM_MD_FEC_CNT_MAX ) + { + hIsmMeta[ch]->ism_metadata_flag = 1; + hIsmMeta[ch]->position_angle.angle1_diff_cnt = ISM_FEC_MAX; + } } +#endif } } /*----------------------------------------------------------------* - * Rate importance of particular ISm streams + * Rate importance of particular ISM streams *----------------------------------------------------------------*/ rate_ism_importance( nchan_transport, hIsmMeta, hSCE, ism_imp ); - /* relax the importance decision in "stereo" coding for noisy audio */ - if ( ism_mode == ISM_MODE_DISC && num_obj == 2 ) - { - float diff_F; - - if ( hIsmMeta[0]->ism_metadata_flag ^ hIsmMeta[1]->ism_metadata_flag ) - { - for ( ch = 0; ch < num_obj; ch++ ) - { - diff_F = hSCE[ch]->hCoreCoder[0]->lp_speech - hSCE[ch]->hCoreCoder[0]->lp_noise; - - if ( hIsmMeta[ch]->ism_metadata_flag == 0 && diff_F < 25.0f ) - { - hIsmMeta[ch]->ism_metadata_flag = 1; - ism_imp[ch] = ISM_LOW_IMP; - } - } - } - } /*----------------------------------------------------------------* - * Write ISm common signaling + * Write ISM common signaling *----------------------------------------------------------------*/ /* write number of objects - unary coding */ - for ( ch = 1; ch < num_obj; ch++ ) + for ( ch = 1; ch < nchan_ism; ch++ ) { push_indice( hBstr, IND_ISM_NUM_OBJECTS, 1, 1 ); } push_indice( hBstr, IND_ISM_NUM_OBJECTS, 0, 1 ); - /* write ISm metadata flag (one per object) */ + /* write extended metadata presence flag */ + if ( ism_total_brate >= ISM_EXTENDED_METADATA_BRATE ) + { + push_indice( hBstr, IND_ISM_EXTENDED_FLAG, ism_extended_metadata_flag, ISM_EXTENDED_METADATA_BITS ); + } + + /* write ISM metadata flag (one per object) */ for ( ch = 0; ch < nchan_transport; ch++ ) { push_indice( hBstr, IND_ISM_METADATA_FLAG, ism_imp[ch], ISM_METADATA_FLAG_BITS ); } - for ( ch = 0; ch < num_obj; ch++ ) + for ( ch = 0; ch < nchan_ism; ch++ ) { ism_metadata_flag_global |= hIsmMeta[ch]->ism_metadata_flag; } @@ -309,7 +318,7 @@ ivas_error ivas_ism_metadata_enc( nb_bits_start = hBstr->nb_bits_tot; } - for ( ch = 0; ch < num_obj; ch++ ) + for ( ch = 0; ch < nchan_ism; ch++ ) { hIsmMetaData = hIsmMeta[ch]; if ( ism_mode == ISM_MODE_DISC ) @@ -320,249 +329,47 @@ ivas_error ivas_ism_metadata_enc( if ( hIsmMeta[ch]->ism_metadata_flag ) { /*----------------------------------------------------------------* - * Azimuth quantization and encoding + * Quantize and encode azimuth and elevation *----------------------------------------------------------------*/ - /* Azimuth quantization (quantize azimuth to the AZIMUTH_NBITS-bit index */ if ( ism_mode == ISM_MODE_DISC ) { - idx_azimuth_abs = ism_quant_meta( hIsmMetaData->azimuth, &valQ, ism_azimuth_borders, 1 << ISM_AZIMUTH_NBITS ); - } - else if ( ism_mode == ISM_MODE_PARAM ) - { - idx_azimuth_abs = hParamIsm->azi_index[ch]; - } - idx_azimuth = idx_azimuth_abs; - - nbits_diff_azimuth = 0; - - flag_abs_azimuth[ch] = 0; /* differential coding by default */ - if ( hIsmMetaData->azimuth_diff_cnt == ISM_FEC_MAX /* make differential encoding in ISM_FEC_MAX consecutive frames at maximum (in order to control the decoding in FEC) */ - || hIsmMetaData->last_ism_metadata_flag == 0 /* If last frame had no metadata coded, do not use differential coding */ - ) - { - flag_abs_azimuth[ch] = 1; + idx_angle1_abs = ism_quant_meta( hIsmMetaData->azimuth, &valQ, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS ); + idx_angle2_abs = ism_quant_meta( hIsmMetaData->elevation, &valQ, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS ); } - - /* try differential coding */ - if ( flag_abs_azimuth[ch] == 0 ) - { - diff = idx_azimuth_abs - hIsmMetaData->last_azimuth_idx; - - /* azimuth is on a circle - check for diff coding for -180° -> 180° and vice versa changes */ - if ( abs( diff ) > ( ( 1 << ISM_AZIMUTH_NBITS ) - 1 ) - ISM_MAX_AZIMUTH_DIFF_IDX ) - { - if ( diff > 0 ) - { - diff -= ( 1 << ISM_AZIMUTH_NBITS ) - 1; - } - else - { - diff += ( 1 << ISM_AZIMUTH_NBITS ) - 1; - } - } - - if ( diff == 0 ) - { - idx_azimuth = 0; - nbits_diff_azimuth = 1; - } - else if ( ABSVAL( diff ) < ISM_MAX_AZIMUTH_DIFF_IDX ) /* when diff bits >= abs bits, prefer abs */ - { - idx_azimuth = 1 << 1; - nbits_diff_azimuth = 1; - - if ( diff < 0 ) - { - idx_azimuth += 1; /* negative sign */ - diff *= -1; - } - else - { - idx_azimuth += 0; /* positive sign */ - } - - idx_azimuth = idx_azimuth << diff; - nbits_diff_azimuth++; - - /* unary coding of "diff */ - idx_azimuth += ( ( 1 << diff ) - 1 ); - nbits_diff_azimuth += diff; - - if ( nbits_diff_azimuth < ISM_AZIMUTH_NBITS - 1 ) - { - /* add stop bit - only for codewords shorter than ISM_AZIMUTH_NBITS */ - idx_azimuth = idx_azimuth << 1; - nbits_diff_azimuth++; - } - } - else - { - flag_abs_azimuth[ch] = 1; - } - } - - /* update counter */ - if ( flag_abs_azimuth[ch] == 0 ) - { - hIsmMetaData->azimuth_diff_cnt++; - hIsmMetaData->elevation_diff_cnt = min( hIsmMetaData->elevation_diff_cnt, ISM_FEC_MAX ); - } - else + else /* ISM_MODE_PARAM */ { - hIsmMetaData->azimuth_diff_cnt = 0; + idx_angle1_abs = hParamIsm->azi_index[ch]; + idx_angle2_abs = hParamIsm->ele_index[ch]; } - /* Write azimuth */ - push_indice( hBstr, IND_ISM_AZIMUTH_DIFF_FLAG, flag_abs_azimuth[ch], 1 ); - - if ( flag_abs_azimuth[ch] ) - { - push_indice( hBstr, IND_ISM_AZIMUTH, idx_azimuth, ISM_AZIMUTH_NBITS ); - } - else - { - push_indice( hBstr, IND_ISM_AZIMUTH, idx_azimuth, nbits_diff_azimuth ); - } + encode_angle_indices( hBstr, &( hIsmMetaData->position_angle ), hIsmMetaData->last_ism_metadata_flag, hSCE[0]->hCoreCoder[0]->ini_frame, idx_angle1_abs, idx_angle2_abs, &flag_abs_azimuth[ch], &flag_abs_elevation[ch] ); /*----------------------------------------------------------------* - * Elevation quantization and encoding + * Quantize and encode radius, yaw, and pitch *----------------------------------------------------------------*/ - /* Elevation quantization (quantize azimuth to the ELEVATION_NBITS-bit index */ - if ( ism_mode == ISM_MODE_DISC ) - { - idx_elevation_abs = ism_quant_meta( hIsmMetaData->elevation, &valQ, ism_elevation_borders, 1 << ISM_ELEVATION_NBITS ); - } - else /* ISM_MODE_PARAM */ + if ( ism_mode == ISM_MODE_DISC && ism_extended_metadata_flag ) { - idx_elevation_abs = hParamIsm->ele_index[ch]; - } - idx_elevation = idx_elevation_abs; - - nbits_diff_elevation = 0; + idx_angle1_abs = ism_quant_meta( hIsmMetaData->yaw, &valQ, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS ); + idx_angle2_abs = ism_quant_meta( hIsmMetaData->pitch, &valQ, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS ); + idx_radius_abs = usquant( hIsmMetaData->radius, &valQ, ISM_RADIUS_MIN, ISM_RADIUS_DELTA, 1 << ISM_RADIUS_NBITS ); - flag_abs_elevation[ch] = 0; /* differential coding by default */ - if ( hIsmMetaData->elevation_diff_cnt == ISM_FEC_MAX /* make differential encoding in ISM_FEC_MAX consecutive frames at maximum (in order to control the decoding in FEC) */ - || hIsmMetaData->last_ism_metadata_flag == 0 /* If last frame had no metadata coded, do not use differential coding */ - ) - { - flag_abs_elevation[ch] = 1; - } - - /* note: elevation is coded starting from the second frame only (it is meaningless in the init_frame) */ - if ( hSCE[0]->hCoreCoder[0]->ini_frame == 0 ) - { - flag_abs_elevation[ch] = 1; - hIsmMetaData->last_elevation_idx = idx_elevation_abs; + encode_angle_indices( hBstr, &( hIsmMetaData->orientation_angle ), hIsmMetaData->last_ism_metadata_flag, hSCE[0]->hCoreCoder[0]->ini_frame, idx_angle1_abs, idx_angle2_abs, &flag_abs_yaw[ch], &flag_abs_pitch[ch] ); + encode_radius( hBstr, &hIsmMetaData->last_radius_idx, &hIsmMetaData->radius_diff_cnt, hIsmMetaData->last_ism_metadata_flag, idx_radius_abs, &flag_abs_radius[ch] ); } - diff = idx_elevation_abs - hIsmMetaData->last_elevation_idx; - - /* avoid absolute coding of elevation if absolute coding was already used for azimuth */ - if ( flag_abs_azimuth[ch] == 1 ) - { - int16_t diff_orig = diff; - - flag_abs_elevation[ch] = 0; - - - if ( diff >= 0 ) - { - diff = min( diff, ISM_MAX_ELEVATION_DIFF_IDX ); - } - else - { - diff = -1 * min( -diff, ISM_MAX_ELEVATION_DIFF_IDX ); - } - - if ( hIsmMetaData->last_ism_metadata_flag == 0 || abs( diff_orig - diff ) > ISM_MAX_ELEVATION_DIFF_IDX ) - { - hIsmMetaData->elevation_diff_cnt = ISM_FEC_MAX - 1; - } - } - - /* try differential coding */ - if ( flag_abs_elevation[ch] == 0 ) - { - if ( diff == 0 ) - { - idx_elevation = 0; - nbits_diff_elevation = 1; - } - else if ( ABSVAL( diff ) <= ISM_MAX_ELEVATION_DIFF_IDX ) - { - idx_elevation = 1 << 1; - nbits_diff_elevation = 1; - - if ( diff < 0 ) - { - idx_elevation += 1; /* negative sign */ - diff *= -1; - } - else - { - idx_elevation += 0; /* positive sign */ - } - - idx_elevation = idx_elevation << diff; - nbits_diff_elevation++; - - /* unary coding of "diff */ - idx_elevation += ( ( 1 << diff ) - 1 ); - nbits_diff_elevation += diff; - - if ( nbits_diff_elevation < ISM_ELEVATION_NBITS ) - { - /* add stop bit */ - idx_elevation = idx_elevation << 1; - nbits_diff_elevation++; - } - } - else - { - flag_abs_elevation[ch] = 1; - } - } - - /* update counter */ - if ( flag_abs_elevation[ch] == 0 ) - { - hIsmMetaData->elevation_diff_cnt++; - hIsmMetaData->elevation_diff_cnt = min( hIsmMetaData->elevation_diff_cnt, ISM_FEC_MAX ); - } - else - { - hIsmMetaData->elevation_diff_cnt = 0; - } - - /* Write elevation */ - if ( flag_abs_azimuth[ch] == 0 ) /* do not write "flag_abs_elevation" if "flag_abs_azimuth == 1" */ - { - push_indice( hBstr, IND_ISM_ELEVATION_DIFF_FLAG, flag_abs_elevation[ch], 1 ); - } - - if ( flag_abs_elevation[ch] ) - { - push_indice( hBstr, IND_ISM_ELEVATION, idx_elevation, ISM_ELEVATION_NBITS ); - } - else - { - push_indice( hBstr, IND_ISM_ELEVATION, idx_elevation, nbits_diff_elevation ); - } - - /*----------------------------------------------------------------* - * Updates - *----------------------------------------------------------------*/ - - hIsmMetaData->last_azimuth_idx = idx_azimuth_abs; - hIsmMetaData->last_elevation_idx = idx_elevation_abs; - /* save number of metadata bits written */ if ( ism_mode == ISM_MODE_DISC ) { nb_bits_metadata[ch] = hBstr->nb_bits_tot - nb_bits_start; } + +#ifdef FIX_387_ISM_MD_FEC + /* Updates */ + hIsmMeta[ch]->last_true_azimuth = hIsmMeta[ch]->azimuth; + hIsmMeta[ch]->last_true_elevation = hIsmMeta[ch]->elevation; +#endif } } @@ -572,12 +379,12 @@ ivas_error ivas_ism_metadata_enc( *----------------------------------------------------------------*/ i = 0; - while ( i == 0 || i < num_obj / INTER_OBJECT_PARAM_CHECK ) + while ( i == 0 || i < nchan_ism / INTER_OBJECT_PARAM_CHECK ) { int16_t num, abs_num, abs_first, abs_next, pos_zero; - int16_t abs_matrice[INTER_OBJECT_PARAM_CHECK * 2]; + int16_t abs_matrice[INTER_OBJECT_PARAM_CHECK * ISM_NUM_PARAM]; - num = min( INTER_OBJECT_PARAM_CHECK, num_obj - i * INTER_OBJECT_PARAM_CHECK ); + num = min( INTER_OBJECT_PARAM_CHECK, nchan_ism - i * INTER_OBJECT_PARAM_CHECK ); i++; set_s( abs_matrice, 0, INTER_OBJECT_PARAM_CHECK * ISM_NUM_PARAM ); @@ -623,12 +430,12 @@ ivas_error ivas_ism_metadata_enc( if ( abs_next % ISM_NUM_PARAM == 0 ) { - hIsmMeta[ch]->azimuth_diff_cnt = abs_num - 1; + hIsmMeta[ch]->position_angle.angle1_diff_cnt = abs_num - 1; } if ( abs_next % ISM_NUM_PARAM == 1 ) { - hIsmMeta[ch]->elevation_diff_cnt = abs_num - 1; + hIsmMeta[ch]->position_angle.angle2_diff_cnt = abs_num - 1; /*hIsmMeta[ch]->elevation_diff_cnt = min( hIsmMeta[ch]->elevation_diff_cnt, ISM_FEC_MAX );*/ } @@ -691,18 +498,39 @@ ivas_error ivas_ism_metadata_enc( * Configuration and decision about bitrates per channel *----------------------------------------------------------------*/ - ivas_ism_config( ism_total_brate, nchan_transport, num_obj, hIsmMeta, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata ); + if ( ( error = ivas_ism_config( ism_total_brate, nchan_transport, nchan_ism, hIsmMeta, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata ) ) != IVAS_ERR_OK ) + { + return error; + } - for ( ch = 0; ch < num_obj; ch++ ) + for ( ch = 0; ch < nchan_ism; ch++ ) { hIsmMeta[ch]->last_ism_metadata_flag = hIsmMeta[ch]->ism_metadata_flag; + +#ifdef FIX_387_ISM_MD_FEC + if ( hIsmMeta[ch]->ism_metadata_flag == 0 ) + { + hIsmMeta[ch]->ism_md_fec_cnt_enc++; + } + else + { + hIsmMeta[ch]->ism_md_fec_cnt_enc = 0; + } + hIsmMeta[ch]->ism_md_inc_diff_cnt++; + hIsmMeta[ch]->ism_md_inc_diff_cnt = min( hIsmMeta[ch]->ism_md_inc_diff_cnt, ISM_MD_INC_DIFF_CNT_MAX ); +#endif } for ( ch = 0; ch < nchan_transport; ch++ ) { +#ifdef FIX_419_ISM_BRATE_SW_DTX + hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0; +#endif if ( ism_mode == ISM_MODE_DISC ) { +#ifndef FIX_419_ISM_BRATE_SW_DTX hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0; +#endif if ( hIsmMeta[ch]->ism_metadata_flag == 0 && localVAD[ch] == 0 && ism_metadata_flag_global ) { hSCE[ch]->hCoreCoder[0]->low_rate_mode = 1; @@ -719,28 +547,30 @@ ivas_error ivas_ism_metadata_enc( } } - wmops_sub_end(); + pop_wmops(); return error; } + /*------------------------------------------------------------------------- - * create_ism_metadata_enc() + * ivas_ism_metadata_enc_create() * - * Create, allocate, initialize and configure IVAS encoder ISM handles + * Create, allocate, initialize and configure IVAS encoder ISM metadata handles *-------------------------------------------------------------------------*/ -ivas_error create_ism_metadata_enc( +ivas_error ivas_ism_metadata_enc_create( Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */ const int16_t n_ISms, /* i : number of objects */ int32_t element_brate_tmp[] /* o : element bitrate per object */ ) { int16_t ch, nchan_transport; + ivas_error error; if ( st_ivas->ism_mode == ISM_MODE_PARAM ) { - nchan_transport = 2; + nchan_transport = MAX_PARAM_ISM_WAVE; } else { @@ -751,24 +581,540 @@ ivas_error create_ism_metadata_enc( st_ivas->nSCE = nchan_transport; st_ivas->nCPE = 0; - /* allocate ISm metadata handles */ + /* allocate ISM metadata handles */ for ( ch = 0; ch < n_ISms; ch++ ) { - if ( ( st_ivas->hIsmMetaData[ch] = (ISM_METADATA_HANDLE) count_malloc( sizeof( ISM_METADATA_FRAME ) ) ) == NULL ) + if ( ( st_ivas->hIsmMetaData[ch] = (ISM_METADATA_HANDLE) malloc( sizeof( ISM_METADATA_FRAME ) ) ) == NULL ) { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ISm MetaData\n" ) ); + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ISM MetaData\n" ) ); } - - st_ivas->hIsmMetaData[ch]->last_azimuth_idx = 0; - st_ivas->hIsmMetaData[ch]->azimuth_diff_cnt = ISM_FEC_MAX; - st_ivas->hIsmMetaData[ch]->last_elevation_idx = 0; - st_ivas->hIsmMetaData[ch]->elevation_diff_cnt = ISM_FEC_MAX - 1; + st_ivas->hIsmMetaData[ch]->position_angle.last_angle1_idx = 0; + st_ivas->hIsmMetaData[ch]->position_angle.angle1_diff_cnt = ISM_FEC_MAX; + st_ivas->hIsmMetaData[ch]->position_angle.last_angle2_idx = 0; + st_ivas->hIsmMetaData[ch]->position_angle.angle2_diff_cnt = ISM_FEC_MAX - 1; + st_ivas->hIsmMetaData[ch]->orientation_angle.last_angle1_idx = 0; + st_ivas->hIsmMetaData[ch]->orientation_angle.angle1_diff_cnt = ISM_FEC_MAX - 2; + st_ivas->hIsmMetaData[ch]->orientation_angle.last_angle2_idx = 0; + st_ivas->hIsmMetaData[ch]->orientation_angle.angle2_diff_cnt = ISM_FEC_MAX - 2; + st_ivas->hIsmMetaData[ch]->last_radius_idx = 0; + st_ivas->hIsmMetaData[ch]->radius_diff_cnt = ISM_FEC_MAX - 2; st_ivas->hIsmMetaData[ch]->last_ism_metadata_flag = 0; ivas_ism_reset_metadata( st_ivas->hIsmMetaData[ch] ); + + st_ivas->hIsmMetaData[ch]->last_azimuth = 0.0f; + st_ivas->hIsmMetaData[ch]->last_elevation = 0.0f; + +#ifdef FIX_387_ISM_MD_FEC + st_ivas->hIsmMetaData[ch]->last_true_azimuth = 0.0f; + st_ivas->hIsmMetaData[ch]->last_true_elevation = 0.0f; + st_ivas->hIsmMetaData[ch]->ism_md_fec_cnt_enc = 0; + st_ivas->hIsmMetaData[ch]->ism_md_inc_diff_cnt = ISM_MD_INC_DIFF_CNT_MAX; +#endif } - ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, nchan_transport, n_ISms, NULL, NULL, NULL, element_brate_tmp, NULL, NULL ); + if ( ( error = ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, nchan_transport, n_ISms, NULL, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK ) + { + return error; + } return IVAS_ERR_OK; } + + +/*------------------------------------------------------------------------- + * encode_radius() + * + * Radius index encoding + *-------------------------------------------------------------------------*/ + +static void encode_radius( + BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */ + int16_t *last_radius_idx, /* i/o: last radius index */ + int16_t *radius_diff_cnt, /* i/o: radius diff coding counter */ + const int16_t last_ism_metadata_flag, /* last frame ism_metadata_flag */ + const int16_t idx_radius_abs, /* i : Azimuth index */ + int16_t *flag_abs_radius /* o : Radius encoding mode */ +) +{ + int16_t idx_radius, nbits_diff_radius, diff; + + idx_radius = idx_radius_abs; + nbits_diff_radius = 0; + *flag_abs_radius = 0; /* differential coding by default */ + + if ( *radius_diff_cnt == ISM_FEC_MAX /* make differential encoding in ISM_FEC_MAX consecutive frames at maximum (in order to control the decoding in FEC) */ + || last_ism_metadata_flag == 0 /* If last frame had no metadata coded, do not use differential coding */ + ) + { + *flag_abs_radius = 1; + } + + diff = idx_radius_abs - *last_radius_idx; + + /* try differential coding */ + if ( *flag_abs_radius == 0 ) + { + if ( diff == 0 ) + { + idx_radius = 0; + nbits_diff_radius = 1; + } + else if ( ABSVAL( diff ) <= ISM_MAX_RADIUS_DIFF_IDX ) + { + idx_radius = 1 << 1; + nbits_diff_radius = 1; + + if ( diff < 0 ) + { + idx_radius += 1; /* negative sign */ + diff *= -1; + } + else + { + idx_radius += 0; /* positive sign */ + } + + idx_radius = idx_radius << diff; + nbits_diff_radius++; + + /* unary coding of "diff */ + idx_radius += ( ( 1 << diff ) - 1 ); + nbits_diff_radius += diff; + + if ( nbits_diff_radius < ISM_RADIUS_NBITS ) + { + /* add stop bit */ + idx_radius = idx_radius << 1; + nbits_diff_radius++; + } + } + else + { + *flag_abs_radius = 1; + } + } + + /* update counter */ + if ( *flag_abs_radius == 0 ) + { + ( *radius_diff_cnt )++; + *radius_diff_cnt = min( *radius_diff_cnt, ISM_FEC_MAX ); + } + else + { + *radius_diff_cnt = 0; + } + + /* Write radius */ + push_indice( hBstr, IND_ISM_RADIUS_DIFF_FLAG, *flag_abs_radius, 1 ); + + if ( *flag_abs_radius ) + { + push_indice( hBstr, IND_ISM_RADIUS, idx_radius, ISM_RADIUS_NBITS ); + } + else + { + push_indice( hBstr, IND_ISM_RADIUS, idx_radius, nbits_diff_radius ); + } + + /* Updates */ + *last_radius_idx = idx_radius_abs; + + return; +} + + +/*----------------------------------------------------------------* + * encode_angle_indices() + * + * Encoding of an angle + *----------------------------------------------------------------*/ +static void encode_angle_indices( + BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */ + ISM_METADATA_ANGLE_HANDLE angle, /* i/o: angle handle */ + const int16_t last_ism_metadata_flag, /* i : last frame ism_metadata_flag */ + const int16_t ini_frame, /* i : initialization frames counter */ + const int16_t idx_angle1_abs, /* i : Azimuth index */ + const int16_t idx_angle2_abs, /* i : Elevation index */ + int16_t *flag_abs_angle1, /* o : Azimuth/yaw encoding mode */ + int16_t *flag_abs_angle2 /* o : Elevation/pitch encoding mode */ +) +{ + int16_t idx_angle1, nbits_diff_angle1, diff; + int16_t idx_angle2, nbits_diff_angle2; + + /*----------------------------------------------------------------* + * Azimuth/yaw index encoding + *----------------------------------------------------------------*/ + + idx_angle1 = idx_angle1_abs; + + nbits_diff_angle1 = 0; + + *flag_abs_angle1 = 0; /* differential coding by default */ + if ( angle->angle1_diff_cnt == ISM_FEC_MAX /* make differential encoding in ISM_FEC_MAX consecutive frames at maximum (in order to control the decoding in FEC) */ + || last_ism_metadata_flag == 0 /* If last frame had no metadata coded, do not use differential coding */ + ) + { + *flag_abs_angle1 = 1; + } + + /* try differential coding */ + if ( *flag_abs_angle1 == 0 ) + { + diff = idx_angle1_abs - angle->last_angle1_idx; + + /* azimuth is on a circle - check for diff coding for -180° -> 180° and vice versa changes */ + if ( abs( diff ) > ( ( 1 << ISM_AZIMUTH_NBITS ) - 1 ) - ISM_MAX_AZIMUTH_DIFF_IDX ) + { + if ( diff > 0 ) + { + diff -= ( 1 << ISM_AZIMUTH_NBITS ) - 1; + } + else + { + diff += ( 1 << ISM_AZIMUTH_NBITS ) - 1; + } + } + + if ( diff == 0 ) + { + idx_angle1 = 0; + nbits_diff_angle1 = 1; + } + else if ( ABSVAL( diff ) < ISM_MAX_AZIMUTH_DIFF_IDX ) /* when diff bits >= abs bits, prefer abs */ + { + idx_angle1 = 1 << 1; + nbits_diff_angle1 = 1; + + if ( diff < 0 ) + { + idx_angle1 += 1; /* negative sign */ + diff *= -1; + } + else + { + idx_angle1 += 0; /* positive sign */ + } + + idx_angle1 = idx_angle1 << diff; + nbits_diff_angle1++; + + /* unary coding of "diff */ + idx_angle1 += ( ( 1 << diff ) - 1 ); + nbits_diff_angle1 += diff; + + if ( nbits_diff_angle1 < ISM_AZIMUTH_NBITS - 1 ) + { + /* add stop bit - only for codewords shorter than ISM_AZIMUTH_NBITS */ + idx_angle1 = idx_angle1 << 1; + nbits_diff_angle1++; + } + } + else + { + *flag_abs_angle1 = 1; + } + } + + /* update counter */ + if ( *flag_abs_angle1 == 0 ) + { + angle->angle1_diff_cnt++; +#ifdef FIX_419_ISM_MD_FIX + angle->angle1_diff_cnt = min( angle->angle1_diff_cnt, ISM_FEC_MAX ); +#else + angle->angle2_diff_cnt = min( angle->angle2_diff_cnt, ISM_FEC_MAX ); +#endif + } + else + { + angle->angle1_diff_cnt = 0; + } + + /* Write azimuth/yaw */ + push_indice( hBstr, IND_ISM_AZIMUTH_DIFF_FLAG, *flag_abs_angle1, 1 ); + + if ( *flag_abs_angle1 ) + { + push_indice( hBstr, IND_ISM_AZIMUTH, idx_angle1, ISM_AZIMUTH_NBITS ); + } + else + { + push_indice( hBstr, IND_ISM_AZIMUTH, idx_angle1, nbits_diff_angle1 ); + } + + /*----------------------------------------------------------------* + * Elevation/pitch index encoding + *----------------------------------------------------------------*/ + + idx_angle2 = idx_angle2_abs; + nbits_diff_angle2 = 0; + *flag_abs_angle2 = 0; /* differential coding by default */ + if ( angle->angle2_diff_cnt == ISM_FEC_MAX /* make differential encoding in ISM_FEC_MAX consecutive frames at maximum (in order to control the decoding in FEC) */ + || last_ism_metadata_flag == 0 /* If last frame had no metadata coded, do not use differential coding */ + ) + { + *flag_abs_angle2 = 1; + } + + /* note: elevation/pitch is coded starting from the second frame only (it is meaningless in the init_frame) */ + if ( ini_frame == 0 ) + { + *flag_abs_angle2 = 1; + angle->last_angle2_idx = idx_angle2_abs; + } + + diff = idx_angle2_abs - angle->last_angle2_idx; + + /* avoid absolute coding of elevation/pitch if absolute coding was already used for azimuth/yaw */ + if ( *flag_abs_angle1 == 1 ) + { + int16_t diff_orig = diff; + + *flag_abs_angle2 = 0; + + + if ( diff >= 0 ) + { + diff = min( diff, ISM_MAX_ELEVATION_DIFF_IDX ); + } + else + { + diff = -1 * min( -diff, ISM_MAX_ELEVATION_DIFF_IDX ); + } + + if ( last_ism_metadata_flag == 0 || abs( diff_orig - diff ) > ISM_MAX_ELEVATION_DIFF_IDX ) + { + angle->angle2_diff_cnt = ISM_FEC_MAX - 1; + } + } + + /* try differential coding */ + if ( *flag_abs_angle2 == 0 ) + { + if ( diff == 0 ) + { + idx_angle2 = 0; + nbits_diff_angle2 = 1; + } + else if ( ABSVAL( diff ) <= ISM_MAX_ELEVATION_DIFF_IDX ) + { + idx_angle2 = 1 << 1; + nbits_diff_angle2 = 1; + + if ( diff < 0 ) + { + idx_angle2 += 1; /* negative sign */ + diff *= -1; + } + else + { + idx_angle2 += 0; /* positive sign */ + } + + idx_angle2 = idx_angle2 << diff; + nbits_diff_angle2++; + + /* unary coding of "diff */ + idx_angle2 += ( ( 1 << diff ) - 1 ); + nbits_diff_angle2 += diff; + + if ( nbits_diff_angle2 < ISM_ELEVATION_NBITS ) + { + /* add stop bit */ + idx_angle2 = idx_angle2 << 1; + nbits_diff_angle2++; + } + } + else + { + *flag_abs_angle2 = 1; + } + } + + /* update counter */ + if ( *flag_abs_angle2 == 0 ) + { + angle->angle2_diff_cnt++; + angle->angle2_diff_cnt = min( angle->angle2_diff_cnt, ISM_FEC_MAX ); + } + else + { + angle->angle2_diff_cnt = 0; + } + + /* Write elevation */ + if ( *flag_abs_angle1 == 0 ) /* do not write "flag_abs_elevation/pitch" if "flag_abs_azimuth/yaw == 1" */ + { + push_indice( hBstr, IND_ISM_ELEVATION_DIFF_FLAG, *flag_abs_angle2, 1 ); + } + + if ( *flag_abs_angle2 ) + { + push_indice( hBstr, IND_ISM_ELEVATION, idx_angle2, ISM_ELEVATION_NBITS ); + } + else + { + push_indice( hBstr, IND_ISM_ELEVATION, idx_angle2, nbits_diff_angle2 ); + } + + /*----------------------------------------------------------------* + * Updates + *----------------------------------------------------------------*/ + + angle->last_angle1_idx = idx_angle1_abs; + angle->last_angle2_idx = idx_angle2_abs; + + return; +} + + +/*-------------------------------------------------------------------* + * ivas_ism_metadata_sid_enc() + * + * Quantize and encode ISM metadata in SID frame + *-------------------------------------------------------------------*/ + +void ivas_ism_metadata_sid_enc( + ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */ + const int16_t flag_noisy_speech, /* i : noisy speech flag */ + const int16_t nchan_ism, /* i : number of objects */ + const int16_t nchan_transport, /* i : number of transport channels */ + const ISM_MODE ism_mode, /* i : ISM mode */ + ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */ + const int16_t sid_flag, /* i : indication of SID frame */ + const int16_t md_diff_flag[], /* i : metadata differental flag */ + BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */ + int16_t nb_bits_metadata[] /* o : number of metadata bits */ +) +{ + int16_t i, ch, nBits, nBits_start, nBits_unused; + float q_step, q_step_border; + int16_t idx, idx_azimuth, idx_elevation; + int16_t nBits_azimuth, nBits_elevation, nBits_coh, nBits_sce_id; + float valQ; + ISM_METADATA_HANDLE hIsmMetaData; + + if ( sid_flag ) + { + nBits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC; + nBits -= SID_FORMAT_NBITS; + nBits_start = hBstr->nb_bits_tot; + + /*----------------------------------------------------------------* + * Write ISm common signaling + *----------------------------------------------------------------*/ + + /* write number of objects - unary coding */ + for ( ch = 1; ch < nchan_ism; ch++ ) + { + push_indice( hBstr, IND_ISM_NUM_OBJECTS, 1, 1 ); + } + push_indice( hBstr, IND_ISM_NUM_OBJECTS, 0, 1 ); + + /* write SID metadata flag (one per object) */ + for ( ch = 0; ch < nchan_ism; ch++ ) + { + push_indice( hBstr, IND_ISM_METADATA_FLAG, md_diff_flag[ch], 1 ); + } + + /*----------------------------------------------------------------* + * Set quantization bits based on the number of coded objects + *----------------------------------------------------------------*/ + + ivas_get_ism_sid_quan_bitbudget( nchan_ism, &nBits_azimuth, &nBits_elevation, &q_step, &q_step_border, &nBits_coh, &nBits_sce_id ); + + /*----------------------------------------------------------------* + * Spatial parameters, loop over TCs - 1 + *----------------------------------------------------------------*/ + + /* write ISM mode flag to explicitly signal number of spatial parameters */ + if ( nchan_ism > 2 ) + { + if ( ism_mode == ISM_MODE_DISC ) + { + push_indice( hBstr, IND_ISM_VAD_FLAG, 0, 1 ); + } + else + { + push_indice( hBstr, IND_ISM_VAD_FLAG, 1, 1 ); + } + + if ( ism_mode == ISM_MODE_PARAM ) + { + /* write noisy speech flag */ + push_indice( hBstr, IND_ISM_NOISY_SPEECH_FLAG, flag_noisy_speech, 1 ); + nBits_sce_id = 1; + } + } + + if ( nchan_transport > 1 ) + { + /* write sce id */ + push_indice( hBstr, IND_ISM_SCE_ID_DTX, hISMDTX->sce_id_dtx, nBits_sce_id ); + + /* quantize and write coherence */ + for ( ch = 0; ch < nchan_transport; ch++ ) + { + if ( ch == hISMDTX->sce_id_dtx ) + { + continue; + } + + idx = (int16_t) ( hISMDTX->coh[ch] * ( ( 1 << nBits_coh ) - 1 ) + 0.5f ); + assert( ( idx >= 0 ) && ( idx <= ( ( 1 << nBits_coh ) - 1 ) ) ); + push_indice( hBstr, IND_ISM_DTX_COH_SCA, idx, nBits_coh ); + } + } + + /*----------------------------------------------------------------* + * Metadata quantization and coding, loop over all objects + *----------------------------------------------------------------*/ + + for ( ch = 0; ch < nchan_ism; ch++ ) + { + if ( md_diff_flag[ch] == 1 ) + { + hIsmMetaData = hIsmMeta[ch]; + + idx_azimuth = ism_quant_meta( hIsmMetaData->azimuth, &valQ, ism_azimuth_borders, q_step, q_step_border, 1 << nBits_azimuth ); + idx_elevation = ism_quant_meta( hIsmMetaData->elevation, &valQ, ism_elevation_borders, q_step, q_step_border, 1 << nBits_elevation ); + + push_indice( hBstr, IND_ISM_AZIMUTH, idx_azimuth, nBits_azimuth ); + push_indice( hBstr, IND_ISM_ELEVATION, idx_elevation, nBits_elevation ); + + /* update last indexes to correspond to active frames coding */ + if ( nBits_azimuth > ISM_AZIMUTH_NBITS ) + { + hIsmMetaData->position_angle.last_angle1_idx = idx_azimuth >> ( nBits_azimuth - ISM_AZIMUTH_NBITS ); + hIsmMetaData->position_angle.last_angle2_idx = idx_elevation >> ( nBits_elevation - ISM_ELEVATION_NBITS ); + } + else + { + hIsmMetaData->position_angle.last_angle1_idx = idx_azimuth << ( ISM_AZIMUTH_NBITS - nBits_azimuth ); + hIsmMetaData->position_angle.last_angle2_idx = idx_elevation << ( ISM_ELEVATION_NBITS - nBits_elevation ); + } + +#ifdef FIX_387_ISM_MD_FEC + hIsmMetaData->ism_md_fec_cnt_enc = 0; + hIsmMeta[ch]->ism_md_inc_diff_cnt = ISM_MD_INC_DIFF_CNT_MAX; +#endif + } + } + + /* Write unused (padding) bits */ + nBits_unused = nBits - hBstr->nb_bits_tot; + while ( nBits_unused > 0 ) + { + i = min( nBits_unused, 16 ); + push_indice( hBstr, IND_UNUSED, 0, i ); + nBits_unused -= i; + } + + nb_bits_metadata[0] = hBstr->nb_bits_tot - nBits_start; + } + + return; +} diff --git a/lib_enc/ivas_ism_param_enc.c b/lib_enc/ivas_ism_param_enc.c index 8dcdef30b5..32fb6af515 100644 --- a/lib_enc/ivas_ism_param_enc.c +++ b/lib_enc/ivas_ism_param_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include "cnst.h" #include "ivas_cnst.h" #include "ivas_rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------- * Local function definitions @@ -47,16 +47,16 @@ static void ivas_param_ism_compute_obj_parameters( + const int16_t nchan_ism, /* i : number of ISM channels */ float reference_power_obj[MAX_NUM_OBJECTS][PARAM_ISM_MDFT_NO_SLOTS][DIRAC_NO_FB_BANDS_MAX], /* i : Reference power */ PARAM_ISM_CONFIG_HANDLE hParamIsm /* i/o: Param ISM Enc Handle */ ) { - int16_t i, b, m, br, mr, num_obj; + int16_t i, b, m, br, mr; int16_t brange_start, brange_end, mrange_start, mrange_end, time_merge_fac; float power_ratios_m[MAX_PARAM_ISM_NBANDS][MAX_PARAM_ISM_NBLOCKS]; - num_obj = hParamIsm->num_obj; - assert( num_obj == 3 || num_obj == 4 ); + assert( nchan_ism == 3 || nchan_ism == 4 ); for ( b = 0; b < hParamIsm->nbands; b++ ) { @@ -81,7 +81,7 @@ static void ivas_param_ism_compute_obj_parameters( /* for each object, sum up reference power within current T/F tile */ - for ( i = 0; i < num_obj; i++ ) + for ( i = 0; i < nchan_ism; i++ ) { for ( mr = mrange_start; mr < mrange_end; mr++ ) { @@ -103,7 +103,8 @@ static void ivas_param_ism_compute_obj_parameters( index_1 = 1; index_2 = 0; } - for ( i = 2; i < num_obj; i++ ) + + for ( i = MAX_PARAM_ISM_WAVE; i < nchan_ism; i++ ) { if ( ref_power_local[i] > ref_power_local[index_1] ) { @@ -149,23 +150,23 @@ static void ivas_param_ism_compute_obj_parameters( static void ivas_param_ism_enc_quantize_DOA( + const int16_t nchan_ism, /* i : number of ISM channels */ ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS], /* i : ISM metadata */ PARAM_ISM_CONFIG_HANDLE hParamIsm /* i/o: Param ISM encoder handle */ ) { - int16_t i, azi_idx, ele_idx, num_obj; + int16_t i, azi_idx, ele_idx; float valQ; - num_obj = hParamIsm->num_obj; /* Loop over objects */ - for ( i = 0; i < num_obj; i++ ) + for ( i = 0; i < nchan_ism; i++ ) { /* Quantize the elevation and obtain quantized elevation value and index */ - ele_idx = ism_quant_meta( hIsmMetaData[i]->elevation, &valQ, ism_elevation_borders, 1 << ISM_ELEVATION_NBITS ); + ele_idx = ism_quant_meta( hIsmMetaData[i]->elevation, &valQ, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS ); /* Obtain the index of quantized azimuth values */ - azi_idx = ism_quant_meta( hIsmMetaData[i]->azimuth, &valQ, ism_azimuth_borders, 1 << ISM_AZIMUTH_NBITS ); + azi_idx = ism_quant_meta( hIsmMetaData[i]->azimuth, &valQ, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS ); /*Replace azimuth with quantized values */ hIsmMetaData[i]->azimuth = valQ; @@ -191,25 +192,24 @@ void ivas_param_ism_stereo_dmx( const int16_t input_frame /* i : Length of input frame */ ) { - int16_t i, j, num_obj; + int16_t i, j; float alpha, azi_shift, tmp, tmp_1; float cardioid_left[MAX_NUM_OBJECTS], cardioid_right[MAX_NUM_OBJECTS]; float stereo_dmx[2][L_FRAME48k]; ISM_METADATA_HANDLE hIsmMetaData; - wmops_sub_start( "ivas_param_ism_st_dmx" ); + push_wmops( "ivas_param_ism_st_dmx" ); /*Initialization*/ alpha = 0.5; azi_shift = 0; - num_obj = st_ivas->hDirAC->hParamIsm->num_obj; /* Set the stereo dmx to zero */ set_zero( stereo_dmx[0], L_FRAME48k ); set_zero( stereo_dmx[1], L_FRAME48k ); /* Loop over all objects */ - for ( i = 0; i < num_obj; i++ ) + for ( i = 0; i < st_ivas->hEncoderConfig->nchan_ism; i++ ) { hIsmMetaData = st_ivas->hIsmMetaData[i]; @@ -232,7 +232,7 @@ void ivas_param_ism_stereo_dmx( mvr2r( stereo_dmx[0], data[0], input_frame ); mvr2r( stereo_dmx[1], data[1], input_frame ); - wmops_sub_end(); + pop_wmops(); return; } @@ -258,21 +258,19 @@ ivas_error ivas_param_ism_enc_open( error = IVAS_ERR_OK; /* Assign memory to DirAC handle */ - if ( ( hDirAC = (DIRAC_ENC_HANDLE) count_malloc( sizeof( DIRAC_ENC_DATA ) ) ) == NULL ) + if ( ( hDirAC = (DIRAC_ENC_HANDLE) malloc( sizeof( DIRAC_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) ); } /* Assign memory to Param Object handle */ - if ( ( hDirAC->hParamIsm = (PARAM_ISM_CONFIG_HANDLE) count_malloc( sizeof( PARAM_ISM_CONFIG_DATA ) ) ) == NULL ) + if ( ( hDirAC->hParamIsm = (PARAM_ISM_CONFIG_HANDLE) malloc( sizeof( PARAM_ISM_CONFIG_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM\n" ) ); } input_Fs = st_ivas->hEncoderConfig->input_Fs; - /* Assign the number of objects */ - hDirAC->hParamIsm->num_obj = st_ivas->hEncoderConfig->nchan_inp; /* set FB config. */ if ( ( error = ivas_fb_set_cfg( &fb_cfg, ISM_FORMAT, SBA_MODE_NONE, st_ivas->hEncoderConfig->nchan_inp, 0, 0, input_Fs ) ) != IVAS_ERR_OK ) @@ -281,14 +279,12 @@ ivas_error ivas_param_ism_enc_open( } /* Allocate and initialize FB mixer handle */ - if ( ( error = ivas_FB_mixer_open( &( hDirAC->hFbMixer ), input_Fs, fb_cfg ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_FB_mixer_open( &( hDirAC->hFbMixer ), input_Fs, fb_cfg, 0 ) ) != IVAS_ERR_OK ) { return error; } - - ivas_param_ism_config( hDirAC->hParamIsm ); - + ivas_param_ism_config( hDirAC->hParamIsm, st_ivas->hEncoderConfig->nchan_inp ); /* Assign memories for Band and Block grouping */ hDirAC->hParamIsm->nbands = MAX_PARAM_ISM_NBANDS; @@ -314,23 +310,29 @@ ivas_error ivas_param_ism_enc_open( /*-------------------------------------------------------------------------* * ivas_param_ism_enc_close() * - * Close Param ISM handle + * Close Param ISM encoder handle *-------------------------------------------------------------------------*/ void ivas_param_ism_enc_close( - DIRAC_ENC_HANDLE hDirAC, /* i/o: encoder DirAC handle */ - const int32_t input_Fs /* i : input sampling_rate */ + DIRAC_ENC_HANDLE *hDirAC, /* i/o: encoder DirAC handle */ + const int32_t input_Fs /* i : input sampling_rate */ ) { - ivas_FB_mixer_close( &hDirAC->hFbMixer, input_Fs ); + if ( hDirAC == NULL || *hDirAC == NULL ) + { + return; + } - if ( hDirAC->hParamIsm != NULL ) + ivas_FB_mixer_close( &( *hDirAC )->hFbMixer, input_Fs, 0 ); + + if ( ( *hDirAC )->hParamIsm != NULL ) { - count_free( hDirAC->hParamIsm ); - hDirAC->hParamIsm = NULL; + free( ( *hDirAC )->hParamIsm ); + ( *hDirAC )->hParamIsm = NULL; } - count_free( hDirAC ); + free( ( *hDirAC ) ); + ( *hDirAC ) = NULL; return; } @@ -349,6 +351,7 @@ void ivas_param_ism_enc( ) { int16_t i, j, ts, l_ts; + int16_t nchan_ism; int16_t num_time_slots; float *pcm_in[MAX_NUM_OBJECTS]; float fb_RealBuffer[MAX_NUM_OBJECTS][DIRAC_NO_FB_BANDS_MAX]; @@ -359,15 +362,16 @@ void ivas_param_ism_enc( DIRAC_ENC_HANDLE hDirAC; PARAM_ISM_CONFIG_HANDLE hParamIsm; + nchan_ism = st_ivas->hEncoderConfig->nchan_ism; hDirAC = st_ivas->hDirAC; hParamIsm = hDirAC->hParamIsm; - wmops_sub_start( "ivas_param_ism_enc" ); + push_wmops( "ivas_param_ism_enc" ); l_ts = input_frame / PARAM_ISM_MDFT_NO_SLOTS; num_time_slots = PARAM_ISM_MDFT_NO_SLOTS; - for ( i = 0; i < hParamIsm->num_obj; i++ ) + for ( i = 0; i < nchan_ism; i++ ) { pcm_in[i] = &data[i][0]; @@ -376,12 +380,14 @@ void ivas_param_ism_enc( p_fb_RealBuffer[i] = &fb_RealBuffer[i][0]; p_fb_ImagBuffer[i] = &fb_ImagBuffer[i][0]; } + for ( ts = 0; ts < num_time_slots; ts++ ) { ivas_fb_mixer_get_windowed_fr( hDirAC->hFbMixer, pcm_in, p_fb_RealBuffer, p_fb_ImagBuffer, l_ts, l_ts ); + ivas_fb_mixer_update_prior_input( hDirAC->hFbMixer, pcm_in, l_ts ); - for ( i = 0; i < hParamIsm->num_obj; i++ ) + for ( i = 0; i < nchan_ism; i++ ) { pcm_in[i] += l_ts; for ( j = 0; j < DIRAC_NO_FB_BANDS_MAX; j++ ) @@ -390,78 +396,65 @@ void ivas_param_ism_enc( } } } + /* Quantize DOAs */ - ivas_param_ism_enc_quantize_DOA( st_ivas->hIsmMetaData, hParamIsm ); + ivas_param_ism_enc_quantize_DOA( nchan_ism, st_ivas->hIsmMetaData, hParamIsm ); /* Compute object indices and power ratios */ - ivas_param_ism_compute_obj_parameters( reference_power_obj, hParamIsm ); + ivas_param_ism_compute_obj_parameters( nchan_ism, reference_power_obj, hParamIsm ); - wmops_sub_end(); + pop_wmops(); return; } -/*------------------------------------------------------------------------- - * ivas_ism_enc_config() + +/*-------------------------------------------------------------------* + * ivas_param_ism_compute_noisy_speech_flag() * - * - select ISM format mode - * - reconfigure the ISM format encoder - *-------------------------------------------------------------------------*/ + * + *-------------------------------------------------------------------*/ -/*! r : ISM format mode */ -ivas_error ivas_ism_enc_config( - Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */ +void ivas_param_ism_compute_noisy_speech_flag( + Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */ ) { - ivas_error error; - ISM_MODE last_ism_mode; - int16_t nchan_transport_old; - - error = IVAS_ERR_OK; - last_ism_mode = st_ivas->ism_mode; - - /* select ISM format mode */ - st_ivas->ism_mode = ivas_ism_mode_select( st_ivas->hEncoderConfig->nchan_inp, st_ivas->hEncoderConfig->ivas_total_brate ); + int16_t i; - /* ISM bit-rate switching */ - if ( ( st_ivas->ism_mode != last_ism_mode ) || ( st_ivas->hEncoderConfig->ivas_total_brate != st_ivas->hEncoderConfig->last_ivas_total_brate ) ) + /* Move the Noisy speech buffer */ + for ( i = 0; i < ( PARAM_ISM_HYS_BUF_SIZE - 1 ); i++ ) { - int32_t element_brate_tmp[MAX_NUM_OBJECTS]; - - nchan_transport_old = st_ivas->nchan_transport; + st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i + 1]; + } - /* Reset and Initialize */ - if ( st_ivas->ism_mode == ISM_MODE_PARAM ) + /* For the current frame, make a decision based on some core-coder flags */ + if ( st_ivas->hSCE[0]->hCoreCoder[0]->flag_noisy_speech_snr && st_ivas->hSCE[1]->hCoreCoder[0]->flag_noisy_speech_snr ) + { +#ifdef FIX_422 + if ( st_ivas->hSCE[0]->hCoreCoder[0]->vad_flag || st_ivas->hSCE[1]->hCoreCoder[0]->vad_flag ) +#else + if ( st_ivas->hSCE[0]->hCoreCoder[0]->vad_flag && st_ivas->hSCE[1]->hCoreCoder[0]->vad_flag ) +#endif { - st_ivas->nchan_transport = 2; + st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = 0; } else { - st_ivas->nchan_transport = st_ivas->hEncoderConfig->nchan_inp; + st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = 1; } + } + else + { - st_ivas->nSCE = st_ivas->nchan_transport; - st_ivas->nCPE = 0; - - ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hEncoderConfig->nchan_inp, NULL, NULL, NULL, element_brate_tmp, NULL, NULL ); - - ivas_corecoder_enc_reconfig( st_ivas, nchan_transport_old, 0, nchan_transport_old ); - - if ( st_ivas->ism_mode == ISM_MODE_PARAM && last_ism_mode == ISM_MODE_DISC ) - { - /* Allocate and Initialize the memory used by ParamISM when switch from Discrete ISM */ - if ( ( error = ivas_param_ism_enc_open( st_ivas ) ) != IVAS_ERR_OK ) - { - return error; - } - } + st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = 0; + } - if ( st_ivas->ism_mode == ISM_MODE_DISC && last_ism_mode == ISM_MODE_PARAM ) - { - /* Deallocate the memory used by ParamISM when switch to Discrete ISM */ - ivas_param_ism_enc_close( st_ivas->hDirAC, st_ivas->hEncoderConfig->input_Fs ); - st_ivas->hDirAC = NULL; - } + /* Do a decision based on hysterisis */ + st_ivas->hDirAC->hParamIsm->flag_noisy_speech = 1; + for ( i = 0; i < PARAM_ISM_HYS_BUF_SIZE; i++ ) + { + st_ivas->hDirAC->hParamIsm->flag_noisy_speech = st_ivas->hDirAC->hParamIsm->flag_noisy_speech && st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i]; } - return error; + + return; } diff --git a/lib_enc/ivas_lfe_enc.c b/lib_enc/ivas_lfe_enc.c index a333995d69..a14424774f 100644 --- a/lib_enc/ivas_lfe_enc.c +++ b/lib_enc/ivas_lfe_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------------------------* @@ -391,7 +391,7 @@ ivas_error ivas_create_lfe_enc( * Allocate LFE handle *-----------------------------------------------------------------*/ - if ( ( hLFE = (LFE_ENC_HANDLE) count_malloc( sizeof( LFE_ENC_DATA ) ) ) == NULL ) + if ( ( hLFE = (LFE_ENC_HANDLE) malloc( sizeof( LFE_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LFE\n" ) ); } @@ -406,7 +406,7 @@ ivas_error ivas_create_lfe_enc( * Input memory buffer: allocate and initialize *-----------------------------------------------------------------*/ - if ( ( hLFE->old_wtda_audio = (float *) count_malloc( sizeof( float ) * NS2SA( input_Fs, IVAS_LFE_FADE_NS ) ) ) == NULL ) + if ( ( hLFE->old_wtda_audio = (float *) malloc( sizeof( float ) * NS2SA( input_Fs, IVAS_LFE_FADE_NS ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LFE memory\n" ) ); } @@ -417,7 +417,7 @@ ivas_error ivas_create_lfe_enc( * LFE Window: allocate and initialize *-----------------------------------------------------------------*/ - if ( ( hLFE->pWindow_state = (LFE_WINDOW_HANDLE) count_malloc( sizeof( LFE_WINDOW_DATA ) ) ) == NULL ) + if ( ( hLFE->pWindow_state = (LFE_WINDOW_HANDLE) malloc( sizeof( LFE_WINDOW_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LFE window structure\n" ) ); } @@ -460,21 +460,27 @@ ivas_error ivas_create_lfe_enc( *-------------------------------------------------------------------------*/ void ivas_lfe_enc_close( - LFE_ENC_HANDLE hLFE /* i/o: LFE encoder handle */ + LFE_ENC_HANDLE *hLFE /* i/o: LFE encoder handle */ ) { - if ( hLFE->old_wtda_audio != NULL ) + if ( hLFE == NULL || *hLFE == NULL ) { - count_free( hLFE->old_wtda_audio ); - hLFE->old_wtda_audio = NULL; + return; } - if ( hLFE->pWindow_state ) + + if ( ( *hLFE )->old_wtda_audio != NULL ) + { + free( ( *hLFE )->old_wtda_audio ); + ( *hLFE )->old_wtda_audio = NULL; + } + if ( ( *hLFE )->pWindow_state ) { - count_free( hLFE->pWindow_state ); - hLFE->pWindow_state = NULL; + free( ( *hLFE )->pWindow_state ); + ( *hLFE )->pWindow_state = NULL; } - count_free( hLFE ); + free( ( *hLFE ) ); + ( *hLFE ) = NULL; return; } diff --git a/lib_enc/ivas_masa_enc.c b/lib_enc/ivas_masa_enc.c index c2649adc56..2a21a667e9 100644 --- a/lib_enc/ivas_masa_enc.c +++ b/lib_enc/ivas_masa_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -31,15 +31,16 @@ *******************************************************************************************************/ #include -#include "options.h" #include +#include "options.h" #include "ivas_cnst.h" #include "ivas_prot.h" #include "ivas_rom_com.h" #include "ivas_stat_enc.h" -#include "wmops.h" +#include "wmc_auto.h" #include "prot.h" + /*-----------------------------------------------------------------------* * Local function prototypes *-----------------------------------------------------------------------*/ @@ -50,9 +51,9 @@ static void combine_directions( MASA_ENCODER_HANDLE hMasa ); static void find_n_largest( const float *input, int16_t *largestIndices, const int16_t numElements, const int16_t numLargest ); -static void move_metadata_to_qmetadata( MASA_ENCODER_HANDLE hMasa, IVAS_QMETADATA_HANDLE hQMeta ); +static void move_metadata_to_qmetadata( const MASA_ENCODER_HANDLE hMasa, IVAS_QMETADATA_HANDLE hQMeta ); -static void detect_metadata_composition( MASA_ENCODER_HANDLE hMasa, uint8_t *joinedSubframes, uint8_t *coherencePresent, uint8_t *isTwoDir ); +static void detect_metadata_composition( const MASA_ENCODER_HANDLE hMasa, uint8_t *joinedSubframes, uint8_t *coherencePresent, uint8_t *isTwoDir ); static void compensate_energy_ratios( MASA_ENCODER_HANDLE hMasa ); @@ -60,6 +61,19 @@ static int16_t encode_lfe_to_total_energy_ratio( MASA_ENCODER_HANDLE hMasa, BSTR static void reduce_metadata_further( MASA_ENCODER_HANDLE hMasa, IVAS_QMETADATA_HANDLE hqmetadata, const IVAS_FORMAT ivas_format ); +static void average_masa_metadata( MASA_METADATA_FRAME *masaMetadata, float energy[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS] ); + +static void copy_masa_metadata_subframe( const MASA_METADATA_HANDLE hMetaFrom, const uint8_t sfFrom, MASA_METADATA_HANDLE hMetaTo, const uint8_t sfTo ); + +static void copy_masa_metadata( const MASA_METADATA_HANDLE hMetaFrom, MASA_METADATA_HANDLE hMetaTo ); + +static uint8_t are_masa_subframes_similar( const MASA_METADATA_HANDLE frame1, const uint8_t sf1_idx, const MASA_METADATA_HANDLE frame2, const uint8_t sf2_idx ); + +static void detect_framing_async( MASA_ENCODER_HANDLE hMasa ); + +#ifdef FIX_398_MASA_DIRECTION_ALIGNMENT +static void masa_metadata_direction_alignment( MASA_ENCODER_HANDLE hMasa ); +#endif /*-----------------------------------------------------------------------* * Local constants @@ -88,7 +102,7 @@ ivas_error ivas_masa_enc_open( error = IVAS_ERR_OK; - if ( ( hMasa = (MASA_ENCODER_HANDLE) count_malloc( sizeof( MASA_ENCODER ) ) ) == NULL ) + if ( ( hMasa = (MASA_ENCODER_HANDLE) malloc( sizeof( MASA_ENCODER ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA encoder\n" ) ); } @@ -119,14 +133,6 @@ ivas_error ivas_masa_enc_open( mvs2s( DirAC_block_grouping, hMasa->config.block_grouping, MAX_PARAM_SPATIAL_SUBFRAMES + 1 ); mvs2s( MASA_band_grouping_24, hMasa->config.band_grouping, MASA_FREQUENCY_BANDS + 1 ); - if ( hEncoderConfig->ivas_format == MASA_FORMAT ) - { - for ( i = 0; i < st_ivas->nchan_transport; i++ ) - { - hMasa->data.delay_buffer[i] = (float *) count_malloc( MASA_ENC_DELAY_SLOTS * CLDFB_NO_CHANNELS_MAX * sizeof( float ) ); - set_f( hMasa->data.delay_buffer[i], 0.0f, MASA_ENC_DELAY_SLOTS * CLDFB_NO_CHANNELS_MAX ); - } - } hMasa->data.onset_detector_1 = 0.0f; hMasa->data.onset_detector_2 = 0.0f; @@ -134,6 +140,18 @@ ivas_error ivas_masa_enc_open( set_zero( hMasa->data.lfeToTotalEnergyRatio, MAX_PARAM_SPATIAL_SUBFRAMES ); hMasa->data.prevq_lfeToTotalEnergyRatio = 0.0f; hMasa->data.prevq_lfeIndex = 0; + + hMasa->data.sync_state.prev_sim_stop = 0; + hMasa->data.sync_state.prev_offset = 0; + hMasa->data.sync_state.frame_mode = MASA_FRAME_4SF; + +#ifdef FIX_398_MASA_DIRECTION_ALIGNMENT + set_zero( hMasa->data.dir_align_state.previous_azi_dir1, MASA_FREQUENCY_BANDS ); + set_zero( hMasa->data.dir_align_state.previous_ele_dir1, MASA_FREQUENCY_BANDS ); + set_zero( hMasa->data.dir_align_state.previous_azi_dir2, MASA_FREQUENCY_BANDS ); + set_zero( hMasa->data.dir_align_state.previous_ele_dir2, MASA_FREQUENCY_BANDS ); +#endif + st_ivas->hMasa = hMasa; return error; @@ -147,28 +165,24 @@ ivas_error ivas_masa_enc_open( *-----------------------------------------------------------------------*/ void ivas_masa_enc_close( - MASA_ENCODER_HANDLE hMasa, /* i/o: MASA metadata structure */ - const int16_t nchan_transport, /* i : Number of transport channels */ - const IVAS_FORMAT ivas_format /* i : IVAS format */ + MASA_ENCODER_HANDLE *hMasa /* i/o: MASA metadata structure */ ) { int16_t i; - for ( i = 0; i < hMasa->data.num_Cldfb_instances; i++ ) + if ( hMasa == NULL || *hMasa == NULL ) { - deleteCldfb( &( hMasa->data.cldfbAnaEnc[i] ) ); + return; } - if ( ivas_format == MASA_FORMAT ) + for ( i = 0; i < ( *hMasa )->data.num_Cldfb_instances; i++ ) { - for ( i = 0; i < nchan_transport; i++ ) - { - count_free( hMasa->data.delay_buffer[i] ); - hMasa->data.delay_buffer[i] = NULL; - } + deleteCldfb( &( ( *hMasa )->data.cldfbAnaEnc[i] ) ); } - count_free( hMasa ); + + free( ( *hMasa ) ); + ( *hMasa ) = NULL; return; } @@ -180,7 +194,7 @@ void ivas_masa_enc_close( * main MASA encoder function *-----------------------------------------------------------------------*/ -void ivas_masa_encode( +ivas_error ivas_masa_encode( MASA_ENCODER_HANDLE hMasa, /* i/o: MASA encoder structure */ IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */ BSTR_ENC_HANDLE hMetaData, /* i/o: Metadata bitstream handle */ @@ -219,7 +233,11 @@ void ivas_masa_encode( if ( Opt_DTX_ON ) { - h_orig_metadata = (MASA_DIRECTIONAL_SPATIAL_META *) count_malloc( MASA_MAXIMUM_DIRECTIONS * sizeof( MASA_DIRECTIONAL_SPATIAL_META ) ); + if ( ( h_orig_metadata = (MASA_DIRECTIONAL_SPATIAL_META *) malloc( MASA_MAXIMUM_DIRECTIONS * sizeof( MASA_DIRECTIONAL_SPATIAL_META ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA encoder\n" ) ); + } + for ( i = 0; i < MASA_MAXIMUM_DIRECTIONS; i++ ) { for ( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ ) @@ -348,7 +366,7 @@ void ivas_masa_encode( } } - count_free( h_orig_metadata ); + free( h_orig_metadata ); ivas_qmetadata_enc_sid_encode( hMetaData, hQMetaData, masa_sid_descriptor, ivas_format, SBA_MODE_NONE ); @@ -361,7 +379,7 @@ void ivas_masa_encode( hQMetaData->no_directions = numberOfDirectionsQMetaData; } - return; + return IVAS_ERR_OK; } @@ -397,19 +415,9 @@ void ivas_masa_estimate_energy( for ( ts = mrange[0]; ts < mrange[1]; ts++ ) { - if ( ts < MASA_ENC_DELAY_SLOTS ) - { - for ( i = 0; i < nchan_transport; i++ ) - { - cldfbAnalysis_ts( &( hMasa->data.delay_buffer[i][l_ts * ts] ), Input_RealBuffer[i], Input_ImagBuffer[i], l_ts, hMasa->data.cldfbAnaEnc[i] ); - } - } - else + for ( i = 0; i < nchan_transport; i++ ) { - for ( i = 0; i < nchan_transport; i++ ) - { - cldfbAnalysis_ts( &( data_f[i][l_ts * ( ts - MASA_ENC_DELAY_SLOTS )] ), Input_RealBuffer[i], Input_ImagBuffer[i], l_ts, hMasa->data.cldfbAnaEnc[i] ); - } + cldfbAnalysis_ts( &( data_f[i][l_ts * ts] ), Input_RealBuffer[i], Input_ImagBuffer[i], l_ts, hMasa->data.cldfbAnaEnc[i] ); } for ( band_m_idx = 0; band_m_idx < MASA_FREQUENCY_BANDS; band_m_idx++ ) @@ -438,10 +446,6 @@ void ivas_masa_estimate_energy( } } - for ( i = 0; i < nchan_transport; i++ ) - { - mvr2r( &data_f[i][input_frame - MASA_ENC_DELAY_SLOTS * maxBin], &( hMasa->data.delay_buffer[i][0] ), MASA_ENC_DELAY_SLOTS * maxBin ); - } return; } @@ -480,6 +484,18 @@ ivas_error ivas_masa_enc_config( if ( ivas_format == MASA_FORMAT ) { +#ifdef FIX_398_MASA_DIRECTION_ALIGNMENT + masa_metadata_direction_alignment( hMasa ); +#endif + + detect_framing_async( hMasa ); /* detect the offset, set 1sf/4sf mode based on this. potentially also shift the metadata using a history buffer */ + + if ( hMasa->data.sync_state.frame_mode == MASA_FRAME_1SF && hMasa->data.sync_state.prev_offset != 0 ) + { + /* average over sub-frames */ + average_masa_metadata( &( hMasa->masaMetadata ), hMasa->data.energy ); + } + /* Inspect metadata for parameter changes that affect coding. */ detect_metadata_composition( hMasa, &joinedSubframes, &coherencePresent, &isActualTwoDir ); hMasa->config.joinedSubframes = joinedSubframes; @@ -488,7 +504,7 @@ ivas_error ivas_masa_enc_config( } else if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) { - /* For mcMASA, these are set only once as this function is called only once. */ + /* For McMASA, these are set only once as this function is called only once. */ hMasa->config.joinedSubframes = 0; hMasa->config.numberOfDirections = 1; } @@ -569,7 +585,7 @@ ivas_error ivas_masa_enc_config( ivas_set_qmetadata_maxbit_req( hQMetaData, ivas_format ); - masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, hQMetaData, st_ivas->hEncoderConfig->input_Fs ); + masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, hQMetaData, st_ivas->hEncoderConfig->input_Fs, NULL ); /* Transmit stereo signals using a mono downmix at lowest bitrates */ if ( ivas_format == MASA_FORMAT && st_ivas->nCPE == 1 && st_ivas->hCPE[0]->hStereoDft != NULL && st_ivas->hCPE[0]->hStereoDft->hConfig != NULL ) @@ -679,9 +695,10 @@ static void combine_freqbands_and_subframes( if ( numCodingBands < MASA_FREQUENCY_BANDS ) { + /* reduce metadata *frequency* resolution. time resolution is not touched */ for ( i = 0; i < numDirections; i++ ) { - for ( j = 0; j < numSf; j++ ) + for ( j = 0; j < numSf; j++ ) /* NB: for numSf==1, operates only on first sub-frame */ { for ( k = 0; k < MASA_FREQUENCY_BANDS; k++ ) { @@ -755,7 +772,7 @@ static void combine_freqbands_and_subframes( } } } - else if ( mergeRatiosOverSubframes ) + else if ( mergeRatiosOverSubframes ) /* keep frequency resolution */ { for ( j = 0; j < numSf; j++ ) { @@ -983,7 +1000,7 @@ static void find_n_largest( static void move_metadata_to_qmetadata( - MASA_ENCODER_HANDLE hMasa, + const MASA_ENCODER_HANDLE hMasa, IVAS_QMETADATA_HANDLE hQMeta ) { int16_t dir, sf, band; @@ -1055,18 +1072,19 @@ static void move_metadata_to_qmetadata( /* This function studies parametric MASA metadata to provide information for codec configuration */ static void detect_metadata_composition( - MASA_ENCODER_HANDLE hMasa, /* i : MASA encoder data */ - uint8_t *joinedSubframes, /* o : Result of subframe composition */ - uint8_t *coherencePresent, /* o : Result of coherence presence */ - uint8_t *isTwoDir /* o : Result of two direction check */ + const MASA_ENCODER_HANDLE hMasa, /* i : MASA encoder data */ + uint8_t *joinedSubframes, /* o : Result of subframe composition */ + uint8_t *coherencePresent, /* o : Result of coherence presence */ + uint8_t *isTwoDir /* o : Result of two direction check */ ) { MASA_METADATA_FRAME *hMeta; - int16_t sf, band, dir, numDir; + int8_t sf, band, dir, numDir; int16_t nSubFrames; uint8_t dirValid[2] = { FALSE }; uint8_t cohPresent = FALSE; uint8_t sfDiffer = FALSE; + uint8_t sfSimilar; hMeta = &( hMasa->masaMetadata ); numDir = hMeta->descriptive_meta.numberOfDirections + 1; @@ -1131,52 +1149,14 @@ static void detect_metadata_composition( } /* Check if data over subframes is identical. Check is done by comparing to first subframe. */ - dir = 0; - while ( sfDiffer == FALSE && dir < numDir ) + sfSimilar = TRUE; + sf = 1; + while ( ( sfSimilar == TRUE ) && ( sf < MAX_PARAM_SPATIAL_SUBFRAMES ) ) { - sf = 1; - while ( sfDiffer == FALSE && sf < MAX_PARAM_SPATIAL_SUBFRAMES ) - { - band = 0; - while ( sfDiffer == FALSE && band < MASA_FREQUENCY_BANDS ) - { - float aziDif; - aziDif = fabsf( hMeta->directional_meta[dir].azimuth[sf][band] - hMeta->directional_meta[dir].azimuth[0][band] ); - aziDif = aziDif > 180.0f ? aziDif - 360.0f : aziDif; - if ( aziDif > MASA_ANGLE_TOLERANCE ) - { - sfDiffer = TRUE; - break; - } - - if ( fabsf( hMeta->directional_meta[dir].elevation[sf][band] - hMeta->directional_meta[dir].elevation[0][band] ) > MASA_ANGLE_TOLERANCE ) - { - sfDiffer = TRUE; - break; - } - - if ( fabsf( hMeta->directional_meta[dir].energy_ratio[sf][band] - hMeta->directional_meta[dir].energy_ratio[0][band] ) > MASA_RATIO_TOLERANCE ) - { - sfDiffer = TRUE; - break; - } - - if ( fabsf( hMeta->directional_meta[dir].spread_coherence[sf][band] - hMeta->directional_meta[dir].spread_coherence[0][band] ) > MASA_COHERENCE_TOLERANCE ) - { - sfDiffer = TRUE; - break; - } - - if ( dir == 0 && fabsf( hMeta->common_meta.surround_coherence[sf][band] - hMeta->common_meta.surround_coherence[0][band] ) > MASA_COHERENCE_TOLERANCE ) - { - sfDiffer = TRUE; - } - band++; - } - sf++; - } - dir++; + sfSimilar = are_masa_subframes_similar( hMeta, 0, hMeta, sf ); + sf++; } + sfDiffer = sfSimilar == TRUE ? FALSE : TRUE; /* Further checks can be done with just one subframe if they are identical */ nSubFrames = sfDiffer == TRUE ? MAX_PARAM_SPATIAL_SUBFRAMES : 1; @@ -1678,6 +1658,7 @@ void ivas_masa_enc_reconfigure( int16_t n, tmp; int16_t sce_id, cpe_id; int32_t ivas_total_brate; + ivas_total_brate = st_ivas->hEncoderConfig->ivas_total_brate; if ( ivas_total_brate != st_ivas->hEncoderConfig->last_ivas_total_brate ) @@ -1719,3 +1700,567 @@ void ivas_masa_enc_reconfigure( return; } + + +/*-------------------------------------------------------------------* + * average_masa_metadata() + * + * Average MASA metadata frame subframe contents: applies aggregation over time + *-------------------------------------------------------------------*/ + +static void average_masa_metadata( + MASA_METADATA_FRAME *hMeta, + float energy[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS] ) +{ + int16_t i, j, k; + float azi_rad, ele_rad; + uint8_t numDirections; + + /* use the nominal values without data-adaptivity */ + numDirections = hMeta->descriptive_meta.numberOfDirections + 1; + + /* azi/ele/nrg into vectors for each sub-frame and band */ + for ( i = 0; i < numDirections; i++ ) + { + for ( k = 0; k < MASA_FREQUENCY_BANDS; k++ ) + { + float x_sum, y_sum, z_sum, energy_sum, vec_len, spread_coh_sum, surr_coh_sum; + + x_sum = 0.0f; + y_sum = 0.0f; + z_sum = 0.0f; + energy_sum = 0.0f; + spread_coh_sum = 0.0f; + surr_coh_sum = 0.0f; + for ( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ ) + { + azi_rad = hMeta->directional_meta[i].azimuth[j][k] / 180.0f * EVS_PI; + ele_rad = hMeta->directional_meta[i].elevation[j][k] / 180.0f * EVS_PI; + vec_len = hMeta->directional_meta[i].energy_ratio[j][k] * energy[j][k]; + + /* energy-weighted sum over subframes */ + x_sum += cosf( azi_rad ) * cosf( ele_rad ) * vec_len; + y_sum += sinf( azi_rad ) * cosf( ele_rad ) * vec_len; + z_sum += sinf( ele_rad ) * vec_len; + + energy_sum += energy[j][k]; + + spread_coh_sum += hMeta->directional_meta[i].spread_coherence[j][k] * energy[j][k]; + if ( i == 0 ) + { + /* this is in common metadata and not in each direction */ + surr_coh_sum += hMeta->common_meta.surround_coherence[j][k] * energy[j][k]; + } + } + + /* the data from the combined sub-frames is written into the first sub-frame band */ + j = 0; + hMeta->directional_meta[i].azimuth[j][k] = atan2f( y_sum, x_sum ) / EVS_PI * 180.0f; + hMeta->directional_meta[i].elevation[j][k] = atan2f( z_sum, sqrtf( x_sum * x_sum + y_sum * y_sum ) ) / EVS_PI * 180.0f; + + vec_len = sqrtf( x_sum * x_sum + y_sum * y_sum + z_sum * z_sum ); + hMeta->directional_meta[i].energy_ratio[j][k] = vec_len / ( energy_sum + EPSILON ); + + hMeta->directional_meta[i].spread_coherence[j][k] = spread_coh_sum / ( energy_sum + EPSILON ); + if ( i == 0 ) + { + hMeta->common_meta.surround_coherence[j][k] = surr_coh_sum / ( energy_sum + EPSILON ); + } + + /* copy the same value to all subframes */ + for ( j = 1; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ ) + { + hMeta->directional_meta[i].azimuth[j][k] = hMeta->directional_meta[i].azimuth[0][k]; + hMeta->directional_meta[i].elevation[j][k] = hMeta->directional_meta[i].elevation[0][k]; + hMeta->directional_meta[i].energy_ratio[j][k] = hMeta->directional_meta[i].energy_ratio[0][k]; + hMeta->directional_meta[i].spread_coherence[j][k] = hMeta->directional_meta[i].spread_coherence[0][k]; + if ( i == 0 ) + { + hMeta->common_meta.surround_coherence[j][k] = hMeta->common_meta.surround_coherence[0][k]; + } + } + } + } + + for ( k = 0; k < MASA_FREQUENCY_BANDS; k++ ) + { + for ( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ ) + { + if ( numDirections == 2 ) + { + hMeta->common_meta.diffuse_to_total_ratio[j][k] = max( 0.0f, 1.0f - hMeta->directional_meta[1].energy_ratio[j][k] - hMeta->directional_meta[0].energy_ratio[j][k] ); + } + else + { + hMeta->common_meta.diffuse_to_total_ratio[j][k] = max( 0.0f, 1.0f - hMeta->directional_meta[0].energy_ratio[j][k] ); + } + hMeta->common_meta.remainder_to_total_ratio[j][k] = 0.0f; + } + } + + return; +} + + +/*-------------------------------------------------------------------* + * copy_masa_metadata_subframe() + * + * Copy MASA metadata frame subframe contents + *-------------------------------------------------------------------*/ + +static void copy_masa_metadata_subframe( + const MASA_METADATA_HANDLE hMetaFrom, /* i : MASA frame metdata to be copied */ + const uint8_t sfFrom, /* i : subframe index of the copy source */ + MASA_METADATA_HANDLE hMetaTo, /* o : MASA frame metadata copy destination */ + const uint8_t sfTo /* i : subframe index of the copy target */ +) +{ + uint8_t dir; + + /* directional metadata */ + for ( dir = 0; dir < MASA_MAXIMUM_DIRECTIONS; dir++ ) + { + mvr2r( hMetaFrom->directional_meta[dir].azimuth[sfFrom], hMetaTo->directional_meta[dir].azimuth[sfTo], MASA_FREQUENCY_BANDS ); + mvr2r( hMetaFrom->directional_meta[dir].elevation[sfFrom], hMetaTo->directional_meta[dir].elevation[sfTo], MASA_FREQUENCY_BANDS ); + mvr2r( hMetaFrom->directional_meta[dir].energy_ratio[sfFrom], hMetaTo->directional_meta[dir].energy_ratio[sfTo], MASA_FREQUENCY_BANDS ); + mvr2r( hMetaFrom->directional_meta[dir].spread_coherence[sfFrom], hMetaTo->directional_meta[dir].spread_coherence[sfTo], MASA_FREQUENCY_BANDS ); + } + + /* common metadata */ + mvr2r( hMetaFrom->common_meta.diffuse_to_total_ratio[sfFrom], hMetaTo->common_meta.diffuse_to_total_ratio[sfTo], MASA_FREQUENCY_BANDS ); + mvr2r( hMetaFrom->common_meta.surround_coherence[sfFrom], hMetaTo->common_meta.surround_coherence[sfTo], MASA_FREQUENCY_BANDS ); + mvr2r( hMetaFrom->common_meta.remainder_to_total_ratio[sfFrom], hMetaTo->common_meta.remainder_to_total_ratio[sfTo], MASA_FREQUENCY_BANDS ); + + return; +} + + +/*-------------------------------------------------------------------* + * copy_masa_metadata() + * + * Copy MASA metada frame contents + *-------------------------------------------------------------------*/ + +static void copy_masa_metadata( + const MASA_METADATA_HANDLE hMetaFrom, /* i : MASA frame metadata to be copied */ + MASA_METADATA_HANDLE hMetaTo /* o : MASA frame metadata copy destination */ +) +{ + uint8_t sf, byte_idx; + + /* descriptive metadata */ + for ( byte_idx = 0; byte_idx < 8; byte_idx++ ) + { + hMetaTo->descriptive_meta.formatDescriptor[byte_idx] = hMetaFrom->descriptive_meta.formatDescriptor[byte_idx]; + } + + hMetaTo->descriptive_meta.numberOfDirections = hMetaFrom->descriptive_meta.numberOfDirections; + hMetaTo->descriptive_meta.numberOfChannels = hMetaFrom->descriptive_meta.numberOfChannels; + hMetaTo->descriptive_meta.sourceFormat = hMetaFrom->descriptive_meta.sourceFormat; + hMetaTo->descriptive_meta.transportDefinition = hMetaFrom->descriptive_meta.transportDefinition; + hMetaTo->descriptive_meta.channelAngle = hMetaFrom->descriptive_meta.channelAngle; + hMetaTo->descriptive_meta.channelDistance = hMetaFrom->descriptive_meta.channelDistance; + hMetaTo->descriptive_meta.channelLayout = hMetaFrom->descriptive_meta.channelLayout; + + /* directional and common metadata */ + for ( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ ) + { + copy_masa_metadata_subframe( hMetaFrom, sf, hMetaTo, sf ); + } + + return; +} + + +/*-------------------------------------------------------------------* + * are_masa_subframes_similar() + * + * Compare the similarity of MASA metadata in two sub-frames + *-------------------------------------------------------------------*/ + +static uint8_t are_masa_subframes_similar( + const MASA_METADATA_HANDLE frame1, /* i : MASA metadata frame 1 */ + const uint8_t sf1_idx, /* i : index of the subframe of frame1 to inspect */ + const MASA_METADATA_HANDLE frame2, /* i : MASA metadata frame 2 */ + const uint8_t sf2_idx /* o : index of the subframe of frame2 to inspect */ +) +{ + uint8_t num_dir; + uint8_t dir; + uint8_t band_idx; + uint8_t sf_differ; + + num_dir = frame1->descriptive_meta.numberOfDirections; + dir = 0; + band_idx = 0; + sf_differ = FALSE; + + if ( num_dir != frame2->descriptive_meta.numberOfDirections ) + { + sf_differ = TRUE; + } + else + { + /* check per-direction metadata */ + dir = 0; + band_idx = 0; + + while ( ( sf_differ == FALSE ) && ( dir <= num_dir ) ) + { + band_idx = 0; + while ( ( sf_differ == FALSE ) && ( band_idx < MASA_FREQUENCY_BANDS ) ) + { + float azi_dif; + azi_dif = fabsf( frame1->directional_meta[dir].azimuth[sf1_idx][band_idx] - frame2->directional_meta[dir].azimuth[sf2_idx][band_idx] ); + azi_dif = azi_dif > 180.0f ? 360.0f - azi_dif : azi_dif; + + if ( azi_dif > MASA_ANGLE_TOLERANCE ) + { + sf_differ = TRUE; + break; + } + + if ( fabsf( frame1->directional_meta[dir].elevation[sf1_idx][band_idx] - frame2->directional_meta[dir].elevation[sf2_idx][band_idx] ) > MASA_ANGLE_TOLERANCE ) + { + sf_differ = TRUE; + break; + } + + if ( fabsf( frame1->directional_meta[dir].energy_ratio[sf1_idx][band_idx] - frame2->directional_meta[dir].energy_ratio[sf2_idx][band_idx] ) > MASA_RATIO_TOLERANCE ) + { + sf_differ = TRUE; + break; + } + + if ( fabsf( frame1->directional_meta[dir].spread_coherence[sf1_idx][band_idx] - frame2->directional_meta[dir].spread_coherence[sf2_idx][band_idx] ) > MASA_COHERENCE_TOLERANCE ) + { + sf_differ = TRUE; + break; + } + + band_idx++; + } + dir++; + } + + /* check the common metadata */ + while ( ( sf_differ == FALSE ) && ( band_idx < MASA_FREQUENCY_BANDS ) ) + { + if ( fabsf( frame1->common_meta.surround_coherence[sf1_idx][band_idx] - frame2->common_meta.surround_coherence[sf2_idx][band_idx] ) > MASA_COHERENCE_TOLERANCE ) + { + sf_differ = TRUE; + break; + } + + band_idx++; + } + } + + /* TODO: a nicer negation */ // VE: ?? + if ( sf_differ ) + { + return FALSE; + } + else + { + return TRUE; + } +} + + +/*-------------------------------------------------------------------* + * detect_framing_async() + * + * Compare the similarity of MASA metadata in two sub-frames + * Analysis result is stored in hMasa->data.sync_state, and + * potentially hMasa->masaMetadata is modified + *-------------------------------------------------------------------*/ + +static void detect_framing_async( + MASA_ENCODER_HANDLE hMasa /* i/o: MASA encoder structure */ +) +{ + MASA_METADATA_HANDLE current_meta; + MASA_METADATA_HANDLE previous_meta; + MASA_SYNC_HANDLE sync_state; + MASA_FRAME_MODE frame_mode; + uint8_t n_sim_start, n_sim_stop, sf_idx; + uint8_t found_offset; + + current_meta = &( hMasa->masaMetadata ); /* metadata from current frame */ + sync_state = &( hMasa->data.sync_state ); /* synchronization structure */ + previous_meta = &( sync_state->previous_metadata ); + + /* check current frame, how many are similar from the start and from the end */ + n_sim_start = 1; + for ( sf_idx = n_sim_start; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ ) + { + if ( are_masa_subframes_similar( current_meta, 0, current_meta, sf_idx ) == TRUE ) + { + n_sim_start = sf_idx + 1; + } + else + { + break; + } + } + + /* number of similar sub-frames starting from the end of the frame */ + if ( n_sim_start == MAX_PARAM_SPATIAL_SUBFRAMES ) /* shortcut */ + { + n_sim_stop = n_sim_start; + } + else + { + n_sim_stop = 1; + for ( sf_idx = 2; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ ) + { + /* we need to check only the two middle sub-frames, as all being the same would have taken the shortcut above */ + if ( are_masa_subframes_similar( current_meta, MAX_PARAM_SPATIAL_SUBFRAMES - 1, current_meta, MAX_PARAM_SPATIAL_SUBFRAMES - sf_idx ) == TRUE ) + { + n_sim_stop = sf_idx; + } + else + { + break; + } + } + } + + frame_mode = MASA_FRAME_4SF; /* default mode: 4sf */ + if ( sync_state->prev_offset > MAX_PARAM_SPATIAL_SUBFRAMES - 2 ) + { + /* earlier offset was large => reset the offset */ + found_offset = 0; + } + else + { + /* keep previous offset unless something else is found. alternatively, we could reset always */ + found_offset = sync_state->prev_offset; + } + + if ( ( n_sim_start == MAX_PARAM_SPATIAL_SUBFRAMES ) && ( n_sim_stop == MAX_PARAM_SPATIAL_SUBFRAMES ) ) + { + /* full frame consists of similar sub-frames */ + frame_mode = MASA_FRAME_1SF; + if ( ( sync_state->prev_sim_stop != 0 ) && ( are_masa_subframes_similar( current_meta, 0, previous_meta, MAX_PARAM_SPATIAL_SUBFRAMES - 1 ) == TRUE ) ) + { + /* > 4 sub-frames of similar data */ + if ( sync_state->prev_sim_stop < 3 ) + { + /* can nicely align the framing with the earlier data and a small offset */ + found_offset = sync_state->prev_sim_stop; + } + else + { + /* too many similar sub-frames to determine the offset accurately => keep earlier value */ + found_offset = sync_state->prev_offset; + } + } + else + { + /* earlier window was different => reset the offset */ + found_offset = 0; + } + } + else if ( n_sim_stop == 3 ) + { + /* first sub-frame different that the rest 3 + => make a risky guess that the future sf would be the same too and we're in an offset case */ + frame_mode = MASA_FRAME_1SF; + found_offset = 3; + } + else if ( ( sync_state->prev_sim_stop > 0 ) && ( are_masa_subframes_similar( current_meta, 0, previous_meta, MAX_PARAM_SPATIAL_SUBFRAMES - 1 ) == TRUE ) ) + { + /* seeing data similar to past */ + if ( ( n_sim_start > 1 ) && ( n_sim_start + sync_state->prev_sim_stop >= MAX_PARAM_SPATIAL_SUBFRAMES ) ) + { + /* with the past, would have at least one long frame similar subframes */ + frame_mode = MASA_FRAME_1SF; + + if ( sync_state->prev_offset == 0 ) + { + found_offset = min( 2, sync_state->prev_sim_stop ); + } + else + { + found_offset = sync_state->prev_offset; + } + } + } + + /* keep the original contents of the frame, but then perform interpolation later */ + /* just copy current frame to storage */ + copy_masa_metadata( current_meta, previous_meta ); + + sync_state->prev_sim_stop = n_sim_stop; + sync_state->prev_offset = found_offset; + sync_state->frame_mode = frame_mode; + + return; +} + + +#ifdef FIX_398_MASA_DIRECTION_ALIGNMENT +/*-------------------------------------------------------------------* + * masa_metadata_direction_alignment() + * + * In 2dir MASA metadata, determine the ordering of the directional + * fields such that the azi/ele change across time is minimized. + *-------------------------------------------------------------------*/ + +static void masa_metadata_direction_alignment( + MASA_ENCODER_HANDLE hMasa /* i/o: MASA encoder handle */ +) +{ + uint8_t band, n_dirs; + + MASA_DIR_ALIGN_HANDLE hAlignState; + MASA_METADATA_HANDLE hMeta; + + hAlignState = &( hMasa->data.dir_align_state ); + hMeta = &( hMasa->masaMetadata ); + + n_dirs = hMeta->descriptive_meta.numberOfDirections + 1; /* 1-based */ + for ( band = 0; band < MASA_FREQUENCY_BANDS; band++ ) + { + uint8_t sf; + float diff_swap, diff_no_swap; + + /* trade 2*(cos+sin) against storing the values between frames */ + float prev_ele_dir1_sin, prev_ele_dir2_sin; + float prev_ele_dir1_cos, prev_ele_dir2_cos; + + prev_ele_dir1_sin = sinf( hAlignState->previous_ele_dir1[band] ); + prev_ele_dir2_sin = sinf( hAlignState->previous_ele_dir2[band] ); + + prev_ele_dir1_cos = cosf( hAlignState->previous_ele_dir1[band] ); + prev_ele_dir2_cos = cosf( hAlignState->previous_ele_dir2[band] ); + + for ( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ ) + { + float azi_rad1, ele_rad1; + float azi_rad2, ele_rad2; + float cos_ele1, cos_ele2; + float sin_ele1, sin_ele2; + + azi_rad1 = hMeta->directional_meta[0].azimuth[sf][band] * PI_OVER_180; + ele_rad1 = hMeta->directional_meta[0].elevation[sf][band] * PI_OVER_180; + + if ( n_dirs > 1 ) + { + azi_rad2 = hMeta->directional_meta[1].azimuth[sf][band] * PI_OVER_180; + ele_rad2 = hMeta->directional_meta[1].elevation[sf][band] * PI_OVER_180; + + /* quick checks to detect constant data and earlier flip */ + if ( fabsf( azi_rad1 - hAlignState->previous_azi_dir1[band] ) < EPSILON && + fabsf( azi_rad2 - hAlignState->previous_azi_dir2[band] ) < EPSILON && + fabsf( ele_rad1 - hAlignState->previous_ele_dir1[band] ) < EPSILON && + fabsf( ele_rad2 - hAlignState->previous_ele_dir2[band] ) < EPSILON ) + { + diff_swap = 1.0f; + diff_no_swap = 0.0f; + /* cached values that will be used for the short-cuts and over-written by the real computations, if done */ + sin_ele1 = prev_ele_dir1_sin; + sin_ele2 = prev_ele_dir2_sin; + cos_ele1 = prev_ele_dir1_cos; + cos_ele2 = prev_ele_dir2_cos; + } + else if ( fabsf( azi_rad1 - hAlignState->previous_azi_dir2[band] ) < EPSILON && + fabsf( azi_rad2 - hAlignState->previous_azi_dir1[band] ) < EPSILON && + fabsf( ele_rad1 - hAlignState->previous_ele_dir2[band] ) < EPSILON && + fabsf( ele_rad2 - hAlignState->previous_ele_dir1[band] ) < EPSILON ) + { + diff_swap = 0.0f; + diff_no_swap = 1.0f; + /* cached values that will be used for the short-cuts and over-written by the real computations, if done */ + sin_ele1 = prev_ele_dir2_sin; + sin_ele2 = prev_ele_dir1_sin; + cos_ele1 = prev_ele_dir2_cos; + cos_ele2 = prev_ele_dir1_cos; + } + else + { + /* angular distance of the two vectors */ + /* pre-compute values for re-use */ + sin_ele1 = sinf( ele_rad1 ); + sin_ele2 = sinf( ele_rad2 ); + + cos_ele1 = cosf( ele_rad1 ); + cos_ele2 = cosf( ele_rad2 ); + + diff_no_swap = acosf( cos_ele1 * prev_ele_dir1_cos * cosf( azi_rad1 - hAlignState->previous_azi_dir1[band] ) + sin_ele1 * prev_ele_dir1_sin ) + + acosf( cos_ele2 * prev_ele_dir2_cos * cosf( azi_rad2 - hAlignState->previous_azi_dir2[band] ) + sin_ele2 * prev_ele_dir2_sin ); + + diff_swap = acosf( cos_ele1 * prev_ele_dir2_cos * cosf( azi_rad1 - hAlignState->previous_azi_dir2[band] ) + sin_ele1 * prev_ele_dir2_sin ) + + acosf( cos_ele2 * prev_ele_dir1_cos * cosf( azi_rad2 - hAlignState->previous_azi_dir1[band] ) + sin_ele2 * prev_ele_dir1_sin ); + } + } + else + { + /* 1dir */ + sin_ele1 = sinf( ele_rad1 ); + cos_ele1 = cosf( ele_rad1 ); + + azi_rad2 = 0.0f; + ele_rad2 = 0.0f; + + sin_ele2 = 0.0f; /* sin(0) */ + cos_ele2 = 1.0f; /* cos(0) */ + + diff_swap = 1.0f; + diff_no_swap = 0.0f; + } + + if ( n_dirs > 1 && diff_no_swap > diff_swap ) + { + /* swap the metadata of the two directions in this TF-tile */ + float tmp_val; + tmp_val = hMeta->directional_meta[0].azimuth[sf][band]; + hMeta->directional_meta[0].azimuth[sf][band] = hMeta->directional_meta[1].azimuth[sf][band]; + hMeta->directional_meta[1].azimuth[sf][band] = tmp_val; + + tmp_val = hMeta->directional_meta[0].elevation[sf][band]; + hMeta->directional_meta[0].elevation[sf][band] = hMeta->directional_meta[1].elevation[sf][band]; + hMeta->directional_meta[1].elevation[sf][band] = tmp_val; + + tmp_val = hMeta->directional_meta[0].energy_ratio[sf][band]; + hMeta->directional_meta[0].energy_ratio[sf][band] = hMeta->directional_meta[1].energy_ratio[sf][band]; + hMeta->directional_meta[1].energy_ratio[sf][band] = tmp_val; + + tmp_val = hMeta->directional_meta[0].spread_coherence[sf][band]; + hMeta->directional_meta[0].spread_coherence[sf][band] = hMeta->directional_meta[1].spread_coherence[sf][band]; + hMeta->directional_meta[1].spread_coherence[sf][band] = tmp_val; + + hAlignState->previous_azi_dir1[band] = azi_rad2; + hAlignState->previous_ele_dir1[band] = ele_rad2; + + hAlignState->previous_azi_dir2[band] = azi_rad1; + hAlignState->previous_ele_dir2[band] = ele_rad1; + + prev_ele_dir1_cos = cos_ele2; + prev_ele_dir1_sin = sin_ele2; + + prev_ele_dir2_cos = cos_ele1; + prev_ele_dir2_sin = sin_ele1; + } + else + { + hAlignState->previous_azi_dir1[band] = azi_rad1; + hAlignState->previous_ele_dir1[band] = ele_rad1; + + hAlignState->previous_azi_dir2[band] = azi_rad2; + hAlignState->previous_ele_dir2[band] = ele_rad2; + + prev_ele_dir1_cos = cos_ele1; + prev_ele_dir1_sin = sin_ele1; + + prev_ele_dir2_cos = cos_ele2; + prev_ele_dir2_sin = sin_ele2; + } + } /* sf */ + } /* band */ + + return; +} +#endif diff --git a/lib_enc/ivas_mc_param_enc.c b/lib_enc/ivas_mc_param_enc.c index af7a48a80b..14eca6afee 100644 --- a/lib_enc/ivas_mc_param_enc.c +++ b/lib_enc/ivas_mc_param_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -46,7 +46,7 @@ #ifdef DEBUG_PLOT #include "deb_out.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------- @@ -75,6 +75,7 @@ static void ivas_param_mc_encode_parameter( int16_t *idx_in, HANDLE_IVAS_PARAM_M static void ivas_param_mc_range_encoder( const int16_t *seq_in, const int16_t num_symbols, const uint16_t *cum_freq, const uint16_t *sym_freq, const uint16_t tot_shift, const int16_t max_nb_bits, uint16_t *bit_buffer, int16_t *bit_pos ); + /*------------------------------------------------------------------------- * ivas_param_mc_enc_open() * @@ -97,7 +98,7 @@ ivas_error ivas_param_mc_enc_open( error = IVAS_ERR_OK; /* Sanity Checks */ - if ( ( hParamMC = (PARAM_MC_ENC_HANDLE) count_malloc( sizeof( PARAM_MC_ENC_DATA ) ) ) == NULL ) + if ( ( hParamMC = (PARAM_MC_ENC_HANDLE) malloc( sizeof( PARAM_MC_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Paramtric MC\n" ) ); } @@ -145,12 +146,11 @@ ivas_error ivas_param_mc_enc_open( } /* Allocate and initialize FB mixer handle */ - if ( ( error = ivas_FB_mixer_open( &( hParamMC->hFbMixer ), input_Fs, fb_cfg ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_FB_mixer_open( &( hParamMC->hFbMixer ), input_Fs, fb_cfg, 0 ) ) != IVAS_ERR_OK ) { return error; } - /* open/init parameter coding */ ivas_param_mc_metadata_open( mc_input_setup, hParamMC->lfe_index, ivas_total_brate, &hParamMC->hMetadataPMC ); @@ -199,7 +199,11 @@ ivas_error ivas_param_mc_enc_open( /* parameter band grouping: 60 band CLDFB to 240 band MDFT resolution */ for ( i = 0; i < hParamMC->hMetadataPMC.num_parameter_bands + 1; i++ ) { +#ifdef PARAMMC_SHORT_ENC_MDFT + hParamMC->band_grouping[i] *= PARAM_MC_CLDFB_TO_MDFT_FAC; +#else hParamMC->band_grouping[i] *= CLDFB_TO_MDFT_FAC; +#endif } /* set correct coded band width */ @@ -219,6 +223,144 @@ ivas_error ivas_param_mc_enc_open( } +/*------------------------------------------------------------------------- + * ivas_param_mc_enc_reconfig() + * + * Reconfigure Parametric MC encoder + *------------------------------------------------------------------------*/ + +ivas_error ivas_param_mc_enc_reconfig( + Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */ +) +{ + int16_t i, k, l; + PARAM_MC_ENC_HANDLE hParamMC; + uint16_t config_index; + MC_LS_SETUP mc_input_setup; + int16_t max_bwidth; + int32_t input_Fs, ivas_total_brate; + ivas_error error; + + error = IVAS_ERR_OK; + + mc_input_setup = st_ivas->hEncoderConfig->mc_input_setup; + max_bwidth = st_ivas->hEncoderConfig->max_bwidth; + input_Fs = st_ivas->hEncoderConfig->input_Fs; + ivas_total_brate = st_ivas->hEncoderConfig->ivas_total_brate; + hParamMC = st_ivas->hParamMC; + + /* Preparing Config */ + st_ivas->nchan_transport = ivas_param_mc_getNumTransportChannels( ivas_total_brate, mc_input_setup ); + + /* get configuration index */ + config_index = ivas_param_mc_get_configuration_index( mc_input_setup, ivas_total_brate ); + + /* set core coder dependent on the number of transport channels */ + switch ( st_ivas->nchan_transport ) + { + case 4: + case 3: + st_ivas->nCPE = 2; + st_ivas->nSCE = 0; + st_ivas->hEncoderConfig->element_mode_init = IVAS_CPE_MDCT; + break; + case 2: + st_ivas->nCPE = 1; + st_ivas->nSCE = 0; + st_ivas->hEncoderConfig->element_mode_init = IVAS_CPE_MDCT; + break; +#ifdef DEBUGGING + default: + assert( 0 && "Number of transport channels not supported by ParamMC!\n" ); +#endif + } + + /* get dmx factors */ + hParamMC->dmx_factors = ivas_param_mc_conf[config_index].dmx_fac; + + /* deallocate the full icc map, gets newly allocated in the metadata open function */ + for ( i = 0; i < 2; i++ ) + { +#ifdef DEBUGGING + assert( hParamMC->hMetadataPMC.icc_map_full[i] != NULL ); +#endif + if ( hParamMC->hMetadataPMC.icc_map_full[i] != NULL ) + { + free( hParamMC->hMetadataPMC.icc_map_full[i] ); + hParamMC->hMetadataPMC.icc_map_full[i] = NULL; + } + } + + /* open/init parameter coding */ + ivas_param_mc_metadata_open( mc_input_setup, hParamMC->lfe_index, ivas_total_brate, &hParamMC->hMetadataPMC ); + + /* init icc index states */ + for ( i = 0; i < PARAM_MC_PARAMETER_FRAMES; i++ ) + { + set_s( hParamMC->icc_map_index[i], -1, PARAM_MC_SZ_ICC_MAP ); + + for ( l = 0; l < hParamMC->hMetadataPMC.icc_mapping_conf->icc_map_size_lfe; l++ ) + { + for ( k = 0; k < hParamMC->hMetadataPMC.icc_map_size_full; k++ ) + { + if ( hParamMC->hMetadataPMC.icc_mapping[i][l][0] == hParamMC->hMetadataPMC.icc_map_full[0][k] && hParamMC->hMetadataPMC.icc_mapping[i][l][1] == hParamMC->hMetadataPMC.icc_map_full[1][k] ) + { + hParamMC->icc_map_index[i][l] = k; + } + } + } + } + + /* Band Grouping */ + if ( hParamMC->hMetadataPMC.num_parameter_bands == 20 ) + { + mvs2s( param_mc_band_grouping_20, hParamMC->band_grouping, 20 + 1 ); + } + else if ( hParamMC->hMetadataPMC.num_parameter_bands == 14 ) + { + mvs2s( param_mc_band_grouping_14, hParamMC->band_grouping, 14 + 1 ); + } + else if ( hParamMC->hMetadataPMC.num_parameter_bands == 10 ) + { + mvs2s( param_mc_band_grouping_10, hParamMC->band_grouping, 10 + 1 ); + } + else + { + assert( 0 && "nbands must be 20, 14, or 10!" ); + } + + /* set max parameter band for abs cov */ + i = 0; + while ( hParamMC->band_grouping[i] <= PARAM_MC_MAX_BAND_ABS_COV_ENC ) + { + hParamMC->max_param_band_abs_cov = ( i++ ); + } + + /* parameter band grouping: 60 band CLDFB to 240 band MDFT resolution */ + for ( i = 0; i < hParamMC->hMetadataPMC.num_parameter_bands + 1; i++ ) + { +#ifdef PARAMMC_SHORT_ENC_MDFT + hParamMC->band_grouping[i] *= PARAM_MC_CLDFB_TO_MDFT_FAC; +#else + hParamMC->band_grouping[i] *= CLDFB_TO_MDFT_FAC; +#endif + } + + /* set correct coded band width */ + hParamMC->hMetadataPMC.coded_bwidth = max_bwidth; + hParamMC->hMetadataPMC.last_coded_bwidth = max_bwidth; + ivas_param_mc_set_coded_bands( &hParamMC->hMetadataPMC ); + + /* initialize offset for transient detection */ + hParamMC->transient_detector_delay = ( NSUBBLOCKS_SHIFT + 1 ) + NSUBBLOCKS + 1 - (int16_t) ceilf( (float) NS2SA( input_Fs, DELAY_DIRAC_ENC_CMP_NS ) / (float) NS2SA( input_Fs, 2 * DIRAC_SLOT_NS ) ); + + /* Init total/dmx ener factors */ + set_f( hParamMC->ener_fac, 0.0f, PARAM_MC_MAX_PARAMETER_BANDS ); + + return error; +} + + /*------------------------------------------------------------------------- * ivas_param_mc_enc_close() * @@ -226,14 +368,20 @@ ivas_error ivas_param_mc_enc_open( *------------------------------------------------------------------------*/ void ivas_param_mc_enc_close( - PARAM_MC_ENC_HANDLE hParamMC, /* i/o: Parametric MC encoder handle */ + PARAM_MC_ENC_HANDLE *hParamMC, /* i/o: Parametric MC encoder handle */ const int32_t sampling_rate ) { - ivas_param_mc_metadata_close( &hParamMC->hMetadataPMC ); + if ( hParamMC == NULL || *hParamMC == NULL ) + { + return; + } - ivas_FB_mixer_close( &hParamMC->hFbMixer, sampling_rate ); + ivas_param_mc_metadata_close( &( *hParamMC )->hMetadataPMC ); - count_free( hParamMC ); + ivas_FB_mixer_close( &( *hParamMC )->hFbMixer, sampling_rate, 0 ); + + free( ( *hParamMC ) ); + ( *hParamMC ) = NULL; return; } @@ -246,10 +394,10 @@ void ivas_param_mc_enc_close( *------------------------------------------------------------------------*/ void ivas_param_mc_enc( - Encoder_Struct *st_ivas, /* i/o: IVAS Encoder handle */ - BSTR_ENC_HANDLE hMetaData, /* i/o: IVAS Metadata bitstream handle */ - float data_f[][L_FRAME48k], /* i/o: input: CICP6, CICP12, CICP14, CICP16 or CICP19 MC data */ - const int16_t input_frame /* i : input frame length */ + Encoder_Struct *st_ivas, /* i/o: IVAS Encoder handle */ + BSTR_ENC_HANDLE hMetaData, /* i/o: IVAS Metadata bitstream handle */ + float data_f[][L_FRAME48k], /* i/o: input: CICP6, CICP12, CICP14, CICP16 or CICP19 MC data */ + const int16_t input_frame /* i : input frame length */ ) { int16_t k; @@ -267,7 +415,7 @@ void ivas_param_mc_enc( PARAM_MC_ENC_HANDLE hParamMC; int16_t nchan_inp; - wmops_sub_start( "param_mc_enc" ); + push_wmops( "param_mc_enc" ); /* initializations */ hParamMC = st_ivas->hParamMC; @@ -409,7 +557,7 @@ void ivas_param_mc_enc( /* updates */ hParamMC->hMetadataPMC.last_coded_bwidth = hParamMC->hMetadataPMC.coded_bwidth; - wmops_sub_end(); + pop_wmops(); return; } @@ -500,11 +648,9 @@ static void ivas_param_mc_param_est_enc( int16_t start_ts; const float *p_dmx_fac; - wmops_sub_start( "param_mc_prm_est" ); + push_wmops( "param_mc_prm_est" ); /* initializations */ - - l_ts = input_frame / PARAM_MC_MDFT_NO_SLOTS; num_time_slots = PARAM_MC_MDFT_NO_SLOTS; start_ts = hParamMC->hMetadataPMC.bAttackPresent ? hParamMC->hMetadataPMC.attackIndex : 0; @@ -544,7 +690,11 @@ static void ivas_param_mc_param_est_enc( for ( ts = start_ts; ts < num_time_slots; ts++ ) { +#ifdef PARAMMC_SHORT_ENC_MDFT + ivas_fb_mixer_get_windowed_fr( hParamMC->hFbMixer, pcm_in, p_slot_frame_f_real, p_slot_frame_f_imag, l_ts, l_ts ); +#else ivas_fb_mixer_get_windowed_fr( hParamMC->hFbMixer, pcm_in, p_slot_frame_f_real, p_slot_frame_f_imag, l_ts, 2 * l_ts ); +#endif ivas_fb_mixer_update_prior_input( hParamMC->hFbMixer, pcm_in, l_ts ); for ( i = 0; i < nchan_input; i++ ) { @@ -776,8 +926,7 @@ static void ivas_param_mc_param_est_enc( hParamMC->hMetadataPMC.lfe_on = 1; } - - wmops_sub_end(); + pop_wmops(); return; } @@ -1034,7 +1183,7 @@ static void ivas_param_mc_quantize_ilds( float tot_ener, dmx_ener, ener_fac, delta_fac; int16_t ILD_idx[PARAM_MC_SZ_ILD_MAP]; - wmops_sub_start( "param_mc_prm_q" ); + push_wmops( "param_mc_prm_q" ); /* Initialization */ set_zero( Nrg, MAX_CICP_CHANNELS ); @@ -1056,7 +1205,7 @@ static void ivas_param_mc_quantize_ilds( /* Downsampling */ if ( ( hParamMC->hMetadataPMC.bAttackPresent == 0 ) && ( hParamMC->hMetadataPMC.param_frame_idx != hParamMC->hMetadataPMC.coding_band_mapping[freq_idx] ) ) { - wmops_sub_end(); + pop_wmops(); return; } @@ -1143,7 +1292,7 @@ static void ivas_param_mc_quantize_ilds( /* Save current quantized ICLDs */ mvs2s( ILD_idx, ILD_idx_out + freq_idx * ild_map_size, num_ilds_to_code ); - wmops_sub_end(); + pop_wmops(); return; } @@ -1308,7 +1457,7 @@ static void ivas_param_mc_transient_detection( float *pAccSubblockNrg; float attackRatioThreshold; - wmops_sub_start( "param_mc_trn_det" ); + push_wmops( "param_mc_trn_det" ); attackRatioThreshold = hTranDet->transientDetector.attackRatioThreshold; pSubblockNrg = &hTranDet->subblockEnergies.subblockNrg[hParamMC->transient_detector_delay]; @@ -1339,7 +1488,7 @@ static void ivas_param_mc_transient_detection( *pAttackIndex = attackIndex; *pbIsAttackPresent = bIsAttackPresent; - wmops_sub_end(); + pop_wmops(); return; } @@ -1369,7 +1518,7 @@ static void ivas_param_mc_write_bs( int16_t ild_map_size_wo_lfe; int16_t ild_map_size; - wmops_sub_start( "param_mc_prm_enc" ); + push_wmops( "param_mc_prm_enc" ); /* Init */ set_zero( seq_tmp_uni, PARAM_MC_MAX_PARAMETER_BANDS * PARAM_MC_SZ_ILD_MAP ); @@ -1434,7 +1583,7 @@ static void ivas_param_mc_write_bs( ivas_param_mc_encode_parameter( ILD_idx, &hParamMC->hMetadataPMC, &hParamMC->hMetadataPMC.ild_coding, nbands, band_step, ild_map_size_wo_lfe, ild_map_size, bit_buffer, bit_pos ); - wmops_sub_end(); + pop_wmops(); return; } @@ -1587,6 +1736,7 @@ static void ivas_param_mc_dec2bin( { bits[idx] = ( val >> ( N - 1 - idx ) ) & 1; } + return; } diff --git a/lib_enc/ivas_mcmasa_enc.c b/lib_enc/ivas_mcmasa_enc.c index 8d127e17d5..8151b33c66 100644 --- a/lib_enc/ivas_mcmasa_enc.c +++ b/lib_enc/ivas_mcmasa_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -34,7 +34,6 @@ #include #include #include - #include "ivas_cnst.h" #include "ivas_prot.h" #include "options.h" @@ -44,7 +43,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------- @@ -111,7 +110,7 @@ ivas_error ivas_mcmasa_enc_open( assert( st_ivas->hMasa != NULL && "MASA encoder handle is not present" ); hMasa = st_ivas->hMasa; - if ( NULL == ( hMcMasa = (MCMASA_ENC_HANDLE) count_malloc( sizeof( MCMASA_ENC_DATA ) ) ) ) + if ( ( hMcMasa = (MCMASA_ENC_HANDLE) malloc( sizeof( MCMASA_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) ); } @@ -195,7 +194,7 @@ ivas_error ivas_mcmasa_enc_open( } /* Allocate and initialize FB mixer handle */ - if ( ( error = ivas_FB_mixer_open( &( hMcMasa->hFbMixer ), input_Fs, fb_cfg ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_FB_mixer_open( &( hMcMasa->hFbMixer ), input_Fs, fb_cfg, 0 ) ) != IVAS_ERR_OK ) { return error; } @@ -204,9 +203,16 @@ ivas_error ivas_mcmasa_enc_open( if ( hMcMasa->separateChannelEnabled ) { /* TD Energy calculation with LP */ - hMcMasa->delay_buffer_lfe[0] = (float *) count_malloc( NS2SA( input_Fs, DELAY_DIRAC_ENC_CMP_NS + DIRAC_SLOT_ENC_NS ) * sizeof( float ) ); + if ( ( hMcMasa->delay_buffer_lfe[0] = (float *) malloc( NS2SA( input_Fs, DELAY_DIRAC_ENC_CMP_NS + DIRAC_SLOT_ENC_NS ) * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) ); + } set_zero( hMcMasa->delay_buffer_lfe[0], NS2SA( input_Fs, DELAY_DIRAC_ENC_CMP_NS + DIRAC_SLOT_ENC_NS ) ); - hMcMasa->delay_buffer_lfe[1] = (float *) count_malloc( NS2SA( input_Fs, DELAY_DIRAC_ENC_CMP_NS + DIRAC_SLOT_ENC_NS ) * sizeof( float ) ); + + if ( ( hMcMasa->delay_buffer_lfe[1] = (float *) malloc( NS2SA( input_Fs, DELAY_DIRAC_ENC_CMP_NS + DIRAC_SLOT_ENC_NS ) * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) ); + } set_zero( hMcMasa->delay_buffer_lfe[1], NS2SA( input_Fs, DELAY_DIRAC_ENC_CMP_NS + DIRAC_SLOT_ENC_NS ) ); hMcMasa->hFbMixerLfe = NULL; } @@ -218,7 +224,7 @@ ivas_error ivas_mcmasa_enc_open( return error; } - if ( ( error = ivas_FB_mixer_open( &( hMcMasa->hFbMixerLfe ), input_Fs, fb_cfgLfe ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_FB_mixer_open( &( hMcMasa->hFbMixerLfe ), input_Fs, fb_cfgLfe, 0 ) ) != IVAS_ERR_OK ) { return error; } @@ -236,7 +242,10 @@ ivas_error ivas_mcmasa_enc_open( bufferSize = (int16_t) ( ( input_Fs / FRAMES_PER_SEC ) / MAX_PARAM_SPATIAL_SUBFRAMES ); for ( i = 0; i < 2; i++ ) { - hMcMasa->lfeAnaRingBuffer[i] = (float *) count_malloc( bufferSize * sizeof( float ) ); + if ( ( hMcMasa->lfeAnaRingBuffer[i] = (float *) malloc( bufferSize * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) ); + } set_zero( hMcMasa->lfeAnaRingBuffer[i], bufferSize ); hMcMasa->lowpassSum[i] = 0.0f; } @@ -250,33 +259,56 @@ ivas_error ivas_mcmasa_enc_open( /* intensity 3-dim */ for ( i = 0; i < DIRAC_NUM_DIMS; i++ ) { - hMcMasa->direction_vector_m[i] = (float **) count_malloc( MAX_PARAM_SPATIAL_SUBFRAMES * sizeof( float * ) ); + if ( ( hMcMasa->direction_vector_m[i] = (float **) malloc( MAX_PARAM_SPATIAL_SUBFRAMES * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) ); + } for ( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ ) { - hMcMasa->direction_vector_m[i][j] = (float *) count_malloc( hMcMasa->nbands * sizeof( float ) ); + if ( ( hMcMasa->direction_vector_m[i][j] = (float *) malloc( hMcMasa->nbands * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) ); + } } } hMcMasa->no_col_avg_diff = (int8_t) ( DIRAC_NO_COL_AVG_DIFF_NS / dirac_slot_ns ); for ( i = 0; i < DIRAC_NUM_DIMS; i++ ) { - hMcMasa->buffer_intensity_real[i] = (float **) count_malloc( hMcMasa->no_col_avg_diff * sizeof( float * ) ); + if ( ( hMcMasa->buffer_intensity_real[i] = (float **) malloc( hMcMasa->no_col_avg_diff * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) ); + } + for ( j = 0; j < hMcMasa->no_col_avg_diff; j++ ) { - hMcMasa->buffer_intensity_real[i][j] = (float *) count_malloc( hMcMasa->nbands * sizeof( float ) ); + if ( ( hMcMasa->buffer_intensity_real[i][j] = (float *) malloc( hMcMasa->nbands * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) ); + } set_zero( hMcMasa->buffer_intensity_real[i][j], hMcMasa->nbands ); } } - hMcMasa->buffer_intensity_real_vert = (float **) count_malloc( hMcMasa->no_col_avg_diff * sizeof( float * ) ); + if ( ( hMcMasa->buffer_intensity_real_vert = (float **) malloc( hMcMasa->no_col_avg_diff * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) ); + } + for ( j = 0; j < hMcMasa->no_col_avg_diff; j++ ) { - hMcMasa->buffer_intensity_real_vert[j] = (float *) count_malloc( hMcMasa->nbands * sizeof( float ) ); + if ( ( hMcMasa->buffer_intensity_real_vert[j] = (float *) malloc( hMcMasa->nbands * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) ); + } set_zero( hMcMasa->buffer_intensity_real_vert[j], hMcMasa->nbands ); } - hMcMasa->buffer_energy = (float *) count_malloc( hMcMasa->nbands * hMcMasa->no_col_avg_diff * sizeof( float ) ); + if ( ( hMcMasa->buffer_energy = (float *) malloc( hMcMasa->nbands * hMcMasa->no_col_avg_diff * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) ); + } set_zero( hMcMasa->buffer_energy, hMcMasa->nbands * hMcMasa->no_col_avg_diff ); if ( st_ivas->hEncoderConfig->mc_input_setup == MC_LS_SETUP_5_1 ) @@ -396,6 +428,50 @@ ivas_error ivas_mcmasa_enc_open( } +/*------------------------------------------------------------------------- + * ivas_mcmasa_enc_reconfig() + * + * Reconfigure McMASA encoder + *------------------------------------------------------------------------*/ + +ivas_error ivas_mcmasa_enc_reconfig( + Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */ +) +{ + int32_t ivas_total_brate; + ivas_error error; + + error = IVAS_ERR_OK; + + ivas_total_brate = st_ivas->hEncoderConfig->ivas_total_brate; + + if ( ivas_total_brate != st_ivas->hEncoderConfig->last_ivas_total_brate ) + { + /* bitrate changed, may need to do something */ + + /* brute-force solution: close McMASA and re-instantiate with new settings */ + ivas_masa_enc_close( &( st_ivas->hMasa ) ); + ivas_mcmasa_enc_close( &( st_ivas->hMcMasa ), st_ivas->hEncoderConfig->input_Fs ); + + /* Determine if to separate some channels from the analysis */ + ivas_mcmasa_setNumTransportChannels( &( st_ivas->nchan_transport ), &( st_ivas->hEncoderConfig->element_mode_init ), ivas_total_brate ); + + if ( ( error = ivas_masa_enc_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + + if ( ( error = ivas_mcmasa_enc_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + + /* core SCE, CPE reconfiguration happens later */ + } + + return error; +} + /*--------------------------------------------------------------------------* * ivas_mcmasa_enc_close() * @@ -403,30 +479,33 @@ ivas_error ivas_mcmasa_enc_open( *--------------------------------------------------------------------------*/ void ivas_mcmasa_enc_close( - MCMASA_ENC_HANDLE hMcMasa, /* i/o: encoder McMASA handle */ - const int32_t input_Fs /* i : input sampling rate */ + MCMASA_ENC_HANDLE *hMcMasa, /* i/o: encoder McMASA handle */ + const int32_t input_Fs /* i : input sampling rate */ ) { int16_t i, j; - if ( hMcMasa->separateChannelEnabled ) + if ( hMcMasa == NULL || *hMcMasa == NULL ) { - count_free( hMcMasa->delay_buffer_lfe[0] ); - count_free( hMcMasa->delay_buffer_lfe[1] ); + return; } - if ( hMcMasa->separateChannelEnabled ) + + if ( ( *hMcMasa )->separateChannelEnabled ) { + free( ( *hMcMasa )->delay_buffer_lfe[0] ); + free( ( *hMcMasa )->delay_buffer_lfe[1] ); + for ( i = 0; i < 2; i++ ) { - count_free( hMcMasa->lfeAnaRingBuffer[i] ); + free( ( *hMcMasa )->lfeAnaRingBuffer[i] ); } } - ivas_FB_mixer_close( &hMcMasa->hFbMixer, input_Fs ); + ivas_FB_mixer_close( &( *hMcMasa )->hFbMixer, input_Fs, 0 ); - if ( !hMcMasa->separateChannelEnabled ) + if ( !( *hMcMasa )->separateChannelEnabled ) { - ivas_FB_mixer_close( &hMcMasa->hFbMixerLfe, input_Fs ); + ivas_FB_mixer_close( &( *hMcMasa )->hFbMixerLfe, input_Fs, 0 ); } /* intensity 3-dim */ @@ -434,35 +513,36 @@ void ivas_mcmasa_enc_close( { for ( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ ) { - count_free( hMcMasa->direction_vector_m[i][j] ); - hMcMasa->direction_vector_m[i][j] = NULL; + free( ( *hMcMasa )->direction_vector_m[i][j] ); + ( *hMcMasa )->direction_vector_m[i][j] = NULL; } - for ( j = 0; j < hMcMasa->no_col_avg_diff; j++ ) + for ( j = 0; j < ( *hMcMasa )->no_col_avg_diff; j++ ) { - count_free( hMcMasa->buffer_intensity_real[i][j] ); - hMcMasa->buffer_intensity_real[i][j] = NULL; + free( ( *hMcMasa )->buffer_intensity_real[i][j] ); + ( *hMcMasa )->buffer_intensity_real[i][j] = NULL; } - count_free( hMcMasa->buffer_intensity_real[i] ); - hMcMasa->buffer_intensity_real[i] = NULL; + free( ( *hMcMasa )->buffer_intensity_real[i] ); + ( *hMcMasa )->buffer_intensity_real[i] = NULL; - count_free( hMcMasa->direction_vector_m[i] ); - hMcMasa->direction_vector_m[i] = NULL; + free( ( *hMcMasa )->direction_vector_m[i] ); + ( *hMcMasa )->direction_vector_m[i] = NULL; } - for ( j = 0; j < hMcMasa->no_col_avg_diff; j++ ) + for ( j = 0; j < ( *hMcMasa )->no_col_avg_diff; j++ ) { - count_free( hMcMasa->buffer_intensity_real_vert[j] ); - hMcMasa->buffer_intensity_real_vert[j] = NULL; + free( ( *hMcMasa )->buffer_intensity_real_vert[j] ); + ( *hMcMasa )->buffer_intensity_real_vert[j] = NULL; } - count_free( hMcMasa->buffer_intensity_real_vert ); - hMcMasa->buffer_intensity_real_vert = NULL; + free( ( *hMcMasa )->buffer_intensity_real_vert ); + ( *hMcMasa )->buffer_intensity_real_vert = NULL; - count_free( hMcMasa->buffer_energy ); - hMcMasa->buffer_energy = NULL; + free( ( *hMcMasa )->buffer_energy ); + ( *hMcMasa )->buffer_energy = NULL; - count_free( hMcMasa ); + free( ( *hMcMasa ) ); + ( *hMcMasa ) = NULL; return; } @@ -486,15 +566,12 @@ void ivas_mcmasa_enc( int16_t i, j, k; int16_t nBands = hMcMasa->nbands; int16_t nBlocks = MAX_PARAM_SPATIAL_SUBFRAMES; - uint8_t fixedDistance = 0; - float elevation_m_values[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; float azimuth_m_values[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; float energyRatio[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; float spreadCoherence[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; float surroundingCoherence[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; - float separatedChannelSignal[L_FRAME48k]; /* Compute low frequency energy */ @@ -721,7 +798,6 @@ void ivas_mcmasa_param_est_enc( set_zero( coherentEnergyRatio[0], hMcMasa->nbands ); } - /* Copy current frame to memory for delay compensation */ for ( i = 0; i < numAnalysisChannels; i++ ) { @@ -1138,6 +1214,7 @@ void ivas_mcmasa_param_est_enc( { numSubFramesForRatio = MAX_PARAM_SPATIAL_SUBFRAMES; } + for ( i = 0; i < numSubFramesForRatio; i++ ) { for ( j = 0; j < hMcMasa->nbands; j++ ) @@ -1151,6 +1228,86 @@ void ivas_mcmasa_param_est_enc( } +/*--------------------------------------------------------------------------* + * ivas_mcmasa_dmx_modify() + * + * + *--------------------------------------------------------------------------*/ + +void ivas_mcmasa_dmx_modify( + const int16_t n_samples, /* i : input frame length in samples */ + float dmx[][L_FRAME48k + NS2SA( 48000, IVAS_FB_ENC_DELAY_NS )], /* i/o: downmix signal to be transformed into another format. TODO: buffer size into define? */ + const int16_t n_chnls_dmx_old, /* i : number of downmix channels in the old format */ + const int16_t n_chnls_dmx_new ) /* i : number of downmix channels in the target format */ +{ + /* assumed data ordering in **dmx: [sce][cpe_chnl0][cpe_chnl1], i.e., [c][l][r] */ + int16_t i; + + assert( ( n_chnls_dmx_old == 1 || n_chnls_dmx_old == 2 || n_chnls_dmx_old == 3 ) && "Input downmix may contain only 1-3 channels." ); + assert( ( n_chnls_dmx_new == 1 || n_chnls_dmx_new == 2 || n_chnls_dmx_new == 3 ) && "Output downmix may contain only 1-3 channels." ); + + if ( n_chnls_dmx_old == n_chnls_dmx_new ) + { + /* same dmx layout -> nothing to do */ + return; + } + + if ( n_chnls_dmx_old == 1 ) + { + /* split mono energy into identical channels */ + for ( i = 0; i < n_samples; i++ ) + { + if ( n_chnls_dmx_new == 2 ) + { + dmx[1][i] = dmx[0][i] * INV_SQRT2; + dmx[2][i] = dmx[1][i]; + } + else if ( n_chnls_dmx_new == 3 ) + { + dmx[0][i] = dmx[0][i] * INV_SQRT3; + } + } + } + else if ( n_chnls_dmx_old == 2 ) + { + for ( i = 0; i < n_samples; i++ ) + { + if ( n_chnls_dmx_new == 1 ) + { + /* sum l and r */ + dmx[0][i] = dmx[1][i] + dmx[2][i]; + } + else if ( n_chnls_dmx_new == 3 ) + { + dmx[0][i] = 0.5f * ( dmx[1][i] + dmx[2][i] ); + dmx[1][i] = dmx[1][i] - dmx[0][i]; + dmx[2][i] = dmx[2][i] - dmx[0][i]; + } + } + } + else if ( n_chnls_dmx_old == 3 ) + { + for ( i = 0; i < n_samples; i++ ) + { + if ( n_chnls_dmx_new == 1 ) + { + /* sum all channels */ + dmx[0][i] = dmx[0][i] + dmx[1][i] + dmx[2][i]; + } + else if ( n_chnls_dmx_new == 2 ) + { + /* mix center into sides */ + dmx[0][i] *= INV_SQRT2; + dmx[1][i] += dmx[0][i]; + dmx[2][i] += dmx[0][i]; + } + } + } + + return; +} + + /*--------------------------------------------------------------------------* * Local functions *--------------------------------------------------------------------------*/ diff --git a/lib_enc/ivas_mct_core_enc.c b/lib_enc/ivas_mct_core_enc.c index 4a94dee5d9..900c5e1653 100644 --- a/lib_enc/ivas_mct_core_enc.c +++ b/lib_enc/ivas_mct_core_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*----------------------------------------------------------* @@ -51,7 +51,6 @@ *----------------------------------------------------------*/ static void FindChannelRatio( - MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */ Encoder_State **sts, /* i/o: encoder state structure */ int16_t chBitRatios[MCT_MAX_CHANNELS], /* o : bit-disctribution channel ratios */ const int16_t nChannels /* i : number of channels to be coded */ @@ -69,7 +68,7 @@ static void FindChannelRatio( sum_nrg = 0; for ( i = 0; i < nChannels; i++ ) { - if ( sts[i]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[i]->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( sts[i]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { sum_nrg += nrg[i]; } @@ -78,7 +77,7 @@ static void FindChannelRatio( for ( i = 0; i < nChannels; i++ ) { - if ( sts[i]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[i]->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( sts[i]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { chRatio = nrg[i] * sum_nrg; chBitRatios[i] = min( BITRATE_MCT_RATIO_RANGE - 1, max( 1, (uint16_t) ( BITRATE_MCT_RATIO_RANGE * chRatio + 0.5f ) ) ); @@ -87,15 +86,10 @@ static void FindChannelRatio( { chBitRatios[i] = 0; } - else if ( hMCT->num_lfe ) - { - assert( sts[i]->mct_chan_mode == MCT_CHAN_MODE_LFE ); - chBitRatios[i] = !hMCT->LFE_off; - } } #ifdef DEBUG_MODE_MDCT - for ( i = 0; i < nchan; i++ ) + for ( i = 0; i < nChannels; i++ ) { dbgwrite( &chBitRatios[i], sizeof( int16_t ), 1, 1, "./res/chBitRatio" ); /* dbgwrite(&chRatio[i], sizeof(float),1,1,"./res/chRatio");*/ @@ -114,28 +108,17 @@ static void FindChannelRatio( static void AdjustChannelRatios( int16_t chBitRatios[MCT_MAX_CHANNELS], /* o : bit-disctribution channel ratios */ - const int16_t nChannels /* i/o: number of channels */ -#ifdef FIX_I1_113 - , - const int32_t ivas_total_brate, /* i : IVAS total bitrate */ - const int16_t nAvailBits, /* i : number of available bits */ - const int16_t sba_order /* i : Ambisonic (SBA) order */ -#endif + const int16_t nChannels, /* i/o: number of channels */ + const int32_t ivas_total_brate, /* i : IVAS total bitrate */ + const int16_t nAvailBits, /* i : number of available bits */ + const int16_t sba_order /* i : Ambisonic (SBA) order */ ) { int16_t force_ch_bit_ratios[IVAS_SPAR_MAX_DMX_CHS]; -#ifdef FIX_I1_113 int32_t temp_brs[IVAS_SPAR_MAX_DMX_CHS]; -#endif float cur_ratio, tar_ratio, sum_ratio, sum_tar_ratio; int16_t ratio_diff, i; -#ifndef FIX_I1_113 - force_ch_bit_ratios[0] = 9; - force_ch_bit_ratios[1] = 7; - force_ch_bit_ratios[2] = 5; - force_ch_bit_ratios[3] = 3; -#else ivas_spar_bitrate_dist( temp_brs, nAvailBits, ivas_total_brate, sba_order, (int16_t) FB ); sum_ratio = 0.0f; @@ -148,7 +131,6 @@ static void AdjustChannelRatios( cur_ratio = temp_brs[i] / sum_ratio; force_ch_bit_ratios[i] = min( BITRATE_MCT_RATIO_RANGE - 1, max( 1, (uint16_t) ( BITRATE_MCT_RATIO_RANGE * cur_ratio + 0.5f ) ) ); } -#endif /* adjust the ratios further based on received chBitRatios[]*/ ratio_diff = 0; @@ -207,11 +189,8 @@ void ivas_mct_core_enc( const int16_t nChannels, /* i : number of channels to be coded */ const int32_t ivas_total_brate, /* i : IVAS total bitrate */ const int16_t switch_bw, /* i : flag bandwidth switch occurance */ - const int16_t lfe_bits /* i : bits spent for LFE */ -#ifdef FIX_I1_113 - , - const int16_t sba_order /* i : Ambisonic (SBA) order */ -#endif + const int16_t lfe_bits, /* i : bits spent for LFE */ + const int16_t sba_order /* i : Ambisonic (SBA) order */ ) { int16_t ch, ch_core, nSubframes, L_subframeTCX; @@ -243,7 +222,7 @@ void ivas_mct_core_enc( static FILE *f_bit_split = 0; #endif - wmops_sub_start( "mct_encoding" ); + push_wmops( "mct_encoding" ); /*--------------------------------------------------------------* * Initialization @@ -252,6 +231,8 @@ void ivas_mct_core_enc( total_side_bits = 0; nCPE = nChannels / CPE_CHANNELS; + + /*in case of odd number of channels*/ if ( ( nCPE * CPE_CHANNELS ) != nChannels ) { nCPE++; @@ -270,7 +251,7 @@ void ivas_mct_core_enc( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { sts[i] = hCPE[cpe_id]->hCoreCoder[ch]; - if ( hCPE[cpe_id]->hCoreCoder[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE || hCPE[cpe_id]->hCoreCoder[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( hCPE[cpe_id]->hCoreCoder[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { i++; continue; @@ -319,7 +300,8 @@ void ivas_mct_core_enc( { st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && hMCT->LFE_off ) || st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -347,7 +329,8 @@ void ivas_mct_core_enc( for ( ch = 0; ch < nChannels; ch++ ) { - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -394,7 +377,8 @@ void ivas_mct_core_enc( for ( ch = 0; ch < nChannels; ch++ ) { st = sts[ch]; - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -426,7 +410,8 @@ void ivas_mct_core_enc( for ( ch = 0; ch < nChannels; ch++ ) { st = sts[ch]; - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -447,7 +432,8 @@ void ivas_mct_core_enc( for ( ch = 0; ch < nChannels; ch++ ) { st = sts[ch]; - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -460,7 +446,8 @@ void ivas_mct_core_enc( { st = sts[ch]; - if ( ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) && hMCT->LFE_off ) || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -475,15 +462,8 @@ void ivas_mct_core_enc( write_mct_bitstream( sts, hMCT, nChannels ); - FindChannelRatio( hMCT, sts, chBitRatios, nChannels ); - -#ifndef FIX_I1_113 - if ( hMCT->hbr_mct ) - { - assert( ivas_total_brate >= IVAS_256k ); - AdjustChannelRatios( chBitRatios, nChannels ); - } -#endif + FindChannelRatio( + sts, chBitRatios, nChannels ); nAvailBits = (int16_t) ( ( ivas_total_brate / FRAMES_PER_SEC ) - NBITS_BWIDTH - hMCT->nBitsMCT - lfe_bits ); @@ -511,29 +491,29 @@ void ivas_mct_core_enc( /*substract bits needed for the bitrate ratios */ for ( ch = 0; ch < nChannels; ch++ ) { - if ( ( ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) && hMCT->LFE_off ) || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } nAvailBits -= NBBITS_MCT_RATIO; } - nAvailBits -= total_side_bits + ( hMCT->num_lfe ? 1 : 0 ) + hMCT->nchan_out_woLFE; /* if MC 1 extra bit that was initially send to signal LFE_off */ + nAvailBits -= total_side_bits + hMCT->nchan_out_woLFE; /* if MC 1 extra bit that was initially send to signal LFE_off */ #ifdef DEBUG_MODE_MDCT dbgwrite( &nAvailBits, sizeof( int16_t ), 1, 1, "./res/availBits" ); #endif -#ifdef FIX_I1_113 if ( hMCT->hbr_mct ) { assert( ivas_total_brate >= IVAS_256k ); AdjustChannelRatios( chBitRatios, nChannels, ivas_total_brate, nAvailBits, sba_order ); } -#endif for ( ch = 0; ch < nChannels; ch++ ) { - if ( ( ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) && hMCT->LFE_off ) || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -556,15 +536,11 @@ void ivas_mct_core_enc( { continue; } - - if ( !( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) && hMCT->LFE_off ) ) /* indicates LFE with no content */ - { - st->total_brate = ( st->bits_frame_channel + st->side_bits_frame_channel ) * FRAMES_PER_SEC; + st->total_brate = ( st->bits_frame_channel + st->side_bits_frame_channel ) * FRAMES_PER_SEC; #ifdef DEBUGGING - total_brate += st->total_brate; + total_brate += st->total_brate; #endif - } } #ifdef DEBUGGING if ( hCPE[cpe_id]->hMetaData != NULL ) @@ -576,11 +552,11 @@ void ivas_mct_core_enc( #ifdef DEBUGGING format_bits = ( ivas_format == MC_FORMAT ? IVAS_FORMAT_SIGNALING_NBITS + MC_LS_SETUP_BITS : IVAS_FORMAT_SIGNALING_NBITS_SBA + SBA_ORDER_BITS + SBA_PLANAR_BITS ); - mct_bits += hMCT->nBitsMCT + ( hMCT->num_lfe ? 1 : 0 ) + hMCT->nchan_out_woLFE; + mct_bits += hMCT->nBitsMCT + hMCT->nchan_out_woLFE; assert( ( total_brate + ( NBITS_BWIDTH + format_bits + mct_bits + sba_meta + lfe_bits ) * FRAMES_PER_SEC ) == ivas_total_brate ); #endif - wmops_sub_end(); + pop_wmops(); return; } diff --git a/lib_enc/ivas_mct_enc.c b/lib_enc/ivas_mct_enc.c index c9f3698b27..f2f5d23461 100644 --- a/lib_enc/ivas_mct_enc.c +++ b/lib_enc/ivas_mct_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,14 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" + + +/*-----------------------------------------------------------------------* + * Local function prototypes + *-----------------------------------------------------------------------*/ + +static ivas_error ivas_mc_enc_reconfig( Encoder_Struct *st_ivas, const int16_t last_mc_mode ); /*-------------------------------------------------------------------* @@ -83,7 +90,59 @@ static void set_mct_enc_params( return; } +/*-------------------------------------------------------------------* + * map_input_to_cpe_channels() + * + * for MC_MODE map input channels to cpe channels + * mid channel (ch==2) is mapped to last odd-channel CPE + * all channels after LFE are mapped to cpe_id=1 and onwards + * E.g. for 5_1 and for 3 CPEs: + * cpe_id 0: L=data[0] R=data[1] + * cpe_id 1: L=data[4] R=data[5] + * cpe_id 2: L=data[2] (mid) R=NULL + *-------------------------------------------------------------------*/ +static void map_input_to_cpe_channels( + const Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */ + float *pdata[MAX_INPUT_CHANNELS], /* o: mapped input pointers */ + float data[MCT_MAX_CHANNELS][L_FRAME48k] /* i: input channel data */ +) +{ + int16_t i, n; + + i = 0; + + for ( n = 0; n < LFE_CHANNEL - 1; n++ ) + { + pdata[i] = data[n]; + i++; + } + + if ( st_ivas->hEncoderConfig->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ) + { + for ( n = LFE_CHANNEL + 1; n < st_ivas->nchan_transport; n++ ) + { + pdata[i] = data[n]; + i++; + } + pdata[i] = data[LFE_CHANNEL - 1]; + } + else + { + for ( ; n < st_ivas->nchan_transport; n++ ) + { + pdata[i] = data[n]; + i++; + } + } + /* odd channel CPE*/ + if ( ( st_ivas->nchan_transport < st_ivas->nCPE * CPE_CHANNELS ) || ( st_ivas->mc_mode == MC_MODE_MCT && st_ivas->hMCT->nchan_out_woLFE < st_ivas->nCPE * CPE_CHANNELS ) ) + { + pdata[st_ivas->nCPE * CPE_CHANNELS - 1] = NULL; + } + + return; +} /*-------------------------------------------------------------------* * ivas_mct_enc() * @@ -107,10 +166,11 @@ ivas_error ivas_mct_enc( int16_t max_bwidth; int32_t ivas_total_brate; ivas_error error; + float *pdata[MAX_INPUT_CHANNELS]; error = IVAS_ERR_OK; - wmops_sub_start( "ivas_mct_enc" ); + push_wmops( "ivas_mct_enc" ); /* Initialization */ hMCT = st_ivas->hMCT; @@ -123,7 +183,7 @@ ivas_error ivas_mct_enc( #ifdef DEBUG_FORCE_MCT_CP if ( ivas_format == MC_FORMAT ) { - assert( "Debugging switch works only with SBA modes" ); + assert( !"Debugging switch works only with SBA modes" ); } #endif @@ -136,11 +196,17 @@ ivas_error ivas_mct_enc( hMCT->p_orig_spectrum_long[cpe_id][n] = orig_spectrum_long[cpe_id][n]; hCPE->hCoreCoder[n]->input_bwidth = hCPE->hCoreCoder[n]->last_input_bwidth; /* updated in BWD */ hCPE->hCoreCoder[n]->bwidth = hCPE->hCoreCoder[n]->last_bwidth; /* updated in BWD */ + /* reset channel mode from previous state*/ + if ( ( hCPE->cpe_id * CPE_CHANNELS + n ) >= hMCT->nchan_out_woLFE ) + { + hCPE->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_IGNORE; + } + else + { + hCPE->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_REGULAR; + } } } - - hMCT->LFE_off = 1; /* disable LFE coding by default for the moment */ - /* reconfiguration in case of bitrate switching */ if ( ivas_total_brate != st_ivas->hEncoderConfig->last_ivas_total_brate ) { @@ -156,39 +222,43 @@ ivas_error ivas_mct_enc( /* set coded audio band-width */ switch_bw = set_bw_mct( st_ivas->hCPE, st_ivas->nCPE ); + /*for MC and MCT remove pointer to LFE input that has been processed seperately */ + map_input_to_cpe_channels( st_ivas, pdata, data ); /* pre-processing */ for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) { - if ( ( error = ivas_cpe_enc( st_ivas, cpe_id, data[cpe_id * CPE_CHANNELS], data[cpe_id * CPE_CHANNELS + 1], input_frame, nb_bits_metadata ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_cpe_enc( st_ivas, cpe_id, pdata[cpe_id * CPE_CHANNELS], pdata[cpe_id * CPE_CHANNELS + 1], input_frame, nb_bits_metadata ) ) != IVAS_ERR_OK ) { return error; } } /* joint MCT encoding */ - ivas_mct_core_enc( ivas_format, hMCT, st_ivas->hCPE, hMCT->nchan_out_woLFE + hMCT->num_lfe, ivas_total_brate, switch_bw, - ivas_format == MC_FORMAT ? (int16_t) st_ivas->hLFE->lfe_bits : 0 -#ifdef FIX_I1_113 - , - st_ivas->hEncoderConfig->sba_order -#endif - ); + ivas_mct_core_enc( ivas_format, hMCT, st_ivas->hCPE, + hMCT->nchan_out_woLFE, + ivas_total_brate, switch_bw, + ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ) ? (int16_t) st_ivas->hLFE->lfe_bits : 0, + st_ivas->hEncoderConfig->sba_order ); /* Spectrum quantization and coding */ for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) { hCPE = st_ivas->hCPE[cpe_id]; - ivas_mdct_quant_coder( hCPE, hMCT->LFE_off, hMCT->tnsBits[cpe_id], hMCT->tnsSize[cpe_id], hMCT->p_param[cpe_id], 1 ); + ivas_mdct_quant_coder( hCPE, + hMCT->tnsBits[cpe_id], hMCT->tnsSize[cpe_id], hMCT->p_param[cpe_id], 1 ); /* update input samples buffer (as done in ivas_cpe_enc() for other than MCT coding) */ for ( n = 0; n < CPE_CHANNELS; n++ ) { mvr2r( hCPE->hCoreCoder[n]->input, hCPE->hCoreCoder[n]->old_input_signal, input_frame ); + + /* common encoder updates */ + updt_enc_common( hCPE->hCoreCoder[n] ); } } - wmops_sub_end(); + pop_wmops(); return error; } @@ -218,7 +288,7 @@ ivas_error create_mct_enc( * Allocate MCT handle *-----------------------------------------------------------------*/ - if ( ( hMCT = (MCT_ENC_HANDLE) count_malloc( sizeof( MCT_ENC_DATA ) ) ) == NULL ) + if ( ( hMCT = (MCT_ENC_HANDLE) malloc( sizeof( MCT_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MCT\n" ) ); } @@ -231,23 +301,18 @@ ivas_error create_mct_enc( if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ) { hMCT->nchan_out_woLFE = st_ivas->hEncoderConfig->nchan_inp - 1; /* LFE channel is coded separately */ - hMCT->num_lfe = TRUE; } else if ( ivas_format == SBA_FORMAT ) { hMCT->nchan_out_woLFE = ivas_get_sba_num_TCs( ivas_total_brate, st_ivas->sba_analysis_order ); - - hMCT->num_lfe = FALSE; } else if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) { hMCT->nchan_out_woLFE = ivas_param_mc_getNumTransportChannels( ivas_total_brate, st_ivas->hEncoderConfig->mc_input_setup ); - hMCT->num_lfe = FALSE; } else if ( ivas_format == SBA_FORMAT ) { hMCT->nchan_out_woLFE = ivas_sba_get_nchan( st_ivas->sba_analysis_order, st_ivas->hEncoderConfig->sba_planar ); - hMCT->num_lfe = FALSE; } else { @@ -256,21 +321,17 @@ ivas_error create_mct_enc( cp_bitrate = ivas_total_brate / hMCT->nchan_out_woLFE * CPE_CHANNELS; - /* indicate LFE for appropriate core-coder channel */ for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) { for ( n = 0; n < CPE_CHANNELS; n++ ) { st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_REGULAR; - if ( ( hMCT->num_lfe > 0 ) && ( ( n + cpe_id * CPE_CHANNELS ) == LFE_CHANNEL ) ) - { - st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_LFE; - } } } /* in case we have an uneven number of transport channels, indicate last channel ID as inactive */ - if ( ( hMCT->nchan_out_woLFE + hMCT->num_lfe ) % 2 ) + if ( ( hMCT->nchan_out_woLFE ) % + 2 ) { st_ivas->hCPE[st_ivas->nCPE - 1]->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_IGNORE; } @@ -280,9 +341,10 @@ ivas_error create_mct_enc( for ( n = 0; n < max_blocks; n++ ) { + assert( st_ivas->hEncoderConfig->element_mode_init == IVAS_CPE_MDCT && "MCT is not supported for other stereo modes" ); - if ( ( hMCT->hBlockData[n] = (MCT_BLOCK_DATA_HANDLE) count_malloc( sizeof( MCT_BLOCK_DATA ) ) ) == NULL ) + if ( ( hMCT->hBlockData[n] = (MCT_BLOCK_DATA_HANDLE) malloc( sizeof( MCT_BLOCK_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MCT block data structure\n" ) ); } @@ -296,7 +358,7 @@ ivas_error create_mct_enc( * MDCT stereo initialization *-----------------------------------------------------------------*/ - if ( ( hMCT->hBlockData[n]->hStereoMdct = (STEREO_MDCT_ENC_DATA_HANDLE) count_malloc( sizeof( STEREO_MDCT_ENC_DATA ) ) ) == NULL ) + if ( ( hMCT->hBlockData[n]->hStereoMdct = (STEREO_MDCT_ENC_DATA_HANDLE) malloc( sizeof( STEREO_MDCT_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MDCT Stereo \n" ) ); } @@ -355,12 +417,14 @@ ivas_error mct_enc_reconfigure( if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ) { hMCT->nchan_out_woLFE = st_ivas->hEncoderConfig->nchan_inp - 1; /* LFE channel is coded separately */ - hMCT->num_lfe = TRUE; + } + else if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) + { + hMCT->nchan_out_woLFE = ivas_param_mc_getNumTransportChannels( ivas_total_brate, st_ivas->hEncoderConfig->mc_input_setup ); } else if ( ivas_format == SBA_FORMAT ) { hMCT->nchan_out_woLFE = st_ivas->nchan_transport; - hMCT->num_lfe = FALSE; } else { @@ -370,21 +434,18 @@ ivas_error mct_enc_reconfigure( cp_bitrate = ivas_total_brate / hMCT->nchan_out_woLFE * CPE_CHANNELS; - /* indicate LFE for appropriate core-coder channel */ for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) { + st_ivas->hCPE[cpe_id]->element_brate = cp_bitrate; for ( n = 0; n < CPE_CHANNELS; n++ ) { st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_REGULAR; - if ( ( hMCT->num_lfe > 0 ) && ( ( n + cpe_id * CPE_CHANNELS ) == LFE_CHANNEL ) ) - { - st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_LFE; - } } } /* in case we have an uneven number of transport channels, indicate last channel ID as inactive */ - if ( ( hMCT->nchan_out_woLFE + hMCT->num_lfe ) % 2 ) + if ( ( hMCT->nchan_out_woLFE ) % + 2 ) { st_ivas->hCPE[st_ivas->nCPE - 1]->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_IGNORE; } @@ -401,10 +462,11 @@ ivas_error mct_enc_reconfigure( st->total_brate = st_ivas->hCPE[cpe_id]->element_brate; - if ( !( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) ) + if ( !( + ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) ) { st->bits_frame_nominal = (int16_t) ( st_ivas->hCPE[cpe_id]->element_brate / FRAMES_PER_SEC ); - st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_mode, st->mct_chan_mode ); + st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_mode ); if ( st->igf ) { IGFEncSetMode( st->hIGFEnc, st_ivas->hCPE[cpe_id]->element_brate, st->bwidth, st->element_mode, st->rf_mode ); @@ -427,7 +489,7 @@ ivas_error mct_enc_reconfigure( if ( hMCT->hBlockData[n] == NULL ) { mem_init = 1; - if ( ( hMCT->hBlockData[n] = (MCT_BLOCK_DATA_HANDLE) count_malloc( sizeof( MCT_BLOCK_DATA ) ) ) == NULL ) + if ( ( hMCT->hBlockData[n] = (MCT_BLOCK_DATA_HANDLE) malloc( sizeof( MCT_BLOCK_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MCT block data structure\n" ) ); } @@ -441,7 +503,7 @@ ivas_error mct_enc_reconfigure( * MDCT stereo initialization *-----------------------------------------------------------------*/ - if ( ( hMCT->hBlockData[n]->hStereoMdct = (STEREO_MDCT_ENC_DATA_HANDLE) count_malloc( sizeof( STEREO_MDCT_ENC_DATA ) ) ) == NULL ) + if ( ( hMCT->hBlockData[n]->hStereoMdct = (STEREO_MDCT_ENC_DATA_HANDLE) malloc( sizeof( STEREO_MDCT_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MDCT Stereo \n" ) ); } @@ -461,11 +523,11 @@ ivas_error mct_enc_reconfigure( { if ( hMCT->hBlockData[n]->hStereoMdct != NULL ) { - count_free( hMCT->hBlockData[n]->hStereoMdct ); + free( hMCT->hBlockData[n]->hStereoMdct ); hMCT->hBlockData[n]->hStereoMdct = NULL; } - count_free( hMCT->hBlockData[n] ); + free( hMCT->hBlockData[n] ); hMCT->hBlockData[n] = NULL; } } @@ -487,29 +549,35 @@ ivas_error mct_enc_reconfigure( *-------------------------------------------------------------------------*/ void ivas_mct_enc_close( - MCT_ENC_HANDLE hMCT /* i/o: MCT encoder structure */ + MCT_ENC_HANDLE *hMCT /* i/o: MCT encoder structure */ ) { int16_t n, maxBlocks; - maxBlocks = hMCT->nchan_out_woLFE / 2; + if ( hMCT == NULL || *hMCT == NULL ) + { + return; + } + + maxBlocks = ( *hMCT )->nchan_out_woLFE / 2; for ( n = 0; n < maxBlocks; n++ ) { - if ( hMCT->hBlockData[n] != NULL ) + if ( ( *hMCT )->hBlockData[n] != NULL ) { - if ( hMCT->hBlockData[n]->hStereoMdct != NULL ) + if ( ( *hMCT )->hBlockData[n]->hStereoMdct != NULL ) { - count_free( hMCT->hBlockData[n]->hStereoMdct ); - hMCT->hBlockData[n]->hStereoMdct = NULL; + free( ( *hMCT )->hBlockData[n]->hStereoMdct ); + ( *hMCT )->hBlockData[n]->hStereoMdct = NULL; } - count_free( hMCT->hBlockData[n] ); - hMCT->hBlockData[n] = NULL; + free( ( *hMCT )->hBlockData[n] ); + ( *hMCT )->hBlockData[n] = NULL; } } - count_free( hMCT ); + free( ( *hMCT ) ); + ( *hMCT ) = NULL; return; } @@ -545,8 +613,221 @@ ivas_error ivas_mc_enc_config( /* MC format switching */ if ( st_ivas->hEncoderConfig->last_ivas_total_brate != st_ivas->hEncoderConfig->ivas_total_brate || st_ivas->mc_mode != last_mc_mode ) { - /*ivas_mc_enc_reconfigure( st_ivas );*/ - return IVAS_ERROR( IVAS_ERR_RECONFIGURE_NOT_SUPPORTED, "Error: MC format switching not supported yet!!!\n\n" ); + if ( ( error = ivas_mc_enc_reconfig( st_ivas, last_mc_mode ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + return error; +} + + +/*------------------------------------------------------------------------- + * ivas_mc_enc_reconfig() + * + * Reconfigure the MC format encoder + *-------------------------------------------------------------------------*/ + +static ivas_error ivas_mc_enc_reconfig( + Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */ + const int16_t last_mc_mode /* i: last frame mc mode */ +) +{ + int16_t nchan_transport_old, nSCE_old, nCPE_old; + ivas_error error; + int32_t new_brate_SCE, new_brate_CPE; + + error = IVAS_ERR_OK; + + nchan_transport_old = st_ivas->nchan_transport; + nSCE_old = st_ivas->nSCE; + nCPE_old = st_ivas->nCPE; + + /*-----------------------------------------------------------------* + * Reconfigure MC modules + *-----------------------------------------------------------------*/ + + if ( st_ivas->mc_mode == MC_MODE_MCT ) + { + st_ivas->nSCE = 0; + st_ivas->nCPE = st_ivas->hEncoderConfig->nchan_inp / 2; + + st_ivas->nchan_transport = ivas_mc_ls_setup_get_num_channels( st_ivas->hEncoderConfig->mc_input_setup ); + + if ( last_mc_mode != MC_MODE_MCT ) + { + /* create LFE handle */ + if ( ( error = ivas_create_lfe_enc( &st_ivas->hLFE, st_ivas->hEncoderConfig->input_Fs ) ) != IVAS_ERR_OK ) + { + return error; + } + + /*De-allocate handles for other MC modes*/ + ivas_param_mc_enc_close( &( st_ivas->hParamMC ), st_ivas->hEncoderConfig->input_Fs ); + + /* De-allocate McMasa-related handles */ + ivas_mcmasa_enc_close( &( st_ivas->hMcMasa ), st_ivas->hEncoderConfig->input_Fs ); + + ivas_masa_enc_close( &( st_ivas->hMasa ) ); + + ivas_qmetadata_close( &st_ivas->hQMetaData ); + } + } + else if ( st_ivas->mc_mode == MC_MODE_PARAMMC ) + { + if ( last_mc_mode != MC_MODE_PARAMMC ) + { + if ( ( error = ivas_param_mc_enc_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else + { + if ( ( error = ivas_param_mc_enc_reconfig( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + /* De-allocate McMasa-related handles */ + ivas_mcmasa_enc_close( &( st_ivas->hMcMasa ), st_ivas->hEncoderConfig->input_Fs ); + + if ( st_ivas->hMasa != NULL ) + { + ivas_masa_enc_close( &( st_ivas->hMasa ) ); + st_ivas->hMasa = NULL; + } + + ivas_qmetadata_close( &st_ivas->hQMetaData ); + + /* De-allocate MCT handle if last mode was MCT */ + if ( last_mc_mode == MC_MODE_MCT && st_ivas->nchan_transport <= CPE_CHANNELS ) + { + ivas_mct_enc_close( &( st_ivas->hMCT ) ); + } + + if ( last_mc_mode == MC_MODE_MCT && st_ivas->hLFE != NULL ) + { + /* LFE handle */ + ivas_lfe_enc_close( &( st_ivas->hLFE ) ); + } + } + else if ( st_ivas->mc_mode == MC_MODE_MCMASA ) + { + if ( last_mc_mode != MC_MODE_MCMASA ) + { + ivas_mcmasa_setNumTransportChannels( &( st_ivas->nchan_transport ), &( st_ivas->hEncoderConfig->element_mode_init ), st_ivas->hEncoderConfig->ivas_total_brate ); + + if ( ( error = ivas_qmetadata_open( &( st_ivas->hQMetaData ) ) ) != IVAS_ERR_OK ) + { + return error; + } + + if ( ( error = ivas_masa_enc_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + + if ( ( error = ivas_mcmasa_enc_open( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else + { + /* reconfigure McMASA instance */ + if ( ( error = ivas_mcmasa_enc_reconfig( st_ivas ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + ivas_param_mc_enc_close( &( st_ivas->hParamMC ), st_ivas->hEncoderConfig->input_Fs ); + + if ( last_mc_mode == MC_MODE_MCT ) + { + /* LFE handle */ + ivas_lfe_enc_close( &( st_ivas->hLFE ) ); + + ivas_mct_enc_close( &( st_ivas->hMCT ) ); + } + } + + if ( st_ivas->mc_mode != MC_MODE_MCMASA ) + { + if ( st_ivas->nchan_transport == 1 ) + { + st_ivas->hEncoderConfig->element_mode_init = IVAS_SCE; + } + else + { + st_ivas->hEncoderConfig->element_mode_init = IVAS_CPE_MDCT; + } + } + + /*-----------------------------------------------------------------* + * Reconfigure core coder + *-----------------------------------------------------------------*/ + + /* special case: MCT->ParamMC with more than 2 TC, CPE 1 stays, but has the wrong mct_chan_mode in channel 1 + and might have IGF and TranDet static memory not allocated and the bit stream index list not set, + set correct mct_chan_mode and init missing static mem + do it here since it is _very_ MC specific */ + if ( last_mc_mode == MC_MODE_MCT && st_ivas->mc_mode == MC_MODE_PARAMMC && st_ivas->nchan_transport > CPE_CHANNELS ) + { + Encoder_State *st = st_ivas->hCPE[1]->hCoreCoder[1]; + + if ( st_ivas->nchan_transport == 3 ) + { + st->mct_chan_mode = MCT_CHAN_MODE_IGNORE; + } + else + { + st->mct_chan_mode = MCT_CHAN_MODE_REGULAR; + } + + if ( st->hTranDet == NULL ) + { + if ( ( st->hTranDet = (TRAN_DET_HANDLE) malloc( sizeof( TRAN_DET_DATA ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Transient Detection\n" ) ); + } + + InitTransientDetection( (int16_t) ( st->input_Fs / FRAMES_PER_SEC ), NS2SA( st->input_Fs, DELAY_FIR_RESAMPL_NS ), st->hTranDet, 0 ); + } + + if ( st->hIGFEnc == NULL ) + { + if ( ( st->hIGFEnc = (IGF_ENC_INSTANCE_HANDLE) malloc( sizeof( IGF_ENC_INSTANCE ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hIGFEnc\n" ) ); + } + } + + st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode ); + /* set last core to TCX20 */ + st->last_core = TCX_20_CORE; + } + if ( st_ivas->mc_mode == MC_MODE_MCMASA ) + { + ivas_mcmasa_split_brate( st_ivas->hMcMasa->separateChannelEnabled, st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nSCE, st_ivas->nCPE, &new_brate_SCE, &new_brate_CPE ); + } + else if ( st_ivas->mc_mode == MC_MODE_MCT ) + { + new_brate_SCE = 0; + new_brate_CPE = ( st_ivas->hEncoderConfig->ivas_total_brate / ( st_ivas->nchan_transport - 1 ) ) * CPE_CHANNELS; + } + else + { + new_brate_SCE = 0; /*st_ivas->hEncoderConfig->ivas_total_brate / st_ivas->nchan_transport;*/ + new_brate_CPE = ( st_ivas->hEncoderConfig->ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS; + } + + if ( ( error = ivas_corecoder_enc_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old, new_brate_SCE, new_brate_CPE, last_mc_mode ) ) != IVAS_ERR_OK ) + { + return error; } return error; diff --git a/lib_enc/ivas_mct_enc_mct.c b/lib_enc/ivas_mct_enc_mct.c old mode 100755 new mode 100644 index 0e36280b20..7ab6206a29 --- a/lib_enc/ivas_mct_enc_mct.c +++ b/lib_enc/ivas_mct_enc_mct.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -36,7 +36,7 @@ #include "ivas_cnst.h" #include "ivas_prot.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" #include #define SPAR_CORR_THRES 0.9f @@ -62,7 +62,7 @@ void getChannelEnergies( for ( ch = 0; ch < nchan; ch++ ) { st = sts[ch]; - if ( st->mct_chan_mode != MCT_CHAN_MODE_IGNORE && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( st->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { nSubframes = ( st->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV; L_subframe = st->hTcxEnc->L_frameTCX / nSubframes; @@ -156,7 +156,7 @@ static void getCorrelationMatrix( int16_t ch1, ch2, n, nchan; float tmp; - nchan = hMCT->nchan_out_woLFE + hMCT->num_lfe; + nchan = hMCT->nchan_out_woLFE; /* correlation */ for ( ch1 = 0; ch1 < nchan; ch1++ ) @@ -166,8 +166,7 @@ static void getCorrelationMatrix( xCorrMatrix[ch1][ch2] = 0; if ( sts[ch1]->core == sts[ch2]->core && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && - sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_LFE && - sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_LFE ) + sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { int16_t nSubframes = ( sts[ch1]->core == TCX_20_CORE ? 1 : NB_DIV ); int16_t L_subframe = sts[ch1]->hTcxEnc->L_frameTCX / nSubframes; @@ -225,9 +224,11 @@ static void getBestCorrelation( *_ch2 = -1; *max_corr = 0.f; - for ( ch1 = 0; ch1 < ( hMCT->nchan_out_woLFE + hMCT->num_lfe ); ch1++ ) + for ( ch1 = 0; ch1 < ( hMCT->nchan_out_woLFE ); + ch1++ ) { - for ( ch2 = ch1 + 1; ch2 < ( hMCT->nchan_out_woLFE + hMCT->num_lfe ); ch2++ ) + for ( ch2 = ch1 + 1; ch2 < ( hMCT->nchan_out_woLFE ); + ch2++ ) { if ( fabsf( *max_corr ) < fabsf( xCorrMatrix[ch1][ch2] ) ) { @@ -308,13 +309,14 @@ static void updateCorrelationMatrix( int16_t ch1, ch2, n; /* correlation: */ - for ( ch1 = 0; ch1 < ( hMCT->nchan_out_woLFE + hMCT->num_lfe ); ch1++ ) + for ( ch1 = 0; ch1 < ( hMCT->nchan_out_woLFE ); + ch1++ ) { - for ( ch2 = ch1; ch2 < ( hMCT->nchan_out_woLFE + hMCT->num_lfe ); ch2++ ) + for ( ch2 = ch1; ch2 < ( hMCT->nchan_out_woLFE ); + ch2++ ) { if ( sts[ch1]->core == sts[ch2]->core && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && - sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_LFE && - sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_LFE ) + sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { int16_t nSubframes = ( sts[ch1]->core == TCX_20_CORE ? 1 : NB_DIV ); @@ -341,9 +343,7 @@ static void updateCorrelationMatrix( static int16_t channelPairToIndex( const int16_t chIdx1, const int16_t chIdx2, - const int16_t nChannels, - Encoder_State **sts /* i/o: encoder state structure */ -) + const int16_t nChannels ) { int16_t ch1, ch2; int16_t pairIdx; @@ -354,11 +354,6 @@ static int16_t channelPairToIndex( { for ( ch1 = 0; ch1 < ch2; ch1++ ) { - if ( sts[ch1]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch2]->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - continue; - } - if ( ch1 == chIdx1 && ch2 == chIdx2 ) { return pairIdx; @@ -398,7 +393,7 @@ static void getGlobalILD( /*calculate total energy without LFE*/ for ( ch = 0; ch < nchan; ch++ ) { - if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { meanE += nrg[ch]; cnt++; @@ -410,7 +405,7 @@ static void getGlobalILD( meanE = max( meanE / cnt, EPSILON ); for ( ch = 0; ch < nchan; ch++ ) { - if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { nSubframes = ( sts[ch]->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV; L_subframe = sts[ch]->hTcxEnc->L_frameTCX / nSubframes; @@ -474,7 +469,7 @@ void apply_MCT_enc( float tmp_max_corr; int16_t count_active_ch = 0; - wmops_sub_start( "mct_core_enc_mct" ); + push_wmops( "mct_core_enc_mct" ); forceKeepTree = 1; inactiveBlockDetected = 0; @@ -483,11 +478,11 @@ void apply_MCT_enc( /*Determine active channels*/ for ( ch = 0; ch < nchan; ch++ ) { - if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { count_active_ch++; } - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + else { hMCT->mc_global_ild[ch] = 0; } @@ -508,8 +503,8 @@ void apply_MCT_enc( { for ( ch1 = 0; ch1 < ch2; ch1++ ) { - if ( sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_LFE && - sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && + sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { sumCorrDiff += fabsf( hMCT->lastxCorrMatrix[ch1][ch2] - xCorrMatrix[ch1][ch2] ); } @@ -600,8 +595,7 @@ void apply_MCT_enc( } /* calculate all related values: */ - assert( sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_LFE && - sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_LFE ); + assert( sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ); getBlockValues( sts, ch1, ch2, hMCT->hBlockData[currBlockDataCnt], mdst_spectrum, inv_spectrum, inv_mdst_spectrum ); @@ -686,7 +680,7 @@ void apply_MCT_enc( for ( ch = 0; ch < nchan; ch++ ) { - if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE ) + if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { if ( ( !cpEle[ch] ) || hMCT->currBlockDataCnt == 0 ) { @@ -739,7 +733,7 @@ void apply_MCT_enc( } #endif - wmops_sub_end(); + pop_wmops(); return; } @@ -771,7 +765,8 @@ void write_mct_bitstream( /* first write core info and overlap mode for all channels */ for ( ch = 0; ch < nchan; ch++ ) { - if ( ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE ) && hMCT->currBlockDataCnt && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) + if ( + hMCT->currBlockDataCnt && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { push_next_indice( hBstr, hMCT->mc_global_ild[ch], SMDCT_GLOBAL_ILD_BITS ); } @@ -781,7 +776,8 @@ void write_mct_bitstream( { for ( ch = 0; ch < nchan; ch++ ) { - if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) + if ( + sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE ) { push_next_indice( hBstr, hMCT->lowE_ch[ch], 1 ); } @@ -794,7 +790,7 @@ void write_mct_bitstream( hBlock = hMCT->hBlockData[pair]; /*calculate channel pair index and write it to BS*/ - channelPairIndex = channelPairToIndex( hBlock->ch1, hBlock->ch2, nchan, sts ); + channelPairIndex = channelPairToIndex( hBlock->ch1, hBlock->ch2, nchan ); push_next_indice( hBstr, channelPairIndex, hMCT->bitsChannelPairIndex ); /*point to encoder states of actual channels to write block pair bits*/ @@ -838,7 +834,7 @@ void mctStereoIGF_enc( int16_t singleChEle[MCT_MAX_CHANNELS]; L_subframeTCX = 0; /* to avoid compilation warning */ - set_s( singleChEle, 1, hMCT->nchan_out_woLFE + hMCT->num_lfe ); + set_s( singleChEle, 1, hMCT->nchan_out_woLFE ); for ( b = 0; b < hMCT->currBlockDataCnt; b++ ) { @@ -889,15 +885,17 @@ void mctStereoIGF_enc( } /* channel elements that are coded separately detected */ - if ( sum_s( singleChEle, ( hMCT->nchan_out_woLFE + hMCT->num_lfe ) ) != 0 ) + if ( sum_s( singleChEle, ( hMCT->nchan_out_woLFE ) ) != 0 ) { - for ( ch = 0; ch < ( hMCT->nchan_out_woLFE + hMCT->num_lfe ); ch++ ) + for ( ch = 0; ch < ( hMCT->nchan_out_woLFE ); + ch++ ) { if ( singleChEle[ch] ) { st = sts[ch]; - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE || st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( + st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } diff --git a/lib_enc/ivas_mdct_core_enc.c b/lib_enc/ivas_mdct_core_enc.c index a999681ab4..b1b9389c5e 100644 --- a/lib_enc/ivas_mdct_core_enc.c +++ b/lib_enc/ivas_mdct_core_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -30,6 +30,7 @@ *******************************************************************************************************/ +#include "ivas_cnst.h" #include #include #include "options.h" @@ -38,10 +39,13 @@ #include "prot.h" #include "ivas_prot.h" #include "rom_com.h" +#ifdef SNS_MSVQ +#include "ivas_rom_com.h" +#endif #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------* * Local constants @@ -88,15 +92,11 @@ static void enc_prm_pre_mdct( { writeTCXWindowing( hBstr, st->hTcxCfg->tcx_last_overlap_mode ); } - - if ( st->element_mode == IVAS_CPE_MDCT && st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + push_next_indice( hBstr, st->hTcxEnc->kernel_type[0], st->last_core != ACELP_CORE ? 2 : 1 ); + if ( st->core == TCX_10_CORE ) { - push_next_indice( hBstr, st->hTcxEnc->kernel_type[0], st->last_core != ACELP_CORE ? 2 : 1 ); - if ( st->core == TCX_10_CORE ) - { - assert( ( st->hTcxEnc->kernel_type[0] & 1 ) == ( st->hTcxEnc->kernel_type[1] >> 1 ) ); - push_next_indice( hBstr, st->hTcxEnc->kernel_type[1] & 1, 1 ); - } + assert( ( st->hTcxEnc->kernel_type[0] & 1 ) == ( st->hTcxEnc->kernel_type[1] >> 1 ) ); + push_next_indice( hBstr, st->hTcxEnc->kernel_type[1] & 1, 1 ); } st->glr_reset = 0; @@ -288,7 +288,7 @@ static void kernel_switch_update_transforms( int16_t i, leftOverlap = 0, rightOverlap = 0; const float *left_win, *right_win; - tcx_get_windows( hTcxCfg, (int16_t) windowedTimeSignal[0], (int16_t) windowedTimeSignal[1], &leftOverlap, &left_win, &rightOverlap, &right_win, 1, 0 ); + tcx_get_windows( hTcxCfg, (int16_t) windowedTimeSignal[0], (int16_t) windowedTimeSignal[1], &leftOverlap, &left_win, &rightOverlap, &right_win, 1 ); if ( speech_TCX != NULL && tcxTransType != TCX_20 && (int16_t) windowedTimeSignal[0] == FULL_OVERLAP && s - leftOverlap > minWindowLen ) { for ( i = minWindowLen; i >= 0; i-- ) /* outer left folding of shortened long ALDO slope */ @@ -311,7 +311,7 @@ static void kernel_switch_update_transforms( s = hTcxCfg->tcx5SizeFB; /* obtain 1st TCX5 again */ nSubframes *= 2; - WindowSignal( hTcxCfg, leftOverlap / 2, RECTANGULAR_OVERLAP, MIN_OVERLAP, &leftOverlap, &rightOverlap, windowedTimeSignal + 2, &s, tcx5Win, 0, 1, 0 ); + WindowSignal( hTcxCfg, leftOverlap / 2, RECTANGULAR_OVERLAP, MIN_OVERLAP, &leftOverlap, &rightOverlap, windowedTimeSignal + 2, &s, tcx5Win, 0, 1 ); kernel_switch_trafo( tcx5Win, sigR, leftOverlap, s /* L_subfr. */ - ( leftOverlap + rightOverlap ) / 2, rightOverlap, kernelType ); if ( kernelType & 1 ) /* 2nd TCX5 is kernelType 3 */ @@ -576,13 +576,18 @@ void ivas_mdct_core_whitening_enc( int16_t tnsSize[CPE_CHANNELS][NB_DIV], /* o : number of tns parameters put into prm */ int16_t p_param[CPE_CHANNELS][NB_DIV], /* o : pointer to the parameter table */ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */ - int16_t *LFE_off, /* o : flag if LFE has zero content */ const int16_t mct_on, /* i : flag mct block (1) or stereo (0) */ const int16_t nChannels /* i : total number of coded channels */ ) { int16_t n, ch, nSubframes, L_subframe, L_subframeTCX, tcx_subframe_coded_lines; float A_q[CPE_CHANNELS][NB_DIV][M + 1]; +#ifdef SNS_MSVQ + int16_t sns_vq_indices[CPE_CHANNELS * NB_DIV * SNS_MSVQ_NSTAGES_TCX10]; + int16_t nbits_sns; + int16_t sns_stereo_mode[NB_DIV]; + int16_t idx; +#endif int16_t param_lpc[CPE_CHANNELS][NPRM_LPC_NEW]; int16_t param_core[CPE_CHANNELS][2 * NPRM_DIV]; int16_t ltpBits[CPE_CHANNELS]; @@ -598,11 +603,14 @@ void ivas_mdct_core_whitening_enc( float scf_q[CPE_CHANNELS][NB_DIV][M]; float chE[2], chE_tot; int8_t sns_low_br_mode; - int8_t skipped_first_channel; int16_t nbits_start_sns; int16_t num_sns; + int8_t skipped_first_channel; +#ifdef SNS_MSVQ + int16_t zero_side_flag[NB_DIV]; +#endif - wmops_sub_start( "mdct_core_whitening" ); + push_wmops( "mdct_core_whitening" ); /*--------------------------------------------------------------* * Initialization @@ -612,10 +620,7 @@ void ivas_mdct_core_whitening_enc( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { - if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE ) - { - stereo_tcx_init_enc( sts[ch] ); - } + stereo_tcx_init_enc( sts[ch] ); set_s( tnsSize[ch], 0, 2 ); set_s( tnsBits[ch], 0, 2 ); @@ -655,10 +660,7 @@ void ivas_mdct_core_whitening_enc( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; - if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE ) - { - SetTCXModeInfo( st, st->hTranDet, &st->hTcxCfg->tcx_curr_overlap_mode ); - } + SetTCXModeInfo( st, st->hTranDet, &st->hTcxCfg->tcx_curr_overlap_mode ); } } @@ -672,12 +674,10 @@ void ivas_mdct_core_whitening_enc( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; - - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( ( hCPE->cpe_id * CPE_CHANNELS + ch ) >= nChannels ) { continue; } - SetCurrentPsychParams( st->core, 0, st->hTcxCfg ); /* tcx ltp analysis on the 12.8kHz weighted speech, saves preproc resampling to sr_core */ @@ -686,11 +686,18 @@ void ivas_mdct_core_whitening_enc( core_signal_analysis_high_bitrate( new_samples[ch] + L_INP_MEM, T_op[ch], NULL, NULL, st, mdst_spectrum[ch], tnsSize[ch], tnsBits[ch], param_core[ch], <pBits[ch], windowedSignal[ch], st->L_frame, st->hTcxEnc->L_frameTCX, hCPE->last_element_mode, 0 ); /* BWD in MDCT domain */ - if ( st->hTcxEnc->transform_type[0] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP ) + if ( st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP ) { - if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + nSubframes = ( st->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV; + + for ( n = 0; n < nSubframes; n++ ) { - bw_detect( st, NULL, st->hTcxEnc->spectrum[0], NULL ); + bw_detect( st, NULL, st->hTcxEnc->spectrum[n], NULL, mct_on ); + + if ( nSubframes == NB_DIV && n == 0 ) + { + st->last_input_bwidth = st->input_bwidth; + } } } @@ -803,7 +810,7 @@ void ivas_mdct_core_whitening_enc( { TCX_ENC_HANDLE hTcxEncCh = sts[ch]->hTcxEnc; - if ( ( hCPE->cpe_id * CPE_CHANNELS + ch ) >= nChannels || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( ( hCPE->cpe_id * CPE_CHANNELS + ch ) >= nChannels ) { hTcxEncCh->kernel_symmetry_past = hTcxEncCh->kernel_type[0] = 0; @@ -830,9 +837,10 @@ void ivas_mdct_core_whitening_enc( * Envelope Quantization and FDNS *---------------------------------------------------------------*/ + for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { - if ( ( hCPE->cpe_id * CPE_CHANNELS + ch ) >= nChannels || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( ( hCPE->cpe_id * CPE_CHANNELS + ch ) >= nChannels ) { continue; } @@ -877,7 +885,8 @@ void ivas_mdct_core_whitening_enc( } /* MCT: detect whether there are silent channels and set mct_chan_mode accordingly */ - if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE && mct_on ) + if ( + mct_on ) { chE_tot = sum_f( chE, NB_DIV ); @@ -894,7 +903,7 @@ void ivas_mdct_core_whitening_enc( } /* set low br mode, if possible. Can later be discarded, depending on the stereo mode used for SNS parameter decoding */ - if ( hCPE->element_brate == IVAS_48k && !( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) ) + if ( hCPE->element_brate == IVAS_48k && !( ( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) ) ) { sns_low_br_mode = !sts[0]->sp_aud_decision0; } @@ -903,6 +912,49 @@ void ivas_mdct_core_whitening_enc( sns_low_br_mode = 0; } +#ifdef SNS_MSVQ + if ( !mct_on && sts[0]->sr_core == 25600 && ( ( hCPE->element_brate == IVAS_48k || hCPE->element_brate == IVAS_64k ) ) ) + { + nbits_sns = quantize_sns( scf, scf_q, sts, sns_vq_indices, zero_side_flag, sns_stereo_mode ); + } + else + { + if ( sts[0]->hTcxEnc->tcxMode == TCX_20 && sts[1]->hTcxEnc->tcxMode == TCX_20 && + sts[0]->mct_chan_mode == MCT_CHAN_MODE_REGULAR && sts[1]->mct_chan_mode == MCT_CHAN_MODE_REGULAR ) + { + sns_avq_cod_stereo( scf[0][0], scf[1][0], scf_q[0][0], scf_q[1][0], param_lpc[0], param_lpc[1] ); + } + else + { +#ifdef DEBUG_MODE_MDCT + { + float ener_side = 0; + float ener_mid = 0; + dbgwrite( &ener_side, sizeof( float ), 1, 1, "./res/ener_side" ); + dbgwrite( &ener_mid, sizeof( float ), 1, 1, "./res/ener_mid" ); + } +#endif + for ( ch = 0; ch < CPE_CHANNELS; ch++ ) + { + param_lpc[ch][0] = ch; + if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + { + continue; + } + st = sts[ch]; + + if ( st->hTcxEnc->tcxMode == TCX_20 ) + { + sns_avq_cod( scf[ch][0], NULL, scf_q[ch][0], NULL, ¶m_lpc[ch][1], st->hTcxEnc->tcxMode, sns_low_br_mode ); + } + else + { + sns_avq_cod( scf[ch][1], scf[ch][0], scf_q[ch][1], scf_q[ch][0], ¶m_lpc[ch][1], st->hTcxEnc->tcxMode, sns_low_br_mode ); + } + } + } + } +#else // else of SNS_MSVQ if ( sts[0]->hTcxEnc->tcxMode == TCX_20 && sts[1]->hTcxEnc->tcxMode == TCX_20 && sts[0]->mct_chan_mode == MCT_CHAN_MODE_REGULAR && sts[1]->mct_chan_mode == MCT_CHAN_MODE_REGULAR ) { @@ -921,7 +973,7 @@ void ivas_mdct_core_whitening_enc( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { param_lpc[ch][0] = ch; - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -933,18 +985,15 @@ void ivas_mdct_core_whitening_enc( } else { -#ifdef SNS_LOW_BR_MODE sns_avq_cod( scf[ch][1], scf[ch][0], scf_q[ch][1], scf_q[ch][0], ¶m_lpc[ch][1], st->hTcxEnc->tcxMode, sns_low_br_mode ); -#else - sns_avq_cod( scf[ch][1], scf[ch][0], scf_q[ch][1], scf_q[ch][0], ¶m_lpc[ch][1], st->hTcxEnc->tcxMode, ( hCPE->element_brate == IVAS_48k && !hCPE->hCoreCoder[0]->sp_aud_decision0 ) ); -#endif } } } +#endif // SNS_AVQ4TCX20_MSVQ4TCX10 for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -965,6 +1014,7 @@ void ivas_mdct_core_whitening_enc( } } + /*--------------------------------------------------------------* * TNS *---------------------------------------------------------------*/ @@ -972,7 +1022,7 @@ void ivas_mdct_core_whitening_enc( /* first deinterleave once more */ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -993,7 +1043,7 @@ void ivas_mdct_core_whitening_enc( for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { - if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) + if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -1015,8 +1065,6 @@ void ivas_mdct_core_whitening_enc( } } } - - /*check whether LFE channel is active*/ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { /*no need to write last channel bit in case of odd channels*/ @@ -1029,12 +1077,7 @@ void ivas_mdct_core_whitening_enc( if ( mct_on ) /* signal bits should be written only for MCT*/ { - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) - { - assert( *LFE_off == 1 ); - push_next_indice( hBstr, *LFE_off, 1 ); - } - else if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { push_next_indice( hBstr, 1, 1 ); } @@ -1051,7 +1094,7 @@ void ivas_mdct_core_whitening_enc( { st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && ( *LFE_off ) ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { st->side_bits_frame_channel = 0; /*dummy initialization to prevent range coder crashing in case all channels are silent and bits are distributed to channel 0 */ @@ -1089,14 +1132,105 @@ void ivas_mdct_core_whitening_enc( /*--------------------------------------------------------------------------------* * SNS parameters *--------------------------------------------------------------------------------*/ +#ifdef SNS_MSVQ + if ( !mct_on && sts[0]->sr_core == 25600 && ( ( hCPE->element_brate == IVAS_48k || hCPE->element_brate == IVAS_64k ) ) ) + { + nbits_sns = 0; + idx = 0; + + if ( sts[0]->core == sts[1]->core ) + { + nSubframes = ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV; + + /* push all stereo mode bits first */ + for ( n = 0; n < nSubframes; ++n ) + { + push_next_indice( hBstr, sns_stereo_mode[n], 1 ); + nbits_sns++; + sts[0]->side_bits_frame_channel++; + } + + /* zero side flags only get transmitted if needed */ + for ( n = 0; n < nSubframes; ++n ) + { + if ( sns_stereo_mode[n] == SNS_STEREO_MODE_MS ) + { + push_next_indice( hBstr, zero_side_flag[n], 1 ); + nbits_sns++; + sts[0]->side_bits_frame_channel++; + } + } + } + + for ( ch = 0; ch < CPE_CHANNELS; ++ch ) + { + st = sts[ch]; + nbits_start_sns = hBstr->nb_bits_tot; + nSubframes = ( st->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV; + for ( n = 0; n < nSubframes; ++n ) + { + const int16_t is_side = ch == 1 && sns_stereo_mode[n] == SNS_STEREO_MODE_MS; + const int16_t *bits = ( nSubframes == 1 ) ? ivas_sns_cdbks_tcx20_bits : ivas_sns_cdbks_tcx10_bits; + int16_t nStages = ( ( nSubframes == 1 ) ? SNS_MSVQ_NSTAGES_TCX20 : SNS_MSVQ_NSTAGES_TCX10 ); + + if ( is_side ) + { + if ( zero_side_flag[n] ) + { + continue; + } + nStages = SNS_MSVQ_NSTAGES_SIDE; + bits = ( sts[ch]->core == TCX_20_CORE ) ? ivas_sns_cdbks_side_tcx20_bits : ivas_sns_cdbks_side_tcx10_bits; + } + for ( int16_t j = 0; j < nStages; ++j, ++idx ) + { + push_next_indice( hBstr, sns_vq_indices[idx], bits[j] ); + } + } + st->side_bits_frame_channel += hBstr->nb_bits_tot - nbits_start_sns; + } + } + else + { + /* write SNS parameter separately since at the decoder, both channels' cores need to be decoded before, so the joint SNS decoding can be done */ + skipped_first_channel = 0; + for ( ch = 0; ch < CPE_CHANNELS; ch++ ) + { + st = sts[ch]; + + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) + { + skipped_first_channel = 1; + continue; + } + + nbits_start_sns = hBstr->nb_bits_tot; + + num_sns = ( st->core == TCX_20_CORE ) ? 1 : 2; + + if ( ch == 0 || skipped_first_channel ) + { + push_next_indice( hBstr, param_lpc[0][0] >> 1, 1 ); + + if ( st->element_brate == IVAS_48k && !( ( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) ) ) + { + /* write classifier decision to signal low br mode for SNS encoding, for all other configs, low_br mode is not possible */ + push_next_indice( hBstr, sns_low_br_mode, 1 ); + } + } + encode_lpc_avq( hBstr, num_sns, param_lpc[ch], st->core, st->element_mode ); + st->side_bits_frame_channel += hBstr->nb_bits_tot - nbits_start_sns; + } + } +#else // else of SNS_MSVQ /* write SNS parameter separately since at the decoder, both channels' cores need to be decoded before, so the joint SNS decoding can be done */ skipped_first_channel = 0; for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && ( *LFE_off ) ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { skipped_first_channel = 1; continue; @@ -1110,7 +1244,7 @@ void ivas_mdct_core_whitening_enc( { push_next_indice( hBstr, param_lpc[0][0] >> 1, 1 ); - if ( st->element_brate == IVAS_48k && !( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) ) + if ( st->element_brate == IVAS_48k && !( ( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) ) ) { /* write classifier decision to signal low br mode for SNS encoding, for all other configs, low_br mode is not possible */ push_next_indice( hBstr, sns_low_br_mode, 1 ); @@ -1121,11 +1255,13 @@ void ivas_mdct_core_whitening_enc( st->side_bits_frame_channel += hBstr->nb_bits_tot - nbits_start_sns; } +#endif // MSVQ_SNS + /*update pitch buffer*/ for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && ( *LFE_off ) ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -1139,7 +1275,7 @@ void ivas_mdct_core_whitening_enc( } } - wmops_sub_end(); + pop_wmops(); return; } @@ -1152,7 +1288,6 @@ void ivas_mdct_core_whitening_enc( void ivas_mdct_quant_coder( CPE_ENC_HANDLE hCPE, /* i/o: Encoder CPE handle */ - const int16_t LFE_off, /* i : flag if LFE is inactive */ int16_t tnsBits[CPE_CHANNELS][NB_DIV], /* i : bits needed for TNS parameters */ int16_t tnsSize[CPE_CHANNELS][NB_DIV], /* i : size of TNS */ int16_t p_param[CPE_CHANNELS][NB_DIV], /* i : pointer to parameter array */ @@ -1178,7 +1313,7 @@ void ivas_mdct_quant_coder( int16_t target_bitsTCX10[CPE_CHANNELS][NB_DIV]; int16_t nbits_start, total_nbbits; - wmops_sub_start( "mdct_core_Q" ); + push_wmops( "mdct_core_Q" ); sts = hCPE->hCoreCoder; @@ -1198,7 +1333,7 @@ void ivas_mdct_quant_coder( st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { ignore_chan[ch] = 1; continue; @@ -1258,7 +1393,7 @@ void ivas_mdct_quant_coder( { st = sts[ch]; - if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { /*Enable appropriate upadte of tcx_curr_overlap_mode even for uncoded channel index 1*/ L_frameTCX[ch][0] = ( st->core == TCX_10_CORE ) ? st->hTcxEnc->L_frameTCX >> 1 : st->hTcxEnc->L_frameTCX; @@ -1285,7 +1420,7 @@ void ivas_mdct_quant_coder( * Generate Bitstream *---------------------------------------------------------------*/ - if ( ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) + if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) { continue; } @@ -1298,7 +1433,7 @@ void ivas_mdct_quant_coder( assert( st->bits_frame_channel == total_nbbits ); } - wmops_sub_end(); + pop_wmops(); return; } diff --git a/lib_enc/ivas_pca_enc.c b/lib_enc/ivas_pca_enc.c index c6b804088e..8ecac8d208 100644 --- a/lib_enc/ivas_pca_enc.c +++ b/lib_enc/ivas_pca_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,8 +40,7 @@ #include "ivas_cnst.h" #include #include -#include "typedef.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------* diff --git a/lib_enc/ivas_qmetadata_enc.c b/lib_enc/ivas_qmetadata_enc.c index c9f0bd70ff..ac4f83a657 100644 --- a/lib_enc/ivas_qmetadata_enc.c +++ b/lib_enc/ivas_qmetadata_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include "ivas_prot.h" #include "ivas_rom_com.h" #include "ivas_stat_enc.h" -#include "wmops.h" +#include "wmc_auto.h" #include "prot.h" @@ -4056,27 +4056,24 @@ static int16_t encode_spread_coherence_1sf( BSTR_ENC_HANDLE hMasaMetaData /* i/o: metadata bitstream handle */ ) { - int16_t i, j; + int16_t i, j, k; int16_t idx_ER; int16_t nbits, nbits_fr; uint16_t idx_sp_coh[MASA_MAXIMUM_CODING_SUBBANDS]; uint16_t mr_idx_sp_coh[MASA_MAXIMUM_CODING_SUBBANDS]; int16_t GR_ord, bits_GR; - uint64_t idx; + uint64_t idx, idx1; int16_t no_idx16; - int16_t k; int16_t no_cv[MASA_MAXIMUM_CODING_SUBBANDS]; IVAS_QDIRECTION *q_direction; - int16_t half_coding_subbands, nbits_fr1; - uint64_t idx1; - uint8_t coding_subbands; + int16_t half_coding_subbands, nbits_fr1, coding_subbands; uint16_t idx_sp_coh_shift[MASA_MAXIMUM_CODING_SUBBANDS]; uint8_t idx_shift; int16_t max_val = 0, nbits_max; int16_t extra_cv; int16_t no_cv_shift[MASA_MAXIMUM_CODING_SUBBANDS], min_idx; - coding_subbands = (uint8_t) ( q_metadata->q_direction[idx_d].cfg.nbands ); + coding_subbands = q_metadata->q_direction[idx_d].cfg.nbands; q_direction = &( q_metadata->q_direction[idx_d] ); nbits = 0; GR_ord = 1; @@ -4237,28 +4234,25 @@ static int16_t encode_surround_coherence( BSTR_ENC_HANDLE hMetaData /* i/o: metadata bitstream handle */ ) { - int16_t i, j; - int16_t idx_ER; + int16_t i, j, k; + int16_t idx_ER, idx16; int16_t nbits, nbits_fr; uint16_t idx_sur_coh[MASA_MAXIMUM_CODING_SUBBANDS]; uint16_t mr_idx_sur_coh[MASA_MAXIMUM_CODING_SUBBANDS]; int16_t GR_ord, bits_GR; - uint64_t idx; + uint64_t idx, idx1; int16_t no_idx16; - int16_t k; int16_t no_cv[MASA_MAXIMUM_CODING_SUBBANDS]; float error_ratio_surr; IVAS_QDIRECTION *q_direction; - int16_t half_coding_subbands, nbits_fr1; - uint64_t idx1; - uint8_t coding_subbands; + int16_t half_coding_subbands, nbits_fr1, coding_subbands; int16_t all_coherence_zero; uint16_t idx_sur_coh_shift[MASA_MAXIMUM_CODING_SUBBANDS]; uint8_t idx_shift; int16_t max_val = 0, nbits_max; int16_t no_cv_shift[MASA_MAXIMUM_CODING_SUBBANDS], min_idx; - coding_subbands = (uint8_t) ( hQMetaData->q_direction[0].cfg.nbands ); + coding_subbands = hQMetaData->q_direction[0].cfg.nbands; all_coherence_zero = hQMetaData->all_coherence_zero; q_direction = &( hQMetaData->q_direction[0] ); nbits = 0; @@ -4277,7 +4271,8 @@ static int16_t encode_surround_coherence( if ( hQMetaData->no_directions == 2 ) { k += hQMetaData->twoDirBands[j]; - error_ratio_surr = 1.0f - q_direction[0].band_data[j].energy_ratio[0] - q_direction[1].band_data[max( k - 1, 0 )].energy_ratio[0] * hQMetaData->twoDirBands[j]; + idx16 = max( k - 1, 0 ); + error_ratio_surr = 1.0f - q_direction[0].band_data[j].energy_ratio[0] - q_direction[1].band_data[idx16].energy_ratio[0] * hQMetaData->twoDirBands[j]; } else { diff --git a/lib_enc/ivas_qspherical_enc.c b/lib_enc/ivas_qspherical_enc.c index b8f889b472..80a9d0064f 100644 --- a/lib_enc/ivas_qspherical_enc.c +++ b/lib_enc/ivas_qspherical_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #include "ivas_prot.h" #include "ivas_rom_com.h" #include "ivas_stat_enc.h" -#include "wmops.h" +#include "wmc_auto.h" #include "prot.h" diff --git a/lib_enc/ivas_range_uni_enc.c b/lib_enc/ivas_range_uni_enc.c index be325d47bc..82f6813c2e 100644 --- a/lib_enc/ivas_range_uni_enc.c +++ b/lib_enc/ivas_range_uni_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include #include "options.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" #ifdef DEBUGGING #include "debug.h" #endif diff --git a/lib_enc/ivas_rom_enc.c b/lib_enc/ivas_rom_enc.c index ebc4ee6bc3..ae7cd2ee1a 100644 --- a/lib_enc/ivas_rom_enc.c +++ b/lib_enc/ivas_rom_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #include "cnst.h" #include "ivas_cnst.h" #include -#include "wmops.h" +#include "wmc_auto.h" /* clang-format off */ diff --git a/lib_enc/ivas_rom_enc.h b/lib_enc/ivas_rom_enc.h index 8bcad95506..d240fb6918 100644 --- a/lib_enc/ivas_rom_enc.h +++ b/lib_enc/ivas_rom_enc.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_enc/ivas_sba_enc.c b/lib_enc/ivas_sba_enc.c index 003baa0fa0..1766351c95 100644 --- a/lib_enc/ivas_sba_enc.c +++ b/lib_enc/ivas_sba_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* @@ -58,7 +58,10 @@ void ivas_sba_getTCs( const int16_t input_frame /* i : frame length */ ) { - ivas_sba_zero_vert_comp( sba_data, st_ivas->sba_analysis_order, st_ivas->hEncoderConfig->sba_planar, input_frame ); + if ( st_ivas->hEncoderConfig->sba_planar ) + { + ivas_sba_zero_vert_comp( sba_data, st_ivas->sba_analysis_order, st_ivas->hEncoderConfig->sba_planar, input_frame ); + } st_ivas->nchan_transport = ivas_get_sba_num_TCs( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->sba_analysis_order ); @@ -93,262 +96,249 @@ void ivas_sba_getTCs( return; } -#ifdef SBA_BR_SWITCHING /*-------------------------------------------------------------------* - * ivas_sba_enc_reinit() + * ivas_sba_enc_reconfigure() * - * Reinitialise IVAS SBA encoder + * Reconfigure IVAS SBA encoder *-------------------------------------------------------------------*/ -ivas_error ivas_sba_enc_reinit( +ivas_error ivas_sba_enc_reconfigure( Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */ ) { - int16_t nSCE_old; - int16_t nCPE_old; - int16_t sce_id; - int16_t cpe_id; - int16_t n; - Indice *ind_list_metadata; + int16_t n, nSCE_old, nCPE_old, nchan_transport_old; int32_t ivas_total_brate; - int16_t i, nchan_inp; ivas_error error; ENCODER_CONFIG_HANDLE hEncoderConfig; - Indice *ind_list; - BSTR_ENC_HANDLE hBstr; - BSTR_ENC_HANDLE hMetaData; + error = IVAS_ERR_OK; hEncoderConfig = st_ivas->hEncoderConfig; ivas_total_brate = hEncoderConfig->ivas_total_brate; - error = IVAS_ERR_OK; - nchan_inp = st_ivas->hEncoderConfig->nchan_inp; - ivas_total_brate = st_ivas->hEncoderConfig->ivas_total_brate; - - nCPE_old = st_ivas->nCPE; - nSCE_old = st_ivas->nSCE; - ind_list_metadata = NULL; - - - ind_list = NULL; - hBstr = NULL; - hMetaData = NULL; - - /* get the index list pointers */ - if ( nSCE_old ) - { - hBstr = st_ivas->hSCE[0]->hCoreCoder[0]->hBstr; - hMetaData = st_ivas->hSCE[0]->hMetaData; - } - else if ( nCPE_old ) - { - hBstr = st_ivas->hCPE[0]->hCoreCoder[0]->hBstr; - hMetaData = st_ivas->hCPE[nCPE_old - 1]->hMetaData; - } - - /* save bitstream information */ - ind_list = hBstr->ind_list; - ind_list_metadata = hMetaData->ind_list; - - /*------------------------------------------------------------------------------------------* - * Closing Encoder handles before Reinitialisation - *------------------------------------------------------------------------------------------*/ - /* Q Metadata handle */ - ivas_qmetadata_close( &( st_ivas->hQMetaData ) ); - /* DirAC handle */ - if ( st_ivas->hDirAC != NULL ) + if ( ivas_total_brate != hEncoderConfig->last_ivas_total_brate ) { - ivas_dirac_enc_close( st_ivas->hDirAC, st_ivas->hEncoderConfig->input_Fs ); + DIRAC_ENC_HANDLE hDirAC = st_ivas->hDirAC; + SPAR_ENC_HANDLE hSpar; +#ifndef LBR_SBA_BR_SWITCHING + SBA_MODE sba_mode_old; +#endif + int16_t analysis_order_old; + int16_t spar_reconfig_flag; - st_ivas->hDirAC = NULL; - } + spar_reconfig_flag = 0; + nchan_transport_old = st_ivas->nchan_transport; + nCPE_old = st_ivas->nCPE; + nSCE_old = st_ivas->nSCE; +#ifndef LBR_SBA_BR_SWITCHING + sba_mode_old = st_ivas->sba_mode; +#endif + st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, hEncoderConfig->sba_order ); +#ifndef LBR_SBA_BR_SWITCHING +#ifndef LBR_SBA + st_ivas->sba_mode = ivas_sba_mode_select( ivas_total_brate ); +#else + st_ivas->sba_mode = ivas_sba_mode_select(); +#endif +#endif + analysis_order_old = ivas_sba_get_analysis_order( hEncoderConfig->last_ivas_total_brate, hEncoderConfig->sba_order ); - /* SPAR handle */ - if ( st_ivas->hSpar != NULL ) - { - ivas_spar_enc_close( st_ivas->hSpar, st_ivas->hEncoderConfig->input_Fs, nchan_inp ); - st_ivas->hSpar = NULL; - } - /* SCE handles */ - for ( i = 0; i < MAX_SCE; i++ ) - { - if ( st_ivas->hSCE[i] != NULL ) + if ( analysis_order_old != st_ivas->sba_analysis_order ) { - destroy_sce_enc( st_ivas->hSCE[i] ); - st_ivas->hSCE[i] = NULL; - } - } + int16_t i, n_old; + float **old_mem_hp20_in; - /* CPE handles */ - for ( i = 0; i < MAX_CPE; i++ ) - { - if ( st_ivas->hCPE[i] != NULL ) - { - destroy_cpe_enc( st_ivas->hCPE[i] ); - st_ivas->hCPE[i] = NULL; - } - } - /* MCT handle */ - if ( st_ivas->hMCT != NULL ) - { - ivas_mct_enc_close( st_ivas->hMCT ); - st_ivas->hMCT = NULL; - } - if ( st_ivas->mem_hp20_in != NULL ) - { - n = getNumChanAnalysis( st_ivas ); + n_old = ivas_sba_get_nchan_metadata( analysis_order_old ); + n = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order ); - for ( i = 0; i < n; i++ ) - { - count_free( st_ivas->mem_hp20_in[i] ); - st_ivas->mem_hp20_in[i] = NULL; + if ( n > n_old ) + { + /* save old mem_hp_20 pointer */ + old_mem_hp20_in = st_ivas->mem_hp20_in; + st_ivas->mem_hp20_in = NULL; + + if ( ( st_ivas->mem_hp20_in = (float **) malloc( n * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HP20 filter memory\n" ) ); + } + + for ( i = 0; i < n_old; i++ ) + { + st_ivas->mem_hp20_in[i] = old_mem_hp20_in[i]; + old_mem_hp20_in[i] = NULL; + } + /* create additional hp20 memories */ + for ( ; i < n; i++ ) + { + if ( ( st_ivas->mem_hp20_in[i] = (float *) malloc( L_HP20_MEM * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HP20 filter memory\n" ) ); + } + + set_f( st_ivas->mem_hp20_in[i], 0.0f, L_HP20_MEM ); + } + + free( old_mem_hp20_in ); + old_mem_hp20_in = NULL; + } + else if ( n < n_old ) + { + /* save old mem_hp_20 pointer */ + old_mem_hp20_in = st_ivas->mem_hp20_in; + st_ivas->mem_hp20_in = NULL; + + if ( ( st_ivas->mem_hp20_in = (float **) malloc( n * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HP20 filter memory\n" ) ); + } + + for ( i = 0; i < n; i++ ) + { + st_ivas->mem_hp20_in[i] = old_mem_hp20_in[i]; + old_mem_hp20_in[i] = NULL; + } + /* remove superfluous hp20 memories */ + for ( ; i < n_old; i++ ) + { + free( old_mem_hp20_in[i] ); + old_mem_hp20_in[i] = NULL; + } + + free( old_mem_hp20_in ); + old_mem_hp20_in = NULL; + } } - count_free( st_ivas->mem_hp20_in ); - st_ivas->mem_hp20_in = NULL; - } - - /*------------------------------------------------------------------------------------------* - * Reopening Encoder handles for Reinitialisation - *------------------------------------------------------------------------------------------*/ - - if ( ( error = ivas_qmetadata_open( &( st_ivas->hQMetaData ) ) ) != IVAS_ERR_OK ) - { - return error; - } - - st_ivas->sba_mode = ivas_sba_mode_select( ivas_total_brate ); - st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, st_ivas->hEncoderConfig->sba_order ); - - if ( st_ivas->sba_mode == SBA_MODE_SPAR ) - { - if ( ( error = ivas_spar_enc_open( st_ivas ) ) != IVAS_ERR_OK ) +#ifndef LBR_SBA_BR_SWITCHING + if ( st_ivas->sba_mode == SBA_MODE_SPAR ) { - return error; - } - } - - if ( ( error = ivas_dirac_enc_open( st_ivas ) ) != IVAS_ERR_OK ) - { - return error; - } - + if ( st_ivas->hSpar == NULL ) + { + if ( ( error = ivas_spar_enc_open( st_ivas, spar_reconfig_flag ) ) != IVAS_ERR_OK ) + { + return error; + } + } +#endif + ivas_spar_config( ivas_total_brate, min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ), + &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->hSpar->core_nominal_brate, -1 ); - for ( sce_id = 0; sce_id < st_ivas->nSCE; sce_id++ ) - { - if ( ( error = create_sce_enc( st_ivas, sce_id, ivas_total_brate / st_ivas->nchan_transport ) ) != IVAS_ERR_OK ) + for ( n = 0; n < DIRAC_MAX_ANA_CHANS; n++ ) + { + if ( hDirAC->sba_synchro_buffer[n] != NULL ) + { + free( hDirAC->sba_synchro_buffer[n] ); + hDirAC->sba_synchro_buffer[n] = NULL; + } + } + hDirAC->num_samples_synchro_delay = 0; +#ifndef LBR_SBA_BR_SWITCHING + } + else { - return error; + ivas_spar_enc_close( &( st_ivas->hSpar ), hEncoderConfig->input_Fs, hEncoderConfig->nchan_inp, spar_reconfig_flag ); } +#endif + hSpar = st_ivas->hSpar; - /* prepare bitstream buffers */ - st_ivas->hSCE[sce_id]->hCoreCoder[0]->hBstr->ind_list = ind_list + sce_id * MAX_NUM_INDICES; - reset_indices_enc( st_ivas->hSCE[sce_id]->hCoreCoder[0]->hBstr, MAX_NUM_INDICES ); - - st_ivas->hSCE[sce_id]->hMetaData->ind_list = ind_list_metadata + sce_id * MAX_BITS_METADATA; - reset_indices_enc( st_ivas->hSCE[sce_id]->hMetaData, MAX_BITS_METADATA ); - - if ( st_ivas->sba_mode == SBA_MODE_SPAR && st_ivas->hEncoderConfig->Opt_DTX_ON ) + if ( st_ivas->nchan_transport == 1 ) { - st_ivas->hSCE[sce_id]->hCoreCoder[0]->dtx_sce_sba = 1; + hEncoderConfig->element_mode_init = IVAS_SCE; } - } - - for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) - { - if ( ( error = create_cpe_enc( st_ivas, cpe_id, ( ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS ) ) != IVAS_ERR_OK ) + else { - return error; + hEncoderConfig->element_mode_init = IVAS_CPE_MDCT; } - - /* prepare bitstream buffers */ - for ( n = 0; n < CPE_CHANNELS; n++ ) +#ifndef LBR_SBA_BR_SWITCHING + if ( ( sba_mode_old != st_ivas->sba_mode ) || ( nchan_transport_old != st_ivas->nchan_transport ) ) +#else + if ( nchan_transport_old != st_ivas->nchan_transport ) +#endif { - st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->ind_list = ind_list + ( cpe_id * CPE_CHANNELS + n ) * MAX_NUM_INDICES; - reset_indices_enc( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr, MAX_NUM_INDICES ); - - if ( hEncoderConfig->Opt_DTX_ON ) + /* FB mixer handle */ +#ifndef LBR_SBA_BR_SWITCHING + if ( st_ivas->sba_mode == SBA_MODE_SPAR ) { - st_ivas->hCPE[cpe_id]->hCoreCoder[n]->cng_sba_flag = 1; +#endif + if ( hDirAC->hFbMixer != NULL ) + { + ivas_FB_mixer_close( &( hDirAC->hFbMixer ), hEncoderConfig->input_Fs, 0 ); + hDirAC->hFbMixer = NULL; + } +#ifndef LBR_SBA_BR_SWITCHING + if ( sba_mode_old == SBA_MODE_SPAR ) + { +#endif + spar_reconfig_flag = 1; + ivas_spar_enc_close( &( st_ivas->hSpar ), hEncoderConfig->input_Fs, hEncoderConfig->nchan_inp, spar_reconfig_flag ); + + if ( ( error = ivas_spar_enc_open( st_ivas, spar_reconfig_flag ) ) != IVAS_ERR_OK ) + { + return error; + } +#ifndef LBR_SBA_BR_SWITCHING + } } + else + { + if ( hDirAC->hFbMixer == NULL ) + { + IVAS_FB_CFG *fb_cfg; + + if ( ( error = ivas_fb_set_cfg( &fb_cfg, SBA_FORMAT, SBA_MODE_DIRAC, DIRAC_MAX_ANA_CHANS, 0, 0, hEncoderConfig->input_Fs ) ) != IVAS_ERR_OK ) + { + return error; + } + + /* Allocate and initialize FB mixer handle */ + if ( ( error = ivas_FB_mixer_open( &( hDirAC->hFbMixer ), hEncoderConfig->input_Fs, fb_cfg, 0 ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + if ( hDirAC->num_samples_synchro_delay == 0 ) + { + hDirAC->num_samples_synchro_delay = NS2SA( hEncoderConfig->input_Fs, IVAS_FB_ENC_DELAY_NS ); + + for ( n = 0; n < DIRAC_MAX_ANA_CHANS; n++ ) + { + if ( ( hDirAC->sba_synchro_buffer[n] = (float *) malloc( hDirAC->num_samples_synchro_delay * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hDirAC synchro buffer\n" ) ); + } + set_zero( hDirAC->sba_synchro_buffer[n], hDirAC->num_samples_synchro_delay ); + } + for ( ; n < DIRAC_MAX_ANA_CHANS; n++ ) + { + hDirAC->sba_synchro_buffer[n] = NULL; + } + } + } +#endif } - - /* Metadata only initialized for the last CPE index */ - if ( cpe_id == st_ivas->nCPE - 1 ) - { - st_ivas->hCPE[cpe_id]->hMetaData->ind_list = ind_list_metadata + sce_id * MAX_BITS_METADATA; - reset_indices_enc( st_ivas->hCPE[cpe_id]->hMetaData, MAX_BITS_METADATA ); - } - } - - if ( st_ivas->nCPE > 1 ) - { - if ( ( error = create_mct_enc( st_ivas ) ) != IVAS_ERR_OK ) +#ifdef LBR_SBA_BR_SWITCHING + hEncoderConfig->spar_reconfig_flag = spar_reconfig_flag; +#endif + if ( ( error = ivas_dirac_enc_reconfigure( st_ivas ) ) != IVAS_ERR_OK ) { return error; } - } - n = getNumChanAnalysis( st_ivas ); - - if ( n > 0 ) - { - if ( ( st_ivas->mem_hp20_in = (float **) count_malloc( n * sizeof( float * ) ) ) == NULL ) - { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HP20 filter memory\n" ) ); - } - } - else - { - st_ivas->mem_hp20_in = NULL; - } - - for ( i = 0; i < n; i++ ) - { - if ( ( st_ivas->mem_hp20_in[i] = (float *) count_malloc( L_HP20_MEM * sizeof( float ) ) ) == NULL ) +#ifndef LBR_SBA_BR_SWITCHING + if ( st_ivas->sba_mode == SBA_MODE_SPAR ) { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HP20 filter memory\n" ) ); +#endif + mvs2s( hDirAC->dirac_to_spar_md_bands, hSpar->dirac_to_spar_md_bands, DIRAC_MAX_NBANDS ); + hSpar->enc_param_start_band = hDirAC->hConfig->enc_param_start_band; +#ifndef LBR_SBA_BR_SWITCHING } - - set_f( st_ivas->mem_hp20_in[i], 0.0f, L_HP20_MEM ); - } - return error; -} #endif - - -/*-------------------------------------------------------------------* - * ivas_sba_enc_reconfigure() - * - * Reconfigure IVAS SBA encoder - *-------------------------------------------------------------------*/ - -ivas_error ivas_sba_enc_reconfigure( - Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */ -) -{ - int16_t nSCE_old, nCPE_old, nchan_transport_old; - int32_t ivas_total_brate; - ivas_error error; - - error = IVAS_ERR_OK; - - ivas_total_brate = st_ivas->hEncoderConfig->ivas_total_brate; - - if ( ivas_total_brate != st_ivas->hEncoderConfig->last_ivas_total_brate ) - { - nchan_transport_old = st_ivas->nchan_transport; - nCPE_old = st_ivas->nCPE; - nSCE_old = st_ivas->nSCE; - - st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, st_ivas->hEncoderConfig->sba_order ); - - ivas_dirac_enc_reconfigure( st_ivas ); - - /*-----------------------------------------------------------------* - * Allocate, initalize, and configure SCE/CPE/MCT handles + * Allocate, initialize, and configure SCE/CPE/MCT handles *-----------------------------------------------------------------*/ - ivas_corecoder_enc_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old ); + if ( ( error = ivas_corecoder_enc_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old, ivas_total_brate / st_ivas->nchan_transport, ( ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS, MC_MODE_NONE ) ) != IVAS_ERR_OK ) + { + return error; + } } return error; diff --git a/lib_enc/ivas_sce_enc.c b/lib_enc/ivas_sce_enc.c index 2a74fcf68d..c8577a85ba 100644 --- a/lib_enc/ivas_sce_enc.c +++ b/lib_enc/ivas_sce_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* @@ -60,7 +60,6 @@ ivas_error ivas_sce_enc( { float old_inp_12k8[1][L_INP_12k8]; /* buffer of input signal @ 12k8 */ float old_inp_16k[1][L_INP]; /* buffer of input signal @ 16kHz */ - float Etot[1]; /* total energy; correlation shift */ float ener[1]; /* residual energy from Levinson-Durbin */ float relE[1]; /* frame relative energy */ float A[1][NB_SUBFR16k * ( M + 1 )]; /* A(z) unquantized for subframes */ @@ -91,7 +90,7 @@ ivas_error ivas_sce_enc( ivas_error error; int16_t flag_16k_smc; - wmops_sub_start( "ivas_sce_enc" ); + push_wmops( "ivas_sce_enc" ); error = IVAS_ERR_OK; @@ -182,7 +181,7 @@ ivas_error ivas_sce_enc( *----------------------------------------------------------------*/ error = pre_proc_front_ivas( hSCE, NULL, hSCE->element_brate, nb_bits_metadata, input_frame, 0, old_inp_12k8[0], old_inp_16k[0], - &Etot[0], &ener[0], &relE[0], A[0], Aw[0], epsP[0], lsp_new[0], lsp_mid[0], + &ener[0], &relE[0], A[0], Aw[0], epsP[0], lsp_new[0], lsp_mid[0], &vad_hover_flag[0], &attack_flag[0], realBuffer[0], imagBuffer[0], old_wsp[0], pitch_fr[0], voicing_fr[0], &loc_harm[0], &cor_map_sum[0], &vad_flag_dtx[0], enerBuffer[0], fft_buff[0], A[0], lsp_new[0], currFlatness[0], 0, fr_bands, Etot_LR, lf_E, localVAD_HE_SAD, NULL, flag_16k_smc, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_flag : 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->force_front_vad : 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_dtx_flag : 0, @@ -238,7 +237,7 @@ ivas_error ivas_sce_enc( * Encoder *----------------------------------------------------------------*/ - if ( ( error = ivas_core_enc( hSCE, NULL, NULL, 1, old_inp_12k8, old_inp_16k, Etot, ener, A, Aw, epsP, lsp_new, lsp_mid, vad_hover_flag, attack_flag, realBuffer, imagBuffer, old_wsp, loc_harm, cor_map_sum, vad_flag_dtx, enerBuffer, fft_buff, 0, ivas_format, flag_16k_smc ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_core_enc( hSCE, NULL, NULL, 1, old_inp_12k8, old_inp_16k, ener, A, Aw, epsP, lsp_new, lsp_mid, vad_hover_flag, attack_flag, realBuffer, imagBuffer, old_wsp, loc_harm, cor_map_sum, vad_flag_dtx, enerBuffer, fft_buff, 0, ivas_format, flag_16k_smc ) ) != IVAS_ERR_OK ) { return error; } @@ -252,6 +251,9 @@ ivas_error ivas_sce_enc( hSCE->last_element_brate = hSCE->element_brate; + /* Store previous attack detection flag */ + st->hTranDet->transientDetector.prev_bIsAttackPresent = st->hTranDet->transientDetector.bIsAttackPresent; + #ifdef DEBUG_MODE_INFO { float tmpF = hSCE->element_brate / 1000.0f; @@ -259,7 +261,7 @@ ivas_error ivas_sce_enc( } #endif - wmops_sub_end(); + pop_wmops(); return error; } @@ -287,7 +289,7 @@ ivas_error create_sce_enc( * Allocate SCE handle *-----------------------------------------------------------------*/ - if ( ( hSCE = (SCE_ENC_HANDLE) count_malloc( sizeof( SCE_ENC_DATA ) ) ) == NULL ) + if ( ( hSCE = (SCE_ENC_HANDLE) malloc( sizeof( SCE_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SCE\n" ) ); } @@ -306,7 +308,7 @@ ivas_error create_sce_enc( if ( st_ivas->hEncoderConfig->ivas_format != MONO_FORMAT ) { - if ( ( hSCE->hMetaData = (BSTR_ENC_HANDLE) count_malloc( sizeof( BSTR_ENC_DATA ) ) ) == NULL ) + if ( ( hSCE->hMetaData = (BSTR_ENC_HANDLE) malloc( sizeof( BSTR_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MetaData structure\n" ) ); } @@ -320,7 +322,7 @@ ivas_error create_sce_enc( * Core Coder, 1 instance: allocate and initialize *-----------------------------------------------------------------*/ - if ( ( st = (ENC_CORE_HANDLE) count_malloc( sizeof( Encoder_State ) ) ) == NULL ) + if ( ( st = (ENC_CORE_HANDLE) malloc( sizeof( Encoder_State ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CoreCoder structure\n" ) ); } @@ -330,7 +332,7 @@ ivas_error create_sce_enc( st->total_brate = hSCE->element_brate; /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */ st->mct_chan_mode = MCT_CHAN_MODE_REGULAR; - if ( ( error = init_encoder( st, 0, st_ivas->hEncoderConfig->var_SID_rate_flag, st_ivas->hEncoderConfig->interval_SID, 0 ) ) != IVAS_ERR_OK ) + if ( ( error = init_encoder( st, 0, st_ivas->hEncoderConfig->var_SID_rate_flag, st_ivas->hEncoderConfig->interval_SID, 0, st_ivas->ism_mode ) ) != IVAS_ERR_OK ) { return error; } @@ -365,11 +367,11 @@ void destroy_sce_enc( if ( hSCE->hMetaData != NULL ) { - count_free( hSCE->hMetaData ); + free( hSCE->hMetaData ); hSCE->hMetaData = NULL; } - count_free( hSCE ); + free( hSCE ); return; } diff --git a/lib_enc/ivas_sns_enc.c b/lib_enc/ivas_sns_enc.c index 45c04ac9ea..762b0aeb0f 100644 --- a/lib_enc/ivas_sns_enc.c +++ b/lib_enc/ivas_sns_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,10 +38,14 @@ #include "prot.h" #include "ivas_prot.h" #include "rom_com.h" +#ifdef SNS_MSVQ +#include "ivas_rom_com.h" +#include "ivas_cnst.h" +#endif #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------- @@ -130,7 +134,7 @@ static int16_t sns_1st_cod( /*------------------------------------------------------------------- - * sns_1st_cod() + * sns_2st_cod() * * *-------------------------------------------------------------------*/ @@ -282,12 +286,12 @@ void sns_avq_cod( *-------------------------------------------------------------------*/ void sns_avq_cod_stereo( - const float *snsl, /* i : Input sns vector (left channel) */ - const float *snsr, /* i : Input sns vector (right channel) */ - float *snsl_q, /* o : Quantized sns vector (left channel) */ - float *snsr_q, /* o : Quantized sns vector (right channel) */ - int16_t *indexl, /* o : Quantization indices (left channel) */ - int16_t *indexr /* o : Quantization indices (right channel) */ + const float *snsl, /* i : Input sns vector (left channel) */ + const float *snsr, /* i : Input sns vector (right channel) */ + float *snsl_q, /* o : Quantized sns vector (left channel) */ + float *snsr_q, /* o : Quantized sns vector (right channel) */ + int16_t *indexl, /* o : Quantization indices (left channel) */ + int16_t *indexr /* o : Quantization indices (right channel) */ ) { int16_t i, flag_zero; @@ -377,3 +381,159 @@ void sns_avq_cod_stereo( return; } + +#ifdef SNS_MSVQ +int16_t quantize_sns( + float sns_in[CPE_CHANNELS][NB_DIV][M], + float snsQ_out[CPE_CHANNELS][NB_DIV][M], + Encoder_State **sts, + int16_t *indices, + int16_t *zero_side_flag, + int16_t *sns_stereo_mode ) +{ + int16_t nSubframes, k, ch, i; + int16_t nbits, idxIndices; + Encoder_State *st; + float weights[M]; + const float *means; + float sns_buffer[CPE_CHANNELS][NB_DIV][M]; + + nbits = 0; + idxIndices = 0; + set_f( weights, 1.0f, M ); + + /* stereo mode decision */ + sns_stereo_mode[0] = SNS_STEREO_MODE_LR; + sns_stereo_mode[1] = SNS_STEREO_MODE_LR; + zero_side_flag[0] = 0; + zero_side_flag[1] = 0; + if ( sts[0]->core == sts[1]->core ) + { + nSubframes = ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV; + + for ( k = 0; k < nSubframes; ++k ) + { + float *side; + float ener_side; + + side = &sns_buffer[1][k][0]; + v_sub( sns_in[0][k], sns_in[1][k], side, M ); + ener_side = dotp( side, side, M ); + + sns_stereo_mode[k] = ener_side < 12.f; + zero_side_flag[k] = ener_side < 1.f; + } + } + + /* prepare buffers depending on the chosen stereo mode */ + + /* remove means of L/R SNS parameters */ + for ( ch = 0; ch < CPE_CHANNELS; ++ch ) + { + st = sts[ch]; + nSubframes = ( st->core == TCX_20_CORE ) ? 1 : NB_DIV; + means = ( st->core == TCX_20_CORE ) ? ivas_sns_means_tcx20 : ivas_sns_means_tcx10; + for ( k = 0; k < nSubframes; ++k ) + { + v_sub( sns_in[ch][k], means, sns_buffer[ch][k], M ); + } + } + + if ( sns_stereo_mode[0] == SNS_STEREO_MODE_MS || sns_stereo_mode[1] == SNS_STEREO_MODE_MS ) + { + nSubframes = ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV; + for ( k = 0; k < nSubframes; ++k ) + { + if ( sns_stereo_mode[k] == SNS_STEREO_MODE_MS ) + { + convertToMS( M, sns_buffer[0][k], sns_buffer[1][k], 0.5f ); + } + } + } + + for ( ch = 0; ch < CPE_CHANNELS; ++ch ) + { + st = sts[ch]; + nSubframes = ( st->core == TCX_20_CORE ) ? 1 : NB_DIV; + + for ( k = 0; k < nSubframes; ++k ) + { + const int16_t is_side = ch == 1 && sns_stereo_mode[k] == SNS_STEREO_MODE_MS; + const float *const *cdbks = ( nSubframes == 1 ) ? ivas_sns_cdbks_tcx20 : ivas_sns_cdbks_tcx10; + const int16_t *levels = ( nSubframes == 1 ) ? ivas_sns_cdbks_tcx20_levels : ivas_sns_cdbks_tcx10_levels; + const int16_t *bits = ( nSubframes == 1 ) ? ivas_sns_cdbks_tcx20_bits : ivas_sns_cdbks_tcx10_bits; + int16_t nStages = ( ( nSubframes == 1 ) ? SNS_MSVQ_NSTAGES_TCX20 : SNS_MSVQ_NSTAGES_TCX10 ); + float *snsQ = snsQ_out[ch][k]; + const float *sns_ptr = sns_buffer[ch][k]; + + if ( is_side ) + { + const float *const *side_cdbks = ( st->core == TCX_20_CORE ) ? ivas_sns_cdbks_side_tcx20 : ivas_sns_cdbks_side_tcx10; + const int16_t *side_levels = ( st->core == TCX_20_CORE ) ? ivas_sns_cdbks_side_tcx20_levels : ivas_sns_cdbks_side_tcx10_levels; + + if ( zero_side_flag[k] ) + { + set_zero( snsQ, M ); + continue; + } + + nStages = SNS_MSVQ_NSTAGES_SIDE; + bits = ( st->core == TCX_20_CORE ) ? ivas_sns_cdbks_side_tcx20_bits : ivas_sns_cdbks_side_tcx10_bits; + means = ( st->core == TCX_20_CORE ) ? ivas_sns_means_side_tcx20 : ivas_sns_means_side_tcx10; + + v_sub( sns_ptr, means, snsQ, M ); +#ifdef ERI_FDCNGVQ_LOW_ROM + msvq_enc( side_cdbks, NULL, NULL, snsQ, side_levels, 3, nStages, weights, M, M, 0, NULL, &indices[idxIndices] ); + msvq_dec( side_cdbks, NULL, NULL, nStages, M, M, &indices[idxIndices], 0, NULL, snsQ, NULL ); +#else + msvq_enc( side_cdbks, NULL, NULL, snsQ, side_levels, 3, nStages, weights, M, M, &indices[idxIndices] ); + msvq_dec( side_cdbks, NULL, NULL, nStages, M, M, &indices[idxIndices], snsQ, NULL ); +#endif + v_add( snsQ, means, snsQ, M ); + } + else + { +#ifdef ERI_FDCNGVQ_LOW_ROM + msvq_enc( cdbks, NULL, NULL, sns_ptr, levels, 3, nStages, weights, M, M, 0, NULL, &indices[idxIndices] ); + msvq_dec( cdbks, NULL, NULL, nStages, M, M, &indices[idxIndices], 0, NULL, snsQ, NULL ); +#else + msvq_enc( cdbks, NULL, NULL, sns_ptr, levels, 3, nStages, weights, M, M, &indices[idxIndices] ); + msvq_dec( cdbks, NULL, NULL, nStages, M, M, &indices[idxIndices], snsQ, NULL ); +#endif + } + idxIndices += nStages; + + for ( i = 0; i < nStages; ++i ) + { + nbits += bits[i]; + } + } + } + + if ( sns_stereo_mode[0] == SNS_STEREO_MODE_MS || sns_stereo_mode[1] == SNS_STEREO_MODE_MS ) + { + nSubframes = ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV; + for ( k = 0; k < nSubframes; ++k ) + { + if ( sns_stereo_mode[k] == SNS_STEREO_MODE_MS ) + { + convertToMS( M, snsQ_out[0][k], snsQ_out[1][k], 1.f ); + } + } + } + + /* add means back */ + for ( ch = 0; ch < CPE_CHANNELS; ++ch ) + { + st = sts[ch]; + nSubframes = ( st->core == TCX_20_CORE ) ? 1 : NB_DIV; + means = ( st->core == TCX_20_CORE ) ? ivas_sns_means_tcx20 : ivas_sns_means_tcx10; + for ( k = 0; k < nSubframes; ++k ) + { + v_add( snsQ_out[ch][k], means, snsQ_out[ch][k], M ); + } + } + + return nbits; +} +#endif // SNS_MSVQ diff --git a/lib_enc/ivas_spar_encoder.c b/lib_enc/ivas_spar_encoder.c index b08eeb5e4b..ad7db2ae6a 100644 --- a/lib_enc/ivas_spar_encoder.c +++ b/lib_enc/ivas_spar_encoder.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #include "prot.h" #include "math.h" #include -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* @@ -58,7 +58,8 @@ static ivas_error ivas_spar_enc_process( Encoder_Struct *st_ivas, const ENCODER_ *------------------------------------------------------------------------*/ ivas_error ivas_spar_enc_open( - Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */ + Encoder_Struct *st_ivas, /* i/o: IVAS encoder handle */ + const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ ) { SPAR_ENC_HANDLE hSpar; @@ -71,11 +72,15 @@ ivas_error ivas_spar_enc_open( hEncoderConfig = st_ivas->hEncoderConfig; error = IVAS_ERR_OK; + hSpar = st_ivas->hSpar; - /* SPAR encoder handle */ - if ( ( hSpar = (SPAR_ENC_HANDLE) count_malloc( sizeof( SPAR_ENC_DATA ) ) ) == NULL ) + if ( !spar_reconfig_flag ) { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR encoder" ); + /* SPAR encoder handle */ + if ( ( hSpar = (SPAR_ENC_HANDLE) malloc( sizeof( SPAR_ENC_DATA ) ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR encoder" ); + } } input_Fs = hEncoderConfig->input_Fs; @@ -102,23 +107,33 @@ ivas_error ivas_spar_enc_open( fb_cfg->remix_order = remix_order_set[hSpar->hMdEnc->spar_md_cfg.remix_unmix_order]; /* FB mixer handle */ - if ( ( error = ivas_FB_mixer_open( &( hSpar->hFbMixer ), input_Fs, fb_cfg ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_FB_mixer_open( &( hSpar->hFbMixer ), input_Fs, fb_cfg, spar_reconfig_flag ) ) != IVAS_ERR_OK ) { return error; } /* Covariance handle */ +#ifdef LBR_SBA_EXTRA_COV_SMOOTH + if ( ( error = ivas_spar_covar_enc_open( &( hSpar->hCovEnc ), hSpar->hFbMixer->pFb, input_Fs, nchan_inp, hEncoderConfig->ivas_total_brate ) ) != IVAS_ERR_OK ) +#else if ( ( error = ivas_spar_covar_enc_open( &( hSpar->hCovEnc ), hSpar->hFbMixer->pFb, input_Fs, nchan_inp ) ) != IVAS_ERR_OK ) +#endif { return error; } - /* Transient Detector handle */ - if ( ( error = ivas_spar_transient_det_open( &( hSpar->hTranDet ), input_Fs ) ) != IVAS_ERR_OK ) + if ( !spar_reconfig_flag ) { - return error; + /* Transient Detector handle */ + if ( ( error = ivas_transient_det_open( &( hSpar->hTranDet ), input_Fs ) ) != IVAS_ERR_OK ) + { + return error; + } } + /* initialization */ + hSpar->hMdEnc->table_idx = -1; + /* AGC handle */ #ifdef DEBUG_AGC_ENCODER_CMD_OPTION hSpar->AGC_Enable = ivas_agc_enc_get_flag( hEncoderConfig->Opt_AGC_ON, nchan_transport ); @@ -138,7 +153,7 @@ ivas_error ivas_spar_enc_open( hSpar->hPCA = NULL; if ( hEncoderConfig->Opt_PCA_ON ) { - if ( ( hSpar->hPCA = (PCA_ENC_STATE *) count_malloc( sizeof( PCA_ENC_STATE ) ) ) == NULL ) + if ( ( hSpar->hPCA = (PCA_ENC_STATE *) malloc( sizeof( PCA_ENC_STATE ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR PCA encoder" ); } @@ -168,37 +183,40 @@ ivas_error ivas_spar_enc_open( * Allocate and initialize Front-VAD handle *-----------------------------------------------------------------*/ - hSpar->front_vad_flag = 0; - hSpar->front_vad_dtx_flag = 0; - hSpar->force_front_vad = 0; - - if ( hEncoderConfig->Opt_DTX_ON ) + if ( !spar_reconfig_flag ) { - if ( ( error = front_vad_create( &( hSpar->hFrontVad ), hEncoderConfig ) ) != IVAS_ERR_OK ) - { - return error; - } + hSpar->front_vad_flag = 0; + hSpar->front_vad_dtx_flag = 0; + hSpar->force_front_vad = 0; - if ( ( hSpar->hCoreCoderVAD = (ENC_CORE_HANDLE) count_malloc( sizeof( Encoder_State ) ) ) == NULL ) + if ( hEncoderConfig->Opt_DTX_ON ) { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CoreCoder structure\n" ) ); - } + if ( ( error = front_vad_create( &( hSpar->hFrontVad ), hEncoderConfig ) ) != IVAS_ERR_OK ) + { + return error; + } - copy_encoder_config( st_ivas, hSpar->hCoreCoderVAD, 1 ); + if ( ( hSpar->hCoreCoderVAD = (ENC_CORE_HANDLE) malloc( sizeof( Encoder_State ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CoreCoder structure\n" ) ); + } - hSpar->hCoreCoderVAD->total_brate = hEncoderConfig->ivas_total_brate; /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */ - hSpar->hCoreCoderVAD->mct_chan_mode = MCT_CHAN_MODE_IGNORE; + copy_encoder_config( st_ivas, hSpar->hCoreCoderVAD, 1 ); - if ( ( error = init_encoder( hSpar->hCoreCoderVAD, 0, hEncoderConfig->var_SID_rate_flag, hEncoderConfig->interval_SID, 1 ) ) != IVAS_ERR_OK ) + hSpar->hCoreCoderVAD->total_brate = hEncoderConfig->ivas_total_brate; /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */ + hSpar->hCoreCoderVAD->mct_chan_mode = MCT_CHAN_MODE_IGNORE; + + if ( ( error = init_encoder( hSpar->hCoreCoderVAD, 0, hEncoderConfig->var_SID_rate_flag, hEncoderConfig->interval_SID, 1, st_ivas->ism_mode ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else { - return error; + hSpar->hCoreCoderVAD = NULL; + hSpar->hFrontVad = NULL; } } - else - { - hSpar->hCoreCoderVAD = NULL; - hSpar->hFrontVad = NULL; - } /*-----------------------------------------------------------------* * Final assignment @@ -217,57 +235,67 @@ ivas_error ivas_spar_enc_open( *------------------------------------------------------------------------*/ void ivas_spar_enc_close( - SPAR_ENC_HANDLE hSpar, /* i/o: SPAR encoder handle */ - const int32_t input_Fs, /* i : input sampling rate */ - const int16_t nchan_inp /* i : number of input channels */ + SPAR_ENC_HANDLE *hSpar, /* i/o: SPAR encoder handle */ + const int32_t input_Fs, /* i : input sampling rate */ + const int16_t nchan_inp, /* i : number of input channels */ + const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */ ) { int16_t num_chans; - if ( hSpar != NULL ) + + if ( hSpar == NULL || *hSpar == NULL ) + { + return; + } + + if ( !spar_reconfig_flag ) { /* core-coder-VAD handle */ - if ( hSpar->hCoreCoderVAD != NULL ) + if ( ( *hSpar )->hCoreCoderVAD != NULL ) { - destroy_core_enc( hSpar->hCoreCoderVAD ); - hSpar->hCoreCoderVAD = NULL; + destroy_core_enc( ( *hSpar )->hCoreCoderVAD ); + ( *hSpar )->hCoreCoderVAD = NULL; } /* front-VAD handle */ - if ( hSpar->hFrontVad != NULL ) + if ( ( *hSpar )->hFrontVad != NULL ) { - front_vad_destroy( &hSpar->hFrontVad ); - hSpar->hFrontVad = NULL; + front_vad_destroy( &( *hSpar )->hFrontVad ); + ( *hSpar )->hFrontVad = NULL; } + } - num_chans = hSpar->hFbMixer->fb_cfg->num_in_chans; - assert( num_chans <= nchan_inp ); - - /* MD handle */ - ivas_spar_md_enc_close( &hSpar->hMdEnc ); + num_chans = ( *hSpar )->hFbMixer->fb_cfg->num_in_chans; + assert( num_chans <= nchan_inp ); - /* Covar. State handle */ - ivas_spar_covar_enc_close( &hSpar->hCovEnc, num_chans ); + /* MD handle */ + ivas_spar_md_enc_close( &( *hSpar )->hMdEnc ); - /* FB mixer handle */ - ivas_FB_mixer_close( &hSpar->hFbMixer, input_Fs ); + /* Covar. State handle */ + ivas_spar_covar_enc_close( &( *hSpar )->hCovEnc, num_chans ); - /* Trans Det handle */ - ivas_spar_transient_det_close( &hSpar->hTranDet ); + /* FB mixer handle */ + ivas_FB_mixer_close( &( *hSpar )->hFbMixer, input_Fs, spar_reconfig_flag ); - /* AGC */ - ivas_spar_agc_enc_close( &hSpar->hAgcEnc ); + /* AGC */ + ivas_spar_agc_enc_close( &( *hSpar )->hAgcEnc ); - /* PCA */ - if ( hSpar->hPCA != NULL ) - { - count_free( hSpar->hPCA ); - hSpar->hPCA = NULL; - } + /* PCA */ + if ( ( *hSpar )->hPCA != NULL ) + { + free( ( *hSpar )->hPCA ); + ( *hSpar )->hPCA = NULL; + } - count_free( hSpar ); - hSpar = NULL; + if ( !spar_reconfig_flag ) + { + /* Trans Det handle */ + ivas_transient_det_close( &( *hSpar )->hTranDet ); + free( ( *hSpar ) ); + ( *hSpar ) = NULL; } + return; } @@ -292,6 +320,41 @@ ivas_error ivas_spar_enc( error = IVAS_ERR_OK; hEncoderConfig = st_ivas->hEncoderConfig; + // VE2DB: can hFbMixer->ppFilterbank_prior_input be replaced by st->input ? + + /* check last sba_mode */ +#ifndef LBR_SBA + if ( ivas_sba_mode_select( st_ivas->hEncoderConfig->last_ivas_total_brate ) == SBA_MODE_DIRAC ) +#else + if ( ivas_sba_mode_select() == SBA_MODE_DIRAC ) +#endif + { + Encoder_State *sts[MCT_MAX_BLOCKS]; + + /* initializations */ + for ( int16_t sce_id = 0; sce_id < st_ivas->nSCE; sce_id++ ) + { + sts[sce_id] = st_ivas->hSCE[sce_id]->hCoreCoder[0]; + } + + for ( int16_t cpe_id = 0, i = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) + { + for ( int16_t ch = 0; ch < CPE_CHANNELS; ch++ ) + { + sts[i] = st_ivas->hCPE[cpe_id]->hCoreCoder[ch]; + i++; + } + } + + /* update FB prior input */ + // VE: last 1ms of 'ppFilterbank_prior_input' is not correct + for ( int16_t i = 0; i < st_ivas->nchan_transport; i++ ) + { + mvr2r( ( sts[i]->input_buff + NS2SA( hEncoderConfig->input_Fs, IVAS_FB_ENC_DELAY_NS ) ), + ( st_ivas->hSpar->hFbMixer->ppFilterbank_prior_input[i] + st_ivas->hSpar->hFbMixer->fb_cfg->prior_input_length - input_frame ), input_frame ); + } + } + /* front VAD */ if ( ( error = front_vad_spar( st_ivas->hSpar, data_f[0], hEncoderConfig, input_frame ) ) != IVAS_ERR_OK ) { @@ -308,11 +371,6 @@ ivas_error ivas_spar_enc( return error; } - if ( hEncoderConfig->sba_planar ) - { - ivas_sba_zero_vert_comp( data_f, st_ivas->sba_analysis_order, hEncoderConfig->sba_planar, input_frame ); // TODO tmu: do we need a second call to this function ? - } - *nb_bits_metadata = hMetaData->nb_bits_tot; /* Force IVAS front pre-proc decision for higher bitrates */ @@ -341,7 +399,8 @@ static ivas_error ivas_spar_enc_process( { float pcm_tmp[IVAS_SPAR_MAX_CH][L_FRAME48k * 2]; float *p_pcm_tmp[IVAS_SPAR_MAX_CH]; - int16_t i, j, b, i_ts, input_frame, transient_det, dtx_vad; + int16_t i, j, b, i_ts, input_frame, dtx_vad; + int16_t transient_det[2]; int32_t ivas_total_brate, input_Fs; float *cov_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH]; float *cov_dtx_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH]; @@ -358,7 +417,7 @@ static ivas_error ivas_spar_enc_process( float dir[3], avg_dir[3]; float energySum, vecLen; - wmops_sub_start( "ivas_spar_enc_process" ); + push_wmops( "ivas_spar_enc_process" ); /*-----------------------------------------------------------------------------------------* * Initialization @@ -374,7 +433,10 @@ static ivas_error ivas_spar_enc_process( sba_order = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); nchan_inp = ivas_sba_get_nchan_metadata( sba_order ); assert( nchan_inp <= hEncoderConfig->nchan_inp ); - +#ifdef LBR_SBA + int16_t active_w_vlbr; + active_w_vlbr = ( hEncoderConfig->ivas_total_brate < IVAS_24k4 ) ? 1 : 0; +#endif for ( i = FOA_CHANNELS + 1; i < nchan_inp; i++ ) { mvr2r( data_f[HOA_keep_ind[i]], data_f[i], input_frame ); @@ -384,8 +446,17 @@ static ivas_error ivas_spar_enc_process( * Transient detector *-----------------------------------------------------------------------------------------*/ - transient_det = ivas_transient_det_process( hSpar->hTranDet, data_f[0], input_frame ); - + ivas_transient_det_process( hSpar->hTranDet, data_f[0], input_frame, transient_det ); + if ( sba_order == 1 ) + { + transient_det[1] = transient_det[0]; + } +#ifdef LBR_SBA_EXTRA_COV_SMOOTH + if ( ivas_total_brate < IVAS_24k4 ) + { + transient_det[1] = 0; + } +#endif /* store previous input samples for W in local buffer */ assert( num_del_samples <= IVAS_FB_1MS_48K_SAMP ); mvr2r( &hSpar->hFbMixer->ppFilterbank_prior_input[0][hSpar->hFbMixer->fb_cfg->prior_input_length - num_del_samples], w_del_buf, num_del_samples ); @@ -449,6 +520,17 @@ static ivas_error ivas_spar_enc_process( { /* WB 4TC mode bit : disable for now*/ push_next_indice( hMetaData, 0, 1 ); +#ifdef LBR_SBA_PLANAR + /* force planar for LBR SPAR+DirAC, then encode parameters */ + if ( hQMetaData->useLowerRes ) + { + for ( i = hQMetaData->q_direction[0].cfg.start_band; i < hQMetaData->q_direction[0].cfg.nbands; i++ ) + { + /* Make sure elevation is really zero */ + set_zero( hQMetaData->q_direction[0].band_data[i].elevation, hQMetaData->q_direction[0].cfg.nblocks ); + } + } +#endif ivas_qmetadata_enc_encode( hMetaData, hQMetaData ); } else @@ -522,7 +604,31 @@ static ivas_error ivas_spar_enc_process( hQMetaData->q_direction->cfg.nbands = orig_dirac_bands; } } + /*-----------------------------------------------------------------------------------------* + * Set SPAR bitrates + *-----------------------------------------------------------------------------------------*/ + table_idx = ivas_get_spar_table_idx( ivas_total_brate, sba_order, SPAR_CONFIG_BW, NULL, NULL ); + + if ( hSpar->hMdEnc->table_idx != table_idx ) + { + hSpar->hMdEnc->table_idx = table_idx; +#ifdef LBR_SBA_BR_SWITCHING + if ( ( ivas_total_brate != hEncoderConfig->last_ivas_total_brate ) && ( !hEncoderConfig->spar_reconfig_flag ) ) +#else + if ( ivas_total_brate != hEncoderConfig->last_ivas_total_brate ) +#endif + { + if ( ( error = ivas_spar_md_enc_init( hSpar->hMdEnc, hEncoderConfig, sba_order ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else + { + ivas_spar_set_bitrate_config( &hSpar->hMdEnc->spar_md_cfg, table_idx, ( hSpar->hMdEnc->spar_hoa_md_flag ) ? IVAS_MAX_NUM_BANDS : SPAR_DIRAC_SPLIT_START_BAND ); + } + } /*-----------------------------------------------------------------------------------------* * Covariance process *-----------------------------------------------------------------------------------------*/ @@ -537,19 +643,6 @@ static ivas_error ivas_spar_enc_process( } ivas_enc_cov_handler_process( hSpar->hCovEnc, ppIn_FR_real, ppIn_FR_imag, cov_real, cov_dtx_real, hSpar->hFbMixer->pFb, 0, hSpar->hFbMixer->pFb->filterbank_num_bands, nchan_inp, dtx_vad, transient_det ); - - /*-----------------------------------------------------------------------------------------* - * Set SPAR bitrates - *-----------------------------------------------------------------------------------------*/ - - table_idx = ivas_get_spar_table_idx( ivas_total_brate, sba_order, SPAR_CONFIG_BW, NULL, NULL ); - - if ( hSpar->hMdEnc->table_idx != table_idx ) - { - hSpar->hMdEnc->table_idx = table_idx; - ivas_spar_set_bitrate_config( &hSpar->hMdEnc->spar_md_cfg, table_idx, ( hSpar->hMdEnc->spar_hoa_md_flag ) ? IVAS_MAX_NUM_BANDS : SPAR_DIRAC_SPLIT_START_BAND ); - } - nchan_transport = st_ivas->nchan_transport; /*-----------------------------------------------------------------------------------------* @@ -558,7 +651,12 @@ static ivas_error ivas_spar_enc_process( if ( hSpar->hMdEnc->spar_hoa_md_flag == 0 ) { - ivas_spar_md_enc_process( hSpar->hMdEnc, hEncoderConfig, cov_real, cov_dtx_real, hMetaData, dtx_vad, nchan_inp, sba_order ); + ivas_spar_md_enc_process( hSpar->hMdEnc, hEncoderConfig, cov_real, cov_dtx_real, hMetaData, dtx_vad, nchan_inp, sba_order +#ifdef LBR_SBA + , + hSpar->hFbMixer->prior_mixer +#endif + ); } { @@ -600,14 +698,88 @@ static ivas_error ivas_spar_enc_process( Wscale_d[b] = min( 2.0f, max( Wscale_d[b], 1.0f ) ); } - ivas_get_spar_md_from_dirac( azi_dirac, ele_dirac, diffuseness, 1, hSpar->hMdEnc->mixer_mat, &hSpar->hMdEnc->spar_md, &hSpar->hMdEnc->spar_md_cfg, d_start_band, d_end_band, ( hSpar->hMdEnc->spar_hoa_md_flag ) ? 1 : sba_order, dtx_vad, Wscale_d ); + ivas_get_spar_md_from_dirac( azi_dirac, ele_dirac, diffuseness, 1, hSpar->hMdEnc->mixer_mat, &hSpar->hMdEnc->spar_md, &hSpar->hMdEnc->spar_md_cfg, d_start_band, d_end_band, ( hSpar->hMdEnc->spar_hoa_md_flag ) ? 1 : sba_order, dtx_vad, Wscale_d +#ifdef LBR_SBA + , + hQMetaData->useLowerRes, active_w_vlbr +#endif + ); } if ( hSpar->hMdEnc->spar_hoa_md_flag ) { - ivas_spar_md_enc_process( hSpar->hMdEnc, hEncoderConfig, cov_real, cov_dtx_real, hMetaData, dtx_vad, nchan_inp, sba_order ); + ivas_spar_md_enc_process( hSpar->hMdEnc, hEncoderConfig, cov_real, cov_dtx_real, hMetaData, dtx_vad, nchan_inp, sba_order +#ifdef LBR_SBA + , + hSpar->hFbMixer->prior_mixer +#endif + ); + } +#ifdef DEBUG_LBR_SBA + /* Dumping SPAR Coefficients */ + char f_name[100]; + int16_t nbands = 6; + int16_t num_subframes = 1; + int16_t num_elements = 6; + int16_t num_block_group = 1; + int16_t byte_size = sizeof( float ); + + sprintf( f_name, "SBA_MD_values.bin" ); + ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false; + + for ( b = 0; b < nbands; b++ ) + { + for ( int16_t sf = 0; sf < num_subframes; sf++ ) + { + for ( int16_t bl = 0; bl < num_block_group; bl++ ) + { + dbgwrite( &hSpar->hMdEnc->spar_md.band_coeffs[b].pred_re[0], byte_size, 1, 1, f_name ); + dbgwrite( &hSpar->hMdEnc->spar_md.band_coeffs[b].pred_re[1], byte_size, 1, 1, f_name ); + dbgwrite( &hSpar->hMdEnc->spar_md.band_coeffs[b].pred_re[2], byte_size, 1, 1, f_name ); + dbgwrite( &hSpar->hMdEnc->spar_md.band_coeffs[b].P_re[0], byte_size, 1, 1, f_name ); + dbgwrite( &hSpar->hMdEnc->spar_md.band_coeffs[b].P_re[1], byte_size, 1, 1, f_name ); + dbgwrite( &hSpar->hMdEnc->spar_md.band_coeffs[b].P_re[2], byte_size, 1, 1, f_name ); + // fprintf(stdout, "%f\t%f\t%f\t%d\t%d\n", dirac_md_kbps, spar_md_kbps, sba_md_kbps, qsi, code_strat ); + } + } } - +#endif +#ifdef DEBUG_LBR_SBA + /* Dumping SPAR Coefficients */ + nbands = 6; + num_subframes = 1; + num_elements = 6; + num_block_group = 1; + byte_size = sizeof( float ); + + sprintf( f_name, "SBA_MD_values_quant.bin" ); + ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false; + + for ( b = 0; b < nbands; b++ ) + { + for ( int16_t sf = 0; sf < num_subframes; sf++ ) + { + for ( int16_t bl = 0; bl < num_block_group; bl++ ) + { + dbgwrite( &hSpar->hMdEnc->spar_md.band_coeffs[b].pred_quant_re[0], byte_size, 1, 1, f_name ); + dbgwrite( &hSpar->hMdEnc->spar_md.band_coeffs[b].pred_quant_re[1], byte_size, 1, 1, f_name ); + dbgwrite( &hSpar->hMdEnc->spar_md.band_coeffs[b].pred_quant_re[2], byte_size, 1, 1, f_name ); + dbgwrite( &hSpar->hMdEnc->spar_md.band_coeffs[b].P_quant_re[0], byte_size, 1, 1, f_name ); + dbgwrite( &hSpar->hMdEnc->spar_md.band_coeffs[b].P_quant_re[1], byte_size, 1, 1, f_name ); + dbgwrite( &hSpar->hMdEnc->spar_md.band_coeffs[b].P_quant_re[2], byte_size, 1, 1, f_name ); + // fprintf(stdout, "%f\t%f\t%f\t%d\t%d\n", dirac_md_kbps, spar_md_kbps, sba_md_kbps, qsi, code_strat ); + } + } + } +#endif /*-----------------------------------------------------------------------------------------* * FB mixer *-----------------------------------------------------------------------------------------*/ @@ -680,7 +852,16 @@ static ivas_error ivas_spar_enc_process( push_next_indice( hMetaData, PCA_MODE_INACTIVE, 1 ); } } - +#ifdef DEBUG_LBR_SBA + for ( int t = 0; t < 960; t++ ) + { + for ( int c = 0; c < hSpar->hFbMixer->fb_cfg->num_out_chans; c++ ) + { + float val = p_pcm_tmp[c][t]; // / MAX16B_FLT; + dbgwrite( &val, sizeof( float ), 1, 1, "int_enc_dmx.raw" ); + } + } +#endif #ifdef DEBUG_SBA_AUDIO_DUMP ivas_spar_dump_signal_wav( input_frame, p_pcm_tmp, NULL, nchan_transport, spar_foa_enc_wav[0], "ivas_pca_enc()" ); #endif @@ -774,7 +955,7 @@ static ivas_error ivas_spar_enc_process( set_f( data_f[order[j]], 0.0f, input_frame ); } - wmops_sub_end(); + pop_wmops(); return error; } diff --git a/lib_enc/ivas_spar_md_enc.c b/lib_enc/ivas_spar_md_enc.c index 09c766b581..b76a831fea 100644 --- a/lib_enc/ivas_spar_md_enc.c +++ b/lib_enc/ivas_spar_md_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "math.h" #include "ivas_rom_com.h" #include -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------------------------* @@ -72,20 +72,34 @@ static void ivas_band_mixer( float *cov_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], static void ivas_get_band_differential_index( ivas_band_coeffs_ind_t *pBand_idx, const int16_t q_levels[2], const int16_t one_sided, const int16_t nB, const int16_t complex_cov, const int16_t dim, const ivas_coeffs_type_t coeff_type ); -static void ivas_get_huffman_coded_bs( ivas_spar_md_enc_state_t *hMdEnc, BSTR_ENC_HANDLE hMetaData, const int16_t nB, const int16_t qsi, const int16_t planarCP ); +static void ivas_get_huffman_coded_bs( ivas_spar_md_enc_state_t *hMdEnc, BSTR_ENC_HANDLE hMetaData, const int16_t nB, const int16_t qsi, const int16_t planarCP +#ifdef LBR_SBA + , + const int16_t bands_bw +#endif +); -static void ivas_get_arith_coded_bs( ivas_spar_md_enc_state_t *hMdEnc, BSTR_ENC_HANDLE hMetaData, const int16_t *pDo_diff, const int16_t bands_bw, const int16_t nB, const int16_t qsi, const int16_t planarCP ); +static void ivas_get_arith_coded_bs( ivas_spar_md_enc_state_t *hMdEnc, BSTR_ENC_HANDLE hMetaData, const int16_t *pDo_diff, const int16_t bands_bw, const int16_t nB, const int16_t qsi, const int16_t planarCP +#ifdef LBR_SBA + , + const int16_t strat, + const int32_t ivas_total_brate +#endif +); static ivas_error ivas_spar_set_enc_config( ivas_spar_md_enc_state_t *hMdEnc, int16_t *max_freq_per_chan, const int16_t nchan_transport, float *pFC, const int16_t nchan_inp ); static void ivas_select_next_strat( ivas_strats_t prior_strat, ivas_strats_t cs[MAX_QUANT_STRATS], const int16_t dmx_switch, const int16_t dtx_vad ); -static void ivas_store_prior_coeffs( ivas_spar_md_enc_state_t *hMdEnc, const int16_t num_bands, const int16_t bands_bw, const int16_t strat, const int16_t dtx_vad, const int16_t qsi ); +static void ivas_store_prior_coeffs( ivas_spar_md_enc_state_t *hMdEnc, const int16_t num_bands, +#ifndef LBR_SBA + const int16_t bands_bw, +#endif + const int16_t strat, + const int16_t dtx_vad, + const int16_t qsi ); static void ivas_write_spar_md_bitstream( ivas_spar_md_enc_state_t *hMdEnc, const int16_t nB, const int16_t bands_bw, BSTR_ENC_HANDLE hMetaData, const int32_t ivas_total_brate, const int16_t strat, const int16_t qsi, const int16_t planarCP ); - -static ivas_error ivas_spar_md_enc_init( ivas_spar_md_enc_state_t *hMdEnc, const ENCODER_CONFIG_HANDLE hEncoderConfig, const int16_t sba_order ); - static void ivas_spar_quant_pred_coeffs_dtx( ivas_spar_md_t *pSpar_md, const float *pValues, const int16_t ndm, int16_t *pIndex, const int16_t dim1, float *pQuant ); static void ivas_quant_p_per_band_dtx( float *pP_mat, const int16_t num_dec, const int16_t num_dmx, int16_t *ppIdx_pd, float *pP_out, const int16_t num_ch ); @@ -117,87 +131,87 @@ ivas_error ivas_spar_md_enc_open( error = IVAS_ERR_OK; - if ( ( hMdEnc = (ivas_spar_md_enc_state_t *) count_malloc( sizeof( ivas_spar_md_enc_state_t ) ) ) == NULL ) + if ( ( hMdEnc = (ivas_spar_md_enc_state_t *) malloc( sizeof( ivas_spar_md_enc_state_t ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD encoder" ); } num_channels = ivas_sba_get_nchan_metadata( sba_order ); - if ( ( hMdEnc->spar_md.band_coeffs = (ivas_band_coeffs_t *) count_malloc( IVAS_MAX_NUM_BANDS * sizeof( ivas_band_coeffs_t ) ) ) == NULL ) + if ( ( hMdEnc->spar_md.band_coeffs = (ivas_band_coeffs_t *) malloc( IVAS_MAX_NUM_BANDS * sizeof( ivas_band_coeffs_t ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for band_coeffs in SPAR MD" ); } - if ( ( hMdEnc->mixer_mat = (float ***) count_malloc( num_channels * sizeof( float ** ) ) ) == NULL ) + if ( ( hMdEnc->mixer_mat = (float ***) malloc( num_channels * sizeof( float ** ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } for ( i = 0; i < num_channels; i++ ) { - if ( ( hMdEnc->mixer_mat[i] = (float **) count_malloc( num_channels * sizeof( float * ) ) ) == NULL ) + if ( ( hMdEnc->mixer_mat[i] = (float **) malloc( num_channels * sizeof( float * ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } for ( j = 0; j < num_channels; j++ ) { - if ( ( hMdEnc->mixer_mat[i][j] = (float *) count_malloc( IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) + if ( ( hMdEnc->mixer_mat[i][j] = (float *) malloc( IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } } } - if ( ( hMdEnc->cov_real = (float ***) count_malloc( num_channels * sizeof( float ** ) ) ) == NULL ) + if ( ( hMdEnc->cov_real = (float ***) malloc( num_channels * sizeof( float ** ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR cov real matrix" ); } for ( i = 0; i < num_channels; i++ ) { - if ( ( hMdEnc->cov_real[i] = (float **) count_malloc( num_channels * sizeof( float * ) ) ) == NULL ) + if ( ( hMdEnc->cov_real[i] = (float **) malloc( num_channels * sizeof( float * ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR cov real matrix" ); } for ( j = 0; j < num_channels; j++ ) { - if ( ( hMdEnc->cov_real[i][j] = (float *) count_malloc( IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) + if ( ( hMdEnc->cov_real[i][j] = (float *) malloc( IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR cov real matrix" ); } } } - if ( ( hMdEnc->cov_dtx_real = (float ***) count_malloc( num_channels * sizeof( float ** ) ) ) == NULL ) + if ( ( hMdEnc->cov_dtx_real = (float ***) malloc( num_channels * sizeof( float ** ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR cov dtx real matrix" ); } for ( i = 0; i < num_channels; i++ ) { - if ( ( hMdEnc->cov_dtx_real[i] = (float **) count_malloc( num_channels * sizeof( float * ) ) ) == NULL ) + if ( ( hMdEnc->cov_dtx_real[i] = (float **) malloc( num_channels * sizeof( float * ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR cov dtx real matrix" ); } for ( j = 0; j < num_channels; j++ ) { - if ( ( hMdEnc->cov_dtx_real[i][j] = (float *) count_malloc( IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) + if ( ( hMdEnc->cov_dtx_real[i][j] = (float *) malloc( IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR cov dtx real matrix" ); } } } - if ( ( hMdEnc->mixer_mat_local = (float ***) count_malloc( num_channels * sizeof( float ** ) ) ) == NULL ) + if ( ( hMdEnc->mixer_mat_local = (float ***) malloc( num_channels * sizeof( float ** ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } for ( i = 0; i < num_channels; i++ ) { - if ( ( hMdEnc->mixer_mat_local[i] = (float **) count_malloc( num_channels * sizeof( float * ) ) ) == NULL ) + if ( ( hMdEnc->mixer_mat_local[i] = (float **) malloc( num_channels * sizeof( float * ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } for ( j = 0; j < num_channels; j++ ) { - if ( ( hMdEnc->mixer_mat_local[i][j] = (float *) count_malloc( IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) + if ( ( hMdEnc->mixer_mat_local[i][j] = (float *) malloc( IVAS_MAX_NUM_BANDS * sizeof( float ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR MD matrix" ); } @@ -228,12 +242,17 @@ void ivas_spar_md_enc_close( int16_t num_channels, i, j; ivas_spar_md_enc_state_t *hMdEnc; + if ( hMdEnc_in == NULL || *hMdEnc_in == NULL ) + { + return; + } + hMdEnc = *hMdEnc_in; num_channels = hMdEnc->num_umx_ch; if ( hMdEnc->spar_md.band_coeffs != NULL ) { - count_free( hMdEnc->spar_md.band_coeffs ); + free( hMdEnc->spar_md.band_coeffs ); hMdEnc->spar_md.band_coeffs = NULL; } if ( hMdEnc->mixer_mat != NULL ) @@ -242,39 +261,37 @@ void ivas_spar_md_enc_close( { for ( j = 0; j < num_channels; j++ ) { - count_free( hMdEnc->mixer_mat[i][j] ); + free( hMdEnc->mixer_mat[i][j] ); } - count_free( hMdEnc->mixer_mat[i] ); + free( hMdEnc->mixer_mat[i] ); } - count_free( hMdEnc->mixer_mat ); + free( hMdEnc->mixer_mat ); } if ( hMdEnc->cov_real != NULL ) { for ( i = 0; i < num_channels; i++ ) { - for ( j = 0; j < num_channels; j++ ) { - count_free( hMdEnc->cov_real[i][j] ); + free( hMdEnc->cov_real[i][j] ); } - count_free( hMdEnc->cov_real[i] ); + free( hMdEnc->cov_real[i] ); } - count_free( hMdEnc->cov_real ); + free( hMdEnc->cov_real ); } if ( hMdEnc->cov_dtx_real != NULL ) { for ( i = 0; i < num_channels; i++ ) { - for ( j = 0; j < num_channels; j++ ) { - count_free( hMdEnc->cov_dtx_real[i][j] ); + free( hMdEnc->cov_dtx_real[i][j] ); } - count_free( hMdEnc->cov_dtx_real[i] ); + free( hMdEnc->cov_dtx_real[i] ); } - count_free( hMdEnc->cov_dtx_real ); + free( hMdEnc->cov_dtx_real ); } if ( hMdEnc->mixer_mat_local != NULL ) @@ -284,18 +301,15 @@ void ivas_spar_md_enc_close( for ( j = 0; j < num_channels; j++ ) { - count_free( hMdEnc->mixer_mat_local[i][j] ); + free( hMdEnc->mixer_mat_local[i][j] ); } - count_free( hMdEnc->mixer_mat_local[i] ); + free( hMdEnc->mixer_mat_local[i] ); } - count_free( hMdEnc->mixer_mat_local ); + free( hMdEnc->mixer_mat_local ); } - if ( hMdEnc != NULL ) - { - count_free( hMdEnc ); - hMdEnc = NULL; - } + free( *hMdEnc_in ); + *hMdEnc_in = NULL; return; } @@ -306,8 +320,7 @@ void ivas_spar_md_enc_close( * * SPAR MD encoder initialization *-----------------------------------------------------------------------------------------*/ - -static ivas_error ivas_spar_md_enc_init( +ivas_error ivas_spar_md_enc_init( ivas_spar_md_enc_state_t *hMdEnc, /* o : MD encoder handle */ const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */ const int16_t sba_order /* i : Ambisonic (SBA) order */ @@ -548,6 +561,10 @@ ivas_error ivas_spar_md_enc_process( const int16_t dtx_vad, const int16_t nchan_inp, const int16_t sba_order /* i : Ambisonic (SBA) order */ +#ifdef LBR_SBA + , + float *prior_mixer[IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH] /* i : prior mixer_matrix */ +#endif ) { float pred_coeffs_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS]; @@ -572,7 +589,10 @@ ivas_error ivas_spar_md_enc_process( bwidth = ivas_get_bw_idx_from_sample_rate( hEncoderConfig->input_Fs ); bwidth = min( bwidth, hEncoderConfig->max_bwidth ); - +#ifdef LBR_SBA + int16_t active_w_vlbr; + active_w_vlbr = ( hEncoderConfig->ivas_total_brate < IVAS_24k4 ) ? 1 : 0; +#endif num_bands = ivas_get_num_bands_from_bw_idx( SPAR_CONFIG_BW ); if ( hMdEnc->spar_hoa_md_flag == 0 ) { @@ -625,6 +645,15 @@ ivas_error ivas_spar_md_enc_process( ivas_band_mixer( cov_real, num_ch, &num_bands, bands_bw ); } +#ifdef LBR_SBA + else if ( hEncoderConfig->ivas_total_brate < IVAS_24k4 ) + { + bands_bw = 2; + nB = num_bands / bands_bw; + + ivas_band_mixer( cov_real, num_ch, &num_bands, bands_bw ); + } +#endif else { nB = num_bands; @@ -643,7 +672,11 @@ ivas_error ivas_spar_md_enc_process( } ivas_compute_spar_params( cov_real, dm_fv_re, 0, hMdEnc->mixer_mat, 0, nB, dtx_vad, num_ch, - bands_bw, active_w, &hMdEnc->spar_md_cfg, &hMdEnc->spar_md, Wscale, 0 ); + bands_bw, active_w, +#ifdef LBR_SBA + active_w_vlbr, +#endif + &hMdEnc->spar_md_cfg, &hMdEnc->spar_md, Wscale, 0 ); for ( i = 0; i < num_ch; i++ ) { @@ -655,7 +688,9 @@ ivas_error ivas_spar_md_enc_process( } } } - +#ifdef DEBUG_LBR_SBA + float dirac_md_kbps = (float) ( hMetaData->nb_bits_tot ) * 50 / 1000; +#endif planarCP = 0; code_strat = 0; #ifdef DEBUG_SBA_MD_DUMP @@ -740,16 +775,77 @@ ivas_error ivas_spar_md_enc_process( fprintf(stderr, "\n\n"); */ #endif } - +#ifdef LBR_SBA_PLANAR + if ( active_w_vlbr ) /* SPAR PLANAR */ + { + pState->spar_md.band_coeffs[b].P_re[2] = 0.0f; + } +#endif ivas_quant_p_per_band( &hMdEnc->spar_md.band_coeffs[b], &hMdEnc->spar_md.band_coeffs_idx[b], &hMdEnc->spar_md_cfg.quant_strat[qsi], num_ch ); } - +#ifdef LBR_SBA_PLANAR + if ( active_w_vlbr ) /* SPAR PLANAR */ + { + pState->spar_md.band_coeffs[b].pred_re[1] = 0.0f; + } +#endif ivas_quant_pred_coeffs_per_band( &hMdEnc->spar_md.band_coeffs[b], &hMdEnc->spar_md.band_coeffs_idx[b], &hMdEnc->spar_md_cfg.quant_strat[qsi], num_ch ); +#ifdef LBR_SBA + if ( active_w_vlbr ) + { + for ( i = 0; i < 3; i++ ) + { +#ifdef LBR_SBA_PLANAR + if ( i == 1 ) /* Z prediction coefficients */ + { + continue; + } +#endif + int16_t i2; + i2 = 0; + switch ( i ) /* PRED (Y,Z,X) and DECD (Y,X,Z) coeffs are in different orders */ + { + case 0: + i2 = 0; + break; + case 1: + i2 = 2; + break; + case 2: + i2 = 1; + break; + } + if ( ( hMdEnc->spar_md.band_coeffs_idx[b].pred_index_re[i] == 0 ) && ( hMdEnc->spar_md.band_coeffs_idx[b].decd_index_re[i2] == 0 ) && ( hMdEnc->spar_md.band_coeffs[b].pred_re[i] != 0.0f ) && ( cov_real[i + 1][i + 1][b] != 0.0f ) ) + { + /* bump up the Pred coeff */ + float PR_uq, PR_step; + ivas_quant_strat_t qs; + qs = hMdEnc->spar_md_cfg.quant_strat[qsi]; + PR_uq = hMdEnc->spar_md.band_coeffs[b].pred_re[i]; + PR_step = ( qs.PR.max - qs.PR.min ) / ( qs.PR.q_levels[0] - 1 ); + + int16_t PR_sign; + PR_sign = ( PR_uq > 0 ) - ( PR_uq < 0 ); + + hMdEnc->spar_md.band_coeffs_idx[b].pred_index_re[i] = PR_sign; + + /* deindex the modified coefficient */ + hMdEnc->spar_md.band_coeffs[b].pred_quant_re[i] = PR_sign * PR_step; + } + } + } +#endif } else { if ( ndm != num_ch ) { +#ifdef LBR_SBA_PLANAR + if ( active_w_vlbr ) /* SPAR PLANAR */ + { + hMdEnc->spar_md.band_coeffs[b].P_re[2] = 0.0f; + } +#endif ivas_quant_p_per_band_dtx( hMdEnc->spar_md.band_coeffs[b].P_re, ndec, ndm, &hMdEnc->spar_md.band_coeffs_idx[b].decd_index_re[0], hMdEnc->spar_md.band_coeffs[b].P_quant_re, num_ch ); } @@ -757,7 +853,12 @@ ivas_error ivas_spar_md_enc_process( { hMdEnc->spar_md.band_coeffs[b].pred_quant_re[i] = 0; } - +#ifdef LBR_SBA_PLANAR + if ( active_w_vlbr ) /* SPAR PLANAR */ + { + hMdEnc->spar_md.band_coeffs[b].pred_re[1] = 0.0f; + } +#endif ivas_spar_quant_pred_coeffs_dtx( &hMdEnc->spar_md, hMdEnc->spar_md.band_coeffs[b].pred_re, ndm, hMdEnc->spar_md.band_coeffs_idx[b].pred_index_re, num_ch - 1, hMdEnc->spar_md.band_coeffs[b].pred_quant_re ); } } @@ -907,6 +1008,66 @@ ivas_error ivas_spar_md_enc_process( { assert( qsi == 0 ); } +#ifdef LBR_SBA + /* Reuse mixer matrix values for unsent bands */ + if ( ( hEncoderConfig->ivas_total_brate < IVAS_24k4 ) && ( code_strat > 3 ) ) + { + for ( b = 0; b < num_bands * bands_bw; b += 2 * bands_bw ) + { + if ( ( b == 0 ) && ( code_strat % 2 == 0 ) ) + { + b += 2; + } + for ( i = 0; i < 1; i++ ) + { + for ( j = 0; j < 4; j++ ) + { + hMdEnc->mixer_mat[i][j][b] = prior_mixer[i][j][b]; + hMdEnc->mixer_mat[i][j][b + 1] = prior_mixer[i][j][b + 1]; + } + } + } + } +#endif +#ifdef DEBUG_LBR_SBA + char f_name[100]; + int16_t nbands = 1; + int16_t num_subframes = 1; + int16_t num_elements = 6; + int16_t num_block_group = 1; + int16_t byte_size = sizeof( float ); + + float sba_md_kbps = (float) hMetaData->nb_bits_tot * 50 / 1000; + float spar_md_kbps = sba_md_kbps - dirac_md_kbps; + float corebr_kbps = (float) hEncoderConfig->ivas_total_brate / 1000 - sba_md_kbps; + + sprintf( f_name, "SBA_MD_bitrate.bin" ); + ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false; + ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false; + + for ( b = 0; b < nbands; b++ ) + { + for ( int16_t sf = 0; sf < num_subframes; sf++ ) + { + for ( int16_t bl = 0; bl < num_block_group; bl++ ) + { + float fqsi = (float) qsi; + float fcode = (float) code_strat; + + dbgwrite( &dirac_md_kbps, byte_size, 1, 1, f_name ); + dbgwrite( &spar_md_kbps, byte_size, 1, 1, f_name ); + dbgwrite( &sba_md_kbps, byte_size, 1, 1, f_name ); + dbgwrite( &fqsi, byte_size, 1, 1, f_name ); + dbgwrite( &fcode, byte_size, 1, 1, f_name ); + dbgwrite( &corebr_kbps, byte_size, 1, 1, f_name ); + // fprintf(stdout, "%f\t%f\t%f\t%d\t%d\n", dirac_md_kbps, spar_md_kbps, sba_md_kbps, qsi, code_strat ); + } + } + } +#endif #ifdef SPAR_HOA_DBG /*if ( strat >= 4 ) { @@ -1082,7 +1243,11 @@ ivas_error ivas_spar_md_enc_process( fclose( fp ); #endif - ivas_store_prior_coeffs( hMdEnc, num_bands, bands_bw, code_strat, dtx_vad, qsi ); + ivas_store_prior_coeffs( hMdEnc, num_bands, +#ifndef LBR_SBA + bands_bw, +#endif + code_strat, dtx_vad, qsi ); hMdEnc->spar_md.dtx_vad = dtx_vad; hMdEnc->spar_md.num_bands = num_bands; @@ -1174,56 +1339,87 @@ static void ivas_write_spar_md_bitstream( no_ec = 0; - switch ( strat ) +#ifdef LBR_SBA + if ( ivas_total_brate < IVAS_24k4 ) { - case BASE: - push_next_indice( hMetaData, bands_bw - 1, SPAR_NUM_CODING_STRAT_BITS ); - for ( i = 0; i < nB; i++ ) - { - do_diff[i] = 0; - } - break; - case BASE_NOEC: - push_next_indice( hMetaData, bands_bw + 1, SPAR_NUM_CODING_STRAT_BITS ); - for ( i = 0; i < nB; i++ ) - { - do_diff[i] = 0; - } - no_ec = 1; - break; - case FOUR_A: - push_next_indice( hMetaData, 4, SPAR_NUM_CODING_STRAT_BITS ); - for ( i = 0; i < nB; i++ ) - { - do_diff[i] = ( ( ( i + 1 ) & 3 ) != 0 ); - } - ivas_map_prior_coeffs_quant( &hMdEnc->spar_md_prior, &hMdEnc->spar_md_cfg, qsi, nB ); - break; - case FOUR_B: - push_next_indice( hMetaData, 5, SPAR_NUM_CODING_STRAT_BITS ); - for ( i = 0; i < nB; i++ ) - { - do_diff[i] = ( ( ( i + 1 ) & 3 ) != 1 ); - } - ivas_map_prior_coeffs_quant( &hMdEnc->spar_md_prior, &hMdEnc->spar_md_cfg, qsi, nB ); - break; - case FOUR_C: - push_next_indice( hMetaData, 6, SPAR_NUM_CODING_STRAT_BITS ); - for ( i = 0; i < nB; i++ ) - { - do_diff[i] = ( ( ( i + 1 ) & 3 ) != 2 ); - } - ivas_map_prior_coeffs_quant( &hMdEnc->spar_md_prior, &hMdEnc->spar_md_cfg, qsi, nB ); - break; - case FOUR_D: - push_next_indice( hMetaData, 7, SPAR_NUM_CODING_STRAT_BITS ); - for ( i = 0; i < nB; i++ ) - { - do_diff[i] = ( ( ( i + 1 ) & 3 ) != 3 ); - } - ivas_map_prior_coeffs_quant( &hMdEnc->spar_md_prior, &hMdEnc->spar_md_cfg, qsi, nB ); - break; + switch ( strat ) + { + case BASE: + push_next_indice( hMetaData, bands_bw - 1, SPAR_NUM_CODING_STRAT_BITS ); + break; + case BASE_NOEC: + push_next_indice( hMetaData, bands_bw + 1, SPAR_NUM_CODING_STRAT_BITS ); + no_ec = 1; + break; + case FOUR_A: + case FOUR_C: + case FOUR_B: + case FOUR_D: + push_next_indice( hMetaData, strat, SPAR_NUM_CODING_STRAT_BITS ); + break; + } + /* for LBR SBA 40MS MD never do time diff */ + for ( i = 0; i < nB; i++ ) + { + do_diff[i] = 0; + } + } + else + { +#endif + switch ( strat ) + { + case BASE: + push_next_indice( hMetaData, bands_bw - 1, SPAR_NUM_CODING_STRAT_BITS ); + for ( i = 0; i < nB; i++ ) + { + do_diff[i] = 0; + } + break; + case BASE_NOEC: + push_next_indice( hMetaData, bands_bw + 1, SPAR_NUM_CODING_STRAT_BITS ); + for ( i = 0; i < nB; i++ ) + { + do_diff[i] = 0; + } + no_ec = 1; + break; + case FOUR_A: + push_next_indice( hMetaData, 4, SPAR_NUM_CODING_STRAT_BITS ); + for ( i = 0; i < nB; i++ ) + { + do_diff[i] = ( ( ( i + 1 ) & 3 ) != 0 ); + } + ivas_map_prior_coeffs_quant( &hMdEnc->spar_md_prior, &hMdEnc->spar_md_cfg, qsi, nB ); + break; + case FOUR_B: + push_next_indice( hMetaData, 5, SPAR_NUM_CODING_STRAT_BITS ); + for ( i = 0; i < nB; i++ ) + { + do_diff[i] = ( ( ( i + 1 ) & 3 ) != 1 ); + } + ivas_map_prior_coeffs_quant( &hMdEnc->spar_md_prior, &hMdEnc->spar_md_cfg, qsi, nB ); + break; + case FOUR_C: + push_next_indice( hMetaData, 6, SPAR_NUM_CODING_STRAT_BITS ); + for ( i = 0; i < nB; i++ ) + { + do_diff[i] = ( ( ( i + 1 ) & 3 ) != 2 ); + } + ivas_map_prior_coeffs_quant( &hMdEnc->spar_md_prior, &hMdEnc->spar_md_cfg, qsi, nB ); + break; + case FOUR_D: + push_next_indice( hMetaData, 7, SPAR_NUM_CODING_STRAT_BITS ); + for ( i = 0; i < nB; i++ ) + { + do_diff[i] = ( ( ( i + 1 ) & 3 ) != 3 ); + } + ivas_map_prior_coeffs_quant( &hMdEnc->spar_md_prior, &hMdEnc->spar_md_cfg, qsi, nB ); + break; + } +#ifdef LBR_SBA } +#endif #ifdef SPAR_HOA_DBG if ( strat < 2 ) @@ -1233,11 +1429,22 @@ static void ivas_write_spar_md_bitstream( #endif if ( no_ec == 1 ) { - ivas_get_huffman_coded_bs( hMdEnc, hMetaData, nB, qsi, planarCP ); + ivas_get_huffman_coded_bs( hMdEnc, hMetaData, nB, qsi, planarCP +#ifdef LBR_SBA + , + bands_bw +#endif + ); } else { - ivas_get_arith_coded_bs( hMdEnc, hMetaData, do_diff, bands_bw, nB, qsi, planarCP ); + ivas_get_arith_coded_bs( hMdEnc, hMetaData, do_diff, bands_bw, nB, qsi, planarCP +#ifdef LBR_SBA + , + strat, + ivas_total_brate +#endif + ); } return; @@ -1255,7 +1462,12 @@ static void ivas_get_huffman_coded_bs( BSTR_ENC_HANDLE hMetaData, const int16_t nB, const int16_t qsi, - const int16_t planarCP ) + const int16_t planarCP +#ifdef LBR_SBA + , + const int16_t bands_bw +#endif +) { int16_t i, j; int16_t pred_coeff_dim, pred_offset; @@ -1263,8 +1475,15 @@ static void ivas_get_huffman_coded_bs( for ( i = 0; i < nB; i++ ) { int16_t code, len; - int16_t ndm = hMdEnc->spar_md_cfg.num_dmx_chans_per_band[i]; - int16_t ndec = hMdEnc->spar_md_cfg.num_decorr_per_band[i]; +#ifdef LBR_SBA + int16_t ndm, ndec; + ndm = hMdEnc->spar_md_cfg.num_dmx_chans_per_band[i * bands_bw]; + ndec = hMdEnc->spar_md_cfg.num_decorr_per_band[i * bands_bw]; +#else + int16_t ndm, ndec; + ndm = hMdEnc->spar_md_cfg.num_dmx_chans_per_band[i]; + ndec = hMdEnc->spar_md_cfg.num_decorr_per_band[i]; +#endif pred_coeff_dim = ndm + ndec - 1; pred_offset = 0; @@ -1306,6 +1525,12 @@ static void ivas_get_huffman_coded_bs( { for ( j = pred_offset; j < pred_coeff_dim; j++ ) { +#ifdef LBR_SBA_PLANAR + if ( ( j == 1 ) && ( bands_bw == IVAS_RED_BAND_FACT ) ) + { + continue; + } +#endif ivas_huffman_encode( &hMdEnc->huff_coeffs.pred_huff_re[qsi], hMdEnc->spar_md.band_coeffs_idx[i].pred_index_re[j], &code, &len ); push_next_indice( hMetaData, code, len ); } @@ -1318,6 +1543,12 @@ static void ivas_get_huffman_coded_bs( for ( j = 0; j < ndec; j++ ) { +#ifdef LBR_SBA_PLANAR + if ( ( j == 2 ) && ( bands_bw == IVAS_RED_BAND_FACT ) ) + { + continue; + } +#endif ivas_huffman_encode( &hMdEnc->huff_coeffs.decd_huff_re[qsi], hMdEnc->spar_md.band_coeffs_idx[i].decd_index_re[j], &code, &len ); push_next_indice( hMetaData, code, len ); } @@ -1341,7 +1572,13 @@ static void ivas_get_arith_coded_bs( const int16_t bands_bw, const int16_t nB, const int16_t qsi, - const int16_t planarCP ) + const int16_t planarCP +#ifdef LBR_SBA + , + const int16_t strat, + const int32_t ivas_total_brate +#endif +) { int16_t i, j, any_diff; ivas_cell_dim_t pred_cell_dims[IVAS_MAX_NUM_BANDS]; @@ -1356,21 +1593,46 @@ static void ivas_get_arith_coded_bs( int16_t ndm, ndec; ndm = hMdEnc->spar_md_cfg.num_dmx_chans_per_band[bands_bw * i]; ndec = hMdEnc->spar_md_cfg.num_decorr_per_band[bands_bw * i]; - pred_cell_dims[i].dim1 = ndm + ndec - 1; - if ( hMdEnc->spar_hoa_md_flag ) +#ifdef LBR_SBA + if ( ( ivas_total_brate < IVAS_24k4 ) && ( strat > 3 ) && ( ( ( i % 2 == 1 ) && ( strat % 2 == 0 ) ) || ( ( i % 2 == 0 ) && ( strat % 2 == 1 ) ) ) ) { - if ( i >= SPAR_DIRAC_SPLIT_START_BAND ) + pred_cell_dims[i].dim1 = 0; + pred_cell_dims[i].dim2 = 0; + drct_cell_dims[i].dim1 = 0; + drct_cell_dims[i].dim2 = 0; + decd_cell_dims[i].dim1 = 0; + decd_cell_dims[i].dim2 = 0; + decx_cell_dims[i].dim1 = 0; + decx_cell_dims[i].dim2 = 0; + } + else + { +#endif + pred_cell_dims[i].dim1 = ndm + ndec - 1; + if ( hMdEnc->spar_hoa_md_flag ) { - pred_cell_dims[i].dim1 -= ( FOA_CHANNELS - 1 ); + if ( i >= SPAR_DIRAC_SPLIT_START_BAND ) + { + pred_cell_dims[i].dim1 -= ( FOA_CHANNELS - 1 ); + } } + pred_cell_dims[i].dim2 = 1; + drct_cell_dims[i].dim1 = ndec; + drct_cell_dims[i].dim2 = ndm - 1; + decd_cell_dims[i].dim1 = ndec; + decd_cell_dims[i].dim2 = 1; + decx_cell_dims[i].dim1 = ( ndec * ( ndec - 1 ) ) >> 1; + decx_cell_dims[i].dim2 = 1; +#ifdef LBR_SBA_PLANAR + if ( ivas_total_brate < IVAS_24k4 ) + { + pred_cell_dims[i].dim1 -= 1; + decd_cell_dims[i].dim1 -= 1; + } +#endif +#ifdef LBR_SBA } - pred_cell_dims[i].dim2 = 1; - drct_cell_dims[i].dim1 = ndec; - drct_cell_dims[i].dim2 = ndm - 1; - decd_cell_dims[i].dim1 = ndec; - decd_cell_dims[i].dim2 = 1; - decx_cell_dims[i].dim1 = ( ndec * ( ndec - 1 ) ) >> 1; - decx_cell_dims[i].dim2 = 1; +#endif } any_diff = 0; @@ -1402,6 +1664,15 @@ static void ivas_get_arith_coded_bs( } } } +#ifdef LBR_SBA_PLANAR + if ( ivas_total_brate < IVAS_24k4 ) + { + for ( int16_t b = 0; b < nB; b++ ) /* swap X and Z PR coefficients, then code fewer */ + { + hMdEnc->spar_md.band_coeffs_idx[b].pred_index_re[1] = hMdEnc->spar_md.band_coeffs_idx[b].pred_index_re[2]; + } + } +#endif ivas_copy_band_coeffs_idx_to_arr( hMdEnc->spar_md.band_coeffs_idx, nB, symbol_arr_re, pred_cell_dims, PRED_COEFF, planarCP ); if ( any_diff == 1 ) @@ -1544,15 +1815,17 @@ static void ivas_select_next_strat( static void ivas_store_prior_coeffs( ivas_spar_md_enc_state_t *hMdEnc, const int16_t num_bands, +#ifndef LBR_SBA const int16_t bands_bw, +#endif const int16_t strat, const int16_t dtx_vad, const int16_t qsi ) { int16_t i, j, b; - +#ifndef LBR_SBA float one_by_bands_bw = ( 1.0f / bands_bw ); - +#endif if ( dtx_vad == 0 ) { hMdEnc->spar_md_cfg.prior_strat = START; @@ -1566,8 +1839,13 @@ static void ivas_store_prior_coeffs( for ( i = 0; i < num_bands; i++ ) { +#ifdef LBR_SBA + b = i; + /* TODO: Bitrate switching will require dependence on bands_bw, and changes to time differential coding/prior index + storage for 6-12 band switching. e.g. b = (int16_t) floor( i * one_by_bands_bw ); */ +#else b = (int16_t) floor( i * one_by_bands_bw ); - +#endif for ( j = 0; j < IVAS_SPAR_MAX_CH - 1; j++ ) { hMdEnc->spar_md_prior.band_coeffs_idx[i].pred_index_re[j] = hMdEnc->spar_md.band_coeffs_idx[b].pred_index_re[j]; diff --git a/lib_enc/ivas_stat_enc.h b/lib_enc/ivas_stat_enc.h index dfe32a9a02..68ba7eac5a 100644 --- a/lib_enc/ivas_stat_enc.h +++ b/lib_enc/ivas_stat_enc.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -35,10 +35,9 @@ #include #include "options.h" -#include "ivas_cnst.h" #include "cnst.h" -#include "stat_enc.h" #include "ivas_cnst.h" +#include "stat_enc.h" #include "ivas_stat_com.h" /*----------------------------------------------------------------------------------* @@ -193,10 +192,8 @@ typedef struct stereo_dft_enc_data_struct float Spd_R_smooth[STEREO_DFT_N_32k_ENC / 2]; float sid_gipd; int16_t coh_fade_counter; -#ifdef FIX_ITD_CNG float prev_sid_gipd; int16_t prev_sid_no_ipd_flag; -#endif /*IPD*/ float gipd[STEREO_DFT_ENC_DFT_NB]; @@ -212,34 +209,20 @@ typedef struct stereo_dft_enc_data_struct float sfm; float sum_dot_prod_real; float sum_dot_prod_img; + float dot_prod_real_smooth[STEREO_DFT_BAND_MAX]; + float dot_prod_img_smooth[STEREO_DFT_BAND_MAX]; + float ipd_buf[STEREO_DFT_BAND_MAX][STEREO_DFT_IPD_BUF_LEN]; + float prev_gipd; /*ITD*/ ITD_DATA_HANDLE hItd; float voicing_lt; -#ifdef ITD_WINNER_GAIN_MODIFY - float noise_coherence; - int16_t local_vad; - int16_t mus_flag; - float spd_L_noise[STEREO_DFT_N_32k_ENC / 2]; /*The estimation of spectral power density of noise in the left channel*/ - float spd_R_noise[STEREO_DFT_N_32k_ENC / 2]; /*The estimation of spectral power density of noise in the right channel*/ - float spd_L_noise_min[STEREO_DFT_N_32k_ENC / 2]; - float spd_R_noise_min[STEREO_DFT_N_32k_ENC / 2]; - float spd_L_noise_max[STEREO_DFT_N_32k_ENC / 2]; - float spd_R_noise_max[STEREO_DFT_N_32k_ENC / 2]; - float winner_gain_L[STEREO_DFT_N_32k_ENC / 2]; /*The estimation of the Winner gain of the left channel*/ - float winner_gain_R[STEREO_DFT_N_32k_ENC / 2]; /*The estimation of the Winner gain of the right channel*/ - float spd_L_smooth_new[STEREO_DFT_N_32k_ENC / 2]; - float spd_R_smooth_new[STEREO_DFT_N_32k_ENC / 2]; -#endif - -#ifdef FIX_ITD_CNG int16_t currentNumUpdates; int16_t expectedNumUpdates; /* Expected number of frames before use of ITD estimate */ int16_t resetFrames; -#endif /* energy buffers for ICBWE */ float nrg_L[2]; @@ -551,6 +534,22 @@ typedef struct ivas_stereo_classifier_data_structure } STEREO_CLASSIF_DATA, *STEREO_CLASSIF_HANDLE; +/*----------------------------------------------------------------------------------* + * ISM DTX structure + *----------------------------------------------------------------------------------*/ + +typedef struct +{ + int16_t dtx_flag; + int16_t sce_id_dtx; + + int16_t cnt_SID_ISM; + + float long_term_energy_stereo_dmx_enc[MAX_NUM_OBJECTS][PARAM_ISM_HYS_BUF_SIZE]; + float coh[MAX_NUM_OBJECTS]; + +} ISM_DTX_DATA, *ISM_DTX_HANDLE; + /*----------------------------------------------------------------------------------* * Front-VAD structure *----------------------------------------------------------------------------------*/ @@ -567,9 +566,7 @@ typedef struct front_vad_enc VAD_HANDLE hVAD; /* VAD handle */ float *delay_buf; int16_t delay_samples; -#ifdef FIX_ITD_CNG int16_t rem_dtx_ho; /* Remaining hangover frames */ -#endif } FRONT_VAD_ENC, *FRONT_VAD_ENC_HANDLE; @@ -723,12 +720,33 @@ typedef struct ivas_param_mc_enc_data_structure * MASA encoder structures *----------------------------------------------------------------------------------*/ +#ifdef FIX_398_MASA_DIRECTION_ALIGNMENT +typedef struct ivas_masa_dir_align_struct +{ + float previous_azi_dir1[MASA_FREQUENCY_BANDS]; + float previous_ele_dir1[MASA_FREQUENCY_BANDS]; + + float previous_azi_dir2[MASA_FREQUENCY_BANDS]; + float previous_ele_dir2[MASA_FREQUENCY_BANDS]; + +} MASA_DIR_ALIGN_STATE, *MASA_DIR_ALIGN_HANDLE; +#endif + +/* structure storing MASA framing sync detection and compensation data */ +typedef struct ivas_masa_sync_struct +{ + MASA_METADATA_FRAME previous_metadata; + uint8_t prev_sim_stop; + uint8_t prev_offset; + MASA_FRAME_MODE frame_mode; + +} MASA_SYNC_STATE, *MASA_SYNC_HANDLE; + typedef struct ivas_masa_encoder_data_struct { float energy[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; int16_t num_Cldfb_instances; HANDLE_CLDFB_FILTER_BANK cldfbAnaEnc[MAX_NUM_ENC_CLDFB_INSTANCES]; - float *delay_buffer[MASA_MAX_TRANSPORT_CHANNELS]; int16_t band_mapping[MASA_FREQUENCY_BANDS + 1]; uint8_t twoDirBands[MASA_FREQUENCY_BANDS]; float importanceWeight[MASA_FREQUENCY_BANDS]; @@ -740,6 +758,12 @@ typedef struct ivas_masa_encoder_data_struct float onset_detector_1; float onset_detector_2; + MASA_SYNC_STATE sync_state; + +#ifdef FIX_398_MASA_DIRECTION_ALIGNMENT + MASA_DIR_ALIGN_STATE dir_align_state; +#endif + } MASA_ENCODER_DATA; typedef struct ivas_masa_encoder_struct @@ -816,21 +840,17 @@ typedef struct ivas_mcmasa_enc_data_structure typedef struct stereo_cng_enc { - int16_t prev_sg_average_counter; /* Counter for sidegain averaging */ - int16_t sg_active_cnt; /* Counter for sidegain averaging */ - int16_t sg_average_counter; /* Counter for sidegain averaging */ - float sg_average[STEREO_DFT_ERB4_BANDS]; /* Sidegain average */ - float prev_sg_average[STEREO_DFT_ERB4_BANDS]; /* Previous sidegain average */ - float mem_cohBand[STEREO_DFT_BAND_MAX / 2]; /* Coherence memory */ -#ifdef FIX_ITD_CNG + int16_t prev_sg_average_counter; /* Counter for sidegain averaging */ + int16_t sg_active_cnt; /* Counter for sidegain averaging */ + int16_t sg_average_counter; /* Counter for sidegain averaging */ + float sg_average[STEREO_DFT_ERB4_BANDS]; /* Sidegain average */ + float prev_sg_average[STEREO_DFT_ERB4_BANDS]; /* Previous sidegain average */ + float mem_cohBand[STEREO_DFT_BAND_MAX / 2]; /* Coherence memory */ float prev_cohBand[2 * ( STEREO_DFT_BAND_MAX / 2 )]; /* Previous coherence */ int16_t cng_counter; /* Counter for cng period length */ -#else - float coh_crossfade[STEREO_DFT_BAND_MAX / 2]; /* Coherence memory */ -#endif - int16_t td_active; /* TD-stereo indication */ - int16_t first_SID_after_TD; /* Set if first SID frame after TD stereo */ - int16_t first_SID; /* Set if first SID frame since codec start */ + int16_t td_active; /* TD-stereo indication */ + int16_t first_SID_after_TD; /* Set if first SID frame after TD stereo */ + int16_t first_SID; /* Set if first SID frame since codec start */ } STEREO_CNG_ENC, *STEREO_CNG_ENC_HANDLE; @@ -912,11 +932,8 @@ typedef struct mct_enc_data_structure float lastxCorrMatrix[MCT_MAX_CHANNELS][MCT_MAX_CHANNELS]; int16_t lowE_ch[MCT_MAX_CHANNELS]; - int16_t LFE_off; uint16_t mc_global_ild[MCT_MAX_CHANNELS]; int16_t nBitsMCT; /* number of bits spent on mct side info */ - int16_t num_lfe; - /* pointers to local buffers */ float *p_mdst_spectrum_long[MCT_MAX_BLOCKS][CPE_CHANNELS]; float *p_orig_spectrum_long[MCT_MAX_BLOCKS][CPE_CHANNELS]; @@ -999,9 +1016,11 @@ typedef struct encoder_config_structure int16_t element_mode_init; /* element mode used at initialization */ int16_t stereo_dmx_evs; /* flag to indicate that stereo downmix for EVS encoder */ + int16_t nchan_ism; /* number of ISM channels */ int16_t sba_order; /* Ambisonic (SBA) order */ int16_t sba_planar; /* Ambisonic (SBA) planar flag */ MC_LS_SETUP mc_input_setup; /* multichannel input ls setup */ + int16_t ism_extended_metadata_flag; /* flag indicating extended metadata encoding, including radius and orientation (yaw, pitch) in ISM format */ int16_t Opt_AMR_WB; /* flag indicating AMR-WB IO mode */ @@ -1018,7 +1037,9 @@ typedef struct encoder_config_structure /* temp. development parameters */ int16_t Opt_PCA_ON; /* flag indicating PCA operation in SBA */ - +#ifdef LBR_SBA_BR_SWITCHING + int16_t spar_reconfig_flag; +#endif #ifdef DEBUGGING /* debugging options */ int16_t stereo_mode_cmdl; /* stereo mode forced from the command-line */ @@ -1048,7 +1069,6 @@ typedef struct int16_t sba_analysis_order; /* Ambisonic (SBA) order used for analysis and coding */ int16_t codec_mode; /* Mode1 or Mode2 of core codec */ int16_t last_codec_mode; /* previous frame Mode 1 or 2 */ - float **mem_hp20_in; /* input signals HP filter memories */ /* core-encoder modules */ @@ -1059,6 +1079,7 @@ typedef struct /* multichannel modules */ ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS]; /* ISM metadata handles (storage for one frame of read ISM metadata) */ + ISM_DTX_HANDLE hISMDTX; /* ISM DTX handle */ DIRAC_ENC_HANDLE hDirAC; /* DirAC data handle */ SPAR_ENC_HANDLE hSpar; /* SPAR encoder handle */ MASA_ENCODER_HANDLE hMasa; /* MASA encoder data and configuration */ diff --git a/lib_enc/ivas_stereo_adapt_GR_enc.c b/lib_enc/ivas_stereo_adapt_GR_enc.c index 8f07441920..087ecda8e0 100644 --- a/lib_enc/ivas_stereo_adapt_GR_enc.c +++ b/lib_enc/ivas_stereo_adapt_GR_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -36,7 +36,7 @@ #include "ivas_prot.h" #include "prot.h" #include "stat_enc.h" -#include "wmops.h" +#include "wmc_auto.h" #include "ivas_rom_com.h" #ifdef DEBUGGING #include "debug.h" diff --git a/lib_enc/ivas_stereo_classifier.c b/lib_enc/ivas_stereo_classifier.c index 48b21146fa..d4d0b310b6 100644 --- a/lib_enc/ivas_stereo_classifier.c +++ b/lib_enc/ivas_stereo_classifier.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* diff --git a/lib_enc/ivas_stereo_cng_enc.c b/lib_enc/ivas_stereo_cng_enc.c index 68be66c2a1..2eb838bf5c 100644 --- a/lib_enc/ivas_stereo_cng_enc.c +++ b/lib_enc/ivas_stereo_cng_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,17 +43,15 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------- * Local constants *-------------------------------------------------------------------*/ -#define COH_FADE_MAX 4 -#ifdef FIX_ITD_CNG +#define COH_FADE_MAX 4 #define COH_FADE_UPDATES 2 -#endif /*--------------------------------------------------------------- @@ -63,23 +61,17 @@ * ---------------------------------------------------------------*/ void stereo_dft_enc_sid_calc_coh( - STEREO_DFT_ENC_DATA_HANDLE hStereoDft, /* i/o: DFT stereo handle */ -#ifdef FIX_ITD_CNG + STEREO_DFT_ENC_DATA_HANDLE hStereoDft, /* i/o: DFT stereo handle */ float prev_cohBand[2 * ( STEREO_DFT_BAND_MAX / 2 )], /* i/o: Previous coherence */ -#else - float coh_crossfade[STEREO_DFT_BAND_MAX / 2], /* i/o: Coherence crossfade memory */ -#endif - int16_t *td_active, /* i/o: TD stereo mode indicator */ - int16_t *first_SID, /* i/o: First SID indicator */ - float *cohBand /* i/o: Coherence per band */ + int16_t *td_active, /* i/o: TD stereo mode indicator */ + int16_t *first_SID, /* i/o: First SID indicator */ + float *cohBand /* i/o: Coherence per band */ ) { int16_t b, k; float coh_weight; float coh_weight_sum; -#ifdef FIX_ITD_CNG float xspec_scale; -#endif /* Cluster the coherence into bands using a weighted average. The coherence is weighted with the energy spectrum of the mixdown signal. */ for ( b = 0; b < hStereoDft->nbands; b++ ) @@ -87,7 +79,6 @@ void stereo_dft_enc_sid_calc_coh( cohBand[b] = 0; coh_weight_sum = 0; -#ifdef FIX_ITD_CNG if ( hStereoDft->coh_fade_counter == 0 && !*first_SID ) { for ( k = hStereoDft->band_limits[b]; k < hStereoDft->band_limits[b + 1]; k++ ) @@ -112,67 +103,35 @@ void stereo_dft_enc_sid_calc_coh( cohBand[b] = cohBand[b] / coh_weight_sum; } } -#else - for ( k = hStereoDft->band_limits[b]; k < hStereoDft->band_limits[b + 1]; k++ ) - { - coh_weight = hStereoDft->DFT[0][2 * k] * hStereoDft->DFT[0][2 * k] + hStereoDft->DFT[0][2 * k + 1] * hStereoDft->DFT[0][2 * k + 1]; - cohBand[b] += coh_weight * ( hStereoDft->xspec_smooth[2 * k] * hStereoDft->xspec_smooth[2 * k] + hStereoDft->xspec_smooth[2 * k + 1] * hStereoDft->xspec_smooth[2 * k + 1] ) / ( hStereoDft->Spd_L_smooth[k] * hStereoDft->Spd_R_smooth[k] + EPSILON ); - coh_weight_sum += coh_weight; - } - if ( coh_weight_sum > 0 ) - { - cohBand[b] = cohBand[b] / coh_weight_sum; - } -#endif } if ( *first_SID ) { -#ifdef FIX_ITD_CNG mvr2r( cohBand, prev_cohBand, hStereoDft->nbands ); mvr2r( prev_cohBand, &( prev_cohBand[STEREO_DFT_BAND_MAX / 2] ), hStereoDft->nbands ); -#else - mvr2r( cohBand, coh_crossfade, hStereoDft->nbands ); -#endif *first_SID = 0; } -#ifdef FIX_ITD_CNG if ( hStereoDft->coh_fade_counter < COH_FADE_MAX && ( *td_active || hStereoDft->currentNumUpdates < COH_FADE_UPDATES ) ) -#else - if ( hStereoDft->coh_fade_counter < COH_FADE_MAX && *td_active ) -#endif { for ( b = 0; b < hStereoDft->nbands; b++ ) { -#ifdef FIX_ITD_CNG cohBand[b] = ( cohBand[b] * hStereoDft->coh_fade_counter + prev_cohBand[b] * ( COH_FADE_MAX - hStereoDft->coh_fade_counter ) ) / COH_FADE_MAX; -#else - cohBand[b] = ( cohBand[b] * hStereoDft->coh_fade_counter + coh_crossfade[b] * ( COH_FADE_MAX - hStereoDft->coh_fade_counter ) ) / COH_FADE_MAX; -#endif } hStereoDft->coh_fade_counter++; -#ifdef FIX_ITD_CNG if ( hStereoDft->coh_fade_counter > 0 ) { mvr2r( &prev_cohBand[STEREO_DFT_BAND_MAX / 2], prev_cohBand, hStereoDft->nbands ); } mvr2r( cohBand, &prev_cohBand[STEREO_DFT_BAND_MAX / 2], hStereoDft->nbands ); -#else - mvr2r( cohBand, coh_crossfade, hStereoDft->nbands ); -#endif } else { -#ifdef FIX_ITD_CNG if ( hStereoDft->coh_fade_counter > 0 ) { mvr2r( &prev_cohBand[STEREO_DFT_BAND_MAX / 2], prev_cohBand, hStereoDft->nbands ); } mvr2r( cohBand, &prev_cohBand[STEREO_DFT_BAND_MAX / 2], hStereoDft->nbands ); -#else - mvr2r( cohBand, coh_crossfade, hStereoDft->nbands ); -#endif hStereoDft->coh_fade_counter = COH_FADE_MAX; *td_active = 0; } @@ -214,8 +173,12 @@ void stereo_dft_enc_sid_coh( int16_t alpha_level; int16_t n; +#ifdef FIX_418_SID_BITRATE + nr_of_sid_stereo_bits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; +#else /* TODO: still use old number of bits to keep bitexactness in output */ nr_of_sid_stereo_bits = ( 4400 /*IVAS_SID_5k2*/ - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; +#endif zeropad = 0; /* Encode coherence vector. Find best fixed predictor by minimizing prediction error on input vector. @@ -370,7 +333,9 @@ void stereo_dft_enc_sid_coh( ( *nb_bits )++; } +#ifndef FIX_418_SID_BITRATE push_next_indice( hBstr, zeropad, ( IVAS_SID_5k2 - 4400 ) / FRAMES_PER_SEC ); +#endif return; } @@ -412,10 +377,8 @@ void stereo_dft_cng_side_gain( } hStereoCng->sg_average_counter++; -#ifdef FIX_ITD_CNG hStereoCng->cng_counter++; hStereoCng->cng_counter = min( hStereoCng->cng_counter, STEREO_DFT_SG_ACT_CNT_MAX ); -#endif if ( core_brate == SID_2k40 ) { @@ -514,16 +477,10 @@ void stereo_enc_cng_init( hStereoCng->sg_active_cnt = 0; hStereoCng->first_SID = 1; set_f( hStereoCng->mem_cohBand, 0.5f, STEREO_DFT_BAND_MAX / 2 ); -#ifdef FIX_ITD_CNG set_zero( hStereoCng->prev_cohBand, 2 * ( STEREO_DFT_BAND_MAX / 2 ) ); -#else - set_zero( hStereoCng->coh_crossfade, STEREO_DFT_BAND_MAX / 2 ); -#endif hStereoCng->td_active = 0; hStereoCng->first_SID_after_TD = 1; -#ifdef FIX_ITD_CNG hStereoCng->cng_counter = 0; -#endif return; } @@ -540,11 +497,8 @@ void stereo_cng_upd_counters( const int32_t element_mode, /* i : element mode */ const int16_t nbands, /* i : Number of bands in active */ const float sidSideGain[], /* i : SID side gains */ - const int16_t burst_ho_count /* i : Hang-over count */ -#ifdef FIX_ITD_CNG - , - int16_t *coh_fade_counter /* i : Coherence fade counter */ -#endif + const int16_t burst_ho_count, /* i : Hang-over count */ + int16_t *coh_fade_counter /* i : Coherence fade counter */ ) { int16_t b; @@ -568,7 +522,6 @@ void stereo_cng_upd_counters( hStereoCng->sg_active_cnt++; hStereoCng->sg_active_cnt = min( hStereoCng->sg_active_cnt, STEREO_DFT_SG_ACT_CNT_MAX ); -#ifdef FIX_ITD_CNG if ( hStereoCng->sg_active_cnt > STEREO_DFT_CNG_ITD_CNT ) { hStereoCng->cng_counter = 0; @@ -578,6 +531,5 @@ void stereo_cng_upd_counters( { *coh_fade_counter = 0; } -#endif return; } diff --git a/lib_enc/ivas_stereo_dft_enc.c b/lib_enc/ivas_stereo_dft_enc.c index e54b98a942..43546261a4 100644 --- a/lib_enc/ivas_stereo_dft_enc.c +++ b/lib_enc/ivas_stereo_dft_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -45,7 +45,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" #ifdef DEBUG_PLOT #include "deb_out.h" #endif @@ -62,9 +62,7 @@ static FILE *pF = NULL; #define STEREO_DFT_NRG_PAST_MAX_BAND_LB 4 #define STEREO_DFT_DMX_CROSSOVER ( int16_t )( 132 * ( (float) ( STEREO_DFT_N_NS_ENC ) / STEREO_DFT_N_NS ) + 0.5f ) /* crossover bin between binwise and bandwise DMX */ #define ITD_VAD_E_BAND_N_INIT 200000 -#ifdef FIX_ITD_CNG -#define ITD_SID_PREV_FRAMES 5 -#endif +#define ITD_SID_PREV_FRAMES 5 /*------------------------------------------------------------------------- @@ -75,6 +73,12 @@ static void stereo_dft_enc_open( STEREO_DFT_ENC_DATA_HANDLE hStereoDft, const in static void stereo_dft_enc_compute_prm( STEREO_DFT_ENC_DATA_HANDLE hStereoDft, float *DFT_L, float *DFT_R, int16_t k_offset, int16_t flag_quant, const int16_t sp_aud_decision0, const int16_t vad_flag, float *bin_nrgL, float *bin_nrgR, float *dot_prod_nrg_ratio ); +static float stereo_dft_calc_mean_bipd( float *pIpd, float ipd_buf[STEREO_DFT_IPD_BUF_LEN] ); + +static float stereo_dft_calc_mean_ipd_change( float *pIpd, float *ipd_smooth, int16_t gipd_band_max ); + +static void stereo_dft_gipd_stabilization( float *pgIpd, float prev_gipd, float ipd_mean_change ); + #ifdef DEBUG_MODE_DFT static void stereo_dft_enc_get_nipd_flag( STEREO_DFT_ENC_DATA_HANDLE hStereoDft, float *pgIpd, const int16_t sp_aud_decision0, const float gainIPD ); #else @@ -272,17 +276,17 @@ ivas_error stereo_dft_enc_create( return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: DFT Stereo memory already allocated\n" ); } - if ( ( hStereoDft_loc = (STEREO_DFT_ENC_DATA_HANDLE) count_malloc( sizeof( STEREO_DFT_ENC_DATA ) ) ) == NULL ) + if ( ( hStereoDft_loc = (STEREO_DFT_ENC_DATA_HANDLE) malloc( sizeof( STEREO_DFT_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DFT Stereo\n" ) ); } - if ( ( hStereoDft_loc->hConfig = (STEREO_DFT_CONFIG_DATA_HANDLE) count_malloc( sizeof( STEREO_DFT_CONFIG_DATA ) ) ) == NULL ) + if ( ( hStereoDft_loc->hConfig = (STEREO_DFT_CONFIG_DATA_HANDLE) malloc( sizeof( STEREO_DFT_CONFIG_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DFT Stereo Config\n" ) ); } - if ( ( hStereoDft_loc->hItd = (ITD_DATA_HANDLE) count_malloc( sizeof( ITD_DATA ) ) ) == NULL ) + if ( ( hStereoDft_loc->hItd = (ITD_DATA_HANDLE) malloc( sizeof( ITD_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ITD data\n" ) ); } @@ -412,21 +416,6 @@ void stereo_dft_enc_reset( ) { int16_t i; -#ifdef ITD_WINNER_GAIN_MODIFY - hStereoDft->noise_coherence = 0.0f; - hStereoDft->local_vad = 0; - hStereoDft->mus_flag = 2; - set_zero( hStereoDft->spd_L_noise, STEREO_DFT_N_32k_ENC / 2 ); - set_zero( hStereoDft->spd_R_noise, STEREO_DFT_N_32k_ENC / 2 ); - set_zero( hStereoDft->spd_L_noise_min, STEREO_DFT_N_32k_ENC / 2 ); - set_zero( hStereoDft->spd_R_noise_min, STEREO_DFT_N_32k_ENC / 2 ); - set_zero( hStereoDft->spd_L_noise_max, STEREO_DFT_N_32k_ENC / 2 ); - set_zero( hStereoDft->spd_R_noise_max, STEREO_DFT_N_32k_ENC / 2 ); - set_zero( hStereoDft->winner_gain_L, STEREO_DFT_N_32k_ENC / 2 ); - set_zero( hStereoDft->winner_gain_R, STEREO_DFT_N_32k_ENC / 2 ); - set_f( hStereoDft->spd_L_smooth_new, 1.0f, STEREO_DFT_N_32k_ENC / 2 ); - set_f( hStereoDft->spd_R_smooth_new, 1.0f, STEREO_DFT_N_32k_ENC / 2 ); -#endif /*reset parameters*/ set_zero( hStereoDft->side_gain, STEREO_DFT_ENC_DFT_NB * STEREO_DFT_BAND_MAX ); set_s( hStereoDft->side_gain_index_EC, 15, STEREO_DFT_BAND_MAX ); @@ -435,6 +424,13 @@ void stereo_dft_enc_reset( hStereoDft->side_gain_counter = 0; hStereoDft->side_gain_bitdiff_lp = STEREO_DFT_BITDIFF_INIT; set_zero( hStereoDft->gipd, STEREO_DFT_ENC_DFT_NB ); + set_zero( hStereoDft->dot_prod_real_smooth, STEREO_DFT_BAND_MAX ); + set_zero( hStereoDft->dot_prod_img_smooth, STEREO_DFT_BAND_MAX ); + for ( i = 0; i < STEREO_DFT_BAND_MAX; i++ ) + { + set_zero( hStereoDft->ipd_buf[i], STEREO_DFT_IPD_BUF_LEN ); + } + hStereoDft->prev_gipd = 0.f; hStereoDft->gipd_index = 0; set_zero( hStereoDft->res_pred_gain, STEREO_DFT_ENC_DFT_NB * STEREO_DFT_BAND_MAX ); set_s( hStereoDft->res_pred_index_EC, 0, STEREO_DFT_BAND_MAX ); @@ -494,14 +490,12 @@ void stereo_dft_enc_reset( set_f( hStereoDft->Spd_L_smooth, 1.0f, STEREO_DFT_N_32k_ENC / 2 ); set_f( hStereoDft->Spd_R_smooth, 1.0f, STEREO_DFT_N_32k_ENC / 2 ); -#ifdef FIX_ITD_CNG hStereoDft->currentNumUpdates = 0; hStereoDft->expectedNumUpdates = FIXED_SID_RATE; hStereoDft->resetFrames = 0; hStereoDft->sid_gipd = 0; hStereoDft->prev_sid_gipd = 0; hStereoDft->prev_sid_no_ipd_flag = 1; -#endif hStereoDft->coh_fade_counter = 0; @@ -630,7 +624,7 @@ void stereo_dft_enc_update( hStereoDft->nbands_dmx = stereo_dft_band_config( hStereoDft->band_limits_dmx, 1, NFFT_inner, ENC ); /*Compute main parameters*/ - hStereoDft->gipd_band_max = dft_band_ipd[hStereoDft->hConfig->band_res][3]; + hStereoDft->gipd_band_max = dft_band_ipd[1][3]; hStereoDft->res_cod_band_max = dft_band_res_cod[hStereoDft->hConfig->band_res][hStereoDft->res_cod_mode[k_offset]]; hStereoDft->res_cod_line_max = (int16_t) ( 0.5f + ( hStereoDft->band_limits[hStereoDft->res_cod_band_max] - 1 ) * 2.f * hStereoDft->N / (float) ( hStereoDft->NFFT ) ); hStereoDft->res_cod_line_max = 8 * ( hStereoDft->res_cod_line_max / 8 ); @@ -703,17 +697,17 @@ void stereo_dft_enc_destroy( { if ( ( *hStereoDft )->hConfig != NULL ) { - count_free( ( *hStereoDft )->hConfig ); + free( ( *hStereoDft )->hConfig ); ( *hStereoDft )->hConfig = NULL; } if ( ( *hStereoDft )->hItd != NULL ) { - count_free( ( *hStereoDft )->hItd ); + free( ( *hStereoDft )->hItd ); ( *hStereoDft )->hItd = NULL; } - count_free( *hStereoDft ); + free( *hStereoDft ); *hStereoDft = NULL; return; @@ -747,7 +741,7 @@ void stereo_dft_enc_analyze( int16_t trigo_step; - wmops_sub_start( "DFT_analysis" ); + push_wmops( "DFT_analysis" ); /*-----------------------------------------------------------------* * Initialization @@ -871,7 +865,7 @@ void stereo_dft_enc_analyze( } } - wmops_sub_end(); + pop_wmops(); return; } @@ -947,7 +941,7 @@ float stereo_dft_enc_synthesize( win = hStereoDft->win; win_ana = hStereoDft->win_ana; - wmops_sub_start( "DFT_synth_fs" ); + push_wmops( "DFT_synth_fs" ); } else if ( output_sampling_rate == INT_FS_12k8 ) { @@ -964,7 +958,7 @@ float stereo_dft_enc_synthesize( win = hStereoDft->win_12k8; win_ana = hStereoDft->win_ana_12k8; - wmops_sub_start( "DFT_synth_12k8" ); + push_wmops( "DFT_synth_12k8" ); } else if ( output_sampling_rate == 16000 ) { @@ -981,13 +975,13 @@ float stereo_dft_enc_synthesize( { mem = hStereoDft->output_mem_dmx_16k_shb; - wmops_sub_start( "DFT_synth_16k_shb" ); + push_wmops( "DFT_synth_16k_shb" ); } else { mem = hStereoDft->output_mem_dmx_16k; - wmops_sub_start( "DFT_synth_16k" ); + push_wmops( "DFT_synth_16k" ); } win = hStereoDft->win_16k; win_ana = hStereoDft->win_ana_16k; @@ -1007,7 +1001,7 @@ float stereo_dft_enc_synthesize( win = hStereoDft->win_32k; win_ana = hStereoDft->win_ana_32k; - wmops_sub_start( "DFT_synth_32k" ); + push_wmops( "DFT_synth_32k" ); } else if ( output_sampling_rate == 8000 ) { @@ -1024,7 +1018,7 @@ float stereo_dft_enc_synthesize( win = hStereoDft->win_8k; win_ana = hStereoDft->win_ana_8k; - wmops_sub_start( "DFT_synth_8k" ); + push_wmops( "DFT_synth_8k" ); } else { @@ -1220,7 +1214,7 @@ float stereo_dft_enc_synthesize( } #endif - wmops_sub_end(); + pop_wmops(); return ( nrg ); } @@ -1234,12 +1228,10 @@ float stereo_dft_enc_synthesize( *-------------------------------------------------------------------------*/ void stereo_dft_enc_process( - CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */ -#ifdef FIX_ITD_CNG + CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */ const int16_t vad_flag_dtx[], /* i: VAD dtx flags */ const int16_t vad_hover_flag[], /* i: VAD hangover flags */ -#endif - const int16_t input_frame /* i : input frame length */ + const int16_t input_frame /* i : input frame length */ ) { int16_t i, j, b; @@ -1281,7 +1273,7 @@ void stereo_dft_enc_process( /* Initialization */ k_offset = STEREO_DFT_OFFSET; /*Add an offset at encoder*/ - hStereoDft->gipd_band_max = dft_band_ipd[hStereoDft->band_res[k_offset]][3]; + hStereoDft->gipd_band_max = dft_band_ipd[1][3]; hStereoDft->res_cod_band_max = dft_band_res_cod[hStereoDft->band_res[k_offset]][hStereoDft->res_cod_mode[k_offset]]; hStereoDft->res_cod_line_max = (int16_t) ( 0.5f + ( hStereoDft->band_limits[hStereoDft->res_cod_band_max] - 1 ) * 2.f * input_frame / (float) ( hStereoDft->NFFT ) ); hStereoDft->res_cod_line_max = 8 * ( hStereoDft->res_cod_line_max / 8 ); @@ -1309,11 +1301,7 @@ void stereo_dft_enc_process( if ( hStereoDft->hConfig->itd_mode ) #endif { -#ifdef FIX_ITD_CNG stereo_dft_enc_compute_itd( hCPE, pDFT_L, pDFT_R, k_offset, input_frame, vad_flag_dtx, vad_hover_flag, bin_nrgL, bin_nrgR ); -#else - stereo_dft_enc_compute_itd( hCPE, pDFT_L, pDFT_R, k_offset, input_frame, bin_nrgL, bin_nrgR ); -#endif if ( hCPE->element_mode == IVAS_CPE_MDCT ) { return; @@ -1386,7 +1374,6 @@ void stereo_dft_enc_process( /* DFT stereo parameters */ stereo_dft_enc_compute_prm( hStereoDft, pDFT_L, pDFT_R, k_offset, 1, hCPE->hCoreCoder[0]->sp_aud_decision0, hCPE->hCoreCoder[0]->vad_flag, bin_nrgL, bin_nrgR, dot_prod_nrg_ratio ); -#ifdef FIX_ITD_CNG if ( vad_flag_dtx[0] == 0 ) { if ( hCPE->hStereoCng->cng_counter == 0 && !hCPE->hStereoCng->first_SID_after_TD ) @@ -1401,7 +1388,6 @@ void stereo_dft_enc_process( hStereoDft->prev_sid_no_ipd_flag = hStereoDft->no_ipd_flag; } } -#endif /*----------------------------------------------------------------* * UNCLR classifier (detection of uncorrelated L and R channels) @@ -1459,11 +1445,7 @@ void stereo_dft_enc_process( } } -#ifdef FIX_ITD_CNG if ( b < hStereoDft->res_cod_band_max && vad_flag_dtx[0] ) -#else - if ( b < hStereoDft->res_cod_band_max ) -#endif { #ifdef DEBUGGING assert( hStereoDft->nbands == hStereoDft->nbands_dmx && "Don't use coarser stereo parameter resolution for residual coding bitrates!" ); @@ -1961,7 +1943,7 @@ void stereo_dft_enc_res( dbgwrite( &max_snr, sizeof( float ), 1, 1, "./res/stereo_dft_res_cod_target_snr.dat" ); #endif - wmops_sub_start( "residual_encode" ); + push_wmops( "residual_encode" ); /* residual encoding */ ECSQ_init_instance( &ecsq_inst, 0 /*dummy index*/, &range_uni_enc_state ); @@ -2039,7 +2021,7 @@ void stereo_dft_enc_res( } #endif - wmops_sub_end(); + pop_wmops(); #ifdef DEBUG_MODE_DFT { @@ -2353,11 +2335,7 @@ void stereo_dft_enc_write_BS( if ( core_brate == SID_2k40 ) { -#ifdef FIX_ITD_CNG stereo_dft_enc_sid_calc_coh( hStereoDft, hCPE->hStereoCng->prev_cohBand, &hCPE->hStereoCng->td_active, &hCPE->hStereoCng->first_SID, cohBand ); -#else - stereo_dft_enc_sid_calc_coh( hStereoDft, hCPE->hStereoCng->coh_crossfade, &hCPE->hStereoCng->td_active, &hCPE->hStereoCng->first_SID, cohBand ); -#endif if ( *nb_bits <= ( ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS - STEREO_DFT_ITD_MODE_NBITS - STEREO_DFT_SID_ITD_NBITS - 1 ) ) { @@ -2606,8 +2584,10 @@ static void stereo_dft_enc_compute_prm( float sum_energy_L, sum_energy_R; float g, c; float abs_L_R; + float abs_L_R2; float gain_IPD; float sub_nrg_DMX[STEREO_DFT_BAND_MAX]; + float sub_nrg_DMX2; float sub_nrg_L[STEREO_DFT_BAND_MAX]; float sub_nrg_R[STEREO_DFT_BAND_MAX]; float diff_ipd; @@ -2621,6 +2601,9 @@ static void stereo_dft_enc_compute_prm( float sum_past_dot_prod_abs, sum_past_dot_prod_abs2; float sum_past_nrg_dmx; int16_t pos; + float pIpd[STEREO_DFT_BAND_MAX]; + float ipd_smooth[STEREO_DFT_BAND_MAX]; + float ipd_mean_change; /*------------------------------------------------------------------* * Initialization @@ -2633,7 +2616,6 @@ static void stereo_dft_enc_compute_prm( set_f( sub_nrg_L, 0, STEREO_DFT_BAND_MAX ); set_f( sub_nrg_R, 0, STEREO_DFT_BAND_MAX ); - pSideGain = hStereoDft->side_gain + k_offset * STEREO_DFT_BAND_MAX; pgIpd = hStereoDft->gipd + k_offset; pPredGain = hStereoDft->res_pred_gain + k_offset * STEREO_DFT_BAND_MAX; @@ -2642,6 +2624,7 @@ static void stereo_dft_enc_compute_prm( sum_energy_R = EPSILON; sum_dot_prod_real = EPSILON; sum_dot_prod_img = EPSILON; + sub_nrg_DMX2 = 0.f; #ifdef DEBUG_MODE_DFT sum_nrg_L = EPSILON; sum_nrg_R = EPSILON; @@ -2671,10 +2654,10 @@ static void stereo_dft_enc_compute_prm( pNrgL = bin_nrgL; pNrgR = bin_nrgR; - sum_nrg_L2 = 0; - sum_nrg_R2 = 0; - dot_prod_real2 = 0; - dot_prod_img2 = 0; + sum_nrg_L2 = EPSILON; + sum_nrg_R2 = EPSILON; + dot_prod_real2 = EPSILON; + dot_prod_img2 = EPSILON; for ( i = hStereoDft->band_limits_dmx[b2]; i < hStereoDft->band_limits_dmx[b2 + 1]; i++ ) { @@ -2685,6 +2668,19 @@ static void stereo_dft_enc_compute_prm( dot_prod_real2 += pDFT_L[2 * i] * pDFT_R[2 * i] + pDFT_L[2 * i + 1] * pDFT_R[2 * i + 1]; dot_prod_img2 += pDFT_L[2 * i + 1] * pDFT_R[2 * i] - pDFT_L[2 * i] * pDFT_R[2 * i + 1]; } + abs_L_R2 = sqrtf( dot_prod_real2 * dot_prod_real2 + dot_prod_img2 * dot_prod_img2 ); + sub_nrg_DMX2 = sum_nrg_L2 + sum_nrg_R2 + 2 * abs_L_R2; + + if ( b2 < hStereoDft->gipd_band_max ) + { + hStereoDft->dot_prod_real_smooth[b2] = 0.5f * hStereoDft->dot_prod_real_smooth[b2] + 0.5f * dot_prod_real2; + hStereoDft->dot_prod_img_smooth[b2] = 0.5f * hStereoDft->dot_prod_img_smooth[b2] + 0.5f * dot_prod_img2; + pIpd[b2] = (float) atan2( hStereoDft->dot_prod_img_smooth[b2], hStereoDft->dot_prod_real_smooth[b2] ); + + ipd_smooth[b2] = stereo_dft_calc_mean_bipd( &pIpd[b2], hStereoDft->ipd_buf[b2] ); + + gain_IPD += ( sum_nrg_L2 + sum_nrg_R2 + 2 * dot_prod_real2 ) / sub_nrg_DMX2 / hStereoDft->gipd_band_max; + } sum_past_nrgL2 = EPSILON; sum_past_nrgR2 = EPSILON; @@ -2839,17 +2835,16 @@ static void stereo_dft_enc_compute_prm( } - if ( b < hStereoDft->gipd_band_max ) - { - gain_IPD += ( sum_nrg_L + sum_nrg_R + 2 * dot_prod_real ) / sub_nrg_DMX[b] / hStereoDft->gipd_band_max; - } - - if ( b == hStereoDft->gipd_band_max - 1 ) + if ( b2 == hStereoDft->gipd_band_max ) { + ipd_mean_change = stereo_dft_calc_mean_ipd_change( pIpd, ipd_smooth, hStereoDft->gipd_band_max ); hStereoDft->sum_dot_prod_real = ( 1.f - hStereoDft->sfm ) * hStereoDft->sum_dot_prod_real + hStereoDft->sfm * sum_dot_prod_real; hStereoDft->sum_dot_prod_img = ( 1.f - hStereoDft->sfm ) * hStereoDft->sum_dot_prod_img + hStereoDft->sfm * sum_dot_prod_img; pgIpd[0] = (float) atan2( hStereoDft->sum_dot_prod_img, hStereoDft->sum_dot_prod_real ); + + stereo_dft_gipd_stabilization( &pgIpd[0], hStereoDft->prev_gipd, ipd_mean_change ); + hStereoDft->prev_gipd = pgIpd[0]; } } @@ -3188,6 +3183,171 @@ static void res_pred_gain_mode_decision( } +/*------------------------------------------------------------------------- + * stereo_dft_calc_mean_bipd() + * + * Calculate mean of previous bandwise IPD values + *------------------------------------------------------------------------*/ + +static float stereo_dft_calc_mean_bipd( + float *pIpd, /* i: current bandwise IPD */ + float ipd_buf[STEREO_DFT_IPD_BUF_LEN] /* i/o: previous bandwise IPDs */ +) +{ + int16_t i; + float ipd_smooth; + float diff_to_last; + + assert( *pIpd <= EVS_PI && *pIpd >= -EVS_PI ); + + ipd_smooth = 0.f; + for ( i = 0; i < STEREO_DFT_IPD_BUF_LEN; i++ ) + { + if ( i == 0 ) + { + diff_to_last = ipd_buf[0]; + } + else + { + diff_to_last = fabsf( ipd_buf[i] - ipd_smooth ); + } + if ( diff_to_last > EVS_PI ) + { + if ( ipd_buf[i] > 0 ) + { + ipd_buf[i] -= 2 * EVS_PI; + } + else + { + ipd_buf[i] += 2 * EVS_PI; + } + } + ipd_smooth = ( i / (float) ( i + 1 ) ) * ipd_smooth + ( 1 / (float) ( i + 1 ) ) * ipd_buf[i]; + if ( ipd_smooth < -EVS_PI ) + { + ipd_smooth += 2 * EVS_PI; + } + else if ( ipd_smooth > EVS_PI ) + { + ipd_smooth -= 2 * EVS_PI; + } + } + + for ( i = 0; i < STEREO_DFT_IPD_BUF_LEN - 1; i++ ) + { + ipd_buf[i] = ipd_buf[i + 1]; + } + ipd_buf[STEREO_DFT_IPD_BUF_LEN - 1] = *pIpd; + +#ifdef DEBUG_MODE_DFT + dbgwrite( pIpd, sizeof( float ), 1, 1, "res/stereo_dft_bipd.pcm" ); + dbgwrite( &ipd_smooth, sizeof( float ), 1, 1, "res/stereo_dft_bipd_smooth.pcm" ); +#endif + + return ipd_smooth; +} + + +/*------------------------------------------------------------------------- + * stereo_dft_calc_mean_ipd_change() + * + * Calculate mean IPD change over all bands + *------------------------------------------------------------------------*/ + +static float stereo_dft_calc_mean_ipd_change( + float *pIpd, /* i: bandwise IPDs */ + float *ipd_smooth, /* i: mean of previous bandwise IPDs */ + int16_t gipd_band_max /* i: number of IPD bands */ +) +{ + int16_t b; + float ipd_mean_change; + float ipd_change[STEREO_DFT_BAND_MAX]; + + ipd_mean_change = 0.f; + for ( b = 0; b < gipd_band_max; b++ ) + { + ipd_change[b] = fabsf( pIpd[b] - ipd_smooth[b] ); + if ( ipd_change[b] > EVS_PI ) + { + ipd_change[b] = 2 * EVS_PI - ipd_change[b]; + } + ipd_mean_change += ipd_change[b]; + } + ipd_mean_change /= gipd_band_max; + +#ifdef DEBUG_MODE_DFT + dbgwrite( ipd_change, sizeof( float ), hStereoDft->gipd_band_max, 1, "res/stereo_dft_ipd_change.pcm" ); + dbgwrite( &ipd_mean_change, sizeof( float ), 1, 1, "res/stereo_dft_ipd_mean_change.pcm" ); +#endif + + return ipd_mean_change; +} + + +/*------------------------------------------------------------------------- + * stereo_dft_gipd_stabilization() + * + * stabilize global IPD based on stability of bandwise IPDs + *------------------------------------------------------------------------*/ + +static void stereo_dft_gipd_stabilization( + float *pgIpd, /* i/o: global IPD to be stabilized */ + float prev_gipd, /* i: previous global IPD */ + float ipd_mean_change /* i: mean of previous bandwise IPDs */ +) +{ + float diff_gipd; + + if ( ipd_mean_change < 0.3f ) + { + *pgIpd = prev_gipd; + } + else + { + diff_gipd = fabsf( *pgIpd - prev_gipd ); + if ( diff_gipd > EVS_PI ) + { + diff_gipd = 2 * EVS_PI - diff_gipd; + } + if ( diff_gipd > ipd_mean_change ) + { + if ( *pgIpd > prev_gipd ) + { + if ( *pgIpd - prev_gipd < EVS_PI ) + { + *pgIpd = prev_gipd + ipd_mean_change; + } + else + { + *pgIpd = prev_gipd - ipd_mean_change; + if ( *pgIpd < -EVS_PI ) + { + *pgIpd += 2 * EVS_PI; + } + } + } + else + { + if ( prev_gipd - *pgIpd < EVS_PI ) + { + *pgIpd = prev_gipd - ipd_mean_change; + } + else + { + *pgIpd = prev_gipd + ipd_mean_change; + if ( *pgIpd > EVS_PI ) + { + *pgIpd -= 2 * EVS_PI; + } + } + } + } + } + return; +} + + /*------------------------------------------------------------------------- * stereo_dft_enc_get_nipd_flag() * diff --git a/lib_enc/ivas_stereo_dft_enc_itd.c b/lib_enc/ivas_stereo_dft_enc_itd.c index e917c36e36..d2c0bc7fe1 100644 --- a/lib_enc/ivas_stereo_dft_enc_itd.c +++ b/lib_enc/ivas_stereo_dft_enc_itd.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -45,7 +45,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------- @@ -66,11 +66,9 @@ #define SUBDIV ( 2 * STEREO_DFT_ITD_MAX_ANA / L_SAMPLES ) #define DENOM 0.05f -#define XSPEC_ALPHA ( 1.f / 32 ) -#ifdef FIX_ITD_CNG +#define XSPEC_ALPHA ( 1.f / 32 ) #define CORR_FILT 0.8f #define CORR_RESET_FRAMES_MAX 20 -#endif #define ITD_VAD_NOISE_INIT_FRAMES 30 #define ITD_VAD_THRSHOLD 0.001f @@ -84,135 +82,6 @@ #define ITD_MAX_MDCT 80 -#ifdef ITD_WINNER_GAIN_MODIFY -/*------------------------------------------------------------------------- - * stereo_dft_frame_coherence() - * Calculate the frame coherence of the stereo signal - * - *-------------------------------------------------------------------------*/ - -static void stereo_dft_frame_coherence( - STEREO_DFT_ENC_DATA_HANDLE hStereoDft, - float *xcorr, - float *Spd_L, - float *Spd_R, - float *frame_coherence ) -{ - float spd_xcorr_real, spd_xcorr_imag, spd_LR; - int16_t i, NFFT; - - NFFT = min( STEREO_DFT_N_32k_ENC, hStereoDft->NFFT ); - spd_xcorr_real = 0.0f; - spd_xcorr_imag = 0.0f; - spd_LR = 0.0f; - *frame_coherence = 0.0f; - - for ( i = 1; i < NFFT / 2; i++ ) - { - spd_xcorr_real += (float) xcorr[i * 2]; - spd_xcorr_imag += (float) xcorr[i * 2 + 1]; - spd_LR += (float) sqrt( Spd_L[i] ) * sqrt( Spd_R[i] ); - } - - *frame_coherence = (float) ( sqrt( spd_xcorr_real * spd_xcorr_real + spd_xcorr_imag * spd_xcorr_imag ) / spd_LR ); - - return; -} - - -/*------------------------------------------------------------------------- - * stereo_dft_itd_winner_gain() - * Estimate the spectral power density of noise in the stereo signal and - * calculate the winner gain for the ITD estimation - *-------------------------------------------------------------------------*/ - -static void stereo_dft_itd_winner_gain( - STEREO_DFT_ENC_DATA_HANDLE hStereoDft, - float *Spd_L, - float *Spd_R ) -{ - int16_t i; - float alpha1 = 0.05f; - float alpha2 = 0.95f; - float trackingfactor = 0.5f; - float ratio = 2.75f; - - for ( i = 0; i < STEREO_DFT_N_16k_ENC / 2; i++ ) - { - if ( hStereoDft->spd_L_noise_min[i] > Spd_L[i] ) - { - hStereoDft->spd_L_noise_min[i] = ( 1 - 0.15 ) * hStereoDft->spd_L_noise_min[i] + 0.15 * Spd_L[i]; - } - else - { - hStereoDft->spd_L_noise_min[i] = hStereoDft->spd_L_noise_min[i] + alpha1 * ( Spd_L[i] - hStereoDft->spd_L_noise_min[i] ); - } - if ( hStereoDft->spd_R_noise[i] > Spd_R[i] ) - { - hStereoDft->spd_R_noise_min[i] = ( 1 - 0.15 ) * hStereoDft->spd_R_noise_min[i] + 0.15 * Spd_R[i]; - } - else - { - hStereoDft->spd_R_noise_min[i] = hStereoDft->spd_R_noise_min[i] + alpha1 * ( Spd_R[i] - hStereoDft->spd_R_noise_min[i] ); - } - if ( hStereoDft->spd_L_noise_max[i] < Spd_L[i] ) - { - hStereoDft->spd_L_noise_max[i] = Spd_L[i]; - } - else - { - hStereoDft->spd_L_noise_max[i] = hStereoDft->spd_L_noise_max[i] + alpha2 * ( Spd_L[i] - hStereoDft->spd_L_noise_max[i] ); - } - if ( hStereoDft->spd_R_noise_max[i] < Spd_R[i] ) - { - hStereoDft->spd_R_noise_max[i] = Spd_R[i]; - } - else - { - hStereoDft->spd_R_noise_max[i] = hStereoDft->spd_R_noise_max[i] + alpha2 * ( Spd_R[i] - hStereoDft->spd_R_noise_max[i] ); - } - if ( hStereoDft->spd_L_noise_max[i] > ratio * hStereoDft->spd_L_noise_min[i] ) - { - hStereoDft->spd_L_noise[i] = hStereoDft->spd_L_noise[i]; - hStereoDft->winner_gain_L[i] = ( Spd_L[i] - hStereoDft->spd_L_noise[i] ) / Spd_L[i]; - } - else - { - hStereoDft->spd_L_noise[i] = hStereoDft->spd_L_noise[i] + trackingfactor * ( Spd_L[i] - hStereoDft->spd_L_noise[i] ); - hStereoDft->winner_gain_L[i] = ( Spd_L[i] - hStereoDft->spd_L_noise[i] ) / Spd_L[i]; - } - if ( hStereoDft->spd_R_noise_max[i] > ratio * hStereoDft->spd_R_noise_min[i] ) - { - hStereoDft->spd_R_noise[i] = hStereoDft->spd_R_noise[i]; - hStereoDft->winner_gain_R[i] = ( Spd_R[i] - hStereoDft->spd_R_noise[i] ) / Spd_R[i]; - } - else - { - hStereoDft->spd_R_noise[i] = hStereoDft->spd_R_noise[i] + trackingfactor * ( Spd_R[i] - hStereoDft->spd_R_noise[i] ); - hStereoDft->winner_gain_R[i] = ( Spd_R[i] - hStereoDft->spd_R_noise[i] ) / Spd_R[i]; - } - } - - for ( i = 0; i < STEREO_DFT_N_16k_ENC / 2; i++ ) - { - hStereoDft->winner_gain_L[i] = max( hStereoDft->winner_gain_L[i], 0.01f ); - hStereoDft->winner_gain_R[i] = max( hStereoDft->winner_gain_R[i], 0.01f ); - hStereoDft->winner_gain_L[i] = min( hStereoDft->winner_gain_L[i], 1.0f ); - hStereoDft->winner_gain_R[i] = min( hStereoDft->winner_gain_R[i], 1.0f ); - if ( hStereoDft->winner_gain_L[i] >= 0.80f ) - hStereoDft->winner_gain_L[i] = 1.0f; - else - hStereoDft->winner_gain_L[i] = 0.01f; - if ( hStereoDft->winner_gain_R[i] >= 0.80f ) - hStereoDft->winner_gain_R[i] = 1.0f; - else - hStereoDft->winner_gain_R[i] = 0.01f; - } - - return; -} -#endif - /*------------------------------------------------------------------------- * set_band_limits() * @@ -726,10 +595,8 @@ void stereo_dft_enc_compute_itd( float *DFT_R, const int16_t k_offset, const int16_t input_frame, -#ifdef FIX_ITD_CNG const int16_t vad_flag_dtx[], const int16_t vad_hover_flag[], -#endif float *bin_nrgL, float *bin_nrgR ) { @@ -745,9 +612,6 @@ void stereo_dft_enc_compute_itd( int16_t itd, itd_td; float xcorr_itd[STEREO_DFT_N_32k_ENC]; float tmpf1, tmpf2, tmpf3; -#ifdef ITD_WINNER_GAIN_MODIFY - float frame_coherence, tmpf4; -#endif float thres, alpha; int16_t index; float xcorr_max, sum_nrg_L_lb, par_L[XCORR_LB_NUM_BANDS], par_L_avrg, sum_nrg_L_tmp; @@ -776,9 +640,7 @@ void stereo_dft_enc_compute_itd( const float *dft_trigo32k; float trigo_enc[STEREO_DFT_N_32k_ENC / 2 + 1]; -#ifdef FIX_ITD_CNG float cng_xcorr_filt; -#endif if ( hCPE->element_mode == IVAS_CPE_DFT ) { @@ -938,9 +800,7 @@ void stereo_dft_enc_compute_itd( vad_flag_itd = stereo_dft_enc_itd_vad( hItd->E_band_n, &( hItd->vad_frm_cnt ), Spd_L, Spd_R, &mssnr ); -#ifdef FIX_ITD_CNG vad_flag_itd = vad_flag_itd && vad_flag_dtx[0]; -#endif if ( sum_nrg_L < EPSILON ) { @@ -992,32 +852,6 @@ void stereo_dft_enc_compute_itd( xcorr[0] = sign( hItd->xcorr_smooth[0] ); xcorr[1] = sign( hItd->xcorr_smooth[1] ); -#ifdef ITD_WINNER_GAIN_MODIFY - if ( hStereoDft->mus_flag == 0 ) - { - stereo_dft_frame_coherence( hStereoDft, xcorr, Spd_L, Spd_R, &frame_coherence ); - if ( hStereoDft->local_vad == 0 ) - { - hStereoDft->noise_coherence = 0.9f * hStereoDft->noise_coherence + ( 1.0 - 0.9f ) * frame_coherence; - } - else - { - hStereoDft->noise_coherence = hStereoDft->noise_coherence; - } - stereo_dft_itd_winner_gain( hStereoDft, Spd_L, Spd_R ); - - if ( hStereoDft->noise_coherence > 0.25f ) - { - for ( i = 1; i < NFFT / 2; i++ ) - { - xcorr[2 * i] = ( hStereoDft->winner_gain_L[i] * hStereoDft->winner_gain_R[i] ) * xcorr[2 * i]; - xcorr[2 * i + 1] = ( hStereoDft->winner_gain_L[i] * hStereoDft->winner_gain_R[i] ) * xcorr[2 * i + 1]; - Spd_L[i] = hStereoDft->winner_gain_L[i] * Spd_L[i]; - Spd_R[i] = hStereoDft->winner_gain_R[i] * Spd_R[i]; - } - } - } -#endif if ( hCPE->element_mode == IVAS_CPE_DFT && ( hItd->td_itd[k_offset] - hItd->td_itd[k_offset - 1] ) ) { @@ -1040,23 +874,6 @@ void stereo_dft_enc_compute_itd( } tmpf3 = 2.f; -#ifdef ITD_WINNER_GAIN_MODIFY - if ( hStereoDft->mus_flag == 0 ) - { - alpha = -0.8f; - } - else - { - if ( flag_noisy_speech_snr ) - { - alpha = -0.8f; - } - else - { - alpha = -1.0f; - } - } -#else if ( flag_noisy_speech_snr ) { alpha = -0.8f; @@ -1065,11 +882,9 @@ void stereo_dft_enc_compute_itd( { alpha = -1.0f; } -#endif if ( hCPE->hCoreCoder[0]->Opt_DTX_ON && hCPE->element_mode == IVAS_CPE_DFT ) { -#ifdef FIX_ITD_CNG if ( hCPE->hFrontVad[0] != NULL ) { /* Determine if we are in hangover */ @@ -1119,14 +934,8 @@ void stereo_dft_enc_compute_itd( } } } -#endif -#ifdef FIX_ITD_CNG if ( ( vad_flag_dtx[0] == 0 ) || ( hCPE->hFrontVad[0] == NULL && ( hCPE->hCoreCoder[0]->last_core_brate == SID_2k40 || hCPE->hCoreCoder[0]->last_core_brate == FRAME_NO_DATA ) ) || hCPE->hStereoCng->first_SID_after_TD ) -#else - if ( hCPE->hCoreCoder[0]->last_core_brate == SID_2k40 || hCPE->hCoreCoder[0]->last_core_brate == FRAME_NO_DATA || hCPE->hStereoCng->first_SID_after_TD ) -#endif { -#ifdef FIX_ITD_CNG if ( vad_flag_dtx[0] == 0 ) { /* expectedNumUpdates updated after call to dtx() in SID frames */ @@ -1144,59 +953,20 @@ void stereo_dft_enc_compute_itd( { mvr2r( hStereoDft->xspec_smooth, hItd->xcorr_smooth, NFFT ); } -#endif for ( i = 1; i < NFFT / 2; i++ ) { /* Low pass filter cross L/R power spectrum */ hStereoDft->xspec_smooth[2 * i] = ( 1.f - XSPEC_ALPHA ) * hStereoDft->xspec_smooth[2 * i] + XSPEC_ALPHA * xcorr[2 * i]; hStereoDft->xspec_smooth[2 * i + 1] = ( 1.f - XSPEC_ALPHA ) * hStereoDft->xspec_smooth[2 * i + 1] + XSPEC_ALPHA * xcorr[2 * i + 1]; -#ifdef FIX_ITD_CNG hItd->xcorr_smooth[2 * i] = ( 1.f - cng_xcorr_filt ) * hItd->xcorr_smooth[2 * i] + cng_xcorr_filt * xcorr[2 * i]; hItd->xcorr_smooth[2 * i + 1] = ( 1.f - cng_xcorr_filt ) * hItd->xcorr_smooth[2 * i + 1] + cng_xcorr_filt * xcorr[2 * i + 1]; -#else - hItd->xcorr_smooth[2 * i] = ( 1.f - sfm_L ) * hItd->xcorr_smooth[2 * i] + sfm_L * xcorr[2 * i]; - hItd->xcorr_smooth[2 * i + 1] = ( 1.f - sfm_L ) * hItd->xcorr_smooth[2 * i + 1] + sfm_L * xcorr[2 * i + 1]; -#endif tmpf1 = sqrtf( hItd->xcorr_smooth[i * 2] * hItd->xcorr_smooth[i * 2] + hItd->xcorr_smooth[i * 2 + 1] * hItd->xcorr_smooth[i * 2 + 1] ); tmpf1 += EPSILON; tmpf2 = tmpf1; tmpf1 = powf( tmpf1, alpha ); -#ifdef ITD_WINNER_GAIN_MODIFY - if ( hStereoDft->mus_flag == 0 ) - { - tmpf4 = 1.0f; - /* Calculate smoothed spectral power density for the L/R channel */ - hStereoDft->spd_L_smooth_new[i] = ( 1.f - sfm_L ) * hStereoDft->spd_L_smooth_new[i] + sfm_L * Spd_L[i]; - hStereoDft->spd_R_smooth_new[i] = ( 1.f - sfm_L ) * hStereoDft->spd_R_smooth_new[i] + sfm_L * Spd_R[i]; - /* Calculate cross spectral power density using the smoothed spectral power density*/ - tmpf4 = (float) sqrt( hStereoDft->spd_L_smooth_new[i] ) * sqrt( hStereoDft->spd_R_smooth_new[i] ); - /* Calculate the value of weighted function for each frequency bin */ - tmpf4 += EPSILON; - if ( hStereoDft->noise_coherence > 0.25f ) - { - tmpf4 = tmpf1 * pow( tmpf2, 2.0f ) * pow( tmpf4, -2.0f ); - tmpf3 += tmpf2 * tmpf1; - tmpf3 -= tmpf2 * tmpf4; - } - else - { - tmpf4 = tmpf2 * pow( tmpf4, -2.0f ); - } - /* Calculate the value of weighted generlized cross-correlation function for each frequency bin */ - xcorr[2 * i] = hItd->xcorr_smooth[2 * i] * tmpf4; - xcorr[2 * i + 1] = hItd->xcorr_smooth[2 * i + 1] * tmpf4; - } - else - { - tmpf3 += tmpf2 * tmpf1; - xcorr[2 * i] = hItd->xcorr_smooth[2 * i] * tmpf1; - xcorr[2 * i + 1] = hItd->xcorr_smooth[2 * i + 1] * tmpf1; - } -#else tmpf3 += tmpf2 * tmpf1; xcorr[2 * i] = hItd->xcorr_smooth[2 * i] * tmpf1; xcorr[2 * i + 1] = hItd->xcorr_smooth[2 * i + 1] * tmpf1; -#endif /* Low pass filter L/R power spectrum */ /* Calculate coherence as cross spectral density divided by L*R power spectrum */ @@ -1214,42 +984,9 @@ void stereo_dft_enc_compute_itd( tmpf1 += EPSILON; tmpf2 = tmpf1; tmpf1 = powf( tmpf1, alpha ); -#ifdef ITD_WINNER_GAIN_MODIFY - if ( hStereoDft->mus_flag == 0 ) - { - tmpf4 = 1.0f; - /* Calculate smoothed spectral power density for the L/R channel */ - hStereoDft->spd_L_smooth_new[i] = ( 1.f - sfm_L ) * hStereoDft->spd_L_smooth_new[i] + sfm_L * Spd_L[i]; - hStereoDft->spd_R_smooth_new[i] = ( 1.f - sfm_L ) * hStereoDft->spd_R_smooth_new[i] + sfm_L * Spd_R[i]; - /* Calculate cross spectral power density using the smoothed spectral power density*/ - tmpf4 = (float) sqrt( hStereoDft->spd_L_smooth_new[i] ) * sqrt( hStereoDft->spd_R_smooth_new[i] ); - /* Calculate the value of weighted function for each frequency bin */ - tmpf4 += EPSILON; - if ( hStereoDft->noise_coherence > 0.25f ) - { - tmpf4 = tmpf1 * pow( tmpf2, 2.0f ) * pow( tmpf4, -2.0f ); - tmpf3 += tmpf2 * tmpf1; - tmpf3 -= tmpf2 * tmpf4; - } - else - { - tmpf4 = tmpf2 * pow( tmpf4, -2.0f ); - } - /* Calculate the value of weighted generlized cross-correlation function for each frequency bin */ - xcorr[2 * i] = hItd->xcorr_smooth[2 * i] * tmpf4; - xcorr[2 * i + 1] = hItd->xcorr_smooth[2 * i + 1] * tmpf4; - } - else - { - tmpf3 += tmpf2 * tmpf1; - xcorr[2 * i] = hItd->xcorr_smooth[2 * i] * tmpf1; - xcorr[2 * i + 1] = hItd->xcorr_smooth[2 * i + 1] * tmpf1; - } -#else tmpf3 += tmpf2 * tmpf1; xcorr[2 * i] = hItd->xcorr_smooth[2 * i] * tmpf1; xcorr[2 * i + 1] = hItd->xcorr_smooth[2 * i + 1] * tmpf1; -#endif } } } @@ -1263,70 +1000,16 @@ void stereo_dft_enc_compute_itd( tmpf1 += EPSILON; tmpf2 = tmpf1; tmpf1 = powf( tmpf1, alpha ); -#ifdef ITD_WINNER_GAIN_MODIFY - if ( hStereoDft->mus_flag == 0 ) - { - tmpf4 = 1.0f; - /* Calculate smoothed spectral power density for the L/R channel */ - hStereoDft->spd_L_smooth_new[i] = ( 1.f - sfm_L ) * hStereoDft->spd_L_smooth_new[i] + sfm_L * Spd_L[i]; - hStereoDft->spd_R_smooth_new[i] = ( 1.f - sfm_L ) * hStereoDft->spd_R_smooth_new[i] + sfm_L * Spd_R[i]; - /* Calculate cross spectral power density using the smoothed spectral power density*/ - tmpf4 = (float) sqrt( hStereoDft->spd_L_smooth_new[i] ) * sqrt( hStereoDft->spd_R_smooth_new[i] ); - /* Calculate the value of weighted function for each frequency bin */ - tmpf4 += EPSILON; - if ( hStereoDft->noise_coherence > 0.25f ) - { - tmpf4 = tmpf1 * pow( tmpf2, 2.0f ) * pow( tmpf4, -2.0f ); - tmpf3 += tmpf2 * tmpf1; - tmpf3 -= tmpf2 * tmpf4; - } - else - { - tmpf4 = tmpf2 * pow( tmpf4, -2.0f ); - } - /* Calculate the value of weighted generlized cross-correlation function for each frequency bin */ - xcorr[2 * i] = hItd->xcorr_smooth[2 * i] * tmpf4; - xcorr[2 * i + 1] = hItd->xcorr_smooth[2 * i + 1] * tmpf4; - } - else - { - tmpf3 += tmpf2 * tmpf1; - xcorr[2 * i] = hItd->xcorr_smooth[2 * i] * tmpf1; - xcorr[2 * i + 1] = hItd->xcorr_smooth[2 * i + 1] * tmpf1; - } -#else tmpf3 += tmpf2 * tmpf1; xcorr[2 * i] = hItd->xcorr_smooth[2 * i] * tmpf1; xcorr[2 * i + 1] = hItd->xcorr_smooth[2 * i + 1] * tmpf1; -#endif } } -#ifdef ITD_WINNER_GAIN_MODIFY - if ( hStereoDft->mus_flag == 0 ) - { - if ( hStereoDft->noise_coherence > 0.25f ) - { - tmpf1 = (float) ( NFFT / 2 + 1 ) / tmpf3; - for ( i = 0; i < NFFT; i++ ) - { - xcorr[i] *= tmpf1; - } - } - else - { - for ( i = NFFT / 2; i < NFFT; i++ ) - { - xcorr[i] = 0.0f; - } - } - } -#else tmpf1 = (float) ( NFFT / 2 + 1 ) / tmpf3; for ( i = 0; i < NFFT; i++ ) { xcorr[i] *= tmpf1; } -#endif /*calculate mean E ratio of main to background signal for cohSNR*/ if ( hCPE->element_mode == IVAS_CPE_DFT ) { diff --git a/lib_enc/ivas_stereo_dft_td_itd.c b/lib_enc/ivas_stereo_dft_td_itd.c index fd4cbdde71..b7fb95422f 100644 --- a/lib_enc/ivas_stereo_dft_td_itd.c +++ b/lib_enc/ivas_stereo_dft_td_itd.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -47,7 +47,7 @@ #ifdef DEBUG_PLOT #include "deb_out.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* @@ -383,12 +383,10 @@ void stereo_td_itd( * ---------------------------------------------------------------*/ void stereo_td_itd_mdct_stereo( - CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder handle */ -#ifdef FIX_ITD_CNG + CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder handle */ const int16_t vad_flag_dtx[], /* i: VAD dtx flags */ const int16_t vad_hover_flag[], /* i: VAD hangover flags */ -#endif - const int16_t input_frame /* i : frame length */ + const int16_t input_frame /* i : frame length */ ) { int16_t i; @@ -415,11 +413,7 @@ void stereo_td_itd_mdct_stereo( stereo_dft_enc_analyze( hCPE->hCoreCoder, CPE_CHANNELS, input_frame, NULL, hStereoMdct, DFT, hCPE->input_mem ); /*call ITD function*/ -#ifdef FIX_ITD_CNG stereo_dft_enc_compute_itd( hCPE, DFT[0], DFT[1], STEREO_DFT_OFFSET, input_frame, vad_flag_dtx, vad_hover_flag, bin_nrgL, bin_nrgR ); -#else - stereo_dft_enc_compute_itd( hCPE, DFT[0], DFT[1], STEREO_DFT_OFFSET, input_frame, bin_nrgL, bin_nrgR ); -#endif /* Time Domain ITD compensation using extrapolation */ #ifdef DEBUG_MODE_DFT diff --git a/lib_enc/ivas_stereo_dmx_evs.c b/lib_enc/ivas_stereo_dmx_evs.c index e522912cc7..a5c0fe147f 100644 --- a/lib_enc/ivas_stereo_dmx_evs.c +++ b/lib_enc/ivas_stereo_dmx_evs.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------* @@ -847,7 +847,7 @@ ivas_error stereo_dmx_evs_init_encoder( input_frame = (int16_t) ( input_Fs / FRAMES_PER_SEC ); hStereoDmxEVS = NULL; - if ( ( hStereoDmxEVS = (STEREO_DMX_EVS_ENC_HANDLE) count_malloc( sizeof( STEREO_DMX_EVS_ENC_DATA ) ) ) == NULL ) + if ( ( hStereoDmxEVS = (STEREO_DMX_EVS_ENC_HANDLE) malloc( sizeof( STEREO_DMX_EVS_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for STEREO_DMX_EVS_ENC_DATA\n" ) ); } @@ -881,7 +881,7 @@ ivas_error stereo_dmx_evs_init_encoder( } hStereoDmxEVS->hPOC = NULL; - if ( ( hStereoDmxEVS->hPOC = (STEREO_DMX_EVS_POC_HANDLE) count_malloc( sizeof( STEREO_DMX_EVS_POC_DATA ) ) ) == NULL ) + if ( ( hStereoDmxEVS->hPOC = (STEREO_DMX_EVS_POC_HANDLE) malloc( sizeof( STEREO_DMX_EVS_POC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for STEREO_DMX_EVS_POC_DATA\n" ) ); } @@ -946,16 +946,22 @@ ivas_error stereo_dmx_evs_init_encoder( *-------------------------------------------------------------------*/ void stereo_dmx_evs_close_encoder( - STEREO_DMX_EVS_ENC_HANDLE hStereoDmxEVS /* i/o: Stereo downmix for EVS encoder handle */ + STEREO_DMX_EVS_ENC_HANDLE *hStereoDmxEVS /* i/o: Stereo downmix for EVS encoder handle */ ) { - if ( hStereoDmxEVS->hPOC != NULL ) + if ( hStereoDmxEVS == NULL || *hStereoDmxEVS == NULL ) { - count_free( hStereoDmxEVS->hPOC ); - hStereoDmxEVS->hPOC = NULL; + return; } - count_free( hStereoDmxEVS ); + if ( ( *hStereoDmxEVS )->hPOC != NULL ) + { + free( ( *hStereoDmxEVS )->hPOC ); + ( *hStereoDmxEVS )->hPOC = NULL; + } + + free( ( *hStereoDmxEVS ) ); + ( *hStereoDmxEVS ) = NULL; return; } diff --git a/lib_enc/ivas_stereo_eclvq_enc.c b/lib_enc/ivas_stereo_eclvq_enc.c index dffdafd17a..fc622b5321 100644 --- a/lib_enc/ivas_stereo_eclvq_enc.c +++ b/lib_enc/ivas_stereo_eclvq_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include "ivas_rom_enc.h" #include #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /* used only for norm_s in the code_length_from_count function */ #include "basop32.h" @@ -240,9 +240,9 @@ static int16_t code_length_from_count( assert( c <= ( 1 << 14 ) ); #endif -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP c_norm = norm_s( (int16_t) c ); /* equivalent with 14 - floor(log_base2(c)) */ -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP /* compute linear approximation of log2(1 + x), for x in [0, 1], using a look-up table with 64 entries */ /* normalize to {16384, ..., 32767}, subtract MSB bit, and convert to Q6 for indexing log2_1px_table */ diff --git a/lib_enc/ivas_stereo_ica_enc.c b/lib_enc/ivas_stereo_ica_enc.c index c178d05a91..4cdd1c2fc3 100644 --- a/lib_enc/ivas_stereo_ica_enc.c +++ b/lib_enc/ivas_stereo_ica_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" #include "rom_com.h" #include "ivas_rom_com.h" diff --git a/lib_enc/ivas_stereo_icbwe_enc.c b/lib_enc/ivas_stereo_icbwe_enc.c index 1d1f89f656..43ae497df8 100644 --- a/lib_enc/ivas_stereo_icbwe_enc.c +++ b/lib_enc/ivas_stereo_icbwe_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,7 +37,7 @@ #include "ivas_cnst.h" #include "prot.h" #include "ivas_prot.h" -#include "wmops.h" +#include "wmc_auto.h" #include "rom_com.h" #include "ivas_rom_com.h" #ifdef DEBUGGING diff --git a/lib_enc/ivas_stereo_mdct_core_enc.c b/lib_enc/ivas_stereo_mdct_core_enc.c old mode 100755 new mode 100644 index 6d1e9a32b0..2e739cc906 --- a/lib_enc/ivas_stereo_mdct_core_enc.c +++ b/lib_enc/ivas_stereo_mdct_core_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * sync_tcx_mode() @@ -146,7 +146,7 @@ void stereo_mdct_core_enc( int16_t stereo_bits; int16_t meta_bits, signal_bits; - wmops_sub_start( "stereo_mdct_core_enc" ); + push_wmops( "stereo_mdct_core_enc" ); L_subframeTCX = 0; /* to avoid compilation warning */ @@ -235,7 +235,8 @@ void stereo_mdct_core_enc( *---------------------------------------------------------------*/ ivas_mdct_core_whitening_enc( hCPE, new_samples, old_wsp, pitch_buf, p_mdst_spectrum_long, - tnsBits, p_orig_spectrum_long, tnsSize, p_param, hBstr, NULL, 0, CPE_CHANNELS ); + tnsBits, p_orig_spectrum_long, tnsSize, p_param, hBstr, + 0, CPE_CHANNELS ); for ( ch = 0; ch < CPE_CHANNELS; ch++ ) { @@ -449,9 +450,10 @@ void stereo_mdct_core_enc( } #endif - ivas_mdct_quant_coder( hCPE, 0, tnsBits, tnsSize, p_param, 0 ); + ivas_mdct_quant_coder( hCPE, + tnsBits, tnsSize, p_param, 0 ); - wmops_sub_end(); + pop_wmops(); return; } diff --git a/lib_enc/ivas_stereo_mdct_igf_enc.c b/lib_enc/ivas_stereo_mdct_igf_enc.c index b04fe84de2..1924028bcf 100644 --- a/lib_enc/ivas_stereo_mdct_igf_enc.c +++ b/lib_enc/ivas_stereo_mdct_igf_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include "stat_enc.h" #include "ivas_stat_enc.h" #include "ivas_prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_enc/ivas_stereo_mdct_stereo_enc.c b/lib_enc/ivas_stereo_mdct_stereo_enc.c index fcad004b3a..4ef24de8a1 100644 --- a/lib_enc/ivas_stereo_mdct_stereo_enc.c +++ b/lib_enc/ivas_stereo_mdct_stereo_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include "prot.h" #include "ivas_rom_com.h" #include "ivas_rom_enc.h" -#include "wmops.h" +#include "wmc_auto.h" #include "stat_enc.h" #ifdef DEBUG_PLOT #include "deb_out.h" @@ -189,7 +189,7 @@ void stereo_coder_tcx( int16_t k; int16_t nSubframes, L_frameTCX; int16_t nAvailBitsMS[NB_DIV]; - wmops_sub_start( "stereo_coder_tcx" ); + push_wmops( "stereo_coder_tcx" ); set_s( nAvailBitsMS, 0, NB_DIV ); @@ -321,7 +321,7 @@ void stereo_coder_tcx( #endif hStereoMdct->sw_uncorr = 1; - wmops_sub_end(); + pop_wmops(); return; } #ifdef DEBUGGING @@ -342,7 +342,7 @@ void stereo_coder_tcx( set_s( &ms_mask[k][0], 1, MAX_SFB ); } - wmops_sub_end(); + pop_wmops(); return; } #endif @@ -464,7 +464,7 @@ void stereo_coder_tcx( hStereoMdct->sw_uncorr = ( sw_uncorr_mean > 0.6f ); } - wmops_sub_end(); + pop_wmops(); #ifdef DEBUG_MODE_MDCT /* MDCT stereo data */ @@ -1161,13 +1161,13 @@ void initMdctStereoEncData( { if ( hStereoMdct->hDft_ana != NULL ) { - count_free( hStereoMdct->hDft_ana ); + free( hStereoMdct->hDft_ana ); hStereoMdct->hDft_ana = NULL; } if ( hStereoMdct->hItd != NULL ) { - count_free( hStereoMdct->hItd ); + free( hStereoMdct->hItd ); hStereoMdct->hItd = NULL; } } @@ -1188,7 +1188,7 @@ ivas_error initMdctItdHandling( { if ( hStereoMdct->hItd == NULL ) { - if ( ( hStereoMdct->hItd = (ITD_DATA_HANDLE) count_malloc( sizeof( ITD_DATA ) ) ) == NULL ) + if ( ( hStereoMdct->hItd = (ITD_DATA_HANDLE) malloc( sizeof( ITD_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ITD data\n" ) ); } @@ -1196,7 +1196,7 @@ ivas_error initMdctItdHandling( if ( hStereoMdct->hDft_ana == NULL ) { - if ( ( hStereoMdct->hDft_ana = (DFT_ANA_HANDLE) count_malloc( sizeof( DFT_ANA ) ) ) == NULL ) + if ( ( hStereoMdct->hDft_ana = (DFT_ANA_HANDLE) malloc( sizeof( DFT_ANA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ITD data\n" ) ); } @@ -1223,17 +1223,17 @@ void stereo_mdct_enc_destroy( { if ( ( *hStereoMdct )->hDft_ana != NULL ) { - count_free( ( *hStereoMdct )->hDft_ana ); + free( ( *hStereoMdct )->hDft_ana ); ( *hStereoMdct )->hDft_ana = NULL; } if ( ( *hStereoMdct )->hItd != NULL ) { - count_free( ( *hStereoMdct )->hItd ); + free( ( *hStereoMdct )->hItd ); ( *hStereoMdct )->hItd = NULL; } - count_free( *hStereoMdct ); + free( *hStereoMdct ); *hStereoMdct = NULL; return; diff --git a/lib_enc/ivas_stereo_switching_enc.c b/lib_enc/ivas_stereo_switching_enc.c index 59adc49fef..fca3c7785e 100644 --- a/lib_enc/ivas_stereo_switching_enc.c +++ b/lib_enc/ivas_stereo_switching_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -32,16 +32,16 @@ #include #include "options.h" -#ifdef DEBUGGING -#include "debug.h" -#endif #include "cnst.h" #include "rom_com.h" #include "prot.h" #include "ivas_prot.h" #include "ivas_rom_com.h" -#include "wmops.h" - +#include "assert.h" +#include "wmc_auto.h" +#ifdef DEBUGGING +#include "debug.h" +#endif /*-------------------------------------------------------------------* * Function allocate_CoreCoder_enc() @@ -55,7 +55,7 @@ static ivas_error allocate_CoreCoder_enc( { if ( st->hLPDmem == NULL && st->element_mode != IVAS_CPE_MDCT ) { - if ( ( st->hLPDmem = (LPD_state_HANDLE) count_malloc( sizeof( LPD_state ) ) ) == NULL ) + if ( ( st->hLPDmem = (LPD_state_HANDLE) malloc( sizeof( LPD_state ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LPDmem\n" ) ); } @@ -64,7 +64,7 @@ static ivas_error allocate_CoreCoder_enc( if ( st->hGSCEnc == NULL && st->element_mode != IVAS_CPE_MDCT ) { - if ( ( st->hGSCEnc = (GSC_ENC_HANDLE) count_malloc( sizeof( GSC_ENC_DATA ) ) ) == NULL ) + if ( ( st->hGSCEnc = (GSC_ENC_HANDLE) malloc( sizeof( GSC_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for GSC\n" ) ); } @@ -73,7 +73,7 @@ static ivas_error allocate_CoreCoder_enc( if ( st->hNoiseEst == NULL ) { - if ( ( st->hNoiseEst = (NOISE_EST_HANDLE) count_malloc( sizeof( NOISE_EST_DATA ) ) ) == NULL ) + if ( ( st->hNoiseEst = (NOISE_EST_HANDLE) malloc( sizeof( NOISE_EST_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Noise estimation\n" ) ); } @@ -82,7 +82,7 @@ static ivas_error allocate_CoreCoder_enc( if ( st->hVAD == NULL ) { - if ( ( st->hVAD = (VAD_HANDLE) count_malloc( sizeof( VAD_DATA ) ) ) == NULL ) + if ( ( st->hVAD = (VAD_HANDLE) malloc( sizeof( VAD_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VAD\n" ) ); } @@ -91,7 +91,7 @@ static ivas_error allocate_CoreCoder_enc( if ( st->hSpMusClas == NULL ) { - if ( ( st->hSpMusClas = (SP_MUS_CLAS_HANDLE) count_malloc( sizeof( SP_MUS_CLAS_DATA ) ) ) == NULL ) + if ( ( st->hSpMusClas = (SP_MUS_CLAS_HANDLE) malloc( sizeof( SP_MUS_CLAS_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Speech/music classifier\n" ) ); } @@ -114,25 +114,25 @@ static void deallocate_CoreCoder_TCX_enc( { if ( st->hTcxEnc != NULL ) { - count_free( st->hTcxEnc ); + free( st->hTcxEnc ); st->hTcxEnc = NULL; } if ( st->hTcxCfg != NULL ) { - count_free( st->hTcxCfg ); + free( st->hTcxCfg ); st->hTcxCfg = NULL; } if ( st->hIGFEnc != NULL ) { - count_free( st->hIGFEnc ); + free( st->hIGFEnc ); st->hIGFEnc = NULL; } if ( st->hHQ_core != NULL ) { - count_free( st->hHQ_core ); + free( st->hHQ_core ); st->hHQ_core = NULL; } @@ -152,31 +152,31 @@ static void deallocate_CoreCoder_enc( { if ( st->hLPDmem != NULL ) { - count_free( st->hLPDmem ); + free( st->hLPDmem ); st->hLPDmem = NULL; } if ( st->hGSCEnc != NULL ) { - count_free( st->hGSCEnc ); + free( st->hGSCEnc ); st->hGSCEnc = NULL; } if ( st->hNoiseEst != NULL && st->element_mode != IVAS_CPE_MDCT ) { - count_free( st->hNoiseEst ); + free( st->hNoiseEst ); st->hNoiseEst = NULL; } if ( st->hVAD != NULL && st->element_mode != IVAS_CPE_MDCT ) { - count_free( st->hVAD ); + free( st->hVAD ); st->hVAD = NULL; } if ( st->hSpMusClas != NULL && st->element_mode != IVAS_CPE_MDCT ) { - count_free( st->hSpMusClas ); + free( st->hSpMusClas ); st->hSpMusClas = NULL; } @@ -187,7 +187,7 @@ static void deallocate_CoreCoder_enc( if ( st->hBWE_TD != NULL ) { - count_free( st->hBWE_TD ); + free( st->hBWE_TD ); st->hBWE_TD = NULL; } @@ -198,7 +198,7 @@ static void deallocate_CoreCoder_enc( if ( st->hBWE_FD != NULL ) { - count_free( st->hBWE_FD ); + free( st->hBWE_FD ); st->hBWE_FD = NULL; } @@ -231,6 +231,8 @@ ivas_error stereo_memory_enc( error = IVAS_ERR_OK; + assert( hCPE->last_element_mode >= IVAS_CPE_DFT && "Switching from SCE to CPE is not a valid configuration!" ); + /*--------------------------------------------------------------* * save parameters from structures that will be freed *---------------------------------------------------------------*/ @@ -261,7 +263,7 @@ ivas_error stereo_memory_enc( /* deallocate data structure of the previous CPE mode */ if ( hCPE->hStereoTD != NULL ) { - count_free( hCPE->hStereoTD ); + free( hCPE->hStereoTD ); hCPE->hStereoTD = NULL; } @@ -283,7 +285,7 @@ ivas_error stereo_memory_enc( /* allocate ICBWE structure */ if ( hCPE->hStereoICBWE == NULL ) { - if ( ( hCPE->hStereoICBWE = (STEREO_ICBWE_ENC_HANDLE) count_malloc( sizeof( STEREO_ICBWE_ENC_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoICBWE = (STEREO_ICBWE_ENC_HANDLE) malloc( sizeof( STEREO_ICBWE_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Stereo ICBWE \n" ) ); } @@ -295,7 +297,7 @@ ivas_error stereo_memory_enc( st = hCPE->hCoreCoder[0]; if ( st->hHQ_core == NULL ) { - if ( ( st->hHQ_core = (HQ_ENC_HANDLE) count_malloc( sizeof( HQ_ENC_DATA ) ) ) == NULL ) + if ( ( st->hHQ_core = (HQ_ENC_HANDLE) malloc( sizeof( HQ_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HQ core\n" ) ); } @@ -332,7 +334,7 @@ ivas_error stereo_memory_enc( return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: TD Stereo memory already allocated\n" ); } - if ( ( hCPE->hStereoTD = (STEREO_TD_ENC_DATA_HANDLE) count_malloc( sizeof( STEREO_TD_ENC_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoTD = (STEREO_TD_ENC_DATA_HANDLE) malloc( sizeof( STEREO_TD_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD Stereo\n" ) ); } @@ -360,7 +362,7 @@ ivas_error stereo_memory_enc( { if ( hCPE->hCoreCoder[1]->hDtxEnc != NULL ) { - count_free( hCPE->hCoreCoder[1]->hDtxEnc ); + free( hCPE->hCoreCoder[1]->hDtxEnc ); hCPE->hCoreCoder[1]->hDtxEnc = NULL; } @@ -372,7 +374,7 @@ ivas_error stereo_memory_enc( if ( hCPE->hCoreCoder[0]->Opt_DTX_ON && hCPE->hCoreCoder[0]->hTdCngEnc == NULL ) { - if ( ( hCPE->hCoreCoder[0]->hTdCngEnc = (TD_CNG_ENC_HANDLE) count_malloc( sizeof( TD_CNG_ENC_DATA ) ) ) == NULL ) + if ( ( hCPE->hCoreCoder[0]->hTdCngEnc = (TD_CNG_ENC_HANDLE) malloc( sizeof( TD_CNG_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DTX/TD CNG\n" ) ); } @@ -386,7 +388,7 @@ ivas_error stereo_memory_enc( return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: TCA Stereo memory already allocated\n" ); } - if ( ( hCPE->hStereoTCA = (STEREO_TCA_ENC_HANDLE) count_malloc( sizeof( STEREO_TCA_ENC_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoTCA = (STEREO_TCA_ENC_HANDLE) malloc( sizeof( STEREO_TCA_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Stereo TCA\n" ) ); } @@ -413,7 +415,7 @@ ivas_error stereo_memory_enc( /* allocate BWEs for primary channel */ if ( st->hBWE_TD == NULL ) { - if ( ( st->hBWE_TD = (TD_BWE_ENC_HANDLE) count_malloc( sizeof( TD_BWE_ENC_DATA ) ) ) == NULL ) + if ( ( st->hBWE_TD = (TD_BWE_ENC_HANDLE) malloc( sizeof( TD_BWE_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD BWE\n" ) ); } @@ -429,7 +431,7 @@ ivas_error stereo_memory_enc( InitSWBencBuffer( st->hBWE_TD ); ResetSHBbuffer_Enc( st->hBWE_TD ); - if ( ( st->hBWE_FD = (FD_BWE_ENC_HANDLE) count_malloc( sizeof( FD_BWE_ENC_DATA ) ) ) == NULL ) + if ( ( st->hBWE_FD = (FD_BWE_ENC_HANDLE) malloc( sizeof( FD_BWE_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FD BWE\n" ) ); } @@ -440,7 +442,7 @@ ivas_error stereo_memory_enc( /* allocate stereo CNG structure */ if ( hCPE->hStereoCng == NULL ) { - if ( ( hCPE->hStereoCng = (STEREO_CNG_ENC_HANDLE) count_malloc( sizeof( STEREO_CNG_ENC ) ) ) == NULL ) + if ( ( hCPE->hStereoCng = (STEREO_CNG_ENC_HANDLE) malloc( sizeof( STEREO_CNG_ENC ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Stereo Cng for Unified/TD\n" ) ); } @@ -466,19 +468,19 @@ ivas_error stereo_memory_enc( if ( hCPE->hStereoTD != NULL ) { - count_free( hCPE->hStereoTD ); + free( hCPE->hStereoTD ); hCPE->hStereoTD = NULL; } if ( hCPE->hStereoTCA != NULL ) { - count_free( hCPE->hStereoTCA ); + free( hCPE->hStereoTCA ); hCPE->hStereoTCA = NULL; } if ( hCPE->hStereoICBWE != NULL ) { - count_free( hCPE->hStereoICBWE ); + free( hCPE->hStereoICBWE ); hCPE->hStereoICBWE = NULL; } @@ -500,7 +502,7 @@ ivas_error stereo_memory_enc( /* allocate TCX/IGF structures for second channel */ st = hCPE->hCoreCoder[1]; - if ( ( st->hTcxEnc = (TCX_ENC_HANDLE) count_malloc( sizeof( TCX_ENC_DATA ) ) ) == NULL ) + if ( ( st->hTcxEnc = (TCX_ENC_HANDLE) malloc( sizeof( TCX_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hTcxEnc\n" ) ); } @@ -515,19 +517,19 @@ ivas_error stereo_memory_enc( st->last_core = ACELP_CORE; /* needed to set-up TCX core in SetTCXModeInfo() */ } - if ( ( st->hTcxCfg = (TCX_CONFIG_HANDLE) count_malloc( sizeof( TCX_config ) ) ) == NULL ) + if ( ( st->hTcxCfg = (TCX_CONFIG_HANDLE) malloc( sizeof( TCX_config ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hTcxCfg\n" ) ); } - if ( ( st->hIGFEnc = (IGF_ENC_INSTANCE_HANDLE) count_malloc( sizeof( IGF_ENC_INSTANCE ) ) ) == NULL ) + if ( ( st->hIGFEnc = (IGF_ENC_INSTANCE_HANDLE) malloc( sizeof( IGF_ENC_INSTANCE ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hIGFEnc\n" ) ); } - st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode, st->mct_chan_mode ); + st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode ); /* allocate and initialize MDCT stereo structure */ - if ( ( hCPE->hStereoMdct = (STEREO_MDCT_ENC_DATA_HANDLE) count_malloc( sizeof( STEREO_MDCT_ENC_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoMdct = (STEREO_MDCT_ENC_DATA_HANDLE) malloc( sizeof( STEREO_MDCT_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MDCT Stereo \n" ) ); } @@ -562,7 +564,7 @@ ivas_error stereo_memory_enc( if ( st->hDtxEnc == NULL ) { - if ( ( st->hDtxEnc = (DTX_ENC_HANDLE) count_malloc( sizeof( DTX_ENC_DATA ) ) ) == NULL ) + if ( ( st->hDtxEnc = (DTX_ENC_HANDLE) malloc( sizeof( DTX_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DTX variables\n" ) ); } @@ -571,7 +573,7 @@ ivas_error stereo_memory_enc( if ( st->hTdCngEnc != NULL ) { - count_free( st->hTdCngEnc ); + free( st->hTdCngEnc ); st->hTdCngEnc = NULL; } diff --git a/lib_enc/ivas_stereo_td_analysis.c b/lib_enc/ivas_stereo_td_analysis.c index 41de84d714..d2d72c1534 100644 --- a/lib_enc/ivas_stereo_td_analysis.c +++ b/lib_enc/ivas_stereo_td_analysis.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* diff --git a/lib_enc/ivas_stereo_td_enc.c b/lib_enc/ivas_stereo_td_enc.c index 1e7fe30bd1..3857795dce 100644 --- a/lib_enc/ivas_stereo_td_enc.c +++ b/lib_enc/ivas_stereo_td_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #include "prot.h" #include "ivas_prot.h" #include "ivas_rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" #include "math.h" @@ -190,7 +190,7 @@ ivas_error stereo_set_tdm( { if ( st->hBWE_TD != NULL ) { - count_free( st->hBWE_TD ); + free( st->hBWE_TD ); st->hBWE_TD = NULL; } @@ -198,7 +198,7 @@ ivas_error stereo_set_tdm( if ( st->hBWE_FD != NULL ) { - count_free( st->hBWE_FD ); + free( st->hBWE_FD ); st->hBWE_FD = NULL; } } @@ -206,7 +206,7 @@ ivas_error stereo_set_tdm( /* allocate ICBWE structure */ if ( hCPE->hStereoICBWE == NULL ) { - if ( ( hCPE->hStereoICBWE = (STEREO_ICBWE_ENC_HANDLE) count_malloc( sizeof( STEREO_ICBWE_ENC_DATA ) ) ) == NULL ) + if ( ( hCPE->hStereoICBWE = (STEREO_ICBWE_ENC_HANDLE) malloc( sizeof( STEREO_ICBWE_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Stereo ICBWE \n" ) ); } @@ -222,7 +222,7 @@ ivas_error stereo_set_tdm( /* deallocate ICBWE structure */ if ( hCPE->hStereoICBWE != NULL ) { - count_free( hCPE->hStereoICBWE ); + free( hCPE->hStereoICBWE ); hCPE->hStereoICBWE = NULL; } @@ -238,7 +238,7 @@ ivas_error stereo_set_tdm( /* allocate BWEs for secondary channel */ if ( st->hBWE_TD == NULL ) { - if ( ( st->hBWE_TD = (TD_BWE_ENC_HANDLE) count_malloc( sizeof( TD_BWE_ENC_DATA ) ) ) == NULL ) + if ( ( st->hBWE_TD = (TD_BWE_ENC_HANDLE) malloc( sizeof( TD_BWE_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD BWE\n" ) ); } @@ -251,7 +251,7 @@ ivas_error stereo_set_tdm( InitSWBencBuffer( st->hBWE_TD ); ResetSHBbuffer_Enc( st->hBWE_TD ); - if ( ( st->hBWE_FD = (FD_BWE_ENC_HANDLE) count_malloc( sizeof( FD_BWE_ENC_DATA ) ) ) == NULL ) + if ( ( st->hBWE_FD = (FD_BWE_ENC_HANDLE) malloc( sizeof( FD_BWE_ENC_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FD BWE\n" ) ); } @@ -302,12 +302,13 @@ ivas_error stereo_set_tdm( *-------------------------------------------------------------------*/ void tdm_configure_enc( - CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */ - const int16_t tdm_SM_or_LRTD_Pri, /* i : channel combination scheme flag in TD stereo OR LRTD primary channel */ - const int16_t tdm_ratio_idx, /* i : ratio index */ - const int16_t tdm_ratio_idx_SM, /* i : ratio index in SM mode */ - const int16_t attack_flag, /* i : Primary channel attack flag */ - const int16_t nb_bits_metadata /* i : number of metadata bits */ + CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */ + const float Etot_last[CPE_CHANNELS], /* i/o: Energy of last frame */ + const int16_t tdm_SM_or_LRTD_Pri, /* i : channel combination scheme flag in TD stereo OR LRTD primary channel */ + const int16_t tdm_ratio_idx, /* i : ratio index */ + const int16_t tdm_ratio_idx_SM, /* i : ratio index in SM mode */ + const int16_t attack_flag, /* i : Primary channel attack flag */ + const int16_t nb_bits_metadata /* i : number of metadata bits */ ) { int16_t tdm_ratio_bit_alloc_idx, mod_ct; @@ -326,11 +327,11 @@ void tdm_configure_enc( *----------------------------------------------------------------*/ hStereoTD->tdm_use_IAWB_Ave_lpc = 0; /* Flag initialisation */ - sts[0]->hSpMusClas->tdm_lt_Etot = 0.1f * sts[0]->hNoiseEst->Etot_last + 0.9f * sts[0]->hSpMusClas->tdm_lt_Etot; - sts[1]->hSpMusClas->tdm_lt_Etot = 0.1f * sts[1]->hNoiseEst->Etot_last + 0.9f * sts[1]->hSpMusClas->tdm_lt_Etot; + sts[0]->hSpMusClas->tdm_lt_Etot = 0.1f * Etot_last[0] + 0.9f * sts[0]->hSpMusClas->tdm_lt_Etot; + sts[1]->hSpMusClas->tdm_lt_Etot = 0.1f * Etot_last[1] + 0.9f * sts[1]->hSpMusClas->tdm_lt_Etot; if ( hCPE->hStereoClassif->lrtd_mode == 0 && ( ( sts[1]->hSpMusClas->tdm_lt_Etot < 0 && hCPE->hCoreCoder[1]->vad_flag == 0 ) /* very clean signal */ - || ( hCPE->hCoreCoder[1]->vad_flag == 0 || ( sts[1]->hNoiseEst->Etot_last < 30.0f && ( sts[0]->hSpMusClas->tdm_lt_Etot - sts[1]->hSpMusClas->tdm_lt_Etot ) > 26.0f ) ) ) ) + || ( hCPE->hCoreCoder[1]->vad_flag == 0 || ( Etot_last[1] < 30.0f && ( sts[0]->hSpMusClas->tdm_lt_Etot - sts[1]->hSpMusClas->tdm_lt_Etot ) > 26.0f ) ) ) ) { sts[1]->coder_type = INACTIVE; @@ -340,7 +341,7 @@ void tdm_configure_enc( } hStereoTD->tdm_lp_reuse_flag = 1; } - else if ( ( ( hCPE->hCoreCoder[1]->vad_flag == 0 ) || ( hCPE->hCoreCoder[0]->vad_flag == 0 && sts[1]->hNoiseEst->Etot_last < 30.0f && ( sts[0]->hSpMusClas->tdm_lt_Etot - sts[1]->hSpMusClas->tdm_lt_Etot ) > 26.0f ) ) && ( hCPE->hStereoClassif->lrtd_mode == 1 ) /* && NO_DTX */ ) /* boths channels are inactive but not DTX used*/ + else if ( ( ( hCPE->hCoreCoder[1]->vad_flag == 0 ) || ( hCPE->hCoreCoder[0]->vad_flag == 0 && Etot_last[1] < 30.0f && ( sts[0]->hSpMusClas->tdm_lt_Etot - sts[1]->hSpMusClas->tdm_lt_Etot ) > 26.0f ) ) && ( hCPE->hStereoClassif->lrtd_mode == 1 ) /* && NO_DTX */ ) /* boths channels are inactive but not DTX used*/ { sts[1]->coder_type = INACTIVE; if ( tdm_ratio_idx > 1 && tdm_ratio_idx < 29 ) @@ -352,7 +353,7 @@ void tdm_configure_enc( hStereoTD->tdm_lp_reuse_flag = 1; } } - else if ( !( sts[1]->sp_aud_decision0 ) && sts[1]->tc_cnt <= 0 && ( sts[1]->coder_type_raw == UNVOICED || ( hStereoTD->tdm_LRTD_flag == 1 && hStereoTD->tdm_lp_reuse_flag == 0 && ( hCPE->hCoreCoder[1]->vad_flag == 0 || ( sts[1]->hNoiseEst->Etot_last < 30.0f && ( sts[0]->hSpMusClas->tdm_lt_Etot - sts[1]->hSpMusClas->tdm_lt_Etot ) > 26.0f ) ) ) ) ) + else if ( !( sts[1]->sp_aud_decision0 ) && sts[1]->tc_cnt <= 0 && ( sts[1]->coder_type_raw == UNVOICED || ( hStereoTD->tdm_LRTD_flag == 1 && hStereoTD->tdm_lp_reuse_flag == 0 && ( hCPE->hCoreCoder[1]->vad_flag == 0 || ( Etot_last[1] < 30.0f && ( sts[0]->hSpMusClas->tdm_lt_Etot - sts[1]->hSpMusClas->tdm_lt_Etot ) > 26.0f ) ) ) ) ) { sts[1]->coder_type = UNVOICED; if ( hStereoTD->tdm_LRTD_flag == 1 ) diff --git a/lib_enc/ivas_tcx_core_enc.c b/lib_enc/ivas_tcx_core_enc.c index e8cfaf6697..e334f4d029 100644 --- a/lib_enc/ivas_tcx_core_enc.c +++ b/lib_enc/ivas_tcx_core_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #include "prot.h" #include "rom_com.h" #include "basop_proto_func.h" -#include "wmops.h" +#include "wmc_auto.h" #include "ivas_prot.h" /*-------------------------------------------------------------------* @@ -99,7 +99,11 @@ void stereo_tcx_init_enc( st->hTcxCfg->ctx_hm = getCtxHm( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->rf_mode ); st->hTcxCfg->resq = getResq( st->bits_frame_nominal * FRAMES_PER_SEC ); st->hTcxEnc->tcx_lpc_shaped_ari = getTcxLpcShapedAri( st->bits_frame_nominal * FRAMES_PER_SEC, st->rf_mode, st->element_mode ); - st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_mode, st->mct_chan_mode ); + st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_mode ); + if ( st->element_mode != EVS_MONO ) + { + st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode ); + } st->core_brate = st->total_brate; @@ -120,8 +124,8 @@ void stereo_tcx_core_enc( float lsp_new[], /* i : LSPs at the end of the frame */ float lsp_mid[], /* i : LSPs in the middle of the frame */ float pitch_buf[NB_SUBFR16k], /* o : floating pitch for each subframe */ - const int16_t last_element_mode, /* i : last element mode */ - const int16_t vad_hover_flag /* i : VAD hangover flag */ + const int16_t last_element_mode, /* i : last element mode */ + const int16_t vad_hover_flag /* i : VAD hangover flag */ ) { TCX_ENC_HANDLE hTcxEnc; @@ -171,7 +175,7 @@ void stereo_tcx_core_enc( pF = fopen( "./res/stereo_tcx_enc_ind.txt", "w" ); #endif - wmops_sub_start( "stereo_tcx_core_enc" ); + push_wmops( "stereo_tcx_core_enc" ); /*Sanity check*/ assert( st->mdct_sw == MODE1 && "MDCT switching should be in TCX MODE 1\n" ); @@ -453,7 +457,7 @@ void stereo_tcx_core_enc( mvr2r( lsp_q, st->lsp_old, M ); } - if ( st->Opt_DTX_ON && !st->tcxonly ) + if ( st->Opt_DTX_ON && !st->tcxonly && st->hTdCngEnc != NULL ) { /* update CNG parameters in active frames */ if ( st->bwidth == NB && st->enableTcxLpc && st->core != ACELP_CORE ) @@ -547,7 +551,7 @@ void stereo_tcx_core_enc( set_f( pitch_buf, L_SUBFR, NB_SUBFR16k ); } - wmops_sub_end(); + pop_wmops(); return; } diff --git a/lib_enc/ivas_td_low_rate_enc.c b/lib_enc/ivas_td_low_rate_enc.c index 8714014347..de75faf2f9 100644 --- a/lib_enc/ivas_td_low_rate_enc.c +++ b/lib_enc/ivas_td_low_rate_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "ivas_cnst.h" #include "prot.h" #include "ivas_prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* diff --git a/lib_enc/lead_indexing.c b/lib_enc/lead_indexing.c index d97ccc6955..6208d66eb8 100644 --- a/lib_enc/lead_indexing.c +++ b/lib_enc/lead_indexing.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local function prototypes diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c index efbed2baf7..5b60da2759 100755 --- a/lib_enc/lib_enc.c +++ b/lib_enc/lib_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,10 +39,7 @@ #ifdef DEBUGGING #include "debug.h" #endif -#ifdef WMOPS -#include "wmops.h" -#endif - +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local struct @@ -64,6 +61,7 @@ struct IVAS_ENC bool ismMetadataProvided[MAX_NUM_OBJECTS]; bool maxBandwidthUser; /* Was a specific max bandwith selected by the user? */ IVAS_ENC_BANDWIDTH newBandwidthApi; /* maximum encoded bandwidth, as set on API level */ + bool extMetadataApi; /* External metadata requested, to be checked against current bit rate */ }; /*---------------------------------------------------------------------* @@ -78,7 +76,7 @@ static int16_t getInputBufferSize( const Encoder_Struct *st_ivas ); static ivas_error doCommonConfigureChecks( IVAS_ENC_HANDLE hIvasEnc ); static ivas_error doCommonSetterChecks( IVAS_ENC_HANDLE hIvasEnc ); static ivas_error sanitizeBandwidth( const IVAS_ENC_HANDLE hIvasEnc ); -static ivas_error sanitizeBitrateISM( const ENCODER_CONFIG_HANDLE hEncoderConfig ); +static ivas_error sanitizeBitrateISM( const ENCODER_CONFIG_HANDLE hEncoderConfig, const IVAS_ENC_HANDLE hIvasEnc ); static void init_encoder_config( ENCODER_CONFIG_HANDLE hEncoderConfig ); static void resetIsmMetadataProvidedFlags( IVAS_ENC_HANDLE hIvasEnc ); static ivas_error bandwidthApiToInternal( const IVAS_ENC_BANDWIDTH maxBandwidth, int16_t *internalMaxBandwidth ); @@ -114,9 +112,11 @@ ivas_error IVAS_ENC_Open( *-----------------------------------------------------------------*/ #ifdef BITSTREAM_INDICES_MEMORY - if ( ( *phIvasEnc = (IVAS_ENC_HANDLE) dynamic_malloc( sizeof( struct IVAS_ENC ) ) ) == NULL ) +#define WMC_TOOL_SKIP + if ( ( *phIvasEnc = (IVAS_ENC_HANDLE) malloc( sizeof( struct IVAS_ENC ) ) ) == NULL ) +#undef WMC_TOOL_SKIP #else - if ( ( *phIvasEnc = (IVAS_ENC_HANDLE) count_malloc( sizeof( struct IVAS_ENC ) ) ) == NULL ) + if ( ( *phIvasEnc = (IVAS_ENC_HANDLE) malloc( sizeof( struct IVAS_ENC ) ) ) == NULL ) #endif { return IVAS_ERR_FAILED_ALLOC; @@ -157,12 +157,12 @@ ivas_error IVAS_ENC_Open( * Allocate IVAS-codec encoder state *-----------------------------------------------------------------*/ - if ( ( ( *phIvasEnc )->st_ivas = (Encoder_Struct *) count_malloc( sizeof( Encoder_Struct ) ) ) == NULL ) + if ( ( ( *phIvasEnc )->st_ivas = (Encoder_Struct *) malloc( sizeof( Encoder_Struct ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for IVAS encoder structure" ); } - if ( ( ( *phIvasEnc )->st_ivas->hEncoderConfig = (ENCODER_CONFIG_HANDLE) count_malloc( sizeof( ENCODER_CONFIG ) ) ) == NULL ) + if ( ( ( *phIvasEnc )->st_ivas->hEncoderConfig = (ENCODER_CONFIG_HANDLE) malloc( sizeof( ENCODER_CONFIG ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for Encoder config structure" ); } @@ -213,18 +213,20 @@ void IVAS_ENC_Close( { if ( ( *phIvasEnc )->st_ivas->hEncoderConfig ) { - count_free( ( *phIvasEnc )->st_ivas->hEncoderConfig ); + free( ( *phIvasEnc )->st_ivas->hEncoderConfig ); ( *phIvasEnc )->st_ivas->hEncoderConfig = NULL; } - count_free( ( *phIvasEnc )->st_ivas ); + free( ( *phIvasEnc )->st_ivas ); } ( *phIvasEnc )->st_ivas = NULL; #ifdef BITSTREAM_INDICES_MEMORY - dynamic_free( *phIvasEnc ); +#define WMC_TOOL_SKIP + free( *phIvasEnc ); +#undef WMC_TOOL_SKIP #else - count_free( *phIvasEnc ); + free( *phIvasEnc ); #endif *phIvasEnc = NULL; @@ -365,7 +367,8 @@ ivas_error IVAS_ENC_ConfigureForObjects( const bool max_bwidth_user, /* i : shows if bandwidth limitation was set by the user (true) or if default bandwidth was used (false) */ const IVAS_ENC_BANDWIDTH maxBandwidth, /* i : bandwidth limitation */ const IVAS_ENC_DTX_CONFIG dtxConfig, /* i : configuration of DTX, can by set to default by using IVAS_ENC_GetDefaultDtxConfig() */ - const uint16_t numObjects /* i : number of objects to be encoded */ + const uint16_t numObjects, /* i : number of objects to be encoded */ + const bool ism_extended_metadata /* i : Extended metadata used (true/false), where extended metadata includes radius and orientation */ ) { Encoder_Struct *st_ivas; @@ -385,7 +388,9 @@ ivas_error IVAS_ENC_ConfigureForObjects( st_ivas->hEncoderConfig->ivas_format = ISM_FORMAT; st_ivas->hEncoderConfig->element_mode_init = IVAS_SCE; st_ivas->hEncoderConfig->nchan_inp = numObjects; - + st_ivas->hEncoderConfig->nchan_ism = numObjects; + st_ivas->hEncoderConfig->ism_extended_metadata_flag = ism_extended_metadata; + hIvasEnc->extMetadataApi = ( ism_extended_metadata == 1 ); hIvasEnc->maxBandwidthUser = max_bwidth_user; error = configureEncoder( hIvasEnc, inputFs, bitrate, maxBandwidth, dtxConfig, IVAS_ENC_GetDefaultChannelAwareConfig() ); @@ -425,7 +430,8 @@ ivas_error IVAS_ENC_FeedObjectMetadata( return IVAS_ERR_INDEX_OUT_OF_BOUNDS; } - error = set_ism_metadata( hIvasEnc->st_ivas->hIsmMetaData[ismIndex], metadata.azimuth, metadata.elevation ); + error = ivas_set_ism_metadata( hIvasEnc->st_ivas->hIsmMetaData[ismIndex], metadata.azimuth, metadata.elevation, metadata.radius, metadata.yaw, metadata.pitch ); + if ( error != IVAS_ERR_OK ) { return error; @@ -775,7 +781,7 @@ static ivas_error configureEncoder( } else if ( hEncoderConfig->ivas_format == ISM_FORMAT ) { - if ( ( error = sanitizeBitrateISM( hEncoderConfig ) ) != IVAS_ERR_OK ) + if ( ( error = sanitizeBitrateISM( hEncoderConfig, hIvasEnc ) ) != IVAS_ERR_OK ) { return error; } @@ -873,8 +879,7 @@ static ivas_error configureEncoder( } if ( hEncoderConfig->Opt_DTX_ON && hEncoderConfig->ivas_format != MONO_FORMAT && - ( ( hEncoderConfig->ivas_format == ISM_FORMAT && hEncoderConfig->nchan_inp > 1 ) || // ToDo: see Issue 113 - ( hEncoderConfig->ivas_format == MASA_FORMAT && hEncoderConfig->ivas_total_brate > IVAS_128k ) || // ToDo: remove the bitrate limitation + ( ( hEncoderConfig->ivas_format == MASA_FORMAT && hEncoderConfig->ivas_total_brate > IVAS_128k ) || // ToDo: remove the bitrate limitation ( hEncoderConfig->ivas_format == SBA_FORMAT && ivas_get_sba_num_TCs( hEncoderConfig->ivas_total_brate, 1 ) > 2 ) || // ToDo: support for 3+ TCs to be done hEncoderConfig->ivas_format == MC_FORMAT // ToDo: TBD ) ) @@ -883,7 +888,11 @@ static ivas_error configureEncoder( } #ifdef DEBUG_AGC_ENCODER_CMD_OPTION +#ifndef LBR_SBA if ( hEncoderConfig->Opt_AGC_ON == SBA_AGC_FORCE_ENABLE && !( hEncoderConfig->ivas_format == SBA_FORMAT && ivas_sba_mode_select( hEncoderConfig->ivas_total_brate ) == SBA_MODE_SPAR ) ) +#else + if ( hEncoderConfig->Opt_AGC_ON == SBA_AGC_FORCE_ENABLE && !( hEncoderConfig->ivas_format == SBA_FORMAT && ivas_sba_mode_select() == SBA_MODE_SPAR ) ) +#endif { return IVAS_ERROR( IVAS_ERR_NOT_SUPPORTED_OPTION, "AGC supported in SBA format at bitrates >= 24.4 kbps only." ); } @@ -908,6 +917,7 @@ static ivas_error configureEncoder( return error; } + if ( hEncoderConfig->ivas_format == MONO_FORMAT ) { hIvasEnc->hCoreCoder = st_ivas->hSCE[0]->hCoreCoder[0]; /* Note: this is needed for switching in EVS mono */ @@ -952,9 +962,9 @@ ivas_error IVAS_ENC_GetDelay( } #ifdef SPLIT_REND_WITH_HEAD_ROT - *delay = NS2SA( hEncoderConfig->input_Fs, get_delay( ENC, hEncoderConfig->input_Fs, hEncoderConfig->ivas_format, NULL, RENDERER_DISABLE, 0, AUDIO_CONFIG_INVALID ) ); + *delay = NS2SA( hEncoderConfig->input_Fs, get_delay( ENC, hEncoderConfig->input_Fs, hEncoderConfig->ivas_format, NULL, AUDIO_CONFIG_INVALID ) ); #else - *delay = NS2SA( hEncoderConfig->input_Fs, get_delay( ENC, hEncoderConfig->input_Fs, hEncoderConfig->ivas_format, NULL, RENDERER_DISABLE, 0 ) ); + *delay = NS2SA( hEncoderConfig->input_Fs, get_delay( ENC, hEncoderConfig->input_Fs, hEncoderConfig->ivas_format, NULL ) ); #endif *delay *= hEncoderConfig->nchan_inp; @@ -976,6 +986,31 @@ static int16_t getInputBufferSize( return (int16_t) ( st_ivas->hEncoderConfig->input_Fs * st_ivas->hEncoderConfig->nchan_inp / FRAMES_PER_SEC ); } +/*---------------------------------------------------------------------* + * IVAS_ENC_GetNumInChannels() + * + * + *---------------------------------------------------------------------*/ +ivas_error IVAS_ENC_GetNumInChannels( + const IVAS_ENC_HANDLE hIvasEnc, /* i/o: IVAS encoder handle */ + int16_t *numInChannels /* o : total number of samples expected in the input buffer for current encoder configuration */ +) +{ + if ( hIvasEnc == NULL || numInChannels == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + if ( !hIvasEnc->isConfigured ) + { + return IVAS_ERR_NOT_CONFIGURED; + } + + *numInChannels = hIvasEnc->st_ivas->hEncoderConfig->nchan_inp; + + return IVAS_ERR_OK; +} + /*---------------------------------------------------------------------* * IVAS_ENC_GetInputBufferSize() @@ -1493,11 +1528,11 @@ static ivas_error printConfigInfo_enc( { if ( hEncoderConfig->ivas_total_brate <= ACELP_32k && hEncoderConfig->nchan_inp > 2 ) { - fprintf( stdout, "IVAS format: Param-ISm (%i streams)\n", hEncoderConfig->nchan_inp ); + fprintf( stdout, "IVAS format: Param-ISM (%i streams)\n", hEncoderConfig->nchan_inp ); } else { - fprintf( stdout, "IVAS format: ISm (%i streams)\n", hEncoderConfig->nchan_inp ); + fprintf( stdout, "IVAS format: ISM (%i streams)\n", hEncoderConfig->nchan_inp ); } } else if ( hEncoderConfig->ivas_format == SBA_FORMAT ) @@ -1699,7 +1734,7 @@ static ivas_error setBitrate( if ( hEncoderConfig->ivas_format == ISM_FORMAT ) { - if ( ( error = sanitizeBitrateISM( hEncoderConfig ) ) != IVAS_ERR_OK ) + if ( ( error = sanitizeBitrateISM( hEncoderConfig, hIvasEnc ) ) != IVAS_ERR_OK ) { return error; } @@ -1938,26 +1973,46 @@ static ivas_error sanitizeBandwidth( *---------------------------------------------------------------------*/ static ivas_error sanitizeBitrateISM( - const ENCODER_CONFIG_HANDLE hEncoderConfig ) + const ENCODER_CONFIG_HANDLE hEncoderConfig, + const IVAS_ENC_HANDLE hIvasEnc ) { - if ( hEncoderConfig->ivas_total_brate > IVAS_256k ) + if ( hEncoderConfig->ivas_total_brate > IVAS_128k && hEncoderConfig->nchan_inp == 1 ) + { + return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too high bitrate for 1 ISM specified in IVAS: %d", hEncoderConfig->ivas_total_brate ); + } + + if ( hEncoderConfig->ivas_total_brate > IVAS_256k && hEncoderConfig->nchan_inp == 2 ) { - return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too high bitrate for ISm specified in IVAS: %d", hEncoderConfig->ivas_total_brate ); + return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too high bitrate for 2 ISM specified in IVAS: %d", hEncoderConfig->ivas_total_brate ); + } + + if ( hEncoderConfig->ivas_total_brate > IVAS_384k && hEncoderConfig->nchan_inp == 3 ) + { + return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too high bitrate for 3 ISM specified in IVAS: %d", hEncoderConfig->ivas_total_brate ); } if ( hEncoderConfig->ivas_total_brate < IVAS_16k4 && hEncoderConfig->nchan_inp == 2 ) { - return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too low bitrate for 2 ISm specified in IVAS: %d", hEncoderConfig->ivas_total_brate ); + return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too low bitrate for 2 ISM specified in IVAS: %d", hEncoderConfig->ivas_total_brate ); } if ( hEncoderConfig->ivas_total_brate < IVAS_24k4 && hEncoderConfig->nchan_inp == 3 ) { - return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too low bitrate for 3 ISm specified in IVAS: %d", hEncoderConfig->ivas_total_brate ); + return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too low bitrate for 3 ISM specified in IVAS: %d", hEncoderConfig->ivas_total_brate ); } if ( hEncoderConfig->ivas_total_brate < IVAS_24k4 && hEncoderConfig->nchan_inp == 4 ) { - return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too low bitrate for 4 ISm specified in IVAS: %d", hEncoderConfig->ivas_total_brate ); + return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too low bitrate for 4 ISM specified in IVAS: %d", hEncoderConfig->ivas_total_brate ); + } + + if ( hIvasEnc->extMetadataApi ) + { + hEncoderConfig->ism_extended_metadata_flag = ( hEncoderConfig->ivas_total_brate >= ISM_EXTENDED_METADATA_BRATE ); + } + else + { + hEncoderConfig->ism_extended_metadata_flag = 0; } return IVAS_ERR_OK; @@ -2215,8 +2270,10 @@ static void init_encoder_config( hEncoderConfig->var_SID_rate_flag = 1; hEncoderConfig->mc_input_setup = MC_LS_SETUP_INVALID; hEncoderConfig->stereo_dmx_evs = 0; + hEncoderConfig->nchan_ism = 0; hEncoderConfig->sba_order = 0; hEncoderConfig->sba_planar = 0; + hEncoderConfig->ism_extended_metadata_flag = 0; #ifdef DEBUGGING hEncoderConfig->stereo_mode_cmdl = 0; hEncoderConfig->force = -1; diff --git a/lib_enc/lib_enc.h b/lib_enc/lib_enc.h index dbcb21c989..349c41ebef 100644 --- a/lib_enc/lib_enc.h +++ b/lib_enc/lib_enc.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -34,9 +34,7 @@ #define LIB_ENC_H #include "common_api_types.h" -#include "ivas_error.h" #include -#include /*---------------------------------------------------------------------* @@ -182,7 +180,8 @@ ivas_error IVAS_ENC_ConfigureForObjects( const bool max_bwidth_user, /* i : shows if bandwidth limitation was set by the user (true) or if default bandwidth was used (false) */ const IVAS_ENC_BANDWIDTH maxBandwidth, /* i : bandwidth limitation */ const IVAS_ENC_DTX_CONFIG dtxConfig, /* i : configuration of DTX, can by set to default by using IVAS_ENC_GetDefaultDtxConfig() */ - const uint16_t numObjects /* i : number of objects to be encoded */ + const uint16_t numObjects, /* i : number of objects to be encoded */ + const bool ism_extended_metadata /* i : Extended metadata used (true/false), where extended metadata includes radius and orientation */ ); /*! r: error code */ @@ -300,6 +299,12 @@ ivas_error IVAS_ENC_GetDelay( int16_t *delay /* o : encoder delay */ ); +/*! r: encoder error code */ +ivas_error IVAS_ENC_GetNumInChannels( + const IVAS_ENC_HANDLE hIvasEnc, /* i/o: IVAS encoder handle */ + int16_t *numInChannels /* o : total number of samples expected in the input buffer for current encoder configuration */ +); + /*! r: encoder error code */ ivas_error IVAS_ENC_GetInputBufferSize( const IVAS_ENC_HANDLE hIvasEnc, /* i/o: IVAS encoder handle */ diff --git a/lib_enc/long_enr.c b/lib_enc/long_enr.c index 3dc098af61..c520c642c7 100644 --- a/lib_enc/long_enr.c +++ b/lib_enc/long_enr.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * long_enr() @@ -67,6 +67,7 @@ void long_enr( * Compute long term estimate of total noise energy * and total active speech energy *-----------------------------------------------------------------*/ + if ( hFrontVad != NULL ) { if ( hFrontVad[0]->ini_frame < 4 ) @@ -114,6 +115,12 @@ void long_enr( } } } + + /* Update */ + for ( n = 0; n < n_chan; n++ ) + { + hFrontVad[n]->hNoiseEst->Etot_last = Etot_LR[n]; + } } else { @@ -150,6 +157,9 @@ void long_enr( } } } + + /* Update */ + st->hNoiseEst->Etot_last = Etot; } return; diff --git a/lib_enc/lp_exc_e.c b/lib_enc/lp_exc_e.c index e8078c5e0e..4fb81a9b75 100644 --- a/lib_enc/lp_exc_e.c +++ b/lib_enc/lp_exc_e.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_enc/lsf_enc.c b/lib_enc/lsf_enc.c index 8e561c76e8..62e93912ed 100644 --- a/lib_enc/lsf_enc.c +++ b/lib_enc/lsf_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -49,7 +49,7 @@ #include "ivas_prot.h" #include "ivas_rom_com.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------* * Local constants @@ -185,8 +185,7 @@ void lsf_enc( *-------------------------------------------------------------------------------------*/ #ifdef LSF_RE_USE_SECONDARY_CHANNEL - lsf_end_enc( st, lsf_new, lsf_new, nBits, coder_type, force_sf, param_lpc, &no_param_lpc, NULL, st->coder_type_raw, - tdm_lsfQ_PCh ); + lsf_end_enc( st, lsf_new, lsf_new, nBits, coder_type, force_sf, param_lpc, &no_param_lpc, NULL, st->coder_type_raw, tdm_lsfQ_PCh ); #else lsf_end_enc( st, lsf_new, lsf_new, nBits, coder_type, force_sf, param_lpc, &no_param_lpc, NULL, st->coder_type_raw ); #endif @@ -734,7 +733,6 @@ void lsf_end_enc( /* AR inter-frame prediction */ lsf_allocate( nBits - 1, mode_lvq, mode_lvq_p, &dummy, &stages1, dummy_v, levels1, dummy_v, bits1 ); - Err[1] = vq_lvq_lsf_enc( 2, mode_lvq_p, Tmp, levels1, stages1, wghts, Idx1, lsf, pred2, resq, lsfq ); if ( Err[0] * ( st->streaklimit ) < PREFERSFNET * Err[1] ) @@ -751,6 +749,7 @@ void lsf_end_enc( } } #endif + /*--------------------------------------------------------------------------* * Write indices to array *--------------------------------------------------------------------------*/ @@ -758,11 +757,13 @@ void lsf_end_enc( if ( st->codec_mode == MODE1 && st->core == ACELP_CORE ) { /* write coder_type bit for VOICED@16kHz or GENERIC@16kHz */ - if ( coder_type_org == GENERIC && st->sr_core == INT_FS_16k #ifdef LSF_RE_USE_SECONDARY_CHANNEL - && ( st->idchan == 0 ) -#endif + if ( coder_type_org == GENERIC && st->sr_core == INT_FS_16k && st->idchan == 0 + ) +#else + if ( coder_type_org == GENERIC && st->sr_core == INT_FS_16k ) +#endif { /* VOICED =2 and GENERIC=3, so "coder_type-2" means VOICED =0 and GENERIC=1*/ push_indice( hBstr, IND_LSF_PREDICTOR_SELECT_BIT, coder_type - 2, 1 ); diff --git a/lib_enc/lsf_msvq_ma_enc.c b/lib_enc/lsf_msvq_ma_enc.c index bf115aa671..4735b0a651 100644 --- a/lib_enc/lsf_msvq_ma_enc.c +++ b/lib_enc/lsf_msvq_ma_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,16 +44,22 @@ #include "rom_com.h" #include "rom_enc.h" #include "basop_proto_func.h" -#include "wmops.h" +#include "wmc_auto.h" #define kMaxC 8 + +#ifdef ERI_FDCNGVQ_LOW_ROM + +#include "ivas_prot.h" +void dctT2_N_apply_matrix( const float *input, float *output, const int16_t dct_dim, int16_t fdcngvq_dim, const float *idctT2_24_X_matrixQ16, const int16_t matrix_1st_dim, DCTTYPE dcttype ); +#endif + /*--------------------------------------------------------------------------* * msvq_enc() * * MSVQ encoder *--------------------------------------------------------------------------*/ - void msvq_enc( const float *const *cb, /* i : Codebook (indexed cb[*stages][levels][p]) */ const int16_t dims[], /* i : Dimension of each codebook stage (NULL: full dim.) */ @@ -66,7 +72,11 @@ void msvq_enc( const float w[], /* i : Weights */ const int16_t N, /* i : Vector dimension */ const int16_t maxN, /* i : Codebook dimension */ - int16_t Idx[] /* o : Indices */ +#ifdef ERI_FDCNGVQ_LOW_ROM + const int16_t applyDCT_flag, /* i : applyDCT flag */ + float *invTrfMatrix, /*i/o : synthesis matrix */ +#endif + int16_t Idx[] /* o : Indices */ ) { float *resid[2], *dist[2]; @@ -78,8 +88,46 @@ void msvq_enc( int16_t idx_buf[2 * LSFMBEST_MAX * MAX_VQ_STAGES_USED], parents[LSFMBEST_MAX]; int16_t n, maxn, start; + +#ifdef ERI_FDCNGVQ_LOW_ROM + /* buffers */ + float dct_target[FDCNG_VQ_DCT_MAXTRUNC]; + float u_mr[FDCNG_VQ_MAX_LEN]; + float u_mr_scaled[FDCNG_VQ_MAX_LEN]; + float mse_trunc_all_segms; + float mse_trunc_segm[FDCNG_VQ_DCT_NSEGM]; + float mse; + + const Word8 *cbpW8; + const Word16 *dct_col_shift_tab; + + float *st1_mse_pair; + int16_t *st1_idx_pair; + int16_t indices_st1_local[FDCNG_VQ_DCT_NSEGM * 2]; /* after stage#1 DCT search this is copied to the global indices[1][s*stages] structure */ + int16_t n_ana, p_mins[2], idx_min[2]; + DCTTYPE dcttype = DCT_T2_24_XX; + float tmp2; + + int16_t check_ind[FDCNG_VQ_DCT_NPOST]; + int16_t segm, j_full, maxC_pre; + float *st1_syn_vec_ptr; /* 8* 24 floats in dynRAM */ + float *st1_mse_ptr; /* 2^7 == 128 floats in existing dRAM used for stage 1 candidate analysis, 128 Word32 in BASOP */ + float res24, high_diff[FDCNG_VQ_MAX_LEN - FDCNG_VQ_MAX_LEN_WB]; + + maxC_pre = ( FDCNG_VQ_DCT_NSEGM * 2 ); + assert( maxC <= LSFMBEST_MAX ); + assert( ( LSFMBEST_MAX * M_MAX ) > ( N * maxC ) ); + /* top of resid_buf is resid[1] and used for stage#1 residuals (input target u), + we here reuse resid[0] part of the buffer for stage#1 DCT dynamic RAM needs + */ + st1_mse_ptr = &( resid_buf[1 * LSFMBEST_MAX * M_MAX] ) - ( levels[0] ); /* reuse top of residual resid[0] scratch RAM for stage1 MSEs */ + st1_syn_vec_ptr = &( resid_buf[1 * LSFMBEST_MAX * M_MAX] ) - FDCNG_VQ_MAX_LEN * maxC; /* reuse top of resid[0] scratch RAM for residual */ + + dcttype = DCT_T2_24_XX; +#endif + /*----------------------------------------------------------------* - * Allocate memory for previous (parent) and current nodes. + * Allocate memory for previous (parent) and current nodes. * Parent node is indexed [0], current node is indexed [1]. *----------------------------------------------------------------*/ @@ -120,14 +168,14 @@ void msvq_enc( cb_stage = cbp; /* Set up pointers to parent and current nodes */ -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP swap( indices[0], indices[1], int16_t * ); MOVE( 3 ); swap( resid[0], resid[1], float * ); MOVE( 3 ); swap( dist[0], dist[1], float * ); MOVE( 3 ); -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP /* p_max points to maximum distortion node (worst of best) */ p_max = 0; @@ -159,7 +207,173 @@ void msvq_enc( { dist[1][j] = FLT_MAX; } - if ( !s ) /* means: m==1 */ + +#ifdef ERI_FDCNGVQ_LOW_ROM + if ( !s && applyDCT_flag != 0 ) /* means: m==1 */ + { /* stage 1 search in truncated dct domain without any weights */ + + n_ana = FDCNG_VQ_MAX_LEN; /* VQ stage#1 core is always using stored DCT24 coeffs */ + /*remove mean/mid fdcng stage#1 vector, in original subband domain */ + v_sub( u, cdk1r_tr_midQ_truncQ, u_mr, n_ana ); + + v_multc( u_mr, fdcng_dct_invScaleF[1], u_mr_scaled, n_ana ); /*scale up target to upscaled W8x storage domain */ + /* 16.0-->scale up from Q0 to search domain in Q4, not really needed in BASOP , impl. by shifts */ + + assert( n_ana >= FDCNG_VQ_DCT_MAXTRUNC ); /* check for WB , SWB, FB operation */ + + dctT2_N_apply_matrix( (const float *) u_mr_scaled, dct_target, min( FDCNG_VQ_DCT_MAXTRUNC, n_ana ), n_ana, invTrfMatrix, FDCNG_VQ_DCT_MAXTRUNC, dcttype ); + + mse_trunc_all_segms = 0; + mse = 0; + + /* init search state ptr's at the top */ + for ( segm = 0; segm < FDCNG_VQ_DCT_NSEGM; segm++ ) + { + /* point to a new paired location */ + st1_mse_pair = &( dist[1][2 * segm] ); /* req. ptr init +=2 */ + st1_mse_pair[0] = FLT_MAX; /* req */ + st1_mse_pair[1] = FLT_MAX; /* req */ + st1_idx_pair = &( indices_st1_local[2 * segm] ); /* +=2 */ + p_max = 0; /* req. to point to 1 or 0 */ + + /* compute segment common trunction error in dct domain */ + mse_trunc_segm[segm] = mse_trunc_all_segms; + mse_trunc_segm[segm] += sum2_f( (const float *) ( &( dct_target[cdk1_ivas_cols_per_segment[segm]] ) ), cdk1_ivas_trunc_dct_cols_per_segment[segm] ); + + cbpW8 = cdk_37bits_ivas_stage1_W8Qx_dct_sections[segm]; /* Word8 column variable Qx storage*/ + + for ( j = 0; j < cdk1_ivas_entries_per_segment[segm]; j++ ) + { + /* unweighted segmented search DCT domain loop */ + j_full = j + cdk1_ivas_cum_entries_per_segment[segm]; /* or simply use j_full++ */ + + mse = mse_trunc_segm[segm]; /* move32() init mse with with common mse truncation part */ + + dct_col_shift_tab = stage1_dct_col_syn_shift[segm]; /* ptr init */ + + for ( c2 = 0; c2 < cdk1_ivas_cols_per_segment[segm]; c2++ ) + { + +#define WMC_TOOL_SKIP + tmp = dct_target[c2] - (float) ( ( (Word16) cbpW8[c2] ) << dct_col_shift_tab[c2] ); /* Word8 storage MSE inner loop */ + LOGIC( 1 ); + SHIFT( 1 ); + ADD( 1 ); /* in BASOP: s_and(for W8->W16), shl(), sub()*/ +#undef WMC_TOOL_SKIP + + mse += tmp * tmp; /* L_mac or L_mac0() square Word16 -> Word32*/ + } + st1_mse_ptr[j_full] = mse; /* save MSE in shared dynamic 2^7=128 RAM, move32() in BASOP */ + +#define WMC_TOOL_SKIP + cbpW8 += cdk1_ivas_cols_per_segment[segm]; /* pointer increment */ +#undef WMC_TOOL_SKIP + /* overwrite with a new worst index at p_max */ + +#ifdef ERI_FDCNGVQ_LOW_ROM + /* The three inner loop if's below are not really properly instrumented by WMC tool */ + /* a ptr to worst index will be in use */ +#endif + if ( mse < st1_mse_pair[p_max] ) /* L_sub */ + { + st1_idx_pair[p_max] = j_full; /* simplified */ + } /* BASOP 2 ops */ + + if ( st1_idx_pair[p_max] == j_full ) /* simplified */ + { /*idx updated to j_full --> also update mse */ + st1_mse_pair[p_max] = mse; /* move32(), single BASOP */ + } /* BASOP 3 ops */ + /* avoid WC costly list management by always updating p_max, as we have only a pair to maintain */ + p_max = 0; /* move16() */ + if ( ( st1_mse_pair[0] - st1_mse_pair[1] ) < 0 ) /* L_sub()*/ + { + p_max = 1; /* move16() */ + } /* BASOP 3 ops ,Note 2 ops possible in BASOP with L_sub and L_lshr */ + + /* Note: logical shift right not available in ANSI-C */ + /* p_max = (st1_mse_pair[0] - st1_mse_pair[1]) ">>>" 31; */ + /* in java logical shift right is available as >>> , in BASOP it is L_lshr */ + + /* Cost: weighted sum with cond moves ('if') => 8 in float , 7 in BASOP with L_lshr */ + } /* j in section */ + + } /* next segment */ + + for ( j = 0; j < maxC_pre; j++ ) + { + /* compute_full mse using stored DCT24 domain MSE's */ + /* calculate MSE from stage1 inner using existing inner DCT domain variables */ + dist[1][j] *= fdcng_dct_scaleF[2]; /* single multiplication to get the MSE scale to the correct input domain */ + } + + p_max = maximum( dist[1], maxC_pre, NULL ); /* establish current worst candidate for stage#2 among all maxC_pre candidates */ + + p_mins[0] = minimum( dist[1], maxC_pre, NULL ); /* find best entry among all maxC_pre */ + tmp = dist[1][p_mins[0]]; + dist[1][p_mins[0]] = FLT_MAX; /* exclude 1st */ + + p_mins[1] = minimum( dist[1], maxC_pre, NULL ); /* find 2nd best entry */ + tmp2 = dist[1][p_mins[1]]; + dist[1][p_mins[1]] = FLT_MAX; /* exclude 2nd*/ + + dist[1][p_mins[0]] = tmp; /* restore 1st */ + dist[1][p_mins[1]] = tmp2; /* restore 2nd */ + + idx_min[0] = indices_st1_local[p_mins[0]]; + idx_min[1] = indices_st1_local[p_mins[1]]; + + + /* use global exclusion list to never reselect the two (best) mse values sofar */ + st1_mse_ptr[idx_min[0]] = FLT_MAX; /* move32() */ + st1_mse_ptr[idx_min[1]] = FLT_MAX; /* move32() */ + + /* circular MSE-neigbour list in use to potentially replace some segment search candidates */ + /* using both 1st and 2nd best neighbours in fwd and rev directions */ + check_ind[0] = cdk1_ivas_segm_neighbour_fwd[idx_min[0]]; + check_ind[1] = cdk1_ivas_segm_neighbour_rev[idx_min[0]]; + + check_ind[2] = cdk1_ivas_segm_neighbour_fwd[idx_min[1]]; + check_ind[3] = cdk1_ivas_segm_neighbour_rev[idx_min[1]]; + + check_ind[4] = cdk1_ivas_segm_neighbour_fwd[check_ind[0]]; + check_ind[5] = cdk1_ivas_segm_neighbour_rev[check_ind[1]]; + + check_ind[6] = cdk1_ivas_segm_neighbour_fwd[check_ind[2]]; + check_ind[7] = cdk1_ivas_segm_neighbour_rev[check_ind[3]]; + + for ( i = 0; i < FDCNG_VQ_DCT_NPOST; i++ ) + { + float check_mse = st1_mse_ptr[check_ind[i]] * fdcng_dct_scaleF[2]; + /* *= fdcng_dct_scaleF[2]; */ /* multiplication in use to get the float outer loop scale correct */ + + if ( check_mse < dist[1][p_max] ) + { + /* new winner , replace */ + dist[1][p_max] = check_mse; + indices_st1_local[p_max] = check_ind[i]; + st1_mse_ptr[check_ind[i]] = FLT_MAX; /* BASOP: move32() */ + p_max = maximum( dist[1], maxC_pre, NULL ); /* establish a new current worst candidate among all maxC */ + } + } + + for ( c = 0; c < maxC_pre; c++ ) + { + indices[1][c * stages] = indices_st1_local[c]; /* move established stage#1 indices to global MSVQ list structure */ + } + + /* extract the selected stage one vectors in DCT domain , apply IDCT_N and scale up */ + /*always extract full length signal(24) to be able to update WB( N==21) candidate MSE values */ + for ( c = 0; c < maxC_pre; c++ ) + { + dec_FDCNG_MSVQ_stage1( indices_st1_local[c], FDCNG_VQ_MAX_LEN, invTrfMatrix, dcttype + 1, &( st1_syn_vec_ptr[c * FDCNG_VQ_MAX_LEN] ), NULL ); + } + + assert( maxC == maxC_pre ); + } + else + /* non-DCT Stage #1 code below */ +#endif + if ( !s ) /* means: m==1 */ { /* This loop is identical to the one below, except, that the inner loop over c=0..m is hardcoded to c=0, since m=1. */ @@ -202,9 +416,16 @@ void msvq_enc( } } /* if (tmp <= dist[1][p_max]) */ } /* for (j=0; j #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * ltd_stable() diff --git a/lib_enc/mdct_classifier.c b/lib_enc/mdct_classifier.c index ae7e6f7e3f..f26b127733 100644 --- a/lib_enc/mdct_classifier.c +++ b/lib_enc/mdct_classifier.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" #include diff --git a/lib_enc/mdct_selector.c b/lib_enc/mdct_selector.c index 1f118d23d2..45f3d3174c 100644 --- a/lib_enc/mdct_selector.c +++ b/lib_enc/mdct_selector.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "rom_enc.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------* * Local constants diff --git a/lib_enc/mslvq_enc.c b/lib_enc/mslvq_enc.c index 3c910cbf06..e4e98ea1e6 100644 --- a/lib_enc/mslvq_enc.c +++ b/lib_enc/mslvq_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "prot.h" #include "rom_com.h" #include "cnst.h" -#include "wmops.h" +#include "wmc_auto.h" #include "ivas_prot.h" /*-----------------------------------------------------------------* diff --git a/lib_enc/multi_harm.c b/lib_enc/multi_harm.c index 4427b3376c..c53371e28d 100644 --- a/lib_enc/multi_harm.c +++ b/lib_enc/multi_harm.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------* * Local constants diff --git a/lib_enc/nelp_enc.c b/lib_enc/nelp_enc.c index 8f8f407749..a1ae3c20d7 100644 --- a/lib_enc/nelp_enc.c +++ b/lib_enc/nelp_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * quantize_uvg() diff --git a/lib_enc/nois_est.c b/lib_enc/nois_est.c index b8d551a738..50dab41028 100644 --- a/lib_enc/nois_est.c +++ b/lib_enc/nois_est.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------* * Local constants @@ -232,7 +232,7 @@ void noise_est_pre( /*-----------------------------------------------------------------* * noise_est_down() * - * Down-ward noise udatation routine + * Down-ward noise updatation routine * Total Noise computation, relative frame Energy computation * Noise energy update - here, the energy is updated only if it is * decreasing to improve noise suppression. Otherwise, the noise @@ -298,6 +298,7 @@ void noise_est_down( *------------------------------------------------------------------*/ Etot_v = (float) fabs( *Etot_last - Etot ); + *Etot_v_h2 = ( 1.0f - 0.02f ) * *Etot_v_h2 + 0.02f * min( 3.0f, Etot_v ); if ( *Etot_v_h2 < 0.1f ) { diff --git a/lib_enc/noise_adjust.c b/lib_enc/noise_adjust.c index 5d592d071b..0ba9bd4537 100644 --- a/lib_enc/noise_adjust.c +++ b/lib_enc/noise_adjust.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * noise_adjust() diff --git a/lib_enc/normalizecoefs.c b/lib_enc/normalizecoefs.c index 7e039f171e..bd24f2cd2b 100644 --- a/lib_enc/normalizecoefs.c +++ b/lib_enc/normalizecoefs.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------------- * normalizecoefs() diff --git a/lib_enc/peak_vq_enc.c b/lib_enc/peak_vq_enc.c index a77f071112..efdd0b14a9 100644 --- a/lib_enc/peak_vq_enc.c +++ b/lib_enc/peak_vq_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" #include /*-------------------------------------------------------------------------- diff --git a/lib_enc/pit_enc.c b/lib_enc/pit_enc.c index 454da71966..d8d51e2a1b 100644 --- a/lib_enc/pit_enc.c +++ b/lib_enc/pit_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "prot.h" #include "rom_enc.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------* * pit_encode() diff --git a/lib_enc/pitch_ol.c b/lib_enc/pitch_ol.c index 72d454fd30..8f149a35d8 100644 --- a/lib_enc/pitch_ol.c +++ b/lib_enc/pitch_ol.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #include "cnst.h" #include "rom_com.h" #include "rom_enc.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local constants diff --git a/lib_enc/pitch_ol2.c b/lib_enc/pitch_ol2.c index 13f5bd33de..bc414158e1 100644 --- a/lib_enc/pitch_ol2.c +++ b/lib_enc/pitch_ol2.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_enc.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local constants diff --git a/lib_enc/plc_enc_ext.c b/lib_enc/plc_enc_ext.c index 70b573c5a9..8e5cfc382d 100644 --- a/lib_enc/plc_enc_ext.c +++ b/lib_enc/plc_enc_ext.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,11 +37,10 @@ #include #include "options.h" #include "prot.h" -#include "typedef.h" #include "stat_enc.h" #include "cnst.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" #define NBITS_GACELP 5 diff --git a/lib_enc/ppp_enc.c b/lib_enc/ppp_enc.c index f2c6f4e2bd..d55cb135dd 100644 --- a/lib_enc/ppp_enc.c +++ b/lib_enc/ppp_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* @@ -355,7 +355,7 @@ ivas_error ppp_quarter_encoder( push_indice( hBstr, IND_GLOBAL_ALIGNMENT, (int16_t) ( tmp + 3 ), 3 ); - dynamic_free( PREVDTFS ); + free( PREVDTFS ); return error; } diff --git a/lib_enc/pre_proc.c b/lib_enc/pre_proc.c index 7fb89690f1..4c4bf68674 100644 --- a/lib_enc/pre_proc.c +++ b/lib_enc/pre_proc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "rom_enc.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* @@ -59,7 +59,6 @@ void pre_proc( float old_inp_16k[], /* i/o: buffer of old input signal @ 16kHz */ float **inp, /* o : ptr. to inp. signal in the current frame*/ float fr_bands[2 * NB_BANDS], /* i : energy in frequency bands */ - float *Etot, /* i : total energy */ float *ener, /* o : residual energy from Levinson-Durbin */ #ifndef FIX_I4_OL_PITCH int16_t pitch_orig[3], /* o : open-loop pitch values for quantization */ @@ -84,6 +83,7 @@ void pre_proc( float old_wsp[L_WSP], *wsp; /* weighted input signal buffer */ float pitch_fr[NB_SUBFR]; /* fractional pitch values */ float voicing_fr[NB_SUBFR]; /* fractional pitch gains */ + float Etot; /* total energy */ float lf_E[2 * VOIC_BINS]; /* per bin spectrum energy in lf */ float tmpN[NB_BANDS]; /* Temporary noise update */ float tmpE[NB_BANDS]; /* Temporary averaged energy of 2 sf. */ @@ -118,7 +118,7 @@ void pre_proc( int16_t clas_mod; int16_t old_pitch1; - wmops_sub_start( "pre_proc" ); + push_wmops( "pre_proc" ); /*------------------------------------------------------------------* * Initialization @@ -190,14 +190,16 @@ void pre_proc( * Spectral analysis *--------------------------------------------------------------------------*/ - analy_sp( -1, NULL, st->input_Fs, inp_12k8, st->Bin_E, st->Bin_E_old, fr_bands, lf_E, Etot, st->min_band, st->max_band, band_energies, PS, fft_buff ); + analy_sp( -1, NULL, st->input_Fs, inp_12k8, st->Bin_E, st->Bin_E_old, fr_bands, lf_E, &Etot, st->min_band, st->max_band, band_energies, PS, fft_buff ); /*----------------------------------------------------------------* * SAD (1-signal, 0-noise) *----------------------------------------------------------------*/ - noise_est_pre( *Etot, st->ini_frame, st->hNoiseEst, 0, EVS_MONO, EVS_MONO ); + noise_est_pre( Etot, st->ini_frame, st->hNoiseEst, 0, EVS_MONO, EVS_MONO ); + st->vad_flag = wb_vad( st, fr_bands, &noisy_speech_HO, &clean_speech_HO, &NB_speech_HO, &snr_sum_he, &localVAD_HE_SAD, &( st->flag_noisy_speech_snr ), NULL, NULL, -1000.0f, -1000.0f ); + vad_flag_cldfb = vad_proc( realBuffer, imagBuffer, enerBuffer, st->cldfbAnaEnc->no_channels, st->hVAD_CLDFB, &cldfb_addition, st->vad_flag ); if ( st->Pos_relE_cnt < 20 ) /* Ensure the level is high enough and cldfb decision is reliable */ @@ -211,18 +213,14 @@ void pre_proc( st->vad_flag = vad_flag_cldfb; } - vad_flag_dtx = dtx_hangover_addition( st, st->vad_flag, st->lp_speech - st->lp_noise, cldfb_addition, vad_hover_flag, NULL, NULL -#ifdef FIX_ITD_CNG - , - NULL -#endif - ); + vad_flag_dtx = dtx_hangover_addition( st, st->vad_flag, st->lp_speech - st->lp_noise, cldfb_addition, vad_hover_flag, NULL, NULL, NULL ); /*----------------------------------------------------------------* * NB/WB/SWB/FB bandwidth detector *----------------------------------------------------------------*/ - bw_detect( st, st->input, NULL, enerBuffer ); + bw_detect( st, st->input, NULL, enerBuffer, + 0 ); /*----------------------------------------------------------------* * Noise energy down-ward update and total noise energy estimation @@ -230,9 +228,9 @@ void pre_proc( * Correlation correction as a function of total noise level *----------------------------------------------------------------*/ - noise_est_down( fr_bands, st->hNoiseEst->bckr, tmpN, tmpE, st->min_band, st->max_band, &st->hNoiseEst->totalNoise, *Etot, &st->hNoiseEst->Etot_last, &st->hNoiseEst->Etot_v_h2 ); + noise_est_down( fr_bands, st->hNoiseEst->bckr, tmpN, tmpE, st->min_band, st->max_band, &st->hNoiseEst->totalNoise, Etot, &st->hNoiseEst->Etot_last, &st->hNoiseEst->Etot_v_h2 ); - relE = *Etot - st->lp_speech; + relE = Etot - st->lp_speech; if ( relE > 1.5f ) { @@ -255,7 +253,6 @@ void pre_proc( /*-----------------------------------------------------------------* * Select SID or FRAME_NO_DATA frame if DTX enabled *-----------------------------------------------------------------*/ - dtx( st, -1, vad_flag_dtx, inp_12k8 ); /*----------------------------------------------------------------* @@ -358,7 +355,7 @@ void pre_proc( * Update estimated noise energy and voicing cut-off frequency *-----------------------------------------------------------------*/ - noise_est( st, old_pitch1, tmpN, epsP, *Etot, relE, corr_shift, tmpE, fr_bands, &cor_map_sum, NULL, &sp_div, &non_staX, &loc_harm, lf_E, &st->hNoiseEst->harm_cor_cnt, st->hNoiseEst->Etot_l_lp, &sp_floor, 0, NULL, NULL, st->ini_frame ); + noise_est( st, old_pitch1, tmpN, epsP, Etot, relE, corr_shift, tmpE, fr_bands, &cor_map_sum, NULL, &sp_div, &non_staX, &loc_harm, lf_E, &st->hNoiseEst->harm_cor_cnt, st->hNoiseEst->Etot_l_lp, &sp_floor, 0, NULL, NULL, st->ini_frame ); /*------------------------------------------------------------------* * Update parameters used in the VAD and DTX @@ -373,7 +370,7 @@ void pre_proc( find_tilt( fr_bands, st->hNoiseEst->bckr, ee, st->pitch, st->voicing, lf_E, corr_shift, st->input_bwidth, st->max_band, hp_E, st->codec_mode, &( st->bckr_tilt_lt ), st->Opt_SC_VBR ); - st->coder_type = find_uv( st, pitch_fr, voicing_fr, inp_12k8, ee, NULL, corr_shift, relE, *Etot, hp_E, &flag_spitch, last_core_orig, NULL ); + st->coder_type = find_uv( st, pitch_fr, voicing_fr, inp_12k8, ee, NULL, corr_shift, relE, Etot, hp_E, &flag_spitch, last_core_orig, NULL ); /*-----------------------------------------------------------------* * channel aware mode configuration * @@ -427,8 +424,9 @@ void pre_proc( st->GSC_IVAS_mode = 0; - speech_music_classif( st, new_inp_12k8, inp_12k8, localVAD_HE_SAD, lsp_new, cor_map_sum, epsP, PS, *Etot, old_cor, attack_flag, non_staX, relE, &high_lpn_flag, flag_spitch ); - long_enr( st, *Etot, localVAD_HE_SAD, high_lpn_flag, NULL, 1, NULL, NULL ); + speech_music_classif( st, new_inp_12k8, inp_12k8, localVAD_HE_SAD, lsp_new, cor_map_sum, epsP, PS, Etot, old_cor, attack_flag, non_staX, relE, &high_lpn_flag, flag_spitch ); + + long_enr( st, Etot, localVAD_HE_SAD, high_lpn_flag, NULL, 1, NULL, NULL ); /*----------------------------------------------------------------* * Final VAD correction ( when HE-SAD is used instead of the normal VAD, @@ -580,7 +578,7 @@ void pre_proc( } if ( st->total_brate == ACELP_13k20 && st->bwidth != FB ) { - MDCT_selector( st, sp_floor, *Etot, cor_map_sum, enerBuffer ); + MDCT_selector( st, sp_floor, Etot, cor_map_sum, enerBuffer ); } } else @@ -619,7 +617,7 @@ void pre_proc( st->gamma = GAMMA16k; } - st->igf = getIgfPresent( EVS_MONO, st->total_brate, st->bwidth, st->rf_mode, MCT_CHAN_MODE_REGULAR ); /* TBV: needs checking */ + st->igf = getIgfPresent( EVS_MONO, st->total_brate, st->bwidth, st->rf_mode ); } st->coder_type = st->coder_type_raw; @@ -876,7 +874,7 @@ void pre_proc( if ( st->total_brate == ACELP_16k40 && st->bwidth != FB ) { - MDCT_selector( st, sp_floor, *Etot, cor_map_sum, enerBuffer ); + MDCT_selector( st, sp_floor, Etot, cor_map_sum, enerBuffer ); } } else @@ -964,6 +962,6 @@ void pre_proc( } } - wmops_sub_end(); + pop_wmops(); return; } diff --git a/lib_enc/pvq_core_enc.c b/lib_enc/pvq_core_enc.c index 3603b950e9..5876c8b44a 100644 --- a/lib_enc/pvq_core_enc.c +++ b/lib_enc/pvq_core_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "prot.h" #include "prot.h" #include "stl.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local function prototypes diff --git a/lib_enc/pvq_encode.c b/lib_enc/pvq_encode.c index acf7928a6f..eb066e8ed2 100644 --- a/lib_enc/pvq_encode.c +++ b/lib_enc/pvq_encode.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "prot.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" static void pyramidSearch( const float *const s, const int16_t L, const int16_t Ptot, const float A, int16_t *ztak, float *stak ); diff --git a/lib_enc/q_gain2p.c b/lib_enc/q_gain2p.c index 8a3bc04b9a..9c89b44c87 100644 --- a/lib_enc/q_gain2p.c +++ b/lib_enc/q_gain2p.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "prot.h" #include "cnst.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------------* * Local function prototypes diff --git a/lib_enc/qlpc_avq.c b/lib_enc/qlpc_avq.c index 03aeab128e..eabbd8128f 100644 --- a/lib_enc/qlpc_avq.c +++ b/lib_enc/qlpc_avq.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #include "options.h" #include "prot.h" #include "ivas_prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * qlpc_avq() diff --git a/lib_enc/qlpc_stoch.c b/lib_enc/qlpc_stoch.c index 403132b6e8..b7103bc169 100644 --- a/lib_enc/qlpc_stoch.c +++ b/lib_enc/qlpc_stoch.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -46,7 +46,7 @@ #include "rom_com.h" #include "rom_enc.h" #include "basop_proto_func.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * lpc_quantization() @@ -103,7 +103,6 @@ void lpc_quantization( /****** Low-rate LPC quantizer *******/ else if ( st->lpcQuantization == 1 ) { - lsp2lsf( lsp, lsf, M, st->sr_core ); force_sf = 0; @@ -122,23 +121,21 @@ void lpc_quantization( if ( st->sr_core == INT_FS_16k && coder_type == UNVOICED ) { - lsf_end_enc( st, lsf, lsf_q, ENDLSF_NBITS, GENERIC, force_sf, param_lpc, no_param_lpc, bits_param_lpc, GENERIC #ifdef LSF_RE_USE_SECONDARY_CHANNEL - , - NULL + lsf_end_enc( st, lsf, lsf_q, ENDLSF_NBITS, GENERIC, force_sf, param_lpc, no_param_lpc, bits_param_lpc, GENERIC, NULL ); +#else + lsf_end_enc( st, lsf, lsf_q, ENDLSF_NBITS, GENERIC, force_sf, param_lpc, no_param_lpc, bits_param_lpc, GENERIC ); #endif - ); nb_indices = *no_param_lpc; } else { - lsf_end_enc( st, lsf, lsf_q, ENDLSF_NBITS, coder_type, force_sf, param_lpc, no_param_lpc, bits_param_lpc, coder_type #ifdef LSF_RE_USE_SECONDARY_CHANNEL - , - NULL + lsf_end_enc( st, lsf, lsf_q, ENDLSF_NBITS, coder_type, force_sf, param_lpc, no_param_lpc, bits_param_lpc, coder_type, NULL ); +#else + lsf_end_enc( st, lsf, lsf_q, ENDLSF_NBITS, coder_type, force_sf, param_lpc, no_param_lpc, bits_param_lpc, coder_type ); #endif - ); nb_indices = *no_param_lpc; } diff --git a/lib_enc/range_enc.c b/lib_enc/range_enc.c index d44ed895a4..8ea8c888d2 100644 --- a/lib_enc/range_enc.c +++ b/lib_enc/range_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local function prototypes diff --git a/lib_enc/re8_cod.c b/lib_enc/re8_cod.c index 30030cc394..5facffd8f4 100644 --- a/lib_enc/re8_cod.c +++ b/lib_enc/re8_cod.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "debug.h" #endif #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------ diff --git a/lib_enc/reordernorm.c b/lib_enc/reordernorm.c index 2387263aab..831adeee53 100644 --- a/lib_enc/reordernorm.c +++ b/lib_enc/reordernorm.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "prot.h" #include "cnst.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------*/ /* Function reordernorm */ diff --git a/lib_enc/rom_enc.c b/lib_enc/rom_enc.c index cc9755ce92..ae96fdfc31 100644 --- a/lib_enc/rom_enc.c +++ b/lib_enc/rom_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "debug.h" #endif #include "cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /* clang-format off */ diff --git a/lib_enc/rom_enc.h b/lib_enc/rom_enc.h index e3e62cb6e9..7e7659ceb6 100644 --- a/lib_enc/rom_enc.h +++ b/lib_enc/rom_enc.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_enc/rst_enc.c b/lib_enc/rst_enc.c index ac8853c721..3a20418759 100644 --- a/lib_enc/rst_enc.c +++ b/lib_enc/rst_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * CNG_reset_enc() @@ -84,8 +84,11 @@ void CNG_reset_enc( set_f( voice_factors, 1.0, NB_SUBFR16k ); - /* Reset active frame counter */ - st->hTdCngEnc->act_cnt2 = 0; + if ( st->hTdCngEnc != NULL ) + { + /* Reset active frame counter */ + st->hTdCngEnc->act_cnt2 = 0; + } /* deactivate bass post-filter */ st->bpf_off = 1; diff --git a/lib_enc/set_impulse.c b/lib_enc/set_impulse.c index 493d373d1e..4cafeea9e8 100644 --- a/lib_enc/set_impulse.c +++ b/lib_enc/set_impulse.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------* * Local constant diff --git a/lib_enc/setmodeindex.c b/lib_enc/setmodeindex.c index 67d2d9d710..b2187b8990 100644 --- a/lib_enc/setmodeindex.c +++ b/lib_enc/setmodeindex.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "prot.h" #include "cnst.h" #include "ivas_cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------- diff --git a/lib_enc/sig_clas.c b/lib_enc/sig_clas.c index c1438b6b76..18ee55df61 100644 --- a/lib_enc/sig_clas.c +++ b/lib_enc/sig_clas.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local constants diff --git a/lib_enc/spec_center.c b/lib_enc/spec_center.c index f565cba7a8..73835a1511 100644 --- a/lib_enc/spec_center.c +++ b/lib_enc/spec_center.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include "prot.h" #include "rom_enc.h" #include "cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * spec_center() diff --git a/lib_enc/spec_flatness.c b/lib_enc/spec_flatness.c index 2ef6bd3b60..0473cc6b98 100644 --- a/lib_enc/spec_flatness.c +++ b/lib_enc/spec_flatness.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include "options.h" #include #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * spec_flatness() diff --git a/lib_enc/speech_music_classif.c b/lib_enc/speech_music_classif.c index a61e42c164..80bd2d6d2a 100644 --- a/lib_enc/speech_music_classif.c +++ b/lib_enc/speech_music_classif.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -46,7 +46,7 @@ #include "ivas_prot.h" #include "rom_enc.h" #include "rom_com.h" /* Common static table prototypes */ -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* @@ -1828,6 +1828,9 @@ void ivas_smc_mode_selection( float ton; int16_t i; float S_p2a, S_max, S_ave; +#ifdef FIX_SP2A + float thr_sp2a; +#endif SP_MUS_CLAS_HANDLE hSpMusClas = st->hSpMusClas; @@ -1858,8 +1861,23 @@ void ivas_smc_mode_selection( S_ave = sum_f( st->hSpMusClas->tod_lt_Bin_E, TOD_NSPEC ) / TOD_NSPEC; S_p2a = S_max - S_ave; +#ifdef FIX_SP2A + if ( element_brate <= IVAS_16k4 ) + { + thr_sp2a = THR_P2A_HIGH; + } + else + { + thr_sp2a = THR_P2A; + } +#endif + /* initial 3-way selection of coding modes (ACELP/GSC/TCX) */ +#ifdef FIX_SP2A + if ( relE > -10.0f && ( S_p2a > thr_sp2a || ton > hSpMusClas->tod_thr_lt ) ) +#else if ( relE > -10.0f && ( S_p2a > THR_P2A || ton > hSpMusClas->tod_thr_lt ) ) +#endif { /* select TCX to encode extremely peaky signals or strongly tonal signals */ st->sp_aud_decision1 = 1; diff --git a/lib_enc/stat_enc.h b/lib_enc/stat_enc.h index de0451d3bc..ec7fb594d1 100644 --- a/lib_enc/stat_enc.h +++ b/lib_enc/stat_enc.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -123,6 +123,8 @@ typedef struct float firState1; float firState2; + int16_t ramp_up_flag; /* bit map flags to indicate a ramp up in beginning of TCX frame */ + } SubblockEnergies; @@ -138,8 +140,8 @@ typedef struct TransientDetector TCheckSubblocksForAttack CheckSubblocksForAttack; /* Function for checking a presence of an attack. */ float attackRatioThreshold; /* Attack ratio threshold. */ int16_t bIsAttackPresent; /* True when an attack was detected. */ + int16_t prev_bIsAttackPresent; /* True if an attack was detected in the previous frame. */ int16_t attackIndex; /* The index of an attack. */ - } TransientDetector; /* Transient detection: Holds all transient detectors and buffers used by them. */ diff --git a/lib_enc/stat_noise_uv_enc.c b/lib_enc/stat_noise_uv_enc.c index 3cb876097b..a1adfb052a 100644 --- a/lib_enc/stat_noise_uv_enc.c +++ b/lib_enc/stat_noise_uv_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -41,7 +41,7 @@ #endif #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------* * stat_noise_uv_enc() diff --git a/lib_enc/subband_fft.c b/lib_enc/subband_fft.c index 9f02fa04ae..638a6d63f8 100644 --- a/lib_enc/subband_fft.c +++ b/lib_enc/subband_fft.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include #include "prot.h" #include "rom_enc.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* diff --git a/lib_enc/swb_bwe_enc.c b/lib_enc/swb_bwe_enc.c index 54e786d761..e2c8812eca 100644 --- a/lib_enc/swb_bwe_enc.c +++ b/lib_enc/swb_bwe_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -46,7 +46,7 @@ #include "rom_enc.h" #include "basop_util.h" #include "basop_proto_func.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local function prototypes @@ -1795,6 +1795,11 @@ void hq_generic_hf_encoding( { Word16 tmp, frac, exp; Word32 L_tmp; +#ifdef BASOP_NOGLOB + Flag Overflow; + + Overflow = 0; +#endif tmp = add( (int16_t) ( hq_generic_fenv[n_band] * 256 ), (int16_t) ( Mean_env[n_band] * 256 ) ); /*Q8 */ L_tmp = L_mult( tmp, 21771 ); /* 0.166096 in Q17 -> Q26 */ @@ -1805,7 +1810,11 @@ void hq_generic_hf_encoding( /* output of Pow2() will be: */ /* 16384 < Pow2() <= 32767 */ exp = sub( exp, 13 ); - tmp = shl( tmp, add( exp, 1 ) ); /*Q1 */ +#ifdef BASOP_NOGLOB + tmp = shl_o( tmp, add( exp, 1 ), &Overflow ); /*Q1 */ +#else + tmp = shl( tmp, add( exp, 1 ) ); /*Q1 */ +#endif hq_generic_fenv[n_band] = (float) tmp * 0.5f; /*Q1 */ } diff --git a/lib_enc/swb_bwe_enc_hr.c b/lib_enc/swb_bwe_enc_hr.c index 63e5753650..7b2f3687a0 100644 --- a/lib_enc/swb_bwe_enc_hr.c +++ b/lib_enc/swb_bwe_enc_hr.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * en_band_quant() diff --git a/lib_enc/swb_bwe_enc_lr.c b/lib_enc/swb_bwe_enc_lr.c index 7273972d7c..afa9e75ac7 100644 --- a/lib_enc/swb_bwe_enc_lr.c +++ b/lib_enc/swb_bwe_enc_lr.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "prot.h" #include "rom_com.h" #include "stat_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*--------------------------------------------------------------------------* * GetSubbandCorrIndex2_har() diff --git a/lib_enc/swb_pre_proc.c b/lib_enc/swb_pre_proc.c index 4d6eaf7836..3ec175958a 100644 --- a/lib_enc/swb_pre_proc.c +++ b/lib_enc/swb_pre_proc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "prot.h" #include "rom_com.h" #include "rom_enc.h" -#include "wmops.h" +#include "wmc_auto.h" #include "ivas_prot.h" #include "ivas_rom_enc.h" @@ -677,16 +677,7 @@ void swb_pre_proc( { if ( ( st->bwidth == FB || st->core == ACELP_CORE ) && ( st->element_mode == EVS_MONO ) ) { - set_f( hBWE_TD->old_speech_shb, 0, L_LOOK_16k + L_SUBFR16k ); - set_f( shb_speech, 0, L_FRAME16k ); /* shb_speech for FB/SWB BWE_HIGHRATE is not used at 64kbps */ - set_f( st->hBWE_TD->mem_shb_res, 0.0f, MAX_LEN_MA_FILTER ); - set_f( st->hBWE_TD->old_EnvSHBres, 0.0f, L_FRAME4k ); - st->hBWE_TD->old_mean_EnvSHBres = 0.0f; - st->hBWE_TD->prev_enr_EnvSHBres = 1.0f; - st->hBWE_TD->prev_shb_env_tilt = 0.0f; - st->hBWE_TD->prev_pow_exc16kWhtnd = 1.0f; - st->hBWE_TD->prev_mix_factor = 1.0f; - st->hBWE_TD->prev_Env_error = 0.0f; + InitSWBencBufferStates( st->hBWE_TD, shb_speech ); } else { diff --git a/lib_enc/swb_tbe_enc.c b/lib_enc/swb_tbe_enc.c index 036611efb3..38a0fb73ff 100644 --- a/lib_enc/swb_tbe_enc.c +++ b/lib_enc/swb_tbe_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "prot.h" #include "rom_com.h" #include "rom_enc.h" -#include "wmops.h" +#include "wmc_auto.h" #include "ivas_prot.h" /*-----------------------------------------------------------------* @@ -63,7 +63,7 @@ static void return_M_Least( const float *inp, const int16_t n_cols, const float static void singlevectortest_gain( const float *inp, const int16_t dimen, const int16_t cb_size, int16_t *index, const float *weight, float *recon, const float *codebook ); static void determine_gain_weights( const float *gain, float *weights, const int16_t dims ); static void QuantizeSHBsubgains( Encoder_State *st, float *subgains, const int16_t extl ); -static void QuantizeSHBframegain( Encoder_State *st, float *GainFrame, const int16_t extl, const int32_t extl_brate, int16_t *rf_gainFrame_ind, int16_t flag_conservative ); +static void QuantizeSHBframegain( Encoder_State *st, float *GainFrame, const int16_t extl, const int32_t extl_brate, int16_t *rf_gainFrame_ind, const int16_t flag_conservative ); static int16_t closest_centroid( const float *data, const float *weights, const float *quantizer, const int16_t centroids, const int16_t length ); static void EstimateSHBFrameGain( const int16_t length, const float *oriSHB, const float *synSHB, float *subgain, float *GainFrame, const float *win_shb, const float *subwin ); static void EstimateSHBGainShape( const int16_t length, const float *oriSHB, const float *synSHB, float *subgain, const float *subwin ); @@ -76,9 +76,9 @@ static void gainFrSmooth_En( TD_BWE_ENC_HANDLE hBWE_TD, const int16_t last_extl, static void Quant_BWE_LSF( BSTR_ENC_HANDLE hBstr, TD_BWE_ENC_HANDLE hBWE_TD, const int16_t codec_mode, const float lsp_shb[], float Q_lsfs[], const int32_t extl_brate ); static void Quant_shb_ener_sf( Encoder_State *st, float *shb_ener_sf ); static void Quant_shb_res_gshape( Encoder_State *st, float *shb_res_gshape ); - static void LVQQuant_BWE_LSF( BSTR_ENC_HANDLE hBstr, const float lsf_shb[], float Q_lsfs[], int16_t nbits ); + /*-------------------------------------------------------------------* * InitSWBencBuffer() * @@ -108,14 +108,8 @@ void InitSWBencBuffer( set_f( hBWE_TD->old_speech_shb, 0.0f, L_LOOK_16k + L_SUBFR16k ); set_f( hBWE_TD->old_speech_wb, 0.0f, ( L_LOOK_12k8 + L_SUBFR ) * 5 / 16 ); set_f( hBWE_TD->old_input_fhb, 0.0f, NS2SA( 48000, ACELP_LOOK_NS + DELAY_FD_BWE_ENC_12k8_NS + DELAY_FIR_RESAMPL_NS ) - L_FRAME48k / 2 ); - set_f( hBWE_TD->mem_shb_res, 0.0f, MAX_LEN_MA_FILTER ); - set_f( hBWE_TD->old_EnvSHBres, 0.0f, L_FRAME4k ); - hBWE_TD->old_mean_EnvSHBres = 0.0f; - hBWE_TD->prev_enr_EnvSHBres = 1.0f; - hBWE_TD->prev_shb_env_tilt = 0.0f; - hBWE_TD->prev_pow_exc16kWhtnd = 1.0f; - hBWE_TD->prev_mix_factor = 1.0f; - hBWE_TD->prev_Env_error = 0.0f; + + InitSWBencBufferStates( hBWE_TD, NULL ); for ( i = 0; i < LPC_SHB_ORDER; i++ ) { @@ -156,6 +150,36 @@ void InitSWBencBuffer( } +/*-------------------------------------------------------------------* + * InitSWBencBufferStates() + * + * Initialize SWB buffer states + *-------------------------------------------------------------------*/ + +void InitSWBencBufferStates( + TD_BWE_ENC_HANDLE hBWE_TD, /* i/o: TD BWE data handle */ + float *shb_speech /* o : SHB target signal (6-14kHz) at 16kHz */ +) +{ + if ( shb_speech != NULL ) + { + set_f( shb_speech, 0.0f, L_FRAME16k ); + } + + set_f( hBWE_TD->old_speech_shb, 0.0f, L_LOOK_16k + L_SUBFR16k ); + set_f( hBWE_TD->mem_shb_res, 0.0f, MAX_LEN_MA_FILTER ); + set_f( hBWE_TD->old_EnvSHBres, 0.0f, L_FRAME4k ); + hBWE_TD->old_mean_EnvSHBres = 0.0f; + hBWE_TD->prev_enr_EnvSHBres = 1.0f; + hBWE_TD->prev_shb_env_tilt = 0.0f; + hBWE_TD->prev_pow_exc16kWhtnd = 1.0f; + hBWE_TD->prev_mix_factor = 1.0f; + hBWE_TD->prev_Env_error = 0.0f; + + return; +} + + /*-------------------------------------------------------------------* * ResetSHBbuffer_Enc() * @@ -405,7 +429,9 @@ void wb_tbe_enc( p2m_in = pow_off_pk_corrected( GainShape, NUM_SHB_SUBFR / 4, 1 ); } else + { p2m_in = pow_off_pk( GainShape, NUM_SHB_SUBFR / 4, 1 ); + } if ( st->extl_brate == WB_TBE_0k35 ) { @@ -428,7 +454,9 @@ void wb_tbe_enc( p2m_out = pow_off_pk_corrected( GainShape, NUM_SHB_SUBFR / 2, 2 ); } else + { p2m_out = pow_off_pk( GainShape, NUM_SHB_SUBFR / 2, 2 ); + } /* Estimate the gain parameter */ EstimateSHBFrameGain( SHB_OVERLAP_LEN / 2, hb_frame, shaped_wb_excitation, GainShape, &GainFrame, window_wb, subwin_wb ); @@ -475,13 +503,11 @@ void wb_tbe_enc( if ( st->rf_mode ) { - QuantizeSHBframegain( st, &GainFrame, st->extl, st->extl_brate, &st->hRF->RF_bwe_gainFr_ind, - 0 ); + QuantizeSHBframegain( st, &GainFrame, st->extl, st->extl_brate, &st->hRF->RF_bwe_gainFr_ind, 0 ); } else { - QuantizeSHBframegain( st, &GainFrame, st->extl, st->extl_brate, NULL, - 0 ); + QuantizeSHBframegain( st, &GainFrame, st->extl, st->extl_brate, NULL, 0 ); } /* Adjust the subframe and frame gain of the synthesized SHB signal */ @@ -557,7 +583,6 @@ void swb_tbe_enc( float sum_gain, normFact; float Env_error_part[NUM_SHB_SUBGAINS]; - Env_error = 0.0f; pitBufAvg = 0.0f; voicingBufAvg = 0.0f; @@ -1172,7 +1197,9 @@ void swb_tbe_enc( p2m_in = pow_off_pk_corrected( GainShape, NUM_SHB_SUBGAINS, 1 ); } else + { p2m_in = pow_off_pk( GainShape, NUM_SHB_SUBGAINS, 1 ); + } /* Quantization of the gain shape parameter */ QuantizeSHBsubgains( st, GainShape, st->extl ); @@ -1183,7 +1210,9 @@ void swb_tbe_enc( p2m_out = pow_off_pk_corrected( GainShape, NUM_SHB_SUBFR, 4 ); } else + { p2m_out = pow_off_pk( GainShape, NUM_SHB_SUBFR, 4 ); + } /* Gain shape smoothing after quantization */ if ( st->extl_brate == SWB_TBE_1k10 || st->extl_brate == SWB_TBE_1k75 ) @@ -1362,13 +1391,11 @@ void swb_tbe_enc( /* Quantization of the frame gain parameter */ if ( st->rf_mode ) { - QuantizeSHBframegain( st, &GainFrame, st->extl, 0, &st->hRF->RF_bwe_gainFr_ind, - 0 ); + QuantizeSHBframegain( st, &GainFrame, st->extl, 0, &st->hRF->RF_bwe_gainFr_ind, 0 ); } else { - QuantizeSHBframegain( st, &GainFrame, st->extl, 0, NULL, - ( st->extl_brate == SWB_TBE_1k10 || st->extl_brate == SWB_TBE_1k75 ) ? 1 : 0 ); + QuantizeSHBframegain( st, &GainFrame, st->extl, 0, NULL, ( st->extl_brate == SWB_TBE_1k10 || st->extl_brate == SWB_TBE_1k75 ) ? 1 : 0 ); } if ( hStereoICBWE != NULL ) @@ -1568,7 +1595,6 @@ static float pow_off_pk( * pow_off_pk_corrected() * * Sums squares of SWB shape gain parameters away from peak values - * VM: !! includes correction of indexing !! *-------------------------------------------------------------------*/ static float pow_off_pk_corrected( @@ -1974,7 +2000,6 @@ static void LVQQuant_BWE_LSF( int16_t i, c2, dim1 = 6; int16_t levels[1], numbits_VQ; - float w[8] = { 5.0f, 5.0f, 2.0f, 2.0f, 2.0f, 1.0f, 1.0f, 1.0f }; float cand[LPC_SHB_ORDER], quant[LPC_SHB_ORDER], e[2], ftmp; const float *cb_stage; @@ -2306,7 +2331,6 @@ static void Quant_shb_ener_sf( ) { int16_t idxSubEner; - float temp_shb_ener_sf, sum; sum = *shb_ener_sf; @@ -2344,6 +2368,7 @@ static void Quant_shb_res_gshape( for ( i = 0; i < NB_SUBFR16k; i++ ) { idxSubGain[i] = usquant( shb_res_gshape[i], &shb_res_gshape[i], 0.125, 0.125f, 1 << NUM_BITS_SHB_RES_GS ); + if ( st->codec_mode == MODE2 ) { st->hBWE_TD->idx_res_gs[i] = idxSubGain[i]; @@ -2369,7 +2394,7 @@ static void QuantizeSHBframegain( const int16_t extl, /* i : extension layer */ const int32_t extl_brate, /* i : extension layer bitrate */ int16_t *rf_gainFrame_ind, - int16_t flag_conservative /* i : flag to indicate more conservative gain quantization */ + const int16_t flag_conservative /* i : flag to indicate more conservative gain quantization */ ) { int16_t idxFrameGain; @@ -2634,7 +2659,6 @@ static void return_M_Least( return; } - /*-------------------------------------------------------------------* * fb_tbe_reset_enc() * @@ -2731,7 +2755,6 @@ void fb_tbe_enc( return; } - /*---------------------------------------------------------------------* * tbe_write_bitstream() * @@ -2811,7 +2834,6 @@ void tbe_write_bitstream( return; } - /*---------------------------------------------------------------------* * TBEreset_enc() * diff --git a/lib_enc/tcq_core_enc.c b/lib_enc/tcq_core_enc.c index 11d96e2015..aad3e54e73 100644 --- a/lib_enc/tcq_core_enc.c +++ b/lib_enc/tcq_core_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "cnst.h" #include "basop_util.h" #include "basop_proto_func.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * tcq_core_LR_enc() @@ -181,7 +181,7 @@ ivas_error tcq_core_LR_enc( } } -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP bsub_fx = L_shl( L_add( tcq_arbits, lsbtcq_bits ), 16 ); IF( bsub_fx > 0 ) { @@ -206,7 +206,7 @@ ivas_error tcq_core_LR_enc( } srt_vec_ind_fx( Rk_fx, Rk_sort_fx, k_sort, BANDS ); -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP /* Quantize spectral band shapes using TCQ */ /* Select ISC */ @@ -282,7 +282,7 @@ ivas_error tcq_core_LR_enc( if ( Rk_fx[k_sort[k]] > 0 && surplus_fx < 0 ) { -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP IF( nzbands <= 1 ) { divider = 0; @@ -302,7 +302,7 @@ ivas_error tcq_core_LR_enc( delta_fx = 0; } surplus_fx = L_sub( surplus_fx, delta_fx ); -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP } else { @@ -311,13 +311,13 @@ ivas_error tcq_core_LR_enc( } } -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP if ( ( L_sub( surplus_fx, 524288 ) > 0 && sub( input_frame, L_FRAME8k ) == 0 ) || ( L_sub( surplus_fx, 786432 ) > 0 && sub( input_frame, L_FRAME16k ) == 0 ) ) { bit_surplus_fx[0] = Mult_32_16( surplus_fx, 24576 ); /* Q16 */ bit_surplus_fx[1] = Mult_32_16( surplus_fx, 8192 ); /* Q16 */ } -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP else { bit_surplus_fx[0] = surplus_fx; @@ -329,9 +329,9 @@ ivas_error tcq_core_LR_enc( { if ( k == k_num[j] ) { -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP Rk_fx[k_sort[k]] = L_add( Rk_fx[k_sort[k]], bit_surplus_fx[j] ); -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP if ( Rk_fx[k_sort[k]] > 0 && USQ_TCQ[k_sort[k]] == 0 ) /* Then have non-zero block AND WILL BE ENCODED BY TCQ */ { diff --git a/lib_enc/tcx_ltp_enc.c b/lib_enc/tcx_ltp_enc.c index fbac9b1640..0ea2e0424a 100644 --- a/lib_enc/tcx_ltp_enc.c +++ b/lib_enc/tcx_ltp_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "prot.h" #include "rom_enc.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" #ifdef DEBUG_PLOT #include "deb_out.h" #endif diff --git a/lib_enc/tcx_utils_enc.c b/lib_enc/tcx_utils_enc.c old mode 100755 new mode 100644 index 04b6f0a206..ba709f0158 --- a/lib_enc/tcx_utils_enc.c +++ b/lib_enc/tcx_utils_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "prot.h" #include "rom_com.h" #include "cnst.h" -#include "wmops.h" +#include "wmc_auto.h" #include "ivas_prot.h" /*---------------------------------------------------------------------* diff --git a/lib_enc/tfa_enc.c b/lib_enc/tfa_enc.c index dca8b62623..50dd7c3668 100644 --- a/lib_enc/tfa_enc.c +++ b/lib_enc/tfa_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #include "options.h" #include #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * tfaCalcEnv() diff --git a/lib_enc/tns_base_enc.c b/lib_enc/tns_base_enc.c index f008ed728f..594f782411 100644 --- a/lib_enc/tns_base_enc.c +++ b/lib_enc/tns_base_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,7 +37,7 @@ #include #include #include "options.h" -#include "wmops.h" +#include "wmc_auto.h" #include "cnst.h" #include "rom_com.h" #include "prot.h" diff --git a/lib_enc/transient_detection.c b/lib_enc/transient_detection.c index 469c7c4d8d..1f8b36819f 100644 --- a/lib_enc/transient_detection.c +++ b/lib_enc/transient_detection.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,7 +44,7 @@ #include "prot.h" #include "ivas_prot.h" #include -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------* @@ -53,6 +53,12 @@ #define MIN_BLOCK_ENERGY 107.37f +#define THR_HIGH 8.5f +#define THR_NORM_HIGH 8.0f +#define THR_NORM_LOW 4.5f +#define THR_LOW 4.25f +#define THR_LOW_STEP 1.0f + /*---------------------------------------------------------------* * Local function prototypes @@ -218,6 +224,7 @@ void RunTransientDetection( float filteredInput[L_FRAME_MAX]; SubblockEnergies *pSubblockEnergies = &hTranDet->subblockEnergies; TransientDetector *pTransientDetector = &hTranDet->transientDetector; + float e0, e1; assert( ( input != NULL ) && ( hTranDet != NULL ) && ( pSubblockEnergies != NULL ) && ( pTransientDetector != NULL ) ); @@ -233,10 +240,22 @@ void RunTransientDetection( /* Update the delay buffer. */ UpdateDelayBuffer( filteredInput, length, &hTranDet->delayBuffer ); + /* compute ramp up flag */ + pSubblockEnergies->ramp_up_flag = pSubblockEnergies->ramp_up_flag << 1; + e0 = dotp( filteredInput + length / 2, filteredInput + length / 2, pSubblockEnergies->pDelayBuffer->nSubblockSize / 2 ) + 0.5f * MIN_BLOCK_ENERGY; + e1 = pSubblockEnergies->subblockNrg[pSubblockEnergies->nDelay + 4] - e0; + if ( e1 > e0 ) + { + pSubblockEnergies->ramp_up_flag |= 0x0001; + } + return; } -static uint16_t isLongTermTransient( const float frameTFM, float *lastTFM ) + +static uint16_t isLongTermTransient( + const float frameTFM, + float *lastTFM ) { float currTFM; @@ -250,11 +269,13 @@ static uint16_t isLongTermTransient( const float frameTFM, float *lastTFM ) { currTFM = *lastTFM * 0.96875f + frameTFM * 0.03125f; } + *lastTFM = max( 0.015625f, currTFM ); return ( currTFM < 0.5625f ? 1 : 0 ); } + /*-------------------------------------------------------------------* * SetTCXModeInfo() * @@ -303,86 +324,74 @@ void SetTCXModeInfo( hTcxEnc->tcxMode = NO_TCX; } } - - if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) + /* set the left window overlap */ + if ( st->last_core == ACELP_CORE || st->last_core == AMR_WB_CORE ) + { + st->hTcxCfg->tcx_last_overlap_mode = TRANSITION_OVERLAP; + } + else if ( ( hTcxEnc->tcxMode == TCX_10 ) && ( st->hTcxCfg->tcx_curr_overlap_mode == ALDO_WINDOW ) ) + { + st->hTcxCfg->tcx_last_overlap_mode = FULL_OVERLAP; + } + else { - hTcxEnc->tcxMode = TCX_20; - *tcxModeOverlap = FULL_OVERLAP; st->hTcxCfg->tcx_last_overlap_mode = st->hTcxCfg->tcx_curr_overlap_mode; } - - if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE ) + /* determine the right window overlap */ + if ( hTcxEnc->tcxMode == TCX_10 ) { - /* set the left window overlap */ - if ( st->last_core == ACELP_CORE || st->last_core == AMR_WB_CORE ) + if ( hTranDet->transientDetector.attackIndex < 0 ) { - st->hTcxCfg->tcx_last_overlap_mode = TRANSITION_OVERLAP; - } - else if ( ( hTcxEnc->tcxMode == TCX_10 ) && ( st->hTcxCfg->tcx_curr_overlap_mode == ALDO_WINDOW ) ) - { - st->hTcxCfg->tcx_last_overlap_mode = FULL_OVERLAP; + *tcxModeOverlap = HALF_OVERLAP; } else { - st->hTcxCfg->tcx_last_overlap_mode = st->hTcxCfg->tcx_curr_overlap_mode; - } - - /* determine the right window overlap */ - if ( hTcxEnc->tcxMode == TCX_10 ) - { - if ( hTranDet->transientDetector.attackIndex < 0 ) - { - *tcxModeOverlap = HALF_OVERLAP; - } - else - { - *tcxModeOverlap = hTranDet->transientDetector.attackIndex % 4; - if ( *tcxModeOverlap == 1 ) - { - *tcxModeOverlap = FULL_OVERLAP; - } - } - if ( isLongTermTransient( 1.0f / GetTCXAvgTemporalFlatnessMeasure( hTranDet, NSUBBLOCKS, 0 ), &hTcxEnc->tfm_mem ) && st->element_mode == IVAS_CPE_MDCT ) + *tcxModeOverlap = hTranDet->transientDetector.attackIndex % 4; + if ( *tcxModeOverlap == 1 ) { - if ( ( *tcxModeOverlap != MIN_OVERLAP ) && ( hTcxEnc->tcxltp_norm_corr_past < 0.5625f ) ) - { - *tcxModeOverlap = HALF_OVERLAP; - } + *tcxModeOverlap = FULL_OVERLAP; } } - else if ( hTcxEnc->tcxMode == TCX_20 ) + if ( isLongTermTransient( 1.0f / GetTCXAvgTemporalFlatnessMeasure( hTranDet, NSUBBLOCKS, 0 ), &hTcxEnc->tfm_mem ) && st->element_mode == IVAS_CPE_MDCT ) { - if ( hTranDet->transientDetector.attackIndex == 7 ) + if ( ( *tcxModeOverlap != MIN_OVERLAP ) && ( hTcxEnc->tcxltp_norm_corr_past < 0.5625f ) ) { *tcxModeOverlap = HALF_OVERLAP; } - else if ( hTranDet->transientDetector.attackIndex == 6 ) - { - *tcxModeOverlap = MIN_OVERLAP; - } - else - { - *tcxModeOverlap = ALDO_WINDOW; - } - if ( isLongTermTransient( 1.0f / GetTCXAvgTemporalFlatnessMeasure( hTranDet, NSUBBLOCKS, 0 ), &hTcxEnc->tfm_mem ) && st->element_mode == IVAS_CPE_MDCT ) - { - if ( ( *tcxModeOverlap != MIN_OVERLAP ) && ( hTcxEnc->tcxltp_norm_corr_past < 0.5625f ) ) - { - *tcxModeOverlap = HALF_OVERLAP; - } - } + } + } + else if ( hTcxEnc->tcxMode == TCX_20 ) + { + if ( hTranDet->transientDetector.attackIndex == 7 ) + { + *tcxModeOverlap = HALF_OVERLAP; + } + else if ( hTranDet->transientDetector.attackIndex == 6 ) + { + *tcxModeOverlap = MIN_OVERLAP; } else { - /* NO_TCX */ - *tcxModeOverlap = TRANSITION_OVERLAP; - if ( st->element_mode == IVAS_CPE_MDCT ) + *tcxModeOverlap = ALDO_WINDOW; + } + if ( isLongTermTransient( 1.0f / GetTCXAvgTemporalFlatnessMeasure( hTranDet, NSUBBLOCKS, 0 ), &hTcxEnc->tfm_mem ) && st->element_mode == IVAS_CPE_MDCT ) + { + if ( ( *tcxModeOverlap != MIN_OVERLAP ) && ( hTcxEnc->tcxltp_norm_corr_past < 0.5625f ) ) { - hTcxEnc->tfm_mem = 0.75f; + *tcxModeOverlap = HALF_OVERLAP; } } } + else + { + /* NO_TCX */ + *tcxModeOverlap = TRANSITION_OVERLAP; + if ( st->element_mode == IVAS_CPE_MDCT ) + { + hTcxEnc->tfm_mem = 0.75f; + } + } /* for the ACELP -> TCX transition frames use full right window overlap */ if ( ( st->hTcxCfg->tcx_last_overlap_mode == TRANSITION_OVERLAP ) && ( *tcxModeOverlap == ALDO_WINDOW ) ) @@ -556,7 +565,9 @@ static void InitTransientDetector( pTransientDetector->CheckSubblocksForAttack = pCheckSubblocksForAttack; pTransientDetector->attackRatioThreshold = attackRatioThreshold; pTransientDetector->bIsAttackPresent = FALSE; + pTransientDetector->prev_bIsAttackPresent = FALSE; pTransientDetector->attackIndex = -1; + pTransientDetector->pSubblockEnergies->ramp_up_flag = 0x0; return; } @@ -609,9 +620,9 @@ static void RunTransientDetector( assert( ( pTransientDetector->CheckSubblocksForAttack != NULL ) ); /* Variable initialization */ -#define WMC_TOOL_MAN +#define WMC_TOOL_SKIP pTransientDetector->CheckSubblocksForAttack( pSubblockNrg, pAccSubblockNrg, NSUBBLOCKS + nDelay, nRelativeDelay, attackRatioThreshold, &pTransientDetector->bIsAttackPresent, &pTransientDetector->attackIndex ); -#undef WMC_TOOL_MAN +#undef WMC_TOOL_SKIP return; } @@ -824,3 +835,99 @@ void set_transient_stereo( return; } + +/*-------------------------------------------------------------------* + * transient_analysis() + * + * + *-------------------------------------------------------------------*/ + +/*! r: preliminary flag to force ACELP */ +int16_t transient_analysis( + TRAN_DET_HANDLE hTranDet, /* i : handle transient detection */ + const float cor_map_LT[], /* i : LT correlation map */ + const float multi_harm_limit /* i : multi harminic threshold */ +) +{ + const float *pSubblockNrg; + float accSubblockNrgRev[NSUBBLOCKS]; /* store acc Nrg in reversed signal */ + float *pTmp; /* point to acc Nrg */ + int16_t offset; + int16_t i; + float thr_fwd; + float thr_rev; + const int16_t nRelativeDelay = hTranDet->subblockEnergies.nDelay - hTranDet->transientDetector.nDelay; + int16_t prel_force_td; + float cor_map_LT_sum; + + pTmp = &accSubblockNrgRev[NSUBBLOCKS - 1]; + offset = nRelativeDelay - 4; + prel_force_td = FALSE; + + /* summation of the LT correlation map */ + cor_map_LT_sum = sum_f( cor_map_LT, L_FFT / 2 ); /* Note maybe BE optimized by computing inside noise_est */ + + thr_fwd = THR_NORM_HIGH; + if ( cor_map_LT_sum > multi_harm_limit * 0.8f ) + { + thr_fwd = THR_HIGH; + } + thr_rev = THR_LOW; + if ( cor_map_LT_sum > multi_harm_limit * 0.6f ) + { + thr_rev = THR_NORM_LOW; + } + + /* forward attack analysis */ + for ( i = -2; i < 7; i++ ) + { + if ( hTranDet->subblockEnergies.subblockNrg[nRelativeDelay + i] > hTranDet->subblockEnergies.accSubblockNrg[nRelativeDelay + i] * thr_fwd ) + { + prel_force_td |= 0x0001; + } + } + if ( prel_force_td == 0 && hTranDet->transientDetector.prev_bIsAttackPresent == 1 ) + { + /* release analysis */ + pSubblockNrg = hTranDet->transientDetector.pSubblockEnergies->subblockNrg; + set_zero( accSubblockNrgRev, NSUBBLOCKS ); + + for ( i = NSUBBLOCKS - 1; i > -1; i-- ) + { + if ( i == NSUBBLOCKS - 1 ) + { + accSubblockNrgRev[i] = pSubblockNrg[i + offset]; + } + else + { + accSubblockNrgRev[i] = *pTmp; + *pTmp *= hTranDet->transientDetector.pSubblockEnergies->facAccSubblockNrg; + if ( pSubblockNrg[i + offset] > *pTmp ) + { + *pTmp = pSubblockNrg[i + offset]; + } + } + } + + /* -3 check */ + if ( pSubblockNrg[1 + offset] > accSubblockNrgRev[1] * thr_rev ) + { + prel_force_td |= 0x0002; + } + + /* -4 check */ + if ( prel_force_td == 0 && pSubblockNrg[offset] > accSubblockNrgRev[0] * thr_rev ) + { + if ( pSubblockNrg[offset] > accSubblockNrgRev[0] * ( thr_rev + THR_LOW_STEP ) ) + { + prel_force_td |= 0x0004; + } + else if ( ( hTranDet->subblockEnergies.ramp_up_flag & 0x0002 ) != 0 ) + { + prel_force_td |= 0x0008; + } + } + } + + return prel_force_td != 0; +} diff --git a/lib_enc/transition_enc.c b/lib_enc/transition_enc.c index ef291f23c2..1ba6c37852 100644 --- a/lib_enc/transition_enc.c +++ b/lib_enc/transition_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------* * Local function prototypes @@ -178,7 +178,11 @@ void transition_enc( if ( *tc_subfr == TC_0_0 ) { /* this is called only to compute unused bits */ +#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE + config_acelp1( ENC, st->total_brate, st->core_brate, st->core, st->extl, st->extl_brate, L_FRAME, -1, &( st->acelp_cfg ), hBstr->nb_bits_tot, TRANSITION, TC_0_0, 3, NULL, unbits_ACELP, st->element_mode, &i /*dummy*/, 0 /*tdm_lp_reuse_flag*/, 0 /*tdm_low_rate_mode*/, st->idchan, st->active_cnt, 0 /*tdm_Pitch_reuse_flag*/, st->tdm_LRTD_flag, 0 /*GSC_IVAS_mode*/ ); +#else config_acelp1( ENC, st->total_brate, st->core_brate, st->core, st->extl, st->extl_brate, L_FRAME, -1, &( st->acelp_cfg ), hBstr->nb_bits_tot, TRANSITION, TC_0_0, 3, NULL, unbits_ACELP, st->element_mode, &i /*dummy*/, 0 /*tdm_lp_reuse_flag*/, 0 /*tdm_low_rate_mode*/, st->idchan, 0 /*tdm_Pitch_reuse_flag*/, st->tdm_LRTD_flag, 0 /*GSC_IVAS_mode*/ ); +#endif } *clip_gain = gp_clip( st->element_mode, st->core_brate, st->voicing, i_subfr, TRANSITION, xn, gp_cl ); @@ -274,7 +278,11 @@ void transition_enc( if ( i_subfr - *tc_subfr <= L_SUBFR ) { +#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE + config_acelp1( ENC, st->total_brate, st->core_brate, st->core, st->extl, st->extl_brate, st->L_frame, -1, &( st->acelp_cfg ), hBstr->nb_bits_tot, TRANSITION, *tc_subfr, 2, NULL, unbits_ACELP, st->element_mode, &i /*dummy*/, 0 /*tdm_lp_reuse_flag*/, 0 /*tdm_low_rate_mode*/, st->idchan, st->active_cnt, 0 /*tdm_Pitch_reuse_flag*/, st->tdm_LRTD_flag, 0 /*GSC_IVAS_mode*/ ); +#else config_acelp1( ENC, st->total_brate, st->core_brate, st->core, st->extl, st->extl_brate, st->L_frame, -1, &( st->acelp_cfg ), hBstr->nb_bits_tot, TRANSITION, *tc_subfr, 2, NULL, unbits_ACELP, st->element_mode, &i /*dummy*/, 0 /*tdm_lp_reuse_flag*/, 0 /*tdm_low_rate_mode*/, st->idchan, 0 /*tdm_Pitch_reuse_flag*/, st->tdm_LRTD_flag, 0 /*GSC_IVAS_mode*/ ); +#endif } /*-----------------------------------------------------------------* diff --git a/lib_enc/update_decision.c b/lib_enc/update_decision.c index 05877f7a7e..1269ca68da 100644 --- a/lib_enc/update_decision.c +++ b/lib_enc/update_decision.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #include "options.h" #include #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* diff --git a/lib_enc/updt_enc.c b/lib_enc/updt_enc.c index c6663895e0..6b8c595f5e 100644 --- a/lib_enc/updt_enc.c +++ b/lib_enc/updt_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "rom_com.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * updt_enc() @@ -188,17 +188,10 @@ void updt_IO_switch_enc( preemph( st->old_inp_16k, PREEMPH_FAC_16k, L_INP_MEM, &( st->mem_preemph16k ) ); /* reset TD BWE buffers */ - set_f( st->hBWE_TD->old_speech_shb, 0.0f, L_LOOK_16k + L_SUBFR16k ); set_f( st->hBWE_TD->old_speech_wb, 0.0f, ( L_LOOK_12k8 + L_SUBFR ) * 5 / 16 ); set_f( st->hBWE_TD->old_bwe_exc, 0.0f, PIT16k_MAX * 2 ); set_f( st->hBWE_TD->old_bwe_exc_extended, 0.0f, NL_BUFF_OFFSET ); - set_f( st->hBWE_TD->mem_shb_res, 0.0f, MAX_LEN_MA_FILTER ); - set_f( st->hBWE_TD->old_EnvSHBres, 0.0f, L_FRAME4k ); - st->hBWE_TD->old_mean_EnvSHBres = 0.0f; - st->hBWE_TD->prev_enr_EnvSHBres = 1.0f; - st->hBWE_TD->prev_pow_exc16kWhtnd = 1.0f; - st->hBWE_TD->prev_mix_factor = 1.0f; - st->hBWE_TD->prev_Env_error = 0.0f; + InitSWBencBufferStates( st->hBWE_TD, NULL ); st->hBWE_TD->bwe_non_lin_prev_scale = 0.0; set_f( st->hBWE_TD->decim_state1, 0.0f, ( 2 * ALLPASSSECTIONS_STEEP + 1 ) ); @@ -297,8 +290,7 @@ void updt_IO_switch_enc( *-------------------------------------------------------------------*/ void updt_enc_common( - Encoder_State *st, /* i/o: encoder state structure */ - const float Etot /* i : total energy */ + Encoder_State *st /* i/o: encoder state structure */ ) { /*---------------------------------------------------------------------* @@ -316,7 +308,6 @@ void updt_enc_common( st->last_extl = st->extl; st->last_input_bwidth = st->input_bwidth; st->last_bwidth = st->bwidth; - st->hNoiseEst->Etot_last = Etot; st->last_coder_type_raw = st->coder_type_raw; if ( st->core_brate > SID_2k40 && st->hDtxEnc != NULL ) @@ -417,7 +408,7 @@ void updt_enc_common( st->gamma = GAMMA16k; } - st->igf = getIgfPresent( EVS_MONO, st->total_brate, st->bwidth, st->rf_mode, MCT_CHAN_MODE_REGULAR ); + st->igf = getIgfPresent( EVS_MONO, st->total_brate, st->bwidth, st->rf_mode ); } /* update FER clas */ diff --git a/lib_enc/updt_tar.c b/lib_enc/updt_tar.c index 4cf7f78680..4c3ff4843c 100644 --- a/lib_enc/updt_tar.c +++ b/lib_enc/updt_tar.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "debug.h" #endif #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*----------------------------------------------------------------------------------* * procedure updt_tar() diff --git a/lib_enc/vad.c b/lib_enc/vad.c index 98b6ad240e..62c7ccb913 100644 --- a/lib_enc/vad.c +++ b/lib_enc/vad.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,7 +43,7 @@ #include "cnst.h" #include "prot.h" #include "rom_enc.h" -#include "wmops.h" +#include "wmc_auto.h" #include "ivas_prot.h" /*-----------------------------------------------------------------* @@ -155,17 +155,14 @@ static void sign_thr_snr_acc( *-----------------------------------------------------------------*/ int16_t dtx_hangover_addition( - Encoder_State *st, /* i/o: encoder state structure */ - const int16_t vad_flag, /* i : VAD flag */ - const float lp_snr, /* i : input single SNR estimate */ - const int16_t cldfb_subtraction, /* i : */ - int16_t *vad_hover_flag, /* o : VAD hangover flag */ - VAD_HANDLE hVAD, /* i/o: VAD handle for L or R channel */ - NOISE_EST_HANDLE hNoiseEst /* i : Noise estimation handle */ -#ifdef FIX_ITD_CNG - , - int16_t *rem_dtx_ho /* o : Expected remaining hangover frames */ -#endif + Encoder_State *st, /* i/o: encoder state structure */ + const int16_t vad_flag, /* i : VAD flag */ + const float lp_snr, /* i : input single SNR estimate */ + const int16_t cldfb_subtraction, /* i : */ + int16_t *vad_hover_flag, /* o : VAD hangover flag */ + VAD_HANDLE hVAD, /* i/o: VAD handle for L or R channel */ + NOISE_EST_HANDLE hNoiseEst, /* i : Noise estimation handle */ + int16_t *rem_dtx_ho /* o : Expected remaining hangover frames */ ) { int16_t hangover_short_dtx, flag_dtx; @@ -307,12 +304,10 @@ int16_t dtx_hangover_addition( if ( flag_dtx != 0 && st->localVAD == 0 ) { *vad_hover_flag = 1; -#ifdef FIX_ITD_CNG if ( rem_dtx_ho != NULL ) { *rem_dtx_ho = max( hangover_short_dtx - hVAD->hangover_cnt_dtx, 0 ); } -#endif } return flag_dtx; diff --git a/lib_enc/vad_param_updt.c b/lib_enc/vad_param_updt.c index cbbf5c37d9..b7adac46ea 100644 --- a/lib_enc/vad_param_updt.c +++ b/lib_enc/vad_param_updt.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * vad_param_updt() diff --git a/lib_enc/vad_proc.c b/lib_enc/vad_proc.c index f40ca2cb5f..07814aacf3 100644 --- a/lib_enc/vad_proc.c +++ b/lib_enc/vad_proc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,7 @@ #include "options.h" #include "prot.h" #include "rom_enc.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* diff --git a/lib_enc/vbr_average_rate.c b/lib_enc/vbr_average_rate.c index a32091f690..8e7330c8b8 100644 --- a/lib_enc/vbr_average_rate.c +++ b/lib_enc/vbr_average_rate.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------* * Local constants diff --git a/lib_enc/vlpc_1st_cod.c b/lib_enc/vlpc_1st_cod.c index 9f93167054..553cf7e264 100644 --- a/lib_enc/vlpc_1st_cod.c +++ b/lib_enc/vlpc_1st_cod.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,7 +42,7 @@ #include "cnst.h" #include "prot.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------* diff --git a/lib_enc/vlpc_2st_cod.c b/lib_enc/vlpc_2st_cod.c index 86abfec1b0..9e1e9fe550 100644 --- a/lib_enc/vlpc_2st_cod.c +++ b/lib_enc/vlpc_2st_cod.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #include "options.h" #include "cnst.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------* * vlpc_2st_cod() diff --git a/lib_enc/voiced_enc.c b/lib_enc/voiced_enc.c index d67ecbbce2..b32692b983 100644 --- a/lib_enc/voiced_enc.c +++ b/lib_enc/voiced_enc.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -40,7 +40,7 @@ #include "prot.h" #include "cnst.h" #include "rom_com.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * Local function prototypes @@ -554,12 +554,12 @@ ivas_error ppp_voiced_encoder( { hSC_VBR->bump_up = 1; - dynamic_free( CURRP_NQ ); - dynamic_free( TMPDTFS ); - dynamic_free( TMPDTFS2 ); - dynamic_free( TMPDTFS3 ); - dynamic_free( CURRP_Q_E ); - dynamic_free( dtfs_temp ); + free( CURRP_NQ ); + free( TMPDTFS ); + free( TMPDTFS2 ); + free( TMPDTFS3 ); + free( CURRP_Q_E ); + free( dtfs_temp ); return error; } @@ -580,12 +580,12 @@ ivas_error ppp_voiced_encoder( { hSC_VBR->bump_up = 1; - dynamic_free( CURRP_NQ ); - dynamic_free( TMPDTFS ); - dynamic_free( TMPDTFS2 ); - dynamic_free( TMPDTFS3 ); - dynamic_free( CURRP_Q_E ); - dynamic_free( dtfs_temp ); + free( CURRP_NQ ); + free( TMPDTFS ); + free( TMPDTFS2 ); + free( TMPDTFS3 ); + free( CURRP_Q_E ); + free( dtfs_temp ); return error; } @@ -608,12 +608,12 @@ ivas_error ppp_voiced_encoder( { hSC_VBR->bump_up = 1; - dynamic_free( CURRP_NQ ); - dynamic_free( TMPDTFS ); - dynamic_free( TMPDTFS2 ); - dynamic_free( TMPDTFS3 ); - dynamic_free( CURRP_Q_E ); - dynamic_free( dtfs_temp ); + free( CURRP_NQ ); + free( TMPDTFS ); + free( TMPDTFS2 ); + free( TMPDTFS3 ); + free( CURRP_Q_E ); + free( dtfs_temp ); return error; } @@ -749,12 +749,12 @@ ivas_error ppp_voiced_encoder( { hSC_VBR->bump_up = 1; - dynamic_free( CURRP_NQ ); - dynamic_free( TMPDTFS ); - dynamic_free( TMPDTFS2 ); - dynamic_free( TMPDTFS3 ); - dynamic_free( CURRP_Q_E ); - dynamic_free( dtfs_temp ); + free( CURRP_NQ ); + free( TMPDTFS ); + free( TMPDTFS2 ); + free( TMPDTFS3 ); + free( CURRP_Q_E ); + free( dtfs_temp ); return error; } @@ -780,12 +780,12 @@ ivas_error ppp_voiced_encoder( { hSC_VBR->bump_up = 1; - dynamic_free( CURRP_NQ ); - dynamic_free( TMPDTFS ); - dynamic_free( TMPDTFS2 ); - dynamic_free( TMPDTFS3 ); - dynamic_free( CURRP_Q_E ); - dynamic_free( dtfs_temp ); + free( CURRP_NQ ); + free( TMPDTFS ); + free( TMPDTFS2 ); + free( TMPDTFS3 ); + free( CURRP_Q_E ); + free( dtfs_temp ); return error; } @@ -800,13 +800,12 @@ ivas_error ppp_voiced_encoder( if ( hSC_VBR->bump_up == 1 ) { - - dynamic_free( CURRP_NQ ); - dynamic_free( TMPDTFS ); - dynamic_free( TMPDTFS2 ); - dynamic_free( TMPDTFS3 ); - dynamic_free( CURRP_Q_E ); - dynamic_free( dtfs_temp ); + free( CURRP_NQ ); + free( TMPDTFS ); + free( TMPDTFS2 ); + free( TMPDTFS3 ); + free( CURRP_Q_E ); + free( dtfs_temp ); return error; } @@ -816,12 +815,12 @@ ivas_error ppp_voiced_encoder( { hSC_VBR->bump_up = 1; - dynamic_free( CURRP_NQ ); - dynamic_free( TMPDTFS ); - dynamic_free( TMPDTFS2 ); - dynamic_free( TMPDTFS3 ); - dynamic_free( CURRP_Q_E ); - dynamic_free( dtfs_temp ); + free( CURRP_NQ ); + free( TMPDTFS ); + free( TMPDTFS2 ); + free( TMPDTFS3 ); + free( CURRP_Q_E ); + free( dtfs_temp ); return error; } @@ -835,12 +834,12 @@ ivas_error ppp_voiced_encoder( { if ( ( error = ppp_quarter_encoder( &flag, hBstr, CURRP_Q_E, TMPDTFS, dtfs_temp->lag, *CURRP_NQ, lpc2, &( hSC_VBR->lastLgainE ), &( hSC_VBR->lastHgainE ), &( hSC_VBR->lasterbE[0] ), *dtfs_temp ) ) != IVAS_ERR_OK ) { - dynamic_free( CURRP_NQ ); - dynamic_free( TMPDTFS ); - dynamic_free( TMPDTFS2 ); - dynamic_free( TMPDTFS3 ); - dynamic_free( CURRP_Q_E ); - dynamic_free( dtfs_temp ); + free( CURRP_NQ ); + free( TMPDTFS ); + free( TMPDTFS2 ); + free( TMPDTFS3 ); + free( CURRP_Q_E ); + free( dtfs_temp ); return error; } @@ -1027,12 +1026,12 @@ ivas_error ppp_voiced_encoder( { hSC_VBR->bump_up = 1; - dynamic_free( CURRP_NQ ); - dynamic_free( TMPDTFS ); - dynamic_free( TMPDTFS2 ); - dynamic_free( TMPDTFS3 ); - dynamic_free( CURRP_Q_E ); - dynamic_free( dtfs_temp ); + free( CURRP_NQ ); + free( TMPDTFS ); + free( TMPDTFS2 ); + free( TMPDTFS3 ); + free( CURRP_Q_E ); + free( dtfs_temp ); return error; } @@ -1047,12 +1046,12 @@ ivas_error ppp_voiced_encoder( PPP_MODE_E = 'B'; hSC_VBR->bump_up = 1; - dynamic_free( CURRP_NQ ); - dynamic_free( TMPDTFS ); - dynamic_free( TMPDTFS2 ); - dynamic_free( TMPDTFS3 ); - dynamic_free( CURRP_Q_E ); - dynamic_free( dtfs_temp ); + free( CURRP_NQ ); + free( TMPDTFS ); + free( TMPDTFS2 ); + free( TMPDTFS3 ); + free( CURRP_Q_E ); + free( dtfs_temp ); return error; } @@ -1084,12 +1083,12 @@ ivas_error ppp_voiced_encoder( mvr2r( dtfs_temp->a, hSC_VBR->dtfs_enc_a, MAXLAG_WI ); mvr2r( dtfs_temp->b, hSC_VBR->dtfs_enc_b, MAXLAG_WI ); - dynamic_free( CURRP_NQ ); - dynamic_free( TMPDTFS ); - dynamic_free( TMPDTFS2 ); - dynamic_free( TMPDTFS3 ); - dynamic_free( CURRP_Q_E ); - dynamic_free( dtfs_temp ); + free( CURRP_NQ ); + free( TMPDTFS ); + free( TMPDTFS2 ); + free( TMPDTFS3 ); + free( CURRP_Q_E ); + free( dtfs_temp ); return error; } diff --git a/lib_enc/waveadjust_fec_cod.c b/lib_enc/waveadjust_fec_cod.c index e0b87477be..bd57e4a093 100644 --- a/lib_enc/waveadjust_fec_cod.c +++ b/lib_enc/waveadjust_fec_cod.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ #include "options.h" #include #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------* * SFM_Cal() diff --git a/lib_rend/ivas_CQMFDecoder.c b/lib_rend/ivas_CQMFDecoder.c index 37ae41bca0..b5fe0b38ea 100644 --- a/lib_rend/ivas_CQMFDecoder.c +++ b/lib_rend/ivas_CQMFDecoder.c @@ -36,16 +36,14 @@ Nations Convention on Contracts on the International Sales of Goods. *******************************************************************************************************/ #include "ivas_CQMFDecoder.h" +#include "options.h" +#ifdef SPLIT_REND_WITH_HEAD_ROT -#include "ivas_CQMFHuff.h" #include "ivas_NoiseGen.h" #include "ivas_PerceptualModel.h" -#include "ivas_RMSEnvDeltaHuff.h" -#include "ivas_Tables.h" +#include "ivas_lcld_tables.h" #include "ivas_cldfb_codec_bitstream.h" -#include "options.h" #include "prot.h" -#include "wmops.h" #include #include #include @@ -53,10 +51,27 @@ Nations Convention on Contracts on the International Sales of Goods. #ifdef ENABLE_MS_PRED #include "ivas_MSPred.h" #endif - #include "ivas_PredDecoder.h" -#include "ivas_lib_rend_internal.h" +#include "ivas_prot_rend.h" +#include "wmc_auto.h" +#ifdef ROM_TO_RAM +typedef struct TableNode +{ + struct TableNode **ppoNextTable; + struct TableNode *poOrderedNext; + + int32_t *piCodeIndex; + int32_t *piDifference; + int32_t *piLength; +} TableNode; +typedef struct TableList +{ + TableNode *poOrderedTop; + TableNode *poOrderedBottom; + +} TableList; +#endif struct CQMF_DECODER { int32_t iSampleRate; @@ -68,6 +83,11 @@ struct CQMF_DECODER int32_t iMSMode; int32_t *piMSFlags; +#ifdef ROM_TO_RAM + TableList *ptable_list; + uint32_t ( *c_apauiHuffDecTable_RAM[2 * ALLOC_TABLE_SIZE] )[HUFF_DEC_TABLE_SIZE]; + uint32_t num_decode_table[2 * ALLOC_TABLE_SIZE]; +#endif #ifdef ENABLE_MS_PRED int32_t piMSPredCoefs[MAX_BANDS]; int32_t piLRPhaseDiffs[MAX_BANDS]; @@ -99,16 +119,250 @@ struct CQMF_DECODER int32_t iLastError; }; +#ifdef ROM_TO_RAM +static void CreateDecodeTable( CQMFDecoder *psCQMFDecoder, int32_t num, const uint16_t ( *ppuiEncTable )[2], int32_t iSize, int32_t iReadLength, uint32_t *iTables ); +static TableNode *CreateTableList( int32_t iReadLength ); +static void DeleteTableList( TableList *ptable_list, int32_t iTables ); +static TableNode *GetNextTable( int32_t iIndex, TableList *table_list, TableNode *poParent, int32_t iReadLength, uint32_t *iTablesCreated ); +static void AddcodeTableList( TableList *ptable_list, int32_t iLength, int32_t iCode, int32_t iCodeIndex, int32_t iReadLength, uint32_t *iTables ); +static void CompleteTables( CQMFDecoder *psCQMFDecoder, int32_t n, TableList *ptable_list, int32_t iReadLength, int32_t iTablesCreated ); + +static TableNode *CreateTableList( int32_t iReadLength ) +{ + int32_t n; + int32_t iMaxTables; + TableNode *ptable_top; + iMaxTables = 1 << iReadLength; + ptable_top = (TableNode *) malloc( sizeof( TableNode ) ); + ptable_top->ppoNextTable = + (TableNode **) malloc( iMaxTables * sizeof( TableNode * ) ); + ptable_top->piCodeIndex = (int32_t *) malloc( iMaxTables * sizeof( int32_t ) ); + ptable_top->piDifference = (int32_t *) malloc( iMaxTables * sizeof( int32_t ) ); + ptable_top->piLength = (int32_t *) malloc( iMaxTables * sizeof( int32_t ) ); + for ( n = 0; n < iMaxTables; n++ ) + { + ptable_top->ppoNextTable[n] = NULL; + ptable_top->piCodeIndex[n] = 0xffff; + ptable_top->piDifference[n] = 0; + ptable_top->piLength[n] = 0; + } + + return ptable_top; +} +static void DeleteTableList( TableList *ptable_list, int32_t iTables ) +{ + + TableNode *node; + node = ptable_list->poOrderedTop; + + while ( ( iTables ) ) + { + + TableNode *node1 = node; + node = node1->poOrderedNext; + if ( node1->piCodeIndex != NULL ) + { + free( node1->piCodeIndex ); + } + if ( node1->piLength != NULL ) + { + free( node1->piLength ); + } + if ( node1->piDifference != NULL ) + { + free( node1->piDifference ); + } + if ( node1->ppoNextTable != NULL ) + { + free( node1->ppoNextTable ); + } + if ( node1 != NULL ) + { + free( node1 ); + } + iTables--; + } + if ( ptable_list != NULL ) + { + free( ptable_list ); + } +} +static TableNode *GetNextTable( int32_t iIndex, TableList *table_list, TableNode *poParent, int32_t iReadLength, uint32_t *iTablesCreated ) +{ + TableNode *poNextNode; + if ( poParent->ppoNextTable[iIndex] == NULL ) + { + poNextNode = CreateTableList( iReadLength ); + poParent->ppoNextTable[iIndex] = poNextNode; + poParent->piDifference[iIndex] = + *iTablesCreated; // this is a link to the next table rather than the + // difference + table_list->poOrderedBottom->poOrderedNext = poNextNode; + table_list->poOrderedBottom = poNextNode; + + ( *iTablesCreated )++; + } + else + { + poNextNode = poParent->ppoNextTable[iIndex]; + } + + return poNextNode; +} +static void CompleteTables( CQMFDecoder *psCQMFDecoder, int32_t n, TableList *ptable_list, int32_t iReadLength, int32_t iTablesCreated ) +{ + + int32_t iMaxTables; + int32_t j; + TableNode *poNode; + + iMaxTables = 1 << iReadLength; + psCQMFDecoder->c_apauiHuffDecTable_RAM[n] = + malloc( iTablesCreated * iMaxTables * sizeof( uint32_t * ) ); + + poNode = ptable_list->poOrderedTop; + for ( j = 0; j < iTablesCreated; j++ ) + { + int32_t k; + if ( poNode != NULL ) + { + for ( k = 0; k < iMaxTables; k++ ) + { + uint32_t uiCode; + uiCode = poNode->piDifference[k]; + uiCode <<= 16; + uiCode |= poNode->piCodeIndex[k]; + psCQMFDecoder->c_apauiHuffDecTable_RAM[n][j][k] = uiCode; + } + } + poNode = poNode->poOrderedNext; + } +} +static void AddcodeTableList( TableList *ptable_list, int32_t iLength, int32_t iCode, int32_t iCodeIndex, int32_t iReadLength, uint32_t *iTables ) +{ + int32_t iDifference; + int32_t iMask; + int32_t iCurrentLength; + int32_t iIndex; + int32_t iCodeLow; + int32_t iCodeHigh; + + TableNode *poNode; + poNode = ptable_list->poOrderedTop; + iMask = ( 1 << iReadLength ) - 1; + iCurrentLength = iLength; + while ( iCurrentLength > iReadLength ) + { + iDifference = iCurrentLength - iReadLength; + iIndex = iCode >> iDifference; + iIndex &= iMask; + poNode = GetNextTable( iIndex, ptable_list, poNode, iReadLength, iTables ); + iCurrentLength -= iReadLength; + } + + iMask = ( 1 << iCurrentLength ) - 1; + iDifference = iReadLength - iCurrentLength; + iCodeLow = ( iCode & iMask ) << iDifference; + iMask = ( 1 << iDifference ) - 1; + iCodeHigh = iCodeLow | iMask; + for ( iIndex = iCodeLow; iIndex <= iCodeHigh; iIndex++ ) + { + poNode->piCodeIndex[iIndex] = iCodeIndex; + poNode->piDifference[iIndex] = iDifference; + poNode->piLength[iIndex] = iLength; + } +} + +static void CreateDecodeTable( CQMFDecoder *psCQMFDecoder, int32_t num, const uint16_t ( *ppuiEncTable )[2], int32_t iSize, int32_t iReadLength, uint32_t *iTables ) +{ + int32_t n; + uint32_t **ppsort_enc_table; + TableList *ptable_list; + ptable_list = (TableList *) malloc( sizeof( TableList ) ); + + ppsort_enc_table = (uint32_t **) malloc( iSize * sizeof( int32_t * ) ); + for ( n = 0; n < iSize; n++ ) + { + + ppsort_enc_table[n] = (uint32_t *) malloc( 3 * sizeof( int32_t ) ); + ppsort_enc_table[n][0] = (uint32_t) ppuiEncTable[n][0]; + ppsort_enc_table[n][1] = (uint32_t) ppuiEncTable[n][1]; + ppsort_enc_table[n][2] = (uint32_t) n; + } + + for ( n = 0; n < iSize; n++ ) + { + uint32_t iMin; + int32_t iMinIndex; + int32_t k; + + iMin = ppsort_enc_table[n][0]; + iMinIndex = n; + for ( k = n; k < iSize; k++ ) + { + if ( ppsort_enc_table[k][0] < iMin ) + { + iMin = ppsort_enc_table[k][0]; + iMinIndex = k; + } + } + + if ( iMinIndex != n ) + { + uint32_t uiLength; + uint32_t uiCode; + uint32_t uiCodeIndex; + + uiLength = ppsort_enc_table[n][0]; + uiCode = ppsort_enc_table[n][1]; + uiCodeIndex = ppsort_enc_table[n][2]; + + ppsort_enc_table[n][0] = ppsort_enc_table[iMinIndex][0]; + ppsort_enc_table[n][1] = ppsort_enc_table[iMinIndex][1]; + ppsort_enc_table[n][2] = ppsort_enc_table[iMinIndex][2]; + + ppsort_enc_table[iMinIndex][0] = uiLength; + ppsort_enc_table[iMinIndex][1] = uiCode; + ppsort_enc_table[iMinIndex][2] = uiCodeIndex; + } + } + ptable_list->poOrderedTop = CreateTableList( iReadLength ); + ptable_list->poOrderedBottom = ptable_list->poOrderedTop; + for ( n = 0; n < iSize; n++ ) + { + int32_t iLength; + int32_t iCode; + int32_t iCodeIndex; + + iLength = ppsort_enc_table[n][0]; + iCode = ppsort_enc_table[n][1]; + iCodeIndex = ppsort_enc_table[n][2]; + AddcodeTableList( ptable_list, iLength, iCode, iCodeIndex, iReadLength, + iTables ); + } + + CompleteTables( psCQMFDecoder, num, ptable_list, iReadLength, *iTables ); + DeleteTableList( ptable_list, *iTables ); + for ( n = 0; n < iSize; n++ ) + { + free( ppsort_enc_table[n] ); + } + free( ppsort_enc_table ); +} +#endif CQMFDecoder *CreateCQMFDecoder( const int32_t iSampleRate, const int32_t iChannels ) { int32_t n; +#ifdef ROM_TO_RAM + int32_t read_length; +#endif CQMFDecoder *psCQMFDecoder = NULL; assert( iSampleRate == 48000 ); // Fix - psCQMFDecoder = (CQMFDecoder *) count_malloc( sizeof( CQMFDecoder ) ); + psCQMFDecoder = (CQMFDecoder *) malloc( sizeof( CQMFDecoder ) ); psCQMFDecoder->iSampleRate = iSampleRate; psCQMFDecoder->iChannels = iChannels; psCQMFDecoder->iNumBlocks = CQMF_BLOCKS_PER_FRAME; @@ -119,7 +373,7 @@ CQMFDecoder *CreateCQMFDecoder( const int32_t iSampleRate, psCQMFDecoder->iMSMode = 0; psCQMFDecoder->piMSFlags = - (int32_t *) count_malloc( MAX_BANDS * sizeof( int32_t ) ); + (int32_t *) malloc( MAX_BANDS * sizeof( int32_t ) ); #ifdef ENABLE_MS_PRED for ( n = 0; n < MAX_BANDS; n++ ) { @@ -129,85 +383,100 @@ CQMFDecoder *CreateCQMFDecoder( const int32_t iSampleRate, #endif #ifdef ENABLE_PMOD_ADJUST psCQMFDecoder->ppiHiSMRFlags = - (int32_t **) count_malloc( psCQMFDecoder->iChannels * sizeof( int32_t * ) ); + (int32_t **) malloc( psCQMFDecoder->iChannels * sizeof( int32_t * ) ); #endif psCQMFDecoder->iCommonGrouping = 1; // Common grouping always on only impacts stereo psCQMFDecoder->piNumGroups = - (int32_t *) count_malloc( psCQMFDecoder->iChannels * sizeof( int32_t ) ); + (int32_t *) malloc( psCQMFDecoder->iChannels * sizeof( int32_t ) ); psCQMFDecoder->ppiGroupLengths = - (int32_t **) count_malloc( psCQMFDecoder->iChannels * sizeof( int32_t * ) ); + (int32_t **) malloc( psCQMFDecoder->iChannels * sizeof( int32_t * ) ); psCQMFDecoder->pppiRMSEnvelope = - (int32_t ***) count_malloc( psCQMFDecoder->iChannels * sizeof( int32_t ** ) ); + (int32_t ***) malloc( psCQMFDecoder->iChannels * sizeof( int32_t ** ) ); psCQMFDecoder->pppiSMR = - (int32_t ***) count_malloc( psCQMFDecoder->iChannels * sizeof( int32_t ** ) ); + (int32_t ***) malloc( psCQMFDecoder->iChannels * sizeof( int32_t ** ) ); psCQMFDecoder->pppiExcitation = - (int32_t ***) count_malloc( psCQMFDecoder->iChannels * sizeof( int32_t ** ) ); + (int32_t ***) malloc( psCQMFDecoder->iChannels * sizeof( int32_t ** ) ); psCQMFDecoder->pppiAlloc = - (int32_t ***) count_malloc( psCQMFDecoder->iChannels * sizeof( int32_t ** ) ); + (int32_t ***) malloc( psCQMFDecoder->iChannels * sizeof( int32_t ** ) ); psCQMFDecoder->pppiCQMFSignReal = - (int32_t ***) count_malloc( psCQMFDecoder->iChannels * sizeof( int32_t ** ) ); + (int32_t ***) malloc( psCQMFDecoder->iChannels * sizeof( int32_t ** ) ); psCQMFDecoder->pppiCQMFSignImag = - (int32_t ***) count_malloc( psCQMFDecoder->iChannels * sizeof( int32_t ** ) ); + (int32_t ***) malloc( psCQMFDecoder->iChannels * sizeof( int32_t ** ) ); psCQMFDecoder->pppiQCQMFReal = - (int32_t ***) count_malloc( psCQMFDecoder->iChannels * sizeof( int32_t ** ) ); + (int32_t ***) malloc( psCQMFDecoder->iChannels * sizeof( int32_t ** ) ); psCQMFDecoder->pppiQCQMFImag = - (int32_t ***) count_malloc( psCQMFDecoder->iChannels * sizeof( int32_t ** ) ); + (int32_t ***) malloc( psCQMFDecoder->iChannels * sizeof( int32_t ** ) ); for ( n = 0; n < iChannels; n++ ) { int32_t k; #ifdef ENABLE_PMOD_ADJUST psCQMFDecoder->ppiHiSMRFlags[n] = - (int32_t *) count_malloc( MAX_BANDS * sizeof( int32_t ) ); + (int32_t *) malloc( MAX_BANDS * sizeof( int32_t ) ); ; #endif psCQMFDecoder->ppiGroupLengths[n] = - (int32_t *) count_malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t ) ); + (int32_t *) malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t ) ); psCQMFDecoder->pppiRMSEnvelope[n] = - (int32_t **) count_malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); + (int32_t **) malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); psCQMFDecoder->pppiSMR[n] = - (int32_t **) count_malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); + (int32_t **) malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); psCQMFDecoder->pppiExcitation[n] = - (int32_t **) count_malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); + (int32_t **) malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); psCQMFDecoder->pppiAlloc[n] = - (int32_t **) count_malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); + (int32_t **) malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); psCQMFDecoder->pppiCQMFSignReal[n] = - (int32_t **) count_malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); + (int32_t **) malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); psCQMFDecoder->pppiCQMFSignImag[n] = - (int32_t **) count_malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); + (int32_t **) malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); psCQMFDecoder->pppiQCQMFReal[n] = - (int32_t **) count_malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); + (int32_t **) malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); psCQMFDecoder->pppiQCQMFImag[n] = - (int32_t **) count_malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); + (int32_t **) malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); for ( k = 0; k < CQMF_BLOCKS_PER_FRAME; k++ ) { psCQMFDecoder->pppiRMSEnvelope[n][k] = - (int32_t *) count_malloc( MAX_BANDS * sizeof( int32_t ) ); + (int32_t *) malloc( MAX_BANDS * sizeof( int32_t ) ); psCQMFDecoder->pppiSMR[n][k] = - (int32_t *) count_malloc( MAX_BANDS * sizeof( int32_t ) ); + (int32_t *) malloc( MAX_BANDS * sizeof( int32_t ) ); psCQMFDecoder->pppiExcitation[n][k] = - (int32_t *) count_malloc( MAX_BANDS * sizeof( int32_t ) ); + (int32_t *) malloc( MAX_BANDS * sizeof( int32_t ) ); psCQMFDecoder->pppiAlloc[n][k] = - (int32_t *) count_malloc( MAX_BANDS * sizeof( int32_t ) ); + (int32_t *) malloc( MAX_BANDS * sizeof( int32_t ) ); psCQMFDecoder->pppiCQMFSignReal[n][k] = - (int32_t *) count_malloc( CQMF_BANDS * sizeof( int32_t ) ); + (int32_t *) malloc( CQMF_BANDS * sizeof( int32_t ) ); psCQMFDecoder->pppiCQMFSignImag[n][k] = - (int32_t *) count_malloc( CQMF_BANDS * sizeof( int32_t ) ); + (int32_t *) malloc( CQMF_BANDS * sizeof( int32_t ) ); psCQMFDecoder->pppiQCQMFReal[n][k] = - (int32_t *) count_malloc( CQMF_BANDS * sizeof( int32_t ) ); + (int32_t *) malloc( CQMF_BANDS * sizeof( int32_t ) ); psCQMFDecoder->pppiQCQMFImag[n][k] = - (int32_t *) count_malloc( CQMF_BANDS * sizeof( int32_t ) ); + (int32_t *) malloc( CQMF_BANDS * sizeof( int32_t ) ); } } +#ifdef ROM_TO_RAM + read_length = READ_LENGTH; + for ( n = 0; n < ALLOC_TABLE_SIZE * 2; n++ ) + { + psCQMFDecoder->num_decode_table[n] = 1; // initialising the value to 1 + if ( c_apauiHuffEncTabels[n] != NULL ) + { + CreateDecodeTable( psCQMFDecoder, n, c_apauiHuffEncTabels[n], num_row_aauiCQMFHuff[n], read_length, &psCQMFDecoder->num_decode_table[n] ); + } + else + { + psCQMFDecoder->c_apauiHuffDecTable_RAM[n] = NULL; + } + } +#endif psCQMFDecoder->psPredictionDecoder = CreatePredictionDecoder( iChannels, psCQMFDecoder->iNumBlocks ); // psCQMFDecoder->pReadBuff = - // (uint8_t *) count_malloc( 4096 * sizeof( uint8_t ) ); + // (uint8_t *) malloc( 4096 * sizeof( uint8_t ) ); psCQMFDecoder->psNoiseGen = NULL; // CreateNoiseGen(); // No noise fill for now @@ -223,12 +492,12 @@ void DeleteCQMFDecoder( CQMFDecoder *psCQMFDecoder ) if ( psCQMFDecoder->piMSFlags != NULL ) { - count_free( psCQMFDecoder->piMSFlags ); + free( psCQMFDecoder->piMSFlags ); } if ( psCQMFDecoder->piNumGroups != NULL ) { - count_free( psCQMFDecoder->piNumGroups ); + free( psCQMFDecoder->piNumGroups ); } if ( psCQMFDecoder->ppiGroupLengths != NULL ) @@ -236,9 +505,9 @@ void DeleteCQMFDecoder( CQMFDecoder *psCQMFDecoder ) int32_t n; for ( n = 0; n < psCQMFDecoder->iChannels; n++ ) { - count_free( psCQMFDecoder->ppiGroupLengths[n] ); + free( psCQMFDecoder->ppiGroupLengths[n] ); } - count_free( psCQMFDecoder->ppiGroupLengths ); + free( psCQMFDecoder->ppiGroupLengths ); } if ( psCQMFDecoder->pppiRMSEnvelope != NULL ) @@ -249,11 +518,11 @@ void DeleteCQMFDecoder( CQMFDecoder *psCQMFDecoder ) int32_t k; for ( k = 0; k < CQMF_BLOCKS_PER_FRAME; k++ ) { - count_free( psCQMFDecoder->pppiRMSEnvelope[n][k] ); + free( psCQMFDecoder->pppiRMSEnvelope[n][k] ); } - count_free( psCQMFDecoder->pppiRMSEnvelope[n] ); + free( psCQMFDecoder->pppiRMSEnvelope[n] ); } - count_free( psCQMFDecoder->pppiRMSEnvelope ); + free( psCQMFDecoder->pppiRMSEnvelope ); } if ( psCQMFDecoder->pppiSMR != NULL ) @@ -264,11 +533,11 @@ void DeleteCQMFDecoder( CQMFDecoder *psCQMFDecoder ) int32_t k; for ( k = 0; k < CQMF_BLOCKS_PER_FRAME; k++ ) { - count_free( psCQMFDecoder->pppiSMR[n][k] ); + free( psCQMFDecoder->pppiSMR[n][k] ); } - count_free( psCQMFDecoder->pppiSMR[n] ); + free( psCQMFDecoder->pppiSMR[n] ); } - count_free( psCQMFDecoder->pppiSMR ); + free( psCQMFDecoder->pppiSMR ); } if ( psCQMFDecoder->pppiExcitation != NULL ) @@ -279,11 +548,11 @@ void DeleteCQMFDecoder( CQMFDecoder *psCQMFDecoder ) int32_t k; for ( k = 0; k < CQMF_BLOCKS_PER_FRAME; k++ ) { - count_free( psCQMFDecoder->pppiExcitation[n][k] ); + free( psCQMFDecoder->pppiExcitation[n][k] ); } - count_free( psCQMFDecoder->pppiExcitation[n] ); + free( psCQMFDecoder->pppiExcitation[n] ); } - count_free( psCQMFDecoder->pppiExcitation ); + free( psCQMFDecoder->pppiExcitation ); } #ifdef ENABLE_PMOD_ADJUST @@ -292,9 +561,9 @@ void DeleteCQMFDecoder( CQMFDecoder *psCQMFDecoder ) int32_t n; for ( n = 0; n < psCQMFDecoder->iChannels; n++ ) { - count_free( psCQMFDecoder->ppiHiSMRFlags[n] ); + free( psCQMFDecoder->ppiHiSMRFlags[n] ); } - count_free( psCQMFDecoder->ppiHiSMRFlags ); + free( psCQMFDecoder->ppiHiSMRFlags ); } #endif @@ -306,11 +575,11 @@ void DeleteCQMFDecoder( CQMFDecoder *psCQMFDecoder ) int32_t k; for ( k = 0; k < CQMF_BLOCKS_PER_FRAME; k++ ) { - count_free( psCQMFDecoder->pppiAlloc[n][k] ); + free( psCQMFDecoder->pppiAlloc[n][k] ); } - count_free( psCQMFDecoder->pppiAlloc[n] ); + free( psCQMFDecoder->pppiAlloc[n] ); } - count_free( psCQMFDecoder->pppiAlloc ); + free( psCQMFDecoder->pppiAlloc ); } if ( psCQMFDecoder->pppiCQMFSignReal != NULL ) @@ -321,11 +590,11 @@ void DeleteCQMFDecoder( CQMFDecoder *psCQMFDecoder ) int32_t k; for ( k = 0; k < CQMF_BLOCKS_PER_FRAME; k++ ) { - count_free( psCQMFDecoder->pppiCQMFSignReal[n][k] ); + free( psCQMFDecoder->pppiCQMFSignReal[n][k] ); } - count_free( psCQMFDecoder->pppiCQMFSignReal[n] ); + free( psCQMFDecoder->pppiCQMFSignReal[n] ); } - count_free( psCQMFDecoder->pppiCQMFSignReal ); + free( psCQMFDecoder->pppiCQMFSignReal ); } if ( psCQMFDecoder->pppiCQMFSignImag != NULL ) @@ -336,11 +605,11 @@ void DeleteCQMFDecoder( CQMFDecoder *psCQMFDecoder ) int32_t k; for ( k = 0; k < CQMF_BLOCKS_PER_FRAME; k++ ) { - count_free( psCQMFDecoder->pppiCQMFSignImag[n][k] ); + free( psCQMFDecoder->pppiCQMFSignImag[n][k] ); } - count_free( psCQMFDecoder->pppiCQMFSignImag[n] ); + free( psCQMFDecoder->pppiCQMFSignImag[n] ); } - count_free( psCQMFDecoder->pppiCQMFSignImag ); + free( psCQMFDecoder->pppiCQMFSignImag ); } if ( psCQMFDecoder->pppiQCQMFReal != NULL ) @@ -351,11 +620,11 @@ void DeleteCQMFDecoder( CQMFDecoder *psCQMFDecoder ) int32_t k; for ( k = 0; k < CQMF_BLOCKS_PER_FRAME; k++ ) { - count_free( psCQMFDecoder->pppiQCQMFReal[n][k] ); + free( psCQMFDecoder->pppiQCQMFReal[n][k] ); } - count_free( psCQMFDecoder->pppiQCQMFReal[n] ); + free( psCQMFDecoder->pppiQCQMFReal[n] ); } - count_free( psCQMFDecoder->pppiQCQMFReal ); + free( psCQMFDecoder->pppiQCQMFReal ); } if ( psCQMFDecoder->pppiQCQMFImag != NULL ) @@ -366,17 +635,30 @@ void DeleteCQMFDecoder( CQMFDecoder *psCQMFDecoder ) int32_t k; for ( k = 0; k < CQMF_BLOCKS_PER_FRAME; k++ ) { - count_free( psCQMFDecoder->pppiQCQMFImag[n][k] ); + free( psCQMFDecoder->pppiQCQMFImag[n][k] ); } - count_free( psCQMFDecoder->pppiQCQMFImag[n] ); + free( psCQMFDecoder->pppiQCQMFImag[n] ); } - count_free( psCQMFDecoder->pppiQCQMFImag ); + free( psCQMFDecoder->pppiQCQMFImag ); } // if ( psCQMFDecoder->pReadBuff != NULL ) //{ - // count_free( psCQMFDecoder->pReadBuff ); + // free( psCQMFDecoder->pReadBuff ); // } +#ifdef ROM_TO_RAM + for ( uint32_t n = 0; n < ALLOC_TABLE_SIZE * 2; n++ ) + { + if ( psCQMFDecoder->num_decode_table[n] > 1 ) + { + + if ( psCQMFDecoder->c_apauiHuffDecTable_RAM[n] != NULL ) + { + free( psCQMFDecoder->c_apauiHuffDecTable_RAM[n] ); + } + } + } +#endif DeletePredictionDecoder( psCQMFDecoder->psPredictionDecoder ); @@ -385,7 +667,7 @@ void DeleteCQMFDecoder( CQMFDecoder *psCQMFDecoder ) DeleteNoiseGen( psCQMFDecoder->psNoiseGen ); } - count_free( psCQMFDecoder ); + free( psCQMFDecoder ); } } @@ -445,9 +727,13 @@ static int32_t ReadRMSEnvelope( const int32_t iChannels, ivas_split_rend_bits_t *pBits ); static int32_t ReadAllocInformation( int32_t *piAllocOffset, ivas_split_rend_bits_t *pBits ); - +#ifdef ROM_TO_RAM +static int32_t +ReadCQMFData( const int32_t iNumGroups, const int32_t *piGroupLengths, const int32_t iNumBands, const int32_t *piBandwidths, const int32_t *piPredEnable, int32_t **ppiAlloc, int32_t **ppiSignReal, int32_t **ppiSignImag, int32_t **ppiQReal, int32_t **ppiQImag, ivas_split_rend_bits_t *pBits, uint32_t ( *c_apauiHuffDecTables[2 * ALLOC_TABLE_SIZE] )[HUFF_DEC_TABLE_SIZE] ); +#else static int32_t ReadCQMFData( const int32_t iNumGroups, const int32_t *piGroupLengths, const int32_t iNumBands, const int32_t *piBandwidths, const int32_t *piPredEnable, int32_t **ppiAlloc, int32_t **ppiSignReal, int32_t **ppiSignImag, int32_t **ppiQReal, int32_t **ppiQImag, ivas_split_rend_bits_t *pBits ); +#endif static void ComputeAllocation( const int32_t iChannels, const int32_t *piNumGroups, @@ -549,7 +835,12 @@ int32_t DecodeFrame( CQMFDecoder *psCQMFDecoder, psCQMFDecoder->pppiAlloc[n], psCQMFDecoder->pppiCQMFSignReal[n], psCQMFDecoder->pppiCQMFSignImag[n], psCQMFDecoder->pppiQCQMFReal[n], psCQMFDecoder->pppiQCQMFImag[n], - pBits ); + pBits +#ifdef ROM_TO_RAM + , + psCQMFDecoder->c_apauiHuffDecTable_RAM +#endif + ); } for ( n = 0; n < psCQMFDecoder->iChannels; n++ ) @@ -1216,9 +1507,13 @@ static int32_t ReadAllocInformation( int32_t *piAllocOffset, return iBitsRead; } - +#ifdef ROM_TO_RAM +static int32_t +ReadCQMFData( const int32_t iNumGroups, const int32_t *piGroupLengths, const int32_t iNumBands, const int32_t *piBandwidths, const int32_t *piPredEnable, int32_t **ppiAlloc, int32_t **ppiSignReal, int32_t **ppiSignImag, int32_t **ppiQReal, int32_t **ppiQImag, ivas_split_rend_bits_t *pBits, uint32_t ( *c_apauiHuffDecTables[2 * ALLOC_TABLE_SIZE] )[HUFF_DEC_TABLE_SIZE] ) +#else static int32_t ReadCQMFData( const int32_t iNumGroups, const int32_t *piGroupLengths, const int32_t iNumBands, const int32_t *piBandwidths, const int32_t *piPredEnable, int32_t **ppiAlloc, int32_t **ppiSignReal, int32_t **ppiSignImag, int32_t **ppiQReal, int32_t **ppiQImag, ivas_split_rend_bits_t *pBits ) +#endif { int32_t n; int32_t iBitsRead; @@ -1254,10 +1549,13 @@ ReadCQMFData( const int32_t iNumGroups, const int32_t *piGroupLengths, const int #ifdef USE_DEMOD_TABLES const int32_t( *paiDemodTable )[2] = NULL; #endif - +#ifdef ROM_TO_RAM + pauiHuffmanTable = (const uint32_t( * )[HUFF_DEC_TABLE_SIZE]) c_apauiHuffDecTables[iAlloc]; + pauiHuffmanTableDPCM = (const uint32_t( * )[HUFF_DEC_TABLE_SIZE]) c_apauiHuffDecTables[ALLOC_TABLE_SIZE + iAlloc]; +#else pauiHuffmanTable = c_apauiHuffDecTables[iAlloc]; - pauiHuffmanTableDPCM = - c_apauiHuffDecTables[ALLOC_TABLE_SIZE + iAlloc]; + pauiHuffmanTableDPCM = c_apauiHuffDecTables[ALLOC_TABLE_SIZE + iAlloc]; +#endif #ifdef USE_DEMOD_TABLES paiDemodTable = c_apaiDemodTables[iAlloc]; #endif @@ -1325,18 +1623,39 @@ ReadCQMFData( const int32_t iNumGroups, const int32_t *piGroupLengths, const int ppiSignReal[iBlockOffest][iFBOffset] = ivas_split_rend_bitstream_read_int32( pBits, 1 ); iBitsRead += 1; } +#ifdef SPLIT_REND_CLANG_SAN_FIX + else + { + ppiSignReal[iBlockOffest][iFBOffset] = 0; + } +#endif if ( iQuantValue2 > 0 ) { ppiSignImag[iBlockOffest][iFBOffset] = ivas_split_rend_bitstream_read_int32( pBits, 1 ); iBitsRead += 1; } +#ifdef SPLIT_REND_CLANG_SAN_FIX + else + { + ppiSignImag[iBlockOffest][iFBOffset] = 0; + } +#endif iFBOffset++; } } else { +#ifdef SPLIT_REND_CLANG_SAN_FIX + for ( m = 0; m < piBandwidths[b]; m++ ) + { + ppiSignReal[iBlockOffest][iFBOffset] = 0; + ppiSignImag[iBlockOffest][iFBOffset] = 0; + iFBOffset++; + } +#else iFBOffset += piBandwidths[b]; +#endif } } @@ -1373,3 +1692,4 @@ static void ComputeAllocation( const int32_t iChannels, } } } +#endif diff --git a/lib_rend/ivas_CQMFDecoder.h b/lib_rend/ivas_CQMFDecoder.h index a68c2451fb..f331ed20d3 100644 --- a/lib_rend/ivas_CQMFDecoder.h +++ b/lib_rend/ivas_CQMFDecoder.h @@ -37,6 +37,10 @@ extern "C" { #endif + +#include "options.h" +#ifdef SPLIT_REND_WITH_HEAD_ROT + #include "lib_rend.h" #define DECODER_ERROR_NONE ( 0 ) #define DECODER_ERROR_FS_NOT_SUPPORTED ( -1 ) @@ -56,9 +60,8 @@ extern "C" ivas_split_rend_bits_t *pBits, float ***pppfCQMFReal, float ***pppfCQMFImag ); - +#endif #ifdef __cplusplus } #endif - #endif /* _CQMF_DECODER_H_ */ diff --git a/lib_rend/ivas_CQMFEncoder.c b/lib_rend/ivas_CQMFEncoder.c index 3f2906e7d5..755fb670f4 100644 --- a/lib_rend/ivas_CQMFEncoder.c +++ b/lib_rend/ivas_CQMFEncoder.c @@ -31,29 +31,26 @@ *******************************************************************************************************/ #include "ivas_CQMFEncoder.h" - +#include "options.h" +#ifdef SPLIT_REND_WITH_HEAD_ROT #include #include #include #include -#include "ivas_Tables.h" -#include "options.h" +#include "ivas_lcld_tables.h" #include "prot.h" -#include "wmops.h" #include "ivas_RMSEnvGrouping.h" #include "ivas_PerceptualModel.h" -#include "ivas_RMSEnvDeltaHuff.h" -#include "ivas_CQMFHuff.h" #include "ivas_cldfb_codec_bitstream.h" -#include "ivas_lib_rend_internal.h" +#include "ivas_prot_rend.h" #ifdef ENABLE_MS_PRED #include "ivas_MSPred.h" #endif #ifdef ENABLE_PMOD_ADJUST #include "ton_corr.h" #endif - #include "ivas_PredEncoder.h" +#include "wmc_auto.h" struct CQMF_ENCODER { @@ -111,7 +108,7 @@ CQMFEncoder *CreateCQMFEncoder( const int32_t iSampleRate, assert( iSampleRate == 48000 ); // Fix - psCQMFEncoder = (CQMFEncoder *) count_malloc( sizeof( CQMFEncoder ) ); + psCQMFEncoder = (CQMFEncoder *) malloc( sizeof( CQMFEncoder ) ); psCQMFEncoder->iSampleRate = iSampleRate; psCQMFEncoder->iChannels = iChannels; psCQMFEncoder->iNumBlocks = CQMF_BLOCKS_PER_FRAME; @@ -124,7 +121,7 @@ CQMFEncoder *CreateCQMFEncoder( const int32_t iSampleRate, psCQMFEncoder->piBandwidths = c_aiBandwidths48; // Fix psCQMFEncoder->iMSMode = 0; - psCQMFEncoder->piMSFlags = (int32_t *) count_malloc( MAX_BANDS * sizeof( int32_t ) ); + psCQMFEncoder->piMSFlags = (int32_t *) malloc( MAX_BANDS * sizeof( int32_t ) ); #ifdef ENABLE_MS_PRED for ( n = 0; n < MAX_BANDS; n++ ) { @@ -136,49 +133,49 @@ CQMFEncoder *CreateCQMFEncoder( const int32_t iSampleRate, psCQMFEncoder->psRMSEnvelopeGrouping = CreateRMSEnvelopeGrouping( psCQMFEncoder->iNumBlocks ); psCQMFEncoder->iCommonGrouping = 1; // Common grouping always on only impacts stereo - psCQMFEncoder->piNumGroups = (int32_t *) count_malloc( psCQMFEncoder->iChannels * sizeof( int32_t ) ); - psCQMFEncoder->ppiGroupLengths = (int32_t **) count_malloc( psCQMFEncoder->iChannels * sizeof( int32_t * ) ); - psCQMFEncoder->pppiRMSEnvelope = (int32_t ***) count_malloc( psCQMFEncoder->iChannels * sizeof( int32_t ** ) ); - psCQMFEncoder->pppiSMR = (int32_t ***) count_malloc( psCQMFEncoder->iChannels * sizeof( int32_t ** ) ); - psCQMFEncoder->pppiExcitation = (int32_t ***) count_malloc( psCQMFEncoder->iChannels * sizeof( int32_t ** ) ); - psCQMFEncoder->pppiAlloc = (int32_t ***) count_malloc( psCQMFEncoder->iChannels * sizeof( int32_t ** ) ); - - psCQMFEncoder->pppiCQMFSignReal = (int32_t ***) count_malloc( psCQMFEncoder->iChannels * sizeof( int32_t ** ) ); - psCQMFEncoder->pppiCQMFSignImag = (int32_t ***) count_malloc( psCQMFEncoder->iChannels * sizeof( int32_t ** ) ); - psCQMFEncoder->pppiQCQMFReal = (int32_t ***) count_malloc( psCQMFEncoder->iChannels * sizeof( int32_t ** ) ); - psCQMFEncoder->pppiQCQMFImag = (int32_t ***) count_malloc( psCQMFEncoder->iChannels * sizeof( int32_t ** ) ); + psCQMFEncoder->piNumGroups = (int32_t *) malloc( psCQMFEncoder->iChannels * sizeof( int32_t ) ); + psCQMFEncoder->ppiGroupLengths = (int32_t **) malloc( psCQMFEncoder->iChannels * sizeof( int32_t * ) ); + psCQMFEncoder->pppiRMSEnvelope = (int32_t ***) malloc( psCQMFEncoder->iChannels * sizeof( int32_t ** ) ); + psCQMFEncoder->pppiSMR = (int32_t ***) malloc( psCQMFEncoder->iChannels * sizeof( int32_t ** ) ); + psCQMFEncoder->pppiExcitation = (int32_t ***) malloc( psCQMFEncoder->iChannels * sizeof( int32_t ** ) ); + psCQMFEncoder->pppiAlloc = (int32_t ***) malloc( psCQMFEncoder->iChannels * sizeof( int32_t ** ) ); + + psCQMFEncoder->pppiCQMFSignReal = (int32_t ***) malloc( psCQMFEncoder->iChannels * sizeof( int32_t ** ) ); + psCQMFEncoder->pppiCQMFSignImag = (int32_t ***) malloc( psCQMFEncoder->iChannels * sizeof( int32_t ** ) ); + psCQMFEncoder->pppiQCQMFReal = (int32_t ***) malloc( psCQMFEncoder->iChannels * sizeof( int32_t ** ) ); + psCQMFEncoder->pppiQCQMFImag = (int32_t ***) malloc( psCQMFEncoder->iChannels * sizeof( int32_t ** ) ); #ifdef ENABLE_PMOD_ADJUST - psCQMFEncoder->ppiHiSMRFlags = (int32_t **) count_malloc( psCQMFEncoder->iChannels * sizeof( int32_t * ) ); + psCQMFEncoder->ppiHiSMRFlags = (int32_t **) malloc( psCQMFEncoder->iChannels * sizeof( int32_t * ) ); #endif for ( n = 0; n < iChannels; n++ ) { int32_t k; #ifdef ENABLE_PMOD_ADJUST - psCQMFEncoder->ppiHiSMRFlags[n] = (int32_t *) count_malloc( MAX_BANDS * sizeof( int32_t ) ); + psCQMFEncoder->ppiHiSMRFlags[n] = (int32_t *) malloc( MAX_BANDS * sizeof( int32_t ) ); ; #endif - psCQMFEncoder->ppiGroupLengths[n] = (int32_t *) count_malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t ) ); - psCQMFEncoder->pppiRMSEnvelope[n] = (int32_t **) count_malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); - psCQMFEncoder->pppiSMR[n] = (int32_t **) count_malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); - psCQMFEncoder->pppiExcitation[n] = (int32_t **) count_malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); - psCQMFEncoder->pppiAlloc[n] = (int32_t **) count_malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); - - psCQMFEncoder->pppiCQMFSignReal[n] = (int32_t **) count_malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); - psCQMFEncoder->pppiCQMFSignImag[n] = (int32_t **) count_malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); - psCQMFEncoder->pppiQCQMFReal[n] = (int32_t **) count_malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); - psCQMFEncoder->pppiQCQMFImag[n] = (int32_t **) count_malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); + psCQMFEncoder->ppiGroupLengths[n] = (int32_t *) malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t ) ); + psCQMFEncoder->pppiRMSEnvelope[n] = (int32_t **) malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); + psCQMFEncoder->pppiSMR[n] = (int32_t **) malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); + psCQMFEncoder->pppiExcitation[n] = (int32_t **) malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); + psCQMFEncoder->pppiAlloc[n] = (int32_t **) malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); + + psCQMFEncoder->pppiCQMFSignReal[n] = (int32_t **) malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); + psCQMFEncoder->pppiCQMFSignImag[n] = (int32_t **) malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); + psCQMFEncoder->pppiQCQMFReal[n] = (int32_t **) malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); + psCQMFEncoder->pppiQCQMFImag[n] = (int32_t **) malloc( CQMF_BLOCKS_PER_FRAME * sizeof( int32_t * ) ); for ( k = 0; k < CQMF_BLOCKS_PER_FRAME; k++ ) { - psCQMFEncoder->pppiRMSEnvelope[n][k] = (int32_t *) count_malloc( MAX_BANDS * sizeof( int32_t ) ); - psCQMFEncoder->pppiSMR[n][k] = (int32_t *) count_malloc( MAX_BANDS * sizeof( int32_t ) ); - psCQMFEncoder->pppiExcitation[n][k] = (int32_t *) count_malloc( MAX_BANDS * sizeof( int32_t ) ); - psCQMFEncoder->pppiAlloc[n][k] = (int32_t *) count_malloc( MAX_BANDS * sizeof( int32_t ) ); - - psCQMFEncoder->pppiCQMFSignReal[n][k] = (int32_t *) count_malloc( CQMF_BANDS * sizeof( int32_t ) ); - psCQMFEncoder->pppiCQMFSignImag[n][k] = (int32_t *) count_malloc( CQMF_BANDS * sizeof( int32_t ) ); - psCQMFEncoder->pppiQCQMFReal[n][k] = (int32_t *) count_malloc( CQMF_BANDS * sizeof( int32_t ) ); - psCQMFEncoder->pppiQCQMFImag[n][k] = (int32_t *) count_malloc( CQMF_BANDS * sizeof( int32_t ) ); + psCQMFEncoder->pppiRMSEnvelope[n][k] = (int32_t *) malloc( MAX_BANDS * sizeof( int32_t ) ); + psCQMFEncoder->pppiSMR[n][k] = (int32_t *) malloc( MAX_BANDS * sizeof( int32_t ) ); + psCQMFEncoder->pppiExcitation[n][k] = (int32_t *) malloc( MAX_BANDS * sizeof( int32_t ) ); + psCQMFEncoder->pppiAlloc[n][k] = (int32_t *) malloc( MAX_BANDS * sizeof( int32_t ) ); + + psCQMFEncoder->pppiCQMFSignReal[n][k] = (int32_t *) malloc( CQMF_BANDS * sizeof( int32_t ) ); + psCQMFEncoder->pppiCQMFSignImag[n][k] = (int32_t *) malloc( CQMF_BANDS * sizeof( int32_t ) ); + psCQMFEncoder->pppiQCQMFReal[n][k] = (int32_t *) malloc( CQMF_BANDS * sizeof( int32_t ) ); + psCQMFEncoder->pppiQCQMFImag[n][k] = (int32_t *) malloc( CQMF_BANDS * sizeof( int32_t ) ); } } @@ -195,12 +192,12 @@ void DeleteCQMFEncoder( CQMFEncoder *psCQMFEncoder ) if ( psCQMFEncoder->piMSFlags != NULL ) { - count_free( psCQMFEncoder->piMSFlags ); + free( psCQMFEncoder->piMSFlags ); } if ( psCQMFEncoder->piNumGroups != NULL ) { - count_free( psCQMFEncoder->piNumGroups ); + free( psCQMFEncoder->piNumGroups ); } if ( psCQMFEncoder->psRMSEnvelopeGrouping != NULL ) @@ -213,9 +210,9 @@ void DeleteCQMFEncoder( CQMFEncoder *psCQMFEncoder ) int32_t n; for ( n = 0; n < psCQMFEncoder->iChannels; n++ ) { - count_free( psCQMFEncoder->ppiGroupLengths[n] ); + free( psCQMFEncoder->ppiGroupLengths[n] ); } - count_free( psCQMFEncoder->ppiGroupLengths ); + free( psCQMFEncoder->ppiGroupLengths ); } #ifdef ENABLE_PMOD_ADJUST if ( psCQMFEncoder->ppiHiSMRFlags != NULL ) @@ -223,9 +220,9 @@ void DeleteCQMFEncoder( CQMFEncoder *psCQMFEncoder ) int32_t n; for ( n = 0; n < psCQMFEncoder->iChannels; n++ ) { - count_free( psCQMFEncoder->ppiHiSMRFlags[n] ); + free( psCQMFEncoder->ppiHiSMRFlags[n] ); } - count_free( psCQMFEncoder->ppiHiSMRFlags ); + free( psCQMFEncoder->ppiHiSMRFlags ); } #endif if ( psCQMFEncoder->pppiRMSEnvelope != NULL ) @@ -236,11 +233,11 @@ void DeleteCQMFEncoder( CQMFEncoder *psCQMFEncoder ) int32_t k; for ( k = 0; k < CQMF_BLOCKS_PER_FRAME; k++ ) { - count_free( psCQMFEncoder->pppiRMSEnvelope[n][k] ); + free( psCQMFEncoder->pppiRMSEnvelope[n][k] ); } - count_free( psCQMFEncoder->pppiRMSEnvelope[n] ); + free( psCQMFEncoder->pppiRMSEnvelope[n] ); } - count_free( psCQMFEncoder->pppiRMSEnvelope ); + free( psCQMFEncoder->pppiRMSEnvelope ); } if ( psCQMFEncoder->pppiSMR != NULL ) @@ -251,11 +248,11 @@ void DeleteCQMFEncoder( CQMFEncoder *psCQMFEncoder ) int32_t k; for ( k = 0; k < CQMF_BLOCKS_PER_FRAME; k++ ) { - count_free( psCQMFEncoder->pppiSMR[n][k] ); + free( psCQMFEncoder->pppiSMR[n][k] ); } - count_free( psCQMFEncoder->pppiSMR[n] ); + free( psCQMFEncoder->pppiSMR[n] ); } - count_free( psCQMFEncoder->pppiSMR ); + free( psCQMFEncoder->pppiSMR ); } if ( psCQMFEncoder->pppiExcitation != NULL ) @@ -266,11 +263,11 @@ void DeleteCQMFEncoder( CQMFEncoder *psCQMFEncoder ) int32_t k; for ( k = 0; k < CQMF_BLOCKS_PER_FRAME; k++ ) { - count_free( psCQMFEncoder->pppiExcitation[n][k] ); + free( psCQMFEncoder->pppiExcitation[n][k] ); } - count_free( psCQMFEncoder->pppiExcitation[n] ); + free( psCQMFEncoder->pppiExcitation[n] ); } - count_free( psCQMFEncoder->pppiExcitation ); + free( psCQMFEncoder->pppiExcitation ); } if ( psCQMFEncoder->pppiAlloc != NULL ) @@ -281,11 +278,11 @@ void DeleteCQMFEncoder( CQMFEncoder *psCQMFEncoder ) int32_t k; for ( k = 0; k < CQMF_BLOCKS_PER_FRAME; k++ ) { - count_free( psCQMFEncoder->pppiAlloc[n][k] ); + free( psCQMFEncoder->pppiAlloc[n][k] ); } - count_free( psCQMFEncoder->pppiAlloc[n] ); + free( psCQMFEncoder->pppiAlloc[n] ); } - count_free( psCQMFEncoder->pppiAlloc ); + free( psCQMFEncoder->pppiAlloc ); } if ( psCQMFEncoder->pppiCQMFSignReal != NULL ) @@ -296,11 +293,11 @@ void DeleteCQMFEncoder( CQMFEncoder *psCQMFEncoder ) int32_t k; for ( k = 0; k < CQMF_BLOCKS_PER_FRAME; k++ ) { - count_free( psCQMFEncoder->pppiCQMFSignReal[n][k] ); + free( psCQMFEncoder->pppiCQMFSignReal[n][k] ); } - count_free( psCQMFEncoder->pppiCQMFSignReal[n] ); + free( psCQMFEncoder->pppiCQMFSignReal[n] ); } - count_free( psCQMFEncoder->pppiCQMFSignReal ); + free( psCQMFEncoder->pppiCQMFSignReal ); } if ( psCQMFEncoder->pppiCQMFSignImag != NULL ) @@ -311,11 +308,11 @@ void DeleteCQMFEncoder( CQMFEncoder *psCQMFEncoder ) int32_t k; for ( k = 0; k < CQMF_BLOCKS_PER_FRAME; k++ ) { - count_free( psCQMFEncoder->pppiCQMFSignImag[n][k] ); + free( psCQMFEncoder->pppiCQMFSignImag[n][k] ); } - count_free( psCQMFEncoder->pppiCQMFSignImag[n] ); + free( psCQMFEncoder->pppiCQMFSignImag[n] ); } - count_free( psCQMFEncoder->pppiCQMFSignImag ); + free( psCQMFEncoder->pppiCQMFSignImag ); } if ( psCQMFEncoder->pppiQCQMFReal != NULL ) @@ -326,11 +323,11 @@ void DeleteCQMFEncoder( CQMFEncoder *psCQMFEncoder ) int32_t k; for ( k = 0; k < CQMF_BLOCKS_PER_FRAME; k++ ) { - count_free( psCQMFEncoder->pppiQCQMFReal[n][k] ); + free( psCQMFEncoder->pppiQCQMFReal[n][k] ); } - count_free( psCQMFEncoder->pppiQCQMFReal[n] ); + free( psCQMFEncoder->pppiQCQMFReal[n] ); } - count_free( psCQMFEncoder->pppiQCQMFReal ); + free( psCQMFEncoder->pppiQCQMFReal ); } if ( psCQMFEncoder->pppiQCQMFImag != NULL ) @@ -341,16 +338,16 @@ void DeleteCQMFEncoder( CQMFEncoder *psCQMFEncoder ) int32_t k; for ( k = 0; k < CQMF_BLOCKS_PER_FRAME; k++ ) { - count_free( psCQMFEncoder->pppiQCQMFImag[n][k] ); + free( psCQMFEncoder->pppiQCQMFImag[n][k] ); } - count_free( psCQMFEncoder->pppiQCQMFImag[n] ); + free( psCQMFEncoder->pppiQCQMFImag[n] ); } - count_free( psCQMFEncoder->pppiQCQMFImag ); + free( psCQMFEncoder->pppiQCQMFImag ); } DeletePredictionEncoder( psCQMFEncoder->psPredictionEncoder ); - count_free( psCQMFEncoder ); + free( psCQMFEncoder ); } } @@ -1358,9 +1355,13 @@ static int32_t CountCQMFBits( const int32_t iNumGroups, if ( iAlloc > 0 ) { +#ifndef ROM_TO_RAM const uint32_t( *pauiHuffmanTable )[2] = NULL; const uint32_t( *pauiHuffmanTableDPCM )[2] = NULL; - +#else + const uint16_t( *pauiHuffmanTable )[2] = NULL; + const uint16_t( *pauiHuffmanTableDPCM )[2] = NULL; +#endif // pauiHuffmanTable = GetHuffEncTable(iAlloc); pauiHuffmanTable = c_apauiHuffEncTabels[iAlloc]; pauiHuffmanTableDPCM = c_apauiHuffEncTabels[ALLOC_TABLE_SIZE + iAlloc]; @@ -1806,9 +1807,13 @@ static int32_t WriteCQMFData( const int32_t iNumGroups, if ( iAlloc > 0 ) { +#ifndef ROM_TO_RAM const uint32_t( *pauiHuffmanTable )[2] = NULL; const uint32_t( *pauiHuffmanTableDPCM )[2] = NULL; - +#else + const uint16_t( *pauiHuffmanTable )[2] = NULL; + const uint16_t( *pauiHuffmanTableDPCM )[2] = NULL; +#endif // pauiHuffmanTable = GetHuffEncTable(iAlloc); pauiHuffmanTable = c_apauiHuffEncTabels[iAlloc]; pauiHuffmanTableDPCM = c_apauiHuffEncTabels[ALLOC_TABLE_SIZE + iAlloc]; @@ -2048,3 +2053,4 @@ static int32_t ComputeAllocation( const int32_t iChannels, return iBitsUsed; } +#endif diff --git a/lib_rend/ivas_CQMFEncoder.h b/lib_rend/ivas_CQMFEncoder.h index 3466eae6b4..e78aa4614d 100644 --- a/lib_rend/ivas_CQMFEncoder.h +++ b/lib_rend/ivas_CQMFEncoder.h @@ -37,6 +37,8 @@ extern "C" { #endif +#include "options.h" +#ifdef SPLIT_REND_WITH_HEAD_ROT #include "lib_rend.h" #define ENCODER_ERROR_NONE ( 0 ) #define ENCODER_ERROR_FS_NOT_SUPPORTED ( -1 ) @@ -61,9 +63,8 @@ extern "C" const int32_t available_bits, ivas_split_rend_bits_t *pBits ); int32_t GetNumGroups( CQMFEncoder *psCQMFEncoder ); - +#endif #ifdef __cplusplus } #endif - #endif /* _CQMF_ENCODER_H_ */ diff --git a/lib_rend/ivas_CQMFHuff.c b/lib_rend/ivas_CQMFHuff.c deleted file mode 100644 index aea5a98a47..0000000000 --- a/lib_rend/ivas_CQMFHuff.c +++ /dev/null @@ -1,4124 +0,0 @@ -/****************************************************************************************************** - - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository. All Rights Reserved. - - This software is protected by copyright law and by international treaties. - The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository retain full ownership rights in their respective contributions in - the software. This notice grants no license of any kind, including but not limited to patent - license, nor is any license granted by implication, estoppel or otherwise. - - Contributors are required to enter into the IVAS codec Public Collaboration agreement before making - contributions. - - This software is provided "AS IS", without any express or implied warranties. The software is in the - development stage. It is intended exclusively for experts who have experience with such software and - solely for the purpose of inspection. All implied warranties of non-infringement, merchantability - and fitness for a particular purpose are hereby disclaimed and excluded. - - Any dispute, controversy or claim arising under or in relation to providing this software shall be - submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in - accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and - the United Nations Convention on Contracts on the International Sales of Goods. - -*******************************************************************************************************/ - -#include "ivas_CQMFHuff.h" -#include "wmops.h" - -/* clang-format off */ -const uint32_t c_aauiCQMFHuffEnc1[16][2] = -{ - {0x0001, 0x0001}, {0x0003, 0x0001}, {0x0005, 0x0001}, {0x000b, 0x0000}, {0x0002, 0x0001}, {0x0004, 0x0001}, {0x0007, 0x0001}, {0x000b, 0x0001}, - {0x0006, 0x0001}, {0x0008, 0x0001}, {0x000b, 0x0002}, {0x000b, 0x0003}, {0x000b, 0x0004}, {0x000b, 0x0005}, {0x000b, 0x0006}, {0x000b, 0x0007}, -}; - -const uint32_t c_aauiCQMFHuffDec1[3][16] = -{ - {0x0001ffff, 0x00000005, 0x00010001, 0x00010001, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x0002ffff, 0x00000009, 0x00010006, 0x00010006, 0x00020008, 0x00020008, 0x00020008, 0x00020008, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, }, - {0x00010003, 0x00010003, 0x00010007, 0x00010007, 0x0001000a, 0x0001000a, 0x0001000b, 0x0001000b, 0x0001000c, 0x0001000c, 0x0001000d, 0x0001000d, 0x0001000e, 0x0001000e, 0x0001000f, 0x0001000f, }, -}; - -const uint32_t c_aauiCQMFHuffEnc2[16][2] = -{ - {0x0001, 0x0001}, {0x0003, 0x0001}, {0x0005, 0x0001}, {0x000c, 0x0000}, {0x0002, 0x0001}, {0x0004, 0x0001}, {0x0007, 0x0001}, {0x000c, 0x0001}, - {0x0006, 0x0001}, {0x0008, 0x0001}, {0x0009, 0x0001}, {0x000c, 0x0002}, {0x000c, 0x0003}, {0x000c, 0x0004}, {0x000c, 0x0005}, {0x000b, 0x0003}, -}; - -const uint32_t c_aauiCQMFHuffDec2[3][16] = -{ - {0x0001ffff, 0x00000005, 0x00010001, 0x00010001, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x0002ffff, 0x00000009, 0x00010006, 0x00010006, 0x00020008, 0x00020008, 0x00020008, 0x00020008, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, }, - {0x00000003, 0x00000007, 0x0000000b, 0x0000000c, 0x0000000d, 0x0000000e, 0x0001000f, 0x0001000f, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, }, -}; - -const uint32_t c_aauiCQMFHuffEnc3[25][2] = -{ - {0x0001, 0x0001}, {0x0003, 0x0001}, {0x0006, 0x0001}, {0x000d, 0x0000}, {0x000d, 0x0001}, {0x0002, 0x0001}, {0x0004, 0x0001}, {0x0007, 0x0001}, - {0x000d, 0x0002}, {0x000d, 0x0003}, {0x0006, 0x0002}, {0x0006, 0x0003}, {0x0008, 0x0001}, {0x000d, 0x0004}, {0x000d, 0x0005}, {0x0009, 0x0001}, - {0x000c, 0x0007}, {0x000d, 0x0006}, {0x000d, 0x0007}, {0x000d, 0x0008}, {0x000d, 0x0009}, {0x000d, 0x000a}, {0x000d, 0x000b}, {0x000d, 0x000c}, - {0x000d, 0x000d}, - -}; - -const uint32_t c_aauiCQMFHuffDec3[10][16] = -{ - {0x0001ffff, 0x00000006, 0x00010001, 0x00010001, 0x00020005, 0x00020005, 0x00020005, 0x00020005, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x0002ffff, 0x0000000c, 0x00010007, 0x00010007, 0x00020002, 0x00020002, 0x00020002, 0x00020002, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000b, 0x0002000b, 0x0002000b, 0x0002000b, }, - {0x0003ffff, 0x0004ffff, 0x0005ffff, 0x0006ffff, 0x0007ffff, 0x0008ffff, 0x0009ffff, 0x00000010, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, }, - {0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, }, - {0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, }, - {0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, }, - {0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, }, - {0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, }, - {0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, }, - {0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, }, -}; - -const uint32_t c_aauiCQMFHuffEnc4[36][2] = -{ - {0x0001, 0x0001}, {0x0003, 0x0001}, {0x0006, 0x0001}, {0x000b, 0x0001}, {0x0010, 0x0000}, {0x0010, 0x0001}, {0x0002, 0x0001}, {0x0004, 0x0001}, - {0x0007, 0x0001}, {0x000a, 0x0001}, {0x0010, 0x0002}, {0x0010, 0x0003}, {0x0006, 0x0002}, {0x0006, 0x0003}, {0x0008, 0x0001}, {0x000e, 0x0006}, - {0x0010, 0x0004}, {0x0010, 0x0005}, {0x000a, 0x0002}, {0x000a, 0x0003}, {0x000e, 0x0007}, {0x0010, 0x0006}, {0x0010, 0x0007}, {0x0010, 0x0008}, - {0x0010, 0x0009}, {0x0010, 0x000a}, {0x0010, 0x000b}, {0x0010, 0x000c}, {0x0010, 0x000d}, {0x0010, 0x000e}, {0x0010, 0x000f}, {0x0010, 0x0010}, - {0x0010, 0x0011}, {0x000f, 0x0009}, {0x000f, 0x000a}, {0x000f, 0x000b}, - -}; - -const uint32_t c_aauiCQMFHuffDec4[5][16] = -{ - {0x0001ffff, 0x00000007, 0x00010001, 0x00010001, 0x00020006, 0x00020006, 0x00020006, 0x00020006, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x0002ffff, 0x0000000e, 0x00010008, 0x00010008, 0x00020002, 0x00020002, 0x00020002, 0x00020002, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000d, }, - {0x0004ffff, 0x0003ffff, 0x00010003, 0x00010003, 0x00020009, 0x00020009, 0x00020009, 0x00020009, 0x00020012, 0x00020012, 0x00020012, 0x00020012, 0x00020013, 0x00020013, 0x00020013, 0x00020013, }, - {0x0000001f, 0x00000020, 0x00010021, 0x00010021, 0x00010022, 0x00010022, 0x00010023, 0x00010023, 0x0002000f, 0x0002000f, 0x0002000f, 0x0002000f, 0x00020014, 0x00020014, 0x00020014, 0x00020014, }, - {0x00000004, 0x00000005, 0x0000000a, 0x0000000b, 0x00000010, 0x00000011, 0x00000015, 0x00000016, 0x00000017, 0x00000018, 0x00000019, 0x0000001a, 0x0000001b, 0x0000001c, 0x0000001d, 0x0000001e, }, -}; - -const uint32_t c_aauiCQMFHuffEnc5[36][2] = -{ - {0x0001, 0x0001}, {0x0003, 0x0001}, {0x0006, 0x0001}, {0x000a, 0x0001}, {0x000f, 0x0003}, {0x0012, 0x0000}, {0x0002, 0x0001}, {0x0004, 0x0001}, - {0x0007, 0x0001}, {0x000b, 0x0001}, {0x0011, 0x0008}, {0x0012, 0x0001}, {0x0006, 0x0002}, {0x0006, 0x0003}, {0x0008, 0x0001}, {0x000c, 0x0001}, - {0x0012, 0x0002}, {0x0012, 0x0003}, {0x000a, 0x0002}, {0x000a, 0x0003}, {0x000d, 0x0001}, {0x0012, 0x0004}, {0x0012, 0x0005}, {0x0012, 0x0006}, - {0x0011, 0x0009}, {0x0011, 0x000a}, {0x0012, 0x0007}, {0x0012, 0x0008}, {0x0012, 0x0009}, {0x0012, 0x000a}, {0x0012, 0x000b}, {0x0012, 0x000c}, - {0x0012, 0x000d}, {0x0012, 0x000e}, {0x0012, 0x000f}, {0x0011, 0x000b}, - -}; - -const uint32_t c_aauiCQMFHuffDec5[10][16] = -{ - {0x0001ffff, 0x00000007, 0x00010001, 0x00010001, 0x00020006, 0x00020006, 0x00020006, 0x00020006, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x0002ffff, 0x0000000e, 0x00010008, 0x00010008, 0x00020002, 0x00020002, 0x00020002, 0x00020002, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000d, }, - {0x0003ffff, 0x0000000f, 0x00010009, 0x00010009, 0x00020003, 0x00020003, 0x00020003, 0x00020003, 0x00020012, 0x00020012, 0x00020012, 0x00020012, 0x00020013, 0x00020013, 0x00020013, 0x00020013, }, - {0x0006ffff, 0x0007ffff, 0x0008ffff, 0x0009ffff, 0x0004ffff, 0x0005ffff, 0x00010004, 0x00010004, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, }, - {0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, }, - {0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, }, - {0x00020005, 0x00020005, 0x00020005, 0x00020005, 0x0002000b, 0x0002000b, 0x0002000b, 0x0002000b, 0x00020010, 0x00020010, 0x00020010, 0x00020010, 0x00020011, 0x00020011, 0x00020011, 0x00020011, }, - {0x00020015, 0x00020015, 0x00020015, 0x00020015, 0x00020016, 0x00020016, 0x00020016, 0x00020016, 0x00020017, 0x00020017, 0x00020017, 0x00020017, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001a, }, - {0x0002001b, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001d, 0x0002001d, 0x0002001d, 0x0002001d, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001e, }, - {0x0002001f, 0x0002001f, 0x0002001f, 0x0002001f, 0x00020020, 0x00020020, 0x00020020, 0x00020020, 0x00020021, 0x00020021, 0x00020021, 0x00020021, 0x00020022, 0x00020022, 0x00020022, 0x00020022, }, -}; - -const uint32_t c_aauiCQMFHuffEnc6[49][2] = -{ - {0x0001, 0x0001}, {0x0003, 0x0001}, {0x0006, 0x0001}, {0x000a, 0x0001}, {0x0010, 0x0003}, {0x0014, 0x0000}, {0x0014, 0x0001}, {0x0002, 0x0001}, - {0x0004, 0x0001}, {0x0007, 0x0001}, {0x000a, 0x0002}, {0x0010, 0x0004}, {0x0014, 0x0002}, {0x0014, 0x0003}, {0x0006, 0x0002}, {0x0006, 0x0003}, - {0x0008, 0x0001}, {0x000d, 0x0001}, {0x0012, 0x0007}, {0x0014, 0x0004}, {0x0014, 0x0005}, {0x000a, 0x0003}, {0x000b, 0x0001}, {0x000c, 0x0001}, - {0x0011, 0x0004}, {0x0014, 0x0006}, {0x0014, 0x0007}, {0x0014, 0x0008}, {0x0010, 0x0005}, {0x000f, 0x0003}, {0x0011, 0x0005}, {0x0014, 0x0009}, - {0x0014, 0x000a}, {0x0014, 0x000b}, {0x0014, 0x000c}, {0x0014, 0x000d}, {0x0013, 0x000d}, {0x0014, 0x000e}, {0x0014, 0x000f}, {0x0014, 0x0010}, - {0x0014, 0x0011}, {0x0014, 0x0012}, {0x0014, 0x0013}, {0x0014, 0x0014}, {0x0014, 0x0015}, {0x0014, 0x0016}, {0x0014, 0x0017}, {0x0014, 0x0018}, - {0x0014, 0x0019}, - -}; - -const uint32_t c_aauiCQMFHuffDec6[7][16] = -{ - {0x0001ffff, 0x00000008, 0x00010001, 0x00010001, 0x00020007, 0x00020007, 0x00020007, 0x00020007, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x0002ffff, 0x00000010, 0x00010009, 0x00010009, 0x00020002, 0x00020002, 0x00020002, 0x00020002, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000f, 0x0002000f, 0x0002000f, 0x0002000f, }, - {0x0003ffff, 0x00000017, 0x00010016, 0x00010016, 0x00020003, 0x00020003, 0x00020003, 0x00020003, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000a, 0x00020015, 0x00020015, 0x00020015, 0x00020015, }, - {0x0006ffff, 0x0005ffff, 0x0004ffff, 0x00000004, 0x0000000b, 0x0000001c, 0x0001001d, 0x0001001d, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, }, - {0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, }, - {0x00000027, 0x00000028, 0x00000029, 0x0000002a, 0x0000002b, 0x0000002c, 0x0000002d, 0x0000002e, 0x0000002f, 0x00000030, 0x00010024, 0x00010024, 0x00020012, 0x00020012, 0x00020012, 0x00020012, }, - {0x00000005, 0x00000006, 0x0000000c, 0x0000000d, 0x00000013, 0x00000014, 0x00000019, 0x0000001a, 0x0000001b, 0x0000001f, 0x00000020, 0x00000021, 0x00000022, 0x00000023, 0x00000025, 0x00000026, }, -}; - -const uint32_t c_aauiCQMFHuffEnc7[64][2] = -{ - {0x0002, 0x0001}, {0x0002, 0x0002}, {0x0005, 0x0001}, {0x0009, 0x0001}, {0x000f, 0x0002}, {0x0015, 0x0000}, {0x0015, 0x0001}, {0x0015, 0x0002}, - {0x0002, 0x0003}, {0x0003, 0x0001}, {0x0006, 0x0001}, {0x0009, 0x0002}, {0x000f, 0x0003}, {0x0014, 0x0011}, {0x0015, 0x0003}, {0x0015, 0x0004}, - {0x0005, 0x0002}, {0x0005, 0x0003}, {0x0007, 0x0001}, {0x000b, 0x0001}, {0x0010, 0x0002}, {0x0015, 0x0005}, {0x0015, 0x0006}, {0x0015, 0x0007}, - {0x000a, 0x0001}, {0x0009, 0x0003}, {0x000c, 0x0001}, {0x000f, 0x0004}, {0x0012, 0x0006}, {0x0015, 0x0008}, {0x0015, 0x0009}, {0x0015, 0x000a}, - {0x000f, 0x0005}, {0x000e, 0x0003}, {0x0010, 0x0003}, {0x0012, 0x0007}, {0x0014, 0x0012}, {0x0015, 0x000b}, {0x0015, 0x000c}, {0x0015, 0x000d}, - {0x0014, 0x0013}, {0x0014, 0x0014}, {0x0013, 0x000b}, {0x0014, 0x0015}, {0x0015, 0x000e}, {0x0015, 0x000f}, {0x0015, 0x0010}, {0x0015, 0x0011}, - {0x0015, 0x0012}, {0x0015, 0x0013}, {0x0015, 0x0014}, {0x0015, 0x0015}, {0x0015, 0x0016}, {0x0015, 0x0017}, {0x0015, 0x0018}, {0x0015, 0x0019}, - {0x0015, 0x001a}, {0x0015, 0x001b}, {0x0015, 0x001c}, {0x0015, 0x001d}, {0x0015, 0x001e}, {0x0015, 0x001f}, {0x0015, 0x0020}, {0x0015, 0x0021}, -}; - -const uint32_t c_aauiCQMFHuffDec7[25][16] = -{ - {0x0001ffff, 0x0002ffff, 0x00010009, 0x00010009, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020001, 0x00020001, 0x00020001, 0x00020001, 0x00020008, 0x00020008, 0x00020008, 0x00020008, }, - {0x0003ffff, 0x0004ffff, 0x00010012, 0x00010012, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000a, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, }, - {0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, }, - {0x0005ffff, 0x0000001a, 0x00010013, 0x00010013, 0x00020018, 0x00020018, 0x00020018, 0x00020018, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, }, - {0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, }, - {0x0007ffff, 0x0006ffff, 0x00000014, 0x00000022, 0x00010004, 0x00010004, 0x0001000c, 0x0001000c, 0x0001001b, 0x0001001b, 0x00010020, 0x00010020, 0x00020021, 0x00020021, 0x00020021, 0x00020021, }, - {0x0018ffff, 0x0000000d, 0x00000024, 0x00000028, 0x00000029, 0x0000002b, 0x0001002a, 0x0001002a, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001c, 0x00020023, 0x00020023, 0x00020023, 0x00020023, }, - {0x000effff, 0x000affff, 0x000bffff, 0x000cffff, 0x0008ffff, 0x0009ffff, 0x000dffff, 0x000fffff, 0x0010ffff, 0x0011ffff, 0x0012ffff, 0x0013ffff, 0x0014ffff, 0x0015ffff, 0x0016ffff, 0x0017ffff, }, - {0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, }, - {0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, }, - {0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, }, - {0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, }, - {0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, }, - {0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, }, - {0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, }, - {0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, }, - {0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, }, - {0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, }, - {0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, }, - {0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, }, - {0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, }, - {0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, }, - {0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, }, - {0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, }, - {0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, }, -}; - -const uint32_t c_aauiCQMFHuffEnc8[81][2] = -{ - {0x0001, 0x0001}, {0x0003, 0x0001}, {0x0006, 0x0001}, {0x000a, 0x0001}, {0x000f, 0x0002}, {0x0014, 0x0008}, {0x0017, 0x0000}, {0x0017, 0x0001}, - {0x0017, 0x0002}, {0x0003, 0x0002}, {0x0003, 0x0003}, {0x0005, 0x0001}, {0x0009, 0x0001}, {0x000f, 0x0003}, {0x0012, 0x0004}, {0x0015, 0x000d}, - {0x0017, 0x0003}, {0x0017, 0x0004}, {0x0005, 0x0002}, {0x0005, 0x0003}, {0x0007, 0x0001}, {0x000c, 0x0001}, {0x0010, 0x0002}, {0x0013, 0x0005}, - {0x0017, 0x0005}, {0x0017, 0x0006}, {0x0017, 0x0007}, {0x0009, 0x0002}, {0x0009, 0x0003}, {0x000b, 0x0001}, {0x000f, 0x0004}, {0x0012, 0x0005}, - {0x0016, 0x0015}, {0x0017, 0x0008}, {0x0017, 0x0009}, {0x0017, 0x000a}, {0x000f, 0x0005}, {0x000e, 0x0003}, {0x0010, 0x0003}, {0x0012, 0x0006}, - {0x0014, 0x0009}, {0x0017, 0x000b}, {0x0017, 0x000c}, {0x0017, 0x000d}, {0x0017, 0x000e}, {0x0013, 0x0006}, {0x0012, 0x0007}, {0x0013, 0x0007}, - {0x0015, 0x000e}, {0x0017, 0x000f}, {0x0017, 0x0010}, {0x0017, 0x0011}, {0x0017, 0x0012}, {0x0017, 0x0013}, {0x0016, 0x0016}, {0x0016, 0x0017}, - {0x0015, 0x000f}, {0x0016, 0x0018}, {0x0017, 0x0014}, {0x0017, 0x0015}, {0x0017, 0x0016}, {0x0017, 0x0017}, {0x0017, 0x0018}, {0x0017, 0x0019}, - {0x0017, 0x001a}, {0x0017, 0x001b}, {0x0017, 0x001c}, {0x0017, 0x001d}, {0x0017, 0x001e}, {0x0017, 0x001f}, {0x0017, 0x0020}, {0x0017, 0x0021}, - {0x0017, 0x0022}, {0x0017, 0x0023}, {0x0017, 0x0024}, {0x0017, 0x0025}, {0x0017, 0x0026}, {0x0017, 0x0027}, {0x0017, 0x0028}, {0x0017, 0x0029}, - {0x0016, 0x0019}, - -}; - -const uint32_t c_aauiCQMFHuffDec8[16][16] = -{ - {0x0001ffff, 0x0002ffff, 0x00010001, 0x00010001, 0x00010009, 0x00010009, 0x0001000a, 0x0001000a, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x0003ffff, 0x0004ffff, 0x00010014, 0x00010014, 0x00020002, 0x00020002, 0x00020002, 0x00020002, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, }, - {0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, }, - {0x0005ffff, 0x00000015, 0x0001001d, 0x0001001d, 0x00020003, 0x00020003, 0x00020003, 0x00020003, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, }, - {0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, }, - {0x0007ffff, 0x0006ffff, 0x00000016, 0x00000026, 0x00010004, 0x00010004, 0x0001000d, 0x0001000d, 0x0001001e, 0x0001001e, 0x00010024, 0x00010024, 0x00020025, 0x00020025, 0x00020025, 0x00020025, }, - {0x0002000e, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002001f, 0x0002001f, 0x0002001f, 0x0002001f, 0x00020027, 0x00020027, 0x00020027, 0x00020027, 0x0002002e, 0x0002002e, 0x0002002e, 0x0002002e, }, - {0x000bffff, 0x000cffff, 0x000dffff, 0x000effff, 0x000fffff, 0x000affff, 0x0008ffff, 0x0009ffff, 0x00000005, 0x00000028, 0x00010017, 0x00010017, 0x0001002d, 0x0001002d, 0x0001002f, 0x0001002f, }, - {0x00020039, 0x00020039, 0x00020039, 0x00020039, 0x00020050, 0x00020050, 0x00020050, 0x00020050, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, }, - {0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, }, - {0x0001004e, 0x0001004e, 0x0001004f, 0x0001004f, 0x00020020, 0x00020020, 0x00020020, 0x00020020, 0x00020036, 0x00020036, 0x00020036, 0x00020036, 0x00020037, 0x00020037, 0x00020037, 0x00020037, }, - {0x00010006, 0x00010006, 0x00010007, 0x00010007, 0x00010008, 0x00010008, 0x00010010, 0x00010010, 0x00010011, 0x00010011, 0x00010018, 0x00010018, 0x00010019, 0x00010019, 0x0001001a, 0x0001001a, }, - {0x00010021, 0x00010021, 0x00010022, 0x00010022, 0x00010023, 0x00010023, 0x00010029, 0x00010029, 0x0001002a, 0x0001002a, 0x0001002b, 0x0001002b, 0x0001002c, 0x0001002c, 0x00010031, 0x00010031, }, - {0x00010032, 0x00010032, 0x00010033, 0x00010033, 0x00010034, 0x00010034, 0x00010035, 0x00010035, 0x0001003a, 0x0001003a, 0x0001003b, 0x0001003b, 0x0001003c, 0x0001003c, 0x0001003d, 0x0001003d, }, - {0x0001003e, 0x0001003e, 0x0001003f, 0x0001003f, 0x00010040, 0x00010040, 0x00010041, 0x00010041, 0x00010042, 0x00010042, 0x00010043, 0x00010043, 0x00010044, 0x00010044, 0x00010045, 0x00010045, }, - {0x00010046, 0x00010046, 0x00010047, 0x00010047, 0x00010048, 0x00010048, 0x00010049, 0x00010049, 0x0001004a, 0x0001004a, 0x0001004b, 0x0001004b, 0x0001004c, 0x0001004c, 0x0001004d, 0x0001004d, }, -}; - -const uint32_t c_aauiCQMFHuffEnc9[100][2] = -{ - {0x0001, 0x0001}, {0x0003, 0x0001}, {0x0006, 0x0001}, {0x0009, 0x0001}, {0x000d, 0x0002}, {0x0011, 0x0004}, {0x0014, 0x000a}, {0x0017, 0x0000}, - {0x0017, 0x0001}, {0x0017, 0x0002}, {0x0003, 0x0002}, {0x0003, 0x0003}, {0x0005, 0x0001}, {0x0009, 0x0002}, {0x000d, 0x0003}, {0x0010, 0x0004}, - {0x0013, 0x0007}, {0x0016, 0x0018}, {0x0017, 0x0003}, {0x0017, 0x0004}, {0x0005, 0x0002}, {0x0005, 0x0003}, {0x0008, 0x0002}, {0x000b, 0x0002}, - {0x000e, 0x0002}, {0x0011, 0x0005}, {0x0014, 0x000b}, {0x0016, 0x0019}, {0x0017, 0x0005}, {0x0017, 0x0006}, {0x0009, 0x0003}, {0x0008, 0x0003}, - {0x000b, 0x0003}, {0x000d, 0x0004}, {0x0010, 0x0005}, {0x0012, 0x0006}, {0x0015, 0x000f}, {0x0017, 0x0007}, {0x0017, 0x0008}, {0x0017, 0x0009}, - {0x000d, 0x0005}, {0x000c, 0x0003}, {0x000e, 0x0003}, {0x0010, 0x0006}, {0x0012, 0x0007}, {0x0014, 0x000c}, {0x0017, 0x000a}, {0x0016, 0x001a}, - {0x0017, 0x000b}, {0x0017, 0x000c}, {0x0011, 0x0006}, {0x0010, 0x0007}, {0x0011, 0x0007}, {0x0013, 0x0008}, {0x0013, 0x0009}, {0x0015, 0x0010}, - {0x0017, 0x000d}, {0x0017, 0x000e}, {0x0017, 0x000f}, {0x0017, 0x0010}, {0x0013, 0x000a}, {0x0013, 0x000b}, {0x0014, 0x000d}, {0x0015, 0x0011}, - {0x0017, 0x0011}, {0x0016, 0x001b}, {0x0017, 0x0012}, {0x0017, 0x0013}, {0x0017, 0x0014}, {0x0017, 0x0015}, {0x0017, 0x0016}, {0x0015, 0x0012}, - {0x0015, 0x0013}, {0x0017, 0x0017}, {0x0016, 0x001c}, {0x0017, 0x0018}, {0x0017, 0x0019}, {0x0017, 0x001a}, {0x0017, 0x001b}, {0x0017, 0x001c}, - {0x0017, 0x001d}, {0x0017, 0x001e}, {0x0017, 0x001f}, {0x0017, 0x0020}, {0x0017, 0x0021}, {0x0017, 0x0022}, {0x0017, 0x0023}, {0x0017, 0x0024}, - {0x0017, 0x0025}, {0x0017, 0x0026}, {0x0017, 0x0027}, {0x0017, 0x0028}, {0x0017, 0x0029}, {0x0017, 0x002a}, {0x0017, 0x002b}, {0x0017, 0x002c}, - {0x0017, 0x002d}, {0x0017, 0x002e}, {0x0017, 0x002f}, {0x0016, 0x001d}, - -}; - -const uint32_t c_aauiCQMFHuffDec9[22][16] = -{ - {0x0001ffff, 0x0002ffff, 0x00010001, 0x00010001, 0x0001000a, 0x0001000a, 0x0001000b, 0x0001000b, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x0003ffff, 0x0004ffff, 0x00000016, 0x0000001f, 0x00020002, 0x00020002, 0x00020002, 0x00020002, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, }, - {0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, }, - {0x0007ffff, 0x0005ffff, 0x0006ffff, 0x00000029, 0x00010017, 0x00010017, 0x00010020, 0x00010020, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, }, - {0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, }, - {0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, }, - {0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, }, - {0x000bffff, 0x000affff, 0x0008ffff, 0x0009ffff, 0x0000000f, 0x00000022, 0x0000002b, 0x00000033, 0x00020018, 0x00020018, 0x00020018, 0x00020018, 0x0002002a, 0x0002002a, 0x0002002a, 0x0002002a, }, - {0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, }, - {0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, }, - {0x00010035, 0x00010035, 0x00010036, 0x00010036, 0x0001003c, 0x0001003c, 0x0001003d, 0x0001003d, 0x00020023, 0x00020023, 0x00020023, 0x00020023, 0x0002002c, 0x0002002c, 0x0002002c, 0x0002002c, }, - {0x0010ffff, 0x0011ffff, 0x0012ffff, 0x0013ffff, 0x0014ffff, 0x0015ffff, 0x000fffff, 0x000dffff, 0x000cffff, 0x000effff, 0x00000006, 0x0000001a, 0x0000002d, 0x0000003e, 0x00010010, 0x00010010, }, - {0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, }, - {0x0002004a, 0x0002004a, 0x0002004a, 0x0002004a, 0x00020063, 0x00020063, 0x00020063, 0x00020063, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, }, - {0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, }, - {0x00020011, 0x00020011, 0x00020011, 0x00020011, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002002f, 0x0002002f, 0x0002002f, 0x0002002f, 0x00020041, 0x00020041, 0x00020041, 0x00020041, }, - {0x00010007, 0x00010007, 0x00010008, 0x00010008, 0x00010009, 0x00010009, 0x00010012, 0x00010012, 0x00010013, 0x00010013, 0x0001001c, 0x0001001c, 0x0001001d, 0x0001001d, 0x00010025, 0x00010025, }, - {0x00010026, 0x00010026, 0x00010027, 0x00010027, 0x0001002e, 0x0001002e, 0x00010030, 0x00010030, 0x00010031, 0x00010031, 0x00010038, 0x00010038, 0x00010039, 0x00010039, 0x0001003a, 0x0001003a, }, - {0x0001003b, 0x0001003b, 0x00010040, 0x00010040, 0x00010042, 0x00010042, 0x00010043, 0x00010043, 0x00010044, 0x00010044, 0x00010045, 0x00010045, 0x00010046, 0x00010046, 0x00010049, 0x00010049, }, - {0x0001004b, 0x0001004b, 0x0001004c, 0x0001004c, 0x0001004d, 0x0001004d, 0x0001004e, 0x0001004e, 0x0001004f, 0x0001004f, 0x00010050, 0x00010050, 0x00010051, 0x00010051, 0x00010052, 0x00010052, }, - {0x00010053, 0x00010053, 0x00010054, 0x00010054, 0x00010055, 0x00010055, 0x00010056, 0x00010056, 0x00010057, 0x00010057, 0x00010058, 0x00010058, 0x00010059, 0x00010059, 0x0001005a, 0x0001005a, }, - {0x0001005b, 0x0001005b, 0x0001005c, 0x0001005c, 0x0001005d, 0x0001005d, 0x0001005e, 0x0001005e, 0x0001005f, 0x0001005f, 0x00010060, 0x00010060, 0x00010061, 0x00010061, 0x00010062, 0x00010062, }, -}; - -const uint32_t c_aauiCQMFHuffEnc10[169][2] = -{ - {0x0001, 0x0001}, {0x0004, 0x0002}, {0x0005, 0x0002}, {0x0007, 0x0002}, {0x000a, 0x0002}, {0x000e, 0x0004}, {0x0011, 0x0007}, {0x0013, 0x0012}, - {0x0016, 0x0000}, {0x0016, 0x0001}, {0x0016, 0x0002}, {0x0016, 0x0003}, {0x0016, 0x0004}, {0x0004, 0x0003}, {0x0003, 0x0003}, {0x0004, 0x0004}, - {0x0007, 0x0003}, {0x000a, 0x0003}, {0x000d, 0x0004}, {0x0010, 0x0007}, {0x0013, 0x0013}, {0x0015, 0x0035}, {0x0016, 0x0005}, {0x0016, 0x0006}, - {0x0016, 0x0007}, {0x0016, 0x0008}, {0x0005, 0x0003}, {0x0004, 0x0005}, {0x0006, 0x0003}, {0x0008, 0x0002}, {0x000b, 0x0002}, {0x000e, 0x0005}, - {0x0010, 0x0008}, {0x0013, 0x0014}, {0x0014, 0x001d}, {0x0016, 0x0009}, {0x0016, 0x000a}, {0x0016, 0x000b}, {0x0016, 0x000c}, {0x0007, 0x0004}, - {0x0007, 0x0005}, {0x0008, 0x0003}, {0x000a, 0x0004}, {0x000d, 0x0005}, {0x000f, 0x0005}, {0x0011, 0x0008}, {0x0014, 0x001e}, {0x0014, 0x001f}, - {0x0016, 0x000d}, {0x0016, 0x000e}, {0x0016, 0x000f}, {0x0016, 0x0010}, {0x000a, 0x0005}, {0x0009, 0x0003}, {0x000b, 0x0003}, {0x000d, 0x0006}, - {0x000f, 0x0006}, {0x0011, 0x0009}, {0x0013, 0x0015}, {0x0014, 0x0020}, {0x0016, 0x0011}, {0x0016, 0x0012}, {0x0016, 0x0013}, {0x0016, 0x0014}, - {0x0016, 0x0015}, {0x000e, 0x0006}, {0x000d, 0x0007}, {0x000e, 0x0007}, {0x000f, 0x0007}, {0x0011, 0x000a}, {0x0012, 0x000c}, {0x0016, 0x0016}, - {0x0016, 0x0017}, {0x0016, 0x0018}, {0x0016, 0x0019}, {0x0016, 0x001a}, {0x0016, 0x001b}, {0x0016, 0x001c}, {0x0011, 0x000b}, {0x0010, 0x0009}, - {0x0011, 0x000c}, {0x0011, 0x000d}, {0x0013, 0x0016}, {0x0016, 0x001d}, {0x0016, 0x001e}, {0x0016, 0x001f}, {0x0016, 0x0020}, {0x0016, 0x0021}, - {0x0016, 0x0022}, {0x0016, 0x0023}, {0x0016, 0x0024}, {0x0014, 0x0021}, {0x0014, 0x0022}, {0x0012, 0x000d}, {0x0013, 0x0017}, {0x0016, 0x0025}, - {0x0016, 0x0026}, {0x0016, 0x0027}, {0x0016, 0x0028}, {0x0016, 0x0029}, {0x0016, 0x002a}, {0x0016, 0x002b}, {0x0016, 0x002c}, {0x0016, 0x002d}, - {0x0015, 0x0036}, {0x0015, 0x0037}, {0x0014, 0x0023}, {0x0015, 0x0038}, {0x0016, 0x002e}, {0x0016, 0x002f}, {0x0016, 0x0030}, {0x0016, 0x0031}, - {0x0016, 0x0032}, {0x0016, 0x0033}, {0x0016, 0x0034}, {0x0016, 0x0035}, {0x0016, 0x0036}, {0x0016, 0x0037}, {0x0016, 0x0038}, {0x0016, 0x0039}, - {0x0016, 0x003a}, {0x0016, 0x003b}, {0x0016, 0x003c}, {0x0016, 0x003d}, {0x0016, 0x003e}, {0x0016, 0x003f}, {0x0016, 0x0040}, {0x0016, 0x0041}, - {0x0016, 0x0042}, {0x0016, 0x0043}, {0x0016, 0x0044}, {0x0016, 0x0045}, {0x0016, 0x0046}, {0x0016, 0x0047}, {0x0016, 0x0048}, {0x0016, 0x0049}, - {0x0016, 0x004a}, {0x0016, 0x004b}, {0x0016, 0x004c}, {0x0016, 0x004d}, {0x0016, 0x004e}, {0x0016, 0x004f}, {0x0016, 0x0050}, {0x0016, 0x0051}, - {0x0016, 0x0052}, {0x0016, 0x0053}, {0x0016, 0x0054}, {0x0016, 0x0055}, {0x0016, 0x0056}, {0x0016, 0x0057}, {0x0016, 0x0058}, {0x0016, 0x0059}, - {0x0016, 0x005a}, {0x0016, 0x005b}, {0x0016, 0x005c}, {0x0016, 0x005d}, {0x0016, 0x005e}, {0x0016, 0x005f}, {0x0016, 0x0060}, {0x0016, 0x0061}, - {0x0016, 0x0062}, {0x0016, 0x0063}, {0x0016, 0x0064}, {0x0016, 0x0065}, {0x0016, 0x0066}, {0x0016, 0x0067}, {0x0016, 0x0068}, {0x0016, 0x0069}, - {0x0015, 0x0039}, - -}; - -const uint32_t c_aauiCQMFHuffDec10[45][16] = -{ - {0x0002ffff, 0x0001ffff, 0x00000001, 0x0000000d, 0x0000000f, 0x0000001b, 0x0001000e, 0x0001000e, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, }, - {0x0004ffff, 0x0003ffff, 0x0000001d, 0x00000029, 0x00010003, 0x00010003, 0x00010010, 0x00010010, 0x00010027, 0x00010027, 0x00010028, 0x00010028, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001c, }, - {0x0002002a, 0x0002002a, 0x0002002a, 0x0002002a, 0x00020034, 0x00020034, 0x00020034, 0x00020034, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, }, - {0x0008ffff, 0x0007ffff, 0x0005ffff, 0x0006ffff, 0x0001001e, 0x0001001e, 0x00010036, 0x00010036, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020011, 0x00020011, 0x00020011, 0x00020011, }, - {0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, }, - {0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, }, - {0x00020005, 0x00020005, 0x00020005, 0x00020005, 0x0002001f, 0x0002001f, 0x0002001f, 0x0002001f, 0x00020041, 0x00020041, 0x00020041, 0x00020041, 0x00020043, 0x00020043, 0x00020043, 0x00020043, }, - {0x0012ffff, 0x000effff, 0x000dffff, 0x000affff, 0x0009ffff, 0x000bffff, 0x000cffff, 0x00000013, 0x00000020, 0x0000004f, 0x0001002c, 0x0001002c, 0x00010038, 0x00010038, 0x00010044, 0x00010044, }, - {0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, }, - {0x00020046, 0x00020046, 0x00020046, 0x00020046, 0x0002005d, 0x0002005d, 0x0002005d, 0x0002005d, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, }, - {0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, }, - {0x00030050, 0x00030050, 0x00030050, 0x00030050, 0x00030050, 0x00030050, 0x00030050, 0x00030050, 0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030051, }, - {0x0000003b, 0x0000005b, 0x0000005c, 0x0000006a, 0x00010007, 0x00010007, 0x00010014, 0x00010014, 0x00010021, 0x00010021, 0x0001003a, 0x0001003a, 0x00010052, 0x00010052, 0x0001005e, 0x0001005e, }, - {0x0023ffff, 0x0024ffff, 0x0025ffff, 0x0026ffff, 0x0027ffff, 0x0028ffff, 0x0029ffff, 0x002affff, 0x002bffff, 0x002cffff, 0x000fffff, 0x0010ffff, 0x0011ffff, 0x00000022, 0x0000002e, 0x0000002f, }, - {0x000200a6, 0x000200a6, 0x000200a6, 0x000200a6, 0x000200a7, 0x000200a7, 0x000200a7, 0x000200a7, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, }, - {0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030069, 0x00030069, 0x00030069, 0x00030069, 0x00030069, 0x00030069, 0x00030069, 0x00030069, }, - {0x0003006b, 0x0003006b, 0x0003006b, 0x0003006b, 0x0003006b, 0x0003006b, 0x0003006b, 0x0003006b, 0x000300a8, 0x000300a8, 0x000300a8, 0x000300a8, 0x000300a8, 0x000300a8, 0x000300a8, 0x000300a8, }, - {0x0014ffff, 0x0017ffff, 0x0015ffff, 0x0016ffff, 0x001cffff, 0x0013ffff, 0x0018ffff, 0x0019ffff, 0x001affff, 0x001bffff, 0x001dffff, 0x001effff, 0x001fffff, 0x0020ffff, 0x0021ffff, 0x0022ffff, }, - {0x0002003f, 0x0002003f, 0x0002003f, 0x0002003f, 0x00020040, 0x00020040, 0x00020040, 0x00020040, 0x00020047, 0x00020047, 0x00020047, 0x00020047, 0x00020048, 0x00020048, 0x00020048, 0x00020048, }, - {0x00020008, 0x00020008, 0x00020008, 0x00020008, 0x00020009, 0x00020009, 0x00020009, 0x00020009, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000b, 0x0002000b, 0x0002000b, 0x0002000b, }, - {0x00020019, 0x00020019, 0x00020019, 0x00020019, 0x00020023, 0x00020023, 0x00020023, 0x00020023, 0x00020024, 0x00020024, 0x00020024, 0x00020024, 0x00020025, 0x00020025, 0x00020025, 0x00020025, }, - {0x00020026, 0x00020026, 0x00020026, 0x00020026, 0x00020030, 0x00020030, 0x00020030, 0x00020030, 0x00020031, 0x00020031, 0x00020031, 0x00020031, 0x00020032, 0x00020032, 0x00020032, 0x00020032, }, - {0x0002000c, 0x0002000c, 0x0002000c, 0x0002000c, 0x00020016, 0x00020016, 0x00020016, 0x00020016, 0x00020017, 0x00020017, 0x00020017, 0x00020017, 0x00020018, 0x00020018, 0x00020018, 0x00020018, }, - {0x00020049, 0x00020049, 0x00020049, 0x00020049, 0x0002004a, 0x0002004a, 0x0002004a, 0x0002004a, 0x0002004b, 0x0002004b, 0x0002004b, 0x0002004b, 0x0002004c, 0x0002004c, 0x0002004c, 0x0002004c, }, - {0x0002004d, 0x0002004d, 0x0002004d, 0x0002004d, 0x00020053, 0x00020053, 0x00020053, 0x00020053, 0x00020054, 0x00020054, 0x00020054, 0x00020054, 0x00020055, 0x00020055, 0x00020055, 0x00020055, }, - {0x00020056, 0x00020056, 0x00020056, 0x00020056, 0x00020057, 0x00020057, 0x00020057, 0x00020057, 0x00020058, 0x00020058, 0x00020058, 0x00020058, 0x00020059, 0x00020059, 0x00020059, 0x00020059, }, - {0x0002005a, 0x0002005a, 0x0002005a, 0x0002005a, 0x0002005f, 0x0002005f, 0x0002005f, 0x0002005f, 0x00020060, 0x00020060, 0x00020060, 0x00020060, 0x00020061, 0x00020061, 0x00020061, 0x00020061, }, - {0x00020033, 0x00020033, 0x00020033, 0x00020033, 0x0002003c, 0x0002003c, 0x0002003c, 0x0002003c, 0x0002003d, 0x0002003d, 0x0002003d, 0x0002003d, 0x0002003e, 0x0002003e, 0x0002003e, 0x0002003e, }, - {0x00020062, 0x00020062, 0x00020062, 0x00020062, 0x00020063, 0x00020063, 0x00020063, 0x00020063, 0x00020064, 0x00020064, 0x00020064, 0x00020064, 0x00020065, 0x00020065, 0x00020065, 0x00020065, }, - {0x00020066, 0x00020066, 0x00020066, 0x00020066, 0x00020067, 0x00020067, 0x00020067, 0x00020067, 0x0002006c, 0x0002006c, 0x0002006c, 0x0002006c, 0x0002006d, 0x0002006d, 0x0002006d, 0x0002006d, }, - {0x0002006e, 0x0002006e, 0x0002006e, 0x0002006e, 0x0002006f, 0x0002006f, 0x0002006f, 0x0002006f, 0x00020070, 0x00020070, 0x00020070, 0x00020070, 0x00020071, 0x00020071, 0x00020071, 0x00020071, }, - {0x00020072, 0x00020072, 0x00020072, 0x00020072, 0x00020073, 0x00020073, 0x00020073, 0x00020073, 0x00020074, 0x00020074, 0x00020074, 0x00020074, 0x00020075, 0x00020075, 0x00020075, 0x00020075, }, - {0x00020076, 0x00020076, 0x00020076, 0x00020076, 0x00020077, 0x00020077, 0x00020077, 0x00020077, 0x00020078, 0x00020078, 0x00020078, 0x00020078, 0x00020079, 0x00020079, 0x00020079, 0x00020079, }, - {0x0002007a, 0x0002007a, 0x0002007a, 0x0002007a, 0x0002007b, 0x0002007b, 0x0002007b, 0x0002007b, 0x0002007c, 0x0002007c, 0x0002007c, 0x0002007c, 0x0002007d, 0x0002007d, 0x0002007d, 0x0002007d, }, - {0x0002007e, 0x0002007e, 0x0002007e, 0x0002007e, 0x0002007f, 0x0002007f, 0x0002007f, 0x0002007f, 0x00020080, 0x00020080, 0x00020080, 0x00020080, 0x00020081, 0x00020081, 0x00020081, 0x00020081, }, - {0x00020082, 0x00020082, 0x00020082, 0x00020082, 0x00020083, 0x00020083, 0x00020083, 0x00020083, 0x00020084, 0x00020084, 0x00020084, 0x00020084, 0x00020085, 0x00020085, 0x00020085, 0x00020085, }, - {0x00020086, 0x00020086, 0x00020086, 0x00020086, 0x00020087, 0x00020087, 0x00020087, 0x00020087, 0x00020088, 0x00020088, 0x00020088, 0x00020088, 0x00020089, 0x00020089, 0x00020089, 0x00020089, }, - {0x0002008a, 0x0002008a, 0x0002008a, 0x0002008a, 0x0002008b, 0x0002008b, 0x0002008b, 0x0002008b, 0x0002008c, 0x0002008c, 0x0002008c, 0x0002008c, 0x0002008d, 0x0002008d, 0x0002008d, 0x0002008d, }, - {0x0002008e, 0x0002008e, 0x0002008e, 0x0002008e, 0x0002008f, 0x0002008f, 0x0002008f, 0x0002008f, 0x00020090, 0x00020090, 0x00020090, 0x00020090, 0x00020091, 0x00020091, 0x00020091, 0x00020091, }, - {0x00020092, 0x00020092, 0x00020092, 0x00020092, 0x00020093, 0x00020093, 0x00020093, 0x00020093, 0x00020094, 0x00020094, 0x00020094, 0x00020094, 0x00020095, 0x00020095, 0x00020095, 0x00020095, }, - {0x00020096, 0x00020096, 0x00020096, 0x00020096, 0x00020097, 0x00020097, 0x00020097, 0x00020097, 0x00020098, 0x00020098, 0x00020098, 0x00020098, 0x00020099, 0x00020099, 0x00020099, 0x00020099, }, - {0x0002009a, 0x0002009a, 0x0002009a, 0x0002009a, 0x0002009b, 0x0002009b, 0x0002009b, 0x0002009b, 0x0002009c, 0x0002009c, 0x0002009c, 0x0002009c, 0x0002009d, 0x0002009d, 0x0002009d, 0x0002009d, }, - {0x0002009e, 0x0002009e, 0x0002009e, 0x0002009e, 0x0002009f, 0x0002009f, 0x0002009f, 0x0002009f, 0x000200a0, 0x000200a0, 0x000200a0, 0x000200a0, 0x000200a1, 0x000200a1, 0x000200a1, 0x000200a1, }, - {0x000200a2, 0x000200a2, 0x000200a2, 0x000200a2, 0x000200a3, 0x000200a3, 0x000200a3, 0x000200a3, 0x000200a4, 0x000200a4, 0x000200a4, 0x000200a4, 0x000200a5, 0x000200a5, 0x000200a5, 0x000200a5, }, -}; - -const uint32_t c_aauiCQMFHuffEnc11[196][2] = -{ - {0x0001, 0x0001}, {0x0004, 0x0003}, {0x0005, 0x0003}, {0x0007, 0x0002}, {0x0009, 0x0003}, {0x000c, 0x0004}, {0x000f, 0x0005}, {0x0012, 0x000d}, - {0x0014, 0x001f}, {0x0016, 0x0000}, {0x0016, 0x0001}, {0x0016, 0x0002}, {0x0016, 0x0003}, {0x0016, 0x0004}, {0x0004, 0x0004}, {0x0003, 0x0003}, - {0x0005, 0x0004}, {0x0006, 0x0003}, {0x0009, 0x0004}, {0x000b, 0x0004}, {0x000e, 0x0005}, {0x0010, 0x0007}, {0x0012, 0x000e}, {0x0014, 0x0020}, - {0x0016, 0x0005}, {0x0016, 0x0006}, {0x0016, 0x0007}, {0x0016, 0x0008}, {0x0005, 0x0005}, {0x0004, 0x0005}, {0x0006, 0x0004}, {0x0007, 0x0003}, - {0x000a, 0x0004}, {0x000c, 0x0005}, {0x000e, 0x0006}, {0x0011, 0x000a}, {0x0012, 0x000f}, {0x0015, 0x003b}, {0x0016, 0x0009}, {0x0016, 0x000a}, - {0x0016, 0x000b}, {0x0016, 0x000c}, {0x0007, 0x0004}, {0x0006, 0x0005}, {0x0007, 0x0005}, {0x0009, 0x0005}, {0x000b, 0x0005}, {0x000d, 0x0005}, - {0x000f, 0x0006}, {0x0012, 0x0010}, {0x0014, 0x0021}, {0x0016, 0x000d}, {0x0016, 0x000e}, {0x0016, 0x000f}, {0x0016, 0x0010}, {0x0016, 0x0011}, - {0x0009, 0x0006}, {0x0009, 0x0007}, {0x000a, 0x0005}, {0x000b, 0x0006}, {0x000d, 0x0006}, {0x000f, 0x0007}, {0x0011, 0x000b}, {0x0013, 0x0017}, - {0x0014, 0x0022}, {0x0016, 0x0012}, {0x0016, 0x0013}, {0x0016, 0x0014}, {0x0016, 0x0015}, {0x0016, 0x0016}, {0x000c, 0x0006}, {0x000b, 0x0007}, - {0x000c, 0x0007}, {0x000d, 0x0007}, {0x000e, 0x0007}, {0x0010, 0x0008}, {0x0012, 0x0011}, {0x0014, 0x0023}, {0x0015, 0x003c}, {0x0016, 0x0017}, - {0x0016, 0x0018}, {0x0016, 0x0019}, {0x0016, 0x001a}, {0x0016, 0x001b}, {0x000f, 0x0008}, {0x000e, 0x0008}, {0x000e, 0x0009}, {0x000f, 0x0009}, - {0x0011, 0x000c}, {0x0013, 0x0018}, {0x0014, 0x0024}, {0x0016, 0x001c}, {0x0016, 0x001d}, {0x0016, 0x001e}, {0x0016, 0x001f}, {0x0016, 0x0020}, - {0x0016, 0x0021}, {0x0016, 0x0022}, {0x0011, 0x000d}, {0x0010, 0x0009}, {0x0012, 0x0012}, {0x0012, 0x0013}, {0x0014, 0x0025}, {0x0015, 0x003d}, - {0x0014, 0x0026}, {0x0016, 0x0023}, {0x0016, 0x0024}, {0x0016, 0x0025}, {0x0016, 0x0026}, {0x0016, 0x0027}, {0x0016, 0x0028}, {0x0016, 0x0029}, - {0x0014, 0x0027}, {0x0013, 0x0019}, {0x0014, 0x0028}, {0x0014, 0x0029}, {0x0014, 0x002a}, {0x0016, 0x002a}, {0x0016, 0x002b}, {0x0016, 0x002c}, - {0x0016, 0x002d}, {0x0016, 0x002e}, {0x0016, 0x002f}, {0x0016, 0x0030}, {0x0016, 0x0031}, {0x0016, 0x0032}, {0x0014, 0x002b}, {0x0014, 0x002c}, - {0x0014, 0x002d}, {0x0016, 0x0033}, {0x0016, 0x0034}, {0x0016, 0x0035}, {0x0016, 0x0036}, {0x0016, 0x0037}, {0x0016, 0x0038}, {0x0016, 0x0039}, - {0x0016, 0x003a}, {0x0016, 0x003b}, {0x0016, 0x003c}, {0x0016, 0x003d}, {0x0016, 0x003e}, {0x0016, 0x003f}, {0x0016, 0x0040}, {0x0016, 0x0041}, - {0x0016, 0x0042}, {0x0016, 0x0043}, {0x0016, 0x0044}, {0x0016, 0x0045}, {0x0016, 0x0046}, {0x0016, 0x0047}, {0x0016, 0x0048}, {0x0016, 0x0049}, - {0x0016, 0x004a}, {0x0016, 0x004b}, {0x0016, 0x004c}, {0x0016, 0x004d}, {0x0016, 0x004e}, {0x0016, 0x004f}, {0x0016, 0x0050}, {0x0016, 0x0051}, - {0x0016, 0x0052}, {0x0016, 0x0053}, {0x0016, 0x0054}, {0x0016, 0x0055}, {0x0016, 0x0056}, {0x0016, 0x0057}, {0x0016, 0x0058}, {0x0016, 0x0059}, - {0x0016, 0x005a}, {0x0016, 0x005b}, {0x0016, 0x005c}, {0x0016, 0x005d}, {0x0016, 0x005e}, {0x0016, 0x005f}, {0x0016, 0x0060}, {0x0016, 0x0061}, - {0x0016, 0x0062}, {0x0016, 0x0063}, {0x0016, 0x0064}, {0x0016, 0x0065}, {0x0016, 0x0066}, {0x0016, 0x0067}, {0x0016, 0x0068}, {0x0016, 0x0069}, - {0x0016, 0x006a}, {0x0016, 0x006b}, {0x0016, 0x006c}, {0x0016, 0x006d}, {0x0016, 0x006e}, {0x0016, 0x006f}, {0x0016, 0x0070}, {0x0016, 0x0071}, - {0x0016, 0x0072}, {0x0016, 0x0073}, {0x0016, 0x0074}, {0x0016, 0x0075}, - -}; - -const uint32_t c_aauiCQMFHuffDec11[50][16] = -{ - {0x0003ffff, 0x0001ffff, 0x0002ffff, 0x00000001, 0x0000000e, 0x0000001d, 0x0001000f, 0x0001000f, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x0002001e, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002002b, 0x0002002b, 0x0002002b, 0x0002002b, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, }, - {0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, }, - {0x0007ffff, 0x0005ffff, 0x0004ffff, 0x0006ffff, 0x00010003, 0x00010003, 0x0001001f, 0x0001001f, 0x0001002a, 0x0001002a, 0x0001002c, 0x0001002c, 0x00020011, 0x00020011, 0x00020011, 0x00020011, }, - {0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, }, - {0x00020020, 0x00020020, 0x00020020, 0x00020020, 0x0002003a, 0x0002003a, 0x0002003a, 0x0002003a, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, }, - {0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, }, - {0x000bffff, 0x000affff, 0x0008ffff, 0x0009ffff, 0x00000005, 0x00000021, 0x00000046, 0x00000048, 0x00010013, 0x00010013, 0x0001002e, 0x0001002e, 0x0001003b, 0x0001003b, 0x00010047, 0x00010047, }, - {0x00020055, 0x00020055, 0x00020055, 0x00020055, 0x00020056, 0x00020056, 0x00020056, 0x00020056, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, }, - {0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, }, - {0x00010054, 0x00010054, 0x00010057, 0x00010057, 0x00020014, 0x00020014, 0x00020014, 0x00020014, 0x00020022, 0x00020022, 0x00020022, 0x00020022, 0x0002004a, 0x0002004a, 0x0002004a, 0x0002004a, }, - {0x0014ffff, 0x0011ffff, 0x0010ffff, 0x000effff, 0x000fffff, 0x000cffff, 0x000dffff, 0x00000015, 0x0000004b, 0x00000063, 0x00010006, 0x00010006, 0x00010030, 0x00010030, 0x0001003d, 0x0001003d, }, - {0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, }, - {0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030062, 0x00030062, 0x00030062, 0x00030062, 0x00030062, 0x00030062, 0x00030062, 0x00030062, }, - {0x00010059, 0x00010059, 0x00010071, 0x00010071, 0x00020007, 0x00020007, 0x00020007, 0x00020007, 0x00020016, 0x00020016, 0x00020016, 0x00020016, 0x00020024, 0x00020024, 0x00020024, 0x00020024, }, - {0x00020031, 0x00020031, 0x00020031, 0x00020031, 0x0002004c, 0x0002004c, 0x0002004c, 0x0002004c, 0x00020064, 0x00020064, 0x00020064, 0x00020064, 0x00020065, 0x00020065, 0x00020065, 0x00020065, }, - {0x00000017, 0x00000032, 0x00000040, 0x0000004d, 0x0000005a, 0x00000066, 0x00000068, 0x00000070, 0x00000072, 0x00000073, 0x00000074, 0x0000007e, 0x0000007f, 0x00000080, 0x0001003f, 0x0001003f, }, - {0x0025ffff, 0x0026ffff, 0x0027ffff, 0x0028ffff, 0x0029ffff, 0x002affff, 0x002bffff, 0x002cffff, 0x002dffff, 0x002effff, 0x002fffff, 0x0030ffff, 0x0031ffff, 0x0013ffff, 0x0012ffff, 0x00000008, }, - {0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x00030067, 0x00030067, 0x00030067, 0x00030067, 0x00030067, 0x00030067, 0x00030067, 0x00030067, }, - {0x000200c2, 0x000200c2, 0x000200c2, 0x000200c2, 0x000200c3, 0x000200c3, 0x000200c3, 0x000200c3, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, }, - {0x001affff, 0x0019ffff, 0x0015ffff, 0x0018ffff, 0x001dffff, 0x0016ffff, 0x0017ffff, 0x001bffff, 0x001cffff, 0x001effff, 0x001fffff, 0x0020ffff, 0x0021ffff, 0x0022ffff, 0x0023ffff, 0x0024ffff, }, - {0x0002001b, 0x0002001b, 0x0002001b, 0x0002001b, 0x00020026, 0x00020026, 0x00020026, 0x00020026, 0x00020027, 0x00020027, 0x00020027, 0x00020027, 0x00020028, 0x00020028, 0x00020028, 0x00020028, }, - {0x00020043, 0x00020043, 0x00020043, 0x00020043, 0x00020044, 0x00020044, 0x00020044, 0x00020044, 0x00020045, 0x00020045, 0x00020045, 0x00020045, 0x0002004f, 0x0002004f, 0x0002004f, 0x0002004f, }, - {0x00020050, 0x00020050, 0x00020050, 0x00020050, 0x00020051, 0x00020051, 0x00020051, 0x00020051, 0x00020052, 0x00020052, 0x00020052, 0x00020052, 0x00020053, 0x00020053, 0x00020053, 0x00020053, }, - {0x00020029, 0x00020029, 0x00020029, 0x00020029, 0x00020033, 0x00020033, 0x00020033, 0x00020033, 0x00020034, 0x00020034, 0x00020034, 0x00020034, 0x00020035, 0x00020035, 0x00020035, 0x00020035, }, - {0x0002000d, 0x0002000d, 0x0002000d, 0x0002000d, 0x00020018, 0x00020018, 0x00020018, 0x00020018, 0x00020019, 0x00020019, 0x00020019, 0x00020019, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001a, }, - {0x00020009, 0x00020009, 0x00020009, 0x00020009, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000b, 0x0002000b, 0x0002000b, 0x0002000b, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000c, }, - {0x0002005b, 0x0002005b, 0x0002005b, 0x0002005b, 0x0002005c, 0x0002005c, 0x0002005c, 0x0002005c, 0x0002005d, 0x0002005d, 0x0002005d, 0x0002005d, 0x0002005e, 0x0002005e, 0x0002005e, 0x0002005e, }, - {0x0002005f, 0x0002005f, 0x0002005f, 0x0002005f, 0x00020060, 0x00020060, 0x00020060, 0x00020060, 0x00020061, 0x00020061, 0x00020061, 0x00020061, 0x00020069, 0x00020069, 0x00020069, 0x00020069, }, - {0x00020036, 0x00020036, 0x00020036, 0x00020036, 0x00020037, 0x00020037, 0x00020037, 0x00020037, 0x00020041, 0x00020041, 0x00020041, 0x00020041, 0x00020042, 0x00020042, 0x00020042, 0x00020042, }, - {0x0002006a, 0x0002006a, 0x0002006a, 0x0002006a, 0x0002006b, 0x0002006b, 0x0002006b, 0x0002006b, 0x0002006c, 0x0002006c, 0x0002006c, 0x0002006c, 0x0002006d, 0x0002006d, 0x0002006d, 0x0002006d, }, - {0x0002006e, 0x0002006e, 0x0002006e, 0x0002006e, 0x0002006f, 0x0002006f, 0x0002006f, 0x0002006f, 0x00020075, 0x00020075, 0x00020075, 0x00020075, 0x00020076, 0x00020076, 0x00020076, 0x00020076, }, - {0x00020077, 0x00020077, 0x00020077, 0x00020077, 0x00020078, 0x00020078, 0x00020078, 0x00020078, 0x00020079, 0x00020079, 0x00020079, 0x00020079, 0x0002007a, 0x0002007a, 0x0002007a, 0x0002007a, }, - {0x0002007b, 0x0002007b, 0x0002007b, 0x0002007b, 0x0002007c, 0x0002007c, 0x0002007c, 0x0002007c, 0x0002007d, 0x0002007d, 0x0002007d, 0x0002007d, 0x00020081, 0x00020081, 0x00020081, 0x00020081, }, - {0x00020082, 0x00020082, 0x00020082, 0x00020082, 0x00020083, 0x00020083, 0x00020083, 0x00020083, 0x00020084, 0x00020084, 0x00020084, 0x00020084, 0x00020085, 0x00020085, 0x00020085, 0x00020085, }, - {0x00020086, 0x00020086, 0x00020086, 0x00020086, 0x00020087, 0x00020087, 0x00020087, 0x00020087, 0x00020088, 0x00020088, 0x00020088, 0x00020088, 0x00020089, 0x00020089, 0x00020089, 0x00020089, }, - {0x0002008a, 0x0002008a, 0x0002008a, 0x0002008a, 0x0002008b, 0x0002008b, 0x0002008b, 0x0002008b, 0x0002008c, 0x0002008c, 0x0002008c, 0x0002008c, 0x0002008d, 0x0002008d, 0x0002008d, 0x0002008d, }, - {0x0002008e, 0x0002008e, 0x0002008e, 0x0002008e, 0x0002008f, 0x0002008f, 0x0002008f, 0x0002008f, 0x00020090, 0x00020090, 0x00020090, 0x00020090, 0x00020091, 0x00020091, 0x00020091, 0x00020091, }, - {0x00020092, 0x00020092, 0x00020092, 0x00020092, 0x00020093, 0x00020093, 0x00020093, 0x00020093, 0x00020094, 0x00020094, 0x00020094, 0x00020094, 0x00020095, 0x00020095, 0x00020095, 0x00020095, }, - {0x00020096, 0x00020096, 0x00020096, 0x00020096, 0x00020097, 0x00020097, 0x00020097, 0x00020097, 0x00020098, 0x00020098, 0x00020098, 0x00020098, 0x00020099, 0x00020099, 0x00020099, 0x00020099, }, - {0x0002009a, 0x0002009a, 0x0002009a, 0x0002009a, 0x0002009b, 0x0002009b, 0x0002009b, 0x0002009b, 0x0002009c, 0x0002009c, 0x0002009c, 0x0002009c, 0x0002009d, 0x0002009d, 0x0002009d, 0x0002009d, }, - {0x0002009e, 0x0002009e, 0x0002009e, 0x0002009e, 0x0002009f, 0x0002009f, 0x0002009f, 0x0002009f, 0x000200a0, 0x000200a0, 0x000200a0, 0x000200a0, 0x000200a1, 0x000200a1, 0x000200a1, 0x000200a1, }, - {0x000200a2, 0x000200a2, 0x000200a2, 0x000200a2, 0x000200a3, 0x000200a3, 0x000200a3, 0x000200a3, 0x000200a4, 0x000200a4, 0x000200a4, 0x000200a4, 0x000200a5, 0x000200a5, 0x000200a5, 0x000200a5, }, - {0x000200a6, 0x000200a6, 0x000200a6, 0x000200a6, 0x000200a7, 0x000200a7, 0x000200a7, 0x000200a7, 0x000200a8, 0x000200a8, 0x000200a8, 0x000200a8, 0x000200a9, 0x000200a9, 0x000200a9, 0x000200a9, }, - {0x000200aa, 0x000200aa, 0x000200aa, 0x000200aa, 0x000200ab, 0x000200ab, 0x000200ab, 0x000200ab, 0x000200ac, 0x000200ac, 0x000200ac, 0x000200ac, 0x000200ad, 0x000200ad, 0x000200ad, 0x000200ad, }, - {0x000200ae, 0x000200ae, 0x000200ae, 0x000200ae, 0x000200af, 0x000200af, 0x000200af, 0x000200af, 0x000200b0, 0x000200b0, 0x000200b0, 0x000200b0, 0x000200b1, 0x000200b1, 0x000200b1, 0x000200b1, }, - {0x000200b2, 0x000200b2, 0x000200b2, 0x000200b2, 0x000200b3, 0x000200b3, 0x000200b3, 0x000200b3, 0x000200b4, 0x000200b4, 0x000200b4, 0x000200b4, 0x000200b5, 0x000200b5, 0x000200b5, 0x000200b5, }, - {0x000200b6, 0x000200b6, 0x000200b6, 0x000200b6, 0x000200b7, 0x000200b7, 0x000200b7, 0x000200b7, 0x000200b8, 0x000200b8, 0x000200b8, 0x000200b8, 0x000200b9, 0x000200b9, 0x000200b9, 0x000200b9, }, - {0x000200ba, 0x000200ba, 0x000200ba, 0x000200ba, 0x000200bb, 0x000200bb, 0x000200bb, 0x000200bb, 0x000200bc, 0x000200bc, 0x000200bc, 0x000200bc, 0x000200bd, 0x000200bd, 0x000200bd, 0x000200bd, }, - {0x000200be, 0x000200be, 0x000200be, 0x000200be, 0x000200bf, 0x000200bf, 0x000200bf, 0x000200bf, 0x000200c0, 0x000200c0, 0x000200c0, 0x000200c0, 0x000200c1, 0x000200c1, 0x000200c1, 0x000200c1, }, -}; - -const uint32_t c_aauiCQMFHuffEnc12[289][2] = -{ - {0x0001, 0x0001}, {0x0004, 0x0004}, {0x0005, 0x0004}, {0x0007, 0x0004}, {0x0008, 0x0002}, {0x000b, 0x0004}, {0x000e, 0x0006}, {0x0010, 0x0009}, - {0x0012, 0x0014}, {0x0013, 0x001f}, {0x0016, 0x0000}, {0x0016, 0x0001}, {0x0016, 0x0002}, {0x0016, 0x0003}, {0x0016, 0x0004}, {0x0016, 0x0005}, - {0x0016, 0x0006}, {0x0004, 0x0005}, {0x0004, 0x0006}, {0x0005, 0x0005}, {0x0006, 0x0003}, {0x0008, 0x0003}, {0x000a, 0x0004}, {0x000d, 0x0006}, - {0x000f, 0x0008}, {0x0011, 0x000c}, {0x0013, 0x0020}, {0x0016, 0x0007}, {0x0015, 0x0063}, {0x0016, 0x0008}, {0x0016, 0x0009}, {0x0016, 0x000a}, - {0x0016, 0x000b}, {0x0016, 0x000c}, {0x0005, 0x0006}, {0x0004, 0x0007}, {0x0005, 0x0007}, {0x0006, 0x0004}, {0x0008, 0x0004}, {0x000b, 0x0005}, - {0x000d, 0x0007}, {0x0010, 0x000a}, {0x0012, 0x0015}, {0x0015, 0x0064}, {0x0016, 0x000d}, {0x0016, 0x000e}, {0x0016, 0x000f}, {0x0016, 0x0010}, - {0x0016, 0x0011}, {0x0016, 0x0012}, {0x0016, 0x0013}, {0x0006, 0x0005}, {0x0006, 0x0006}, {0x0006, 0x0007}, {0x0008, 0x0005}, {0x000a, 0x0005}, - {0x000c, 0x0005}, {0x000e, 0x0007}, {0x0010, 0x000b}, {0x0012, 0x0016}, {0x0014, 0x0037}, {0x0015, 0x0065}, {0x0016, 0x0014}, {0x0016, 0x0015}, - {0x0016, 0x0016}, {0x0016, 0x0017}, {0x0016, 0x0018}, {0x0016, 0x0019}, {0x0008, 0x0006}, {0x0007, 0x0005}, {0x0008, 0x0007}, {0x000a, 0x0006}, - {0x000c, 0x0006}, {0x000e, 0x0008}, {0x0010, 0x000c}, {0x0011, 0x000d}, {0x0013, 0x0021}, {0x0015, 0x0066}, {0x0016, 0x001a}, {0x0016, 0x001b}, - {0x0016, 0x001c}, {0x0016, 0x001d}, {0x0016, 0x001e}, {0x0016, 0x001f}, {0x0016, 0x0020}, {0x000b, 0x0006}, {0x000a, 0x0007}, {0x000b, 0x0007}, - {0x000c, 0x0007}, {0x000e, 0x0009}, {0x000f, 0x0009}, {0x0011, 0x000e}, {0x0013, 0x0022}, {0x0015, 0x0067}, {0x0015, 0x0068}, {0x0016, 0x0021}, - {0x0016, 0x0022}, {0x0016, 0x0023}, {0x0016, 0x0024}, {0x0016, 0x0025}, {0x0016, 0x0026}, {0x0016, 0x0027}, {0x000e, 0x000a}, {0x000d, 0x0008}, - {0x000d, 0x0009}, {0x000e, 0x000b}, {0x000f, 0x000a}, {0x0011, 0x000f}, {0x0013, 0x0023}, {0x0014, 0x0038}, {0x0016, 0x0028}, {0x0016, 0x0029}, - {0x0016, 0x002a}, {0x0016, 0x002b}, {0x0016, 0x002c}, {0x0016, 0x002d}, {0x0016, 0x002e}, {0x0016, 0x002f}, {0x0016, 0x0030}, {0x0010, 0x000d}, - {0x000f, 0x000b}, {0x0010, 0x000e}, {0x0010, 0x000f}, {0x0012, 0x0017}, {0x0013, 0x0024}, {0x0014, 0x0039}, {0x0016, 0x0031}, {0x0016, 0x0032}, - {0x0016, 0x0033}, {0x0016, 0x0034}, {0x0016, 0x0035}, {0x0016, 0x0036}, {0x0016, 0x0037}, {0x0016, 0x0038}, {0x0016, 0x0039}, {0x0016, 0x003a}, - {0x0013, 0x0025}, {0x0011, 0x0010}, {0x0011, 0x0011}, {0x0013, 0x0026}, {0x0013, 0x0027}, {0x0014, 0x003a}, {0x0014, 0x003b}, {0x0016, 0x003b}, - {0x0016, 0x003c}, {0x0016, 0x003d}, {0x0016, 0x003e}, {0x0016, 0x003f}, {0x0016, 0x0040}, {0x0016, 0x0041}, {0x0016, 0x0042}, {0x0016, 0x0043}, - {0x0016, 0x0044}, {0x0015, 0x0069}, {0x0014, 0x003c}, {0x0014, 0x003d}, {0x0015, 0x006a}, {0x0015, 0x006b}, {0x0015, 0x006c}, {0x0016, 0x0045}, - {0x0016, 0x0046}, {0x0016, 0x0047}, {0x0016, 0x0048}, {0x0016, 0x0049}, {0x0016, 0x004a}, {0x0016, 0x004b}, {0x0016, 0x004c}, {0x0016, 0x004d}, - {0x0016, 0x004e}, {0x0016, 0x004f}, {0x0016, 0x0050}, {0x0016, 0x0051}, {0x0015, 0x006d}, {0x0016, 0x0052}, {0x0016, 0x0053}, {0x0016, 0x0054}, - {0x0016, 0x0055}, {0x0016, 0x0056}, {0x0016, 0x0057}, {0x0016, 0x0058}, {0x0016, 0x0059}, {0x0016, 0x005a}, {0x0016, 0x005b}, {0x0016, 0x005c}, - {0x0016, 0x005d}, {0x0016, 0x005e}, {0x0016, 0x005f}, {0x0016, 0x0060}, {0x0016, 0x0061}, {0x0016, 0x0062}, {0x0016, 0x0063}, {0x0016, 0x0064}, - {0x0016, 0x0065}, {0x0016, 0x0066}, {0x0016, 0x0067}, {0x0016, 0x0068}, {0x0016, 0x0069}, {0x0016, 0x006a}, {0x0016, 0x006b}, {0x0016, 0x006c}, - {0x0016, 0x006d}, {0x0016, 0x006e}, {0x0016, 0x006f}, {0x0016, 0x0070}, {0x0016, 0x0071}, {0x0016, 0x0072}, {0x0016, 0x0073}, {0x0016, 0x0074}, - {0x0016, 0x0075}, {0x0016, 0x0076}, {0x0016, 0x0077}, {0x0016, 0x0078}, {0x0016, 0x0079}, {0x0016, 0x007a}, {0x0016, 0x007b}, {0x0016, 0x007c}, - {0x0016, 0x007d}, {0x0016, 0x007e}, {0x0016, 0x007f}, {0x0016, 0x0080}, {0x0016, 0x0081}, {0x0016, 0x0082}, {0x0016, 0x0083}, {0x0016, 0x0084}, - {0x0016, 0x0085}, {0x0016, 0x0086}, {0x0016, 0x0087}, {0x0016, 0x0088}, {0x0016, 0x0089}, {0x0016, 0x008a}, {0x0016, 0x008b}, {0x0016, 0x008c}, - {0x0016, 0x008d}, {0x0016, 0x008e}, {0x0016, 0x008f}, {0x0016, 0x0090}, {0x0016, 0x0091}, {0x0016, 0x0092}, {0x0016, 0x0093}, {0x0016, 0x0094}, - {0x0016, 0x0095}, {0x0016, 0x0096}, {0x0016, 0x0097}, {0x0016, 0x0098}, {0x0016, 0x0099}, {0x0016, 0x009a}, {0x0016, 0x009b}, {0x0016, 0x009c}, - {0x0016, 0x009d}, {0x0016, 0x009e}, {0x0016, 0x009f}, {0x0016, 0x00a0}, {0x0016, 0x00a1}, {0x0016, 0x00a2}, {0x0016, 0x00a3}, {0x0016, 0x00a4}, - {0x0016, 0x00a5}, {0x0016, 0x00a6}, {0x0016, 0x00a7}, {0x0016, 0x00a8}, {0x0016, 0x00a9}, {0x0016, 0x00aa}, {0x0016, 0x00ab}, {0x0016, 0x00ac}, - {0x0016, 0x00ad}, {0x0016, 0x00ae}, {0x0016, 0x00af}, {0x0016, 0x00b0}, {0x0016, 0x00b1}, {0x0016, 0x00b2}, {0x0016, 0x00b3}, {0x0016, 0x00b4}, - {0x0016, 0x00b5}, {0x0016, 0x00b6}, {0x0016, 0x00b7}, {0x0016, 0x00b8}, {0x0016, 0x00b9}, {0x0016, 0x00ba}, {0x0016, 0x00bb}, {0x0016, 0x00bc}, - {0x0016, 0x00bd}, {0x0016, 0x00be}, {0x0016, 0x00bf}, {0x0016, 0x00c0}, {0x0016, 0x00c1}, {0x0016, 0x00c2}, {0x0016, 0x00c3}, {0x0016, 0x00c4}, - {0x0016, 0x00c5}, - -}; - -const uint32_t c_aauiCQMFHuffDec12[76][16] = -{ - {0x0003ffff, 0x0004ffff, 0x0001ffff, 0x0002ffff, 0x00000001, 0x00000011, 0x00000012, 0x00000023, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, }, - {0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, }, - {0x0006ffff, 0x0005ffff, 0x00000004, 0x00000015, 0x00000026, 0x00000036, 0x00000044, 0x00000046, 0x00010003, 0x00010003, 0x00010045, 0x00010045, 0x00020014, 0x00020014, 0x00020014, 0x00020014, }, - {0x00020025, 0x00020025, 0x00020025, 0x00020025, 0x00020033, 0x00020033, 0x00020033, 0x00020033, 0x00020034, 0x00020034, 0x00020034, 0x00020034, 0x00020035, 0x00020035, 0x00020035, 0x00020035, }, - {0x00020016, 0x00020016, 0x00020016, 0x00020016, 0x00020037, 0x00020037, 0x00020037, 0x00020037, 0x00020047, 0x00020047, 0x00020047, 0x00020047, 0x00020056, 0x00020056, 0x00020056, 0x00020056, }, - {0x000bffff, 0x0009ffff, 0x000affff, 0x0007ffff, 0x0008ffff, 0x00000038, 0x00000048, 0x00000058, 0x00010005, 0x00010005, 0x00010027, 0x00010027, 0x00010055, 0x00010055, 0x00010057, 0x00010057, }, - {0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, }, - {0x00030067, 0x00030067, 0x00030067, 0x00030067, 0x00030067, 0x00030067, 0x00030067, 0x00030067, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, }, - {0x00010018, 0x00010018, 0x0001005a, 0x0001005a, 0x0001006a, 0x0001006a, 0x00010078, 0x00010078, 0x00020006, 0x00020006, 0x00020006, 0x00020006, 0x00020039, 0x00020039, 0x00020039, 0x00020039, }, - {0x00020049, 0x00020049, 0x00020049, 0x00020049, 0x00020059, 0x00020059, 0x00020059, 0x00020059, 0x00020066, 0x00020066, 0x00020066, 0x00020066, 0x00020069, 0x00020069, 0x00020069, 0x00020069, }, - {0x0018ffff, 0x0029ffff, 0x003affff, 0x0010ffff, 0x0011ffff, 0x000fffff, 0x000cffff, 0x000dffff, 0x000effff, 0x00000007, 0x00000029, 0x0000003a, 0x0000004a, 0x00000077, 0x00000079, 0x0000007a, }, - {0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x0003004b, 0x0003004b, 0x0003004b, 0x0003004b, 0x0003004b, 0x0003004b, 0x0003004b, 0x0003004b, }, - {0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003006b, 0x0003006b, 0x0003006b, 0x0003006b, 0x0003006b, 0x0003006b, 0x0003006b, 0x0003006b, }, - {0x00030089, 0x00030089, 0x00030089, 0x00030089, 0x00030089, 0x00030089, 0x00030089, 0x00030089, 0x0003008a, 0x0003008a, 0x0003008a, 0x0003008a, 0x0003008a, 0x0003008a, 0x0003008a, 0x0003008a, }, - {0x00020008, 0x00020008, 0x00020008, 0x00020008, 0x0002002a, 0x0002002a, 0x0002002a, 0x0002002a, 0x0002003b, 0x0002003b, 0x0002003b, 0x0002003b, 0x0002007b, 0x0002007b, 0x0002007b, 0x0002007b, }, - {0x004bffff, 0x0012ffff, 0x0015ffff, 0x0013ffff, 0x0014ffff, 0x0016ffff, 0x0017ffff, 0x0000003c, 0x0000006d, 0x0000007d, 0x0000008d, 0x0000008e, 0x0000009a, 0x0000009b, 0x00010009, 0x00010009, }, - {0x0001001a, 0x0001001a, 0x0001004c, 0x0001004c, 0x0001005c, 0x0001005c, 0x0001006c, 0x0001006c, 0x0001007c, 0x0001007c, 0x00010088, 0x00010088, 0x0001008b, 0x0001008b, 0x0001008c, 0x0001008c, }, - {0x0002011f, 0x0002011f, 0x0002011f, 0x0002011f, 0x00020120, 0x00020120, 0x00020120, 0x00020120, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, }, - {0x0003004d, 0x0003004d, 0x0003004d, 0x0003004d, 0x0003004d, 0x0003004d, 0x0003004d, 0x0003004d, 0x0003005d, 0x0003005d, 0x0003005d, 0x0003005d, 0x0003005d, 0x0003005d, 0x0003005d, 0x0003005d, }, - {0x0003005e, 0x0003005e, 0x0003005e, 0x0003005e, 0x0003005e, 0x0003005e, 0x0003005e, 0x0003005e, 0x00030099, 0x00030099, 0x00030099, 0x00030099, 0x00030099, 0x00030099, 0x00030099, 0x00030099, }, - {0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, }, - {0x0003009c, 0x0003009c, 0x0003009c, 0x0003009c, 0x0003009c, 0x0003009c, 0x0003009c, 0x0003009c, 0x0003009d, 0x0003009d, 0x0003009d, 0x0003009d, 0x0003009d, 0x0003009d, 0x0003009d, 0x0003009d, }, - {0x0003009e, 0x0003009e, 0x0003009e, 0x0003009e, 0x0003009e, 0x0003009e, 0x0003009e, 0x0003009e, 0x000300ac, 0x000300ac, 0x000300ac, 0x000300ac, 0x000300ac, 0x000300ac, 0x000300ac, 0x000300ac, }, - {0x0025ffff, 0x001fffff, 0x0019ffff, 0x0020ffff, 0x001effff, 0x0021ffff, 0x001affff, 0x001bffff, 0x001cffff, 0x001dffff, 0x0022ffff, 0x0023ffff, 0x0024ffff, 0x0026ffff, 0x0027ffff, 0x0028ffff, }, - {0x0002001d, 0x0002001d, 0x0002001d, 0x0002001d, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001f, 0x0002001f, 0x0002001f, 0x0002001f, 0x00020020, 0x00020020, 0x00020020, 0x00020020, }, - {0x00020042, 0x00020042, 0x00020042, 0x00020042, 0x00020043, 0x00020043, 0x00020043, 0x00020043, 0x0002004e, 0x0002004e, 0x0002004e, 0x0002004e, 0x0002004f, 0x0002004f, 0x0002004f, 0x0002004f, }, - {0x00020050, 0x00020050, 0x00020050, 0x00020050, 0x00020051, 0x00020051, 0x00020051, 0x00020051, 0x00020052, 0x00020052, 0x00020052, 0x00020052, 0x00020053, 0x00020053, 0x00020053, 0x00020053, }, - {0x00020054, 0x00020054, 0x00020054, 0x00020054, 0x0002005f, 0x0002005f, 0x0002005f, 0x0002005f, 0x00020060, 0x00020060, 0x00020060, 0x00020060, 0x00020061, 0x00020061, 0x00020061, 0x00020061, }, - {0x00020062, 0x00020062, 0x00020062, 0x00020062, 0x00020063, 0x00020063, 0x00020063, 0x00020063, 0x00020064, 0x00020064, 0x00020064, 0x00020064, 0x00020065, 0x00020065, 0x00020065, 0x00020065, }, - {0x0002002f, 0x0002002f, 0x0002002f, 0x0002002f, 0x00020030, 0x00020030, 0x00020030, 0x00020030, 0x00020031, 0x00020031, 0x00020031, 0x00020031, 0x00020032, 0x00020032, 0x00020032, 0x00020032, }, - {0x0002000e, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000f, 0x0002000f, 0x0002000f, 0x0002000f, 0x00020010, 0x00020010, 0x00020010, 0x00020010, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001b, }, - {0x00020021, 0x00020021, 0x00020021, 0x00020021, 0x0002002c, 0x0002002c, 0x0002002c, 0x0002002c, 0x0002002d, 0x0002002d, 0x0002002d, 0x0002002d, 0x0002002e, 0x0002002e, 0x0002002e, 0x0002002e, }, - {0x0002003e, 0x0002003e, 0x0002003e, 0x0002003e, 0x0002003f, 0x0002003f, 0x0002003f, 0x0002003f, 0x00020040, 0x00020040, 0x00020040, 0x00020040, 0x00020041, 0x00020041, 0x00020041, 0x00020041, }, - {0x0002006e, 0x0002006e, 0x0002006e, 0x0002006e, 0x0002006f, 0x0002006f, 0x0002006f, 0x0002006f, 0x00020070, 0x00020070, 0x00020070, 0x00020070, 0x00020071, 0x00020071, 0x00020071, 0x00020071, }, - {0x00020072, 0x00020072, 0x00020072, 0x00020072, 0x00020073, 0x00020073, 0x00020073, 0x00020073, 0x00020074, 0x00020074, 0x00020074, 0x00020074, 0x00020075, 0x00020075, 0x00020075, 0x00020075, }, - {0x00020076, 0x00020076, 0x00020076, 0x00020076, 0x0002007e, 0x0002007e, 0x0002007e, 0x0002007e, 0x0002007f, 0x0002007f, 0x0002007f, 0x0002007f, 0x00020080, 0x00020080, 0x00020080, 0x00020080, }, - {0x0002000a, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000b, 0x0002000b, 0x0002000b, 0x0002000b, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000d, }, - {0x00020081, 0x00020081, 0x00020081, 0x00020081, 0x00020082, 0x00020082, 0x00020082, 0x00020082, 0x00020083, 0x00020083, 0x00020083, 0x00020083, 0x00020084, 0x00020084, 0x00020084, 0x00020084, }, - {0x00020085, 0x00020085, 0x00020085, 0x00020085, 0x00020086, 0x00020086, 0x00020086, 0x00020086, 0x00020087, 0x00020087, 0x00020087, 0x00020087, 0x0002008f, 0x0002008f, 0x0002008f, 0x0002008f, }, - {0x00020090, 0x00020090, 0x00020090, 0x00020090, 0x00020091, 0x00020091, 0x00020091, 0x00020091, 0x00020092, 0x00020092, 0x00020092, 0x00020092, 0x00020093, 0x00020093, 0x00020093, 0x00020093, }, - {0x002affff, 0x002bffff, 0x002cffff, 0x002dffff, 0x002effff, 0x002fffff, 0x0030ffff, 0x0031ffff, 0x0032ffff, 0x0033ffff, 0x0034ffff, 0x0035ffff, 0x0036ffff, 0x0037ffff, 0x0038ffff, 0x0039ffff, }, - {0x00020094, 0x00020094, 0x00020094, 0x00020094, 0x00020095, 0x00020095, 0x00020095, 0x00020095, 0x00020096, 0x00020096, 0x00020096, 0x00020096, 0x00020097, 0x00020097, 0x00020097, 0x00020097, }, - {0x00020098, 0x00020098, 0x00020098, 0x00020098, 0x0002009f, 0x0002009f, 0x0002009f, 0x0002009f, 0x000200a0, 0x000200a0, 0x000200a0, 0x000200a0, 0x000200a1, 0x000200a1, 0x000200a1, 0x000200a1, }, - {0x000200a2, 0x000200a2, 0x000200a2, 0x000200a2, 0x000200a3, 0x000200a3, 0x000200a3, 0x000200a3, 0x000200a4, 0x000200a4, 0x000200a4, 0x000200a4, 0x000200a5, 0x000200a5, 0x000200a5, 0x000200a5, }, - {0x000200a6, 0x000200a6, 0x000200a6, 0x000200a6, 0x000200a7, 0x000200a7, 0x000200a7, 0x000200a7, 0x000200a8, 0x000200a8, 0x000200a8, 0x000200a8, 0x000200a9, 0x000200a9, 0x000200a9, 0x000200a9, }, - {0x000200aa, 0x000200aa, 0x000200aa, 0x000200aa, 0x000200ab, 0x000200ab, 0x000200ab, 0x000200ab, 0x000200ad, 0x000200ad, 0x000200ad, 0x000200ad, 0x000200ae, 0x000200ae, 0x000200ae, 0x000200ae, }, - {0x000200af, 0x000200af, 0x000200af, 0x000200af, 0x000200b0, 0x000200b0, 0x000200b0, 0x000200b0, 0x000200b1, 0x000200b1, 0x000200b1, 0x000200b1, 0x000200b2, 0x000200b2, 0x000200b2, 0x000200b2, }, - {0x000200b3, 0x000200b3, 0x000200b3, 0x000200b3, 0x000200b4, 0x000200b4, 0x000200b4, 0x000200b4, 0x000200b5, 0x000200b5, 0x000200b5, 0x000200b5, 0x000200b6, 0x000200b6, 0x000200b6, 0x000200b6, }, - {0x000200b7, 0x000200b7, 0x000200b7, 0x000200b7, 0x000200b8, 0x000200b8, 0x000200b8, 0x000200b8, 0x000200b9, 0x000200b9, 0x000200b9, 0x000200b9, 0x000200ba, 0x000200ba, 0x000200ba, 0x000200ba, }, - {0x000200bb, 0x000200bb, 0x000200bb, 0x000200bb, 0x000200bc, 0x000200bc, 0x000200bc, 0x000200bc, 0x000200bd, 0x000200bd, 0x000200bd, 0x000200bd, 0x000200be, 0x000200be, 0x000200be, 0x000200be, }, - {0x000200bf, 0x000200bf, 0x000200bf, 0x000200bf, 0x000200c0, 0x000200c0, 0x000200c0, 0x000200c0, 0x000200c1, 0x000200c1, 0x000200c1, 0x000200c1, 0x000200c2, 0x000200c2, 0x000200c2, 0x000200c2, }, - {0x000200c3, 0x000200c3, 0x000200c3, 0x000200c3, 0x000200c4, 0x000200c4, 0x000200c4, 0x000200c4, 0x000200c5, 0x000200c5, 0x000200c5, 0x000200c5, 0x000200c6, 0x000200c6, 0x000200c6, 0x000200c6, }, - {0x000200c7, 0x000200c7, 0x000200c7, 0x000200c7, 0x000200c8, 0x000200c8, 0x000200c8, 0x000200c8, 0x000200c9, 0x000200c9, 0x000200c9, 0x000200c9, 0x000200ca, 0x000200ca, 0x000200ca, 0x000200ca, }, - {0x000200cb, 0x000200cb, 0x000200cb, 0x000200cb, 0x000200cc, 0x000200cc, 0x000200cc, 0x000200cc, 0x000200cd, 0x000200cd, 0x000200cd, 0x000200cd, 0x000200ce, 0x000200ce, 0x000200ce, 0x000200ce, }, - {0x000200cf, 0x000200cf, 0x000200cf, 0x000200cf, 0x000200d0, 0x000200d0, 0x000200d0, 0x000200d0, 0x000200d1, 0x000200d1, 0x000200d1, 0x000200d1, 0x000200d2, 0x000200d2, 0x000200d2, 0x000200d2, }, - {0x000200d3, 0x000200d3, 0x000200d3, 0x000200d3, 0x000200d4, 0x000200d4, 0x000200d4, 0x000200d4, 0x000200d5, 0x000200d5, 0x000200d5, 0x000200d5, 0x000200d6, 0x000200d6, 0x000200d6, 0x000200d6, }, - {0x000200d7, 0x000200d7, 0x000200d7, 0x000200d7, 0x000200d8, 0x000200d8, 0x000200d8, 0x000200d8, 0x000200d9, 0x000200d9, 0x000200d9, 0x000200d9, 0x000200da, 0x000200da, 0x000200da, 0x000200da, }, - {0x003bffff, 0x003cffff, 0x003dffff, 0x003effff, 0x003fffff, 0x0040ffff, 0x0041ffff, 0x0042ffff, 0x0043ffff, 0x0044ffff, 0x0045ffff, 0x0046ffff, 0x0047ffff, 0x0048ffff, 0x0049ffff, 0x004affff, }, - {0x000200db, 0x000200db, 0x000200db, 0x000200db, 0x000200dc, 0x000200dc, 0x000200dc, 0x000200dc, 0x000200dd, 0x000200dd, 0x000200dd, 0x000200dd, 0x000200de, 0x000200de, 0x000200de, 0x000200de, }, - {0x000200df, 0x000200df, 0x000200df, 0x000200df, 0x000200e0, 0x000200e0, 0x000200e0, 0x000200e0, 0x000200e1, 0x000200e1, 0x000200e1, 0x000200e1, 0x000200e2, 0x000200e2, 0x000200e2, 0x000200e2, }, - {0x000200e3, 0x000200e3, 0x000200e3, 0x000200e3, 0x000200e4, 0x000200e4, 0x000200e4, 0x000200e4, 0x000200e5, 0x000200e5, 0x000200e5, 0x000200e5, 0x000200e6, 0x000200e6, 0x000200e6, 0x000200e6, }, - {0x000200e7, 0x000200e7, 0x000200e7, 0x000200e7, 0x000200e8, 0x000200e8, 0x000200e8, 0x000200e8, 0x000200e9, 0x000200e9, 0x000200e9, 0x000200e9, 0x000200ea, 0x000200ea, 0x000200ea, 0x000200ea, }, - {0x000200eb, 0x000200eb, 0x000200eb, 0x000200eb, 0x000200ec, 0x000200ec, 0x000200ec, 0x000200ec, 0x000200ed, 0x000200ed, 0x000200ed, 0x000200ed, 0x000200ee, 0x000200ee, 0x000200ee, 0x000200ee, }, - {0x000200ef, 0x000200ef, 0x000200ef, 0x000200ef, 0x000200f0, 0x000200f0, 0x000200f0, 0x000200f0, 0x000200f1, 0x000200f1, 0x000200f1, 0x000200f1, 0x000200f2, 0x000200f2, 0x000200f2, 0x000200f2, }, - {0x000200f3, 0x000200f3, 0x000200f3, 0x000200f3, 0x000200f4, 0x000200f4, 0x000200f4, 0x000200f4, 0x000200f5, 0x000200f5, 0x000200f5, 0x000200f5, 0x000200f6, 0x000200f6, 0x000200f6, 0x000200f6, }, - {0x000200f7, 0x000200f7, 0x000200f7, 0x000200f7, 0x000200f8, 0x000200f8, 0x000200f8, 0x000200f8, 0x000200f9, 0x000200f9, 0x000200f9, 0x000200f9, 0x000200fa, 0x000200fa, 0x000200fa, 0x000200fa, }, - {0x000200fb, 0x000200fb, 0x000200fb, 0x000200fb, 0x000200fc, 0x000200fc, 0x000200fc, 0x000200fc, 0x000200fd, 0x000200fd, 0x000200fd, 0x000200fd, 0x000200fe, 0x000200fe, 0x000200fe, 0x000200fe, }, - {0x000200ff, 0x000200ff, 0x000200ff, 0x000200ff, 0x00020100, 0x00020100, 0x00020100, 0x00020100, 0x00020101, 0x00020101, 0x00020101, 0x00020101, 0x00020102, 0x00020102, 0x00020102, 0x00020102, }, - {0x00020103, 0x00020103, 0x00020103, 0x00020103, 0x00020104, 0x00020104, 0x00020104, 0x00020104, 0x00020105, 0x00020105, 0x00020105, 0x00020105, 0x00020106, 0x00020106, 0x00020106, 0x00020106, }, - {0x00020107, 0x00020107, 0x00020107, 0x00020107, 0x00020108, 0x00020108, 0x00020108, 0x00020108, 0x00020109, 0x00020109, 0x00020109, 0x00020109, 0x0002010a, 0x0002010a, 0x0002010a, 0x0002010a, }, - {0x0002010b, 0x0002010b, 0x0002010b, 0x0002010b, 0x0002010c, 0x0002010c, 0x0002010c, 0x0002010c, 0x0002010d, 0x0002010d, 0x0002010d, 0x0002010d, 0x0002010e, 0x0002010e, 0x0002010e, 0x0002010e, }, - {0x0002010f, 0x0002010f, 0x0002010f, 0x0002010f, 0x00020110, 0x00020110, 0x00020110, 0x00020110, 0x00020111, 0x00020111, 0x00020111, 0x00020111, 0x00020112, 0x00020112, 0x00020112, 0x00020112, }, - {0x00020113, 0x00020113, 0x00020113, 0x00020113, 0x00020114, 0x00020114, 0x00020114, 0x00020114, 0x00020115, 0x00020115, 0x00020115, 0x00020115, 0x00020116, 0x00020116, 0x00020116, 0x00020116, }, - {0x00020117, 0x00020117, 0x00020117, 0x00020117, 0x00020118, 0x00020118, 0x00020118, 0x00020118, 0x00020119, 0x00020119, 0x00020119, 0x00020119, 0x0002011a, 0x0002011a, 0x0002011a, 0x0002011a, }, - {0x0002011b, 0x0002011b, 0x0002011b, 0x0002011b, 0x0002011c, 0x0002011c, 0x0002011c, 0x0002011c, 0x0002011d, 0x0002011d, 0x0002011d, 0x0002011d, 0x0002011e, 0x0002011e, 0x0002011e, 0x0002011e, }, -}; - -const uint32_t c_aauiCQMFHuffEnc13[324][2] = -{ - {0x0004, 0x0006}, {0x0004, 0x0007}, {0x0005, 0x0005}, {0x0005, 0x0006}, {0x0006, 0x0004}, {0x0008, 0x0005}, {0x000a, 0x0005}, {0x000c, 0x0007}, - {0x000e, 0x000b}, {0x0010, 0x0011}, {0x0012, 0x002d}, {0x0015, 0x0000}, {0x0014, 0x0035}, {0x0015, 0x0001}, {0x0015, 0x0002}, {0x0015, 0x0003}, - {0x0015, 0x0004}, {0x0015, 0x0005}, {0x0004, 0x0008}, {0x0003, 0x0007}, {0x0004, 0x0009}, {0x0004, 0x000a}, {0x0006, 0x0005}, {0x0008, 0x0006}, - {0x0009, 0x0006}, {0x000c, 0x0008}, {0x000d, 0x0009}, {0x0010, 0x0012}, {0x0011, 0x001a}, {0x0015, 0x0006}, {0x0015, 0x0007}, {0x0015, 0x0008}, - {0x0015, 0x0009}, {0x0015, 0x000a}, {0x0015, 0x000b}, {0x0015, 0x000c}, {0x0005, 0x0007}, {0x0004, 0x000b}, {0x0004, 0x000c}, {0x0005, 0x0008}, - {0x0006, 0x0006}, {0x0008, 0x0007}, {0x000a, 0x0006}, {0x000c, 0x0009}, {0x000e, 0x000c}, {0x0010, 0x0013}, {0x0012, 0x002e}, {0x0015, 0x000d}, - {0x0015, 0x000e}, {0x0015, 0x000f}, {0x0015, 0x0010}, {0x0015, 0x0011}, {0x0015, 0x0012}, {0x0015, 0x0013}, {0x0005, 0x0009}, {0x0004, 0x000d}, - {0x0005, 0x000a}, {0x0006, 0x0007}, {0x0007, 0x0005}, {0x0009, 0x0007}, {0x000b, 0x0008}, {0x000d, 0x000a}, {0x000f, 0x000e}, {0x0010, 0x0014}, - {0x0011, 0x001b}, {0x0014, 0x0036}, {0x0015, 0x0014}, {0x0015, 0x0015}, {0x0015, 0x0016}, {0x0015, 0x0017}, {0x0015, 0x0018}, {0x0015, 0x0019}, - {0x0006, 0x0008}, {0x0005, 0x000b}, {0x0006, 0x0009}, {0x0007, 0x0006}, {0x0009, 0x0008}, {0x000a, 0x0007}, {0x000c, 0x000a}, {0x000e, 0x000d}, - {0x0010, 0x0015}, {0x0011, 0x001c}, {0x0013, 0x0053}, {0x0015, 0x001a}, {0x0015, 0x001b}, {0x0015, 0x001c}, {0x0015, 0x001d}, {0x0015, 0x001e}, - {0x0015, 0x001f}, {0x0015, 0x0020}, {0x0008, 0x0008}, {0x0007, 0x0007}, {0x0008, 0x0009}, {0x0009, 0x0009}, {0x000a, 0x0008}, {0x000c, 0x000b}, - {0x000d, 0x000b}, {0x000f, 0x000f}, {0x0010, 0x0016}, {0x0011, 0x001d}, {0x0014, 0x0037}, {0x0015, 0x0021}, {0x0015, 0x0022}, {0x0015, 0x0023}, - {0x0015, 0x0024}, {0x0015, 0x0025}, {0x0015, 0x0026}, {0x0015, 0x0027}, {0x000a, 0x0009}, {0x000a, 0x000a}, {0x000a, 0x000b}, {0x000b, 0x0009}, - {0x000c, 0x000c}, {0x000d, 0x000c}, {0x000f, 0x0010}, {0x0010, 0x0017}, {0x0012, 0x002f}, {0x0015, 0x0028}, {0x0015, 0x0029}, {0x0015, 0x002a}, - {0x0015, 0x002b}, {0x0015, 0x002c}, {0x0015, 0x002d}, {0x0015, 0x002e}, {0x0015, 0x002f}, {0x0015, 0x0030}, {0x000c, 0x000d}, {0x000c, 0x000e}, - {0x000c, 0x000f}, {0x000d, 0x000d}, {0x000e, 0x000e}, {0x000f, 0x0011}, {0x0010, 0x0018}, {0x0011, 0x001e}, {0x0014, 0x0038}, {0x0015, 0x0031}, - {0x0015, 0x0032}, {0x0015, 0x0033}, {0x0015, 0x0034}, {0x0015, 0x0035}, {0x0015, 0x0036}, {0x0015, 0x0037}, {0x0015, 0x0038}, {0x0015, 0x0039}, - {0x000f, 0x0012}, {0x000e, 0x000f}, {0x000e, 0x0010}, {0x000e, 0x0011}, {0x000f, 0x0013}, {0x0010, 0x0019}, {0x0011, 0x001f}, {0x0013, 0x0054}, - {0x0015, 0x003a}, {0x0014, 0x0039}, {0x0015, 0x003b}, {0x0015, 0x003c}, {0x0015, 0x003d}, {0x0015, 0x003e}, {0x0015, 0x003f}, {0x0015, 0x0040}, - {0x0015, 0x0041}, {0x0015, 0x0042}, {0x0010, 0x001a}, {0x000f, 0x0014}, {0x000f, 0x0015}, {0x0010, 0x001b}, {0x0011, 0x0020}, {0x0012, 0x0030}, - {0x0013, 0x0055}, {0x0015, 0x0043}, {0x0015, 0x0044}, {0x0014, 0x003a}, {0x0015, 0x0045}, {0x0015, 0x0046}, {0x0015, 0x0047}, {0x0015, 0x0048}, - {0x0015, 0x0049}, {0x0015, 0x004a}, {0x0015, 0x004b}, {0x0015, 0x004c}, {0x0012, 0x0031}, {0x0011, 0x0021}, {0x0013, 0x0056}, {0x0013, 0x0057}, - {0x0012, 0x0032}, {0x0015, 0x004d}, {0x0015, 0x004e}, {0x0015, 0x004f}, {0x0015, 0x0050}, {0x0015, 0x0051}, {0x0015, 0x0052}, {0x0015, 0x0053}, - {0x0015, 0x0054}, {0x0015, 0x0055}, {0x0015, 0x0056}, {0x0015, 0x0057}, {0x0015, 0x0058}, {0x0015, 0x0059}, {0x0015, 0x005a}, {0x0014, 0x003b}, - {0x0012, 0x0033}, {0x0013, 0x0058}, {0x0013, 0x0059}, {0x0015, 0x005b}, {0x0015, 0x005c}, {0x0015, 0x005d}, {0x0015, 0x005e}, {0x0015, 0x005f}, - {0x0015, 0x0060}, {0x0015, 0x0061}, {0x0015, 0x0062}, {0x0015, 0x0063}, {0x0015, 0x0064}, {0x0015, 0x0065}, {0x0015, 0x0066}, {0x0015, 0x0067}, - {0x0015, 0x0068}, {0x0015, 0x0069}, {0x0014, 0x003c}, {0x0014, 0x003d}, {0x0014, 0x003e}, {0x0014, 0x003f}, {0x0014, 0x0040}, {0x0014, 0x0041}, - {0x0014, 0x0042}, {0x0014, 0x0043}, {0x0014, 0x0044}, {0x0014, 0x0045}, {0x0014, 0x0046}, {0x0014, 0x0047}, {0x0014, 0x0048}, {0x0014, 0x0049}, - {0x0014, 0x004a}, {0x0014, 0x004b}, {0x0014, 0x004c}, {0x0014, 0x004d}, {0x0014, 0x004e}, {0x0014, 0x004f}, {0x0014, 0x0050}, {0x0014, 0x0051}, - {0x0014, 0x0052}, {0x0014, 0x0053}, {0x0014, 0x0054}, {0x0014, 0x0055}, {0x0014, 0x0056}, {0x0014, 0x0057}, {0x0014, 0x0058}, {0x0014, 0x0059}, - {0x0014, 0x005a}, {0x0014, 0x005b}, {0x0014, 0x005c}, {0x0014, 0x005d}, {0x0014, 0x005e}, {0x0014, 0x005f}, {0x0014, 0x0060}, {0x0014, 0x0061}, - {0x0014, 0x0062}, {0x0014, 0x0063}, {0x0014, 0x0064}, {0x0014, 0x0065}, {0x0014, 0x0066}, {0x0014, 0x0067}, {0x0014, 0x0068}, {0x0014, 0x0069}, - {0x0014, 0x006a}, {0x0014, 0x006b}, {0x0014, 0x006c}, {0x0014, 0x006d}, {0x0014, 0x006e}, {0x0014, 0x006f}, {0x0014, 0x0070}, {0x0014, 0x0071}, - {0x0014, 0x0072}, {0x0014, 0x0073}, {0x0014, 0x0074}, {0x0014, 0x0075}, {0x0014, 0x0076}, {0x0014, 0x0077}, {0x0014, 0x0078}, {0x0014, 0x0079}, - {0x0014, 0x007a}, {0x0014, 0x007b}, {0x0014, 0x007c}, {0x0014, 0x007d}, {0x0014, 0x007e}, {0x0014, 0x007f}, {0x0014, 0x0080}, {0x0014, 0x0081}, - {0x0014, 0x0082}, {0x0014, 0x0083}, {0x0014, 0x0084}, {0x0014, 0x0085}, {0x0014, 0x0086}, {0x0014, 0x0087}, {0x0014, 0x0088}, {0x0014, 0x0089}, - {0x0014, 0x008a}, {0x0014, 0x008b}, {0x0014, 0x008c}, {0x0014, 0x008d}, {0x0014, 0x008e}, {0x0014, 0x008f}, {0x0014, 0x0090}, {0x0014, 0x0091}, - {0x0014, 0x0092}, {0x0014, 0x0093}, {0x0014, 0x0094}, {0x0014, 0x0095}, {0x0014, 0x0096}, {0x0014, 0x0097}, {0x0014, 0x0098}, {0x0014, 0x0099}, - {0x0014, 0x009a}, {0x0014, 0x009b}, {0x0014, 0x009c}, {0x0014, 0x009d}, {0x0014, 0x009e}, {0x0014, 0x009f}, {0x0014, 0x00a0}, {0x0014, 0x00a1}, - {0x0014, 0x00a2}, {0x0014, 0x00a3}, {0x0014, 0x00a4}, {0x0014, 0x00a5}, - -}; - -const uint32_t c_aauiCQMFHuffDec13[89][16] = -{ - {0x0006ffff, 0x0005ffff, 0x0001ffff, 0x0002ffff, 0x0003ffff, 0x0004ffff, 0x00000000, 0x00000001, 0x00000012, 0x00000014, 0x00000015, 0x00000025, 0x00000026, 0x00000037, 0x00010013, 0x00010013, }, - {0x00020048, 0x00020048, 0x00020048, 0x00020048, 0x0002004a, 0x0002004a, 0x0002004a, 0x0002004a, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, }, - {0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, }, - {0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, }, - {0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, }, - {0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020016, 0x00020016, 0x00020016, 0x00020016, 0x00020028, 0x00020028, 0x00020028, 0x00020028, 0x00020039, 0x00020039, 0x00020039, 0x00020039, }, - {0x000bffff, 0x0009ffff, 0x000affff, 0x0007ffff, 0x0008ffff, 0x00000005, 0x00000017, 0x00000029, 0x0000005a, 0x0000005c, 0x0001003a, 0x0001003a, 0x0001004b, 0x0001004b, 0x0001005b, 0x0001005b, }, - {0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, }, - {0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003005d, 0x0003005d, 0x0003005d, 0x0003005d, 0x0003005d, 0x0003005d, 0x0003005d, 0x0003005d, }, - {0x0001003c, 0x0001003c, 0x0001006f, 0x0001006f, 0x00020006, 0x00020006, 0x00020006, 0x00020006, 0x0002002a, 0x0002002a, 0x0002002a, 0x0002002a, 0x0002004d, 0x0002004d, 0x0002004d, 0x0002004d, }, - {0x0002005e, 0x0002005e, 0x0002005e, 0x0002005e, 0x0002006c, 0x0002006c, 0x0002006c, 0x0002006c, 0x0002006d, 0x0002006d, 0x0002006d, 0x0002006d, 0x0002006e, 0x0002006e, 0x0002006e, 0x0002006e, }, - {0x0012ffff, 0x0011ffff, 0x0010ffff, 0x000fffff, 0x000dffff, 0x000cffff, 0x000effff, 0x00000007, 0x00000019, 0x0000002b, 0x0000004e, 0x0000005f, 0x00000070, 0x0000007e, 0x0000007f, 0x00000080, }, - {0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x00030060, 0x00030060, 0x00030060, 0x00030060, 0x00030060, 0x00030060, 0x00030060, 0x00030060, }, - {0x00020092, 0x00020092, 0x00020092, 0x00020092, 0x00020093, 0x00020093, 0x00020093, 0x00020093, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, }, - {0x00030071, 0x00030071, 0x00030071, 0x00030071, 0x00030071, 0x00030071, 0x00030071, 0x00030071, 0x00030081, 0x00030081, 0x00030081, 0x00030081, 0x00030081, 0x00030081, 0x00030081, 0x00030081, }, - {0x0002002c, 0x0002002c, 0x0002002c, 0x0002002c, 0x0002004f, 0x0002004f, 0x0002004f, 0x0002004f, 0x00020082, 0x00020082, 0x00020082, 0x00020082, 0x00020091, 0x00020091, 0x00020091, 0x00020091, }, - {0x00010072, 0x00010072, 0x00010083, 0x00010083, 0x00010090, 0x00010090, 0x00010094, 0x00010094, 0x000100a3, 0x000100a3, 0x000100a4, 0x000100a4, 0x00020008, 0x00020008, 0x00020008, 0x00020008, }, - {0x0016ffff, 0x00000009, 0x0000001b, 0x0000002d, 0x0000003f, 0x00000050, 0x00000062, 0x00000073, 0x00000084, 0x00000095, 0x000000a2, 0x000000a5, 0x0001003e, 0x0001003e, 0x00010061, 0x00010061, }, - {0x0021ffff, 0x0024ffff, 0x003dffff, 0x001affff, 0x001bffff, 0x001cffff, 0x001dffff, 0x001effff, 0x001fffff, 0x0020ffff, 0x0019ffff, 0x0017ffff, 0x0018ffff, 0x0013ffff, 0x0014ffff, 0x0015ffff, }, - {0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x00030040, 0x00030040, 0x00030040, 0x00030040, 0x00030040, 0x00030040, 0x00030040, 0x00030040, }, - {0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030063, 0x00030063, 0x00030063, 0x00030063, 0x00030063, 0x00030063, 0x00030063, 0x00030063, }, - {0x00030085, 0x00030085, 0x00030085, 0x00030085, 0x00030085, 0x00030085, 0x00030085, 0x00030085, 0x00030096, 0x00030096, 0x00030096, 0x00030096, 0x00030096, 0x00030096, 0x00030096, 0x00030096, }, - {0x000300a6, 0x000300a6, 0x000300a6, 0x000300a6, 0x000300a6, 0x000300a6, 0x000300a6, 0x000300a6, 0x000300b5, 0x000300b5, 0x000300b5, 0x000300b5, 0x000300b5, 0x000300b5, 0x000300b5, 0x000300b5, }, - {0x000100c9, 0x000100c9, 0x000100ca, 0x000100ca, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002002e, 0x0002002e, 0x0002002e, 0x0002002e, 0x00020074, 0x00020074, 0x00020074, 0x00020074, }, - {0x000200a7, 0x000200a7, 0x000200a7, 0x000200a7, 0x000200b4, 0x000200b4, 0x000200b4, 0x000200b4, 0x000200b8, 0x000200b8, 0x000200b8, 0x000200b8, 0x000200c8, 0x000200c8, 0x000200c8, 0x000200c8, }, - {0x0000013e, 0x0000013f, 0x00000140, 0x00000141, 0x00000142, 0x00000143, 0x00010052, 0x00010052, 0x00010097, 0x00010097, 0x000100a8, 0x000100a8, 0x000100b6, 0x000100b6, 0x000100b7, 0x000100b7, }, - {0x0054ffff, 0x0055ffff, 0x0056ffff, 0x0057ffff, 0x0058ffff, 0x0000000c, 0x00000041, 0x00000064, 0x00000086, 0x00000099, 0x000000ab, 0x000000c7, 0x000000da, 0x000000db, 0x000000dc, 0x000000dd, }, - {0x000000de, 0x000000df, 0x000000e0, 0x000000e1, 0x000000e2, 0x000000e3, 0x000000e4, 0x000000e5, 0x000000e6, 0x000000e7, 0x000000e8, 0x000000e9, 0x000000ea, 0x000000eb, 0x000000ec, 0x000000ed, }, - {0x000000ee, 0x000000ef, 0x000000f0, 0x000000f1, 0x000000f2, 0x000000f3, 0x000000f4, 0x000000f5, 0x000000f6, 0x000000f7, 0x000000f8, 0x000000f9, 0x000000fa, 0x000000fb, 0x000000fc, 0x000000fd, }, - {0x000000fe, 0x000000ff, 0x00000100, 0x00000101, 0x00000102, 0x00000103, 0x00000104, 0x00000105, 0x00000106, 0x00000107, 0x00000108, 0x00000109, 0x0000010a, 0x0000010b, 0x0000010c, 0x0000010d, }, - {0x0000010e, 0x0000010f, 0x00000110, 0x00000111, 0x00000112, 0x00000113, 0x00000114, 0x00000115, 0x00000116, 0x00000117, 0x00000118, 0x00000119, 0x0000011a, 0x0000011b, 0x0000011c, 0x0000011d, }, - {0x0000011e, 0x0000011f, 0x00000120, 0x00000121, 0x00000122, 0x00000123, 0x00000124, 0x00000125, 0x00000126, 0x00000127, 0x00000128, 0x00000129, 0x0000012a, 0x0000012b, 0x0000012c, 0x0000012d, }, - {0x0000012e, 0x0000012f, 0x00000130, 0x00000131, 0x00000132, 0x00000133, 0x00000134, 0x00000135, 0x00000136, 0x00000137, 0x00000138, 0x00000139, 0x0000013a, 0x0000013b, 0x0000013c, 0x0000013d, }, - {0x0026ffff, 0x002dffff, 0x0037ffff, 0x0023ffff, 0x0044ffff, 0x002effff, 0x003affff, 0x0022ffff, 0x002cffff, 0x0035ffff, 0x002fffff, 0x0036ffff, 0x0040ffff, 0x0049ffff, 0x0030ffff, 0x0038ffff, }, - {0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, }, - {0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, }, - {0x0041ffff, 0x004affff, 0x0042ffff, 0x0025ffff, 0x0027ffff, 0x0028ffff, 0x0029ffff, 0x002affff, 0x002bffff, 0x0031ffff, 0x0032ffff, 0x0033ffff, 0x0034ffff, 0x0039ffff, 0x003bffff, 0x003cffff, }, - {0x0003006a, 0x0003006a, 0x0003006a, 0x0003006a, 0x0003006a, 0x0003006a, 0x0003006a, 0x0003006a, 0x0003006b, 0x0003006b, 0x0003006b, 0x0003006b, 0x0003006b, 0x0003006b, 0x0003006b, 0x0003006b, }, - {0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, }, - {0x00030075, 0x00030075, 0x00030075, 0x00030075, 0x00030075, 0x00030075, 0x00030075, 0x00030075, 0x00030076, 0x00030076, 0x00030076, 0x00030076, 0x00030076, 0x00030076, 0x00030076, 0x00030076, }, - {0x00030077, 0x00030077, 0x00030077, 0x00030077, 0x00030077, 0x00030077, 0x00030077, 0x00030077, 0x00030078, 0x00030078, 0x00030078, 0x00030078, 0x00030078, 0x00030078, 0x00030078, 0x00030078, }, - {0x00030079, 0x00030079, 0x00030079, 0x00030079, 0x00030079, 0x00030079, 0x00030079, 0x00030079, 0x0003007a, 0x0003007a, 0x0003007a, 0x0003007a, 0x0003007a, 0x0003007a, 0x0003007a, 0x0003007a, }, - {0x0003007b, 0x0003007b, 0x0003007b, 0x0003007b, 0x0003007b, 0x0003007b, 0x0003007b, 0x0003007b, 0x0003007c, 0x0003007c, 0x0003007c, 0x0003007c, 0x0003007c, 0x0003007c, 0x0003007c, 0x0003007c, }, - {0x0003007d, 0x0003007d, 0x0003007d, 0x0003007d, 0x0003007d, 0x0003007d, 0x0003007d, 0x0003007d, 0x00030087, 0x00030087, 0x00030087, 0x00030087, 0x00030087, 0x00030087, 0x00030087, 0x00030087, }, - {0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, }, - {0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, }, - {0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, }, - {0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, }, - {0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030056, 0x00030056, 0x00030056, 0x00030056, 0x00030056, 0x00030056, 0x00030056, 0x00030056, }, - {0x00030088, 0x00030088, 0x00030088, 0x00030088, 0x00030088, 0x00030088, 0x00030088, 0x00030088, 0x00030089, 0x00030089, 0x00030089, 0x00030089, 0x00030089, 0x00030089, 0x00030089, 0x00030089, }, - {0x0003008a, 0x0003008a, 0x0003008a, 0x0003008a, 0x0003008a, 0x0003008a, 0x0003008a, 0x0003008a, 0x0003008b, 0x0003008b, 0x0003008b, 0x0003008b, 0x0003008b, 0x0003008b, 0x0003008b, 0x0003008b, }, - {0x0003008c, 0x0003008c, 0x0003008c, 0x0003008c, 0x0003008c, 0x0003008c, 0x0003008c, 0x0003008c, 0x0003008d, 0x0003008d, 0x0003008d, 0x0003008d, 0x0003008d, 0x0003008d, 0x0003008d, 0x0003008d, }, - {0x0003008e, 0x0003008e, 0x0003008e, 0x0003008e, 0x0003008e, 0x0003008e, 0x0003008e, 0x0003008e, 0x0003008f, 0x0003008f, 0x0003008f, 0x0003008f, 0x0003008f, 0x0003008f, 0x0003008f, 0x0003008f, }, - {0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, }, - {0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, }, - {0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, }, - {0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, }, - {0x00030098, 0x00030098, 0x00030098, 0x00030098, 0x00030098, 0x00030098, 0x00030098, 0x00030098, 0x0003009a, 0x0003009a, 0x0003009a, 0x0003009a, 0x0003009a, 0x0003009a, 0x0003009a, 0x0003009a, }, - {0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, }, - {0x0003009b, 0x0003009b, 0x0003009b, 0x0003009b, 0x0003009b, 0x0003009b, 0x0003009b, 0x0003009b, 0x0003009c, 0x0003009c, 0x0003009c, 0x0003009c, 0x0003009c, 0x0003009c, 0x0003009c, 0x0003009c, }, - {0x0003009d, 0x0003009d, 0x0003009d, 0x0003009d, 0x0003009d, 0x0003009d, 0x0003009d, 0x0003009d, 0x0003009e, 0x0003009e, 0x0003009e, 0x0003009e, 0x0003009e, 0x0003009e, 0x0003009e, 0x0003009e, }, - {0x003effff, 0x003fffff, 0x0043ffff, 0x0045ffff, 0x0046ffff, 0x0047ffff, 0x0048ffff, 0x004bffff, 0x004cffff, 0x004dffff, 0x004effff, 0x004fffff, 0x0050ffff, 0x0051ffff, 0x0052ffff, 0x0053ffff, }, - {0x0003009f, 0x0003009f, 0x0003009f, 0x0003009f, 0x0003009f, 0x0003009f, 0x0003009f, 0x0003009f, 0x000300a0, 0x000300a0, 0x000300a0, 0x000300a0, 0x000300a0, 0x000300a0, 0x000300a0, 0x000300a0, }, - {0x000300a1, 0x000300a1, 0x000300a1, 0x000300a1, 0x000300a1, 0x000300a1, 0x000300a1, 0x000300a1, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, }, - {0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, }, - {0x00030059, 0x00030059, 0x00030059, 0x00030059, 0x00030059, 0x00030059, 0x00030059, 0x00030059, 0x00030065, 0x00030065, 0x00030065, 0x00030065, 0x00030065, 0x00030065, 0x00030065, 0x00030065, }, - {0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030069, 0x00030069, 0x00030069, 0x00030069, 0x00030069, 0x00030069, 0x00030069, 0x00030069, }, - {0x000300aa, 0x000300aa, 0x000300aa, 0x000300aa, 0x000300aa, 0x000300aa, 0x000300aa, 0x000300aa, 0x000300ac, 0x000300ac, 0x000300ac, 0x000300ac, 0x000300ac, 0x000300ac, 0x000300ac, 0x000300ac, }, - {0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, }, - {0x000300ad, 0x000300ad, 0x000300ad, 0x000300ad, 0x000300ad, 0x000300ad, 0x000300ad, 0x000300ad, 0x000300ae, 0x000300ae, 0x000300ae, 0x000300ae, 0x000300ae, 0x000300ae, 0x000300ae, 0x000300ae, }, - {0x000300af, 0x000300af, 0x000300af, 0x000300af, 0x000300af, 0x000300af, 0x000300af, 0x000300af, 0x000300b0, 0x000300b0, 0x000300b0, 0x000300b0, 0x000300b0, 0x000300b0, 0x000300b0, 0x000300b0, }, - {0x000300b1, 0x000300b1, 0x000300b1, 0x000300b1, 0x000300b1, 0x000300b1, 0x000300b1, 0x000300b1, 0x000300b2, 0x000300b2, 0x000300b2, 0x000300b2, 0x000300b2, 0x000300b2, 0x000300b2, 0x000300b2, }, - {0x000300b3, 0x000300b3, 0x000300b3, 0x000300b3, 0x000300b3, 0x000300b3, 0x000300b3, 0x000300b3, 0x000300b9, 0x000300b9, 0x000300b9, 0x000300b9, 0x000300b9, 0x000300b9, 0x000300b9, 0x000300b9, }, - {0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, }, - {0x00030066, 0x00030066, 0x00030066, 0x00030066, 0x00030066, 0x00030066, 0x00030066, 0x00030066, 0x00030067, 0x00030067, 0x00030067, 0x00030067, 0x00030067, 0x00030067, 0x00030067, 0x00030067, }, - {0x000300ba, 0x000300ba, 0x000300ba, 0x000300ba, 0x000300ba, 0x000300ba, 0x000300ba, 0x000300ba, 0x000300bb, 0x000300bb, 0x000300bb, 0x000300bb, 0x000300bb, 0x000300bb, 0x000300bb, 0x000300bb, }, - {0x000300bc, 0x000300bc, 0x000300bc, 0x000300bc, 0x000300bc, 0x000300bc, 0x000300bc, 0x000300bc, 0x000300bd, 0x000300bd, 0x000300bd, 0x000300bd, 0x000300bd, 0x000300bd, 0x000300bd, 0x000300bd, }, - {0x000300be, 0x000300be, 0x000300be, 0x000300be, 0x000300be, 0x000300be, 0x000300be, 0x000300be, 0x000300bf, 0x000300bf, 0x000300bf, 0x000300bf, 0x000300bf, 0x000300bf, 0x000300bf, 0x000300bf, }, - {0x000300c0, 0x000300c0, 0x000300c0, 0x000300c0, 0x000300c0, 0x000300c0, 0x000300c0, 0x000300c0, 0x000300c1, 0x000300c1, 0x000300c1, 0x000300c1, 0x000300c1, 0x000300c1, 0x000300c1, 0x000300c1, }, - {0x000300c2, 0x000300c2, 0x000300c2, 0x000300c2, 0x000300c2, 0x000300c2, 0x000300c2, 0x000300c2, 0x000300c3, 0x000300c3, 0x000300c3, 0x000300c3, 0x000300c3, 0x000300c3, 0x000300c3, 0x000300c3, }, - {0x000300c4, 0x000300c4, 0x000300c4, 0x000300c4, 0x000300c4, 0x000300c4, 0x000300c4, 0x000300c4, 0x000300c5, 0x000300c5, 0x000300c5, 0x000300c5, 0x000300c5, 0x000300c5, 0x000300c5, 0x000300c5, }, - {0x000300c6, 0x000300c6, 0x000300c6, 0x000300c6, 0x000300c6, 0x000300c6, 0x000300c6, 0x000300c6, 0x000300cb, 0x000300cb, 0x000300cb, 0x000300cb, 0x000300cb, 0x000300cb, 0x000300cb, 0x000300cb, }, - {0x000300cc, 0x000300cc, 0x000300cc, 0x000300cc, 0x000300cc, 0x000300cc, 0x000300cc, 0x000300cc, 0x000300cd, 0x000300cd, 0x000300cd, 0x000300cd, 0x000300cd, 0x000300cd, 0x000300cd, 0x000300cd, }, - {0x000300ce, 0x000300ce, 0x000300ce, 0x000300ce, 0x000300ce, 0x000300ce, 0x000300ce, 0x000300ce, 0x000300cf, 0x000300cf, 0x000300cf, 0x000300cf, 0x000300cf, 0x000300cf, 0x000300cf, 0x000300cf, }, - {0x000300d0, 0x000300d0, 0x000300d0, 0x000300d0, 0x000300d0, 0x000300d0, 0x000300d0, 0x000300d0, 0x000300d1, 0x000300d1, 0x000300d1, 0x000300d1, 0x000300d1, 0x000300d1, 0x000300d1, 0x000300d1, }, - {0x000300d2, 0x000300d2, 0x000300d2, 0x000300d2, 0x000300d2, 0x000300d2, 0x000300d2, 0x000300d2, 0x000300d3, 0x000300d3, 0x000300d3, 0x000300d3, 0x000300d3, 0x000300d3, 0x000300d3, 0x000300d3, }, - {0x000300d4, 0x000300d4, 0x000300d4, 0x000300d4, 0x000300d4, 0x000300d4, 0x000300d4, 0x000300d4, 0x000300d5, 0x000300d5, 0x000300d5, 0x000300d5, 0x000300d5, 0x000300d5, 0x000300d5, 0x000300d5, }, - {0x000300d6, 0x000300d6, 0x000300d6, 0x000300d6, 0x000300d6, 0x000300d6, 0x000300d6, 0x000300d6, 0x000300d7, 0x000300d7, 0x000300d7, 0x000300d7, 0x000300d7, 0x000300d7, 0x000300d7, 0x000300d7, }, - {0x000300d8, 0x000300d8, 0x000300d8, 0x000300d8, 0x000300d8, 0x000300d8, 0x000300d8, 0x000300d8, 0x000300d9, 0x000300d9, 0x000300d9, 0x000300d9, 0x000300d9, 0x000300d9, 0x000300d9, 0x000300d9, }, -}; - -const uint32_t c_aauiCQMFHuffEnc14[400][2] = -{ - {0x0005, 0x0007}, {0x0004, 0x0009}, {0x0005, 0x0008}, {0x0005, 0x0009}, {0x0006, 0x0006}, {0x0007, 0x0006}, {0x0009, 0x0007}, {0x000b, 0x0008}, - {0x000d, 0x000c}, {0x000f, 0x0013}, {0x0010, 0x001b}, {0x0013, 0x0082}, {0x0013, 0x0083}, {0x0014, 0x0000}, {0x0014, 0x0001}, {0x0014, 0x0002}, - {0x0014, 0x0003}, {0x0014, 0x0004}, {0x0014, 0x0005}, {0x0014, 0x0006}, {0x0004, 0x000a}, {0x0004, 0x000b}, {0x0004, 0x000c}, {0x0005, 0x000a}, - {0x0005, 0x000b}, {0x0006, 0x0007}, {0x0008, 0x0006}, {0x000a, 0x0007}, {0x000c, 0x000a}, {0x000e, 0x000e}, {0x000f, 0x0014}, {0x0011, 0x002a}, - {0x0012, 0x004a}, {0x0013, 0x0084}, {0x0014, 0x0007}, {0x0014, 0x0008}, {0x0014, 0x0009}, {0x0014, 0x000a}, {0x0014, 0x000b}, {0x0014, 0x000c}, - {0x0005, 0x000c}, {0x0004, 0x000d}, {0x0004, 0x000e}, {0x0005, 0x000d}, {0x0006, 0x0008}, {0x0007, 0x0007}, {0x0008, 0x0007}, {0x000a, 0x0008}, - {0x000c, 0x000b}, {0x000e, 0x000f}, {0x000f, 0x0015}, {0x0012, 0x004b}, {0x0013, 0x0085}, {0x0014, 0x000d}, {0x0014, 0x000e}, {0x0014, 0x000f}, - {0x0014, 0x0010}, {0x0014, 0x0011}, {0x0014, 0x0012}, {0x0014, 0x0013}, {0x0005, 0x000e}, {0x0004, 0x000f}, {0x0005, 0x000f}, {0x0005, 0x0010}, - {0x0006, 0x0009}, {0x0008, 0x0008}, {0x0009, 0x0008}, {0x000b, 0x0009}, {0x000d, 0x000d}, {0x000e, 0x0010}, {0x0010, 0x001c}, {0x0011, 0x002b}, - {0x0014, 0x0014}, {0x0014, 0x0015}, {0x0014, 0x0016}, {0x0014, 0x0017}, {0x0014, 0x0018}, {0x0014, 0x0019}, {0x0014, 0x001a}, {0x0014, 0x001b}, - {0x0006, 0x000a}, {0x0005, 0x0011}, {0x0006, 0x000b}, {0x0006, 0x000c}, {0x0007, 0x0008}, {0x0008, 0x0009}, {0x000a, 0x0009}, {0x000c, 0x000c}, - {0x000e, 0x0011}, {0x000f, 0x0016}, {0x0010, 0x001d}, {0x0012, 0x004c}, {0x0014, 0x001c}, {0x0014, 0x001d}, {0x0014, 0x001e}, {0x0014, 0x001f}, - {0x0014, 0x0020}, {0x0014, 0x0021}, {0x0014, 0x0022}, {0x0014, 0x0023}, {0x0007, 0x0009}, {0x0006, 0x000d}, {0x0007, 0x000a}, {0x0007, 0x000b}, - {0x0009, 0x0009}, {0x000a, 0x000a}, {0x000b, 0x000a}, {0x000d, 0x000e}, {0x000f, 0x0017}, {0x0011, 0x002c}, {0x0010, 0x001e}, {0x0014, 0x0024}, - {0x0014, 0x0025}, {0x0014, 0x0026}, {0x0014, 0x0027}, {0x0014, 0x0028}, {0x0014, 0x0029}, {0x0014, 0x002a}, {0x0014, 0x002b}, {0x0014, 0x002c}, - {0x0009, 0x000a}, {0x0008, 0x000a}, {0x0008, 0x000b}, {0x0009, 0x000b}, {0x000a, 0x000b}, {0x000b, 0x000b}, {0x000d, 0x000f}, {0x000e, 0x0012}, - {0x000f, 0x0018}, {0x0011, 0x002d}, {0x0011, 0x002e}, {0x0013, 0x0086}, {0x0014, 0x002d}, {0x0014, 0x002e}, {0x0014, 0x002f}, {0x0014, 0x0030}, - {0x0014, 0x0031}, {0x0014, 0x0032}, {0x0014, 0x0033}, {0x0014, 0x0034}, {0x000b, 0x000c}, {0x000a, 0x000c}, {0x000a, 0x000d}, {0x000b, 0x000d}, - {0x000c, 0x000d}, {0x000d, 0x0010}, {0x000e, 0x0013}, {0x000f, 0x0019}, {0x0010, 0x001f}, {0x0013, 0x0087}, {0x0014, 0x0035}, {0x0014, 0x0036}, - {0x0013, 0x0088}, {0x0014, 0x0037}, {0x0014, 0x0038}, {0x0014, 0x0039}, {0x0014, 0x003a}, {0x0014, 0x003b}, {0x0014, 0x003c}, {0x0014, 0x003d}, - {0x000d, 0x0011}, {0x000c, 0x000e}, {0x000c, 0x000f}, {0x000d, 0x0012}, {0x000d, 0x0013}, {0x000e, 0x0014}, {0x0010, 0x0020}, {0x0010, 0x0021}, - {0x0012, 0x004d}, {0x0011, 0x002f}, {0x0014, 0x003e}, {0x0014, 0x003f}, {0x0014, 0x0040}, {0x0014, 0x0041}, {0x0014, 0x0042}, {0x0014, 0x0043}, - {0x0014, 0x0044}, {0x0014, 0x0045}, {0x0014, 0x0046}, {0x0014, 0x0047}, {0x000f, 0x001a}, {0x000e, 0x0015}, {0x000e, 0x0016}, {0x000e, 0x0017}, - {0x000f, 0x001b}, {0x0011, 0x0030}, {0x0011, 0x0031}, {0x0013, 0x0089}, {0x0013, 0x008a}, {0x0013, 0x008b}, {0x0014, 0x0048}, {0x0014, 0x0049}, - {0x0014, 0x004a}, {0x0014, 0x004b}, {0x0014, 0x004c}, {0x0014, 0x004d}, {0x0014, 0x004e}, {0x0014, 0x004f}, {0x0014, 0x0050}, {0x0014, 0x0051}, - {0x0010, 0x0022}, {0x0010, 0x0023}, {0x0010, 0x0024}, {0x0010, 0x0025}, {0x0011, 0x0032}, {0x0011, 0x0033}, {0x0012, 0x004e}, {0x0012, 0x004f}, - {0x0014, 0x0052}, {0x0013, 0x008c}, {0x0013, 0x008d}, {0x0014, 0x0053}, {0x0014, 0x0054}, {0x0014, 0x0055}, {0x0014, 0x0056}, {0x0014, 0x0057}, - {0x0014, 0x0058}, {0x0014, 0x0059}, {0x0014, 0x005a}, {0x0014, 0x005b}, {0x0011, 0x0034}, {0x0011, 0x0035}, {0x0012, 0x0050}, {0x0012, 0x0051}, - {0x0013, 0x008e}, {0x0014, 0x005c}, {0x0014, 0x005d}, {0x0014, 0x005e}, {0x0014, 0x005f}, {0x0014, 0x0060}, {0x0014, 0x0061}, {0x0014, 0x0062}, - {0x0014, 0x0063}, {0x0014, 0x0064}, {0x0014, 0x0065}, {0x0014, 0x0066}, {0x0014, 0x0067}, {0x0014, 0x0068}, {0x0014, 0x0069}, {0x0014, 0x006a}, - {0x0012, 0x0052}, {0x0013, 0x008f}, {0x0013, 0x0090}, {0x0014, 0x006b}, {0x0013, 0x0091}, {0x0014, 0x006c}, {0x0014, 0x006d}, {0x0014, 0x006e}, - {0x0014, 0x006f}, {0x0014, 0x0070}, {0x0014, 0x0071}, {0x0014, 0x0072}, {0x0014, 0x0073}, {0x0014, 0x0074}, {0x0014, 0x0075}, {0x0014, 0x0076}, - {0x0014, 0x0077}, {0x0014, 0x0078}, {0x0014, 0x0079}, {0x0014, 0x007a}, {0x0014, 0x007b}, {0x0014, 0x007c}, {0x0013, 0x0092}, {0x0012, 0x0053}, - {0x0014, 0x007d}, {0x0014, 0x007e}, {0x0014, 0x007f}, {0x0014, 0x0080}, {0x0014, 0x0081}, {0x0014, 0x0082}, {0x0014, 0x0083}, {0x0014, 0x0084}, - {0x0014, 0x0085}, {0x0014, 0x0086}, {0x0014, 0x0087}, {0x0014, 0x0088}, {0x0014, 0x0089}, {0x0014, 0x008a}, {0x0014, 0x008b}, {0x0014, 0x008c}, - {0x0014, 0x008d}, {0x0014, 0x008e}, {0x0013, 0x0093}, {0x0014, 0x008f}, {0x0014, 0x0090}, {0x0014, 0x0091}, {0x0014, 0x0092}, {0x0014, 0x0093}, - {0x0014, 0x0094}, {0x0014, 0x0095}, {0x0014, 0x0096}, {0x0014, 0x0097}, {0x0014, 0x0098}, {0x0014, 0x0099}, {0x0014, 0x009a}, {0x0014, 0x009b}, - {0x0014, 0x009c}, {0x0014, 0x009d}, {0x0014, 0x009e}, {0x0014, 0x009f}, {0x0014, 0x00a0}, {0x0014, 0x00a1}, {0x0014, 0x00a2}, {0x0014, 0x00a3}, - {0x0014, 0x00a4}, {0x0014, 0x00a5}, {0x0014, 0x00a6}, {0x0014, 0x00a7}, {0x0014, 0x00a8}, {0x0014, 0x00a9}, {0x0014, 0x00aa}, {0x0014, 0x00ab}, - {0x0014, 0x00ac}, {0x0014, 0x00ad}, {0x0014, 0x00ae}, {0x0014, 0x00af}, {0x0014, 0x00b0}, {0x0014, 0x00b1}, {0x0014, 0x00b2}, {0x0014, 0x00b3}, - {0x0014, 0x00b4}, {0x0014, 0x00b5}, {0x0014, 0x00b6}, {0x0014, 0x00b7}, {0x0014, 0x00b8}, {0x0014, 0x00b9}, {0x0014, 0x00ba}, {0x0014, 0x00bb}, - {0x0014, 0x00bc}, {0x0014, 0x00bd}, {0x0014, 0x00be}, {0x0014, 0x00bf}, {0x0014, 0x00c0}, {0x0014, 0x00c1}, {0x0014, 0x00c2}, {0x0014, 0x00c3}, - {0x0014, 0x00c4}, {0x0014, 0x00c5}, {0x0014, 0x00c6}, {0x0014, 0x00c7}, {0x0014, 0x00c8}, {0x0014, 0x00c9}, {0x0014, 0x00ca}, {0x0014, 0x00cb}, - {0x0014, 0x00cc}, {0x0014, 0x00cd}, {0x0014, 0x00ce}, {0x0014, 0x00cf}, {0x0014, 0x00d0}, {0x0014, 0x00d1}, {0x0014, 0x00d2}, {0x0014, 0x00d3}, - {0x0014, 0x00d4}, {0x0014, 0x00d5}, {0x0014, 0x00d6}, {0x0014, 0x00d7}, {0x0014, 0x00d8}, {0x0014, 0x00d9}, {0x0014, 0x00da}, {0x0014, 0x00db}, - {0x0014, 0x00dc}, {0x0014, 0x00dd}, {0x0014, 0x00de}, {0x0014, 0x00df}, {0x0014, 0x00e0}, {0x0014, 0x00e1}, {0x0014, 0x00e2}, {0x0014, 0x00e3}, - {0x0014, 0x00e4}, {0x0014, 0x00e5}, {0x0014, 0x00e6}, {0x0014, 0x00e7}, {0x0014, 0x00e8}, {0x0014, 0x00e9}, {0x0014, 0x00ea}, {0x0014, 0x00eb}, - {0x0014, 0x00ec}, {0x0014, 0x00ed}, {0x0014, 0x00ee}, {0x0014, 0x00ef}, {0x0014, 0x00f0}, {0x0014, 0x00f1}, {0x0014, 0x00f2}, {0x0014, 0x00f3}, - {0x0014, 0x00f4}, {0x0014, 0x00f5}, {0x0014, 0x00f6}, {0x0014, 0x00f7}, {0x0014, 0x00f8}, {0x0014, 0x00f9}, {0x0014, 0x00fa}, {0x0014, 0x00fb}, - {0x0014, 0x00fc}, {0x0014, 0x00fd}, {0x0014, 0x00fe}, {0x0014, 0x00ff}, {0x0014, 0x0100}, {0x0014, 0x0101}, {0x0014, 0x0102}, {0x0014, 0x0103}, -}; - -const uint32_t c_aauiCQMFHuffDec14[53][16] = -{ - {0x0009ffff, 0x0007ffff, 0x0008ffff, 0x0001ffff, 0x0002ffff, 0x0003ffff, 0x0004ffff, 0x0005ffff, 0x0006ffff, 0x00000001, 0x00000014, 0x00000015, 0x00000016, 0x00000029, 0x0000002a, 0x0000003d, }, - {0x00020053, 0x00020053, 0x00020053, 0x00020053, 0x00020065, 0x00020065, 0x00020065, 0x00020065, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, }, - {0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, }, - {0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, }, - {0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, }, - {0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030051, }, - {0x00010054, 0x00010054, 0x00010064, 0x00010064, 0x00010066, 0x00010066, 0x00010067, 0x00010067, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020019, 0x00020019, 0x00020019, 0x00020019, }, - {0x0002002c, 0x0002002c, 0x0002002c, 0x0002002c, 0x00020040, 0x00020040, 0x00020040, 0x00020040, 0x00020050, 0x00020050, 0x00020050, 0x00020050, 0x00020052, 0x00020052, 0x00020052, 0x00020052, }, - {0x000fffff, 0x000dffff, 0x000effff, 0x000affff, 0x000bffff, 0x000cffff, 0x0000001a, 0x0000002e, 0x00000041, 0x00000055, 0x00000079, 0x0000007a, 0x00010005, 0x00010005, 0x0001002d, 0x0001002d, }, - {0x0002008d, 0x0002008d, 0x0002008d, 0x0002008d, 0x0002008e, 0x0002008e, 0x0002008e, 0x0002008e, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, }, - {0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, }, - {0x00030078, 0x00030078, 0x00030078, 0x00030078, 0x00030078, 0x00030078, 0x00030078, 0x00030078, 0x0003007b, 0x0003007b, 0x0003007b, 0x0003007b, 0x0003007b, 0x0003007b, 0x0003007b, 0x0003007b, }, - {0x00010007, 0x00010007, 0x00010043, 0x00010043, 0x0001006a, 0x0001006a, 0x0001007d, 0x0001007d, 0x0001008c, 0x0001008c, 0x0001008f, 0x0001008f, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001b, }, - {0x0002002f, 0x0002002f, 0x0002002f, 0x0002002f, 0x00020056, 0x00020056, 0x00020056, 0x00020056, 0x00020069, 0x00020069, 0x00020069, 0x00020069, 0x0002007c, 0x0002007c, 0x0002007c, 0x0002007c, }, - {0x0024ffff, 0x0018ffff, 0x0017ffff, 0x0015ffff, 0x0014ffff, 0x0016ffff, 0x0010ffff, 0x0011ffff, 0x0012ffff, 0x0013ffff, 0x0000001c, 0x00000030, 0x00000057, 0x00000090, 0x000000a1, 0x000000a2, }, - {0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030044, }, - {0x0003006b, 0x0003006b, 0x0003006b, 0x0003006b, 0x0003006b, 0x0003006b, 0x0003006b, 0x0003006b, 0x0003007e, 0x0003007e, 0x0003007e, 0x0003007e, 0x0003007e, 0x0003007e, 0x0003007e, 0x0003007e, }, - {0x00030091, 0x00030091, 0x00030091, 0x00030091, 0x00030091, 0x00030091, 0x00030091, 0x00030091, 0x000300a0, 0x000300a0, 0x000300a0, 0x000300a0, 0x000300a0, 0x000300a0, 0x000300a0, 0x000300a0, }, - {0x000300a3, 0x000300a3, 0x000300a3, 0x000300a3, 0x000300a3, 0x000300a3, 0x000300a3, 0x000300a3, 0x000300a4, 0x000300a4, 0x000300a4, 0x000300a4, 0x000300a4, 0x000300a4, 0x000300a4, 0x000300a4, }, - {0x00020045, 0x00020045, 0x00020045, 0x00020045, 0x00020058, 0x00020058, 0x00020058, 0x00020058, 0x0002007f, 0x0002007f, 0x0002007f, 0x0002007f, 0x00020092, 0x00020092, 0x00020092, 0x00020092, }, - {0x00010080, 0x00010080, 0x00010093, 0x00010093, 0x000100b4, 0x000100b4, 0x000100b8, 0x000100b8, 0x0002001d, 0x0002001d, 0x0002001d, 0x0002001d, 0x00020031, 0x00020031, 0x00020031, 0x00020031, }, - {0x000200a5, 0x000200a5, 0x000200a5, 0x000200a5, 0x000200b5, 0x000200b5, 0x000200b5, 0x000200b5, 0x000200b6, 0x000200b6, 0x000200b6, 0x000200b6, 0x000200b7, 0x000200b7, 0x000200b7, 0x000200b7, }, - {0x000000a6, 0x000000a7, 0x000000c8, 0x000000c9, 0x000000ca, 0x000000cb, 0x00010009, 0x00010009, 0x0001001e, 0x0001001e, 0x00010032, 0x00010032, 0x00010059, 0x00010059, 0x0001006c, 0x0001006c, }, - {0x0022ffff, 0x0023ffff, 0x001fffff, 0x0020ffff, 0x0021ffff, 0x0019ffff, 0x001affff, 0x001bffff, 0x001cffff, 0x001dffff, 0x001effff, 0x0000000a, 0x00000046, 0x0000005a, 0x0000006e, 0x00000094, }, - {0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, }, - {0x0003006d, 0x0003006d, 0x0003006d, 0x0003006d, 0x0003006d, 0x0003006d, 0x0003006d, 0x0003006d, 0x00030081, 0x00030081, 0x00030081, 0x00030081, 0x00030081, 0x00030081, 0x00030081, 0x00030081, }, - {0x00030082, 0x00030082, 0x00030082, 0x00030082, 0x00030082, 0x00030082, 0x00030082, 0x00030082, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, }, - {0x000300b9, 0x000300b9, 0x000300b9, 0x000300b9, 0x000300b9, 0x000300b9, 0x000300b9, 0x000300b9, 0x000300ba, 0x000300ba, 0x000300ba, 0x000300ba, 0x000300ba, 0x000300ba, 0x000300ba, 0x000300ba, }, - {0x000300cc, 0x000300cc, 0x000300cc, 0x000300cc, 0x000300cc, 0x000300cc, 0x000300cc, 0x000300cc, 0x000300cd, 0x000300cd, 0x000300cd, 0x000300cd, 0x000300cd, 0x000300cd, 0x000300cd, 0x000300cd, }, - {0x000300dc, 0x000300dc, 0x000300dc, 0x000300dc, 0x000300dc, 0x000300dc, 0x000300dc, 0x000300dc, 0x000300dd, 0x000300dd, 0x000300dd, 0x000300dd, 0x000300dd, 0x000300dd, 0x000300dd, 0x000300dd, }, - {0x000100f2, 0x000100f2, 0x000100f4, 0x000100f4, 0x00010106, 0x00010106, 0x0001011a, 0x0001011a, 0x00020020, 0x00020020, 0x00020020, 0x00020020, 0x00020033, 0x00020033, 0x00020033, 0x00020033, }, - {0x0002005b, 0x0002005b, 0x0002005b, 0x0002005b, 0x000200a8, 0x000200a8, 0x000200a8, 0x000200a8, 0x000200ce, 0x000200ce, 0x000200ce, 0x000200ce, 0x000200cf, 0x000200cf, 0x000200cf, 0x000200cf, }, - {0x000200de, 0x000200de, 0x000200de, 0x000200de, 0x000200df, 0x000200df, 0x000200df, 0x000200df, 0x000200f0, 0x000200f0, 0x000200f0, 0x000200f0, 0x00020107, 0x00020107, 0x00020107, 0x00020107, }, - {0x0000018c, 0x0000018d, 0x0000018e, 0x0000018f, 0x0001000b, 0x0001000b, 0x0001000c, 0x0001000c, 0x00010021, 0x00010021, 0x00010034, 0x00010034, 0x00010083, 0x00010083, 0x00010095, 0x00010095, }, - {0x00010098, 0x00010098, 0x000100bb, 0x000100bb, 0x000100bc, 0x000100bc, 0x000100bd, 0x000100bd, 0x000100d1, 0x000100d1, 0x000100d2, 0x000100d2, 0x000100e0, 0x000100e0, 0x000100f1, 0x000100f1, }, - {0x0025ffff, 0x0026ffff, 0x0028ffff, 0x0027ffff, 0x0029ffff, 0x002affff, 0x002bffff, 0x002cffff, 0x002dffff, 0x002effff, 0x002fffff, 0x0030ffff, 0x0031ffff, 0x0032ffff, 0x0033ffff, 0x0034ffff, }, - {0x0000000d, 0x0000000e, 0x0000000f, 0x00000010, 0x00000011, 0x00000012, 0x00000013, 0x00000022, 0x00000023, 0x00000024, 0x00000025, 0x00000026, 0x00000027, 0x00000035, 0x00000036, 0x00000037, }, - {0x00000038, 0x00000039, 0x0000003a, 0x0000003b, 0x00000048, 0x00000049, 0x0000004a, 0x0000004b, 0x0000004c, 0x0000004d, 0x0000004e, 0x0000004f, 0x0000005c, 0x0000005d, 0x0000005e, 0x0000005f, }, - {0x00000087, 0x00000088, 0x00000089, 0x0000008a, 0x0000008b, 0x00000096, 0x00000097, 0x00000099, 0x0000009a, 0x0000009b, 0x0000009c, 0x0000009d, 0x0000009e, 0x0000009f, 0x000000aa, 0x000000ab, }, - {0x00000060, 0x00000061, 0x00000062, 0x00000063, 0x0000006f, 0x00000070, 0x00000071, 0x00000072, 0x00000073, 0x00000074, 0x00000075, 0x00000076, 0x00000077, 0x00000084, 0x00000085, 0x00000086, }, - {0x000000ac, 0x000000ad, 0x000000ae, 0x000000af, 0x000000b0, 0x000000b1, 0x000000b2, 0x000000b3, 0x000000be, 0x000000bf, 0x000000c0, 0x000000c1, 0x000000c2, 0x000000c3, 0x000000c4, 0x000000c5, }, - {0x000000c6, 0x000000c7, 0x000000d0, 0x000000d3, 0x000000d4, 0x000000d5, 0x000000d6, 0x000000d7, 0x000000d8, 0x000000d9, 0x000000da, 0x000000db, 0x000000e1, 0x000000e2, 0x000000e3, 0x000000e4, }, - {0x000000e5, 0x000000e6, 0x000000e7, 0x000000e8, 0x000000e9, 0x000000ea, 0x000000eb, 0x000000ec, 0x000000ed, 0x000000ee, 0x000000ef, 0x000000f3, 0x000000f5, 0x000000f6, 0x000000f7, 0x000000f8, }, - {0x000000f9, 0x000000fa, 0x000000fb, 0x000000fc, 0x000000fd, 0x000000fe, 0x000000ff, 0x00000100, 0x00000101, 0x00000102, 0x00000103, 0x00000104, 0x00000105, 0x00000108, 0x00000109, 0x0000010a, }, - {0x0000010b, 0x0000010c, 0x0000010d, 0x0000010e, 0x0000010f, 0x00000110, 0x00000111, 0x00000112, 0x00000113, 0x00000114, 0x00000115, 0x00000116, 0x00000117, 0x00000118, 0x00000119, 0x0000011b, }, - {0x0000011c, 0x0000011d, 0x0000011e, 0x0000011f, 0x00000120, 0x00000121, 0x00000122, 0x00000123, 0x00000124, 0x00000125, 0x00000126, 0x00000127, 0x00000128, 0x00000129, 0x0000012a, 0x0000012b, }, - {0x0000012c, 0x0000012d, 0x0000012e, 0x0000012f, 0x00000130, 0x00000131, 0x00000132, 0x00000133, 0x00000134, 0x00000135, 0x00000136, 0x00000137, 0x00000138, 0x00000139, 0x0000013a, 0x0000013b, }, - {0x0000013c, 0x0000013d, 0x0000013e, 0x0000013f, 0x00000140, 0x00000141, 0x00000142, 0x00000143, 0x00000144, 0x00000145, 0x00000146, 0x00000147, 0x00000148, 0x00000149, 0x0000014a, 0x0000014b, }, - {0x0000014c, 0x0000014d, 0x0000014e, 0x0000014f, 0x00000150, 0x00000151, 0x00000152, 0x00000153, 0x00000154, 0x00000155, 0x00000156, 0x00000157, 0x00000158, 0x00000159, 0x0000015a, 0x0000015b, }, - {0x0000015c, 0x0000015d, 0x0000015e, 0x0000015f, 0x00000160, 0x00000161, 0x00000162, 0x00000163, 0x00000164, 0x00000165, 0x00000166, 0x00000167, 0x00000168, 0x00000169, 0x0000016a, 0x0000016b, }, - {0x0000016c, 0x0000016d, 0x0000016e, 0x0000016f, 0x00000170, 0x00000171, 0x00000172, 0x00000173, 0x00000174, 0x00000175, 0x00000176, 0x00000177, 0x00000178, 0x00000179, 0x0000017a, 0x0000017b, }, - {0x0000017c, 0x0000017d, 0x0000017e, 0x0000017f, 0x00000180, 0x00000181, 0x00000182, 0x00000183, 0x00000184, 0x00000185, 0x00000186, 0x00000187, 0x00000188, 0x00000189, 0x0000018a, 0x0000018b, }, -}; - -const uint32_t c_aauiCQMFHuffEnc15[576][2] = -{ - {0x0005, 0x000a}, {0x0005, 0x000b}, {0x0005, 0x000c}, {0x0006, 0x0009}, {0x0006, 0x000a}, {0x0007, 0x0008}, {0x0008, 0x0009}, {0x0009, 0x0008}, - {0x000b, 0x000b}, {0x000d, 0x000e}, {0x000e, 0x0011}, {0x000f, 0x001a}, {0x0012, 0x006e}, {0x0014, 0x0000}, {0x0013, 0x00cc}, {0x0014, 0x0001}, - {0x0014, 0x0002}, {0x0014, 0x0003}, {0x0014, 0x0004}, {0x0014, 0x0005}, {0x0014, 0x0006}, {0x0014, 0x0007}, {0x0014, 0x0008}, {0x0014, 0x0009}, - {0x0005, 0x000d}, {0x0004, 0x000c}, {0x0004, 0x000d}, {0x0005, 0x000e}, {0x0005, 0x000f}, {0x0006, 0x000b}, {0x0007, 0x0009}, {0x0008, 0x000a}, - {0x000a, 0x000a}, {0x000c, 0x000c}, {0x000d, 0x000f}, {0x000f, 0x001b}, {0x0011, 0x003d}, {0x0011, 0x003e}, {0x0013, 0x00cd}, {0x0014, 0x000a}, - {0x0014, 0x000b}, {0x0014, 0x000c}, {0x0014, 0x000d}, {0x0014, 0x000e}, {0x0014, 0x000f}, {0x0014, 0x0010}, {0x0014, 0x0011}, {0x0014, 0x0012}, - {0x0005, 0x0010}, {0x0004, 0x000e}, {0x0004, 0x000f}, {0x0005, 0x0011}, {0x0005, 0x0012}, {0x0006, 0x000c}, {0x0007, 0x000a}, {0x0009, 0x0009}, - {0x000a, 0x000b}, {0x000c, 0x000d}, {0x000e, 0x0012}, {0x0010, 0x0027}, {0x0011, 0x003f}, {0x0012, 0x006f}, {0x0014, 0x0013}, {0x0014, 0x0014}, - {0x0014, 0x0015}, {0x0014, 0x0016}, {0x0014, 0x0017}, {0x0014, 0x0018}, {0x0014, 0x0019}, {0x0014, 0x001a}, {0x0014, 0x001b}, {0x0014, 0x001c}, - {0x0006, 0x000d}, {0x0005, 0x0013}, {0x0005, 0x0014}, {0x0005, 0x0015}, {0x0006, 0x000e}, {0x0007, 0x000b}, {0x0008, 0x000b}, {0x0009, 0x000a}, - {0x000b, 0x000c}, {0x000c, 0x000e}, {0x000e, 0x0013}, {0x000f, 0x001c}, {0x0011, 0x0040}, {0x0012, 0x0070}, {0x0014, 0x001d}, {0x0014, 0x001e}, - {0x0014, 0x001f}, {0x0014, 0x0020}, {0x0014, 0x0021}, {0x0014, 0x0022}, {0x0014, 0x0023}, {0x0014, 0x0024}, {0x0014, 0x0025}, {0x0014, 0x0026}, - {0x0006, 0x000f}, {0x0005, 0x0016}, {0x0005, 0x0017}, {0x0006, 0x0010}, {0x0006, 0x0011}, {0x0007, 0x000c}, {0x0009, 0x000b}, {0x000a, 0x000c}, - {0x000b, 0x000d}, {0x000d, 0x0010}, {0x000e, 0x0014}, {0x0010, 0x0028}, {0x0011, 0x0041}, {0x0013, 0x00ce}, {0x0014, 0x0027}, {0x0014, 0x0028}, - {0x0014, 0x0029}, {0x0014, 0x002a}, {0x0014, 0x002b}, {0x0014, 0x002c}, {0x0014, 0x002d}, {0x0014, 0x002e}, {0x0014, 0x002f}, {0x0014, 0x0030}, - {0x0007, 0x000d}, {0x0006, 0x0012}, {0x0006, 0x0013}, {0x0007, 0x000e}, {0x0007, 0x000f}, {0x0008, 0x000c}, {0x0009, 0x000c}, {0x000b, 0x000e}, - {0x000c, 0x000f}, {0x000e, 0x0015}, {0x0010, 0x0029}, {0x0011, 0x0042}, {0x0014, 0x0031}, {0x0014, 0x0032}, {0x0014, 0x0033}, {0x0014, 0x0034}, - {0x0014, 0x0035}, {0x0014, 0x0036}, {0x0014, 0x0037}, {0x0014, 0x0038}, {0x0014, 0x0039}, {0x0014, 0x003a}, {0x0014, 0x003b}, {0x0014, 0x003c}, - {0x0008, 0x000d}, {0x0007, 0x0010}, {0x0007, 0x0011}, {0x0008, 0x000e}, {0x0009, 0x000d}, {0x0009, 0x000e}, {0x000b, 0x000f}, {0x000c, 0x0010}, - {0x000d, 0x0011}, {0x000f, 0x001d}, {0x0010, 0x002a}, {0x0011, 0x0043}, {0x0014, 0x003d}, {0x0013, 0x00cf}, {0x0014, 0x003e}, {0x0014, 0x003f}, - {0x0014, 0x0040}, {0x0014, 0x0041}, {0x0014, 0x0042}, {0x0014, 0x0043}, {0x0014, 0x0044}, {0x0014, 0x0045}, {0x0014, 0x0046}, {0x0014, 0x0047}, - {0x0009, 0x000f}, {0x0008, 0x000f}, {0x0009, 0x0010}, {0x0009, 0x0011}, {0x000a, 0x000d}, {0x000b, 0x0010}, {0x000c, 0x0011}, {0x000d, 0x0012}, - {0x000e, 0x0016}, {0x0010, 0x002b}, {0x0011, 0x0044}, {0x0012, 0x0071}, {0x0014, 0x0048}, {0x0014, 0x0049}, {0x0014, 0x004a}, {0x0014, 0x004b}, - {0x0014, 0x004c}, {0x0014, 0x004d}, {0x0014, 0x004e}, {0x0014, 0x004f}, {0x0014, 0x0050}, {0x0014, 0x0051}, {0x0014, 0x0052}, {0x0014, 0x0053}, - {0x000b, 0x0011}, {0x000a, 0x000e}, {0x000a, 0x000f}, {0x000b, 0x0012}, {0x000b, 0x0013}, {0x000c, 0x0012}, {0x000d, 0x0013}, {0x000e, 0x0017}, - {0x0010, 0x002c}, {0x0012, 0x0072}, {0x0011, 0x0045}, {0x0013, 0x00d0}, {0x0013, 0x00d1}, {0x0014, 0x0054}, {0x0014, 0x0055}, {0x0014, 0x0056}, - {0x0014, 0x0057}, {0x0014, 0x0058}, {0x0014, 0x0059}, {0x0014, 0x005a}, {0x0014, 0x005b}, {0x0014, 0x005c}, {0x0014, 0x005d}, {0x0014, 0x005e}, - {0x000c, 0x0013}, {0x000c, 0x0014}, {0x000c, 0x0015}, {0x000d, 0x0014}, {0x000d, 0x0015}, {0x000e, 0x0018}, {0x000f, 0x001e}, {0x0010, 0x002d}, - {0x0011, 0x0046}, {0x0011, 0x0047}, {0x0011, 0x0048}, {0x0014, 0x005f}, {0x0014, 0x0060}, {0x0014, 0x0061}, {0x0014, 0x0062}, {0x0014, 0x0063}, - {0x0014, 0x0064}, {0x0014, 0x0065}, {0x0014, 0x0066}, {0x0014, 0x0067}, {0x0014, 0x0068}, {0x0014, 0x0069}, {0x0014, 0x006a}, {0x0014, 0x006b}, - {0x000e, 0x0019}, {0x000d, 0x0016}, {0x000d, 0x0017}, {0x000e, 0x001a}, {0x000e, 0x001b}, {0x000f, 0x001f}, {0x0010, 0x002e}, {0x0011, 0x0049}, - {0x0012, 0x0073}, {0x0014, 0x006c}, {0x0014, 0x006d}, {0x0014, 0x006e}, {0x0014, 0x006f}, {0x0014, 0x0070}, {0x0014, 0x0071}, {0x0014, 0x0072}, - {0x0014, 0x0073}, {0x0014, 0x0074}, {0x0014, 0x0075}, {0x0014, 0x0076}, {0x0014, 0x0077}, {0x0014, 0x0078}, {0x0014, 0x0079}, {0x0014, 0x007a}, - {0x0010, 0x002f}, {0x000f, 0x0020}, {0x0010, 0x0030}, {0x000f, 0x0021}, {0x0010, 0x0031}, {0x0011, 0x004a}, {0x0011, 0x004b}, {0x0012, 0x0074}, - {0x0014, 0x007b}, {0x0014, 0x007c}, {0x0013, 0x00d2}, {0x0014, 0x007d}, {0x0014, 0x007e}, {0x0014, 0x007f}, {0x0014, 0x0080}, {0x0014, 0x0081}, - {0x0014, 0x0082}, {0x0014, 0x0083}, {0x0014, 0x0084}, {0x0014, 0x0085}, {0x0014, 0x0086}, {0x0014, 0x0087}, {0x0014, 0x0088}, {0x0014, 0x0089}, - {0x0012, 0x0075}, {0x0010, 0x0032}, {0x0010, 0x0033}, {0x0011, 0x004c}, {0x0011, 0x004d}, {0x0013, 0x00d3}, {0x0013, 0x00d4}, {0x0012, 0x0076}, - {0x0013, 0x00d5}, {0x0014, 0x008a}, {0x0014, 0x008b}, {0x0014, 0x008c}, {0x0014, 0x008d}, {0x0014, 0x008e}, {0x0014, 0x008f}, {0x0014, 0x0090}, - {0x0014, 0x0091}, {0x0014, 0x0092}, {0x0014, 0x0093}, {0x0014, 0x0094}, {0x0014, 0x0095}, {0x0014, 0x0096}, {0x0014, 0x0097}, {0x0014, 0x0098}, - {0x0013, 0x00d6}, {0x0013, 0x00d7}, {0x0012, 0x0077}, {0x0012, 0x0078}, {0x0014, 0x0099}, {0x0014, 0x009a}, {0x0013, 0x00d8}, {0x0014, 0x009b}, - {0x0014, 0x009c}, {0x0014, 0x009d}, {0x0014, 0x009e}, {0x0014, 0x009f}, {0x0014, 0x00a0}, {0x0014, 0x00a1}, {0x0014, 0x00a2}, {0x0014, 0x00a3}, - {0x0014, 0x00a4}, {0x0014, 0x00a5}, {0x0014, 0x00a6}, {0x0014, 0x00a7}, {0x0014, 0x00a8}, {0x0014, 0x00a9}, {0x0014, 0x00aa}, {0x0014, 0x00ab}, - {0x0014, 0x00ac}, {0x0014, 0x00ad}, {0x0014, 0x00ae}, {0x0014, 0x00af}, {0x0012, 0x0079}, {0x0014, 0x00b0}, {0x0014, 0x00b1}, {0x0014, 0x00b2}, - {0x0014, 0x00b3}, {0x0014, 0x00b4}, {0x0014, 0x00b5}, {0x0014, 0x00b6}, {0x0014, 0x00b7}, {0x0014, 0x00b8}, {0x0014, 0x00b9}, {0x0014, 0x00ba}, - {0x0014, 0x00bb}, {0x0014, 0x00bc}, {0x0014, 0x00bd}, {0x0014, 0x00be}, {0x0014, 0x00bf}, {0x0014, 0x00c0}, {0x0014, 0x00c1}, {0x0014, 0x00c2}, - {0x0014, 0x00c3}, {0x0014, 0x00c4}, {0x0014, 0x00c5}, {0x0014, 0x00c6}, {0x0013, 0x00d9}, {0x0013, 0x00da}, {0x0014, 0x00c7}, {0x0014, 0x00c8}, - {0x0014, 0x00c9}, {0x0014, 0x00ca}, {0x0014, 0x00cb}, {0x0014, 0x00cc}, {0x0014, 0x00cd}, {0x0014, 0x00ce}, {0x0014, 0x00cf}, {0x0014, 0x00d0}, - {0x0014, 0x00d1}, {0x0014, 0x00d2}, {0x0014, 0x00d3}, {0x0014, 0x00d4}, {0x0014, 0x00d5}, {0x0014, 0x00d6}, {0x0014, 0x00d7}, {0x0014, 0x00d8}, - {0x0014, 0x00d9}, {0x0014, 0x00da}, {0x0014, 0x00db}, {0x0014, 0x00dc}, {0x0014, 0x00dd}, {0x0014, 0x00de}, {0x0014, 0x00df}, {0x0014, 0x00e0}, - {0x0014, 0x00e1}, {0x0014, 0x00e2}, {0x0014, 0x00e3}, {0x0014, 0x00e4}, {0x0014, 0x00e5}, {0x0014, 0x00e6}, {0x0014, 0x00e7}, {0x0014, 0x00e8}, - {0x0014, 0x00e9}, {0x0014, 0x00ea}, {0x0014, 0x00eb}, {0x0014, 0x00ec}, {0x0014, 0x00ed}, {0x0014, 0x00ee}, {0x0014, 0x00ef}, {0x0014, 0x00f0}, - {0x0014, 0x00f1}, {0x0014, 0x00f2}, {0x0014, 0x00f3}, {0x0014, 0x00f4}, {0x0014, 0x00f5}, {0x0014, 0x00f6}, {0x0014, 0x00f7}, {0x0014, 0x00f8}, - {0x0014, 0x00f9}, {0x0014, 0x00fa}, {0x0014, 0x00fb}, {0x0014, 0x00fc}, {0x0014, 0x00fd}, {0x0014, 0x00fe}, {0x0014, 0x00ff}, {0x0014, 0x0100}, - {0x0014, 0x0101}, {0x0014, 0x0102}, {0x0014, 0x0103}, {0x0014, 0x0104}, {0x0014, 0x0105}, {0x0014, 0x0106}, {0x0014, 0x0107}, {0x0014, 0x0108}, - {0x0014, 0x0109}, {0x0014, 0x010a}, {0x0014, 0x010b}, {0x0014, 0x010c}, {0x0014, 0x010d}, {0x0014, 0x010e}, {0x0014, 0x010f}, {0x0014, 0x0110}, - {0x0014, 0x0111}, {0x0014, 0x0112}, {0x0014, 0x0113}, {0x0014, 0x0114}, {0x0014, 0x0115}, {0x0014, 0x0116}, {0x0014, 0x0117}, {0x0014, 0x0118}, - {0x0014, 0x0119}, {0x0014, 0x011a}, {0x0014, 0x011b}, {0x0014, 0x011c}, {0x0014, 0x011d}, {0x0014, 0x011e}, {0x0014, 0x011f}, {0x0014, 0x0120}, - {0x0014, 0x0121}, {0x0014, 0x0122}, {0x0014, 0x0123}, {0x0014, 0x0124}, {0x0014, 0x0125}, {0x0014, 0x0126}, {0x0014, 0x0127}, {0x0014, 0x0128}, - {0x0014, 0x0129}, {0x0014, 0x012a}, {0x0014, 0x012b}, {0x0014, 0x012c}, {0x0014, 0x012d}, {0x0014, 0x012e}, {0x0014, 0x012f}, {0x0014, 0x0130}, - {0x0014, 0x0131}, {0x0014, 0x0132}, {0x0014, 0x0133}, {0x0014, 0x0134}, {0x0014, 0x0135}, {0x0014, 0x0136}, {0x0014, 0x0137}, {0x0014, 0x0138}, - {0x0014, 0x0139}, {0x0014, 0x013a}, {0x0014, 0x013b}, {0x0014, 0x013c}, {0x0014, 0x013d}, {0x0014, 0x013e}, {0x0014, 0x013f}, {0x0014, 0x0140}, - {0x0014, 0x0141}, {0x0014, 0x0142}, {0x0014, 0x0143}, {0x0014, 0x0144}, {0x0014, 0x0145}, {0x0014, 0x0146}, {0x0014, 0x0147}, {0x0014, 0x0148}, - {0x0014, 0x0149}, {0x0014, 0x014a}, {0x0014, 0x014b}, {0x0014, 0x014c}, {0x0014, 0x014d}, {0x0014, 0x014e}, {0x0014, 0x014f}, {0x0014, 0x0150}, - {0x0014, 0x0151}, {0x0014, 0x0152}, {0x0014, 0x0153}, {0x0014, 0x0154}, {0x0014, 0x0155}, {0x0014, 0x0156}, {0x0014, 0x0157}, {0x0014, 0x0158}, - {0x0014, 0x0159}, {0x0014, 0x015a}, {0x0014, 0x015b}, {0x0014, 0x015c}, {0x0014, 0x015d}, {0x0014, 0x015e}, {0x0014, 0x015f}, {0x0014, 0x0160}, - {0x0014, 0x0161}, {0x0014, 0x0162}, {0x0014, 0x0163}, {0x0014, 0x0164}, {0x0014, 0x0165}, {0x0014, 0x0166}, {0x0014, 0x0167}, {0x0014, 0x0168}, - {0x0014, 0x0169}, {0x0014, 0x016a}, {0x0014, 0x016b}, {0x0014, 0x016c}, {0x0014, 0x016d}, {0x0014, 0x016e}, {0x0014, 0x016f}, {0x0014, 0x0170}, - {0x0014, 0x0171}, {0x0014, 0x0172}, {0x0014, 0x0173}, {0x0014, 0x0174}, {0x0014, 0x0175}, {0x0014, 0x0176}, {0x0014, 0x0177}, {0x0014, 0x0178}, - {0x0014, 0x0179}, {0x0014, 0x017a}, {0x0014, 0x017b}, {0x0014, 0x017c}, {0x0014, 0x017d}, {0x0014, 0x017e}, {0x0014, 0x017f}, {0x0014, 0x0180}, - {0x0014, 0x0181}, {0x0014, 0x0182}, {0x0014, 0x0183}, {0x0014, 0x0184}, {0x0014, 0x0185}, {0x0014, 0x0186}, {0x0014, 0x0187}, {0x0014, 0x0188}, - {0x0014, 0x0189}, {0x0014, 0x018a}, {0x0014, 0x018b}, {0x0014, 0x018c}, {0x0014, 0x018d}, {0x0014, 0x018e}, {0x0014, 0x018f}, {0x0014, 0x0190}, - {0x0014, 0x0191}, {0x0014, 0x0192}, {0x0014, 0x0193}, {0x0014, 0x0194}, {0x0014, 0x0195}, {0x0014, 0x0196}, {0x0014, 0x0197}, {0x0013, 0x00db}, -}; - -const uint32_t c_aauiCQMFHuffDec15[73][16] = -{ - {0x000cffff, 0x000bffff, 0x0008ffff, 0x0009ffff, 0x000affff, 0x0002ffff, 0x0001ffff, 0x0003ffff, 0x0004ffff, 0x0005ffff, 0x0006ffff, 0x0007ffff, 0x00000019, 0x0000001a, 0x00000031, 0x00000032, }, - {0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, }, - {0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, }, - {0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, }, - {0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, }, - {0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, }, - {0x0003004a, 0x0003004a, 0x0003004a, 0x0003004a, 0x0003004a, 0x0003004a, 0x0003004a, 0x0003004a, 0x0003004b, 0x0003004b, 0x0003004b, 0x0003004b, 0x0003004b, 0x0003004b, 0x0003004b, 0x0003004b, }, - {0x00030061, 0x00030061, 0x00030061, 0x00030061, 0x00030061, 0x00030061, 0x00030061, 0x00030061, 0x00030062, 0x00030062, 0x00030062, 0x00030062, 0x00030062, 0x00030062, 0x00030062, 0x00030062, }, - {0x00010091, 0x00010091, 0x00010092, 0x00010092, 0x00020003, 0x00020003, 0x00020003, 0x00020003, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x0002001d, 0x0002001d, 0x0002001d, 0x0002001d, }, - {0x00020035, 0x00020035, 0x00020035, 0x00020035, 0x00020048, 0x00020048, 0x00020048, 0x00020048, 0x0002004c, 0x0002004c, 0x0002004c, 0x0002004c, 0x00020060, 0x00020060, 0x00020060, 0x00020060, }, - {0x00020063, 0x00020063, 0x00020063, 0x00020063, 0x00020064, 0x00020064, 0x00020064, 0x00020064, 0x00020079, 0x00020079, 0x00020079, 0x00020079, 0x0002007a, 0x0002007a, 0x0002007a, 0x0002007a, }, - {0x00010005, 0x00010005, 0x0001001e, 0x0001001e, 0x00010036, 0x00010036, 0x0001004d, 0x0001004d, 0x00010065, 0x00010065, 0x00010078, 0x00010078, 0x0001007b, 0x0001007b, 0x0001007c, 0x0001007c, }, - {0x0015ffff, 0x0014ffff, 0x0012ffff, 0x0013ffff, 0x000dffff, 0x000effff, 0x000fffff, 0x0010ffff, 0x0011ffff, 0x00000006, 0x0000001f, 0x0000004e, 0x0000007d, 0x00000090, 0x00000093, 0x000000a9, }, - {0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, }, - {0x0003004f, 0x0003004f, 0x0003004f, 0x0003004f, 0x0003004f, 0x0003004f, 0x0003004f, 0x0003004f, 0x00030066, 0x00030066, 0x00030066, 0x00030066, 0x00030066, 0x00030066, 0x00030066, 0x00030066, }, - {0x0003007e, 0x0003007e, 0x0003007e, 0x0003007e, 0x0003007e, 0x0003007e, 0x0003007e, 0x0003007e, 0x00030094, 0x00030094, 0x00030094, 0x00030094, 0x00030094, 0x00030094, 0x00030094, 0x00030094, }, - {0x00030095, 0x00030095, 0x00030095, 0x00030095, 0x00030095, 0x00030095, 0x00030095, 0x00030095, 0x000300a8, 0x000300a8, 0x000300a8, 0x000300a8, 0x000300a8, 0x000300a8, 0x000300a8, 0x000300a8, }, - {0x000300aa, 0x000300aa, 0x000300aa, 0x000300aa, 0x000300aa, 0x000300aa, 0x000300aa, 0x000300aa, 0x000300ab, 0x000300ab, 0x000300ab, 0x000300ab, 0x000300ab, 0x000300ab, 0x000300ab, 0x000300ab, }, - {0x000100ad, 0x000100ad, 0x000100c0, 0x000100c0, 0x000100c3, 0x000100c3, 0x000100c4, 0x000100c4, 0x00020020, 0x00020020, 0x00020020, 0x00020020, 0x00020038, 0x00020038, 0x00020038, 0x00020038, }, - {0x00020067, 0x00020067, 0x00020067, 0x00020067, 0x000200ac, 0x000200ac, 0x000200ac, 0x000200ac, 0x000200c1, 0x000200c1, 0x000200c1, 0x000200c1, 0x000200c2, 0x000200c2, 0x000200c2, 0x000200c2, }, - {0x00000097, 0x000000ae, 0x000000c5, 0x000000d8, 0x000000d9, 0x000000da, 0x00010008, 0x00010008, 0x00010050, 0x00010050, 0x00010068, 0x00010068, 0x0001007f, 0x0001007f, 0x00010096, 0x00010096, }, - {0x002fffff, 0x0020ffff, 0x001fffff, 0x001effff, 0x001bffff, 0x001cffff, 0x001dffff, 0x0016ffff, 0x0017ffff, 0x0018ffff, 0x0019ffff, 0x001affff, 0x00000021, 0x00000039, 0x00000051, 0x00000080, }, - {0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, }, - {0x00030069, 0x00030069, 0x00030069, 0x00030069, 0x00030069, 0x00030069, 0x00030069, 0x00030069, 0x00030098, 0x00030098, 0x00030098, 0x00030098, 0x00030098, 0x00030098, 0x00030098, 0x00030098, }, - {0x000300af, 0x000300af, 0x000300af, 0x000300af, 0x000300af, 0x000300af, 0x000300af, 0x000300af, 0x000300c6, 0x000300c6, 0x000300c6, 0x000300c6, 0x000300c6, 0x000300c6, 0x000300c6, 0x000300c6, }, - {0x000300db, 0x000300db, 0x000300db, 0x000300db, 0x000300db, 0x000300db, 0x000300db, 0x000300db, 0x000300dc, 0x000300dc, 0x000300dc, 0x000300dc, 0x000300dc, 0x000300dc, 0x000300dc, 0x000300dc, }, - {0x000300f1, 0x000300f1, 0x000300f1, 0x000300f1, 0x000300f1, 0x000300f1, 0x000300f1, 0x000300f1, 0x000300f2, 0x000300f2, 0x000300f2, 0x000300f2, 0x000300f2, 0x000300f2, 0x000300f2, 0x000300f2, }, - {0x00010109, 0x00010109, 0x0001010b, 0x0001010b, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002003a, 0x0002003a, 0x0002003a, 0x0002003a, 0x00020052, 0x00020052, 0x00020052, 0x00020052, }, - {0x0002006a, 0x0002006a, 0x0002006a, 0x0002006a, 0x00020081, 0x00020081, 0x00020081, 0x00020081, 0x000200b0, 0x000200b0, 0x000200b0, 0x000200b0, 0x000200c7, 0x000200c7, 0x000200c7, 0x000200c7, }, - {0x000200dd, 0x000200dd, 0x000200dd, 0x000200dd, 0x000200f0, 0x000200f0, 0x000200f0, 0x000200f0, 0x000200f3, 0x000200f3, 0x000200f3, 0x000200f3, 0x000200f4, 0x000200f4, 0x000200f4, 0x000200f4, }, - {0x0000010a, 0x0000010c, 0x00000121, 0x00000122, 0x0001000b, 0x0001000b, 0x00010023, 0x00010023, 0x00010053, 0x00010053, 0x00010099, 0x00010099, 0x000100de, 0x000100de, 0x000100f5, 0x000100f5, }, - {0x0024ffff, 0x0022ffff, 0x0025ffff, 0x0026ffff, 0x0027ffff, 0x0028ffff, 0x0029ffff, 0x0000003b, 0x0000006b, 0x00000082, 0x0000009a, 0x000000b1, 0x000000c8, 0x000000df, 0x000000f6, 0x00000108, }, - {0x0040ffff, 0x0041ffff, 0x0042ffff, 0x0043ffff, 0x0044ffff, 0x0045ffff, 0x0046ffff, 0x0047ffff, 0x0048ffff, 0x002dffff, 0x002effff, 0x002affff, 0x002bffff, 0x002cffff, 0x0021ffff, 0x0023ffff, }, - {0x0002013b, 0x0002013b, 0x0002013b, 0x0002013b, 0x00020154, 0x00020154, 0x00020154, 0x00020154, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, }, - {0x00030083, 0x00030083, 0x00030083, 0x00030083, 0x00030083, 0x00030083, 0x00030083, 0x00030083, 0x0003009b, 0x0003009b, 0x0003009b, 0x0003009b, 0x0003009b, 0x0003009b, 0x0003009b, 0x0003009b, }, - {0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, }, - {0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x0003006c, 0x0003006c, 0x0003006c, 0x0003006c, 0x0003006c, 0x0003006c, 0x0003006c, 0x0003006c, }, - {0x000300b2, 0x000300b2, 0x000300b2, 0x000300b2, 0x000300b2, 0x000300b2, 0x000300b2, 0x000300b2, 0x000300ca, 0x000300ca, 0x000300ca, 0x000300ca, 0x000300ca, 0x000300ca, 0x000300ca, 0x000300ca, }, - {0x000300e0, 0x000300e0, 0x000300e0, 0x000300e0, 0x000300e0, 0x000300e0, 0x000300e0, 0x000300e0, 0x000300e1, 0x000300e1, 0x000300e1, 0x000300e1, 0x000300e1, 0x000300e1, 0x000300e1, 0x000300e1, }, - {0x000300e2, 0x000300e2, 0x000300e2, 0x000300e2, 0x000300e2, 0x000300e2, 0x000300e2, 0x000300e2, 0x000300f7, 0x000300f7, 0x000300f7, 0x000300f7, 0x000300f7, 0x000300f7, 0x000300f7, 0x000300f7, }, - {0x0003010d, 0x0003010d, 0x0003010d, 0x0003010d, 0x0003010d, 0x0003010d, 0x0003010d, 0x0003010d, 0x0003010e, 0x0003010e, 0x0003010e, 0x0003010e, 0x0003010e, 0x0003010e, 0x0003010e, 0x0003010e, }, - {0x00030123, 0x00030123, 0x00030123, 0x00030123, 0x00030123, 0x00030123, 0x00030123, 0x00030123, 0x00030124, 0x00030124, 0x00030124, 0x00030124, 0x00030124, 0x00030124, 0x00030124, 0x00030124, }, - {0x0001013e, 0x0001013e, 0x0001016c, 0x0001016c, 0x0001016d, 0x0001016d, 0x0001023f, 0x0001023f, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002003d, 0x0002003d, 0x0002003d, 0x0002003d, }, - {0x00020055, 0x00020055, 0x00020055, 0x00020055, 0x000200b3, 0x000200b3, 0x000200b3, 0x000200b3, 0x000200c9, 0x000200c9, 0x000200c9, 0x000200c9, 0x000200f8, 0x000200f8, 0x000200f8, 0x000200f8, }, - {0x0002010f, 0x0002010f, 0x0002010f, 0x0002010f, 0x00020120, 0x00020120, 0x00020120, 0x00020120, 0x00020127, 0x00020127, 0x00020127, 0x00020127, 0x0002013a, 0x0002013a, 0x0002013a, 0x0002013a, }, - {0x00000237, 0x00000238, 0x00000239, 0x0000023a, 0x0000023b, 0x0000023c, 0x0000023d, 0x0000023e, 0x0001000e, 0x0001000e, 0x00010026, 0x00010026, 0x0001006d, 0x0001006d, 0x0001009d, 0x0001009d, }, - {0x000100cb, 0x000100cb, 0x000100cc, 0x000100cc, 0x00010112, 0x00010112, 0x00010125, 0x00010125, 0x00010126, 0x00010126, 0x00010128, 0x00010128, 0x00010138, 0x00010138, 0x00010139, 0x00010139, }, - {0x0030ffff, 0x0031ffff, 0x0032ffff, 0x0033ffff, 0x0034ffff, 0x0035ffff, 0x0036ffff, 0x0037ffff, 0x0038ffff, 0x0039ffff, 0x003affff, 0x003bffff, 0x003cffff, 0x003dffff, 0x003effff, 0x003fffff, }, - {0x0000000d, 0x0000000f, 0x00000010, 0x00000011, 0x00000012, 0x00000013, 0x00000014, 0x00000015, 0x00000016, 0x00000017, 0x00000027, 0x00000028, 0x00000029, 0x0000002a, 0x0000002b, 0x0000002c, }, - {0x0000002d, 0x0000002e, 0x0000002f, 0x0000003e, 0x0000003f, 0x00000040, 0x00000041, 0x00000042, 0x00000043, 0x00000044, 0x00000045, 0x00000046, 0x00000047, 0x00000056, 0x00000057, 0x00000058, }, - {0x00000059, 0x0000005a, 0x0000005b, 0x0000005c, 0x0000005d, 0x0000005e, 0x0000005f, 0x0000006e, 0x0000006f, 0x00000070, 0x00000071, 0x00000072, 0x00000073, 0x00000074, 0x00000075, 0x00000076, }, - {0x00000077, 0x00000084, 0x00000085, 0x00000086, 0x00000087, 0x00000088, 0x00000089, 0x0000008a, 0x0000008b, 0x0000008c, 0x0000008d, 0x0000008e, 0x0000008f, 0x0000009c, 0x0000009e, 0x0000009f, }, - {0x000000a0, 0x000000a1, 0x000000a2, 0x000000a3, 0x000000a4, 0x000000a5, 0x000000a6, 0x000000a7, 0x000000b4, 0x000000b5, 0x000000b6, 0x000000b7, 0x000000b8, 0x000000b9, 0x000000ba, 0x000000bb, }, - {0x000000bc, 0x000000bd, 0x000000be, 0x000000bf, 0x000000cd, 0x000000ce, 0x000000cf, 0x000000d0, 0x000000d1, 0x000000d2, 0x000000d3, 0x000000d4, 0x000000d5, 0x000000d6, 0x000000d7, 0x000000e3, }, - {0x000000e4, 0x000000e5, 0x000000e6, 0x000000e7, 0x000000e8, 0x000000e9, 0x000000ea, 0x000000eb, 0x000000ec, 0x000000ed, 0x000000ee, 0x000000ef, 0x000000f9, 0x000000fa, 0x000000fb, 0x000000fc, }, - {0x000000fd, 0x000000fe, 0x000000ff, 0x00000100, 0x00000101, 0x00000102, 0x00000103, 0x00000104, 0x00000105, 0x00000106, 0x00000107, 0x00000110, 0x00000111, 0x00000113, 0x00000114, 0x00000115, }, - {0x00000116, 0x00000117, 0x00000118, 0x00000119, 0x0000011a, 0x0000011b, 0x0000011c, 0x0000011d, 0x0000011e, 0x0000011f, 0x00000129, 0x0000012a, 0x0000012b, 0x0000012c, 0x0000012d, 0x0000012e, }, - {0x0000012f, 0x00000130, 0x00000131, 0x00000132, 0x00000133, 0x00000134, 0x00000135, 0x00000136, 0x00000137, 0x0000013c, 0x0000013d, 0x0000013f, 0x00000140, 0x00000141, 0x00000142, 0x00000143, }, - {0x00000144, 0x00000145, 0x00000146, 0x00000147, 0x00000148, 0x00000149, 0x0000014a, 0x0000014b, 0x0000014c, 0x0000014d, 0x0000014e, 0x0000014f, 0x00000150, 0x00000151, 0x00000152, 0x00000153, }, - {0x00000155, 0x00000156, 0x00000157, 0x00000158, 0x00000159, 0x0000015a, 0x0000015b, 0x0000015c, 0x0000015d, 0x0000015e, 0x0000015f, 0x00000160, 0x00000161, 0x00000162, 0x00000163, 0x00000164, }, - {0x00000165, 0x00000166, 0x00000167, 0x00000168, 0x00000169, 0x0000016a, 0x0000016b, 0x0000016e, 0x0000016f, 0x00000170, 0x00000171, 0x00000172, 0x00000173, 0x00000174, 0x00000175, 0x00000176, }, - {0x00000177, 0x00000178, 0x00000179, 0x0000017a, 0x0000017b, 0x0000017c, 0x0000017d, 0x0000017e, 0x0000017f, 0x00000180, 0x00000181, 0x00000182, 0x00000183, 0x00000184, 0x00000185, 0x00000186, }, - {0x00000187, 0x00000188, 0x00000189, 0x0000018a, 0x0000018b, 0x0000018c, 0x0000018d, 0x0000018e, 0x0000018f, 0x00000190, 0x00000191, 0x00000192, 0x00000193, 0x00000194, 0x00000195, 0x00000196, }, - {0x00000197, 0x00000198, 0x00000199, 0x0000019a, 0x0000019b, 0x0000019c, 0x0000019d, 0x0000019e, 0x0000019f, 0x000001a0, 0x000001a1, 0x000001a2, 0x000001a3, 0x000001a4, 0x000001a5, 0x000001a6, }, - {0x000001a7, 0x000001a8, 0x000001a9, 0x000001aa, 0x000001ab, 0x000001ac, 0x000001ad, 0x000001ae, 0x000001af, 0x000001b0, 0x000001b1, 0x000001b2, 0x000001b3, 0x000001b4, 0x000001b5, 0x000001b6, }, - {0x000001b7, 0x000001b8, 0x000001b9, 0x000001ba, 0x000001bb, 0x000001bc, 0x000001bd, 0x000001be, 0x000001bf, 0x000001c0, 0x000001c1, 0x000001c2, 0x000001c3, 0x000001c4, 0x000001c5, 0x000001c6, }, - {0x000001c7, 0x000001c8, 0x000001c9, 0x000001ca, 0x000001cb, 0x000001cc, 0x000001cd, 0x000001ce, 0x000001cf, 0x000001d0, 0x000001d1, 0x000001d2, 0x000001d3, 0x000001d4, 0x000001d5, 0x000001d6, }, - {0x000001d7, 0x000001d8, 0x000001d9, 0x000001da, 0x000001db, 0x000001dc, 0x000001dd, 0x000001de, 0x000001df, 0x000001e0, 0x000001e1, 0x000001e2, 0x000001e3, 0x000001e4, 0x000001e5, 0x000001e6, }, - {0x000001e7, 0x000001e8, 0x000001e9, 0x000001ea, 0x000001eb, 0x000001ec, 0x000001ed, 0x000001ee, 0x000001ef, 0x000001f0, 0x000001f1, 0x000001f2, 0x000001f3, 0x000001f4, 0x000001f5, 0x000001f6, }, - {0x000001f7, 0x000001f8, 0x000001f9, 0x000001fa, 0x000001fb, 0x000001fc, 0x000001fd, 0x000001fe, 0x000001ff, 0x00000200, 0x00000201, 0x00000202, 0x00000203, 0x00000204, 0x00000205, 0x00000206, }, - {0x00000207, 0x00000208, 0x00000209, 0x0000020a, 0x0000020b, 0x0000020c, 0x0000020d, 0x0000020e, 0x0000020f, 0x00000210, 0x00000211, 0x00000212, 0x00000213, 0x00000214, 0x00000215, 0x00000216, }, - {0x00000217, 0x00000218, 0x00000219, 0x0000021a, 0x0000021b, 0x0000021c, 0x0000021d, 0x0000021e, 0x0000021f, 0x00000220, 0x00000221, 0x00000222, 0x00000223, 0x00000224, 0x00000225, 0x00000226, }, - {0x00000227, 0x00000228, 0x00000229, 0x0000022a, 0x0000022b, 0x0000022c, 0x0000022d, 0x0000022e, 0x0000022f, 0x00000230, 0x00000231, 0x00000232, 0x00000233, 0x00000234, 0x00000235, 0x00000236, }, -}; - -const uint32_t c_aauiCQMFHuffEnc16[729][2] = -{ - {0x0006, 0x000d}, {0x0005, 0x0010}, {0x0006, 0x000e}, {0x0006, 0x000f}, {0x0006, 0x0010}, {0x0007, 0x000a}, {0x0007, 0x000b}, {0x0008, 0x000a}, - {0x0009, 0x000b}, {0x000b, 0x000d}, {0x000c, 0x000e}, {0x000e, 0x0016}, {0x0010, 0x002d}, {0x0011, 0x0051}, {0x0012, 0x008c}, {0x0014, 0x0000}, - {0x0014, 0x0001}, {0x0014, 0x0002}, {0x0014, 0x0003}, {0x0014, 0x0004}, {0x0014, 0x0005}, {0x0014, 0x0006}, {0x0014, 0x0007}, {0x0014, 0x0008}, - {0x0014, 0x0009}, {0x0014, 0x000a}, {0x0014, 0x000b}, {0x0005, 0x0011}, {0x0004, 0x000f}, {0x0005, 0x0012}, {0x0005, 0x0013}, {0x0005, 0x0014}, - {0x0006, 0x0011}, {0x0006, 0x0012}, {0x0007, 0x000c}, {0x0008, 0x000b}, {0x000a, 0x000c}, {0x000b, 0x000e}, {0x000d, 0x0010}, {0x000e, 0x0017}, - {0x000f, 0x001c}, {0x0013, 0x010b}, {0x0013, 0x010c}, {0x0014, 0x000c}, {0x0014, 0x000d}, {0x0014, 0x000e}, {0x0014, 0x000f}, {0x0014, 0x0010}, - {0x0014, 0x0011}, {0x0014, 0x0012}, {0x0014, 0x0013}, {0x0014, 0x0014}, {0x0014, 0x0015}, {0x0014, 0x0016}, {0x0006, 0x0013}, {0x0005, 0x0015}, - {0x0005, 0x0016}, {0x0005, 0x0017}, {0x0005, 0x0018}, {0x0006, 0x0014}, {0x0007, 0x000d}, {0x0007, 0x000e}, {0x0009, 0x000c}, {0x000a, 0x000d}, - {0x000c, 0x000f}, {0x000d, 0x0011}, {0x000f, 0x001d}, {0x0011, 0x0052}, {0x0012, 0x008d}, {0x0012, 0x008e}, {0x0014, 0x0017}, {0x0014, 0x0018}, - {0x0014, 0x0019}, {0x0014, 0x001a}, {0x0014, 0x001b}, {0x0014, 0x001c}, {0x0014, 0x001d}, {0x0014, 0x001e}, {0x0014, 0x001f}, {0x0014, 0x0020}, - {0x0014, 0x0021}, {0x0006, 0x0015}, {0x0005, 0x0019}, {0x0005, 0x001a}, {0x0005, 0x001b}, {0x0006, 0x0016}, {0x0006, 0x0017}, {0x0007, 0x000f}, - {0x0008, 0x000c}, {0x0009, 0x000d}, {0x000b, 0x000f}, {0x000c, 0x0010}, {0x000d, 0x0012}, {0x000f, 0x001e}, {0x0012, 0x008f}, {0x0014, 0x0022}, - {0x0014, 0x0023}, {0x0014, 0x0024}, {0x0014, 0x0025}, {0x0014, 0x0026}, {0x0014, 0x0027}, {0x0014, 0x0028}, {0x0014, 0x0029}, {0x0014, 0x002a}, - {0x0014, 0x002b}, {0x0014, 0x002c}, {0x0014, 0x002d}, {0x0014, 0x002e}, {0x0006, 0x0018}, {0x0005, 0x001c}, {0x0005, 0x001d}, {0x0006, 0x0019}, - {0x0006, 0x001a}, {0x0007, 0x0010}, {0x0007, 0x0011}, {0x0008, 0x000d}, {0x000a, 0x000e}, {0x000b, 0x0010}, {0x000c, 0x0011}, {0x000e, 0x0018}, - {0x0010, 0x002e}, {0x0012, 0x0090}, {0x0013, 0x010d}, {0x0013, 0x010e}, {0x0014, 0x002f}, {0x0014, 0x0030}, {0x0014, 0x0031}, {0x0014, 0x0032}, - {0x0014, 0x0033}, {0x0014, 0x0034}, {0x0014, 0x0035}, {0x0014, 0x0036}, {0x0014, 0x0037}, {0x0014, 0x0038}, {0x0014, 0x0039}, {0x0007, 0x0012}, - {0x0006, 0x001b}, {0x0006, 0x001c}, {0x0006, 0x001d}, {0x0007, 0x0013}, {0x0007, 0x0014}, {0x0008, 0x000e}, {0x0009, 0x000e}, {0x000b, 0x0011}, - {0x000c, 0x0012}, {0x000d, 0x0013}, {0x000e, 0x0019}, {0x0010, 0x002f}, {0x0012, 0x0091}, {0x0014, 0x003a}, {0x0014, 0x003b}, {0x0014, 0x003c}, - {0x0014, 0x003d}, {0x0014, 0x003e}, {0x0014, 0x003f}, {0x0014, 0x0040}, {0x0014, 0x0041}, {0x0014, 0x0042}, {0x0014, 0x0043}, {0x0014, 0x0044}, - {0x0014, 0x0045}, {0x0014, 0x0046}, {0x0007, 0x0015}, {0x0006, 0x001e}, {0x0006, 0x001f}, {0x0007, 0x0016}, {0x0007, 0x0017}, {0x0008, 0x000f}, - {0x0009, 0x000f}, {0x000a, 0x000f}, {0x000b, 0x0012}, {0x000d, 0x0014}, {0x000e, 0x001a}, {0x000f, 0x001f}, {0x0013, 0x010f}, {0x0011, 0x0053}, - {0x0014, 0x0047}, {0x0014, 0x0048}, {0x0014, 0x0049}, {0x0014, 0x004a}, {0x0014, 0x004b}, {0x0014, 0x004c}, {0x0014, 0x004d}, {0x0014, 0x004e}, - {0x0014, 0x004f}, {0x0014, 0x0050}, {0x0014, 0x0051}, {0x0014, 0x0052}, {0x0014, 0x0053}, {0x0008, 0x0010}, {0x0007, 0x0018}, {0x0007, 0x0019}, - {0x0008, 0x0011}, {0x0008, 0x0012}, {0x0009, 0x0010}, {0x000a, 0x0010}, {0x000b, 0x0013}, {0x000c, 0x0013}, {0x000e, 0x001b}, {0x000f, 0x0020}, - {0x0010, 0x0030}, {0x0012, 0x0092}, {0x0014, 0x0054}, {0x0014, 0x0055}, {0x0014, 0x0056}, {0x0014, 0x0057}, {0x0014, 0x0058}, {0x0014, 0x0059}, - {0x0014, 0x005a}, {0x0014, 0x005b}, {0x0014, 0x005c}, {0x0014, 0x005d}, {0x0014, 0x005e}, {0x0014, 0x005f}, {0x0014, 0x0060}, {0x0014, 0x0061}, - {0x0009, 0x0011}, {0x0008, 0x0013}, {0x0009, 0x0012}, {0x0009, 0x0013}, {0x000a, 0x0011}, {0x000a, 0x0012}, {0x000b, 0x0014}, {0x000c, 0x0014}, - {0x000d, 0x0015}, {0x000e, 0x001c}, {0x000f, 0x0021}, {0x0013, 0x0110}, {0x0012, 0x0093}, {0x0012, 0x0094}, {0x0014, 0x0062}, {0x0014, 0x0063}, - {0x0014, 0x0064}, {0x0014, 0x0065}, {0x0014, 0x0066}, {0x0014, 0x0067}, {0x0014, 0x0068}, {0x0014, 0x0069}, {0x0014, 0x006a}, {0x0014, 0x006b}, - {0x0014, 0x006c}, {0x0014, 0x006d}, {0x0014, 0x006e}, {0x000b, 0x0015}, {0x000a, 0x0013}, {0x000a, 0x0014}, {0x000a, 0x0015}, {0x000b, 0x0016}, - {0x000c, 0x0015}, {0x000d, 0x0016}, {0x000d, 0x0017}, {0x000f, 0x0022}, {0x0010, 0x0031}, {0x0012, 0x0095}, {0x0012, 0x0096}, {0x0014, 0x006f}, - {0x0013, 0x0111}, {0x0014, 0x0070}, {0x0014, 0x0071}, {0x0014, 0x0072}, {0x0014, 0x0073}, {0x0014, 0x0074}, {0x0014, 0x0075}, {0x0014, 0x0076}, - {0x0014, 0x0077}, {0x0014, 0x0078}, {0x0014, 0x0079}, {0x0014, 0x007a}, {0x0014, 0x007b}, {0x0014, 0x007c}, {0x000c, 0x0016}, {0x000b, 0x0017}, - {0x000c, 0x0017}, {0x000c, 0x0018}, {0x000c, 0x0019}, {0x000d, 0x0018}, {0x000e, 0x001d}, {0x000f, 0x0023}, {0x000f, 0x0024}, {0x0011, 0x0054}, - {0x0012, 0x0097}, {0x0014, 0x007d}, {0x0014, 0x007e}, {0x0014, 0x007f}, {0x0014, 0x0080}, {0x0014, 0x0081}, {0x0014, 0x0082}, {0x0014, 0x0083}, - {0x0014, 0x0084}, {0x0014, 0x0085}, {0x0014, 0x0086}, {0x0014, 0x0087}, {0x0014, 0x0088}, {0x0014, 0x0089}, {0x0014, 0x008a}, {0x0014, 0x008b}, - {0x0014, 0x008c}, {0x000e, 0x001e}, {0x000d, 0x0019}, {0x000d, 0x001a}, {0x000d, 0x001b}, {0x000e, 0x001f}, {0x000f, 0x0025}, {0x000f, 0x0026}, - {0x0010, 0x0032}, {0x0010, 0x0033}, {0x0012, 0x0098}, {0x0013, 0x0112}, {0x0014, 0x008d}, {0x0014, 0x008e}, {0x0014, 0x008f}, {0x0014, 0x0090}, - {0x0014, 0x0091}, {0x0014, 0x0092}, {0x0014, 0x0093}, {0x0014, 0x0094}, {0x0014, 0x0095}, {0x0014, 0x0096}, {0x0014, 0x0097}, {0x0014, 0x0098}, - {0x0014, 0x0099}, {0x0014, 0x009a}, {0x0014, 0x009b}, {0x0014, 0x009c}, {0x000f, 0x0027}, {0x000f, 0x0028}, {0x000f, 0x0029}, {0x000f, 0x002a}, - {0x0010, 0x0034}, {0x000f, 0x002b}, {0x0011, 0x0055}, {0x0012, 0x0099}, {0x0012, 0x009a}, {0x0012, 0x009b}, {0x0014, 0x009d}, {0x0013, 0x0113}, - {0x0014, 0x009e}, {0x0014, 0x009f}, {0x0014, 0x00a0}, {0x0014, 0x00a1}, {0x0014, 0x00a2}, {0x0014, 0x00a3}, {0x0014, 0x00a4}, {0x0014, 0x00a5}, - {0x0014, 0x00a6}, {0x0014, 0x00a7}, {0x0014, 0x00a8}, {0x0014, 0x00a9}, {0x0014, 0x00aa}, {0x0014, 0x00ab}, {0x0014, 0x00ac}, {0x0011, 0x0056}, - {0x0010, 0x0035}, {0x0010, 0x0036}, {0x0010, 0x0037}, {0x0011, 0x0057}, {0x0012, 0x009c}, {0x0012, 0x009d}, {0x0012, 0x009e}, {0x0014, 0x00ad}, - {0x0014, 0x00ae}, {0x0014, 0x00af}, {0x0014, 0x00b0}, {0x0014, 0x00b1}, {0x0014, 0x00b2}, {0x0014, 0x00b3}, {0x0014, 0x00b4}, {0x0014, 0x00b5}, - {0x0014, 0x00b6}, {0x0014, 0x00b7}, {0x0014, 0x00b8}, {0x0014, 0x00b9}, {0x0014, 0x00ba}, {0x0014, 0x00bb}, {0x0014, 0x00bc}, {0x0014, 0x00bd}, - {0x0014, 0x00be}, {0x0014, 0x00bf}, {0x0012, 0x009f}, {0x0011, 0x0058}, {0x0012, 0x00a0}, {0x0014, 0x00c0}, {0x0011, 0x0059}, {0x0013, 0x0114}, - {0x0012, 0x00a1}, {0x0014, 0x00c1}, {0x0013, 0x0115}, {0x0014, 0x00c2}, {0x0014, 0x00c3}, {0x0014, 0x00c4}, {0x0014, 0x00c5}, {0x0014, 0x00c6}, - {0x0014, 0x00c7}, {0x0014, 0x00c8}, {0x0014, 0x00c9}, {0x0014, 0x00ca}, {0x0014, 0x00cb}, {0x0014, 0x00cc}, {0x0014, 0x00cd}, {0x0014, 0x00ce}, - {0x0014, 0x00cf}, {0x0014, 0x00d0}, {0x0014, 0x00d1}, {0x0014, 0x00d2}, {0x0014, 0x00d3}, {0x0014, 0x00d4}, {0x0014, 0x00d5}, {0x0014, 0x00d6}, - {0x0014, 0x00d7}, {0x0014, 0x00d8}, {0x0014, 0x00d9}, {0x0014, 0x00da}, {0x0014, 0x00db}, {0x0014, 0x00dc}, {0x0014, 0x00dd}, {0x0014, 0x00de}, - {0x0014, 0x00df}, {0x0014, 0x00e0}, {0x0014, 0x00e1}, {0x0014, 0x00e2}, {0x0014, 0x00e3}, {0x0014, 0x00e4}, {0x0014, 0x00e5}, {0x0014, 0x00e6}, - {0x0014, 0x00e7}, {0x0014, 0x00e8}, {0x0014, 0x00e9}, {0x0014, 0x00ea}, {0x0014, 0x00eb}, {0x0014, 0x00ec}, {0x0014, 0x00ed}, {0x0014, 0x00ee}, - {0x0014, 0x00ef}, {0x0014, 0x00f0}, {0x0014, 0x00f1}, {0x0014, 0x00f2}, {0x0014, 0x00f3}, {0x0014, 0x00f4}, {0x0014, 0x00f5}, {0x0014, 0x00f6}, - {0x0014, 0x00f7}, {0x0014, 0x00f8}, {0x0014, 0x00f9}, {0x0014, 0x00fa}, {0x0014, 0x00fb}, {0x0014, 0x00fc}, {0x0014, 0x00fd}, {0x0014, 0x00fe}, - {0x0014, 0x00ff}, {0x0014, 0x0100}, {0x0014, 0x0101}, {0x0014, 0x0102}, {0x0014, 0x0103}, {0x0014, 0x0104}, {0x0014, 0x0105}, {0x0014, 0x0106}, - {0x0014, 0x0107}, {0x0014, 0x0108}, {0x0014, 0x0109}, {0x0014, 0x010a}, {0x0014, 0x010b}, {0x0014, 0x010c}, {0x0014, 0x010d}, {0x0014, 0x010e}, - {0x0014, 0x010f}, {0x0014, 0x0110}, {0x0014, 0x0111}, {0x0014, 0x0112}, {0x0014, 0x0113}, {0x0014, 0x0114}, {0x0014, 0x0115}, {0x0014, 0x0116}, - {0x0014, 0x0117}, {0x0014, 0x0118}, {0x0014, 0x0119}, {0x0014, 0x011a}, {0x0014, 0x011b}, {0x0014, 0x011c}, {0x0014, 0x011d}, {0x0014, 0x011e}, - {0x0014, 0x011f}, {0x0014, 0x0120}, {0x0014, 0x0121}, {0x0014, 0x0122}, {0x0014, 0x0123}, {0x0014, 0x0124}, {0x0014, 0x0125}, {0x0013, 0x0116}, - {0x0014, 0x0126}, {0x0014, 0x0127}, {0x0014, 0x0128}, {0x0014, 0x0129}, {0x0014, 0x012a}, {0x0014, 0x012b}, {0x0014, 0x012c}, {0x0014, 0x012d}, - {0x0014, 0x012e}, {0x0014, 0x012f}, {0x0014, 0x0130}, {0x0014, 0x0131}, {0x0014, 0x0132}, {0x0014, 0x0133}, {0x0014, 0x0134}, {0x0014, 0x0135}, - {0x0014, 0x0136}, {0x0014, 0x0137}, {0x0014, 0x0138}, {0x0014, 0x0139}, {0x0014, 0x013a}, {0x0014, 0x013b}, {0x0014, 0x013c}, {0x0014, 0x013d}, - {0x0014, 0x013e}, {0x0014, 0x013f}, {0x0014, 0x0140}, {0x0014, 0x0141}, {0x0014, 0x0142}, {0x0014, 0x0143}, {0x0014, 0x0144}, {0x0014, 0x0145}, - {0x0014, 0x0146}, {0x0014, 0x0147}, {0x0014, 0x0148}, {0x0014, 0x0149}, {0x0014, 0x014a}, {0x0014, 0x014b}, {0x0014, 0x014c}, {0x0014, 0x014d}, - {0x0014, 0x014e}, {0x0014, 0x014f}, {0x0014, 0x0150}, {0x0014, 0x0151}, {0x0014, 0x0152}, {0x0014, 0x0153}, {0x0014, 0x0154}, {0x0014, 0x0155}, - {0x0014, 0x0156}, {0x0014, 0x0157}, {0x0014, 0x0158}, {0x0014, 0x0159}, {0x0014, 0x015a}, {0x0014, 0x015b}, {0x0014, 0x015c}, {0x0014, 0x015d}, - {0x0014, 0x015e}, {0x0014, 0x015f}, {0x0014, 0x0160}, {0x0014, 0x0161}, {0x0014, 0x0162}, {0x0014, 0x0163}, {0x0014, 0x0164}, {0x0014, 0x0165}, - {0x0014, 0x0166}, {0x0014, 0x0167}, {0x0014, 0x0168}, {0x0014, 0x0169}, {0x0014, 0x016a}, {0x0014, 0x016b}, {0x0014, 0x016c}, {0x0014, 0x016d}, - {0x0014, 0x016e}, {0x0014, 0x016f}, {0x0014, 0x0170}, {0x0014, 0x0171}, {0x0014, 0x0172}, {0x0014, 0x0173}, {0x0014, 0x0174}, {0x0014, 0x0175}, - {0x0014, 0x0176}, {0x0014, 0x0177}, {0x0014, 0x0178}, {0x0014, 0x0179}, {0x0014, 0x017a}, {0x0014, 0x017b}, {0x0014, 0x017c}, {0x0014, 0x017d}, - {0x0014, 0x017e}, {0x0014, 0x017f}, {0x0014, 0x0180}, {0x0014, 0x0181}, {0x0014, 0x0182}, {0x0014, 0x0183}, {0x0014, 0x0184}, {0x0014, 0x0185}, - {0x0014, 0x0186}, {0x0014, 0x0187}, {0x0014, 0x0188}, {0x0014, 0x0189}, {0x0014, 0x018a}, {0x0014, 0x018b}, {0x0014, 0x018c}, {0x0014, 0x018d}, - {0x0014, 0x018e}, {0x0014, 0x018f}, {0x0014, 0x0190}, {0x0014, 0x0191}, {0x0014, 0x0192}, {0x0014, 0x0193}, {0x0014, 0x0194}, {0x0014, 0x0195}, - {0x0014, 0x0196}, {0x0014, 0x0197}, {0x0014, 0x0198}, {0x0014, 0x0199}, {0x0014, 0x019a}, {0x0014, 0x019b}, {0x0014, 0x019c}, {0x0014, 0x019d}, - {0x0014, 0x019e}, {0x0014, 0x019f}, {0x0014, 0x01a0}, {0x0014, 0x01a1}, {0x0014, 0x01a2}, {0x0014, 0x01a3}, {0x0014, 0x01a4}, {0x0014, 0x01a5}, - {0x0014, 0x01a6}, {0x0014, 0x01a7}, {0x0014, 0x01a8}, {0x0014, 0x01a9}, {0x0014, 0x01aa}, {0x0014, 0x01ab}, {0x0014, 0x01ac}, {0x0014, 0x01ad}, - {0x0014, 0x01ae}, {0x0014, 0x01af}, {0x0014, 0x01b0}, {0x0014, 0x01b1}, {0x0014, 0x01b2}, {0x0014, 0x01b3}, {0x0014, 0x01b4}, {0x0014, 0x01b5}, - {0x0014, 0x01b6}, {0x0014, 0x01b7}, {0x0014, 0x01b8}, {0x0014, 0x01b9}, {0x0014, 0x01ba}, {0x0014, 0x01bb}, {0x0014, 0x01bc}, {0x0014, 0x01bd}, - {0x0014, 0x01be}, {0x0014, 0x01bf}, {0x0014, 0x01c0}, {0x0014, 0x01c1}, {0x0014, 0x01c2}, {0x0014, 0x01c3}, {0x0014, 0x01c4}, {0x0014, 0x01c5}, - {0x0014, 0x01c6}, {0x0014, 0x01c7}, {0x0014, 0x01c8}, {0x0014, 0x01c9}, {0x0014, 0x01ca}, {0x0014, 0x01cb}, {0x0014, 0x01cc}, {0x0014, 0x01cd}, - {0x0014, 0x01ce}, {0x0014, 0x01cf}, {0x0014, 0x01d0}, {0x0014, 0x01d1}, {0x0014, 0x01d2}, {0x0014, 0x01d3}, {0x0014, 0x01d4}, {0x0014, 0x01d5}, - {0x0014, 0x01d6}, {0x0014, 0x01d7}, {0x0014, 0x01d8}, {0x0014, 0x01d9}, {0x0014, 0x01da}, {0x0014, 0x01db}, {0x0014, 0x01dc}, {0x0014, 0x01dd}, - {0x0014, 0x01de}, {0x0014, 0x01df}, {0x0014, 0x01e0}, {0x0014, 0x01e1}, {0x0014, 0x01e2}, {0x0014, 0x01e3}, {0x0014, 0x01e4}, {0x0014, 0x01e5}, - {0x0014, 0x01e6}, {0x0014, 0x01e7}, {0x0014, 0x01e8}, {0x0014, 0x01e9}, {0x0014, 0x01ea}, {0x0014, 0x01eb}, {0x0014, 0x01ec}, {0x0014, 0x01ed}, - {0x0014, 0x01ee}, {0x0014, 0x01ef}, {0x0014, 0x01f0}, {0x0014, 0x01f1}, {0x0014, 0x01f2}, {0x0014, 0x01f3}, {0x0014, 0x01f4}, {0x0014, 0x01f5}, - {0x0014, 0x01f6}, {0x0014, 0x01f7}, {0x0014, 0x01f8}, {0x0014, 0x01f9}, {0x0014, 0x01fa}, {0x0014, 0x01fb}, {0x0014, 0x01fc}, {0x0014, 0x01fd}, - {0x0014, 0x01fe}, {0x0014, 0x01ff}, {0x0014, 0x0200}, {0x0014, 0x0201}, {0x0014, 0x0202}, {0x0014, 0x0203}, {0x0014, 0x0204}, {0x0014, 0x0205}, - {0x0014, 0x0206}, {0x0014, 0x0207}, {0x0014, 0x0208}, {0x0014, 0x0209}, {0x0014, 0x020a}, {0x0014, 0x020b}, {0x0014, 0x020c}, {0x0014, 0x020d}, - {0x0014, 0x020e}, {0x0014, 0x020f}, {0x0014, 0x0210}, {0x0014, 0x0211}, {0x0014, 0x0212}, {0x0014, 0x0213}, {0x0014, 0x0214}, {0x0014, 0x0215}, - {0x0013, 0x0117}, - -}; - -const uint32_t c_aauiCQMFHuffDec16[85][16] = -{ - {0x000fffff, 0x000dffff, 0x000effff, 0x0008ffff, 0x0009ffff, 0x000affff, 0x000bffff, 0x000cffff, 0x0001ffff, 0x0002ffff, 0x0003ffff, 0x0004ffff, 0x0005ffff, 0x0006ffff, 0x0007ffff, 0x0000001c, }, - {0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, }, - {0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, }, - {0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, }, - {0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, }, - {0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x00030052, 0x00030052, 0x00030052, 0x00030052, 0x00030052, 0x00030052, 0x00030052, 0x00030052, }, - {0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, }, - {0x0003006d, 0x0003006d, 0x0003006d, 0x0003006d, 0x0003006d, 0x0003006d, 0x0003006d, 0x0003006d, 0x0003006e, 0x0003006e, 0x0003006e, 0x0003006e, 0x0003006e, 0x0003006e, 0x0003006e, 0x0003006e, }, - {0x000100be, 0x000100be, 0x000100bf, 0x000100bf, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020002, 0x00020002, 0x00020002, 0x00020002, 0x00020003, 0x00020003, 0x00020003, 0x00020003, }, - {0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020020, 0x00020020, 0x00020020, 0x00020020, 0x00020021, 0x00020021, 0x00020021, 0x00020021, 0x00020036, 0x00020036, 0x00020036, 0x00020036, }, - {0x0002003b, 0x0002003b, 0x0002003b, 0x0002003b, 0x00020051, 0x00020051, 0x00020051, 0x00020051, 0x00020055, 0x00020055, 0x00020055, 0x00020055, 0x00020056, 0x00020056, 0x00020056, 0x00020056, }, - {0x0002006c, 0x0002006c, 0x0002006c, 0x0002006c, 0x0002006f, 0x0002006f, 0x0002006f, 0x0002006f, 0x00020070, 0x00020070, 0x00020070, 0x00020070, 0x00020088, 0x00020088, 0x00020088, 0x00020088, }, - {0x00020089, 0x00020089, 0x00020089, 0x00020089, 0x0002008a, 0x0002008a, 0x0002008a, 0x0002008a, 0x000200a3, 0x000200a3, 0x000200a3, 0x000200a3, 0x000200a4, 0x000200a4, 0x000200a4, 0x000200a4, }, - {0x000000bd, 0x000000c0, 0x000000c1, 0x000000d9, 0x00010005, 0x00010005, 0x00010006, 0x00010006, 0x00010022, 0x00010022, 0x0001003c, 0x0001003c, 0x0001003d, 0x0001003d, 0x00010057, 0x00010057, }, - {0x00010071, 0x00010071, 0x00010072, 0x00010072, 0x00010087, 0x00010087, 0x0001008b, 0x0001008b, 0x0001008c, 0x0001008c, 0x000100a2, 0x000100a2, 0x000100a5, 0x000100a5, 0x000100a6, 0x000100a6, }, - {0x0019ffff, 0x0017ffff, 0x0018ffff, 0x0015ffff, 0x0016ffff, 0x0012ffff, 0x0010ffff, 0x0011ffff, 0x0013ffff, 0x0014ffff, 0x00000007, 0x00000023, 0x00000058, 0x00000073, 0x0000008d, 0x000000a7, }, - {0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x00030059, 0x00030059, 0x00030059, 0x00030059, 0x00030059, 0x00030059, 0x00030059, 0x00030059, }, - {0x0003008e, 0x0003008e, 0x0003008e, 0x0003008e, 0x0003008e, 0x0003008e, 0x0003008e, 0x0003008e, 0x000300a8, 0x000300a8, 0x000300a8, 0x000300a8, 0x000300a8, 0x000300a8, 0x000300a8, 0x000300a8, }, - {0x000200f5, 0x000200f5, 0x000200f5, 0x000200f5, 0x000200f6, 0x000200f6, 0x000200f6, 0x000200f6, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, }, - {0x000300c2, 0x000300c2, 0x000300c2, 0x000300c2, 0x000300c2, 0x000300c2, 0x000300c2, 0x000300c2, 0x000300d8, 0x000300d8, 0x000300d8, 0x000300d8, 0x000300d8, 0x000300d8, 0x000300d8, 0x000300d8, }, - {0x000300da, 0x000300da, 0x000300da, 0x000300da, 0x000300da, 0x000300da, 0x000300da, 0x000300da, 0x000300db, 0x000300db, 0x000300db, 0x000300db, 0x000300db, 0x000300db, 0x000300db, 0x000300db, }, - {0x00020024, 0x00020024, 0x00020024, 0x00020024, 0x0002003f, 0x0002003f, 0x0002003f, 0x0002003f, 0x00020074, 0x00020074, 0x00020074, 0x00020074, 0x000200a9, 0x000200a9, 0x000200a9, 0x000200a9, }, - {0x000200c3, 0x000200c3, 0x000200c3, 0x000200c3, 0x000200dc, 0x000200dc, 0x000200dc, 0x000200dc, 0x000200dd, 0x000200dd, 0x000200dd, 0x000200dd, 0x000200f4, 0x000200f4, 0x000200f4, 0x000200f4, }, - {0x0000005b, 0x00000076, 0x00000090, 0x000000c5, 0x000000df, 0x000000f8, 0x0000010e, 0x00000110, 0x00000111, 0x00000112, 0x00010009, 0x00010009, 0x00010025, 0x00010025, 0x0001005a, 0x0001005a, }, - {0x00010075, 0x00010075, 0x0001008f, 0x0001008f, 0x000100aa, 0x000100aa, 0x000100c4, 0x000100c4, 0x000100de, 0x000100de, 0x000100f3, 0x000100f3, 0x000100f7, 0x000100f7, 0x0001010f, 0x0001010f, }, - {0x0032ffff, 0x0043ffff, 0x0025ffff, 0x0023ffff, 0x0024ffff, 0x0021ffff, 0x0020ffff, 0x0022ffff, 0x001cffff, 0x001affff, 0x001bffff, 0x001dffff, 0x001effff, 0x001fffff, 0x0000000a, 0x00000040, }, - {0x0003005c, 0x0003005c, 0x0003005c, 0x0003005c, 0x0003005c, 0x0003005c, 0x0003005c, 0x0003005c, 0x00030091, 0x00030091, 0x00030091, 0x00030091, 0x00030091, 0x00030091, 0x00030091, 0x00030091, }, - {0x000300ab, 0x000300ab, 0x000300ab, 0x000300ab, 0x000300ab, 0x000300ab, 0x000300ab, 0x000300ab, 0x000300e0, 0x000300e0, 0x000300e0, 0x000300e0, 0x000300e0, 0x000300e0, 0x000300e0, 0x000300e0, }, - {0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030041, 0x00030041, 0x00030041, 0x00030041, 0x00030041, 0x00030041, 0x00030041, 0x00030041, }, - {0x000300f9, 0x000300f9, 0x000300f9, 0x000300f9, 0x000300f9, 0x000300f9, 0x000300f9, 0x000300f9, 0x000300fa, 0x000300fa, 0x000300fa, 0x000300fa, 0x000300fa, 0x000300fa, 0x000300fa, 0x000300fa, }, - {0x00030113, 0x00030113, 0x00030113, 0x00030113, 0x00030113, 0x00030113, 0x00030113, 0x00030113, 0x0003012a, 0x0003012a, 0x0003012a, 0x0003012a, 0x0003012a, 0x0003012a, 0x0003012a, 0x0003012a, }, - {0x0003012b, 0x0003012b, 0x0003012b, 0x0003012b, 0x0003012b, 0x0003012b, 0x0003012b, 0x0003012b, 0x0003012c, 0x0003012c, 0x0003012c, 0x0003012c, 0x0003012c, 0x0003012c, 0x0003012c, 0x0003012c, }, - {0x00020077, 0x00020077, 0x00020077, 0x00020077, 0x00020092, 0x00020092, 0x00020092, 0x00020092, 0x000200ac, 0x000200ac, 0x000200ac, 0x000200ac, 0x000200c6, 0x000200c6, 0x000200c6, 0x000200c6, }, - {0x00010145, 0x00010145, 0x00010146, 0x00010146, 0x00010147, 0x00010147, 0x00010149, 0x00010149, 0x0002000b, 0x0002000b, 0x0002000b, 0x0002000b, 0x00020027, 0x00020027, 0x00020027, 0x00020027, }, - {0x000200e1, 0x000200e1, 0x000200e1, 0x000200e1, 0x00020114, 0x00020114, 0x00020114, 0x00020114, 0x00020129, 0x00020129, 0x00020129, 0x00020129, 0x0002012d, 0x0002012d, 0x0002012d, 0x0002012d, }, - {0x000000c8, 0x000000fc, 0x00000130, 0x00000131, 0x00000148, 0x00000160, 0x00000161, 0x00000162, 0x00010028, 0x00010028, 0x00010042, 0x00010042, 0x0001005d, 0x0001005d, 0x000100ad, 0x000100ad, }, - {0x000100c7, 0x000100c7, 0x000100e2, 0x000100e2, 0x000100fb, 0x000100fb, 0x00010115, 0x00010115, 0x00010116, 0x00010116, 0x0001012e, 0x0001012e, 0x0001012f, 0x0001012f, 0x00010144, 0x00010144, }, - {0x0054ffff, 0x0031ffff, 0x0030ffff, 0x002bffff, 0x002cffff, 0x002dffff, 0x002effff, 0x002fffff, 0x0027ffff, 0x0026ffff, 0x0028ffff, 0x0029ffff, 0x002affff, 0x0000000c, 0x00000078, 0x00000093, }, - {0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x000300af, 0x000300af, 0x000300af, 0x000300af, 0x000300af, 0x000300af, 0x000300af, 0x000300af, }, - {0x0002017c, 0x0002017c, 0x0002017c, 0x0002017c, 0x00020180, 0x00020180, 0x00020180, 0x00020180, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, }, - {0x00030117, 0x00030117, 0x00030117, 0x00030117, 0x00030117, 0x00030117, 0x00030117, 0x00030117, 0x0003014a, 0x0003014a, 0x0003014a, 0x0003014a, 0x0003014a, 0x0003014a, 0x0003014a, 0x0003014a, }, - {0x0003015f, 0x0003015f, 0x0003015f, 0x0003015f, 0x0003015f, 0x0003015f, 0x0003015f, 0x0003015f, 0x00030163, 0x00030163, 0x00030163, 0x00030163, 0x00030163, 0x00030163, 0x00030163, 0x00030163, }, - {0x0003017b, 0x0003017b, 0x0003017b, 0x0003017b, 0x0003017b, 0x0003017b, 0x0003017b, 0x0003017b, 0x0003017e, 0x0003017e, 0x0003017e, 0x0003017e, 0x0003017e, 0x0003017e, 0x0003017e, 0x0003017e, }, - {0x0002000e, 0x0002000e, 0x0002000e, 0x0002000e, 0x00020044, 0x00020044, 0x00020044, 0x00020044, 0x00020045, 0x00020045, 0x00020045, 0x00020045, 0x0002005e, 0x0002005e, 0x0002005e, 0x0002005e, }, - {0x00020079, 0x00020079, 0x00020079, 0x00020079, 0x00020094, 0x00020094, 0x00020094, 0x00020094, 0x000200c9, 0x000200c9, 0x000200c9, 0x000200c9, 0x000200e4, 0x000200e4, 0x000200e4, 0x000200e4, }, - {0x000200e5, 0x000200e5, 0x000200e5, 0x000200e5, 0x000200fd, 0x000200fd, 0x000200fd, 0x000200fd, 0x000200fe, 0x000200fe, 0x000200fe, 0x000200fe, 0x00020118, 0x00020118, 0x00020118, 0x00020118, }, - {0x00020132, 0x00020132, 0x00020132, 0x00020132, 0x0002014b, 0x0002014b, 0x0002014b, 0x0002014b, 0x0002014c, 0x0002014c, 0x0002014c, 0x0002014c, 0x0002014d, 0x0002014d, 0x0002014d, 0x0002014d, }, - {0x00020164, 0x00020164, 0x00020164, 0x00020164, 0x00020165, 0x00020165, 0x00020165, 0x00020165, 0x00020166, 0x00020166, 0x00020166, 0x00020166, 0x0002017a, 0x0002017a, 0x0002017a, 0x0002017a, }, - {0x000100e3, 0x000100e3, 0x00010100, 0x00010100, 0x00010133, 0x00010133, 0x0001014f, 0x0001014f, 0x0001017f, 0x0001017f, 0x00010182, 0x00010182, 0x000101e7, 0x000101e7, 0x000102d8, 0x000102d8, }, - {0x000002d2, 0x000002d3, 0x000002d4, 0x000002d5, 0x000002d6, 0x000002d7, 0x00010029, 0x00010029, 0x0001002a, 0x0001002a, 0x0001007a, 0x0001007a, 0x0001007b, 0x0001007b, 0x000100ae, 0x000100ae, }, - {0x0034ffff, 0x0033ffff, 0x0035ffff, 0x0036ffff, 0x0039ffff, 0x0037ffff, 0x0038ffff, 0x003affff, 0x003bffff, 0x003cffff, 0x003dffff, 0x003effff, 0x003fffff, 0x0040ffff, 0x0041ffff, 0x0042ffff, }, - {0x0000002f, 0x00000030, 0x00000031, 0x00000032, 0x00000033, 0x00000034, 0x00000035, 0x00000046, 0x00000047, 0x00000048, 0x00000049, 0x0000004a, 0x0000004b, 0x0000004c, 0x0000004d, 0x0000004e, }, - {0x0000000f, 0x00000010, 0x00000011, 0x00000012, 0x00000013, 0x00000014, 0x00000015, 0x00000016, 0x00000017, 0x00000018, 0x00000019, 0x0000001a, 0x0000002b, 0x0000002c, 0x0000002d, 0x0000002e, }, - {0x0000004f, 0x00000050, 0x0000005f, 0x00000060, 0x00000061, 0x00000062, 0x00000063, 0x00000064, 0x00000065, 0x00000066, 0x00000067, 0x00000068, 0x00000069, 0x0000006a, 0x0000006b, 0x0000007c, }, - {0x0000007d, 0x0000007e, 0x0000007f, 0x00000080, 0x00000081, 0x00000082, 0x00000083, 0x00000084, 0x00000085, 0x00000086, 0x00000095, 0x00000096, 0x00000097, 0x00000098, 0x00000099, 0x0000009a, }, - {0x000000b9, 0x000000ba, 0x000000bb, 0x000000bc, 0x000000ca, 0x000000cb, 0x000000cc, 0x000000cd, 0x000000ce, 0x000000cf, 0x000000d0, 0x000000d1, 0x000000d2, 0x000000d3, 0x000000d4, 0x000000d5, }, - {0x000000d6, 0x000000d7, 0x000000e6, 0x000000e7, 0x000000e8, 0x000000e9, 0x000000ea, 0x000000eb, 0x000000ec, 0x000000ed, 0x000000ee, 0x000000ef, 0x000000f0, 0x000000f1, 0x000000f2, 0x000000ff, }, - {0x0000009b, 0x0000009c, 0x0000009d, 0x0000009e, 0x0000009f, 0x000000a0, 0x000000a1, 0x000000b0, 0x000000b1, 0x000000b2, 0x000000b3, 0x000000b4, 0x000000b5, 0x000000b6, 0x000000b7, 0x000000b8, }, - {0x00000101, 0x00000102, 0x00000103, 0x00000104, 0x00000105, 0x00000106, 0x00000107, 0x00000108, 0x00000109, 0x0000010a, 0x0000010b, 0x0000010c, 0x0000010d, 0x00000119, 0x0000011a, 0x0000011b, }, - {0x0000011c, 0x0000011d, 0x0000011e, 0x0000011f, 0x00000120, 0x00000121, 0x00000122, 0x00000123, 0x00000124, 0x00000125, 0x00000126, 0x00000127, 0x00000128, 0x00000134, 0x00000135, 0x00000136, }, - {0x00000137, 0x00000138, 0x00000139, 0x0000013a, 0x0000013b, 0x0000013c, 0x0000013d, 0x0000013e, 0x0000013f, 0x00000140, 0x00000141, 0x00000142, 0x00000143, 0x0000014e, 0x00000150, 0x00000151, }, - {0x00000152, 0x00000153, 0x00000154, 0x00000155, 0x00000156, 0x00000157, 0x00000158, 0x00000159, 0x0000015a, 0x0000015b, 0x0000015c, 0x0000015d, 0x0000015e, 0x00000167, 0x00000168, 0x00000169, }, - {0x0000016a, 0x0000016b, 0x0000016c, 0x0000016d, 0x0000016e, 0x0000016f, 0x00000170, 0x00000171, 0x00000172, 0x00000173, 0x00000174, 0x00000175, 0x00000176, 0x00000177, 0x00000178, 0x00000179, }, - {0x0000017d, 0x00000181, 0x00000183, 0x00000184, 0x00000185, 0x00000186, 0x00000187, 0x00000188, 0x00000189, 0x0000018a, 0x0000018b, 0x0000018c, 0x0000018d, 0x0000018e, 0x0000018f, 0x00000190, }, - {0x00000191, 0x00000192, 0x00000193, 0x00000194, 0x00000195, 0x00000196, 0x00000197, 0x00000198, 0x00000199, 0x0000019a, 0x0000019b, 0x0000019c, 0x0000019d, 0x0000019e, 0x0000019f, 0x000001a0, }, - {0x000001a1, 0x000001a2, 0x000001a3, 0x000001a4, 0x000001a5, 0x000001a6, 0x000001a7, 0x000001a8, 0x000001a9, 0x000001aa, 0x000001ab, 0x000001ac, 0x000001ad, 0x000001ae, 0x000001af, 0x000001b0, }, - {0x000001b1, 0x000001b2, 0x000001b3, 0x000001b4, 0x000001b5, 0x000001b6, 0x000001b7, 0x000001b8, 0x000001b9, 0x000001ba, 0x000001bb, 0x000001bc, 0x000001bd, 0x000001be, 0x000001bf, 0x000001c0, }, - {0x0044ffff, 0x0045ffff, 0x0046ffff, 0x0047ffff, 0x0048ffff, 0x0049ffff, 0x004affff, 0x004bffff, 0x004cffff, 0x004dffff, 0x004effff, 0x004fffff, 0x0050ffff, 0x0051ffff, 0x0052ffff, 0x0053ffff, }, - {0x000001c1, 0x000001c2, 0x000001c3, 0x000001c4, 0x000001c5, 0x000001c6, 0x000001c7, 0x000001c8, 0x000001c9, 0x000001ca, 0x000001cb, 0x000001cc, 0x000001cd, 0x000001ce, 0x000001cf, 0x000001d0, }, - {0x000001d1, 0x000001d2, 0x000001d3, 0x000001d4, 0x000001d5, 0x000001d6, 0x000001d7, 0x000001d8, 0x000001d9, 0x000001da, 0x000001db, 0x000001dc, 0x000001dd, 0x000001de, 0x000001df, 0x000001e0, }, - {0x000001e1, 0x000001e2, 0x000001e3, 0x000001e4, 0x000001e5, 0x000001e6, 0x000001e8, 0x000001e9, 0x000001ea, 0x000001eb, 0x000001ec, 0x000001ed, 0x000001ee, 0x000001ef, 0x000001f0, 0x000001f1, }, - {0x000001f2, 0x000001f3, 0x000001f4, 0x000001f5, 0x000001f6, 0x000001f7, 0x000001f8, 0x000001f9, 0x000001fa, 0x000001fb, 0x000001fc, 0x000001fd, 0x000001fe, 0x000001ff, 0x00000200, 0x00000201, }, - {0x00000202, 0x00000203, 0x00000204, 0x00000205, 0x00000206, 0x00000207, 0x00000208, 0x00000209, 0x0000020a, 0x0000020b, 0x0000020c, 0x0000020d, 0x0000020e, 0x0000020f, 0x00000210, 0x00000211, }, - {0x00000212, 0x00000213, 0x00000214, 0x00000215, 0x00000216, 0x00000217, 0x00000218, 0x00000219, 0x0000021a, 0x0000021b, 0x0000021c, 0x0000021d, 0x0000021e, 0x0000021f, 0x00000220, 0x00000221, }, - {0x00000222, 0x00000223, 0x00000224, 0x00000225, 0x00000226, 0x00000227, 0x00000228, 0x00000229, 0x0000022a, 0x0000022b, 0x0000022c, 0x0000022d, 0x0000022e, 0x0000022f, 0x00000230, 0x00000231, }, - {0x00000232, 0x00000233, 0x00000234, 0x00000235, 0x00000236, 0x00000237, 0x00000238, 0x00000239, 0x0000023a, 0x0000023b, 0x0000023c, 0x0000023d, 0x0000023e, 0x0000023f, 0x00000240, 0x00000241, }, - {0x00000242, 0x00000243, 0x00000244, 0x00000245, 0x00000246, 0x00000247, 0x00000248, 0x00000249, 0x0000024a, 0x0000024b, 0x0000024c, 0x0000024d, 0x0000024e, 0x0000024f, 0x00000250, 0x00000251, }, - {0x00000252, 0x00000253, 0x00000254, 0x00000255, 0x00000256, 0x00000257, 0x00000258, 0x00000259, 0x0000025a, 0x0000025b, 0x0000025c, 0x0000025d, 0x0000025e, 0x0000025f, 0x00000260, 0x00000261, }, - {0x00000262, 0x00000263, 0x00000264, 0x00000265, 0x00000266, 0x00000267, 0x00000268, 0x00000269, 0x0000026a, 0x0000026b, 0x0000026c, 0x0000026d, 0x0000026e, 0x0000026f, 0x00000270, 0x00000271, }, - {0x00000272, 0x00000273, 0x00000274, 0x00000275, 0x00000276, 0x00000277, 0x00000278, 0x00000279, 0x0000027a, 0x0000027b, 0x0000027c, 0x0000027d, 0x0000027e, 0x0000027f, 0x00000280, 0x00000281, }, - {0x00000282, 0x00000283, 0x00000284, 0x00000285, 0x00000286, 0x00000287, 0x00000288, 0x00000289, 0x0000028a, 0x0000028b, 0x0000028c, 0x0000028d, 0x0000028e, 0x0000028f, 0x00000290, 0x00000291, }, - {0x00000292, 0x00000293, 0x00000294, 0x00000295, 0x00000296, 0x00000297, 0x00000298, 0x00000299, 0x0000029a, 0x0000029b, 0x0000029c, 0x0000029d, 0x0000029e, 0x0000029f, 0x000002a0, 0x000002a1, }, - {0x000002a2, 0x000002a3, 0x000002a4, 0x000002a5, 0x000002a6, 0x000002a7, 0x000002a8, 0x000002a9, 0x000002aa, 0x000002ab, 0x000002ac, 0x000002ad, 0x000002ae, 0x000002af, 0x000002b0, 0x000002b1, }, - {0x000002b2, 0x000002b3, 0x000002b4, 0x000002b5, 0x000002b6, 0x000002b7, 0x000002b8, 0x000002b9, 0x000002ba, 0x000002bb, 0x000002bc, 0x000002bd, 0x000002be, 0x000002bf, 0x000002c0, 0x000002c1, }, - {0x000002c2, 0x000002c3, 0x000002c4, 0x000002c5, 0x000002c6, 0x000002c7, 0x000002c8, 0x000002c9, 0x000002ca, 0x000002cb, 0x000002cc, 0x000002cd, 0x000002ce, 0x000002cf, 0x000002d0, 0x000002d1, }, -}; - -const uint32_t c_aauiCQMFHuffEnc17[729][2] = -{ - {0x0006, 0x0012}, {0x0006, 0x0013}, {0x0006, 0x0014}, {0x0006, 0x0015}, {0x0007, 0x000f}, {0x0007, 0x0010}, {0x0007, 0x0011}, {0x0008, 0x000e}, - {0x0008, 0x000f}, {0x0009, 0x000f}, {0x000a, 0x000f}, {0x000c, 0x0011}, {0x000d, 0x0014}, {0x000e, 0x0017}, {0x0010, 0x002d}, {0x0011, 0x004c}, - {0x0012, 0x008a}, {0x0014, 0x0000}, {0x0014, 0x0001}, {0x0014, 0x0002}, {0x0014, 0x0003}, {0x0014, 0x0004}, {0x0014, 0x0005}, {0x0014, 0x0006}, - {0x0014, 0x0007}, {0x0014, 0x0008}, {0x0014, 0x0009}, {0x0006, 0x0016}, {0x0005, 0x0018}, {0x0005, 0x0019}, {0x0005, 0x001a}, {0x0006, 0x0017}, - {0x0006, 0x0018}, {0x0006, 0x0019}, {0x0007, 0x0012}, {0x0007, 0x0013}, {0x0008, 0x0010}, {0x000a, 0x0010}, {0x000b, 0x0011}, {0x000c, 0x0012}, - {0x000e, 0x0018}, {0x000f, 0x0020}, {0x0011, 0x004d}, {0x0013, 0x00e4}, {0x0014, 0x000a}, {0x0014, 0x000b}, {0x0014, 0x000c}, {0x0014, 0x000d}, - {0x0014, 0x000e}, {0x0014, 0x000f}, {0x0014, 0x0010}, {0x0014, 0x0011}, {0x0014, 0x0012}, {0x0014, 0x0013}, {0x0006, 0x001a}, {0x0005, 0x001b}, - {0x0005, 0x001c}, {0x0005, 0x001d}, {0x0006, 0x001b}, {0x0006, 0x001c}, {0x0006, 0x001d}, {0x0007, 0x0014}, {0x0008, 0x0011}, {0x0009, 0x0010}, - {0x000a, 0x0011}, {0x000b, 0x0012}, {0x000c, 0x0013}, {0x000e, 0x0019}, {0x000f, 0x0021}, {0x0010, 0x002e}, {0x0013, 0x00e5}, {0x0013, 0x00e6}, - {0x0014, 0x0014}, {0x0014, 0x0015}, {0x0014, 0x0016}, {0x0014, 0x0017}, {0x0014, 0x0018}, {0x0014, 0x0019}, {0x0014, 0x001a}, {0x0014, 0x001b}, - {0x0014, 0x001c}, {0x0006, 0x001e}, {0x0005, 0x001e}, {0x0005, 0x001f}, {0x0006, 0x001f}, {0x0006, 0x0020}, {0x0006, 0x0021}, {0x0006, 0x0022}, - {0x0007, 0x0015}, {0x0008, 0x0012}, {0x0009, 0x0011}, {0x000a, 0x0012}, {0x000b, 0x0013}, {0x000c, 0x0014}, {0x000e, 0x001a}, {0x000f, 0x0022}, - {0x0010, 0x002f}, {0x0013, 0x00e7}, {0x0013, 0x00e8}, {0x0014, 0x001d}, {0x0014, 0x001e}, {0x0014, 0x001f}, {0x0014, 0x0020}, {0x0014, 0x0021}, - {0x0014, 0x0022}, {0x0014, 0x0023}, {0x0014, 0x0024}, {0x0014, 0x0025}, {0x0006, 0x0023}, {0x0006, 0x0024}, {0x0006, 0x0025}, {0x0006, 0x0026}, - {0x0006, 0x0027}, {0x0006, 0x0028}, {0x0007, 0x0016}, {0x0007, 0x0017}, {0x0008, 0x0013}, {0x0009, 0x0012}, {0x000a, 0x0013}, {0x000c, 0x0015}, - {0x000d, 0x0015}, {0x000f, 0x0023}, {0x0010, 0x0030}, {0x0011, 0x004e}, {0x0014, 0x0026}, {0x0014, 0x0027}, {0x0014, 0x0028}, {0x0014, 0x0029}, - {0x0014, 0x002a}, {0x0014, 0x002b}, {0x0014, 0x002c}, {0x0014, 0x002d}, {0x0014, 0x002e}, {0x0014, 0x002f}, {0x0014, 0x0030}, {0x0007, 0x0018}, - {0x0006, 0x0029}, {0x0006, 0x002a}, {0x0006, 0x002b}, {0x0006, 0x002c}, {0x0007, 0x0019}, {0x0007, 0x001a}, {0x0008, 0x0014}, {0x0009, 0x0013}, - {0x000a, 0x0014}, {0x000b, 0x0014}, {0x000c, 0x0016}, {0x000d, 0x0016}, {0x000f, 0x0024}, {0x0010, 0x0031}, {0x0011, 0x004f}, {0x0014, 0x0031}, - {0x0014, 0x0032}, {0x0014, 0x0033}, {0x0014, 0x0034}, {0x0014, 0x0035}, {0x0014, 0x0036}, {0x0014, 0x0037}, {0x0014, 0x0038}, {0x0014, 0x0039}, - {0x0014, 0x003a}, {0x0014, 0x003b}, {0x0007, 0x001b}, {0x0006, 0x002d}, {0x0006, 0x002e}, {0x0006, 0x002f}, {0x0007, 0x001c}, {0x0007, 0x001d}, - {0x0008, 0x0015}, {0x0009, 0x0014}, {0x000a, 0x0015}, {0x000a, 0x0016}, {0x000c, 0x0017}, {0x000d, 0x0017}, {0x000e, 0x001b}, {0x000f, 0x0025}, - {0x0011, 0x0050}, {0x0011, 0x0051}, {0x0014, 0x003c}, {0x0014, 0x003d}, {0x0014, 0x003e}, {0x0014, 0x003f}, {0x0014, 0x0040}, {0x0014, 0x0041}, - {0x0014, 0x0042}, {0x0014, 0x0043}, {0x0014, 0x0044}, {0x0014, 0x0045}, {0x0014, 0x0046}, {0x0008, 0x0016}, {0x0007, 0x001e}, {0x0007, 0x001f}, - {0x0007, 0x0020}, {0x0007, 0x0021}, {0x0008, 0x0017}, {0x0008, 0x0018}, {0x0009, 0x0015}, {0x000a, 0x0017}, {0x000b, 0x0015}, {0x000c, 0x0018}, - {0x000e, 0x001c}, {0x000e, 0x001d}, {0x0010, 0x0032}, {0x0012, 0x008b}, {0x0012, 0x008c}, {0x0014, 0x0047}, {0x0014, 0x0048}, {0x0014, 0x0049}, - {0x0014, 0x004a}, {0x0014, 0x004b}, {0x0014, 0x004c}, {0x0014, 0x004d}, {0x0014, 0x004e}, {0x0014, 0x004f}, {0x0014, 0x0050}, {0x0014, 0x0051}, - {0x0008, 0x0019}, {0x0007, 0x0022}, {0x0007, 0x0023}, {0x0008, 0x001a}, {0x0008, 0x001b}, {0x0009, 0x0016}, {0x0009, 0x0017}, {0x000a, 0x0018}, - {0x000b, 0x0016}, {0x000c, 0x0019}, {0x000d, 0x0018}, {0x000e, 0x001e}, {0x0010, 0x0033}, {0x0011, 0x0052}, {0x0014, 0x0052}, {0x0013, 0x00e9}, - {0x0014, 0x0053}, {0x0014, 0x0054}, {0x0014, 0x0055}, {0x0014, 0x0056}, {0x0014, 0x0057}, {0x0014, 0x0058}, {0x0014, 0x0059}, {0x0014, 0x005a}, - {0x0014, 0x005b}, {0x0014, 0x005c}, {0x0014, 0x005d}, {0x0009, 0x0018}, {0x0008, 0x001c}, {0x0008, 0x001d}, {0x0009, 0x0019}, {0x0009, 0x001a}, - {0x000a, 0x0019}, {0x000a, 0x001a}, {0x000b, 0x0017}, {0x000c, 0x001a}, {0x000d, 0x0019}, {0x000e, 0x001f}, {0x000f, 0x0026}, {0x0010, 0x0034}, - {0x0012, 0x008d}, {0x0013, 0x00ea}, {0x0014, 0x005e}, {0x0014, 0x005f}, {0x0014, 0x0060}, {0x0014, 0x0061}, {0x0014, 0x0062}, {0x0014, 0x0063}, - {0x0014, 0x0064}, {0x0014, 0x0065}, {0x0014, 0x0066}, {0x0014, 0x0067}, {0x0014, 0x0068}, {0x0014, 0x0069}, {0x000b, 0x0018}, {0x0009, 0x001b}, - {0x000a, 0x001b}, {0x000a, 0x001c}, {0x000a, 0x001d}, {0x000b, 0x0019}, {0x000b, 0x001a}, {0x000c, 0x001b}, {0x000d, 0x001a}, {0x000e, 0x0020}, - {0x000f, 0x0027}, {0x0012, 0x008e}, {0x0011, 0x0053}, {0x0013, 0x00eb}, {0x0014, 0x006a}, {0x0014, 0x006b}, {0x0014, 0x006c}, {0x0014, 0x006d}, - {0x0014, 0x006e}, {0x0014, 0x006f}, {0x0014, 0x0070}, {0x0014, 0x0071}, {0x0014, 0x0072}, {0x0014, 0x0073}, {0x0014, 0x0074}, {0x0014, 0x0075}, - {0x0014, 0x0076}, {0x000c, 0x001c}, {0x000b, 0x001b}, {0x000b, 0x001c}, {0x000b, 0x001d}, {0x000c, 0x001d}, {0x000c, 0x001e}, {0x000d, 0x001b}, - {0x000d, 0x001c}, {0x000e, 0x0021}, {0x0010, 0x0035}, {0x0010, 0x0036}, {0x0011, 0x0054}, {0x0013, 0x00ec}, {0x0014, 0x0077}, {0x0014, 0x0078}, - {0x0014, 0x0079}, {0x0014, 0x007a}, {0x0014, 0x007b}, {0x0014, 0x007c}, {0x0014, 0x007d}, {0x0014, 0x007e}, {0x0014, 0x007f}, {0x0014, 0x0080}, - {0x0014, 0x0081}, {0x0014, 0x0082}, {0x0014, 0x0083}, {0x0014, 0x0084}, {0x000d, 0x001d}, {0x000c, 0x001f}, {0x000c, 0x0020}, {0x000c, 0x0021}, - {0x000d, 0x001e}, {0x000d, 0x001f}, {0x000e, 0x0022}, {0x000f, 0x0028}, {0x0010, 0x0037}, {0x0010, 0x0038}, {0x0010, 0x0039}, {0x0012, 0x008f}, - {0x0013, 0x00ed}, {0x0014, 0x0085}, {0x0014, 0x0086}, {0x0014, 0x0087}, {0x0014, 0x0088}, {0x0014, 0x0089}, {0x0014, 0x008a}, {0x0014, 0x008b}, - {0x0014, 0x008c}, {0x0014, 0x008d}, {0x0014, 0x008e}, {0x0014, 0x008f}, {0x0014, 0x0090}, {0x0014, 0x0091}, {0x0014, 0x0092}, {0x000e, 0x0023}, - {0x000d, 0x0020}, {0x000d, 0x0021}, {0x000e, 0x0024}, {0x000e, 0x0025}, {0x000e, 0x0026}, {0x000f, 0x0029}, {0x0010, 0x003a}, {0x0010, 0x003b}, - {0x0012, 0x0090}, {0x0014, 0x0093}, {0x0014, 0x0094}, {0x0014, 0x0095}, {0x0014, 0x0096}, {0x0014, 0x0097}, {0x0014, 0x0098}, {0x0014, 0x0099}, - {0x0014, 0x009a}, {0x0014, 0x009b}, {0x0014, 0x009c}, {0x0014, 0x009d}, {0x0014, 0x009e}, {0x0014, 0x009f}, {0x0014, 0x00a0}, {0x0014, 0x00a1}, - {0x0014, 0x00a2}, {0x0014, 0x00a3}, {0x000f, 0x002a}, {0x000e, 0x0027}, {0x000f, 0x002b}, {0x000f, 0x002c}, {0x000f, 0x002d}, {0x0010, 0x003c}, - {0x0010, 0x003d}, {0x0011, 0x0055}, {0x0011, 0x0056}, {0x0014, 0x00a4}, {0x0014, 0x00a5}, {0x0014, 0x00a6}, {0x0014, 0x00a7}, {0x0014, 0x00a8}, - {0x0014, 0x00a9}, {0x0014, 0x00aa}, {0x0014, 0x00ab}, {0x0014, 0x00ac}, {0x0014, 0x00ad}, {0x0014, 0x00ae}, {0x0014, 0x00af}, {0x0014, 0x00b0}, - {0x0014, 0x00b1}, {0x0014, 0x00b2}, {0x0014, 0x00b3}, {0x0014, 0x00b4}, {0x0014, 0x00b5}, {0x0012, 0x0091}, {0x0010, 0x003e}, {0x0010, 0x003f}, - {0x0011, 0x0057}, {0x0011, 0x0058}, {0x0011, 0x0059}, {0x0012, 0x0092}, {0x0013, 0x00ee}, {0x0013, 0x00ef}, {0x0012, 0x0093}, {0x0014, 0x00b6}, - {0x0014, 0x00b7}, {0x0014, 0x00b8}, {0x0014, 0x00b9}, {0x0014, 0x00ba}, {0x0014, 0x00bb}, {0x0014, 0x00bc}, {0x0014, 0x00bd}, {0x0014, 0x00be}, - {0x0014, 0x00bf}, {0x0014, 0x00c0}, {0x0014, 0x00c1}, {0x0014, 0x00c2}, {0x0014, 0x00c3}, {0x0014, 0x00c4}, {0x0014, 0x00c5}, {0x0014, 0x00c6}, - {0x0013, 0x00f0}, {0x0012, 0x0094}, {0x0012, 0x0095}, {0x0012, 0x0096}, {0x0014, 0x00c7}, {0x0014, 0x00c8}, {0x0014, 0x00c9}, {0x0014, 0x00ca}, - {0x0014, 0x00cb}, {0x0014, 0x00cc}, {0x0014, 0x00cd}, {0x0014, 0x00ce}, {0x0014, 0x00cf}, {0x0014, 0x00d0}, {0x0014, 0x00d1}, {0x0014, 0x00d2}, - {0x0014, 0x00d3}, {0x0014, 0x00d4}, {0x0014, 0x00d5}, {0x0014, 0x00d6}, {0x0014, 0x00d7}, {0x0014, 0x00d8}, {0x0014, 0x00d9}, {0x0014, 0x00da}, - {0x0014, 0x00db}, {0x0014, 0x00dc}, {0x0014, 0x00dd}, {0x0014, 0x00de}, {0x0012, 0x0097}, {0x0014, 0x00df}, {0x0014, 0x00e0}, {0x0014, 0x00e1}, - {0x0014, 0x00e2}, {0x0014, 0x00e3}, {0x0014, 0x00e4}, {0x0014, 0x00e5}, {0x0014, 0x00e6}, {0x0014, 0x00e7}, {0x0014, 0x00e8}, {0x0014, 0x00e9}, - {0x0014, 0x00ea}, {0x0014, 0x00eb}, {0x0014, 0x00ec}, {0x0014, 0x00ed}, {0x0014, 0x00ee}, {0x0014, 0x00ef}, {0x0014, 0x00f0}, {0x0014, 0x00f1}, - {0x0014, 0x00f2}, {0x0014, 0x00f3}, {0x0014, 0x00f4}, {0x0014, 0x00f5}, {0x0014, 0x00f6}, {0x0014, 0x00f7}, {0x0014, 0x00f8}, {0x0014, 0x00f9}, - {0x0014, 0x00fa}, {0x0014, 0x00fb}, {0x0014, 0x00fc}, {0x0014, 0x00fd}, {0x0014, 0x00fe}, {0x0014, 0x00ff}, {0x0014, 0x0100}, {0x0014, 0x0101}, - {0x0014, 0x0102}, {0x0014, 0x0103}, {0x0014, 0x0104}, {0x0014, 0x0105}, {0x0014, 0x0106}, {0x0014, 0x0107}, {0x0014, 0x0108}, {0x0014, 0x0109}, - {0x0014, 0x010a}, {0x0014, 0x010b}, {0x0014, 0x010c}, {0x0014, 0x010d}, {0x0014, 0x010e}, {0x0014, 0x010f}, {0x0014, 0x0110}, {0x0014, 0x0111}, - {0x0014, 0x0112}, {0x0014, 0x0113}, {0x0014, 0x0114}, {0x0014, 0x0115}, {0x0014, 0x0116}, {0x0014, 0x0117}, {0x0014, 0x0118}, {0x0014, 0x0119}, - {0x0014, 0x011a}, {0x0014, 0x011b}, {0x0014, 0x011c}, {0x0014, 0x011d}, {0x0014, 0x011e}, {0x0014, 0x011f}, {0x0014, 0x0120}, {0x0014, 0x0121}, - {0x0014, 0x0122}, {0x0014, 0x0123}, {0x0014, 0x0124}, {0x0014, 0x0125}, {0x0014, 0x0126}, {0x0014, 0x0127}, {0x0014, 0x0128}, {0x0014, 0x0129}, - {0x0014, 0x012a}, {0x0014, 0x012b}, {0x0014, 0x012c}, {0x0014, 0x012d}, {0x0014, 0x012e}, {0x0014, 0x012f}, {0x0014, 0x0130}, {0x0014, 0x0131}, - {0x0014, 0x0132}, {0x0014, 0x0133}, {0x0014, 0x0134}, {0x0014, 0x0135}, {0x0014, 0x0136}, {0x0014, 0x0137}, {0x0014, 0x0138}, {0x0014, 0x0139}, - {0x0014, 0x013a}, {0x0014, 0x013b}, {0x0014, 0x013c}, {0x0014, 0x013d}, {0x0014, 0x013e}, {0x0014, 0x013f}, {0x0014, 0x0140}, {0x0014, 0x0141}, - {0x0014, 0x0142}, {0x0014, 0x0143}, {0x0014, 0x0144}, {0x0014, 0x0145}, {0x0014, 0x0146}, {0x0014, 0x0147}, {0x0014, 0x0148}, {0x0014, 0x0149}, - {0x0014, 0x014a}, {0x0014, 0x014b}, {0x0014, 0x014c}, {0x0014, 0x014d}, {0x0014, 0x014e}, {0x0014, 0x014f}, {0x0014, 0x0150}, {0x0014, 0x0151}, - {0x0014, 0x0152}, {0x0014, 0x0153}, {0x0014, 0x0154}, {0x0014, 0x0155}, {0x0014, 0x0156}, {0x0014, 0x0157}, {0x0014, 0x0158}, {0x0014, 0x0159}, - {0x0014, 0x015a}, {0x0014, 0x015b}, {0x0014, 0x015c}, {0x0014, 0x015d}, {0x0014, 0x015e}, {0x0014, 0x015f}, {0x0014, 0x0160}, {0x0014, 0x0161}, - {0x0014, 0x0162}, {0x0014, 0x0163}, {0x0014, 0x0164}, {0x0014, 0x0165}, {0x0014, 0x0166}, {0x0014, 0x0167}, {0x0014, 0x0168}, {0x0014, 0x0169}, - {0x0014, 0x016a}, {0x0014, 0x016b}, {0x0014, 0x016c}, {0x0014, 0x016d}, {0x0014, 0x016e}, {0x0014, 0x016f}, {0x0014, 0x0170}, {0x0014, 0x0171}, - {0x0014, 0x0172}, {0x0014, 0x0173}, {0x0014, 0x0174}, {0x0014, 0x0175}, {0x0014, 0x0176}, {0x0014, 0x0177}, {0x0014, 0x0178}, {0x0014, 0x0179}, - {0x0014, 0x017a}, {0x0014, 0x017b}, {0x0014, 0x017c}, {0x0014, 0x017d}, {0x0014, 0x017e}, {0x0014, 0x017f}, {0x0014, 0x0180}, {0x0014, 0x0181}, - {0x0014, 0x0182}, {0x0014, 0x0183}, {0x0014, 0x0184}, {0x0014, 0x0185}, {0x0014, 0x0186}, {0x0014, 0x0187}, {0x0014, 0x0188}, {0x0014, 0x0189}, - {0x0014, 0x018a}, {0x0014, 0x018b}, {0x0014, 0x018c}, {0x0014, 0x018d}, {0x0014, 0x018e}, {0x0014, 0x018f}, {0x0014, 0x0190}, {0x0014, 0x0191}, - {0x0014, 0x0192}, {0x0014, 0x0193}, {0x0014, 0x0194}, {0x0014, 0x0195}, {0x0014, 0x0196}, {0x0014, 0x0197}, {0x0014, 0x0198}, {0x0014, 0x0199}, - {0x0014, 0x019a}, {0x0014, 0x019b}, {0x0014, 0x019c}, {0x0014, 0x019d}, {0x0014, 0x019e}, {0x0014, 0x019f}, {0x0014, 0x01a0}, {0x0014, 0x01a1}, - {0x0014, 0x01a2}, {0x0014, 0x01a3}, {0x0014, 0x01a4}, {0x0014, 0x01a5}, {0x0014, 0x01a6}, {0x0014, 0x01a7}, {0x0014, 0x01a8}, {0x0014, 0x01a9}, - {0x0014, 0x01aa}, {0x0014, 0x01ab}, {0x0014, 0x01ac}, {0x0014, 0x01ad}, {0x0014, 0x01ae}, {0x0014, 0x01af}, {0x0014, 0x01b0}, {0x0014, 0x01b1}, - {0x0014, 0x01b2}, {0x0014, 0x01b3}, {0x0014, 0x01b4}, {0x0014, 0x01b5}, {0x0014, 0x01b6}, {0x0014, 0x01b7}, {0x0014, 0x01b8}, {0x0014, 0x01b9}, - {0x0014, 0x01ba}, {0x0014, 0x01bb}, {0x0014, 0x01bc}, {0x0014, 0x01bd}, {0x0014, 0x01be}, {0x0014, 0x01bf}, {0x0014, 0x01c0}, {0x0014, 0x01c1}, - {0x0014, 0x01c2}, {0x0014, 0x01c3}, {0x0014, 0x01c4}, {0x0014, 0x01c5}, {0x0014, 0x01c6}, {0x0014, 0x01c7}, {0x0013, 0x00f1}, {0x0013, 0x00f2}, - {0x0013, 0x00f3}, {0x0013, 0x00f4}, {0x0013, 0x00f5}, {0x0013, 0x00f6}, {0x0013, 0x00f7}, {0x0013, 0x00f8}, {0x0013, 0x00f9}, {0x0013, 0x00fa}, - {0x0013, 0x00fb}, {0x0013, 0x00fc}, {0x0013, 0x00fd}, {0x0013, 0x00fe}, {0x0013, 0x00ff}, {0x0013, 0x0100}, {0x0013, 0x0101}, {0x0013, 0x0102}, - {0x0013, 0x0103}, {0x0013, 0x0104}, {0x0013, 0x0105}, {0x0013, 0x0106}, {0x0013, 0x0107}, {0x0013, 0x0108}, {0x0013, 0x0109}, {0x0013, 0x010a}, - {0x0013, 0x010b}, {0x0013, 0x010c}, {0x0013, 0x010d}, {0x0013, 0x010e}, {0x0013, 0x010f}, {0x0013, 0x0110}, {0x0013, 0x0111}, {0x0013, 0x0112}, - {0x0013, 0x0113}, - -}; - -const uint32_t c_aauiCQMFHuffDec17[93][16] = -{ - {0x0010ffff, 0x000dffff, 0x000effff, 0x000fffff, 0x0006ffff, 0x0005ffff, 0x0007ffff, 0x0008ffff, 0x0009ffff, 0x000affff, 0x000bffff, 0x000cffff, 0x0001ffff, 0x0002ffff, 0x0003ffff, 0x0004ffff, }, - {0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, }, - {0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, }, - {0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, }, - {0x00030052, 0x00030052, 0x00030052, 0x00030052, 0x00030052, 0x00030052, 0x00030052, 0x00030052, 0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030053, }, - {0x00020002, 0x00020002, 0x00020002, 0x00020002, 0x00020003, 0x00020003, 0x00020003, 0x00020003, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001f, 0x0002001f, 0x0002001f, 0x0002001f, }, - {0x000100c0, 0x000100c0, 0x000100c1, 0x000100c1, 0x000100d9, 0x000100d9, 0x000100da, 0x000100da, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020001, 0x00020001, 0x00020001, 0x00020001, }, - {0x00020020, 0x00020020, 0x00020020, 0x00020020, 0x00020021, 0x00020021, 0x00020021, 0x00020021, 0x00020036, 0x00020036, 0x00020036, 0x00020036, 0x0002003a, 0x0002003a, 0x0002003a, 0x0002003a, }, - {0x0002003b, 0x0002003b, 0x0002003b, 0x0002003b, 0x0002003c, 0x0002003c, 0x0002003c, 0x0002003c, 0x00020051, 0x00020051, 0x00020051, 0x00020051, 0x00020054, 0x00020054, 0x00020054, 0x00020054, }, - {0x00020055, 0x00020055, 0x00020055, 0x00020055, 0x00020056, 0x00020056, 0x00020056, 0x00020056, 0x00020057, 0x00020057, 0x00020057, 0x00020057, 0x0002006c, 0x0002006c, 0x0002006c, 0x0002006c, }, - {0x0002006d, 0x0002006d, 0x0002006d, 0x0002006d, 0x0002006e, 0x0002006e, 0x0002006e, 0x0002006e, 0x0002006f, 0x0002006f, 0x0002006f, 0x0002006f, 0x00020070, 0x00020070, 0x00020070, 0x00020070, }, - {0x00020071, 0x00020071, 0x00020071, 0x00020071, 0x00020088, 0x00020088, 0x00020088, 0x00020088, 0x00020089, 0x00020089, 0x00020089, 0x00020089, 0x0002008a, 0x0002008a, 0x0002008a, 0x0002008a, }, - {0x0002008b, 0x0002008b, 0x0002008b, 0x0002008b, 0x000200a3, 0x000200a3, 0x000200a3, 0x000200a3, 0x000200a4, 0x000200a4, 0x000200a4, 0x000200a4, 0x000200a5, 0x000200a5, 0x000200a5, 0x000200a5, }, - {0x00000024, 0x0000003e, 0x00000059, 0x00000074, 0x0000008e, 0x000000a8, 0x000000bd, 0x000000c2, 0x000000c3, 0x000000d8, 0x000000db, 0x000000dc, 0x000000f4, 0x000000f5, 0x00010004, 0x00010004, }, - {0x00010005, 0x00010005, 0x00010006, 0x00010006, 0x00010022, 0x00010022, 0x00010023, 0x00010023, 0x0001003d, 0x0001003d, 0x00010058, 0x00010058, 0x00010072, 0x00010072, 0x00010073, 0x00010073, }, - {0x00010087, 0x00010087, 0x0001008c, 0x0001008c, 0x0001008d, 0x0001008d, 0x000100a2, 0x000100a2, 0x000100a6, 0x000100a6, 0x000100a7, 0x000100a7, 0x000100be, 0x000100be, 0x000100bf, 0x000100bf, }, - {0x001effff, 0x001dffff, 0x001cffff, 0x0019ffff, 0x0018ffff, 0x001affff, 0x001bffff, 0x0012ffff, 0x0011ffff, 0x0013ffff, 0x0014ffff, 0x0015ffff, 0x0016ffff, 0x0017ffff, 0x00000007, 0x00000008, }, - {0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003005a, 0x0003005a, 0x0003005a, 0x0003005a, 0x0003005a, 0x0003005a, 0x0003005a, 0x0003005a, }, - {0x00020111, 0x00020111, 0x00020111, 0x00020111, 0x00020112, 0x00020112, 0x00020112, 0x00020112, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, }, - {0x00030075, 0x00030075, 0x00030075, 0x00030075, 0x00030075, 0x00030075, 0x00030075, 0x00030075, 0x0003008f, 0x0003008f, 0x0003008f, 0x0003008f, 0x0003008f, 0x0003008f, 0x0003008f, 0x0003008f, }, - {0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300c4, 0x000300c4, 0x000300c4, 0x000300c4, 0x000300c4, 0x000300c4, 0x000300c4, 0x000300c4, }, - {0x000300dd, 0x000300dd, 0x000300dd, 0x000300dd, 0x000300dd, 0x000300dd, 0x000300dd, 0x000300dd, 0x000300de, 0x000300de, 0x000300de, 0x000300de, 0x000300de, 0x000300de, 0x000300de, 0x000300de, }, - {0x000300f3, 0x000300f3, 0x000300f3, 0x000300f3, 0x000300f3, 0x000300f3, 0x000300f3, 0x000300f3, 0x000300f6, 0x000300f6, 0x000300f6, 0x000300f6, 0x000300f6, 0x000300f6, 0x000300f6, 0x000300f6, }, - {0x000300f7, 0x000300f7, 0x000300f7, 0x000300f7, 0x000300f7, 0x000300f7, 0x000300f7, 0x000300f7, 0x0003010f, 0x0003010f, 0x0003010f, 0x0003010f, 0x0003010f, 0x0003010f, 0x0003010f, 0x0003010f, }, - {0x00020025, 0x00020025, 0x00020025, 0x00020025, 0x00020040, 0x00020040, 0x00020040, 0x00020040, 0x0002005b, 0x0002005b, 0x0002005b, 0x0002005b, 0x00020076, 0x00020076, 0x00020076, 0x00020076, }, - {0x0001010e, 0x0001010e, 0x00010113, 0x00010113, 0x00010114, 0x00010114, 0x0001012a, 0x0001012a, 0x0001012b, 0x0001012b, 0x0001012c, 0x0001012c, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000a, }, - {0x00020090, 0x00020090, 0x00020090, 0x00020090, 0x000200aa, 0x000200aa, 0x000200aa, 0x000200aa, 0x000200ab, 0x000200ab, 0x000200ab, 0x000200ab, 0x000200c5, 0x000200c5, 0x000200c5, 0x000200c5, }, - {0x000200df, 0x000200df, 0x000200df, 0x000200df, 0x000200f8, 0x000200f8, 0x000200f8, 0x000200f8, 0x000200f9, 0x000200f9, 0x000200f9, 0x000200f9, 0x00020110, 0x00020110, 0x00020110, 0x00020110, }, - {0x00000146, 0x00000147, 0x00010026, 0x00010026, 0x00010041, 0x00010041, 0x0001005c, 0x0001005c, 0x00010091, 0x00010091, 0x000100c6, 0x000100c6, 0x000100e0, 0x000100e0, 0x000100fa, 0x000100fa, }, - {0x0025ffff, 0x0000000b, 0x00000027, 0x00000042, 0x0000005d, 0x00000077, 0x00000092, 0x000000ac, 0x000000c7, 0x000000e1, 0x000000fb, 0x00000115, 0x00000129, 0x0000012d, 0x0000012e, 0x00000145, }, - {0x0040ffff, 0x0039ffff, 0x002dffff, 0x002cffff, 0x002bffff, 0x0028ffff, 0x0026ffff, 0x0027ffff, 0x0029ffff, 0x002affff, 0x001fffff, 0x0020ffff, 0x0021ffff, 0x0022ffff, 0x0023ffff, 0x0024ffff, }, - {0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x00030078, 0x00030078, 0x00030078, 0x00030078, 0x00030078, 0x00030078, 0x00030078, 0x00030078, }, - {0x00030093, 0x00030093, 0x00030093, 0x00030093, 0x00030093, 0x00030093, 0x00030093, 0x00030093, 0x000300ad, 0x000300ad, 0x000300ad, 0x000300ad, 0x000300ad, 0x000300ad, 0x000300ad, 0x000300ad, }, - {0x000300e2, 0x000300e2, 0x000300e2, 0x000300e2, 0x000300e2, 0x000300e2, 0x000300e2, 0x000300e2, 0x000300fc, 0x000300fc, 0x000300fc, 0x000300fc, 0x000300fc, 0x000300fc, 0x000300fc, 0x000300fc, }, - {0x00030116, 0x00030116, 0x00030116, 0x00030116, 0x00030116, 0x00030116, 0x00030116, 0x00030116, 0x0003012f, 0x0003012f, 0x0003012f, 0x0003012f, 0x0003012f, 0x0003012f, 0x0003012f, 0x0003012f, }, - {0x00030130, 0x00030130, 0x00030130, 0x00030130, 0x00030130, 0x00030130, 0x00030130, 0x00030130, 0x00030144, 0x00030144, 0x00030144, 0x00030144, 0x00030144, 0x00030144, 0x00030144, 0x00030144, }, - {0x00030148, 0x00030148, 0x00030148, 0x00030148, 0x00030148, 0x00030148, 0x00030148, 0x00030148, 0x00030149, 0x00030149, 0x00030149, 0x00030149, 0x00030149, 0x00030149, 0x00030149, 0x00030149, }, - {0x00030160, 0x00030160, 0x00030160, 0x00030160, 0x00030160, 0x00030160, 0x00030160, 0x00030160, 0x00030161, 0x00030161, 0x00030161, 0x00030161, 0x00030161, 0x00030161, 0x00030161, 0x00030161, }, - {0x00020028, 0x00020028, 0x00020028, 0x00020028, 0x00020043, 0x00020043, 0x00020043, 0x00020043, 0x0002005e, 0x0002005e, 0x0002005e, 0x0002005e, 0x000200ae, 0x000200ae, 0x000200ae, 0x000200ae, }, - {0x000200c8, 0x000200c8, 0x000200c8, 0x000200c8, 0x000200c9, 0x000200c9, 0x000200c9, 0x000200c9, 0x000200e3, 0x000200e3, 0x000200e3, 0x000200e3, 0x000200fd, 0x000200fd, 0x000200fd, 0x000200fd, }, - {0x0001014b, 0x0001014b, 0x00010165, 0x00010165, 0x0001017a, 0x0001017a, 0x0001017c, 0x0001017c, 0x0001017d, 0x0001017d, 0x0001017e, 0x0001017e, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000d, }, - {0x00020117, 0x00020117, 0x00020117, 0x00020117, 0x00020131, 0x00020131, 0x00020131, 0x00020131, 0x0002014a, 0x0002014a, 0x0002014a, 0x0002014a, 0x0002015f, 0x0002015f, 0x0002015f, 0x0002015f, }, - {0x00020162, 0x00020162, 0x00020162, 0x00020162, 0x00020163, 0x00020163, 0x00020163, 0x00020163, 0x00020164, 0x00020164, 0x00020164, 0x00020164, 0x0002017b, 0x0002017b, 0x0002017b, 0x0002017b, }, - {0x00010029, 0x00010029, 0x00010044, 0x00010044, 0x0001005f, 0x0001005f, 0x00010079, 0x00010079, 0x00010094, 0x00010094, 0x000100af, 0x000100af, 0x000100fe, 0x000100fe, 0x00010118, 0x00010118, }, - {0x0000007a, 0x00000095, 0x000000ca, 0x000000e4, 0x000000ff, 0x00000132, 0x00000133, 0x0000014c, 0x0000014d, 0x0000014e, 0x00000166, 0x00000167, 0x0000017f, 0x00000180, 0x00000196, 0x00000197, }, - {0x003effff, 0x003fffff, 0x0036ffff, 0x0035ffff, 0x0037ffff, 0x0038ffff, 0x0031ffff, 0x002effff, 0x0032ffff, 0x002fffff, 0x0030ffff, 0x0033ffff, 0x0034ffff, 0x0000000e, 0x00000045, 0x00000060, }, - {0x0003007b, 0x0003007b, 0x0003007b, 0x0003007b, 0x0003007b, 0x0003007b, 0x0003007b, 0x0003007b, 0x00030096, 0x00030096, 0x00030096, 0x00030096, 0x00030096, 0x00030096, 0x00030096, 0x00030096, }, - {0x000300e5, 0x000300e5, 0x000300e5, 0x000300e5, 0x000300e5, 0x000300e5, 0x000300e5, 0x000300e5, 0x0003011a, 0x0003011a, 0x0003011a, 0x0003011a, 0x0003011a, 0x0003011a, 0x0003011a, 0x0003011a, }, - {0x00030134, 0x00030134, 0x00030134, 0x00030134, 0x00030134, 0x00030134, 0x00030134, 0x00030134, 0x00030181, 0x00030181, 0x00030181, 0x00030181, 0x00030181, 0x00030181, 0x00030181, 0x00030181, }, - {0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, }, - {0x000300b0, 0x000300b0, 0x000300b0, 0x000300b0, 0x000300b0, 0x000300b0, 0x000300b0, 0x000300b0, 0x000300b1, 0x000300b1, 0x000300b1, 0x000300b1, 0x000300b1, 0x000300b1, 0x000300b1, 0x000300b1, }, - {0x00030182, 0x00030182, 0x00030182, 0x00030182, 0x00030182, 0x00030182, 0x00030182, 0x00030182, 0x00030198, 0x00030198, 0x00030198, 0x00030198, 0x00030198, 0x00030198, 0x00030198, 0x00030198, }, - {0x00030199, 0x00030199, 0x00030199, 0x00030199, 0x00030199, 0x00030199, 0x00030199, 0x00030199, 0x0003019a, 0x0003019a, 0x0003019a, 0x0003019a, 0x0003019a, 0x0003019a, 0x0003019a, 0x0003019a, }, - {0x000200cc, 0x000200cc, 0x000200cc, 0x000200cc, 0x00020100, 0x00020100, 0x00020100, 0x00020100, 0x00020119, 0x00020119, 0x00020119, 0x00020119, 0x0002014f, 0x0002014f, 0x0002014f, 0x0002014f, }, - {0x000102d5, 0x000102d5, 0x000102d6, 0x000102d6, 0x000102d7, 0x000102d7, 0x000102d8, 0x000102d8, 0x00020010, 0x00020010, 0x00020010, 0x00020010, 0x000200cb, 0x000200cb, 0x000200cb, 0x000200cb, }, - {0x00020168, 0x00020168, 0x00020168, 0x00020168, 0x00020195, 0x00020195, 0x00020195, 0x00020195, 0x0002019b, 0x0002019b, 0x0002019b, 0x0002019b, 0x0002019e, 0x0002019e, 0x0002019e, 0x0002019e, }, - {0x000201b1, 0x000201b1, 0x000201b1, 0x000201b1, 0x000201b2, 0x000201b2, 0x000201b2, 0x000201b2, 0x000201b3, 0x000201b3, 0x000201b3, 0x000201b3, 0x000201cc, 0x000201cc, 0x000201cc, 0x000201cc, }, - {0x0051ffff, 0x0052ffff, 0x0053ffff, 0x0054ffff, 0x0055ffff, 0x0056ffff, 0x0057ffff, 0x0058ffff, 0x0059ffff, 0x005affff, 0x005bffff, 0x005cffff, 0x003bffff, 0x003affff, 0x003cffff, 0x003dffff, }, - {0x00010062, 0x00010062, 0x000100e7, 0x000100e7, 0x00010101, 0x00010101, 0x0001011b, 0x0001011b, 0x00010135, 0x00010135, 0x00010150, 0x00010150, 0x0001019c, 0x0001019c, 0x0001019d, 0x0001019d, }, - {0x000002ae, 0x000002af, 0x000002b0, 0x000002b1, 0x000002b2, 0x000002b3, 0x000002b4, 0x000002b5, 0x0001002b, 0x0001002b, 0x00010046, 0x00010046, 0x00010047, 0x00010047, 0x00010061, 0x00010061, }, - {0x000101b0, 0x000101b0, 0x000102b6, 0x000102b6, 0x000102b7, 0x000102b7, 0x000102b8, 0x000102b8, 0x000102b9, 0x000102b9, 0x000102ba, 0x000102ba, 0x000102bb, 0x000102bb, 0x000102bc, 0x000102bc, }, - {0x000102bd, 0x000102bd, 0x000102be, 0x000102be, 0x000102bf, 0x000102bf, 0x000102c0, 0x000102c0, 0x000102c1, 0x000102c1, 0x000102c2, 0x000102c2, 0x000102c3, 0x000102c3, 0x000102c4, 0x000102c4, }, - {0x000102c5, 0x000102c5, 0x000102c6, 0x000102c6, 0x000102c7, 0x000102c7, 0x000102c8, 0x000102c8, 0x000102c9, 0x000102c9, 0x000102ca, 0x000102ca, 0x000102cb, 0x000102cb, 0x000102cc, 0x000102cc, }, - {0x000102cd, 0x000102cd, 0x000102ce, 0x000102ce, 0x000102cf, 0x000102cf, 0x000102d0, 0x000102d0, 0x000102d1, 0x000102d1, 0x000102d2, 0x000102d2, 0x000102d3, 0x000102d3, 0x000102d4, 0x000102d4, }, - {0x0044ffff, 0x0041ffff, 0x0042ffff, 0x0043ffff, 0x0045ffff, 0x0048ffff, 0x0046ffff, 0x0047ffff, 0x0049ffff, 0x004affff, 0x004bffff, 0x004cffff, 0x004dffff, 0x004effff, 0x004fffff, 0x0050ffff, }, - {0x00000032, 0x00000033, 0x00000034, 0x00000035, 0x00000048, 0x00000049, 0x0000004a, 0x0000004b, 0x0000004c, 0x0000004d, 0x0000004e, 0x0000004f, 0x00000050, 0x00000063, 0x00000064, 0x00000065, }, - {0x00000066, 0x00000067, 0x00000068, 0x00000069, 0x0000006a, 0x0000006b, 0x0000007c, 0x0000007d, 0x0000007e, 0x0000007f, 0x00000080, 0x00000081, 0x00000082, 0x00000083, 0x00000084, 0x00000085, }, - {0x00000086, 0x00000097, 0x00000098, 0x00000099, 0x0000009a, 0x0000009b, 0x0000009c, 0x0000009d, 0x0000009e, 0x0000009f, 0x000000a0, 0x000000a1, 0x000000b2, 0x000000b3, 0x000000b4, 0x000000b5, }, - {0x00000011, 0x00000012, 0x00000013, 0x00000014, 0x00000015, 0x00000016, 0x00000017, 0x00000018, 0x00000019, 0x0000001a, 0x0000002c, 0x0000002d, 0x0000002e, 0x0000002f, 0x00000030, 0x00000031, }, - {0x000000b6, 0x000000b7, 0x000000b8, 0x000000b9, 0x000000ba, 0x000000bb, 0x000000bc, 0x000000cd, 0x000000ce, 0x000000cf, 0x000000d0, 0x000000d1, 0x000000d2, 0x000000d3, 0x000000d4, 0x000000d5, }, - {0x00000104, 0x00000105, 0x00000106, 0x00000107, 0x00000108, 0x00000109, 0x0000010a, 0x0000010b, 0x0000010c, 0x0000010d, 0x0000011c, 0x0000011d, 0x0000011e, 0x0000011f, 0x00000120, 0x00000121, }, - {0x00000122, 0x00000123, 0x00000124, 0x00000125, 0x00000126, 0x00000127, 0x00000128, 0x00000136, 0x00000137, 0x00000138, 0x00000139, 0x0000013a, 0x0000013b, 0x0000013c, 0x0000013d, 0x0000013e, }, - {0x000000d6, 0x000000d7, 0x000000e6, 0x000000e8, 0x000000e9, 0x000000ea, 0x000000eb, 0x000000ec, 0x000000ed, 0x000000ee, 0x000000ef, 0x000000f0, 0x000000f1, 0x000000f2, 0x00000102, 0x00000103, }, - {0x0000013f, 0x00000140, 0x00000141, 0x00000142, 0x00000143, 0x00000151, 0x00000152, 0x00000153, 0x00000154, 0x00000155, 0x00000156, 0x00000157, 0x00000158, 0x00000159, 0x0000015a, 0x0000015b, }, - {0x0000015c, 0x0000015d, 0x0000015e, 0x00000169, 0x0000016a, 0x0000016b, 0x0000016c, 0x0000016d, 0x0000016e, 0x0000016f, 0x00000170, 0x00000171, 0x00000172, 0x00000173, 0x00000174, 0x00000175, }, - {0x00000176, 0x00000177, 0x00000178, 0x00000179, 0x00000183, 0x00000184, 0x00000185, 0x00000186, 0x00000187, 0x00000188, 0x00000189, 0x0000018a, 0x0000018b, 0x0000018c, 0x0000018d, 0x0000018e, }, - {0x0000018f, 0x00000190, 0x00000191, 0x00000192, 0x00000193, 0x00000194, 0x0000019f, 0x000001a0, 0x000001a1, 0x000001a2, 0x000001a3, 0x000001a4, 0x000001a5, 0x000001a6, 0x000001a7, 0x000001a8, }, - {0x000001a9, 0x000001aa, 0x000001ab, 0x000001ac, 0x000001ad, 0x000001ae, 0x000001af, 0x000001b4, 0x000001b5, 0x000001b6, 0x000001b7, 0x000001b8, 0x000001b9, 0x000001ba, 0x000001bb, 0x000001bc, }, - {0x000001bd, 0x000001be, 0x000001bf, 0x000001c0, 0x000001c1, 0x000001c2, 0x000001c3, 0x000001c4, 0x000001c5, 0x000001c6, 0x000001c7, 0x000001c8, 0x000001c9, 0x000001ca, 0x000001cb, 0x000001cd, }, - {0x000001ce, 0x000001cf, 0x000001d0, 0x000001d1, 0x000001d2, 0x000001d3, 0x000001d4, 0x000001d5, 0x000001d6, 0x000001d7, 0x000001d8, 0x000001d9, 0x000001da, 0x000001db, 0x000001dc, 0x000001dd, }, - {0x000001de, 0x000001df, 0x000001e0, 0x000001e1, 0x000001e2, 0x000001e3, 0x000001e4, 0x000001e5, 0x000001e6, 0x000001e7, 0x000001e8, 0x000001e9, 0x000001ea, 0x000001eb, 0x000001ec, 0x000001ed, }, - {0x000001ee, 0x000001ef, 0x000001f0, 0x000001f1, 0x000001f2, 0x000001f3, 0x000001f4, 0x000001f5, 0x000001f6, 0x000001f7, 0x000001f8, 0x000001f9, 0x000001fa, 0x000001fb, 0x000001fc, 0x000001fd, }, - {0x000001fe, 0x000001ff, 0x00000200, 0x00000201, 0x00000202, 0x00000203, 0x00000204, 0x00000205, 0x00000206, 0x00000207, 0x00000208, 0x00000209, 0x0000020a, 0x0000020b, 0x0000020c, 0x0000020d, }, - {0x0000020e, 0x0000020f, 0x00000210, 0x00000211, 0x00000212, 0x00000213, 0x00000214, 0x00000215, 0x00000216, 0x00000217, 0x00000218, 0x00000219, 0x0000021a, 0x0000021b, 0x0000021c, 0x0000021d, }, - {0x0000021e, 0x0000021f, 0x00000220, 0x00000221, 0x00000222, 0x00000223, 0x00000224, 0x00000225, 0x00000226, 0x00000227, 0x00000228, 0x00000229, 0x0000022a, 0x0000022b, 0x0000022c, 0x0000022d, }, - {0x0000022e, 0x0000022f, 0x00000230, 0x00000231, 0x00000232, 0x00000233, 0x00000234, 0x00000235, 0x00000236, 0x00000237, 0x00000238, 0x00000239, 0x0000023a, 0x0000023b, 0x0000023c, 0x0000023d, }, - {0x0000023e, 0x0000023f, 0x00000240, 0x00000241, 0x00000242, 0x00000243, 0x00000244, 0x00000245, 0x00000246, 0x00000247, 0x00000248, 0x00000249, 0x0000024a, 0x0000024b, 0x0000024c, 0x0000024d, }, - {0x0000024e, 0x0000024f, 0x00000250, 0x00000251, 0x00000252, 0x00000253, 0x00000254, 0x00000255, 0x00000256, 0x00000257, 0x00000258, 0x00000259, 0x0000025a, 0x0000025b, 0x0000025c, 0x0000025d, }, - {0x0000025e, 0x0000025f, 0x00000260, 0x00000261, 0x00000262, 0x00000263, 0x00000264, 0x00000265, 0x00000266, 0x00000267, 0x00000268, 0x00000269, 0x0000026a, 0x0000026b, 0x0000026c, 0x0000026d, }, - {0x0000026e, 0x0000026f, 0x00000270, 0x00000271, 0x00000272, 0x00000273, 0x00000274, 0x00000275, 0x00000276, 0x00000277, 0x00000278, 0x00000279, 0x0000027a, 0x0000027b, 0x0000027c, 0x0000027d, }, - {0x0000027e, 0x0000027f, 0x00000280, 0x00000281, 0x00000282, 0x00000283, 0x00000284, 0x00000285, 0x00000286, 0x00000287, 0x00000288, 0x00000289, 0x0000028a, 0x0000028b, 0x0000028c, 0x0000028d, }, - {0x0000028e, 0x0000028f, 0x00000290, 0x00000291, 0x00000292, 0x00000293, 0x00000294, 0x00000295, 0x00000296, 0x00000297, 0x00000298, 0x00000299, 0x0000029a, 0x0000029b, 0x0000029c, 0x0000029d, }, - {0x0000029e, 0x0000029f, 0x000002a0, 0x000002a1, 0x000002a2, 0x000002a3, 0x000002a4, 0x000002a5, 0x000002a6, 0x000002a7, 0x000002a8, 0x000002a9, 0x000002aa, 0x000002ab, 0x000002ac, 0x000002ad, }, -}; - -const uint32_t c_aauiCQMFHuffEnc18[28][2] = -{ - {0x0004, 0x0001}, {0x0003, 0x0002}, {0x0003, 0x0003}, {0x0003, 0x0004}, {0x0003, 0x0005}, {0x0003, 0x0006}, {0x0003, 0x0007}, {0x0004, 0x0002}, - {0x0004, 0x0003}, {0x0005, 0x0001}, {0x0006, 0x0001}, {0x0007, 0x0001}, {0x0008, 0x0001}, {0x0009, 0x0001}, {0x000a, 0x0001}, {0x000b, 0x0001}, - {0x000c, 0x0001}, {0x000d, 0x0001}, {0x000e, 0x0001}, {0x000f, 0x0001}, {0x0011, 0x0003}, {0x0012, 0x0001}, {0x0012, 0x0002}, {0x0012, 0x0003}, - {0x0013, 0x0000}, {0x0013, 0x0001}, {0x0012, 0x0004}, {0x0012, 0x0005}, - -}; - -const uint32_t c_aauiCQMFHuffDec18[6][16] = -{ - {0x0001ffff, 0x00000000, 0x00000007, 0x00000008, 0x00010001, 0x00010001, 0x00010002, 0x00010002, 0x00010003, 0x00010003, 0x00010004, 0x00010004, 0x00010005, 0x00010005, 0x00010006, 0x00010006, }, - {0x0002ffff, 0x0000000c, 0x0001000b, 0x0001000b, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000a, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, }, - {0x0003ffff, 0x00000010, 0x0001000f, 0x0001000f, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000e, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, }, - {0x0005ffff, 0x0004ffff, 0x00010013, 0x00010013, 0x00020012, 0x00020012, 0x00020012, 0x00020012, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, }, - {0x0002001a, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001b, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, }, - {0x00010018, 0x00010018, 0x00010019, 0x00010019, 0x00020015, 0x00020015, 0x00020015, 0x00020015, 0x00020016, 0x00020016, 0x00020016, 0x00020016, 0x00020017, 0x00020017, 0x00020017, 0x00020017, }, -}; - -const uint32_t c_aauiCQMFHuffEnc19[29][2] = -{ - {0x0004, 0x0002}, {0x0003, 0x0003}, {0x0003, 0x0004}, {0x0003, 0x0005}, {0x0003, 0x0006}, {0x0003, 0x0007}, {0x0004, 0x0003}, {0x0004, 0x0004}, - {0x0004, 0x0005}, {0x0005, 0x0001}, {0x0005, 0x0002}, {0x0005, 0x0003}, {0x0006, 0x0001}, {0x0007, 0x0001}, {0x0008, 0x0001}, {0x0009, 0x0001}, - {0x000a, 0x0001}, {0x000b, 0x0001}, {0x000c, 0x0001}, {0x000d, 0x0001}, {0x000e, 0x0001}, {0x000f, 0x0001}, {0x0010, 0x0001}, {0x0012, 0x0002}, - {0x0013, 0x0000}, {0x0013, 0x0001}, {0x0013, 0x0002}, {0x0013, 0x0003}, {0x0012, 0x0003}, - -}; - -const uint32_t c_aauiCQMFHuffDec19[6][16] = -{ - {0x0001ffff, 0x0002ffff, 0x00000000, 0x00000006, 0x00000007, 0x00000008, 0x00010001, 0x00010001, 0x00010002, 0x00010002, 0x00010003, 0x00010003, 0x00010004, 0x00010004, 0x00010005, 0x00010005, }, - {0x0003ffff, 0x0000000e, 0x0001000d, 0x0001000d, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000c, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, }, - {0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, }, - {0x0004ffff, 0x00000012, 0x00010011, 0x00010011, 0x00020010, 0x00020010, 0x00020010, 0x00020010, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, }, - {0x0005ffff, 0x00000016, 0x00010015, 0x00010015, 0x00020014, 0x00020014, 0x00020014, 0x00020014, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, }, - {0x00010018, 0x00010018, 0x00010019, 0x00010019, 0x0001001a, 0x0001001a, 0x0001001b, 0x0001001b, 0x00020017, 0x00020017, 0x00020017, 0x00020017, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001c, }, -}; - -const uint32_t c_aauiCQMFHuffEnc20[32][2] = -{ - {0x0004, 0x0002}, {0x0003, 0x0005}, {0x0003, 0x0006}, {0x0003, 0x0007}, {0x0004, 0x0003}, {0x0004, 0x0004}, {0x0004, 0x0005}, {0x0004, 0x0006}, - {0x0004, 0x0007}, {0x0004, 0x0008}, {0x0004, 0x0009}, {0x0005, 0x0002}, {0x0005, 0x0003}, {0x0006, 0x0001}, {0x0006, 0x0002}, {0x0006, 0x0003}, - {0x0007, 0x0001}, {0x0008, 0x0001}, {0x0009, 0x0001}, {0x000a, 0x0001}, {0x000b, 0x0001}, {0x000c, 0x0001}, {0x000d, 0x0001}, {0x000e, 0x0001}, - {0x000f, 0x0001}, {0x0010, 0x0001}, {0x0011, 0x0001}, {0x0014, 0x0000}, {0x0014, 0x0001}, {0x0013, 0x0001}, {0x0013, 0x0002}, {0x0013, 0x0003}, -}; - -const uint32_t c_aauiCQMFHuffDec20[6][16] = -{ - {0x0002ffff, 0x0001ffff, 0x00000000, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 0x00000008, 0x00000009, 0x0000000a, 0x00010001, 0x00010001, 0x00010002, 0x00010002, 0x00010003, 0x00010003, }, - {0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, }, - {0x0003ffff, 0x00000011, 0x00010010, 0x00010010, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000f, 0x0002000f, 0x0002000f, 0x0002000f, }, - {0x0004ffff, 0x00000015, 0x00010014, 0x00010014, 0x00020013, 0x00020013, 0x00020013, 0x00020013, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, }, - {0x0005ffff, 0x00000019, 0x00010018, 0x00010018, 0x00020017, 0x00020017, 0x00020017, 0x00020017, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, }, - {0x0000001b, 0x0000001c, 0x0001001d, 0x0001001d, 0x0001001e, 0x0001001e, 0x0001001f, 0x0001001f, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, }, -}; - -const uint32_t c_aauiCQMFHuffEnc21[37][2] = -{ - {0x0005, 0x0002}, {0x0003, 0x0006}, {0x0003, 0x0007}, {0x0004, 0x0003}, {0x0004, 0x0004}, {0x0004, 0x0005}, {0x0004, 0x0006}, {0x0004, 0x0007}, - {0x0004, 0x0008}, {0x0004, 0x0009}, {0x0004, 0x000a}, {0x0004, 0x000b}, {0x0005, 0x0003}, {0x0005, 0x0004}, {0x0005, 0x0005}, {0x0006, 0x0002}, - {0x0006, 0x0003}, {0x0007, 0x0002}, {0x0007, 0x0003}, {0x0008, 0x0001}, {0x0008, 0x0002}, {0x0008, 0x0003}, {0x0009, 0x0001}, {0x000b, 0x0001}, - {0x000b, 0x0002}, {0x000b, 0x0003}, {0x000c, 0x0001}, {0x000d, 0x0001}, {0x000e, 0x0001}, {0x000f, 0x0001}, {0x0010, 0x0001}, {0x0011, 0x0001}, - {0x0014, 0x0000}, {0x0014, 0x0001}, {0x0013, 0x0001}, {0x0013, 0x0002}, {0x0013, 0x0003}, - -}; - -const uint32_t c_aauiCQMFHuffDec21[7][16] = -{ - {0x0003ffff, 0x0001ffff, 0x0002ffff, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 0x00000008, 0x00000009, 0x0000000a, 0x0000000b, 0x00010001, 0x00010001, 0x00010002, 0x00010002, }, - {0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, }, - {0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, }, - {0x0004ffff, 0x00000013, 0x00000014, 0x00000015, 0x00010011, 0x00010011, 0x00010012, 0x00010012, 0x0002000f, 0x0002000f, 0x0002000f, 0x0002000f, 0x00020010, 0x00020010, 0x00020010, 0x00020010, }, - {0x0005ffff, 0x0000001a, 0x00010017, 0x00010017, 0x00010018, 0x00010018, 0x00010019, 0x00010019, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, }, - {0x0006ffff, 0x0000001e, 0x0001001d, 0x0001001d, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001c, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, }, - {0x00000020, 0x00000021, 0x00010022, 0x00010022, 0x00010023, 0x00010023, 0x00010024, 0x00010024, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, }, -}; - -const uint32_t c_aauiCQMFHuffEnc22[39][2] = -{ - {0x0005, 0x0002}, {0x0004, 0x0004}, {0x0004, 0x0005}, {0x0004, 0x0006}, {0x0004, 0x0007}, {0x0004, 0x0008}, {0x0004, 0x0009}, {0x0004, 0x000a}, - {0x0004, 0x000b}, {0x0004, 0x000c}, {0x0004, 0x000d}, {0x0004, 0x000e}, {0x0004, 0x000f}, {0x0005, 0x0003}, {0x0005, 0x0004}, {0x0005, 0x0005}, - {0x0005, 0x0006}, {0x0005, 0x0007}, {0x0006, 0x0002}, {0x0006, 0x0003}, {0x0007, 0x0002}, {0x0007, 0x0003}, {0x0008, 0x0002}, {0x0008, 0x0003}, - {0x0009, 0x0002}, {0x0009, 0x0003}, {0x000a, 0x0001}, {0x000a, 0x0002}, {0x000a, 0x0003}, {0x000c, 0x0001}, {0x000c, 0x0002}, {0x000c, 0x0003}, - {0x000e, 0x0001}, {0x000e, 0x0002}, {0x000f, 0x0001}, {0x000e, 0x0003}, {0x0011, 0x0000}, {0x0010, 0x0001}, {0x0011, 0x0001}, - -}; - -const uint32_t c_aauiCQMFHuffDec22[9][16] = -{ - {0x0004ffff, 0x0001ffff, 0x0002ffff, 0x0003ffff, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 0x00000008, 0x00000009, 0x0000000a, 0x0000000b, 0x0000000c, }, - {0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, }, - {0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, }, - {0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, }, - {0x0006ffff, 0x0005ffff, 0x00000016, 0x00000017, 0x00010014, 0x00010014, 0x00010015, 0x00010015, 0x00020012, 0x00020012, 0x00020012, 0x00020012, 0x00020013, 0x00020013, 0x00020013, 0x00020013, }, - {0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, }, - {0x0007ffff, 0x0000001d, 0x0000001e, 0x0000001f, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001c, }, - {0x0008ffff, 0x00000025, 0x00010022, 0x00010022, 0x00020020, 0x00020020, 0x00020020, 0x00020020, 0x00020021, 0x00020021, 0x00020021, 0x00020021, 0x00020023, 0x00020023, 0x00020023, 0x00020023, }, - {0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, }, -}; - -const uint32_t c_aauiCQMFHuffEnc23[46][2] = -{ - {0x0005, 0x0003}, {0x0004, 0x0006}, {0x0004, 0x0007}, {0x0004, 0x0008}, {0x0004, 0x0009}, {0x0004, 0x000a}, {0x0004, 0x000b}, {0x0004, 0x000c}, - {0x0004, 0x000d}, {0x0004, 0x000e}, {0x0004, 0x000f}, {0x0005, 0x0004}, {0x0005, 0x0005}, {0x0005, 0x0006}, {0x0005, 0x0007}, {0x0005, 0x0008}, - {0x0005, 0x0009}, {0x0005, 0x000a}, {0x0005, 0x000b}, {0x0006, 0x0003}, {0x0006, 0x0004}, {0x0006, 0x0005}, {0x0007, 0x0002}, {0x0007, 0x0003}, - {0x0007, 0x0004}, {0x0007, 0x0005}, {0x0008, 0x0002}, {0x0008, 0x0003}, {0x0009, 0x0002}, {0x0009, 0x0003}, {0x000a, 0x0002}, {0x000a, 0x0003}, - {0x000b, 0x0002}, {0x000b, 0x0003}, {0x000c, 0x0002}, {0x000c, 0x0003}, {0x000d, 0x0002}, {0x000d, 0x0003}, {0x000e, 0x0001}, {0x000e, 0x0002}, - {0x000e, 0x0003}, {0x000f, 0x0001}, {0x0010, 0x0001}, {0x0012, 0x0000}, {0x0012, 0x0001}, {0x0011, 0x0001}, - -}; - -const uint32_t c_aauiCQMFHuffDec23[12][16] = -{ - {0x0006ffff, 0x0001ffff, 0x0002ffff, 0x0003ffff, 0x0004ffff, 0x0005ffff, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 0x00000008, 0x00000009, 0x0000000a, }, - {0x00020014, 0x00020014, 0x00020014, 0x00020014, 0x00020015, 0x00020015, 0x00020015, 0x00020015, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, }, - {0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, }, - {0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, }, - {0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, }, - {0x0008ffff, 0x0007ffff, 0x0000001a, 0x0000001b, 0x00010016, 0x00010016, 0x00010017, 0x00010017, 0x00010018, 0x00010018, 0x00010019, 0x00010019, 0x00020013, 0x00020013, 0x00020013, 0x00020013, }, - {0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, }, - {0x000affff, 0x0009ffff, 0x00000022, 0x00000023, 0x00010020, 0x00010020, 0x00010021, 0x00010021, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001f, 0x0002001f, 0x0002001f, 0x0002001f, }, - {0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, }, - {0x000bffff, 0x0000002a, 0x00010029, 0x00010029, 0x00020026, 0x00020026, 0x00020026, 0x00020026, 0x00020027, 0x00020027, 0x00020027, 0x00020027, 0x00020028, 0x00020028, 0x00020028, 0x00020028, }, - {0x0002002b, 0x0002002b, 0x0002002b, 0x0002002b, 0x0002002c, 0x0002002c, 0x0002002c, 0x0002002c, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, }, -}; - -const uint32_t c_aauiCQMFHuffEnc24[55][2] = -{ - {0x0005, 0x0004}, {0x0004, 0x0009}, {0x0004, 0x000a}, {0x0004, 0x000b}, {0x0004, 0x000c}, {0x0004, 0x000d}, {0x0004, 0x000e}, {0x0004, 0x000f}, - {0x0005, 0x0005}, {0x0005, 0x0006}, {0x0005, 0x0007}, {0x0005, 0x0008}, {0x0005, 0x0009}, {0x0005, 0x000a}, {0x0005, 0x000b}, {0x0005, 0x000c}, - {0x0005, 0x000d}, {0x0005, 0x000e}, {0x0005, 0x000f}, {0x0005, 0x0010}, {0x0005, 0x0011}, {0x0006, 0x0003}, {0x0006, 0x0004}, {0x0006, 0x0005}, - {0x0006, 0x0006}, {0x0006, 0x0007}, {0x0007, 0x0003}, {0x0007, 0x0004}, {0x0007, 0x0005}, {0x0008, 0x0003}, {0x0008, 0x0004}, {0x0008, 0x0005}, - {0x0009, 0x0002}, {0x0009, 0x0003}, {0x0009, 0x0004}, {0x0009, 0x0005}, {0x000a, 0x0002}, {0x000a, 0x0003}, {0x000b, 0x0002}, {0x000b, 0x0003}, - {0x000c, 0x0003}, {0x000d, 0x0002}, {0x000d, 0x0003}, {0x000d, 0x0004}, {0x000d, 0x0005}, {0x000e, 0x0002}, {0x000e, 0x0003}, {0x000f, 0x0001}, - {0x000f, 0x0002}, {0x000f, 0x0003}, {0x0010, 0x0001}, {0x0011, 0x0001}, {0x0013, 0x0000}, {0x0012, 0x0001}, {0x0013, 0x0001}, - -}; - -const uint32_t c_aauiCQMFHuffDec24[17][16] = -{ - {0x0008ffff, 0x0009ffff, 0x0001ffff, 0x0002ffff, 0x0003ffff, 0x0004ffff, 0x0005ffff, 0x0006ffff, 0x0007ffff, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00000007, }, - {0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, }, - {0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, }, - {0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, }, - {0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, }, - {0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, }, - {0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, }, - {0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, }, - {0x000cffff, 0x000affff, 0x000bffff, 0x0000001d, 0x0000001e, 0x0000001f, 0x0001001a, 0x0001001a, 0x0001001b, 0x0001001b, 0x0001001c, 0x0001001c, 0x00020015, 0x00020015, 0x00020015, 0x00020015, }, - {0x00020016, 0x00020016, 0x00020016, 0x00020016, 0x00020017, 0x00020017, 0x00020017, 0x00020017, 0x00020018, 0x00020018, 0x00020018, 0x00020018, 0x00020019, 0x00020019, 0x00020019, 0x00020019, }, - {0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, }, - {0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, }, - {0x000fffff, 0x000dffff, 0x000effff, 0x00000028, 0x00010026, 0x00010026, 0x00010027, 0x00010027, 0x00020024, 0x00020024, 0x00020024, 0x00020024, 0x00020025, 0x00020025, 0x00020025, 0x00020025, }, - {0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, }, - {0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, }, - {0x0010ffff, 0x00000032, 0x0001002f, 0x0001002f, 0x00010030, 0x00010030, 0x00010031, 0x00010031, 0x0002002d, 0x0002002d, 0x0002002d, 0x0002002d, 0x0002002e, 0x0002002e, 0x0002002e, 0x0002002e, }, - {0x00010034, 0x00010034, 0x00010036, 0x00010036, 0x00020035, 0x00020035, 0x00020035, 0x00020035, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, }, -}; - -const uint32_t c_aauiCQMFHuffEnc25[65][2] = -{ - {0x0005, 0x0005}, {0x0004, 0x000c}, {0x0004, 0x000d}, {0x0004, 0x000e}, {0x0005, 0x0006}, {0x0004, 0x000f}, {0x0005, 0x0007}, {0x0005, 0x0008}, - {0x0005, 0x0009}, {0x0005, 0x000a}, {0x0005, 0x000b}, {0x0005, 0x000c}, {0x0005, 0x000d}, {0x0005, 0x000e}, {0x0005, 0x000f}, {0x0005, 0x0010}, - {0x0005, 0x0011}, {0x0005, 0x0012}, {0x0005, 0x0013}, {0x0005, 0x0014}, {0x0005, 0x0015}, {0x0005, 0x0016}, {0x0005, 0x0017}, {0x0006, 0x0004}, - {0x0006, 0x0005}, {0x0006, 0x0006}, {0x0006, 0x0007}, {0x0006, 0x0008}, {0x0006, 0x0009}, {0x0007, 0x0003}, {0x0007, 0x0004}, {0x0007, 0x0005}, - {0x0007, 0x0006}, {0x0007, 0x0007}, {0x0008, 0x0003}, {0x0008, 0x0004}, {0x0008, 0x0005}, {0x0009, 0x0003}, {0x0009, 0x0004}, {0x0009, 0x0005}, - {0x000a, 0x0003}, {0x000a, 0x0004}, {0x000a, 0x0005}, {0x000b, 0x0003}, {0x000b, 0x0004}, {0x000b, 0x0005}, {0x000c, 0x0002}, {0x000c, 0x0003}, - {0x000c, 0x0004}, {0x000c, 0x0005}, {0x000d, 0x0003}, {0x000e, 0x0003}, {0x000e, 0x0004}, {0x000f, 0x0003}, {0x000e, 0x0005}, {0x000f, 0x0004}, - {0x0010, 0x0001}, {0x000f, 0x0005}, {0x0010, 0x0002}, {0x0010, 0x0003}, {0x0010, 0x0004}, {0x0010, 0x0005}, {0x0011, 0x0001}, {0x0012, 0x0000}, - {0x0012, 0x0001}, - -}; - -const uint32_t c_aauiCQMFHuffDec25[19][16] = -{ - {0x000cffff, 0x000bffff, 0x0002ffff, 0x0001ffff, 0x0003ffff, 0x0004ffff, 0x0005ffff, 0x0006ffff, 0x0007ffff, 0x0008ffff, 0x0009ffff, 0x000affff, 0x00000001, 0x00000002, 0x00000003, 0x00000005, }, - {0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, }, - {0x0002001b, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001c, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, }, - {0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, }, - {0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, }, - {0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, }, - {0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, }, - {0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, }, - {0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, }, - {0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, }, - {0x00020017, 0x00020017, 0x00020017, 0x00020017, 0x00020018, 0x00020018, 0x00020018, 0x00020018, 0x00020019, 0x00020019, 0x00020019, 0x00020019, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001a, }, - {0x000fffff, 0x000dffff, 0x000effff, 0x00000022, 0x00000023, 0x00000024, 0x0001001d, 0x0001001d, 0x0001001e, 0x0001001e, 0x0001001f, 0x0001001f, 0x00010020, 0x00010020, 0x00010021, 0x00010021, }, - {0x00020029, 0x00020029, 0x00020029, 0x00020029, 0x0002002a, 0x0002002a, 0x0002002a, 0x0002002a, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, }, - {0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, }, - {0x0011ffff, 0x0010ffff, 0x0000002e, 0x0000002f, 0x00000030, 0x00000031, 0x0001002b, 0x0001002b, 0x0001002c, 0x0001002c, 0x0001002d, 0x0001002d, 0x00020028, 0x00020028, 0x00020028, 0x00020028, }, - {0x00020034, 0x00020034, 0x00020034, 0x00020034, 0x00020036, 0x00020036, 0x00020036, 0x00020036, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, }, - {0x0012ffff, 0x00000038, 0x0000003a, 0x0000003b, 0x0000003c, 0x0000003d, 0x00010035, 0x00010035, 0x00010037, 0x00010037, 0x00010039, 0x00010039, 0x00020033, 0x00020033, 0x00020033, 0x00020033, }, - {0x0002003f, 0x0002003f, 0x0002003f, 0x0002003f, 0x00020040, 0x00020040, 0x00020040, 0x00020040, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, }, -}; - -const uint32_t c_aauiCQMFHuffEnc26[77][2] = -{ - {0x0006, 0x0004}, {0x0005, 0x0007}, {0x0005, 0x0008}, {0x0005, 0x0009}, {0x0005, 0x000a}, {0x0005, 0x000b}, {0x0005, 0x000c}, {0x0005, 0x000d}, - {0x0005, 0x000e}, {0x0005, 0x000f}, {0x0005, 0x0010}, {0x0005, 0x0011}, {0x0005, 0x0012}, {0x0005, 0x0013}, {0x0005, 0x0014}, {0x0005, 0x0015}, - {0x0005, 0x0016}, {0x0005, 0x0017}, {0x0005, 0x0018}, {0x0005, 0x0019}, {0x0005, 0x001a}, {0x0005, 0x001b}, {0x0005, 0x001c}, {0x0005, 0x001d}, - {0x0005, 0x001e}, {0x0005, 0x001f}, {0x0006, 0x0005}, {0x0006, 0x0006}, {0x0006, 0x0007}, {0x0006, 0x0008}, {0x0006, 0x0009}, {0x0006, 0x000a}, - {0x0006, 0x000b}, {0x0006, 0x000c}, {0x0006, 0x000d}, {0x0007, 0x0004}, {0x0007, 0x0005}, {0x0007, 0x0006}, {0x0007, 0x0007}, {0x0008, 0x0004}, - {0x0008, 0x0005}, {0x0008, 0x0006}, {0x0008, 0x0007}, {0x0009, 0x0003}, {0x0009, 0x0004}, {0x0009, 0x0005}, {0x0009, 0x0006}, {0x0009, 0x0007}, - {0x000a, 0x0003}, {0x000a, 0x0004}, {0x000a, 0x0005}, {0x000b, 0x0004}, {0x000b, 0x0005}, {0x000c, 0x0003}, {0x000c, 0x0004}, {0x000c, 0x0005}, - {0x000c, 0x0006}, {0x000c, 0x0007}, {0x000d, 0x0003}, {0x000d, 0x0004}, {0x000e, 0x0002}, {0x000d, 0x0005}, {0x000e, 0x0003}, {0x000e, 0x0004}, - {0x000f, 0x0003}, {0x000e, 0x0005}, {0x0010, 0x0002}, {0x0010, 0x0003}, {0x0010, 0x0004}, {0x0011, 0x0002}, {0x0012, 0x0001}, {0x0010, 0x0005}, - {0x0012, 0x0002}, {0x0011, 0x0003}, {0x0012, 0x0003}, {0x0013, 0x0000}, {0x0013, 0x0001}, - -}; - -const uint32_t c_aauiCQMFHuffDec26[26][16] = -{ - {0x0010ffff, 0x000effff, 0x000fffff, 0x0001ffff, 0x0002ffff, 0x0003ffff, 0x0004ffff, 0x0005ffff, 0x0006ffff, 0x0007ffff, 0x0008ffff, 0x0009ffff, 0x000affff, 0x000bffff, 0x000cffff, 0x000dffff, }, - {0x00020021, 0x00020021, 0x00020021, 0x00020021, 0x00020022, 0x00020022, 0x00020022, 0x00020022, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, }, - {0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, }, - {0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, }, - {0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, }, - {0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, }, - {0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, }, - {0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, }, - {0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, }, - {0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, }, - {0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, }, - {0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, }, - {0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, }, - {0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, }, - {0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001c, }, - {0x0002001d, 0x0002001d, 0x0002001d, 0x0002001d, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001f, 0x0002001f, 0x0002001f, 0x0002001f, 0x00020020, 0x00020020, 0x00020020, 0x00020020, }, - {0x0014ffff, 0x0011ffff, 0x0012ffff, 0x0013ffff, 0x00000027, 0x00000028, 0x00000029, 0x0000002a, 0x00010023, 0x00010023, 0x00010024, 0x00010024, 0x00010025, 0x00010025, 0x00010026, 0x00010026, }, - {0x00020031, 0x00020031, 0x00020031, 0x00020031, 0x00020032, 0x00020032, 0x00020032, 0x00020032, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, }, - {0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, }, - {0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, }, - {0x0017ffff, 0x0015ffff, 0x0016ffff, 0x00000035, 0x00000036, 0x00000037, 0x00000038, 0x00000039, 0x00010033, 0x00010033, 0x00010034, 0x00010034, 0x00020030, 0x00020030, 0x00020030, 0x00020030, }, - {0x0002003f, 0x0002003f, 0x0002003f, 0x0002003f, 0x00020041, 0x00020041, 0x00020041, 0x00020041, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, }, - {0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, }, - {0x0019ffff, 0x0018ffff, 0x00000042, 0x00000043, 0x00000044, 0x00000047, 0x00010040, 0x00010040, 0x0002003c, 0x0002003c, 0x0002003c, 0x0002003c, 0x0002003e, 0x0002003e, 0x0002003e, 0x0002003e, }, - {0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, }, - {0x0001004b, 0x0001004b, 0x0001004c, 0x0001004c, 0x00020046, 0x00020046, 0x00020046, 0x00020046, 0x00020048, 0x00020048, 0x00020048, 0x00020048, 0x0002004a, 0x0002004a, 0x0002004a, 0x0002004a, }, -}; - -const uint32_t c_aauiCQMFHuffEnc27[91][2] = -{ - {0x0006, 0x0006}, {0x0005, 0x000b}, {0x0005, 0x000c}, {0x0005, 0x000d}, {0x0005, 0x000e}, {0x0005, 0x000f}, {0x0005, 0x0010}, {0x0005, 0x0011}, - {0x0005, 0x0012}, {0x0005, 0x0013}, {0x0005, 0x0014}, {0x0005, 0x0015}, {0x0005, 0x0016}, {0x0005, 0x0017}, {0x0005, 0x0018}, {0x0005, 0x0019}, - {0x0005, 0x001a}, {0x0005, 0x001b}, {0x0005, 0x001c}, {0x0005, 0x001d}, {0x0005, 0x001e}, {0x0005, 0x001f}, {0x0006, 0x0007}, {0x0006, 0x0008}, - {0x0006, 0x0009}, {0x0006, 0x000a}, {0x0006, 0x000b}, {0x0006, 0x000c}, {0x0006, 0x000d}, {0x0006, 0x000e}, {0x0006, 0x000f}, {0x0006, 0x0010}, - {0x0006, 0x0011}, {0x0006, 0x0012}, {0x0006, 0x0013}, {0x0006, 0x0014}, {0x0006, 0x0015}, {0x0007, 0x0005}, {0x0007, 0x0006}, {0x0007, 0x0007}, - {0x0007, 0x0008}, {0x0007, 0x0009}, {0x0007, 0x000a}, {0x0007, 0x000b}, {0x0008, 0x0004}, {0x0008, 0x0005}, {0x0008, 0x0006}, {0x0008, 0x0007}, - {0x0008, 0x0008}, {0x0008, 0x0009}, {0x0009, 0x0004}, {0x0009, 0x0005}, {0x0009, 0x0006}, {0x0009, 0x0007}, {0x000a, 0x0004}, {0x000a, 0x0005}, - {0x000a, 0x0006}, {0x000a, 0x0007}, {0x000b, 0x0004}, {0x000b, 0x0005}, {0x000b, 0x0006}, {0x000b, 0x0007}, {0x000c, 0x0004}, {0x000c, 0x0005}, - {0x000c, 0x0006}, {0x000c, 0x0007}, {0x000d, 0x0004}, {0x000d, 0x0005}, {0x000d, 0x0006}, {0x000d, 0x0007}, {0x000e, 0x0003}, {0x000e, 0x0004}, - {0x000e, 0x0005}, {0x000e, 0x0006}, {0x000e, 0x0007}, {0x000f, 0x0003}, {0x000f, 0x0004}, {0x0010, 0x0003}, {0x000f, 0x0005}, {0x0012, 0x0000}, - {0x0010, 0x0004}, {0x0010, 0x0005}, {0x0012, 0x0001}, {0x0012, 0x0002}, {0x0011, 0x0004}, {0x0011, 0x0005}, {0x0012, 0x0003}, {0x0012, 0x0004}, - {0x0012, 0x0005}, {0x0012, 0x0006}, {0x0012, 0x0007}, - -}; - -const uint32_t c_aauiCQMFHuffDec27[28][16] = -{ - {0x0010ffff, 0x000cffff, 0x000dffff, 0x000effff, 0x000fffff, 0x0001ffff, 0x0002ffff, 0x0003ffff, 0x0004ffff, 0x0005ffff, 0x0006ffff, 0x0007ffff, 0x0008ffff, 0x0009ffff, 0x000affff, 0x000bffff, }, - {0x00020023, 0x00020023, 0x00020023, 0x00020023, 0x00020024, 0x00020024, 0x00020024, 0x00020024, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, }, - {0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, }, - {0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, }, - {0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, }, - {0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, }, - {0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, }, - {0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, }, - {0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, }, - {0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, }, - {0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, }, - {0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, }, - {0x00010028, 0x00010028, 0x00010029, 0x00010029, 0x0001002a, 0x0001002a, 0x0001002b, 0x0001002b, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020016, 0x00020016, 0x00020016, 0x00020016, }, - {0x00020017, 0x00020017, 0x00020017, 0x00020017, 0x00020018, 0x00020018, 0x00020018, 0x00020018, 0x00020019, 0x00020019, 0x00020019, 0x00020019, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001a, }, - {0x0002001b, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001d, 0x0002001d, 0x0002001d, 0x0002001d, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001e, }, - {0x0002001f, 0x0002001f, 0x0002001f, 0x0002001f, 0x00020020, 0x00020020, 0x00020020, 0x00020020, 0x00020021, 0x00020021, 0x00020021, 0x00020021, 0x00020022, 0x00020022, 0x00020022, 0x00020022, }, - {0x0014ffff, 0x0013ffff, 0x0011ffff, 0x0012ffff, 0x0000002c, 0x0000002d, 0x0000002e, 0x0000002f, 0x00000030, 0x00000031, 0x00010025, 0x00010025, 0x00010026, 0x00010026, 0x00010027, 0x00010027, }, - {0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, }, - {0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, }, - {0x00020036, 0x00020036, 0x00020036, 0x00020036, 0x00020037, 0x00020037, 0x00020037, 0x00020037, 0x00020038, 0x00020038, 0x00020038, 0x00020038, 0x00020039, 0x00020039, 0x00020039, 0x00020039, }, - {0x0017ffff, 0x0018ffff, 0x0015ffff, 0x0016ffff, 0x0000003e, 0x0000003f, 0x00000040, 0x00000041, 0x0001003a, 0x0001003a, 0x0001003b, 0x0001003b, 0x0001003c, 0x0001003c, 0x0001003d, 0x0001003d, }, - {0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, }, - {0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, }, - {0x001affff, 0x001bffff, 0x0019ffff, 0x0000004d, 0x00000050, 0x00000051, 0x0001004b, 0x0001004b, 0x0001004c, 0x0001004c, 0x0001004e, 0x0001004e, 0x00020046, 0x00020046, 0x00020046, 0x00020046, }, - {0x00020047, 0x00020047, 0x00020047, 0x00020047, 0x00020048, 0x00020048, 0x00020048, 0x00020048, 0x00020049, 0x00020049, 0x00020049, 0x00020049, 0x0002004a, 0x0002004a, 0x0002004a, 0x0002004a, }, - {0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, }, - {0x0002004f, 0x0002004f, 0x0002004f, 0x0002004f, 0x00020052, 0x00020052, 0x00020052, 0x00020052, 0x00020053, 0x00020053, 0x00020053, 0x00020053, 0x00020056, 0x00020056, 0x00020056, 0x00020056, }, - {0x00020057, 0x00020057, 0x00020057, 0x00020057, 0x00020058, 0x00020058, 0x00020058, 0x00020058, 0x00020059, 0x00020059, 0x00020059, 0x00020059, 0x0002005a, 0x0002005a, 0x0002005a, 0x0002005a, }, -}; - -const uint32_t c_aauiCQMFHuffEnc28[109][2] = -{ - {0x0006, 0x0008}, {0x0005, 0x0010}, {0x0005, 0x0011}, {0x0005, 0x0012}, {0x0005, 0x0013}, {0x0005, 0x0014}, {0x0005, 0x0015}, {0x0005, 0x0016}, - {0x0005, 0x0017}, {0x0005, 0x0018}, {0x0005, 0x0019}, {0x0005, 0x001a}, {0x0005, 0x001b}, {0x0005, 0x001c}, {0x0005, 0x001d}, {0x0005, 0x001e}, - {0x0006, 0x0009}, {0x0005, 0x001f}, {0x0006, 0x000a}, {0x0006, 0x000b}, {0x0006, 0x000c}, {0x0006, 0x000d}, {0x0006, 0x000e}, {0x0006, 0x000f}, - {0x0006, 0x0010}, {0x0006, 0x0011}, {0x0006, 0x0012}, {0x0006, 0x0013}, {0x0006, 0x0014}, {0x0006, 0x0015}, {0x0006, 0x0016}, {0x0006, 0x0017}, - {0x0006, 0x0018}, {0x0006, 0x0019}, {0x0006, 0x001a}, {0x0006, 0x001b}, {0x0006, 0x001c}, {0x0006, 0x001d}, {0x0006, 0x001e}, {0x0006, 0x001f}, - {0x0007, 0x0006}, {0x0007, 0x0007}, {0x0007, 0x0008}, {0x0007, 0x0009}, {0x0007, 0x000a}, {0x0007, 0x000b}, {0x0007, 0x000c}, {0x0007, 0x000d}, - {0x0007, 0x000e}, {0x0007, 0x000f}, {0x0008, 0x0005}, {0x0008, 0x0006}, {0x0008, 0x0007}, {0x0008, 0x0008}, {0x0008, 0x0009}, {0x0008, 0x000a}, - {0x0008, 0x000b}, {0x0009, 0x0004}, {0x0009, 0x0005}, {0x0009, 0x0006}, {0x0009, 0x0007}, {0x0009, 0x0008}, {0x0009, 0x0009}, {0x000a, 0x0005}, - {0x000a, 0x0006}, {0x000a, 0x0007}, {0x000b, 0x0005}, {0x000b, 0x0006}, {0x000b, 0x0007}, {0x000b, 0x0008}, {0x000b, 0x0009}, {0x000c, 0x0004}, - {0x000c, 0x0005}, {0x000c, 0x0006}, {0x000c, 0x0007}, {0x000c, 0x0008}, {0x000c, 0x0009}, {0x000d, 0x0004}, {0x000d, 0x0005}, {0x000d, 0x0006}, - {0x000d, 0x0007}, {0x000e, 0x0004}, {0x000e, 0x0005}, {0x000e, 0x0006}, {0x000e, 0x0007}, {0x0010, 0x0004}, {0x000f, 0x0005}, {0x0010, 0x0005}, - {0x000f, 0x0006}, {0x000f, 0x0007}, {0x0010, 0x0006}, {0x0011, 0x0006}, {0x0010, 0x0007}, {0x0013, 0x0000}, {0x0010, 0x0008}, {0x0010, 0x0009}, - {0x0013, 0x0001}, {0x0011, 0x0007}, {0x0012, 0x0001}, {0x0012, 0x0002}, {0x0012, 0x0003}, {0x0012, 0x0004}, {0x0012, 0x0005}, {0x0012, 0x0006}, - {0x0012, 0x0007}, {0x0012, 0x0008}, {0x0012, 0x0009}, {0x0012, 0x000a}, {0x0012, 0x000b}, - -}; - -const uint32_t c_aauiCQMFHuffDec28[30][16] = -{ - {0x000fffff, 0x0010ffff, 0x0009ffff, 0x000affff, 0x000bffff, 0x000cffff, 0x000dffff, 0x000effff, 0x0001ffff, 0x0002ffff, 0x0003ffff, 0x0004ffff, 0x0005ffff, 0x0006ffff, 0x0007ffff, 0x0008ffff, }, - {0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, }, - {0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, }, - {0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, }, - {0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, }, - {0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, }, - {0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, }, - {0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, }, - {0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, }, - {0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020010, 0x00020010, 0x00020010, 0x00020010, 0x00020012, 0x00020012, 0x00020012, 0x00020012, 0x00020013, 0x00020013, 0x00020013, 0x00020013, }, - {0x00020014, 0x00020014, 0x00020014, 0x00020014, 0x00020015, 0x00020015, 0x00020015, 0x00020015, 0x00020016, 0x00020016, 0x00020016, 0x00020016, 0x00020017, 0x00020017, 0x00020017, 0x00020017, }, - {0x00020018, 0x00020018, 0x00020018, 0x00020018, 0x00020019, 0x00020019, 0x00020019, 0x00020019, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001b, }, - {0x0002001c, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001d, 0x0002001d, 0x0002001d, 0x0002001d, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001f, 0x0002001f, 0x0002001f, 0x0002001f, }, - {0x00020020, 0x00020020, 0x00020020, 0x00020020, 0x00020021, 0x00020021, 0x00020021, 0x00020021, 0x00020022, 0x00020022, 0x00020022, 0x00020022, 0x00020023, 0x00020023, 0x00020023, 0x00020023, }, - {0x00020024, 0x00020024, 0x00020024, 0x00020024, 0x00020025, 0x00020025, 0x00020025, 0x00020025, 0x00020026, 0x00020026, 0x00020026, 0x00020026, 0x00020027, 0x00020027, 0x00020027, 0x00020027, }, - {0x0015ffff, 0x0014ffff, 0x0011ffff, 0x0012ffff, 0x0013ffff, 0x00000032, 0x00000033, 0x00000034, 0x00000035, 0x00000036, 0x00000037, 0x00000038, 0x00010028, 0x00010028, 0x00010029, 0x00010029, }, - {0x0001002a, 0x0001002a, 0x0001002b, 0x0001002b, 0x0001002c, 0x0001002c, 0x0001002d, 0x0001002d, 0x0001002e, 0x0001002e, 0x0001002f, 0x0001002f, 0x00010030, 0x00010030, 0x00010031, 0x00010031, }, - {0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, }, - {0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, }, - {0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, }, - {0x00010045, 0x00010045, 0x00010046, 0x00010046, 0x0002003f, 0x0002003f, 0x0002003f, 0x0002003f, 0x00020040, 0x00020040, 0x00020040, 0x00020040, 0x00020041, 0x00020041, 0x00020041, 0x00020041, }, - {0x0019ffff, 0x0018ffff, 0x0016ffff, 0x0017ffff, 0x00000047, 0x00000048, 0x00000049, 0x0000004a, 0x0000004b, 0x0000004c, 0x00010042, 0x00010042, 0x00010043, 0x00010043, 0x00010044, 0x00010044, }, - {0x0003004d, 0x0003004d, 0x0003004d, 0x0003004d, 0x0003004d, 0x0003004d, 0x0003004d, 0x0003004d, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, }, - {0x0003004f, 0x0003004f, 0x0003004f, 0x0003004f, 0x0003004f, 0x0003004f, 0x0003004f, 0x0003004f, 0x00030050, 0x00030050, 0x00030050, 0x00030050, 0x00030050, 0x00030050, 0x00030050, 0x00030050, }, - {0x00020051, 0x00020051, 0x00020051, 0x00020051, 0x00020052, 0x00020052, 0x00020052, 0x00020052, 0x00020053, 0x00020053, 0x00020053, 0x00020053, 0x00020054, 0x00020054, 0x00020054, 0x00020054, }, - {0x001bffff, 0x001cffff, 0x001dffff, 0x001affff, 0x00000055, 0x00000057, 0x0000005a, 0x0000005c, 0x0000005e, 0x0000005f, 0x00010056, 0x00010056, 0x00010058, 0x00010058, 0x00010059, 0x00010059, }, - {0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x00030061, 0x00030061, 0x00030061, 0x00030061, 0x00030061, 0x00030061, 0x00030061, 0x00030061, }, - {0x0001005d, 0x0001005d, 0x00010060, 0x00010060, 0x00020062, 0x00020062, 0x00020062, 0x00020062, 0x00020063, 0x00020063, 0x00020063, 0x00020063, 0x00020064, 0x00020064, 0x00020064, 0x00020064, }, - {0x00020065, 0x00020065, 0x00020065, 0x00020065, 0x00020066, 0x00020066, 0x00020066, 0x00020066, 0x00020067, 0x00020067, 0x00020067, 0x00020067, 0x00020068, 0x00020068, 0x00020068, 0x00020068, }, - {0x00020069, 0x00020069, 0x00020069, 0x00020069, 0x0002006a, 0x0002006a, 0x0002006a, 0x0002006a, 0x0002006b, 0x0002006b, 0x0002006b, 0x0002006b, 0x0002006c, 0x0002006c, 0x0002006c, 0x0002006c, }, -}; - -const uint32_t c_aauiCQMFHuffEnc29[129][2] = -{ - {0x0006, 0x0009}, {0x0005, 0x0019}, {0x0006, 0x000a}, {0x0005, 0x001a}, {0x0005, 0x001b}, {0x0005, 0x001c}, {0x0006, 0x000b}, {0x0005, 0x001d}, - {0x0005, 0x001e}, {0x0006, 0x000c}, {0x0006, 0x000d}, {0x0005, 0x001f}, {0x0006, 0x000e}, {0x0006, 0x000f}, {0x0006, 0x0010}, {0x0006, 0x0011}, - {0x0006, 0x0012}, {0x0006, 0x0013}, {0x0006, 0x0014}, {0x0006, 0x0015}, {0x0006, 0x0016}, {0x0006, 0x0017}, {0x0006, 0x0018}, {0x0006, 0x0019}, - {0x0006, 0x001a}, {0x0006, 0x001b}, {0x0006, 0x001c}, {0x0006, 0x001d}, {0x0006, 0x001e}, {0x0006, 0x001f}, {0x0006, 0x0020}, {0x0006, 0x0021}, - {0x0006, 0x0022}, {0x0006, 0x0023}, {0x0006, 0x0024}, {0x0006, 0x0025}, {0x0006, 0x0026}, {0x0006, 0x0027}, {0x0006, 0x0028}, {0x0006, 0x0029}, - {0x0006, 0x002a}, {0x0006, 0x002b}, {0x0006, 0x002c}, {0x0006, 0x002d}, {0x0006, 0x002e}, {0x0006, 0x002f}, {0x0006, 0x0030}, {0x0006, 0x0031}, - {0x0007, 0x0007}, {0x0007, 0x0008}, {0x0007, 0x0009}, {0x0007, 0x000a}, {0x0007, 0x000b}, {0x0007, 0x000c}, {0x0007, 0x000d}, {0x0007, 0x000e}, - {0x0007, 0x000f}, {0x0007, 0x0010}, {0x0007, 0x0011}, {0x0008, 0x0006}, {0x0008, 0x0007}, {0x0008, 0x0008}, {0x0008, 0x0009}, {0x0008, 0x000a}, - {0x0008, 0x000b}, {0x0008, 0x000c}, {0x0008, 0x000d}, {0x0009, 0x0006}, {0x0009, 0x0007}, {0x0009, 0x0008}, {0x0009, 0x0009}, {0x0009, 0x000a}, - {0x0009, 0x000b}, {0x000a, 0x0005}, {0x000a, 0x0006}, {0x000a, 0x0007}, {0x000a, 0x0008}, {0x000a, 0x0009}, {0x000a, 0x000a}, {0x000a, 0x000b}, - {0x000b, 0x0006}, {0x000b, 0x0007}, {0x000b, 0x0008}, {0x000b, 0x0009}, {0x000c, 0x0006}, {0x000c, 0x0007}, {0x000c, 0x0008}, {0x000c, 0x0009}, - {0x000c, 0x000a}, {0x000c, 0x000b}, {0x000d, 0x0005}, {0x000d, 0x0006}, {0x000d, 0x0007}, {0x000d, 0x0008}, {0x000d, 0x0009}, {0x000d, 0x000a}, - {0x000d, 0x000b}, {0x000e, 0x0006}, {0x000e, 0x0007}, {0x000e, 0x0008}, {0x000e, 0x0009}, {0x000f, 0x0004}, {0x000f, 0x0005}, {0x000f, 0x0006}, - {0x000f, 0x0007}, {0x0011, 0x0007}, {0x000f, 0x0008}, {0x0012, 0x0000}, {0x000f, 0x0009}, {0x0010, 0x0005}, {0x000f, 0x000a}, {0x000f, 0x000b}, - {0x0012, 0x0001}, {0x0010, 0x0006}, {0x0010, 0x0007}, {0x0012, 0x0002}, {0x0012, 0x0003}, {0x0012, 0x0004}, {0x0012, 0x0005}, {0x0012, 0x0006}, - {0x0012, 0x0007}, {0x0012, 0x0008}, {0x0011, 0x0008}, {0x0012, 0x0009}, {0x0012, 0x000a}, {0x0012, 0x000b}, {0x0012, 0x000c}, {0x0012, 0x000d}, - {0x0011, 0x0009}, - -}; - -const uint32_t c_aauiCQMFHuffDec29[34][16] = -{ - {0x000fffff, 0x0010ffff, 0x0005ffff, 0x0006ffff, 0x0007ffff, 0x0008ffff, 0x0009ffff, 0x000affff, 0x000bffff, 0x000cffff, 0x000dffff, 0x000effff, 0x0001ffff, 0x0002ffff, 0x0003ffff, 0x0004ffff, }, - {0x0002002e, 0x0002002e, 0x0002002e, 0x0002002e, 0x0002002f, 0x0002002f, 0x0002002f, 0x0002002f, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, 0x00030001, }, - {0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, }, - {0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, }, - {0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, }, - {0x00010039, 0x00010039, 0x0001003a, 0x0001003a, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020002, 0x00020002, 0x00020002, 0x00020002, 0x00020006, 0x00020006, 0x00020006, 0x00020006, }, - {0x00020009, 0x00020009, 0x00020009, 0x00020009, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000d, }, - {0x0002000e, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000f, 0x0002000f, 0x0002000f, 0x0002000f, 0x00020010, 0x00020010, 0x00020010, 0x00020010, 0x00020011, 0x00020011, 0x00020011, 0x00020011, }, - {0x00020012, 0x00020012, 0x00020012, 0x00020012, 0x00020013, 0x00020013, 0x00020013, 0x00020013, 0x00020014, 0x00020014, 0x00020014, 0x00020014, 0x00020015, 0x00020015, 0x00020015, 0x00020015, }, - {0x00020016, 0x00020016, 0x00020016, 0x00020016, 0x00020017, 0x00020017, 0x00020017, 0x00020017, 0x00020018, 0x00020018, 0x00020018, 0x00020018, 0x00020019, 0x00020019, 0x00020019, 0x00020019, }, - {0x0002001a, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001d, 0x0002001d, 0x0002001d, 0x0002001d, }, - {0x0002001e, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001f, 0x0002001f, 0x0002001f, 0x0002001f, 0x00020020, 0x00020020, 0x00020020, 0x00020020, 0x00020021, 0x00020021, 0x00020021, 0x00020021, }, - {0x00020022, 0x00020022, 0x00020022, 0x00020022, 0x00020023, 0x00020023, 0x00020023, 0x00020023, 0x00020024, 0x00020024, 0x00020024, 0x00020024, 0x00020025, 0x00020025, 0x00020025, 0x00020025, }, - {0x00020026, 0x00020026, 0x00020026, 0x00020026, 0x00020027, 0x00020027, 0x00020027, 0x00020027, 0x00020028, 0x00020028, 0x00020028, 0x00020028, 0x00020029, 0x00020029, 0x00020029, 0x00020029, }, - {0x0002002a, 0x0002002a, 0x0002002a, 0x0002002a, 0x0002002b, 0x0002002b, 0x0002002b, 0x0002002b, 0x0002002c, 0x0002002c, 0x0002002c, 0x0002002c, 0x0002002d, 0x0002002d, 0x0002002d, 0x0002002d, }, - {0x0016ffff, 0x0014ffff, 0x0015ffff, 0x0011ffff, 0x0012ffff, 0x0013ffff, 0x0000003b, 0x0000003c, 0x0000003d, 0x0000003e, 0x0000003f, 0x00000040, 0x00000041, 0x00000042, 0x00010030, 0x00010030, }, - {0x00010031, 0x00010031, 0x00010032, 0x00010032, 0x00010033, 0x00010033, 0x00010034, 0x00010034, 0x00010035, 0x00010035, 0x00010036, 0x00010036, 0x00010037, 0x00010037, 0x00010038, 0x00010038, }, - {0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030044, }, - {0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030046, }, - {0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, }, - {0x00010052, 0x00010052, 0x00010053, 0x00010053, 0x00020049, 0x00020049, 0x00020049, 0x00020049, 0x0002004a, 0x0002004a, 0x0002004a, 0x0002004a, 0x0002004b, 0x0002004b, 0x0002004b, 0x0002004b, }, - {0x0002004c, 0x0002004c, 0x0002004c, 0x0002004c, 0x0002004d, 0x0002004d, 0x0002004d, 0x0002004d, 0x0002004e, 0x0002004e, 0x0002004e, 0x0002004e, 0x0002004f, 0x0002004f, 0x0002004f, 0x0002004f, }, - {0x001cffff, 0x001bffff, 0x0017ffff, 0x0018ffff, 0x0019ffff, 0x001affff, 0x00000054, 0x00000055, 0x00000056, 0x00000057, 0x00000058, 0x00000059, 0x00010050, 0x00010050, 0x00010051, 0x00010051, }, - {0x00020063, 0x00020063, 0x00020063, 0x00020063, 0x00020064, 0x00020064, 0x00020064, 0x00020064, 0x0003005a, 0x0003005a, 0x0003005a, 0x0003005a, 0x0003005a, 0x0003005a, 0x0003005a, 0x0003005a, }, - {0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005c, 0x0003005c, 0x0003005c, 0x0003005c, 0x0003005c, 0x0003005c, 0x0003005c, 0x0003005c, }, - {0x0003005d, 0x0003005d, 0x0003005d, 0x0003005d, 0x0003005d, 0x0003005d, 0x0003005d, 0x0003005d, 0x0003005e, 0x0003005e, 0x0003005e, 0x0003005e, 0x0003005e, 0x0003005e, 0x0003005e, 0x0003005e, }, - {0x0003005f, 0x0003005f, 0x0003005f, 0x0003005f, 0x0003005f, 0x0003005f, 0x0003005f, 0x0003005f, 0x00030060, 0x00030060, 0x00030060, 0x00030060, 0x00030060, 0x00030060, 0x00030060, 0x00030060, }, - {0x0001006a, 0x0001006a, 0x0001006c, 0x0001006c, 0x0001006e, 0x0001006e, 0x0001006f, 0x0001006f, 0x00020061, 0x00020061, 0x00020061, 0x00020061, 0x00020062, 0x00020062, 0x00020062, 0x00020062, }, - {0x001fffff, 0x0020ffff, 0x0021ffff, 0x001dffff, 0x001effff, 0x0000006d, 0x00000071, 0x00000072, 0x00010065, 0x00010065, 0x00010066, 0x00010066, 0x00010067, 0x00010067, 0x00010068, 0x00010068, }, - {0x0002007e, 0x0002007e, 0x0002007e, 0x0002007e, 0x0002007f, 0x0002007f, 0x0002007f, 0x0002007f, 0x00030069, 0x00030069, 0x00030069, 0x00030069, 0x00030069, 0x00030069, 0x00030069, 0x00030069, }, - {0x0003007a, 0x0003007a, 0x0003007a, 0x0003007a, 0x0003007a, 0x0003007a, 0x0003007a, 0x0003007a, 0x00030080, 0x00030080, 0x00030080, 0x00030080, 0x00030080, 0x00030080, 0x00030080, 0x00030080, }, - {0x0002006b, 0x0002006b, 0x0002006b, 0x0002006b, 0x00020070, 0x00020070, 0x00020070, 0x00020070, 0x00020073, 0x00020073, 0x00020073, 0x00020073, 0x00020074, 0x00020074, 0x00020074, 0x00020074, }, - {0x00020075, 0x00020075, 0x00020075, 0x00020075, 0x00020076, 0x00020076, 0x00020076, 0x00020076, 0x00020077, 0x00020077, 0x00020077, 0x00020077, 0x00020078, 0x00020078, 0x00020078, 0x00020078, }, - {0x00020079, 0x00020079, 0x00020079, 0x00020079, 0x0002007b, 0x0002007b, 0x0002007b, 0x0002007b, 0x0002007c, 0x0002007c, 0x0002007c, 0x0002007c, 0x0002007d, 0x0002007d, 0x0002007d, 0x0002007d, }, -}; - -const uint32_t c_aauiCQMFHuffEnc30[153][2] = -{ - {0x0007, 0x0009}, {0x0006, 0x000e}, {0x0006, 0x000f}, {0x0006, 0x0010}, {0x0006, 0x0011}, {0x0006, 0x0012}, {0x0006, 0x0013}, {0x0006, 0x0014}, - {0x0006, 0x0015}, {0x0006, 0x0016}, {0x0006, 0x0017}, {0x0006, 0x0018}, {0x0006, 0x0019}, {0x0006, 0x001a}, {0x0006, 0x001b}, {0x0006, 0x001c}, - {0x0006, 0x001d}, {0x0006, 0x001e}, {0x0006, 0x001f}, {0x0006, 0x0020}, {0x0006, 0x0021}, {0x0006, 0x0022}, {0x0006, 0x0023}, {0x0006, 0x0024}, - {0x0006, 0x0025}, {0x0006, 0x0026}, {0x0006, 0x0027}, {0x0006, 0x0028}, {0x0006, 0x0029}, {0x0006, 0x002a}, {0x0006, 0x002b}, {0x0006, 0x002c}, - {0x0006, 0x002d}, {0x0006, 0x002e}, {0x0006, 0x002f}, {0x0006, 0x0030}, {0x0006, 0x0031}, {0x0006, 0x0032}, {0x0006, 0x0033}, {0x0006, 0x0034}, - {0x0006, 0x0035}, {0x0006, 0x0036}, {0x0006, 0x0037}, {0x0006, 0x0038}, {0x0006, 0x0039}, {0x0006, 0x003a}, {0x0006, 0x003b}, {0x0006, 0x003c}, - {0x0006, 0x003d}, {0x0006, 0x003e}, {0x0006, 0x003f}, {0x0007, 0x000a}, {0x0007, 0x000b}, {0x0007, 0x000c}, {0x0007, 0x000d}, {0x0007, 0x000e}, - {0x0007, 0x000f}, {0x0007, 0x0010}, {0x0007, 0x0011}, {0x0007, 0x0012}, {0x0007, 0x0013}, {0x0007, 0x0014}, {0x0007, 0x0015}, {0x0007, 0x0016}, - {0x0007, 0x0017}, {0x0007, 0x0018}, {0x0007, 0x0019}, {0x0007, 0x001a}, {0x0007, 0x001b}, {0x0008, 0x0008}, {0x0008, 0x0009}, {0x0008, 0x000a}, - {0x0008, 0x000b}, {0x0008, 0x000c}, {0x0008, 0x000d}, {0x0008, 0x000e}, {0x0008, 0x000f}, {0x0008, 0x0010}, {0x0008, 0x0011}, {0x0009, 0x0007}, - {0x0009, 0x0008}, {0x0009, 0x0009}, {0x0009, 0x000a}, {0x0009, 0x000b}, {0x0009, 0x000c}, {0x0009, 0x000d}, {0x0009, 0x000e}, {0x000a, 0x0008}, - {0x0009, 0x000f}, {0x000a, 0x0009}, {0x000a, 0x000a}, {0x000a, 0x000b}, {0x000a, 0x000c}, {0x000a, 0x000d}, {0x000b, 0x0007}, {0x000b, 0x0008}, - {0x000b, 0x0009}, {0x000b, 0x000a}, {0x000b, 0x000b}, {0x000b, 0x000c}, {0x000b, 0x000d}, {0x000c, 0x0008}, {0x000b, 0x000e}, {0x000b, 0x000f}, - {0x000c, 0x0009}, {0x000c, 0x000a}, {0x000d, 0x0008}, {0x000c, 0x000b}, {0x000c, 0x000c}, {0x000d, 0x0009}, {0x000c, 0x000d}, {0x000d, 0x000a}, - {0x000d, 0x000b}, {0x000d, 0x000c}, {0x000d, 0x000d}, {0x000e, 0x0008}, {0x000d, 0x000e}, {0x000d, 0x000f}, {0x000e, 0x0009}, {0x000e, 0x000a}, - {0x000e, 0x000b}, {0x000e, 0x000c}, {0x000f, 0x0006}, {0x000f, 0x0007}, {0x000f, 0x0008}, {0x0010, 0x0006}, {0x000e, 0x000d}, {0x000e, 0x000e}, - {0x000e, 0x000f}, {0x0010, 0x0007}, {0x000f, 0x0009}, {0x0010, 0x0008}, {0x000f, 0x000a}, {0x000f, 0x000b}, {0x000f, 0x000c}, {0x000f, 0x000d}, - {0x0010, 0x0009}, {0x0011, 0x0000}, {0x0011, 0x0001}, {0x0011, 0x0002}, {0x000f, 0x000e}, {0x0010, 0x000a}, {0x0011, 0x0003}, {0x0011, 0x0004}, - {0x0011, 0x0005}, {0x000f, 0x000f}, {0x0011, 0x0006}, {0x0011, 0x0007}, {0x0011, 0x0008}, {0x0011, 0x0009}, {0x0011, 0x000a}, {0x0011, 0x000b}, - {0x0010, 0x000b}, - -}; - -const uint32_t c_aauiCQMFHuffDec30[39][16] = -{ - {0x0010ffff, 0x000effff, 0x000fffff, 0x0001ffff, 0x0002ffff, 0x0003ffff, 0x0004ffff, 0x0005ffff, 0x0006ffff, 0x0007ffff, 0x0008ffff, 0x0009ffff, 0x000affff, 0x000bffff, 0x000cffff, 0x000dffff, }, - {0x00010041, 0x00010041, 0x00010042, 0x00010042, 0x00010043, 0x00010043, 0x00010044, 0x00010044, 0x00020001, 0x00020001, 0x00020001, 0x00020001, 0x00020002, 0x00020002, 0x00020002, 0x00020002, }, - {0x00020003, 0x00020003, 0x00020003, 0x00020003, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020005, 0x00020005, 0x00020005, 0x00020005, 0x00020006, 0x00020006, 0x00020006, 0x00020006, }, - {0x00020007, 0x00020007, 0x00020007, 0x00020007, 0x00020008, 0x00020008, 0x00020008, 0x00020008, 0x00020009, 0x00020009, 0x00020009, 0x00020009, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000a, }, - {0x0002000b, 0x0002000b, 0x0002000b, 0x0002000b, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000e, }, - {0x0002000f, 0x0002000f, 0x0002000f, 0x0002000f, 0x00020010, 0x00020010, 0x00020010, 0x00020010, 0x00020011, 0x00020011, 0x00020011, 0x00020011, 0x00020012, 0x00020012, 0x00020012, 0x00020012, }, - {0x00020013, 0x00020013, 0x00020013, 0x00020013, 0x00020014, 0x00020014, 0x00020014, 0x00020014, 0x00020015, 0x00020015, 0x00020015, 0x00020015, 0x00020016, 0x00020016, 0x00020016, 0x00020016, }, - {0x00020017, 0x00020017, 0x00020017, 0x00020017, 0x00020018, 0x00020018, 0x00020018, 0x00020018, 0x00020019, 0x00020019, 0x00020019, 0x00020019, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001a, }, - {0x0002001b, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001d, 0x0002001d, 0x0002001d, 0x0002001d, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001e, }, - {0x0002001f, 0x0002001f, 0x0002001f, 0x0002001f, 0x00020020, 0x00020020, 0x00020020, 0x00020020, 0x00020021, 0x00020021, 0x00020021, 0x00020021, 0x00020022, 0x00020022, 0x00020022, 0x00020022, }, - {0x00020023, 0x00020023, 0x00020023, 0x00020023, 0x00020024, 0x00020024, 0x00020024, 0x00020024, 0x00020025, 0x00020025, 0x00020025, 0x00020025, 0x00020026, 0x00020026, 0x00020026, 0x00020026, }, - {0x00020027, 0x00020027, 0x00020027, 0x00020027, 0x00020028, 0x00020028, 0x00020028, 0x00020028, 0x00020029, 0x00020029, 0x00020029, 0x00020029, 0x0002002a, 0x0002002a, 0x0002002a, 0x0002002a, }, - {0x0002002b, 0x0002002b, 0x0002002b, 0x0002002b, 0x0002002c, 0x0002002c, 0x0002002c, 0x0002002c, 0x0002002d, 0x0002002d, 0x0002002d, 0x0002002d, 0x0002002e, 0x0002002e, 0x0002002e, 0x0002002e, }, - {0x0002002f, 0x0002002f, 0x0002002f, 0x0002002f, 0x00020030, 0x00020030, 0x00020030, 0x00020030, 0x00020031, 0x00020031, 0x00020031, 0x00020031, 0x00020032, 0x00020032, 0x00020032, 0x00020032, }, - {0x0000004d, 0x0000004e, 0x00010000, 0x00010000, 0x00010033, 0x00010033, 0x00010034, 0x00010034, 0x00010035, 0x00010035, 0x00010036, 0x00010036, 0x00010037, 0x00010037, 0x00010038, 0x00010038, }, - {0x00010039, 0x00010039, 0x0001003a, 0x0001003a, 0x0001003b, 0x0001003b, 0x0001003c, 0x0001003c, 0x0001003d, 0x0001003d, 0x0001003e, 0x0001003e, 0x0001003f, 0x0001003f, 0x00010040, 0x00010040, }, - {0x0017ffff, 0x0018ffff, 0x0016ffff, 0x0011ffff, 0x0012ffff, 0x0013ffff, 0x0014ffff, 0x0015ffff, 0x00000045, 0x00000046, 0x00000047, 0x00000048, 0x00000049, 0x0000004a, 0x0000004b, 0x0000004c, }, - {0x0002005c, 0x0002005c, 0x0002005c, 0x0002005c, 0x0002005d, 0x0002005d, 0x0002005d, 0x0002005d, 0x0003004f, 0x0003004f, 0x0003004f, 0x0003004f, 0x0003004f, 0x0003004f, 0x0003004f, 0x0003004f, }, - {0x00030050, 0x00030050, 0x00030050, 0x00030050, 0x00030050, 0x00030050, 0x00030050, 0x00030050, 0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030051, }, - {0x00030052, 0x00030052, 0x00030052, 0x00030052, 0x00030052, 0x00030052, 0x00030052, 0x00030052, 0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030053, }, - {0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, }, - {0x00030056, 0x00030056, 0x00030056, 0x00030056, 0x00030056, 0x00030056, 0x00030056, 0x00030056, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, }, - {0x00020057, 0x00020057, 0x00020057, 0x00020057, 0x00020059, 0x00020059, 0x00020059, 0x00020059, 0x0002005a, 0x0002005a, 0x0002005a, 0x0002005a, 0x0002005b, 0x0002005b, 0x0002005b, 0x0002005b, }, - {0x001fffff, 0x0020ffff, 0x001dffff, 0x001effff, 0x0019ffff, 0x001affff, 0x001bffff, 0x001cffff, 0x00000065, 0x00000068, 0x00000069, 0x0000006b, 0x0000006c, 0x0000006e, 0x0001005e, 0x0001005e, }, - {0x0001005f, 0x0001005f, 0x00010060, 0x00010060, 0x00010061, 0x00010061, 0x00010062, 0x00010062, 0x00010063, 0x00010063, 0x00010064, 0x00010064, 0x00010066, 0x00010066, 0x00010067, 0x00010067, }, - {0x0003006a, 0x0003006a, 0x0003006a, 0x0003006a, 0x0003006a, 0x0003006a, 0x0003006a, 0x0003006a, 0x0003006d, 0x0003006d, 0x0003006d, 0x0003006d, 0x0003006d, 0x0003006d, 0x0003006d, 0x0003006d, }, - {0x0003006f, 0x0003006f, 0x0003006f, 0x0003006f, 0x0003006f, 0x0003006f, 0x0003006f, 0x0003006f, 0x00030070, 0x00030070, 0x00030070, 0x00030070, 0x00030070, 0x00030070, 0x00030070, 0x00030070, }, - {0x00030071, 0x00030071, 0x00030071, 0x00030071, 0x00030071, 0x00030071, 0x00030071, 0x00030071, 0x00030072, 0x00030072, 0x00030072, 0x00030072, 0x00030072, 0x00030072, 0x00030072, 0x00030072, }, - {0x00030074, 0x00030074, 0x00030074, 0x00030074, 0x00030074, 0x00030074, 0x00030074, 0x00030074, 0x00030075, 0x00030075, 0x00030075, 0x00030075, 0x00030075, 0x00030075, 0x00030075, 0x00030075, }, - {0x00020073, 0x00020073, 0x00020073, 0x00020073, 0x00020076, 0x00020076, 0x00020076, 0x00020076, 0x00020077, 0x00020077, 0x00020077, 0x00020077, 0x00020078, 0x00020078, 0x00020078, 0x00020078, }, - {0x00020079, 0x00020079, 0x00020079, 0x00020079, 0x0002007e, 0x0002007e, 0x0002007e, 0x0002007e, 0x0002007f, 0x0002007f, 0x0002007f, 0x0002007f, 0x00020080, 0x00020080, 0x00020080, 0x00020080, }, - {0x0021ffff, 0x0022ffff, 0x0023ffff, 0x0024ffff, 0x0025ffff, 0x0026ffff, 0x0000007d, 0x00000081, 0x00000083, 0x00000088, 0x0000008d, 0x00000098, 0x0001007a, 0x0001007a, 0x0001007b, 0x0001007b, }, - {0x0001007c, 0x0001007c, 0x00010082, 0x00010082, 0x00010084, 0x00010084, 0x00010085, 0x00010085, 0x00010086, 0x00010086, 0x00010087, 0x00010087, 0x0001008c, 0x0001008c, 0x00010091, 0x00010091, }, - {0x00030089, 0x00030089, 0x00030089, 0x00030089, 0x00030089, 0x00030089, 0x00030089, 0x00030089, 0x0003008a, 0x0003008a, 0x0003008a, 0x0003008a, 0x0003008a, 0x0003008a, 0x0003008a, 0x0003008a, }, - {0x0003008b, 0x0003008b, 0x0003008b, 0x0003008b, 0x0003008b, 0x0003008b, 0x0003008b, 0x0003008b, 0x0003008e, 0x0003008e, 0x0003008e, 0x0003008e, 0x0003008e, 0x0003008e, 0x0003008e, 0x0003008e, }, - {0x0003008f, 0x0003008f, 0x0003008f, 0x0003008f, 0x0003008f, 0x0003008f, 0x0003008f, 0x0003008f, 0x00030090, 0x00030090, 0x00030090, 0x00030090, 0x00030090, 0x00030090, 0x00030090, 0x00030090, }, - {0x00030092, 0x00030092, 0x00030092, 0x00030092, 0x00030092, 0x00030092, 0x00030092, 0x00030092, 0x00030093, 0x00030093, 0x00030093, 0x00030093, 0x00030093, 0x00030093, 0x00030093, 0x00030093, }, - {0x00030094, 0x00030094, 0x00030094, 0x00030094, 0x00030094, 0x00030094, 0x00030094, 0x00030094, 0x00030095, 0x00030095, 0x00030095, 0x00030095, 0x00030095, 0x00030095, 0x00030095, 0x00030095, }, - {0x00030096, 0x00030096, 0x00030096, 0x00030096, 0x00030096, 0x00030096, 0x00030096, 0x00030096, 0x00030097, 0x00030097, 0x00030097, 0x00030097, 0x00030097, 0x00030097, 0x00030097, 0x00030097, }, -}; - -const uint32_t c_aauiCQMFHuffEnc31[181][2] = -{ - {0x0007, 0x000b}, {0x0006, 0x0015}, {0x0006, 0x0016}, {0x0006, 0x0017}, {0x0006, 0x0018}, {0x0006, 0x0019}, {0x0006, 0x001a}, {0x0006, 0x001b}, - {0x0006, 0x001c}, {0x0006, 0x001d}, {0x0006, 0x001e}, {0x0006, 0x001f}, {0x0006, 0x0020}, {0x0006, 0x0021}, {0x0006, 0x0022}, {0x0006, 0x0023}, - {0x0006, 0x0024}, {0x0006, 0x0025}, {0x0006, 0x0026}, {0x0006, 0x0027}, {0x0006, 0x0028}, {0x0006, 0x0029}, {0x0006, 0x002a}, {0x0006, 0x002b}, - {0x0006, 0x002c}, {0x0006, 0x002d}, {0x0006, 0x002e}, {0x0006, 0x002f}, {0x0006, 0x0030}, {0x0006, 0x0031}, {0x0006, 0x0032}, {0x0006, 0x0033}, - {0x0006, 0x0034}, {0x0006, 0x0035}, {0x0006, 0x0036}, {0x0006, 0x0037}, {0x0006, 0x0038}, {0x0006, 0x0039}, {0x0006, 0x003a}, {0x0006, 0x003b}, - {0x0006, 0x003c}, {0x0006, 0x003d}, {0x0006, 0x003e}, {0x0007, 0x000c}, {0x0006, 0x003f}, {0x0007, 0x000d}, {0x0007, 0x000e}, {0x0007, 0x000f}, - {0x0007, 0x0010}, {0x0007, 0x0011}, {0x0007, 0x0012}, {0x0007, 0x0013}, {0x0007, 0x0014}, {0x0007, 0x0015}, {0x0007, 0x0016}, {0x0007, 0x0017}, - {0x0007, 0x0018}, {0x0007, 0x0019}, {0x0007, 0x001a}, {0x0007, 0x001b}, {0x0007, 0x001c}, {0x0007, 0x001d}, {0x0007, 0x001e}, {0x0007, 0x001f}, - {0x0007, 0x0020}, {0x0007, 0x0021}, {0x0007, 0x0022}, {0x0007, 0x0023}, {0x0007, 0x0024}, {0x0007, 0x0025}, {0x0007, 0x0026}, {0x0007, 0x0027}, - {0x0007, 0x0028}, {0x0007, 0x0029}, {0x0008, 0x0009}, {0x0008, 0x000a}, {0x0008, 0x000b}, {0x0008, 0x000c}, {0x0008, 0x000d}, {0x0008, 0x000e}, - {0x0008, 0x000f}, {0x0008, 0x0010}, {0x0008, 0x0011}, {0x0008, 0x0012}, {0x0008, 0x0013}, {0x0008, 0x0014}, {0x0008, 0x0015}, {0x0009, 0x0008}, - {0x0009, 0x0009}, {0x0009, 0x000a}, {0x0009, 0x000b}, {0x0009, 0x000c}, {0x0009, 0x000d}, {0x0009, 0x000e}, {0x0009, 0x000f}, {0x0009, 0x0010}, - {0x0009, 0x0011}, {0x000a, 0x0008}, {0x000a, 0x0009}, {0x000a, 0x000a}, {0x000a, 0x000b}, {0x000a, 0x000c}, {0x000a, 0x000d}, {0x000a, 0x000e}, - {0x000a, 0x000f}, {0x000b, 0x0008}, {0x000b, 0x0009}, {0x000b, 0x000a}, {0x000b, 0x000b}, {0x000b, 0x000c}, {0x000b, 0x000d}, {0x000b, 0x000e}, - {0x000c, 0x0008}, {0x000c, 0x0009}, {0x000b, 0x000f}, {0x000c, 0x000a}, {0x000c, 0x000b}, {0x000c, 0x000c}, {0x000c, 0x000d}, {0x000d, 0x0008}, - {0x000c, 0x000e}, {0x000d, 0x0009}, {0x000d, 0x000a}, {0x000c, 0x000f}, {0x000d, 0x000b}, {0x000d, 0x000c}, {0x000d, 0x000d}, {0x000d, 0x000e}, - {0x000d, 0x000f}, {0x000e, 0x0008}, {0x000e, 0x0009}, {0x000e, 0x000a}, {0x000e, 0x000b}, {0x000e, 0x000c}, {0x000e, 0x000d}, {0x000e, 0x000e}, - {0x000e, 0x000f}, {0x000f, 0x0009}, {0x000f, 0x000a}, {0x000f, 0x000b}, {0x000f, 0x000c}, {0x0010, 0x0009}, {0x000f, 0x000d}, {0x000f, 0x000e}, - {0x0010, 0x000a}, {0x0010, 0x000b}, {0x0010, 0x000c}, {0x0010, 0x000d}, {0x0011, 0x000a}, {0x0010, 0x000e}, {0x000f, 0x000f}, {0x0010, 0x000f}, - {0x0012, 0x0000}, {0x0012, 0x0001}, {0x0011, 0x000b}, {0x0011, 0x000c}, {0x0010, 0x0010}, {0x0012, 0x0002}, {0x0012, 0x0003}, {0x0011, 0x000d}, - {0x0011, 0x000e}, {0x0011, 0x000f}, {0x0011, 0x0010}, {0x0011, 0x0011}, {0x0010, 0x0011}, {0x0012, 0x0004}, {0x0012, 0x0005}, {0x0012, 0x0006}, - {0x0012, 0x0007}, {0x0012, 0x0008}, {0x0012, 0x0009}, {0x0012, 0x000a}, {0x0012, 0x000b}, {0x0012, 0x000c}, {0x0012, 0x000d}, {0x0012, 0x000e}, - {0x0012, 0x000f}, {0x0012, 0x0010}, {0x0012, 0x0011}, {0x0012, 0x0012}, {0x0012, 0x0013}, - -}; - -const uint32_t c_aauiCQMFHuffDec31[43][16] = -{ - {0x0010ffff, 0x000cffff, 0x000dffff, 0x000effff, 0x000fffff, 0x0001ffff, 0x0002ffff, 0x0003ffff, 0x0004ffff, 0x0005ffff, 0x0006ffff, 0x0007ffff, 0x0008ffff, 0x0009ffff, 0x000affff, 0x000bffff, }, - {0x00010048, 0x00010048, 0x00010049, 0x00010049, 0x00020001, 0x00020001, 0x00020001, 0x00020001, 0x00020002, 0x00020002, 0x00020002, 0x00020002, 0x00020003, 0x00020003, 0x00020003, 0x00020003, }, - {0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020005, 0x00020005, 0x00020005, 0x00020005, 0x00020006, 0x00020006, 0x00020006, 0x00020006, 0x00020007, 0x00020007, 0x00020007, 0x00020007, }, - {0x00020008, 0x00020008, 0x00020008, 0x00020008, 0x00020009, 0x00020009, 0x00020009, 0x00020009, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000b, 0x0002000b, 0x0002000b, 0x0002000b, }, - {0x0002000c, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000f, 0x0002000f, 0x0002000f, 0x0002000f, }, - {0x00020010, 0x00020010, 0x00020010, 0x00020010, 0x00020011, 0x00020011, 0x00020011, 0x00020011, 0x00020012, 0x00020012, 0x00020012, 0x00020012, 0x00020013, 0x00020013, 0x00020013, 0x00020013, }, - {0x00020014, 0x00020014, 0x00020014, 0x00020014, 0x00020015, 0x00020015, 0x00020015, 0x00020015, 0x00020016, 0x00020016, 0x00020016, 0x00020016, 0x00020017, 0x00020017, 0x00020017, 0x00020017, }, - {0x00020018, 0x00020018, 0x00020018, 0x00020018, 0x00020019, 0x00020019, 0x00020019, 0x00020019, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001b, }, - {0x0002001c, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001d, 0x0002001d, 0x0002001d, 0x0002001d, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001f, 0x0002001f, 0x0002001f, 0x0002001f, }, - {0x00020020, 0x00020020, 0x00020020, 0x00020020, 0x00020021, 0x00020021, 0x00020021, 0x00020021, 0x00020022, 0x00020022, 0x00020022, 0x00020022, 0x00020023, 0x00020023, 0x00020023, 0x00020023, }, - {0x00020024, 0x00020024, 0x00020024, 0x00020024, 0x00020025, 0x00020025, 0x00020025, 0x00020025, 0x00020026, 0x00020026, 0x00020026, 0x00020026, 0x00020027, 0x00020027, 0x00020027, 0x00020027, }, - {0x00020028, 0x00020028, 0x00020028, 0x00020028, 0x00020029, 0x00020029, 0x00020029, 0x00020029, 0x0002002a, 0x0002002a, 0x0002002a, 0x0002002a, 0x0002002c, 0x0002002c, 0x0002002c, 0x0002002c, }, - {0x00000051, 0x00000052, 0x00000053, 0x00000054, 0x00000055, 0x00000056, 0x00010000, 0x00010000, 0x0001002b, 0x0001002b, 0x0001002d, 0x0001002d, 0x0001002e, 0x0001002e, 0x0001002f, 0x0001002f, }, - {0x00010030, 0x00010030, 0x00010031, 0x00010031, 0x00010032, 0x00010032, 0x00010033, 0x00010033, 0x00010034, 0x00010034, 0x00010035, 0x00010035, 0x00010036, 0x00010036, 0x00010037, 0x00010037, }, - {0x00010038, 0x00010038, 0x00010039, 0x00010039, 0x0001003a, 0x0001003a, 0x0001003b, 0x0001003b, 0x0001003c, 0x0001003c, 0x0001003d, 0x0001003d, 0x0001003e, 0x0001003e, 0x0001003f, 0x0001003f, }, - {0x00010040, 0x00010040, 0x00010041, 0x00010041, 0x00010042, 0x00010042, 0x00010043, 0x00010043, 0x00010044, 0x00010044, 0x00010045, 0x00010045, 0x00010046, 0x00010046, 0x00010047, 0x00010047, }, - {0x0019ffff, 0x0018ffff, 0x0016ffff, 0x0017ffff, 0x0011ffff, 0x0012ffff, 0x0013ffff, 0x0014ffff, 0x0015ffff, 0x0000004a, 0x0000004b, 0x0000004c, 0x0000004d, 0x0000004e, 0x0000004f, 0x00000050, }, - {0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, }, - {0x00030059, 0x00030059, 0x00030059, 0x00030059, 0x00030059, 0x00030059, 0x00030059, 0x00030059, 0x0003005a, 0x0003005a, 0x0003005a, 0x0003005a, 0x0003005a, 0x0003005a, 0x0003005a, 0x0003005a, }, - {0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005c, 0x0003005c, 0x0003005c, 0x0003005c, 0x0003005c, 0x0003005c, 0x0003005c, 0x0003005c, }, - {0x0003005d, 0x0003005d, 0x0003005d, 0x0003005d, 0x0003005d, 0x0003005d, 0x0003005d, 0x0003005d, 0x0003005e, 0x0003005e, 0x0003005e, 0x0003005e, 0x0003005e, 0x0003005e, 0x0003005e, 0x0003005e, }, - {0x0003005f, 0x0003005f, 0x0003005f, 0x0003005f, 0x0003005f, 0x0003005f, 0x0003005f, 0x0003005f, 0x00030060, 0x00030060, 0x00030060, 0x00030060, 0x00030060, 0x00030060, 0x00030060, 0x00030060, }, - {0x00020061, 0x00020061, 0x00020061, 0x00020061, 0x00020062, 0x00020062, 0x00020062, 0x00020062, 0x00020063, 0x00020063, 0x00020063, 0x00020063, 0x00020064, 0x00020064, 0x00020064, 0x00020064, }, - {0x00020065, 0x00020065, 0x00020065, 0x00020065, 0x00020066, 0x00020066, 0x00020066, 0x00020066, 0x00020067, 0x00020067, 0x00020067, 0x00020067, 0x00020068, 0x00020068, 0x00020068, 0x00020068, }, - {0x00010069, 0x00010069, 0x0001006a, 0x0001006a, 0x0001006b, 0x0001006b, 0x0001006c, 0x0001006c, 0x0001006d, 0x0001006d, 0x0001006e, 0x0001006e, 0x0001006f, 0x0001006f, 0x00010072, 0x00010072, }, - {0x0021ffff, 0x0020ffff, 0x001effff, 0x001fffff, 0x001affff, 0x001bffff, 0x001cffff, 0x001dffff, 0x00000070, 0x00000071, 0x00000073, 0x00000074, 0x00000075, 0x00000076, 0x00000078, 0x0000007b, }, - {0x00030077, 0x00030077, 0x00030077, 0x00030077, 0x00030077, 0x00030077, 0x00030077, 0x00030077, 0x00030079, 0x00030079, 0x00030079, 0x00030079, 0x00030079, 0x00030079, 0x00030079, 0x00030079, }, - {0x0003007a, 0x0003007a, 0x0003007a, 0x0003007a, 0x0003007a, 0x0003007a, 0x0003007a, 0x0003007a, 0x0003007c, 0x0003007c, 0x0003007c, 0x0003007c, 0x0003007c, 0x0003007c, 0x0003007c, 0x0003007c, }, - {0x0003007d, 0x0003007d, 0x0003007d, 0x0003007d, 0x0003007d, 0x0003007d, 0x0003007d, 0x0003007d, 0x0003007e, 0x0003007e, 0x0003007e, 0x0003007e, 0x0003007e, 0x0003007e, 0x0003007e, 0x0003007e, }, - {0x0003007f, 0x0003007f, 0x0003007f, 0x0003007f, 0x0003007f, 0x0003007f, 0x0003007f, 0x0003007f, 0x00030080, 0x00030080, 0x00030080, 0x00030080, 0x00030080, 0x00030080, 0x00030080, 0x00030080, }, - {0x00020081, 0x00020081, 0x00020081, 0x00020081, 0x00020082, 0x00020082, 0x00020082, 0x00020082, 0x00020083, 0x00020083, 0x00020083, 0x00020083, 0x00020084, 0x00020084, 0x00020084, 0x00020084, }, - {0x00020085, 0x00020085, 0x00020085, 0x00020085, 0x00020086, 0x00020086, 0x00020086, 0x00020086, 0x00020087, 0x00020087, 0x00020087, 0x00020087, 0x00020088, 0x00020088, 0x00020088, 0x00020088, }, - {0x0000009c, 0x000000a4, 0x00010089, 0x00010089, 0x0001008a, 0x0001008a, 0x0001008b, 0x0001008b, 0x0001008c, 0x0001008c, 0x0001008e, 0x0001008e, 0x0001008f, 0x0001008f, 0x00010096, 0x00010096, }, - {0x0026ffff, 0x0027ffff, 0x0028ffff, 0x0029ffff, 0x002affff, 0x0022ffff, 0x0023ffff, 0x0024ffff, 0x0025ffff, 0x0000008d, 0x00000090, 0x00000091, 0x00000092, 0x00000093, 0x00000095, 0x00000097, }, - {0x00030094, 0x00030094, 0x00030094, 0x00030094, 0x00030094, 0x00030094, 0x00030094, 0x00030094, 0x0003009a, 0x0003009a, 0x0003009a, 0x0003009a, 0x0003009a, 0x0003009a, 0x0003009a, 0x0003009a, }, - {0x0003009b, 0x0003009b, 0x0003009b, 0x0003009b, 0x0003009b, 0x0003009b, 0x0003009b, 0x0003009b, 0x0003009f, 0x0003009f, 0x0003009f, 0x0003009f, 0x0003009f, 0x0003009f, 0x0003009f, 0x0003009f, }, - {0x000300a0, 0x000300a0, 0x000300a0, 0x000300a0, 0x000300a0, 0x000300a0, 0x000300a0, 0x000300a0, 0x000300a1, 0x000300a1, 0x000300a1, 0x000300a1, 0x000300a1, 0x000300a1, 0x000300a1, 0x000300a1, }, - {0x000300a2, 0x000300a2, 0x000300a2, 0x000300a2, 0x000300a2, 0x000300a2, 0x000300a2, 0x000300a2, 0x000300a3, 0x000300a3, 0x000300a3, 0x000300a3, 0x000300a3, 0x000300a3, 0x000300a3, 0x000300a3, }, - {0x00020098, 0x00020098, 0x00020098, 0x00020098, 0x00020099, 0x00020099, 0x00020099, 0x00020099, 0x0002009d, 0x0002009d, 0x0002009d, 0x0002009d, 0x0002009e, 0x0002009e, 0x0002009e, 0x0002009e, }, - {0x000200a5, 0x000200a5, 0x000200a5, 0x000200a5, 0x000200a6, 0x000200a6, 0x000200a6, 0x000200a6, 0x000200a7, 0x000200a7, 0x000200a7, 0x000200a7, 0x000200a8, 0x000200a8, 0x000200a8, 0x000200a8, }, - {0x000200a9, 0x000200a9, 0x000200a9, 0x000200a9, 0x000200aa, 0x000200aa, 0x000200aa, 0x000200aa, 0x000200ab, 0x000200ab, 0x000200ab, 0x000200ab, 0x000200ac, 0x000200ac, 0x000200ac, 0x000200ac, }, - {0x000200ad, 0x000200ad, 0x000200ad, 0x000200ad, 0x000200ae, 0x000200ae, 0x000200ae, 0x000200ae, 0x000200af, 0x000200af, 0x000200af, 0x000200af, 0x000200b0, 0x000200b0, 0x000200b0, 0x000200b0, }, - {0x000200b1, 0x000200b1, 0x000200b1, 0x000200b1, 0x000200b2, 0x000200b2, 0x000200b2, 0x000200b2, 0x000200b3, 0x000200b3, 0x000200b3, 0x000200b3, 0x000200b4, 0x000200b4, 0x000200b4, 0x000200b4, }, -}; - -const uint32_t c_aauiCQMFHuffEnc33[16][2] = -{ - {0x0001, 0x0001}, {0x0003, 0x0001}, {0x0008, 0x0000}, {0x0008, 0x0001}, {0x0002, 0x0001}, {0x0004, 0x0001}, {0x0008, 0x0002}, {0x0008, 0x0003}, - {0x0008, 0x0004}, {0x0008, 0x0005}, {0x0008, 0x0006}, {0x0008, 0x0007}, {0x0007, 0x0004}, {0x0007, 0x0005}, {0x0007, 0x0006}, {0x0007, 0x0007}, -}; - -const uint32_t c_aauiCQMFHuffDec33[2][16] = -{ - {0x0001ffff, 0x00000005, 0x00010001, 0x00010001, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x00000002, 0x00000003, 0x00000006, 0x00000007, 0x00000008, 0x00000009, 0x0000000a, 0x0000000b, 0x0001000c, 0x0001000c, 0x0001000d, 0x0001000d, 0x0001000e, 0x0001000e, 0x0001000f, 0x0001000f, }, -}; - -const uint32_t c_aauiCQMFHuffEnc34[16][2] = -{ - {0x0001, 0x0001}, {0x0003, 0x0001}, {0x0008, 0x0000}, {0x0008, 0x0001}, {0x0002, 0x0001}, {0x0004, 0x0001}, {0x0008, 0x0002}, {0x0008, 0x0003}, - {0x0008, 0x0004}, {0x0008, 0x0005}, {0x0008, 0x0006}, {0x0008, 0x0007}, {0x0007, 0x0004}, {0x0007, 0x0005}, {0x0007, 0x0006}, {0x0007, 0x0007}, -}; - -const uint32_t c_aauiCQMFHuffDec34[2][16] = -{ - {0x0001ffff, 0x00000005, 0x00010001, 0x00010001, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x00000002, 0x00000003, 0x00000006, 0x00000007, 0x00000008, 0x00000009, 0x0000000a, 0x0000000b, 0x0001000c, 0x0001000c, 0x0001000d, 0x0001000d, 0x0001000e, 0x0001000e, 0x0001000f, 0x0001000f, }, -}; - -const uint32_t c_aauiCQMFHuffEnc35[25][2] = -{ - {0x0001, 0x0001}, {0x0003, 0x0001}, {0x0007, 0x0006}, {0x0009, 0x0000}, {0x0009, 0x0001}, {0x0002, 0x0001}, {0x0004, 0x0001}, {0x0009, 0x0002}, - {0x0009, 0x0003}, {0x0009, 0x0004}, {0x0007, 0x0007}, {0x0009, 0x0005}, {0x0009, 0x0006}, {0x0009, 0x0007}, {0x0009, 0x0008}, {0x0009, 0x0009}, - {0x0009, 0x000a}, {0x0009, 0x000b}, {0x0009, 0x000c}, {0x0009, 0x000d}, {0x0008, 0x0007}, {0x0008, 0x0008}, {0x0008, 0x0009}, {0x0008, 0x000a}, - {0x0008, 0x000b}, - -}; - -const uint32_t c_aauiCQMFHuffDec35[9][16] = -{ - {0x0001ffff, 0x00000006, 0x00010001, 0x00010001, 0x00020005, 0x00020005, 0x00020005, 0x00020005, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x0007ffff, 0x0008ffff, 0x0002ffff, 0x0003ffff, 0x0004ffff, 0x0005ffff, 0x0006ffff, 0x00000014, 0x00000015, 0x00000016, 0x00000017, 0x00000018, 0x00010002, 0x00010002, 0x0001000a, 0x0001000a, }, - {0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, }, - {0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, }, - {0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, }, - {0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, }, - {0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, }, - {0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, }, - {0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, }, -}; - -const uint32_t c_aauiCQMFHuffEnc36[36][2] = -{ - {0x0001, 0x0001}, {0x0002, 0x0001}, {0x0006, 0x0002}, {0x000b, 0x0000}, {0x000b, 0x0001}, {0x000b, 0x0002}, {0x0003, 0x0001}, {0x0004, 0x0001}, - {0x0008, 0x0005}, {0x000b, 0x0003}, {0x000b, 0x0004}, {0x000b, 0x0005}, {0x0006, 0x0003}, {0x0007, 0x0003}, {0x000b, 0x0006}, {0x000b, 0x0007}, - {0x000b, 0x0008}, {0x000b, 0x0009}, {0x000b, 0x000a}, {0x000b, 0x000b}, {0x000b, 0x000c}, {0x000b, 0x000d}, {0x000b, 0x000e}, {0x000b, 0x000f}, - {0x000a, 0x0008}, {0x000a, 0x0009}, {0x000a, 0x000a}, {0x000a, 0x000b}, {0x000a, 0x000c}, {0x000a, 0x000d}, {0x000a, 0x000e}, {0x000a, 0x000f}, - {0x000a, 0x0010}, {0x000a, 0x0011}, {0x000a, 0x0012}, {0x000a, 0x0013}, - -}; - -const uint32_t c_aauiCQMFHuffDec36[7][16] = -{ - {0x0001ffff, 0x00000007, 0x00010006, 0x00010006, 0x00020001, 0x00020001, 0x00020001, 0x00020001, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x0006ffff, 0x0005ffff, 0x0002ffff, 0x0003ffff, 0x0004ffff, 0x00000008, 0x0001000d, 0x0001000d, 0x00020002, 0x00020002, 0x00020002, 0x00020002, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000c, }, - {0x00020018, 0x00020018, 0x00020018, 0x00020018, 0x00020019, 0x00020019, 0x00020019, 0x00020019, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001b, }, - {0x0002001c, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001d, 0x0002001d, 0x0002001d, 0x0002001d, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001f, 0x0002001f, 0x0002001f, 0x0002001f, }, - {0x00020020, 0x00020020, 0x00020020, 0x00020020, 0x00020021, 0x00020021, 0x00020021, 0x00020021, 0x00020022, 0x00020022, 0x00020022, 0x00020022, 0x00020023, 0x00020023, 0x00020023, 0x00020023, }, - {0x00010010, 0x00010010, 0x00010011, 0x00010011, 0x00010012, 0x00010012, 0x00010013, 0x00010013, 0x00010014, 0x00010014, 0x00010015, 0x00010015, 0x00010016, 0x00010016, 0x00010017, 0x00010017, }, - {0x00010003, 0x00010003, 0x00010004, 0x00010004, 0x00010005, 0x00010005, 0x00010009, 0x00010009, 0x0001000a, 0x0001000a, 0x0001000b, 0x0001000b, 0x0001000e, 0x0001000e, 0x0001000f, 0x0001000f, }, -}; - -const uint32_t c_aauiCQMFHuffEnc37[36][2] = -{ - {0x0001, 0x0001}, {0x0002, 0x0001}, {0x0006, 0x0001}, {0x000c, 0x0000}, {0x000c, 0x0001}, {0x000c, 0x0002}, {0x0003, 0x0001}, {0x0004, 0x0001}, - {0x0006, 0x0002}, {0x000c, 0x0003}, {0x000c, 0x0004}, {0x000c, 0x0005}, {0x0006, 0x0003}, {0x0007, 0x0001}, {0x000a, 0x0007}, {0x000c, 0x0006}, - {0x000c, 0x0007}, {0x000c, 0x0008}, {0x000c, 0x0009}, {0x000c, 0x000a}, {0x000c, 0x000b}, {0x000c, 0x000c}, {0x000c, 0x000d}, {0x000c, 0x000e}, - {0x000c, 0x000f}, {0x000c, 0x0010}, {0x000c, 0x0011}, {0x000c, 0x0012}, {0x000c, 0x0013}, {0x000c, 0x0014}, {0x000c, 0x0015}, {0x000c, 0x0016}, - {0x000c, 0x0017}, {0x000c, 0x0018}, {0x000c, 0x0019}, {0x000b, 0x000d}, - -}; - -const uint32_t c_aauiCQMFHuffDec37[4][16] = -{ - {0x0001ffff, 0x00000007, 0x00010006, 0x00010006, 0x00020001, 0x00020001, 0x00020001, 0x00020001, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x0003ffff, 0x0002ffff, 0x0001000d, 0x0001000d, 0x00020002, 0x00020002, 0x00020002, 0x00020002, 0x00020008, 0x00020008, 0x00020008, 0x00020008, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000c, }, - {0x00000019, 0x0000001a, 0x0000001b, 0x0000001c, 0x0000001d, 0x0000001e, 0x0000001f, 0x00000020, 0x00000021, 0x00000022, 0x00010023, 0x00010023, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000e, }, - {0x00000003, 0x00000004, 0x00000005, 0x00000009, 0x0000000a, 0x0000000b, 0x0000000f, 0x00000010, 0x00000011, 0x00000012, 0x00000013, 0x00000014, 0x00000015, 0x00000016, 0x00000017, 0x00000018, }, -}; - -const uint32_t c_aauiCQMFHuffEnc38[49][2] = -{ - {0x0001, 0x0001}, {0x0003, 0x0001}, {0x0006, 0x0001}, {0x000c, 0x0012}, {0x000d, 0x0000}, {0x000d, 0x0001}, {0x000d, 0x0002}, {0x0002, 0x0001}, - {0x0004, 0x0001}, {0x0007, 0x0001}, {0x000b, 0x000a}, {0x000d, 0x0003}, {0x000d, 0x0004}, {0x000d, 0x0005}, {0x0006, 0x0002}, {0x0006, 0x0003}, - {0x0009, 0x0003}, {0x000d, 0x0006}, {0x000d, 0x0007}, {0x000d, 0x0008}, {0x000d, 0x0009}, {0x000c, 0x0013}, {0x000b, 0x000b}, {0x000d, 0x000a}, - {0x000d, 0x000b}, {0x000d, 0x000c}, {0x000d, 0x000d}, {0x000d, 0x000e}, {0x000d, 0x000f}, {0x000d, 0x0010}, {0x000d, 0x0011}, {0x000d, 0x0012}, - {0x000d, 0x0013}, {0x000d, 0x0014}, {0x000d, 0x0015}, {0x000d, 0x0016}, {0x000d, 0x0017}, {0x000d, 0x0018}, {0x000d, 0x0019}, {0x000d, 0x001a}, - {0x000d, 0x001b}, {0x000d, 0x001c}, {0x000d, 0x001d}, {0x000d, 0x001e}, {0x000d, 0x001f}, {0x000d, 0x0020}, {0x000d, 0x0021}, {0x000d, 0x0022}, - {0x000d, 0x0023}, - -}; - -const uint32_t c_aauiCQMFHuffDec38[22][16] = -{ - {0x0001ffff, 0x00000008, 0x00010001, 0x00010001, 0x00020007, 0x00020007, 0x00020007, 0x00020007, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x0003ffff, 0x0002ffff, 0x00010009, 0x00010009, 0x00020002, 0x00020002, 0x00020002, 0x00020002, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000f, 0x0002000f, 0x0002000f, 0x0002000f, }, - {0x0014ffff, 0x0015ffff, 0x00000003, 0x00000015, 0x0001000a, 0x0001000a, 0x00010016, 0x00010016, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, }, - {0x0005ffff, 0x0006ffff, 0x0004ffff, 0x0007ffff, 0x0008ffff, 0x0009ffff, 0x000affff, 0x000bffff, 0x000cffff, 0x000dffff, 0x000effff, 0x000fffff, 0x0010ffff, 0x0011ffff, 0x0012ffff, 0x0013ffff, }, - {0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, }, - {0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, }, - {0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, }, - {0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, }, - {0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, }, - {0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, }, - {0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, }, - {0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, }, - {0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, }, - {0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, }, - {0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, }, - {0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, }, - {0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, }, - {0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, }, - {0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, }, - {0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, }, - {0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, }, - {0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, }, -}; - -const uint32_t c_aauiCQMFHuffEnc39[64][2] = -{ - {0x0001, 0x0001}, {0x0002, 0x0001}, {0x0006, 0x0001}, {0x000a, 0x0002}, {0x000f, 0x0000}, {0x000f, 0x0001}, {0x000f, 0x0002}, {0x000f, 0x0003}, - {0x0003, 0x0001}, {0x0004, 0x0001}, {0x0007, 0x0001}, {0x000a, 0x0003}, {0x000f, 0x0004}, {0x000f, 0x0005}, {0x000f, 0x0006}, {0x000f, 0x0007}, - {0x0006, 0x0002}, {0x0006, 0x0003}, {0x0009, 0x0003}, {0x000d, 0x000e}, {0x000f, 0x0008}, {0x000f, 0x0009}, {0x000f, 0x000a}, {0x000f, 0x000b}, - {0x000a, 0x0004}, {0x000a, 0x0005}, {0x000d, 0x000f}, {0x000f, 0x000c}, {0x000f, 0x000d}, {0x000f, 0x000e}, {0x000f, 0x000f}, {0x000f, 0x0010}, - {0x000f, 0x0011}, {0x000f, 0x0012}, {0x000f, 0x0013}, {0x000f, 0x0014}, {0x000f, 0x0015}, {0x000f, 0x0016}, {0x000f, 0x0017}, {0x000f, 0x0018}, - {0x000f, 0x0019}, {0x000f, 0x001a}, {0x000f, 0x001b}, {0x000f, 0x001c}, {0x000f, 0x001d}, {0x000f, 0x001e}, {0x000f, 0x001f}, {0x000f, 0x0020}, - {0x000f, 0x0021}, {0x000f, 0x0022}, {0x000f, 0x0023}, {0x000f, 0x0024}, {0x000f, 0x0025}, {0x000f, 0x0026}, {0x000f, 0x0027}, {0x000f, 0x0028}, - {0x000f, 0x0029}, {0x000e, 0x0015}, {0x000e, 0x0016}, {0x000e, 0x0017}, {0x000e, 0x0018}, {0x000e, 0x0019}, {0x000e, 0x001a}, {0x000e, 0x001b}, -}; - -const uint32_t c_aauiCQMFHuffDec39[12][16] = -{ - {0x0001ffff, 0x00000009, 0x00010008, 0x00010008, 0x00020001, 0x00020001, 0x00020001, 0x00020001, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x0003ffff, 0x0002ffff, 0x0001000a, 0x0001000a, 0x00020002, 0x00020002, 0x00020002, 0x00020002, 0x00020010, 0x00020010, 0x00020010, 0x00020010, 0x00020011, 0x00020011, 0x00020011, 0x00020011, }, - {0x00020018, 0x00020018, 0x00020018, 0x00020018, 0x00020019, 0x00020019, 0x00020019, 0x00020019, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, 0x00030012, }, - {0x0008ffff, 0x0007ffff, 0x0009ffff, 0x000affff, 0x000bffff, 0x0005ffff, 0x0006ffff, 0x0004ffff, 0x00020003, 0x00020003, 0x00020003, 0x00020003, 0x0002000b, 0x0002000b, 0x0002000b, 0x0002000b, }, - {0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, }, - {0x00010037, 0x00010037, 0x00010038, 0x00010038, 0x00020039, 0x00020039, 0x00020039, 0x00020039, 0x0002003a, 0x0002003a, 0x0002003a, 0x0002003a, 0x0002003b, 0x0002003b, 0x0002003b, 0x0002003b, }, - {0x0002003c, 0x0002003c, 0x0002003c, 0x0002003c, 0x0002003d, 0x0002003d, 0x0002003d, 0x0002003d, 0x0002003e, 0x0002003e, 0x0002003e, 0x0002003e, 0x0002003f, 0x0002003f, 0x0002003f, 0x0002003f, }, - {0x00010014, 0x00010014, 0x00010015, 0x00010015, 0x00010016, 0x00010016, 0x00010017, 0x00010017, 0x0001001b, 0x0001001b, 0x0001001c, 0x0001001c, 0x0001001d, 0x0001001d, 0x0001001e, 0x0001001e, }, - {0x00010004, 0x00010004, 0x00010005, 0x00010005, 0x00010006, 0x00010006, 0x00010007, 0x00010007, 0x0001000c, 0x0001000c, 0x0001000d, 0x0001000d, 0x0001000e, 0x0001000e, 0x0001000f, 0x0001000f, }, - {0x0001001f, 0x0001001f, 0x00010020, 0x00010020, 0x00010021, 0x00010021, 0x00010022, 0x00010022, 0x00010023, 0x00010023, 0x00010024, 0x00010024, 0x00010025, 0x00010025, 0x00010026, 0x00010026, }, - {0x00010027, 0x00010027, 0x00010028, 0x00010028, 0x00010029, 0x00010029, 0x0001002a, 0x0001002a, 0x0001002b, 0x0001002b, 0x0001002c, 0x0001002c, 0x0001002d, 0x0001002d, 0x0001002e, 0x0001002e, }, - {0x0001002f, 0x0001002f, 0x00010030, 0x00010030, 0x00010031, 0x00010031, 0x00010032, 0x00010032, 0x00010033, 0x00010033, 0x00010034, 0x00010034, 0x00010035, 0x00010035, 0x00010036, 0x00010036, }, -}; - -const uint32_t c_aauiCQMFHuffEnc40[81][2] = -{ - {0x0001, 0x0001}, {0x0002, 0x0001}, {0x0006, 0x0001}, {0x000b, 0x0002}, {0x000f, 0x0011}, {0x0011, 0x0000}, {0x0011, 0x0001}, {0x0011, 0x0002}, - {0x0011, 0x0003}, {0x0003, 0x0001}, {0x0004, 0x0001}, {0x0007, 0x0001}, {0x000a, 0x0002}, {0x000e, 0x0009}, {0x0011, 0x0004}, {0x0011, 0x0005}, - {0x0011, 0x0006}, {0x0011, 0x0007}, {0x0006, 0x0002}, {0x0006, 0x0003}, {0x0008, 0x0001}, {0x000d, 0x0005}, {0x0011, 0x0008}, {0x0011, 0x0009}, - {0x0011, 0x000a}, {0x0011, 0x000b}, {0x0011, 0x000c}, {0x000b, 0x0003}, {0x000a, 0x0003}, {0x000c, 0x0003}, {0x0011, 0x000d}, {0x0011, 0x000e}, - {0x0011, 0x000f}, {0x0011, 0x0010}, {0x0011, 0x0011}, {0x0011, 0x0012}, {0x0011, 0x0013}, {0x0011, 0x0014}, {0x0011, 0x0015}, {0x0011, 0x0016}, - {0x0011, 0x0017}, {0x0011, 0x0018}, {0x0011, 0x0019}, {0x0011, 0x001a}, {0x0011, 0x001b}, {0x0011, 0x001c}, {0x0011, 0x001d}, {0x0011, 0x001e}, - {0x0011, 0x001f}, {0x0011, 0x0020}, {0x0011, 0x0021}, {0x0011, 0x0022}, {0x0011, 0x0023}, {0x0011, 0x0024}, {0x0011, 0x0025}, {0x0011, 0x0026}, - {0x0011, 0x0027}, {0x0011, 0x0028}, {0x0011, 0x0029}, {0x0011, 0x002a}, {0x0011, 0x002b}, {0x0011, 0x002c}, {0x0011, 0x002d}, {0x0011, 0x002e}, - {0x0011, 0x002f}, {0x0011, 0x0030}, {0x0011, 0x0031}, {0x0011, 0x0032}, {0x0011, 0x0033}, {0x0011, 0x0034}, {0x0011, 0x0035}, {0x0011, 0x0036}, - {0x0011, 0x0037}, {0x0011, 0x0038}, {0x0011, 0x0039}, {0x0011, 0x003a}, {0x0011, 0x003b}, {0x0010, 0x001e}, {0x0010, 0x001f}, {0x0010, 0x0020}, - {0x0010, 0x0021}, - -}; - -const uint32_t c_aauiCQMFHuffDec40[36][16] = -{ - {0x0001ffff, 0x0000000a, 0x00010009, 0x00010009, 0x00020001, 0x00020001, 0x00020001, 0x00020001, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x0002ffff, 0x00000014, 0x0001000b, 0x0001000b, 0x00020002, 0x00020002, 0x00020002, 0x00020002, 0x00020012, 0x00020012, 0x00020012, 0x00020012, 0x00020013, 0x00020013, 0x00020013, 0x00020013, }, - {0x0005ffff, 0x0004ffff, 0x0003ffff, 0x0000001d, 0x00010003, 0x00010003, 0x0001001b, 0x0001001b, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001c, }, - {0x0000004f, 0x00000050, 0x00010004, 0x00010004, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000d, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, }, - {0x0015ffff, 0x0016ffff, 0x0017ffff, 0x0018ffff, 0x0019ffff, 0x001affff, 0x001bffff, 0x001cffff, 0x001dffff, 0x001effff, 0x001fffff, 0x0020ffff, 0x0021ffff, 0x0022ffff, 0x0000004d, 0x0000004e, }, - {0x0023ffff, 0x000affff, 0x0006ffff, 0x000bffff, 0x0007ffff, 0x0008ffff, 0x0009ffff, 0x000cffff, 0x000dffff, 0x000effff, 0x000fffff, 0x0010ffff, 0x0011ffff, 0x0012ffff, 0x0013ffff, 0x0014ffff, }, - {0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, }, - {0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, }, - {0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, }, - {0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, }, - {0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, }, - {0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, }, - {0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, }, - {0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, }, - {0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, }, - {0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, }, - {0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, }, - {0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, }, - {0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, }, - {0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, }, - {0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, }, - {0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, }, - {0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, }, - {0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, }, - {0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, }, - {0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, }, - {0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, }, - {0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, }, - {0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x00030040, 0x00030040, 0x00030040, 0x00030040, 0x00030040, 0x00030040, 0x00030040, 0x00030040, }, - {0x00030041, 0x00030041, 0x00030041, 0x00030041, 0x00030041, 0x00030041, 0x00030041, 0x00030041, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, }, - {0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030044, 0x00030044, }, - {0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030046, }, - {0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, }, - {0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x0003004a, 0x0003004a, 0x0003004a, 0x0003004a, 0x0003004a, 0x0003004a, 0x0003004a, 0x0003004a, }, - {0x0003004b, 0x0003004b, 0x0003004b, 0x0003004b, 0x0003004b, 0x0003004b, 0x0003004b, 0x0003004b, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, }, - {0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, }, -}; - -const uint32_t c_aauiCQMFHuffEnc41[100][2] = -{ - {0x0001, 0x0001}, {0x0003, 0x0001}, {0x0006, 0x0001}, {0x000b, 0x0001}, {0x0011, 0x0014}, {0x0013, 0x0000}, {0x0013, 0x0001}, {0x0013, 0x0002}, - {0x0013, 0x0003}, {0x0013, 0x0004}, {0x0002, 0x0001}, {0x0004, 0x0001}, {0x0007, 0x0001}, {0x000a, 0x0001}, {0x0010, 0x000b}, {0x0013, 0x0005}, - {0x0013, 0x0006}, {0x0013, 0x0007}, {0x0013, 0x0008}, {0x0013, 0x0009}, {0x0006, 0x0002}, {0x0006, 0x0003}, {0x0008, 0x0001}, {0x000d, 0x0002}, - {0x0011, 0x0015}, {0x0013, 0x000a}, {0x0013, 0x000b}, {0x0013, 0x000c}, {0x0013, 0x000d}, {0x0013, 0x000e}, {0x000a, 0x0002}, {0x000a, 0x0003}, - {0x000d, 0x0003}, {0x0010, 0x000c}, {0x0013, 0x000f}, {0x0013, 0x0010}, {0x0013, 0x0011}, {0x0013, 0x0012}, {0x0013, 0x0013}, {0x0013, 0x0014}, - {0x0010, 0x000d}, {0x000f, 0x0007}, {0x0012, 0x0027}, {0x0013, 0x0015}, {0x0013, 0x0016}, {0x0013, 0x0017}, {0x0013, 0x0018}, {0x0013, 0x0019}, - {0x0013, 0x001a}, {0x0013, 0x001b}, {0x0013, 0x001c}, {0x0013, 0x001d}, {0x0013, 0x001e}, {0x0013, 0x001f}, {0x0013, 0x0020}, {0x0013, 0x0021}, - {0x0013, 0x0022}, {0x0013, 0x0023}, {0x0013, 0x0024}, {0x0013, 0x0025}, {0x0013, 0x0026}, {0x0013, 0x0027}, {0x0013, 0x0028}, {0x0013, 0x0029}, - {0x0013, 0x002a}, {0x0013, 0x002b}, {0x0013, 0x002c}, {0x0013, 0x002d}, {0x0013, 0x002e}, {0x0013, 0x002f}, {0x0013, 0x0030}, {0x0013, 0x0031}, - {0x0013, 0x0032}, {0x0013, 0x0033}, {0x0013, 0x0034}, {0x0013, 0x0035}, {0x0013, 0x0036}, {0x0013, 0x0037}, {0x0013, 0x0038}, {0x0013, 0x0039}, - {0x0013, 0x003a}, {0x0013, 0x003b}, {0x0013, 0x003c}, {0x0013, 0x003d}, {0x0013, 0x003e}, {0x0013, 0x003f}, {0x0013, 0x0040}, {0x0013, 0x0041}, - {0x0013, 0x0042}, {0x0013, 0x0043}, {0x0013, 0x0044}, {0x0013, 0x0045}, {0x0013, 0x0046}, {0x0013, 0x0047}, {0x0013, 0x0048}, {0x0013, 0x0049}, - {0x0013, 0x004a}, {0x0013, 0x004b}, {0x0013, 0x004c}, {0x0013, 0x004d}, - -}; - -const uint32_t c_aauiCQMFHuffDec41[16][16] = -{ - {0x0001ffff, 0x0000000b, 0x00010001, 0x00010001, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000a, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x0002ffff, 0x00000016, 0x0001000c, 0x0001000c, 0x00020002, 0x00020002, 0x00020002, 0x00020002, 0x00020014, 0x00020014, 0x00020014, 0x00020014, 0x00020015, 0x00020015, 0x00020015, 0x00020015, }, - {0x0004ffff, 0x0003ffff, 0x00010003, 0x00010003, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001f, 0x0002001f, 0x0002001f, 0x0002001f, }, - {0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, }, - {0x0007ffff, 0x0008ffff, 0x0009ffff, 0x000affff, 0x000bffff, 0x000cffff, 0x000dffff, 0x000effff, 0x000fffff, 0x0006ffff, 0x0005ffff, 0x0000000e, 0x00000021, 0x00000028, 0x00010029, 0x00010029, }, - {0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, }, - {0x0001005e, 0x0001005e, 0x0001005f, 0x0001005f, 0x00010060, 0x00010060, 0x00010061, 0x00010061, 0x00010062, 0x00010062, 0x00010063, 0x00010063, 0x0002002a, 0x0002002a, 0x0002002a, 0x0002002a, }, - {0x00010005, 0x00010005, 0x00010006, 0x00010006, 0x00010007, 0x00010007, 0x00010008, 0x00010008, 0x00010009, 0x00010009, 0x0001000f, 0x0001000f, 0x00010010, 0x00010010, 0x00010011, 0x00010011, }, - {0x00010012, 0x00010012, 0x00010013, 0x00010013, 0x00010019, 0x00010019, 0x0001001a, 0x0001001a, 0x0001001b, 0x0001001b, 0x0001001c, 0x0001001c, 0x0001001d, 0x0001001d, 0x00010022, 0x00010022, }, - {0x00010023, 0x00010023, 0x00010024, 0x00010024, 0x00010025, 0x00010025, 0x00010026, 0x00010026, 0x00010027, 0x00010027, 0x0001002b, 0x0001002b, 0x0001002c, 0x0001002c, 0x0001002d, 0x0001002d, }, - {0x0001002e, 0x0001002e, 0x0001002f, 0x0001002f, 0x00010030, 0x00010030, 0x00010031, 0x00010031, 0x00010032, 0x00010032, 0x00010033, 0x00010033, 0x00010034, 0x00010034, 0x00010035, 0x00010035, }, - {0x00010036, 0x00010036, 0x00010037, 0x00010037, 0x00010038, 0x00010038, 0x00010039, 0x00010039, 0x0001003a, 0x0001003a, 0x0001003b, 0x0001003b, 0x0001003c, 0x0001003c, 0x0001003d, 0x0001003d, }, - {0x0001003e, 0x0001003e, 0x0001003f, 0x0001003f, 0x00010040, 0x00010040, 0x00010041, 0x00010041, 0x00010042, 0x00010042, 0x00010043, 0x00010043, 0x00010044, 0x00010044, 0x00010045, 0x00010045, }, - {0x00010046, 0x00010046, 0x00010047, 0x00010047, 0x00010048, 0x00010048, 0x00010049, 0x00010049, 0x0001004a, 0x0001004a, 0x0001004b, 0x0001004b, 0x0001004c, 0x0001004c, 0x0001004d, 0x0001004d, }, - {0x0001004e, 0x0001004e, 0x0001004f, 0x0001004f, 0x00010050, 0x00010050, 0x00010051, 0x00010051, 0x00010052, 0x00010052, 0x00010053, 0x00010053, 0x00010054, 0x00010054, 0x00010055, 0x00010055, }, - {0x00010056, 0x00010056, 0x00010057, 0x00010057, 0x00010058, 0x00010058, 0x00010059, 0x00010059, 0x0001005a, 0x0001005a, 0x0001005b, 0x0001005b, 0x0001005c, 0x0001005c, 0x0001005d, 0x0001005d, }, -}; - -const uint32_t c_aauiCQMFHuffEnc42[169][2] = -{ - {0x0001, 0x0001}, {0x0003, 0x0001}, {0x0006, 0x0001}, {0x0009, 0x0001}, {0x000e, 0x0006}, {0x0013, 0x0000}, {0x0013, 0x0001}, {0x0013, 0x0002}, - {0x0013, 0x0003}, {0x0013, 0x0004}, {0x0013, 0x0005}, {0x0013, 0x0006}, {0x0013, 0x0007}, {0x0003, 0x0002}, {0x0003, 0x0003}, {0x0005, 0x0001}, - {0x0009, 0x0002}, {0x000d, 0x0004}, {0x0010, 0x0013}, {0x0013, 0x0008}, {0x0013, 0x0009}, {0x0013, 0x000a}, {0x0013, 0x000b}, {0x0013, 0x000c}, - {0x0013, 0x000d}, {0x0013, 0x000e}, {0x0005, 0x0002}, {0x0005, 0x0003}, {0x0008, 0x0002}, {0x000b, 0x0002}, {0x000f, 0x000b}, {0x0011, 0x0025}, - {0x0013, 0x000f}, {0x0013, 0x0010}, {0x0013, 0x0011}, {0x0013, 0x0012}, {0x0013, 0x0013}, {0x0013, 0x0014}, {0x0013, 0x0015}, {0x0009, 0x0003}, - {0x0008, 0x0003}, {0x000b, 0x0003}, {0x000d, 0x0005}, {0x0010, 0x0014}, {0x0013, 0x0016}, {0x0013, 0x0017}, {0x0013, 0x0018}, {0x0013, 0x0019}, - {0x0013, 0x001a}, {0x0013, 0x001b}, {0x0013, 0x001c}, {0x0013, 0x001d}, {0x000d, 0x0006}, {0x000d, 0x0007}, {0x000e, 0x0007}, {0x0010, 0x0015}, - {0x0013, 0x001e}, {0x0013, 0x001f}, {0x0013, 0x0020}, {0x0013, 0x0021}, {0x0013, 0x0022}, {0x0013, 0x0023}, {0x0013, 0x0024}, {0x0013, 0x0025}, - {0x0013, 0x0026}, {0x0012, 0x0045}, {0x0013, 0x0027}, {0x0013, 0x0028}, {0x0013, 0x0029}, {0x0013, 0x002a}, {0x0013, 0x002b}, {0x0013, 0x002c}, - {0x0013, 0x002d}, {0x0013, 0x002e}, {0x0013, 0x002f}, {0x0013, 0x0030}, {0x0013, 0x0031}, {0x0013, 0x0032}, {0x0013, 0x0033}, {0x0013, 0x0034}, - {0x0013, 0x0035}, {0x0013, 0x0036}, {0x0013, 0x0037}, {0x0013, 0x0038}, {0x0013, 0x0039}, {0x0013, 0x003a}, {0x0013, 0x003b}, {0x0013, 0x003c}, - {0x0013, 0x003d}, {0x0013, 0x003e}, {0x0013, 0x003f}, {0x0013, 0x0040}, {0x0013, 0x0041}, {0x0013, 0x0042}, {0x0013, 0x0043}, {0x0013, 0x0044}, - {0x0013, 0x0045}, {0x0013, 0x0046}, {0x0013, 0x0047}, {0x0013, 0x0048}, {0x0013, 0x0049}, {0x0013, 0x004a}, {0x0013, 0x004b}, {0x0013, 0x004c}, - {0x0013, 0x004d}, {0x0013, 0x004e}, {0x0013, 0x004f}, {0x0013, 0x0050}, {0x0013, 0x0051}, {0x0013, 0x0052}, {0x0013, 0x0053}, {0x0013, 0x0054}, - {0x0013, 0x0055}, {0x0013, 0x0056}, {0x0013, 0x0057}, {0x0013, 0x0058}, {0x0013, 0x0059}, {0x0013, 0x005a}, {0x0013, 0x005b}, {0x0013, 0x005c}, - {0x0013, 0x005d}, {0x0013, 0x005e}, {0x0013, 0x005f}, {0x0013, 0x0060}, {0x0013, 0x0061}, {0x0013, 0x0062}, {0x0013, 0x0063}, {0x0013, 0x0064}, - {0x0013, 0x0065}, {0x0013, 0x0066}, {0x0013, 0x0067}, {0x0013, 0x0068}, {0x0013, 0x0069}, {0x0013, 0x006a}, {0x0013, 0x006b}, {0x0013, 0x006c}, - {0x0013, 0x006d}, {0x0013, 0x006e}, {0x0013, 0x006f}, {0x0013, 0x0070}, {0x0013, 0x0071}, {0x0013, 0x0072}, {0x0013, 0x0073}, {0x0013, 0x0074}, - {0x0013, 0x0075}, {0x0013, 0x0076}, {0x0013, 0x0077}, {0x0013, 0x0078}, {0x0013, 0x0079}, {0x0013, 0x007a}, {0x0013, 0x007b}, {0x0013, 0x007c}, - {0x0013, 0x007d}, {0x0013, 0x007e}, {0x0013, 0x007f}, {0x0013, 0x0080}, {0x0013, 0x0081}, {0x0013, 0x0082}, {0x0013, 0x0083}, {0x0013, 0x0084}, - {0x0013, 0x0085}, {0x0013, 0x0086}, {0x0013, 0x0087}, {0x0013, 0x0088}, {0x0013, 0x0089}, {0x0012, 0x0046}, {0x0012, 0x0047}, {0x0012, 0x0048}, - {0x0012, 0x0049}, - -}; - -const uint32_t c_aauiCQMFHuffDec42[28][16] = -{ - {0x0001ffff, 0x0002ffff, 0x00010001, 0x00010001, 0x0001000d, 0x0001000d, 0x0001000e, 0x0001000e, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x0003ffff, 0x0004ffff, 0x0000001c, 0x00000028, 0x00020002, 0x00020002, 0x00020002, 0x00020002, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, }, - {0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001a, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, }, - {0x000affff, 0x0007ffff, 0x0005ffff, 0x0006ffff, 0x0001001d, 0x0001001d, 0x00010029, 0x00010029, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, }, - {0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, }, - {0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, }, - {0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, }, - {0x001bffff, 0x0009ffff, 0x0008ffff, 0x00000012, 0x0000002b, 0x00000037, 0x0001001e, 0x0001001e, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020036, 0x00020036, 0x00020036, 0x00020036, }, - {0x000200a7, 0x000200a7, 0x000200a7, 0x000200a7, 0x000200a8, 0x000200a8, 0x000200a8, 0x000200a8, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, }, - {0x000100a3, 0x000100a3, 0x000100a4, 0x000100a4, 0x00020041, 0x00020041, 0x00020041, 0x00020041, 0x000200a5, 0x000200a5, 0x000200a5, 0x000200a5, 0x000200a6, 0x000200a6, 0x000200a6, 0x000200a6, }, - {0x000dffff, 0x000bffff, 0x000cffff, 0x000effff, 0x000fffff, 0x0010ffff, 0x0011ffff, 0x0012ffff, 0x0013ffff, 0x0014ffff, 0x0015ffff, 0x0016ffff, 0x0017ffff, 0x0018ffff, 0x0019ffff, 0x001affff, }, - {0x00010013, 0x00010013, 0x00010014, 0x00010014, 0x00010015, 0x00010015, 0x00010016, 0x00010016, 0x00010017, 0x00010017, 0x00010018, 0x00010018, 0x00010019, 0x00010019, 0x00010020, 0x00010020, }, - {0x00010021, 0x00010021, 0x00010022, 0x00010022, 0x00010023, 0x00010023, 0x00010024, 0x00010024, 0x00010025, 0x00010025, 0x00010026, 0x00010026, 0x0001002c, 0x0001002c, 0x0001002d, 0x0001002d, }, - {0x00010005, 0x00010005, 0x00010006, 0x00010006, 0x00010007, 0x00010007, 0x00010008, 0x00010008, 0x00010009, 0x00010009, 0x0001000a, 0x0001000a, 0x0001000b, 0x0001000b, 0x0001000c, 0x0001000c, }, - {0x0001002e, 0x0001002e, 0x0001002f, 0x0001002f, 0x00010030, 0x00010030, 0x00010031, 0x00010031, 0x00010032, 0x00010032, 0x00010033, 0x00010033, 0x00010038, 0x00010038, 0x00010039, 0x00010039, }, - {0x0001003a, 0x0001003a, 0x0001003b, 0x0001003b, 0x0001003c, 0x0001003c, 0x0001003d, 0x0001003d, 0x0001003e, 0x0001003e, 0x0001003f, 0x0001003f, 0x00010040, 0x00010040, 0x00010042, 0x00010042, }, - {0x00010043, 0x00010043, 0x00010044, 0x00010044, 0x00010045, 0x00010045, 0x00010046, 0x00010046, 0x00010047, 0x00010047, 0x00010048, 0x00010048, 0x00010049, 0x00010049, 0x0001004a, 0x0001004a, }, - {0x0001004b, 0x0001004b, 0x0001004c, 0x0001004c, 0x0001004d, 0x0001004d, 0x0001004e, 0x0001004e, 0x0001004f, 0x0001004f, 0x00010050, 0x00010050, 0x00010051, 0x00010051, 0x00010052, 0x00010052, }, - {0x00010053, 0x00010053, 0x00010054, 0x00010054, 0x00010055, 0x00010055, 0x00010056, 0x00010056, 0x00010057, 0x00010057, 0x00010058, 0x00010058, 0x00010059, 0x00010059, 0x0001005a, 0x0001005a, }, - {0x0001005b, 0x0001005b, 0x0001005c, 0x0001005c, 0x0001005d, 0x0001005d, 0x0001005e, 0x0001005e, 0x0001005f, 0x0001005f, 0x00010060, 0x00010060, 0x00010061, 0x00010061, 0x00010062, 0x00010062, }, - {0x00010063, 0x00010063, 0x00010064, 0x00010064, 0x00010065, 0x00010065, 0x00010066, 0x00010066, 0x00010067, 0x00010067, 0x00010068, 0x00010068, 0x00010069, 0x00010069, 0x0001006a, 0x0001006a, }, - {0x0001006b, 0x0001006b, 0x0001006c, 0x0001006c, 0x0001006d, 0x0001006d, 0x0001006e, 0x0001006e, 0x0001006f, 0x0001006f, 0x00010070, 0x00010070, 0x00010071, 0x00010071, 0x00010072, 0x00010072, }, - {0x00010073, 0x00010073, 0x00010074, 0x00010074, 0x00010075, 0x00010075, 0x00010076, 0x00010076, 0x00010077, 0x00010077, 0x00010078, 0x00010078, 0x00010079, 0x00010079, 0x0001007a, 0x0001007a, }, - {0x0001007b, 0x0001007b, 0x0001007c, 0x0001007c, 0x0001007d, 0x0001007d, 0x0001007e, 0x0001007e, 0x0001007f, 0x0001007f, 0x00010080, 0x00010080, 0x00010081, 0x00010081, 0x00010082, 0x00010082, }, - {0x00010083, 0x00010083, 0x00010084, 0x00010084, 0x00010085, 0x00010085, 0x00010086, 0x00010086, 0x00010087, 0x00010087, 0x00010088, 0x00010088, 0x00010089, 0x00010089, 0x0001008a, 0x0001008a, }, - {0x0001008b, 0x0001008b, 0x0001008c, 0x0001008c, 0x0001008d, 0x0001008d, 0x0001008e, 0x0001008e, 0x0001008f, 0x0001008f, 0x00010090, 0x00010090, 0x00010091, 0x00010091, 0x00010092, 0x00010092, }, - {0x00010093, 0x00010093, 0x00010094, 0x00010094, 0x00010095, 0x00010095, 0x00010096, 0x00010096, 0x00010097, 0x00010097, 0x00010098, 0x00010098, 0x00010099, 0x00010099, 0x0001009a, 0x0001009a, }, - {0x0001009b, 0x0001009b, 0x0001009c, 0x0001009c, 0x0001009d, 0x0001009d, 0x0001009e, 0x0001009e, 0x0001009f, 0x0001009f, 0x000100a0, 0x000100a0, 0x000100a1, 0x000100a1, 0x000100a2, 0x000100a2, }, -}; - -const uint32_t c_aauiCQMFHuffEnc43[196][2] = -{ - {0x0001, 0x0001}, {0x0003, 0x0001}, {0x0006, 0x0001}, {0x0009, 0x0002}, {0x000c, 0x0003}, {0x0010, 0x0017}, {0x0013, 0x0000}, {0x0013, 0x0001}, - {0x0013, 0x0002}, {0x0013, 0x0003}, {0x0013, 0x0004}, {0x0013, 0x0005}, {0x0013, 0x0006}, {0x0013, 0x0007}, {0x0003, 0x0002}, {0x0003, 0x0003}, - {0x0005, 0x0001}, {0x0009, 0x0003}, {0x000c, 0x0004}, {0x0010, 0x0018}, {0x0012, 0x0050}, {0x0013, 0x0008}, {0x0013, 0x0009}, {0x0013, 0x000a}, - {0x0013, 0x000b}, {0x0013, 0x000c}, {0x0013, 0x000d}, {0x0013, 0x000e}, {0x0005, 0x0002}, {0x0005, 0x0003}, {0x0008, 0x0003}, {0x000a, 0x0002}, - {0x000d, 0x0004}, {0x0011, 0x002a}, {0x0013, 0x000f}, {0x0013, 0x0010}, {0x0013, 0x0011}, {0x0013, 0x0012}, {0x0013, 0x0013}, {0x0013, 0x0014}, - {0x0013, 0x0015}, {0x0013, 0x0016}, {0x0009, 0x0004}, {0x0009, 0x0005}, {0x000a, 0x0003}, {0x000c, 0x0005}, {0x000f, 0x000d}, {0x0012, 0x0051}, - {0x0013, 0x0017}, {0x0013, 0x0018}, {0x0013, 0x0019}, {0x0013, 0x001a}, {0x0013, 0x001b}, {0x0013, 0x001c}, {0x0013, 0x001d}, {0x0013, 0x001e}, - {0x000c, 0x0006}, {0x000c, 0x0007}, {0x000d, 0x0005}, {0x000f, 0x000e}, {0x0011, 0x002b}, {0x0013, 0x001f}, {0x0013, 0x0020}, {0x0013, 0x0021}, - {0x0013, 0x0022}, {0x0013, 0x0023}, {0x0013, 0x0024}, {0x0013, 0x0025}, {0x0013, 0x0026}, {0x0013, 0x0027}, {0x0011, 0x002c}, {0x000f, 0x000f}, - {0x0010, 0x0019}, {0x0012, 0x0052}, {0x0012, 0x0053}, {0x0013, 0x0028}, {0x0013, 0x0029}, {0x0013, 0x002a}, {0x0013, 0x002b}, {0x0013, 0x002c}, - {0x0013, 0x002d}, {0x0013, 0x002e}, {0x0013, 0x002f}, {0x0013, 0x0030}, {0x0013, 0x0031}, {0x0011, 0x002d}, {0x0013, 0x0032}, {0x0013, 0x0033}, - {0x0013, 0x0034}, {0x0013, 0x0035}, {0x0013, 0x0036}, {0x0013, 0x0037}, {0x0013, 0x0038}, {0x0013, 0x0039}, {0x0013, 0x003a}, {0x0013, 0x003b}, - {0x0013, 0x003c}, {0x0013, 0x003d}, {0x0013, 0x003e}, {0x0013, 0x003f}, {0x0013, 0x0040}, {0x0013, 0x0041}, {0x0013, 0x0042}, {0x0013, 0x0043}, - {0x0013, 0x0044}, {0x0013, 0x0045}, {0x0013, 0x0046}, {0x0013, 0x0047}, {0x0013, 0x0048}, {0x0013, 0x0049}, {0x0013, 0x004a}, {0x0013, 0x004b}, - {0x0013, 0x004c}, {0x0013, 0x004d}, {0x0013, 0x004e}, {0x0013, 0x004f}, {0x0013, 0x0050}, {0x0013, 0x0051}, {0x0013, 0x0052}, {0x0013, 0x0053}, - {0x0013, 0x0054}, {0x0013, 0x0055}, {0x0013, 0x0056}, {0x0013, 0x0057}, {0x0013, 0x0058}, {0x0013, 0x0059}, {0x0013, 0x005a}, {0x0013, 0x005b}, - {0x0013, 0x005c}, {0x0013, 0x005d}, {0x0013, 0x005e}, {0x0013, 0x005f}, {0x0013, 0x0060}, {0x0013, 0x0061}, {0x0013, 0x0062}, {0x0013, 0x0063}, - {0x0013, 0x0064}, {0x0013, 0x0065}, {0x0013, 0x0066}, {0x0013, 0x0067}, {0x0013, 0x0068}, {0x0013, 0x0069}, {0x0013, 0x006a}, {0x0013, 0x006b}, - {0x0013, 0x006c}, {0x0013, 0x006d}, {0x0013, 0x006e}, {0x0013, 0x006f}, {0x0013, 0x0070}, {0x0013, 0x0071}, {0x0013, 0x0072}, {0x0013, 0x0073}, - {0x0013, 0x0074}, {0x0013, 0x0075}, {0x0013, 0x0076}, {0x0013, 0x0077}, {0x0013, 0x0078}, {0x0013, 0x0079}, {0x0013, 0x007a}, {0x0013, 0x007b}, - {0x0013, 0x007c}, {0x0013, 0x007d}, {0x0013, 0x007e}, {0x0013, 0x007f}, {0x0013, 0x0080}, {0x0013, 0x0081}, {0x0013, 0x0082}, {0x0013, 0x0083}, - {0x0013, 0x0084}, {0x0013, 0x0085}, {0x0013, 0x0086}, {0x0013, 0x0087}, {0x0013, 0x0088}, {0x0013, 0x0089}, {0x0013, 0x008a}, {0x0013, 0x008b}, - {0x0013, 0x008c}, {0x0013, 0x008d}, {0x0013, 0x008e}, {0x0013, 0x008f}, {0x0013, 0x0090}, {0x0013, 0x0091}, {0x0013, 0x0092}, {0x0013, 0x0093}, - {0x0013, 0x0094}, {0x0013, 0x0095}, {0x0013, 0x0096}, {0x0013, 0x0097}, {0x0013, 0x0098}, {0x0013, 0x0099}, {0x0013, 0x009a}, {0x0013, 0x009b}, - {0x0013, 0x009c}, {0x0013, 0x009d}, {0x0013, 0x009e}, {0x0013, 0x009f}, - -}; - -const uint32_t c_aauiCQMFHuffDec43[32][16] = -{ - {0x0001ffff, 0x0002ffff, 0x00010001, 0x00010001, 0x0001000e, 0x0001000e, 0x0001000f, 0x0001000f, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x0005ffff, 0x0003ffff, 0x0004ffff, 0x0000001e, 0x00020002, 0x00020002, 0x00020002, 0x00020002, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, }, - {0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, }, - {0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030003, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, 0x00030011, }, - {0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, }, - {0x000bffff, 0x0007ffff, 0x0006ffff, 0x00000004, 0x00000012, 0x0000002d, 0x00000038, 0x00000039, 0x0002001f, 0x0002001f, 0x0002001f, 0x0002001f, 0x0002002c, 0x0002002c, 0x0002002c, 0x0002002c, }, - {0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, }, - {0x001cffff, 0x001dffff, 0x001effff, 0x001fffff, 0x000affff, 0x0008ffff, 0x0009ffff, 0x00000005, 0x00000013, 0x00000048, 0x0001002e, 0x0001002e, 0x0001003b, 0x0001003b, 0x00010047, 0x00010047, }, - {0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, }, - {0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, }, - {0x00020014, 0x00020014, 0x00020014, 0x00020014, 0x0002002f, 0x0002002f, 0x0002002f, 0x0002002f, 0x00020049, 0x00020049, 0x00020049, 0x00020049, 0x0002004a, 0x0002004a, 0x0002004a, 0x0002004a, }, - {0x000dffff, 0x000effff, 0x000cffff, 0x000fffff, 0x0010ffff, 0x0011ffff, 0x0012ffff, 0x0013ffff, 0x0014ffff, 0x0015ffff, 0x0016ffff, 0x0017ffff, 0x0018ffff, 0x0019ffff, 0x001affff, 0x001bffff, }, - {0x00010023, 0x00010023, 0x00010024, 0x00010024, 0x00010025, 0x00010025, 0x00010026, 0x00010026, 0x00010027, 0x00010027, 0x00010028, 0x00010028, 0x00010029, 0x00010029, 0x00010030, 0x00010030, }, - {0x00010006, 0x00010006, 0x00010007, 0x00010007, 0x00010008, 0x00010008, 0x00010009, 0x00010009, 0x0001000a, 0x0001000a, 0x0001000b, 0x0001000b, 0x0001000c, 0x0001000c, 0x0001000d, 0x0001000d, }, - {0x00010015, 0x00010015, 0x00010016, 0x00010016, 0x00010017, 0x00010017, 0x00010018, 0x00010018, 0x00010019, 0x00010019, 0x0001001a, 0x0001001a, 0x0001001b, 0x0001001b, 0x00010022, 0x00010022, }, - {0x00010031, 0x00010031, 0x00010032, 0x00010032, 0x00010033, 0x00010033, 0x00010034, 0x00010034, 0x00010035, 0x00010035, 0x00010036, 0x00010036, 0x00010037, 0x00010037, 0x0001003d, 0x0001003d, }, - {0x0001003e, 0x0001003e, 0x0001003f, 0x0001003f, 0x00010040, 0x00010040, 0x00010041, 0x00010041, 0x00010042, 0x00010042, 0x00010043, 0x00010043, 0x00010044, 0x00010044, 0x00010045, 0x00010045, }, - {0x0001004b, 0x0001004b, 0x0001004c, 0x0001004c, 0x0001004d, 0x0001004d, 0x0001004e, 0x0001004e, 0x0001004f, 0x0001004f, 0x00010050, 0x00010050, 0x00010051, 0x00010051, 0x00010052, 0x00010052, }, - {0x00010053, 0x00010053, 0x00010054, 0x00010054, 0x00010056, 0x00010056, 0x00010057, 0x00010057, 0x00010058, 0x00010058, 0x00010059, 0x00010059, 0x0001005a, 0x0001005a, 0x0001005b, 0x0001005b, }, - {0x0001005c, 0x0001005c, 0x0001005d, 0x0001005d, 0x0001005e, 0x0001005e, 0x0001005f, 0x0001005f, 0x00010060, 0x00010060, 0x00010061, 0x00010061, 0x00010062, 0x00010062, 0x00010063, 0x00010063, }, - {0x00010064, 0x00010064, 0x00010065, 0x00010065, 0x00010066, 0x00010066, 0x00010067, 0x00010067, 0x00010068, 0x00010068, 0x00010069, 0x00010069, 0x0001006a, 0x0001006a, 0x0001006b, 0x0001006b, }, - {0x0001006c, 0x0001006c, 0x0001006d, 0x0001006d, 0x0001006e, 0x0001006e, 0x0001006f, 0x0001006f, 0x00010070, 0x00010070, 0x00010071, 0x00010071, 0x00010072, 0x00010072, 0x00010073, 0x00010073, }, - {0x00010074, 0x00010074, 0x00010075, 0x00010075, 0x00010076, 0x00010076, 0x00010077, 0x00010077, 0x00010078, 0x00010078, 0x00010079, 0x00010079, 0x0001007a, 0x0001007a, 0x0001007b, 0x0001007b, }, - {0x0001007c, 0x0001007c, 0x0001007d, 0x0001007d, 0x0001007e, 0x0001007e, 0x0001007f, 0x0001007f, 0x00010080, 0x00010080, 0x00010081, 0x00010081, 0x00010082, 0x00010082, 0x00010083, 0x00010083, }, - {0x00010084, 0x00010084, 0x00010085, 0x00010085, 0x00010086, 0x00010086, 0x00010087, 0x00010087, 0x00010088, 0x00010088, 0x00010089, 0x00010089, 0x0001008a, 0x0001008a, 0x0001008b, 0x0001008b, }, - {0x0001008c, 0x0001008c, 0x0001008d, 0x0001008d, 0x0001008e, 0x0001008e, 0x0001008f, 0x0001008f, 0x00010090, 0x00010090, 0x00010091, 0x00010091, 0x00010092, 0x00010092, 0x00010093, 0x00010093, }, - {0x00010094, 0x00010094, 0x00010095, 0x00010095, 0x00010096, 0x00010096, 0x00010097, 0x00010097, 0x00010098, 0x00010098, 0x00010099, 0x00010099, 0x0001009a, 0x0001009a, 0x0001009b, 0x0001009b, }, - {0x0001009c, 0x0001009c, 0x0001009d, 0x0001009d, 0x0001009e, 0x0001009e, 0x0001009f, 0x0001009f, 0x000100a0, 0x000100a0, 0x000100a1, 0x000100a1, 0x000100a2, 0x000100a2, 0x000100a3, 0x000100a3, }, - {0x000100a4, 0x000100a4, 0x000100a5, 0x000100a5, 0x000100a6, 0x000100a6, 0x000100a7, 0x000100a7, 0x000100a8, 0x000100a8, 0x000100a9, 0x000100a9, 0x000100aa, 0x000100aa, 0x000100ab, 0x000100ab, }, - {0x000100ac, 0x000100ac, 0x000100ad, 0x000100ad, 0x000100ae, 0x000100ae, 0x000100af, 0x000100af, 0x000100b0, 0x000100b0, 0x000100b1, 0x000100b1, 0x000100b2, 0x000100b2, 0x000100b3, 0x000100b3, }, - {0x000100b4, 0x000100b4, 0x000100b5, 0x000100b5, 0x000100b6, 0x000100b6, 0x000100b7, 0x000100b7, 0x000100b8, 0x000100b8, 0x000100b9, 0x000100b9, 0x000100ba, 0x000100ba, 0x000100bb, 0x000100bb, }, - {0x000100bc, 0x000100bc, 0x000100bd, 0x000100bd, 0x000100be, 0x000100be, 0x000100bf, 0x000100bf, 0x000100c0, 0x000100c0, 0x000100c1, 0x000100c1, 0x000100c2, 0x000100c2, 0x000100c3, 0x000100c3, }, -}; - -const uint32_t c_aauiCQMFHuffEnc44[289][2] = -{ - {0x0001, 0x0001}, {0x0003, 0x0001}, {0x0006, 0x0002}, {0x0008, 0x0002}, {0x000b, 0x0002}, {0x000f, 0x000a}, {0x0011, 0x0022}, {0x0014, 0x0000}, - {0x0014, 0x0001}, {0x0014, 0x0002}, {0x0014, 0x0003}, {0x0014, 0x0004}, {0x0014, 0x0005}, {0x0014, 0x0006}, {0x0014, 0x0007}, {0x0014, 0x0008}, - {0x0014, 0x0009}, {0x0003, 0x0002}, {0x0003, 0x0003}, {0x0005, 0x0002}, {0x0008, 0x0003}, {0x000b, 0x0003}, {0x000e, 0x0007}, {0x0012, 0x003f}, - {0x0014, 0x000a}, {0x0014, 0x000b}, {0x0014, 0x000c}, {0x0014, 0x000d}, {0x0014, 0x000e}, {0x0014, 0x000f}, {0x0014, 0x0010}, {0x0014, 0x0011}, - {0x0014, 0x0012}, {0x0014, 0x0013}, {0x0006, 0x0003}, {0x0005, 0x0003}, {0x0007, 0x0003}, {0x0009, 0x0002}, {0x000c, 0x0003}, {0x000f, 0x000b}, - {0x0012, 0x0040}, {0x0014, 0x0014}, {0x0014, 0x0015}, {0x0014, 0x0016}, {0x0014, 0x0017}, {0x0014, 0x0018}, {0x0014, 0x0019}, {0x0014, 0x001a}, - {0x0014, 0x001b}, {0x0014, 0x001c}, {0x0014, 0x001d}, {0x0008, 0x0004}, {0x0008, 0x0005}, {0x0009, 0x0003}, {0x000b, 0x0004}, {0x000d, 0x0005}, - {0x0010, 0x0013}, {0x0014, 0x001e}, {0x0014, 0x001f}, {0x0014, 0x0020}, {0x0014, 0x0021}, {0x0014, 0x0022}, {0x0014, 0x0023}, {0x0014, 0x0024}, - {0x0014, 0x0025}, {0x0014, 0x0026}, {0x0014, 0x0027}, {0x0014, 0x0028}, {0x000b, 0x0005}, {0x000b, 0x0006}, {0x000b, 0x0007}, {0x000e, 0x0008}, - {0x0011, 0x0023}, {0x0012, 0x0041}, {0x0014, 0x0029}, {0x0014, 0x002a}, {0x0013, 0x007b}, {0x0014, 0x002b}, {0x0014, 0x002c}, {0x0014, 0x002d}, - {0x0014, 0x002e}, {0x0014, 0x002f}, {0x0014, 0x0030}, {0x0014, 0x0031}, {0x0014, 0x0032}, {0x000f, 0x000c}, {0x000e, 0x0009}, {0x000f, 0x000d}, - {0x0011, 0x0024}, {0x0012, 0x0042}, {0x0014, 0x0033}, {0x0014, 0x0034}, {0x0014, 0x0035}, {0x0014, 0x0036}, {0x0014, 0x0037}, {0x0014, 0x0038}, - {0x0014, 0x0039}, {0x0014, 0x003a}, {0x0014, 0x003b}, {0x0014, 0x003c}, {0x0014, 0x003d}, {0x0014, 0x003e}, {0x0013, 0x007c}, {0x0011, 0x0025}, - {0x0012, 0x0043}, {0x0014, 0x003f}, {0x0014, 0x0040}, {0x0014, 0x0041}, {0x0014, 0x0042}, {0x0014, 0x0043}, {0x0014, 0x0044}, {0x0014, 0x0045}, - {0x0014, 0x0046}, {0x0014, 0x0047}, {0x0014, 0x0048}, {0x0014, 0x0049}, {0x0014, 0x004a}, {0x0014, 0x004b}, {0x0014, 0x004c}, {0x0014, 0x004d}, - {0x0014, 0x004e}, {0x0014, 0x004f}, {0x0014, 0x0050}, {0x0014, 0x0051}, {0x0014, 0x0052}, {0x0014, 0x0053}, {0x0014, 0x0054}, {0x0014, 0x0055}, - {0x0014, 0x0056}, {0x0014, 0x0057}, {0x0014, 0x0058}, {0x0014, 0x0059}, {0x0014, 0x005a}, {0x0014, 0x005b}, {0x0014, 0x005c}, {0x0014, 0x005d}, - {0x0014, 0x005e}, {0x0014, 0x005f}, {0x0014, 0x0060}, {0x0014, 0x0061}, {0x0014, 0x0062}, {0x0014, 0x0063}, {0x0014, 0x0064}, {0x0014, 0x0065}, - {0x0014, 0x0066}, {0x0014, 0x0067}, {0x0014, 0x0068}, {0x0014, 0x0069}, {0x0014, 0x006a}, {0x0014, 0x006b}, {0x0014, 0x006c}, {0x0014, 0x006d}, - {0x0014, 0x006e}, {0x0014, 0x006f}, {0x0014, 0x0070}, {0x0014, 0x0071}, {0x0014, 0x0072}, {0x0014, 0x0073}, {0x0014, 0x0074}, {0x0014, 0x0075}, - {0x0014, 0x0076}, {0x0014, 0x0077}, {0x0014, 0x0078}, {0x0014, 0x0079}, {0x0014, 0x007a}, {0x0014, 0x007b}, {0x0014, 0x007c}, {0x0014, 0x007d}, - {0x0014, 0x007e}, {0x0014, 0x007f}, {0x0014, 0x0080}, {0x0014, 0x0081}, {0x0014, 0x0082}, {0x0014, 0x0083}, {0x0014, 0x0084}, {0x0014, 0x0085}, - {0x0014, 0x0086}, {0x0014, 0x0087}, {0x0014, 0x0088}, {0x0014, 0x0089}, {0x0014, 0x008a}, {0x0014, 0x008b}, {0x0014, 0x008c}, {0x0014, 0x008d}, - {0x0014, 0x008e}, {0x0014, 0x008f}, {0x0014, 0x0090}, {0x0014, 0x0091}, {0x0014, 0x0092}, {0x0014, 0x0093}, {0x0014, 0x0094}, {0x0014, 0x0095}, - {0x0014, 0x0096}, {0x0014, 0x0097}, {0x0014, 0x0098}, {0x0014, 0x0099}, {0x0014, 0x009a}, {0x0014, 0x009b}, {0x0014, 0x009c}, {0x0014, 0x009d}, - {0x0014, 0x009e}, {0x0014, 0x009f}, {0x0014, 0x00a0}, {0x0014, 0x00a1}, {0x0014, 0x00a2}, {0x0014, 0x00a3}, {0x0014, 0x00a4}, {0x0014, 0x00a5}, - {0x0014, 0x00a6}, {0x0014, 0x00a7}, {0x0014, 0x00a8}, {0x0014, 0x00a9}, {0x0014, 0x00aa}, {0x0014, 0x00ab}, {0x0014, 0x00ac}, {0x0014, 0x00ad}, - {0x0014, 0x00ae}, {0x0014, 0x00af}, {0x0014, 0x00b0}, {0x0014, 0x00b1}, {0x0014, 0x00b2}, {0x0014, 0x00b3}, {0x0014, 0x00b4}, {0x0014, 0x00b5}, - {0x0014, 0x00b6}, {0x0014, 0x00b7}, {0x0014, 0x00b8}, {0x0014, 0x00b9}, {0x0014, 0x00ba}, {0x0014, 0x00bb}, {0x0014, 0x00bc}, {0x0014, 0x00bd}, - {0x0014, 0x00be}, {0x0014, 0x00bf}, {0x0014, 0x00c0}, {0x0014, 0x00c1}, {0x0014, 0x00c2}, {0x0014, 0x00c3}, {0x0014, 0x00c4}, {0x0014, 0x00c5}, - {0x0014, 0x00c6}, {0x0014, 0x00c7}, {0x0014, 0x00c8}, {0x0014, 0x00c9}, {0x0014, 0x00ca}, {0x0014, 0x00cb}, {0x0014, 0x00cc}, {0x0014, 0x00cd}, - {0x0014, 0x00ce}, {0x0014, 0x00cf}, {0x0014, 0x00d0}, {0x0014, 0x00d1}, {0x0014, 0x00d2}, {0x0014, 0x00d3}, {0x0014, 0x00d4}, {0x0014, 0x00d5}, - {0x0014, 0x00d6}, {0x0014, 0x00d7}, {0x0014, 0x00d8}, {0x0014, 0x00d9}, {0x0014, 0x00da}, {0x0014, 0x00db}, {0x0014, 0x00dc}, {0x0014, 0x00dd}, - {0x0014, 0x00de}, {0x0014, 0x00df}, {0x0014, 0x00e0}, {0x0014, 0x00e1}, {0x0014, 0x00e2}, {0x0014, 0x00e3}, {0x0014, 0x00e4}, {0x0014, 0x00e5}, - {0x0014, 0x00e6}, {0x0014, 0x00e7}, {0x0014, 0x00e8}, {0x0014, 0x00e9}, {0x0014, 0x00ea}, {0x0014, 0x00eb}, {0x0014, 0x00ec}, {0x0014, 0x00ed}, - {0x0014, 0x00ee}, {0x0014, 0x00ef}, {0x0014, 0x00f0}, {0x0014, 0x00f1}, {0x0014, 0x00f2}, {0x0014, 0x00f3}, {0x0014, 0x00f4}, {0x0014, 0x00f5}, - {0x0013, 0x007d}, - -}; - -const uint32_t c_aauiCQMFHuffDec44[27][16] = -{ - {0x0002ffff, 0x0001ffff, 0x00010001, 0x00010001, 0x00010011, 0x00010011, 0x00010012, 0x00010012, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, }, - {0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, }, - {0x0004ffff, 0x0003ffff, 0x00000003, 0x00000014, 0x00000033, 0x00000034, 0x00010024, 0x00010024, 0x00020002, 0x00020002, 0x00020002, 0x00020002, 0x00020022, 0x00020022, 0x00020022, 0x00020022, }, - {0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, }, - {0x000affff, 0x0006ffff, 0x0005ffff, 0x00000026, 0x00010004, 0x00010004, 0x00010015, 0x00010015, 0x00010036, 0x00010036, 0x00010044, 0x00010044, 0x00010045, 0x00010045, 0x00010046, 0x00010046, }, - {0x00020047, 0x00020047, 0x00020047, 0x00020047, 0x00020056, 0x00020056, 0x00020056, 0x00020056, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, }, - {0x0009ffff, 0x0007ffff, 0x0008ffff, 0x00000038, 0x00010005, 0x00010005, 0x00010027, 0x00010027, 0x00010055, 0x00010055, 0x00010057, 0x00010057, 0x00020016, 0x00020016, 0x00020016, 0x00020016, }, - {0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, }, - {0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030067, 0x00030067, 0x00030067, 0x00030067, 0x00030067, 0x00030067, 0x00030067, 0x00030067, }, - {0x00020028, 0x00020028, 0x00020028, 0x00020028, 0x00020049, 0x00020049, 0x00020049, 0x00020049, 0x00020059, 0x00020059, 0x00020059, 0x00020059, 0x00020068, 0x00020068, 0x00020068, 0x00020068, }, - {0x000dffff, 0x000cffff, 0x000effff, 0x000fffff, 0x0010ffff, 0x0011ffff, 0x0012ffff, 0x0013ffff, 0x0014ffff, 0x0015ffff, 0x0016ffff, 0x0017ffff, 0x0018ffff, 0x0019ffff, 0x001affff, 0x000bffff, }, - {0x0000011a, 0x0000011b, 0x0000011c, 0x0000011d, 0x0000011e, 0x0000011f, 0x0001004c, 0x0001004c, 0x00010066, 0x00010066, 0x00010120, 0x00010120, 0x00020017, 0x00020017, 0x00020017, 0x00020017, }, - {0x0000001e, 0x0000001f, 0x00000020, 0x00000021, 0x00000029, 0x0000002a, 0x0000002b, 0x0000002c, 0x0000002d, 0x0000002e, 0x0000002f, 0x00000030, 0x00000031, 0x00000032, 0x00000039, 0x0000003a, }, - {0x00000007, 0x00000008, 0x00000009, 0x0000000a, 0x0000000b, 0x0000000c, 0x0000000d, 0x0000000e, 0x0000000f, 0x00000010, 0x00000018, 0x00000019, 0x0000001a, 0x0000001b, 0x0000001c, 0x0000001d, }, - {0x0000003b, 0x0000003c, 0x0000003d, 0x0000003e, 0x0000003f, 0x00000040, 0x00000041, 0x00000042, 0x00000043, 0x0000004a, 0x0000004b, 0x0000004d, 0x0000004e, 0x0000004f, 0x00000050, 0x00000051, }, - {0x00000052, 0x00000053, 0x00000054, 0x0000005a, 0x0000005b, 0x0000005c, 0x0000005d, 0x0000005e, 0x0000005f, 0x00000060, 0x00000061, 0x00000062, 0x00000063, 0x00000064, 0x00000065, 0x00000069, }, - {0x0000006a, 0x0000006b, 0x0000006c, 0x0000006d, 0x0000006e, 0x0000006f, 0x00000070, 0x00000071, 0x00000072, 0x00000073, 0x00000074, 0x00000075, 0x00000076, 0x00000077, 0x00000078, 0x00000079, }, - {0x0000007a, 0x0000007b, 0x0000007c, 0x0000007d, 0x0000007e, 0x0000007f, 0x00000080, 0x00000081, 0x00000082, 0x00000083, 0x00000084, 0x00000085, 0x00000086, 0x00000087, 0x00000088, 0x00000089, }, - {0x0000008a, 0x0000008b, 0x0000008c, 0x0000008d, 0x0000008e, 0x0000008f, 0x00000090, 0x00000091, 0x00000092, 0x00000093, 0x00000094, 0x00000095, 0x00000096, 0x00000097, 0x00000098, 0x00000099, }, - {0x0000009a, 0x0000009b, 0x0000009c, 0x0000009d, 0x0000009e, 0x0000009f, 0x000000a0, 0x000000a1, 0x000000a2, 0x000000a3, 0x000000a4, 0x000000a5, 0x000000a6, 0x000000a7, 0x000000a8, 0x000000a9, }, - {0x000000aa, 0x000000ab, 0x000000ac, 0x000000ad, 0x000000ae, 0x000000af, 0x000000b0, 0x000000b1, 0x000000b2, 0x000000b3, 0x000000b4, 0x000000b5, 0x000000b6, 0x000000b7, 0x000000b8, 0x000000b9, }, - {0x000000ba, 0x000000bb, 0x000000bc, 0x000000bd, 0x000000be, 0x000000bf, 0x000000c0, 0x000000c1, 0x000000c2, 0x000000c3, 0x000000c4, 0x000000c5, 0x000000c6, 0x000000c7, 0x000000c8, 0x000000c9, }, - {0x000000ca, 0x000000cb, 0x000000cc, 0x000000cd, 0x000000ce, 0x000000cf, 0x000000d0, 0x000000d1, 0x000000d2, 0x000000d3, 0x000000d4, 0x000000d5, 0x000000d6, 0x000000d7, 0x000000d8, 0x000000d9, }, - {0x000000da, 0x000000db, 0x000000dc, 0x000000dd, 0x000000de, 0x000000df, 0x000000e0, 0x000000e1, 0x000000e2, 0x000000e3, 0x000000e4, 0x000000e5, 0x000000e6, 0x000000e7, 0x000000e8, 0x000000e9, }, - {0x000000ea, 0x000000eb, 0x000000ec, 0x000000ed, 0x000000ee, 0x000000ef, 0x000000f0, 0x000000f1, 0x000000f2, 0x000000f3, 0x000000f4, 0x000000f5, 0x000000f6, 0x000000f7, 0x000000f8, 0x000000f9, }, - {0x000000fa, 0x000000fb, 0x000000fc, 0x000000fd, 0x000000fe, 0x000000ff, 0x00000100, 0x00000101, 0x00000102, 0x00000103, 0x00000104, 0x00000105, 0x00000106, 0x00000107, 0x00000108, 0x00000109, }, - {0x0000010a, 0x0000010b, 0x0000010c, 0x0000010d, 0x0000010e, 0x0000010f, 0x00000110, 0x00000111, 0x00000112, 0x00000113, 0x00000114, 0x00000115, 0x00000116, 0x00000117, 0x00000118, 0x00000119, }, -}; - -const uint32_t c_aauiCQMFHuffEnc45[324][2] = -{ - {0x0002, 0x0002}, {0x0003, 0x0002}, {0x0005, 0x0003}, {0x0007, 0x0002}, {0x0009, 0x0003}, {0x000c, 0x0005}, {0x0010, 0x0025}, {0x0012, 0x0088}, - {0x0013, 0x0000}, {0x0013, 0x0001}, {0x0013, 0x0002}, {0x0013, 0x0003}, {0x0013, 0x0004}, {0x0013, 0x0005}, {0x0013, 0x0006}, {0x0013, 0x0007}, - {0x0013, 0x0008}, {0x0013, 0x0009}, {0x0002, 0x0003}, {0x0003, 0x0003}, {0x0005, 0x0004}, {0x0006, 0x0003}, {0x0009, 0x0004}, {0x000b, 0x0004}, - {0x000f, 0x0014}, {0x0011, 0x0048}, {0x0013, 0x000a}, {0x0013, 0x000b}, {0x0013, 0x000c}, {0x0013, 0x000d}, {0x0013, 0x000e}, {0x0013, 0x000f}, - {0x0013, 0x0010}, {0x0013, 0x0011}, {0x0013, 0x0012}, {0x0013, 0x0013}, {0x0005, 0x0005}, {0x0004, 0x0003}, {0x0006, 0x0004}, {0x0007, 0x0003}, - {0x000a, 0x0004}, {0x000d, 0x0007}, {0x000f, 0x0015}, {0x0013, 0x0014}, {0x0013, 0x0015}, {0x0013, 0x0016}, {0x0013, 0x0017}, {0x0013, 0x0018}, - {0x0013, 0x0019}, {0x0013, 0x001a}, {0x0013, 0x001b}, {0x0013, 0x001c}, {0x0013, 0x001d}, {0x0013, 0x001e}, {0x0007, 0x0004}, {0x0006, 0x0005}, - {0x0007, 0x0005}, {0x0009, 0x0005}, {0x000b, 0x0005}, {0x000d, 0x0008}, {0x0010, 0x0026}, {0x0012, 0x0089}, {0x0012, 0x008a}, {0x0013, 0x001f}, - {0x0013, 0x0020}, {0x0013, 0x0021}, {0x0013, 0x0022}, {0x0013, 0x0023}, {0x0013, 0x0024}, {0x0013, 0x0025}, {0x0013, 0x0026}, {0x0013, 0x0027}, - {0x0009, 0x0006}, {0x0009, 0x0007}, {0x000a, 0x0005}, {0x000b, 0x0006}, {0x000d, 0x0009}, {0x000f, 0x0016}, {0x0011, 0x0049}, {0x0013, 0x0028}, - {0x0013, 0x0029}, {0x0013, 0x002a}, {0x0013, 0x002b}, {0x0013, 0x002c}, {0x0013, 0x002d}, {0x0013, 0x002e}, {0x0013, 0x002f}, {0x0013, 0x0030}, - {0x0013, 0x0031}, {0x0013, 0x0032}, {0x000c, 0x0006}, {0x000b, 0x0007}, {0x000c, 0x0007}, {0x000e, 0x000d}, {0x0010, 0x0027}, {0x0012, 0x008b}, - {0x0012, 0x008c}, {0x0013, 0x0033}, {0x0013, 0x0034}, {0x0013, 0x0035}, {0x0013, 0x0036}, {0x0013, 0x0037}, {0x0013, 0x0038}, {0x0013, 0x0039}, - {0x0013, 0x003a}, {0x0013, 0x003b}, {0x0013, 0x003c}, {0x0013, 0x003d}, {0x000f, 0x0017}, {0x000f, 0x0018}, {0x000f, 0x0019}, {0x0012, 0x008d}, - {0x0013, 0x003e}, {0x0013, 0x003f}, {0x0013, 0x0040}, {0x0013, 0x0041}, {0x0013, 0x0042}, {0x0013, 0x0043}, {0x0013, 0x0044}, {0x0013, 0x0045}, - {0x0013, 0x0046}, {0x0013, 0x0047}, {0x0013, 0x0048}, {0x0013, 0x0049}, {0x0013, 0x004a}, {0x0013, 0x004b}, {0x0013, 0x004c}, {0x0012, 0x008e}, - {0x0012, 0x008f}, {0x0013, 0x004d}, {0x0013, 0x004e}, {0x0013, 0x004f}, {0x0013, 0x0050}, {0x0013, 0x0051}, {0x0013, 0x0052}, {0x0013, 0x0053}, - {0x0013, 0x0054}, {0x0013, 0x0055}, {0x0013, 0x0056}, {0x0013, 0x0057}, {0x0013, 0x0058}, {0x0013, 0x0059}, {0x0013, 0x005a}, {0x0013, 0x005b}, - {0x0013, 0x005c}, {0x0013, 0x005d}, {0x0013, 0x005e}, {0x0013, 0x005f}, {0x0013, 0x0060}, {0x0013, 0x0061}, {0x0013, 0x0062}, {0x0013, 0x0063}, - {0x0013, 0x0064}, {0x0013, 0x0065}, {0x0013, 0x0066}, {0x0013, 0x0067}, {0x0013, 0x0068}, {0x0013, 0x0069}, {0x0013, 0x006a}, {0x0013, 0x006b}, - {0x0013, 0x006c}, {0x0013, 0x006d}, {0x0013, 0x006e}, {0x0013, 0x006f}, {0x0013, 0x0070}, {0x0013, 0x0071}, {0x0013, 0x0072}, {0x0013, 0x0073}, - {0x0013, 0x0074}, {0x0013, 0x0075}, {0x0013, 0x0076}, {0x0013, 0x0077}, {0x0013, 0x0078}, {0x0013, 0x0079}, {0x0013, 0x007a}, {0x0013, 0x007b}, - {0x0013, 0x007c}, {0x0013, 0x007d}, {0x0013, 0x007e}, {0x0013, 0x007f}, {0x0013, 0x0080}, {0x0013, 0x0081}, {0x0013, 0x0082}, {0x0013, 0x0083}, - {0x0013, 0x0084}, {0x0013, 0x0085}, {0x0013, 0x0086}, {0x0013, 0x0087}, {0x0013, 0x0088}, {0x0013, 0x0089}, {0x0013, 0x008a}, {0x0013, 0x008b}, - {0x0013, 0x008c}, {0x0013, 0x008d}, {0x0013, 0x008e}, {0x0013, 0x008f}, {0x0013, 0x0090}, {0x0013, 0x0091}, {0x0013, 0x0092}, {0x0013, 0x0093}, - {0x0013, 0x0094}, {0x0013, 0x0095}, {0x0013, 0x0096}, {0x0013, 0x0097}, {0x0013, 0x0098}, {0x0013, 0x0099}, {0x0013, 0x009a}, {0x0013, 0x009b}, - {0x0013, 0x009c}, {0x0013, 0x009d}, {0x0013, 0x009e}, {0x0013, 0x009f}, {0x0013, 0x00a0}, {0x0013, 0x00a1}, {0x0013, 0x00a2}, {0x0013, 0x00a3}, - {0x0013, 0x00a4}, {0x0013, 0x00a5}, {0x0013, 0x00a6}, {0x0013, 0x00a7}, {0x0013, 0x00a8}, {0x0013, 0x00a9}, {0x0013, 0x00aa}, {0x0013, 0x00ab}, - {0x0013, 0x00ac}, {0x0013, 0x00ad}, {0x0013, 0x00ae}, {0x0013, 0x00af}, {0x0013, 0x00b0}, {0x0013, 0x00b1}, {0x0013, 0x00b2}, {0x0013, 0x00b3}, - {0x0013, 0x00b4}, {0x0013, 0x00b5}, {0x0013, 0x00b6}, {0x0013, 0x00b7}, {0x0013, 0x00b8}, {0x0013, 0x00b9}, {0x0013, 0x00ba}, {0x0013, 0x00bb}, - {0x0013, 0x00bc}, {0x0013, 0x00bd}, {0x0013, 0x00be}, {0x0013, 0x00bf}, {0x0013, 0x00c0}, {0x0013, 0x00c1}, {0x0013, 0x00c2}, {0x0013, 0x00c3}, - {0x0013, 0x00c4}, {0x0013, 0x00c5}, {0x0013, 0x00c6}, {0x0013, 0x00c7}, {0x0013, 0x00c8}, {0x0013, 0x00c9}, {0x0013, 0x00ca}, {0x0013, 0x00cb}, - {0x0013, 0x00cc}, {0x0013, 0x00cd}, {0x0013, 0x00ce}, {0x0013, 0x00cf}, {0x0013, 0x00d0}, {0x0013, 0x00d1}, {0x0013, 0x00d2}, {0x0013, 0x00d3}, - {0x0013, 0x00d4}, {0x0013, 0x00d5}, {0x0013, 0x00d6}, {0x0013, 0x00d7}, {0x0013, 0x00d8}, {0x0013, 0x00d9}, {0x0013, 0x00da}, {0x0013, 0x00db}, - {0x0013, 0x00dc}, {0x0013, 0x00dd}, {0x0013, 0x00de}, {0x0013, 0x00df}, {0x0013, 0x00e0}, {0x0013, 0x00e1}, {0x0013, 0x00e2}, {0x0013, 0x00e3}, - {0x0013, 0x00e4}, {0x0013, 0x00e5}, {0x0013, 0x00e6}, {0x0013, 0x00e7}, {0x0013, 0x00e8}, {0x0013, 0x00e9}, {0x0013, 0x00ea}, {0x0013, 0x00eb}, - {0x0013, 0x00ec}, {0x0013, 0x00ed}, {0x0013, 0x00ee}, {0x0013, 0x00ef}, {0x0013, 0x00f0}, {0x0013, 0x00f1}, {0x0013, 0x00f2}, {0x0013, 0x00f3}, - {0x0013, 0x00f4}, {0x0013, 0x00f5}, {0x0013, 0x00f6}, {0x0013, 0x00f7}, {0x0013, 0x00f8}, {0x0013, 0x00f9}, {0x0013, 0x00fa}, {0x0013, 0x00fb}, - {0x0013, 0x00fc}, {0x0013, 0x00fd}, {0x0013, 0x00fe}, {0x0013, 0x00ff}, {0x0013, 0x0100}, {0x0013, 0x0101}, {0x0013, 0x0102}, {0x0013, 0x0103}, - {0x0013, 0x0104}, {0x0013, 0x0105}, {0x0013, 0x0106}, {0x0013, 0x0107}, {0x0013, 0x0108}, {0x0013, 0x0109}, {0x0013, 0x010a}, {0x0013, 0x010b}, - {0x0013, 0x010c}, {0x0013, 0x010d}, {0x0013, 0x010e}, {0x0013, 0x010f}, - -}; - -const uint32_t c_aauiCQMFHuffDec45[50][16] = -{ - {0x0003ffff, 0x0001ffff, 0x0002ffff, 0x00000025, 0x00010001, 0x00010001, 0x00010013, 0x00010013, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020012, 0x00020012, 0x00020012, 0x00020012, }, - {0x00020026, 0x00020026, 0x00020026, 0x00020026, 0x00020037, 0x00020037, 0x00020037, 0x00020037, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, }, - {0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, }, - {0x0007ffff, 0x0005ffff, 0x0004ffff, 0x0006ffff, 0x00010003, 0x00010003, 0x00010027, 0x00010027, 0x00010036, 0x00010036, 0x00010038, 0x00010038, 0x00020015, 0x00020015, 0x00020015, 0x00020015, }, - {0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, 0x00030039, }, - {0x00020028, 0x00020028, 0x00020028, 0x00020028, 0x0002004a, 0x0002004a, 0x0002004a, 0x0002004a, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, }, - {0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, }, - {0x000effff, 0x001fffff, 0x000affff, 0x0008ffff, 0x0009ffff, 0x00000005, 0x0000005a, 0x0000005c, 0x00010017, 0x00010017, 0x0001003a, 0x0001003a, 0x0001004b, 0x0001004b, 0x0001005b, 0x0001005b, }, - {0x0001006d, 0x0001006d, 0x0001006e, 0x0001006e, 0x0002005d, 0x0002005d, 0x0002005d, 0x0002005d, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, }, - {0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, }, - {0x0030ffff, 0x0031ffff, 0x000cffff, 0x000dffff, 0x000bffff, 0x00000006, 0x0000003c, 0x0000005e, 0x00010018, 0x00010018, 0x0001002a, 0x0001002a, 0x0001004d, 0x0001004d, 0x0001006c, 0x0001006c, }, - {0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, }, - {0x00020007, 0x00020007, 0x00020007, 0x00020007, 0x0002003d, 0x0002003d, 0x0002003d, 0x0002003d, 0x0002003e, 0x0002003e, 0x0002003e, 0x0002003e, 0x0002005f, 0x0002005f, 0x0002005f, 0x0002005f, }, - {0x00020060, 0x00020060, 0x00020060, 0x00020060, 0x0002006f, 0x0002006f, 0x0002006f, 0x0002006f, 0x0002007f, 0x0002007f, 0x0002007f, 0x0002007f, 0x00020080, 0x00020080, 0x00020080, 0x00020080, }, - {0x0010ffff, 0x0011ffff, 0x0012ffff, 0x000fffff, 0x0013ffff, 0x0014ffff, 0x0015ffff, 0x0016ffff, 0x0017ffff, 0x0018ffff, 0x0019ffff, 0x001affff, 0x001bffff, 0x001cffff, 0x001dffff, 0x001effff, }, - {0x0001002f, 0x0001002f, 0x00010030, 0x00010030, 0x00010031, 0x00010031, 0x00010032, 0x00010032, 0x00010033, 0x00010033, 0x00010034, 0x00010034, 0x00010035, 0x00010035, 0x0001003f, 0x0001003f, }, - {0x00010008, 0x00010008, 0x00010009, 0x00010009, 0x0001000a, 0x0001000a, 0x0001000b, 0x0001000b, 0x0001000c, 0x0001000c, 0x0001000d, 0x0001000d, 0x0001000e, 0x0001000e, 0x0001000f, 0x0001000f, }, - {0x00010010, 0x00010010, 0x00010011, 0x00010011, 0x0001001a, 0x0001001a, 0x0001001b, 0x0001001b, 0x0001001c, 0x0001001c, 0x0001001d, 0x0001001d, 0x0001001e, 0x0001001e, 0x0001001f, 0x0001001f, }, - {0x00010020, 0x00010020, 0x00010021, 0x00010021, 0x00010022, 0x00010022, 0x00010023, 0x00010023, 0x0001002b, 0x0001002b, 0x0001002c, 0x0001002c, 0x0001002d, 0x0001002d, 0x0001002e, 0x0001002e, }, - {0x00010040, 0x00010040, 0x00010041, 0x00010041, 0x00010042, 0x00010042, 0x00010043, 0x00010043, 0x00010044, 0x00010044, 0x00010045, 0x00010045, 0x00010046, 0x00010046, 0x00010047, 0x00010047, }, - {0x0001004f, 0x0001004f, 0x00010050, 0x00010050, 0x00010051, 0x00010051, 0x00010052, 0x00010052, 0x00010053, 0x00010053, 0x00010054, 0x00010054, 0x00010055, 0x00010055, 0x00010056, 0x00010056, }, - {0x00010057, 0x00010057, 0x00010058, 0x00010058, 0x00010059, 0x00010059, 0x00010061, 0x00010061, 0x00010062, 0x00010062, 0x00010063, 0x00010063, 0x00010064, 0x00010064, 0x00010065, 0x00010065, }, - {0x00010066, 0x00010066, 0x00010067, 0x00010067, 0x00010068, 0x00010068, 0x00010069, 0x00010069, 0x0001006a, 0x0001006a, 0x0001006b, 0x0001006b, 0x00010070, 0x00010070, 0x00010071, 0x00010071, }, - {0x00010072, 0x00010072, 0x00010073, 0x00010073, 0x00010074, 0x00010074, 0x00010075, 0x00010075, 0x00010076, 0x00010076, 0x00010077, 0x00010077, 0x00010078, 0x00010078, 0x00010079, 0x00010079, }, - {0x0001007a, 0x0001007a, 0x0001007b, 0x0001007b, 0x0001007c, 0x0001007c, 0x0001007d, 0x0001007d, 0x0001007e, 0x0001007e, 0x00010081, 0x00010081, 0x00010082, 0x00010082, 0x00010083, 0x00010083, }, - {0x00010084, 0x00010084, 0x00010085, 0x00010085, 0x00010086, 0x00010086, 0x00010087, 0x00010087, 0x00010088, 0x00010088, 0x00010089, 0x00010089, 0x0001008a, 0x0001008a, 0x0001008b, 0x0001008b, }, - {0x0001008c, 0x0001008c, 0x0001008d, 0x0001008d, 0x0001008e, 0x0001008e, 0x0001008f, 0x0001008f, 0x00010090, 0x00010090, 0x00010091, 0x00010091, 0x00010092, 0x00010092, 0x00010093, 0x00010093, }, - {0x00010094, 0x00010094, 0x00010095, 0x00010095, 0x00010096, 0x00010096, 0x00010097, 0x00010097, 0x00010098, 0x00010098, 0x00010099, 0x00010099, 0x0001009a, 0x0001009a, 0x0001009b, 0x0001009b, }, - {0x0001009c, 0x0001009c, 0x0001009d, 0x0001009d, 0x0001009e, 0x0001009e, 0x0001009f, 0x0001009f, 0x000100a0, 0x000100a0, 0x000100a1, 0x000100a1, 0x000100a2, 0x000100a2, 0x000100a3, 0x000100a3, }, - {0x000100a4, 0x000100a4, 0x000100a5, 0x000100a5, 0x000100a6, 0x000100a6, 0x000100a7, 0x000100a7, 0x000100a8, 0x000100a8, 0x000100a9, 0x000100a9, 0x000100aa, 0x000100aa, 0x000100ab, 0x000100ab, }, - {0x000100ac, 0x000100ac, 0x000100ad, 0x000100ad, 0x000100ae, 0x000100ae, 0x000100af, 0x000100af, 0x000100b0, 0x000100b0, 0x000100b1, 0x000100b1, 0x000100b2, 0x000100b2, 0x000100b3, 0x000100b3, }, - {0x0020ffff, 0x0021ffff, 0x0022ffff, 0x0023ffff, 0x0024ffff, 0x0025ffff, 0x0026ffff, 0x0027ffff, 0x0028ffff, 0x0029ffff, 0x002affff, 0x002bffff, 0x002cffff, 0x002dffff, 0x002effff, 0x002fffff, }, - {0x000100b4, 0x000100b4, 0x000100b5, 0x000100b5, 0x000100b6, 0x000100b6, 0x000100b7, 0x000100b7, 0x000100b8, 0x000100b8, 0x000100b9, 0x000100b9, 0x000100ba, 0x000100ba, 0x000100bb, 0x000100bb, }, - {0x000100bc, 0x000100bc, 0x000100bd, 0x000100bd, 0x000100be, 0x000100be, 0x000100bf, 0x000100bf, 0x000100c0, 0x000100c0, 0x000100c1, 0x000100c1, 0x000100c2, 0x000100c2, 0x000100c3, 0x000100c3, }, - {0x000100c4, 0x000100c4, 0x000100c5, 0x000100c5, 0x000100c6, 0x000100c6, 0x000100c7, 0x000100c7, 0x000100c8, 0x000100c8, 0x000100c9, 0x000100c9, 0x000100ca, 0x000100ca, 0x000100cb, 0x000100cb, }, - {0x000100cc, 0x000100cc, 0x000100cd, 0x000100cd, 0x000100ce, 0x000100ce, 0x000100cf, 0x000100cf, 0x000100d0, 0x000100d0, 0x000100d1, 0x000100d1, 0x000100d2, 0x000100d2, 0x000100d3, 0x000100d3, }, - {0x000100d4, 0x000100d4, 0x000100d5, 0x000100d5, 0x000100d6, 0x000100d6, 0x000100d7, 0x000100d7, 0x000100d8, 0x000100d8, 0x000100d9, 0x000100d9, 0x000100da, 0x000100da, 0x000100db, 0x000100db, }, - {0x000100dc, 0x000100dc, 0x000100dd, 0x000100dd, 0x000100de, 0x000100de, 0x000100df, 0x000100df, 0x000100e0, 0x000100e0, 0x000100e1, 0x000100e1, 0x000100e2, 0x000100e2, 0x000100e3, 0x000100e3, }, - {0x000100e4, 0x000100e4, 0x000100e5, 0x000100e5, 0x000100e6, 0x000100e6, 0x000100e7, 0x000100e7, 0x000100e8, 0x000100e8, 0x000100e9, 0x000100e9, 0x000100ea, 0x000100ea, 0x000100eb, 0x000100eb, }, - {0x000100ec, 0x000100ec, 0x000100ed, 0x000100ed, 0x000100ee, 0x000100ee, 0x000100ef, 0x000100ef, 0x000100f0, 0x000100f0, 0x000100f1, 0x000100f1, 0x000100f2, 0x000100f2, 0x000100f3, 0x000100f3, }, - {0x000100f4, 0x000100f4, 0x000100f5, 0x000100f5, 0x000100f6, 0x000100f6, 0x000100f7, 0x000100f7, 0x000100f8, 0x000100f8, 0x000100f9, 0x000100f9, 0x000100fa, 0x000100fa, 0x000100fb, 0x000100fb, }, - {0x000100fc, 0x000100fc, 0x000100fd, 0x000100fd, 0x000100fe, 0x000100fe, 0x000100ff, 0x000100ff, 0x00010100, 0x00010100, 0x00010101, 0x00010101, 0x00010102, 0x00010102, 0x00010103, 0x00010103, }, - {0x00010104, 0x00010104, 0x00010105, 0x00010105, 0x00010106, 0x00010106, 0x00010107, 0x00010107, 0x00010108, 0x00010108, 0x00010109, 0x00010109, 0x0001010a, 0x0001010a, 0x0001010b, 0x0001010b, }, - {0x0001010c, 0x0001010c, 0x0001010d, 0x0001010d, 0x0001010e, 0x0001010e, 0x0001010f, 0x0001010f, 0x00010110, 0x00010110, 0x00010111, 0x00010111, 0x00010112, 0x00010112, 0x00010113, 0x00010113, }, - {0x00010114, 0x00010114, 0x00010115, 0x00010115, 0x00010116, 0x00010116, 0x00010117, 0x00010117, 0x00010118, 0x00010118, 0x00010119, 0x00010119, 0x0001011a, 0x0001011a, 0x0001011b, 0x0001011b, }, - {0x0001011c, 0x0001011c, 0x0001011d, 0x0001011d, 0x0001011e, 0x0001011e, 0x0001011f, 0x0001011f, 0x00010120, 0x00010120, 0x00010121, 0x00010121, 0x00010122, 0x00010122, 0x00010123, 0x00010123, }, - {0x00010124, 0x00010124, 0x00010125, 0x00010125, 0x00010126, 0x00010126, 0x00010127, 0x00010127, 0x00010128, 0x00010128, 0x00010129, 0x00010129, 0x0001012a, 0x0001012a, 0x0001012b, 0x0001012b, }, - {0x0001012c, 0x0001012c, 0x0001012d, 0x0001012d, 0x0001012e, 0x0001012e, 0x0001012f, 0x0001012f, 0x00010130, 0x00010130, 0x00010131, 0x00010131, 0x00010132, 0x00010132, 0x00010133, 0x00010133, }, - {0x00010134, 0x00010134, 0x00010135, 0x00010135, 0x00010136, 0x00010136, 0x00010137, 0x00010137, 0x00010138, 0x00010138, 0x00010139, 0x00010139, 0x0001013a, 0x0001013a, 0x0001013b, 0x0001013b, }, - {0x0001013c, 0x0001013c, 0x0001013d, 0x0001013d, 0x0001013e, 0x0001013e, 0x0001013f, 0x0001013f, 0x00010140, 0x00010140, 0x00010141, 0x00010141, 0x00010142, 0x00010142, 0x00010143, 0x00010143, }, -}; - -const uint32_t c_aauiCQMFHuffEnc46[400][2] = -{ - {0x0002, 0x0002}, {0x0003, 0x0002}, {0x0005, 0x0003}, {0x0007, 0x0004}, {0x0009, 0x0005}, {0x000b, 0x0006}, {0x000d, 0x000a}, {0x000f, 0x0018}, - {0x0012, 0x00a6}, {0x0013, 0x0000}, {0x0013, 0x0001}, {0x0013, 0x0002}, {0x0013, 0x0003}, {0x0013, 0x0004}, {0x0013, 0x0005}, {0x0013, 0x0006}, - {0x0013, 0x0007}, {0x0013, 0x0008}, {0x0013, 0x0009}, {0x0013, 0x000a}, {0x0002, 0x0003}, {0x0003, 0x0003}, {0x0005, 0x0004}, {0x0006, 0x0004}, - {0x0008, 0x0004}, {0x000a, 0x0006}, {0x000c, 0x0008}, {0x000e, 0x0011}, {0x0012, 0x00a7}, {0x0013, 0x000b}, {0x0013, 0x000c}, {0x0013, 0x000d}, - {0x0013, 0x000e}, {0x0013, 0x000f}, {0x0013, 0x0010}, {0x0013, 0x0011}, {0x0013, 0x0012}, {0x0013, 0x0013}, {0x0013, 0x0014}, {0x0013, 0x0015}, - {0x0005, 0x0005}, {0x0005, 0x0006}, {0x0005, 0x0007}, {0x0007, 0x0005}, {0x0009, 0x0006}, {0x000b, 0x0007}, {0x000d, 0x000b}, {0x000f, 0x0019}, - {0x0013, 0x0016}, {0x0013, 0x0017}, {0x0013, 0x0018}, {0x0013, 0x0019}, {0x0013, 0x001a}, {0x0013, 0x001b}, {0x0013, 0x001c}, {0x0013, 0x001d}, - {0x0013, 0x001e}, {0x0013, 0x001f}, {0x0013, 0x0020}, {0x0013, 0x0021}, {0x0007, 0x0006}, {0x0006, 0x0005}, {0x0007, 0x0007}, {0x0008, 0x0005}, - {0x000a, 0x0007}, {0x000c, 0x0009}, {0x000e, 0x0012}, {0x000f, 0x001a}, {0x0012, 0x00a8}, {0x0013, 0x0022}, {0x0013, 0x0023}, {0x0013, 0x0024}, - {0x0013, 0x0025}, {0x0013, 0x0026}, {0x0013, 0x0027}, {0x0013, 0x0028}, {0x0013, 0x0029}, {0x0013, 0x002a}, {0x0013, 0x002b}, {0x0013, 0x002c}, - {0x0009, 0x0007}, {0x0008, 0x0006}, {0x0008, 0x0007}, {0x000a, 0x0008}, {0x000b, 0x0008}, {0x000d, 0x000c}, {0x000e, 0x0013}, {0x0010, 0x002c}, - {0x0013, 0x002d}, {0x0013, 0x002e}, {0x0013, 0x002f}, {0x0013, 0x0030}, {0x0013, 0x0031}, {0x0013, 0x0032}, {0x0013, 0x0033}, {0x0013, 0x0034}, - {0x0013, 0x0035}, {0x0013, 0x0036}, {0x0013, 0x0037}, {0x0013, 0x0038}, {0x000b, 0x0009}, {0x000a, 0x0009}, {0x000b, 0x000a}, {0x000b, 0x000b}, - {0x000d, 0x000d}, {0x000f, 0x001b}, {0x0010, 0x002d}, {0x0013, 0x0039}, {0x0013, 0x003a}, {0x0013, 0x003b}, {0x0013, 0x003c}, {0x0013, 0x003d}, - {0x0013, 0x003e}, {0x0013, 0x003f}, {0x0013, 0x0040}, {0x0013, 0x0041}, {0x0013, 0x0042}, {0x0013, 0x0043}, {0x0013, 0x0044}, {0x0013, 0x0045}, - {0x000d, 0x000e}, {0x000c, 0x000a}, {0x000c, 0x000b}, {0x000d, 0x000f}, {0x000f, 0x001c}, {0x000f, 0x001d}, {0x0013, 0x0046}, {0x0013, 0x0047}, - {0x0013, 0x0048}, {0x0013, 0x0049}, {0x0013, 0x004a}, {0x0013, 0x004b}, {0x0013, 0x004c}, {0x0013, 0x004d}, {0x0013, 0x004e}, {0x0013, 0x004f}, - {0x0013, 0x0050}, {0x0013, 0x0051}, {0x0013, 0x0052}, {0x0013, 0x0053}, {0x000f, 0x001e}, {0x000f, 0x001f}, {0x000f, 0x0020}, {0x000f, 0x0021}, - {0x0010, 0x002e}, {0x0012, 0x00a9}, {0x0013, 0x0054}, {0x0013, 0x0055}, {0x0012, 0x00aa}, {0x0013, 0x0056}, {0x0013, 0x0057}, {0x0013, 0x0058}, - {0x0013, 0x0059}, {0x0013, 0x005a}, {0x0013, 0x005b}, {0x0013, 0x005c}, {0x0013, 0x005d}, {0x0013, 0x005e}, {0x0013, 0x005f}, {0x0013, 0x0060}, - {0x0013, 0x0061}, {0x0010, 0x002f}, {0x0013, 0x0062}, {0x0011, 0x0057}, {0x0013, 0x0063}, {0x0013, 0x0064}, {0x0013, 0x0065}, {0x0013, 0x0066}, - {0x0013, 0x0067}, {0x0013, 0x0068}, {0x0013, 0x0069}, {0x0013, 0x006a}, {0x0013, 0x006b}, {0x0013, 0x006c}, {0x0013, 0x006d}, {0x0013, 0x006e}, - {0x0013, 0x006f}, {0x0013, 0x0070}, {0x0013, 0x0071}, {0x0013, 0x0072}, {0x0013, 0x0073}, {0x0013, 0x0074}, {0x0013, 0x0075}, {0x0013, 0x0076}, - {0x0013, 0x0077}, {0x0013, 0x0078}, {0x0013, 0x0079}, {0x0013, 0x007a}, {0x0013, 0x007b}, {0x0013, 0x007c}, {0x0013, 0x007d}, {0x0013, 0x007e}, - {0x0013, 0x007f}, {0x0013, 0x0080}, {0x0013, 0x0081}, {0x0013, 0x0082}, {0x0013, 0x0083}, {0x0013, 0x0084}, {0x0013, 0x0085}, {0x0013, 0x0086}, - {0x0013, 0x0087}, {0x0013, 0x0088}, {0x0013, 0x0089}, {0x0013, 0x008a}, {0x0013, 0x008b}, {0x0013, 0x008c}, {0x0013, 0x008d}, {0x0013, 0x008e}, - {0x0013, 0x008f}, {0x0013, 0x0090}, {0x0013, 0x0091}, {0x0013, 0x0092}, {0x0013, 0x0093}, {0x0013, 0x0094}, {0x0013, 0x0095}, {0x0013, 0x0096}, - {0x0013, 0x0097}, {0x0013, 0x0098}, {0x0013, 0x0099}, {0x0013, 0x009a}, {0x0013, 0x009b}, {0x0013, 0x009c}, {0x0013, 0x009d}, {0x0013, 0x009e}, - {0x0013, 0x009f}, {0x0013, 0x00a0}, {0x0013, 0x00a1}, {0x0013, 0x00a2}, {0x0013, 0x00a3}, {0x0013, 0x00a4}, {0x0013, 0x00a5}, {0x0013, 0x00a6}, - {0x0013, 0x00a7}, {0x0013, 0x00a8}, {0x0013, 0x00a9}, {0x0013, 0x00aa}, {0x0013, 0x00ab}, {0x0013, 0x00ac}, {0x0013, 0x00ad}, {0x0013, 0x00ae}, - {0x0013, 0x00af}, {0x0013, 0x00b0}, {0x0013, 0x00b1}, {0x0013, 0x00b2}, {0x0013, 0x00b3}, {0x0013, 0x00b4}, {0x0013, 0x00b5}, {0x0013, 0x00b6}, - {0x0013, 0x00b7}, {0x0013, 0x00b8}, {0x0013, 0x00b9}, {0x0013, 0x00ba}, {0x0013, 0x00bb}, {0x0013, 0x00bc}, {0x0013, 0x00bd}, {0x0013, 0x00be}, - {0x0013, 0x00bf}, {0x0013, 0x00c0}, {0x0013, 0x00c1}, {0x0013, 0x00c2}, {0x0013, 0x00c3}, {0x0013, 0x00c4}, {0x0013, 0x00c5}, {0x0013, 0x00c6}, - {0x0013, 0x00c7}, {0x0013, 0x00c8}, {0x0013, 0x00c9}, {0x0013, 0x00ca}, {0x0013, 0x00cb}, {0x0013, 0x00cc}, {0x0013, 0x00cd}, {0x0013, 0x00ce}, - {0x0013, 0x00cf}, {0x0013, 0x00d0}, {0x0013, 0x00d1}, {0x0013, 0x00d2}, {0x0013, 0x00d3}, {0x0013, 0x00d4}, {0x0013, 0x00d5}, {0x0013, 0x00d6}, - {0x0013, 0x00d7}, {0x0013, 0x00d8}, {0x0013, 0x00d9}, {0x0013, 0x00da}, {0x0013, 0x00db}, {0x0013, 0x00dc}, {0x0013, 0x00dd}, {0x0013, 0x00de}, - {0x0013, 0x00df}, {0x0013, 0x00e0}, {0x0013, 0x00e1}, {0x0013, 0x00e2}, {0x0013, 0x00e3}, {0x0013, 0x00e4}, {0x0013, 0x00e5}, {0x0013, 0x00e6}, - {0x0013, 0x00e7}, {0x0013, 0x00e8}, {0x0013, 0x00e9}, {0x0013, 0x00ea}, {0x0013, 0x00eb}, {0x0013, 0x00ec}, {0x0013, 0x00ed}, {0x0013, 0x00ee}, - {0x0013, 0x00ef}, {0x0013, 0x00f0}, {0x0013, 0x00f1}, {0x0013, 0x00f2}, {0x0013, 0x00f3}, {0x0013, 0x00f4}, {0x0013, 0x00f5}, {0x0013, 0x00f6}, - {0x0013, 0x00f7}, {0x0013, 0x00f8}, {0x0013, 0x00f9}, {0x0013, 0x00fa}, {0x0013, 0x00fb}, {0x0013, 0x00fc}, {0x0013, 0x00fd}, {0x0013, 0x00fe}, - {0x0013, 0x00ff}, {0x0013, 0x0100}, {0x0013, 0x0101}, {0x0013, 0x0102}, {0x0013, 0x0103}, {0x0013, 0x0104}, {0x0013, 0x0105}, {0x0013, 0x0106}, - {0x0013, 0x0107}, {0x0013, 0x0108}, {0x0013, 0x0109}, {0x0013, 0x010a}, {0x0013, 0x010b}, {0x0013, 0x010c}, {0x0013, 0x010d}, {0x0013, 0x010e}, - {0x0013, 0x010f}, {0x0013, 0x0110}, {0x0013, 0x0111}, {0x0013, 0x0112}, {0x0013, 0x0113}, {0x0013, 0x0114}, {0x0013, 0x0115}, {0x0013, 0x0116}, - {0x0013, 0x0117}, {0x0013, 0x0118}, {0x0013, 0x0119}, {0x0013, 0x011a}, {0x0013, 0x011b}, {0x0013, 0x011c}, {0x0013, 0x011d}, {0x0013, 0x011e}, - {0x0013, 0x011f}, {0x0013, 0x0120}, {0x0013, 0x0121}, {0x0013, 0x0122}, {0x0013, 0x0123}, {0x0013, 0x0124}, {0x0013, 0x0125}, {0x0013, 0x0126}, - {0x0013, 0x0127}, {0x0013, 0x0128}, {0x0013, 0x0129}, {0x0013, 0x012a}, {0x0013, 0x012b}, {0x0013, 0x012c}, {0x0013, 0x012d}, {0x0013, 0x012e}, - {0x0013, 0x012f}, {0x0013, 0x0130}, {0x0013, 0x0131}, {0x0013, 0x0132}, {0x0013, 0x0133}, {0x0013, 0x0134}, {0x0013, 0x0135}, {0x0013, 0x0136}, - {0x0013, 0x0137}, {0x0013, 0x0138}, {0x0013, 0x0139}, {0x0013, 0x013a}, {0x0013, 0x013b}, {0x0013, 0x013c}, {0x0013, 0x013d}, {0x0013, 0x013e}, - {0x0013, 0x013f}, {0x0013, 0x0140}, {0x0013, 0x0141}, {0x0013, 0x0142}, {0x0013, 0x0143}, {0x0013, 0x0144}, {0x0013, 0x0145}, {0x0013, 0x0146}, - {0x0013, 0x0147}, {0x0013, 0x0148}, {0x0013, 0x0149}, {0x0013, 0x014a}, {0x0013, 0x014b}, {0x0012, 0x00ab}, {0x0012, 0x00ac}, {0x0012, 0x00ad}, -}; - -const uint32_t c_aauiCQMFHuffDec46[61][16] = -{ - {0x0004ffff, 0x0001ffff, 0x0002ffff, 0x0003ffff, 0x00010001, 0x00010001, 0x00010015, 0x00010015, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020014, 0x00020014, 0x00020014, 0x00020014, }, - {0x00020017, 0x00020017, 0x00020017, 0x00020017, 0x0002003d, 0x0002003d, 0x0002003d, 0x0002003d, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, }, - {0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, }, - {0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, }, - {0x0008ffff, 0x0007ffff, 0x0005ffff, 0x0006ffff, 0x00000018, 0x0000003f, 0x00000051, 0x00000052, 0x00010003, 0x00010003, 0x0001002b, 0x0001002b, 0x0001003c, 0x0001003c, 0x0001003e, 0x0001003e, }, - {0x00020053, 0x00020053, 0x00020053, 0x00020053, 0x00020065, 0x00020065, 0x00020065, 0x00020065, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, }, - {0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x00030050, 0x00030050, 0x00030050, 0x00030050, 0x00030050, 0x00030050, 0x00030050, 0x00030050, }, - {0x00010054, 0x00010054, 0x00010064, 0x00010064, 0x00010066, 0x00010066, 0x00010067, 0x00010067, 0x00020019, 0x00020019, 0x00020019, 0x00020019, 0x00020040, 0x00020040, 0x00020040, 0x00020040, }, - {0x0012ffff, 0x0023ffff, 0x000effff, 0x000dffff, 0x000cffff, 0x0009ffff, 0x000affff, 0x000bffff, 0x0000001a, 0x00000041, 0x00000079, 0x0000007a, 0x00010005, 0x00010005, 0x0001002d, 0x0001002d, }, - {0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, }, - {0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, }, - {0x00030078, 0x00030078, 0x00030078, 0x00030078, 0x00030078, 0x00030078, 0x00030078, 0x00030078, 0x0003007b, 0x0003007b, 0x0003007b, 0x0003007b, 0x0003007b, 0x0003007b, 0x0003007b, 0x0003007b, }, - {0x0001008e, 0x0001008e, 0x0001008f, 0x0001008f, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001b, 0x00020042, 0x00020042, 0x00020042, 0x00020042, 0x00020056, 0x00020056, 0x00020056, 0x00020056, }, - {0x00010007, 0x00010007, 0x0001002f, 0x0001002f, 0x00010043, 0x00010043, 0x00010069, 0x00010069, 0x0001007c, 0x0001007c, 0x0001007d, 0x0001007d, 0x0001008c, 0x0001008c, 0x0001008d, 0x0001008d, }, - {0x0034ffff, 0x0035ffff, 0x0036ffff, 0x0037ffff, 0x0038ffff, 0x0039ffff, 0x003affff, 0x003bffff, 0x003cffff, 0x0010ffff, 0x0011ffff, 0x000fffff, 0x00000057, 0x0000006a, 0x00000090, 0x000000a1, }, - {0x0002018e, 0x0002018e, 0x0002018e, 0x0002018e, 0x0002018f, 0x0002018f, 0x0002018f, 0x0002018f, 0x000300a3, 0x000300a3, 0x000300a3, 0x000300a3, 0x000300a3, 0x000300a3, 0x000300a3, 0x000300a3, }, - {0x00010189, 0x00010189, 0x0001018a, 0x0001018a, 0x0001018b, 0x0001018b, 0x0001018c, 0x0001018c, 0x00020008, 0x00020008, 0x00020008, 0x00020008, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001c, }, - {0x00020044, 0x00020044, 0x00020044, 0x00020044, 0x00020091, 0x00020091, 0x00020091, 0x00020091, 0x00020094, 0x00020094, 0x00020094, 0x00020094, 0x0002018d, 0x0002018d, 0x0002018d, 0x0002018d, }, - {0x0013ffff, 0x0016ffff, 0x0017ffff, 0x0018ffff, 0x0014ffff, 0x0015ffff, 0x0019ffff, 0x001affff, 0x001bffff, 0x001cffff, 0x001dffff, 0x001effff, 0x001fffff, 0x0020ffff, 0x0021ffff, 0x0022ffff, }, - {0x00010009, 0x00010009, 0x0001000a, 0x0001000a, 0x0001000b, 0x0001000b, 0x0001000c, 0x0001000c, 0x0001000d, 0x0001000d, 0x0001000e, 0x0001000e, 0x0001000f, 0x0001000f, 0x00010010, 0x00010010, }, - {0x0001003a, 0x0001003a, 0x0001003b, 0x0001003b, 0x00010045, 0x00010045, 0x00010046, 0x00010046, 0x00010047, 0x00010047, 0x00010048, 0x00010048, 0x00010049, 0x00010049, 0x0001004a, 0x0001004a, }, - {0x0001004b, 0x0001004b, 0x0001004c, 0x0001004c, 0x0001004d, 0x0001004d, 0x0001004e, 0x0001004e, 0x0001004f, 0x0001004f, 0x00010058, 0x00010058, 0x00010059, 0x00010059, 0x0001005a, 0x0001005a, }, - {0x00010011, 0x00010011, 0x00010012, 0x00010012, 0x00010013, 0x00010013, 0x0001001d, 0x0001001d, 0x0001001e, 0x0001001e, 0x0001001f, 0x0001001f, 0x00010020, 0x00010020, 0x00010021, 0x00010021, }, - {0x00010022, 0x00010022, 0x00010023, 0x00010023, 0x00010024, 0x00010024, 0x00010025, 0x00010025, 0x00010026, 0x00010026, 0x00010027, 0x00010027, 0x00010030, 0x00010030, 0x00010031, 0x00010031, }, - {0x00010032, 0x00010032, 0x00010033, 0x00010033, 0x00010034, 0x00010034, 0x00010035, 0x00010035, 0x00010036, 0x00010036, 0x00010037, 0x00010037, 0x00010038, 0x00010038, 0x00010039, 0x00010039, }, - {0x0001005b, 0x0001005b, 0x0001005c, 0x0001005c, 0x0001005d, 0x0001005d, 0x0001005e, 0x0001005e, 0x0001005f, 0x0001005f, 0x00010060, 0x00010060, 0x00010061, 0x00010061, 0x00010062, 0x00010062, }, - {0x00010063, 0x00010063, 0x0001006b, 0x0001006b, 0x0001006c, 0x0001006c, 0x0001006d, 0x0001006d, 0x0001006e, 0x0001006e, 0x0001006f, 0x0001006f, 0x00010070, 0x00010070, 0x00010071, 0x00010071, }, - {0x00010072, 0x00010072, 0x00010073, 0x00010073, 0x00010074, 0x00010074, 0x00010075, 0x00010075, 0x00010076, 0x00010076, 0x00010077, 0x00010077, 0x0001007e, 0x0001007e, 0x0001007f, 0x0001007f, }, - {0x00010080, 0x00010080, 0x00010081, 0x00010081, 0x00010082, 0x00010082, 0x00010083, 0x00010083, 0x00010084, 0x00010084, 0x00010085, 0x00010085, 0x00010086, 0x00010086, 0x00010087, 0x00010087, }, - {0x00010088, 0x00010088, 0x00010089, 0x00010089, 0x0001008a, 0x0001008a, 0x0001008b, 0x0001008b, 0x00010092, 0x00010092, 0x00010093, 0x00010093, 0x00010095, 0x00010095, 0x00010096, 0x00010096, }, - {0x00010097, 0x00010097, 0x00010098, 0x00010098, 0x00010099, 0x00010099, 0x0001009a, 0x0001009a, 0x0001009b, 0x0001009b, 0x0001009c, 0x0001009c, 0x0001009d, 0x0001009d, 0x0001009e, 0x0001009e, }, - {0x0001009f, 0x0001009f, 0x000100a0, 0x000100a0, 0x000100a2, 0x000100a2, 0x000100a4, 0x000100a4, 0x000100a5, 0x000100a5, 0x000100a6, 0x000100a6, 0x000100a7, 0x000100a7, 0x000100a8, 0x000100a8, }, - {0x000100a9, 0x000100a9, 0x000100aa, 0x000100aa, 0x000100ab, 0x000100ab, 0x000100ac, 0x000100ac, 0x000100ad, 0x000100ad, 0x000100ae, 0x000100ae, 0x000100af, 0x000100af, 0x000100b0, 0x000100b0, }, - {0x000100b1, 0x000100b1, 0x000100b2, 0x000100b2, 0x000100b3, 0x000100b3, 0x000100b4, 0x000100b4, 0x000100b5, 0x000100b5, 0x000100b6, 0x000100b6, 0x000100b7, 0x000100b7, 0x000100b8, 0x000100b8, }, - {0x000100b9, 0x000100b9, 0x000100ba, 0x000100ba, 0x000100bb, 0x000100bb, 0x000100bc, 0x000100bc, 0x000100bd, 0x000100bd, 0x000100be, 0x000100be, 0x000100bf, 0x000100bf, 0x000100c0, 0x000100c0, }, - {0x0024ffff, 0x0025ffff, 0x0026ffff, 0x0027ffff, 0x0028ffff, 0x0029ffff, 0x002affff, 0x002bffff, 0x002cffff, 0x002dffff, 0x002effff, 0x002fffff, 0x0030ffff, 0x0031ffff, 0x0032ffff, 0x0033ffff, }, - {0x000100c1, 0x000100c1, 0x000100c2, 0x000100c2, 0x000100c3, 0x000100c3, 0x000100c4, 0x000100c4, 0x000100c5, 0x000100c5, 0x000100c6, 0x000100c6, 0x000100c7, 0x000100c7, 0x000100c8, 0x000100c8, }, - {0x000100c9, 0x000100c9, 0x000100ca, 0x000100ca, 0x000100cb, 0x000100cb, 0x000100cc, 0x000100cc, 0x000100cd, 0x000100cd, 0x000100ce, 0x000100ce, 0x000100cf, 0x000100cf, 0x000100d0, 0x000100d0, }, - {0x000100d1, 0x000100d1, 0x000100d2, 0x000100d2, 0x000100d3, 0x000100d3, 0x000100d4, 0x000100d4, 0x000100d5, 0x000100d5, 0x000100d6, 0x000100d6, 0x000100d7, 0x000100d7, 0x000100d8, 0x000100d8, }, - {0x000100d9, 0x000100d9, 0x000100da, 0x000100da, 0x000100db, 0x000100db, 0x000100dc, 0x000100dc, 0x000100dd, 0x000100dd, 0x000100de, 0x000100de, 0x000100df, 0x000100df, 0x000100e0, 0x000100e0, }, - {0x000100e1, 0x000100e1, 0x000100e2, 0x000100e2, 0x000100e3, 0x000100e3, 0x000100e4, 0x000100e4, 0x000100e5, 0x000100e5, 0x000100e6, 0x000100e6, 0x000100e7, 0x000100e7, 0x000100e8, 0x000100e8, }, - {0x000100e9, 0x000100e9, 0x000100ea, 0x000100ea, 0x000100eb, 0x000100eb, 0x000100ec, 0x000100ec, 0x000100ed, 0x000100ed, 0x000100ee, 0x000100ee, 0x000100ef, 0x000100ef, 0x000100f0, 0x000100f0, }, - {0x000100f1, 0x000100f1, 0x000100f2, 0x000100f2, 0x000100f3, 0x000100f3, 0x000100f4, 0x000100f4, 0x000100f5, 0x000100f5, 0x000100f6, 0x000100f6, 0x000100f7, 0x000100f7, 0x000100f8, 0x000100f8, }, - {0x000100f9, 0x000100f9, 0x000100fa, 0x000100fa, 0x000100fb, 0x000100fb, 0x000100fc, 0x000100fc, 0x000100fd, 0x000100fd, 0x000100fe, 0x000100fe, 0x000100ff, 0x000100ff, 0x00010100, 0x00010100, }, - {0x00010101, 0x00010101, 0x00010102, 0x00010102, 0x00010103, 0x00010103, 0x00010104, 0x00010104, 0x00010105, 0x00010105, 0x00010106, 0x00010106, 0x00010107, 0x00010107, 0x00010108, 0x00010108, }, - {0x00010109, 0x00010109, 0x0001010a, 0x0001010a, 0x0001010b, 0x0001010b, 0x0001010c, 0x0001010c, 0x0001010d, 0x0001010d, 0x0001010e, 0x0001010e, 0x0001010f, 0x0001010f, 0x00010110, 0x00010110, }, - {0x00010111, 0x00010111, 0x00010112, 0x00010112, 0x00010113, 0x00010113, 0x00010114, 0x00010114, 0x00010115, 0x00010115, 0x00010116, 0x00010116, 0x00010117, 0x00010117, 0x00010118, 0x00010118, }, - {0x00010119, 0x00010119, 0x0001011a, 0x0001011a, 0x0001011b, 0x0001011b, 0x0001011c, 0x0001011c, 0x0001011d, 0x0001011d, 0x0001011e, 0x0001011e, 0x0001011f, 0x0001011f, 0x00010120, 0x00010120, }, - {0x00010121, 0x00010121, 0x00010122, 0x00010122, 0x00010123, 0x00010123, 0x00010124, 0x00010124, 0x00010125, 0x00010125, 0x00010126, 0x00010126, 0x00010127, 0x00010127, 0x00010128, 0x00010128, }, - {0x00010129, 0x00010129, 0x0001012a, 0x0001012a, 0x0001012b, 0x0001012b, 0x0001012c, 0x0001012c, 0x0001012d, 0x0001012d, 0x0001012e, 0x0001012e, 0x0001012f, 0x0001012f, 0x00010130, 0x00010130, }, - {0x00010131, 0x00010131, 0x00010132, 0x00010132, 0x00010133, 0x00010133, 0x00010134, 0x00010134, 0x00010135, 0x00010135, 0x00010136, 0x00010136, 0x00010137, 0x00010137, 0x00010138, 0x00010138, }, - {0x00010139, 0x00010139, 0x0001013a, 0x0001013a, 0x0001013b, 0x0001013b, 0x0001013c, 0x0001013c, 0x0001013d, 0x0001013d, 0x0001013e, 0x0001013e, 0x0001013f, 0x0001013f, 0x00010140, 0x00010140, }, - {0x00010141, 0x00010141, 0x00010142, 0x00010142, 0x00010143, 0x00010143, 0x00010144, 0x00010144, 0x00010145, 0x00010145, 0x00010146, 0x00010146, 0x00010147, 0x00010147, 0x00010148, 0x00010148, }, - {0x00010149, 0x00010149, 0x0001014a, 0x0001014a, 0x0001014b, 0x0001014b, 0x0001014c, 0x0001014c, 0x0001014d, 0x0001014d, 0x0001014e, 0x0001014e, 0x0001014f, 0x0001014f, 0x00010150, 0x00010150, }, - {0x00010151, 0x00010151, 0x00010152, 0x00010152, 0x00010153, 0x00010153, 0x00010154, 0x00010154, 0x00010155, 0x00010155, 0x00010156, 0x00010156, 0x00010157, 0x00010157, 0x00010158, 0x00010158, }, - {0x00010159, 0x00010159, 0x0001015a, 0x0001015a, 0x0001015b, 0x0001015b, 0x0001015c, 0x0001015c, 0x0001015d, 0x0001015d, 0x0001015e, 0x0001015e, 0x0001015f, 0x0001015f, 0x00010160, 0x00010160, }, - {0x00010161, 0x00010161, 0x00010162, 0x00010162, 0x00010163, 0x00010163, 0x00010164, 0x00010164, 0x00010165, 0x00010165, 0x00010166, 0x00010166, 0x00010167, 0x00010167, 0x00010168, 0x00010168, }, - {0x00010169, 0x00010169, 0x0001016a, 0x0001016a, 0x0001016b, 0x0001016b, 0x0001016c, 0x0001016c, 0x0001016d, 0x0001016d, 0x0001016e, 0x0001016e, 0x0001016f, 0x0001016f, 0x00010170, 0x00010170, }, - {0x00010171, 0x00010171, 0x00010172, 0x00010172, 0x00010173, 0x00010173, 0x00010174, 0x00010174, 0x00010175, 0x00010175, 0x00010176, 0x00010176, 0x00010177, 0x00010177, 0x00010178, 0x00010178, }, - {0x00010179, 0x00010179, 0x0001017a, 0x0001017a, 0x0001017b, 0x0001017b, 0x0001017c, 0x0001017c, 0x0001017d, 0x0001017d, 0x0001017e, 0x0001017e, 0x0001017f, 0x0001017f, 0x00010180, 0x00010180, }, - {0x00010181, 0x00010181, 0x00010182, 0x00010182, 0x00010183, 0x00010183, 0x00010184, 0x00010184, 0x00010185, 0x00010185, 0x00010186, 0x00010186, 0x00010187, 0x00010187, 0x00010188, 0x00010188, }, -}; - -const uint32_t c_aauiCQMFHuffEnc47[576][2] = -{ - {0x0002, 0x0003}, {0x0003, 0x0003}, {0x0005, 0x0005}, {0x0006, 0x0004}, {0x0008, 0x0006}, {0x000a, 0x0007}, {0x000c, 0x000b}, {0x000d, 0x000d}, - {0x0010, 0x0041}, {0x0013, 0x0000}, {0x0013, 0x0001}, {0x0013, 0x0002}, {0x0013, 0x0003}, {0x0013, 0x0004}, {0x0013, 0x0005}, {0x0013, 0x0006}, - {0x0013, 0x0007}, {0x0013, 0x0008}, {0x0013, 0x0009}, {0x0013, 0x000a}, {0x0013, 0x000b}, {0x0013, 0x000c}, {0x0013, 0x000d}, {0x0013, 0x000e}, - {0x0003, 0x0004}, {0x0003, 0x0005}, {0x0004, 0x0004}, {0x0006, 0x0005}, {0x0007, 0x0005}, {0x0009, 0x0006}, {0x000b, 0x0007}, {0x000d, 0x000e}, - {0x000f, 0x0025}, {0x000f, 0x0026}, {0x0012, 0x00f6}, {0x0013, 0x000f}, {0x0013, 0x0010}, {0x0013, 0x0011}, {0x0013, 0x0012}, {0x0013, 0x0013}, - {0x0013, 0x0014}, {0x0013, 0x0015}, {0x0013, 0x0016}, {0x0013, 0x0017}, {0x0013, 0x0018}, {0x0013, 0x0019}, {0x0013, 0x001a}, {0x0013, 0x001b}, - {0x0005, 0x0006}, {0x0004, 0x0005}, {0x0005, 0x0007}, {0x0006, 0x0006}, {0x0008, 0x0007}, {0x0009, 0x0007}, {0x000b, 0x0008}, {0x000d, 0x000f}, - {0x000f, 0x0027}, {0x0012, 0x00f7}, {0x0013, 0x001c}, {0x0013, 0x001d}, {0x0013, 0x001e}, {0x0013, 0x001f}, {0x0013, 0x0020}, {0x0013, 0x0021}, - {0x0013, 0x0022}, {0x0013, 0x0023}, {0x0013, 0x0024}, {0x0013, 0x0025}, {0x0013, 0x0026}, {0x0013, 0x0027}, {0x0013, 0x0028}, {0x0013, 0x0029}, - {0x0006, 0x0007}, {0x0006, 0x0008}, {0x0006, 0x0009}, {0x0007, 0x0006}, {0x0009, 0x0008}, {0x000a, 0x0008}, {0x000c, 0x000c}, {0x000e, 0x0017}, - {0x0010, 0x0042}, {0x0012, 0x00f8}, {0x0013, 0x002a}, {0x0013, 0x002b}, {0x0013, 0x002c}, {0x0013, 0x002d}, {0x0013, 0x002e}, {0x0013, 0x002f}, - {0x0013, 0x0030}, {0x0013, 0x0031}, {0x0013, 0x0032}, {0x0013, 0x0033}, {0x0013, 0x0034}, {0x0013, 0x0035}, {0x0013, 0x0036}, {0x0013, 0x0037}, - {0x0008, 0x0008}, {0x0007, 0x0007}, {0x0008, 0x0009}, {0x0009, 0x0009}, {0x000a, 0x0009}, {0x000b, 0x0009}, {0x000d, 0x0010}, {0x000f, 0x0028}, - {0x000f, 0x0029}, {0x0011, 0x007f}, {0x0013, 0x0038}, {0x0013, 0x0039}, {0x0013, 0x003a}, {0x0013, 0x003b}, {0x0013, 0x003c}, {0x0013, 0x003d}, - {0x0013, 0x003e}, {0x0013, 0x003f}, {0x0013, 0x0040}, {0x0013, 0x0041}, {0x0013, 0x0042}, {0x0013, 0x0043}, {0x0013, 0x0044}, {0x0013, 0x0045}, - {0x000a, 0x000a}, {0x0009, 0x000a}, {0x0009, 0x000b}, {0x000a, 0x000b}, {0x000b, 0x000a}, {0x000d, 0x0011}, {0x000f, 0x002a}, {0x0010, 0x0043}, - {0x0012, 0x00f9}, {0x0013, 0x0046}, {0x0013, 0x0047}, {0x0013, 0x0048}, {0x0013, 0x0049}, {0x0013, 0x004a}, {0x0013, 0x004b}, {0x0013, 0x004c}, - {0x0013, 0x004d}, {0x0013, 0x004e}, {0x0013, 0x004f}, {0x0013, 0x0050}, {0x0013, 0x0051}, {0x0013, 0x0052}, {0x0013, 0x0053}, {0x0013, 0x0054}, - {0x000b, 0x000b}, {0x000b, 0x000c}, {0x000b, 0x000d}, {0x000c, 0x000d}, {0x000d, 0x0012}, {0x000e, 0x0018}, {0x0010, 0x0044}, {0x0013, 0x0055}, - {0x0013, 0x0056}, {0x0013, 0x0057}, {0x0013, 0x0058}, {0x0013, 0x0059}, {0x0013, 0x005a}, {0x0013, 0x005b}, {0x0013, 0x005c}, {0x0013, 0x005d}, - {0x0013, 0x005e}, {0x0013, 0x005f}, {0x0013, 0x0060}, {0x0013, 0x0061}, {0x0013, 0x0062}, {0x0013, 0x0063}, {0x0013, 0x0064}, {0x0013, 0x0065}, - {0x000e, 0x0019}, {0x000d, 0x0013}, {0x000d, 0x0014}, {0x000d, 0x0015}, {0x000f, 0x002b}, {0x0010, 0x0045}, {0x0013, 0x0066}, {0x0012, 0x00fa}, - {0x0013, 0x0067}, {0x0013, 0x0068}, {0x0013, 0x0069}, {0x0013, 0x006a}, {0x0013, 0x006b}, {0x0013, 0x006c}, {0x0013, 0x006d}, {0x0013, 0x006e}, - {0x0013, 0x006f}, {0x0013, 0x0070}, {0x0013, 0x0071}, {0x0013, 0x0072}, {0x0013, 0x0073}, {0x0013, 0x0074}, {0x0013, 0x0075}, {0x0013, 0x0076}, - {0x0010, 0x0046}, {0x000f, 0x002c}, {0x000f, 0x002d}, {0x0010, 0x0047}, {0x0011, 0x0080}, {0x0013, 0x0077}, {0x0013, 0x0078}, {0x0013, 0x0079}, - {0x0013, 0x007a}, {0x0013, 0x007b}, {0x0013, 0x007c}, {0x0013, 0x007d}, {0x0013, 0x007e}, {0x0013, 0x007f}, {0x0013, 0x0080}, {0x0013, 0x0081}, - {0x0013, 0x0082}, {0x0013, 0x0083}, {0x0013, 0x0084}, {0x0013, 0x0085}, {0x0013, 0x0086}, {0x0013, 0x0087}, {0x0013, 0x0088}, {0x0013, 0x0089}, - {0x0013, 0x008a}, {0x0010, 0x0048}, {0x0010, 0x0049}, {0x0011, 0x0081}, {0x0013, 0x008b}, {0x0012, 0x00fb}, {0x0013, 0x008c}, {0x0013, 0x008d}, - {0x0013, 0x008e}, {0x0013, 0x008f}, {0x0013, 0x0090}, {0x0013, 0x0091}, {0x0013, 0x0092}, {0x0013, 0x0093}, {0x0013, 0x0094}, {0x0013, 0x0095}, - {0x0013, 0x0096}, {0x0013, 0x0097}, {0x0013, 0x0098}, {0x0013, 0x0099}, {0x0013, 0x009a}, {0x0013, 0x009b}, {0x0013, 0x009c}, {0x0013, 0x009d}, - {0x0013, 0x009e}, {0x0013, 0x009f}, {0x0013, 0x00a0}, {0x0012, 0x00fc}, {0x0013, 0x00a1}, {0x0013, 0x00a2}, {0x0013, 0x00a3}, {0x0013, 0x00a4}, - {0x0013, 0x00a5}, {0x0013, 0x00a6}, {0x0013, 0x00a7}, {0x0013, 0x00a8}, {0x0013, 0x00a9}, {0x0013, 0x00aa}, {0x0013, 0x00ab}, {0x0013, 0x00ac}, - {0x0013, 0x00ad}, {0x0013, 0x00ae}, {0x0013, 0x00af}, {0x0013, 0x00b0}, {0x0013, 0x00b1}, {0x0013, 0x00b2}, {0x0013, 0x00b3}, {0x0013, 0x00b4}, - {0x0013, 0x00b5}, {0x0013, 0x00b6}, {0x0013, 0x00b7}, {0x0013, 0x00b8}, {0x0013, 0x00b9}, {0x0013, 0x00ba}, {0x0013, 0x00bb}, {0x0013, 0x00bc}, - {0x0013, 0x00bd}, {0x0013, 0x00be}, {0x0013, 0x00bf}, {0x0013, 0x00c0}, {0x0013, 0x00c1}, {0x0013, 0x00c2}, {0x0013, 0x00c3}, {0x0013, 0x00c4}, - {0x0013, 0x00c5}, {0x0013, 0x00c6}, {0x0013, 0x00c7}, {0x0013, 0x00c8}, {0x0013, 0x00c9}, {0x0013, 0x00ca}, {0x0013, 0x00cb}, {0x0013, 0x00cc}, - {0x0013, 0x00cd}, {0x0013, 0x00ce}, {0x0013, 0x00cf}, {0x0013, 0x00d0}, {0x0013, 0x00d1}, {0x0013, 0x00d2}, {0x0013, 0x00d3}, {0x0013, 0x00d4}, - {0x0013, 0x00d5}, {0x0013, 0x00d6}, {0x0013, 0x00d7}, {0x0013, 0x00d8}, {0x0013, 0x00d9}, {0x0013, 0x00da}, {0x0013, 0x00db}, {0x0013, 0x00dc}, - {0x0013, 0x00dd}, {0x0013, 0x00de}, {0x0013, 0x00df}, {0x0013, 0x00e0}, {0x0013, 0x00e1}, {0x0013, 0x00e2}, {0x0013, 0x00e3}, {0x0013, 0x00e4}, - {0x0013, 0x00e5}, {0x0013, 0x00e6}, {0x0013, 0x00e7}, {0x0013, 0x00e8}, {0x0013, 0x00e9}, {0x0013, 0x00ea}, {0x0013, 0x00eb}, {0x0013, 0x00ec}, - {0x0013, 0x00ed}, {0x0013, 0x00ee}, {0x0013, 0x00ef}, {0x0013, 0x00f0}, {0x0013, 0x00f1}, {0x0013, 0x00f2}, {0x0013, 0x00f3}, {0x0013, 0x00f4}, - {0x0013, 0x00f5}, {0x0013, 0x00f6}, {0x0013, 0x00f7}, {0x0013, 0x00f8}, {0x0013, 0x00f9}, {0x0013, 0x00fa}, {0x0013, 0x00fb}, {0x0013, 0x00fc}, - {0x0013, 0x00fd}, {0x0013, 0x00fe}, {0x0013, 0x00ff}, {0x0013, 0x0100}, {0x0013, 0x0101}, {0x0013, 0x0102}, {0x0013, 0x0103}, {0x0013, 0x0104}, - {0x0013, 0x0105}, {0x0013, 0x0106}, {0x0013, 0x0107}, {0x0013, 0x0108}, {0x0013, 0x0109}, {0x0013, 0x010a}, {0x0013, 0x010b}, {0x0013, 0x010c}, - {0x0013, 0x010d}, {0x0013, 0x010e}, {0x0013, 0x010f}, {0x0013, 0x0110}, {0x0013, 0x0111}, {0x0013, 0x0112}, {0x0013, 0x0113}, {0x0013, 0x0114}, - {0x0013, 0x0115}, {0x0013, 0x0116}, {0x0013, 0x0117}, {0x0013, 0x0118}, {0x0013, 0x0119}, {0x0013, 0x011a}, {0x0013, 0x011b}, {0x0013, 0x011c}, - {0x0013, 0x011d}, {0x0013, 0x011e}, {0x0013, 0x011f}, {0x0013, 0x0120}, {0x0013, 0x0121}, {0x0013, 0x0122}, {0x0013, 0x0123}, {0x0013, 0x0124}, - {0x0013, 0x0125}, {0x0013, 0x0126}, {0x0013, 0x0127}, {0x0013, 0x0128}, {0x0013, 0x0129}, {0x0013, 0x012a}, {0x0013, 0x012b}, {0x0013, 0x012c}, - {0x0013, 0x012d}, {0x0013, 0x012e}, {0x0013, 0x012f}, {0x0013, 0x0130}, {0x0013, 0x0131}, {0x0013, 0x0132}, {0x0013, 0x0133}, {0x0013, 0x0134}, - {0x0013, 0x0135}, {0x0013, 0x0136}, {0x0013, 0x0137}, {0x0013, 0x0138}, {0x0013, 0x0139}, {0x0013, 0x013a}, {0x0013, 0x013b}, {0x0013, 0x013c}, - {0x0013, 0x013d}, {0x0013, 0x013e}, {0x0013, 0x013f}, {0x0013, 0x0140}, {0x0013, 0x0141}, {0x0013, 0x0142}, {0x0013, 0x0143}, {0x0013, 0x0144}, - {0x0013, 0x0145}, {0x0013, 0x0146}, {0x0013, 0x0147}, {0x0013, 0x0148}, {0x0013, 0x0149}, {0x0013, 0x014a}, {0x0013, 0x014b}, {0x0013, 0x014c}, - {0x0013, 0x014d}, {0x0013, 0x014e}, {0x0013, 0x014f}, {0x0013, 0x0150}, {0x0013, 0x0151}, {0x0013, 0x0152}, {0x0013, 0x0153}, {0x0013, 0x0154}, - {0x0013, 0x0155}, {0x0013, 0x0156}, {0x0013, 0x0157}, {0x0013, 0x0158}, {0x0013, 0x0159}, {0x0013, 0x015a}, {0x0013, 0x015b}, {0x0013, 0x015c}, - {0x0013, 0x015d}, {0x0013, 0x015e}, {0x0013, 0x015f}, {0x0013, 0x0160}, {0x0013, 0x0161}, {0x0013, 0x0162}, {0x0013, 0x0163}, {0x0013, 0x0164}, - {0x0013, 0x0165}, {0x0013, 0x0166}, {0x0013, 0x0167}, {0x0013, 0x0168}, {0x0013, 0x0169}, {0x0013, 0x016a}, {0x0013, 0x016b}, {0x0013, 0x016c}, - {0x0013, 0x016d}, {0x0013, 0x016e}, {0x0013, 0x016f}, {0x0013, 0x0170}, {0x0013, 0x0171}, {0x0013, 0x0172}, {0x0013, 0x0173}, {0x0013, 0x0174}, - {0x0013, 0x0175}, {0x0013, 0x0176}, {0x0013, 0x0177}, {0x0013, 0x0178}, {0x0013, 0x0179}, {0x0013, 0x017a}, {0x0013, 0x017b}, {0x0013, 0x017c}, - {0x0013, 0x017d}, {0x0013, 0x017e}, {0x0013, 0x017f}, {0x0013, 0x0180}, {0x0013, 0x0181}, {0x0013, 0x0182}, {0x0013, 0x0183}, {0x0013, 0x0184}, - {0x0013, 0x0185}, {0x0013, 0x0186}, {0x0013, 0x0187}, {0x0013, 0x0188}, {0x0013, 0x0189}, {0x0013, 0x018a}, {0x0013, 0x018b}, {0x0013, 0x018c}, - {0x0013, 0x018d}, {0x0013, 0x018e}, {0x0013, 0x018f}, {0x0013, 0x0190}, {0x0013, 0x0191}, {0x0013, 0x0192}, {0x0013, 0x0193}, {0x0013, 0x0194}, - {0x0013, 0x0195}, {0x0013, 0x0196}, {0x0013, 0x0197}, {0x0013, 0x0198}, {0x0013, 0x0199}, {0x0013, 0x019a}, {0x0013, 0x019b}, {0x0013, 0x019c}, - {0x0013, 0x019d}, {0x0013, 0x019e}, {0x0013, 0x019f}, {0x0013, 0x01a0}, {0x0013, 0x01a1}, {0x0013, 0x01a2}, {0x0013, 0x01a3}, {0x0013, 0x01a4}, - {0x0013, 0x01a5}, {0x0013, 0x01a6}, {0x0013, 0x01a7}, {0x0013, 0x01a8}, {0x0013, 0x01a9}, {0x0013, 0x01aa}, {0x0013, 0x01ab}, {0x0013, 0x01ac}, - {0x0013, 0x01ad}, {0x0013, 0x01ae}, {0x0013, 0x01af}, {0x0013, 0x01b0}, {0x0013, 0x01b1}, {0x0013, 0x01b2}, {0x0013, 0x01b3}, {0x0013, 0x01b4}, - {0x0013, 0x01b5}, {0x0013, 0x01b6}, {0x0013, 0x01b7}, {0x0013, 0x01b8}, {0x0013, 0x01b9}, {0x0013, 0x01ba}, {0x0013, 0x01bb}, {0x0013, 0x01bc}, - {0x0013, 0x01bd}, {0x0013, 0x01be}, {0x0013, 0x01bf}, {0x0013, 0x01c0}, {0x0013, 0x01c1}, {0x0013, 0x01c2}, {0x0013, 0x01c3}, {0x0013, 0x01c4}, - {0x0013, 0x01c5}, {0x0013, 0x01c6}, {0x0013, 0x01c7}, {0x0013, 0x01c8}, {0x0013, 0x01c9}, {0x0013, 0x01ca}, {0x0013, 0x01cb}, {0x0013, 0x01cc}, - {0x0013, 0x01cd}, {0x0013, 0x01ce}, {0x0013, 0x01cf}, {0x0013, 0x01d0}, {0x0013, 0x01d1}, {0x0013, 0x01d2}, {0x0013, 0x01d3}, {0x0013, 0x01d4}, - {0x0013, 0x01d5}, {0x0013, 0x01d6}, {0x0013, 0x01d7}, {0x0013, 0x01d8}, {0x0013, 0x01d9}, {0x0013, 0x01da}, {0x0013, 0x01db}, {0x0013, 0x01dc}, - {0x0013, 0x01dd}, {0x0013, 0x01de}, {0x0013, 0x01df}, {0x0013, 0x01e0}, {0x0013, 0x01e1}, {0x0013, 0x01e2}, {0x0013, 0x01e3}, {0x0013, 0x01e4}, - {0x0013, 0x01e5}, {0x0013, 0x01e6}, {0x0013, 0x01e7}, {0x0013, 0x01e8}, {0x0013, 0x01e9}, {0x0013, 0x01ea}, {0x0013, 0x01eb}, {0x0012, 0x00fd}, -}; - -const uint32_t c_aauiCQMFHuffDec47[87][16] = -{ - {0x0004ffff, 0x0003ffff, 0x0001ffff, 0x0002ffff, 0x0000001a, 0x00000031, 0x00010001, 0x00010001, 0x00010018, 0x00010018, 0x00010019, 0x00010019, 0x00020000, 0x00020000, 0x00020000, 0x00020000, }, - {0x00020049, 0x00020049, 0x00020049, 0x00020049, 0x0002004a, 0x0002004a, 0x0002004a, 0x0002004a, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, }, - {0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, }, - {0x00020003, 0x00020003, 0x00020003, 0x00020003, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001b, 0x00020033, 0x00020033, 0x00020033, 0x00020033, 0x00020048, 0x00020048, 0x00020048, 0x00020048, }, - {0x000affff, 0x0008ffff, 0x0009ffff, 0x0005ffff, 0x0006ffff, 0x0007ffff, 0x00000004, 0x00000034, 0x00000060, 0x00000062, 0x0001001c, 0x0001001c, 0x0001004b, 0x0001004b, 0x00010061, 0x00010061, }, - {0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, }, - {0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x00030063, 0x00030063, 0x00030063, 0x00030063, 0x00030063, 0x00030063, 0x00030063, 0x00030063, }, - {0x00030079, 0x00030079, 0x00030079, 0x00030079, 0x00030079, 0x00030079, 0x00030079, 0x00030079, 0x0003007a, 0x0003007a, 0x0003007a, 0x0003007a, 0x0003007a, 0x0003007a, 0x0003007a, 0x0003007a, }, - {0x00010036, 0x00010036, 0x00010065, 0x00010065, 0x0001007c, 0x0001007c, 0x00010090, 0x00010090, 0x00010091, 0x00010091, 0x00010092, 0x00010092, 0x00020005, 0x00020005, 0x00020005, 0x00020005, }, - {0x0002004d, 0x0002004d, 0x0002004d, 0x0002004d, 0x00020064, 0x00020064, 0x00020064, 0x00020064, 0x00020078, 0x00020078, 0x00020078, 0x00020078, 0x0002007b, 0x0002007b, 0x0002007b, 0x0002007b, }, - {0x0017ffff, 0x0028ffff, 0x0039ffff, 0x0012ffff, 0x0011ffff, 0x0010ffff, 0x000bffff, 0x000cffff, 0x000dffff, 0x000effff, 0x000fffff, 0x00000006, 0x0000004e, 0x00000093, 0x0001001e, 0x0001001e, }, - {0x00020095, 0x00020095, 0x00020095, 0x00020095, 0x000200a8, 0x000200a8, 0x000200a8, 0x000200a8, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, }, - {0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, }, - {0x00030066, 0x00030066, 0x00030066, 0x00030066, 0x00030066, 0x00030066, 0x00030066, 0x00030066, 0x0003007d, 0x0003007d, 0x0003007d, 0x0003007d, 0x0003007d, 0x0003007d, 0x0003007d, 0x0003007d, }, - {0x00030094, 0x00030094, 0x00030094, 0x00030094, 0x00030094, 0x00030094, 0x00030094, 0x00030094, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, }, - {0x000300aa, 0x000300aa, 0x000300aa, 0x000300aa, 0x000300aa, 0x000300aa, 0x000300aa, 0x000300aa, 0x000300ab, 0x000300ab, 0x000300ab, 0x000300ab, 0x000300ab, 0x000300ab, 0x000300ab, 0x000300ab, }, - {0x00010067, 0x00010067, 0x00010068, 0x00010068, 0x0001007e, 0x0001007e, 0x000100ac, 0x000100ac, 0x000100c1, 0x000100c1, 0x000100c2, 0x000100c2, 0x0002004f, 0x0002004f, 0x0002004f, 0x0002004f, }, - {0x0014ffff, 0x00000008, 0x00000050, 0x0000007f, 0x00000096, 0x000000ad, 0x000000c0, 0x000000c3, 0x000000d9, 0x000000da, 0x00010020, 0x00010020, 0x00010021, 0x00010021, 0x00010038, 0x00010038, }, - {0x004affff, 0x004bffff, 0x004cffff, 0x004dffff, 0x004effff, 0x004fffff, 0x0050ffff, 0x0051ffff, 0x0052ffff, 0x0053ffff, 0x0054ffff, 0x0055ffff, 0x0056ffff, 0x0016ffff, 0x0015ffff, 0x0013ffff, }, - {0x000200f3, 0x000200f3, 0x000200f3, 0x000200f3, 0x0002023f, 0x0002023f, 0x0002023f, 0x0002023f, 0x00030069, 0x00030069, 0x00030069, 0x00030069, 0x00030069, 0x00030069, 0x00030069, 0x00030069, }, - {0x000300c4, 0x000300c4, 0x000300c4, 0x000300c4, 0x000300c4, 0x000300c4, 0x000300c4, 0x000300c4, 0x000300db, 0x000300db, 0x000300db, 0x000300db, 0x000300db, 0x000300db, 0x000300db, 0x000300db, }, - {0x00020051, 0x00020051, 0x00020051, 0x00020051, 0x00020080, 0x00020080, 0x00020080, 0x00020080, 0x000200af, 0x000200af, 0x000200af, 0x000200af, 0x000200dd, 0x000200dd, 0x000200dd, 0x000200dd, }, - {0x0001023b, 0x0001023b, 0x0001023c, 0x0001023c, 0x0001023d, 0x0001023d, 0x0001023e, 0x0001023e, 0x00020022, 0x00020022, 0x00020022, 0x00020022, 0x00020039, 0x00020039, 0x00020039, 0x00020039, }, - {0x001bffff, 0x001affff, 0x001dffff, 0x001cffff, 0x0020ffff, 0x0018ffff, 0x0019ffff, 0x001effff, 0x001fffff, 0x0021ffff, 0x0022ffff, 0x0023ffff, 0x0024ffff, 0x0025ffff, 0x0026ffff, 0x0027ffff, }, - {0x00010046, 0x00010046, 0x00010047, 0x00010047, 0x00010052, 0x00010052, 0x00010053, 0x00010053, 0x00010054, 0x00010054, 0x00010055, 0x00010055, 0x00010056, 0x00010056, 0x00010057, 0x00010057, }, - {0x00010058, 0x00010058, 0x00010059, 0x00010059, 0x0001005a, 0x0001005a, 0x0001005b, 0x0001005b, 0x0001005c, 0x0001005c, 0x0001005d, 0x0001005d, 0x0001005e, 0x0001005e, 0x0001005f, 0x0001005f, }, - {0x00010011, 0x00010011, 0x00010012, 0x00010012, 0x00010013, 0x00010013, 0x00010014, 0x00010014, 0x00010015, 0x00010015, 0x00010016, 0x00010016, 0x00010017, 0x00010017, 0x00010023, 0x00010023, }, - {0x00010009, 0x00010009, 0x0001000a, 0x0001000a, 0x0001000b, 0x0001000b, 0x0001000c, 0x0001000c, 0x0001000d, 0x0001000d, 0x0001000e, 0x0001000e, 0x0001000f, 0x0001000f, 0x00010010, 0x00010010, }, - {0x0001002c, 0x0001002c, 0x0001002d, 0x0001002d, 0x0001002e, 0x0001002e, 0x0001002f, 0x0001002f, 0x0001003a, 0x0001003a, 0x0001003b, 0x0001003b, 0x0001003c, 0x0001003c, 0x0001003d, 0x0001003d, }, - {0x00010024, 0x00010024, 0x00010025, 0x00010025, 0x00010026, 0x00010026, 0x00010027, 0x00010027, 0x00010028, 0x00010028, 0x00010029, 0x00010029, 0x0001002a, 0x0001002a, 0x0001002b, 0x0001002b, }, - {0x0001006a, 0x0001006a, 0x0001006b, 0x0001006b, 0x0001006c, 0x0001006c, 0x0001006d, 0x0001006d, 0x0001006e, 0x0001006e, 0x0001006f, 0x0001006f, 0x00010070, 0x00010070, 0x00010071, 0x00010071, }, - {0x00010072, 0x00010072, 0x00010073, 0x00010073, 0x00010074, 0x00010074, 0x00010075, 0x00010075, 0x00010076, 0x00010076, 0x00010077, 0x00010077, 0x00010081, 0x00010081, 0x00010082, 0x00010082, }, - {0x0001003e, 0x0001003e, 0x0001003f, 0x0001003f, 0x00010040, 0x00010040, 0x00010041, 0x00010041, 0x00010042, 0x00010042, 0x00010043, 0x00010043, 0x00010044, 0x00010044, 0x00010045, 0x00010045, }, - {0x00010083, 0x00010083, 0x00010084, 0x00010084, 0x00010085, 0x00010085, 0x00010086, 0x00010086, 0x00010087, 0x00010087, 0x00010088, 0x00010088, 0x00010089, 0x00010089, 0x0001008a, 0x0001008a, }, - {0x0001008b, 0x0001008b, 0x0001008c, 0x0001008c, 0x0001008d, 0x0001008d, 0x0001008e, 0x0001008e, 0x0001008f, 0x0001008f, 0x00010097, 0x00010097, 0x00010098, 0x00010098, 0x00010099, 0x00010099, }, - {0x0001009a, 0x0001009a, 0x0001009b, 0x0001009b, 0x0001009c, 0x0001009c, 0x0001009d, 0x0001009d, 0x0001009e, 0x0001009e, 0x0001009f, 0x0001009f, 0x000100a0, 0x000100a0, 0x000100a1, 0x000100a1, }, - {0x000100a2, 0x000100a2, 0x000100a3, 0x000100a3, 0x000100a4, 0x000100a4, 0x000100a5, 0x000100a5, 0x000100a6, 0x000100a6, 0x000100a7, 0x000100a7, 0x000100ae, 0x000100ae, 0x000100b0, 0x000100b0, }, - {0x000100b1, 0x000100b1, 0x000100b2, 0x000100b2, 0x000100b3, 0x000100b3, 0x000100b4, 0x000100b4, 0x000100b5, 0x000100b5, 0x000100b6, 0x000100b6, 0x000100b7, 0x000100b7, 0x000100b8, 0x000100b8, }, - {0x000100b9, 0x000100b9, 0x000100ba, 0x000100ba, 0x000100bb, 0x000100bb, 0x000100bc, 0x000100bc, 0x000100bd, 0x000100bd, 0x000100be, 0x000100be, 0x000100bf, 0x000100bf, 0x000100c5, 0x000100c5, }, - {0x000100c6, 0x000100c6, 0x000100c7, 0x000100c7, 0x000100c8, 0x000100c8, 0x000100c9, 0x000100c9, 0x000100ca, 0x000100ca, 0x000100cb, 0x000100cb, 0x000100cc, 0x000100cc, 0x000100cd, 0x000100cd, }, - {0x0029ffff, 0x002affff, 0x002bffff, 0x002cffff, 0x002dffff, 0x002effff, 0x002fffff, 0x0030ffff, 0x0031ffff, 0x0032ffff, 0x0033ffff, 0x0034ffff, 0x0035ffff, 0x0036ffff, 0x0037ffff, 0x0038ffff, }, - {0x000100ce, 0x000100ce, 0x000100cf, 0x000100cf, 0x000100d0, 0x000100d0, 0x000100d1, 0x000100d1, 0x000100d2, 0x000100d2, 0x000100d3, 0x000100d3, 0x000100d4, 0x000100d4, 0x000100d5, 0x000100d5, }, - {0x000100d6, 0x000100d6, 0x000100d7, 0x000100d7, 0x000100d8, 0x000100d8, 0x000100dc, 0x000100dc, 0x000100de, 0x000100de, 0x000100df, 0x000100df, 0x000100e0, 0x000100e0, 0x000100e1, 0x000100e1, }, - {0x000100e2, 0x000100e2, 0x000100e3, 0x000100e3, 0x000100e4, 0x000100e4, 0x000100e5, 0x000100e5, 0x000100e6, 0x000100e6, 0x000100e7, 0x000100e7, 0x000100e8, 0x000100e8, 0x000100e9, 0x000100e9, }, - {0x000100ea, 0x000100ea, 0x000100eb, 0x000100eb, 0x000100ec, 0x000100ec, 0x000100ed, 0x000100ed, 0x000100ee, 0x000100ee, 0x000100ef, 0x000100ef, 0x000100f0, 0x000100f0, 0x000100f1, 0x000100f1, }, - {0x000100f2, 0x000100f2, 0x000100f4, 0x000100f4, 0x000100f5, 0x000100f5, 0x000100f6, 0x000100f6, 0x000100f7, 0x000100f7, 0x000100f8, 0x000100f8, 0x000100f9, 0x000100f9, 0x000100fa, 0x000100fa, }, - {0x000100fb, 0x000100fb, 0x000100fc, 0x000100fc, 0x000100fd, 0x000100fd, 0x000100fe, 0x000100fe, 0x000100ff, 0x000100ff, 0x00010100, 0x00010100, 0x00010101, 0x00010101, 0x00010102, 0x00010102, }, - {0x00010103, 0x00010103, 0x00010104, 0x00010104, 0x00010105, 0x00010105, 0x00010106, 0x00010106, 0x00010107, 0x00010107, 0x00010108, 0x00010108, 0x00010109, 0x00010109, 0x0001010a, 0x0001010a, }, - {0x0001010b, 0x0001010b, 0x0001010c, 0x0001010c, 0x0001010d, 0x0001010d, 0x0001010e, 0x0001010e, 0x0001010f, 0x0001010f, 0x00010110, 0x00010110, 0x00010111, 0x00010111, 0x00010112, 0x00010112, }, - {0x00010113, 0x00010113, 0x00010114, 0x00010114, 0x00010115, 0x00010115, 0x00010116, 0x00010116, 0x00010117, 0x00010117, 0x00010118, 0x00010118, 0x00010119, 0x00010119, 0x0001011a, 0x0001011a, }, - {0x0001011b, 0x0001011b, 0x0001011c, 0x0001011c, 0x0001011d, 0x0001011d, 0x0001011e, 0x0001011e, 0x0001011f, 0x0001011f, 0x00010120, 0x00010120, 0x00010121, 0x00010121, 0x00010122, 0x00010122, }, - {0x00010123, 0x00010123, 0x00010124, 0x00010124, 0x00010125, 0x00010125, 0x00010126, 0x00010126, 0x00010127, 0x00010127, 0x00010128, 0x00010128, 0x00010129, 0x00010129, 0x0001012a, 0x0001012a, }, - {0x0001012b, 0x0001012b, 0x0001012c, 0x0001012c, 0x0001012d, 0x0001012d, 0x0001012e, 0x0001012e, 0x0001012f, 0x0001012f, 0x00010130, 0x00010130, 0x00010131, 0x00010131, 0x00010132, 0x00010132, }, - {0x00010133, 0x00010133, 0x00010134, 0x00010134, 0x00010135, 0x00010135, 0x00010136, 0x00010136, 0x00010137, 0x00010137, 0x00010138, 0x00010138, 0x00010139, 0x00010139, 0x0001013a, 0x0001013a, }, - {0x0001013b, 0x0001013b, 0x0001013c, 0x0001013c, 0x0001013d, 0x0001013d, 0x0001013e, 0x0001013e, 0x0001013f, 0x0001013f, 0x00010140, 0x00010140, 0x00010141, 0x00010141, 0x00010142, 0x00010142, }, - {0x00010143, 0x00010143, 0x00010144, 0x00010144, 0x00010145, 0x00010145, 0x00010146, 0x00010146, 0x00010147, 0x00010147, 0x00010148, 0x00010148, 0x00010149, 0x00010149, 0x0001014a, 0x0001014a, }, - {0x0001014b, 0x0001014b, 0x0001014c, 0x0001014c, 0x0001014d, 0x0001014d, 0x0001014e, 0x0001014e, 0x0001014f, 0x0001014f, 0x00010150, 0x00010150, 0x00010151, 0x00010151, 0x00010152, 0x00010152, }, - {0x003affff, 0x003bffff, 0x003cffff, 0x003dffff, 0x003effff, 0x003fffff, 0x0040ffff, 0x0041ffff, 0x0042ffff, 0x0043ffff, 0x0044ffff, 0x0045ffff, 0x0046ffff, 0x0047ffff, 0x0048ffff, 0x0049ffff, }, - {0x00010153, 0x00010153, 0x00010154, 0x00010154, 0x00010155, 0x00010155, 0x00010156, 0x00010156, 0x00010157, 0x00010157, 0x00010158, 0x00010158, 0x00010159, 0x00010159, 0x0001015a, 0x0001015a, }, - {0x0001015b, 0x0001015b, 0x0001015c, 0x0001015c, 0x0001015d, 0x0001015d, 0x0001015e, 0x0001015e, 0x0001015f, 0x0001015f, 0x00010160, 0x00010160, 0x00010161, 0x00010161, 0x00010162, 0x00010162, }, - {0x00010163, 0x00010163, 0x00010164, 0x00010164, 0x00010165, 0x00010165, 0x00010166, 0x00010166, 0x00010167, 0x00010167, 0x00010168, 0x00010168, 0x00010169, 0x00010169, 0x0001016a, 0x0001016a, }, - {0x0001016b, 0x0001016b, 0x0001016c, 0x0001016c, 0x0001016d, 0x0001016d, 0x0001016e, 0x0001016e, 0x0001016f, 0x0001016f, 0x00010170, 0x00010170, 0x00010171, 0x00010171, 0x00010172, 0x00010172, }, - {0x00010173, 0x00010173, 0x00010174, 0x00010174, 0x00010175, 0x00010175, 0x00010176, 0x00010176, 0x00010177, 0x00010177, 0x00010178, 0x00010178, 0x00010179, 0x00010179, 0x0001017a, 0x0001017a, }, - {0x0001017b, 0x0001017b, 0x0001017c, 0x0001017c, 0x0001017d, 0x0001017d, 0x0001017e, 0x0001017e, 0x0001017f, 0x0001017f, 0x00010180, 0x00010180, 0x00010181, 0x00010181, 0x00010182, 0x00010182, }, - {0x00010183, 0x00010183, 0x00010184, 0x00010184, 0x00010185, 0x00010185, 0x00010186, 0x00010186, 0x00010187, 0x00010187, 0x00010188, 0x00010188, 0x00010189, 0x00010189, 0x0001018a, 0x0001018a, }, - {0x0001018b, 0x0001018b, 0x0001018c, 0x0001018c, 0x0001018d, 0x0001018d, 0x0001018e, 0x0001018e, 0x0001018f, 0x0001018f, 0x00010190, 0x00010190, 0x00010191, 0x00010191, 0x00010192, 0x00010192, }, - {0x00010193, 0x00010193, 0x00010194, 0x00010194, 0x00010195, 0x00010195, 0x00010196, 0x00010196, 0x00010197, 0x00010197, 0x00010198, 0x00010198, 0x00010199, 0x00010199, 0x0001019a, 0x0001019a, }, - {0x0001019b, 0x0001019b, 0x0001019c, 0x0001019c, 0x0001019d, 0x0001019d, 0x0001019e, 0x0001019e, 0x0001019f, 0x0001019f, 0x000101a0, 0x000101a0, 0x000101a1, 0x000101a1, 0x000101a2, 0x000101a2, }, - {0x000101a3, 0x000101a3, 0x000101a4, 0x000101a4, 0x000101a5, 0x000101a5, 0x000101a6, 0x000101a6, 0x000101a7, 0x000101a7, 0x000101a8, 0x000101a8, 0x000101a9, 0x000101a9, 0x000101aa, 0x000101aa, }, - {0x000101ab, 0x000101ab, 0x000101ac, 0x000101ac, 0x000101ad, 0x000101ad, 0x000101ae, 0x000101ae, 0x000101af, 0x000101af, 0x000101b0, 0x000101b0, 0x000101b1, 0x000101b1, 0x000101b2, 0x000101b2, }, - {0x000101b3, 0x000101b3, 0x000101b4, 0x000101b4, 0x000101b5, 0x000101b5, 0x000101b6, 0x000101b6, 0x000101b7, 0x000101b7, 0x000101b8, 0x000101b8, 0x000101b9, 0x000101b9, 0x000101ba, 0x000101ba, }, - {0x000101bb, 0x000101bb, 0x000101bc, 0x000101bc, 0x000101bd, 0x000101bd, 0x000101be, 0x000101be, 0x000101bf, 0x000101bf, 0x000101c0, 0x000101c0, 0x000101c1, 0x000101c1, 0x000101c2, 0x000101c2, }, - {0x000101c3, 0x000101c3, 0x000101c4, 0x000101c4, 0x000101c5, 0x000101c5, 0x000101c6, 0x000101c6, 0x000101c7, 0x000101c7, 0x000101c8, 0x000101c8, 0x000101c9, 0x000101c9, 0x000101ca, 0x000101ca, }, - {0x000101cb, 0x000101cb, 0x000101cc, 0x000101cc, 0x000101cd, 0x000101cd, 0x000101ce, 0x000101ce, 0x000101cf, 0x000101cf, 0x000101d0, 0x000101d0, 0x000101d1, 0x000101d1, 0x000101d2, 0x000101d2, }, - {0x000101d3, 0x000101d3, 0x000101d4, 0x000101d4, 0x000101d5, 0x000101d5, 0x000101d6, 0x000101d6, 0x000101d7, 0x000101d7, 0x000101d8, 0x000101d8, 0x000101d9, 0x000101d9, 0x000101da, 0x000101da, }, - {0x000101db, 0x000101db, 0x000101dc, 0x000101dc, 0x000101dd, 0x000101dd, 0x000101de, 0x000101de, 0x000101df, 0x000101df, 0x000101e0, 0x000101e0, 0x000101e1, 0x000101e1, 0x000101e2, 0x000101e2, }, - {0x000101e3, 0x000101e3, 0x000101e4, 0x000101e4, 0x000101e5, 0x000101e5, 0x000101e6, 0x000101e6, 0x000101e7, 0x000101e7, 0x000101e8, 0x000101e8, 0x000101e9, 0x000101e9, 0x000101ea, 0x000101ea, }, - {0x000101eb, 0x000101eb, 0x000101ec, 0x000101ec, 0x000101ed, 0x000101ed, 0x000101ee, 0x000101ee, 0x000101ef, 0x000101ef, 0x000101f0, 0x000101f0, 0x000101f1, 0x000101f1, 0x000101f2, 0x000101f2, }, - {0x000101f3, 0x000101f3, 0x000101f4, 0x000101f4, 0x000101f5, 0x000101f5, 0x000101f6, 0x000101f6, 0x000101f7, 0x000101f7, 0x000101f8, 0x000101f8, 0x000101f9, 0x000101f9, 0x000101fa, 0x000101fa, }, - {0x000101fb, 0x000101fb, 0x000101fc, 0x000101fc, 0x000101fd, 0x000101fd, 0x000101fe, 0x000101fe, 0x000101ff, 0x000101ff, 0x00010200, 0x00010200, 0x00010201, 0x00010201, 0x00010202, 0x00010202, }, - {0x00010203, 0x00010203, 0x00010204, 0x00010204, 0x00010205, 0x00010205, 0x00010206, 0x00010206, 0x00010207, 0x00010207, 0x00010208, 0x00010208, 0x00010209, 0x00010209, 0x0001020a, 0x0001020a, }, - {0x0001020b, 0x0001020b, 0x0001020c, 0x0001020c, 0x0001020d, 0x0001020d, 0x0001020e, 0x0001020e, 0x0001020f, 0x0001020f, 0x00010210, 0x00010210, 0x00010211, 0x00010211, 0x00010212, 0x00010212, }, - {0x00010213, 0x00010213, 0x00010214, 0x00010214, 0x00010215, 0x00010215, 0x00010216, 0x00010216, 0x00010217, 0x00010217, 0x00010218, 0x00010218, 0x00010219, 0x00010219, 0x0001021a, 0x0001021a, }, - {0x0001021b, 0x0001021b, 0x0001021c, 0x0001021c, 0x0001021d, 0x0001021d, 0x0001021e, 0x0001021e, 0x0001021f, 0x0001021f, 0x00010220, 0x00010220, 0x00010221, 0x00010221, 0x00010222, 0x00010222, }, - {0x00010223, 0x00010223, 0x00010224, 0x00010224, 0x00010225, 0x00010225, 0x00010226, 0x00010226, 0x00010227, 0x00010227, 0x00010228, 0x00010228, 0x00010229, 0x00010229, 0x0001022a, 0x0001022a, }, - {0x0001022b, 0x0001022b, 0x0001022c, 0x0001022c, 0x0001022d, 0x0001022d, 0x0001022e, 0x0001022e, 0x0001022f, 0x0001022f, 0x00010230, 0x00010230, 0x00010231, 0x00010231, 0x00010232, 0x00010232, }, - {0x00010233, 0x00010233, 0x00010234, 0x00010234, 0x00010235, 0x00010235, 0x00010236, 0x00010236, 0x00010237, 0x00010237, 0x00010238, 0x00010238, 0x00010239, 0x00010239, 0x0001023a, 0x0001023a, }, -}; - -const uint32_t c_aauiCQMFHuffEnc48[729][2] = -{ - {0x0002, 0x0003}, {0x0003, 0x0003}, {0x0005, 0x0006}, {0x0006, 0x0006}, {0x0008, 0x0006}, {0x0009, 0x0007}, {0x000b, 0x000b}, {0x000c, 0x000d}, - {0x000f, 0x0030}, {0x0010, 0x0055}, {0x0012, 0x0136}, {0x0013, 0x0000}, {0x0013, 0x0001}, {0x0013, 0x0002}, {0x0013, 0x0003}, {0x0013, 0x0004}, - {0x0013, 0x0005}, {0x0013, 0x0006}, {0x0013, 0x0007}, {0x0013, 0x0008}, {0x0013, 0x0009}, {0x0013, 0x000a}, {0x0013, 0x000b}, {0x0013, 0x000c}, - {0x0013, 0x000d}, {0x0013, 0x000e}, {0x0013, 0x000f}, {0x0003, 0x0004}, {0x0003, 0x0005}, {0x0005, 0x0007}, {0x0006, 0x0007}, {0x0007, 0x0007}, - {0x0008, 0x0007}, {0x000a, 0x0008}, {0x000c, 0x000e}, {0x000d, 0x0012}, {0x000f, 0x0031}, {0x0011, 0x00a0}, {0x0013, 0x0010}, {0x0013, 0x0011}, - {0x0013, 0x0012}, {0x0013, 0x0013}, {0x0013, 0x0014}, {0x0013, 0x0015}, {0x0013, 0x0016}, {0x0013, 0x0017}, {0x0013, 0x0018}, {0x0013, 0x0019}, - {0x0013, 0x001a}, {0x0013, 0x001b}, {0x0013, 0x001c}, {0x0013, 0x001d}, {0x0013, 0x001e}, {0x0013, 0x001f}, {0x0005, 0x0008}, {0x0004, 0x0005}, - {0x0005, 0x0009}, {0x0006, 0x0008}, {0x0007, 0x0008}, {0x0008, 0x0008}, {0x000a, 0x0009}, {0x000c, 0x000f}, {0x000d, 0x0013}, {0x000f, 0x0032}, - {0x0011, 0x00a1}, {0x0013, 0x0020}, {0x0013, 0x0021}, {0x0013, 0x0022}, {0x0013, 0x0023}, {0x0013, 0x0024}, {0x0013, 0x0025}, {0x0013, 0x0026}, - {0x0013, 0x0027}, {0x0013, 0x0028}, {0x0013, 0x0029}, {0x0013, 0x002a}, {0x0013, 0x002b}, {0x0013, 0x002c}, {0x0013, 0x002d}, {0x0013, 0x002e}, - {0x0013, 0x002f}, {0x0006, 0x0009}, {0x0006, 0x000a}, {0x0006, 0x000b}, {0x0007, 0x0009}, {0x0008, 0x0009}, {0x0009, 0x0008}, {0x000b, 0x000c}, - {0x000d, 0x0014}, {0x000e, 0x001d}, {0x000f, 0x0033}, {0x0012, 0x0137}, {0x0013, 0x0030}, {0x0013, 0x0031}, {0x0013, 0x0032}, {0x0013, 0x0033}, - {0x0013, 0x0034}, {0x0013, 0x0035}, {0x0013, 0x0036}, {0x0013, 0x0037}, {0x0013, 0x0038}, {0x0013, 0x0039}, {0x0013, 0x003a}, {0x0013, 0x003b}, - {0x0013, 0x003c}, {0x0013, 0x003d}, {0x0013, 0x003e}, {0x0013, 0x003f}, {0x0008, 0x000a}, {0x0007, 0x000a}, {0x0007, 0x000b}, {0x0008, 0x000b}, - {0x0009, 0x0009}, {0x000a, 0x000a}, {0x000c, 0x0010}, {0x000d, 0x0015}, {0x000f, 0x0034}, {0x0010, 0x0056}, {0x0012, 0x0138}, {0x0013, 0x0040}, - {0x0013, 0x0041}, {0x0013, 0x0042}, {0x0013, 0x0043}, {0x0013, 0x0044}, {0x0013, 0x0045}, {0x0013, 0x0046}, {0x0013, 0x0047}, {0x0013, 0x0048}, - {0x0013, 0x0049}, {0x0013, 0x004a}, {0x0013, 0x004b}, {0x0013, 0x004c}, {0x0013, 0x004d}, {0x0013, 0x004e}, {0x0013, 0x004f}, {0x0009, 0x000a}, - {0x0008, 0x000c}, {0x0008, 0x000d}, {0x0009, 0x000b}, {0x000a, 0x000b}, {0x000c, 0x0011}, {0x000d, 0x0016}, {0x000e, 0x001e}, {0x0010, 0x0057}, - {0x0011, 0x00a2}, {0x0011, 0x00a3}, {0x0013, 0x0050}, {0x0013, 0x0051}, {0x0013, 0x0052}, {0x0013, 0x0053}, {0x0013, 0x0054}, {0x0013, 0x0055}, - {0x0013, 0x0056}, {0x0013, 0x0057}, {0x0013, 0x0058}, {0x0013, 0x0059}, {0x0013, 0x005a}, {0x0013, 0x005b}, {0x0013, 0x005c}, {0x0013, 0x005d}, - {0x0013, 0x005e}, {0x0013, 0x005f}, {0x000b, 0x000d}, {0x000a, 0x000c}, {0x000a, 0x000d}, {0x000b, 0x000e}, {0x000c, 0x0012}, {0x000d, 0x0017}, - {0x000e, 0x001f}, {0x0010, 0x0058}, {0x0012, 0x0139}, {0x0011, 0x00a4}, {0x0012, 0x013a}, {0x0013, 0x0060}, {0x0013, 0x0061}, {0x0013, 0x0062}, - {0x0013, 0x0063}, {0x0013, 0x0064}, {0x0013, 0x0065}, {0x0013, 0x0066}, {0x0013, 0x0067}, {0x0013, 0x0068}, {0x0013, 0x0069}, {0x0013, 0x006a}, - {0x0013, 0x006b}, {0x0013, 0x006c}, {0x0013, 0x006d}, {0x0013, 0x006e}, {0x0013, 0x006f}, {0x000c, 0x0013}, {0x000b, 0x000f}, {0x000c, 0x0014}, - {0x000c, 0x0015}, {0x000d, 0x0018}, {0x000e, 0x0020}, {0x000f, 0x0035}, {0x0012, 0x013b}, {0x0013, 0x0070}, {0x0013, 0x0071}, {0x0013, 0x0072}, - {0x0013, 0x0073}, {0x0013, 0x0074}, {0x0013, 0x0075}, {0x0013, 0x0076}, {0x0013, 0x0077}, {0x0013, 0x0078}, {0x0013, 0x0079}, {0x0013, 0x007a}, - {0x0013, 0x007b}, {0x0013, 0x007c}, {0x0013, 0x007d}, {0x0013, 0x007e}, {0x0013, 0x007f}, {0x0013, 0x0080}, {0x0013, 0x0081}, {0x0013, 0x0082}, - {0x000e, 0x0021}, {0x000d, 0x0019}, {0x000e, 0x0022}, {0x000e, 0x0023}, {0x000f, 0x0036}, {0x0010, 0x0059}, {0x0011, 0x00a5}, {0x0013, 0x0083}, - {0x0011, 0x00a6}, {0x0012, 0x013c}, {0x0013, 0x0084}, {0x0013, 0x0085}, {0x0013, 0x0086}, {0x0013, 0x0087}, {0x0013, 0x0088}, {0x0013, 0x0089}, - {0x0013, 0x008a}, {0x0013, 0x008b}, {0x0013, 0x008c}, {0x0013, 0x008d}, {0x0013, 0x008e}, {0x0013, 0x008f}, {0x0013, 0x0090}, {0x0013, 0x0091}, - {0x0013, 0x0092}, {0x0013, 0x0093}, {0x0013, 0x0094}, {0x0010, 0x005a}, {0x000f, 0x0037}, {0x000f, 0x0038}, {0x000f, 0x0039}, {0x0010, 0x005b}, - {0x0010, 0x005c}, {0x0013, 0x0095}, {0x0011, 0x00a7}, {0x0013, 0x0096}, {0x0013, 0x0097}, {0x0013, 0x0098}, {0x0013, 0x0099}, {0x0013, 0x009a}, - {0x0013, 0x009b}, {0x0013, 0x009c}, {0x0013, 0x009d}, {0x0013, 0x009e}, {0x0013, 0x009f}, {0x0013, 0x00a0}, {0x0013, 0x00a1}, {0x0013, 0x00a2}, - {0x0013, 0x00a3}, {0x0013, 0x00a4}, {0x0013, 0x00a5}, {0x0013, 0x00a6}, {0x0013, 0x00a7}, {0x0013, 0x00a8}, {0x0010, 0x005d}, {0x0010, 0x005e}, - {0x0013, 0x00a9}, {0x0010, 0x005f}, {0x0013, 0x00aa}, {0x0012, 0x013d}, {0x0013, 0x00ab}, {0x0013, 0x00ac}, {0x0013, 0x00ad}, {0x0013, 0x00ae}, - {0x0013, 0x00af}, {0x0013, 0x00b0}, {0x0013, 0x00b1}, {0x0013, 0x00b2}, {0x0013, 0x00b3}, {0x0013, 0x00b4}, {0x0013, 0x00b5}, {0x0013, 0x00b6}, - {0x0013, 0x00b7}, {0x0013, 0x00b8}, {0x0013, 0x00b9}, {0x0013, 0x00ba}, {0x0013, 0x00bb}, {0x0013, 0x00bc}, {0x0013, 0x00bd}, {0x0013, 0x00be}, - {0x0013, 0x00bf}, {0x0013, 0x00c0}, {0x0011, 0x00a8}, {0x0013, 0x00c1}, {0x0011, 0x00a9}, {0x0013, 0x00c2}, {0x0013, 0x00c3}, {0x0013, 0x00c4}, - {0x0013, 0x00c5}, {0x0013, 0x00c6}, {0x0013, 0x00c7}, {0x0013, 0x00c8}, {0x0013, 0x00c9}, {0x0013, 0x00ca}, {0x0013, 0x00cb}, {0x0013, 0x00cc}, - {0x0013, 0x00cd}, {0x0013, 0x00ce}, {0x0013, 0x00cf}, {0x0013, 0x00d0}, {0x0013, 0x00d1}, {0x0013, 0x00d2}, {0x0013, 0x00d3}, {0x0013, 0x00d4}, - {0x0013, 0x00d5}, {0x0013, 0x00d6}, {0x0013, 0x00d7}, {0x0013, 0x00d8}, {0x0013, 0x00d9}, {0x0013, 0x00da}, {0x0012, 0x013e}, {0x0013, 0x00db}, - {0x0013, 0x00dc}, {0x0013, 0x00dd}, {0x0013, 0x00de}, {0x0013, 0x00df}, {0x0013, 0x00e0}, {0x0013, 0x00e1}, {0x0013, 0x00e2}, {0x0013, 0x00e3}, - {0x0013, 0x00e4}, {0x0013, 0x00e5}, {0x0013, 0x00e6}, {0x0013, 0x00e7}, {0x0013, 0x00e8}, {0x0013, 0x00e9}, {0x0013, 0x00ea}, {0x0013, 0x00eb}, - {0x0013, 0x00ec}, {0x0013, 0x00ed}, {0x0013, 0x00ee}, {0x0013, 0x00ef}, {0x0013, 0x00f0}, {0x0013, 0x00f1}, {0x0013, 0x00f2}, {0x0013, 0x00f3}, - {0x0013, 0x00f4}, {0x0013, 0x00f5}, {0x0013, 0x00f6}, {0x0013, 0x00f7}, {0x0013, 0x00f8}, {0x0013, 0x00f9}, {0x0013, 0x00fa}, {0x0013, 0x00fb}, - {0x0013, 0x00fc}, {0x0013, 0x00fd}, {0x0013, 0x00fe}, {0x0013, 0x00ff}, {0x0013, 0x0100}, {0x0013, 0x0101}, {0x0013, 0x0102}, {0x0013, 0x0103}, - {0x0013, 0x0104}, {0x0013, 0x0105}, {0x0013, 0x0106}, {0x0013, 0x0107}, {0x0013, 0x0108}, {0x0013, 0x0109}, {0x0013, 0x010a}, {0x0013, 0x010b}, - {0x0013, 0x010c}, {0x0013, 0x010d}, {0x0013, 0x010e}, {0x0013, 0x010f}, {0x0013, 0x0110}, {0x0013, 0x0111}, {0x0013, 0x0112}, {0x0013, 0x0113}, - {0x0013, 0x0114}, {0x0013, 0x0115}, {0x0013, 0x0116}, {0x0013, 0x0117}, {0x0013, 0x0118}, {0x0013, 0x0119}, {0x0013, 0x011a}, {0x0013, 0x011b}, - {0x0013, 0x011c}, {0x0013, 0x011d}, {0x0013, 0x011e}, {0x0013, 0x011f}, {0x0013, 0x0120}, {0x0013, 0x0121}, {0x0013, 0x0122}, {0x0013, 0x0123}, - {0x0013, 0x0124}, {0x0013, 0x0125}, {0x0013, 0x0126}, {0x0013, 0x0127}, {0x0013, 0x0128}, {0x0013, 0x0129}, {0x0013, 0x012a}, {0x0013, 0x012b}, - {0x0013, 0x012c}, {0x0013, 0x012d}, {0x0013, 0x012e}, {0x0013, 0x012f}, {0x0013, 0x0130}, {0x0013, 0x0131}, {0x0013, 0x0132}, {0x0013, 0x0133}, - {0x0013, 0x0134}, {0x0013, 0x0135}, {0x0013, 0x0136}, {0x0013, 0x0137}, {0x0013, 0x0138}, {0x0013, 0x0139}, {0x0013, 0x013a}, {0x0013, 0x013b}, - {0x0013, 0x013c}, {0x0013, 0x013d}, {0x0013, 0x013e}, {0x0013, 0x013f}, {0x0013, 0x0140}, {0x0013, 0x0141}, {0x0013, 0x0142}, {0x0013, 0x0143}, - {0x0013, 0x0144}, {0x0013, 0x0145}, {0x0013, 0x0146}, {0x0013, 0x0147}, {0x0013, 0x0148}, {0x0013, 0x0149}, {0x0013, 0x014a}, {0x0013, 0x014b}, - {0x0013, 0x014c}, {0x0013, 0x014d}, {0x0013, 0x014e}, {0x0013, 0x014f}, {0x0013, 0x0150}, {0x0013, 0x0151}, {0x0013, 0x0152}, {0x0013, 0x0153}, - {0x0013, 0x0154}, {0x0013, 0x0155}, {0x0013, 0x0156}, {0x0013, 0x0157}, {0x0013, 0x0158}, {0x0013, 0x0159}, {0x0013, 0x015a}, {0x0013, 0x015b}, - {0x0013, 0x015c}, {0x0013, 0x015d}, {0x0013, 0x015e}, {0x0013, 0x015f}, {0x0013, 0x0160}, {0x0013, 0x0161}, {0x0013, 0x0162}, {0x0013, 0x0163}, - {0x0013, 0x0164}, {0x0013, 0x0165}, {0x0013, 0x0166}, {0x0013, 0x0167}, {0x0013, 0x0168}, {0x0013, 0x0169}, {0x0013, 0x016a}, {0x0013, 0x016b}, - {0x0013, 0x016c}, {0x0013, 0x016d}, {0x0013, 0x016e}, {0x0013, 0x016f}, {0x0013, 0x0170}, {0x0013, 0x0171}, {0x0013, 0x0172}, {0x0013, 0x0173}, - {0x0013, 0x0174}, {0x0013, 0x0175}, {0x0013, 0x0176}, {0x0013, 0x0177}, {0x0013, 0x0178}, {0x0013, 0x0179}, {0x0013, 0x017a}, {0x0013, 0x017b}, - {0x0013, 0x017c}, {0x0013, 0x017d}, {0x0013, 0x017e}, {0x0013, 0x017f}, {0x0013, 0x0180}, {0x0013, 0x0181}, {0x0013, 0x0182}, {0x0013, 0x0183}, - {0x0013, 0x0184}, {0x0013, 0x0185}, {0x0013, 0x0186}, {0x0013, 0x0187}, {0x0013, 0x0188}, {0x0013, 0x0189}, {0x0013, 0x018a}, {0x0013, 0x018b}, - {0x0013, 0x018c}, {0x0013, 0x018d}, {0x0013, 0x018e}, {0x0013, 0x018f}, {0x0013, 0x0190}, {0x0013, 0x0191}, {0x0013, 0x0192}, {0x0013, 0x0193}, - {0x0013, 0x0194}, {0x0013, 0x0195}, {0x0013, 0x0196}, {0x0013, 0x0197}, {0x0013, 0x0198}, {0x0013, 0x0199}, {0x0013, 0x019a}, {0x0013, 0x019b}, - {0x0013, 0x019c}, {0x0013, 0x019d}, {0x0013, 0x019e}, {0x0013, 0x019f}, {0x0013, 0x01a0}, {0x0013, 0x01a1}, {0x0013, 0x01a2}, {0x0013, 0x01a3}, - {0x0013, 0x01a4}, {0x0013, 0x01a5}, {0x0013, 0x01a6}, {0x0013, 0x01a7}, {0x0013, 0x01a8}, {0x0013, 0x01a9}, {0x0013, 0x01aa}, {0x0013, 0x01ab}, - {0x0013, 0x01ac}, {0x0013, 0x01ad}, {0x0013, 0x01ae}, {0x0013, 0x01af}, {0x0013, 0x01b0}, {0x0013, 0x01b1}, {0x0013, 0x01b2}, {0x0013, 0x01b3}, - {0x0013, 0x01b4}, {0x0013, 0x01b5}, {0x0013, 0x01b6}, {0x0013, 0x01b7}, {0x0013, 0x01b8}, {0x0013, 0x01b9}, {0x0013, 0x01ba}, {0x0013, 0x01bb}, - {0x0013, 0x01bc}, {0x0013, 0x01bd}, {0x0013, 0x01be}, {0x0013, 0x01bf}, {0x0013, 0x01c0}, {0x0013, 0x01c1}, {0x0013, 0x01c2}, {0x0013, 0x01c3}, - {0x0013, 0x01c4}, {0x0013, 0x01c5}, {0x0013, 0x01c6}, {0x0013, 0x01c7}, {0x0013, 0x01c8}, {0x0013, 0x01c9}, {0x0013, 0x01ca}, {0x0013, 0x01cb}, - {0x0013, 0x01cc}, {0x0013, 0x01cd}, {0x0013, 0x01ce}, {0x0013, 0x01cf}, {0x0013, 0x01d0}, {0x0013, 0x01d1}, {0x0013, 0x01d2}, {0x0013, 0x01d3}, - {0x0013, 0x01d4}, {0x0013, 0x01d5}, {0x0013, 0x01d6}, {0x0013, 0x01d7}, {0x0013, 0x01d8}, {0x0013, 0x01d9}, {0x0013, 0x01da}, {0x0013, 0x01db}, - {0x0013, 0x01dc}, {0x0013, 0x01dd}, {0x0013, 0x01de}, {0x0013, 0x01df}, {0x0013, 0x01e0}, {0x0013, 0x01e1}, {0x0013, 0x01e2}, {0x0013, 0x01e3}, - {0x0013, 0x01e4}, {0x0013, 0x01e5}, {0x0013, 0x01e6}, {0x0013, 0x01e7}, {0x0013, 0x01e8}, {0x0013, 0x01e9}, {0x0013, 0x01ea}, {0x0013, 0x01eb}, - {0x0013, 0x01ec}, {0x0013, 0x01ed}, {0x0013, 0x01ee}, {0x0013, 0x01ef}, {0x0013, 0x01f0}, {0x0013, 0x01f1}, {0x0013, 0x01f2}, {0x0013, 0x01f3}, - {0x0013, 0x01f4}, {0x0013, 0x01f5}, {0x0013, 0x01f6}, {0x0013, 0x01f7}, {0x0013, 0x01f8}, {0x0013, 0x01f9}, {0x0013, 0x01fa}, {0x0013, 0x01fb}, - {0x0013, 0x01fc}, {0x0013, 0x01fd}, {0x0013, 0x01fe}, {0x0013, 0x01ff}, {0x0013, 0x0200}, {0x0013, 0x0201}, {0x0013, 0x0202}, {0x0013, 0x0203}, - {0x0013, 0x0204}, {0x0013, 0x0205}, {0x0013, 0x0206}, {0x0013, 0x0207}, {0x0013, 0x0208}, {0x0013, 0x0209}, {0x0013, 0x020a}, {0x0013, 0x020b}, - {0x0013, 0x020c}, {0x0013, 0x020d}, {0x0013, 0x020e}, {0x0013, 0x020f}, {0x0013, 0x0210}, {0x0013, 0x0211}, {0x0013, 0x0212}, {0x0013, 0x0213}, - {0x0013, 0x0214}, {0x0013, 0x0215}, {0x0013, 0x0216}, {0x0013, 0x0217}, {0x0013, 0x0218}, {0x0013, 0x0219}, {0x0013, 0x021a}, {0x0013, 0x021b}, - {0x0013, 0x021c}, {0x0013, 0x021d}, {0x0013, 0x021e}, {0x0013, 0x021f}, {0x0013, 0x0220}, {0x0013, 0x0221}, {0x0013, 0x0222}, {0x0013, 0x0223}, - {0x0013, 0x0224}, {0x0013, 0x0225}, {0x0013, 0x0226}, {0x0013, 0x0227}, {0x0013, 0x0228}, {0x0013, 0x0229}, {0x0013, 0x022a}, {0x0013, 0x022b}, - {0x0013, 0x022c}, {0x0013, 0x022d}, {0x0013, 0x022e}, {0x0013, 0x022f}, {0x0013, 0x0230}, {0x0013, 0x0231}, {0x0013, 0x0232}, {0x0013, 0x0233}, - {0x0013, 0x0234}, {0x0013, 0x0235}, {0x0013, 0x0236}, {0x0013, 0x0237}, {0x0013, 0x0238}, {0x0013, 0x0239}, {0x0013, 0x023a}, {0x0013, 0x023b}, - {0x0013, 0x023c}, {0x0013, 0x023d}, {0x0013, 0x023e}, {0x0013, 0x023f}, {0x0013, 0x0240}, {0x0013, 0x0241}, {0x0013, 0x0242}, {0x0013, 0x0243}, - {0x0013, 0x0244}, {0x0013, 0x0245}, {0x0013, 0x0246}, {0x0013, 0x0247}, {0x0013, 0x0248}, {0x0013, 0x0249}, {0x0013, 0x024a}, {0x0013, 0x024b}, - {0x0013, 0x024c}, {0x0013, 0x024d}, {0x0013, 0x024e}, {0x0013, 0x024f}, {0x0013, 0x0250}, {0x0013, 0x0251}, {0x0013, 0x0252}, {0x0013, 0x0253}, - {0x0013, 0x0254}, {0x0013, 0x0255}, {0x0013, 0x0256}, {0x0013, 0x0257}, {0x0013, 0x0258}, {0x0013, 0x0259}, {0x0013, 0x025a}, {0x0013, 0x025b}, - {0x0013, 0x025c}, {0x0013, 0x025d}, {0x0013, 0x025e}, {0x0013, 0x025f}, {0x0013, 0x0260}, {0x0013, 0x0261}, {0x0013, 0x0262}, {0x0013, 0x0263}, - {0x0013, 0x0264}, {0x0013, 0x0265}, {0x0013, 0x0266}, {0x0013, 0x0267}, {0x0013, 0x0268}, {0x0013, 0x0269}, {0x0013, 0x026a}, {0x0013, 0x026b}, - {0x0012, 0x013f}, - -}; - -const uint32_t c_aauiCQMFHuffDec48[110][16] = -{ - {0x0005ffff, 0x0003ffff, 0x0004ffff, 0x0001ffff, 0x0002ffff, 0x00000037, 0x00010001, 0x00010001, 0x0001001b, 0x0001001b, 0x0001001c, 0x0001001c, 0x00020000, 0x00020000, 0x00020000, 0x00020000, }, - {0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, }, - {0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, }, - {0x0001003a, 0x0001003a, 0x00010054, 0x00010054, 0x0001006d, 0x0001006d, 0x0001006e, 0x0001006e, 0x00020003, 0x00020003, 0x00020003, 0x00020003, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001e, }, - {0x00020039, 0x00020039, 0x00020039, 0x00020039, 0x00020051, 0x00020051, 0x00020051, 0x00020051, 0x00020052, 0x00020052, 0x00020052, 0x00020052, 0x00020053, 0x00020053, 0x00020053, 0x00020053, }, - {0x000bffff, 0x000affff, 0x0009ffff, 0x0008ffff, 0x0006ffff, 0x0007ffff, 0x00000004, 0x00000020, 0x0000003b, 0x00000055, 0x0000006c, 0x0000006f, 0x00000088, 0x00000089, 0x0001001f, 0x0001001f, }, - {0x00030056, 0x00030056, 0x00030056, 0x00030056, 0x00030056, 0x00030056, 0x00030056, 0x00030056, 0x00030070, 0x00030070, 0x00030070, 0x00030070, 0x00030070, 0x00030070, 0x00030070, 0x00030070, }, - {0x00030087, 0x00030087, 0x00030087, 0x00030087, 0x00030087, 0x00030087, 0x00030087, 0x00030087, 0x0003008a, 0x0003008a, 0x0003008a, 0x0003008a, 0x0003008a, 0x0003008a, 0x0003008a, 0x0003008a, }, - {0x000200a3, 0x000200a3, 0x000200a3, 0x000200a3, 0x000200a4, 0x000200a4, 0x000200a4, 0x000200a4, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, }, - {0x00020021, 0x00020021, 0x00020021, 0x00020021, 0x0002003c, 0x0002003c, 0x0002003c, 0x0002003c, 0x00020071, 0x00020071, 0x00020071, 0x00020071, 0x0002008b, 0x0002008b, 0x0002008b, 0x0002008b, }, - {0x00000072, 0x0000008c, 0x000000a6, 0x000000bd, 0x000000bf, 0x000000c0, 0x00010006, 0x00010006, 0x00010057, 0x00010057, 0x000100a2, 0x000100a2, 0x000100a5, 0x000100a5, 0x000100be, 0x000100be, }, - {0x001dffff, 0x002effff, 0x003fffff, 0x0050ffff, 0x0019ffff, 0x0013ffff, 0x0012ffff, 0x0010ffff, 0x0011ffff, 0x000cffff, 0x000dffff, 0x000effff, 0x000fffff, 0x00000007, 0x00000022, 0x0000003d, }, - {0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, }, - {0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030073, 0x00030073, 0x00030073, 0x00030073, 0x00030073, 0x00030073, 0x00030073, 0x00030073, }, - {0x0003008d, 0x0003008d, 0x0003008d, 0x0003008d, 0x0003008d, 0x0003008d, 0x0003008d, 0x0003008d, 0x000300a7, 0x000300a7, 0x000300a7, 0x000300a7, 0x000300a7, 0x000300a7, 0x000300a7, 0x000300a7, }, - {0x000300c1, 0x000300c1, 0x000300c1, 0x000300c1, 0x000300c1, 0x000300c1, 0x000300c1, 0x000300c1, 0x000300d9, 0x000300d9, 0x000300d9, 0x000300d9, 0x000300d9, 0x000300d9, 0x000300d9, 0x000300d9, }, - {0x000100f5, 0x000100f5, 0x000100f6, 0x000100f6, 0x00020059, 0x00020059, 0x00020059, 0x00020059, 0x0002008e, 0x0002008e, 0x0002008e, 0x0002008e, 0x000200a8, 0x000200a8, 0x000200a8, 0x000200a8, }, - {0x000200c2, 0x000200c2, 0x000200c2, 0x000200c2, 0x000200d8, 0x000200d8, 0x000200d8, 0x000200d8, 0x000200da, 0x000200da, 0x000200da, 0x000200da, 0x000200db, 0x000200db, 0x000200db, 0x000200db, }, - {0x00010008, 0x00010008, 0x00010024, 0x00010024, 0x0001003f, 0x0001003f, 0x0001005a, 0x0001005a, 0x00010074, 0x00010074, 0x000100c3, 0x000100c3, 0x000100dc, 0x000100dc, 0x000100f4, 0x000100f4, }, - {0x0015ffff, 0x0014ffff, 0x0016ffff, 0x0017ffff, 0x0018ffff, 0x00000009, 0x00000075, 0x0000008f, 0x000000a9, 0x000000dd, 0x000000f3, 0x000000f7, 0x000000f8, 0x0000010e, 0x0000010f, 0x00000111, }, - {0x00030090, 0x00030090, 0x00030090, 0x00030090, 0x00030090, 0x00030090, 0x00030090, 0x00030090, 0x00030091, 0x00030091, 0x00030091, 0x00030091, 0x00030091, 0x00030091, 0x00030091, 0x00030091, }, - {0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030040, 0x00030040, 0x00030040, 0x00030040, 0x00030040, 0x00030040, 0x00030040, 0x00030040, }, - {0x000300ab, 0x000300ab, 0x000300ab, 0x000300ab, 0x000300ab, 0x000300ab, 0x000300ab, 0x000300ab, 0x000300de, 0x000300de, 0x000300de, 0x000300de, 0x000300de, 0x000300de, 0x000300de, 0x000300de, }, - {0x000300e0, 0x000300e0, 0x000300e0, 0x000300e0, 0x000300e0, 0x000300e0, 0x000300e0, 0x000300e0, 0x000300fa, 0x000300fa, 0x000300fa, 0x000300fa, 0x000300fa, 0x000300fa, 0x000300fa, 0x000300fa, }, - {0x0003012a, 0x0003012a, 0x0003012a, 0x0003012a, 0x0003012a, 0x0003012a, 0x0003012a, 0x0003012a, 0x0003012c, 0x0003012c, 0x0003012c, 0x0003012c, 0x0003012c, 0x0003012c, 0x0003012c, 0x0003012c, }, - {0x0061ffff, 0x0062ffff, 0x0063ffff, 0x0064ffff, 0x0065ffff, 0x0066ffff, 0x0067ffff, 0x0068ffff, 0x0069ffff, 0x006affff, 0x006bffff, 0x006cffff, 0x006dffff, 0x001bffff, 0x001affff, 0x001cffff, }, - {0x00020076, 0x00020076, 0x00020076, 0x00020076, 0x000200aa, 0x000200aa, 0x000200aa, 0x000200aa, 0x000200ac, 0x000200ac, 0x000200ac, 0x000200ac, 0x000200c4, 0x000200c4, 0x000200c4, 0x000200c4, }, - {0x000102d4, 0x000102d4, 0x000102d5, 0x000102d5, 0x000102d6, 0x000102d6, 0x000102d7, 0x000102d7, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002005b, 0x0002005b, 0x0002005b, 0x0002005b, }, - {0x000200e1, 0x000200e1, 0x000200e1, 0x000200e1, 0x00020113, 0x00020113, 0x00020113, 0x00020113, 0x00020146, 0x00020146, 0x00020146, 0x00020146, 0x000202d8, 0x000202d8, 0x000202d8, 0x000202d8, }, - {0x001effff, 0x001fffff, 0x0020ffff, 0x0021ffff, 0x0022ffff, 0x0023ffff, 0x0024ffff, 0x0027ffff, 0x0025ffff, 0x0026ffff, 0x0028ffff, 0x0029ffff, 0x002affff, 0x002bffff, 0x002cffff, 0x002dffff, }, - {0x0001000b, 0x0001000b, 0x0001000c, 0x0001000c, 0x0001000d, 0x0001000d, 0x0001000e, 0x0001000e, 0x0001000f, 0x0001000f, 0x00010010, 0x00010010, 0x00010011, 0x00010011, 0x00010012, 0x00010012, }, - {0x00010013, 0x00010013, 0x00010014, 0x00010014, 0x00010015, 0x00010015, 0x00010016, 0x00010016, 0x00010017, 0x00010017, 0x00010018, 0x00010018, 0x00010019, 0x00010019, 0x0001001a, 0x0001001a, }, - {0x00010026, 0x00010026, 0x00010027, 0x00010027, 0x00010028, 0x00010028, 0x00010029, 0x00010029, 0x0001002a, 0x0001002a, 0x0001002b, 0x0001002b, 0x0001002c, 0x0001002c, 0x0001002d, 0x0001002d, }, - {0x0001002e, 0x0001002e, 0x0001002f, 0x0001002f, 0x00010030, 0x00010030, 0x00010031, 0x00010031, 0x00010032, 0x00010032, 0x00010033, 0x00010033, 0x00010034, 0x00010034, 0x00010035, 0x00010035, }, - {0x00010041, 0x00010041, 0x00010042, 0x00010042, 0x00010043, 0x00010043, 0x00010044, 0x00010044, 0x00010045, 0x00010045, 0x00010046, 0x00010046, 0x00010047, 0x00010047, 0x00010048, 0x00010048, }, - {0x00010049, 0x00010049, 0x0001004a, 0x0001004a, 0x0001004b, 0x0001004b, 0x0001004c, 0x0001004c, 0x0001004d, 0x0001004d, 0x0001004e, 0x0001004e, 0x0001004f, 0x0001004f, 0x00010050, 0x00010050, }, - {0x0001005c, 0x0001005c, 0x0001005d, 0x0001005d, 0x0001005e, 0x0001005e, 0x0001005f, 0x0001005f, 0x00010060, 0x00010060, 0x00010061, 0x00010061, 0x00010062, 0x00010062, 0x00010063, 0x00010063, }, - {0x00010077, 0x00010077, 0x00010078, 0x00010078, 0x00010079, 0x00010079, 0x0001007a, 0x0001007a, 0x0001007b, 0x0001007b, 0x0001007c, 0x0001007c, 0x0001007d, 0x0001007d, 0x0001007e, 0x0001007e, }, - {0x0001007f, 0x0001007f, 0x00010080, 0x00010080, 0x00010081, 0x00010081, 0x00010082, 0x00010082, 0x00010083, 0x00010083, 0x00010084, 0x00010084, 0x00010085, 0x00010085, 0x00010086, 0x00010086, }, - {0x00010064, 0x00010064, 0x00010065, 0x00010065, 0x00010066, 0x00010066, 0x00010067, 0x00010067, 0x00010068, 0x00010068, 0x00010069, 0x00010069, 0x0001006a, 0x0001006a, 0x0001006b, 0x0001006b, }, - {0x00010092, 0x00010092, 0x00010093, 0x00010093, 0x00010094, 0x00010094, 0x00010095, 0x00010095, 0x00010096, 0x00010096, 0x00010097, 0x00010097, 0x00010098, 0x00010098, 0x00010099, 0x00010099, }, - {0x0001009a, 0x0001009a, 0x0001009b, 0x0001009b, 0x0001009c, 0x0001009c, 0x0001009d, 0x0001009d, 0x0001009e, 0x0001009e, 0x0001009f, 0x0001009f, 0x000100a0, 0x000100a0, 0x000100a1, 0x000100a1, }, - {0x000100ad, 0x000100ad, 0x000100ae, 0x000100ae, 0x000100af, 0x000100af, 0x000100b0, 0x000100b0, 0x000100b1, 0x000100b1, 0x000100b2, 0x000100b2, 0x000100b3, 0x000100b3, 0x000100b4, 0x000100b4, }, - {0x000100b5, 0x000100b5, 0x000100b6, 0x000100b6, 0x000100b7, 0x000100b7, 0x000100b8, 0x000100b8, 0x000100b9, 0x000100b9, 0x000100ba, 0x000100ba, 0x000100bb, 0x000100bb, 0x000100bc, 0x000100bc, }, - {0x000100c5, 0x000100c5, 0x000100c6, 0x000100c6, 0x000100c7, 0x000100c7, 0x000100c8, 0x000100c8, 0x000100c9, 0x000100c9, 0x000100ca, 0x000100ca, 0x000100cb, 0x000100cb, 0x000100cc, 0x000100cc, }, - {0x000100cd, 0x000100cd, 0x000100ce, 0x000100ce, 0x000100cf, 0x000100cf, 0x000100d0, 0x000100d0, 0x000100d1, 0x000100d1, 0x000100d2, 0x000100d2, 0x000100d3, 0x000100d3, 0x000100d4, 0x000100d4, }, - {0x002fffff, 0x0030ffff, 0x0031ffff, 0x0032ffff, 0x0033ffff, 0x0034ffff, 0x0035ffff, 0x0036ffff, 0x0037ffff, 0x0038ffff, 0x0039ffff, 0x003affff, 0x003bffff, 0x003cffff, 0x003dffff, 0x003effff, }, - {0x000100d5, 0x000100d5, 0x000100d6, 0x000100d6, 0x000100d7, 0x000100d7, 0x000100df, 0x000100df, 0x000100e2, 0x000100e2, 0x000100e3, 0x000100e3, 0x000100e4, 0x000100e4, 0x000100e5, 0x000100e5, }, - {0x000100e6, 0x000100e6, 0x000100e7, 0x000100e7, 0x000100e8, 0x000100e8, 0x000100e9, 0x000100e9, 0x000100ea, 0x000100ea, 0x000100eb, 0x000100eb, 0x000100ec, 0x000100ec, 0x000100ed, 0x000100ed, }, - {0x000100ee, 0x000100ee, 0x000100ef, 0x000100ef, 0x000100f0, 0x000100f0, 0x000100f1, 0x000100f1, 0x000100f2, 0x000100f2, 0x000100f9, 0x000100f9, 0x000100fb, 0x000100fb, 0x000100fc, 0x000100fc, }, - {0x000100fd, 0x000100fd, 0x000100fe, 0x000100fe, 0x000100ff, 0x000100ff, 0x00010100, 0x00010100, 0x00010101, 0x00010101, 0x00010102, 0x00010102, 0x00010103, 0x00010103, 0x00010104, 0x00010104, }, - {0x00010105, 0x00010105, 0x00010106, 0x00010106, 0x00010107, 0x00010107, 0x00010108, 0x00010108, 0x00010109, 0x00010109, 0x0001010a, 0x0001010a, 0x0001010b, 0x0001010b, 0x0001010c, 0x0001010c, }, - {0x0001010d, 0x0001010d, 0x00010110, 0x00010110, 0x00010112, 0x00010112, 0x00010114, 0x00010114, 0x00010115, 0x00010115, 0x00010116, 0x00010116, 0x00010117, 0x00010117, 0x00010118, 0x00010118, }, - {0x00010119, 0x00010119, 0x0001011a, 0x0001011a, 0x0001011b, 0x0001011b, 0x0001011c, 0x0001011c, 0x0001011d, 0x0001011d, 0x0001011e, 0x0001011e, 0x0001011f, 0x0001011f, 0x00010120, 0x00010120, }, - {0x00010121, 0x00010121, 0x00010122, 0x00010122, 0x00010123, 0x00010123, 0x00010124, 0x00010124, 0x00010125, 0x00010125, 0x00010126, 0x00010126, 0x00010127, 0x00010127, 0x00010128, 0x00010128, }, - {0x00010129, 0x00010129, 0x0001012b, 0x0001012b, 0x0001012d, 0x0001012d, 0x0001012e, 0x0001012e, 0x0001012f, 0x0001012f, 0x00010130, 0x00010130, 0x00010131, 0x00010131, 0x00010132, 0x00010132, }, - {0x00010133, 0x00010133, 0x00010134, 0x00010134, 0x00010135, 0x00010135, 0x00010136, 0x00010136, 0x00010137, 0x00010137, 0x00010138, 0x00010138, 0x00010139, 0x00010139, 0x0001013a, 0x0001013a, }, - {0x0001013b, 0x0001013b, 0x0001013c, 0x0001013c, 0x0001013d, 0x0001013d, 0x0001013e, 0x0001013e, 0x0001013f, 0x0001013f, 0x00010140, 0x00010140, 0x00010141, 0x00010141, 0x00010142, 0x00010142, }, - {0x00010143, 0x00010143, 0x00010144, 0x00010144, 0x00010145, 0x00010145, 0x00010147, 0x00010147, 0x00010148, 0x00010148, 0x00010149, 0x00010149, 0x0001014a, 0x0001014a, 0x0001014b, 0x0001014b, }, - {0x0001014c, 0x0001014c, 0x0001014d, 0x0001014d, 0x0001014e, 0x0001014e, 0x0001014f, 0x0001014f, 0x00010150, 0x00010150, 0x00010151, 0x00010151, 0x00010152, 0x00010152, 0x00010153, 0x00010153, }, - {0x00010154, 0x00010154, 0x00010155, 0x00010155, 0x00010156, 0x00010156, 0x00010157, 0x00010157, 0x00010158, 0x00010158, 0x00010159, 0x00010159, 0x0001015a, 0x0001015a, 0x0001015b, 0x0001015b, }, - {0x0001015c, 0x0001015c, 0x0001015d, 0x0001015d, 0x0001015e, 0x0001015e, 0x0001015f, 0x0001015f, 0x00010160, 0x00010160, 0x00010161, 0x00010161, 0x00010162, 0x00010162, 0x00010163, 0x00010163, }, - {0x00010164, 0x00010164, 0x00010165, 0x00010165, 0x00010166, 0x00010166, 0x00010167, 0x00010167, 0x00010168, 0x00010168, 0x00010169, 0x00010169, 0x0001016a, 0x0001016a, 0x0001016b, 0x0001016b, }, - {0x0040ffff, 0x0041ffff, 0x0042ffff, 0x0043ffff, 0x0044ffff, 0x0045ffff, 0x0046ffff, 0x0047ffff, 0x0048ffff, 0x0049ffff, 0x004affff, 0x004bffff, 0x004cffff, 0x004dffff, 0x004effff, 0x004fffff, }, - {0x0001016c, 0x0001016c, 0x0001016d, 0x0001016d, 0x0001016e, 0x0001016e, 0x0001016f, 0x0001016f, 0x00010170, 0x00010170, 0x00010171, 0x00010171, 0x00010172, 0x00010172, 0x00010173, 0x00010173, }, - {0x00010174, 0x00010174, 0x00010175, 0x00010175, 0x00010176, 0x00010176, 0x00010177, 0x00010177, 0x00010178, 0x00010178, 0x00010179, 0x00010179, 0x0001017a, 0x0001017a, 0x0001017b, 0x0001017b, }, - {0x0001017c, 0x0001017c, 0x0001017d, 0x0001017d, 0x0001017e, 0x0001017e, 0x0001017f, 0x0001017f, 0x00010180, 0x00010180, 0x00010181, 0x00010181, 0x00010182, 0x00010182, 0x00010183, 0x00010183, }, - {0x00010184, 0x00010184, 0x00010185, 0x00010185, 0x00010186, 0x00010186, 0x00010187, 0x00010187, 0x00010188, 0x00010188, 0x00010189, 0x00010189, 0x0001018a, 0x0001018a, 0x0001018b, 0x0001018b, }, - {0x0001018c, 0x0001018c, 0x0001018d, 0x0001018d, 0x0001018e, 0x0001018e, 0x0001018f, 0x0001018f, 0x00010190, 0x00010190, 0x00010191, 0x00010191, 0x00010192, 0x00010192, 0x00010193, 0x00010193, }, - {0x00010194, 0x00010194, 0x00010195, 0x00010195, 0x00010196, 0x00010196, 0x00010197, 0x00010197, 0x00010198, 0x00010198, 0x00010199, 0x00010199, 0x0001019a, 0x0001019a, 0x0001019b, 0x0001019b, }, - {0x0001019c, 0x0001019c, 0x0001019d, 0x0001019d, 0x0001019e, 0x0001019e, 0x0001019f, 0x0001019f, 0x000101a0, 0x000101a0, 0x000101a1, 0x000101a1, 0x000101a2, 0x000101a2, 0x000101a3, 0x000101a3, }, - {0x000101a4, 0x000101a4, 0x000101a5, 0x000101a5, 0x000101a6, 0x000101a6, 0x000101a7, 0x000101a7, 0x000101a8, 0x000101a8, 0x000101a9, 0x000101a9, 0x000101aa, 0x000101aa, 0x000101ab, 0x000101ab, }, - {0x000101ac, 0x000101ac, 0x000101ad, 0x000101ad, 0x000101ae, 0x000101ae, 0x000101af, 0x000101af, 0x000101b0, 0x000101b0, 0x000101b1, 0x000101b1, 0x000101b2, 0x000101b2, 0x000101b3, 0x000101b3, }, - {0x000101b4, 0x000101b4, 0x000101b5, 0x000101b5, 0x000101b6, 0x000101b6, 0x000101b7, 0x000101b7, 0x000101b8, 0x000101b8, 0x000101b9, 0x000101b9, 0x000101ba, 0x000101ba, 0x000101bb, 0x000101bb, }, - {0x000101bc, 0x000101bc, 0x000101bd, 0x000101bd, 0x000101be, 0x000101be, 0x000101bf, 0x000101bf, 0x000101c0, 0x000101c0, 0x000101c1, 0x000101c1, 0x000101c2, 0x000101c2, 0x000101c3, 0x000101c3, }, - {0x000101c4, 0x000101c4, 0x000101c5, 0x000101c5, 0x000101c6, 0x000101c6, 0x000101c7, 0x000101c7, 0x000101c8, 0x000101c8, 0x000101c9, 0x000101c9, 0x000101ca, 0x000101ca, 0x000101cb, 0x000101cb, }, - {0x000101cc, 0x000101cc, 0x000101cd, 0x000101cd, 0x000101ce, 0x000101ce, 0x000101cf, 0x000101cf, 0x000101d0, 0x000101d0, 0x000101d1, 0x000101d1, 0x000101d2, 0x000101d2, 0x000101d3, 0x000101d3, }, - {0x000101d4, 0x000101d4, 0x000101d5, 0x000101d5, 0x000101d6, 0x000101d6, 0x000101d7, 0x000101d7, 0x000101d8, 0x000101d8, 0x000101d9, 0x000101d9, 0x000101da, 0x000101da, 0x000101db, 0x000101db, }, - {0x000101dc, 0x000101dc, 0x000101dd, 0x000101dd, 0x000101de, 0x000101de, 0x000101df, 0x000101df, 0x000101e0, 0x000101e0, 0x000101e1, 0x000101e1, 0x000101e2, 0x000101e2, 0x000101e3, 0x000101e3, }, - {0x000101e4, 0x000101e4, 0x000101e5, 0x000101e5, 0x000101e6, 0x000101e6, 0x000101e7, 0x000101e7, 0x000101e8, 0x000101e8, 0x000101e9, 0x000101e9, 0x000101ea, 0x000101ea, 0x000101eb, 0x000101eb, }, - {0x0051ffff, 0x0052ffff, 0x0053ffff, 0x0054ffff, 0x0055ffff, 0x0056ffff, 0x0057ffff, 0x0058ffff, 0x0059ffff, 0x005affff, 0x005bffff, 0x005cffff, 0x005dffff, 0x005effff, 0x005fffff, 0x0060ffff, }, - {0x000101ec, 0x000101ec, 0x000101ed, 0x000101ed, 0x000101ee, 0x000101ee, 0x000101ef, 0x000101ef, 0x000101f0, 0x000101f0, 0x000101f1, 0x000101f1, 0x000101f2, 0x000101f2, 0x000101f3, 0x000101f3, }, - {0x000101f4, 0x000101f4, 0x000101f5, 0x000101f5, 0x000101f6, 0x000101f6, 0x000101f7, 0x000101f7, 0x000101f8, 0x000101f8, 0x000101f9, 0x000101f9, 0x000101fa, 0x000101fa, 0x000101fb, 0x000101fb, }, - {0x000101fc, 0x000101fc, 0x000101fd, 0x000101fd, 0x000101fe, 0x000101fe, 0x000101ff, 0x000101ff, 0x00010200, 0x00010200, 0x00010201, 0x00010201, 0x00010202, 0x00010202, 0x00010203, 0x00010203, }, - {0x00010204, 0x00010204, 0x00010205, 0x00010205, 0x00010206, 0x00010206, 0x00010207, 0x00010207, 0x00010208, 0x00010208, 0x00010209, 0x00010209, 0x0001020a, 0x0001020a, 0x0001020b, 0x0001020b, }, - {0x0001020c, 0x0001020c, 0x0001020d, 0x0001020d, 0x0001020e, 0x0001020e, 0x0001020f, 0x0001020f, 0x00010210, 0x00010210, 0x00010211, 0x00010211, 0x00010212, 0x00010212, 0x00010213, 0x00010213, }, - {0x00010214, 0x00010214, 0x00010215, 0x00010215, 0x00010216, 0x00010216, 0x00010217, 0x00010217, 0x00010218, 0x00010218, 0x00010219, 0x00010219, 0x0001021a, 0x0001021a, 0x0001021b, 0x0001021b, }, - {0x0001021c, 0x0001021c, 0x0001021d, 0x0001021d, 0x0001021e, 0x0001021e, 0x0001021f, 0x0001021f, 0x00010220, 0x00010220, 0x00010221, 0x00010221, 0x00010222, 0x00010222, 0x00010223, 0x00010223, }, - {0x00010224, 0x00010224, 0x00010225, 0x00010225, 0x00010226, 0x00010226, 0x00010227, 0x00010227, 0x00010228, 0x00010228, 0x00010229, 0x00010229, 0x0001022a, 0x0001022a, 0x0001022b, 0x0001022b, }, - {0x0001022c, 0x0001022c, 0x0001022d, 0x0001022d, 0x0001022e, 0x0001022e, 0x0001022f, 0x0001022f, 0x00010230, 0x00010230, 0x00010231, 0x00010231, 0x00010232, 0x00010232, 0x00010233, 0x00010233, }, - {0x00010234, 0x00010234, 0x00010235, 0x00010235, 0x00010236, 0x00010236, 0x00010237, 0x00010237, 0x00010238, 0x00010238, 0x00010239, 0x00010239, 0x0001023a, 0x0001023a, 0x0001023b, 0x0001023b, }, - {0x0001023c, 0x0001023c, 0x0001023d, 0x0001023d, 0x0001023e, 0x0001023e, 0x0001023f, 0x0001023f, 0x00010240, 0x00010240, 0x00010241, 0x00010241, 0x00010242, 0x00010242, 0x00010243, 0x00010243, }, - {0x00010244, 0x00010244, 0x00010245, 0x00010245, 0x00010246, 0x00010246, 0x00010247, 0x00010247, 0x00010248, 0x00010248, 0x00010249, 0x00010249, 0x0001024a, 0x0001024a, 0x0001024b, 0x0001024b, }, - {0x0001024c, 0x0001024c, 0x0001024d, 0x0001024d, 0x0001024e, 0x0001024e, 0x0001024f, 0x0001024f, 0x00010250, 0x00010250, 0x00010251, 0x00010251, 0x00010252, 0x00010252, 0x00010253, 0x00010253, }, - {0x00010254, 0x00010254, 0x00010255, 0x00010255, 0x00010256, 0x00010256, 0x00010257, 0x00010257, 0x00010258, 0x00010258, 0x00010259, 0x00010259, 0x0001025a, 0x0001025a, 0x0001025b, 0x0001025b, }, - {0x0001025c, 0x0001025c, 0x0001025d, 0x0001025d, 0x0001025e, 0x0001025e, 0x0001025f, 0x0001025f, 0x00010260, 0x00010260, 0x00010261, 0x00010261, 0x00010262, 0x00010262, 0x00010263, 0x00010263, }, - {0x00010264, 0x00010264, 0x00010265, 0x00010265, 0x00010266, 0x00010266, 0x00010267, 0x00010267, 0x00010268, 0x00010268, 0x00010269, 0x00010269, 0x0001026a, 0x0001026a, 0x0001026b, 0x0001026b, }, - {0x0001026c, 0x0001026c, 0x0001026d, 0x0001026d, 0x0001026e, 0x0001026e, 0x0001026f, 0x0001026f, 0x00010270, 0x00010270, 0x00010271, 0x00010271, 0x00010272, 0x00010272, 0x00010273, 0x00010273, }, - {0x00010274, 0x00010274, 0x00010275, 0x00010275, 0x00010276, 0x00010276, 0x00010277, 0x00010277, 0x00010278, 0x00010278, 0x00010279, 0x00010279, 0x0001027a, 0x0001027a, 0x0001027b, 0x0001027b, }, - {0x0001027c, 0x0001027c, 0x0001027d, 0x0001027d, 0x0001027e, 0x0001027e, 0x0001027f, 0x0001027f, 0x00010280, 0x00010280, 0x00010281, 0x00010281, 0x00010282, 0x00010282, 0x00010283, 0x00010283, }, - {0x00010284, 0x00010284, 0x00010285, 0x00010285, 0x00010286, 0x00010286, 0x00010287, 0x00010287, 0x00010288, 0x00010288, 0x00010289, 0x00010289, 0x0001028a, 0x0001028a, 0x0001028b, 0x0001028b, }, - {0x0001028c, 0x0001028c, 0x0001028d, 0x0001028d, 0x0001028e, 0x0001028e, 0x0001028f, 0x0001028f, 0x00010290, 0x00010290, 0x00010291, 0x00010291, 0x00010292, 0x00010292, 0x00010293, 0x00010293, }, - {0x00010294, 0x00010294, 0x00010295, 0x00010295, 0x00010296, 0x00010296, 0x00010297, 0x00010297, 0x00010298, 0x00010298, 0x00010299, 0x00010299, 0x0001029a, 0x0001029a, 0x0001029b, 0x0001029b, }, - {0x0001029c, 0x0001029c, 0x0001029d, 0x0001029d, 0x0001029e, 0x0001029e, 0x0001029f, 0x0001029f, 0x000102a0, 0x000102a0, 0x000102a1, 0x000102a1, 0x000102a2, 0x000102a2, 0x000102a3, 0x000102a3, }, - {0x000102a4, 0x000102a4, 0x000102a5, 0x000102a5, 0x000102a6, 0x000102a6, 0x000102a7, 0x000102a7, 0x000102a8, 0x000102a8, 0x000102a9, 0x000102a9, 0x000102aa, 0x000102aa, 0x000102ab, 0x000102ab, }, - {0x000102ac, 0x000102ac, 0x000102ad, 0x000102ad, 0x000102ae, 0x000102ae, 0x000102af, 0x000102af, 0x000102b0, 0x000102b0, 0x000102b1, 0x000102b1, 0x000102b2, 0x000102b2, 0x000102b3, 0x000102b3, }, - {0x000102b4, 0x000102b4, 0x000102b5, 0x000102b5, 0x000102b6, 0x000102b6, 0x000102b7, 0x000102b7, 0x000102b8, 0x000102b8, 0x000102b9, 0x000102b9, 0x000102ba, 0x000102ba, 0x000102bb, 0x000102bb, }, - {0x000102bc, 0x000102bc, 0x000102bd, 0x000102bd, 0x000102be, 0x000102be, 0x000102bf, 0x000102bf, 0x000102c0, 0x000102c0, 0x000102c1, 0x000102c1, 0x000102c2, 0x000102c2, 0x000102c3, 0x000102c3, }, - {0x000102c4, 0x000102c4, 0x000102c5, 0x000102c5, 0x000102c6, 0x000102c6, 0x000102c7, 0x000102c7, 0x000102c8, 0x000102c8, 0x000102c9, 0x000102c9, 0x000102ca, 0x000102ca, 0x000102cb, 0x000102cb, }, - {0x000102cc, 0x000102cc, 0x000102cd, 0x000102cd, 0x000102ce, 0x000102ce, 0x000102cf, 0x000102cf, 0x000102d0, 0x000102d0, 0x000102d1, 0x000102d1, 0x000102d2, 0x000102d2, 0x000102d3, 0x000102d3, }, -}; - -const uint32_t c_aauiCQMFHuffEnc49[729][2] = -{ - {0x0002, 0x0003}, {0x0003, 0x0003}, {0x0005, 0x0007}, {0x0007, 0x000a}, {0x0008, 0x0009}, {0x0008, 0x000a}, {0x0009, 0x0009}, {0x000b, 0x000d}, - {0x000d, 0x0014}, {0x000d, 0x0015}, {0x0010, 0x0052}, {0x0011, 0x0098}, {0x0013, 0x0000}, {0x0013, 0x0001}, {0x0013, 0x0002}, {0x0013, 0x0003}, - {0x0013, 0x0004}, {0x0013, 0x0005}, {0x0013, 0x0006}, {0x0013, 0x0007}, {0x0013, 0x0008}, {0x0013, 0x0009}, {0x0013, 0x000a}, {0x0013, 0x000b}, - {0x0013, 0x000c}, {0x0013, 0x000d}, {0x0013, 0x000e}, {0x0003, 0x0004}, {0x0003, 0x0005}, {0x0005, 0x0008}, {0x0006, 0x000a}, {0x0007, 0x000b}, - {0x0008, 0x000b}, {0x0008, 0x000c}, {0x000a, 0x000a}, {0x000b, 0x000e}, {0x000d, 0x0016}, {0x000f, 0x0031}, {0x0010, 0x0053}, {0x0012, 0x012a}, - {0x0013, 0x000f}, {0x0013, 0x0010}, {0x0013, 0x0011}, {0x0013, 0x0012}, {0x0013, 0x0013}, {0x0013, 0x0014}, {0x0013, 0x0015}, {0x0013, 0x0016}, - {0x0013, 0x0017}, {0x0013, 0x0018}, {0x0013, 0x0019}, {0x0013, 0x001a}, {0x0013, 0x001b}, {0x0013, 0x001c}, {0x0005, 0x0009}, {0x0005, 0x000a}, - {0x0005, 0x000b}, {0x0006, 0x000b}, {0x0007, 0x000c}, {0x0008, 0x000d}, {0x0009, 0x000a}, {0x000a, 0x000b}, {0x000c, 0x000f}, {0x000d, 0x0017}, - {0x000f, 0x0032}, {0x0010, 0x0054}, {0x0013, 0x001d}, {0x0013, 0x001e}, {0x0013, 0x001f}, {0x0013, 0x0020}, {0x0013, 0x0021}, {0x0013, 0x0022}, - {0x0013, 0x0023}, {0x0013, 0x0024}, {0x0013, 0x0025}, {0x0013, 0x0026}, {0x0013, 0x0027}, {0x0013, 0x0028}, {0x0013, 0x0029}, {0x0013, 0x002a}, - {0x0013, 0x002b}, {0x0007, 0x000d}, {0x0006, 0x000c}, {0x0006, 0x000d}, {0x0007, 0x000e}, {0x0007, 0x000f}, {0x0008, 0x000e}, {0x0009, 0x000b}, - {0x000b, 0x000f}, {0x000c, 0x0010}, {0x000e, 0x001d}, {0x000f, 0x0033}, {0x0011, 0x0099}, {0x0013, 0x002c}, {0x0013, 0x002d}, {0x0013, 0x002e}, - {0x0013, 0x002f}, {0x0013, 0x0030}, {0x0013, 0x0031}, {0x0013, 0x0032}, {0x0013, 0x0033}, {0x0013, 0x0034}, {0x0013, 0x0035}, {0x0013, 0x0036}, - {0x0013, 0x0037}, {0x0013, 0x0038}, {0x0013, 0x0039}, {0x0013, 0x003a}, {0x0008, 0x000f}, {0x0007, 0x0010}, {0x0007, 0x0011}, {0x0007, 0x0012}, - {0x0008, 0x0010}, {0x0009, 0x000c}, {0x000a, 0x000c}, {0x000c, 0x0011}, {0x000d, 0x0018}, {0x000e, 0x001e}, {0x0011, 0x009a}, {0x0011, 0x009b}, - {0x0013, 0x003b}, {0x0013, 0x003c}, {0x0013, 0x003d}, {0x0013, 0x003e}, {0x0013, 0x003f}, {0x0013, 0x0040}, {0x0013, 0x0041}, {0x0013, 0x0042}, - {0x0013, 0x0043}, {0x0013, 0x0044}, {0x0013, 0x0045}, {0x0013, 0x0046}, {0x0013, 0x0047}, {0x0013, 0x0048}, {0x0013, 0x0049}, {0x0008, 0x0011}, - {0x0007, 0x0013}, {0x0008, 0x0012}, {0x0008, 0x0013}, {0x0009, 0x000d}, {0x000a, 0x000d}, {0x000b, 0x0010}, {0x000c, 0x0012}, {0x000e, 0x001f}, - {0x000e, 0x0020}, {0x0010, 0x0055}, {0x0011, 0x009c}, {0x0013, 0x004a}, {0x0013, 0x004b}, {0x0013, 0x004c}, {0x0013, 0x004d}, {0x0013, 0x004e}, - {0x0013, 0x004f}, {0x0013, 0x0050}, {0x0013, 0x0051}, {0x0013, 0x0052}, {0x0013, 0x0053}, {0x0013, 0x0054}, {0x0013, 0x0055}, {0x0013, 0x0056}, - {0x0013, 0x0057}, {0x0013, 0x0058}, {0x0009, 0x000e}, {0x0009, 0x000f}, {0x0009, 0x0010}, {0x0009, 0x0011}, {0x000a, 0x000e}, {0x000b, 0x0011}, - {0x000c, 0x0013}, {0x000d, 0x0019}, {0x000e, 0x0021}, {0x0010, 0x0056}, {0x0010, 0x0057}, {0x0013, 0x0059}, {0x0013, 0x005a}, {0x0013, 0x005b}, - {0x0013, 0x005c}, {0x0013, 0x005d}, {0x0013, 0x005e}, {0x0013, 0x005f}, {0x0013, 0x0060}, {0x0013, 0x0061}, {0x0013, 0x0062}, {0x0013, 0x0063}, - {0x0013, 0x0064}, {0x0013, 0x0065}, {0x0013, 0x0066}, {0x0013, 0x0067}, {0x0013, 0x0068}, {0x000b, 0x0012}, {0x000a, 0x000f}, {0x000a, 0x0010}, - {0x000a, 0x0011}, {0x000c, 0x0014}, {0x000c, 0x0015}, {0x000d, 0x001a}, {0x000e, 0x0022}, {0x0010, 0x0058}, {0x0010, 0x0059}, {0x0013, 0x0069}, - {0x0013, 0x006a}, {0x0013, 0x006b}, {0x0013, 0x006c}, {0x0013, 0x006d}, {0x0013, 0x006e}, {0x0013, 0x006f}, {0x0013, 0x0070}, {0x0013, 0x0071}, - {0x0013, 0x0072}, {0x0013, 0x0073}, {0x0013, 0x0074}, {0x0013, 0x0075}, {0x0013, 0x0076}, {0x0013, 0x0077}, {0x0013, 0x0078}, {0x0013, 0x0079}, - {0x000c, 0x0016}, {0x000b, 0x0013}, {0x000c, 0x0017}, {0x000c, 0x0018}, {0x000c, 0x0019}, {0x000e, 0x0023}, {0x000e, 0x0024}, {0x000f, 0x0034}, - {0x0010, 0x005a}, {0x0011, 0x009d}, {0x0013, 0x007a}, {0x0013, 0x007b}, {0x0013, 0x007c}, {0x0013, 0x007d}, {0x0013, 0x007e}, {0x0013, 0x007f}, - {0x0013, 0x0080}, {0x0013, 0x0081}, {0x0013, 0x0082}, {0x0013, 0x0083}, {0x0013, 0x0084}, {0x0013, 0x0085}, {0x0013, 0x0086}, {0x0013, 0x0087}, - {0x0013, 0x0088}, {0x0013, 0x0089}, {0x0013, 0x008a}, {0x000e, 0x0025}, {0x000d, 0x001b}, {0x000d, 0x001c}, {0x000d, 0x001d}, {0x000e, 0x0026}, - {0x000f, 0x0035}, {0x0010, 0x005b}, {0x0011, 0x009e}, {0x0011, 0x009f}, {0x0012, 0x012b}, {0x0013, 0x008b}, {0x0013, 0x008c}, {0x0013, 0x008d}, - {0x0013, 0x008e}, {0x0013, 0x008f}, {0x0013, 0x0090}, {0x0013, 0x0091}, {0x0013, 0x0092}, {0x0013, 0x0093}, {0x0013, 0x0094}, {0x0013, 0x0095}, - {0x0013, 0x0096}, {0x0013, 0x0097}, {0x0013, 0x0098}, {0x0013, 0x0099}, {0x0013, 0x009a}, {0x0013, 0x009b}, {0x0010, 0x005c}, {0x000f, 0x0036}, - {0x000e, 0x0027}, {0x000f, 0x0037}, {0x000f, 0x0038}, {0x0010, 0x005d}, {0x0011, 0x00a0}, {0x0013, 0x009c}, {0x0012, 0x012c}, {0x0013, 0x009d}, - {0x0013, 0x009e}, {0x0013, 0x009f}, {0x0013, 0x00a0}, {0x0013, 0x00a1}, {0x0013, 0x00a2}, {0x0013, 0x00a3}, {0x0013, 0x00a4}, {0x0013, 0x00a5}, - {0x0013, 0x00a6}, {0x0013, 0x00a7}, {0x0013, 0x00a8}, {0x0013, 0x00a9}, {0x0013, 0x00aa}, {0x0013, 0x00ab}, {0x0013, 0x00ac}, {0x0013, 0x00ad}, - {0x0013, 0x00ae}, {0x0010, 0x005e}, {0x000f, 0x0039}, {0x0010, 0x005f}, {0x0010, 0x0060}, {0x0011, 0x00a1}, {0x0010, 0x0061}, {0x0013, 0x00af}, - {0x0013, 0x00b0}, {0x0012, 0x012d}, {0x0013, 0x00b1}, {0x0013, 0x00b2}, {0x0013, 0x00b3}, {0x0013, 0x00b4}, {0x0013, 0x00b5}, {0x0013, 0x00b6}, - {0x0013, 0x00b7}, {0x0013, 0x00b8}, {0x0013, 0x00b9}, {0x0013, 0x00ba}, {0x0013, 0x00bb}, {0x0013, 0x00bc}, {0x0013, 0x00bd}, {0x0013, 0x00be}, - {0x0013, 0x00bf}, {0x0013, 0x00c0}, {0x0013, 0x00c1}, {0x0013, 0x00c2}, {0x0012, 0x012e}, {0x0011, 0x00a2}, {0x0011, 0x00a3}, {0x0013, 0x00c3}, - {0x0013, 0x00c4}, {0x0013, 0x00c5}, {0x0013, 0x00c6}, {0x0013, 0x00c7}, {0x0013, 0x00c8}, {0x0013, 0x00c9}, {0x0013, 0x00ca}, {0x0013, 0x00cb}, - {0x0013, 0x00cc}, {0x0013, 0x00cd}, {0x0013, 0x00ce}, {0x0013, 0x00cf}, {0x0013, 0x00d0}, {0x0013, 0x00d1}, {0x0013, 0x00d2}, {0x0013, 0x00d3}, - {0x0013, 0x00d4}, {0x0013, 0x00d5}, {0x0013, 0x00d6}, {0x0013, 0x00d7}, {0x0013, 0x00d8}, {0x0013, 0x00d9}, {0x0013, 0x00da}, {0x0013, 0x00db}, - {0x0013, 0x00dc}, {0x0013, 0x00dd}, {0x0013, 0x00de}, {0x0013, 0x00df}, {0x0012, 0x012f}, {0x0013, 0x00e0}, {0x0013, 0x00e1}, {0x0013, 0x00e2}, - {0x0013, 0x00e3}, {0x0013, 0x00e4}, {0x0013, 0x00e5}, {0x0013, 0x00e6}, {0x0013, 0x00e7}, {0x0013, 0x00e8}, {0x0013, 0x00e9}, {0x0013, 0x00ea}, - {0x0013, 0x00eb}, {0x0013, 0x00ec}, {0x0013, 0x00ed}, {0x0013, 0x00ee}, {0x0013, 0x00ef}, {0x0013, 0x00f0}, {0x0013, 0x00f1}, {0x0013, 0x00f2}, - {0x0013, 0x00f3}, {0x0013, 0x00f4}, {0x0013, 0x00f5}, {0x0013, 0x00f6}, {0x0013, 0x00f7}, {0x0013, 0x00f8}, {0x0013, 0x00f9}, {0x0013, 0x00fa}, - {0x0013, 0x00fb}, {0x0013, 0x00fc}, {0x0013, 0x00fd}, {0x0013, 0x00fe}, {0x0013, 0x00ff}, {0x0013, 0x0100}, {0x0013, 0x0101}, {0x0013, 0x0102}, - {0x0013, 0x0103}, {0x0013, 0x0104}, {0x0013, 0x0105}, {0x0013, 0x0106}, {0x0013, 0x0107}, {0x0013, 0x0108}, {0x0013, 0x0109}, {0x0013, 0x010a}, - {0x0013, 0x010b}, {0x0013, 0x010c}, {0x0013, 0x010d}, {0x0013, 0x010e}, {0x0013, 0x010f}, {0x0013, 0x0110}, {0x0013, 0x0111}, {0x0013, 0x0112}, - {0x0013, 0x0113}, {0x0013, 0x0114}, {0x0013, 0x0115}, {0x0013, 0x0116}, {0x0013, 0x0117}, {0x0013, 0x0118}, {0x0013, 0x0119}, {0x0013, 0x011a}, - {0x0013, 0x011b}, {0x0013, 0x011c}, {0x0013, 0x011d}, {0x0013, 0x011e}, {0x0013, 0x011f}, {0x0013, 0x0120}, {0x0013, 0x0121}, {0x0013, 0x0122}, - {0x0013, 0x0123}, {0x0013, 0x0124}, {0x0013, 0x0125}, {0x0013, 0x0126}, {0x0013, 0x0127}, {0x0013, 0x0128}, {0x0013, 0x0129}, {0x0013, 0x012a}, - {0x0013, 0x012b}, {0x0013, 0x012c}, {0x0013, 0x012d}, {0x0013, 0x012e}, {0x0013, 0x012f}, {0x0013, 0x0130}, {0x0013, 0x0131}, {0x0013, 0x0132}, - {0x0013, 0x0133}, {0x0013, 0x0134}, {0x0013, 0x0135}, {0x0013, 0x0136}, {0x0013, 0x0137}, {0x0013, 0x0138}, {0x0013, 0x0139}, {0x0013, 0x013a}, - {0x0013, 0x013b}, {0x0013, 0x013c}, {0x0013, 0x013d}, {0x0013, 0x013e}, {0x0013, 0x013f}, {0x0013, 0x0140}, {0x0013, 0x0141}, {0x0013, 0x0142}, - {0x0013, 0x0143}, {0x0013, 0x0144}, {0x0013, 0x0145}, {0x0013, 0x0146}, {0x0013, 0x0147}, {0x0013, 0x0148}, {0x0013, 0x0149}, {0x0013, 0x014a}, - {0x0013, 0x014b}, {0x0013, 0x014c}, {0x0013, 0x014d}, {0x0013, 0x014e}, {0x0013, 0x014f}, {0x0013, 0x0150}, {0x0013, 0x0151}, {0x0013, 0x0152}, - {0x0013, 0x0153}, {0x0013, 0x0154}, {0x0013, 0x0155}, {0x0013, 0x0156}, {0x0013, 0x0157}, {0x0013, 0x0158}, {0x0013, 0x0159}, {0x0013, 0x015a}, - {0x0013, 0x015b}, {0x0013, 0x015c}, {0x0013, 0x015d}, {0x0013, 0x015e}, {0x0013, 0x015f}, {0x0013, 0x0160}, {0x0013, 0x0161}, {0x0013, 0x0162}, - {0x0013, 0x0163}, {0x0013, 0x0164}, {0x0013, 0x0165}, {0x0013, 0x0166}, {0x0013, 0x0167}, {0x0013, 0x0168}, {0x0013, 0x0169}, {0x0013, 0x016a}, - {0x0013, 0x016b}, {0x0013, 0x016c}, {0x0013, 0x016d}, {0x0013, 0x016e}, {0x0013, 0x016f}, {0x0013, 0x0170}, {0x0013, 0x0171}, {0x0013, 0x0172}, - {0x0013, 0x0173}, {0x0013, 0x0174}, {0x0013, 0x0175}, {0x0013, 0x0176}, {0x0013, 0x0177}, {0x0013, 0x0178}, {0x0013, 0x0179}, {0x0013, 0x017a}, - {0x0013, 0x017b}, {0x0013, 0x017c}, {0x0013, 0x017d}, {0x0013, 0x017e}, {0x0013, 0x017f}, {0x0013, 0x0180}, {0x0013, 0x0181}, {0x0013, 0x0182}, - {0x0013, 0x0183}, {0x0013, 0x0184}, {0x0013, 0x0185}, {0x0013, 0x0186}, {0x0013, 0x0187}, {0x0013, 0x0188}, {0x0013, 0x0189}, {0x0013, 0x018a}, - {0x0013, 0x018b}, {0x0013, 0x018c}, {0x0013, 0x018d}, {0x0013, 0x018e}, {0x0013, 0x018f}, {0x0013, 0x0190}, {0x0013, 0x0191}, {0x0013, 0x0192}, - {0x0013, 0x0193}, {0x0013, 0x0194}, {0x0013, 0x0195}, {0x0013, 0x0196}, {0x0013, 0x0197}, {0x0013, 0x0198}, {0x0013, 0x0199}, {0x0013, 0x019a}, - {0x0013, 0x019b}, {0x0013, 0x019c}, {0x0013, 0x019d}, {0x0013, 0x019e}, {0x0013, 0x019f}, {0x0013, 0x01a0}, {0x0013, 0x01a1}, {0x0013, 0x01a2}, - {0x0013, 0x01a3}, {0x0013, 0x01a4}, {0x0013, 0x01a5}, {0x0013, 0x01a6}, {0x0013, 0x01a7}, {0x0013, 0x01a8}, {0x0013, 0x01a9}, {0x0013, 0x01aa}, - {0x0013, 0x01ab}, {0x0013, 0x01ac}, {0x0013, 0x01ad}, {0x0013, 0x01ae}, {0x0013, 0x01af}, {0x0013, 0x01b0}, {0x0013, 0x01b1}, {0x0013, 0x01b2}, - {0x0013, 0x01b3}, {0x0013, 0x01b4}, {0x0013, 0x01b5}, {0x0013, 0x01b6}, {0x0013, 0x01b7}, {0x0013, 0x01b8}, {0x0013, 0x01b9}, {0x0013, 0x01ba}, - {0x0013, 0x01bb}, {0x0013, 0x01bc}, {0x0013, 0x01bd}, {0x0013, 0x01be}, {0x0013, 0x01bf}, {0x0013, 0x01c0}, {0x0013, 0x01c1}, {0x0013, 0x01c2}, - {0x0013, 0x01c3}, {0x0013, 0x01c4}, {0x0013, 0x01c5}, {0x0013, 0x01c6}, {0x0013, 0x01c7}, {0x0013, 0x01c8}, {0x0013, 0x01c9}, {0x0013, 0x01ca}, - {0x0013, 0x01cb}, {0x0013, 0x01cc}, {0x0013, 0x01cd}, {0x0013, 0x01ce}, {0x0013, 0x01cf}, {0x0013, 0x01d0}, {0x0013, 0x01d1}, {0x0013, 0x01d2}, - {0x0013, 0x01d3}, {0x0013, 0x01d4}, {0x0013, 0x01d5}, {0x0013, 0x01d6}, {0x0013, 0x01d7}, {0x0013, 0x01d8}, {0x0013, 0x01d9}, {0x0013, 0x01da}, - {0x0013, 0x01db}, {0x0013, 0x01dc}, {0x0013, 0x01dd}, {0x0013, 0x01de}, {0x0013, 0x01df}, {0x0013, 0x01e0}, {0x0013, 0x01e1}, {0x0013, 0x01e2}, - {0x0013, 0x01e3}, {0x0013, 0x01e4}, {0x0013, 0x01e5}, {0x0013, 0x01e6}, {0x0013, 0x01e7}, {0x0013, 0x01e8}, {0x0013, 0x01e9}, {0x0013, 0x01ea}, - {0x0013, 0x01eb}, {0x0013, 0x01ec}, {0x0013, 0x01ed}, {0x0013, 0x01ee}, {0x0013, 0x01ef}, {0x0013, 0x01f0}, {0x0013, 0x01f1}, {0x0013, 0x01f2}, - {0x0013, 0x01f3}, {0x0013, 0x01f4}, {0x0013, 0x01f5}, {0x0013, 0x01f6}, {0x0013, 0x01f7}, {0x0013, 0x01f8}, {0x0013, 0x01f9}, {0x0013, 0x01fa}, - {0x0013, 0x01fb}, {0x0013, 0x01fc}, {0x0013, 0x01fd}, {0x0013, 0x01fe}, {0x0013, 0x01ff}, {0x0013, 0x0200}, {0x0013, 0x0201}, {0x0013, 0x0202}, - {0x0013, 0x0203}, {0x0013, 0x0204}, {0x0013, 0x0205}, {0x0013, 0x0206}, {0x0013, 0x0207}, {0x0013, 0x0208}, {0x0013, 0x0209}, {0x0013, 0x020a}, - {0x0013, 0x020b}, {0x0013, 0x020c}, {0x0013, 0x020d}, {0x0013, 0x020e}, {0x0013, 0x020f}, {0x0013, 0x0210}, {0x0013, 0x0211}, {0x0013, 0x0212}, - {0x0013, 0x0213}, {0x0013, 0x0214}, {0x0013, 0x0215}, {0x0013, 0x0216}, {0x0013, 0x0217}, {0x0013, 0x0218}, {0x0013, 0x0219}, {0x0013, 0x021a}, - {0x0013, 0x021b}, {0x0013, 0x021c}, {0x0013, 0x021d}, {0x0013, 0x021e}, {0x0013, 0x021f}, {0x0013, 0x0220}, {0x0013, 0x0221}, {0x0013, 0x0222}, - {0x0013, 0x0223}, {0x0013, 0x0224}, {0x0013, 0x0225}, {0x0013, 0x0226}, {0x0013, 0x0227}, {0x0013, 0x0228}, {0x0013, 0x0229}, {0x0013, 0x022a}, - {0x0013, 0x022b}, {0x0013, 0x022c}, {0x0013, 0x022d}, {0x0013, 0x022e}, {0x0013, 0x022f}, {0x0013, 0x0230}, {0x0013, 0x0231}, {0x0013, 0x0232}, - {0x0013, 0x0233}, {0x0013, 0x0234}, {0x0013, 0x0235}, {0x0013, 0x0236}, {0x0013, 0x0237}, {0x0013, 0x0238}, {0x0013, 0x0239}, {0x0013, 0x023a}, - {0x0013, 0x023b}, {0x0013, 0x023c}, {0x0013, 0x023d}, {0x0013, 0x023e}, {0x0013, 0x023f}, {0x0013, 0x0240}, {0x0013, 0x0241}, {0x0013, 0x0242}, - {0x0013, 0x0243}, {0x0013, 0x0244}, {0x0013, 0x0245}, {0x0013, 0x0246}, {0x0013, 0x0247}, {0x0013, 0x0248}, {0x0013, 0x0249}, {0x0013, 0x024a}, - {0x0013, 0x024b}, {0x0013, 0x024c}, {0x0013, 0x024d}, {0x0013, 0x024e}, {0x0013, 0x024f}, {0x0013, 0x0250}, {0x0013, 0x0251}, {0x0013, 0x0252}, - {0x0013, 0x0253}, - -}; - -const uint32_t c_aauiCQMFHuffDec49[113][16] = -{ - {0x0006ffff, 0x0005ffff, 0x0004ffff, 0x0001ffff, 0x0002ffff, 0x0003ffff, 0x00010001, 0x00010001, 0x0001001b, 0x0001001b, 0x0001001c, 0x0001001c, 0x00020000, 0x00020000, 0x00020000, 0x00020000, }, - {0x00020052, 0x00020052, 0x00020052, 0x00020052, 0x00020053, 0x00020053, 0x00020053, 0x00020053, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, 0x00030002, }, - {0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, }, - {0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, }, - {0x0001006d, 0x0001006d, 0x0001006e, 0x0001006e, 0x0001006f, 0x0001006f, 0x00010088, 0x00010088, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001e, 0x00020039, 0x00020039, 0x00020039, 0x00020039, }, - {0x00000070, 0x00000087, 0x00000089, 0x0000008a, 0x00010003, 0x00010003, 0x0001001f, 0x0001001f, 0x0001003a, 0x0001003a, 0x00010051, 0x00010051, 0x00010054, 0x00010054, 0x00010055, 0x00010055, }, - {0x000fffff, 0x000effff, 0x000cffff, 0x000dffff, 0x0007ffff, 0x0008ffff, 0x0009ffff, 0x000affff, 0x000bffff, 0x00000004, 0x00000005, 0x00000020, 0x00000021, 0x0000003b, 0x00000056, 0x0000006c, }, - {0x000200bf, 0x000200bf, 0x000200bf, 0x000200bf, 0x000200c0, 0x000200c0, 0x000200c0, 0x000200c0, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, }, - {0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x0003003c, 0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030057, }, - {0x00030071, 0x00030071, 0x00030071, 0x00030071, 0x00030071, 0x00030071, 0x00030071, 0x00030071, 0x0003008b, 0x0003008b, 0x0003008b, 0x0003008b, 0x0003008b, 0x0003008b, 0x0003008b, 0x0003008b, }, - {0x000300a2, 0x000300a2, 0x000300a2, 0x000300a2, 0x000300a2, 0x000300a2, 0x000300a2, 0x000300a2, 0x000300a3, 0x000300a3, 0x000300a3, 0x000300a3, 0x000300a3, 0x000300a3, 0x000300a3, 0x000300a3, }, - {0x000300a4, 0x000300a4, 0x000300a4, 0x000300a4, 0x000300a4, 0x000300a4, 0x000300a4, 0x000300a4, 0x000300a5, 0x000300a5, 0x000300a5, 0x000300a5, 0x000300a5, 0x000300a5, 0x000300a5, 0x000300a5, }, - {0x0001008d, 0x0001008d, 0x000100a7, 0x000100a7, 0x000100bd, 0x000100bd, 0x000100d9, 0x000100d9, 0x00020022, 0x00020022, 0x00020022, 0x00020022, 0x0002003d, 0x0002003d, 0x0002003d, 0x0002003d, }, - {0x00020072, 0x00020072, 0x00020072, 0x00020072, 0x0002008c, 0x0002008c, 0x0002008c, 0x0002008c, 0x000200a6, 0x000200a6, 0x000200a6, 0x000200a6, 0x000200be, 0x000200be, 0x000200be, 0x000200be, }, - {0x00000059, 0x00000073, 0x0000008e, 0x000000a8, 0x000000c1, 0x000000c2, 0x000000d8, 0x000000da, 0x000000db, 0x000000dc, 0x00010007, 0x00010007, 0x00010023, 0x00010023, 0x00010058, 0x00010058, }, - {0x0023ffff, 0x0034ffff, 0x0045ffff, 0x0056ffff, 0x001affff, 0x0019ffff, 0x0018ffff, 0x0015ffff, 0x0016ffff, 0x0017ffff, 0x0011ffff, 0x0010ffff, 0x0012ffff, 0x0013ffff, 0x0014ffff, 0x0000003e, }, - {0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, }, - {0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, }, - {0x00030074, 0x00030074, 0x00030074, 0x00030074, 0x00030074, 0x00030074, 0x00030074, 0x00030074, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, 0x000300a9, }, - {0x000300c3, 0x000300c3, 0x000300c3, 0x000300c3, 0x000300c3, 0x000300c3, 0x000300c3, 0x000300c3, 0x000300f4, 0x000300f4, 0x000300f4, 0x000300f4, 0x000300f4, 0x000300f4, 0x000300f4, 0x000300f4, }, - {0x000300f5, 0x000300f5, 0x000300f5, 0x000300f5, 0x000300f5, 0x000300f5, 0x000300f5, 0x000300f5, 0x000300f6, 0x000300f6, 0x000300f6, 0x000300f6, 0x000300f6, 0x000300f6, 0x000300f6, 0x000300f6, }, - {0x00010112, 0x00010112, 0x0001012a, 0x0001012a, 0x0002005a, 0x0002005a, 0x0002005a, 0x0002005a, 0x00020075, 0x00020075, 0x00020075, 0x00020075, 0x0002008f, 0x0002008f, 0x0002008f, 0x0002008f, }, - {0x00020090, 0x00020090, 0x00020090, 0x00020090, 0x000200aa, 0x000200aa, 0x000200aa, 0x000200aa, 0x000200c4, 0x000200c4, 0x000200c4, 0x000200c4, 0x000200dd, 0x000200dd, 0x000200dd, 0x000200dd, }, - {0x000200de, 0x000200de, 0x000200de, 0x000200de, 0x000200f3, 0x000200f3, 0x000200f3, 0x000200f3, 0x000200f7, 0x000200f7, 0x000200f7, 0x000200f7, 0x00020110, 0x00020110, 0x00020110, 0x00020110, }, - {0x0000012c, 0x0000012e, 0x00010025, 0x00010025, 0x00010040, 0x00010040, 0x0001005b, 0x0001005b, 0x000100df, 0x000100df, 0x000100f8, 0x000100f8, 0x0001010f, 0x0001010f, 0x00010111, 0x00010111, }, - {0x001fffff, 0x0020ffff, 0x0000000a, 0x00000026, 0x00000041, 0x00000091, 0x000000ab, 0x000000ac, 0x000000c5, 0x000000c6, 0x000000e0, 0x000000f9, 0x0000010e, 0x00000113, 0x00000129, 0x0000012b, }, - {0x0067ffff, 0x0068ffff, 0x0069ffff, 0x006affff, 0x006bffff, 0x006cffff, 0x006dffff, 0x006effff, 0x006fffff, 0x0070ffff, 0x0021ffff, 0x0022ffff, 0x001cffff, 0x001bffff, 0x001dffff, 0x001effff, }, - {0x00030076, 0x00030076, 0x00030076, 0x00030076, 0x00030076, 0x00030076, 0x00030076, 0x00030076, 0x00030077, 0x00030077, 0x00030077, 0x00030077, 0x00030077, 0x00030077, 0x00030077, 0x00030077, }, - {0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003005c, 0x0003005c, 0x0003005c, 0x0003005c, 0x0003005c, 0x0003005c, 0x0003005c, 0x0003005c, }, - {0x00030092, 0x00030092, 0x00030092, 0x00030092, 0x00030092, 0x00030092, 0x00030092, 0x00030092, 0x000300e1, 0x000300e1, 0x000300e1, 0x000300e1, 0x000300e1, 0x000300e1, 0x000300e1, 0x000300e1, }, - {0x000300fa, 0x000300fa, 0x000300fa, 0x000300fa, 0x000300fa, 0x000300fa, 0x000300fa, 0x000300fa, 0x000300fb, 0x000300fb, 0x000300fb, 0x000300fb, 0x000300fb, 0x000300fb, 0x000300fb, 0x000300fb, }, - {0x00030114, 0x00030114, 0x00030114, 0x00030114, 0x00030114, 0x00030114, 0x00030114, 0x00030114, 0x0003012d, 0x0003012d, 0x0003012d, 0x0003012d, 0x0003012d, 0x0003012d, 0x0003012d, 0x0003012d, }, - {0x00030145, 0x00030145, 0x00030145, 0x00030145, 0x00030145, 0x00030145, 0x00030145, 0x00030145, 0x00030146, 0x00030146, 0x00030146, 0x00030146, 0x00030146, 0x00030146, 0x00030146, 0x00030146, }, - {0x000102d5, 0x000102d5, 0x000102d6, 0x000102d6, 0x000102d7, 0x000102d7, 0x000102d8, 0x000102d8, 0x00020027, 0x00020027, 0x00020027, 0x00020027, 0x000200fc, 0x000200fc, 0x000200fc, 0x000200fc, }, - {0x00020116, 0x00020116, 0x00020116, 0x00020116, 0x00020131, 0x00020131, 0x00020131, 0x00020131, 0x00020144, 0x00020144, 0x00020144, 0x00020144, 0x00020164, 0x00020164, 0x00020164, 0x00020164, }, - {0x0025ffff, 0x0026ffff, 0x0028ffff, 0x002affff, 0x002effff, 0x0029ffff, 0x0027ffff, 0x0033ffff, 0x002dffff, 0x0024ffff, 0x002bffff, 0x002cffff, 0x002fffff, 0x0030ffff, 0x0031ffff, 0x0032ffff, }, - {0x00010085, 0x00010085, 0x00010086, 0x00010086, 0x00010093, 0x00010093, 0x00010094, 0x00010094, 0x00010095, 0x00010095, 0x00010096, 0x00010096, 0x00010097, 0x00010097, 0x00010098, 0x00010098, }, - {0x0001000c, 0x0001000c, 0x0001000d, 0x0001000d, 0x0001000e, 0x0001000e, 0x0001000f, 0x0001000f, 0x00010010, 0x00010010, 0x00010011, 0x00010011, 0x00010012, 0x00010012, 0x00010013, 0x00010013, }, - {0x00010014, 0x00010014, 0x00010015, 0x00010015, 0x00010016, 0x00010016, 0x00010017, 0x00010017, 0x00010018, 0x00010018, 0x00010019, 0x00010019, 0x0001001a, 0x0001001a, 0x00010028, 0x00010028, }, - {0x00010061, 0x00010061, 0x00010062, 0x00010062, 0x00010063, 0x00010063, 0x00010064, 0x00010064, 0x00010065, 0x00010065, 0x00010066, 0x00010066, 0x00010067, 0x00010067, 0x00010068, 0x00010068, }, - {0x00010029, 0x00010029, 0x0001002a, 0x0001002a, 0x0001002b, 0x0001002b, 0x0001002c, 0x0001002c, 0x0001002d, 0x0001002d, 0x0001002e, 0x0001002e, 0x0001002f, 0x0001002f, 0x00010030, 0x00010030, }, - {0x0001004d, 0x0001004d, 0x0001004e, 0x0001004e, 0x0001004f, 0x0001004f, 0x00010050, 0x00010050, 0x0001005d, 0x0001005d, 0x0001005e, 0x0001005e, 0x0001005f, 0x0001005f, 0x00010060, 0x00010060, }, - {0x00010031, 0x00010031, 0x00010032, 0x00010032, 0x00010033, 0x00010033, 0x00010034, 0x00010034, 0x00010035, 0x00010035, 0x00010042, 0x00010042, 0x00010043, 0x00010043, 0x00010044, 0x00010044, }, - {0x00010099, 0x00010099, 0x0001009a, 0x0001009a, 0x0001009b, 0x0001009b, 0x0001009c, 0x0001009c, 0x0001009d, 0x0001009d, 0x0001009e, 0x0001009e, 0x0001009f, 0x0001009f, 0x000100a0, 0x000100a0, }, - {0x000100a1, 0x000100a1, 0x000100ad, 0x000100ad, 0x000100ae, 0x000100ae, 0x000100af, 0x000100af, 0x000100b0, 0x000100b0, 0x000100b1, 0x000100b1, 0x000100b2, 0x000100b2, 0x000100b3, 0x000100b3, }, - {0x0001007d, 0x0001007d, 0x0001007e, 0x0001007e, 0x0001007f, 0x0001007f, 0x00010080, 0x00010080, 0x00010081, 0x00010081, 0x00010082, 0x00010082, 0x00010083, 0x00010083, 0x00010084, 0x00010084, }, - {0x00010045, 0x00010045, 0x00010046, 0x00010046, 0x00010047, 0x00010047, 0x00010048, 0x00010048, 0x00010049, 0x00010049, 0x0001004a, 0x0001004a, 0x0001004b, 0x0001004b, 0x0001004c, 0x0001004c, }, - {0x000100b4, 0x000100b4, 0x000100b5, 0x000100b5, 0x000100b6, 0x000100b6, 0x000100b7, 0x000100b7, 0x000100b8, 0x000100b8, 0x000100b9, 0x000100b9, 0x000100ba, 0x000100ba, 0x000100bb, 0x000100bb, }, - {0x000100bc, 0x000100bc, 0x000100c7, 0x000100c7, 0x000100c8, 0x000100c8, 0x000100c9, 0x000100c9, 0x000100ca, 0x000100ca, 0x000100cb, 0x000100cb, 0x000100cc, 0x000100cc, 0x000100cd, 0x000100cd, }, - {0x000100ce, 0x000100ce, 0x000100cf, 0x000100cf, 0x000100d0, 0x000100d0, 0x000100d1, 0x000100d1, 0x000100d2, 0x000100d2, 0x000100d3, 0x000100d3, 0x000100d4, 0x000100d4, 0x000100d5, 0x000100d5, }, - {0x000100d6, 0x000100d6, 0x000100d7, 0x000100d7, 0x000100e2, 0x000100e2, 0x000100e3, 0x000100e3, 0x000100e4, 0x000100e4, 0x000100e5, 0x000100e5, 0x000100e6, 0x000100e6, 0x000100e7, 0x000100e7, }, - {0x00010069, 0x00010069, 0x0001006a, 0x0001006a, 0x0001006b, 0x0001006b, 0x00010078, 0x00010078, 0x00010079, 0x00010079, 0x0001007a, 0x0001007a, 0x0001007b, 0x0001007b, 0x0001007c, 0x0001007c, }, - {0x0035ffff, 0x0036ffff, 0x0037ffff, 0x0038ffff, 0x0039ffff, 0x003affff, 0x003bffff, 0x003cffff, 0x003dffff, 0x003effff, 0x003fffff, 0x0040ffff, 0x0041ffff, 0x0042ffff, 0x0043ffff, 0x0044ffff, }, - {0x000100e8, 0x000100e8, 0x000100e9, 0x000100e9, 0x000100ea, 0x000100ea, 0x000100eb, 0x000100eb, 0x000100ec, 0x000100ec, 0x000100ed, 0x000100ed, 0x000100ee, 0x000100ee, 0x000100ef, 0x000100ef, }, - {0x000100f0, 0x000100f0, 0x000100f1, 0x000100f1, 0x000100f2, 0x000100f2, 0x000100fd, 0x000100fd, 0x000100fe, 0x000100fe, 0x000100ff, 0x000100ff, 0x00010100, 0x00010100, 0x00010101, 0x00010101, }, - {0x00010102, 0x00010102, 0x00010103, 0x00010103, 0x00010104, 0x00010104, 0x00010105, 0x00010105, 0x00010106, 0x00010106, 0x00010107, 0x00010107, 0x00010108, 0x00010108, 0x00010109, 0x00010109, }, - {0x0001010a, 0x0001010a, 0x0001010b, 0x0001010b, 0x0001010c, 0x0001010c, 0x0001010d, 0x0001010d, 0x00010115, 0x00010115, 0x00010117, 0x00010117, 0x00010118, 0x00010118, 0x00010119, 0x00010119, }, - {0x0001011a, 0x0001011a, 0x0001011b, 0x0001011b, 0x0001011c, 0x0001011c, 0x0001011d, 0x0001011d, 0x0001011e, 0x0001011e, 0x0001011f, 0x0001011f, 0x00010120, 0x00010120, 0x00010121, 0x00010121, }, - {0x00010122, 0x00010122, 0x00010123, 0x00010123, 0x00010124, 0x00010124, 0x00010125, 0x00010125, 0x00010126, 0x00010126, 0x00010127, 0x00010127, 0x00010128, 0x00010128, 0x0001012f, 0x0001012f, }, - {0x00010130, 0x00010130, 0x00010132, 0x00010132, 0x00010133, 0x00010133, 0x00010134, 0x00010134, 0x00010135, 0x00010135, 0x00010136, 0x00010136, 0x00010137, 0x00010137, 0x00010138, 0x00010138, }, - {0x00010139, 0x00010139, 0x0001013a, 0x0001013a, 0x0001013b, 0x0001013b, 0x0001013c, 0x0001013c, 0x0001013d, 0x0001013d, 0x0001013e, 0x0001013e, 0x0001013f, 0x0001013f, 0x00010140, 0x00010140, }, - {0x00010141, 0x00010141, 0x00010142, 0x00010142, 0x00010143, 0x00010143, 0x00010147, 0x00010147, 0x00010148, 0x00010148, 0x00010149, 0x00010149, 0x0001014a, 0x0001014a, 0x0001014b, 0x0001014b, }, - {0x0001014c, 0x0001014c, 0x0001014d, 0x0001014d, 0x0001014e, 0x0001014e, 0x0001014f, 0x0001014f, 0x00010150, 0x00010150, 0x00010151, 0x00010151, 0x00010152, 0x00010152, 0x00010153, 0x00010153, }, - {0x00010154, 0x00010154, 0x00010155, 0x00010155, 0x00010156, 0x00010156, 0x00010157, 0x00010157, 0x00010158, 0x00010158, 0x00010159, 0x00010159, 0x0001015a, 0x0001015a, 0x0001015b, 0x0001015b, }, - {0x0001015c, 0x0001015c, 0x0001015d, 0x0001015d, 0x0001015e, 0x0001015e, 0x0001015f, 0x0001015f, 0x00010160, 0x00010160, 0x00010161, 0x00010161, 0x00010162, 0x00010162, 0x00010163, 0x00010163, }, - {0x00010165, 0x00010165, 0x00010166, 0x00010166, 0x00010167, 0x00010167, 0x00010168, 0x00010168, 0x00010169, 0x00010169, 0x0001016a, 0x0001016a, 0x0001016b, 0x0001016b, 0x0001016c, 0x0001016c, }, - {0x0001016d, 0x0001016d, 0x0001016e, 0x0001016e, 0x0001016f, 0x0001016f, 0x00010170, 0x00010170, 0x00010171, 0x00010171, 0x00010172, 0x00010172, 0x00010173, 0x00010173, 0x00010174, 0x00010174, }, - {0x00010175, 0x00010175, 0x00010176, 0x00010176, 0x00010177, 0x00010177, 0x00010178, 0x00010178, 0x00010179, 0x00010179, 0x0001017a, 0x0001017a, 0x0001017b, 0x0001017b, 0x0001017c, 0x0001017c, }, - {0x0001017d, 0x0001017d, 0x0001017e, 0x0001017e, 0x0001017f, 0x0001017f, 0x00010180, 0x00010180, 0x00010181, 0x00010181, 0x00010182, 0x00010182, 0x00010183, 0x00010183, 0x00010184, 0x00010184, }, - {0x0046ffff, 0x0047ffff, 0x0048ffff, 0x0049ffff, 0x004affff, 0x004bffff, 0x004cffff, 0x004dffff, 0x004effff, 0x004fffff, 0x0050ffff, 0x0051ffff, 0x0052ffff, 0x0053ffff, 0x0054ffff, 0x0055ffff, }, - {0x00010185, 0x00010185, 0x00010186, 0x00010186, 0x00010187, 0x00010187, 0x00010188, 0x00010188, 0x00010189, 0x00010189, 0x0001018a, 0x0001018a, 0x0001018b, 0x0001018b, 0x0001018c, 0x0001018c, }, - {0x0001018d, 0x0001018d, 0x0001018e, 0x0001018e, 0x0001018f, 0x0001018f, 0x00010190, 0x00010190, 0x00010191, 0x00010191, 0x00010192, 0x00010192, 0x00010193, 0x00010193, 0x00010194, 0x00010194, }, - {0x00010195, 0x00010195, 0x00010196, 0x00010196, 0x00010197, 0x00010197, 0x00010198, 0x00010198, 0x00010199, 0x00010199, 0x0001019a, 0x0001019a, 0x0001019b, 0x0001019b, 0x0001019c, 0x0001019c, }, - {0x0001019d, 0x0001019d, 0x0001019e, 0x0001019e, 0x0001019f, 0x0001019f, 0x000101a0, 0x000101a0, 0x000101a1, 0x000101a1, 0x000101a2, 0x000101a2, 0x000101a3, 0x000101a3, 0x000101a4, 0x000101a4, }, - {0x000101a5, 0x000101a5, 0x000101a6, 0x000101a6, 0x000101a7, 0x000101a7, 0x000101a8, 0x000101a8, 0x000101a9, 0x000101a9, 0x000101aa, 0x000101aa, 0x000101ab, 0x000101ab, 0x000101ac, 0x000101ac, }, - {0x000101ad, 0x000101ad, 0x000101ae, 0x000101ae, 0x000101af, 0x000101af, 0x000101b0, 0x000101b0, 0x000101b1, 0x000101b1, 0x000101b2, 0x000101b2, 0x000101b3, 0x000101b3, 0x000101b4, 0x000101b4, }, - {0x000101b5, 0x000101b5, 0x000101b6, 0x000101b6, 0x000101b7, 0x000101b7, 0x000101b8, 0x000101b8, 0x000101b9, 0x000101b9, 0x000101ba, 0x000101ba, 0x000101bb, 0x000101bb, 0x000101bc, 0x000101bc, }, - {0x000101bd, 0x000101bd, 0x000101be, 0x000101be, 0x000101bf, 0x000101bf, 0x000101c0, 0x000101c0, 0x000101c1, 0x000101c1, 0x000101c2, 0x000101c2, 0x000101c3, 0x000101c3, 0x000101c4, 0x000101c4, }, - {0x000101c5, 0x000101c5, 0x000101c6, 0x000101c6, 0x000101c7, 0x000101c7, 0x000101c8, 0x000101c8, 0x000101c9, 0x000101c9, 0x000101ca, 0x000101ca, 0x000101cb, 0x000101cb, 0x000101cc, 0x000101cc, }, - {0x000101cd, 0x000101cd, 0x000101ce, 0x000101ce, 0x000101cf, 0x000101cf, 0x000101d0, 0x000101d0, 0x000101d1, 0x000101d1, 0x000101d2, 0x000101d2, 0x000101d3, 0x000101d3, 0x000101d4, 0x000101d4, }, - {0x000101d5, 0x000101d5, 0x000101d6, 0x000101d6, 0x000101d7, 0x000101d7, 0x000101d8, 0x000101d8, 0x000101d9, 0x000101d9, 0x000101da, 0x000101da, 0x000101db, 0x000101db, 0x000101dc, 0x000101dc, }, - {0x000101dd, 0x000101dd, 0x000101de, 0x000101de, 0x000101df, 0x000101df, 0x000101e0, 0x000101e0, 0x000101e1, 0x000101e1, 0x000101e2, 0x000101e2, 0x000101e3, 0x000101e3, 0x000101e4, 0x000101e4, }, - {0x000101e5, 0x000101e5, 0x000101e6, 0x000101e6, 0x000101e7, 0x000101e7, 0x000101e8, 0x000101e8, 0x000101e9, 0x000101e9, 0x000101ea, 0x000101ea, 0x000101eb, 0x000101eb, 0x000101ec, 0x000101ec, }, - {0x000101ed, 0x000101ed, 0x000101ee, 0x000101ee, 0x000101ef, 0x000101ef, 0x000101f0, 0x000101f0, 0x000101f1, 0x000101f1, 0x000101f2, 0x000101f2, 0x000101f3, 0x000101f3, 0x000101f4, 0x000101f4, }, - {0x000101f5, 0x000101f5, 0x000101f6, 0x000101f6, 0x000101f7, 0x000101f7, 0x000101f8, 0x000101f8, 0x000101f9, 0x000101f9, 0x000101fa, 0x000101fa, 0x000101fb, 0x000101fb, 0x000101fc, 0x000101fc, }, - {0x000101fd, 0x000101fd, 0x000101fe, 0x000101fe, 0x000101ff, 0x000101ff, 0x00010200, 0x00010200, 0x00010201, 0x00010201, 0x00010202, 0x00010202, 0x00010203, 0x00010203, 0x00010204, 0x00010204, }, - {0x0057ffff, 0x0058ffff, 0x0059ffff, 0x005affff, 0x005bffff, 0x005cffff, 0x005dffff, 0x005effff, 0x005fffff, 0x0060ffff, 0x0061ffff, 0x0062ffff, 0x0063ffff, 0x0064ffff, 0x0065ffff, 0x0066ffff, }, - {0x00010205, 0x00010205, 0x00010206, 0x00010206, 0x00010207, 0x00010207, 0x00010208, 0x00010208, 0x00010209, 0x00010209, 0x0001020a, 0x0001020a, 0x0001020b, 0x0001020b, 0x0001020c, 0x0001020c, }, - {0x0001020d, 0x0001020d, 0x0001020e, 0x0001020e, 0x0001020f, 0x0001020f, 0x00010210, 0x00010210, 0x00010211, 0x00010211, 0x00010212, 0x00010212, 0x00010213, 0x00010213, 0x00010214, 0x00010214, }, - {0x00010215, 0x00010215, 0x00010216, 0x00010216, 0x00010217, 0x00010217, 0x00010218, 0x00010218, 0x00010219, 0x00010219, 0x0001021a, 0x0001021a, 0x0001021b, 0x0001021b, 0x0001021c, 0x0001021c, }, - {0x0001021d, 0x0001021d, 0x0001021e, 0x0001021e, 0x0001021f, 0x0001021f, 0x00010220, 0x00010220, 0x00010221, 0x00010221, 0x00010222, 0x00010222, 0x00010223, 0x00010223, 0x00010224, 0x00010224, }, - {0x00010225, 0x00010225, 0x00010226, 0x00010226, 0x00010227, 0x00010227, 0x00010228, 0x00010228, 0x00010229, 0x00010229, 0x0001022a, 0x0001022a, 0x0001022b, 0x0001022b, 0x0001022c, 0x0001022c, }, - {0x0001022d, 0x0001022d, 0x0001022e, 0x0001022e, 0x0001022f, 0x0001022f, 0x00010230, 0x00010230, 0x00010231, 0x00010231, 0x00010232, 0x00010232, 0x00010233, 0x00010233, 0x00010234, 0x00010234, }, - {0x00010235, 0x00010235, 0x00010236, 0x00010236, 0x00010237, 0x00010237, 0x00010238, 0x00010238, 0x00010239, 0x00010239, 0x0001023a, 0x0001023a, 0x0001023b, 0x0001023b, 0x0001023c, 0x0001023c, }, - {0x0001023d, 0x0001023d, 0x0001023e, 0x0001023e, 0x0001023f, 0x0001023f, 0x00010240, 0x00010240, 0x00010241, 0x00010241, 0x00010242, 0x00010242, 0x00010243, 0x00010243, 0x00010244, 0x00010244, }, - {0x00010245, 0x00010245, 0x00010246, 0x00010246, 0x00010247, 0x00010247, 0x00010248, 0x00010248, 0x00010249, 0x00010249, 0x0001024a, 0x0001024a, 0x0001024b, 0x0001024b, 0x0001024c, 0x0001024c, }, - {0x0001024d, 0x0001024d, 0x0001024e, 0x0001024e, 0x0001024f, 0x0001024f, 0x00010250, 0x00010250, 0x00010251, 0x00010251, 0x00010252, 0x00010252, 0x00010253, 0x00010253, 0x00010254, 0x00010254, }, - {0x00010255, 0x00010255, 0x00010256, 0x00010256, 0x00010257, 0x00010257, 0x00010258, 0x00010258, 0x00010259, 0x00010259, 0x0001025a, 0x0001025a, 0x0001025b, 0x0001025b, 0x0001025c, 0x0001025c, }, - {0x0001025d, 0x0001025d, 0x0001025e, 0x0001025e, 0x0001025f, 0x0001025f, 0x00010260, 0x00010260, 0x00010261, 0x00010261, 0x00010262, 0x00010262, 0x00010263, 0x00010263, 0x00010264, 0x00010264, }, - {0x00010265, 0x00010265, 0x00010266, 0x00010266, 0x00010267, 0x00010267, 0x00010268, 0x00010268, 0x00010269, 0x00010269, 0x0001026a, 0x0001026a, 0x0001026b, 0x0001026b, 0x0001026c, 0x0001026c, }, - {0x0001026d, 0x0001026d, 0x0001026e, 0x0001026e, 0x0001026f, 0x0001026f, 0x00010270, 0x00010270, 0x00010271, 0x00010271, 0x00010272, 0x00010272, 0x00010273, 0x00010273, 0x00010274, 0x00010274, }, - {0x00010275, 0x00010275, 0x00010276, 0x00010276, 0x00010277, 0x00010277, 0x00010278, 0x00010278, 0x00010279, 0x00010279, 0x0001027a, 0x0001027a, 0x0001027b, 0x0001027b, 0x0001027c, 0x0001027c, }, - {0x0001027d, 0x0001027d, 0x0001027e, 0x0001027e, 0x0001027f, 0x0001027f, 0x00010280, 0x00010280, 0x00010281, 0x00010281, 0x00010282, 0x00010282, 0x00010283, 0x00010283, 0x00010284, 0x00010284, }, - {0x00010285, 0x00010285, 0x00010286, 0x00010286, 0x00010287, 0x00010287, 0x00010288, 0x00010288, 0x00010289, 0x00010289, 0x0001028a, 0x0001028a, 0x0001028b, 0x0001028b, 0x0001028c, 0x0001028c, }, - {0x0001028d, 0x0001028d, 0x0001028e, 0x0001028e, 0x0001028f, 0x0001028f, 0x00010290, 0x00010290, 0x00010291, 0x00010291, 0x00010292, 0x00010292, 0x00010293, 0x00010293, 0x00010294, 0x00010294, }, - {0x00010295, 0x00010295, 0x00010296, 0x00010296, 0x00010297, 0x00010297, 0x00010298, 0x00010298, 0x00010299, 0x00010299, 0x0001029a, 0x0001029a, 0x0001029b, 0x0001029b, 0x0001029c, 0x0001029c, }, - {0x0001029d, 0x0001029d, 0x0001029e, 0x0001029e, 0x0001029f, 0x0001029f, 0x000102a0, 0x000102a0, 0x000102a1, 0x000102a1, 0x000102a2, 0x000102a2, 0x000102a3, 0x000102a3, 0x000102a4, 0x000102a4, }, - {0x000102a5, 0x000102a5, 0x000102a6, 0x000102a6, 0x000102a7, 0x000102a7, 0x000102a8, 0x000102a8, 0x000102a9, 0x000102a9, 0x000102aa, 0x000102aa, 0x000102ab, 0x000102ab, 0x000102ac, 0x000102ac, }, - {0x000102ad, 0x000102ad, 0x000102ae, 0x000102ae, 0x000102af, 0x000102af, 0x000102b0, 0x000102b0, 0x000102b1, 0x000102b1, 0x000102b2, 0x000102b2, 0x000102b3, 0x000102b3, 0x000102b4, 0x000102b4, }, - {0x000102b5, 0x000102b5, 0x000102b6, 0x000102b6, 0x000102b7, 0x000102b7, 0x000102b8, 0x000102b8, 0x000102b9, 0x000102b9, 0x000102ba, 0x000102ba, 0x000102bb, 0x000102bb, 0x000102bc, 0x000102bc, }, - {0x000102bd, 0x000102bd, 0x000102be, 0x000102be, 0x000102bf, 0x000102bf, 0x000102c0, 0x000102c0, 0x000102c1, 0x000102c1, 0x000102c2, 0x000102c2, 0x000102c3, 0x000102c3, 0x000102c4, 0x000102c4, }, - {0x000102c5, 0x000102c5, 0x000102c6, 0x000102c6, 0x000102c7, 0x000102c7, 0x000102c8, 0x000102c8, 0x000102c9, 0x000102c9, 0x000102ca, 0x000102ca, 0x000102cb, 0x000102cb, 0x000102cc, 0x000102cc, }, - {0x000102cd, 0x000102cd, 0x000102ce, 0x000102ce, 0x000102cf, 0x000102cf, 0x000102d0, 0x000102d0, 0x000102d1, 0x000102d1, 0x000102d2, 0x000102d2, 0x000102d3, 0x000102d3, 0x000102d4, 0x000102d4, }, -}; - -const uint32_t c_aauiCQMFHuffEnc50[28][2] = -{ - {0x0002, 0x0001}, {0x0002, 0x0002}, {0x0002, 0x0003}, {0x0003, 0x0001}, {0x0004, 0x0001}, {0x0005, 0x0001}, {0x0006, 0x0001}, {0x0007, 0x0001}, - {0x0008, 0x0001}, {0x0009, 0x0001}, {0x000a, 0x0001}, {0x000b, 0x0001}, {0x000c, 0x0001}, {0x000d, 0x0001}, {0x000e, 0x0001}, {0x000f, 0x0001}, - {0x0011, 0x0003}, {0x0012, 0x0005}, {0x0013, 0x0000}, {0x0013, 0x0001}, {0x0013, 0x0002}, {0x0013, 0x0003}, {0x0013, 0x0004}, {0x0013, 0x0005}, - {0x0013, 0x0006}, {0x0013, 0x0007}, {0x0013, 0x0008}, {0x0013, 0x0009}, - -}; - -const uint32_t c_aauiCQMFHuffDec50[6][16] = -{ - {0x0001ffff, 0x00000004, 0x00010003, 0x00010003, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020001, 0x00020001, 0x00020001, 0x00020001, 0x00020002, 0x00020002, 0x00020002, 0x00020002, }, - {0x0002ffff, 0x00000008, 0x00010007, 0x00010007, 0x00020006, 0x00020006, 0x00020006, 0x00020006, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, }, - {0x0003ffff, 0x0000000c, 0x0001000b, 0x0001000b, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000a, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, }, - {0x0005ffff, 0x0004ffff, 0x0001000f, 0x0001000f, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000e, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, }, - {0x0001001a, 0x0001001a, 0x0001001b, 0x0001001b, 0x00020011, 0x00020011, 0x00020011, 0x00020011, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, 0x00030010, }, - {0x00010012, 0x00010012, 0x00010013, 0x00010013, 0x00010014, 0x00010014, 0x00010015, 0x00010015, 0x00010016, 0x00010016, 0x00010017, 0x00010017, 0x00010018, 0x00010018, 0x00010019, 0x00010019, }, -}; - -const uint32_t c_aauiCQMFHuffEnc51[29][2] = -{ - {0x0002, 0x0002}, {0x0002, 0x0003}, {0x0003, 0x0002}, {0x0003, 0x0003}, {0x0004, 0x0001}, {0x0004, 0x0002}, {0x0004, 0x0003}, {0x0005, 0x0001}, - {0x0006, 0x0001}, {0x0007, 0x0001}, {0x0008, 0x0001}, {0x0009, 0x0001}, {0x000a, 0x0001}, {0x000b, 0x0001}, {0x000c, 0x0001}, {0x000d, 0x0001}, - {0x000e, 0x0001}, {0x0010, 0x0002}, {0x0010, 0x0003}, {0x0012, 0x0002}, {0x0012, 0x0003}, {0x0013, 0x0000}, {0x0013, 0x0001}, {0x0013, 0x0002}, - {0x0013, 0x0003}, {0x0012, 0x0004}, {0x0012, 0x0005}, {0x0012, 0x0006}, {0x0012, 0x0007}, - -}; - -const uint32_t c_aauiCQMFHuffDec51[6][16] = -{ - {0x0001ffff, 0x00000004, 0x00000005, 0x00000006, 0x00010002, 0x00010002, 0x00010003, 0x00010003, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020001, 0x00020001, 0x00020001, 0x00020001, }, - {0x0002ffff, 0x0000000a, 0x00010009, 0x00010009, 0x00020008, 0x00020008, 0x00020008, 0x00020008, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, }, - {0x0003ffff, 0x0000000e, 0x0001000d, 0x0001000d, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000c, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, }, - {0x0004ffff, 0x0005ffff, 0x00000011, 0x00000012, 0x00020010, 0x00020010, 0x00020010, 0x00020010, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, }, - {0x00010015, 0x00010015, 0x00010016, 0x00010016, 0x00010017, 0x00010017, 0x00010018, 0x00010018, 0x00020013, 0x00020013, 0x00020013, 0x00020013, 0x00020014, 0x00020014, 0x00020014, 0x00020014, }, - {0x00020019, 0x00020019, 0x00020019, 0x00020019, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001c, }, -}; - -const uint32_t c_aauiCQMFHuffEnc52[32][2] = -{ - {0x0002, 0x0002}, {0x0002, 0x0003}, {0x0003, 0x0002}, {0x0003, 0x0003}, {0x0004, 0x0002}, {0x0004, 0x0003}, {0x0005, 0x0001}, {0x0005, 0x0002}, - {0x0005, 0x0003}, {0x0006, 0x0001}, {0x0007, 0x0001}, {0x0008, 0x0001}, {0x0009, 0x0001}, {0x000a, 0x0001}, {0x000b, 0x0001}, {0x000c, 0x0001}, - {0x000e, 0x0001}, {0x000e, 0x0002}, {0x000e, 0x0003}, {0x000f, 0x0001}, {0x0011, 0x0002}, {0x0011, 0x0003}, {0x0012, 0x0003}, {0x0014, 0x0000}, - {0x0013, 0x0003}, {0x0014, 0x0001}, {0x0014, 0x0002}, {0x0014, 0x0003}, {0x0014, 0x0004}, {0x0014, 0x0005}, {0x0013, 0x0004}, {0x0013, 0x0005}, -}; - -const uint32_t c_aauiCQMFHuffDec52[7][16] = -{ - {0x0001ffff, 0x0002ffff, 0x00000004, 0x00000005, 0x00010002, 0x00010002, 0x00010003, 0x00010003, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020001, 0x00020001, 0x00020001, 0x00020001, }, - {0x0003ffff, 0x0000000b, 0x0001000a, 0x0001000a, 0x00020009, 0x00020009, 0x00020009, 0x00020009, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, }, - {0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, }, - {0x0004ffff, 0x0000000f, 0x0001000e, 0x0001000e, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000d, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, }, - {0x0006ffff, 0x0005ffff, 0x00010013, 0x00010013, 0x00020010, 0x00020010, 0x00020010, 0x00020010, 0x00020011, 0x00020011, 0x00020011, 0x00020011, 0x00020012, 0x00020012, 0x00020012, 0x00020012, }, - {0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, }, - {0x00000017, 0x00000019, 0x0000001a, 0x0000001b, 0x0000001c, 0x0000001d, 0x00010018, 0x00010018, 0x0001001e, 0x0001001e, 0x0001001f, 0x0001001f, 0x00020016, 0x00020016, 0x00020016, 0x00020016, }, -}; - -const uint32_t c_aauiCQMFHuffEnc53[37][2] = -{ - {0x0002, 0x0002}, {0x0002, 0x0003}, {0x0003, 0x0002}, {0x0003, 0x0003}, {0x0004, 0x0002}, {0x0004, 0x0003}, {0x0005, 0x0002}, {0x0005, 0x0003}, - {0x0006, 0x0002}, {0x0006, 0x0003}, {0x0007, 0x0001}, {0x0007, 0x0002}, {0x0007, 0x0003}, {0x0008, 0x0001}, {0x0009, 0x0001}, {0x000b, 0x0002}, - {0x000b, 0x0003}, {0x000c, 0x0002}, {0x000c, 0x0003}, {0x000d, 0x0002}, {0x000d, 0x0003}, {0x000e, 0x0002}, {0x000e, 0x0003}, {0x000f, 0x0002}, - {0x000f, 0x0003}, {0x0011, 0x0004}, {0x0010, 0x0003}, {0x0011, 0x0005}, {0x0013, 0x0000}, {0x0013, 0x0001}, {0x0012, 0x0001}, {0x0012, 0x0002}, - {0x0012, 0x0003}, {0x0012, 0x0004}, {0x0012, 0x0005}, {0x0012, 0x0006}, {0x0012, 0x0007}, - -}; - -const uint32_t c_aauiCQMFHuffDec53[9][16] = -{ - {0x0002ffff, 0x0001ffff, 0x00000004, 0x00000005, 0x00010002, 0x00010002, 0x00010003, 0x00010003, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020001, 0x00020001, 0x00020001, 0x00020001, }, - {0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, }, - {0x0003ffff, 0x0000000d, 0x0001000a, 0x0001000a, 0x0001000b, 0x0001000b, 0x0001000c, 0x0001000c, 0x00020008, 0x00020008, 0x00020008, 0x00020008, 0x00020009, 0x00020009, 0x00020009, 0x00020009, }, - {0x0005ffff, 0x0004ffff, 0x00000011, 0x00000012, 0x0001000f, 0x0001000f, 0x00010010, 0x00010010, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, 0x0003000e, }, - {0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, }, - {0x0007ffff, 0x0008ffff, 0x0006ffff, 0x0000001a, 0x00010017, 0x00010017, 0x00010018, 0x00010018, 0x00020015, 0x00020015, 0x00020015, 0x00020015, 0x00020016, 0x00020016, 0x00020016, 0x00020016, }, - {0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, }, - {0x0001001c, 0x0001001c, 0x0001001d, 0x0001001d, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001f, 0x0002001f, 0x0002001f, 0x0002001f, 0x00020020, 0x00020020, 0x00020020, 0x00020020, }, - {0x00020021, 0x00020021, 0x00020021, 0x00020021, 0x00020022, 0x00020022, 0x00020022, 0x00020022, 0x00020023, 0x00020023, 0x00020023, 0x00020023, 0x00020024, 0x00020024, 0x00020024, 0x00020024, }, -}; - -const uint32_t c_aauiCQMFHuffEnc54[39][2] = -{ - {0x0002, 0x0002}, {0x0002, 0x0003}, {0x0003, 0x0002}, {0x0003, 0x0003}, {0x0004, 0x0003}, {0x0005, 0x0003}, {0x0005, 0x0004}, {0x0005, 0x0005}, - {0x0006, 0x0002}, {0x0006, 0x0003}, {0x0006, 0x0004}, {0x0006, 0x0005}, {0x0007, 0x0002}, {0x0007, 0x0003}, {0x0008, 0x0001}, {0x0008, 0x0002}, - {0x0008, 0x0003}, {0x000a, 0x0002}, {0x000a, 0x0003}, {0x000b, 0x0002}, {0x000b, 0x0003}, {0x000c, 0x0002}, {0x000c, 0x0003}, {0x000d, 0x0002}, - {0x000d, 0x0003}, {0x000e, 0x0002}, {0x000e, 0x0003}, {0x000f, 0x0002}, {0x000f, 0x0003}, {0x0011, 0x0002}, {0x0010, 0x0002}, {0x0010, 0x0003}, - {0x0011, 0x0003}, {0x0012, 0x0002}, {0x0012, 0x0003}, {0x0013, 0x0000}, {0x0013, 0x0001}, {0x0013, 0x0002}, {0x0013, 0x0003}, - -}; - -const uint32_t c_aauiCQMFHuffDec54[9][16] = -{ - {0x0003ffff, 0x0001ffff, 0x0002ffff, 0x00000004, 0x00010002, 0x00010002, 0x00010003, 0x00010003, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020001, 0x00020001, 0x00020001, 0x00020001, }, - {0x0002000a, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000b, 0x0002000b, 0x0002000b, 0x0002000b, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, }, - {0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, }, - {0x0004ffff, 0x0000000e, 0x0000000f, 0x00000010, 0x0001000c, 0x0001000c, 0x0001000d, 0x0001000d, 0x00020008, 0x00020008, 0x00020008, 0x00020008, 0x00020009, 0x00020009, 0x00020009, 0x00020009, }, - {0x0006ffff, 0x0005ffff, 0x00000015, 0x00000016, 0x00010013, 0x00010013, 0x00010014, 0x00010014, 0x00020011, 0x00020011, 0x00020011, 0x00020011, 0x00020012, 0x00020012, 0x00020012, 0x00020012, }, - {0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, }, - {0x0008ffff, 0x0007ffff, 0x0000001e, 0x0000001f, 0x0001001b, 0x0001001b, 0x0001001c, 0x0001001c, 0x00020019, 0x00020019, 0x00020019, 0x00020019, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001a, }, - {0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, 0x00030020, }, - {0x00010023, 0x00010023, 0x00010024, 0x00010024, 0x00010025, 0x00010025, 0x00010026, 0x00010026, 0x00020021, 0x00020021, 0x00020021, 0x00020021, 0x00020022, 0x00020022, 0x00020022, 0x00020022, }, -}; - -const uint32_t c_aauiCQMFHuffEnc55[46][2] = -{ - {0x0003, 0x0003}, {0x0002, 0x0003}, {0x0003, 0x0004}, {0x0003, 0x0005}, {0x0004, 0x0003}, {0x0004, 0x0004}, {0x0004, 0x0005}, {0x0005, 0x0003}, - {0x0005, 0x0004}, {0x0005, 0x0005}, {0x0006, 0x0003}, {0x0006, 0x0004}, {0x0006, 0x0005}, {0x0007, 0x0002}, {0x0007, 0x0003}, {0x0007, 0x0004}, - {0x0007, 0x0005}, {0x0008, 0x0002}, {0x0008, 0x0003}, {0x0009, 0x0002}, {0x0009, 0x0003}, {0x000a, 0x0002}, {0x000a, 0x0003}, {0x000b, 0x0002}, - {0x000b, 0x0003}, {0x000c, 0x0002}, {0x000c, 0x0003}, {0x000d, 0x0002}, {0x000d, 0x0003}, {0x000e, 0x0002}, {0x000e, 0x0003}, {0x000f, 0x0003}, - {0x0010, 0x0002}, {0x0010, 0x0003}, {0x0010, 0x0004}, {0x0010, 0x0005}, {0x0011, 0x0003}, {0x0012, 0x0003}, {0x0012, 0x0004}, {0x0012, 0x0005}, - {0x0013, 0x0000}, {0x0013, 0x0001}, {0x0013, 0x0002}, {0x0013, 0x0003}, {0x0013, 0x0004}, {0x0013, 0x0005}, - -}; - -const uint32_t c_aauiCQMFHuffDec55[10][16] = -{ - {0x0003ffff, 0x0001ffff, 0x0002ffff, 0x00000004, 0x00000005, 0x00000006, 0x00010000, 0x00010000, 0x00010002, 0x00010002, 0x00010003, 0x00010003, 0x00020001, 0x00020001, 0x00020001, 0x00020001, }, - {0x0002000b, 0x0002000b, 0x0002000b, 0x0002000b, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000c, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, }, - {0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, }, - {0x0005ffff, 0x0004ffff, 0x00000011, 0x00000012, 0x0001000d, 0x0001000d, 0x0001000e, 0x0001000e, 0x0001000f, 0x0001000f, 0x00010010, 0x00010010, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000a, }, - {0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030013, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, }, - {0x0007ffff, 0x0006ffff, 0x00000019, 0x0000001a, 0x00010017, 0x00010017, 0x00010018, 0x00010018, 0x00020015, 0x00020015, 0x00020015, 0x00020015, 0x00020016, 0x00020016, 0x00020016, 0x00020016, }, - {0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001b, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, }, - {0x0009ffff, 0x0008ffff, 0x00000020, 0x00000021, 0x00000022, 0x00000023, 0x0001001f, 0x0001001f, 0x0002001d, 0x0002001d, 0x0002001d, 0x0002001d, 0x0002001e, 0x0002001e, 0x0002001e, 0x0002001e, }, - {0x00020026, 0x00020026, 0x00020026, 0x00020026, 0x00020027, 0x00020027, 0x00020027, 0x00020027, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, }, - {0x00010028, 0x00010028, 0x00010029, 0x00010029, 0x0001002a, 0x0001002a, 0x0001002b, 0x0001002b, 0x0001002c, 0x0001002c, 0x0001002d, 0x0001002d, 0x00020025, 0x00020025, 0x00020025, 0x00020025, }, -}; - -const uint32_t c_aauiCQMFHuffEnc56[55][2] = -{ - {0x0003, 0x0003}, {0x0002, 0x0003}, {0x0003, 0x0004}, {0x0003, 0x0005}, {0x0004, 0x0004}, {0x0004, 0x0005}, {0x0005, 0x0003}, {0x0005, 0x0004}, - {0x0005, 0x0005}, {0x0005, 0x0006}, {0x0005, 0x0007}, {0x0006, 0x0003}, {0x0006, 0x0004}, {0x0006, 0x0005}, {0x0007, 0x0003}, {0x0007, 0x0004}, - {0x0007, 0x0005}, {0x0008, 0x0002}, {0x0008, 0x0003}, {0x0008, 0x0004}, {0x0008, 0x0005}, {0x0009, 0x0002}, {0x0009, 0x0003}, {0x000a, 0x0002}, - {0x000a, 0x0003}, {0x000b, 0x0003}, {0x000c, 0x0003}, {0x000c, 0x0004}, {0x000c, 0x0005}, {0x000d, 0x0003}, {0x000d, 0x0004}, {0x000d, 0x0005}, - {0x000e, 0x0003}, {0x000e, 0x0004}, {0x000e, 0x0005}, {0x000f, 0x0004}, {0x000f, 0x0005}, {0x0010, 0x0002}, {0x0010, 0x0003}, {0x0010, 0x0004}, - {0x0010, 0x0005}, {0x0010, 0x0006}, {0x0010, 0x0007}, {0x0013, 0x0000}, {0x0011, 0x0003}, {0x0012, 0x0005}, {0x0013, 0x0001}, {0x0013, 0x0002}, - {0x0013, 0x0003}, {0x0013, 0x0004}, {0x0013, 0x0005}, {0x0013, 0x0006}, {0x0013, 0x0007}, {0x0013, 0x0008}, {0x0013, 0x0009}, - -}; - -const uint32_t c_aauiCQMFHuffDec56[12][16] = -{ - {0x0004ffff, 0x0001ffff, 0x0002ffff, 0x0003ffff, 0x00000004, 0x00000005, 0x00010000, 0x00010000, 0x00010002, 0x00010002, 0x00010003, 0x00010003, 0x00020001, 0x00020001, 0x00020001, 0x00020001, }, - {0x0002000c, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000d, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, }, - {0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, }, - {0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, }, - {0x0006ffff, 0x0005ffff, 0x00000011, 0x00000012, 0x00000013, 0x00000014, 0x0001000e, 0x0001000e, 0x0001000f, 0x0001000f, 0x00010010, 0x00010010, 0x0002000b, 0x0002000b, 0x0002000b, 0x0002000b, }, - {0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, }, - {0x0009ffff, 0x0007ffff, 0x0008ffff, 0x0000001a, 0x0000001b, 0x0000001c, 0x00010019, 0x00010019, 0x00020017, 0x00020017, 0x00020017, 0x00020017, 0x00020018, 0x00020018, 0x00020018, 0x00020018, }, - {0x00020021, 0x00020021, 0x00020021, 0x00020021, 0x00020022, 0x00020022, 0x00020022, 0x00020022, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, }, - {0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, 0x0003001f, }, - {0x000bffff, 0x000affff, 0x00000025, 0x00000026, 0x00000027, 0x00000028, 0x00000029, 0x0000002a, 0x00010023, 0x00010023, 0x00010024, 0x00010024, 0x00020020, 0x00020020, 0x00020020, 0x00020020, }, - {0x00010035, 0x00010035, 0x00010036, 0x00010036, 0x0002002d, 0x0002002d, 0x0002002d, 0x0002002d, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, }, - {0x0001002b, 0x0001002b, 0x0001002e, 0x0001002e, 0x0001002f, 0x0001002f, 0x00010030, 0x00010030, 0x00010031, 0x00010031, 0x00010032, 0x00010032, 0x00010033, 0x00010033, 0x00010034, 0x00010034, }, -}; - -const uint32_t c_aauiCQMFHuffEnc57[65][2] = -{ - {0x0003, 0x0004}, {0x0002, 0x0003}, {0x0003, 0x0005}, {0x0004, 0x0004}, {0x0004, 0x0005}, {0x0004, 0x0006}, {0x0004, 0x0007}, {0x0005, 0x0004}, - {0x0005, 0x0005}, {0x0005, 0x0006}, {0x0005, 0x0007}, {0x0006, 0x0004}, {0x0006, 0x0005}, {0x0006, 0x0006}, {0x0006, 0x0007}, {0x0007, 0x0003}, - {0x0007, 0x0004}, {0x0007, 0x0005}, {0x0007, 0x0006}, {0x0007, 0x0007}, {0x0008, 0x0003}, {0x0008, 0x0004}, {0x0008, 0x0005}, {0x0009, 0x0003}, - {0x0009, 0x0004}, {0x0009, 0x0005}, {0x000a, 0x0003}, {0x000a, 0x0004}, {0x000a, 0x0005}, {0x000b, 0x0003}, {0x000b, 0x0004}, {0x000b, 0x0005}, - {0x000c, 0x0003}, {0x000c, 0x0004}, {0x000d, 0x0003}, {0x000c, 0x0005}, {0x000d, 0x0004}, {0x000d, 0x0005}, {0x000e, 0x0003}, {0x000e, 0x0004}, - {0x000e, 0x0005}, {0x000f, 0x0003}, {0x0010, 0x0003}, {0x000f, 0x0004}, {0x000f, 0x0005}, {0x0010, 0x0004}, {0x0010, 0x0005}, {0x0013, 0x0000}, - {0x0011, 0x0005}, {0x0013, 0x0001}, {0x0013, 0x0002}, {0x0012, 0x0007}, {0x0013, 0x0003}, {0x0013, 0x0004}, {0x0012, 0x0008}, {0x0012, 0x0009}, - {0x0013, 0x0005}, {0x0013, 0x0006}, {0x0013, 0x0007}, {0x0013, 0x0008}, {0x0013, 0x0009}, {0x0013, 0x000a}, {0x0013, 0x000b}, {0x0013, 0x000c}, - {0x0013, 0x000d}, - -}; - -const uint32_t c_aauiCQMFHuffDec57[14][16] = -{ - {0x0004ffff, 0x0003ffff, 0x0001ffff, 0x0002ffff, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00010000, 0x00010000, 0x00010002, 0x00010002, 0x00020001, 0x00020001, 0x00020001, 0x00020001, }, - {0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, }, - {0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, }, - {0x0002000b, 0x0002000b, 0x0002000b, 0x0002000b, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000e, }, - {0x0007ffff, 0x0005ffff, 0x0006ffff, 0x00000014, 0x00000015, 0x00000016, 0x0001000f, 0x0001000f, 0x00010010, 0x00010010, 0x00010011, 0x00010011, 0x00010012, 0x00010012, 0x00010013, 0x00010013, }, - {0x0002001b, 0x0002001b, 0x0002001b, 0x0002001b, 0x0002001c, 0x0002001c, 0x0002001c, 0x0002001c, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, 0x00030017, }, - {0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030018, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, 0x00030019, }, - {0x000affff, 0x0008ffff, 0x0009ffff, 0x00000020, 0x00000021, 0x00000023, 0x0001001d, 0x0001001d, 0x0001001e, 0x0001001e, 0x0001001f, 0x0001001f, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001a, }, - {0x00020027, 0x00020027, 0x00020027, 0x00020027, 0x00020028, 0x00020028, 0x00020028, 0x00020028, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, }, - {0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, }, - {0x000dffff, 0x000cffff, 0x000bffff, 0x0000002a, 0x0000002d, 0x0000002e, 0x00010029, 0x00010029, 0x0001002b, 0x0001002b, 0x0001002c, 0x0001002c, 0x00020026, 0x00020026, 0x00020026, 0x00020026, }, - {0x00020036, 0x00020036, 0x00020036, 0x00020036, 0x00020037, 0x00020037, 0x00020037, 0x00020037, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, }, - {0x0001003b, 0x0001003b, 0x0001003c, 0x0001003c, 0x0001003d, 0x0001003d, 0x0001003e, 0x0001003e, 0x0001003f, 0x0001003f, 0x00010040, 0x00010040, 0x00020033, 0x00020033, 0x00020033, 0x00020033, }, - {0x0001002f, 0x0001002f, 0x00010031, 0x00010031, 0x00010032, 0x00010032, 0x00010034, 0x00010034, 0x00010035, 0x00010035, 0x00010038, 0x00010038, 0x00010039, 0x00010039, 0x0001003a, 0x0001003a, }, -}; - -const uint32_t c_aauiCQMFHuffEnc58[77][2] = -{ - {0x0004, 0x0005}, {0x0003, 0x0005}, {0x0003, 0x0006}, {0x0003, 0x0007}, {0x0004, 0x0006}, {0x0004, 0x0007}, {0x0004, 0x0008}, {0x0004, 0x0009}, - {0x0005, 0x0005}, {0x0005, 0x0006}, {0x0005, 0x0007}, {0x0005, 0x0008}, {0x0005, 0x0009}, {0x0006, 0x0004}, {0x0006, 0x0005}, {0x0006, 0x0006}, - {0x0006, 0x0007}, {0x0006, 0x0008}, {0x0006, 0x0009}, {0x0007, 0x0004}, {0x0007, 0x0005}, {0x0007, 0x0006}, {0x0007, 0x0007}, {0x0008, 0x0003}, - {0x0008, 0x0004}, {0x0008, 0x0005}, {0x0008, 0x0006}, {0x0008, 0x0007}, {0x0009, 0x0003}, {0x0009, 0x0004}, {0x0009, 0x0005}, {0x000a, 0x0003}, - {0x000a, 0x0004}, {0x000a, 0x0005}, {0x000b, 0x0004}, {0x000b, 0x0005}, {0x000c, 0x0004}, {0x000c, 0x0005}, {0x000c, 0x0006}, {0x000c, 0x0007}, - {0x000d, 0x0004}, {0x000d, 0x0005}, {0x000d, 0x0006}, {0x000d, 0x0007}, {0x000e, 0x0004}, {0x000e, 0x0005}, {0x000e, 0x0006}, {0x000e, 0x0007}, - {0x000f, 0x0004}, {0x000f, 0x0005}, {0x000f, 0x0006}, {0x0010, 0x0004}, {0x000f, 0x0007}, {0x0010, 0x0005}, {0x0010, 0x0006}, {0x0010, 0x0007}, - {0x0013, 0x0000}, {0x0013, 0x0001}, {0x0012, 0x0006}, {0x0011, 0x0007}, {0x0013, 0x0002}, {0x0013, 0x0003}, {0x0013, 0x0004}, {0x0013, 0x0005}, - {0x0012, 0x0007}, {0x0013, 0x0006}, {0x0013, 0x0007}, {0x0013, 0x0008}, {0x0013, 0x0009}, {0x0013, 0x000a}, {0x0013, 0x000b}, {0x0012, 0x0008}, - {0x0012, 0x0009}, {0x0012, 0x000a}, {0x0012, 0x000b}, {0x0012, 0x000c}, {0x0012, 0x000d}, - -}; - -const uint32_t c_aauiCQMFHuffDec58[17][16] = -{ - {0x0005ffff, 0x0004ffff, 0x0001ffff, 0x0002ffff, 0x0003ffff, 0x00000000, 0x00000004, 0x00000005, 0x00000006, 0x00000007, 0x00010001, 0x00010001, 0x00010002, 0x00010002, 0x00010003, 0x00010003, }, - {0x00020011, 0x00020011, 0x00020011, 0x00020011, 0x00020012, 0x00020012, 0x00020012, 0x00020012, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, }, - {0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, }, - {0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, }, - {0x0002000d, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000f, 0x0002000f, 0x0002000f, 0x0002000f, 0x00020010, 0x00020010, 0x00020010, 0x00020010, }, - {0x0008ffff, 0x0006ffff, 0x0007ffff, 0x00000017, 0x00000018, 0x00000019, 0x0000001a, 0x0000001b, 0x00010013, 0x00010013, 0x00010014, 0x00010014, 0x00010015, 0x00010015, 0x00010016, 0x00010016, }, - {0x00020020, 0x00020020, 0x00020020, 0x00020020, 0x00020021, 0x00020021, 0x00020021, 0x00020021, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, }, - {0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001d, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, 0x0003001e, }, - {0x000cffff, 0x000bffff, 0x0009ffff, 0x000affff, 0x00000024, 0x00000025, 0x00000026, 0x00000027, 0x00010022, 0x00010022, 0x00010023, 0x00010023, 0x0002001f, 0x0002001f, 0x0002001f, 0x0002001f, }, - {0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, }, - {0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, }, - {0x0002002c, 0x0002002c, 0x0002002c, 0x0002002c, 0x0002002d, 0x0002002d, 0x0002002d, 0x0002002d, 0x0002002e, 0x0002002e, 0x0002002e, 0x0002002e, 0x0002002f, 0x0002002f, 0x0002002f, 0x0002002f, }, - {0x0010ffff, 0x000effff, 0x000fffff, 0x000dffff, 0x00000033, 0x00000035, 0x00000036, 0x00000037, 0x00010030, 0x00010030, 0x00010031, 0x00010031, 0x00010032, 0x00010032, 0x00010034, 0x00010034, }, - {0x0002004b, 0x0002004b, 0x0002004b, 0x0002004b, 0x0002004c, 0x0002004c, 0x0002004c, 0x0002004c, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, }, - {0x00010043, 0x00010043, 0x00010044, 0x00010044, 0x00010045, 0x00010045, 0x00010046, 0x00010046, 0x0002003a, 0x0002003a, 0x0002003a, 0x0002003a, 0x00020040, 0x00020040, 0x00020040, 0x00020040, }, - {0x00020047, 0x00020047, 0x00020047, 0x00020047, 0x00020048, 0x00020048, 0x00020048, 0x00020048, 0x00020049, 0x00020049, 0x00020049, 0x00020049, 0x0002004a, 0x0002004a, 0x0002004a, 0x0002004a, }, - {0x00010038, 0x00010038, 0x00010039, 0x00010039, 0x0001003c, 0x0001003c, 0x0001003d, 0x0001003d, 0x0001003e, 0x0001003e, 0x0001003f, 0x0001003f, 0x00010041, 0x00010041, 0x00010042, 0x00010042, }, -}; - -const uint32_t c_aauiCQMFHuffEnc59[91][2] = -{ - {0x0003, 0x0005}, {0x0003, 0x0006}, {0x0003, 0x0007}, {0x0004, 0x0006}, {0x0004, 0x0007}, {0x0004, 0x0008}, {0x0004, 0x0009}, {0x0005, 0x0006}, - {0x0005, 0x0007}, {0x0005, 0x0008}, {0x0005, 0x0009}, {0x0005, 0x000a}, {0x0005, 0x000b}, {0x0006, 0x0006}, {0x0006, 0x0007}, {0x0006, 0x0008}, - {0x0006, 0x0009}, {0x0006, 0x000a}, {0x0006, 0x000b}, {0x0007, 0x0005}, {0x0007, 0x0006}, {0x0007, 0x0007}, {0x0007, 0x0008}, {0x0007, 0x0009}, - {0x0007, 0x000a}, {0x0007, 0x000b}, {0x0008, 0x0003}, {0x0008, 0x0004}, {0x0008, 0x0005}, {0x0008, 0x0006}, {0x0008, 0x0007}, {0x0008, 0x0008}, - {0x0008, 0x0009}, {0x0009, 0x0004}, {0x0009, 0x0005}, {0x000a, 0x0004}, {0x000a, 0x0005}, {0x000a, 0x0006}, {0x000a, 0x0007}, {0x000b, 0x0004}, - {0x000b, 0x0005}, {0x000b, 0x0006}, {0x000b, 0x0007}, {0x000c, 0x0004}, {0x000c, 0x0005}, {0x000c, 0x0006}, {0x000c, 0x0007}, {0x000d, 0x0003}, - {0x000d, 0x0004}, {0x000d, 0x0005}, {0x000d, 0x0006}, {0x000d, 0x0007}, {0x000e, 0x0003}, {0x000e, 0x0004}, {0x000e, 0x0005}, {0x000f, 0x0003}, - {0x000f, 0x0004}, {0x000f, 0x0005}, {0x0011, 0x0008}, {0x0011, 0x0009}, {0x0013, 0x0000}, {0x0011, 0x000a}, {0x0013, 0x0001}, {0x0013, 0x0002}, - {0x0012, 0x000d}, {0x0012, 0x000e}, {0x0013, 0x0003}, {0x0013, 0x0004}, {0x0013, 0x0005}, {0x0011, 0x000b}, {0x0013, 0x0006}, {0x0013, 0x0007}, - {0x0013, 0x0008}, {0x0013, 0x0009}, {0x0013, 0x000a}, {0x0013, 0x000b}, {0x0013, 0x000c}, {0x0013, 0x000d}, {0x0013, 0x000e}, {0x0013, 0x000f}, - {0x0013, 0x0010}, {0x0013, 0x0011}, {0x0013, 0x0012}, {0x0013, 0x0013}, {0x0013, 0x0014}, {0x0013, 0x0015}, {0x0013, 0x0016}, {0x0013, 0x0017}, - {0x0013, 0x0018}, {0x0013, 0x0019}, {0x0012, 0x000f}, - -}; - -const uint32_t c_aauiCQMFHuffDec59[20][16] = -{ - {0x0006ffff, 0x0004ffff, 0x0005ffff, 0x0001ffff, 0x0002ffff, 0x0003ffff, 0x00000003, 0x00000004, 0x00000005, 0x00000006, 0x00010000, 0x00010000, 0x00010001, 0x00010001, 0x00010002, 0x00010002, }, - {0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, }, - {0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, }, - {0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, }, - {0x00010016, 0x00010016, 0x00010017, 0x00010017, 0x00010018, 0x00010018, 0x00010019, 0x00010019, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000e, }, - {0x0002000f, 0x0002000f, 0x0002000f, 0x0002000f, 0x00020010, 0x00020010, 0x00020010, 0x00020010, 0x00020011, 0x00020011, 0x00020011, 0x00020011, 0x00020012, 0x00020012, 0x00020012, 0x00020012, }, - {0x0009ffff, 0x0008ffff, 0x0007ffff, 0x0000001a, 0x0000001b, 0x0000001c, 0x0000001d, 0x0000001e, 0x0000001f, 0x00000020, 0x00010013, 0x00010013, 0x00010014, 0x00010014, 0x00010015, 0x00010015, }, - {0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, }, - {0x00020023, 0x00020023, 0x00020023, 0x00020023, 0x00020024, 0x00020024, 0x00020024, 0x00020024, 0x00020025, 0x00020025, 0x00020025, 0x00020025, 0x00020026, 0x00020026, 0x00020026, 0x00020026, }, - {0x000dffff, 0x000affff, 0x000bffff, 0x000cffff, 0x0000002b, 0x0000002c, 0x0000002d, 0x0000002e, 0x00010027, 0x00010027, 0x00010028, 0x00010028, 0x00010029, 0x00010029, 0x0001002a, 0x0001002a, }, - {0x00020035, 0x00020035, 0x00020035, 0x00020035, 0x00020036, 0x00020036, 0x00020036, 0x00020036, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, }, - {0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, }, - {0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, }, - {0x0011ffff, 0x0012ffff, 0x0013ffff, 0x0010ffff, 0x000effff, 0x000fffff, 0x00010037, 0x00010037, 0x00010038, 0x00010038, 0x00010039, 0x00010039, 0x00020034, 0x00020034, 0x00020034, 0x00020034, }, - {0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, }, - {0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x0003003d, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, }, - {0x00010058, 0x00010058, 0x00010059, 0x00010059, 0x00020040, 0x00020040, 0x00020040, 0x00020040, 0x00020041, 0x00020041, 0x00020041, 0x00020041, 0x0002005a, 0x0002005a, 0x0002005a, 0x0002005a, }, - {0x0001003c, 0x0001003c, 0x0001003e, 0x0001003e, 0x0001003f, 0x0001003f, 0x00010042, 0x00010042, 0x00010043, 0x00010043, 0x00010044, 0x00010044, 0x00010046, 0x00010046, 0x00010047, 0x00010047, }, - {0x00010048, 0x00010048, 0x00010049, 0x00010049, 0x0001004a, 0x0001004a, 0x0001004b, 0x0001004b, 0x0001004c, 0x0001004c, 0x0001004d, 0x0001004d, 0x0001004e, 0x0001004e, 0x0001004f, 0x0001004f, }, - {0x00010050, 0x00010050, 0x00010051, 0x00010051, 0x00010052, 0x00010052, 0x00010053, 0x00010053, 0x00010054, 0x00010054, 0x00010055, 0x00010055, 0x00010056, 0x00010056, 0x00010057, 0x00010057, }, -}; - -const uint32_t c_aauiCQMFHuffEnc60[109][2] = -{ - {0x0004, 0x0007}, {0x0002, 0x0003}, {0x0003, 0x0005}, {0x0004, 0x0008}, {0x0004, 0x0009}, {0x0005, 0x0007}, {0x0005, 0x0008}, {0x0005, 0x0009}, - {0x0005, 0x000a}, {0x0005, 0x000b}, {0x0005, 0x000c}, {0x0005, 0x000d}, {0x0006, 0x0007}, {0x0006, 0x0008}, {0x0006, 0x0009}, {0x0006, 0x000a}, - {0x0006, 0x000b}, {0x0006, 0x000c}, {0x0006, 0x000d}, {0x0007, 0x0006}, {0x0007, 0x0007}, {0x0007, 0x0008}, {0x0007, 0x0009}, {0x0007, 0x000a}, - {0x0007, 0x000b}, {0x0007, 0x000c}, {0x0007, 0x000d}, {0x0008, 0x0006}, {0x0008, 0x0007}, {0x0008, 0x0008}, {0x0008, 0x0009}, {0x0008, 0x000a}, - {0x0008, 0x000b}, {0x0009, 0x0004}, {0x0009, 0x0005}, {0x0009, 0x0006}, {0x0009, 0x0007}, {0x0009, 0x0008}, {0x0009, 0x0009}, {0x0009, 0x000a}, - {0x0009, 0x000b}, {0x000a, 0x0004}, {0x000a, 0x0005}, {0x000a, 0x0006}, {0x000a, 0x0007}, {0x000b, 0x0004}, {0x000b, 0x0005}, {0x000b, 0x0006}, - {0x000b, 0x0007}, {0x000c, 0x0004}, {0x000c, 0x0005}, {0x000c, 0x0006}, {0x000d, 0x0005}, {0x000d, 0x0006}, {0x000d, 0x0007}, {0x000c, 0x0007}, - {0x000e, 0x0005}, {0x000e, 0x0006}, {0x000e, 0x0007}, {0x000e, 0x0008}, {0x000f, 0x0005}, {0x000e, 0x0009}, {0x000f, 0x0006}, {0x0010, 0x0006}, - {0x000f, 0x0007}, {0x000f, 0x0008}, {0x000f, 0x0009}, {0x0010, 0x0007}, {0x0010, 0x0008}, {0x0010, 0x0009}, {0x0011, 0x000a}, {0x0013, 0x0000}, - {0x0011, 0x000b}, {0x0013, 0x0001}, {0x0013, 0x0002}, {0x0012, 0x0011}, {0x0012, 0x0012}, {0x0013, 0x0003}, {0x0013, 0x0004}, {0x0013, 0x0005}, - {0x0013, 0x0006}, {0x0013, 0x0007}, {0x0013, 0x0008}, {0x0013, 0x0009}, {0x0013, 0x000a}, {0x0013, 0x000b}, {0x0013, 0x000c}, {0x0013, 0x000d}, - {0x0013, 0x000e}, {0x0013, 0x000f}, {0x0013, 0x0010}, {0x0013, 0x0011}, {0x0013, 0x0012}, {0x0013, 0x0013}, {0x0013, 0x0014}, {0x0013, 0x0015}, - {0x0013, 0x0016}, {0x0013, 0x0017}, {0x0013, 0x0018}, {0x0013, 0x0019}, {0x0013, 0x001a}, {0x0013, 0x001b}, {0x0013, 0x001c}, {0x0013, 0x001d}, - {0x0013, 0x001e}, {0x0013, 0x001f}, {0x0013, 0x0020}, {0x0013, 0x0021}, {0x0012, 0x0013}, - -}; - -const uint32_t c_aauiCQMFHuffDec60[24][16] = -{ - {0x0007ffff, 0x0005ffff, 0x0006ffff, 0x0001ffff, 0x0002ffff, 0x0003ffff, 0x0004ffff, 0x00000000, 0x00000003, 0x00000004, 0x00010002, 0x00010002, 0x00020001, 0x00020001, 0x00020001, 0x00020001, }, - {0x00020011, 0x00020011, 0x00020011, 0x00020011, 0x00020012, 0x00020012, 0x00020012, 0x00020012, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, }, - {0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, }, - {0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, }, - {0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, }, - {0x00010015, 0x00010015, 0x00010016, 0x00010016, 0x00010017, 0x00010017, 0x00010018, 0x00010018, 0x00010019, 0x00010019, 0x0001001a, 0x0001001a, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000c, }, - {0x0002000d, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000f, 0x0002000f, 0x0002000f, 0x0002000f, 0x00020010, 0x00020010, 0x00020010, 0x00020010, }, - {0x000dffff, 0x000cffff, 0x0008ffff, 0x0009ffff, 0x000affff, 0x000bffff, 0x0000001b, 0x0000001c, 0x0000001d, 0x0000001e, 0x0000001f, 0x00000020, 0x00010013, 0x00010013, 0x00010014, 0x00010014, }, - {0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030021, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, 0x00030022, }, - {0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030023, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, 0x00030024, }, - {0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030025, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, }, - {0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, }, - {0x00020029, 0x00020029, 0x00020029, 0x00020029, 0x0002002a, 0x0002002a, 0x0002002a, 0x0002002a, 0x0002002b, 0x0002002b, 0x0002002b, 0x0002002b, 0x0002002c, 0x0002002c, 0x0002002c, 0x0002002c, }, - {0x0011ffff, 0x0010ffff, 0x000fffff, 0x000effff, 0x00000031, 0x00000032, 0x00000033, 0x00000037, 0x0001002d, 0x0001002d, 0x0001002e, 0x0001002e, 0x0001002f, 0x0001002f, 0x00010030, 0x00010030, }, - {0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, }, - {0x0002003b, 0x0002003b, 0x0002003b, 0x0002003b, 0x0002003d, 0x0002003d, 0x0002003d, 0x0002003d, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, }, - {0x00010041, 0x00010041, 0x00010042, 0x00010042, 0x00020038, 0x00020038, 0x00020038, 0x00020038, 0x00020039, 0x00020039, 0x00020039, 0x00020039, 0x0002003a, 0x0002003a, 0x0002003a, 0x0002003a, }, - {0x0014ffff, 0x0015ffff, 0x0016ffff, 0x0017ffff, 0x0013ffff, 0x0012ffff, 0x0000003f, 0x00000043, 0x00000044, 0x00000045, 0x0001003c, 0x0001003c, 0x0001003e, 0x0001003e, 0x00010040, 0x00010040, }, - {0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030046, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, 0x00030048, }, - {0x0001006a, 0x0001006a, 0x0001006b, 0x0001006b, 0x0002004b, 0x0002004b, 0x0002004b, 0x0002004b, 0x0002004c, 0x0002004c, 0x0002004c, 0x0002004c, 0x0002006c, 0x0002006c, 0x0002006c, 0x0002006c, }, - {0x00010047, 0x00010047, 0x00010049, 0x00010049, 0x0001004a, 0x0001004a, 0x0001004d, 0x0001004d, 0x0001004e, 0x0001004e, 0x0001004f, 0x0001004f, 0x00010050, 0x00010050, 0x00010051, 0x00010051, }, - {0x00010052, 0x00010052, 0x00010053, 0x00010053, 0x00010054, 0x00010054, 0x00010055, 0x00010055, 0x00010056, 0x00010056, 0x00010057, 0x00010057, 0x00010058, 0x00010058, 0x00010059, 0x00010059, }, - {0x0001005a, 0x0001005a, 0x0001005b, 0x0001005b, 0x0001005c, 0x0001005c, 0x0001005d, 0x0001005d, 0x0001005e, 0x0001005e, 0x0001005f, 0x0001005f, 0x00010060, 0x00010060, 0x00010061, 0x00010061, }, - {0x00010062, 0x00010062, 0x00010063, 0x00010063, 0x00010064, 0x00010064, 0x00010065, 0x00010065, 0x00010066, 0x00010066, 0x00010067, 0x00010067, 0x00010068, 0x00010068, 0x00010069, 0x00010069, }, -}; - -const uint32_t c_aauiCQMFHuffEnc61[129][2] = -{ - {0x0004, 0x0008}, {0x0003, 0x0006}, {0x0003, 0x0007}, {0x0004, 0x0009}, {0x0004, 0x000a}, {0x0004, 0x000b}, {0x0005, 0x0008}, {0x0005, 0x0009}, - {0x0005, 0x000a}, {0x0005, 0x000b}, {0x0005, 0x000c}, {0x0005, 0x000d}, {0x0005, 0x000e}, {0x0005, 0x000f}, {0x0006, 0x0008}, {0x0006, 0x0009}, - {0x0006, 0x000a}, {0x0006, 0x000b}, {0x0006, 0x000c}, {0x0006, 0x000d}, {0x0006, 0x000e}, {0x0006, 0x000f}, {0x0007, 0x0008}, {0x0007, 0x0009}, - {0x0007, 0x000a}, {0x0007, 0x000b}, {0x0007, 0x000c}, {0x0007, 0x000d}, {0x0007, 0x000e}, {0x0007, 0x000f}, {0x0008, 0x0006}, {0x0008, 0x0007}, - {0x0008, 0x0008}, {0x0008, 0x0009}, {0x0008, 0x000a}, {0x0008, 0x000b}, {0x0008, 0x000c}, {0x0008, 0x000d}, {0x0008, 0x000e}, {0x0008, 0x000f}, - {0x0009, 0x0006}, {0x0009, 0x0007}, {0x0009, 0x0008}, {0x0009, 0x0009}, {0x0009, 0x000a}, {0x0009, 0x000b}, {0x000a, 0x0005}, {0x000a, 0x0006}, - {0x000a, 0x0007}, {0x000a, 0x0008}, {0x000a, 0x0009}, {0x000a, 0x000a}, {0x000a, 0x000b}, {0x000b, 0x0005}, {0x000b, 0x0006}, {0x000b, 0x0007}, - {0x000b, 0x0008}, {0x000b, 0x0009}, {0x000c, 0x0006}, {0x000c, 0x0007}, {0x000c, 0x0008}, {0x000c, 0x0009}, {0x000d, 0x0005}, {0x000d, 0x0006}, - {0x000d, 0x0007}, {0x000d, 0x0008}, {0x000d, 0x0009}, {0x000d, 0x000a}, {0x000e, 0x0008}, {0x000d, 0x000b}, {0x000e, 0x0009}, {0x000f, 0x0009}, - {0x000f, 0x000a}, {0x000f, 0x000b}, {0x000f, 0x000c}, {0x000f, 0x000d}, {0x000f, 0x000e}, {0x0010, 0x000c}, {0x0011, 0x0015}, {0x0010, 0x000d}, - {0x000f, 0x000f}, {0x0010, 0x000e}, {0x0010, 0x000f}, {0x0012, 0x0000}, {0x0011, 0x0016}, {0x0010, 0x0010}, {0x0010, 0x0011}, {0x0011, 0x0017}, - {0x0012, 0x0001}, {0x0012, 0x0002}, {0x0012, 0x0003}, {0x0012, 0x0004}, {0x0012, 0x0005}, {0x0012, 0x0006}, {0x0012, 0x0007}, {0x0012, 0x0008}, - {0x0012, 0x0009}, {0x0012, 0x000a}, {0x0012, 0x000b}, {0x0012, 0x000c}, {0x0012, 0x000d}, {0x0012, 0x000e}, {0x0012, 0x000f}, {0x0012, 0x0010}, - {0x0012, 0x0011}, {0x0012, 0x0012}, {0x0012, 0x0013}, {0x0012, 0x0014}, {0x0012, 0x0015}, {0x0012, 0x0016}, {0x0012, 0x0017}, {0x0012, 0x0018}, - {0x0012, 0x0019}, {0x0012, 0x001a}, {0x0012, 0x001b}, {0x0012, 0x001c}, {0x0012, 0x001d}, {0x0012, 0x001e}, {0x0012, 0x001f}, {0x0012, 0x0020}, - {0x0012, 0x0021}, {0x0012, 0x0022}, {0x0012, 0x0023}, {0x0012, 0x0024}, {0x0012, 0x0025}, {0x0012, 0x0026}, {0x0012, 0x0027}, {0x0012, 0x0028}, - {0x0012, 0x0029}, - -}; - -const uint32_t c_aauiCQMFHuffDec61[33][16] = -{ - {0x0008ffff, 0x0007ffff, 0x0005ffff, 0x0006ffff, 0x0001ffff, 0x0002ffff, 0x0003ffff, 0x0004ffff, 0x00000000, 0x00000003, 0x00000004, 0x00000005, 0x00010001, 0x00010001, 0x00010002, 0x00010002, }, - {0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, }, - {0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, }, - {0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, }, - {0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, 0x0003000d, }, - {0x0002000e, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000f, 0x0002000f, 0x0002000f, 0x0002000f, 0x00020010, 0x00020010, 0x00020010, 0x00020010, 0x00020011, 0x00020011, 0x00020011, 0x00020011, }, - {0x00020012, 0x00020012, 0x00020012, 0x00020012, 0x00020013, 0x00020013, 0x00020013, 0x00020013, 0x00020014, 0x00020014, 0x00020014, 0x00020014, 0x00020015, 0x00020015, 0x00020015, 0x00020015, }, - {0x00010016, 0x00010016, 0x00010017, 0x00010017, 0x00010018, 0x00010018, 0x00010019, 0x00010019, 0x0001001a, 0x0001001a, 0x0001001b, 0x0001001b, 0x0001001c, 0x0001001c, 0x0001001d, 0x0001001d, }, - {0x000effff, 0x000cffff, 0x000dffff, 0x0009ffff, 0x000affff, 0x000bffff, 0x0000001e, 0x0000001f, 0x00000020, 0x00000021, 0x00000022, 0x00000023, 0x00000024, 0x00000025, 0x00000026, 0x00000027, }, - {0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, 0x00030029, }, - {0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002a, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, }, - {0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, }, - {0x00010038, 0x00010038, 0x00010039, 0x00010039, 0x0002002e, 0x0002002e, 0x0002002e, 0x0002002e, 0x0002002f, 0x0002002f, 0x0002002f, 0x0002002f, 0x00020030, 0x00020030, 0x00020030, 0x00020030, }, - {0x00020031, 0x00020031, 0x00020031, 0x00020031, 0x00020032, 0x00020032, 0x00020032, 0x00020032, 0x00020033, 0x00020033, 0x00020033, 0x00020033, 0x00020034, 0x00020034, 0x00020034, 0x00020034, }, - {0x0014ffff, 0x0013ffff, 0x000fffff, 0x0010ffff, 0x0011ffff, 0x0012ffff, 0x0000003a, 0x0000003b, 0x0000003c, 0x0000003d, 0x00010035, 0x00010035, 0x00010036, 0x00010036, 0x00010037, 0x00010037, }, - {0x00020044, 0x00020044, 0x00020044, 0x00020044, 0x00020046, 0x00020046, 0x00020046, 0x00020046, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, 0x0003003e, }, - {0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x0003003f, 0x00030040, 0x00030040, 0x00030040, 0x00030040, 0x00030040, 0x00030040, 0x00030040, 0x00030040, }, - {0x00030041, 0x00030041, 0x00030041, 0x00030041, 0x00030041, 0x00030041, 0x00030041, 0x00030041, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, 0x00030042, }, - {0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030043, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, 0x00030045, }, - {0x00000055, 0x00000056, 0x00010047, 0x00010047, 0x00010048, 0x00010048, 0x00010049, 0x00010049, 0x0001004a, 0x0001004a, 0x0001004b, 0x0001004b, 0x0001004c, 0x0001004c, 0x00010050, 0x00010050, }, - {0x0017ffff, 0x0018ffff, 0x0019ffff, 0x001affff, 0x001bffff, 0x001cffff, 0x001dffff, 0x001effff, 0x001fffff, 0x0020ffff, 0x0016ffff, 0x0015ffff, 0x0000004d, 0x0000004f, 0x00000051, 0x00000052, }, - {0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030057, }, - {0x0002007f, 0x0002007f, 0x0002007f, 0x0002007f, 0x00020080, 0x00020080, 0x00020080, 0x00020080, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, }, - {0x00020053, 0x00020053, 0x00020053, 0x00020053, 0x00020058, 0x00020058, 0x00020058, 0x00020058, 0x00020059, 0x00020059, 0x00020059, 0x00020059, 0x0002005a, 0x0002005a, 0x0002005a, 0x0002005a, }, - {0x0002005b, 0x0002005b, 0x0002005b, 0x0002005b, 0x0002005c, 0x0002005c, 0x0002005c, 0x0002005c, 0x0002005d, 0x0002005d, 0x0002005d, 0x0002005d, 0x0002005e, 0x0002005e, 0x0002005e, 0x0002005e, }, - {0x0002005f, 0x0002005f, 0x0002005f, 0x0002005f, 0x00020060, 0x00020060, 0x00020060, 0x00020060, 0x00020061, 0x00020061, 0x00020061, 0x00020061, 0x00020062, 0x00020062, 0x00020062, 0x00020062, }, - {0x00020063, 0x00020063, 0x00020063, 0x00020063, 0x00020064, 0x00020064, 0x00020064, 0x00020064, 0x00020065, 0x00020065, 0x00020065, 0x00020065, 0x00020066, 0x00020066, 0x00020066, 0x00020066, }, - {0x00020067, 0x00020067, 0x00020067, 0x00020067, 0x00020068, 0x00020068, 0x00020068, 0x00020068, 0x00020069, 0x00020069, 0x00020069, 0x00020069, 0x0002006a, 0x0002006a, 0x0002006a, 0x0002006a, }, - {0x0002006b, 0x0002006b, 0x0002006b, 0x0002006b, 0x0002006c, 0x0002006c, 0x0002006c, 0x0002006c, 0x0002006d, 0x0002006d, 0x0002006d, 0x0002006d, 0x0002006e, 0x0002006e, 0x0002006e, 0x0002006e, }, - {0x0002006f, 0x0002006f, 0x0002006f, 0x0002006f, 0x00020070, 0x00020070, 0x00020070, 0x00020070, 0x00020071, 0x00020071, 0x00020071, 0x00020071, 0x00020072, 0x00020072, 0x00020072, 0x00020072, }, - {0x00020073, 0x00020073, 0x00020073, 0x00020073, 0x00020074, 0x00020074, 0x00020074, 0x00020074, 0x00020075, 0x00020075, 0x00020075, 0x00020075, 0x00020076, 0x00020076, 0x00020076, 0x00020076, }, - {0x00020077, 0x00020077, 0x00020077, 0x00020077, 0x00020078, 0x00020078, 0x00020078, 0x00020078, 0x00020079, 0x00020079, 0x00020079, 0x00020079, 0x0002007a, 0x0002007a, 0x0002007a, 0x0002007a, }, - {0x0002007b, 0x0002007b, 0x0002007b, 0x0002007b, 0x0002007c, 0x0002007c, 0x0002007c, 0x0002007c, 0x0002007d, 0x0002007d, 0x0002007d, 0x0002007d, 0x0002007e, 0x0002007e, 0x0002007e, 0x0002007e, }, -}; - -const uint32_t c_aauiCQMFHuffEnc62[153][2] = -{ - {0x0004, 0x0009}, {0x0003, 0x0006}, {0x0003, 0x0007}, {0x0004, 0x000a}, {0x0004, 0x000b}, {0x0005, 0x000a}, {0x0005, 0x000b}, {0x0005, 0x000c}, - {0x0005, 0x000d}, {0x0005, 0x000e}, {0x0005, 0x000f}, {0x0005, 0x0010}, {0x0005, 0x0011}, {0x0006, 0x000a}, {0x0006, 0x000b}, {0x0006, 0x000c}, - {0x0006, 0x000d}, {0x0006, 0x000e}, {0x0006, 0x000f}, {0x0006, 0x0010}, {0x0006, 0x0011}, {0x0006, 0x0012}, {0x0006, 0x0013}, {0x0007, 0x0009}, - {0x0007, 0x000a}, {0x0007, 0x000b}, {0x0007, 0x000c}, {0x0007, 0x000d}, {0x0007, 0x000e}, {0x0007, 0x000f}, {0x0007, 0x0010}, {0x0007, 0x0011}, - {0x0007, 0x0012}, {0x0007, 0x0013}, {0x0008, 0x0009}, {0x0008, 0x000a}, {0x0008, 0x000b}, {0x0008, 0x000c}, {0x0008, 0x000d}, {0x0008, 0x000e}, - {0x0008, 0x000f}, {0x0008, 0x0010}, {0x0008, 0x0011}, {0x0009, 0x0007}, {0x0009, 0x0008}, {0x0009, 0x0009}, {0x0009, 0x000a}, {0x0009, 0x000b}, - {0x0009, 0x000c}, {0x0009, 0x000d}, {0x0009, 0x000e}, {0x0009, 0x000f}, {0x0009, 0x0010}, {0x0009, 0x0011}, {0x000a, 0x0004}, {0x000a, 0x0005}, - {0x000a, 0x0006}, {0x000a, 0x0007}, {0x000a, 0x0008}, {0x000a, 0x0009}, {0x000a, 0x000a}, {0x000a, 0x000b}, {0x000a, 0x000c}, {0x000a, 0x000d}, - {0x000b, 0x0007}, {0x000c, 0x0007}, {0x000c, 0x0008}, {0x000c, 0x0009}, {0x000c, 0x000a}, {0x000c, 0x000b}, {0x000c, 0x000c}, {0x000d, 0x0007}, - {0x000c, 0x000d}, {0x000d, 0x0008}, {0x000d, 0x0009}, {0x000d, 0x000a}, {0x000d, 0x000b}, {0x000e, 0x0008}, {0x000d, 0x000c}, {0x000d, 0x000d}, - {0x000e, 0x0009}, {0x000e, 0x000a}, {0x000e, 0x000b}, {0x000e, 0x000c}, {0x000f, 0x000c}, {0x000e, 0x000d}, {0x000f, 0x000d}, {0x000f, 0x000e}, - {0x000f, 0x000f}, {0x0010, 0x000f}, {0x0010, 0x0010}, {0x0011, 0x0019}, {0x0010, 0x0011}, {0x0010, 0x0012}, {0x0010, 0x0013}, {0x0010, 0x0014}, - {0x0010, 0x0015}, {0x0012, 0x0000}, {0x0010, 0x0016}, {0x0011, 0x001a}, {0x0010, 0x0017}, {0x0012, 0x0001}, {0x0012, 0x0002}, {0x0012, 0x0003}, - {0x0011, 0x001b}, {0x0012, 0x0004}, {0x0012, 0x0005}, {0x0012, 0x0006}, {0x0012, 0x0007}, {0x0012, 0x0008}, {0x0012, 0x0009}, {0x0012, 0x000a}, - {0x0012, 0x000b}, {0x0012, 0x000c}, {0x0012, 0x000d}, {0x0012, 0x000e}, {0x0012, 0x000f}, {0x0012, 0x0010}, {0x0012, 0x0011}, {0x0012, 0x0012}, - {0x0012, 0x0013}, {0x0012, 0x0014}, {0x0012, 0x0015}, {0x0012, 0x0016}, {0x0012, 0x0017}, {0x0012, 0x0018}, {0x0011, 0x001c}, {0x0012, 0x0019}, - {0x0012, 0x001a}, {0x0012, 0x001b}, {0x0012, 0x001c}, {0x0012, 0x001d}, {0x0012, 0x001e}, {0x0012, 0x001f}, {0x0012, 0x0020}, {0x0012, 0x0021}, - {0x0012, 0x0022}, {0x0012, 0x0023}, {0x0012, 0x0024}, {0x0012, 0x0025}, {0x0012, 0x0026}, {0x0012, 0x0027}, {0x0012, 0x0028}, {0x0012, 0x0029}, - {0x0012, 0x002a}, {0x0012, 0x002b}, {0x0012, 0x002c}, {0x0012, 0x002d}, {0x0012, 0x002e}, {0x0012, 0x002f}, {0x0012, 0x0030}, {0x0012, 0x0031}, - {0x0011, 0x001d}, - -}; - -const uint32_t c_aauiCQMFHuffDec62[41][16] = -{ - {0x0009ffff, 0x0008ffff, 0x0005ffff, 0x0006ffff, 0x0007ffff, 0x0001ffff, 0x0002ffff, 0x0003ffff, 0x0004ffff, 0x00000000, 0x00000003, 0x00000004, 0x00010001, 0x00010001, 0x00010002, 0x00010002, }, - {0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, }, - {0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, 0x00030008, }, - {0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x00030009, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, 0x0003000a, }, - {0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000b, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, }, - {0x0001001e, 0x0001001e, 0x0001001f, 0x0001001f, 0x00010020, 0x00010020, 0x00010021, 0x00010021, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000e, }, - {0x0002000f, 0x0002000f, 0x0002000f, 0x0002000f, 0x00020010, 0x00020010, 0x00020010, 0x00020010, 0x00020011, 0x00020011, 0x00020011, 0x00020011, 0x00020012, 0x00020012, 0x00020012, 0x00020012, }, - {0x00020013, 0x00020013, 0x00020013, 0x00020013, 0x00020014, 0x00020014, 0x00020014, 0x00020014, 0x00020015, 0x00020015, 0x00020015, 0x00020015, 0x00020016, 0x00020016, 0x00020016, 0x00020016, }, - {0x00000029, 0x0000002a, 0x00010017, 0x00010017, 0x00010018, 0x00010018, 0x00010019, 0x00010019, 0x0001001a, 0x0001001a, 0x0001001b, 0x0001001b, 0x0001001c, 0x0001001c, 0x0001001d, 0x0001001d, }, - {0x0012ffff, 0x0010ffff, 0x0011ffff, 0x000affff, 0x000bffff, 0x000cffff, 0x000dffff, 0x000effff, 0x000fffff, 0x00000022, 0x00000023, 0x00000024, 0x00000025, 0x00000026, 0x00000027, 0x00000028, }, - {0x0002003e, 0x0002003e, 0x0002003e, 0x0002003e, 0x0002003f, 0x0002003f, 0x0002003f, 0x0002003f, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, }, - {0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, }, - {0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, }, - {0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, }, - {0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, }, - {0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, }, - {0x00020036, 0x00020036, 0x00020036, 0x00020036, 0x00020037, 0x00020037, 0x00020037, 0x00020037, 0x00020038, 0x00020038, 0x00020038, 0x00020038, 0x00020039, 0x00020039, 0x00020039, 0x00020039, }, - {0x0002003a, 0x0002003a, 0x0002003a, 0x0002003a, 0x0002003b, 0x0002003b, 0x0002003b, 0x0002003b, 0x0002003c, 0x0002003c, 0x0002003c, 0x0002003c, 0x0002003d, 0x0002003d, 0x0002003d, 0x0002003d, }, - {0x0019ffff, 0x0018ffff, 0x0017ffff, 0x0013ffff, 0x0014ffff, 0x0015ffff, 0x0016ffff, 0x00000041, 0x00000042, 0x00000043, 0x00000044, 0x00000045, 0x00000046, 0x00000048, 0x00010040, 0x00010040, }, - {0x00020053, 0x00020053, 0x00020053, 0x00020053, 0x00020055, 0x00020055, 0x00020055, 0x00020055, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, 0x00030047, }, - {0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x00030049, 0x0003004a, 0x0003004a, 0x0003004a, 0x0003004a, 0x0003004a, 0x0003004a, 0x0003004a, 0x0003004a, }, - {0x0003004b, 0x0003004b, 0x0003004b, 0x0003004b, 0x0003004b, 0x0003004b, 0x0003004b, 0x0003004b, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, 0x0003004c, }, - {0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004e, 0x0003004f, 0x0003004f, 0x0003004f, 0x0003004f, 0x0003004f, 0x0003004f, 0x0003004f, 0x0003004f, }, - {0x0002004d, 0x0002004d, 0x0002004d, 0x0002004d, 0x00020050, 0x00020050, 0x00020050, 0x00020050, 0x00020051, 0x00020051, 0x00020051, 0x00020051, 0x00020052, 0x00020052, 0x00020052, 0x00020052, }, - {0x0000005a, 0x0000005c, 0x0000005d, 0x0000005e, 0x0000005f, 0x00000060, 0x00000062, 0x00000064, 0x00010054, 0x00010054, 0x00010056, 0x00010056, 0x00010057, 0x00010057, 0x00010058, 0x00010058, }, - {0x001dffff, 0x001effff, 0x001fffff, 0x0020ffff, 0x0021ffff, 0x0022ffff, 0x0023ffff, 0x0024ffff, 0x0025ffff, 0x0026ffff, 0x0027ffff, 0x0028ffff, 0x001affff, 0x001bffff, 0x001cffff, 0x00000059, }, - {0x00020096, 0x00020096, 0x00020096, 0x00020096, 0x00020097, 0x00020097, 0x00020097, 0x00020097, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, 0x0003005b, }, - {0x00030063, 0x00030063, 0x00030063, 0x00030063, 0x00030063, 0x00030063, 0x00030063, 0x00030063, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, 0x00030068, }, - {0x0003007e, 0x0003007e, 0x0003007e, 0x0003007e, 0x0003007e, 0x0003007e, 0x0003007e, 0x0003007e, 0x00030098, 0x00030098, 0x00030098, 0x00030098, 0x00030098, 0x00030098, 0x00030098, 0x00030098, }, - {0x00020061, 0x00020061, 0x00020061, 0x00020061, 0x00020065, 0x00020065, 0x00020065, 0x00020065, 0x00020066, 0x00020066, 0x00020066, 0x00020066, 0x00020067, 0x00020067, 0x00020067, 0x00020067, }, - {0x00020069, 0x00020069, 0x00020069, 0x00020069, 0x0002006a, 0x0002006a, 0x0002006a, 0x0002006a, 0x0002006b, 0x0002006b, 0x0002006b, 0x0002006b, 0x0002006c, 0x0002006c, 0x0002006c, 0x0002006c, }, - {0x0002006d, 0x0002006d, 0x0002006d, 0x0002006d, 0x0002006e, 0x0002006e, 0x0002006e, 0x0002006e, 0x0002006f, 0x0002006f, 0x0002006f, 0x0002006f, 0x00020070, 0x00020070, 0x00020070, 0x00020070, }, - {0x00020071, 0x00020071, 0x00020071, 0x00020071, 0x00020072, 0x00020072, 0x00020072, 0x00020072, 0x00020073, 0x00020073, 0x00020073, 0x00020073, 0x00020074, 0x00020074, 0x00020074, 0x00020074, }, - {0x00020075, 0x00020075, 0x00020075, 0x00020075, 0x00020076, 0x00020076, 0x00020076, 0x00020076, 0x00020077, 0x00020077, 0x00020077, 0x00020077, 0x00020078, 0x00020078, 0x00020078, 0x00020078, }, - {0x00020079, 0x00020079, 0x00020079, 0x00020079, 0x0002007a, 0x0002007a, 0x0002007a, 0x0002007a, 0x0002007b, 0x0002007b, 0x0002007b, 0x0002007b, 0x0002007c, 0x0002007c, 0x0002007c, 0x0002007c, }, - {0x0002007d, 0x0002007d, 0x0002007d, 0x0002007d, 0x0002007f, 0x0002007f, 0x0002007f, 0x0002007f, 0x00020080, 0x00020080, 0x00020080, 0x00020080, 0x00020081, 0x00020081, 0x00020081, 0x00020081, }, - {0x00020082, 0x00020082, 0x00020082, 0x00020082, 0x00020083, 0x00020083, 0x00020083, 0x00020083, 0x00020084, 0x00020084, 0x00020084, 0x00020084, 0x00020085, 0x00020085, 0x00020085, 0x00020085, }, - {0x00020086, 0x00020086, 0x00020086, 0x00020086, 0x00020087, 0x00020087, 0x00020087, 0x00020087, 0x00020088, 0x00020088, 0x00020088, 0x00020088, 0x00020089, 0x00020089, 0x00020089, 0x00020089, }, - {0x0002008a, 0x0002008a, 0x0002008a, 0x0002008a, 0x0002008b, 0x0002008b, 0x0002008b, 0x0002008b, 0x0002008c, 0x0002008c, 0x0002008c, 0x0002008c, 0x0002008d, 0x0002008d, 0x0002008d, 0x0002008d, }, - {0x0002008e, 0x0002008e, 0x0002008e, 0x0002008e, 0x0002008f, 0x0002008f, 0x0002008f, 0x0002008f, 0x00020090, 0x00020090, 0x00020090, 0x00020090, 0x00020091, 0x00020091, 0x00020091, 0x00020091, }, - {0x00020092, 0x00020092, 0x00020092, 0x00020092, 0x00020093, 0x00020093, 0x00020093, 0x00020093, 0x00020094, 0x00020094, 0x00020094, 0x00020094, 0x00020095, 0x00020095, 0x00020095, 0x00020095, }, -}; - -const uint32_t c_aauiCQMFHuffEnc63[181][2] = -{ - {0x0004, 0x0008}, {0x0003, 0x0005}, {0x0002, 0x0003}, {0x0004, 0x0009}, {0x0005, 0x000c}, {0x0005, 0x000d}, {0x0005, 0x000e}, {0x0005, 0x000f}, - {0x0006, 0x000c}, {0x0006, 0x000d}, {0x0006, 0x000e}, {0x0006, 0x000f}, {0x0006, 0x0010}, {0x0006, 0x0011}, {0x0006, 0x0012}, {0x0006, 0x0013}, - {0x0006, 0x0014}, {0x0006, 0x0015}, {0x0006, 0x0016}, {0x0006, 0x0017}, {0x0007, 0x000b}, {0x0007, 0x000c}, {0x0007, 0x000d}, {0x0007, 0x000e}, - {0x0007, 0x000f}, {0x0007, 0x0010}, {0x0007, 0x0011}, {0x0007, 0x0012}, {0x0007, 0x0013}, {0x0007, 0x0014}, {0x0007, 0x0015}, {0x0007, 0x0016}, - {0x0007, 0x0017}, {0x0008, 0x000c}, {0x0008, 0x000d}, {0x0008, 0x000e}, {0x0008, 0x000f}, {0x0008, 0x0010}, {0x0008, 0x0011}, {0x0008, 0x0012}, - {0x0008, 0x0013}, {0x0008, 0x0014}, {0x0008, 0x0015}, {0x0009, 0x0008}, {0x0009, 0x0009}, {0x0009, 0x000a}, {0x0009, 0x000b}, {0x0009, 0x000c}, - {0x0009, 0x000d}, {0x0009, 0x000e}, {0x0009, 0x000f}, {0x0009, 0x0010}, {0x0009, 0x0011}, {0x0009, 0x0012}, {0x0009, 0x0013}, {0x0009, 0x0014}, - {0x0009, 0x0015}, {0x000a, 0x0007}, {0x0009, 0x0016}, {0x0009, 0x0017}, {0x000a, 0x0008}, {0x000a, 0x0009}, {0x000a, 0x000a}, {0x000a, 0x000b}, - {0x000a, 0x000c}, {0x000a, 0x000d}, {0x000a, 0x000e}, {0x000b, 0x0008}, {0x000b, 0x0009}, {0x000b, 0x000a}, {0x000a, 0x000f}, {0x000b, 0x000b}, - {0x000b, 0x000c}, {0x000b, 0x000d}, {0x000c, 0x0009}, {0x000c, 0x000a}, {0x000c, 0x000b}, {0x000c, 0x000c}, {0x000c, 0x000d}, {0x000c, 0x000e}, - {0x000c, 0x000f}, {0x000d, 0x0008}, {0x000d, 0x0009}, {0x000d, 0x000a}, {0x000d, 0x000b}, {0x000d, 0x000c}, {0x000d, 0x000d}, {0x000d, 0x000e}, - {0x000d, 0x000f}, {0x000d, 0x0010}, {0x000d, 0x0011}, {0x000e, 0x0007}, {0x000e, 0x0008}, {0x000e, 0x0009}, {0x000e, 0x000a}, {0x000e, 0x000b}, - {0x000e, 0x000c}, {0x000e, 0x000d}, {0x000e, 0x000e}, {0x000e, 0x000f}, {0x000f, 0x0008}, {0x000f, 0x0009}, {0x000f, 0x000a}, {0x000f, 0x000b}, - {0x000f, 0x000c}, {0x0010, 0x0009}, {0x0010, 0x000a}, {0x000f, 0x000d}, {0x0010, 0x000b}, {0x0010, 0x000c}, {0x0010, 0x000d}, {0x0011, 0x000e}, - {0x0011, 0x000f}, {0x0010, 0x000e}, {0x0011, 0x0010}, {0x0011, 0x0011}, {0x0012, 0x0014}, {0x0014, 0x0000}, {0x0010, 0x000f}, {0x0012, 0x0015}, - {0x0012, 0x0016}, {0x0014, 0x0001}, {0x0012, 0x0017}, {0x0012, 0x0018}, {0x0012, 0x0019}, {0x0013, 0x0010}, {0x0012, 0x001a}, {0x0014, 0x0002}, - {0x0012, 0x001b}, {0x0014, 0x0003}, {0x0014, 0x0004}, {0x0014, 0x0005}, {0x0013, 0x0011}, {0x0014, 0x0006}, {0x0013, 0x0012}, {0x0014, 0x0007}, - {0x0014, 0x0008}, {0x0014, 0x0009}, {0x0014, 0x000a}, {0x0014, 0x000b}, {0x0014, 0x000c}, {0x0014, 0x000d}, {0x0014, 0x000e}, {0x0013, 0x0013}, - {0x0014, 0x000f}, {0x0014, 0x0010}, {0x0014, 0x0011}, {0x0014, 0x0012}, {0x0014, 0x0013}, {0x0014, 0x0014}, {0x0014, 0x0015}, {0x0014, 0x0016}, - {0x0014, 0x0017}, {0x0014, 0x0018}, {0x0014, 0x0019}, {0x0014, 0x001a}, {0x0014, 0x001b}, {0x0014, 0x001c}, {0x0014, 0x001d}, {0x0014, 0x001e}, - {0x0014, 0x001f}, {0x0013, 0x0014}, {0x0013, 0x0015}, {0x0013, 0x0016}, {0x0013, 0x0017}, {0x0013, 0x0018}, {0x0013, 0x0019}, {0x0013, 0x001a}, - {0x0013, 0x001b}, {0x0013, 0x001c}, {0x0013, 0x001d}, {0x0013, 0x001e}, {0x0013, 0x001f}, {0x0013, 0x0020}, {0x0013, 0x0021}, {0x0013, 0x0022}, - {0x0013, 0x0023}, {0x0013, 0x0024}, {0x0013, 0x0025}, {0x0013, 0x0026}, {0x0013, 0x0027}, - -}; - -const uint32_t c_aauiCQMFHuffDec63[39][16] = -{ - {0x0008ffff, 0x0006ffff, 0x0007ffff, 0x0003ffff, 0x0004ffff, 0x0005ffff, 0x0001ffff, 0x0002ffff, 0x00000000, 0x00000003, 0x00010001, 0x00010001, 0x00020002, 0x00020002, 0x00020002, 0x00020002, }, - {0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030004, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, }, - {0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030006, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, 0x00030007, }, - {0x00020008, 0x00020008, 0x00020008, 0x00020008, 0x00020009, 0x00020009, 0x00020009, 0x00020009, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000a, 0x0002000b, 0x0002000b, 0x0002000b, 0x0002000b, }, - {0x0002000c, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000f, 0x0002000f, 0x0002000f, 0x0002000f, }, - {0x00020010, 0x00020010, 0x00020010, 0x00020010, 0x00020011, 0x00020011, 0x00020011, 0x00020011, 0x00020012, 0x00020012, 0x00020012, 0x00020012, 0x00020013, 0x00020013, 0x00020013, 0x00020013, }, - {0x00000025, 0x00000026, 0x00000027, 0x00000028, 0x00000029, 0x0000002a, 0x00010014, 0x00010014, 0x00010015, 0x00010015, 0x00010016, 0x00010016, 0x00010017, 0x00010017, 0x00010018, 0x00010018, }, - {0x00010019, 0x00010019, 0x0001001a, 0x0001001a, 0x0001001b, 0x0001001b, 0x0001001c, 0x0001001c, 0x0001001d, 0x0001001d, 0x0001001e, 0x0001001e, 0x0001001f, 0x0001001f, 0x00010020, 0x00010020, }, - {0x0014ffff, 0x0011ffff, 0x0012ffff, 0x0013ffff, 0x0009ffff, 0x000affff, 0x000bffff, 0x000cffff, 0x000dffff, 0x000effff, 0x000fffff, 0x0010ffff, 0x00000021, 0x00000022, 0x00000023, 0x00000024, }, - {0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002b, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, 0x0003002c, }, - {0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002d, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, 0x0003002e, }, - {0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x0003002f, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, 0x00030030, }, - {0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030031, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, 0x00030032, }, - {0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030033, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, 0x00030034, }, - {0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030035, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, 0x00030036, }, - {0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030037, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, 0x00030038, }, - {0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003a, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, 0x0003003b, }, - {0x00010043, 0x00010043, 0x00010044, 0x00010044, 0x00010045, 0x00010045, 0x00010047, 0x00010047, 0x00010048, 0x00010048, 0x00010049, 0x00010049, 0x00020039, 0x00020039, 0x00020039, 0x00020039, }, - {0x0002003c, 0x0002003c, 0x0002003c, 0x0002003c, 0x0002003d, 0x0002003d, 0x0002003d, 0x0002003d, 0x0002003e, 0x0002003e, 0x0002003e, 0x0002003e, 0x0002003f, 0x0002003f, 0x0002003f, 0x0002003f, }, - {0x00020040, 0x00020040, 0x00020040, 0x00020040, 0x00020041, 0x00020041, 0x00020041, 0x00020041, 0x00020042, 0x00020042, 0x00020042, 0x00020042, 0x00020046, 0x00020046, 0x00020046, 0x00020046, }, - {0x001dffff, 0x001affff, 0x001bffff, 0x001cffff, 0x0015ffff, 0x0016ffff, 0x0017ffff, 0x0018ffff, 0x0019ffff, 0x0000004a, 0x0000004b, 0x0000004c, 0x0000004d, 0x0000004e, 0x0000004f, 0x00000050, }, - {0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030051, 0x00030052, 0x00030052, 0x00030052, 0x00030052, 0x00030052, 0x00030052, 0x00030052, 0x00030052, }, - {0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030053, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, 0x00030054, }, - {0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030055, 0x00030056, 0x00030056, 0x00030056, 0x00030056, 0x00030056, 0x00030056, 0x00030056, 0x00030056, }, - {0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030057, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, 0x00030058, }, - {0x00030059, 0x00030059, 0x00030059, 0x00030059, 0x00030059, 0x00030059, 0x00030059, 0x00030059, 0x0003005a, 0x0003005a, 0x0003005a, 0x0003005a, 0x0003005a, 0x0003005a, 0x0003005a, 0x0003005a, }, - {0x00010064, 0x00010064, 0x00010065, 0x00010065, 0x00010066, 0x00010066, 0x00010067, 0x00010067, 0x00010068, 0x00010068, 0x0001006b, 0x0001006b, 0x0002005b, 0x0002005b, 0x0002005b, 0x0002005b, }, - {0x0002005c, 0x0002005c, 0x0002005c, 0x0002005c, 0x0002005d, 0x0002005d, 0x0002005d, 0x0002005d, 0x0002005e, 0x0002005e, 0x0002005e, 0x0002005e, 0x0002005f, 0x0002005f, 0x0002005f, 0x0002005f, }, - {0x00020060, 0x00020060, 0x00020060, 0x00020060, 0x00020061, 0x00020061, 0x00020061, 0x00020061, 0x00020062, 0x00020062, 0x00020062, 0x00020062, 0x00020063, 0x00020063, 0x00020063, 0x00020063, }, - {0x0026ffff, 0x0025ffff, 0x0022ffff, 0x0023ffff, 0x0024ffff, 0x0020ffff, 0x0021ffff, 0x001effff, 0x001fffff, 0x00000069, 0x0000006a, 0x0000006c, 0x0000006d, 0x0000006e, 0x00000071, 0x00000076, }, - {0x0003006f, 0x0003006f, 0x0003006f, 0x0003006f, 0x0003006f, 0x0003006f, 0x0003006f, 0x0003006f, 0x00030070, 0x00030070, 0x00030070, 0x00030070, 0x00030070, 0x00030070, 0x00030070, 0x00030070, }, - {0x00030072, 0x00030072, 0x00030072, 0x00030072, 0x00030072, 0x00030072, 0x00030072, 0x00030072, 0x00030073, 0x00030073, 0x00030073, 0x00030073, 0x00030073, 0x00030073, 0x00030073, 0x00030073, }, - {0x00020074, 0x00020074, 0x00020074, 0x00020074, 0x00020077, 0x00020077, 0x00020077, 0x00020077, 0x00020078, 0x00020078, 0x00020078, 0x00020078, 0x0002007a, 0x0002007a, 0x0002007a, 0x0002007a, }, - {0x0002007b, 0x0002007b, 0x0002007b, 0x0002007b, 0x0002007c, 0x0002007c, 0x0002007c, 0x0002007c, 0x0002007e, 0x0002007e, 0x0002007e, 0x0002007e, 0x00020080, 0x00020080, 0x00020080, 0x00020080, }, - {0x0001007d, 0x0001007d, 0x00010084, 0x00010084, 0x00010086, 0x00010086, 0x0001008f, 0x0001008f, 0x000100a1, 0x000100a1, 0x000100a2, 0x000100a2, 0x000100a3, 0x000100a3, 0x000100a4, 0x000100a4, }, - {0x000100a5, 0x000100a5, 0x000100a6, 0x000100a6, 0x000100a7, 0x000100a7, 0x000100a8, 0x000100a8, 0x000100a9, 0x000100a9, 0x000100aa, 0x000100aa, 0x000100ab, 0x000100ab, 0x000100ac, 0x000100ac, }, - {0x000100ad, 0x000100ad, 0x000100ae, 0x000100ae, 0x000100af, 0x000100af, 0x000100b0, 0x000100b0, 0x000100b1, 0x000100b1, 0x000100b2, 0x000100b2, 0x000100b3, 0x000100b3, 0x000100b4, 0x000100b4, }, - {0x00000091, 0x00000092, 0x00000093, 0x00000094, 0x00000095, 0x00000096, 0x00000097, 0x00000098, 0x00000099, 0x0000009a, 0x0000009b, 0x0000009c, 0x0000009d, 0x0000009e, 0x0000009f, 0x000000a0, }, - {0x00000075, 0x00000079, 0x0000007f, 0x00000081, 0x00000082, 0x00000083, 0x00000085, 0x00000087, 0x00000088, 0x00000089, 0x0000008a, 0x0000008b, 0x0000008c, 0x0000008d, 0x0000008e, 0x00000090, }, -}; - -const uint32_t (*c_apauiHuffEncTabels[2 * ALLOC_TABLE_SIZE])[2] = { - NULL, - c_aauiCQMFHuffEnc1, - c_aauiCQMFHuffEnc2, - c_aauiCQMFHuffEnc3, - c_aauiCQMFHuffEnc4, - c_aauiCQMFHuffEnc5, - c_aauiCQMFHuffEnc6, - c_aauiCQMFHuffEnc7, - c_aauiCQMFHuffEnc8, - c_aauiCQMFHuffEnc9, - c_aauiCQMFHuffEnc10, - c_aauiCQMFHuffEnc11, - c_aauiCQMFHuffEnc12, - c_aauiCQMFHuffEnc13, - c_aauiCQMFHuffEnc14, - c_aauiCQMFHuffEnc15, - c_aauiCQMFHuffEnc16, - c_aauiCQMFHuffEnc17, - c_aauiCQMFHuffEnc18, - c_aauiCQMFHuffEnc19, - c_aauiCQMFHuffEnc20, - c_aauiCQMFHuffEnc21, - c_aauiCQMFHuffEnc22, - c_aauiCQMFHuffEnc23, - c_aauiCQMFHuffEnc24, - c_aauiCQMFHuffEnc25, - c_aauiCQMFHuffEnc26, - c_aauiCQMFHuffEnc27, - c_aauiCQMFHuffEnc28, - c_aauiCQMFHuffEnc29, - c_aauiCQMFHuffEnc30, - c_aauiCQMFHuffEnc31, - NULL, - c_aauiCQMFHuffEnc33, - c_aauiCQMFHuffEnc34, - c_aauiCQMFHuffEnc35, - c_aauiCQMFHuffEnc36, - c_aauiCQMFHuffEnc37, - c_aauiCQMFHuffEnc38, - c_aauiCQMFHuffEnc39, - c_aauiCQMFHuffEnc40, - c_aauiCQMFHuffEnc41, - c_aauiCQMFHuffEnc42, - c_aauiCQMFHuffEnc43, - c_aauiCQMFHuffEnc44, - c_aauiCQMFHuffEnc45, - c_aauiCQMFHuffEnc46, - c_aauiCQMFHuffEnc47, - c_aauiCQMFHuffEnc48, - c_aauiCQMFHuffEnc49, - c_aauiCQMFHuffEnc50, - c_aauiCQMFHuffEnc51, - c_aauiCQMFHuffEnc52, - c_aauiCQMFHuffEnc53, - c_aauiCQMFHuffEnc54, - c_aauiCQMFHuffEnc55, - c_aauiCQMFHuffEnc56, - c_aauiCQMFHuffEnc57, - c_aauiCQMFHuffEnc58, - c_aauiCQMFHuffEnc59, - c_aauiCQMFHuffEnc60, - c_aauiCQMFHuffEnc61, - c_aauiCQMFHuffEnc62, - c_aauiCQMFHuffEnc63, -}; - -const uint32_t (*c_apauiHuffDecTables[2 * ALLOC_TABLE_SIZE])[HUFF_DEC_TABLE_SIZE] = { - NULL, - c_aauiCQMFHuffDec1, - c_aauiCQMFHuffDec2, - c_aauiCQMFHuffDec3, - c_aauiCQMFHuffDec4, - c_aauiCQMFHuffDec5, - c_aauiCQMFHuffDec6, - c_aauiCQMFHuffDec7, - c_aauiCQMFHuffDec8, - c_aauiCQMFHuffDec9, - c_aauiCQMFHuffDec10, - c_aauiCQMFHuffDec11, - c_aauiCQMFHuffDec12, - c_aauiCQMFHuffDec13, - c_aauiCQMFHuffDec14, - c_aauiCQMFHuffDec15, - c_aauiCQMFHuffDec16, - c_aauiCQMFHuffDec17, - c_aauiCQMFHuffDec18, - c_aauiCQMFHuffDec19, - c_aauiCQMFHuffDec20, - c_aauiCQMFHuffDec21, - c_aauiCQMFHuffDec22, - c_aauiCQMFHuffDec23, - c_aauiCQMFHuffDec24, - c_aauiCQMFHuffDec25, - c_aauiCQMFHuffDec26, - c_aauiCQMFHuffDec27, - c_aauiCQMFHuffDec28, - c_aauiCQMFHuffDec29, - c_aauiCQMFHuffDec30, - c_aauiCQMFHuffDec31, - NULL, - c_aauiCQMFHuffDec33, - c_aauiCQMFHuffDec34, - c_aauiCQMFHuffDec35, - c_aauiCQMFHuffDec36, - c_aauiCQMFHuffDec37, - c_aauiCQMFHuffDec38, - c_aauiCQMFHuffDec39, - c_aauiCQMFHuffDec40, - c_aauiCQMFHuffDec41, - c_aauiCQMFHuffDec42, - c_aauiCQMFHuffDec43, - c_aauiCQMFHuffDec44, - c_aauiCQMFHuffDec45, - c_aauiCQMFHuffDec46, - c_aauiCQMFHuffDec47, - c_aauiCQMFHuffDec48, - c_aauiCQMFHuffDec49, - c_aauiCQMFHuffDec50, - c_aauiCQMFHuffDec51, - c_aauiCQMFHuffDec52, - c_aauiCQMFHuffDec53, - c_aauiCQMFHuffDec54, - c_aauiCQMFHuffDec55, - c_aauiCQMFHuffDec56, - c_aauiCQMFHuffDec57, - c_aauiCQMFHuffDec58, - c_aauiCQMFHuffDec59, - c_aauiCQMFHuffDec60, - c_aauiCQMFHuffDec61, - c_aauiCQMFHuffDec62, - c_aauiCQMFHuffDec63, -}; - -#ifdef USE_DEMOD_TABLES -const int32_t c_aaiHuffDemod1[16][2] = { - 0,0,0,1,0,2,0,3,1,0,1,1,1,2,1,3,2,0,2,1,2,2,2,3,3,0,3,1,3,2,3,3, -}; - -const int32_t c_aaiHuffDemod2[16][2] = { - 0,0,0,1,0,2,0,3,1,0,1,1,1,2,1,3,2,0,2,1,2,2,2,3,3,0,3,1,3,2,3,3, -}; - -const int32_t c_aaiHuffDemod3[25][2] = { - 0,0,0,1,0,2,0,3,0,4,1,0,1,1,1,2,1,3,1,4,2,0,2,1,2,2,2,3,2,4,3,0, - 3,1,3,2,3,3,3,4,4,0,4,1,4,2,4,3,4,4, -}; - -const int32_t c_aaiHuffDemod4[36][2] = { - 0,0,0,1,0,2,0,3,0,4,0,5,1,0,1,1,1,2,1,3,1,4,1,5,2,0,2,1,2,2,2,3, - 2,4,2,5,3,0,3,1,3,2,3,3,3,4,3,5,4,0,4,1,4,2,4,3,4,4,4,5,5,0,5,1, - 5,2,5,3,5,4,5,5, -}; - -const int32_t c_aaiHuffDemod5[36][2] = { - 0,0,0,1,0,2,0,3,0,4,0,5,1,0,1,1,1,2,1,3,1,4,1,5,2,0,2,1,2,2,2,3, - 2,4,2,5,3,0,3,1,3,2,3,3,3,4,3,5,4,0,4,1,4,2,4,3,4,4,4,5,5,0,5,1, - 5,2,5,3,5,4,5,5, -}; - -const int32_t c_aaiHuffDemod6[49][2] = { - 0,0,0,1,0,2,0,3,0,4,0,5,0,6,1,0,1,1,1,2,1,3,1,4,1,5,1,6,2,0,2,1, - 2,2,2,3,2,4,2,5,2,6,3,0,3,1,3,2,3,3,3,4,3,5,3,6,4,0,4,1,4,2,4,3, - 4,4,4,5,4,6,5,0,5,1,5,2,5,3,5,4,5,5,5,6,6,0,6,1,6,2,6,3,6,4,6,5, - 6,6, -}; - -const int32_t c_aaiHuffDemod7[64][2] = { - 0,0,0,1,0,2,0,3,0,4,0,5,0,6,0,7,1,0,1,1,1,2,1,3,1,4,1,5,1,6,1,7, - 2,0,2,1,2,2,2,3,2,4,2,5,2,6,2,7,3,0,3,1,3,2,3,3,3,4,3,5,3,6,3,7, - 4,0,4,1,4,2,4,3,4,4,4,5,4,6,4,7,5,0,5,1,5,2,5,3,5,4,5,5,5,6,5,7, - 6,0,6,1,6,2,6,3,6,4,6,5,6,6,6,7,7,0,7,1,7,2,7,3,7,4,7,5,7,6,7,7, -}; - -const int32_t c_aaiHuffDemod8[81][2] = { - 0,0,0,1,0,2,0,3,0,4,0,5,0,6,0,7,0,8,1,0,1,1,1,2,1,3,1,4,1,5,1,6, - 1,7,1,8,2,0,2,1,2,2,2,3,2,4,2,5,2,6,2,7,2,8,3,0,3,1,3,2,3,3,3,4, - 3,5,3,6,3,7,3,8,4,0,4,1,4,2,4,3,4,4,4,5,4,6,4,7,4,8,5,0,5,1,5,2, - 5,3,5,4,5,5,5,6,5,7,5,8,6,0,6,1,6,2,6,3,6,4,6,5,6,6,6,7,6,8,7,0, - 7,1,7,2,7,3,7,4,7,5,7,6,7,7,7,8,8,0,8,1,8,2,8,3,8,4,8,5,8,6,8,7, - 8,8, -}; - -const int32_t c_aaiHuffDemod9[100][2] = { - 0,0,0,1,0,2,0,3,0,4,0,5,0,6,0,7,0,8,0,9,1,0,1,1,1,2,1,3,1,4,1,5, - 1,6,1,7,1,8,1,9,2,0,2,1,2,2,2,3,2,4,2,5,2,6,2,7,2,8,2,9,3,0,3,1, - 3,2,3,3,3,4,3,5,3,6,3,7,3,8,3,9,4,0,4,1,4,2,4,3,4,4,4,5,4,6,4,7, - 4,8,4,9,5,0,5,1,5,2,5,3,5,4,5,5,5,6,5,7,5,8,5,9,6,0,6,1,6,2,6,3, - 6,4,6,5,6,6,6,7,6,8,6,9,7,0,7,1,7,2,7,3,7,4,7,5,7,6,7,7,7,8,7,9, - 8,0,8,1,8,2,8,3,8,4,8,5,8,6,8,7,8,8,8,9,9,0,9,1,9,2,9,3,9,4,9,5, - 9,6,9,7,9,8,9,9, -}; - -const int32_t c_aaiHuffDemod10[169][2] = { - 0,0,0,1,0,2,0,3,0,4,0,5,0,6,0,7,0,8,0,9,0,10,0,11,0,12,1,0,1,1,1,2, - 1,3,1,4,1,5,1,6,1,7,1,8,1,9,1,10,1,11,1,12,2,0,2,1,2,2,2,3,2,4,2,5, - 2,6,2,7,2,8,2,9,2,10,2,11,2,12,3,0,3,1,3,2,3,3,3,4,3,5,3,6,3,7,3,8, - 3,9,3,10,3,11,3,12,4,0,4,1,4,2,4,3,4,4,4,5,4,6,4,7,4,8,4,9,4,10,4,11, - 4,12,5,0,5,1,5,2,5,3,5,4,5,5,5,6,5,7,5,8,5,9,5,10,5,11,5,12,6,0,6,1, - 6,2,6,3,6,4,6,5,6,6,6,7,6,8,6,9,6,10,6,11,6,12,7,0,7,1,7,2,7,3,7,4, - 7,5,7,6,7,7,7,8,7,9,7,10,7,11,7,12,8,0,8,1,8,2,8,3,8,4,8,5,8,6,8,7, - 8,8,8,9,8,10,8,11,8,12,9,0,9,1,9,2,9,3,9,4,9,5,9,6,9,7,9,8,9,9,9,10, - 9,11,9,12,10,0,10,1,10,2,10,3,10,4,10,5,10,6,10,7,10,8,10,9,10,10,10,11,10,12,11,0, - 11,1,11,2,11,3,11,4,11,5,11,6,11,7,11,8,11,9,11,10,11,11,11,12,12,0,12,1,12,2,12,3, - 12,4,12,5,12,6,12,7,12,8,12,9,12,10,12,11,12,12, -}; - -const int32_t c_aaiHuffDemod11[196][2] = { - 0,0,0,1,0,2,0,3,0,4,0,5,0,6,0,7,0,8,0,9,0,10,0,11,0,12,0,13,1,0,1,1, - 1,2,1,3,1,4,1,5,1,6,1,7,1,8,1,9,1,10,1,11,1,12,1,13,2,0,2,1,2,2,2,3, - 2,4,2,5,2,6,2,7,2,8,2,9,2,10,2,11,2,12,2,13,3,0,3,1,3,2,3,3,3,4,3,5, - 3,6,3,7,3,8,3,9,3,10,3,11,3,12,3,13,4,0,4,1,4,2,4,3,4,4,4,5,4,6,4,7, - 4,8,4,9,4,10,4,11,4,12,4,13,5,0,5,1,5,2,5,3,5,4,5,5,5,6,5,7,5,8,5,9, - 5,10,5,11,5,12,5,13,6,0,6,1,6,2,6,3,6,4,6,5,6,6,6,7,6,8,6,9,6,10,6,11, - 6,12,6,13,7,0,7,1,7,2,7,3,7,4,7,5,7,6,7,7,7,8,7,9,7,10,7,11,7,12,7,13, - 8,0,8,1,8,2,8,3,8,4,8,5,8,6,8,7,8,8,8,9,8,10,8,11,8,12,8,13,9,0,9,1, - 9,2,9,3,9,4,9,5,9,6,9,7,9,8,9,9,9,10,9,11,9,12,9,13,10,0,10,1,10,2,10,3, - 10,4,10,5,10,6,10,7,10,8,10,9,10,10,10,11,10,12,10,13,11,0,11,1,11,2,11,3,11,4,11,5, - 11,6,11,7,11,8,11,9,11,10,11,11,11,12,11,13,12,0,12,1,12,2,12,3,12,4,12,5,12,6,12,7, - 12,8,12,9,12,10,12,11,12,12,12,13,13,0,13,1,13,2,13,3,13,4,13,5,13,6,13,7,13,8,13,9, - 13,10,13,11,13,12,13,13, -}; - -const int32_t c_aaiHuffDemod12[289][2] = { - 0,0,0,1,0,2,0,3,0,4,0,5,0,6,0,7,0,8,0,9,0,10,0,11,0,12,0,13,0,14,0,15, - 0,16,1,0,1,1,1,2,1,3,1,4,1,5,1,6,1,7,1,8,1,9,1,10,1,11,1,12,1,13,1,14, - 1,15,1,16,2,0,2,1,2,2,2,3,2,4,2,5,2,6,2,7,2,8,2,9,2,10,2,11,2,12,2,13, - 2,14,2,15,2,16,3,0,3,1,3,2,3,3,3,4,3,5,3,6,3,7,3,8,3,9,3,10,3,11,3,12, - 3,13,3,14,3,15,3,16,4,0,4,1,4,2,4,3,4,4,4,5,4,6,4,7,4,8,4,9,4,10,4,11, - 4,12,4,13,4,14,4,15,4,16,5,0,5,1,5,2,5,3,5,4,5,5,5,6,5,7,5,8,5,9,5,10, - 5,11,5,12,5,13,5,14,5,15,5,16,6,0,6,1,6,2,6,3,6,4,6,5,6,6,6,7,6,8,6,9, - 6,10,6,11,6,12,6,13,6,14,6,15,6,16,7,0,7,1,7,2,7,3,7,4,7,5,7,6,7,7,7,8, - 7,9,7,10,7,11,7,12,7,13,7,14,7,15,7,16,8,0,8,1,8,2,8,3,8,4,8,5,8,6,8,7, - 8,8,8,9,8,10,8,11,8,12,8,13,8,14,8,15,8,16,9,0,9,1,9,2,9,3,9,4,9,5,9,6, - 9,7,9,8,9,9,9,10,9,11,9,12,9,13,9,14,9,15,9,16,10,0,10,1,10,2,10,3,10,4,10,5, - 10,6,10,7,10,8,10,9,10,10,10,11,10,12,10,13,10,14,10,15,10,16,11,0,11,1,11,2,11,3,11,4, - 11,5,11,6,11,7,11,8,11,9,11,10,11,11,11,12,11,13,11,14,11,15,11,16,12,0,12,1,12,2,12,3, - 12,4,12,5,12,6,12,7,12,8,12,9,12,10,12,11,12,12,12,13,12,14,12,15,12,16,13,0,13,1,13,2, - 13,3,13,4,13,5,13,6,13,7,13,8,13,9,13,10,13,11,13,12,13,13,13,14,13,15,13,16,14,0,14,1, - 14,2,14,3,14,4,14,5,14,6,14,7,14,8,14,9,14,10,14,11,14,12,14,13,14,14,14,15,14,16,15,0, - 15,1,15,2,15,3,15,4,15,5,15,6,15,7,15,8,15,9,15,10,15,11,15,12,15,13,15,14,15,15,15,16, - 16,0,16,1,16,2,16,3,16,4,16,5,16,6,16,7,16,8,16,9,16,10,16,11,16,12,16,13,16,14,16,15, - 16,16, -}; - -const int32_t c_aaiHuffDemod13[324][2] = { - 0,0,0,1,0,2,0,3,0,4,0,5,0,6,0,7,0,8,0,9,0,10,0,11,0,12,0,13,0,14,0,15, - 0,16,0,17,1,0,1,1,1,2,1,3,1,4,1,5,1,6,1,7,1,8,1,9,1,10,1,11,1,12,1,13, - 1,14,1,15,1,16,1,17,2,0,2,1,2,2,2,3,2,4,2,5,2,6,2,7,2,8,2,9,2,10,2,11, - 2,12,2,13,2,14,2,15,2,16,2,17,3,0,3,1,3,2,3,3,3,4,3,5,3,6,3,7,3,8,3,9, - 3,10,3,11,3,12,3,13,3,14,3,15,3,16,3,17,4,0,4,1,4,2,4,3,4,4,4,5,4,6,4,7, - 4,8,4,9,4,10,4,11,4,12,4,13,4,14,4,15,4,16,4,17,5,0,5,1,5,2,5,3,5,4,5,5, - 5,6,5,7,5,8,5,9,5,10,5,11,5,12,5,13,5,14,5,15,5,16,5,17,6,0,6,1,6,2,6,3, - 6,4,6,5,6,6,6,7,6,8,6,9,6,10,6,11,6,12,6,13,6,14,6,15,6,16,6,17,7,0,7,1, - 7,2,7,3,7,4,7,5,7,6,7,7,7,8,7,9,7,10,7,11,7,12,7,13,7,14,7,15,7,16,7,17, - 8,0,8,1,8,2,8,3,8,4,8,5,8,6,8,7,8,8,8,9,8,10,8,11,8,12,8,13,8,14,8,15, - 8,16,8,17,9,0,9,1,9,2,9,3,9,4,9,5,9,6,9,7,9,8,9,9,9,10,9,11,9,12,9,13, - 9,14,9,15,9,16,9,17,10,0,10,1,10,2,10,3,10,4,10,5,10,6,10,7,10,8,10,9,10,10,10,11, - 10,12,10,13,10,14,10,15,10,16,10,17,11,0,11,1,11,2,11,3,11,4,11,5,11,6,11,7,11,8,11,9, - 11,10,11,11,11,12,11,13,11,14,11,15,11,16,11,17,12,0,12,1,12,2,12,3,12,4,12,5,12,6,12,7, - 12,8,12,9,12,10,12,11,12,12,12,13,12,14,12,15,12,16,12,17,13,0,13,1,13,2,13,3,13,4,13,5, - 13,6,13,7,13,8,13,9,13,10,13,11,13,12,13,13,13,14,13,15,13,16,13,17,14,0,14,1,14,2,14,3, - 14,4,14,5,14,6,14,7,14,8,14,9,14,10,14,11,14,12,14,13,14,14,14,15,14,16,14,17,15,0,15,1, - 15,2,15,3,15,4,15,5,15,6,15,7,15,8,15,9,15,10,15,11,15,12,15,13,15,14,15,15,15,16,15,17, - 16,0,16,1,16,2,16,3,16,4,16,5,16,6,16,7,16,8,16,9,16,10,16,11,16,12,16,13,16,14,16,15, - 16,16,16,17,17,0,17,1,17,2,17,3,17,4,17,5,17,6,17,7,17,8,17,9,17,10,17,11,17,12,17,13, - 17,14,17,15,17,16,17,17, -}; - -const int32_t c_aaiHuffDemod14[400][2] = { - 0,0,0,1,0,2,0,3,0,4,0,5,0,6,0,7,0,8,0,9,0,10,0,11,0,12,0,13,0,14,0,15, - 0,16,0,17,0,18,0,19,1,0,1,1,1,2,1,3,1,4,1,5,1,6,1,7,1,8,1,9,1,10,1,11, - 1,12,1,13,1,14,1,15,1,16,1,17,1,18,1,19,2,0,2,1,2,2,2,3,2,4,2,5,2,6,2,7, - 2,8,2,9,2,10,2,11,2,12,2,13,2,14,2,15,2,16,2,17,2,18,2,19,3,0,3,1,3,2,3,3, - 3,4,3,5,3,6,3,7,3,8,3,9,3,10,3,11,3,12,3,13,3,14,3,15,3,16,3,17,3,18,3,19, - 4,0,4,1,4,2,4,3,4,4,4,5,4,6,4,7,4,8,4,9,4,10,4,11,4,12,4,13,4,14,4,15, - 4,16,4,17,4,18,4,19,5,0,5,1,5,2,5,3,5,4,5,5,5,6,5,7,5,8,5,9,5,10,5,11, - 5,12,5,13,5,14,5,15,5,16,5,17,5,18,5,19,6,0,6,1,6,2,6,3,6,4,6,5,6,6,6,7, - 6,8,6,9,6,10,6,11,6,12,6,13,6,14,6,15,6,16,6,17,6,18,6,19,7,0,7,1,7,2,7,3, - 7,4,7,5,7,6,7,7,7,8,7,9,7,10,7,11,7,12,7,13,7,14,7,15,7,16,7,17,7,18,7,19, - 8,0,8,1,8,2,8,3,8,4,8,5,8,6,8,7,8,8,8,9,8,10,8,11,8,12,8,13,8,14,8,15, - 8,16,8,17,8,18,8,19,9,0,9,1,9,2,9,3,9,4,9,5,9,6,9,7,9,8,9,9,9,10,9,11, - 9,12,9,13,9,14,9,15,9,16,9,17,9,18,9,19,10,0,10,1,10,2,10,3,10,4,10,5,10,6,10,7, - 10,8,10,9,10,10,10,11,10,12,10,13,10,14,10,15,10,16,10,17,10,18,10,19,11,0,11,1,11,2,11,3, - 11,4,11,5,11,6,11,7,11,8,11,9,11,10,11,11,11,12,11,13,11,14,11,15,11,16,11,17,11,18,11,19, - 12,0,12,1,12,2,12,3,12,4,12,5,12,6,12,7,12,8,12,9,12,10,12,11,12,12,12,13,12,14,12,15, - 12,16,12,17,12,18,12,19,13,0,13,1,13,2,13,3,13,4,13,5,13,6,13,7,13,8,13,9,13,10,13,11, - 13,12,13,13,13,14,13,15,13,16,13,17,13,18,13,19,14,0,14,1,14,2,14,3,14,4,14,5,14,6,14,7, - 14,8,14,9,14,10,14,11,14,12,14,13,14,14,14,15,14,16,14,17,14,18,14,19,15,0,15,1,15,2,15,3, - 15,4,15,5,15,6,15,7,15,8,15,9,15,10,15,11,15,12,15,13,15,14,15,15,15,16,15,17,15,18,15,19, - 16,0,16,1,16,2,16,3,16,4,16,5,16,6,16,7,16,8,16,9,16,10,16,11,16,12,16,13,16,14,16,15, - 16,16,16,17,16,18,16,19,17,0,17,1,17,2,17,3,17,4,17,5,17,6,17,7,17,8,17,9,17,10,17,11, - 17,12,17,13,17,14,17,15,17,16,17,17,17,18,17,19,18,0,18,1,18,2,18,3,18,4,18,5,18,6,18,7, - 18,8,18,9,18,10,18,11,18,12,18,13,18,14,18,15,18,16,18,17,18,18,18,19,19,0,19,1,19,2,19,3, - 19,4,19,5,19,6,19,7,19,8,19,9,19,10,19,11,19,12,19,13,19,14,19,15,19,16,19,17,19,18,19,19, -}; - -const int32_t c_aaiHuffDemod15[576][2] = { - 0,0,0,1,0,2,0,3,0,4,0,5,0,6,0,7,0,8,0,9,0,10,0,11,0,12,0,13,0,14,0,15, - 0,16,0,17,0,18,0,19,0,20,0,21,0,22,0,23,1,0,1,1,1,2,1,3,1,4,1,5,1,6,1,7, - 1,8,1,9,1,10,1,11,1,12,1,13,1,14,1,15,1,16,1,17,1,18,1,19,1,20,1,21,1,22,1,23, - 2,0,2,1,2,2,2,3,2,4,2,5,2,6,2,7,2,8,2,9,2,10,2,11,2,12,2,13,2,14,2,15, - 2,16,2,17,2,18,2,19,2,20,2,21,2,22,2,23,3,0,3,1,3,2,3,3,3,4,3,5,3,6,3,7, - 3,8,3,9,3,10,3,11,3,12,3,13,3,14,3,15,3,16,3,17,3,18,3,19,3,20,3,21,3,22,3,23, - 4,0,4,1,4,2,4,3,4,4,4,5,4,6,4,7,4,8,4,9,4,10,4,11,4,12,4,13,4,14,4,15, - 4,16,4,17,4,18,4,19,4,20,4,21,4,22,4,23,5,0,5,1,5,2,5,3,5,4,5,5,5,6,5,7, - 5,8,5,9,5,10,5,11,5,12,5,13,5,14,5,15,5,16,5,17,5,18,5,19,5,20,5,21,5,22,5,23, - 6,0,6,1,6,2,6,3,6,4,6,5,6,6,6,7,6,8,6,9,6,10,6,11,6,12,6,13,6,14,6,15, - 6,16,6,17,6,18,6,19,6,20,6,21,6,22,6,23,7,0,7,1,7,2,7,3,7,4,7,5,7,6,7,7, - 7,8,7,9,7,10,7,11,7,12,7,13,7,14,7,15,7,16,7,17,7,18,7,19,7,20,7,21,7,22,7,23, - 8,0,8,1,8,2,8,3,8,4,8,5,8,6,8,7,8,8,8,9,8,10,8,11,8,12,8,13,8,14,8,15, - 8,16,8,17,8,18,8,19,8,20,8,21,8,22,8,23,9,0,9,1,9,2,9,3,9,4,9,5,9,6,9,7, - 9,8,9,9,9,10,9,11,9,12,9,13,9,14,9,15,9,16,9,17,9,18,9,19,9,20,9,21,9,22,9,23, - 10,0,10,1,10,2,10,3,10,4,10,5,10,6,10,7,10,8,10,9,10,10,10,11,10,12,10,13,10,14,10,15, - 10,16,10,17,10,18,10,19,10,20,10,21,10,22,10,23,11,0,11,1,11,2,11,3,11,4,11,5,11,6,11,7, - 11,8,11,9,11,10,11,11,11,12,11,13,11,14,11,15,11,16,11,17,11,18,11,19,11,20,11,21,11,22,11,23, - 12,0,12,1,12,2,12,3,12,4,12,5,12,6,12,7,12,8,12,9,12,10,12,11,12,12,12,13,12,14,12,15, - 12,16,12,17,12,18,12,19,12,20,12,21,12,22,12,23,13,0,13,1,13,2,13,3,13,4,13,5,13,6,13,7, - 13,8,13,9,13,10,13,11,13,12,13,13,13,14,13,15,13,16,13,17,13,18,13,19,13,20,13,21,13,22,13,23, - 14,0,14,1,14,2,14,3,14,4,14,5,14,6,14,7,14,8,14,9,14,10,14,11,14,12,14,13,14,14,14,15, - 14,16,14,17,14,18,14,19,14,20,14,21,14,22,14,23,15,0,15,1,15,2,15,3,15,4,15,5,15,6,15,7, - 15,8,15,9,15,10,15,11,15,12,15,13,15,14,15,15,15,16,15,17,15,18,15,19,15,20,15,21,15,22,15,23, - 16,0,16,1,16,2,16,3,16,4,16,5,16,6,16,7,16,8,16,9,16,10,16,11,16,12,16,13,16,14,16,15, - 16,16,16,17,16,18,16,19,16,20,16,21,16,22,16,23,17,0,17,1,17,2,17,3,17,4,17,5,17,6,17,7, - 17,8,17,9,17,10,17,11,17,12,17,13,17,14,17,15,17,16,17,17,17,18,17,19,17,20,17,21,17,22,17,23, - 18,0,18,1,18,2,18,3,18,4,18,5,18,6,18,7,18,8,18,9,18,10,18,11,18,12,18,13,18,14,18,15, - 18,16,18,17,18,18,18,19,18,20,18,21,18,22,18,23,19,0,19,1,19,2,19,3,19,4,19,5,19,6,19,7, - 19,8,19,9,19,10,19,11,19,12,19,13,19,14,19,15,19,16,19,17,19,18,19,19,19,20,19,21,19,22,19,23, - 20,0,20,1,20,2,20,3,20,4,20,5,20,6,20,7,20,8,20,9,20,10,20,11,20,12,20,13,20,14,20,15, - 20,16,20,17,20,18,20,19,20,20,20,21,20,22,20,23,21,0,21,1,21,2,21,3,21,4,21,5,21,6,21,7, - 21,8,21,9,21,10,21,11,21,12,21,13,21,14,21,15,21,16,21,17,21,18,21,19,21,20,21,21,21,22,21,23, - 22,0,22,1,22,2,22,3,22,4,22,5,22,6,22,7,22,8,22,9,22,10,22,11,22,12,22,13,22,14,22,15, - 22,16,22,17,22,18,22,19,22,20,22,21,22,22,22,23,23,0,23,1,23,2,23,3,23,4,23,5,23,6,23,7, - 23,8,23,9,23,10,23,11,23,12,23,13,23,14,23,15,23,16,23,17,23,18,23,19,23,20,23,21,23,22,23,23, -}; - -const int32_t c_aaiHuffDemod16[729][2] = { - 0,0,0,1,0,2,0,3,0,4,0,5,0,6,0,7,0,8,0,9,0,10,0,11,0,12,0,13,0,14,0,15, - 0,16,0,17,0,18,0,19,0,20,0,21,0,22,0,23,0,24,0,25,0,26,1,0,1,1,1,2,1,3,1,4, - 1,5,1,6,1,7,1,8,1,9,1,10,1,11,1,12,1,13,1,14,1,15,1,16,1,17,1,18,1,19,1,20, - 1,21,1,22,1,23,1,24,1,25,1,26,2,0,2,1,2,2,2,3,2,4,2,5,2,6,2,7,2,8,2,9, - 2,10,2,11,2,12,2,13,2,14,2,15,2,16,2,17,2,18,2,19,2,20,2,21,2,22,2,23,2,24,2,25, - 2,26,3,0,3,1,3,2,3,3,3,4,3,5,3,6,3,7,3,8,3,9,3,10,3,11,3,12,3,13,3,14, - 3,15,3,16,3,17,3,18,3,19,3,20,3,21,3,22,3,23,3,24,3,25,3,26,4,0,4,1,4,2,4,3, - 4,4,4,5,4,6,4,7,4,8,4,9,4,10,4,11,4,12,4,13,4,14,4,15,4,16,4,17,4,18,4,19, - 4,20,4,21,4,22,4,23,4,24,4,25,4,26,5,0,5,1,5,2,5,3,5,4,5,5,5,6,5,7,5,8, - 5,9,5,10,5,11,5,12,5,13,5,14,5,15,5,16,5,17,5,18,5,19,5,20,5,21,5,22,5,23,5,24, - 5,25,5,26,6,0,6,1,6,2,6,3,6,4,6,5,6,6,6,7,6,8,6,9,6,10,6,11,6,12,6,13, - 6,14,6,15,6,16,6,17,6,18,6,19,6,20,6,21,6,22,6,23,6,24,6,25,6,26,7,0,7,1,7,2, - 7,3,7,4,7,5,7,6,7,7,7,8,7,9,7,10,7,11,7,12,7,13,7,14,7,15,7,16,7,17,7,18, - 7,19,7,20,7,21,7,22,7,23,7,24,7,25,7,26,8,0,8,1,8,2,8,3,8,4,8,5,8,6,8,7, - 8,8,8,9,8,10,8,11,8,12,8,13,8,14,8,15,8,16,8,17,8,18,8,19,8,20,8,21,8,22,8,23, - 8,24,8,25,8,26,9,0,9,1,9,2,9,3,9,4,9,5,9,6,9,7,9,8,9,9,9,10,9,11,9,12, - 9,13,9,14,9,15,9,16,9,17,9,18,9,19,9,20,9,21,9,22,9,23,9,24,9,25,9,26,10,0,10,1, - 10,2,10,3,10,4,10,5,10,6,10,7,10,8,10,9,10,10,10,11,10,12,10,13,10,14,10,15,10,16,10,17, - 10,18,10,19,10,20,10,21,10,22,10,23,10,24,10,25,10,26,11,0,11,1,11,2,11,3,11,4,11,5,11,6, - 11,7,11,8,11,9,11,10,11,11,11,12,11,13,11,14,11,15,11,16,11,17,11,18,11,19,11,20,11,21,11,22, - 11,23,11,24,11,25,11,26,12,0,12,1,12,2,12,3,12,4,12,5,12,6,12,7,12,8,12,9,12,10,12,11, - 12,12,12,13,12,14,12,15,12,16,12,17,12,18,12,19,12,20,12,21,12,22,12,23,12,24,12,25,12,26,13,0, - 13,1,13,2,13,3,13,4,13,5,13,6,13,7,13,8,13,9,13,10,13,11,13,12,13,13,13,14,13,15,13,16, - 13,17,13,18,13,19,13,20,13,21,13,22,13,23,13,24,13,25,13,26,14,0,14,1,14,2,14,3,14,4,14,5, - 14,6,14,7,14,8,14,9,14,10,14,11,14,12,14,13,14,14,14,15,14,16,14,17,14,18,14,19,14,20,14,21, - 14,22,14,23,14,24,14,25,14,26,15,0,15,1,15,2,15,3,15,4,15,5,15,6,15,7,15,8,15,9,15,10, - 15,11,15,12,15,13,15,14,15,15,15,16,15,17,15,18,15,19,15,20,15,21,15,22,15,23,15,24,15,25,15,26, - 16,0,16,1,16,2,16,3,16,4,16,5,16,6,16,7,16,8,16,9,16,10,16,11,16,12,16,13,16,14,16,15, - 16,16,16,17,16,18,16,19,16,20,16,21,16,22,16,23,16,24,16,25,16,26,17,0,17,1,17,2,17,3,17,4, - 17,5,17,6,17,7,17,8,17,9,17,10,17,11,17,12,17,13,17,14,17,15,17,16,17,17,17,18,17,19,17,20, - 17,21,17,22,17,23,17,24,17,25,17,26,18,0,18,1,18,2,18,3,18,4,18,5,18,6,18,7,18,8,18,9, - 18,10,18,11,18,12,18,13,18,14,18,15,18,16,18,17,18,18,18,19,18,20,18,21,18,22,18,23,18,24,18,25, - 18,26,19,0,19,1,19,2,19,3,19,4,19,5,19,6,19,7,19,8,19,9,19,10,19,11,19,12,19,13,19,14, - 19,15,19,16,19,17,19,18,19,19,19,20,19,21,19,22,19,23,19,24,19,25,19,26,20,0,20,1,20,2,20,3, - 20,4,20,5,20,6,20,7,20,8,20,9,20,10,20,11,20,12,20,13,20,14,20,15,20,16,20,17,20,18,20,19, - 20,20,20,21,20,22,20,23,20,24,20,25,20,26,21,0,21,1,21,2,21,3,21,4,21,5,21,6,21,7,21,8, - 21,9,21,10,21,11,21,12,21,13,21,14,21,15,21,16,21,17,21,18,21,19,21,20,21,21,21,22,21,23,21,24, - 21,25,21,26,22,0,22,1,22,2,22,3,22,4,22,5,22,6,22,7,22,8,22,9,22,10,22,11,22,12,22,13, - 22,14,22,15,22,16,22,17,22,18,22,19,22,20,22,21,22,22,22,23,22,24,22,25,22,26,23,0,23,1,23,2, - 23,3,23,4,23,5,23,6,23,7,23,8,23,9,23,10,23,11,23,12,23,13,23,14,23,15,23,16,23,17,23,18, - 23,19,23,20,23,21,23,22,23,23,23,24,23,25,23,26,24,0,24,1,24,2,24,3,24,4,24,5,24,6,24,7, - 24,8,24,9,24,10,24,11,24,12,24,13,24,14,24,15,24,16,24,17,24,18,24,19,24,20,24,21,24,22,24,23, - 24,24,24,25,24,26,25,0,25,1,25,2,25,3,25,4,25,5,25,6,25,7,25,8,25,9,25,10,25,11,25,12, - 25,13,25,14,25,15,25,16,25,17,25,18,25,19,25,20,25,21,25,22,25,23,25,24,25,25,25,26,26,0,26,1, - 26,2,26,3,26,4,26,5,26,6,26,7,26,8,26,9,26,10,26,11,26,12,26,13,26,14,26,15,26,16,26,17, - 26,18,26,19,26,20,26,21,26,22,26,23,26,24,26,25,26,26, -}; - -const int32_t c_aaiHuffDemod17[729][2] = { - 0,0,0,1,0,2,0,3,0,4,0,5,0,6,0,7,0,8,0,9,0,10,0,11,0,12,0,13,0,14,0,15, - 0,16,0,17,0,18,0,19,0,20,0,21,0,22,0,23,0,24,0,25,0,26,1,0,1,1,1,2,1,3,1,4, - 1,5,1,6,1,7,1,8,1,9,1,10,1,11,1,12,1,13,1,14,1,15,1,16,1,17,1,18,1,19,1,20, - 1,21,1,22,1,23,1,24,1,25,1,26,2,0,2,1,2,2,2,3,2,4,2,5,2,6,2,7,2,8,2,9, - 2,10,2,11,2,12,2,13,2,14,2,15,2,16,2,17,2,18,2,19,2,20,2,21,2,22,2,23,2,24,2,25, - 2,26,3,0,3,1,3,2,3,3,3,4,3,5,3,6,3,7,3,8,3,9,3,10,3,11,3,12,3,13,3,14, - 3,15,3,16,3,17,3,18,3,19,3,20,3,21,3,22,3,23,3,24,3,25,3,26,4,0,4,1,4,2,4,3, - 4,4,4,5,4,6,4,7,4,8,4,9,4,10,4,11,4,12,4,13,4,14,4,15,4,16,4,17,4,18,4,19, - 4,20,4,21,4,22,4,23,4,24,4,25,4,26,5,0,5,1,5,2,5,3,5,4,5,5,5,6,5,7,5,8, - 5,9,5,10,5,11,5,12,5,13,5,14,5,15,5,16,5,17,5,18,5,19,5,20,5,21,5,22,5,23,5,24, - 5,25,5,26,6,0,6,1,6,2,6,3,6,4,6,5,6,6,6,7,6,8,6,9,6,10,6,11,6,12,6,13, - 6,14,6,15,6,16,6,17,6,18,6,19,6,20,6,21,6,22,6,23,6,24,6,25,6,26,7,0,7,1,7,2, - 7,3,7,4,7,5,7,6,7,7,7,8,7,9,7,10,7,11,7,12,7,13,7,14,7,15,7,16,7,17,7,18, - 7,19,7,20,7,21,7,22,7,23,7,24,7,25,7,26,8,0,8,1,8,2,8,3,8,4,8,5,8,6,8,7, - 8,8,8,9,8,10,8,11,8,12,8,13,8,14,8,15,8,16,8,17,8,18,8,19,8,20,8,21,8,22,8,23, - 8,24,8,25,8,26,9,0,9,1,9,2,9,3,9,4,9,5,9,6,9,7,9,8,9,9,9,10,9,11,9,12, - 9,13,9,14,9,15,9,16,9,17,9,18,9,19,9,20,9,21,9,22,9,23,9,24,9,25,9,26,10,0,10,1, - 10,2,10,3,10,4,10,5,10,6,10,7,10,8,10,9,10,10,10,11,10,12,10,13,10,14,10,15,10,16,10,17, - 10,18,10,19,10,20,10,21,10,22,10,23,10,24,10,25,10,26,11,0,11,1,11,2,11,3,11,4,11,5,11,6, - 11,7,11,8,11,9,11,10,11,11,11,12,11,13,11,14,11,15,11,16,11,17,11,18,11,19,11,20,11,21,11,22, - 11,23,11,24,11,25,11,26,12,0,12,1,12,2,12,3,12,4,12,5,12,6,12,7,12,8,12,9,12,10,12,11, - 12,12,12,13,12,14,12,15,12,16,12,17,12,18,12,19,12,20,12,21,12,22,12,23,12,24,12,25,12,26,13,0, - 13,1,13,2,13,3,13,4,13,5,13,6,13,7,13,8,13,9,13,10,13,11,13,12,13,13,13,14,13,15,13,16, - 13,17,13,18,13,19,13,20,13,21,13,22,13,23,13,24,13,25,13,26,14,0,14,1,14,2,14,3,14,4,14,5, - 14,6,14,7,14,8,14,9,14,10,14,11,14,12,14,13,14,14,14,15,14,16,14,17,14,18,14,19,14,20,14,21, - 14,22,14,23,14,24,14,25,14,26,15,0,15,1,15,2,15,3,15,4,15,5,15,6,15,7,15,8,15,9,15,10, - 15,11,15,12,15,13,15,14,15,15,15,16,15,17,15,18,15,19,15,20,15,21,15,22,15,23,15,24,15,25,15,26, - 16,0,16,1,16,2,16,3,16,4,16,5,16,6,16,7,16,8,16,9,16,10,16,11,16,12,16,13,16,14,16,15, - 16,16,16,17,16,18,16,19,16,20,16,21,16,22,16,23,16,24,16,25,16,26,17,0,17,1,17,2,17,3,17,4, - 17,5,17,6,17,7,17,8,17,9,17,10,17,11,17,12,17,13,17,14,17,15,17,16,17,17,17,18,17,19,17,20, - 17,21,17,22,17,23,17,24,17,25,17,26,18,0,18,1,18,2,18,3,18,4,18,5,18,6,18,7,18,8,18,9, - 18,10,18,11,18,12,18,13,18,14,18,15,18,16,18,17,18,18,18,19,18,20,18,21,18,22,18,23,18,24,18,25, - 18,26,19,0,19,1,19,2,19,3,19,4,19,5,19,6,19,7,19,8,19,9,19,10,19,11,19,12,19,13,19,14, - 19,15,19,16,19,17,19,18,19,19,19,20,19,21,19,22,19,23,19,24,19,25,19,26,20,0,20,1,20,2,20,3, - 20,4,20,5,20,6,20,7,20,8,20,9,20,10,20,11,20,12,20,13,20,14,20,15,20,16,20,17,20,18,20,19, - 20,20,20,21,20,22,20,23,20,24,20,25,20,26,21,0,21,1,21,2,21,3,21,4,21,5,21,6,21,7,21,8, - 21,9,21,10,21,11,21,12,21,13,21,14,21,15,21,16,21,17,21,18,21,19,21,20,21,21,21,22,21,23,21,24, - 21,25,21,26,22,0,22,1,22,2,22,3,22,4,22,5,22,6,22,7,22,8,22,9,22,10,22,11,22,12,22,13, - 22,14,22,15,22,16,22,17,22,18,22,19,22,20,22,21,22,22,22,23,22,24,22,25,22,26,23,0,23,1,23,2, - 23,3,23,4,23,5,23,6,23,7,23,8,23,9,23,10,23,11,23,12,23,13,23,14,23,15,23,16,23,17,23,18, - 23,19,23,20,23,21,23,22,23,23,23,24,23,25,23,26,24,0,24,1,24,2,24,3,24,4,24,5,24,6,24,7, - 24,8,24,9,24,10,24,11,24,12,24,13,24,14,24,15,24,16,24,17,24,18,24,19,24,20,24,21,24,22,24,23, - 24,24,24,25,24,26,25,0,25,1,25,2,25,3,25,4,25,5,25,6,25,7,25,8,25,9,25,10,25,11,25,12, - 25,13,25,14,25,15,25,16,25,17,25,18,25,19,25,20,25,21,25,22,25,23,25,24,25,25,25,26,26,0,26,1, - 26,2,26,3,26,4,26,5,26,6,26,7,26,8,26,9,26,10,26,11,26,12,26,13,26,14,26,15,26,16,26,17, - 26,18,26,19,26,20,26,21,26,22,26,23,26,24,26,25,26,26, -}; -}; - -const int32_t (*c_apaiDemodTables[ALLOC_TABLE_SIZE])[2] = { - NULL, - c_aaiHuffDemod1, - c_aaiHuffDemod2, - c_aaiHuffDemod3, - c_aaiHuffDemod4, - c_aaiHuffDemod5, - c_aaiHuffDemod6, - c_aaiHuffDemod7, - c_aaiHuffDemod8, - c_aaiHuffDemod9, - c_aaiHuffDemod10, - c_aaiHuffDemod11, - c_aaiHuffDemod12, - c_aaiHuffDemod13, - c_aaiHuffDemod14, - c_aaiHuffDemod15, - c_aaiHuffDemod16, - c_aaiHuffDemod17, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, -}; - -#endif - - -/* clang-format on */ diff --git a/lib_rend/ivas_CQMFHuff.h b/lib_rend/ivas_CQMFHuff.h deleted file mode 100644 index 3e6eebaba4..0000000000 --- a/lib_rend/ivas_CQMFHuff.h +++ /dev/null @@ -1,350 +0,0 @@ -/****************************************************************************************************** - - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository. All Rights Reserved. - - This software is protected by copyright law and by international treaties. - The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository retain full ownership rights in their respective contributions in - the software. This notice grants no license of any kind, including but not limited to patent - license, nor is any license granted by implication, estoppel or otherwise. - - Contributors are required to enter into the IVAS codec Public Collaboration agreement before making - contributions. - - This software is provided "AS IS", without any express or implied warranties. The software is in the - development stage. It is intended exclusively for experts who have experience with such software and - solely for the purpose of inspection. All implied warranties of non-infringement, merchantability - and fitness for a particular purpose are hereby disclaimed and excluded. - - Any dispute, controversy or claim arising under or in relation to providing this software shall be - submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in - accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and - the United Nations Convention on Contracts on the International Sales of Goods. - -*******************************************************************************************************/ - -#ifndef _IVAS_CQMF_HUFF_H_ -#define _IVAS_CQMF_HUFF_H_ - -#ifdef __cplusplus -extern "C" -{ -#endif - -#include "ivas_Tables.h" - -//#define USE_DEMOD_TABLES - -#ifndef HUFF_READ_SIZE -#define HUFF_READ_SIZE (4) -#endif - -#ifndef HUFF_DEC_TABLE_SIZE -#define HUFF_DEC_TABLE_SIZE (16) -#endif - -#include // For NULL -#include -extern const uint32_t c_aauiCQMFHuffEnc1[16][2]; - -extern const uint32_t c_aauiCQMFHuffDec1[3][16]; - -extern const uint32_t c_aauiCQMFHuffEnc2[16][2]; - -extern const uint32_t c_aauiCQMFHuffDec2[3][16]; - -extern const uint32_t c_aauiCQMFHuffEnc3[25][2]; - -extern const uint32_t c_aauiCQMFHuffDec3[10][16]; - -extern const uint32_t c_aauiCQMFHuffEnc4[36][2]; - -extern const uint32_t c_aauiCQMFHuffDec4[5][16]; - -extern const uint32_t c_aauiCQMFHuffEnc5[36][2]; - -extern const uint32_t c_aauiCQMFHuffDec5[10][16]; - -extern const uint32_t c_aauiCQMFHuffEnc6[49][2]; - -extern const uint32_t c_aauiCQMFHuffDec6[7][16]; - -extern const uint32_t c_aauiCQMFHuffEnc7[64][2]; - -extern const uint32_t c_aauiCQMFHuffDec7[25][16]; - -extern const uint32_t c_aauiCQMFHuffEnc8[81][2]; - -extern const uint32_t c_aauiCQMFHuffDec8[16][16]; - -extern const uint32_t c_aauiCQMFHuffEnc9[100][2]; - -extern const uint32_t c_aauiCQMFHuffDec9[22][16]; - -extern const uint32_t c_aauiCQMFHuffEnc10[169][2]; - -extern const uint32_t c_aauiCQMFHuffDec10[45][16]; - -extern const uint32_t c_aauiCQMFHuffEnc11[196][2]; - -extern const uint32_t c_aauiCQMFHuffDec11[50][16]; - -extern const uint32_t c_aauiCQMFHuffEnc12[289][2]; - -extern const uint32_t c_aauiCQMFHuffDec12[76][16]; - -extern const uint32_t c_aauiCQMFHuffEnc13[324][2]; - -extern const uint32_t c_aauiCQMFHuffDec13[89][16]; - -extern const uint32_t c_aauiCQMFHuffEnc14[400][2]; - -extern const uint32_t c_aauiCQMFHuffDec14[53][16]; - -extern const uint32_t c_aauiCQMFHuffEnc15[576][2]; - -extern const uint32_t c_aauiCQMFHuffDec15[73][16]; - -extern const uint32_t c_aauiCQMFHuffEnc16[729][2]; - -extern const uint32_t c_aauiCQMFHuffDec16[85][16]; - -extern const uint32_t c_aauiCQMFHuffEnc17[729][2]; - -extern const uint32_t c_aauiCQMFHuffDec17[93][16]; - -extern const uint32_t c_aauiCQMFHuffEnc18[28][2]; - -extern const uint32_t c_aauiCQMFHuffDec18[6][16]; - -extern const uint32_t c_aauiCQMFHuffEnc19[29][2]; - -extern const uint32_t c_aauiCQMFHuffDec19[6][16]; - -extern const uint32_t c_aauiCQMFHuffEnc20[32][2]; - -extern const uint32_t c_aauiCQMFHuffDec20[6][16]; - -extern const uint32_t c_aauiCQMFHuffEnc21[37][2]; - -extern const uint32_t c_aauiCQMFHuffDec21[7][16]; - -extern const uint32_t c_aauiCQMFHuffEnc22[39][2]; - -extern const uint32_t c_aauiCQMFHuffDec22[9][16]; - -extern const uint32_t c_aauiCQMFHuffEnc23[46][2]; - -extern const uint32_t c_aauiCQMFHuffDec23[12][16]; - -extern const uint32_t c_aauiCQMFHuffEnc24[55][2]; - -extern const uint32_t c_aauiCQMFHuffDec24[17][16]; - -extern const uint32_t c_aauiCQMFHuffEnc25[65][2]; - -extern const uint32_t c_aauiCQMFHuffDec25[19][16]; - -extern const uint32_t c_aauiCQMFHuffEnc26[77][2]; - -extern const uint32_t c_aauiCQMFHuffDec26[26][16]; - -extern const uint32_t c_aauiCQMFHuffEnc27[91][2]; - -extern const uint32_t c_aauiCQMFHuffDec27[28][16]; - -extern const uint32_t c_aauiCQMFHuffEnc28[109][2]; - -extern const uint32_t c_aauiCQMFHuffDec28[30][16]; - -extern const uint32_t c_aauiCQMFHuffEnc29[129][2]; - -extern const uint32_t c_aauiCQMFHuffDec29[34][16]; - -extern const uint32_t c_aauiCQMFHuffEnc30[153][2]; - -extern const uint32_t c_aauiCQMFHuffDec30[39][16]; - -extern const uint32_t c_aauiCQMFHuffEnc31[181][2]; - -extern const uint32_t c_aauiCQMFHuffDec31[43][16]; - -extern const uint32_t c_aauiCQMFHuffEnc33[16][2]; - -extern const uint32_t c_aauiCQMFHuffDec33[2][16]; - -extern const uint32_t c_aauiCQMFHuffEnc34[16][2]; - -extern const uint32_t c_aauiCQMFHuffDec34[2][16]; - -extern const uint32_t c_aauiCQMFHuffEnc35[25][2]; - -extern const uint32_t c_aauiCQMFHuffDec35[9][16]; - -extern const uint32_t c_aauiCQMFHuffEnc36[36][2]; - -extern const uint32_t c_aauiCQMFHuffDec36[7][16]; - -extern const uint32_t c_aauiCQMFHuffEnc37[36][2]; - -extern const uint32_t c_aauiCQMFHuffDec37[4][16]; - -extern const uint32_t c_aauiCQMFHuffEnc38[49][2]; - -extern const uint32_t c_aauiCQMFHuffDec38[22][16]; - -extern const uint32_t c_aauiCQMFHuffEnc39[64][2]; - -extern const uint32_t c_aauiCQMFHuffDec39[12][16]; - -extern const uint32_t c_aauiCQMFHuffEnc40[81][2]; - -extern const uint32_t c_aauiCQMFHuffDec40[36][16]; - -extern const uint32_t c_aauiCQMFHuffEnc41[100][2]; - -extern const uint32_t c_aauiCQMFHuffDec41[16][16]; - -extern const uint32_t c_aauiCQMFHuffEnc42[169][2]; - -extern const uint32_t c_aauiCQMFHuffDec42[28][16]; - -extern const uint32_t c_aauiCQMFHuffEnc43[196][2]; - -extern const uint32_t c_aauiCQMFHuffDec43[32][16]; - -extern const uint32_t c_aauiCQMFHuffEnc44[289][2]; - -extern const uint32_t c_aauiCQMFHuffDec44[27][16]; - -extern const uint32_t c_aauiCQMFHuffEnc45[324][2]; - -extern const uint32_t c_aauiCQMFHuffDec45[50][16]; - -extern const uint32_t c_aauiCQMFHuffEnc46[400][2]; - -extern const uint32_t c_aauiCQMFHuffDec46[61][16]; - -extern const uint32_t c_aauiCQMFHuffEnc47[576][2]; - -extern const uint32_t c_aauiCQMFHuffDec47[87][16]; - -extern const uint32_t c_aauiCQMFHuffEnc48[729][2]; - -extern const uint32_t c_aauiCQMFHuffDec48[110][16]; - -extern const uint32_t c_aauiCQMFHuffEnc49[729][2]; - -extern const uint32_t c_aauiCQMFHuffDec49[113][16]; - -extern const uint32_t c_aauiCQMFHuffEnc50[28][2]; - -extern const uint32_t c_aauiCQMFHuffDec50[6][16]; - -extern const uint32_t c_aauiCQMFHuffEnc51[29][2]; - -extern const uint32_t c_aauiCQMFHuffDec51[6][16]; - -extern const uint32_t c_aauiCQMFHuffEnc52[32][2]; - -extern const uint32_t c_aauiCQMFHuffDec52[7][16]; - -extern const uint32_t c_aauiCQMFHuffEnc53[37][2]; - -extern const uint32_t c_aauiCQMFHuffDec53[9][16]; - -extern const uint32_t c_aauiCQMFHuffEnc54[39][2]; - -extern const uint32_t c_aauiCQMFHuffDec54[9][16]; - -extern const uint32_t c_aauiCQMFHuffEnc55[46][2]; - -extern const uint32_t c_aauiCQMFHuffDec55[10][16]; - -extern const uint32_t c_aauiCQMFHuffEnc56[55][2]; - -extern const uint32_t c_aauiCQMFHuffDec56[12][16]; - -extern const uint32_t c_aauiCQMFHuffEnc57[65][2]; - -extern const uint32_t c_aauiCQMFHuffDec57[14][16]; - -extern const uint32_t c_aauiCQMFHuffEnc58[77][2]; - -extern const uint32_t c_aauiCQMFHuffDec58[17][16]; - -extern const uint32_t c_aauiCQMFHuffEnc59[91][2]; - -extern const uint32_t c_aauiCQMFHuffDec59[20][16]; - -extern const uint32_t c_aauiCQMFHuffEnc60[109][2]; - -extern const uint32_t c_aauiCQMFHuffDec60[24][16]; - -extern const uint32_t c_aauiCQMFHuffEnc61[129][2]; - -extern const uint32_t c_aauiCQMFHuffDec61[33][16]; - -extern const uint32_t c_aauiCQMFHuffEnc62[153][2]; - -extern const uint32_t c_aauiCQMFHuffDec62[41][16]; - -extern const uint32_t c_aauiCQMFHuffEnc63[181][2]; - -extern const uint32_t c_aauiCQMFHuffDec63[39][16]; - - -extern const uint32_t (*c_apauiHuffEncTabels[2 * ALLOC_TABLE_SIZE])[2]; - -extern const uint32_t (*c_apauiHuffDecTables[2 * ALLOC_TABLE_SIZE])[HUFF_DEC_TABLE_SIZE]; - -#ifdef USE_DEMOD_TABLES -extern const int32_t c_aaiHuffDemod1[16][2]; - -extern const int32_t c_aaiHuffDemod2[16][2]; - -extern const int32_t c_aaiHuffDemod3[25][2]; - -extern const int32_t c_aaiHuffDemod4[36][2]; - -extern const int32_t c_aaiHuffDemod5[36][2]; - -extern const int32_t c_aaiHuffDemod6[49][2]; - -extern const int32_t c_aaiHuffDemod7[64][2]; - -extern const int32_t c_aaiHuffDemod8[81][2]; - -extern const int32_t c_aaiHuffDemod9[100][2]; - -extern const int32_t c_aaiHuffDemod10[169][2]; - -extern const int32_t c_aaiHuffDemod11[196][2]; - -extern const int32_t c_aaiHuffDemod12[289][2]; - -extern const int32_t c_aaiHuffDemod13[324][2]; - -extern const int32_t c_aaiHuffDemod14[400][2]; - -extern const int32_t c_aaiHuffDemod15[576][2]; - -extern const int32_t c_aaiHuffDemod16[729][2]; - -extern const int32_t c_aaiHuffDemod17[729][2]; - -extern const int32_t (*c_apaiDemodTables[ALLOC_TABLE_SIZE])[2]; -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* _CQMF_HUFF_H_ */ diff --git a/lib_rend/ivas_MSPred.c b/lib_rend/ivas_MSPred.c index 97157de348..cec626c3aa 100644 --- a/lib_rend/ivas_MSPred.c +++ b/lib_rend/ivas_MSPred.c @@ -31,13 +31,14 @@ *******************************************************************************************************/ #include "ivas_MSPred.h" -#include "ivas_Tables.h" -#include "ivas_RMSEnvDeltaHuff.h" +#include "options.h" +#ifdef SPLIT_REND_WITH_HEAD_ROT +#include "ivas_lcld_tables.h" #include #include -#include "options.h" #include "prot.h" -#include "wmops.h" +#include "ivas_prot_rend.h" +#include "wmc_auto.h" int32_t _round( float val ) { @@ -355,3 +356,4 @@ void writeMSPred( int32_t *phaseQuant, int32_t *predQuant, int32_t MSMode, int32 } fprintf( fid, "\n" ); } +#endif diff --git a/lib_rend/ivas_NoiseGen.c b/lib_rend/ivas_NoiseGen.c index c0d6bbd5d3..44a794b69a 100644 --- a/lib_rend/ivas_NoiseGen.c +++ b/lib_rend/ivas_NoiseGen.c @@ -31,12 +31,14 @@ *******************************************************************************************************/ #include "ivas_NoiseGen.h" +#include "options.h" +#ifdef SPLIT_REND_WITH_HEAD_ROT #include #include #include -#include "options.h" #include "prot.h" -#include "wmops.h" +#include "ivas_prot_rend.h" +#include "wmc_auto.h" NoiseGen *CreateNoiseGen( void ) { @@ -44,12 +46,12 @@ NoiseGen *CreateNoiseGen( void ) NoiseGen *psNoiseGen = NULL; - psNoiseGen = (NoiseGen *) count_malloc( sizeof( NoiseGen ) ); + psNoiseGen = (NoiseGen *) malloc( sizeof( NoiseGen ) ); psNoiseGen->iNoiseBufferLength = 2048; psNoiseGen->iNoiseBufferMask = 2047; psNoiseGen->iNoiseBufferIndex = 0; - psNoiseGen->pfNoiseBuffer = (float *) count_malloc( psNoiseGen->iNoiseBufferLength * sizeof( float ) ); + psNoiseGen->pfNoiseBuffer = (float *) malloc( psNoiseGen->iNoiseBufferLength * sizeof( float ) ); /* Generate Laplacian distributed noise */ for ( n = 0; n < psNoiseGen->iNoiseBufferLength; n++ ) @@ -75,8 +77,9 @@ NoiseGen *CreateNoiseGen( void ) void DeleteNoiseGen( NoiseGen *psNoiseGen ) { - count_free( psNoiseGen->pfNoiseBuffer ); - count_free( psNoiseGen ); + free( psNoiseGen->pfNoiseBuffer ); + free( psNoiseGen ); } extern float GetNoise( NoiseGen *psNoiseGen ); +#endif diff --git a/lib_rend/ivas_PerceptualModel.c b/lib_rend/ivas_PerceptualModel.c index ab136f5e08..131ca8af0d 100644 --- a/lib_rend/ivas_PerceptualModel.c +++ b/lib_rend/ivas_PerceptualModel.c @@ -29,53 +29,16 @@ the United Nations Convention on Contracts on the International Sales of Goods. *******************************************************************************************************/ - -#include "ivas_PerceptualModel.h" -#include "ivas_Tables.h" #include "options.h" +#ifdef SPLIT_REND_WITH_HEAD_ROT +#include "ivas_PerceptualModel.h" #include "prot.h" -#include "wmops.h" +#include "ivas_prot_rend.h" #include +#include "wmc_auto.h" /* clang-format off */ -#define LOG_ADD_TABLE_LENGTH (512) - -/*TODO : rtyag : move this to tables.c*/ -const int32_t c_aiLogAddTable[LOG_ADD_TABLE_LENGTH] = { - 0x40, 0x40, 0x3F, 0x3F, 0x3E, 0x3E, 0x3D, 0x3D, 0x3C, 0x3C, 0x3B, 0x3B, 0x3A, 0x3A, 0x39, 0x39, - 0x38, 0x38, 0x37, 0x37, 0x37, 0x36, 0x36, 0x35, 0x35, 0x34, 0x34, 0x33, 0x33, 0x33, 0x32, 0x32, - 0x31, 0x31, 0x31, 0x30, 0x30, 0x2F, 0x2F, 0x2F, 0x2E, 0x2E, 0x2D, 0x2D, 0x2D, 0x2C, 0x2C, 0x2B, - 0x2B, 0x2B, 0x2A, 0x2A, 0x2A, 0x29, 0x29, 0x29, 0x28, 0x28, 0x27, 0x27, 0x27, 0x26, 0x26, 0x26, - 0x25, 0x25, 0x25, 0x24, 0x24, 0x24, 0x23, 0x23, 0x23, 0x23, 0x22, 0x22, 0x22, 0x21, 0x21, 0x21, - 0x20, 0x20, 0x20, 0x20, 0x1F, 0x1F, 0x1F, 0x1E, 0x1E, 0x1E, 0x1E, 0x1D, 0x1D, 0x1D, 0x1C, 0x1C, - 0x1C, 0x1C, 0x1B, 0x1B, 0x1B, 0x1B, 0x1A, 0x1A, 0x1A, 0x1A, 0x19, 0x19, 0x19, 0x19, 0x18, 0x18, - 0x18, 0x18, 0x18, 0x17, 0x17, 0x17, 0x17, 0x16, 0x16, 0x16, 0x16, 0x16, 0x15, 0x15, 0x15, 0x15, - 0x15, 0x14, 0x14, 0x14, 0x14, 0x14, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x12, 0x12, 0x12, 0x12, - 0x12, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x0F, 0x0F, 0x0F, - 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, - 0x0D, 0x0D, 0x0D, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, - 0x0B, 0x0B, 0x0B, 0x0B, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x09, 0x09, - 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, - 0x07, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, - 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x03, 0x03, 0x03, - 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, - 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, - 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; static inline int32_t LogAdd(int32_t iVal1,int32_t iVal2) { @@ -95,79 +58,6 @@ static inline int32_t LogAdd(int32_t iVal1,int32_t iVal2) return iRetVal; } -#define PERCEPTUAL_MODEL_SCALE (64) - -#define PERCEPTUAL_MODEL_SCALE_SHIFT (6) - -#define PERCEPTUAL_MODEL_ALPHA_SCALE (614) - -#define PERCEPTUAL_MODEL_ALPHA_INV_SCALE (6827) - -#define PERCEPTUAL_MODEL_ALPHA_SHIFT (11) - -#define PERCEPTUAL_MODEL_SLGAIN_SHIFT (8)//(4) - -const int32_t c_aiBandwidthAdjust48[MAX_BANDS_48] = { - 0,0,0,0,0,0,0,0,0,0,0,64,64,64,64,64, - 101,101,128,165,165,180,213,}; - -const int32_t c_aiAbsoluteThresh48[MAX_BANDS_48] = { - -1787,-1787,-1787,-1787,-1787,-1787,-1787,-1787,-1782,-1761,-1737,-1679,-1638,-1613,-1590,-1568, - -1516,-1459,-1395,-1289,-671,-409,-401,}; - - -#if PERCEPTUAL_MODEL_SLGAIN_SHIFT == 4 -const int32_t c_aiDefaultTheta48[MAX_BANDS_48] = { - 7,7,6,5,5,4,4,4,4,4,4,4,4,4,4,4, - 4,4,4,4,4,4,4, -}; -#elif PERCEPTUAL_MODEL_SLGAIN_SHIFT == 8 -const int32_t c_aiDefaultTheta48[MAX_BANDS_48] = { - 112,112,96,80,80,64,64,64,64,64,64,64,64,64,64,64, - 64,64,64,64,64,64,64, -}; -#endif - -const int32_t c_aaiSpreadFunction48[MAX_BANDS_48*MAX_BANDS_48] = { - 0,-1561,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552, - -2552,-2552,-2552,-2552,-2552,-2552,-2552,-289,-4,-1234,-2295,-2552,-2552,-2552,-2552,-2552, - -2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-569,-229, - -8,-905,-1705,-2324,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552, - -2552,-2552,-2552,-2552,-2552,-789,-445,-173,-16,-656,-1271,-1765,-2172,-2520,-2552,-2552, - -2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-961,-616,-340,-136, - -28,-488,-976,-1382,-1729,-2032,-2305,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552, - -2552,-2552,-2552,-1088,-743,-465,-257,-148,-31,-371,-769,-1114,-1417,-1689,-2054,-2483, - -2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-1198,-852,-574,-364,-209,-148, - -42,-300,-635,-936,-1207,-1572,-2000,-2376,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552, - -2552,-1293,-948,-669,-458,-301,-183,-145,-56,-258,-547,-816,-1179,-1606,-1982,-2311, - -2552,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-1375,-1029,-750,-539,-381,-260,-180,-142, - -68,-231,-487,-846,-1272,-1647,-1976,-2261,-2552,-2552,-2552,-2552,-2552,-2552,-2552,-1444, - -1099,-820,-608,-449,-328,-233,-194,-138,-77,-213,-555,-978,-1352,-1681,-1966,-2268, - -2552,-2552,-2552,-2552,-2552,-2552,-1501,-1155,-876,-665,-505,-383,-287,-210,-193,-130, - -79,-298,-711,-1083,-1411,-1696,-1997,-2288,-2550,-2552,-2552,-2552,-2552,-1567,-1221,-942, - -730,-570,-448,-351,-272,-206,-189,-151,-72,-349,-713,-1039,-1324,-1625,-1915,-2177, - -2448,-2552,-2552,-2552,-1650,-1304,-1025,-813,-653,-530,-432,-352,-285,-227,-177,-163, - -69,-297,-613,-895,-1195,-1485,-1746,-2017,-2238,-2401,-2545,-1727,-1381,-1102,-890,-730, - -607,-509,-428,-360,-301,-249,-180,-153,-72,-257,-527,-824,-1112,-1373,-1643,-1865, - -2028,-2171,-1798,-1452,-1173,-960,-800,-677,-579,-498,-430,-370,-317,-246,-192,-145, - -76,-224,-505,-790,-1050,-1320,-1540,-1703,-1847,-1860,-1514,-1234,-1022,-862,-738,-640, - -559,-490,-430,-377,-306,-224,-197,-136,-81,-242,-515,-771,-1040,-1260,-1422,-1566, - -1923,-1577,-1297,-1085,-925,-801,-703,-621,-553,-492,-439,-367,-284,-213,-198,-144, - -83,-235,-479,-744,-963,-1125,-1268,-1986,-1640,-1360,-1148,-988,-864,-766,-684,-615, - -555,-501,-429,-345,-273,-211,-204,-146,-89,-216,-465,-680,-841,-984,-2043,-1697, - -1417,-1205,-1044,-921,-822,-741,-672,-611,-557,-485,-401,-328,-264,-211,-205,-140, - -93,-227,-430,-588,-729,-2104,-1758,-1479,-1266,-1106,-982,-884,-802,-733,-673,-619, - -546,-461,-388,-324,-269,-212,-211,-151,-100,-195,-336,-472,-2163,-1817,-1537,-1324, - -1164,-1040,-942,-860,-791,-731,-676,-604,-519,-445,-380,-325,-268,-226,-219,-147, - -114,-167,-280,-2203,-1857,-1577,-1365,-1205,-1081,-982,-901,-831,-771,-717,-644,-559, - -485,-420,-364,-306,-252,-239,-206,-132,-122,-163,-2224,-1878,-1598,-1386,-1225,-1102, - -1003,-921,-852,-792,-737,-665,-580,-505,-441,-385,-326,-271,-222,-224,-176,-121,-114, -}; - - -/* clang-format on */ - - void PerceptualModel( const int32_t iMaxQuantBands, const int32_t *piRMSEnvelope, int32_t *piExcitation, @@ -313,3 +203,4 @@ void PerceptualModelStereo( const int32_t iMaxQuantBands, piSMR1[n] = PERCEPTUAL_MODEL_SCALE * piRMSEnvelope1[n] + c_aiBandwidthAdjust48[n] - piSMR1[n]; } } +#endif diff --git a/lib_rend/ivas_PerceptualModel.h b/lib_rend/ivas_PerceptualModel.h index 2d3346183f..269bfa4a3f 100644 --- a/lib_rend/ivas_PerceptualModel.h +++ b/lib_rend/ivas_PerceptualModel.h @@ -38,19 +38,35 @@ extern "C" { #endif #include -void PerceptualModel(const int32_t iMaxQuantBands, - const int32_t *piRMSEnvelope, - int32_t *piExcitation, - int32_t *piSMR); - -void PerceptualModelStereo(const int32_t iMaxQuantBands, - const int32_t *piMSFlags, - const int32_t *piRMSEnvelope0, - const int32_t *piRMSEnvelope1, - int32_t *piExcitation0, - int32_t *piExcitation1, - int32_t *piSMR0, - int32_t *piSMR1); + +#define LOG_ADD_TABLE_LENGTH ( 512 ) +#define PERCEPTUAL_MODEL_SCALE ( 64 ) +#define PERCEPTUAL_MODEL_SCALE_SHIFT ( 6 ) +#define PERCEPTUAL_MODEL_ALPHA_SCALE ( 614 ) +#define PERCEPTUAL_MODEL_ALPHA_INV_SCALE ( 6827 ) +#define PERCEPTUAL_MODEL_ALPHA_SHIFT ( 11 ) +#define PERCEPTUAL_MODEL_SLGAIN_SHIFT ( 8 ) //(4) +#define MAX_BANDS_48 ( 23 ) + + extern const int32_t c_aiLogAddTable[LOG_ADD_TABLE_LENGTH]; + extern const int32_t c_aiBandwidthAdjust48[MAX_BANDS_48]; + extern const int32_t c_aiAbsoluteThresh48[MAX_BANDS_48]; + extern const int32_t c_aiDefaultTheta48[MAX_BANDS_48]; + extern const int32_t c_aaiSpreadFunction48[MAX_BANDS_48 * MAX_BANDS_48]; + + extern void PerceptualModel( const int32_t iMaxQuantBands, + const int32_t *piRMSEnvelope, + int32_t *piExcitation, + int32_t *piSMR ); + + extern void PerceptualModelStereo( const int32_t iMaxQuantBands, + const int32_t *piMSFlags, + const int32_t *piRMSEnvelope0, + const int32_t *piRMSEnvelope1, + int32_t *piExcitation0, + int32_t *piExcitation1, + int32_t *piSMR0, + int32_t *piSMR1 ); #ifdef __cplusplus } diff --git a/lib_rend/ivas_PredDecoder.c b/lib_rend/ivas_PredDecoder.c index 4cfb776154..0105abedb5 100644 --- a/lib_rend/ivas_PredDecoder.c +++ b/lib_rend/ivas_PredDecoder.c @@ -31,15 +31,17 @@ *******************************************************************************************************/ #include "ivas_PredDecoder.h" +#include "options.h" +#ifdef SPLIT_REND_WITH_HEAD_ROT #include #include #include -#include "options.h" #include "prot.h" -#include "wmops.h" -#include "ivas_Tables.h" +#include "ivas_prot_rend.h" +#include "ivas_lcld_tables.h" #include "ivas_PredTables.h" #include "ivas_cldfb_codec_bitstream.h" +#include "wmc_auto.h" PredictionDecoder *CreatePredictionDecoder( const int32_t iChannels, @@ -49,34 +51,34 @@ PredictionDecoder *CreatePredictionDecoder( const int32_t iChannels, PredictionDecoder *psPredictionDecoder = NULL; - psPredictionDecoder = (PredictionDecoder *) count_malloc( sizeof( PredictionDecoder ) ); + psPredictionDecoder = (PredictionDecoder *) malloc( sizeof( PredictionDecoder ) ); psPredictionDecoder->iChannels = iChannels; psPredictionDecoder->iNumBlocks = iNumBlocks; - psPredictionDecoder->piPredChanEnable = (int32_t *) count_malloc( sizeof( int32_t ) * iChannels ); - psPredictionDecoder->piNumPredBands = (int32_t *) count_malloc( sizeof( int32_t ) * iChannels ); + psPredictionDecoder->piPredChanEnable = (int32_t *) malloc( sizeof( int32_t ) * iChannels ); + psPredictionDecoder->piNumPredBands = (int32_t *) malloc( sizeof( int32_t ) * iChannels ); - psPredictionDecoder->ppfEstPredGain = (float **) count_malloc( sizeof( float * ) * iChannels ); - psPredictionDecoder->ppiPredBandEnable = (int32_t **) count_malloc( sizeof( int32_t * ) * iChannels ); - psPredictionDecoder->ppfA1Real = (float **) count_malloc( sizeof( float * ) * iChannels ); - psPredictionDecoder->ppfA1Imag = (float **) count_malloc( sizeof( float * ) * iChannels ); - psPredictionDecoder->ppiA1Mag = (int32_t **) count_malloc( sizeof( int32_t * ) * iChannels ); - psPredictionDecoder->ppiA1Phase = (int32_t **) count_malloc( sizeof( int32_t * ) * iChannels ); + psPredictionDecoder->ppfEstPredGain = (float **) malloc( sizeof( float * ) * iChannels ); + psPredictionDecoder->ppiPredBandEnable = (int32_t **) malloc( sizeof( int32_t * ) * iChannels ); + psPredictionDecoder->ppfA1Real = (float **) malloc( sizeof( float * ) * iChannels ); + psPredictionDecoder->ppfA1Imag = (float **) malloc( sizeof( float * ) * iChannels ); + psPredictionDecoder->ppiA1Mag = (int32_t **) malloc( sizeof( int32_t * ) * iChannels ); + psPredictionDecoder->ppiA1Phase = (int32_t **) malloc( sizeof( int32_t * ) * iChannels ); for ( n = 0; n < psPredictionDecoder->iChannels; n++ ) { - psPredictionDecoder->ppfEstPredGain[n] = (float *) count_malloc( sizeof( float ) * CQMF_BANDS ); - psPredictionDecoder->ppiPredBandEnable[n] = (int32_t *) count_malloc( sizeof( int32_t ) * CQMF_BANDS ); - psPredictionDecoder->ppfA1Real[n] = (float *) count_malloc( sizeof( float ) * CQMF_BANDS ); - psPredictionDecoder->ppfA1Imag[n] = (float *) count_malloc( sizeof( float ) * CQMF_BANDS ); - psPredictionDecoder->ppiA1Mag[n] = (int32_t *) count_malloc( sizeof( int32_t ) * CQMF_BANDS ); - psPredictionDecoder->ppiA1Phase[n] = (int32_t *) count_malloc( sizeof( int32_t ) * CQMF_BANDS ); + psPredictionDecoder->ppfEstPredGain[n] = (float *) malloc( sizeof( float ) * CQMF_BANDS ); + psPredictionDecoder->ppiPredBandEnable[n] = (int32_t *) malloc( sizeof( int32_t ) * CQMF_BANDS ); + psPredictionDecoder->ppfA1Real[n] = (float *) malloc( sizeof( float ) * CQMF_BANDS ); + psPredictionDecoder->ppfA1Imag[n] = (float *) malloc( sizeof( float ) * CQMF_BANDS ); + psPredictionDecoder->ppiA1Mag[n] = (int32_t *) malloc( sizeof( int32_t ) * CQMF_BANDS ); + psPredictionDecoder->ppiA1Phase[n] = (int32_t *) malloc( sizeof( int32_t ) * CQMF_BANDS ); } /* pre-define these tables? */ - psPredictionDecoder->pfMagLUT = (float *) count_malloc( sizeof( float ) * ( 1 << PRED_QUNAT_FILTER_MAG_BITS ) ); - psPredictionDecoder->pfP2RRealLUT = (float *) count_malloc( sizeof( float ) * ( 1 << PRED_QUANT_FILTER_PHASE_BITS ) ); - psPredictionDecoder->pfP2RImagLUT = (float *) count_malloc( sizeof( float ) * ( 1 << PRED_QUANT_FILTER_PHASE_BITS ) ); + psPredictionDecoder->pfMagLUT = (float *) malloc( sizeof( float ) * ( 1 << PRED_QUNAT_FILTER_MAG_BITS ) ); + psPredictionDecoder->pfP2RRealLUT = (float *) malloc( sizeof( float ) * ( 1 << PRED_QUANT_FILTER_PHASE_BITS ) ); + psPredictionDecoder->pfP2RImagLUT = (float *) malloc( sizeof( float ) * ( 1 << PRED_QUANT_FILTER_PHASE_BITS ) ); for ( n = 0; n < ( 1 << PRED_QUNAT_FILTER_MAG_BITS ); n++ ) { @@ -104,27 +106,27 @@ void DeletePredictionDecoder( PredictionDecoder *psPredictionDecoder ) for ( n = 0; n < psPredictionDecoder->iChannels; n++ ) { - count_free( psPredictionDecoder->ppfEstPredGain[n] ); - count_free( psPredictionDecoder->ppiPredBandEnable[n] ); - count_free( psPredictionDecoder->ppfA1Real[n] ); - count_free( psPredictionDecoder->ppfA1Imag[n] ); - count_free( psPredictionDecoder->ppiA1Mag[n] ); - count_free( psPredictionDecoder->ppiA1Phase[n] ); + free( psPredictionDecoder->ppfEstPredGain[n] ); + free( psPredictionDecoder->ppiPredBandEnable[n] ); + free( psPredictionDecoder->ppfA1Real[n] ); + free( psPredictionDecoder->ppfA1Imag[n] ); + free( psPredictionDecoder->ppiA1Mag[n] ); + free( psPredictionDecoder->ppiA1Phase[n] ); } - count_free( psPredictionDecoder->piPredChanEnable ); - count_free( psPredictionDecoder->piNumPredBands ); - count_free( psPredictionDecoder->ppfEstPredGain ); - count_free( psPredictionDecoder->ppiPredBandEnable ); - count_free( psPredictionDecoder->ppfA1Real ); - count_free( psPredictionDecoder->ppfA1Imag ); - count_free( psPredictionDecoder->ppiA1Mag ); - count_free( psPredictionDecoder->ppiA1Phase ); - - count_free( psPredictionDecoder->pfMagLUT ); - count_free( psPredictionDecoder->pfP2RRealLUT ); - count_free( psPredictionDecoder->pfP2RImagLUT ); - - count_free( psPredictionDecoder ); + free( psPredictionDecoder->piPredChanEnable ); + free( psPredictionDecoder->piNumPredBands ); + free( psPredictionDecoder->ppfEstPredGain ); + free( psPredictionDecoder->ppiPredBandEnable ); + free( psPredictionDecoder->ppfA1Real ); + free( psPredictionDecoder->ppfA1Imag ); + free( psPredictionDecoder->ppiA1Mag ); + free( psPredictionDecoder->ppiA1Phase ); + + free( psPredictionDecoder->pfMagLUT ); + free( psPredictionDecoder->pfP2RRealLUT ); + free( psPredictionDecoder->pfP2RImagLUT ); + + free( psPredictionDecoder ); } #define USE_TABLE_LOOKUP int32_t ReadPredictors( PredictionDecoder *psPredictionDecoder, @@ -257,3 +259,4 @@ void ApplyInversePredictros( PredictionDecoder *psPredictionDecoder, } } } +#endif diff --git a/lib_rend/ivas_PredDecoder.h b/lib_rend/ivas_PredDecoder.h index 435c4f2238..47f986bc7d 100644 --- a/lib_rend/ivas_PredDecoder.h +++ b/lib_rend/ivas_PredDecoder.h @@ -38,6 +38,9 @@ extern "C" { #endif +#include "options.h" +#ifdef SPLIT_REND_WITH_HEAD_ROT + #include "ivas_cldfb_codec_bitstream.h" // typedef struct PREDICTION_DECODER PredictionDecoder; @@ -76,7 +79,7 @@ extern "C" float ***pppfReal, float ***pppfImag ); - +#endif #ifdef __cplusplus } #endif diff --git a/lib_rend/ivas_PredEncoder.c b/lib_rend/ivas_PredEncoder.c index fc8bd14502..e982cf7eed 100644 --- a/lib_rend/ivas_PredEncoder.c +++ b/lib_rend/ivas_PredEncoder.c @@ -31,15 +31,17 @@ *******************************************************************************************************/ #include "ivas_PredEncoder.h" +#include "options.h" +#ifdef SPLIT_REND_WITH_HEAD_ROT #include #include #include -#include "ivas_Tables.h" +#include "ivas_lcld_tables.h" #include "ivas_PredTables.h" -#include "options.h" #include "prot.h" -#include "wmops.h" +#include "ivas_prot_rend.h" #include "ivas_cldfb_codec_bitstream.h" +#include "wmc_auto.h" PredictionEncoder *CreatePredictionEncoder( const int32_t iChannels, @@ -49,47 +51,47 @@ PredictionEncoder *CreatePredictionEncoder( const int32_t iChannels, PredictionEncoder *psPredictionEncoder = NULL; - psPredictionEncoder = (PredictionEncoder *) count_malloc( sizeof( PredictionEncoder ) ); + psPredictionEncoder = (PredictionEncoder *) malloc( sizeof( PredictionEncoder ) ); psPredictionEncoder->iChannels = iChannels; psPredictionEncoder->iNumBlocks = iNumBlocks; - psPredictionEncoder->pfWindow = (float *) count_malloc( sizeof( float ) * iNumBlocks ); + psPredictionEncoder->pfWindow = (float *) malloc( sizeof( float ) * iNumBlocks ); for ( n = 0; n < iNumBlocks; n++ ) { psPredictionEncoder->pfWindow[n] = 0.54f - 0.46f * cosf( 2.0f * M_PI * ( (float) n + 0.5f ) / (float) iNumBlocks ); } - psPredictionEncoder->pfRxxReal = (float *) count_malloc( sizeof( float ) * 2 ); - psPredictionEncoder->pfRxxImag = (float *) count_malloc( sizeof( float ) * 2 ); + psPredictionEncoder->pfRxxReal = (float *) malloc( sizeof( float ) * 2 ); + psPredictionEncoder->pfRxxImag = (float *) malloc( sizeof( float ) * 2 ); - psPredictionEncoder->piPredChanEnable = (int32_t *) count_malloc( sizeof( int32_t ) * iChannels ); - psPredictionEncoder->piNumPredBands = (int32_t *) count_malloc( sizeof( int32_t ) * iChannels ); + psPredictionEncoder->piPredChanEnable = (int32_t *) malloc( sizeof( int32_t ) * iChannels ); + psPredictionEncoder->piNumPredBands = (int32_t *) malloc( sizeof( int32_t ) * iChannels ); for ( n = 0; n < psPredictionEncoder->iChannels; n++ ) { psPredictionEncoder->piPredChanEnable[n] = 0; psPredictionEncoder->piNumPredBands[n] = 40; // Will need to be set correctly } - psPredictionEncoder->ppfEstPredGain = (float **) count_malloc( sizeof( float * ) * iChannels ); - psPredictionEncoder->ppfEstPredBitGain = (float **) count_malloc( sizeof( float * ) * iChannels ); - psPredictionEncoder->ppiPredBandEnable = (int32_t **) count_malloc( sizeof( int32_t * ) * iChannels ); - psPredictionEncoder->ppfA1Real = (float **) count_malloc( sizeof( float * ) * iChannels ); - psPredictionEncoder->ppfA1Imag = (float **) count_malloc( sizeof( float * ) * iChannels ); - psPredictionEncoder->ppiA1Mag = (int32_t **) count_malloc( sizeof( int32_t * ) * iChannels ); - psPredictionEncoder->ppiA1Phase = (int32_t **) count_malloc( sizeof( int32_t * ) * iChannels ); + psPredictionEncoder->ppfEstPredGain = (float **) malloc( sizeof( float * ) * iChannels ); + psPredictionEncoder->ppfEstPredBitGain = (float **) malloc( sizeof( float * ) * iChannels ); + psPredictionEncoder->ppiPredBandEnable = (int32_t **) malloc( sizeof( int32_t * ) * iChannels ); + psPredictionEncoder->ppfA1Real = (float **) malloc( sizeof( float * ) * iChannels ); + psPredictionEncoder->ppfA1Imag = (float **) malloc( sizeof( float * ) * iChannels ); + psPredictionEncoder->ppiA1Mag = (int32_t **) malloc( sizeof( int32_t * ) * iChannels ); + psPredictionEncoder->ppiA1Phase = (int32_t **) malloc( sizeof( int32_t * ) * iChannels ); for ( n = 0; n < psPredictionEncoder->iChannels; n++ ) { int32_t k; - psPredictionEncoder->ppfEstPredGain[n] = (float *) count_malloc( sizeof( float ) * CQMF_BANDS ); - psPredictionEncoder->ppfEstPredBitGain[n] = (float *) count_malloc( sizeof( float ) * CQMF_BANDS ); - psPredictionEncoder->ppiPredBandEnable[n] = (int32_t *) count_malloc( sizeof( int32_t ) * CQMF_BANDS ); - psPredictionEncoder->ppfA1Real[n] = (float *) count_malloc( sizeof( float ) * CQMF_BANDS ); - psPredictionEncoder->ppfA1Imag[n] = (float *) count_malloc( sizeof( float ) * CQMF_BANDS ); - psPredictionEncoder->ppiA1Mag[n] = (int32_t *) count_malloc( sizeof( int32_t ) * CQMF_BANDS ); - psPredictionEncoder->ppiA1Phase[n] = (int32_t *) count_malloc( sizeof( int32_t ) * CQMF_BANDS ); + psPredictionEncoder->ppfEstPredGain[n] = (float *) malloc( sizeof( float ) * CQMF_BANDS ); + psPredictionEncoder->ppfEstPredBitGain[n] = (float *) malloc( sizeof( float ) * CQMF_BANDS ); + psPredictionEncoder->ppiPredBandEnable[n] = (int32_t *) malloc( sizeof( int32_t ) * CQMF_BANDS ); + psPredictionEncoder->ppfA1Real[n] = (float *) malloc( sizeof( float ) * CQMF_BANDS ); + psPredictionEncoder->ppfA1Imag[n] = (float *) malloc( sizeof( float ) * CQMF_BANDS ); + psPredictionEncoder->ppiA1Mag[n] = (int32_t *) malloc( sizeof( int32_t ) * CQMF_BANDS ); + psPredictionEncoder->ppiA1Phase[n] = (int32_t *) malloc( sizeof( int32_t ) * CQMF_BANDS ); for ( k = 0; k < CQMF_BANDS; k++ ) { psPredictionEncoder->ppiPredBandEnable[n][k] = 0; @@ -105,31 +107,31 @@ void DeletePredictionEncoder( PredictionEncoder *psPredictionEncoder ) { int32_t n; - count_free( psPredictionEncoder->pfWindow ); - count_free( psPredictionEncoder->pfRxxReal ); - count_free( psPredictionEncoder->pfRxxImag ); + free( psPredictionEncoder->pfWindow ); + free( psPredictionEncoder->pfRxxReal ); + free( psPredictionEncoder->pfRxxImag ); for ( n = 0; n < psPredictionEncoder->iChannels; n++ ) { - count_free( psPredictionEncoder->ppfEstPredGain[n] ); - count_free( psPredictionEncoder->ppfEstPredBitGain[n] ); - count_free( psPredictionEncoder->ppiPredBandEnable[n] ); - count_free( psPredictionEncoder->ppfA1Real[n] ); - count_free( psPredictionEncoder->ppfA1Imag[n] ); - count_free( psPredictionEncoder->ppiA1Mag[n] ); - count_free( psPredictionEncoder->ppiA1Phase[n] ); + free( psPredictionEncoder->ppfEstPredGain[n] ); + free( psPredictionEncoder->ppfEstPredBitGain[n] ); + free( psPredictionEncoder->ppiPredBandEnable[n] ); + free( psPredictionEncoder->ppfA1Real[n] ); + free( psPredictionEncoder->ppfA1Imag[n] ); + free( psPredictionEncoder->ppiA1Mag[n] ); + free( psPredictionEncoder->ppiA1Phase[n] ); } - count_free( psPredictionEncoder->piPredChanEnable ); - count_free( psPredictionEncoder->piNumPredBands ); - count_free( psPredictionEncoder->ppfEstPredGain ); - count_free( psPredictionEncoder->ppfEstPredBitGain ); - count_free( psPredictionEncoder->ppiPredBandEnable ); - count_free( psPredictionEncoder->ppfA1Real ); - count_free( psPredictionEncoder->ppfA1Imag ); - count_free( psPredictionEncoder->ppiA1Mag ); - count_free( psPredictionEncoder->ppiA1Phase ); - - count_free( psPredictionEncoder ); + free( psPredictionEncoder->piPredChanEnable ); + free( psPredictionEncoder->piNumPredBands ); + free( psPredictionEncoder->ppfEstPredGain ); + free( psPredictionEncoder->ppfEstPredBitGain ); + free( psPredictionEncoder->ppiPredBandEnable ); + free( psPredictionEncoder->ppfA1Real ); + free( psPredictionEncoder->ppfA1Imag ); + free( psPredictionEncoder->ppiA1Mag ); + free( psPredictionEncoder->ppiA1Phase ); + + free( psPredictionEncoder ); } //#define USE_RXX_WINDOW int32_t ComputePredictors( PredictionEncoder *psPredictionEncoder, @@ -474,3 +476,4 @@ int32_t WritePredictors( PredictionEncoder *psPredictionEncoder, return iBitsWritten; } +#endif diff --git a/lib_rend/ivas_PredEncoder.h b/lib_rend/ivas_PredEncoder.h index 5ebbe7b48d..e74c61d76b 100644 --- a/lib_rend/ivas_PredEncoder.h +++ b/lib_rend/ivas_PredEncoder.h @@ -38,6 +38,9 @@ extern "C" { #endif +#include "options.h" +#ifdef SPLIT_REND_WITH_HEAD_ROT + #include "ivas_cldfb_codec_bitstream.h" typedef struct PREDICTION_ENCODER @@ -80,7 +83,7 @@ extern "C" int32_t WritePredictors( PredictionEncoder *psPredictionEncoder, ivas_split_rend_bits_t *pBits ); - +#endif #ifdef __cplusplus } #endif diff --git a/lib_rend/ivas_PredTables.h b/lib_rend/ivas_PredTables.h index ee9caf425a..71bdf21437 100644 --- a/lib_rend/ivas_PredTables.h +++ b/lib_rend/ivas_PredTables.h @@ -39,12 +39,12 @@ extern "C" #endif -#define PRED_QUNAT_FILTER_MAG_BITS (3) -#define PRED_QUANT_FILTER_PHASE_BITS (5) -#define PRED_QUANT_FILTER_MAG_MIN (0) -#define PRED_QUANT_FILTER_MAG_MAX (7) -#define PRED_QUANT_FILTER_PHASE_MIN (-16) -#define PRED_QUANT_FILTER_PHASE_MAX (15) +#define PRED_QUNAT_FILTER_MAG_BITS ( 3 ) +#define PRED_QUANT_FILTER_PHASE_BITS ( 5 ) +#define PRED_QUANT_FILTER_MAG_MIN ( 0 ) +#define PRED_QUANT_FILTER_MAG_MAX ( 7 ) +#define PRED_QUANT_FILTER_PHASE_MIN ( -16 ) +#define PRED_QUANT_FILTER_PHASE_MAX ( 15 ) #ifdef __cplusplus } diff --git a/lib_rend/ivas_RMSEnvDeltaHuff.c b/lib_rend/ivas_RMSEnvDeltaHuff.c deleted file mode 100644 index 16e2ee0f49..0000000000 --- a/lib_rend/ivas_RMSEnvDeltaHuff.c +++ /dev/null @@ -1,65 +0,0 @@ -/****************************************************************************************************** - - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository. All Rights Reserved. - - This software is protected by copyright law and by international treaties. - The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository retain full ownership rights in their respective contributions in - the software. This notice grants no license of any kind, including but not limited to patent - license, nor is any license granted by implication, estoppel or otherwise. - - Contributors are required to enter into the IVAS codec Public Collaboration agreement before making - contributions. - - This software is provided "AS IS", without any express or implied warranties. The software is in the - development stage. It is intended exclusively for experts who have experience with such software and - solely for the purpose of inspection. All implied warranties of non-infringement, merchantability - and fitness for a particular purpose are hereby disclaimed and excluded. - - Any dispute, controversy or claim arising under or in relation to providing this software shall be - submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in - accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and - the United Nations Convention on Contracts on the International Sales of Goods. - -*******************************************************************************************************/ - -#include "ivas_RMSEnvDeltaHuff.h" -#include "wmops.h" - -/* clang-format off */ -const uint32_t c_aaiRMSEnvHuffEnc[64][2] = -{ - {0x0014, 0x0000}, {0x0014, 0x0001}, {0x0014, 0x0002}, {0x0014, 0x0003}, {0x0014, 0x0004}, {0x0014, 0x0005}, {0x0013, 0x0003}, {0x0013, 0x0004}, - {0x0013, 0x0005}, {0x0013, 0x0006}, {0x0013, 0x0007}, {0x0012, 0x000b}, {0x000d, 0x0002}, {0x000e, 0x0001}, {0x000e, 0x0002}, {0x000d, 0x0003}, - {0x000b, 0x0002}, {0x000a, 0x0003}, {0x000a, 0x0004}, {0x000a, 0x0005}, {0x0009, 0x0004}, {0x0009, 0x0005}, {0x0009, 0x0006}, {0x0008, 0x0005}, - {0x0008, 0x0006}, {0x0007, 0x0004}, {0x0006, 0x0003}, {0x0006, 0x0004}, {0x0005, 0x0003}, {0x0004, 0x0002}, {0x0003, 0x0002}, {0x0002, 0x0002}, - {0x0002, 0x0003}, {0x0003, 0x0003}, {0x0004, 0x0003}, {0x0006, 0x0005}, {0x0007, 0x0005}, {0x0008, 0x0007}, {0x0009, 0x0007}, {0x0009, 0x0008}, - {0x0009, 0x0009}, {0x000a, 0x0006}, {0x000a, 0x0007}, {0x000b, 0x0003}, {0x000c, 0x0002}, {0x000c, 0x0003}, {0x000b, 0x0004}, {0x000b, 0x0005}, - {0x000e, 0x0003}, {0x0010, 0x0003}, {0x0013, 0x0008}, {0x0013, 0x0009}, {0x0013, 0x000a}, {0x0013, 0x000b}, {0x0013, 0x000c}, {0x0013, 0x000d}, - {0x0013, 0x000e}, {0x0013, 0x000f}, {0x0013, 0x0010}, {0x0013, 0x0011}, {0x0013, 0x0012}, {0x0013, 0x0013}, {0x0013, 0x0014}, {0x0013, 0x0015}, -}; - -const uint32_t c_aaiRMSEnvHuffDec[13][HUFF_DEC_TABLE_SIZE] = -{ - {0x0002ffff, 0x0001ffff, 0x0000001d, 0x00000022, 0x0001001e, 0x0001001e, 0x00010021, 0x00010021, 0x0002001f, 0x0002001f, 0x0002001f, 0x0002001f, 0x00020020, 0x00020020, 0x00020020, 0x00020020, }, - {0x0002001b, 0x0002001b, 0x0002001b, 0x0002001b, 0x00020023, 0x00020023, 0x00020023, 0x00020023, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, 0x0003001c, }, - {0x0006ffff, 0x0007ffff, 0x0003ffff, 0x0004ffff, 0x0005ffff, 0x00000017, 0x00000018, 0x00000025, 0x00010019, 0x00010019, 0x00010024, 0x00010024, 0x0002001a, 0x0002001a, 0x0002001a, 0x0002001a, }, - {0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030014, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, 0x00030015, }, - {0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030016, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, 0x00030026, }, - {0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030027, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, 0x00030028, }, - {0x0009ffff, 0x0008ffff, 0x0000002c, 0x0000002d, 0x00010010, 0x00010010, 0x0001002b, 0x0001002b, 0x0001002e, 0x0001002e, 0x0001002f, 0x0001002f, 0x00020011, 0x00020011, 0x00020011, 0x00020011, }, - {0x00020012, 0x00020012, 0x00020012, 0x00020012, 0x00020013, 0x00020013, 0x00020013, 0x00020013, 0x00020029, 0x00020029, 0x00020029, 0x00020029, 0x0002002a, 0x0002002a, 0x0002002a, 0x0002002a, }, - {0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000c, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, 0x0003000f, }, - {0x000bffff, 0x000cffff, 0x000affff, 0x00000031, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000d, 0x0002000e, 0x0002000e, 0x0002000e, 0x0002000e, 0x00020030, 0x00020030, 0x00020030, 0x00020030, }, - {0x0001003a, 0x0001003a, 0x0001003b, 0x0001003b, 0x0001003c, 0x0001003c, 0x0001003d, 0x0001003d, 0x0001003e, 0x0001003e, 0x0001003f, 0x0001003f, 0x0002000b, 0x0002000b, 0x0002000b, 0x0002000b, }, - {0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00010006, 0x00010006, 0x00010007, 0x00010007, 0x00010008, 0x00010008, 0x00010009, 0x00010009, 0x0001000a, 0x0001000a, }, - {0x00010032, 0x00010032, 0x00010033, 0x00010033, 0x00010034, 0x00010034, 0x00010035, 0x00010035, 0x00010036, 0x00010036, 0x00010037, 0x00010037, 0x00010038, 0x00010038, 0x00010039, 0x00010039, }, -}; -/* clang-format on */ \ No newline at end of file diff --git a/lib_rend/ivas_RMSEnvGrouping.c b/lib_rend/ivas_RMSEnvGrouping.c index 061678770b..f5e18c3c1c 100644 --- a/lib_rend/ivas_RMSEnvGrouping.c +++ b/lib_rend/ivas_RMSEnvGrouping.c @@ -40,9 +40,9 @@ #include #include "options.h" #include "prot.h" -#include "wmops.h" -#include "ivas_Tables.h" -#include "ivas_RMSEnvDeltaHuff.h" // To compute RMS transmission cost +#include "ivas_prot_rend.h" +#include "ivas_lcld_tables.h" +#include "wmc_auto.h" typedef struct GMNODE @@ -75,7 +75,7 @@ RMSEnvelopeGrouping *CreateRMSEnvelopeGrouping( int32_t iNumBlocks ) RMSEnvelopeGrouping *psRMSEnvelopeGrouping; - psRMSEnvelopeGrouping = (RMSEnvelopeGrouping *) count_malloc( sizeof( RMSEnvelopeGrouping ) ); + psRMSEnvelopeGrouping = (RMSEnvelopeGrouping *) malloc( sizeof( RMSEnvelopeGrouping ) ); psRMSEnvelopeGrouping->iNumBlocks = iNumBlocks; #ifdef FORCE_GROUPS_OF_2 psRMSEnvelopeGrouping->iMaxGroups = iNumBlocks >> 1; @@ -83,21 +83,21 @@ RMSEnvelopeGrouping *CreateRMSEnvelopeGrouping( int32_t iNumBlocks ) psRMSEnvelopeGrouping->iMaxGroups = iNumBlocks; #endif - psRMSEnvelopeGrouping->ppfBandEnergy = (float **) count_malloc( psRMSEnvelopeGrouping->iNumBlocks * sizeof( float * ) ); - psRMSEnvelopeGrouping->ppfBandEnergydB = (float **) count_malloc( psRMSEnvelopeGrouping->iNumBlocks * sizeof( float * ) ); - psRMSEnvelopeGrouping->ppfWeight = (float **) count_malloc( psRMSEnvelopeGrouping->iNumBlocks * sizeof( float * ) ); + psRMSEnvelopeGrouping->ppfBandEnergy = (float **) malloc( psRMSEnvelopeGrouping->iNumBlocks * sizeof( float * ) ); + psRMSEnvelopeGrouping->ppfBandEnergydB = (float **) malloc( psRMSEnvelopeGrouping->iNumBlocks * sizeof( float * ) ); + psRMSEnvelopeGrouping->ppfWeight = (float **) malloc( psRMSEnvelopeGrouping->iNumBlocks * sizeof( float * ) ); for ( n = 0; n < psRMSEnvelopeGrouping->iNumBlocks; n++ ) { - psRMSEnvelopeGrouping->ppfBandEnergy[n] = (float *) count_malloc( MAX_BANDS * 2 * sizeof( float ) ); /* 2 for stereo joint group calc */ - psRMSEnvelopeGrouping->ppfBandEnergydB[n] = (float *) count_malloc( MAX_BANDS * 2 * sizeof( float ) ); - psRMSEnvelopeGrouping->ppfWeight[n] = (float *) count_malloc( MAX_BANDS * 2 * sizeof( float ) ); + psRMSEnvelopeGrouping->ppfBandEnergy[n] = (float *) malloc( MAX_BANDS * 2 * sizeof( float ) ); /* 2 for stereo joint group calc */ + psRMSEnvelopeGrouping->ppfBandEnergydB[n] = (float *) malloc( MAX_BANDS * 2 * sizeof( float ) ); + psRMSEnvelopeGrouping->ppfWeight[n] = (float *) malloc( MAX_BANDS * 2 * sizeof( float ) ); } - psRMSEnvelopeGrouping->psGMNodes = (GMNode *) count_malloc( psRMSEnvelopeGrouping->iNumBlocks * sizeof( GMNode ) ); + psRMSEnvelopeGrouping->psGMNodes = (GMNode *) malloc( psRMSEnvelopeGrouping->iNumBlocks * sizeof( GMNode ) ); for ( n = 0; n < psRMSEnvelopeGrouping->iNumBlocks; n++ ) { - psRMSEnvelopeGrouping->psGMNodes[n].pfMergedEnergydB = (float *) count_malloc( MAX_BANDS * 2 * sizeof( float ) ); - psRMSEnvelopeGrouping->psGMNodes[n].piQRMSEnvelope = (int32_t *) count_malloc( MAX_BANDS * 2 * sizeof( int32_t ) ); + psRMSEnvelopeGrouping->psGMNodes[n].pfMergedEnergydB = (float *) malloc( MAX_BANDS * 2 * sizeof( float ) ); + psRMSEnvelopeGrouping->psGMNodes[n].piQRMSEnvelope = (int32_t *) malloc( MAX_BANDS * 2 * sizeof( int32_t ) ); psRMSEnvelopeGrouping->psGMNodes[n].iGroupRMSEnvelopeCost = -1; psRMSEnvelopeGrouping->psGMNodes[n].fGroupSNRPenalty = -1.0; } @@ -111,22 +111,22 @@ void DeleteRMSEnvelopeGrouping( RMSEnvelopeGrouping *psRMSEnvelopeGrouping ) for ( n = 0; n < psRMSEnvelopeGrouping->iNumBlocks; n++ ) { - count_free( psRMSEnvelopeGrouping->ppfBandEnergy[n] ); - count_free( psRMSEnvelopeGrouping->ppfBandEnergydB[n] ); - count_free( psRMSEnvelopeGrouping->ppfWeight[n] ); + free( psRMSEnvelopeGrouping->ppfBandEnergy[n] ); + free( psRMSEnvelopeGrouping->ppfBandEnergydB[n] ); + free( psRMSEnvelopeGrouping->ppfWeight[n] ); } - count_free( psRMSEnvelopeGrouping->ppfBandEnergy ); - count_free( psRMSEnvelopeGrouping->ppfBandEnergydB ); - count_free( psRMSEnvelopeGrouping->ppfWeight ); + free( psRMSEnvelopeGrouping->ppfBandEnergy ); + free( psRMSEnvelopeGrouping->ppfBandEnergydB ); + free( psRMSEnvelopeGrouping->ppfWeight ); for ( n = 0; n < psRMSEnvelopeGrouping->iNumBlocks; n++ ) { - count_free( psRMSEnvelopeGrouping->psGMNodes[n].pfMergedEnergydB ); - count_free( psRMSEnvelopeGrouping->psGMNodes[n].piQRMSEnvelope ); + free( psRMSEnvelopeGrouping->psGMNodes[n].pfMergedEnergydB ); + free( psRMSEnvelopeGrouping->psGMNodes[n].piQRMSEnvelope ); } - count_free( psRMSEnvelopeGrouping->psGMNodes ); + free( psRMSEnvelopeGrouping->psGMNodes ); - count_free( psRMSEnvelopeGrouping ); + free( psRMSEnvelopeGrouping ); } const float c_afThreshQuiet48[23] = { diff --git a/lib_rend/ivas_Tables.c b/lib_rend/ivas_Tables.c deleted file mode 100644 index c28ff6d26f..0000000000 --- a/lib_rend/ivas_Tables.c +++ /dev/null @@ -1,196 +0,0 @@ -/****************************************************************************************************** - - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository. All Rights Reserved. - - This software is protected by copyright law and by international treaties. - The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository retain full ownership rights in their respective contributions in - the software. This notice grants no license of any kind, including but not limited to patent - license, nor is any license granted by implication, estoppel or otherwise. - - Contributors are required to enter into the IVAS codec Public Collaboration agreement before making - contributions. - - This software is provided "AS IS", without any express or implied warranties. The software is in the - development stage. It is intended exclusively for experts who have experience with such software and - solely for the purpose of inspection. All implied warranties of non-infringement, merchantability - and fitness for a particular purpose are hereby disclaimed and excluded. - - Any dispute, controversy or claim arising under or in relation to providing this software shall be - submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in - accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and - the United Nations Convention on Contracts on the International Sales of Goods. - -*******************************************************************************************************/ - -#include "ivas_Tables.h" -#include "wmops.h" - -/* clang-format off */ -const float c_afRotRealImagSimple[SIMPLE_PHASE_MAX_VAL+1][2] = { - {1.0f, 0.0f}, /* zero */ - {0.0f, 1.0f}, /* pi/2 */ - {-1.0f, 0.0f}, /* pi */ - {0.0f, -1.0f}, /* 3*pi/2 */ -}; - -/* phi = (-12:12)'/12 *pi; tmp = [cos(phi),sin(phi)]; tmp = tmp';sprintf('{%.8ff, %.8ff},\n',tmp(:)) */ -const float c_afRotRealImag[PHASE_MAX_VAL - PHASE_MIN_VAL + 1][2] = { - {-1.00000000f, -0.00000000f}, - {-0.96592583f, -0.25881905f}, - {-0.86602540f, -0.50000000f}, - {-0.70710678f, -0.70710678f}, - {-0.50000000f, -0.86602540f}, - {-0.25881905f, -0.96592583f}, - {0.00000000f, -1.00000000f}, - {0.25881905f, -0.96592583f}, - {0.50000000f, -0.86602540f}, - {0.70710678f, -0.70710678f}, - {0.86602540f, -0.50000000f}, - {0.96592583f, -0.25881905f}, - {1.00000000f, 0.00000000f}, - {0.96592583f, 0.25881905f}, - {0.86602540f, 0.50000000f}, - {0.70710678f, 0.70710678f}, - {0.50000000f, 0.86602540f}, - {0.25881905f, 0.96592583f}, - {0.00000000f, 1.00000000f}, - {-0.25881905f, 0.96592583f}, - {-0.50000000f, 0.86602540f}, - {-0.70710678f, 0.70710678f}, - {-0.86602540f, 0.50000000f}, - {-0.96592583f, 0.25881905f}, - {-1.00000000f, 0.00000000f} -}; - -/* Move this to perceptual model ? */ -const int32_t c_aiBandwidths48[MAX_BANDS_48] = { - 1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,3,3,4,6,6,7,10, -}; - - -const float c_afScaleFactor[ALLOC_TABLE_SIZE] = { - 0.0f, - 0.353553390593f, - 0.420448207627f, - 0.500000000000f, - 0.594603557501f, - 0.707106781187f, - 0.840896415254f, - 1.000000000000f, - 1.189207115003f, - 1.414213562373f, - 1.681792830507f, - 2.000000000000f, - 2.378414230005f, - 2.828427124746f, - 3.363585661015f, - 4.0f, - 4.756828460011f, - 5.656854249492f, - 6.727171322030f, - 8.0f, - 9.513656920022f, - 11.31370849898f, - 13.45434264406f, - 16.00000000000f, - 19.02731384004f, - 22.62741699797f, - 26.90868528812f, - 32.000000000000000f, - 38.054627680087073f, - 45.254833995939038f, - 53.817370576237735f, - 64.000000000000000f, -}; - -const float c_afInvScaleFactor[ALLOC_TABLE_SIZE] = { - 0.0f, - 2.367513562373095f, - 2.046407115002721f, - 1.775900000000000f, - 1.536446415253715f, - 1.323056781186548f, - 1.132903557501360f, - 0.965800000000000f, - 0.821348207626857f, - 0.695103390593274f, - 0.587801778750680f, - 0.495800000000000f, - 0.418124103813429f, - 0.352176695296637f, - 0.296200889375340f, - 0.249400000000000f, - 0.209812051906714f, - 0.176538347648318f, - 0.148525444687670f, - 0.124900000000000f, - 0.105056025953357f, - 0.088388347648318f, - 0.074325444687670f, - 0.062500000000000f, - 0.052556025953357f, - 0.044194173824159f, - 0.037162722343835f, - 0.031250000000000f, - 0.026278012976679f, - 0.022097086912080f, - 0.018581361171918f, - 0.015625000000000f, -}; - -const float c_afRMSEnvReconstructTable[ENV_RECONSTRUCT_TABLE_SIZE] = { - 2.32830644e-10f, 3.29272254e-10f, 4.65661287e-10f, 6.58544508e-10f, 9.31322575e-10f, 1.31708902e-09f, 1.86264515e-09f, 2.63417803e-09f, - 3.72529030e-09f, 5.26835606e-09f, 7.45058060e-09f, 1.05367121e-08f, 1.49011612e-08f, 2.10734243e-08f, 2.98023224e-08f, 4.21468485e-08f, - 5.96046448e-08f, 8.42936970e-08f, 1.19209290e-07f, 1.68587394e-07f, 2.38418579e-07f, 3.37174788e-07f, 4.76837158e-07f, 6.74349576e-07f, - 9.53674316e-07f, 1.34869915e-06f, 1.90734863e-06f, 2.69739830e-06f, 3.81469727e-06f, 5.39479661e-06f, 7.62939453e-06f, 1.07895932e-05f, - 1.52587891e-05f, 2.15791864e-05f, 3.05175781e-05f, 4.31583729e-05f, 6.10351562e-05f, 8.63167458e-05f, 1.22070312e-04f, 1.72633492e-04f, - 2.44140625e-04f, 3.45266983e-04f, 4.88281250e-04f, 6.90533966e-04f, 9.76562500e-04f, 1.38106793e-03f, 1.95312500e-03f, 2.76213586e-03f, - 3.90625000e-03f, 5.52427173e-03f, 7.81250000e-03f, 1.10485435e-02f, 1.56250000e-02f, 2.20970869e-02f, 3.12500000e-02f, 4.41941738e-02f, - 6.25000000e-02f, 8.83883476e-02f, 1.25000000e-01f, 1.76776695e-01f, 2.50000000e-01f, 3.53553391e-01f, 5.00000000e-01f, 7.07106781e-01f, - 1.00000000e+00f, 1.41421356e+00f, 2.00000000e+00f, 2.82842712e+00f, 4.00000000e+00f, 5.65685425e+00f, 8.00000000e+00f, 1.13137085e+01f, - 1.60000000e+01f, 2.26274170e+01f, 3.20000000e+01f, 4.52548340e+01f, 6.40000000e+01f, 9.05096680e+01f, 1.28000000e+02f, 1.81019336e+02f, - 2.56000000e+02f, 3.62038672e+02f, 5.12000000e+02f, 7.24077344e+02f, 1.02400000e+03f, 1.44815469e+03f, 2.04800000e+03f, 2.89630938e+03f, - 4.09600000e+03f, 5.79261875e+03f, 8.19200000e+03f, 1.15852375e+04f, 1.63840000e+04f, 2.31704750e+04f, 3.27680000e+04f, 4.63409500e+04f, - 6.55360000e+04f, 9.26819000e+04f, 1.31072000e+05f, 1.85363800e+05f, 2.62144000e+05f, 3.70727600e+05f, 5.24288000e+05f, 7.41455200e+05f, - 1.04857600e+06f, 1.48291040e+06f, 2.09715200e+06f, 2.96582080e+06f, 4.19430400e+06f, 5.93164160e+06f, 8.38860800e+06f, 1.18632832e+07f, - 1.67772160e+07f, 2.37265664e+07f, 3.35544320e+07f, 4.74531328e+07f, 6.71088640e+07f, 9.49062656e+07f, 1.34217728e+08f, 1.89812531e+08f, - 2.68435456e+08f, 3.79625062e+08f, 5.36870912e+08f, 7.59250125e+08f, 1.07374182e+09f, 1.51850025e+09f, 2.14748365e+09f, 3.03700050e+09f, - 4.29496730e+09f, -}; - -const int32_t c_aiQuantMaxValues[ALLOC_TABLE_SIZE] = { - 0, 3, 3, 4, 5, 5, 6, 7, - 8, 9, 12, 13, 16, 17, 19, 23, - 26, 26, 27, 28, 31, 36, 38, 45, - 54, 64, 76, 90, 108, 128, 152, 180, -}; - -const int32_t c_aiHuffmanDim[ALLOC_TABLE_SIZE] = { - 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, -}; - -const int32_t c_aiHuffmanMod[ALLOC_TABLE_SIZE] = { - 0, 4, 4, 5, 6, 6, 7, 8, - 9, 10, 13, 14, 17, 18, 20, 24, - 27, 27, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, -}; - -const int32_t c_aiHuffmanSize[ALLOC_TABLE_SIZE] = { - 1, 16, 16, 25, 36, 36, 49, 64, - 81, 100, 169, 196, 289, 324, 400, 576, - 729, 729, 28, 29, 32, 37, 39, 46, - 55, 65, 77, 91, 109, 129, 153, 181, -}; -/* clang-format on */ diff --git a/lib_rend/ivas_Tables.h b/lib_rend/ivas_Tables.h deleted file mode 100644 index 676ecd43d0..0000000000 --- a/lib_rend/ivas_Tables.h +++ /dev/null @@ -1,126 +0,0 @@ -/****************************************************************************************************** - - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository. All Rights Reserved. - - This software is protected by copyright law and by international treaties. - The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository retain full ownership rights in their respective contributions in - the software. This notice grants no license of any kind, including but not limited to patent - license, nor is any license granted by implication, estoppel or otherwise. - - Contributors are required to enter into the IVAS codec Public Collaboration agreement before making - contributions. - - This software is provided "AS IS", without any express or implied warranties. The software is in the - development stage. It is intended exclusively for experts who have experience with such software and - solely for the purpose of inspection. All implied warranties of non-infringement, merchantability - and fitness for a particular purpose are hereby disclaimed and excluded. - - Any dispute, controversy or claim arising under or in relation to providing this software shall be - submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in - accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and - the United Nations Convention on Contracts on the International Sales of Goods. - -*******************************************************************************************************/ - -#ifndef _IVAS_TABLES_H_ -#define _IVAS_TABLES_H_ - -#ifdef __cplusplus -extern "C" -{ -#endif -#include -#ifndef M_PI - -#define M_PI 3.14159265358979323846264338327950288f - -#endif - -#define CQMF_BLOCKS_PER_FRAME ( 16 ) -#define CQMF_MAX_BLOCKS_PER_FRAME ( 16 ) -#define CQMF_BANDS ( 60 ) - -#define MAX_BANDS ( 23 ) -#define MAX_BANDS_48 ( 23 ) - - extern const int32_t c_aiBandwidths48[MAX_BANDS_48]; // move this - - -#define ENV_MIN ( -64 ) -#define ENV_MAX ( 64 ) - -#define ENV0_BITS ( 7 ) - -#define ENV_DELTA_MIN ( -32 ) -#define ENV_DELTA_MAX ( 31 ) - -#define ENV_RECONSTRUCT_TABLE_SIZE ( 129 ) - -#define ENV_RECONSTRUCT_TABLE_CENTER ( 64 ) - -#define MIN_ALLOC ( 0 ) -#define MAX_ALLOC ( 31 ) - -#define ALLOC_OFFSET_SCALE ( 8 ) - -#define ALLOC_OFFSET_BITS ( 8 ) - -#define MIN_ALLOC_OFFSET ( -128 ) -#define MAX_ALLOC_OFFSET ( 127 ) - - -#define ALLOC_TABLE_SIZE ( 32 ) - -#ifndef _PI_ -#define _PI_ ( 3.14159265358979f ) -#endif -#define PRED_MAX_VAL ( 12 ) -#define PRED_MIN_VAL ( -PRED_MAX_VAL ) -#define PRED_QUANT_FACTOR ( (float) PRED_MAX_VAL ) -#define PRED_BAND0_BITS ( 5 ) - -#define PHASE_MAX_VAL ( 12 ) -#define PHASE_MIN_VAL ( -PHASE_MAX_VAL ) -#define PHASE_QUANT_FACTOR ( (float) PHASE_MAX_VAL / _PI_ ) -#define PHASE_DIFF_DIM ( 2 ) -#define PHASE_BAND0_BITS ( 5 ) - -#define SIMPLE_PHASE_MAX_VAL ( 3 ) -#define SIMPLE_PHASE_MIN_VAL ( 0 ) -#define SIMPLE_PHASE_BITS ( 2 ) -#define SIMPLE_PHASE_QUANT_FACTOR ( 2.0f / _PI_ ) - -#define TON_QUOTA_ABS_THRESHOLD ( 8.0f ) -#define TON_QUOTA_INC_THRESHOLD ( 4.0f ) - - extern const float c_afRotRealImag[PRED_MAX_VAL - PRED_MIN_VAL + 1][2]; - extern const float c_afRotRealImagSimple[SIMPLE_PHASE_MAX_VAL + 1][2]; - extern const int32_t c_aiDefaultTheta48[MAX_BANDS_48]; - - extern const float c_afScaleFactor[ALLOC_TABLE_SIZE]; - - extern const float c_afInvScaleFactor[ALLOC_TABLE_SIZE]; - - extern const float c_afRMSEnvReconstructTable[ENV_RECONSTRUCT_TABLE_SIZE]; - - extern const int32_t c_aiQuantMaxValues[ALLOC_TABLE_SIZE]; - - extern const int32_t c_aiHuffmanDim[ALLOC_TABLE_SIZE]; - - extern const int32_t c_aiHuffmanMod[ALLOC_TABLE_SIZE]; - - extern const int32_t c_aiHuffmanSize[ALLOC_TABLE_SIZE]; - -#ifdef __cplusplus -} -#endif - -#endif /* _TABLES_H_ */ diff --git a/lib_rend/ivas_allrad_dec.c b/lib_rend/ivas_allrad_dec.c index a61f543cb1..fc840755aa 100644 --- a/lib_rend/ivas_allrad_dec.c +++ b/lib_rend/ivas_allrad_dec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -31,19 +31,17 @@ *******************************************************************************************************/ #include +#include "options.h" #include #include -#include -#include -#include "options.h" #include "prot.h" #include "ivas_prot.h" -#include "ivas_stat_dec.h" +#include "ivas_prot_rend.h" #include "ivas_rom_rend.h" #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" #ifdef DEBUG_MODE_INFO_ALLRAD @@ -108,7 +106,7 @@ ivas_error ivas_sba_get_hoa_dec_matrix( /* Allocate memory */ assert( *hoa_dec_mtx == NULL && "hoa_dec_mtx != NULL" ); - if ( ( *hoa_dec_mtx = (float *) count_malloc( SBA_NHARM_HOA3 * ( hOutSetup.nchan_out_woLFE ) * sizeof( float ) ) ) == NULL ) + if ( ( *hoa_dec_mtx = (float *) malloc( SBA_NHARM_HOA3 * ( hOutSetup.nchan_out_woLFE ) * sizeof( float ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "ALLRAD: Cannot allocate memory!" ) ); } diff --git a/lib_rend/ivas_binaural_reverb.c b/lib_rend/ivas_binaural_reverb.c deleted file mode 100644 index db12954a1e..0000000000 --- a/lib_rend/ivas_binaural_reverb.c +++ /dev/null @@ -1,546 +0,0 @@ -/****************************************************************************************************** - - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository. All Rights Reserved. - - This software is protected by copyright law and by international treaties. - The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository retain full ownership rights in their respective contributions in - the software. This notice grants no license of any kind, including but not limited to patent - license, nor is any license granted by implication, estoppel or otherwise. - - Contributors are required to enter into the IVAS codec Public Collaboration agreement before making - contributions. - - This software is provided "AS IS", without any express or implied warranties. The software is in the - development stage. It is intended exclusively for experts who have experience with such software and - solely for the purpose of inspection. All implied warranties of non-infringement, merchantability - and fitness for a particular purpose are hereby disclaimed and excluded. - - Any dispute, controversy or claim arising under or in relation to providing this software shall be - submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in - accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and - the United Nations Convention on Contracts on the International Sales of Goods. - -*******************************************************************************************************/ - -#include -#include "options.h" -#include -#include "ivas_prot.h" -#include "prot.h" -#include "ivas_rom_com.h" -#include "ivas_rom_binauralRenderer.h" -#ifdef DEBUGGING -#include "debug.h" -#endif -#include "wmops.h" - - -/* The reverberator structure implemented here is described in detail in: - * Vilkamo, J., Neugebauer, B., & Plogsties, J. (2012). Sparse frequency-domain reverberator. - * Journal of the Audio Engineering Society, 59(12), 936-943. */ - -/*------------------------------------------------------------------------- - * Local constants - *------------------------------------------------------------------------*/ - -#define BIN_REND_RANDOM_SEED 1 /* random seed for generating reverb decorrelators */ - -#define CLDFB_SLOTS_PER_SECOND 800 /* Used for initializing reverb */ - -/*------------------------------------------------------------------------- - * ivas_binaural_reverb_processFrame() - * - * Compute the reverberation - room effect - *------------------------------------------------------------------------*/ - -void ivas_binaural_reverb_processFrame( - REVERB_STRUCT_HANDLE hReverb, /* i/o: binaural reverb handle */ - const int16_t numInChannels, /* i : num inputs to be processed */ - float inReal[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : input CLDFB data real, Comment: This change swaps two first dimensions as first dimension is not constant. */ - float inImag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : input CLDFB data imag */ - float outReal[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : output CLDFB data real */ - float outImag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : output CLDFB data imag */ - const uint8_t offsetSamplesIO /* i : number of offset samples */ -) -{ - /* Declare the required variables */ - int16_t idx, bin, ch, sample, invertSampleIndex, tapIdx, *phaseShiftTypePr; - float **tapRealPr, **tapImagPr; - - /* 1) Rotate the data in the loop buffer of the reverberator. - * Notice that the audio at the loop buffers is at time-inverted order - * for convolution purposes later on. */ - for ( bin = 0; bin < hReverb->numBins; bin++ ) - { - /* Move the data forwards by blockSize (i.e. by the frame size of 16 CLDFB slots) */ - mvr2r( hReverb->loopBufReal[bin], hReverb->loopBufReal[bin] + hReverb->blockSize, hReverb->loopBufLength[bin] ); - mvr2r( hReverb->loopBufImag[bin], hReverb->loopBufImag[bin] + hReverb->blockSize, hReverb->loopBufLength[bin] ); - - /* Add the data from the end of the loop to the beginning, with an attenuation factor - * according to RT60. This procedure generates an IIR decaying response. The response - * is decorrelated later on. */ - v_multc( hReverb->loopBufReal[bin] + hReverb->loopBufLength[bin], hReverb->loopAttenuationFactor[bin], hReverb->loopBufReal[bin], hReverb->blockSize ); - v_multc( hReverb->loopBufImag[bin] + hReverb->loopBufLength[bin], hReverb->loopAttenuationFactor[bin], hReverb->loopBufImag[bin], hReverb->blockSize ); - } - - /* 2) Apply the determined pre-delay to the input audio, and add the delayed audio to the loop. */ - idx = hReverb->preDelayBufferIndex; - for ( sample = 0; sample < hReverb->blockSize; sample++ ) - { - uint16_t sampleWithOffset; - sampleWithOffset = sample + offsetSamplesIO; - invertSampleIndex = hReverb->blockSize - sample - 1; - for ( bin = 0; bin < hReverb->numBins; bin++ ) - { - /* Add from pre-delay buffer a sample to the loop buffer, in a time-inverted order. - * Also apply the spectral gains determined for the reverberation */ - hReverb->loopBufReal[bin][invertSampleIndex] += hReverb->preDelayBufferReal[idx][bin] * hReverb->reverbEqGains[bin]; - hReverb->loopBufImag[bin][invertSampleIndex] += hReverb->preDelayBufferImag[idx][bin] * hReverb->reverbEqGains[bin]; - hReverb->preDelayBufferReal[idx][bin] = 0.0f; - hReverb->preDelayBufferImag[idx][bin] = 0.0f; - } - - /* Add every second input channel as is to the pre-delay buffer, and every second input channel with - * 90 degrees phase shift to reduce energy imbalances between coherent and incoherent sounds */ - for ( ch = 0; ch < numInChannels; ch++ ) - { - if ( ch % 2 ) - { - v_add( hReverb->preDelayBufferReal[idx], inReal[ch][sampleWithOffset], hReverb->preDelayBufferReal[idx], hReverb->numBins ); - v_add( hReverb->preDelayBufferImag[idx], inImag[ch][sampleWithOffset], hReverb->preDelayBufferImag[idx], hReverb->numBins ); - } - else - { - v_sub( hReverb->preDelayBufferReal[idx], inImag[ch][sampleWithOffset], hReverb->preDelayBufferReal[idx], hReverb->numBins ); - v_add( hReverb->preDelayBufferImag[idx], inReal[ch][sampleWithOffset], hReverb->preDelayBufferImag[idx], hReverb->numBins ); - } - } - idx = ( idx + 1 ) % hReverb->preDelayBufferLength; - } - hReverb->preDelayBufferIndex = idx; - - /* 3) Perform the filtering/decorrelating, using complex and sparse FIR filtering */ - for ( bin = 0; bin < hReverb->numBins; bin++ ) - { - for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) - { - /* These tap pointers have been determined to point to the loop buffer at sparse locations */ - tapRealPr = hReverb->tapPointersReal[bin][ch]; - tapImagPr = hReverb->tapPointersImag[bin][ch]; - phaseShiftTypePr = hReverb->tapPhaseShiftType[bin][ch]; - - /* Flush output */ - set_f( hReverb->outputBufferReal[bin][ch], 0.0f, hReverb->blockSize ); - set_f( hReverb->outputBufferImag[bin][ch], 0.0f, hReverb->blockSize ); - - /* Add from temporally decaying sparse tap locations the audio to the output. */ - for ( tapIdx = 0; tapIdx < hReverb->taps[bin][ch]; tapIdx++ ) - { - switch ( phaseShiftTypePr[tapIdx] ) - { - case 0: /* 0 degrees phase */ - v_add( hReverb->outputBufferReal[bin][ch], tapRealPr[tapIdx], hReverb->outputBufferReal[bin][ch], hReverb->blockSize ); - v_add( hReverb->outputBufferImag[bin][ch], tapImagPr[tapIdx], hReverb->outputBufferImag[bin][ch], hReverb->blockSize ); - break; - case 1: /* 90 degrees phase */ - v_sub( hReverb->outputBufferReal[bin][ch], tapImagPr[tapIdx], hReverb->outputBufferReal[bin][ch], hReverb->blockSize ); - v_add( hReverb->outputBufferImag[bin][ch], tapRealPr[tapIdx], hReverb->outputBufferImag[bin][ch], hReverb->blockSize ); - break; - case 2: /* 180 degrees phase */ - v_sub( hReverb->outputBufferReal[bin][ch], tapRealPr[tapIdx], hReverb->outputBufferReal[bin][ch], hReverb->blockSize ); - v_sub( hReverb->outputBufferImag[bin][ch], tapImagPr[tapIdx], hReverb->outputBufferImag[bin][ch], hReverb->blockSize ); - break; - default: /* 270 degrees phase */ - v_add( hReverb->outputBufferReal[bin][ch], tapImagPr[tapIdx], hReverb->outputBufferReal[bin][ch], hReverb->blockSize ); - v_sub( hReverb->outputBufferImag[bin][ch], tapRealPr[tapIdx], hReverb->outputBufferImag[bin][ch], hReverb->blockSize ); - break; - } - } - } - - /* Generate diffuse field binaural coherence by mixing the incoherent reverberated channels with pre-defined gains */ - if ( bin <= hReverb->highestBinauralCoherenceBin ) - { - if ( hReverb->useBinauralCoherence ) - { - for ( sample = 0; sample < hReverb->blockSize; sample++ ) - { - float leftRe, rightRe, leftIm, rightIm; - - leftRe = hReverb->binauralCoherenceDirectGains[bin] * hReverb->outputBufferReal[bin][0][sample] + hReverb->binauralCoherenceCrossmixGains[bin] * hReverb->outputBufferReal[bin][1][sample]; - rightRe = hReverb->binauralCoherenceDirectGains[bin] * hReverb->outputBufferReal[bin][1][sample] + hReverb->binauralCoherenceCrossmixGains[bin] * hReverb->outputBufferReal[bin][0][sample]; - leftIm = hReverb->binauralCoherenceDirectGains[bin] * hReverb->outputBufferImag[bin][0][sample] + hReverb->binauralCoherenceCrossmixGains[bin] * hReverb->outputBufferImag[bin][1][sample]; - rightIm = hReverb->binauralCoherenceDirectGains[bin] * hReverb->outputBufferImag[bin][1][sample] + hReverb->binauralCoherenceCrossmixGains[bin] * hReverb->outputBufferImag[bin][0][sample]; - - hReverb->outputBufferReal[bin][0][sample] = leftRe; - hReverb->outputBufferReal[bin][1][sample] = rightRe; - hReverb->outputBufferImag[bin][0][sample] = leftIm; - hReverb->outputBufferImag[bin][1][sample] = rightIm; - } - } - } - } - - /* 4) Write data to output */ - for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) - { - for ( sample = 0; sample < hReverb->blockSize; sample++ ) - { - uint16_t sampleWithOffset; - - sampleWithOffset = sample + offsetSamplesIO; - /* Audio was in the temporally inverted order for convolution, re-invert audio to output */ - invertSampleIndex = hReverb->blockSize - sample - 1; - - for ( bin = 0; bin < hReverb->numBins; bin++ ) - { - outReal[ch][sampleWithOffset][bin] = hReverb->outputBufferReal[bin][ch][invertSampleIndex]; - outImag[ch][sampleWithOffset][bin] = hReverb->outputBufferImag[bin][ch][invertSampleIndex]; - } - for ( ; bin < CLDFB_NO_CHANNELS_MAX; bin++ ) - { - outReal[ch][sampleWithOffset][bin] = 0.0f; - outImag[ch][sampleWithOffset][bin] = 0.0f; - } - } - } - - return; -} - - -/*------------------------------------------------------------------------- - * binRend_rand() - * - * - *------------------------------------------------------------------------*/ - -static uint16_t binRend_rand( - REVERB_STRUCT_HANDLE hReverb /* i/o: binaural reverb handle */ -) -{ - hReverb->binRend_RandNext = hReverb->binRend_RandNext * 1103515245 + 12345; - - return (uint16_t) ( hReverb->binRend_RandNext / 65536 ) % 32768; -} - - -/*------------------------------------------------------------------------- - * ivas_binaural_reverb_setPreDelay() - * - * - *------------------------------------------------------------------------*/ - -void ivas_binaural_reverb_setPreDelay( - REVERB_STRUCT_HANDLE hReverb, /* i/o: binaural reverb handle */ - const int16_t delaySamples /* i : reverb pre-delay in CLDFB slots */ -) -{ - if ( delaySamples < 1 ) - { - hReverb->preDelayBufferLength = 1; - - return; - } - - if ( delaySamples > REVERB_PREDELAY_MAX ) - { - hReverb->preDelayBufferLength = REVERB_PREDELAY_MAX; - - return; - } - - hReverb->preDelayBufferLength = delaySamples; - - return; -} - - -/*------------------------------------------------------------------------- - * ivas_binaural_reverb_setReverbTimes() - * - * - *------------------------------------------------------------------------*/ - -void ivas_binaural_reverb_setReverbTimes( - REVERB_STRUCT_HANDLE hReverb, /* i/o: binaural reverb handle */ - const int32_t output_Fs, /* i : sampling_rate */ - const float *revTimes, /* i : reverberation times T60 for each CLDFB bin in seconds */ - const float *revEnes /* i : spectrum for reverberated sound at each CLDFB bin */ -) -{ - int16_t bin, ch, tap, sample; - float binCenterFreq, diffuseFieldICC, tmpVal, attenuationFactorPerSample; - float intendedEnergy, actualizedEnergy, energyBuildup, currentEnergy, attenuationFactorPerSampleSq; - - hReverb->binRend_RandNext = (uint16_t) BIN_REND_RANDOM_SEED; - hReverb->highestBinauralCoherenceBin = 0; - for ( bin = 0; bin < hReverb->numBins; bin++ ) - { - /* Determine the diffuse field binaural coherence */ - binCenterFreq = ( (float) bin + 0.5f ) / ( (float) hReverb->numBins ) * ( (float) output_Fs ) / 2.0f; - if ( bin == 0 ) - { - diffuseFieldICC = 1.0f; - } - else if ( binCenterFreq < 2700.0f ) - { - diffuseFieldICC = sinf( EVS_PI * binCenterFreq / 550.0f + 1e-20f ) / ( EVS_PI * binCenterFreq / 550.0f + 1e-20f ) * ( 1.0f - binCenterFreq / 2700.0f ); - hReverb->highestBinauralCoherenceBin = bin; - } - else - { - diffuseFieldICC = 0.0f; - } - - /* Mixing gains to generate a diffuse-binaural sound based on incoherent sound */ - tmpVal = ( 1.0f - sqrtf( 1.0f - powf( diffuseFieldICC, 2.0 ) ) ) / 2.0f; - if ( diffuseFieldICC > 0 ) - { - hReverb->binauralCoherenceCrossmixGains[bin] = sqrtf( fabsf( tmpVal ) ); - } - else - { - hReverb->binauralCoherenceCrossmixGains[bin] = -sqrtf( fabsf( tmpVal ) ); - } - hReverb->binauralCoherenceDirectGains[bin] = sqrtf( 1.0f - fabsf( tmpVal ) ); - - /* Determine attenuation factor that generates the appropriate energy decay according to reverberation time */ - attenuationFactorPerSample = powf( 10.0f, -3.0f * ( 1.0f / ( (float) CLDFB_SLOTS_PER_SECOND * revTimes[bin] ) ) ); - hReverb->loopAttenuationFactor[bin] = powf( attenuationFactorPerSample, hReverb->loopBufLength[bin] ); - attenuationFactorPerSampleSq = attenuationFactorPerSample * attenuationFactorPerSample; - - /* Design sparse decorrelation filters. The decorrelation filters, due to random procedures involved, - * may affect the spectrum of the output. The spectral effect is therefore monitored and compensated for. */ - intendedEnergy = 0.0f; - actualizedEnergy = 0.0f; - - for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) - { - energyBuildup = 0.0f; - currentEnergy = 1.0f; - tap = 0; - - for ( sample = 0; sample < hReverb->loopBufLength[bin]; sample++ ) - { - intendedEnergy += currentEnergy; - - /* The randomization at the energy build up affects where the sparse taps are located */ - energyBuildup += currentEnergy + 0.1f * ( (float) binRend_rand( hReverb ) / PCM16_TO_FLT_FAC - 0.5f ); - - if ( energyBuildup >= 1.0f ) /* A new filter tap is added at this condition */ - { - /* Four efficient phase operations: n*pi/2, n=0,1,2,3 */ - hReverb->tapPhaseShiftType[bin][ch][tap] = (int16_t) ( binRend_rand( hReverb ) % 4 ); - /* Set the tapPointer to point to the determined sample at the loop buffer */ - hReverb->tapPointersReal[bin][ch][tap] = &( hReverb->loopBufReal[bin][sample] ); - hReverb->tapPointersImag[bin][ch][tap] = &( hReverb->loopBufImag[bin][sample] ); - energyBuildup -= 1.0f; /* A tap is added, thus remove its energy from the buildup */ - tap++; - actualizedEnergy += 1.0f; - } - currentEnergy *= attenuationFactorPerSampleSq; - } - hReverb->taps[bin][ch] = tap; /* Number of taps determined at the above random procedure */ - } - - /* The decorrelator design and IIR attenuation rate affects the energy of reverb, which is compensated here */ - hReverb->reverbEqGains[bin] = sqrtf( revEnes[bin] ); /* Determined reverb spectrum */ - hReverb->reverbEqGains[bin] *= sqrtf( intendedEnergy / actualizedEnergy ); /* Correction of random effects at the decorrelator design */ - hReverb->reverbEqGains[bin] *= sqrtf( 0.5f * ( 1.0f - attenuationFactorPerSampleSq ) ); /* Correction of IIR decay rate */ - } - - return; -} - - -/*------------------------------------------------------------------------- - * ivas_binaural_reverb_open() - * - * Allocate and initialize binaural room reverberator handle - *------------------------------------------------------------------------*/ - -ivas_error ivas_binaural_reverb_open( - REVERB_STRUCT_HANDLE *hReverbPr, /* i/o: binaural reverb handle */ - const int16_t numBins, /* i : number of CLDFB bins */ - const int16_t numCldfbSlotsPerFrame, /* i : number of CLDFB slots per frame */ - ivas_roomAcoustics_t *roomAcoustics, /* i/o: room acoustics parameters */ - const AUDIO_CONFIG output_config, /* i : output audio configuration */ - const int32_t sampling_rate, /* i : sampling rate */ - const RENDERER_TYPE renderer_type /* i : renderer type */ -) -{ - int16_t bin, chIdx, k, len; - REVERB_STRUCT_HANDLE hReverb; - const float *revTimes; - float t60[CLDFB_NO_CHANNELS_MAX]; - float ene[CLDFB_NO_CHANNELS_MAX]; - - if ( ( *hReverbPr = (REVERB_STRUCT_HANDLE) count_malloc( sizeof( REVERB_STRUCT ) ) ) == NULL ) - { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural Reverberator\n" ) ); - } - - hReverb = *hReverbPr; - - hReverb->useBinauralCoherence = 1; - hReverb->preDelayBufferLength = 1; - hReverb->preDelayBufferIndex = 0; - - hReverb->numBins = numBins; - hReverb->blockSize = numCldfbSlotsPerFrame; - - for ( k = 0; k < REVERB_PREDELAY_MAX + 1; k++ ) - { - set_f( hReverb->preDelayBufferReal[k], 0.0f, hReverb->numBins ); - set_f( hReverb->preDelayBufferImag[k], 0.0f, hReverb->numBins ); - } - - if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) - { - if ( !roomAcoustics->override ) - { - revTimes = fastconvReverberationTimes; - } - else - { - revTimes = t60; - } - } - else - { - revTimes = parametricReverberationTimes; - } - - for ( bin = 0; bin < hReverb->numBins; bin++ ) - { - /* Loop Buffer */ - hReverb->loopBufLengthMax[bin] = (int16_t) ( 500 / ( 1 + bin ) + ( CLDFB_NO_CHANNELS_MAX - bin ) ); - - len = hReverb->loopBufLengthMax[bin] + hReverb->blockSize; - if ( ( hReverb->loopBufReal[bin] = (float *) count_malloc( len * sizeof( float ) ) ) == NULL ) - { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural Reverberator\n" ) ); - } - - if ( ( hReverb->loopBufImag[bin] = (float *) count_malloc( len * sizeof( float ) ) ) == NULL ) - { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural Reverberator\n" ) ); - } - - set_f( hReverb->loopBufReal[bin], 0.0f, len ); - set_f( hReverb->loopBufImag[bin], 0.0f, len ); - - /* Determine loop buffer length. The following formula is manually tuned to generate sufficiently long - * but not excessively long loops to generate reverberation. */ - /* Note: the resulted length is very sensitive to the precision of the constants below (e.g. 1.45 vs. 1.45f) */ - hReverb->loopBufLength[bin] = (int16_t) ( 1.45 * (int16_t) ( revTimes[bin] * 150.0 ) + 1 ); - hReverb->loopBufLength[bin] = min( hReverb->loopBufLength[bin], hReverb->loopBufLengthMax[bin] ); - - /* Sparse Filter Tap Locations */ - for ( chIdx = 0; chIdx < BINAURAL_CHANNELS; chIdx++ ) - { - len = hReverb->loopBufLength[bin]; - - if ( ( hReverb->tapPhaseShiftType[bin][chIdx] = (int16_t *) count_malloc( len * sizeof( int16_t ) ) ) == NULL ) - { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural Reverberator\n" ) ); - } - set_s( hReverb->tapPhaseShiftType[bin][chIdx], 0, len ); - - if ( ( hReverb->tapPointersReal[bin][chIdx] = (float **) count_malloc( len * sizeof( float * ) ) ) == NULL ) - { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural Reverberator\n" ) ); - } - - if ( ( hReverb->tapPointersImag[bin][chIdx] = (float **) count_malloc( len * sizeof( float * ) ) ) == NULL ) - { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural Reverberator\n" ) ); - } - - len = hReverb->blockSize; - if ( ( hReverb->outputBufferReal[bin][chIdx] = (float *) count_malloc( len * sizeof( float ) ) ) == NULL ) - { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural Reverberator\n" ) ); - } - - if ( ( hReverb->outputBufferImag[bin][chIdx] = (float *) count_malloc( len * sizeof( float ) ) ) == NULL ) - { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural Reverberator\n" ) ); - } - - set_f( hReverb->outputBufferReal[bin][chIdx], 0.0f, len ); - set_f( hReverb->outputBufferImag[bin][chIdx], 0.0f, len ); - } - } - - if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) - { - if ( !roomAcoustics->override ) - { - ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, fastconvReverberationTimes, fastconvReverberationEneCorrections ); - ivas_binaural_reverb_setPreDelay( hReverb, 10 ); - } - else - { - ivas_reverb_prepare_cldfb_params( roomAcoustics, output_config, roomAcoustics->use_brir, sampling_rate, t60, ene ); - ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, t60, ene ); - ivas_binaural_reverb_setPreDelay( hReverb, (int16_t) roundf( 48000.0f * roomAcoustics->acousticPreDelay / CLDFB_NO_CHANNELS_MAX ) ); - } - } - else - { - ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, parametricReverberationTimes, parametricReverberationEneCorrections ); - ivas_binaural_reverb_setPreDelay( hReverb, 10 ); - } - - return IVAS_ERR_OK; -} - - -/*------------------------------------------------------------------------- - * ivas_binaural_reverb_close() - * - * Close binaural room reverberator handle - *------------------------------------------------------------------------*/ - -void ivas_binaural_reverb_close( - REVERB_STRUCT_HANDLE *hReverb /* i/o: binaural reverb handle */ -) -{ - int16_t bin, chIdx; - - if ( hReverb == NULL || *hReverb == NULL ) - { - return; - } - - for ( bin = 0; bin < ( *hReverb )->numBins; bin++ ) - { - for ( chIdx = 0; chIdx < BINAURAL_CHANNELS; chIdx++ ) - { - count_free( ( *hReverb )->tapPhaseShiftType[bin][chIdx] ); - count_free( ( *hReverb )->tapPointersReal[bin][chIdx] ); - count_free( ( *hReverb )->tapPointersImag[bin][chIdx] ); - count_free( ( *hReverb )->outputBufferReal[bin][chIdx] ); - count_free( ( *hReverb )->outputBufferImag[bin][chIdx] ); - } - count_free( ( *hReverb )->loopBufReal[bin] ); - count_free( ( *hReverb )->loopBufImag[bin] ); - } - - count_free( ( *hReverb ) ); -#ifdef BRATE_SWITCHING_RENDERING - ( *hReverb ) = NULL; -#endif - - return; -} diff --git a/lib_rend/ivas_cldfb_codec_bitstream.c b/lib_rend/ivas_cldfb_codec_bitstream.c index fae5403b9b..7e8950ab28 100644 --- a/lib_rend/ivas_cldfb_codec_bitstream.c +++ b/lib_rend/ivas_cldfb_codec_bitstream.c @@ -29,14 +29,13 @@ the United Nations Convention on Contracts on the International Sales of Goods. *******************************************************************************************************/ - #include "ivas_cldfb_codec_bitstream.h" - +#include "options.h" +#ifdef SPLIT_REND_WITH_HEAD_ROT #include #include -#include "options.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" #define MAX_BUFFER 1024 @@ -83,7 +82,7 @@ Bitstream *CreateBitstream( const int32_t iDirection, int32_t n; Bitstream *psBitstream; - psBitstream = (Bitstream *) count_malloc( sizeof( Bitstream ) ); + psBitstream = (Bitstream *) malloc( sizeof( Bitstream ) ); psBitstream->iDirection = iDirection; psBitstream->iMaxBuffer = iMaxBuffer; @@ -97,7 +96,7 @@ Bitstream *CreateBitstream( const int32_t iDirection, psBitstream->iMaxBuffer = 4096; } - psBitstream->puchBuffer = (uint8_t *) count_malloc( sizeof( uint8_t ) * psBitstream->iMaxBuffer ); + psBitstream->puchBuffer = (uint8_t *) malloc( sizeof( uint8_t ) * psBitstream->iMaxBuffer ); for ( n = 0; n < psBitstream->iMaxBuffer; n++ ) { @@ -109,8 +108,8 @@ Bitstream *CreateBitstream( const int32_t iDirection, void DeleteBitstream( Bitstream *psBitstream ) { - count_free( psBitstream->puchBuffer ); - count_free( psBitstream ); + free( psBitstream->puchBuffer ); + free( psBitstream ); } void BSFlushBuffer( Bitstream *psBitstream ) @@ -305,3 +304,4 @@ int32_t BSGetError( Bitstream *psBitstream ) { return psBitstream->iError; } +#endif diff --git a/lib_rend/ivas_cldfb_codec_bitstream.h b/lib_rend/ivas_cldfb_codec_bitstream.h index 44e351cec5..a058b901ee 100644 --- a/lib_rend/ivas_cldfb_codec_bitstream.h +++ b/lib_rend/ivas_cldfb_codec_bitstream.h @@ -43,7 +43,11 @@ extern "C" { #endif #include "lib_rend.h" -#include "ivas_lib_rend_internal.h" +#include "ivas_prot_rend.h" +#include "options.h" + +#ifdef SPLIT_REND_WITH_HEAD_ROT + enum { BS_READ, @@ -93,6 +97,7 @@ extern "C" int32_t BSGetAvailableBytes( Bitstream *psBitstream ); int32_t BSGetError( Bitstream *psBitstream ); +#endif #ifdef __cplusplus } diff --git a/lib_rend/ivas_crend.c b/lib_rend/ivas_crend.c index 0351af3320..92f6fa75f9 100644 --- a/lib_rend/ivas_crend.c +++ b/lib_rend/ivas_crend.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -34,17 +34,17 @@ #include "options.h" #include "prot.h" #include "ivas_prot.h" +#include "ivas_prot_rend.h" #include "ivas_cnst.h" #include "ivas_rom_rend.h" -#include "ivas_stat_dec.h" #include #include "ivas_rom_binaural_crend_head.h" +#include "ivas_stat_rend.h" #include "lib_rend.h" -#include "ivas_lib_rend_internal.h" #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------- @@ -108,7 +108,7 @@ static ivas_error ivas_hrtf_open( if ( *hHrtf_out == NULL ) { - if ( ( hHrtf = (HRTFS_HANDLE) count_malloc( sizeof( HRTFS_DATA ) ) ) == NULL ) + if ( ( hHrtf = (HRTFS_HANDLE) malloc( sizeof( HRTFS_DATA ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR decoder\n" ); } @@ -141,40 +141,54 @@ static ivas_error ivas_hrtf_close( return IVAS_ERR_WRONG_PARAMS; } - count_free( *hHrtf ); + free( *hHrtf ); *hHrtf = NULL; return IVAS_ERR_OK; } - /*------------------------------------------------------------------------- - * ivas_crend_init_from_rom() + * initCrend_from_rom() * * Allocate and initialize crend renderer handle *------------------------------------------------------------------------*/ -ivas_error ivas_crend_init_from_rom( - Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ -) +static ivas_error ivas_rend_initCrend( + CREND_WRAPPER *pCrend, + const AUDIO_CONFIG inIvasConfig, + const AUDIO_CONFIG outIvasConfig, + RENDER_CONFIG_DATA *hRendCfg, + HRTFS_CREND_HANDLE hSetOfHRTF, + const int32_t output_Fs ) { int16_t i, j, tmp; - int32_t output_Fs; - AUDIO_CONFIG intern_config; + int16_t nchan_in; + bool use_brir; + IVAS_REND_AudioConfigType inConfigType; HRTFS_HANDLE hHrtf; + ivas_error error; + IVAS_REND_AudioConfig inConfig; + IVAS_REND_AudioConfig outConfig; - hHrtf = st_ivas->hHrtf; - output_Fs = st_ivas->hDecoderConfig->output_Fs; + inConfig = getRendAudioConfigFromIvasAudioConfig( inIvasConfig ); + outConfig = getRendAudioConfigFromIvasAudioConfig( outIvasConfig ); + + inConfigType = getAudioConfigType( inConfig ); + hHrtf = pCrend->hHrtfCrend; - intern_config = st_ivas->intern_config; + /* Do all error checks up front so that the nested if later is easier */ + if ( inConfigType != IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED && inConfigType != IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Encountered unsupported input config in Crend" ); + } - if ( intern_config == AUDIO_CONFIG_BINAURAL || intern_config == AUDIO_CONFIG_BINAURAL_ROOM + if ( outConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL && outConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM #ifdef SPLIT_REND_WITH_HEAD_ROT - || intern_config == AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB + && outConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB && outConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_PCM #endif ) { - return IVAS_ERR_INTERNAL_FATAL; + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Encountered unsupported output type in Crend" ); } if ( hHrtf == NULL ) @@ -185,74 +199,129 @@ ivas_error ivas_crend_init_from_rom( } } - hHrtf->max_num_ir = audioCfg2channels( intern_config ); - - if ( hHrtf->max_num_ir <= 0 ) + /* set BRIR flag */ + use_brir = false; + if ( ( ( hRendCfg != NULL ) && hRendCfg->roomAcoustics.use_brir ) || ( ( hRendCfg == NULL ) && ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) ) ) { - return IVAS_ERR_INTERNAL_FATAL; + use_brir = true; } - /* Do all error checks up front so that the nested if later is easier */ - if ( st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV && st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM ) + + if ( ( error = getAudioConfigNumChannels( inConfig, &nchan_in ) ) != IVAS_ERR_OK ) { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Encountered unsupported renderer type" ); + return error; } + hHrtf->max_num_ir = nchan_in; - if ( intern_config != AUDIO_CONFIG_5_1 && intern_config != AUDIO_CONFIG_5_1_2 && intern_config != AUDIO_CONFIG_5_1_4 && - intern_config != AUDIO_CONFIG_7_1 && intern_config != AUDIO_CONFIG_7_1_4 && - intern_config != AUDIO_CONFIG_FOA && intern_config != AUDIO_CONFIG_HOA2 && intern_config != AUDIO_CONFIG_HOA3 ) + if ( hHrtf->max_num_ir <= 0 ) { - return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Encountered unsupported transport config in Crend" ); + return IVAS_ERR_INTERNAL_FATAL; } - if ( ( ( st_ivas->hRenderConfig != NULL ) && !st_ivas->hRenderConfig->roomAcoustics.use_brir ) || ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV ) ) + if ( hSetOfHRTF == NULL ) { - if ( intern_config == AUDIO_CONFIG_5_1 || intern_config == AUDIO_CONFIG_5_1_2 || intern_config == AUDIO_CONFIG_5_1_4 || - intern_config == AUDIO_CONFIG_7_1 || intern_config == AUDIO_CONFIG_7_1_4 ) + if ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) { hHrtf->max_num_ir -= 1; /* subtract LFE */ hHrtf->gain_lfe = GAIN_LFE; if ( output_Fs == 48000 ) { - hHrtf->latency_s = CRendBin_Combined_HRIR_latency_s_48kHz; - hHrtf->max_num_iterations = CRendBin_Combined_HRIR_max_num_iterations_48kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_Combined_HRIR_index_frequency_max_diffuse_48kHz; + if ( use_brir ) + { + hHrtf->latency_s = CRendBin_Combined_BRIR_latency_s; + hHrtf->max_num_iterations = CRendBin_Combined_BRIR_max_num_iterations_48kHz; + hHrtf->index_frequency_max_diffuse = CRendBin_Combined_BRIR_index_frequency_max_diffuse_48kHz; + } + else + { + hHrtf->latency_s = CRendBin_Combined_HRIR_latency_s; + hHrtf->max_num_iterations = CRendBin_Combined_HRIR_max_num_iterations_48kHz; + hHrtf->index_frequency_max_diffuse = CRendBin_Combined_HRIR_index_frequency_max_diffuse_48kHz; + } for ( j = 0; j < BINAURAL_CHANNELS; j++ ) { - hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_HRIR_num_iterations_diffuse_48kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_48kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_HRIR_coeff_diffuse_re_48kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_HRIR_coeff_diffuse_im_48kHz[j]; + if ( use_brir ) + { + hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_BRIR_num_iterations_diffuse_48kHz[j]; + hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_48kHz[j]; + hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_BRIR_coeff_diffuse_re_48kHz[j]; + hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_BRIR_coeff_diffuse_im_48kHz[j]; + } + else + { + hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_HRIR_num_iterations_diffuse_48kHz[j]; + hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_48kHz[j]; + hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_HRIR_coeff_diffuse_re_48kHz[j]; + hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_HRIR_coeff_diffuse_im_48kHz[j]; + } } } else if ( output_Fs == 32000 ) { - hHrtf->latency_s = CRendBin_Combined_HRIR_latency_s_32kHz; - hHrtf->max_num_iterations = CRendBin_Combined_HRIR_max_num_iterations_32kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_Combined_HRIR_index_frequency_max_diffuse_32kHz; + if ( use_brir ) + { + hHrtf->latency_s = CRendBin_Combined_BRIR_latency_s; + hHrtf->max_num_iterations = CRendBin_Combined_BRIR_max_num_iterations_32kHz; + hHrtf->index_frequency_max_diffuse = CRendBin_Combined_BRIR_index_frequency_max_diffuse_32kHz; + } + else + { + hHrtf->latency_s = CRendBin_Combined_HRIR_latency_s; + hHrtf->max_num_iterations = CRendBin_Combined_HRIR_max_num_iterations_32kHz; + hHrtf->index_frequency_max_diffuse = CRendBin_Combined_HRIR_index_frequency_max_diffuse_32kHz; + } for ( j = 0; j < BINAURAL_CHANNELS; j++ ) { - hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_HRIR_num_iterations_diffuse_32kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_32kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_HRIR_coeff_diffuse_re_32kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_HRIR_coeff_diffuse_im_32kHz[j]; + if ( use_brir ) + { + hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_BRIR_num_iterations_diffuse_32kHz[j]; + hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_32kHz[j]; + hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_BRIR_coeff_diffuse_re_32kHz[j]; + hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_BRIR_coeff_diffuse_im_32kHz[j]; + } + else + { + hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_HRIR_num_iterations_diffuse_32kHz[j]; + hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_32kHz[j]; + hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_HRIR_coeff_diffuse_re_32kHz[j]; + hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_HRIR_coeff_diffuse_im_32kHz[j]; + } } } else if ( output_Fs == 16000 ) { - hHrtf->latency_s = CRendBin_Combined_HRIR_latency_s_16kHz; - hHrtf->max_num_iterations = CRendBin_Combined_HRIR_max_num_iterations_16kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_Combined_HRIR_index_frequency_max_diffuse_16kHz; + if ( use_brir ) + { + hHrtf->latency_s = CRendBin_Combined_BRIR_latency_s; + hHrtf->max_num_iterations = CRendBin_Combined_BRIR_max_num_iterations_16kHz; + hHrtf->index_frequency_max_diffuse = CRendBin_Combined_BRIR_index_frequency_max_diffuse_16kHz; + } + else + { + hHrtf->latency_s = CRendBin_Combined_HRIR_latency_s; + hHrtf->max_num_iterations = CRendBin_Combined_HRIR_max_num_iterations_16kHz; + hHrtf->index_frequency_max_diffuse = CRendBin_Combined_HRIR_index_frequency_max_diffuse_16kHz; + } for ( j = 0; j < BINAURAL_CHANNELS; j++ ) { - hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_HRIR_num_iterations_diffuse_16kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_16kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_HRIR_coeff_diffuse_re_16kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_HRIR_coeff_diffuse_im_16kHz[j]; + if ( use_brir ) + { + hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_BRIR_num_iterations_diffuse_16kHz[j]; + hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_16kHz[j]; + hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_BRIR_coeff_diffuse_re_16kHz[j]; + hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[j]; + } + else + { + hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_HRIR_num_iterations_diffuse_16kHz[j]; + hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_16kHz[j]; + hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_HRIR_coeff_diffuse_re_16kHz[j]; + hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_HRIR_coeff_diffuse_im_16kHz[j]; + } } } else @@ -262,23 +331,23 @@ ivas_error ivas_crend_init_from_rom( for ( i = 0; i < hHrtf->max_num_ir; i++ ) { - if ( intern_config == AUDIO_CONFIG_5_1 ) + if ( inConfig == IVAS_REND_AUDIO_CONFIG_5_1 ) { tmp = channelIndex_CICP6[i]; } - else if ( intern_config == AUDIO_CONFIG_7_1 ) + else if ( inConfig == IVAS_REND_AUDIO_CONFIG_7_1 ) { tmp = channelIndex_CICP12[i]; } - else if ( intern_config == AUDIO_CONFIG_5_1_2 ) + else if ( inConfig == IVAS_REND_AUDIO_CONFIG_5_1_2 ) { tmp = channelIndex_CICP14[i]; } - else if ( intern_config == AUDIO_CONFIG_5_1_4 ) + else if ( inConfig == IVAS_REND_AUDIO_CONFIG_5_1_4 ) { tmp = channelIndex_CICP16[i]; } - else if ( intern_config == AUDIO_CONFIG_7_1_4 ) + else if ( inConfig == IVAS_REND_AUDIO_CONFIG_7_1_4 ) { tmp = channelIndex_CICP19[i]; } @@ -289,38 +358,89 @@ ivas_error ivas_crend_init_from_rom( if ( output_Fs == 48000 ) { - hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_HRIR_inv_diffuse_weight_48kHz[tmp]; + if ( use_brir ) + { + hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_BRIR_inv_diffuse_weight_48kHz[tmp]; + } + else + { + hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_HRIR_inv_diffuse_weight_48kHz[tmp]; + } for ( j = 0; j < BINAURAL_CHANNELS; j++ ) { - hHrtf->num_iterations[i][j] = CRendBin_Combined_HRIR_num_iterations_48kHz[tmp][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_HRIR_pIndex_frequency_max_48kHz[tmp][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_HRIR_coeff_re_48kHz[tmp][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_HRIR_coeff_im_48kHz[tmp][j]; + if ( use_brir ) + { + hHrtf->num_iterations[i][j] = CRendBin_Combined_BRIR_num_iterations_48kHz[tmp][j]; + hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_BRIR_pIndex_frequency_max_48kHz[tmp][j]; + hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_BRIR_coeff_re_48kHz[tmp][j]; + hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_BRIR_coeff_im_48kHz[tmp][j]; + } + else + { + hHrtf->num_iterations[i][j] = CRendBin_Combined_HRIR_num_iterations_48kHz[tmp][j]; + hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_HRIR_pIndex_frequency_max_48kHz[tmp][j]; + hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_HRIR_coeff_re_48kHz[tmp][j]; + hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_HRIR_coeff_im_48kHz[tmp][j]; + } } } else if ( output_Fs == 32000 ) { - hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_HRIR_inv_diffuse_weight_32kHz[tmp]; + if ( use_brir ) + { + hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_BRIR_inv_diffuse_weight_32kHz[tmp]; + } + else + { + hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_HRIR_inv_diffuse_weight_32kHz[tmp]; + } for ( j = 0; j < BINAURAL_CHANNELS; j++ ) { - hHrtf->num_iterations[i][j] = CRendBin_Combined_HRIR_num_iterations_32kHz[tmp][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_HRIR_pIndex_frequency_max_32kHz[tmp][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_HRIR_coeff_re_32kHz[tmp][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_HRIR_coeff_im_32kHz[tmp][j]; + if ( use_brir ) + { + hHrtf->num_iterations[i][j] = CRendBin_Combined_BRIR_num_iterations_32kHz[tmp][j]; + hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_BRIR_pIndex_frequency_max_32kHz[tmp][j]; + hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_BRIR_coeff_re_32kHz[tmp][j]; + hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_BRIR_coeff_im_32kHz[tmp][j]; + } + else + { + hHrtf->num_iterations[i][j] = CRendBin_Combined_HRIR_num_iterations_32kHz[tmp][j]; + hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_HRIR_pIndex_frequency_max_32kHz[tmp][j]; + hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_HRIR_coeff_re_32kHz[tmp][j]; + hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_HRIR_coeff_im_32kHz[tmp][j]; + } } } else if ( output_Fs == 16000 ) { - hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_HRIR_inv_diffuse_weight_16kHz[tmp]; + if ( use_brir ) + { + hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_BRIR_inv_diffuse_weight_16kHz[tmp]; + } + else + { + hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_HRIR_inv_diffuse_weight_16kHz[tmp]; + } for ( j = 0; j < BINAURAL_CHANNELS; j++ ) { - hHrtf->num_iterations[i][j] = CRendBin_Combined_HRIR_num_iterations_16kHz[tmp][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_HRIR_pIndex_frequency_max_16kHz[tmp][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_HRIR_coeff_re_16kHz[tmp][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_HRIR_coeff_im_16kHz[tmp][j]; + if ( use_brir ) + { + hHrtf->num_iterations[i][j] = CRendBin_Combined_BRIR_num_iterations_16kHz[tmp][j]; + hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_BRIR_pIndex_frequency_max_16kHz[tmp][j]; + hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_BRIR_coeff_re_16kHz[tmp][j]; + hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_BRIR_coeff_im_16kHz[tmp][j]; + } + else + { + hHrtf->num_iterations[i][j] = CRendBin_Combined_HRIR_num_iterations_16kHz[tmp][j]; + hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_HRIR_pIndex_frequency_max_16kHz[tmp][j]; + hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_HRIR_coeff_re_16kHz[tmp][j]; + hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_HRIR_coeff_im_16kHz[tmp][j]; + } } } else @@ -329,11 +449,11 @@ ivas_error ivas_crend_init_from_rom( } } } - else if ( intern_config == AUDIO_CONFIG_FOA || intern_config == AUDIO_CONFIG_HOA2 || intern_config == AUDIO_CONFIG_HOA3 ) + else if ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS ) { if ( output_Fs == 48000 ) { - hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s_48kHz; + hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s; hHrtf->max_num_iterations = CRendBin_HOA3_HRIR_max_num_iterations_48kHz; hHrtf->index_frequency_max_diffuse = CRendBin_HOA3_HRIR_index_frequency_max_diffuse_48kHz; @@ -359,7 +479,7 @@ ivas_error ivas_crend_init_from_rom( } else if ( output_Fs == 32000 ) { - hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s_32kHz; + hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s; hHrtf->max_num_iterations = CRendBin_HOA3_HRIR_max_num_iterations_32kHz; hHrtf->index_frequency_max_diffuse = CRendBin_HOA3_HRIR_index_frequency_max_diffuse_32kHz; @@ -386,7 +506,7 @@ ivas_error ivas_crend_init_from_rom( } else if ( output_Fs == 16000 ) { - hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s_16kHz; + hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s; hHrtf->max_num_iterations = CRendBin_HOA3_HRIR_max_num_iterations_16kHz; hHrtf->index_frequency_max_diffuse = CRendBin_HOA3_HRIR_index_frequency_max_diffuse_16kHz; @@ -416,81 +536,68 @@ ivas_error ivas_crend_init_from_rom( return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" ); } } + else + { + return IVAS_ERROR( IVAS_ERR_INTERNAL, "Unsupported renderer type in Crend" ); + } } - else if ( ( ( st_ivas->hRenderConfig != NULL ) && st_ivas->hRenderConfig->roomAcoustics.use_brir ) || ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) ) + else { - if ( intern_config == AUDIO_CONFIG_5_1 || intern_config == AUDIO_CONFIG_5_1_2 || intern_config == AUDIO_CONFIG_5_1_4 || - intern_config == AUDIO_CONFIG_7_1 || intern_config == AUDIO_CONFIG_7_1_4 ) + if ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) { hHrtf->max_num_ir -= 1; /* subtract LFE */ hHrtf->gain_lfe = GAIN_LFE; - if ( output_Fs == 48000 ) + if ( use_brir ) { - hHrtf->latency_s = CRendBin_Combined_BRIR_latency_s_48kHz; - hHrtf->max_num_iterations = CRendBin_Combined_BRIR_max_num_iterations_48kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_Combined_BRIR_index_frequency_max_diffuse_48kHz; - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_BRIR_num_iterations_diffuse_48kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_48kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_BRIR_coeff_diffuse_re_48kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_BRIR_coeff_diffuse_im_48kHz[j]; - } + hHrtf->latency_s = hSetOfHRTF->hHRTF_brir_combined->latency_s; + hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_brir_combined->max_num_iterations; + hHrtf->index_frequency_max_diffuse = hSetOfHRTF->hHRTF_brir_combined->index_frequency_max_diffuse; } - else if ( output_Fs == 32000 ) + else { - hHrtf->latency_s = CRendBin_Combined_BRIR_latency_s_32kHz; - hHrtf->max_num_iterations = CRendBin_Combined_BRIR_max_num_iterations_32kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_Combined_BRIR_index_frequency_max_diffuse_32kHz; + hHrtf->latency_s = hSetOfHRTF->hHRTF_hrir_combined->latency_s; + hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_hrir_combined->max_num_iterations; + hHrtf->index_frequency_max_diffuse = hSetOfHRTF->hHRTF_hrir_combined->index_frequency_max_diffuse; + } - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + if ( use_brir ) { - hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_BRIR_num_iterations_diffuse_32kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_32kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_BRIR_coeff_diffuse_re_32kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_BRIR_coeff_diffuse_im_32kHz[j]; + hHrtf->num_iterations_diffuse[j] = hSetOfHRTF->hHRTF_brir_combined->num_iterations_diffuse[j]; + hHrtf->pIndex_frequency_max_diffuse[j] = hSetOfHRTF->hHRTF_brir_combined->pIndex_frequency_max_diffuse[j]; + hHrtf->pOut_to_bin_diffuse_re[j] = hSetOfHRTF->hHRTF_brir_combined->pOut_to_bin_diffuse_re[j]; + hHrtf->pOut_to_bin_diffuse_im[j] = hSetOfHRTF->hHRTF_brir_combined->pOut_to_bin_diffuse_im[j]; } - } - else if ( output_Fs == 16000 ) - { - hHrtf->latency_s = CRendBin_Combined_BRIR_latency_s_16kHz; - hHrtf->max_num_iterations = CRendBin_Combined_BRIR_max_num_iterations_16kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_Combined_BRIR_index_frequency_max_diffuse_16kHz; - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + else { - hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_BRIR_num_iterations_diffuse_16kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_16kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_BRIR_coeff_diffuse_re_16kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[j]; + hHrtf->num_iterations_diffuse[j] = hSetOfHRTF->hHRTF_hrir_combined->num_iterations_diffuse[j]; + hHrtf->pIndex_frequency_max_diffuse[j] = hSetOfHRTF->hHRTF_hrir_combined->pIndex_frequency_max_diffuse[j]; + hHrtf->pOut_to_bin_diffuse_re[j] = hSetOfHRTF->hHRTF_hrir_combined->pOut_to_bin_diffuse_re[j]; + hHrtf->pOut_to_bin_diffuse_im[j] = hSetOfHRTF->hHRTF_hrir_combined->pOut_to_bin_diffuse_im[j]; } } - else - { - return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" ); - } for ( i = 0; i < hHrtf->max_num_ir; i++ ) { - if ( intern_config == AUDIO_CONFIG_5_1 ) + if ( inConfig == IVAS_REND_AUDIO_CONFIG_5_1 ) { tmp = channelIndex_CICP6[i]; } - else if ( intern_config == AUDIO_CONFIG_7_1 ) + else if ( inConfig == IVAS_REND_AUDIO_CONFIG_7_1 ) { tmp = channelIndex_CICP12[i]; } - else if ( intern_config == AUDIO_CONFIG_5_1_2 ) + else if ( inConfig == IVAS_REND_AUDIO_CONFIG_5_1_2 ) { tmp = channelIndex_CICP14[i]; } - else if ( intern_config == AUDIO_CONFIG_5_1_4 ) + else if ( inConfig == IVAS_REND_AUDIO_CONFIG_5_1_4 ) { tmp = channelIndex_CICP16[i]; } - else if ( intern_config == AUDIO_CONFIG_7_1_4 ) + else if ( inConfig == IVAS_REND_AUDIO_CONFIG_7_1_4 ) { tmp = channelIndex_CICP19[i]; } @@ -499,1408 +606,447 @@ ivas_error ivas_crend_init_from_rom( return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: Channel configuration not specified!\n\n" ); } - if ( output_Fs == 48000 ) - { - hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_BRIR_inv_diffuse_weight_48kHz[tmp]; - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - hHrtf->num_iterations[i][j] = CRendBin_Combined_BRIR_num_iterations_48kHz[tmp][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_BRIR_pIndex_frequency_max_48kHz[tmp][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_BRIR_coeff_re_48kHz[tmp][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_BRIR_coeff_im_48kHz[tmp][j]; - } - } - else if ( output_Fs == 32000 ) - { - hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_BRIR_inv_diffuse_weight_32kHz[tmp]; - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - hHrtf->num_iterations[i][j] = CRendBin_Combined_BRIR_num_iterations_32kHz[tmp][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_BRIR_pIndex_frequency_max_32kHz[tmp][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_BRIR_coeff_re_32kHz[tmp][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_BRIR_coeff_im_32kHz[tmp][j]; - } - } - else if ( output_Fs == 16000 ) + if ( use_brir ) { - hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_BRIR_inv_diffuse_weight_16kHz[tmp]; - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - hHrtf->num_iterations[i][j] = CRendBin_Combined_BRIR_num_iterations_16kHz[tmp][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_BRIR_pIndex_frequency_max_16kHz[tmp][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_BRIR_coeff_re_16kHz[tmp][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_BRIR_coeff_im_16kHz[tmp][j]; - } + hHrtf->inv_diffuse_weight[i] = hSetOfHRTF->hHRTF_brir_combined->inv_diffuse_weight[tmp]; } else { - return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" ); + hHrtf->inv_diffuse_weight[i] = hSetOfHRTF->hHRTF_hrir_combined->inv_diffuse_weight[tmp]; } - } - } - else if ( intern_config == AUDIO_CONFIG_FOA || intern_config == AUDIO_CONFIG_HOA2 || intern_config == AUDIO_CONFIG_HOA3 ) - { - if ( output_Fs == 48000 ) - { - hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s_48kHz; - hHrtf->max_num_iterations = CRendBin_HOA3_HRIR_max_num_iterations_48kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_HOA3_HRIR_index_frequency_max_diffuse_48kHz; - for ( i = 0; i < hHrtf->max_num_ir; i++ ) + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) { - hHrtf->inv_diffuse_weight[i] = CRendBin_HOA3_HRIR_inv_diffuse_weight_48kHz[i]; - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + if ( use_brir ) { - hHrtf->num_iterations[i][j] = CRendBin_HOA3_HRIR_num_iterations_48kHz[i][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_48kHz[i][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_HOA3_HRIR_coeff_re_48kHz[i][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_HOA3_HRIR_coeff_im_48kHz[i][j]; + hHrtf->num_iterations[i][j] = hSetOfHRTF->hHRTF_brir_combined->num_iterations[tmp][j]; + hHrtf->pIndex_frequency_max[i][j] = hSetOfHRTF->hHRTF_brir_combined->pIndex_frequency_max[tmp][j]; + hHrtf->pOut_to_bin_re[i][j] = hSetOfHRTF->hHRTF_brir_combined->pOut_to_bin_re[tmp][j]; + hHrtf->pOut_to_bin_im[i][j] = hSetOfHRTF->hHRTF_brir_combined->pOut_to_bin_im[tmp][j]; } - } - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - hHrtf->num_iterations_diffuse[j] = CRendBin_HOA3_HRIR_num_iterations_diffuse_48kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_48kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_HOA3_HRIR_coeff_diffuse_re_48kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA3_HRIR_coeff_diffuse_im_48kHz[j]; - } - } - else if ( output_Fs == 32000 ) - { - hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s_32kHz; - hHrtf->max_num_iterations = CRendBin_HOA3_HRIR_max_num_iterations_32kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_HOA3_HRIR_index_frequency_max_diffuse_32kHz; - - for ( i = 0; i < hHrtf->max_num_ir; i++ ) - { - hHrtf->inv_diffuse_weight[i] = CRendBin_HOA3_HRIR_inv_diffuse_weight_32kHz[i]; - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + else { - hHrtf->num_iterations[i][j] = CRendBin_HOA3_HRIR_num_iterations_32kHz[i][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_32kHz[i][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_HOA3_HRIR_coeff_re_32kHz[i][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_HOA3_HRIR_coeff_im_32kHz[i][j]; + hHrtf->num_iterations[i][j] = hSetOfHRTF->hHRTF_hrir_combined->num_iterations[tmp][j]; + hHrtf->pIndex_frequency_max[i][j] = hSetOfHRTF->hHRTF_hrir_combined->pIndex_frequency_max[tmp][j]; + hHrtf->pOut_to_bin_re[i][j] = hSetOfHRTF->hHRTF_hrir_combined->pOut_to_bin_re[tmp][j]; + hHrtf->pOut_to_bin_im[i][j] = hSetOfHRTF->hHRTF_hrir_combined->pOut_to_bin_im[tmp][j]; } } - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - hHrtf->num_iterations_diffuse[j] = CRendBin_HOA3_HRIR_num_iterations_diffuse_32kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_32kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_HOA3_HRIR_coeff_diffuse_re_32kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA3_HRIR_coeff_diffuse_im_32kHz[j]; - } } - else if ( output_Fs == 16000 ) - { - hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s_16kHz; - hHrtf->max_num_iterations = CRendBin_HOA3_HRIR_max_num_iterations_16kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_HOA3_HRIR_index_frequency_max_diffuse_16kHz; - - for ( i = 0; i < hHrtf->max_num_ir; i++ ) - { - hHrtf->inv_diffuse_weight[i] = CRendBin_HOA3_HRIR_inv_diffuse_weight_16kHz[i]; + } + else if ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS ) + { + hHrtf->latency_s = hSetOfHRTF->hHRTF_hrir_hoa3->latency_s; + hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_hrir_hoa3->max_num_iterations; + hHrtf->index_frequency_max_diffuse = hSetOfHRTF->hHRTF_hrir_hoa3->index_frequency_max_diffuse; - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - hHrtf->num_iterations[i][j] = CRendBin_HOA3_HRIR_num_iterations_16kHz[i][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_16kHz[i][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_HOA3_HRIR_coeff_re_16kHz[i][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_HOA3_HRIR_coeff_im_16kHz[i][j]; - } - } + for ( i = 0; i < hHrtf->max_num_ir; i++ ) + { + hHrtf->inv_diffuse_weight[i] = hSetOfHRTF->hHRTF_hrir_hoa3->inv_diffuse_weight[i]; for ( j = 0; j < BINAURAL_CHANNELS; j++ ) { - hHrtf->num_iterations_diffuse[j] = CRendBin_HOA3_HRIR_num_iterations_diffuse_16kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_16kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_HOA3_HRIR_coeff_diffuse_re_16kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[j]; + hHrtf->num_iterations[i][j] = hSetOfHRTF->hHRTF_hrir_hoa3->num_iterations[i][j]; + hHrtf->pIndex_frequency_max[i][j] = hSetOfHRTF->hHRTF_hrir_hoa3->pIndex_frequency_max[i][j]; + hHrtf->pOut_to_bin_re[i][j] = hSetOfHRTF->hHRTF_hrir_hoa3->pOut_to_bin_re[i][j]; + hHrtf->pOut_to_bin_im[i][j] = hSetOfHRTF->hHRTF_hrir_hoa3->pOut_to_bin_im[i][j]; } } - else + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) { - return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" ); + hHrtf->num_iterations_diffuse[j] = hSetOfHRTF->hHRTF_hrir_hoa3->num_iterations_diffuse[j]; + hHrtf->pIndex_frequency_max_diffuse[j] = hSetOfHRTF->hHRTF_hrir_hoa3->pIndex_frequency_max_diffuse[j]; + hHrtf->pOut_to_bin_diffuse_re[j] = hSetOfHRTF->hHRTF_hrir_hoa3->pOut_to_bin_diffuse_re[j]; + hHrtf->pOut_to_bin_diffuse_im[j] = hSetOfHRTF->hHRTF_hrir_hoa3->pOut_to_bin_diffuse_im[j]; } } else { - return IVAS_ERROR( IVAS_ERR_INTERNAL, "Unsupported intern_config type in Crend" ); + return IVAS_ERROR( IVAS_ERR_INTERNAL, "Unsupported renderer type in Crend" ); } } - else - { - return IVAS_ERROR( IVAS_ERR_INTERNAL, "Unsupported renderer type in Crend" ); - } - st_ivas->hHrtf = hHrtf; + pCrend->hHrtfCrend = hHrtf; return IVAS_ERR_OK; } - /*------------------------------------------------------------------------- - * ivas_crend_open() + * ivas_rend_initCrendWrapper() * - * Allocate and initialize Crend renderer handle + * Allocate and initialize crend renderer handle *------------------------------------------------------------------------*/ -ivas_error ivas_crend_open( - Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +ivas_error ivas_rend_initCrendWrapper( + CREND_WRAPPER_HANDLE *pCrend +#ifdef SPLIT_REND_WITH_HEAD_ROT + , + const int16_t num_poses +#endif ) { - int16_t i, subframe_length; - int16_t max_total_ir_len; - HRTFS_HANDLE hHrtf; + int16_t i; CREND_HANDLE hCrend; - ivas_error error; - - error = IVAS_ERR_OK; - subframe_length = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC ) / MAX_PARAM_SPATIAL_SUBFRAMES; +#ifdef SPLIT_REND_WITH_HEAD_ROT + int16_t pos_idx; +#endif - if ( ( st_ivas->hHrtf == NULL ) && ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) ) + if ( pCrend == NULL ) { - if ( ( error = ivas_crend_init_from_rom( st_ivas ) ) != IVAS_ERR_OK ) - { - return error; - } + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for renderer handle" ); } - if ( ( hCrend = (CREND_HANDLE) count_malloc( sizeof( CREND_DATA ) ) ) == NULL ) + if ( ( *pCrend = (CREND_WRAPPER_HANDLE) malloc( sizeof( CREND_WRAPPER ) ) ) == NULL ) { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for renderer handle" ); + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend Wrapper\n" ); } - hCrend->lfe_delay_line = NULL; + ( *pCrend )->binaural_latency_ns = 0; + ( *pCrend )->hHrtfCrend = NULL; - for ( i = 0; i < MAX_INTERN_CHANNELS; i++ ) +#ifdef SPLIT_REND_WITH_HEAD_ROT + for ( pos_idx = 0; pos_idx < num_poses; pos_idx++ ) +#endif { - hCrend->freq_buffer_re[i] = NULL; - hCrend->freq_buffer_im[i] = NULL; - } + hCrend = NULL; + if ( ( hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for renderer handle" ); + } - for ( i = 0; i < BINAURAL_CHANNELS; i++ ) - { - hCrend->prev_out_buffer[i] = NULL; - } + hCrend->lfe_delay_line = NULL; - hCrend->freq_buffer_re_diffuse = NULL; - hCrend->freq_buffer_im_diffuse = NULL; - hCrend->hReverb = NULL; - hCrend->delay_line_rw_index = 0; - hCrend->diffuse_delay_line_rw_index = 0; - hCrend->hTrack = NULL; - hCrend->m_fYaw = 0; - hCrend->m_fPitch = 0; - hCrend->m_fRoll = 0; + for ( i = 0; i < MAX_INTERN_CHANNELS; i++ ) + { + hCrend->freq_buffer_re[i] = NULL; + hCrend->freq_buffer_im[i] = NULL; + } - hHrtf = st_ivas->hHrtf; + for ( i = 0; i < BINAURAL_CHANNELS; i++ ) + { + hCrend->prev_out_buffer[i] = NULL; + } - if ( ( hHrtf != NULL ) && ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) ) - { - max_total_ir_len = hHrtf->max_num_iterations * subframe_length; - - for ( i = 0; i < hHrtf->max_num_ir; i++ ) - { - if ( ( hCrend->freq_buffer_re[i] = (float *) count_malloc( sizeof( float ) * max_total_ir_len ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); - } - set_f( hCrend->freq_buffer_re[i], 0, max_total_ir_len ); - - if ( ( hCrend->freq_buffer_im[i] = (float *) count_malloc( sizeof( float ) * max_total_ir_len ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); - } - set_f( hCrend->freq_buffer_im[i], 0, max_total_ir_len ); - } - - for ( i = 0; i < BINAURAL_CHANNELS; i++ ) - { - if ( ( hCrend->prev_out_buffer[i] = (float *) count_malloc( sizeof( float ) * subframe_length ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); - } - set_f( hCrend->prev_out_buffer[i], 0, subframe_length ); - } - - max_total_ir_len = hHrtf->num_iterations_diffuse[0] * subframe_length; - - if ( max_total_ir_len > 0 ) - { - if ( ( hCrend->freq_buffer_re_diffuse = (float *) count_malloc( sizeof( float ) * max_total_ir_len ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); - } - set_f( hCrend->freq_buffer_re_diffuse, 0, max_total_ir_len ); - - if ( ( hCrend->freq_buffer_im_diffuse = (float *) count_malloc( sizeof( float ) * max_total_ir_len ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); - } - set_f( hCrend->freq_buffer_im_diffuse, 0, max_total_ir_len ); - } - else - { - hCrend->freq_buffer_re_diffuse = NULL; - hCrend->freq_buffer_im_diffuse = NULL; - } - - max_total_ir_len = (int16_t) ( hHrtf->latency_s * st_ivas->hDecoderConfig->output_Fs + 0.5f ) + subframe_length; - if ( max_total_ir_len > 0 ) - { - if ( ( hCrend->lfe_delay_line = (float *) count_malloc( sizeof( float ) * max_total_ir_len ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); - } - set_f( hCrend->lfe_delay_line, 0, max_total_ir_len ); - } - else - { - hCrend->lfe_delay_line = NULL; - } - - if ( st_ivas->hDecoderConfig->Opt_Headrotation ) - { - if ( ( hCrend->hTrack = (ivas_orient_trk_state_t *) count_malloc( sizeof( ivas_orient_trk_state_t ) ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Orientation tracking" ); - } - - ivas_orient_trk_Init( hCrend->hTrack ); - } - else - { - hCrend->hTrack = NULL; - } - - if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM && st_ivas->ivas_format == MC_FORMAT && st_ivas->hDecoderConfig->Opt_Headrotation ) - { - if ( ( error = efap_init_data( &( st_ivas->hEFAPdata ), st_ivas->hIntSetup.ls_azimuth, st_ivas->hIntSetup.ls_elevation, st_ivas->hIntSetup.nchan_out_woLFE, EFAP_MODE_EFAP ) ) != IVAS_ERR_OK ) - { - return error; - } - } - - if ( ( ( st_ivas->hRenderConfig != NULL ) && st_ivas->hRenderConfig->roomAcoustics.late_reverb_on ) ) - { - if ( ( error = ivas_reverb_open( &( hCrend->hReverb ), st_ivas->intern_config, hHrtf, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK ) - { - return error; - } - } - else - { - hCrend->hReverb = NULL; - } - - st_ivas->binaural_latency_ns = (int32_t) ( st_ivas->hHrtf->latency_s * 1000000000.f ); - } - - st_ivas->hCrend = hCrend; - - return error; -} - - -/*------------------------------------------------------------------------- - * ivas_crend_close() - * - * Deallocate Crend renderer handle - *------------------------------------------------------------------------*/ - -ivas_error ivas_crend_close( - Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ -) -{ - int16_t i; - - if ( st_ivas->hHrtf != NULL ) - { - ivas_hrtf_close( &st_ivas->hHrtf ); - } - - if ( st_ivas->hCrend != NULL ) - { - if ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD ) - { - for ( i = 0; i < MAX_INTERN_CHANNELS; i++ ) - { - if ( st_ivas->hCrend->freq_buffer_re[i] != NULL ) - { - count_free( st_ivas->hCrend->freq_buffer_re[i] ); - st_ivas->hCrend->freq_buffer_re[i] = NULL; - } - if ( st_ivas->hCrend->freq_buffer_im[i] != NULL ) - { - count_free( st_ivas->hCrend->freq_buffer_im[i] ); - st_ivas->hCrend->freq_buffer_im[i] = NULL; - } - } - - for ( i = 0; i < BINAURAL_CHANNELS; i++ ) - { - if ( st_ivas->hCrend->prev_out_buffer[i] != NULL ) - { - count_free( st_ivas->hCrend->prev_out_buffer[i] ); - st_ivas->hCrend->prev_out_buffer[i] = NULL; - } - } - - if ( st_ivas->hCrend->lfe_delay_line != NULL ) - { - count_free( st_ivas->hCrend->lfe_delay_line ); - st_ivas->hCrend->lfe_delay_line = NULL; - } - - if ( st_ivas->hCrend->freq_buffer_re_diffuse != NULL ) - { - count_free( st_ivas->hCrend->freq_buffer_re_diffuse ); - st_ivas->hCrend->freq_buffer_re_diffuse = NULL; - } - - if ( st_ivas->hCrend->freq_buffer_im_diffuse != NULL ) - { - count_free( st_ivas->hCrend->freq_buffer_im_diffuse ); - st_ivas->hCrend->freq_buffer_im_diffuse = NULL; - } - - if ( st_ivas->hCrend->hTrack != NULL ) - { - count_free( st_ivas->hCrend->hTrack ); - st_ivas->hCrend->hTrack = NULL; - } - } - - ivas_reverb_close( &st_ivas->hCrend->hReverb ); - - count_free( st_ivas->hCrend ); - st_ivas->hCrend = NULL; - } - - return IVAS_ERR_OK; -} - - -/*-----------------------------------------------------------------------------------------* - * Function ivas_crend_convolver() - * - * Convolver block - *-----------------------------------------------------------------------------------------*/ - -static ivas_error ivas_crend_convolver( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - float pcm_in[][L_FRAME48k], - float pcm_out[][L_FRAME48k], - const int16_t i_ts ) -{ - float *pIn; - float *pFreq_buf_re; - float *pFreq_buf_im; - float *pFreq_filt_re; - float *pFreq_filt_im; - int16_t i, j, k, m, nchan_out, subframe_length, nchan_intern, idx_in; - float pOut[L_FRAME48k * 2]; - float tmp_out_re[L_FRAME48k], tmp_out_im[L_FRAME48k]; - int16_t offset, offset_in, offset_diffuse; - int32_t output_Fs; - - nchan_intern = audioCfg2channels( st_ivas->intern_config ); - nchan_out = st_ivas->hDecoderConfig->nchan_out; - output_Fs = st_ivas->hDecoderConfig->output_Fs; - subframe_length = (int16_t) ( output_Fs / FRAMES_PER_SEC ) / MAX_PARAM_SPATIAL_SUBFRAMES; - - offset = st_ivas->hCrend->delay_line_rw_index * subframe_length; /* subframe_length * ( st_ivas->hHrtf->max_num_iterations - 1 ); */ - offset_diffuse = st_ivas->hCrend->diffuse_delay_line_rw_index * subframe_length; /* subframe_length *( st_ivas->hHrtf->num_iterations_diffuse[0] - 1 ); */ - - if ( st_ivas->hHrtf->num_iterations_diffuse[0] > 0 ) - { - set_zero( &st_ivas->hCrend->freq_buffer_re_diffuse[offset_diffuse], subframe_length ); - set_zero( &st_ivas->hCrend->freq_buffer_im_diffuse[offset_diffuse], subframe_length ); - } - - i = 0; - for ( idx_in = 0; idx_in < nchan_intern; idx_in++ ) - { - pIn = &pcm_in[idx_in][i_ts * subframe_length]; - if ( st_ivas->hIntSetup.index_lfe[0] != idx_in ) - { - if ( st_ivas->hHrtf->num_iterations_diffuse[0] > 0 ) - { - pFreq_buf_re = &st_ivas->hCrend->freq_buffer_re_diffuse[offset_diffuse]; - pFreq_buf_im = &st_ivas->hCrend->freq_buffer_im_diffuse[offset_diffuse]; - pFreq_filt_re = &st_ivas->hCrend->freq_buffer_re[i][offset]; - pFreq_filt_im = &st_ivas->hCrend->freq_buffer_im[i][offset]; - - for ( k = 0; k < st_ivas->hHrtf->index_frequency_max_diffuse; k++ ) - { - pFreq_buf_re[k] += pFreq_filt_re[k] * st_ivas->hHrtf->inv_diffuse_weight[i]; - pFreq_buf_im[k] += pFreq_filt_im[k] * st_ivas->hHrtf->inv_diffuse_weight[i]; - } - } - - pFreq_buf_re = &st_ivas->hCrend->freq_buffer_re[i][offset]; - pFreq_buf_im = &st_ivas->hCrend->freq_buffer_im[i][offset]; - - ivas_mdft( pIn, pFreq_buf_re, pFreq_buf_im, subframe_length, subframe_length ); - i++; - } - } - - for ( j = 0; j < nchan_out; j++ ) - { - set_zero( tmp_out_re, subframe_length ); - set_zero( tmp_out_im, subframe_length ); - - i = 0; - for ( idx_in = 0; idx_in < nchan_intern; idx_in++ ) - { - if ( idx_in != st_ivas->hIntSetup.index_lfe[0] ) - { - offset = 0; - for ( m = 0; m < st_ivas->hHrtf->num_iterations[i][j]; m++ ) - { - offset_in = ( st_ivas->hCrend->delay_line_rw_index + st_ivas->hHrtf->max_num_iterations - st_ivas->hHrtf->num_iterations[i][j] + m + 1 ); - offset_in = offset_in % ( st_ivas->hHrtf->max_num_iterations ); - offset_in = offset_in * subframe_length; - pFreq_buf_re = &st_ivas->hCrend->freq_buffer_re[i][offset_in]; - pFreq_buf_im = &st_ivas->hCrend->freq_buffer_im[i][offset_in]; - pFreq_filt_re = &st_ivas->hHrtf->pOut_to_bin_re[i][j][offset]; - pFreq_filt_im = &st_ivas->hHrtf->pOut_to_bin_im[i][j][offset]; - - for ( k = 0; k < st_ivas->hHrtf->pIndex_frequency_max[i][j][m]; k++ ) - { - tmp_out_re[k] += pFreq_buf_re[k] * pFreq_filt_re[k] - pFreq_buf_im[k] * pFreq_filt_im[k]; - tmp_out_im[k] += pFreq_buf_re[k] * pFreq_filt_im[k] + pFreq_buf_im[k] * pFreq_filt_re[k]; - } - offset = offset + k; - } - i++; - } - } - - offset = 0; - for ( m = 0; m < st_ivas->hHrtf->num_iterations_diffuse[j]; m++ ) - { - offset_diffuse = ( st_ivas->hCrend->diffuse_delay_line_rw_index + m + 1 ); - offset_diffuse = offset_diffuse % st_ivas->hHrtf->num_iterations_diffuse[0]; - offset_diffuse = offset_diffuse * subframe_length; - pFreq_buf_re = &st_ivas->hCrend->freq_buffer_re_diffuse[offset_diffuse]; - pFreq_buf_im = &st_ivas->hCrend->freq_buffer_im_diffuse[offset_diffuse]; - pFreq_filt_re = &st_ivas->hHrtf->pOut_to_bin_diffuse_re[j][offset]; - pFreq_filt_im = &st_ivas->hHrtf->pOut_to_bin_diffuse_im[j][offset]; - - for ( k = 0; k < st_ivas->hHrtf->pIndex_frequency_max_diffuse[j][m]; k++ ) - { - tmp_out_re[k] += pFreq_buf_re[k] * pFreq_filt_re[k] - pFreq_buf_im[k] * pFreq_filt_im[k]; - tmp_out_im[k] += pFreq_buf_re[k] * pFreq_filt_im[k] + pFreq_buf_im[k] * pFreq_filt_re[k]; - } - offset = offset + k; - } - - ivas_imdft( tmp_out_re, tmp_out_im, pOut, subframe_length ); - - pFreq_buf_re = &pcm_out[j][i_ts * subframe_length]; - for ( k = 0; k < subframe_length; k++ ) - { - pFreq_buf_re[k] = pOut[k] + st_ivas->hCrend->prev_out_buffer[j][k]; - st_ivas->hCrend->prev_out_buffer[j][k] = pOut[k + subframe_length]; - } - } - - st_ivas->hCrend->delay_line_rw_index++; - st_ivas->hCrend->delay_line_rw_index = st_ivas->hCrend->delay_line_rw_index % ( st_ivas->hHrtf->max_num_iterations ); - if ( st_ivas->hHrtf->num_iterations_diffuse[0] > 0 ) - { - st_ivas->hCrend->diffuse_delay_line_rw_index++; - st_ivas->hCrend->diffuse_delay_line_rw_index = st_ivas->hCrend->diffuse_delay_line_rw_index % ( st_ivas->hHrtf->num_iterations_diffuse[0] ); - } - - return IVAS_ERR_OK; -} - - -/*-----------------------------------------------------------------------------------------* - * Function ivas_crend_process() - * - * Process call for IVAS Crend renderer - *-----------------------------------------------------------------------------------------*/ - -ivas_error ivas_crend_process( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - float output[][L_FRAME48k] /* i/o: input/output audio channels */ -) -{ - int16_t i, nchan_out, output_frame; - int16_t subframe_len, subframe_idx; - float pcm_tmp[BINAURAL_CHANNELS][L_FRAME48k]; - AUDIO_CONFIG intern_config; - ivas_error error; - - wmops_sub_start( "ivas_crend_process" ); - - intern_config = st_ivas->intern_config; - nchan_out = st_ivas->hDecoderConfig->nchan_out; - output_frame = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC ); - subframe_len = output_frame / MAX_PARAM_SPATIAL_SUBFRAMES; - - for ( subframe_idx = 0; subframe_idx < MAX_PARAM_SPATIAL_SUBFRAMES; subframe_idx++ ) - { - if ( st_ivas->hDecoderConfig->Opt_Headrotation && st_ivas->hHeadTrackData && st_ivas->hHeadTrackData->num_quaternions >= 0 ) - { - /* Orientation tracking */ - if ( st_ivas->hCrend->hTrack != NULL ) - { - if ( st_ivas->hDecoderConfig->orientation_tracking == IVAS_ORIENT_TRK_AVG ) - { - ivas_orient_trk_SetTrackingType( st_ivas->hCrend->hTrack, OTR_TRACKING_AVG_ORIENT ); - } - else - { - ivas_orient_trk_SetTrackingType( st_ivas->hCrend->hTrack, OTR_TRACKING_REF_ORIENT ); - } - - /* get current subframe quaternion and convert to euler angles */ - Quat2Euler( st_ivas->hHeadTrackData->Quaternions[subframe_idx], &( st_ivas->hCrend->m_fYaw ), &( st_ivas->hCrend->m_fPitch ), &( st_ivas->hCrend->m_fRoll ) ); - ivas_orient_trk_SetAbsoluteOrientation( st_ivas->hCrend->hTrack, st_ivas->hCrend->m_fYaw, st_ivas->hCrend->m_fPitch, st_ivas->hCrend->m_fRoll ); - ivas_orient_trk_Process( st_ivas->hCrend->hTrack ); - ivas_orient_trk_GetTrackedOrientation( st_ivas->hCrend->hTrack, &( st_ivas->hCrend->m_fYaw ), &( st_ivas->hCrend->m_fPitch ), &( st_ivas->hCrend->m_fRoll ) ); - } - - /* Rotation in SHD for: - MC with elevation (5_1_2 / 5_1_4 / 7_1_4) -> BINAURAL - SBA SPAR -> BINAURAL or BINAURAL_ROOM - */ - if ( intern_config == AUDIO_CONFIG_FOA || intern_config == AUDIO_CONFIG_HOA2 || intern_config == AUDIO_CONFIG_HOA3 ) - { - rotateFrame_shd( st_ivas->hHeadTrackData, output, subframe_len, st_ivas->hIntSetup, subframe_idx ); - } - /* Rotation in SD for MC -> BINAURAL_ROOM */ - else if ( st_ivas->ivas_format != ISM_FORMAT && st_ivas->hIntSetup.is_loudspeaker_setup ) - { - rotateFrame_sd( st_ivas->hHeadTrackData, output, subframe_len, st_ivas->hIntSetup, st_ivas->hEFAPdata, subframe_idx ); - } - } - - if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) - { - if ( ( intern_config == AUDIO_CONFIG_FOA ) || ( intern_config == AUDIO_CONFIG_HOA2 ) || ( intern_config == AUDIO_CONFIG_HOA3 ) || - ( intern_config == AUDIO_CONFIG_5_1 ) || ( intern_config == AUDIO_CONFIG_7_1 ) || - ( intern_config == AUDIO_CONFIG_5_1_2 ) || ( intern_config == AUDIO_CONFIG_5_1_4 ) || ( intern_config == AUDIO_CONFIG_7_1_4 ) ) - { - ivas_crend_convolver( st_ivas, output, pcm_tmp, subframe_idx ); - - if ( st_ivas->hCrend->hReverb != NULL ) - { - if ( ( error = ivas_reverb_process( st_ivas->hCrend->hReverb, intern_config, 1, output, pcm_tmp, subframe_idx ) ) != IVAS_ERR_OK ) - { - return error; - } - } - } - else - { - return IVAS_ERR_INVALID_INPUT_FORMAT; - } - } - else - { - return IVAS_ERR_INTERNAL_FATAL; - } - } - - /* move to output */ - for ( i = 0; i < nchan_out; i++ ) - { - mvr2r( pcm_tmp[i], output[i], output_frame ); - } - - wmops_sub_end(); - - return IVAS_ERR_OK; -} -#ifdef SPLIT_REND_WITH_HEAD_ROT -/*------------------------------------------------------------------------- - * ivas_rend_openMultiBinCrend() - * - * Allocate and initialize crend renderer handle - *------------------------------------------------------------------------*/ - -ivas_error ivas_rend_openMultiBinCrend( - CREND_WRAPPER *pCrend, - const IVAS_REND_AudioConfig inConfig, - const IVAS_REND_AudioConfig outConfig, - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, - const int32_t output_Fs ) -{ - int16_t pos_idx; - ivas_error error; - error = IVAS_ERR_OK; - - for ( pos_idx = 0; pos_idx < pMultiBinPoseData->num_poses; pos_idx++ ) - { - error = ivas_rend_openCrend( pCrend, inConfig, outConfig, NULL /*hRendCfg*/, output_Fs, pos_idx ); - if ( error != IVAS_ERR_OK ) - { - return error; - } - } - return error; -} -#endif -/*------------------------------------------------------------------------- - * ivas_rend_openCrend() - * - * Allocate and initialize crend renderer handle - *------------------------------------------------------------------------*/ - -ivas_error ivas_rend_openCrend( - CREND_WRAPPER *pCrend, - const IVAS_REND_AudioConfig inConfig, - const IVAS_REND_AudioConfig outConfig, - RENDER_CONFIG_DATA *hRendCfg, - const int32_t output_Fs -#ifdef SPLIT_REND_WITH_HEAD_ROT - , - const int16_t pos_idx -#endif -) -{ - /* TODO tmu : Based on ivas_crend_open() - could be harmonized / refactored */ - int16_t i, subframe_length; - int16_t max_total_ir_len; - HRTFS_HANDLE hHrtf; - CREND_HANDLE hCrend; - ivas_error error; -#ifdef SPLIT_REND_WITH_HEAD_ROT - hCrend = pCrend->hCrend[pos_idx]; -#else - hCrend = pCrend->hCrend; -#endif - - error = IVAS_ERR_OK; - subframe_length = (int16_t) ( output_Fs / FRAMES_PER_SEC ) / MAX_PARAM_SPATIAL_SUBFRAMES; - - if ( pCrend->hHrtfCrend == NULL ) - { - if ( ( error = ivas_rend_initCrend( pCrend, inConfig, outConfig, hRendCfg, output_Fs ) ) != IVAS_ERR_OK ) - { - return error; - } - } - - if ( ( hCrend = (CREND_HANDLE) count_malloc( sizeof( CREND_DATA ) ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for renderer handle" ); - } - - hCrend->lfe_delay_line = NULL; - for ( i = 0; i < MAX_INTERN_CHANNELS; i++ ) - { - hCrend->freq_buffer_re[i] = NULL; - hCrend->freq_buffer_im[i] = NULL; - } - - for ( i = 0; i < BINAURAL_CHANNELS; i++ ) - { - hCrend->prev_out_buffer[i] = NULL; - } - - hCrend->freq_buffer_re_diffuse = NULL; - hCrend->freq_buffer_im_diffuse = NULL; - - hCrend->hReverb = NULL; - hCrend->delay_line_rw_index = 0; - hCrend->diffuse_delay_line_rw_index = 0; - hCrend->hTrack = NULL; - hCrend->m_fYaw = 0; - hCrend->m_fPitch = 0; - hCrend->m_fRoll = 0; - - hHrtf = pCrend->hHrtfCrend; - - if ( hHrtf != NULL ) - { - max_total_ir_len = hHrtf->max_num_iterations * subframe_length; - - for ( i = 0; i < hHrtf->max_num_ir; i++ ) - { - if ( ( hCrend->freq_buffer_re[i] = (float *) count_malloc( sizeof( float ) * max_total_ir_len ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); - } - set_zero( hCrend->freq_buffer_re[i], max_total_ir_len ); - - if ( ( hCrend->freq_buffer_im[i] = (float *) count_malloc( sizeof( float ) * max_total_ir_len ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); - } - set_zero( hCrend->freq_buffer_im[i], max_total_ir_len ); - } - - for ( i = 0; i < BINAURAL_CHANNELS; i++ ) - { - if ( ( hCrend->prev_out_buffer[i] = (float *) count_malloc( sizeof( float ) * subframe_length ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); - } - set_zero( hCrend->prev_out_buffer[i], subframe_length ); - } - - max_total_ir_len = hHrtf->num_iterations_diffuse[0] * subframe_length; - - if ( max_total_ir_len > 0 ) - { - if ( ( hCrend->freq_buffer_re_diffuse = (float *) count_malloc( sizeof( float ) * max_total_ir_len ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); - } - set_zero( hCrend->freq_buffer_re_diffuse, max_total_ir_len ); - - if ( ( hCrend->freq_buffer_im_diffuse = (float *) count_malloc( sizeof( float ) * max_total_ir_len ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); - } - set_zero( hCrend->freq_buffer_im_diffuse, max_total_ir_len ); - } - else - { - hCrend->freq_buffer_re_diffuse = NULL; - hCrend->freq_buffer_im_diffuse = NULL; - } - - max_total_ir_len = (int16_t) ( hHrtf->latency_s * output_Fs + 0.5f ) + subframe_length; - if ( max_total_ir_len > 0 ) - { - if ( ( hCrend->lfe_delay_line = (float *) count_malloc( sizeof( float ) * max_total_ir_len ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); - } - set_zero( hCrend->lfe_delay_line, max_total_ir_len ); - } - else - { - hCrend->lfe_delay_line = NULL; - } - - if ( false ) /* TODO tmu : check renderer headrotation flag */ - { - if ( ( hCrend->hTrack = (ivas_orient_trk_state_t *) count_malloc( sizeof( ivas_orient_trk_state_t ) ) ) == NULL ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Orientation tracking" ); - } - - ivas_orient_trk_Init( hCrend->hTrack ); - } - else - { - hCrend->hTrack = NULL; - } + hCrend->freq_buffer_re_diffuse = NULL; + hCrend->freq_buffer_im_diffuse = NULL; + hCrend->hReverb = NULL; + hCrend->delay_line_rw_index = 0; + hCrend->diffuse_delay_line_rw_index = 0; + hCrend->hTrack = NULL; + hCrend->m_fYaw = 0; + hCrend->m_fPitch = 0; + hCrend->m_fRoll = 0; #ifdef SPLIT_REND_WITH_HEAD_ROT - if ( ( hRendCfg != NULL ) && ( hRendCfg->roomAcoustics.late_reverb_on ) && ( pos_idx == 0 ) ) + ( *pCrend )->hCrend[pos_idx] = hCrend; #else - if ( ( hRendCfg != NULL ) && ( hRendCfg->roomAcoustics.late_reverb_on ) ) + ( *pCrend )->hCrend = hCrend; #endif - { - if ( ( error = ivas_reverb_open( &( hCrend->hReverb ), - getIvasAudioConfigFromRendAudioConfig( inConfig ), - pCrend->hHrtfCrend, - hRendCfg, - output_Fs ) ) != IVAS_ERR_OK ) - { - return error; - } - } - else - { - hCrend->hReverb = NULL; - } - - pCrend->binaural_latency_ns = (int32_t) ( pCrend->hHrtfCrend->latency_s * 1000000000.f ); } - -#ifdef SPLIT_REND_WITH_HEAD_ROT - pCrend->hCrend[pos_idx] = hCrend; -#else - pCrend->hCrend = hCrend; -#endif - return IVAS_ERR_OK; } +#ifdef SPLIT_REND_WITH_HEAD_ROT /*------------------------------------------------------------------------- - * initCrend_from_rom() + * ivas_rend_openMultiBinCrend() * * Allocate and initialize crend renderer handle *------------------------------------------------------------------------*/ -ivas_error ivas_rend_initCrend( - CREND_WRAPPER *pCrend, +ivas_error ivas_rend_openMultiBinCrend( + CREND_WRAPPER_HANDLE *pCrend, const IVAS_REND_AudioConfig inConfig, const IVAS_REND_AudioConfig outConfig, - RENDER_CONFIG_DATA *hRendCfg, + MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, const int32_t output_Fs ) { - int16_t i, j, tmp; - int16_t nchan_in; - bool use_brir; - IVAS_REND_AudioConfigType inConfigType; - HRTFS_HANDLE hHrtf; ivas_error error; + error = IVAS_ERR_OK; - inConfigType = getAudioConfigType( inConfig ); - hHrtf = pCrend->hHrtfCrend; - - /* Do all error checks up front so that the nested if later is easier */ - if ( inConfigType != IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED && inConfigType != IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS ) - { - return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Encountered unsupported input config in Crend" ); - } - if ( outConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL && outConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM + error = ivas_rend_openCrend( pCrend, + getIvasAudioConfigFromRendAudioConfig( inConfig ), + getIvasAudioConfigFromRendAudioConfig( outConfig ), + NULL /*hRendCfg*/, + NULL, + output_Fs #ifdef SPLIT_REND_WITH_HEAD_ROT - && outConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB && outConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_PCM + , + pMultiBinPoseData->num_poses #endif - ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Encountered unsupported output type in Crend" ); - } - if ( hHrtf == NULL ) + ); + if ( error != IVAS_ERR_OK ) { - if ( ivas_hrtf_open( &hHrtf ) != IVAS_ERR_OK ) - { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for HRTF handle" ); - } + return error; } + return error; +} +#endif - /* set BRIR flag */ - use_brir = false; - if ( ( hRendCfg != NULL && hRendCfg->roomAcoustics.use_brir ) || outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) - { - use_brir = true; - } +/*------------------------------------------------------------------------- + * ivas_rend_openCrend() + * + * Allocate and initialize crend renderer handle + *------------------------------------------------------------------------*/ +ivas_error ivas_rend_openCrend( + CREND_WRAPPER_HANDLE *pCrend, + const AUDIO_CONFIG inConfig, + const AUDIO_CONFIG outConfig, + RENDER_CONFIG_DATA *hRendCfg, + HRTFS_CREND_HANDLE hSetOfHRTF, + const int32_t output_Fs +#ifdef SPLIT_REND_WITH_HEAD_ROT + , + const int16_t num_poses +#endif +) +{ + /* TODO tmu : Based on ivas_crend_open() - could be harmonized / refactored */ + int16_t i, subframe_length; + int16_t max_total_ir_len; + HRTFS_HANDLE hHrtf; + CREND_HANDLE hCrend; + ivas_error error; +#ifdef SPLIT_REND_WITH_HEAD_ROT + int16_t pos_idx; +#endif - if ( ( error = getAudioConfigNumChannels( inConfig, &nchan_in ) ) != IVAS_ERR_OK ) + error = IVAS_ERR_OK; + if ( ( error = ivas_rend_initCrendWrapper( pCrend +#ifdef SPLIT_REND_WITH_HEAD_ROT + , + num_poses +#endif + ) ) != IVAS_ERR_OK ) { return error; } - hHrtf->max_num_ir = nchan_in; - - if ( hHrtf->max_num_ir <= 0 ) - { - return IVAS_ERR_INTERNAL_FATAL; - } + subframe_length = (int16_t) ( output_Fs / FRAMES_PER_SEC ) / MAX_PARAM_SPATIAL_SUBFRAMES; - if ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) + if ( ( *pCrend )->hHrtfCrend == NULL ) { - hHrtf->max_num_ir -= 1; /* subtract LFE */ - hHrtf->gain_lfe = GAIN_LFE; - - if ( output_Fs == 48000 ) - { - if ( use_brir ) - { - hHrtf->latency_s = CRendBin_Combined_BRIR_latency_s_48kHz; - hHrtf->max_num_iterations = CRendBin_Combined_BRIR_max_num_iterations_48kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_Combined_BRIR_index_frequency_max_diffuse_48kHz; - } - else - { - hHrtf->latency_s = CRendBin_Combined_HRIR_latency_s_48kHz; - hHrtf->max_num_iterations = CRendBin_Combined_HRIR_max_num_iterations_48kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_Combined_HRIR_index_frequency_max_diffuse_48kHz; - } - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - if ( use_brir ) - { - hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_BRIR_num_iterations_diffuse_48kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_48kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_BRIR_coeff_diffuse_re_48kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_BRIR_coeff_diffuse_im_48kHz[j]; - } - else - { - hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_HRIR_num_iterations_diffuse_48kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_48kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_HRIR_coeff_diffuse_re_48kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_HRIR_coeff_diffuse_im_48kHz[j]; - } - } - } - else if ( output_Fs == 32000 ) + if ( ( error = ivas_rend_initCrend( *pCrend, inConfig, outConfig, hRendCfg, hSetOfHRTF, output_Fs ) ) != IVAS_ERR_OK ) { - if ( use_brir ) - { - hHrtf->latency_s = CRendBin_Combined_BRIR_latency_s_32kHz; - hHrtf->max_num_iterations = CRendBin_Combined_BRIR_max_num_iterations_32kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_Combined_BRIR_index_frequency_max_diffuse_32kHz; - } - else - { - hHrtf->latency_s = CRendBin_Combined_HRIR_latency_s_32kHz; - hHrtf->max_num_iterations = CRendBin_Combined_HRIR_max_num_iterations_32kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_Combined_HRIR_index_frequency_max_diffuse_32kHz; - } - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - if ( use_brir ) - { - hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_BRIR_num_iterations_diffuse_32kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_32kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_BRIR_coeff_diffuse_re_32kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_BRIR_coeff_diffuse_im_32kHz[j]; - } - else - { - hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_HRIR_num_iterations_diffuse_32kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_32kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_HRIR_coeff_diffuse_re_32kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_HRIR_coeff_diffuse_im_32kHz[j]; - } - } + return error; } - else if ( output_Fs == 16000 ) - { - if ( use_brir ) - { - hHrtf->latency_s = CRendBin_Combined_BRIR_latency_s_16kHz; - hHrtf->max_num_iterations = CRendBin_Combined_BRIR_max_num_iterations_16kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_Combined_BRIR_index_frequency_max_diffuse_16kHz; - } - else - { - hHrtf->latency_s = CRendBin_Combined_HRIR_latency_s_16kHz; - hHrtf->max_num_iterations = CRendBin_Combined_HRIR_max_num_iterations_16kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_Combined_HRIR_index_frequency_max_diffuse_16kHz; - } + } - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - if ( use_brir ) - { - hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_BRIR_num_iterations_diffuse_16kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_16kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_BRIR_coeff_diffuse_re_16kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[j]; - } - else - { - hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_HRIR_num_iterations_diffuse_16kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_16kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_HRIR_coeff_diffuse_re_16kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_HRIR_coeff_diffuse_im_16kHz[j]; - } - } - } - else - { - return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" ); - } +#ifdef SPLIT_REND_WITH_HEAD_ROT + for ( pos_idx = 0; pos_idx < num_poses; pos_idx++ ) +#endif + { +#ifdef SPLIT_REND_WITH_HEAD_ROT + hCrend = ( *pCrend )->hCrend[pos_idx]; +#else + hCrend = ( *pCrend )->hCrend; +#endif + hHrtf = ( *pCrend )->hHrtfCrend; - for ( i = 0; i < hHrtf->max_num_ir; i++ ) + if ( hHrtf != NULL ) { - if ( inConfig == IVAS_REND_AUDIO_CONFIG_5_1 ) - { - tmp = channelIndex_CICP6[i]; - } - else if ( inConfig == IVAS_REND_AUDIO_CONFIG_7_1 ) - { - tmp = channelIndex_CICP12[i]; - } - else if ( inConfig == IVAS_REND_AUDIO_CONFIG_5_1_2 ) - { - tmp = channelIndex_CICP14[i]; - } - else if ( inConfig == IVAS_REND_AUDIO_CONFIG_5_1_4 ) - { - tmp = channelIndex_CICP16[i]; - } - else if ( inConfig == IVAS_REND_AUDIO_CONFIG_7_1_4 ) - { - tmp = channelIndex_CICP19[i]; - } - else - { - return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: Channel configuration not specified!\n\n" ); - } + max_total_ir_len = hHrtf->max_num_iterations * subframe_length; - if ( output_Fs == 48000 ) + for ( i = 0; i < hHrtf->max_num_ir; i++ ) { - if ( use_brir ) - { - hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_BRIR_inv_diffuse_weight_48kHz[tmp]; - } - else + if ( ( hCrend->freq_buffer_re[i] = (float *) malloc( sizeof( float ) * max_total_ir_len ) ) == NULL ) { - hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_HRIR_inv_diffuse_weight_48kHz[tmp]; + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); } + set_zero( hCrend->freq_buffer_re[i], max_total_ir_len ); - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + if ( ( hCrend->freq_buffer_im[i] = (float *) malloc( sizeof( float ) * max_total_ir_len ) ) == NULL ) { - if ( use_brir ) - { - hHrtf->num_iterations[i][j] = CRendBin_Combined_BRIR_num_iterations_48kHz[tmp][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_BRIR_pIndex_frequency_max_48kHz[tmp][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_BRIR_coeff_re_48kHz[tmp][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_BRIR_coeff_im_48kHz[tmp][j]; - } - else - { - hHrtf->num_iterations[i][j] = CRendBin_Combined_HRIR_num_iterations_48kHz[tmp][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_HRIR_pIndex_frequency_max_48kHz[tmp][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_HRIR_coeff_re_48kHz[tmp][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_HRIR_coeff_im_48kHz[tmp][j]; - } + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); } + set_zero( hCrend->freq_buffer_im[i], max_total_ir_len ); } - else if ( output_Fs == 32000 ) - { - if ( use_brir ) - { - hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_BRIR_inv_diffuse_weight_32kHz[tmp]; - } - else - { - hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_HRIR_inv_diffuse_weight_32kHz[tmp]; - } - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) - { - if ( use_brir ) - { - hHrtf->num_iterations[i][j] = CRendBin_Combined_BRIR_num_iterations_32kHz[tmp][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_BRIR_pIndex_frequency_max_32kHz[tmp][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_BRIR_coeff_re_32kHz[tmp][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_BRIR_coeff_im_32kHz[tmp][j]; - } - else - { - hHrtf->num_iterations[i][j] = CRendBin_Combined_HRIR_num_iterations_32kHz[tmp][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_HRIR_pIndex_frequency_max_32kHz[tmp][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_HRIR_coeff_re_32kHz[tmp][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_HRIR_coeff_im_32kHz[tmp][j]; - } - } - } - else if ( output_Fs == 16000 ) + for ( i = 0; i < BINAURAL_CHANNELS; i++ ) { - if ( use_brir ) - { - hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_BRIR_inv_diffuse_weight_16kHz[tmp]; - } - else - { - hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_HRIR_inv_diffuse_weight_16kHz[tmp]; - } - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + if ( ( hCrend->prev_out_buffer[i] = (float *) malloc( sizeof( float ) * subframe_length ) ) == NULL ) { - if ( use_brir ) - { - hHrtf->num_iterations[i][j] = CRendBin_Combined_BRIR_num_iterations_16kHz[tmp][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_BRIR_pIndex_frequency_max_16kHz[tmp][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_BRIR_coeff_re_16kHz[tmp][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_BRIR_coeff_im_16kHz[tmp][j]; - } - else - { - hHrtf->num_iterations[i][j] = CRendBin_Combined_HRIR_num_iterations_16kHz[tmp][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_HRIR_pIndex_frequency_max_16kHz[tmp][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_HRIR_coeff_re_16kHz[tmp][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_HRIR_coeff_im_16kHz[tmp][j]; - } + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); } + set_zero( hCrend->prev_out_buffer[i], subframe_length ); } - else - { - return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" ); - } - } - } - else if ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS ) - { - if ( output_Fs == 48000 ) - { - hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s_48kHz; - hHrtf->max_num_iterations = CRendBin_HOA3_HRIR_max_num_iterations_48kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_HOA3_HRIR_index_frequency_max_diffuse_48kHz; - for ( i = 0; i < hHrtf->max_num_ir; i++ ) + max_total_ir_len = hHrtf->num_iterations_diffuse[0] * subframe_length; + + if ( max_total_ir_len > 0 ) { - hHrtf->inv_diffuse_weight[i] = CRendBin_HOA3_HRIR_inv_diffuse_weight_48kHz[i]; + if ( ( hCrend->freq_buffer_re_diffuse = (float *) malloc( sizeof( float ) * max_total_ir_len ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); + } + set_zero( hCrend->freq_buffer_re_diffuse, max_total_ir_len ); - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + if ( ( hCrend->freq_buffer_im_diffuse = (float *) malloc( sizeof( float ) * max_total_ir_len ) ) == NULL ) { - hHrtf->num_iterations[i][j] = CRendBin_HOA3_HRIR_num_iterations_48kHz[i][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_48kHz[i][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_HOA3_HRIR_coeff_re_48kHz[i][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_HOA3_HRIR_coeff_im_48kHz[i][j]; + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); } + set_zero( hCrend->freq_buffer_im_diffuse, max_total_ir_len ); } - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + else { - hHrtf->num_iterations_diffuse[j] = CRendBin_HOA3_HRIR_num_iterations_diffuse_48kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_48kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_HOA3_HRIR_coeff_diffuse_re_48kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA3_HRIR_coeff_diffuse_im_48kHz[j]; + hCrend->freq_buffer_re_diffuse = NULL; + hCrend->freq_buffer_im_diffuse = NULL; } - } - else if ( output_Fs == 32000 ) - { - hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s_32kHz; - hHrtf->max_num_iterations = CRendBin_HOA3_HRIR_max_num_iterations_32kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_HOA3_HRIR_index_frequency_max_diffuse_32kHz; - for ( i = 0; i < hHrtf->max_num_ir; i++ ) + max_total_ir_len = (int16_t) ( hHrtf->latency_s * output_Fs + 0.5f ) + subframe_length; + if ( max_total_ir_len > 0 ) { - hHrtf->inv_diffuse_weight[i] = CRendBin_HOA3_HRIR_inv_diffuse_weight_32kHz[i]; - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + if ( ( hCrend->lfe_delay_line = (float *) malloc( sizeof( float ) * max_total_ir_len ) ) == NULL ) { - hHrtf->num_iterations[i][j] = CRendBin_HOA3_HRIR_num_iterations_32kHz[i][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_32kHz[i][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_HOA3_HRIR_coeff_re_32kHz[i][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_HOA3_HRIR_coeff_im_32kHz[i][j]; + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" ); } + set_zero( hCrend->lfe_delay_line, max_total_ir_len ); } - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + else { - hHrtf->num_iterations_diffuse[j] = CRendBin_HOA3_HRIR_num_iterations_diffuse_32kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_32kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_HOA3_HRIR_coeff_diffuse_re_32kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA3_HRIR_coeff_diffuse_im_32kHz[j]; + hCrend->lfe_delay_line = NULL; } - } - else if ( output_Fs == 16000 ) - { - hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s_16kHz; - hHrtf->max_num_iterations = CRendBin_HOA3_HRIR_max_num_iterations_16kHz; - hHrtf->index_frequency_max_diffuse = CRendBin_HOA3_HRIR_index_frequency_max_diffuse_16kHz; - for ( i = 0; i < hHrtf->max_num_ir; i++ ) +#ifdef SPLIT_REND_WITH_HEAD_ROT + if ( ( hRendCfg != NULL ) && ( hRendCfg->roomAcoustics.late_reverb_on ) && ( pos_idx == 0 ) ) +#else + if ( ( hRendCfg != NULL ) && ( hRendCfg->roomAcoustics.late_reverb_on ) ) +#endif { - hHrtf->inv_diffuse_weight[i] = CRendBin_HOA3_HRIR_inv_diffuse_weight_16kHz[i]; - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + if ( ( error = ivas_reverb_open( &( hCrend->hReverb ), inConfig, ( *pCrend )->hHrtfCrend, hRendCfg, output_Fs ) ) != IVAS_ERR_OK ) { - hHrtf->num_iterations[i][j] = CRendBin_HOA3_HRIR_num_iterations_16kHz[i][j]; - hHrtf->pIndex_frequency_max[i][j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_16kHz[i][j]; - hHrtf->pOut_to_bin_re[i][j] = CRendBin_HOA3_HRIR_coeff_re_16kHz[i][j]; - hHrtf->pOut_to_bin_im[i][j] = CRendBin_HOA3_HRIR_coeff_im_16kHz[i][j]; + return error; } } - - for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + else { - hHrtf->num_iterations_diffuse[j] = CRendBin_HOA3_HRIR_num_iterations_diffuse_16kHz[j]; - hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_16kHz[j]; - hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_HOA3_HRIR_coeff_diffuse_re_16kHz[j]; - hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[j]; + hCrend->hReverb = NULL; } - } - else - { - return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" ); - } - } - else - { - return IVAS_ERROR( IVAS_ERR_INTERNAL, "Unsupported renderer type in Crend" ); + ( *pCrend )->binaural_latency_ns = (int32_t) ( ( *pCrend )->hHrtfCrend->latency_s * 1000000000.f ); + } +#ifdef SPLIT_REND_WITH_HEAD_ROT + ( *pCrend )->hCrend[pos_idx] = hCrend; +#else + ( *pCrend )->hCrend = hCrend; +#endif } - - pCrend->hHrtfCrend = hHrtf; - return IVAS_ERR_OK; } + /*------------------------------------------------------------------------- * ivas_crend_close() * * Deallocate Crend renderer handle *------------------------------------------------------------------------*/ -ivas_error ivas_rend_closeCrend( - CREND_WRAPPER *pCrend +void ivas_rend_closeCrend( + CREND_WRAPPER_HANDLE *pCrend #ifdef SPLIT_REND_WITH_HEAD_ROT , - int16_t pos_idx + const int16_t num_poses #endif ) { int16_t i; - CREND_HANDLE hCrend; #ifdef SPLIT_REND_WITH_HEAD_ROT - hCrend = pCrend->hCrend[pos_idx]; -#else - hCrend = pCrend->hCrend; + int16_t pos_idx; #endif + CREND_HANDLE hCrend; + if ( pCrend == NULL || *pCrend == NULL ) + { + return; + } - if ( pCrend->hHrtfCrend != NULL ) + if ( ( *pCrend )->hHrtfCrend != NULL ) { - ivas_hrtf_close( &pCrend->hHrtfCrend ); + ivas_hrtf_close( &( *pCrend )->hHrtfCrend ); } - if ( hCrend != NULL ) +#ifdef SPLIT_REND_WITH_HEAD_ROT + for ( pos_idx = 0; pos_idx < num_poses; pos_idx++ ) +#endif { - for ( i = 0; i < MAX_INTERN_CHANNELS; i++ ) +#ifdef SPLIT_REND_WITH_HEAD_ROT + hCrend = ( *pCrend )->hCrend[pos_idx]; +#else + hCrend = ( *pCrend )->hCrend; +#endif + if ( hCrend != NULL ) { - if ( hCrend->freq_buffer_re[i] != NULL ) + for ( i = 0; i < MAX_INTERN_CHANNELS; i++ ) { - count_free( hCrend->freq_buffer_re[i] ); - hCrend->freq_buffer_re[i] = NULL; + if ( hCrend->freq_buffer_re[i] != NULL ) + { + free( hCrend->freq_buffer_re[i] ); + hCrend->freq_buffer_re[i] = NULL; + } + if ( hCrend->freq_buffer_im[i] != NULL ) + { + free( hCrend->freq_buffer_im[i] ); + hCrend->freq_buffer_im[i] = NULL; + } } - if ( hCrend->freq_buffer_im[i] != NULL ) + + for ( i = 0; i < BINAURAL_CHANNELS; i++ ) { - count_free( hCrend->freq_buffer_im[i] ); - hCrend->freq_buffer_im[i] = NULL; + if ( hCrend->prev_out_buffer[i] != NULL ) + { + free( hCrend->prev_out_buffer[i] ); + hCrend->prev_out_buffer[i] = NULL; + } } - } - for ( i = 0; i < BINAURAL_CHANNELS; i++ ) - { - if ( hCrend->prev_out_buffer[i] != NULL ) + if ( hCrend->lfe_delay_line != NULL ) { - count_free( hCrend->prev_out_buffer[i] ); - hCrend->prev_out_buffer[i] = NULL; + free( hCrend->lfe_delay_line ); + hCrend->lfe_delay_line = NULL; } - } - - if ( hCrend->lfe_delay_line != NULL ) - { - count_free( hCrend->lfe_delay_line ); - hCrend->lfe_delay_line = NULL; - } - - if ( hCrend->freq_buffer_re_diffuse != NULL ) - { - count_free( hCrend->freq_buffer_re_diffuse ); - hCrend->freq_buffer_re_diffuse = NULL; - } - - if ( hCrend->freq_buffer_im_diffuse != NULL ) - { - count_free( hCrend->freq_buffer_im_diffuse ); - hCrend->freq_buffer_im_diffuse = NULL; - } - - if ( hCrend->hTrack != NULL ) - { - count_free( hCrend->hTrack ); - hCrend->hTrack = NULL; - } - ivas_reverb_close( &hCrend->hReverb ); - - count_free( hCrend ); - hCrend = NULL; - } + if ( hCrend->freq_buffer_re_diffuse != NULL ) + { + free( hCrend->freq_buffer_re_diffuse ); + hCrend->freq_buffer_re_diffuse = NULL; + } -#ifdef SPLIT_REND_WITH_HEAD_ROT - pCrend->hCrend[pos_idx] = hCrend; -#else - pCrend->hCrend = hCrend; -#endif + if ( hCrend->freq_buffer_im_diffuse != NULL ) + { + free( hCrend->freq_buffer_im_diffuse ); + hCrend->freq_buffer_im_diffuse = NULL; + } - return IVAS_ERR_OK; -} + if ( hCrend->hTrack != NULL ) + { + free( hCrend->hTrack ); + hCrend->hTrack = NULL; + } -/*-----------------------------------------------------------------------------------------* - * Function ivas_rend_crend_Process() - * - * Process call for IVAS Crend renderer - *-----------------------------------------------------------------------------------------*/ + ivas_reverb_close( &hCrend->hReverb ); -ivas_error ivas_rend_crendProcess( - const CREND_WRAPPER *pCrend, - const IVAS_REND_AudioConfig inConfig, - const IVAS_REND_AudioConfig outConfig, - float output[][L_FRAME48k], /* i/o: input/output audio channels */ - const int32_t output_Fs -#ifdef SPLIT_REND_WITH_HEAD_ROT - , - const int16_t pos_idx -#endif -) -{ - int16_t i, subframe_idx, output_frame; - int16_t nchan_out; - float pcm_tmp[BINAURAL_CHANNELS][L_FRAME48k]; - AUDIO_CONFIG in_config; - IVAS_REND_AudioConfigType inConfigType; - ivas_error error; - CREND_HANDLE hCrend; + free( hCrend ); + hCrend = NULL; #ifdef SPLIT_REND_WITH_HEAD_ROT - hCrend = pCrend->hCrend[pos_idx]; + ( *pCrend )->hCrend[pos_idx] = hCrend; #else - hCrend = pCrend->hCrend; -#endif - - wmops_sub_start( "ivas_rend_crendProcess" ); - - in_config = getIvasAudioConfigFromRendAudioConfig( inConfig ); - inConfigType = getAudioConfigType( inConfig ); - getAudioConfigNumChannels( outConfig, &nchan_out ); - output_frame = (int16_t) ( output_Fs / FRAMES_PER_SEC ); - - for ( subframe_idx = 0; subframe_idx < MAX_PARAM_SPATIAL_SUBFRAMES; subframe_idx++ ) - { - if ( ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) || ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS ) ) - { - if ( ( error = ivas_rend_crendConvolver( pCrend, inConfig, outConfig, output, pcm_tmp, output_Fs, subframe_idx -#ifdef SPLIT_REND_WITH_HEAD_ROT - , - pos_idx + ( *pCrend )->hCrend = hCrend; #endif - ) ) != IVAS_ERR_OK ) - { - return error; - } - - if ( hCrend->hReverb != NULL ) - { - if ( ( error = ivas_reverb_process( hCrend->hReverb, in_config, 1, output, pcm_tmp, subframe_idx ) ) != IVAS_ERR_OK ) - { - return error; - } - } } - else - { - return IVAS_ERR_INVALID_INPUT_FORMAT; - } - } - - /* move to output */ - for ( i = 0; i < nchan_out; i++ ) - { - mvr2r( pcm_tmp[i], output[i], output_frame ); } + free( *pCrend ); + *pCrend = NULL; - wmops_sub_end(); - - return IVAS_ERR_OK; + return; } + /*-----------------------------------------------------------------------------------------* * Function ivas_crend_convolver() * * Convolver block *-----------------------------------------------------------------------------------------*/ -ivas_error ivas_rend_crendConvolver( +static ivas_error ivas_rend_crendConvolver( const CREND_WRAPPER *pCrend, IVAS_REND_AudioConfig inConfig, IVAS_REND_AudioConfig outConfig, @@ -1930,9 +1076,17 @@ ivas_error ivas_rend_crendConvolver( #else hCrend = pCrend->hCrend; #endif + ivas_error error; + + if ( ( error = getAudioConfigNumChannels( inConfig, &nchan_in ) ) != IVAS_ERR_OK ) + { + return error; + } - getAudioConfigNumChannels( inConfig, &nchan_in ); - getAudioConfigNumChannels( outConfig, &nchan_out ); + if ( ( error = getAudioConfigNumChannels( outConfig, &nchan_out ) ) != IVAS_ERR_OK ) + { + return error; + } subframe_length = (int16_t) ( output_Fs / FRAMES_PER_SEC ) / MAX_PARAM_SPATIAL_SUBFRAMES; @@ -2057,3 +1211,115 @@ ivas_error ivas_rend_crendConvolver( return IVAS_ERR_OK; } + + +/*-----------------------------------------------------------------------------------------* + * Function ivas_rend_crend_Process() + * + * Process call for IVAS Crend renderer + *-----------------------------------------------------------------------------------------*/ + +ivas_error ivas_rend_crendProcess( + const CREND_WRAPPER *pCrend, + const AUDIO_CONFIG inConfig, + const AUDIO_CONFIG outConfig, + DECODER_CONFIG_HANDLE hDecoderConfig, + HEAD_TRACK_DATA_HANDLE hHeadTrackData, + IVAS_OUTPUT_SETUP_HANDLE hIntSetup, + EFAP_HANDLE hEFAPdata, + float output[][L_FRAME48k], /* i/o: input/output audio channels */ + const int32_t output_Fs +#ifdef SPLIT_REND_WITH_HEAD_ROT + , + const int16_t pos_idx +#endif +) +{ + int16_t i, subframe_idx, output_frame, subframe_len; + int16_t nchan_out; + float pcm_tmp[BINAURAL_CHANNELS][L_FRAME48k]; + AUDIO_CONFIG in_config; + IVAS_REND_AudioConfigType inConfigType; + ivas_error error; + IVAS_REND_AudioConfig inRendConfig; + IVAS_REND_AudioConfig outRendConfig; + CREND_HANDLE hCrend; +#ifdef SPLIT_REND_WITH_HEAD_ROT + hCrend = pCrend->hCrend[pos_idx]; +#else + hCrend = pCrend->hCrend; +#endif + + push_wmops( "ivas_rend_crendProcess" ); + + inRendConfig = getRendAudioConfigFromIvasAudioConfig( inConfig ); + outRendConfig = getRendAudioConfigFromIvasAudioConfig( outConfig ); + + in_config = getIvasAudioConfigFromRendAudioConfig( inRendConfig ); + + inConfigType = getAudioConfigType( inRendConfig ); + + if ( ( error = getAudioConfigNumChannels( outRendConfig, &nchan_out ) ) != IVAS_ERR_OK ) + { + return error; + } + + output_frame = (int16_t) ( output_Fs / FRAMES_PER_SEC ); + subframe_len = output_frame / MAX_PARAM_SPATIAL_SUBFRAMES; + for ( subframe_idx = 0; subframe_idx < MAX_PARAM_SPATIAL_SUBFRAMES; subframe_idx++ ) + { + if ( hDecoderConfig && hDecoderConfig->Opt_Headrotation && hHeadTrackData && hHeadTrackData->num_quaternions >= 0 ) + { + /* Orientation tracking */ + + /* Rotation in SHD for: + MC with elevation (5_1_2 / 5_1_4 / 7_1_4) -> BINAURAL + SBA SPAR -> BINAURAL or BINAURAL_ROOM + */ + if ( in_config == AUDIO_CONFIG_FOA || in_config == AUDIO_CONFIG_HOA2 || in_config == AUDIO_CONFIG_HOA3 ) + { + rotateFrame_shd( hHeadTrackData, output, subframe_len, *hIntSetup, subframe_idx ); + } + /* Rotation in SD for MC -> BINAURAL_ROOM */ + else if ( ( hIntSetup != NULL ) && hIntSetup->is_loudspeaker_setup ) + { + rotateFrame_sd( hHeadTrackData, output, subframe_len, *hIntSetup, hEFAPdata, subframe_idx ); + } + } + + if ( ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) || ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS ) ) + { + if ( ( error = ivas_rend_crendConvolver( pCrend, inRendConfig, outRendConfig, output, pcm_tmp, output_Fs, subframe_idx +#ifdef SPLIT_REND_WITH_HEAD_ROT + , + pos_idx +#endif + ) ) != IVAS_ERR_OK ) + { + return error; + } + + if ( hCrend->hReverb != NULL ) + { + if ( ( error = ivas_reverb_process( hCrend->hReverb, in_config, 1, output, pcm_tmp, subframe_idx ) ) != IVAS_ERR_OK ) + { + return error; + } + } + } + else + { + return IVAS_ERR_INVALID_INPUT_FORMAT; + } + } + + /* move to output */ + for ( i = 0; i < nchan_out; i++ ) + { + mvr2r( pcm_tmp[i], output[i], output_frame ); + } + + pop_wmops(); + + return IVAS_ERR_OK; +} diff --git a/lib_dec/ivas_dirac_dec_binaural_functions.c b/lib_rend/ivas_dirac_dec_binaural_functions.c similarity index 84% rename from lib_dec/ivas_dirac_dec_binaural_functions.c rename to lib_rend/ivas_dirac_dec_binaural_functions.c index ee02a1bfe1..1fbcad6f68 100644 --- a/lib_dec/ivas_dirac_dec_binaural_functions.c +++ b/lib_rend/ivas_dirac_dec_binaural_functions.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -29,29 +29,42 @@ the United Nations Convention on Contracts on the International Sales of Goods. *******************************************************************************************************/ -// VE2AT: move to lib_rend ? + #include #include "options.h" #include #include #include "prot.h" #include "ivas_prot.h" +#include "ivas_prot_rend.h" #include "ivas_cnst.h" -#include "ivas_rom_binauralRenderer.h" // VE2AT: what about to put these includes ust into ivas_rom_rend.c ? -#include "ivas_rom_dec.h" +#include "ivas_rom_binauralRenderer.h" +#include "ivas_rom_rend.h" +#include "ivas_rom_com.h" + #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------- * Local constants *------------------------------------------------------------------------*/ -#define CLDFB_HALF_BIN_FREQUENCY_OFFSET 0.5f +#define CLDFB_HALF_BIN_FREQUENCY_OFFSET 0.5f +#ifdef FIX_417_TD_DECORR_BRATE_SW #define IVAS_TDET_DUCK_MULT_FAC_PARA_BIN ( 2.0f ) #define IVAS_TDET_DUCK_MULT_FAC_PARA_BIN_LOW_BR ( 3.0f ) +#endif + +/* powf(0.95f, 4.0f) for sub-frame smoothing instead of CLDFB slot */ +#define ADAPT_HTPROTO_IIR_FAC 0.81450625f + +#define ADAPT_HTPROTO_ILD_LIM_DB0 1.0f +#define ADAPT_HTPROTO_ILD_LIM_DB1 4.0f +#define ADAPT_HTPROTO_ROT_LIM_0 0.4f +#define ADAPT_HTPROTO_ROT_LIM_1 0.8f /*------------------------------------------------------------------------- * Local function prototypes @@ -67,6 +80,8 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices( Decoder_Struc static void ivas_dirac_dec_binaural_process_output( Decoder_Struct *st_ivas, float output_f[][L_FRAME48k], float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], const int16_t max_band_decorr, const uint8_t numInputChannels, const uint8_t firstSlot, const uint8_t slotEnd ); +static void adaptTransportSignalsHeadtracked( HEAD_TRACK_DATA_HANDLE hHeadTrackData, float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], const uint8_t firstSlot, const uint8_t slotEnd, const uint8_t nBins, float Rmat[3][3] ); + static void ivas_dirac_dec_binaural_check_and_switch_transports_headtracked( HEAD_TRACK_DATA_HANDLE hHeadTrackData, float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], const uint8_t firstSlot, const uint8_t slotEnd, const uint8_t nBins, float Rmat[3][3] ); static void formulate2x2MixingMatrix( float Ein1, float Ein2, float CinRe, float CinIm, float Eout1, float Eout2, float CoutRe, float CoutIm, float Q[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Mre[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Mim[BINAURAL_CHANNELS][BINAURAL_CHANNELS], const float regularizationFactor ); @@ -79,6 +94,9 @@ static void matrixMul( float Are[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Ai static void matrixTransp2Mul( float Are[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Aim[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Bre[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Bim[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float outRe[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float outIm[BINAURAL_CHANNELS][BINAURAL_CHANNELS] ); +#ifndef FIX_417_TD_DECORR_BRATE_SW +static float configure_reqularization_factor( const IVAS_FORMAT ivas_format, const int32_t ivas_brate ); +#endif /*------------------------------------------------------------------------- * ivas_dirac_dec_init_binaural_data() @@ -87,7 +105,8 @@ static void matrixTransp2Mul( float Are[BINAURAL_CHANNELS][BINAURAL_CHANNELS], f *------------------------------------------------------------------------*/ ivas_error ivas_dirac_dec_init_binaural_data( - Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + HRTFS_PARAMBIN_HANDLE hHrtfParambin /* i : HRTF structure for rendering */ ) { DIRAC_DEC_BIN_HANDLE hBinaural; @@ -98,21 +117,17 @@ ivas_error ivas_dirac_dec_init_binaural_data( float binCenterFreq, tmpFloat; ivas_error error; -#ifdef BRATE_SWITCHING_RENDERING hBinaural = st_ivas->hDiracDecBin; if ( hBinaural == NULL ) -#endif { - if ( ( hBinaural = (DIRAC_DEC_BIN_HANDLE) count_malloc( sizeof( DIRAC_DEC_BIN_DATA ) ) ) == NULL ) + if ( ( hBinaural = (DIRAC_DEC_BIN_HANDLE) malloc( sizeof( DIRAC_DEC_BIN_DATA ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC binaural handle " ); } -#ifdef BRATE_SWITCHING_RENDERING hBinaural->hTdDecorr = NULL; hBinaural->hReverb = NULL; -#endif } nBins = st_ivas->hDirAC->num_freq_bands; @@ -141,19 +156,9 @@ ivas_error ivas_dirac_dec_init_binaural_data( set_zero( hBinaural->ChCrossImOutPrev, nBins ); hBinaural->renderStereoOutputInsteadOfBinaural = 0; - if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR ) /* Use subframe-mode with SPAR, since the metadata is not in sync on a frame level */ - { - hBinaural->useSubframeMode = 1; - } - else - { -#ifdef DEBUGGING - hBinaural->useSubframeMode = st_ivas->hDecoderConfig->forceSubframeBinauralization; -#else - hBinaural->useSubframeMode = 0; /* Default to 20 ms mode. */ -#endif - } + hBinaural->useSubframeMode = 1; +#ifndef FIX_417_TD_DECORR_BRATE_SW hBinaural->useTdDecorr = 0; if ( st_ivas->ivas_format == SBA_FORMAT ) { @@ -176,6 +181,7 @@ ivas_error ivas_dirac_dec_init_binaural_data( hBinaural->useTdDecorr = 1; } } +#endif for ( bin = 0; bin < nBins; bin++ ) { @@ -199,9 +205,8 @@ ivas_error ivas_dirac_dec_init_binaural_data( } else if ( renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) /* Indication of binaural rendering with room effect */ { - mvr2r( parametricEarlyPartEneCorrection, hBinaural->earlyPartEneCorrection, nBins ); + mvr2r( hHrtfParambin->parametricEarlyPartEneCorrection, hBinaural->earlyPartEneCorrection, nBins ); -#ifdef BRATE_SWITCHING_RENDERING /* reconfiguration needed when Reverb. parameters are changed -> close and open the handle again */ if ( hBinaural->hReverb != NULL && ( ( hBinaural->hReverb->numBins != nBins ) || ( hBinaural->useSubframeMode && hBinaural->hReverb->blockSize != CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES ) || @@ -211,18 +216,32 @@ ivas_error ivas_dirac_dec_init_binaural_data( } if ( hBinaural->hReverb == NULL ) -#endif { if ( hBinaural->useSubframeMode ) { - if ( ( error = ivas_binaural_reverb_open( &hBinaural->hReverb, nBins, CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, NULL, st_ivas->hIntSetup.output_config, output_Fs, RENDERER_BINAURAL_PARAMETRIC_ROOM ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_binaural_reverb_open( &hBinaural->hReverb, + nBins, + CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, NULL, + st_ivas->hIntSetup.output_config, + output_Fs, + RENDERER_BINAURAL_PARAMETRIC_ROOM, + st_ivas->hHrtfFastConv, + st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK ) { return error; } } else { - if ( ( error = ivas_binaural_reverb_open( &hBinaural->hReverb, nBins, CLDFB_NO_COL_MAX, NULL, st_ivas->hIntSetup.output_config, output_Fs, RENDERER_BINAURAL_PARAMETRIC_ROOM ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_binaural_reverb_open( &hBinaural->hReverb, + nBins, + CLDFB_NO_COL_MAX, + NULL, + st_ivas->hIntSetup.output_config, + output_Fs, + RENDERER_BINAURAL_PARAMETRIC_ROOM, + st_ivas->hHrtfFastConv, + st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK ) { return error; } @@ -240,15 +259,24 @@ ivas_error ivas_dirac_dec_init_binaural_data( assert( false ); } +#ifdef FIX_417_TD_DECORR_BRATE_SW + if ( hBinaural->hTdDecorr == NULL ) + { + hBinaural->useTdDecorr = 0; + } + + if ( ( error = ivas_td_decorr_reconfig_dec( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hDecoderConfig->output_Fs, &( hBinaural->hTdDecorr ), &( hBinaural->useTdDecorr ) ) ) != IVAS_ERR_OK ) + { + return error; + } +#else if ( hBinaural->useTdDecorr ) { if ( st_ivas->hDecoderConfig->ivas_total_brate >= IVAS_13k2 && st_ivas->ivas_format == SBA_FORMAT ) { -#ifdef BRATE_SWITCHING_RENDERING if ( hBinaural->hTdDecorr == NULL ) -#endif { - ivas_spar_td_decorr_dec_open( &( hBinaural->hTdDecorr ), output_Fs, 3, 1 ); + ivas_td_decorr_dec_open( &( hBinaural->hTdDecorr ), output_Fs, 3, 1 ); } if ( st_ivas->hDecoderConfig->ivas_total_brate < IVAS_24k4 ) @@ -262,17 +290,16 @@ ivas_error ivas_dirac_dec_init_binaural_data( } else { - ivas_spar_td_decorr_dec_open( &( hBinaural->hTdDecorr ), output_Fs, 3, 0 ); + ivas_td_decorr_dec_open( &( hBinaural->hTdDecorr ), output_Fs, 3, 0 ); } } else { -#ifdef BRATE_SWITCHING_RENDERING - ivas_spar_td_decorr_dec_close( &( hBinaural->hTdDecorr ) ); -#else - hBinaural->hTdDecorr = NULL; -#endif + ivas_td_decorr_dec_close( &( hBinaural->hTdDecorr ) ); } +#endif + + hBinaural->reqularizationFactor = configure_reqularization_factor( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate ); st_ivas->hDiracDecBin = hBinaural; @@ -290,7 +317,7 @@ void ivas_dirac_dec_close_binaural_data( DIRAC_DEC_BIN_HANDLE *hBinaural /* i/o: decoder DirAC binaural data handle */ ) { - if ( *hBinaural == NULL ) + if ( hBinaural == NULL || *hBinaural == NULL ) { return; } @@ -300,14 +327,59 @@ void ivas_dirac_dec_close_binaural_data( ivas_binaural_reverb_close( &( ( *hBinaural )->hReverb ) ); } - ivas_spar_td_decorr_dec_close( &( ( *hBinaural )->hTdDecorr ) ); + ivas_td_decorr_dec_close( &( ( *hBinaural )->hTdDecorr ) ); - count_free( *hBinaural ); + free( *hBinaural ); *hBinaural = NULL; return; } +/*------------------------------------------------------------------------- + * ivas_dirac_dec_binaural_copy_hrtfs() + * + * Temporary function for copying HRTF data from rom tables if no binary + * file was given. + *------------------------------------------------------------------------*/ + +ivas_error ivas_dirac_dec_binaural_copy_hrtfs( + HRTFS_PARAMBIN_HANDLE *hHrtfParambin /* i/o: HRTF structure for rendering */ +) +{ + int16_t i, j; + if ( hHrtfParambin != NULL && *hHrtfParambin != NULL ) + { + /* Tables already loaded from file */ + return IVAS_ERR_OK; + } + else + { + /* Initialise tables from ROM */ + HRTFS_PARAMBIN *hrtfParambin; + + if ( ( hrtfParambin = (HRTFS_PARAMBIN *) malloc( sizeof( HRTFS_PARAMBIN ) ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for parametric binauralizer HRTF tables" ); + } + + for ( i = 0; i < BINAURAL_CHANNELS; i++ ) + { + for ( j = 0; j < HRTF_SH_CHANNELS; j++ ) + { + mvr2r( hrtfShCoeffsRe[i][j], hrtfParambin->hrtfShCoeffsRe[i][j], HRTF_NUM_BINS ); + mvr2r( hrtfShCoeffsIm[i][j], hrtfParambin->hrtfShCoeffsIm[i][j], HRTF_NUM_BINS ); + } + } + + mvr2r( parametricReverberationTimes, hrtfParambin->parametricReverberationTimes, CLDFB_NO_CHANNELS_MAX ); + mvr2r( parametricReverberationEneCorrections, hrtfParambin->parametricReverberationEneCorrections, CLDFB_NO_CHANNELS_MAX ); + mvr2r( parametricEarlyPartEneCorrection, hrtfParambin->parametricEarlyPartEneCorrection, CLDFB_NO_CHANNELS_MAX ); + + *hHrtfParambin = hrtfParambin; + } + + return IVAS_ERR_OK; +} /*------------------------------------------------------------------------- * ivas_dirac_dec_binaural() @@ -508,6 +580,8 @@ static void ivas_dirac_dec_binaural_internal( if ( nchan_transport == 2 ) { + adaptTransportSignalsHeadtracked( st_ivas->hHeadTrackData, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, firstSlot, slotEnd, nBins, Rmat ); + ivas_dirac_dec_binaural_check_and_switch_transports_headtracked( st_ivas->hHeadTrackData, Cldfb_ImagBuffer_in, Cldfb_RealBuffer_in, firstSlot, slotEnd, nBins, Rmat ); } } @@ -599,7 +673,7 @@ static void ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matric { uint8_t ch, slot, bin, subframe; uint8_t separateCenterChannelRendering; - int16_t nBins; + int16_t nBins, idx; float frameMeanDiffusenessEneWeight[CLDFB_NO_CHANNELS_MAX]; DIRAC_DEC_HANDLE hDirAC; DIRAC_DEC_BIN_HANDLE h; @@ -609,7 +683,6 @@ static void ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matric uint8_t applyLowBitRateEQ; int16_t dirac_read_idx; - hDirAC = st_ivas->hDirAC; h = st_ivas->hDiracDecBin; separateCenterChannelRendering = st_ivas->hOutSetup.separateChannelEnabled; @@ -850,15 +923,16 @@ static void ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matric if ( ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) ) { + idx = min( bin, MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS - 1 ); + /* Apply the target spectrum to the eneCorrectionFactor */ if ( separateCenterChannelRendering ) /* spreadCoh mostly originates from phantom sources in separate channel rendering mode */ { - eneCorrectionFactor *= w1 * 1.0f + ( w2 + w3 ) * spreadCohEne1[min( bin, MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS - 1 )]; + eneCorrectionFactor *= w1 * 1.0f + ( w2 + w3 ) * spreadCohEne1[idx]; } else { - eneCorrectionFactor *= w1 * 1.0f + w2 * spreadCohEne05[min( bin, MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS - 1 )] + - w3 * spreadCohEne1[min( bin, MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS - 1 )]; + eneCorrectionFactor *= w1 * 1.0f + w2 * spreadCohEne05[idx] + w3 * spreadCohEne1[idx]; } } @@ -891,8 +965,9 @@ static void ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matric { if ( !h->renderStereoOutputInsteadOfBinaural ) { + idx = min( bin, MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS - 1 ); /* Apply target spectrum that emphasizes low frequencies when the sound is surround coherent */ - diffEne *= ( 1.0f - surCoh ) + surCoh * surCohEne[min( bin, MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS - 1 )]; + diffEne *= ( 1.0f - surCoh ) + surCoh * surCohEne[idx]; } } h->ChEneOut[0][bin] += diffEne; /* Diff ene part*/ @@ -1028,7 +1103,7 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices( h->ChCrossRe[bin], h->ChCrossIm[bin], h->ChEneOut[0][bin], h->ChEneOut[1][bin], h->ChCrossReOut[bin], h->ChCrossImOut[bin], - prototypeMtx, Mre, Mim, 1.0f ); + prototypeMtx, Mre, Mim, h->reqularizationFactor ); /* Load estimated covariance matrix to the [2][2] matrix form */ CxRe[0][0] = h->ChEne[0][bin]; @@ -1277,6 +1352,134 @@ static void ivas_dirac_dec_binaural_process_output( } +static void adaptTransportSignalsHeadtracked( + HEAD_TRACK_DATA_HANDLE hHeadTrackData, + float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + const uint8_t firstSlot, + const uint8_t slotEnd, + const uint8_t nBins, + float Rmat[3][3] ) +{ + int16_t slot, ch, bin, louderCh; + float ILD, mono_factor_ILD, mono_factor_rotation, mono_factor, y_val, ene_proc, ene_target; + uint8_t n_slots_per_sf, sf_idx, n_sf; + int16_t max_band; + + /* Determine head-orientation-based mono factor. + Rmat[1][1] entry informs how close the ears are aligned according to transport signals. */ + y_val = 1.0f - fabsf( Rmat[1][1] ); + mono_factor_rotation = ( y_val - ADAPT_HTPROTO_ROT_LIM_0 ) / ( ADAPT_HTPROTO_ROT_LIM_1 - ADAPT_HTPROTO_ROT_LIM_0 ); + mono_factor_rotation = fmaxf( 0.0f, fminf( 1.0f, mono_factor_rotation ) ); + + /* Adapt transport signals in frequency bands */ + /* optimization grouping CLDFB bins into MASA bands (they are readily available in ROM and suitable for the task) AND group CLDFB slots into sub-frames */ + n_slots_per_sf = CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES; + n_sf = ( slotEnd - firstSlot ) / n_slots_per_sf; + + max_band = 0; + while ( max_band < MASA_FREQUENCY_BANDS && MASA_band_grouping_24[max_band] < nBins ) + { + max_band++; + } + + for ( sf_idx = 0; sf_idx < n_sf; sf_idx++ ) + { + float eqVal; + uint8_t start_slot, stop_slot; + int16_t band_idx, bin_lo, bin_hi; + + start_slot = firstSlot + sf_idx * n_slots_per_sf; + stop_slot = start_slot + n_slots_per_sf; + + for ( band_idx = 0; band_idx < max_band; band_idx++ ) + { + float ch_nrg[2]; /* storage for input signal channel energies */ + bin_lo = MASA_band_grouping_24[band_idx]; + bin_hi = min( MASA_band_grouping_24[band_idx + 1], (int16_t) nBins ); + for ( ch = 0; ch < 2; ch++ ) + { + ch_nrg[ch] = 0.0f; + for ( slot = start_slot; slot < stop_slot; slot++ ) + { + for ( bin = bin_lo; bin < bin_hi; bin++ ) + { + ch_nrg[ch] += ( inRe[ch][slot][bin] * inRe[ch][slot][bin] ) + ( inIm[ch][slot][bin] * inIm[ch][slot][bin] ); + } + } + hHeadTrackData->chEneIIR[ch][band_idx] *= ADAPT_HTPROTO_IIR_FAC; + hHeadTrackData->chEneIIR[ch][band_idx] += ( 1.0f - ADAPT_HTPROTO_IIR_FAC ) * ch_nrg[ch]; + } + + /* Determine ILD */ + ILD = fabsf( 10.0f * log10f( fmaxf( 1e-12f, hHeadTrackData->chEneIIR[0][band_idx] ) / fmaxf( 1e-12f, hHeadTrackData->chEneIIR[1][band_idx] ) ) ); + if ( hHeadTrackData->chEneIIR[1][band_idx] > hHeadTrackData->chEneIIR[0][band_idx] ) + { + louderCh = 1; + } + else + { + louderCh = 0; + } + + /* Determine ILD-based mono factor */ + mono_factor_ILD = ( ILD - ADAPT_HTPROTO_ILD_LIM_DB0 ) / ( ADAPT_HTPROTO_ILD_LIM_DB1 - ADAPT_HTPROTO_ILD_LIM_DB0 ); + mono_factor_ILD = fmaxf( 0.0f, fminf( 1.0f, mono_factor_ILD ) ); + + /* Combine mono factors */ + mono_factor = mono_factor_ILD * mono_factor_rotation; + + /* Mix original audio and sum signal according to determined mono factor */ + for ( ch = 0; ch < 2; ch++ ) + { + if ( ch != louderCh ) + { + float band_nrg = 0.0f; + + for ( slot = start_slot; slot < stop_slot; slot++ ) + { + for ( bin = bin_lo; bin < bin_hi; bin++ ) + { + /* mono sum signal with the computed weight + rest from the original channel */ + inRe[ch][slot][bin] = mono_factor * ( inRe[0][slot][bin] + inRe[1][slot][bin] ) + ( 1.0f - mono_factor ) * inRe[ch][slot][bin]; + inIm[ch][slot][bin] = mono_factor * ( inIm[0][slot][bin] + inIm[1][slot][bin] ) + ( 1.0f - mono_factor ) * inIm[ch][slot][bin]; + band_nrg += ( inRe[ch][slot][bin] * inRe[ch][slot][bin] ) + ( inIm[ch][slot][bin] * inIm[ch][slot][bin] ); + } + } + hHeadTrackData->procChEneIIR[ch][band_idx] *= ADAPT_HTPROTO_IIR_FAC; + hHeadTrackData->procChEneIIR[ch][band_idx] += ( 1.0f - ADAPT_HTPROTO_IIR_FAC ) * band_nrg; + } + else + { + /* processed signal is input. use the original channel, so no need to compute new signals or signal energy */ + hHeadTrackData->procChEneIIR[ch][band_idx] *= ADAPT_HTPROTO_IIR_FAC; + hHeadTrackData->procChEneIIR[ch][band_idx] += ( 1.0f - ADAPT_HTPROTO_IIR_FAC ) * ch_nrg[ch]; + } + } + + /* Equalize */ + ene_target = hHeadTrackData->chEneIIR[0][band_idx] + hHeadTrackData->chEneIIR[1][band_idx]; + ene_proc = hHeadTrackData->procChEneIIR[0][band_idx] + hHeadTrackData->procChEneIIR[1][band_idx]; + eqVal = fminf( 4.0f, sqrtf( ene_target / fmaxf( 1e-12f, ene_proc ) ) ); + + for ( slot = start_slot; slot < stop_slot; slot++ ) + { + for ( ch = 0; ch < 2; ch++ ) + { + for ( bin = bin_lo; bin < bin_hi; bin++ ) + { + inRe[ch][slot][bin] *= eqVal; + inIm[ch][slot][bin] *= eqVal; + } + } + } + } + } + + return; +} + + static void ivas_dirac_dec_binaural_check_and_switch_transports_headtracked( HEAD_TRACK_DATA_HANDLE hHeadTrackData, float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], @@ -1814,3 +2017,85 @@ static void hrtfShGetHrtf( return; } + + +/*------------------------------------------------------------------------- + * configure_reqularization_factor() + * + * Configure regularization factor for the mixing matrix generation of the + * parametric binauralizer using IVAS codec format and current bitrate. + *------------------------------------------------------------------------*/ + +/*! r: Configured reqularization factor value */ +#ifndef FIX_417_TD_DECORR_BRATE_SW +static +#endif + float + configure_reqularization_factor( + const IVAS_FORMAT ivas_format, /* i : IVAS format */ + const int32_t ivas_total_brate /* i : IVAS total bitrate */ + ) +{ + float reqularizationFactor; + reqularizationFactor = 1.0f; /* Default value */ + + if ( ivas_format == MASA_FORMAT ) + { + if ( ivas_total_brate >= IVAS_256k ) + { + reqularizationFactor = 0.2f; + } + else if ( ivas_total_brate == IVAS_192k ) + { + reqularizationFactor = 0.3f; + } + else if ( ivas_total_brate == IVAS_160k ) + { + reqularizationFactor = 0.4f; + } + else if ( ivas_total_brate == IVAS_128k ) + { + reqularizationFactor = 0.5f; + } + else if ( ivas_total_brate == IVAS_96k ) + { + reqularizationFactor = 0.6f; + } + else if ( ivas_total_brate >= IVAS_64k ) + { + reqularizationFactor = 0.8f; + } + else + { + reqularizationFactor = 1.0f; + } + } + + if ( ivas_format == MC_FORMAT ) /* This is always McMASA for parametric binauralizer. */ + { + if ( ivas_total_brate >= IVAS_96k ) + { + reqularizationFactor = 0.3f; + } + else if ( ivas_total_brate >= IVAS_80k ) + { + reqularizationFactor = 0.5f; + } + else if ( ivas_total_brate >= IVAS_64k ) + { + reqularizationFactor = 0.7f; + } + else if ( ivas_total_brate >= IVAS_48k ) + { + reqularizationFactor = 0.8f; + } + else + { + reqularizationFactor = 1.0f; + } + } + + /* For SBA and parametric ISM, currently in default value of 1.0f. */ + + return reqularizationFactor; +} diff --git a/lib_rend/ivas_efap.c b/lib_rend/ivas_efap.c index 48bfd7b8a0..4301d75dec 100644 --- a/lib_rend/ivas_efap.c +++ b/lib_rend/ivas_efap.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,12 +37,12 @@ #include "options.h" #include "prot.h" #include "ivas_prot.h" +#include "ivas_prot_rend.h" #include "ivas_stat_dec.h" -#include "ivas_rom_dec.h" #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------* * Local constants @@ -101,6 +101,7 @@ static float vertex_distance( const EFAP_VERTEX *vtxArray, const EFAP_LS_TRIANGL static float point_plane_distance( const float P1[3], const float P2[3], const float P3[3], const float X[3] ); static float point_poly_distance( const EFAP_POLYSET poly, const float X[3] ); + static void efap_crossp( const float *v1, const float *v2, float *v ); static int16_t find_int_in_tri( const EFAP_LS_TRIANGLE *tri, const int16_t n, const int16_t r, int16_t *pos ); @@ -163,29 +164,29 @@ ivas_error efap_init_data( *-----------------------------------------------------------------*/ /* Memory Allocations for efap */ - if ( ( efap = (EFAP *) count_malloc( sizeof( EFAP ) ) ) == NULL ) + if ( ( efap = (EFAP *) malloc( sizeof( EFAP ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for EFAP handle\n" ) ); } /* Memory Allocation and update for aziSpk & eleSpk arrays*/ - if ( ( efap->aziSpk = (float *) count_malloc( num_speaker_nodes * sizeof( float ) ) ) == NULL ) + if ( ( efap->aziSpk = (float *) malloc( num_speaker_nodes * sizeof( float ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for EFAP speaker azimuths\n" ) ); } - if ( ( efap->eleSpk = (float *) count_malloc( num_speaker_nodes * sizeof( float ) ) ) == NULL ) + if ( ( efap->eleSpk = (float *) malloc( num_speaker_nodes * sizeof( float ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for EFAP speaker elevations\n" ) ); } /* Memory Allocation for vertexArray */ - if ( ( efap->vtxData.vertexArray = (EFAP_VERTEX *) count_malloc( ( num_speaker_nodes + EFAP_MAX_GHOST_LS ) * sizeof( EFAP_VERTEX ) ) ) == NULL ) + if ( ( efap->vtxData.vertexArray = (EFAP_VERTEX *) malloc( ( num_speaker_nodes + EFAP_MAX_GHOST_LS ) * sizeof( EFAP_VERTEX ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for EFAP Vertex Array\n" ) ); } /* Memory allocation for the tmp buffer short */ - if ( ( efap->bufferShort = (float *) count_malloc( num_speaker_nodes * sizeof( float ) ) ) == NULL ) + if ( ( efap->bufferShort = (float *) malloc( num_speaker_nodes * sizeof( float ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for EFAP bufferS\n" ) ); } @@ -214,7 +215,7 @@ ivas_error efap_init_data( /* Memory allocation for the tmp buffer long */ - if ( ( efap->bufferLong = (float *) count_malloc( efap->vtxData.numVtx * sizeof( float ) ) ) == NULL ) + if ( ( efap->bufferLong = (float *) malloc( efap->vtxData.numVtx * sizeof( float ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for EFAP bufferL\n" ) ); } @@ -322,33 +323,33 @@ void efap_free_data( dim1 = ( *hEFAPdata )->numTot; /* instance buffer members */ - count_free( ( *hEFAPdata )->aziSpk ); + free( ( *hEFAPdata )->aziSpk ); ( *hEFAPdata )->aziSpk = NULL; - count_free( ( *hEFAPdata )->eleSpk ); + free( ( *hEFAPdata )->eleSpk ); ( *hEFAPdata )->eleSpk = NULL; - count_free( ( *hEFAPdata )->vtxData.vertexArray ); + free( ( *hEFAPdata )->vtxData.vertexArray ); ( *hEFAPdata )->vtxData.vertexArray = NULL; - count_free( ( *hEFAPdata )->vtxData.vtxOrder ); + free( ( *hEFAPdata )->vtxData.vtxOrder ); ( *hEFAPdata )->vtxData.vtxOrder = NULL; - count_free( ( *hEFAPdata )->bufferLong ); + free( ( *hEFAPdata )->bufferLong ); ( *hEFAPdata )->bufferLong = NULL; - count_free( ( *hEFAPdata )->bufferShort ); + free( ( *hEFAPdata )->bufferShort ); ( *hEFAPdata )->bufferShort = NULL; p_dmTranspose = (void **) ( *hEFAPdata )->dmTranspose; for ( i = 0; i < dim1; i++ ) { - count_free( p_dmTranspose[i] ); + free( p_dmTranspose[i] ); } - count_free( p_dmTranspose ); + free( p_dmTranspose ); /* instance */ - count_free( *hEFAPdata ); + free( *hEFAPdata ); *hEFAPdata = NULL; return; @@ -533,7 +534,7 @@ static ivas_error sphere_triangulation( add_ghost_speakers( vtxData->vertexArray, &vtxData->numVtx, efip_flag ); /* Sort the vertices according to their index */ - if ( ( vtxData->vtxOrder = (int16_t *) count_malloc( vtxData->numVtx * sizeof( int16_t ) ) ) == NULL ) + if ( ( vtxData->vtxOrder = (int16_t *) malloc( vtxData->numVtx * sizeof( int16_t ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for EFAP Vertex Order\n" ) ); } @@ -552,7 +553,7 @@ static ivas_error sphere_triangulation( assert( polyData->numTri != 0 && "EFAP: failed to construct convex hull!" ); /* Allocate the DM matrix transpose */ - if ( ( p_dmTranspose = count_malloc( vtxData->numVtx * sizeof( float * ) ) ) == NULL ) + if ( ( p_dmTranspose = malloc( vtxData->numVtx * sizeof( float * ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "EFAP: can not allocate memory for dmTranspose\n" ) ); } @@ -562,7 +563,7 @@ static ivas_error sphere_triangulation( for ( i = 0; i < vtxData->numVtx; i++ ) { - if ( ( p_dmTranspose[i] = count_malloc( numSpk * sizeof( float ) ) ) == NULL ) + if ( ( p_dmTranspose[i] = malloc( numSpk * sizeof( float ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "EFAP: can not allocate memory for dmTranspose\n" ) ); } diff --git a/lib_rend/ivas_hrtf.c b/lib_rend/ivas_hrtf.c index 7c4183b0e8..2b1f16d025 100644 --- a/lib_rend/ivas_hrtf.c +++ b/lib_rend/ivas_hrtf.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,228 +33,171 @@ #include #include "options.h" #include "prot.h" -#include "ivas_prot.h" -#include "lib_dec.h" -#include "string.h" -#include "assert.h" -#include "ivas_rom_TdBinauralRenderer.h" +#include "ivas_prot_rend.h" #include "ivas_error.h" -#include "wmops.h" +#include "wmc_auto.h" + +/*-----------------------------------------------------------------------* + * ivas_HRTF_binary_open() + * + * Allocate HRTF binary handle + *-----------------------------------------------------------------------*/ + +ivas_error ivas_HRTF_binary_open( + TDREND_HRFILT_FiltSet_t **hHrtfTD ) +{ + /* Allocate HR filter set for headphones configuration */ + *hHrtfTD = (TDREND_HRFILT_FiltSet_t *) malloc( sizeof( TDREND_HRFILT_FiltSet_t ) ); + if ( *hHrtfTD == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HRTF binary!" ); + } + + return IVAS_ERR_OK; +} /*-------------------------------------------------------------------* - * Local constants + * ivas_HRTF_binary_close() + * + * Close HRTF binary handle *-------------------------------------------------------------------*/ -#define RESAMPLE_FACTOR_16_48 ( 16.0f / 48.0f ) -#define RESAMPLE_FACTOR_32_48 ( 32.0f / 48.0f ) +void ivas_HRTF_binary_close( + TDREND_HRFILT_FiltSet_t **hHrtfTD ) +{ + if ( hHrtfTD == NULL || *hHrtfTD == NULL ) + { + return; + } + + free( *hHrtfTD ); + *hHrtfTD = NULL; + + return; +} + + +/*-----------------------------------------------------------------------* + * ivas_HRTF_CRend_binary_open() + * + * Allocate HRTF binary handle + *-----------------------------------------------------------------------*/ + +ivas_error ivas_HRTF_CRend_binary_open( + HRTFS_CREND **hSetOfHRTF ) +{ + /* Allocate HR filter set for headphones configuration */ + *hSetOfHRTF = (HRTFS_CREND *) malloc( sizeof( HRTFS_CREND ) ); + if ( *hSetOfHRTF == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for set of HRTF binary!" ); + } + + ( *hSetOfHRTF )->hHRTF_hrir_combined = NULL; + ( *hSetOfHRTF )->hHRTF_hrir_hoa3 = NULL; + ( *hSetOfHRTF )->hHRTF_brir_combined = NULL; + + return IVAS_ERR_OK; +} /*-------------------------------------------------------------------* - * BSplineModelEvalAlloc() + * ivas_HRTF_CRend_binary_close() * - * Allocate the B Spline HR Filter model. - --------------------------------------------------------------------*/ + * Close HRTF CRend binary handle + *-------------------------------------------------------------------*/ -void BSplineModelEvalAlloc( - ModelParams_t *model, /* i : Model parameters */ - ModelEval_t *modelEval /* i/o: Model evaluation structure */ -) +void ivas_HRTF_CRend_binary_close( + HRTFS_CREND **hSetOfHRTF ) { - modelEval->hrfModL = (float *) count_malloc( model->K * sizeof( float ) ); - modelEval->hrfModR = (float *) count_malloc( model->K * sizeof( float ) ); + if ( hSetOfHRTF == NULL || *hSetOfHRTF == NULL ) + { + return; + } + + free( *hSetOfHRTF ); + *hSetOfHRTF = NULL; return; } -/*-------------------------------------------------------------------* - * DefaultBSplineModel() +/*-----------------------------------------------------------------------* + * ivas_HRTF_fastconv_binary_open() * - * Init default HRTF model - --------------------------------------------------------------------*/ + * Allocate HRTF binary handle for FASTCONV renderer + *-----------------------------------------------------------------------*/ -void DefaultBSplineModel( - TDREND_HRFILT_FiltSet_t *HrFiltSet_p, /* o : Loaded HR filter set */ - const int32_t output_Fs /* i : Output sampling rate */ -) +ivas_error ivas_HRTF_fastconv_binary_open( + HRTFS_FASTCONV **hHrtfFastConv ) { - ModelParams_t *model; - ModelParamsITD_t *modelITD; - int16_t i, j; - - HrFiltSet_p->FilterMethod = TDREND_HRFILT_Method_BSplineModel; - model = &( HrFiltSet_p->ModelParams ); - modelITD = &( HrFiltSet_p->ModelParamsITD ); - - /* Set ROM flag for correct deallocation */ - model->modelROM = TRUE; - - /* int16_t parameters */ - model->UseItdModel = 1; - model->SplineDegree = 4; - model->elevDim2 = 20; - model->elevDim3 = 18; - model->AlphaN = 578; - model->num_unique_azim_splines = 1; - model->elevSegSamples = 3; - model->elevBsLen[0] = 4; - model->elevBsLen[1] = 7; - model->elevBsLen[2] = 10; - model->elevBsLen[3] = 7; - model->elevBsStart[0] = 0; - model->elevBsStart[1] = 4; - model->elevBsStart[2] = 11; - model->elevBsStart[3] = 21; - - model->azimDim2 = orange53_rom_azimDim2; - model->azimDim3 = orange53_rom_azimDim3; - model->azim_start_idx = orange53_rom_azim_start_idx; - model->azimSegSamples = orange53_rom_azimSegSamples; - model->azimShapeIdx = orange53_rom_azimShapeIdx; - model->azimShapeSampFactor = orange53_rom_azimShapeSampFactor; - - /* float parameters */ - model->elevKSeq = (const float *) orange53_rom_elevKSeq; - model->elevBsShape = (const float *) orange53_rom_elevBsShape; - - model->azimBsShape = (const float **) count_malloc( model->num_unique_azim_splines * sizeof( float * ) ); - model->azimBsShape[0] = (const float *) orange53_rom_azimBsShape; - model->azimKSeq = (float **) count_malloc( 18 * sizeof( float * ) ); - model->azimKSeq[0] = (float *) count_malloc( 2 * sizeof( float * ) ); - model->azimKSeq[17] = (float *) count_malloc( 2 * sizeof( float * ) ); - model->azimKSeq[0][0] = 0.0f; - model->azimKSeq[17][0] = 0.0f; - model->azimKSeq[0][1] = 360.0f; - model->azimKSeq[17][1] = 360.0f; - - for ( i = 1; i < 17; i++ ) + *hHrtfFastConv = (HRTFS_FASTCONV *) malloc( sizeof( HRTFS_FASTCONV ) ); + if ( *hHrtfFastConv == NULL ) { - model->azimKSeq[i] = (float *) count_malloc( model->azimDim2[i] * sizeof( float * ) ); /* azimDim2[i] = 91, i=2..15 */ - for ( j = 0; j < model->azimDim2[i]; j++ ) - { - model->azimKSeq[i][j] = (float) orange53_rom_azimSegSamples[0] * j; - } + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FASTCONV HRTF tables!" ); } - switch ( output_Fs ) + return IVAS_ERR_OK; +} + + +/*-----------------------------------------------------------------------* + * ivas_HRTF_fastconv_binary_close() + * + * Close HRTF binary handle for FASTCONV renderer + *-----------------------------------------------------------------------*/ + +void ivas_HRTF_fastconv_binary_close( + HRTFS_FASTCONV **hHrtfFastConv ) +{ + if ( hHrtfFastConv == NULL || *hHrtfFastConv == NULL ) { - case 48000: - model->AlphaL = (const float *) orange53_rom_AlphaL48; - model->AlphaR = (const float *) orange53_rom_AlphaR48; - model->EL = (const float *) orange53_rom_EL48; - model->ER = (const float *) orange53_rom_ER48; - model->K = 128; - if ( HrFiltSet_p->ModelParams.UseItdModel ) - { - modelITD->resamp_factor = 1.0f; - } - break; - case 32000: - model->AlphaL = (const float *) orange53_rom_AlphaL32; - model->AlphaR = (const float *) orange53_rom_AlphaR32; - model->EL = (const float *) orange53_rom_EL32; - model->ER = (const float *) orange53_rom_ER32; - model->K = 86; - if ( HrFiltSet_p->ModelParams.UseItdModel ) - { - modelITD->resamp_factor = RESAMPLE_FACTOR_32_48; - } - break; - case 16000: - model->AlphaL = (const float *) orange53_rom_AlphaL16; - model->AlphaR = (const float *) orange53_rom_AlphaR16; - model->EL = (const float *) orange53_rom_EL16; - model->ER = (const float *) orange53_rom_ER16; - model->K = 43; - if ( HrFiltSet_p->ModelParams.UseItdModel ) - { - modelITD->resamp_factor = RESAMPLE_FACTOR_16_48; - } - break; - default: - break; + return; } - modelITD->N = 4; - modelITD->elevDim2 = 20; - modelITD->elevDim3 = 18; - modelITD->azimDim2 = 41; - modelITD->azimDim3 = 41; - modelITD->elevSegSamples = 3; - modelITD->elevBsLen[0] = 4; - modelITD->elevBsLen[1] = 7; - modelITD->elevBsLen[2] = 10; - modelITD->elevBsLen[3] = 7; - modelITD->elevBsStart[0] = 0; - modelITD->elevBsStart[1] = 4; - modelITD->elevBsStart[2] = 11; - modelITD->elevBsStart[3] = 21; - - modelITD->elevKSeq = model->elevKSeq; - - modelITD->azimBsLen[0] = 11; - modelITD->azimBsLen[1] = 21; - modelITD->azimBsLen[2] = 31; - modelITD->azimBsLen[3] = 21; - modelITD->azimBsStart[0] = 0; - modelITD->azimBsStart[1] = 11; - modelITD->azimBsStart[2] = 32; - modelITD->azimBsStart[3] = 63; - - modelITD->azimSegSamples = 10; - - modelITD->azimKSeq = orange53_rom_ITD_azimKSeq; - modelITD->W = (const float *) orange53_rom_ITD_W; - modelITD->azimBsShape = (const float *) orange53_rom_ITD_azimBsShape; - modelITD->elevBsShape = (const float *) orange53_rom_ITD_elevBsShape; - - HRTF_model_precalc( model ); - - HrFiltSet_p->SampleRate = output_Fs; - HrFiltSet_p->FiltLength = HrFiltSet_p->ModelParams.K; - BSplineModelEvalAlloc( &HrFiltSet_p->ModelParams, &HrFiltSet_p->ModelEval ); + free( *hHrtfFastConv ); + *hHrtfFastConv = NULL; return; } /*-----------------------------------------------------------------------* - * ivas_HRTF_binary_open() + * ivas_HRTF_parambin_binary_open() * - * Allocate HRTF binary handle + * Allocate HRTF binary handle for parametric binauralizer *-----------------------------------------------------------------------*/ -ivas_error ivas_HRTF_binary_open( - TDREND_HRFILT_FiltSet_t **hHrtfTD ) +ivas_error ivas_HRTF_parambin_binary_open( + HRTFS_PARAMBIN **hHrtfParambin ) { - /* Allocate HR filter set for headphones configuration */ - *hHrtfTD = (TDREND_HRFILT_FiltSet_t *) count_malloc( sizeof( TDREND_HRFILT_FiltSet_t ) ); - if ( *hHrtfTD == NULL ) + *hHrtfParambin = (HRTFS_PARAMBIN *) malloc( sizeof( HRTFS_PARAMBIN ) ); + if ( *hHrtfParambin == NULL ) { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HRTF binary!" ); + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for parametric binauralizer HRTF tables!" ); } return IVAS_ERR_OK; } -/*-------------------------------------------------------------------* - * ivas_HRTF_binary_close() +/*-----------------------------------------------------------------------* + * ivas_HRTF_parambin_binary_close() * - * Close HRTF binary handle - *-------------------------------------------------------------------*/ + * Close HRTF binary handle for parametric binauralizer + *-----------------------------------------------------------------------*/ -void ivas_HRTF_binary_close( - TDREND_HRFILT_FiltSet_t **hHrtfTD ) +void ivas_HRTF_parambin_binary_close( + HRTFS_PARAMBIN **hHrtfParambin ) { - if ( hHrtfTD == NULL || *hHrtfTD == NULL ) + if ( hHrtfParambin == NULL || *hHrtfParambin == NULL ) { return; } - count_free( *hHrtfTD ); - *hHrtfTD = NULL; + free( *hHrtfParambin ); + *hHrtfParambin = NULL; return; } diff --git a/lib_rend/ivas_lc3plus_common.c b/lib_rend/ivas_lc3plus_common.c index 5839cd7ecf..3b12f78be5 100644 --- a/lib_rend/ivas_lc3plus_common.c +++ b/lib_rend/ivas_lc3plus_common.c @@ -34,14 +34,16 @@ #include "ivas_error.h" #include "lc3plus_codec/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/lc3.h" -ivas_error IVAS_LC3PLUS_LC3plusErrToIvasErr(const LC3PLUS_Error lc3PlusError) +ivas_error IVAS_LC3PLUS_LC3plusErrToIvasErr( const LC3PLUS_Error lc3PlusError ) { switch ( lc3PlusError ) { - case LC3PLUS_OK: return IVAS_ERR_OK; - case LC3PLUS_BITRATE_ERROR: return IVAS_ERR_LC3PLUS_INVALID_BITRATE; + case LC3PLUS_OK: + return IVAS_ERR_OK; + case LC3PLUS_BITRATE_ERROR: + return IVAS_ERR_LC3PLUS_INVALID_BITRATE; default: - return IVAS_ERR_INTERNAL; - + break; } + return IVAS_ERR_INTERNAL; } diff --git a/lib_rend/ivas_lc3plus_common.h b/lib_rend/ivas_lc3plus_common.h index bcde2e4684..01971679d2 100644 --- a/lib_rend/ivas_lc3plus_common.h +++ b/lib_rend/ivas_lc3plus_common.h @@ -50,4 +50,4 @@ typedef struct LC3PLUS_CONFIG } LC3PLUS_CONFIG; /*! utility function to convert LC3PLUS_Errors to the suitable ivas_error */ -ivas_error IVAS_LC3PLUS_LC3plusErrToIvasErr(const LC3PLUS_Error lc3PlusError); +ivas_error IVAS_LC3PLUS_LC3plusErrToIvasErr( const LC3PLUS_Error lc3PlusError ); diff --git a/lib_rend/ivas_lc3plus_dec.c b/lib_rend/ivas_lc3plus_dec.c index cc91a32e00..30a7941242 100644 --- a/lib_rend/ivas_lc3plus_dec.c +++ b/lib_rend/ivas_lc3plus_dec.c @@ -31,37 +31,93 @@ *******************************************************************************************************/ #include "prot.h" +#include "ivas_prot.h" #include "ivas_lc3plus_dec.h" #include "ivas_lc3plus_common.h" #include "lc3plus_codec/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/lc3.h" #include "ivas_error_utils.h" +#include "wmc_auto.h" ivas_error IVAS_LC3PLUS_DEC_Open( const LC3PLUS_CONFIG config, /* i: decoder configuration */ +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING + const int16_t enableCaching, /* i: if set to 0, the decoder will NOT use cached frame to flush algorithmic delay after skipped frames */ +#endif IVAS_LC3PLUS_DEC_HANDLE *handle /* o: decoder handle */ ) { LC3PLUS_Error err; int32_t decoder_size; + int16_t lc3plusFrameIdx; + int16_t numLC3plusFramesPerIvasFrame; + int16_t i; - *handle = count_malloc( sizeof( struct IVAS_LC3PLUS_DEC_HANDLE ) ); + *handle = malloc( sizeof( struct IVAS_LC3PLUS_DEC_HANDLE ) ); if ( NULL == handle ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LC3plus wrapper handle\n" ); } + if( 0 == config.lc3plus_frame_duration_us ) + { + return IVAS_ERROR( IVAS_ERR_WRONG_PARAMS, "Invalid lc3plus_frame_duration_us (0)\n" ); + } +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING + (*handle)->cachingEnabled = enableCaching; +#endif + numLC3plusFramesPerIvasFrame = config.ivas_frame_duration_us / config.lc3plus_frame_duration_us; + +#ifdef LC3PLUS_DEC_COLLECT_STATS + ( *handle )->stats.action_histogram[DEC_ACTION_DECODE_AND_DROP] = 0; + ( *handle )->stats.action_histogram[DEC_ACTION_DECODE_AND_USE] = 0; + ( *handle )->stats.action_histogram[DEC_ACTION_SKIP] = 0; + ( *handle )->stats.action_histogram[DEC_ACTION_CACHE] = 0; + ( *handle )->stats.num_cached_frames_decoded_and_dropped = 0; +#endif ( *handle )->num_decs = 0; ( *handle )->pcm_conversion_buffer = NULL; - ( *handle )->handles = count_calloc( config.channels, sizeof( IVAS_LC3PLUS_DEC_HANDLE ) ); - if ( NULL == ( *handle )->handles ) + ( *handle )->handles = NULL; + ( *handle )->selective_decoding_states = NULL; + ( *handle )->bitstream_caches = NULL; + ( *handle )->handles = malloc( config.channels * sizeof( IVAS_LC3PLUS_DEC_HANDLE ) ); + ( *handle )->selective_decoding_states = malloc( config.channels * sizeof( IVAS_LC3PLUS_DEC_SELECTIVE_DECODING_STATE * ) ); + if ( NULL == ( *handle )->handles || NULL == ( *handle )->selective_decoding_states ) { IVAS_LC3PLUS_DEC_Close( handle ); return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LC3plus wrapper handle\n" ); } + for ( i = 0; i < config.channels; ++i ) + { + ( *handle )->handles[i] = NULL; + ( *handle )->selective_decoding_states[i] = NULL; + } +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING + if(enableCaching) + { +#endif + ( *handle )->bitstream_caches = malloc( config.channels * sizeof( IVAS_LC3PLUS_DEC_BITSTREAM_CACHE* ) ); + if ( NULL == ( *handle )->bitstream_caches ) + { + IVAS_LC3PLUS_DEC_Close( handle ); + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LC3plus wrapper handle\n" ); + } + for ( i = 0; i < config.channels; ++i ) + { + ( *handle )->bitstream_caches[i] = NULL; + } +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING + } +#endif ( *handle )->num_decs = config.channels; for ( int32_t iCh = 0; iCh < config.channels; iCh++ ) { + ( *handle )->selective_decoding_states[iCh] = NULL; + if(NULL != ( *handle )->bitstream_caches) + { + ( *handle )->bitstream_caches[iCh] = NULL; + } + /* allocate and configure LC3plus decoder */ decoder_size = lc3plus_dec_get_size( config.samplerate, 1 ); if ( 0 == decoder_size ) { @@ -69,7 +125,7 @@ ivas_error IVAS_LC3PLUS_DEC_Open( return IVAS_ERROR( IVAS_ERR_INTERNAL, "lc3plus_dec_get_size failed\n" ); } - ( *handle )->handles[iCh] = count_malloc( decoder_size ); + ( *handle )->handles[iCh] = malloc( decoder_size ); if ( NULL == ( *handle )->handles[iCh] ) { IVAS_LC3PLUS_DEC_Close( handle ); @@ -80,24 +136,65 @@ ivas_error IVAS_LC3PLUS_DEC_Open( if ( LC3PLUS_OK != err ) { IVAS_LC3PLUS_DEC_Close( handle ); - return IVAS_ERROR( IVAS_LC3PLUS_LC3plusErrToIvasErr(err), "lc3plus_dec_init failed\n" ); + return IVAS_ERROR( IVAS_LC3PLUS_LC3plusErrToIvasErr( err ), "lc3plus_dec_init failed\n" ); } err = lc3plus_dec_set_frame_dms( ( *handle )->handles[iCh], config.lc3plus_frame_duration_us / 100 ); if ( LC3PLUS_OK != err ) { IVAS_LC3PLUS_DEC_Close( handle ); - return IVAS_ERROR( IVAS_LC3PLUS_LC3plusErrToIvasErr(err), "lc3plus_dec_set_frame_dms failed\n" ); + return IVAS_ERROR( IVAS_LC3PLUS_LC3plusErrToIvasErr( err ), "lc3plus_dec_set_frame_dms failed\n" ); } - } + /* allocate and configure per LC3plus decoder skip state */ + ( *handle )->selective_decoding_states[iCh] = malloc( sizeof( IVAS_LC3PLUS_DEC_SELECTIVE_DECODING_STATE ) ); + if ( NULL == ( *handle )->selective_decoding_states[iCh] ) + { + IVAS_LC3PLUS_DEC_Close( handle ); + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LC3plus decoder\n" ); + } + ( *handle )->selective_decoding_states[iCh]->frame_actions = malloc( numLC3plusFramesPerIvasFrame*sizeof(SelectiveDecAction) ); + if ( NULL == ( *handle )->selective_decoding_states[iCh]->frame_actions ) + { + IVAS_LC3PLUS_DEC_Close( handle ); + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LC3plus decoder\n" ); + } + ( *handle )->selective_decoding_states[iCh]->has_skipped_a_frame = 0; + ( *handle )->selective_decoding_states[iCh]->shall_decode_cached_frame = 0; + for(lc3plusFrameIdx = 0; lc3plusFrameIdx < numLC3plusFramesPerIvasFrame; lc3plusFrameIdx++) + { + ( *handle )->selective_decoding_states[iCh]->frame_actions[lc3plusFrameIdx] = DEC_ACTION_DECODE_AND_USE; + } +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING + if(enableCaching) + { +#endif + /* allocate and configure per LC3plus decoder bitstream cache */ + ( *handle )->bitstream_caches[iCh] = malloc( sizeof(IVAS_LC3PLUS_DEC_BITSTREAM_CACHE) ); + if ( NULL == ( *handle )->bitstream_caches[iCh] ) + { + IVAS_LC3PLUS_DEC_Close( handle ); + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LC3plus decoder\n" ); + } + ( *handle )->bitstream_caches[iCh]->bitstream_cache_capacity = 400 /*LC3plus max non-HR octet count*/ * numLC3plusFramesPerIvasFrame; + ( *handle )->bitstream_caches[iCh]->bitstream_cache = malloc(( *handle )->bitstream_caches[iCh]->bitstream_cache_capacity); + if ( NULL == ( *handle )->bitstream_caches[iCh]->bitstream_cache ) + { + IVAS_LC3PLUS_DEC_Close( handle ); + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LC3plus decoder\n" ); + } + ( *handle )->bitstream_caches[iCh]->bitstream_cache_size = 0; +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING + } +#endif + } ( *handle )->config = config; if ( config.ivas_frame_duration_us < config.lc3plus_frame_duration_us || config.ivas_frame_duration_us % config.lc3plus_frame_duration_us != 0 ) { IVAS_LC3PLUS_DEC_Close( handle ); return IVAS_ERROR( IVAS_ERR_NOT_IMPLEMENTED, "Current pcm_conversion_buffer sizing requires that lc3plus uses a shorter or equal frame duration than ivas\n" ); } - ( *handle )->pcm_conversion_buffer = count_malloc( sizeof( int16_t ) * config.samplerate * config.lc3plus_frame_duration_us / 1000000 ); + ( *handle )->pcm_conversion_buffer = malloc( sizeof( int16_t ) * config.samplerate * config.lc3plus_frame_duration_us / 1000000 ); if ( NULL == ( *handle )->pcm_conversion_buffer ) { IVAS_LC3PLUS_DEC_Close( handle ); @@ -106,6 +203,153 @@ ivas_error IVAS_LC3PLUS_DEC_Open( return IVAS_ERR_OK; } +ivas_error IVAS_LC3PLUS_DEC_AllocateSubframeDecodingMatrix(int16_t ***subframeChannelMatrix, const uint32_t num_decs) +{ + *subframeChannelMatrix = malloc(MAX_PARAM_SPATIAL_SUBFRAMES * sizeof(int16_t *)); + if(NULL == *subframeChannelMatrix) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "subframeChannelMatrix allocation failed\n" ); + } + for (int i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++) + { + (*subframeChannelMatrix)[i] = NULL; + } + for (int i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++) + { + (*subframeChannelMatrix)[i] = malloc(num_decs * sizeof(int16_t)); + if(NULL == (*subframeChannelMatrix)[i]) + { + IVAS_LC3PLUS_DEC_FreeSubframeDecodingMatrix(*subframeChannelMatrix); + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "subframeChannelMatrix allocation failed\n" ); + } + } + return IVAS_ERR_OK; +} + +void IVAS_LC3PLUS_DEC_FreeSubframeDecodingMatrix(int16_t **subframeChannelMatrix) +{ + for (int i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++) + { + free(subframeChannelMatrix[i]); + } + free(subframeChannelMatrix); +} + +ivas_error IVAS_LC3PLUS_DEC_SetSelectiveDecodingMatrix( + IVAS_LC3PLUS_DEC_HANDLE handle, /* i: decoder handle */ + int16_t *subframeChannelMatrix[MAX_PARAM_SPATIAL_SUBFRAMES] +) +{ + int16_t numIvasSubFramesPerLC3frame; + uint32_t decIdx; + int16_t ivasSubframeIdx; + int16_t effectiveIvasSubframeDuration; + int16_t actual_num_spatial_subframes; + if ( NULL == handle ) + { + return IVAS_ERROR( IVAS_ERR_UNEXPECTED_NULL_POINTER, "IVAS_LC3PLUS_DEC_HANDLE is NULL\n" ); + } + if ( NULL == subframeChannelMatrix ) + { + return IVAS_ERROR( IVAS_ERR_UNEXPECTED_NULL_POINTER, "subframeChannelMatrix is NULL\n" ); + } + if(handle->config.lc3plus_frame_duration_us == 0 || handle->config.ivas_frame_duration_us % handle->config.lc3plus_frame_duration_us != 0 ) + { + return IVAS_ERROR( IVAS_ERR_WRONG_PARAMS, "invalid ivas_frame_duration_us/lc3plus_frame_duration_us values\n" ); + } + + effectiveIvasSubframeDuration = handle->config.ivas_frame_duration_us == 20000 ? handle->config.ivas_frame_duration_us/MAX_PARAM_SPATIAL_SUBFRAMES : handle->config.ivas_frame_duration_us; + numIvasSubFramesPerLC3frame = handle->config.lc3plus_frame_duration_us/effectiveIvasSubframeDuration; + actual_num_spatial_subframes = handle->config.ivas_frame_duration_us / effectiveIvasSubframeDuration; + // 0.5(0) = 10ms lc3plus, 5ms subframe + if(numIvasSubFramesPerLC3frame != 1) + { + return IVAS_ERROR( IVAS_ERR_NOT_IMPLEMENTED, "Selective decoding is only implemented for aligned IVAS-Subframes & LC3plus \n" ); + } + + + /* map subframeChannelMatrix to lc3plus skip states */ + /* 1st pass: Flag the required frames */ + for(decIdx = 0; decIdx < handle->num_decs; decIdx++) + { + for( ivasSubframeIdx = 0; ivasSubframeIdx < actual_num_spatial_subframes; ivasSubframeIdx++ ) + { + if( 1 == subframeChannelMatrix[ivasSubframeIdx][decIdx] ) + { + /* subframe needed by the user, definitely decode */ + handle->selective_decoding_states[decIdx]->frame_actions[ivasSubframeIdx] = DEC_ACTION_DECODE_AND_USE; + } + else + { + + /* subframe not needed by the user, but might be required to re-initialize a decoder after inactivity */ + if( +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING + handle->cachingEnabled && +#endif + (ivasSubframeIdx != actual_num_spatial_subframes - 1) && 1 == subframeChannelMatrix[ivasSubframeIdx + 1][decIdx] ) + { + /* ... but if the following subframe is required, it needs to be decoded and dropped */ + handle->selective_decoding_states[decIdx]->frame_actions[ivasSubframeIdx] = DEC_ACTION_DECODE_AND_DROP; + } + else + { + handle->selective_decoding_states[decIdx]->frame_actions[ivasSubframeIdx] = DEC_ACTION_SKIP; + } + } + } + } +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING + if(handle->cachingEnabled) + { +#endif + /* if a decoder was paused before, it needs to either: + * - Decode the cached frame (if available) and the first required frame OR + * - Decode the previous LC3plus subframe, even if it isn't needed by the user */ + for(decIdx = 0; decIdx < handle->num_decs; decIdx++) + { + if( handle->selective_decoding_states[decIdx]->has_skipped_a_frame ) + { + /* find the first frame required by the user */ + for( ivasSubframeIdx = 0; ivasSubframeIdx < actual_num_spatial_subframes; ivasSubframeIdx++ ) + { + if( DEC_ACTION_DECODE_AND_USE == handle->selective_decoding_states[decIdx]->frame_actions[ivasSubframeIdx] ) + { + /* The first required frame is the first subframe. To flush the decoder, the cached frame must be decoded and dropped */ + if(0 == ivasSubframeIdx) + { + handle->selective_decoding_states[decIdx]->shall_decode_cached_frame = 1; + break; + } + /* The first required frame is not the first frame, so the cache is useless. Instead we decode & drop the previous frame*/ + else + { + handle->selective_decoding_states[decIdx]->frame_actions[ivasSubframeIdx - 1] = DEC_ACTION_DECODE_AND_DROP; + break; + } + } + } + } + } + + /* if a dec gets paused & caching is activated we need to flag the last useful LC3plus frame for caching */ + for(decIdx = 0; decIdx < handle->num_decs; decIdx++) + { + for( ivasSubframeIdx = 0; ivasSubframeIdx < actual_num_spatial_subframes; ivasSubframeIdx++ ) + { + if( handle->selective_decoding_states[decIdx]->frame_actions[ivasSubframeIdx] == DEC_ACTION_SKIP + && handle->selective_decoding_states[decIdx]->frame_actions[actual_num_spatial_subframes - 1] != DEC_ACTION_DECODE_AND_USE ) + { + handle->selective_decoding_states[decIdx]->frame_actions[actual_num_spatial_subframes - 1] = DEC_ACTION_CACHE; + } + } + } +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING + } +#endif + return IVAS_ERR_OK; +} + ivas_error IVAS_LC3PLUS_DEC_GetDelay( IVAS_LC3PLUS_DEC_HANDLE handle, /* i: decoder handle */ int32_t *delayInSamples /* o: decoder delay in number of samples per channel */ @@ -149,23 +393,66 @@ void IVAS_LC3PLUS_DEC_Close( { return; } +#ifdef LC3PLUS_DEC_COLLECT_STATS + printLC3plusDecStats( &(*handle)->stats ); +#endif for ( uint32_t iDec = 0; iDec < ( *handle )->num_decs; iDec++ ) { - if ( NULL != ( *handle )->handles[iDec] ) + if ( NULL != ( *handle )->handles && NULL != ( *handle )->handles[iDec] ) { lc3plus_free_decoder_structs( ( *handle )->handles[iDec] ); - count_free( ( *handle )->handles[iDec] ); + free( ( *handle )->handles[iDec] ); + } + + if ( NULL != ( *handle )->selective_decoding_states && NULL != ( *handle )->selective_decoding_states[iDec] ) + { + free( ( *handle )->selective_decoding_states[iDec]->frame_actions ); + free( ( *handle )->selective_decoding_states[iDec] ); + } + + if ( NULL != ( *handle )->bitstream_caches && NULL != ( *handle )->bitstream_caches[iDec] ) + { + free( ( *handle )->bitstream_caches[iDec]->bitstream_cache ); + free( ( *handle )->bitstream_caches[iDec] ); } } if ( NULL != ( *handle )->pcm_conversion_buffer ) { - count_free( ( *handle )->pcm_conversion_buffer ); + free( ( *handle )->pcm_conversion_buffer ); + } + free( ( *handle )->handles ); + if( NULL != ( *handle )->bitstream_caches ) + { + free( ( *handle )->bitstream_caches ); } - count_free( ( *handle )->handles ); - count_free( *handle ); + free( ( *handle )->selective_decoding_states ); + free( *handle ); *handle = NULL; } +static ivas_error decode_or_conceal_one_lc3plus_frame( + LC3PLUS_Dec* dec, + uint8_t* bitstream_in, + const int32_t bitstream_in_length, + int16_t **pcm_out_buffer, + const int32_t badFrameIndicator) +{ + LC3PLUS_Error err; + push_wmops( "lc3plus_dec16" ); + err = lc3plus_dec16( dec, bitstream_in, bitstream_in_length, pcm_out_buffer, NULL, badFrameIndicator ); + pop_wmops(); + if ( err == LC3PLUS_DECODE_ERROR && 1 == badFrameIndicator ) + { + /* LC3PLUS_DECODE_ERROR && badFrameIndicator means that the decoder has successfully concealed, which is actually OK. */ + err = LC3PLUS_OK; + } + if ( err != LC3PLUS_OK ) + { + return IVAS_ERROR( IVAS_LC3PLUS_LC3plusErrToIvasErr(err), "lc3plus_dec16 failed\n" ); + } + return IVAS_ERR_OK; +} + static ivas_error IVAS_LC3PLUS_DEC_Decode_or_Conceal_internal( IVAS_LC3PLUS_DEC_HANDLE handle, /* i: decoder configuration */ uint8_t *bitstream_in, /* i: pointer to input bitstream */ @@ -174,11 +461,13 @@ static ivas_error IVAS_LC3PLUS_DEC_Decode_or_Conceal_internal( float **pcm_out /* o: decoded samples */ ) { - int32_t ivasSampleIndex; + uint32_t iDec; + int32_t iLc3plusFrame; int32_t lc3framesPerIvasFrame; + int32_t ivasSampleIndex; int16_t numSamplesPerLC3plusChannel; int32_t bitstreamOffsetPerCoder; - LC3PLUS_Error err; + ivas_error err; uint8_t *bitstream_in_iter = bitstream_in; if ( NULL == handle ) @@ -210,27 +499,98 @@ static ivas_error IVAS_LC3PLUS_DEC_Decode_or_Conceal_internal( numSamplesPerLC3plusChannel = handle->config.samplerate / ( 1000000 / handle->config.ivas_frame_duration_us ) / lc3framesPerIvasFrame; bitstreamOffsetPerCoder = bitstream_in_size / handle->num_decs / lc3framesPerIvasFrame; - for ( uint32_t iDec = 0; iDec < handle->num_decs; iDec++ ) + for ( iDec = 0; iDec < handle->num_decs; iDec++ ) { - for ( int32_t iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) { - err = lc3plus_dec16( handle->handles[iDec], bitstream_in_iter, bitstreamOffsetPerCoder, &handle->pcm_conversion_buffer, NULL, badFrameIndicator ); - if ( err == LC3PLUS_DECODE_ERROR && 1 == badFrameIndicator ) + if( handle->selective_decoding_states[iDec]->shall_decode_cached_frame) { - /* LC3PLUS_DECODE_ERROR && badFrameIndicator means that the decoder has successfully concealed, which is actually OK. */ - err = LC3PLUS_OK; + if(0 == handle->bitstream_caches[iDec]->bitstream_cache_size) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "LC3plus cache is empty\n" ); + } + err = decode_or_conceal_one_lc3plus_frame( + handle->handles[iDec], + handle->bitstream_caches[iDec]->bitstream_cache, + handle->bitstream_caches[iDec]->bitstream_cache_size, + &handle->pcm_conversion_buffer, + badFrameIndicator ); + if(err != IVAS_ERR_OK) + { + return IVAS_ERROR( err, "lc3plus decoding failed\n" ); + } + handle->selective_decoding_states[iDec]->shall_decode_cached_frame = 0; + handle->selective_decoding_states[iDec]->has_skipped_a_frame = 0; +#ifdef LC3PLUS_DEC_COLLECT_STATS + handle->stats.num_cached_frames_decoded_and_dropped++; +#endif } - if ( err != LC3PLUS_OK ) + /* reset cache if caching is enabled - it has either been decoded or is not needed */ + if(NULL != handle->bitstream_caches) { - return IVAS_ERROR( IVAS_LC3PLUS_LC3plusErrToIvasErr(err), "lc3plus_dec16 failed\n" ); + handle->bitstream_caches[iDec]->bitstream_cache_size = 0; } - for ( int32_t iSampleInt16 = 0; iSampleInt16 < numSamplesPerLC3plusChannel; iSampleInt16++ ) +#ifdef LC3PLUS_DEC_COLLECT_STATS + handle->stats.action_histogram[handle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame]]++; +#endif + switch ( handle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] ) { - ivasSampleIndex = iSampleInt16 + iLc3plusFrame * numSamplesPerLC3plusChannel; - pcm_out[iDec][ivasSampleIndex] = (float) handle->pcm_conversion_buffer[iSampleInt16]; + case DEC_ACTION_DECODE_AND_DROP: + { + err = decode_or_conceal_one_lc3plus_frame( handle->handles[iDec], bitstream_in_iter, bitstreamOffsetPerCoder, &handle->pcm_conversion_buffer, badFrameIndicator ); + if(err != IVAS_ERR_OK) + { + return IVAS_ERROR( err, "lc3plus decoding failed\n" ); + } + handle->selective_decoding_states[iDec]->has_skipped_a_frame = 0; + break; + } + case DEC_ACTION_DECODE_AND_USE: + { + err = decode_or_conceal_one_lc3plus_frame( handle->handles[iDec], bitstream_in_iter, bitstreamOffsetPerCoder, &handle->pcm_conversion_buffer, badFrameIndicator ); + if(err != IVAS_ERR_OK) + { + return IVAS_ERROR( err, "lc3plus decoding failed\n" ); + } + + for ( int32_t iSampleInt16 = 0; iSampleInt16 < numSamplesPerLC3plusChannel; iSampleInt16++ ) + { + ivasSampleIndex = iSampleInt16 + iLc3plusFrame * numSamplesPerLC3plusChannel; + pcm_out[iDec][ivasSampleIndex] = (float) handle->pcm_conversion_buffer[iSampleInt16]; + } + handle->selective_decoding_states[iDec]->has_skipped_a_frame = 0; + break; + } + case DEC_ACTION_SKIP: + { + /* log that this instance has skipped a frame and must decode twice once reactivated */ + handle->selective_decoding_states[iDec]->has_skipped_a_frame = 1; + break; + } + case DEC_ACTION_CACHE: + { + if( handle->bitstream_caches[iDec]->bitstream_cache_capacity < bitstreamOffsetPerCoder ) + { + return IVAS_ERROR( IVAS_ERR_INVALID_BUFFER_SIZE, "bitstream_cache_capacity is too low for LC3plus frame size\n" ); + } + /* store bit rate of cached frame */ + mvc2c(bitstream_in_iter, handle->bitstream_caches[iDec]->bitstream_cache, bitstreamOffsetPerCoder); + handle->bitstream_caches[iDec]->bitstream_cache_size = bitstreamOffsetPerCoder; + /* log that this instance has skipped a frame and must decode twice once reactivated */ + handle->selective_decoding_states[iDec]->has_skipped_a_frame = 1; + break; + } + case DEC_ACTION_NUM_ENUMS: + default: + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "invalid LC3plus decoder state\n" ); } bitstream_in_iter += bitstreamOffsetPerCoder; } + /* reset skipping state, must be set by the user before each decode call*/ + for(iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++) + { + handle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] = DEC_ACTION_DECODE_AND_USE; + } } return IVAS_ERR_OK; } @@ -242,6 +602,8 @@ ivas_error IVAS_LC3PLUS_DEC_Decode( float **pcm_out /* o: decoded samples */ ) { + int32_t badFrameIndicator; + if ( NULL == handle ) { return IVAS_ERROR( IVAS_ERR_UNEXPECTED_NULL_POINTER, "LC3PLUS_Dec_Wrap_Handle is NULL\n" ); @@ -254,7 +616,7 @@ ivas_error IVAS_LC3PLUS_DEC_Decode( { return IVAS_ERROR( IVAS_ERR_UNEXPECTED_NULL_POINTER, "pcm_out is NULL\n" ); } - int32_t badFrameIndicator = 0; + badFrameIndicator = 0; return IVAS_LC3PLUS_DEC_Decode_or_Conceal_internal( handle, bitstream_in, bitstream_in_size, badFrameIndicator, pcm_out ); } @@ -263,6 +625,9 @@ ivas_error IVAS_LC3PLUS_DEC_Conceal( float **pcm_out /* o: concealed samples */ ) { + uint8_t bitstream_in[LC3PLUS_MAX_BYTES]; + int32_t badFrameIndicator; + if ( NULL == handle ) { return IVAS_ERROR( IVAS_ERR_UNEXPECTED_NULL_POINTER, "LC3PLUS_Dec_Wrap_Handle is NULL\n" ); @@ -271,8 +636,43 @@ ivas_error IVAS_LC3PLUS_DEC_Conceal( { return IVAS_ERROR( IVAS_ERR_UNEXPECTED_NULL_POINTER, "pcm_out is NULL\n" ); } - /* LC3plus API requires a valid bitstream pointer, even when triggering concealment */ - uint8_t bitstream_in[LC3PLUS_MAX_BYTES]; - int32_t badFrameIndicator = 1; + /* LC3plus API requires a non-NULL bitstream pointer, even when triggering concealment */ + badFrameIndicator = 1; return IVAS_LC3PLUS_DEC_Decode_or_Conceal_internal( handle, bitstream_in, 0, badFrameIndicator, pcm_out ); } + + +#ifdef LC3PLUS_DEC_COLLECT_STATS +void printLC3plusDecStats(const IVAS_LC3PLUS_DEC_COLLECT_STATS *stats) +{ + int32_t sum_pushed_frames = 0; + int32_t sum_decoded_and_dropped_frames, sum_skipped_frames; + + sum_pushed_frames = stats->action_histogram[DEC_ACTION_DECODE_AND_USE] + + stats->action_histogram[DEC_ACTION_SKIP] + + stats->action_histogram[DEC_ACTION_CACHE]; + + sum_decoded_and_dropped_frames = + stats->action_histogram[DEC_ACTION_DECODE_AND_DROP] + + stats->num_cached_frames_decoded_and_dropped; + + sum_skipped_frames = stats->action_histogram[DEC_ACTION_SKIP] + stats->action_histogram[DEC_ACTION_CACHE]; + + if( sum_pushed_frames == 0) + { + printf( "\n Dec didn't run"); + return; + } + + printf( "\nsum_pushed_frames: %i\n" , sum_pushed_frames ); + printf( " DECODE_AND_USE count: %i \n" , stats->action_histogram[DEC_ACTION_DECODE_AND_USE]); + printf( " SKIP count: %i\n" , stats->action_histogram[DEC_ACTION_SKIP]); + printf( " CACHE count: %i\n" , stats->action_histogram[DEC_ACTION_CACHE]); + printf( "Decoded-and-Dropped:\n" ); + printf( " DECODE_AND_DROP count: %i \n" , stats->action_histogram[DEC_ACTION_DECODE_AND_DROP]); + printf( " DEC_CACHE count: %i\n" , stats->num_cached_frames_decoded_and_dropped); + printf( " perc of req : %f\n" , 100.f*(float)sum_decoded_and_dropped_frames/ sum_pushed_frames ); + printf( "Workload saved: \n"); + printf( " Skipped perc. of req %f\n", 100.f*(float)sum_skipped_frames/ sum_pushed_frames ); +} +#endif diff --git a/lib_rend/ivas_lc3plus_dec.h b/lib_rend/ivas_lc3plus_dec.h index b62475ea6c..45bbef86a1 100644 --- a/lib_rend/ivas_lc3plus_dec.h +++ b/lib_rend/ivas_lc3plus_dec.h @@ -36,18 +36,73 @@ #include "lc3plus_codec/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/lc3.h" #include "ivas_error.h" #include "ivas_lc3plus_common.h" +#include "ivas_cnst.h" + +#ifdef DEBUGGING +/* if defined, collects runtime stats and prints them in the DTOR */ +// #define LC3PLUS_DEC_COLLECT_STATS +/* if defined, caching can be disabled, otherwise it's always active */ +// #define LC3PLUS_DEC_ALLOW_DISABLE_CACHING +#endif + +typedef enum +{ + DEC_ACTION_DECODE_AND_DROP = 0, + DEC_ACTION_DECODE_AND_USE, + DEC_ACTION_SKIP, + DEC_ACTION_CACHE, + DEC_ACTION_NUM_ENUMS +} SelectiveDecAction; + +#ifdef LC3PLUS_DEC_COLLECT_STATS +typedef struct IVAS_LC3PLUS_DEC_COLLECT_STATS +{ + int32_t action_histogram[DEC_ACTION_NUM_ENUMS]; + int32_t num_cached_frames_decoded_and_dropped; +} IVAS_LC3PLUS_DEC_COLLECT_STATS; + +void printLC3plusDecStats(const IVAS_LC3PLUS_DEC_COLLECT_STATS *stats); +#endif + +typedef struct IVAS_LC3PLUS_DEC_SELECTIVE_DECODING_STATE +{ + /*! indicates that the decoder has skipped one or more frames. This means it must decode two frames to flush algorithmic delay when re-activated */ + int16_t has_skipped_a_frame; + /*! if set to 1, decoder will skip decoding for the next frame */ + SelectiveDecAction *frame_actions; + /*! if set to 1, decoder will decode the cache before decoding any of current frames */ + int16_t shall_decode_cached_frame; +} IVAS_LC3PLUS_DEC_SELECTIVE_DECODING_STATE; + +typedef struct IVAS_LC3PLUS_DEC_BITSTREAM_CACHE +{ + uint8_t* bitstream_cache; + int32_t bitstream_cache_capacity; + int32_t bitstream_cache_size; +} IVAS_LC3PLUS_DEC_BITSTREAM_CACHE; /* decoder wrapper */ typedef struct IVAS_LC3PLUS_DEC_HANDLE { LC3PLUS_Dec **handles; + IVAS_LC3PLUS_DEC_SELECTIVE_DECODING_STATE **selective_decoding_states; + IVAS_LC3PLUS_DEC_BITSTREAM_CACHE **bitstream_caches; uint32_t num_decs; int16_t *pcm_conversion_buffer; LC3PLUS_CONFIG config; +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING + int16_t cachingEnabled; +#endif +#ifdef LC3PLUS_DEC_COLLECT_STATS + IVAS_LC3PLUS_DEC_COLLECT_STATS stats; +#endif } * IVAS_LC3PLUS_DEC_HANDLE; ivas_error IVAS_LC3PLUS_DEC_Open( const LC3PLUS_CONFIG config, /* i: decoder configuration */ +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING + const int16_t enableCaching, /* i: if set to 0, the decoder will NOT use cached frame to flush algorithmic delay after skipped frames */ +#endif IVAS_LC3PLUS_DEC_HANDLE *handle /* o: decoder handle */ ); @@ -60,6 +115,12 @@ void IVAS_LC3PLUS_DEC_Close( IVAS_LC3PLUS_DEC_HANDLE *handle /* i/o: pointer to decoder handle */ ); +/*! Sets a matrix[MAX_PARAM_SPATIAL_SUBFRAMES][numLC3plusDecoders] where all require subframes must be flagged with 1, frames that are not required with 0 */ +ivas_error IVAS_LC3PLUS_DEC_SetSelectiveDecodingMatrix( + IVAS_LC3PLUS_DEC_HANDLE handle, /* i: decoder handle */ + int16_t *subframeChannelMatrix[MAX_PARAM_SPATIAL_SUBFRAMES] /* i: */ +); + ivas_error IVAS_LC3PLUS_DEC_Decode( IVAS_LC3PLUS_DEC_HANDLE handle, /* i: decoder handle */ uint8_t *bitstream_in, /* i: pointer to input bitstream */ @@ -71,3 +132,7 @@ ivas_error IVAS_LC3PLUS_DEC_Conceal( IVAS_LC3PLUS_DEC_HANDLE handle, /* i: decoder handle */ float **pcm_out /* o: concealed samples */ ); + +ivas_error IVAS_LC3PLUS_DEC_AllocateSubframeDecodingMatrix(int16_t ***subframeChannelMatrix, uint32_t num_decs); + +void IVAS_LC3PLUS_DEC_FreeSubframeDecodingMatrix(int16_t **subframeChannelMatrix); diff --git a/lib_rend/ivas_lc3plus_enc.c b/lib_rend/ivas_lc3plus_enc.c index b016330a9c..0cea05bba5 100644 --- a/lib_rend/ivas_lc3plus_enc.c +++ b/lib_rend/ivas_lc3plus_enc.c @@ -35,6 +35,7 @@ #include "lc3plus_codec/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/lc3.h" #include "ivas_error_utils.h" #include "prot.h" +#include "wmc_auto.h" ivas_error IVAS_LC3PLUS_ENC_Open( const LC3PLUS_CONFIG config, /* i: encoder configuration */ @@ -46,12 +47,19 @@ ivas_error IVAS_LC3PLUS_ENC_Open( int32_t encoder_size; LC3PLUS_Error err; int32_t lfeChans[1] = { 0 }; + int16_t i; if ( 0U == config.channels ) { return IVAS_ERROR( IVAS_ERR_INTERNAL, "Invalid number of channels\n" ); } bitsPerSecondPerChannel = bitsPerSecond / config.channels; +#ifdef SPLIT_REND_LC3PLUS_HBR_DBG + if ( bitsPerSecond == (uint32_t) -1 ) + { + bitsPerSecondPerChannel = SPLIT_REND_LC3PLUS_HBR_DBG; + } +#endif encoder_size = lc3plus_enc_get_size( config.samplerate, 1 ); if ( 0 == encoder_size ) @@ -59,7 +67,7 @@ ivas_error IVAS_LC3PLUS_ENC_Open( return IVAS_ERROR( IVAS_ERR_INTERNAL, "lc3plus_enc_get_size failed\n" ); } - *handle = count_malloc( sizeof( struct IVAS_LC3PLUS_ENC_HANDLE ) ); + *handle = malloc( sizeof( struct IVAS_LC3PLUS_ENC_HANDLE ) ); if ( NULL == handle ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LC3plus wrapper handle\n" ); @@ -67,17 +75,21 @@ ivas_error IVAS_LC3PLUS_ENC_Open( ( *handle )->pcm_conversion_buffer = NULL; ( *handle )->num_encs = 0; - ( *handle )->handles = count_calloc( config.channels, sizeof( IVAS_LC3PLUS_ENC_HANDLE ) ); + ( *handle )->handles = malloc( config.channels * sizeof( IVAS_LC3PLUS_ENC_HANDLE ) ); if ( NULL == ( *handle )->handles ) { IVAS_LC3PLUS_ENC_Close( handle ); return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LC3plus wrapper handle\n" ); } + for ( i = 0; i < config.channels; ++i ) + { + ( *handle )->handles[i] = NULL; + } ( *handle )->num_encs = config.channels; for ( int32_t iCh = 0; iCh < config.channels; iCh++ ) { - ( *handle )->handles[iCh] = count_malloc( encoder_size ); + ( *handle )->handles[iCh] = malloc( encoder_size ); if ( NULL == ( *handle )->handles[iCh] ) { IVAS_LC3PLUS_ENC_Close( handle ); @@ -88,21 +100,21 @@ ivas_error IVAS_LC3PLUS_ENC_Open( if ( err != LC3PLUS_OK ) { IVAS_LC3PLUS_ENC_Close( handle ); - return IVAS_ERROR( IVAS_LC3PLUS_LC3plusErrToIvasErr(err), "lc3plus_enc_init failed\n" ); + return IVAS_ERROR( IVAS_LC3PLUS_LC3plusErrToIvasErr( err ), "lc3plus_enc_init failed\n" ); } err = lc3plus_enc_set_frame_dms( ( *handle )->handles[iCh], config.lc3plus_frame_duration_us / 100 ); if ( err != LC3PLUS_OK ) { IVAS_LC3PLUS_ENC_Close( handle ); - return IVAS_ERROR( IVAS_LC3PLUS_LC3plusErrToIvasErr(err), "lc3plus_enc_set_frame_dms failed\n" ); + return IVAS_ERROR( IVAS_LC3PLUS_LC3plusErrToIvasErr( err ), "lc3plus_enc_set_frame_dms failed\n" ); } err = lc3plus_enc_set_bitrate( ( *handle )->handles[iCh], bitsPerSecondPerChannel ); if ( err != LC3PLUS_OK ) { IVAS_LC3PLUS_ENC_Close( handle ); - return IVAS_ERROR( IVAS_LC3PLUS_LC3plusErrToIvasErr(err), "lc3plus_enc_set_bitrate failed\n" ); + return IVAS_ERROR( IVAS_LC3PLUS_LC3plusErrToIvasErr( err ), "lc3plus_enc_set_bitrate failed\n" ); } } @@ -112,7 +124,7 @@ ivas_error IVAS_LC3PLUS_ENC_Open( return IVAS_ERROR( IVAS_ERR_NOT_IMPLEMENTED, "Current pcm_conversion_buffer sizing requires that lc3plus uses a shorter or equal frame duration than ivas\n" ); } ( *handle )->config = config; - ( *handle )->pcm_conversion_buffer = count_malloc( sizeof( int16_t ) * config.samplerate * config.lc3plus_frame_duration_us / 1000000 ); + ( *handle )->pcm_conversion_buffer = malloc( sizeof( int16_t ) * config.samplerate * config.lc3plus_frame_duration_us / 1000000 ); if ( NULL == ( *handle )->pcm_conversion_buffer ) { IVAS_LC3PLUS_ENC_Close( handle ); @@ -204,15 +216,15 @@ void IVAS_LC3PLUS_ENC_Close( if ( NULL != ( *handle )->handles[iEnc] ) { lc3plus_free_encoder_structs( ( *handle )->handles[iEnc] ); - count_free( ( *handle )->handles[iEnc] ); + free( ( *handle )->handles[iEnc] ); } } if ( NULL != ( *handle )->pcm_conversion_buffer ) { - count_free( ( *handle )->pcm_conversion_buffer ); + free( ( *handle )->pcm_conversion_buffer ); } - count_free( ( *handle )->handles ); - count_free( *handle ); + free( ( *handle )->handles ); + free( *handle ); *handle = NULL; } @@ -227,6 +239,9 @@ ivas_error IVAS_LC3PLUS_ENC_Encode( int32_t ivasSampleIndex; uint8_t *bitstream_out_iter = bitstream_out; int32_t num_bytes = 0; + LC3PLUS_Error err; + + push_wmops( "IVAS_LC3PLUS_ENC_Encode" ); if ( NULL == handle ) { @@ -259,10 +274,12 @@ ivas_error IVAS_LC3PLUS_ENC_Encode( } num_bytes = 0; - LC3PLUS_Error err = lc3plus_enc16( handle->handles[iEnc], &handle->pcm_conversion_buffer, bitstream_out_iter, &num_bytes, NULL ); + push_wmops( "lc3plus_enc16" ); + err = lc3plus_enc16( handle->handles[iEnc], &handle->pcm_conversion_buffer, bitstream_out_iter, &num_bytes, NULL ); + pop_wmops(); if ( err != LC3PLUS_OK ) { - return IVAS_ERROR( IVAS_LC3PLUS_LC3plusErrToIvasErr(err), "lc3plus_enc16 failed\n" ); + return IVAS_ERROR( IVAS_LC3PLUS_LC3plusErrToIvasErr( err ), "lc3plus_enc16 failed\n" ); } if ( 0 == num_bytes ) { @@ -272,5 +289,8 @@ ivas_error IVAS_LC3PLUS_ENC_Encode( bitstream_out_iter += num_bytes; } } + + pop_wmops(); + return IVAS_ERR_OK; } diff --git a/lib_rend/ivas_lcld_tables.c b/lib_rend/ivas_lcld_tables.c new file mode 100644 index 0000000000..834e0536af --- /dev/null +++ b/lib_rend/ivas_lcld_tables.c @@ -0,0 +1,53066 @@ +/****************************************************************************************************** + + (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository. All Rights Reserved. + + This software is protected by copyright law and by international treaties. + The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository retain full ownership rights in their respective contributions in + the software. This notice grants no license of any kind, including but not limited to patent + license, nor is any license granted by implication, estoppel or otherwise. + + Contributors are required to enter into the IVAS codec Public Collaboration agreement before making + contributions. + + This software is provided "AS IS", without any express or implied warranties. The software is in the + development stage. It is intended exclusively for experts who have experience with such software and + solely for the purpose of inspection. All implied warranties of non-infringement, merchantability + and fitness for a particular purpose are hereby disclaimed and excluded. + + Any dispute, controversy or claim arising under or in relation to providing this software shall be + submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in + accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and + the United Nations Convention on Contracts on the International Sales of Goods. + +*******************************************************************************************************/ + +#include "ivas_lcld_tables.h" +#include "options.h" +#ifdef SPLIT_REND_WITH_HEAD_ROT +#include "ivas_prot_rend.h" +#include "wmc_auto.h" +#include +#include "prot.h" +#include "ivas_PerceptualModel.h" + +/* clang-format off */ + +const float c_afRotRealImagSimple[SIMPLE_PHASE_MAX_VAL + 1][2] = { + { 1.0f, 0.0f }, /* zero */ + { 0.0f, 1.0f }, /* pi/2 */ + { -1.0f, 0.0f }, /* pi */ + { 0.0f, -1.0f }, /* 3*pi/2 */ +}; + +/* phi = (-12:12)'/12 *pi; tmp = [cos(phi),sin(phi)]; tmp = tmp';sprintf('{%.8ff, %.8ff},\n',tmp(:)) */ +const float c_afRotRealImag[PHASE_MAX_VAL - PHASE_MIN_VAL + 1][2] = { + { -1.00000000f, -0.00000000f }, + { -0.96592583f, -0.25881905f }, + { -0.86602540f, -0.50000000f }, + { -0.70710678f, -0.70710678f }, + { -0.50000000f, -0.86602540f }, + { -0.25881905f, -0.96592583f }, + { 0.00000000f, -1.00000000f }, + { 0.25881905f, -0.96592583f }, + { 0.50000000f, -0.86602540f }, + { 0.70710678f, -0.70710678f }, + { 0.86602540f, -0.50000000f }, + { 0.96592583f, -0.25881905f }, + { 1.00000000f, 0.00000000f }, + { 0.96592583f, 0.25881905f }, + { 0.86602540f, 0.50000000f }, + { 0.70710678f, 0.70710678f }, + { 0.50000000f, 0.86602540f }, + { 0.25881905f, 0.96592583f }, + { 0.00000000f, 1.00000000f }, + { -0.25881905f, 0.96592583f }, + { -0.50000000f, 0.86602540f }, + { -0.70710678f, 0.70710678f }, + { -0.86602540f, 0.50000000f }, + { -0.96592583f, 0.25881905f }, + { -1.00000000f, 0.00000000f } +}; + +/* Move this to perceptual model ? */ +const int32_t c_aiBandwidths48[MAX_BANDS_48] = { + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 2, + 2, + 2, + 2, + 2, + 3, + 3, + 4, + 6, + 6, + 7, + 10, +}; + + +const float c_afScaleFactor[ALLOC_TABLE_SIZE] = { + 0.0f, + 0.353553390593f, + 0.420448207627f, + 0.500000000000f, + 0.594603557501f, + 0.707106781187f, + 0.840896415254f, + 1.000000000000f, + 1.189207115003f, + 1.414213562373f, + 1.681792830507f, + 2.000000000000f, + 2.378414230005f, + 2.828427124746f, + 3.363585661015f, + 4.0f, + 4.756828460011f, + 5.656854249492f, + 6.727171322030f, + 8.0f, + 9.513656920022f, + 11.31370849898f, + 13.45434264406f, + 16.00000000000f, + 19.02731384004f, + 22.62741699797f, + 26.90868528812f, + 32.000000000000000f, + 38.054627680087073f, + 45.254833995939038f, + 53.817370576237735f, + 64.000000000000000f, +}; + +const float c_afInvScaleFactor[ALLOC_TABLE_SIZE] = { + 0.0f, + 2.367513562373095f, + 2.046407115002721f, + 1.775900000000000f, + 1.536446415253715f, + 1.323056781186548f, + 1.132903557501360f, + 0.965800000000000f, + 0.821348207626857f, + 0.695103390593274f, + 0.587801778750680f, + 0.495800000000000f, + 0.418124103813429f, + 0.352176695296637f, + 0.296200889375340f, + 0.249400000000000f, + 0.209812051906714f, + 0.176538347648318f, + 0.148525444687670f, + 0.124900000000000f, + 0.105056025953357f, + 0.088388347648318f, + 0.074325444687670f, + 0.062500000000000f, + 0.052556025953357f, + 0.044194173824159f, + 0.037162722343835f, + 0.031250000000000f, + 0.026278012976679f, + 0.022097086912080f, + 0.018581361171918f, + 0.015625000000000f, +}; + +const float c_afRMSEnvReconstructTable[ENV_RECONSTRUCT_TABLE_SIZE] = { + 2.32830644e-10f, + 3.29272254e-10f, + 4.65661287e-10f, + 6.58544508e-10f, + 9.31322575e-10f, + 1.31708902e-09f, + 1.86264515e-09f, + 2.63417803e-09f, + 3.72529030e-09f, + 5.26835606e-09f, + 7.45058060e-09f, + 1.05367121e-08f, + 1.49011612e-08f, + 2.10734243e-08f, + 2.98023224e-08f, + 4.21468485e-08f, + 5.96046448e-08f, + 8.42936970e-08f, + 1.19209290e-07f, + 1.68587394e-07f, + 2.38418579e-07f, + 3.37174788e-07f, + 4.76837158e-07f, + 6.74349576e-07f, + 9.53674316e-07f, + 1.34869915e-06f, + 1.90734863e-06f, + 2.69739830e-06f, + 3.81469727e-06f, + 5.39479661e-06f, + 7.62939453e-06f, + 1.07895932e-05f, + 1.52587891e-05f, + 2.15791864e-05f, + 3.05175781e-05f, + 4.31583729e-05f, + 6.10351562e-05f, + 8.63167458e-05f, + 1.22070312e-04f, + 1.72633492e-04f, + 2.44140625e-04f, + 3.45266983e-04f, + 4.88281250e-04f, + 6.90533966e-04f, + 9.76562500e-04f, + 1.38106793e-03f, + 1.95312500e-03f, + 2.76213586e-03f, + 3.90625000e-03f, + 5.52427173e-03f, + 7.81250000e-03f, + 1.10485435e-02f, + 1.56250000e-02f, + 2.20970869e-02f, + 3.12500000e-02f, + 4.41941738e-02f, + 6.25000000e-02f, + 8.83883476e-02f, + 1.25000000e-01f, + 1.76776695e-01f, + 2.50000000e-01f, + 3.53553391e-01f, + 5.00000000e-01f, + 7.07106781e-01f, + 1.00000000e+00f, + 1.41421356e+00f, + 2.00000000e+00f, + 2.82842712e+00f, + 4.00000000e+00f, + 5.65685425e+00f, + 8.00000000e+00f, + 1.13137085e+01f, + 1.60000000e+01f, + 2.26274170e+01f, + 3.20000000e+01f, + 4.52548340e+01f, + 6.40000000e+01f, + 9.05096680e+01f, + 1.28000000e+02f, + 1.81019336e+02f, + 2.56000000e+02f, + 3.62038672e+02f, + 5.12000000e+02f, + 7.24077344e+02f, + 1.02400000e+03f, + 1.44815469e+03f, + 2.04800000e+03f, + 2.89630938e+03f, + 4.09600000e+03f, + 5.79261875e+03f, + 8.19200000e+03f, + 1.15852375e+04f, + 1.63840000e+04f, + 2.31704750e+04f, + 3.27680000e+04f, + 4.63409500e+04f, + 6.55360000e+04f, + 9.26819000e+04f, + 1.31072000e+05f, + 1.85363800e+05f, + 2.62144000e+05f, + 3.70727600e+05f, + 5.24288000e+05f, + 7.41455200e+05f, + 1.04857600e+06f, + 1.48291040e+06f, + 2.09715200e+06f, + 2.96582080e+06f, + 4.19430400e+06f, + 5.93164160e+06f, + 8.38860800e+06f, + 1.18632832e+07f, + 1.67772160e+07f, + 2.37265664e+07f, + 3.35544320e+07f, + 4.74531328e+07f, + 6.71088640e+07f, + 9.49062656e+07f, + 1.34217728e+08f, + 1.89812531e+08f, + 2.68435456e+08f, + 3.79625062e+08f, + 5.36870912e+08f, + 7.59250125e+08f, + 1.07374182e+09f, + 1.51850025e+09f, + 2.14748365e+09f, + 3.03700050e+09f, + 4.29496730e+09f, +}; + +const int32_t c_aiQuantMaxValues[ALLOC_TABLE_SIZE] = { + 0, + 3, + 3, + 4, + 5, + 5, + 6, + 7, + 8, + 9, + 12, + 13, + 16, + 17, + 19, + 23, + 26, + 26, + 27, + 28, + 31, + 36, + 38, + 45, + 54, + 64, + 76, + 90, + 108, + 128, + 152, + 180, +}; + +const int32_t c_aiHuffmanDim[ALLOC_TABLE_SIZE] = { + 2, + 2, + 2, + 2, + 2, + 2, + 2, + 2, + 2, + 2, + 2, + 2, + 2, + 2, + 2, + 2, + 2, + 2, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, +}; + +const int32_t c_aiHuffmanMod[ALLOC_TABLE_SIZE] = { + 0, + 4, + 4, + 5, + 6, + 6, + 7, + 8, + 9, + 10, + 13, + 14, + 17, + 18, + 20, + 24, + 27, + 27, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, +}; + +const int32_t c_aiHuffmanSize[ALLOC_TABLE_SIZE] = { + 1, + 16, + 16, + 25, + 36, + 36, + 49, + 64, + 81, + 100, + 169, + 196, + 289, + 324, + 400, + 576, + 729, + 729, + 28, + 29, + 32, + 37, + 39, + 46, + 55, + 65, + 77, + 91, + 109, + 129, + 153, + 181, +}; + +const uint32_t c_aaiRMSEnvHuffEnc[64][2] = { + { 0x0014, 0x0000 }, + { 0x0014, 0x0001 }, + { 0x0014, 0x0002 }, + { 0x0014, 0x0003 }, + { 0x0014, 0x0004 }, + { 0x0014, 0x0005 }, + { 0x0013, 0x0003 }, + { 0x0013, 0x0004 }, + { 0x0013, 0x0005 }, + { 0x0013, 0x0006 }, + { 0x0013, 0x0007 }, + { 0x0012, 0x000b }, + { 0x000d, 0x0002 }, + { 0x000e, 0x0001 }, + { 0x000e, 0x0002 }, + { 0x000d, 0x0003 }, + { 0x000b, 0x0002 }, + { 0x000a, 0x0003 }, + { 0x000a, 0x0004 }, + { 0x000a, 0x0005 }, + { 0x0009, 0x0004 }, + { 0x0009, 0x0005 }, + { 0x0009, 0x0006 }, + { 0x0008, 0x0005 }, + { 0x0008, 0x0006 }, + { 0x0007, 0x0004 }, + { 0x0006, 0x0003 }, + { 0x0006, 0x0004 }, + { 0x0005, 0x0003 }, + { 0x0004, 0x0002 }, + { 0x0003, 0x0002 }, + { 0x0002, 0x0002 }, + { 0x0002, 0x0003 }, + { 0x0003, 0x0003 }, + { 0x0004, 0x0003 }, + { 0x0006, 0x0005 }, + { 0x0007, 0x0005 }, + { 0x0008, 0x0007 }, + { 0x0009, 0x0007 }, + { 0x0009, 0x0008 }, + { 0x0009, 0x0009 }, + { 0x000a, 0x0006 }, + { 0x000a, 0x0007 }, + { 0x000b, 0x0003 }, + { 0x000c, 0x0002 }, + { 0x000c, 0x0003 }, + { 0x000b, 0x0004 }, + { 0x000b, 0x0005 }, + { 0x000e, 0x0003 }, + { 0x0010, 0x0003 }, + { 0x0013, 0x0008 }, + { 0x0013, 0x0009 }, + { 0x0013, 0x000a }, + { 0x0013, 0x000b }, + { 0x0013, 0x000c }, + { 0x0013, 0x000d }, + { 0x0013, 0x000e }, + { 0x0013, 0x000f }, + { 0x0013, 0x0010 }, + { 0x0013, 0x0011 }, + { 0x0013, 0x0012 }, + { 0x0013, 0x0013 }, + { 0x0013, 0x0014 }, + { 0x0013, 0x0015 }, +}; + +const uint32_t c_aaiRMSEnvHuffDec[13][HUFF_DEC_TABLE_SIZE] = { + { + 0x0002ffff, + 0x0001ffff, + 0x0000001d, + 0x00000022, + 0x0001001e, + 0x0001001e, + 0x00010021, + 0x00010021, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020020, + }, + { + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x00020023, + 0x00020023, + 0x00020023, + 0x00020023, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + }, + { + 0x0006ffff, + 0x0007ffff, + 0x0003ffff, + 0x0004ffff, + 0x0005ffff, + 0x00000017, + 0x00000018, + 0x00000025, + 0x00010019, + 0x00010019, + 0x00010024, + 0x00010024, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001a, + }, + { + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + }, + { + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + }, + { + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + }, + { + 0x0009ffff, + 0x0008ffff, + 0x0000002c, + 0x0000002d, + 0x00010010, + 0x00010010, + 0x0001002b, + 0x0001002b, + 0x0001002e, + 0x0001002e, + 0x0001002f, + 0x0001002f, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020011, + }, + { + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020013, + 0x00020013, + 0x00020013, + 0x00020013, + 0x00020029, + 0x00020029, + 0x00020029, + 0x00020029, + 0x0002002a, + 0x0002002a, + 0x0002002a, + 0x0002002a, + }, + { + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + }, + { + 0x000bffff, + 0x000cffff, + 0x000affff, + 0x00000031, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x00020030, + 0x00020030, + 0x00020030, + 0x00020030, + }, + { + 0x0001003a, + 0x0001003a, + 0x0001003b, + 0x0001003b, + 0x0001003c, + 0x0001003c, + 0x0001003d, + 0x0001003d, + 0x0001003e, + 0x0001003e, + 0x0001003f, + 0x0001003f, + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x0002000b, + }, + { + 0x00000000, + 0x00000001, + 0x00000002, + 0x00000003, + 0x00000004, + 0x00000005, + 0x00010006, + 0x00010006, + 0x00010007, + 0x00010007, + 0x00010008, + 0x00010008, + 0x00010009, + 0x00010009, + 0x0001000a, + 0x0001000a, + }, + { + 0x00010032, + 0x00010032, + 0x00010033, + 0x00010033, + 0x00010034, + 0x00010034, + 0x00010035, + 0x00010035, + 0x00010036, + 0x00010036, + 0x00010037, + 0x00010037, + 0x00010038, + 0x00010038, + 0x00010039, + 0x00010039, + }, +}; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc1[16][2] = +#else +const uint16_t c_aauiCQMFHuffEnc1[16][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0003, 0x0001 }, + { 0x0005, 0x0001 }, + { 0x000b, 0x0000 }, + { 0x0002, 0x0001 }, + { 0x0004, 0x0001 }, + { 0x0007, 0x0001 }, + { 0x000b, 0x0001 }, + { 0x0006, 0x0001 }, + { 0x0008, 0x0001 }, + { 0x000b, 0x0002 }, + { 0x000b, 0x0003 }, + { 0x000b, 0x0004 }, + { 0x000b, 0x0005 }, + { 0x000b, 0x0006 }, + { 0x000b, 0x0007 }, + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec1[3][16] = { + { + 0x0001ffff, + 0x00000005, + 0x00010001, + 0x00010001, + 0x00020004, + 0x00020004, + 0x00020004, + 0x00020004, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x0002ffff, + 0x00000009, + 0x00010006, + 0x00010006, + 0x00020008, + 0x00020008, + 0x00020008, + 0x00020008, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + }, + { + 0x00010003, + 0x00010003, + 0x00010007, + 0x00010007, + 0x0001000a, + 0x0001000a, + 0x0001000b, + 0x0001000b, + 0x0001000c, + 0x0001000c, + 0x0001000d, + 0x0001000d, + 0x0001000e, + 0x0001000e, + 0x0001000f, + 0x0001000f, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc2[16][2] = +#else +const uint16_t c_aauiCQMFHuffEnc2[16][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0003, 0x0001 }, + { 0x0005, 0x0001 }, + { 0x000c, 0x0000 }, + { 0x0002, 0x0001 }, + { 0x0004, 0x0001 }, + { 0x0007, 0x0001 }, + { 0x000c, 0x0001 }, + { 0x0006, 0x0001 }, + { 0x0008, 0x0001 }, + { 0x0009, 0x0001 }, + { 0x000c, 0x0002 }, + { 0x000c, 0x0003 }, + { 0x000c, 0x0004 }, + { 0x000c, 0x0005 }, + { 0x000b, 0x0003 }, + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec2[3][16] = { + { + 0x0001ffff, + 0x00000005, + 0x00010001, + 0x00010001, + 0x00020004, + 0x00020004, + 0x00020004, + 0x00020004, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x0002ffff, + 0x00000009, + 0x00010006, + 0x00010006, + 0x00020008, + 0x00020008, + 0x00020008, + 0x00020008, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + }, + { + 0x00000003, + 0x00000007, + 0x0000000b, + 0x0000000c, + 0x0000000d, + 0x0000000e, + 0x0001000f, + 0x0001000f, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + }, +}; +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc3[25][2] = +#else +const uint16_t c_aauiCQMFHuffEnc3[25][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0003, 0x0001 }, + { 0x0006, 0x0001 }, + { 0x000d, 0x0000 }, + { 0x000d, 0x0001 }, + { 0x0002, 0x0001 }, + { 0x0004, 0x0001 }, + { 0x0007, 0x0001 }, + { 0x000d, 0x0002 }, + { 0x000d, 0x0003 }, + { 0x0006, 0x0002 }, + { 0x0006, 0x0003 }, + { 0x0008, 0x0001 }, + { 0x000d, 0x0004 }, + { 0x000d, 0x0005 }, + { 0x0009, 0x0001 }, + { 0x000c, 0x0007 }, + { 0x000d, 0x0006 }, + { 0x000d, 0x0007 }, + { 0x000d, 0x0008 }, + { 0x000d, 0x0009 }, + { 0x000d, 0x000a }, + { 0x000d, 0x000b }, + { 0x000d, 0x000c }, + { 0x000d, 0x000d }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec3[10][16] = { + { + 0x0001ffff, + 0x00000006, + 0x00010001, + 0x00010001, + 0x00020005, + 0x00020005, + 0x00020005, + 0x00020005, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x0002ffff, + 0x0000000c, + 0x00010007, + 0x00010007, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x0002000b, + }, + { + 0x0003ffff, + 0x0004ffff, + 0x0005ffff, + 0x0006ffff, + 0x0007ffff, + 0x0008ffff, + 0x0009ffff, + 0x00000010, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + }, + { + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + }, + { + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + }, + { + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + }, + { + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + }, + { + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + }, + { + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + }, + { + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + }, +}; +#endif + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc4[36][2] = +#else +const uint16_t c_aauiCQMFHuffEnc4[36][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0003, 0x0001 }, + { 0x0006, 0x0001 }, + { 0x000b, 0x0001 }, + { 0x0010, 0x0000 }, + { 0x0010, 0x0001 }, + { 0x0002, 0x0001 }, + { 0x0004, 0x0001 }, + { 0x0007, 0x0001 }, + { 0x000a, 0x0001 }, + { 0x0010, 0x0002 }, + { 0x0010, 0x0003 }, + { 0x0006, 0x0002 }, + { 0x0006, 0x0003 }, + { 0x0008, 0x0001 }, + { 0x000e, 0x0006 }, + { 0x0010, 0x0004 }, + { 0x0010, 0x0005 }, + { 0x000a, 0x0002 }, + { 0x000a, 0x0003 }, + { 0x000e, 0x0007 }, + { 0x0010, 0x0006 }, + { 0x0010, 0x0007 }, + { 0x0010, 0x0008 }, + { 0x0010, 0x0009 }, + { 0x0010, 0x000a }, + { 0x0010, 0x000b }, + { 0x0010, 0x000c }, + { 0x0010, 0x000d }, + { 0x0010, 0x000e }, + { 0x0010, 0x000f }, + { 0x0010, 0x0010 }, + { 0x0010, 0x0011 }, + { 0x000f, 0x0009 }, + { 0x000f, 0x000a }, + { 0x000f, 0x000b }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec4[5][16] = { + { + 0x0001ffff, + 0x00000007, + 0x00010001, + 0x00010001, + 0x00020006, + 0x00020006, + 0x00020006, + 0x00020006, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x0002ffff, + 0x0000000e, + 0x00010008, + 0x00010008, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000d, + }, + { + 0x0004ffff, + 0x0003ffff, + 0x00010003, + 0x00010003, + 0x00020009, + 0x00020009, + 0x00020009, + 0x00020009, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020013, + 0x00020013, + 0x00020013, + 0x00020013, + }, + { + 0x0000001f, + 0x00000020, + 0x00010021, + 0x00010021, + 0x00010022, + 0x00010022, + 0x00010023, + 0x00010023, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020014, + }, + { + 0x00000004, + 0x00000005, + 0x0000000a, + 0x0000000b, + 0x00000010, + 0x00000011, + 0x00000015, + 0x00000016, + 0x00000017, + 0x00000018, + 0x00000019, + 0x0000001a, + 0x0000001b, + 0x0000001c, + 0x0000001d, + 0x0000001e, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc5[36][2] = +#else +const uint16_t c_aauiCQMFHuffEnc5[36][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0003, 0x0001 }, + { 0x0006, 0x0001 }, + { 0x000a, 0x0001 }, + { 0x000f, 0x0003 }, + { 0x0012, 0x0000 }, + { 0x0002, 0x0001 }, + { 0x0004, 0x0001 }, + { 0x0007, 0x0001 }, + { 0x000b, 0x0001 }, + { 0x0011, 0x0008 }, + { 0x0012, 0x0001 }, + { 0x0006, 0x0002 }, + { 0x0006, 0x0003 }, + { 0x0008, 0x0001 }, + { 0x000c, 0x0001 }, + { 0x0012, 0x0002 }, + { 0x0012, 0x0003 }, + { 0x000a, 0x0002 }, + { 0x000a, 0x0003 }, + { 0x000d, 0x0001 }, + { 0x0012, 0x0004 }, + { 0x0012, 0x0005 }, + { 0x0012, 0x0006 }, + { 0x0011, 0x0009 }, + { 0x0011, 0x000a }, + { 0x0012, 0x0007 }, + { 0x0012, 0x0008 }, + { 0x0012, 0x0009 }, + { 0x0012, 0x000a }, + { 0x0012, 0x000b }, + { 0x0012, 0x000c }, + { 0x0012, 0x000d }, + { 0x0012, 0x000e }, + { 0x0012, 0x000f }, + { 0x0011, 0x000b }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec5[10][16] = { + { + 0x0001ffff, + 0x00000007, + 0x00010001, + 0x00010001, + 0x00020006, + 0x00020006, + 0x00020006, + 0x00020006, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x0002ffff, + 0x0000000e, + 0x00010008, + 0x00010008, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000d, + }, + { + 0x0003ffff, + 0x0000000f, + 0x00010009, + 0x00010009, + 0x00020003, + 0x00020003, + 0x00020003, + 0x00020003, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020013, + 0x00020013, + 0x00020013, + 0x00020013, + }, + { + 0x0006ffff, + 0x0007ffff, + 0x0008ffff, + 0x0009ffff, + 0x0004ffff, + 0x0005ffff, + 0x00010004, + 0x00010004, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + }, + { + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + }, + { + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + }, + { + 0x00020005, + 0x00020005, + 0x00020005, + 0x00020005, + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020011, + }, + { + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020017, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001a, + }, + { + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001e, + }, + { + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020022, + 0x00020022, + 0x00020022, + 0x00020022, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc6[49][2] = +#else +const uint16_t c_aauiCQMFHuffEnc6[49][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0003, 0x0001 }, + { 0x0006, 0x0001 }, + { 0x000a, 0x0001 }, + { 0x0010, 0x0003 }, + { 0x0014, 0x0000 }, + { 0x0014, 0x0001 }, + { 0x0002, 0x0001 }, + { 0x0004, 0x0001 }, + { 0x0007, 0x0001 }, + { 0x000a, 0x0002 }, + { 0x0010, 0x0004 }, + { 0x0014, 0x0002 }, + { 0x0014, 0x0003 }, + { 0x0006, 0x0002 }, + { 0x0006, 0x0003 }, + { 0x0008, 0x0001 }, + { 0x000d, 0x0001 }, + { 0x0012, 0x0007 }, + { 0x0014, 0x0004 }, + { 0x0014, 0x0005 }, + { 0x000a, 0x0003 }, + { 0x000b, 0x0001 }, + { 0x000c, 0x0001 }, + { 0x0011, 0x0004 }, + { 0x0014, 0x0006 }, + { 0x0014, 0x0007 }, + { 0x0014, 0x0008 }, + { 0x0010, 0x0005 }, + { 0x000f, 0x0003 }, + { 0x0011, 0x0005 }, + { 0x0014, 0x0009 }, + { 0x0014, 0x000a }, + { 0x0014, 0x000b }, + { 0x0014, 0x000c }, + { 0x0014, 0x000d }, + { 0x0013, 0x000d }, + { 0x0014, 0x000e }, + { 0x0014, 0x000f }, + { 0x0014, 0x0010 }, + { 0x0014, 0x0011 }, + { 0x0014, 0x0012 }, + { 0x0014, 0x0013 }, + { 0x0014, 0x0014 }, + { 0x0014, 0x0015 }, + { 0x0014, 0x0016 }, + { 0x0014, 0x0017 }, + { 0x0014, 0x0018 }, + { 0x0014, 0x0019 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec6[7][16] = { + { + 0x0001ffff, + 0x00000008, + 0x00010001, + 0x00010001, + 0x00020007, + 0x00020007, + 0x00020007, + 0x00020007, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x0002ffff, + 0x00000010, + 0x00010009, + 0x00010009, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x0002000f, + }, + { + 0x0003ffff, + 0x00000017, + 0x00010016, + 0x00010016, + 0x00020003, + 0x00020003, + 0x00020003, + 0x00020003, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020015, + }, + { + 0x0006ffff, + 0x0005ffff, + 0x0004ffff, + 0x00000004, + 0x0000000b, + 0x0000001c, + 0x0001001d, + 0x0001001d, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + }, + { + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + }, + { + 0x00000027, + 0x00000028, + 0x00000029, + 0x0000002a, + 0x0000002b, + 0x0000002c, + 0x0000002d, + 0x0000002e, + 0x0000002f, + 0x00000030, + 0x00010024, + 0x00010024, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020012, + }, + { + 0x00000005, + 0x00000006, + 0x0000000c, + 0x0000000d, + 0x00000013, + 0x00000014, + 0x00000019, + 0x0000001a, + 0x0000001b, + 0x0000001f, + 0x00000020, + 0x00000021, + 0x00000022, + 0x00000023, + 0x00000025, + 0x00000026, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc7[64][2] = +#else +const uint16_t c_aauiCQMFHuffEnc7[64][2] = +#endif + { + { 0x0002, 0x0001 }, + { 0x0002, 0x0002 }, + { 0x0005, 0x0001 }, + { 0x0009, 0x0001 }, + { 0x000f, 0x0002 }, + { 0x0015, 0x0000 }, + { 0x0015, 0x0001 }, + { 0x0015, 0x0002 }, + { 0x0002, 0x0003 }, + { 0x0003, 0x0001 }, + { 0x0006, 0x0001 }, + { 0x0009, 0x0002 }, + { 0x000f, 0x0003 }, + { 0x0014, 0x0011 }, + { 0x0015, 0x0003 }, + { 0x0015, 0x0004 }, + { 0x0005, 0x0002 }, + { 0x0005, 0x0003 }, + { 0x0007, 0x0001 }, + { 0x000b, 0x0001 }, + { 0x0010, 0x0002 }, + { 0x0015, 0x0005 }, + { 0x0015, 0x0006 }, + { 0x0015, 0x0007 }, + { 0x000a, 0x0001 }, + { 0x0009, 0x0003 }, + { 0x000c, 0x0001 }, + { 0x000f, 0x0004 }, + { 0x0012, 0x0006 }, + { 0x0015, 0x0008 }, + { 0x0015, 0x0009 }, + { 0x0015, 0x000a }, + { 0x000f, 0x0005 }, + { 0x000e, 0x0003 }, + { 0x0010, 0x0003 }, + { 0x0012, 0x0007 }, + { 0x0014, 0x0012 }, + { 0x0015, 0x000b }, + { 0x0015, 0x000c }, + { 0x0015, 0x000d }, + { 0x0014, 0x0013 }, + { 0x0014, 0x0014 }, + { 0x0013, 0x000b }, + { 0x0014, 0x0015 }, + { 0x0015, 0x000e }, + { 0x0015, 0x000f }, + { 0x0015, 0x0010 }, + { 0x0015, 0x0011 }, + { 0x0015, 0x0012 }, + { 0x0015, 0x0013 }, + { 0x0015, 0x0014 }, + { 0x0015, 0x0015 }, + { 0x0015, 0x0016 }, + { 0x0015, 0x0017 }, + { 0x0015, 0x0018 }, + { 0x0015, 0x0019 }, + { 0x0015, 0x001a }, + { 0x0015, 0x001b }, + { 0x0015, 0x001c }, + { 0x0015, 0x001d }, + { 0x0015, 0x001e }, + { 0x0015, 0x001f }, + { 0x0015, 0x0020 }, + { 0x0015, 0x0021 }, + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec7[25][16] = { + { + 0x0001ffff, + 0x0002ffff, + 0x00010009, + 0x00010009, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00020008, + 0x00020008, + 0x00020008, + 0x00020008, + }, + { + 0x0003ffff, + 0x0004ffff, + 0x00010012, + 0x00010012, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + }, + { + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + }, + { + 0x0005ffff, + 0x0000001a, + 0x00010013, + 0x00010013, + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020018, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + }, + { + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + }, + { + 0x0007ffff, + 0x0006ffff, + 0x00000014, + 0x00000022, + 0x00010004, + 0x00010004, + 0x0001000c, + 0x0001000c, + 0x0001001b, + 0x0001001b, + 0x00010020, + 0x00010020, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020021, + }, + { + 0x0018ffff, + 0x0000000d, + 0x00000024, + 0x00000028, + 0x00000029, + 0x0000002b, + 0x0001002a, + 0x0001002a, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x00020023, + 0x00020023, + 0x00020023, + 0x00020023, + }, + { + 0x000effff, + 0x000affff, + 0x000bffff, + 0x000cffff, + 0x0008ffff, + 0x0009ffff, + 0x000dffff, + 0x000fffff, + 0x0010ffff, + 0x0011ffff, + 0x0012ffff, + 0x0013ffff, + 0x0014ffff, + 0x0015ffff, + 0x0016ffff, + 0x0017ffff, + }, + { + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + }, + { + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + }, + { + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + }, + { + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + }, + { + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + }, + { + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + }, + { + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + }, + { + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + }, + { + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + }, + { + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + }, + { + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + }, + { + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + }, + { + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + }, + { + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + }, + { + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + }, + { + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + }, + { + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc8[81][2] = +#else +const uint16_t c_aauiCQMFHuffEnc8[81][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0003, 0x0001 }, + { 0x0006, 0x0001 }, + { 0x000a, 0x0001 }, + { 0x000f, 0x0002 }, + { 0x0014, 0x0008 }, + { 0x0017, 0x0000 }, + { 0x0017, 0x0001 }, + { 0x0017, 0x0002 }, + { 0x0003, 0x0002 }, + { 0x0003, 0x0003 }, + { 0x0005, 0x0001 }, + { 0x0009, 0x0001 }, + { 0x000f, 0x0003 }, + { 0x0012, 0x0004 }, + { 0x0015, 0x000d }, + { 0x0017, 0x0003 }, + { 0x0017, 0x0004 }, + { 0x0005, 0x0002 }, + { 0x0005, 0x0003 }, + { 0x0007, 0x0001 }, + { 0x000c, 0x0001 }, + { 0x0010, 0x0002 }, + { 0x0013, 0x0005 }, + { 0x0017, 0x0005 }, + { 0x0017, 0x0006 }, + { 0x0017, 0x0007 }, + { 0x0009, 0x0002 }, + { 0x0009, 0x0003 }, + { 0x000b, 0x0001 }, + { 0x000f, 0x0004 }, + { 0x0012, 0x0005 }, + { 0x0016, 0x0015 }, + { 0x0017, 0x0008 }, + { 0x0017, 0x0009 }, + { 0x0017, 0x000a }, + { 0x000f, 0x0005 }, + { 0x000e, 0x0003 }, + { 0x0010, 0x0003 }, + { 0x0012, 0x0006 }, + { 0x0014, 0x0009 }, + { 0x0017, 0x000b }, + { 0x0017, 0x000c }, + { 0x0017, 0x000d }, + { 0x0017, 0x000e }, + { 0x0013, 0x0006 }, + { 0x0012, 0x0007 }, + { 0x0013, 0x0007 }, + { 0x0015, 0x000e }, + { 0x0017, 0x000f }, + { 0x0017, 0x0010 }, + { 0x0017, 0x0011 }, + { 0x0017, 0x0012 }, + { 0x0017, 0x0013 }, + { 0x0016, 0x0016 }, + { 0x0016, 0x0017 }, + { 0x0015, 0x000f }, + { 0x0016, 0x0018 }, + { 0x0017, 0x0014 }, + { 0x0017, 0x0015 }, + { 0x0017, 0x0016 }, + { 0x0017, 0x0017 }, + { 0x0017, 0x0018 }, + { 0x0017, 0x0019 }, + { 0x0017, 0x001a }, + { 0x0017, 0x001b }, + { 0x0017, 0x001c }, + { 0x0017, 0x001d }, + { 0x0017, 0x001e }, + { 0x0017, 0x001f }, + { 0x0017, 0x0020 }, + { 0x0017, 0x0021 }, + { 0x0017, 0x0022 }, + { 0x0017, 0x0023 }, + { 0x0017, 0x0024 }, + { 0x0017, 0x0025 }, + { 0x0017, 0x0026 }, + { 0x0017, 0x0027 }, + { 0x0017, 0x0028 }, + { 0x0017, 0x0029 }, + { 0x0016, 0x0019 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec8[16][16] = { + { + 0x0001ffff, + 0x0002ffff, + 0x00010001, + 0x00010001, + 0x00010009, + 0x00010009, + 0x0001000a, + 0x0001000a, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x0003ffff, + 0x0004ffff, + 0x00010014, + 0x00010014, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + }, + { + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + }, + { + 0x0005ffff, + 0x00000015, + 0x0001001d, + 0x0001001d, + 0x00020003, + 0x00020003, + 0x00020003, + 0x00020003, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + }, + { + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + }, + { + 0x0007ffff, + 0x0006ffff, + 0x00000016, + 0x00000026, + 0x00010004, + 0x00010004, + 0x0001000d, + 0x0001000d, + 0x0001001e, + 0x0001001e, + 0x00010024, + 0x00010024, + 0x00020025, + 0x00020025, + 0x00020025, + 0x00020025, + }, + { + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x00020027, + 0x00020027, + 0x00020027, + 0x00020027, + 0x0002002e, + 0x0002002e, + 0x0002002e, + 0x0002002e, + }, + { + 0x000bffff, + 0x000cffff, + 0x000dffff, + 0x000effff, + 0x000fffff, + 0x000affff, + 0x0008ffff, + 0x0009ffff, + 0x00000005, + 0x00000028, + 0x00010017, + 0x00010017, + 0x0001002d, + 0x0001002d, + 0x0001002f, + 0x0001002f, + }, + { + 0x00020039, + 0x00020039, + 0x00020039, + 0x00020039, + 0x00020050, + 0x00020050, + 0x00020050, + 0x00020050, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + }, + { + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + }, + { + 0x0001004e, + 0x0001004e, + 0x0001004f, + 0x0001004f, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020036, + 0x00020036, + 0x00020036, + 0x00020036, + 0x00020037, + 0x00020037, + 0x00020037, + 0x00020037, + }, + { + 0x00010006, + 0x00010006, + 0x00010007, + 0x00010007, + 0x00010008, + 0x00010008, + 0x00010010, + 0x00010010, + 0x00010011, + 0x00010011, + 0x00010018, + 0x00010018, + 0x00010019, + 0x00010019, + 0x0001001a, + 0x0001001a, + }, + { + 0x00010021, + 0x00010021, + 0x00010022, + 0x00010022, + 0x00010023, + 0x00010023, + 0x00010029, + 0x00010029, + 0x0001002a, + 0x0001002a, + 0x0001002b, + 0x0001002b, + 0x0001002c, + 0x0001002c, + 0x00010031, + 0x00010031, + }, + { + 0x00010032, + 0x00010032, + 0x00010033, + 0x00010033, + 0x00010034, + 0x00010034, + 0x00010035, + 0x00010035, + 0x0001003a, + 0x0001003a, + 0x0001003b, + 0x0001003b, + 0x0001003c, + 0x0001003c, + 0x0001003d, + 0x0001003d, + }, + { + 0x0001003e, + 0x0001003e, + 0x0001003f, + 0x0001003f, + 0x00010040, + 0x00010040, + 0x00010041, + 0x00010041, + 0x00010042, + 0x00010042, + 0x00010043, + 0x00010043, + 0x00010044, + 0x00010044, + 0x00010045, + 0x00010045, + }, + { + 0x00010046, + 0x00010046, + 0x00010047, + 0x00010047, + 0x00010048, + 0x00010048, + 0x00010049, + 0x00010049, + 0x0001004a, + 0x0001004a, + 0x0001004b, + 0x0001004b, + 0x0001004c, + 0x0001004c, + 0x0001004d, + 0x0001004d, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc9[100][2] = +#else +const uint16_t c_aauiCQMFHuffEnc9[100][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0003, 0x0001 }, + { 0x0006, 0x0001 }, + { 0x0009, 0x0001 }, + { 0x000d, 0x0002 }, + { 0x0011, 0x0004 }, + { 0x0014, 0x000a }, + { 0x0017, 0x0000 }, + { 0x0017, 0x0001 }, + { 0x0017, 0x0002 }, + { 0x0003, 0x0002 }, + { 0x0003, 0x0003 }, + { 0x0005, 0x0001 }, + { 0x0009, 0x0002 }, + { 0x000d, 0x0003 }, + { 0x0010, 0x0004 }, + { 0x0013, 0x0007 }, + { 0x0016, 0x0018 }, + { 0x0017, 0x0003 }, + { 0x0017, 0x0004 }, + { 0x0005, 0x0002 }, + { 0x0005, 0x0003 }, + { 0x0008, 0x0002 }, + { 0x000b, 0x0002 }, + { 0x000e, 0x0002 }, + { 0x0011, 0x0005 }, + { 0x0014, 0x000b }, + { 0x0016, 0x0019 }, + { 0x0017, 0x0005 }, + { 0x0017, 0x0006 }, + { 0x0009, 0x0003 }, + { 0x0008, 0x0003 }, + { 0x000b, 0x0003 }, + { 0x000d, 0x0004 }, + { 0x0010, 0x0005 }, + { 0x0012, 0x0006 }, + { 0x0015, 0x000f }, + { 0x0017, 0x0007 }, + { 0x0017, 0x0008 }, + { 0x0017, 0x0009 }, + { 0x000d, 0x0005 }, + { 0x000c, 0x0003 }, + { 0x000e, 0x0003 }, + { 0x0010, 0x0006 }, + { 0x0012, 0x0007 }, + { 0x0014, 0x000c }, + { 0x0017, 0x000a }, + { 0x0016, 0x001a }, + { 0x0017, 0x000b }, + { 0x0017, 0x000c }, + { 0x0011, 0x0006 }, + { 0x0010, 0x0007 }, + { 0x0011, 0x0007 }, + { 0x0013, 0x0008 }, + { 0x0013, 0x0009 }, + { 0x0015, 0x0010 }, + { 0x0017, 0x000d }, + { 0x0017, 0x000e }, + { 0x0017, 0x000f }, + { 0x0017, 0x0010 }, + { 0x0013, 0x000a }, + { 0x0013, 0x000b }, + { 0x0014, 0x000d }, + { 0x0015, 0x0011 }, + { 0x0017, 0x0011 }, + { 0x0016, 0x001b }, + { 0x0017, 0x0012 }, + { 0x0017, 0x0013 }, + { 0x0017, 0x0014 }, + { 0x0017, 0x0015 }, + { 0x0017, 0x0016 }, + { 0x0015, 0x0012 }, + { 0x0015, 0x0013 }, + { 0x0017, 0x0017 }, + { 0x0016, 0x001c }, + { 0x0017, 0x0018 }, + { 0x0017, 0x0019 }, + { 0x0017, 0x001a }, + { 0x0017, 0x001b }, + { 0x0017, 0x001c }, + { 0x0017, 0x001d }, + { 0x0017, 0x001e }, + { 0x0017, 0x001f }, + { 0x0017, 0x0020 }, + { 0x0017, 0x0021 }, + { 0x0017, 0x0022 }, + { 0x0017, 0x0023 }, + { 0x0017, 0x0024 }, + { 0x0017, 0x0025 }, + { 0x0017, 0x0026 }, + { 0x0017, 0x0027 }, + { 0x0017, 0x0028 }, + { 0x0017, 0x0029 }, + { 0x0017, 0x002a }, + { 0x0017, 0x002b }, + { 0x0017, 0x002c }, + { 0x0017, 0x002d }, + { 0x0017, 0x002e }, + { 0x0017, 0x002f }, + { 0x0016, 0x001d }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec9[22][16] = { + { + 0x0001ffff, + 0x0002ffff, + 0x00010001, + 0x00010001, + 0x0001000a, + 0x0001000a, + 0x0001000b, + 0x0001000b, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x0003ffff, + 0x0004ffff, + 0x00000016, + 0x0000001f, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + }, + { + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + }, + { + 0x0007ffff, + 0x0005ffff, + 0x0006ffff, + 0x00000029, + 0x00010017, + 0x00010017, + 0x00010020, + 0x00010020, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + }, + { + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + }, + { + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + }, + { + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + }, + { + 0x000bffff, + 0x000affff, + 0x0008ffff, + 0x0009ffff, + 0x0000000f, + 0x00000022, + 0x0000002b, + 0x00000033, + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020018, + 0x0002002a, + 0x0002002a, + 0x0002002a, + 0x0002002a, + }, + { + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + }, + { + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + }, + { + 0x00010035, + 0x00010035, + 0x00010036, + 0x00010036, + 0x0001003c, + 0x0001003c, + 0x0001003d, + 0x0001003d, + 0x00020023, + 0x00020023, + 0x00020023, + 0x00020023, + 0x0002002c, + 0x0002002c, + 0x0002002c, + 0x0002002c, + }, + { + 0x0010ffff, + 0x0011ffff, + 0x0012ffff, + 0x0013ffff, + 0x0014ffff, + 0x0015ffff, + 0x000fffff, + 0x000dffff, + 0x000cffff, + 0x000effff, + 0x00000006, + 0x0000001a, + 0x0000002d, + 0x0000003e, + 0x00010010, + 0x00010010, + }, + { + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + }, + { + 0x0002004a, + 0x0002004a, + 0x0002004a, + 0x0002004a, + 0x00020063, + 0x00020063, + 0x00020063, + 0x00020063, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + }, + { + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + }, + { + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020011, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002002f, + 0x0002002f, + 0x0002002f, + 0x0002002f, + 0x00020041, + 0x00020041, + 0x00020041, + 0x00020041, + }, + { + 0x00010007, + 0x00010007, + 0x00010008, + 0x00010008, + 0x00010009, + 0x00010009, + 0x00010012, + 0x00010012, + 0x00010013, + 0x00010013, + 0x0001001c, + 0x0001001c, + 0x0001001d, + 0x0001001d, + 0x00010025, + 0x00010025, + }, + { + 0x00010026, + 0x00010026, + 0x00010027, + 0x00010027, + 0x0001002e, + 0x0001002e, + 0x00010030, + 0x00010030, + 0x00010031, + 0x00010031, + 0x00010038, + 0x00010038, + 0x00010039, + 0x00010039, + 0x0001003a, + 0x0001003a, + }, + { + 0x0001003b, + 0x0001003b, + 0x00010040, + 0x00010040, + 0x00010042, + 0x00010042, + 0x00010043, + 0x00010043, + 0x00010044, + 0x00010044, + 0x00010045, + 0x00010045, + 0x00010046, + 0x00010046, + 0x00010049, + 0x00010049, + }, + { + 0x0001004b, + 0x0001004b, + 0x0001004c, + 0x0001004c, + 0x0001004d, + 0x0001004d, + 0x0001004e, + 0x0001004e, + 0x0001004f, + 0x0001004f, + 0x00010050, + 0x00010050, + 0x00010051, + 0x00010051, + 0x00010052, + 0x00010052, + }, + { + 0x00010053, + 0x00010053, + 0x00010054, + 0x00010054, + 0x00010055, + 0x00010055, + 0x00010056, + 0x00010056, + 0x00010057, + 0x00010057, + 0x00010058, + 0x00010058, + 0x00010059, + 0x00010059, + 0x0001005a, + 0x0001005a, + }, + { + 0x0001005b, + 0x0001005b, + 0x0001005c, + 0x0001005c, + 0x0001005d, + 0x0001005d, + 0x0001005e, + 0x0001005e, + 0x0001005f, + 0x0001005f, + 0x00010060, + 0x00010060, + 0x00010061, + 0x00010061, + 0x00010062, + 0x00010062, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc10[169][2] = +#else +const uint16_t c_aauiCQMFHuffEnc10[169][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0004, 0x0002 }, + { 0x0005, 0x0002 }, + { 0x0007, 0x0002 }, + { 0x000a, 0x0002 }, + { 0x000e, 0x0004 }, + { 0x0011, 0x0007 }, + { 0x0013, 0x0012 }, + { 0x0016, 0x0000 }, + { 0x0016, 0x0001 }, + { 0x0016, 0x0002 }, + { 0x0016, 0x0003 }, + { 0x0016, 0x0004 }, + { 0x0004, 0x0003 }, + { 0x0003, 0x0003 }, + { 0x0004, 0x0004 }, + { 0x0007, 0x0003 }, + { 0x000a, 0x0003 }, + { 0x000d, 0x0004 }, + { 0x0010, 0x0007 }, + { 0x0013, 0x0013 }, + { 0x0015, 0x0035 }, + { 0x0016, 0x0005 }, + { 0x0016, 0x0006 }, + { 0x0016, 0x0007 }, + { 0x0016, 0x0008 }, + { 0x0005, 0x0003 }, + { 0x0004, 0x0005 }, + { 0x0006, 0x0003 }, + { 0x0008, 0x0002 }, + { 0x000b, 0x0002 }, + { 0x000e, 0x0005 }, + { 0x0010, 0x0008 }, + { 0x0013, 0x0014 }, + { 0x0014, 0x001d }, + { 0x0016, 0x0009 }, + { 0x0016, 0x000a }, + { 0x0016, 0x000b }, + { 0x0016, 0x000c }, + { 0x0007, 0x0004 }, + { 0x0007, 0x0005 }, + { 0x0008, 0x0003 }, + { 0x000a, 0x0004 }, + { 0x000d, 0x0005 }, + { 0x000f, 0x0005 }, + { 0x0011, 0x0008 }, + { 0x0014, 0x001e }, + { 0x0014, 0x001f }, + { 0x0016, 0x000d }, + { 0x0016, 0x000e }, + { 0x0016, 0x000f }, + { 0x0016, 0x0010 }, + { 0x000a, 0x0005 }, + { 0x0009, 0x0003 }, + { 0x000b, 0x0003 }, + { 0x000d, 0x0006 }, + { 0x000f, 0x0006 }, + { 0x0011, 0x0009 }, + { 0x0013, 0x0015 }, + { 0x0014, 0x0020 }, + { 0x0016, 0x0011 }, + { 0x0016, 0x0012 }, + { 0x0016, 0x0013 }, + { 0x0016, 0x0014 }, + { 0x0016, 0x0015 }, + { 0x000e, 0x0006 }, + { 0x000d, 0x0007 }, + { 0x000e, 0x0007 }, + { 0x000f, 0x0007 }, + { 0x0011, 0x000a }, + { 0x0012, 0x000c }, + { 0x0016, 0x0016 }, + { 0x0016, 0x0017 }, + { 0x0016, 0x0018 }, + { 0x0016, 0x0019 }, + { 0x0016, 0x001a }, + { 0x0016, 0x001b }, + { 0x0016, 0x001c }, + { 0x0011, 0x000b }, + { 0x0010, 0x0009 }, + { 0x0011, 0x000c }, + { 0x0011, 0x000d }, + { 0x0013, 0x0016 }, + { 0x0016, 0x001d }, + { 0x0016, 0x001e }, + { 0x0016, 0x001f }, + { 0x0016, 0x0020 }, + { 0x0016, 0x0021 }, + { 0x0016, 0x0022 }, + { 0x0016, 0x0023 }, + { 0x0016, 0x0024 }, + { 0x0014, 0x0021 }, + { 0x0014, 0x0022 }, + { 0x0012, 0x000d }, + { 0x0013, 0x0017 }, + { 0x0016, 0x0025 }, + { 0x0016, 0x0026 }, + { 0x0016, 0x0027 }, + { 0x0016, 0x0028 }, + { 0x0016, 0x0029 }, + { 0x0016, 0x002a }, + { 0x0016, 0x002b }, + { 0x0016, 0x002c }, + { 0x0016, 0x002d }, + { 0x0015, 0x0036 }, + { 0x0015, 0x0037 }, + { 0x0014, 0x0023 }, + { 0x0015, 0x0038 }, + { 0x0016, 0x002e }, + { 0x0016, 0x002f }, + { 0x0016, 0x0030 }, + { 0x0016, 0x0031 }, + { 0x0016, 0x0032 }, + { 0x0016, 0x0033 }, + { 0x0016, 0x0034 }, + { 0x0016, 0x0035 }, + { 0x0016, 0x0036 }, + { 0x0016, 0x0037 }, + { 0x0016, 0x0038 }, + { 0x0016, 0x0039 }, + { 0x0016, 0x003a }, + { 0x0016, 0x003b }, + { 0x0016, 0x003c }, + { 0x0016, 0x003d }, + { 0x0016, 0x003e }, + { 0x0016, 0x003f }, + { 0x0016, 0x0040 }, + { 0x0016, 0x0041 }, + { 0x0016, 0x0042 }, + { 0x0016, 0x0043 }, + { 0x0016, 0x0044 }, + { 0x0016, 0x0045 }, + { 0x0016, 0x0046 }, + { 0x0016, 0x0047 }, + { 0x0016, 0x0048 }, + { 0x0016, 0x0049 }, + { 0x0016, 0x004a }, + { 0x0016, 0x004b }, + { 0x0016, 0x004c }, + { 0x0016, 0x004d }, + { 0x0016, 0x004e }, + { 0x0016, 0x004f }, + { 0x0016, 0x0050 }, + { 0x0016, 0x0051 }, + { 0x0016, 0x0052 }, + { 0x0016, 0x0053 }, + { 0x0016, 0x0054 }, + { 0x0016, 0x0055 }, + { 0x0016, 0x0056 }, + { 0x0016, 0x0057 }, + { 0x0016, 0x0058 }, + { 0x0016, 0x0059 }, + { 0x0016, 0x005a }, + { 0x0016, 0x005b }, + { 0x0016, 0x005c }, + { 0x0016, 0x005d }, + { 0x0016, 0x005e }, + { 0x0016, 0x005f }, + { 0x0016, 0x0060 }, + { 0x0016, 0x0061 }, + { 0x0016, 0x0062 }, + { 0x0016, 0x0063 }, + { 0x0016, 0x0064 }, + { 0x0016, 0x0065 }, + { 0x0016, 0x0066 }, + { 0x0016, 0x0067 }, + { 0x0016, 0x0068 }, + { 0x0016, 0x0069 }, + { 0x0015, 0x0039 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec10[45][16] = { + { + 0x0002ffff, + 0x0001ffff, + 0x00000001, + 0x0000000d, + 0x0000000f, + 0x0000001b, + 0x0001000e, + 0x0001000e, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + }, + { + 0x0004ffff, + 0x0003ffff, + 0x0000001d, + 0x00000029, + 0x00010003, + 0x00010003, + 0x00010010, + 0x00010010, + 0x00010027, + 0x00010027, + 0x00010028, + 0x00010028, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001c, + }, + { + 0x0002002a, + 0x0002002a, + 0x0002002a, + 0x0002002a, + 0x00020034, + 0x00020034, + 0x00020034, + 0x00020034, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + }, + { + 0x0008ffff, + 0x0007ffff, + 0x0005ffff, + 0x0006ffff, + 0x0001001e, + 0x0001001e, + 0x00010036, + 0x00010036, + 0x00020004, + 0x00020004, + 0x00020004, + 0x00020004, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020011, + }, + { + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + }, + { + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + }, + { + 0x00020005, + 0x00020005, + 0x00020005, + 0x00020005, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x00020041, + 0x00020041, + 0x00020041, + 0x00020041, + 0x00020043, + 0x00020043, + 0x00020043, + 0x00020043, + }, + { + 0x0012ffff, + 0x000effff, + 0x000dffff, + 0x000affff, + 0x0009ffff, + 0x000bffff, + 0x000cffff, + 0x00000013, + 0x00000020, + 0x0000004f, + 0x0001002c, + 0x0001002c, + 0x00010038, + 0x00010038, + 0x00010044, + 0x00010044, + }, + { + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + }, + { + 0x00020046, + 0x00020046, + 0x00020046, + 0x00020046, + 0x0002005d, + 0x0002005d, + 0x0002005d, + 0x0002005d, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + }, + { + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + }, + { + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + }, + { + 0x0000003b, + 0x0000005b, + 0x0000005c, + 0x0000006a, + 0x00010007, + 0x00010007, + 0x00010014, + 0x00010014, + 0x00010021, + 0x00010021, + 0x0001003a, + 0x0001003a, + 0x00010052, + 0x00010052, + 0x0001005e, + 0x0001005e, + }, + { + 0x0023ffff, + 0x0024ffff, + 0x0025ffff, + 0x0026ffff, + 0x0027ffff, + 0x0028ffff, + 0x0029ffff, + 0x002affff, + 0x002bffff, + 0x002cffff, + 0x000fffff, + 0x0010ffff, + 0x0011ffff, + 0x00000022, + 0x0000002e, + 0x0000002f, + }, + { + 0x000200a6, + 0x000200a6, + 0x000200a6, + 0x000200a6, + 0x000200a7, + 0x000200a7, + 0x000200a7, + 0x000200a7, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + }, + { + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + }, + { + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x000300a8, + 0x000300a8, + 0x000300a8, + 0x000300a8, + 0x000300a8, + 0x000300a8, + 0x000300a8, + 0x000300a8, + }, + { + 0x0014ffff, + 0x0017ffff, + 0x0015ffff, + 0x0016ffff, + 0x001cffff, + 0x0013ffff, + 0x0018ffff, + 0x0019ffff, + 0x001affff, + 0x001bffff, + 0x001dffff, + 0x001effff, + 0x001fffff, + 0x0020ffff, + 0x0021ffff, + 0x0022ffff, + }, + { + 0x0002003f, + 0x0002003f, + 0x0002003f, + 0x0002003f, + 0x00020040, + 0x00020040, + 0x00020040, + 0x00020040, + 0x00020047, + 0x00020047, + 0x00020047, + 0x00020047, + 0x00020048, + 0x00020048, + 0x00020048, + 0x00020048, + }, + { + 0x00020008, + 0x00020008, + 0x00020008, + 0x00020008, + 0x00020009, + 0x00020009, + 0x00020009, + 0x00020009, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x0002000b, + }, + { + 0x00020019, + 0x00020019, + 0x00020019, + 0x00020019, + 0x00020023, + 0x00020023, + 0x00020023, + 0x00020023, + 0x00020024, + 0x00020024, + 0x00020024, + 0x00020024, + 0x00020025, + 0x00020025, + 0x00020025, + 0x00020025, + }, + { + 0x00020026, + 0x00020026, + 0x00020026, + 0x00020026, + 0x00020030, + 0x00020030, + 0x00020030, + 0x00020030, + 0x00020031, + 0x00020031, + 0x00020031, + 0x00020031, + 0x00020032, + 0x00020032, + 0x00020032, + 0x00020032, + }, + { + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020018, + }, + { + 0x00020049, + 0x00020049, + 0x00020049, + 0x00020049, + 0x0002004a, + 0x0002004a, + 0x0002004a, + 0x0002004a, + 0x0002004b, + 0x0002004b, + 0x0002004b, + 0x0002004b, + 0x0002004c, + 0x0002004c, + 0x0002004c, + 0x0002004c, + }, + { + 0x0002004d, + 0x0002004d, + 0x0002004d, + 0x0002004d, + 0x00020053, + 0x00020053, + 0x00020053, + 0x00020053, + 0x00020054, + 0x00020054, + 0x00020054, + 0x00020054, + 0x00020055, + 0x00020055, + 0x00020055, + 0x00020055, + }, + { + 0x00020056, + 0x00020056, + 0x00020056, + 0x00020056, + 0x00020057, + 0x00020057, + 0x00020057, + 0x00020057, + 0x00020058, + 0x00020058, + 0x00020058, + 0x00020058, + 0x00020059, + 0x00020059, + 0x00020059, + 0x00020059, + }, + { + 0x0002005a, + 0x0002005a, + 0x0002005a, + 0x0002005a, + 0x0002005f, + 0x0002005f, + 0x0002005f, + 0x0002005f, + 0x00020060, + 0x00020060, + 0x00020060, + 0x00020060, + 0x00020061, + 0x00020061, + 0x00020061, + 0x00020061, + }, + { + 0x00020033, + 0x00020033, + 0x00020033, + 0x00020033, + 0x0002003c, + 0x0002003c, + 0x0002003c, + 0x0002003c, + 0x0002003d, + 0x0002003d, + 0x0002003d, + 0x0002003d, + 0x0002003e, + 0x0002003e, + 0x0002003e, + 0x0002003e, + }, + { + 0x00020062, + 0x00020062, + 0x00020062, + 0x00020062, + 0x00020063, + 0x00020063, + 0x00020063, + 0x00020063, + 0x00020064, + 0x00020064, + 0x00020064, + 0x00020064, + 0x00020065, + 0x00020065, + 0x00020065, + 0x00020065, + }, + { + 0x00020066, + 0x00020066, + 0x00020066, + 0x00020066, + 0x00020067, + 0x00020067, + 0x00020067, + 0x00020067, + 0x0002006c, + 0x0002006c, + 0x0002006c, + 0x0002006c, + 0x0002006d, + 0x0002006d, + 0x0002006d, + 0x0002006d, + }, + { + 0x0002006e, + 0x0002006e, + 0x0002006e, + 0x0002006e, + 0x0002006f, + 0x0002006f, + 0x0002006f, + 0x0002006f, + 0x00020070, + 0x00020070, + 0x00020070, + 0x00020070, + 0x00020071, + 0x00020071, + 0x00020071, + 0x00020071, + }, + { + 0x00020072, + 0x00020072, + 0x00020072, + 0x00020072, + 0x00020073, + 0x00020073, + 0x00020073, + 0x00020073, + 0x00020074, + 0x00020074, + 0x00020074, + 0x00020074, + 0x00020075, + 0x00020075, + 0x00020075, + 0x00020075, + }, + { + 0x00020076, + 0x00020076, + 0x00020076, + 0x00020076, + 0x00020077, + 0x00020077, + 0x00020077, + 0x00020077, + 0x00020078, + 0x00020078, + 0x00020078, + 0x00020078, + 0x00020079, + 0x00020079, + 0x00020079, + 0x00020079, + }, + { + 0x0002007a, + 0x0002007a, + 0x0002007a, + 0x0002007a, + 0x0002007b, + 0x0002007b, + 0x0002007b, + 0x0002007b, + 0x0002007c, + 0x0002007c, + 0x0002007c, + 0x0002007c, + 0x0002007d, + 0x0002007d, + 0x0002007d, + 0x0002007d, + }, + { + 0x0002007e, + 0x0002007e, + 0x0002007e, + 0x0002007e, + 0x0002007f, + 0x0002007f, + 0x0002007f, + 0x0002007f, + 0x00020080, + 0x00020080, + 0x00020080, + 0x00020080, + 0x00020081, + 0x00020081, + 0x00020081, + 0x00020081, + }, + { + 0x00020082, + 0x00020082, + 0x00020082, + 0x00020082, + 0x00020083, + 0x00020083, + 0x00020083, + 0x00020083, + 0x00020084, + 0x00020084, + 0x00020084, + 0x00020084, + 0x00020085, + 0x00020085, + 0x00020085, + 0x00020085, + }, + { + 0x00020086, + 0x00020086, + 0x00020086, + 0x00020086, + 0x00020087, + 0x00020087, + 0x00020087, + 0x00020087, + 0x00020088, + 0x00020088, + 0x00020088, + 0x00020088, + 0x00020089, + 0x00020089, + 0x00020089, + 0x00020089, + }, + { + 0x0002008a, + 0x0002008a, + 0x0002008a, + 0x0002008a, + 0x0002008b, + 0x0002008b, + 0x0002008b, + 0x0002008b, + 0x0002008c, + 0x0002008c, + 0x0002008c, + 0x0002008c, + 0x0002008d, + 0x0002008d, + 0x0002008d, + 0x0002008d, + }, + { + 0x0002008e, + 0x0002008e, + 0x0002008e, + 0x0002008e, + 0x0002008f, + 0x0002008f, + 0x0002008f, + 0x0002008f, + 0x00020090, + 0x00020090, + 0x00020090, + 0x00020090, + 0x00020091, + 0x00020091, + 0x00020091, + 0x00020091, + }, + { + 0x00020092, + 0x00020092, + 0x00020092, + 0x00020092, + 0x00020093, + 0x00020093, + 0x00020093, + 0x00020093, + 0x00020094, + 0x00020094, + 0x00020094, + 0x00020094, + 0x00020095, + 0x00020095, + 0x00020095, + 0x00020095, + }, + { + 0x00020096, + 0x00020096, + 0x00020096, + 0x00020096, + 0x00020097, + 0x00020097, + 0x00020097, + 0x00020097, + 0x00020098, + 0x00020098, + 0x00020098, + 0x00020098, + 0x00020099, + 0x00020099, + 0x00020099, + 0x00020099, + }, + { + 0x0002009a, + 0x0002009a, + 0x0002009a, + 0x0002009a, + 0x0002009b, + 0x0002009b, + 0x0002009b, + 0x0002009b, + 0x0002009c, + 0x0002009c, + 0x0002009c, + 0x0002009c, + 0x0002009d, + 0x0002009d, + 0x0002009d, + 0x0002009d, + }, + { + 0x0002009e, + 0x0002009e, + 0x0002009e, + 0x0002009e, + 0x0002009f, + 0x0002009f, + 0x0002009f, + 0x0002009f, + 0x000200a0, + 0x000200a0, + 0x000200a0, + 0x000200a0, + 0x000200a1, + 0x000200a1, + 0x000200a1, + 0x000200a1, + }, + { + 0x000200a2, + 0x000200a2, + 0x000200a2, + 0x000200a2, + 0x000200a3, + 0x000200a3, + 0x000200a3, + 0x000200a3, + 0x000200a4, + 0x000200a4, + 0x000200a4, + 0x000200a4, + 0x000200a5, + 0x000200a5, + 0x000200a5, + 0x000200a5, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc11[196][2] = +#else +const uint16_t c_aauiCQMFHuffEnc11[196][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0004, 0x0003 }, + { 0x0005, 0x0003 }, + { 0x0007, 0x0002 }, + { 0x0009, 0x0003 }, + { 0x000c, 0x0004 }, + { 0x000f, 0x0005 }, + { 0x0012, 0x000d }, + { 0x0014, 0x001f }, + { 0x0016, 0x0000 }, + { 0x0016, 0x0001 }, + { 0x0016, 0x0002 }, + { 0x0016, 0x0003 }, + { 0x0016, 0x0004 }, + { 0x0004, 0x0004 }, + { 0x0003, 0x0003 }, + { 0x0005, 0x0004 }, + { 0x0006, 0x0003 }, + { 0x0009, 0x0004 }, + { 0x000b, 0x0004 }, + { 0x000e, 0x0005 }, + { 0x0010, 0x0007 }, + { 0x0012, 0x000e }, + { 0x0014, 0x0020 }, + { 0x0016, 0x0005 }, + { 0x0016, 0x0006 }, + { 0x0016, 0x0007 }, + { 0x0016, 0x0008 }, + { 0x0005, 0x0005 }, + { 0x0004, 0x0005 }, + { 0x0006, 0x0004 }, + { 0x0007, 0x0003 }, + { 0x000a, 0x0004 }, + { 0x000c, 0x0005 }, + { 0x000e, 0x0006 }, + { 0x0011, 0x000a }, + { 0x0012, 0x000f }, + { 0x0015, 0x003b }, + { 0x0016, 0x0009 }, + { 0x0016, 0x000a }, + { 0x0016, 0x000b }, + { 0x0016, 0x000c }, + { 0x0007, 0x0004 }, + { 0x0006, 0x0005 }, + { 0x0007, 0x0005 }, + { 0x0009, 0x0005 }, + { 0x000b, 0x0005 }, + { 0x000d, 0x0005 }, + { 0x000f, 0x0006 }, + { 0x0012, 0x0010 }, + { 0x0014, 0x0021 }, + { 0x0016, 0x000d }, + { 0x0016, 0x000e }, + { 0x0016, 0x000f }, + { 0x0016, 0x0010 }, + { 0x0016, 0x0011 }, + { 0x0009, 0x0006 }, + { 0x0009, 0x0007 }, + { 0x000a, 0x0005 }, + { 0x000b, 0x0006 }, + { 0x000d, 0x0006 }, + { 0x000f, 0x0007 }, + { 0x0011, 0x000b }, + { 0x0013, 0x0017 }, + { 0x0014, 0x0022 }, + { 0x0016, 0x0012 }, + { 0x0016, 0x0013 }, + { 0x0016, 0x0014 }, + { 0x0016, 0x0015 }, + { 0x0016, 0x0016 }, + { 0x000c, 0x0006 }, + { 0x000b, 0x0007 }, + { 0x000c, 0x0007 }, + { 0x000d, 0x0007 }, + { 0x000e, 0x0007 }, + { 0x0010, 0x0008 }, + { 0x0012, 0x0011 }, + { 0x0014, 0x0023 }, + { 0x0015, 0x003c }, + { 0x0016, 0x0017 }, + { 0x0016, 0x0018 }, + { 0x0016, 0x0019 }, + { 0x0016, 0x001a }, + { 0x0016, 0x001b }, + { 0x000f, 0x0008 }, + { 0x000e, 0x0008 }, + { 0x000e, 0x0009 }, + { 0x000f, 0x0009 }, + { 0x0011, 0x000c }, + { 0x0013, 0x0018 }, + { 0x0014, 0x0024 }, + { 0x0016, 0x001c }, + { 0x0016, 0x001d }, + { 0x0016, 0x001e }, + { 0x0016, 0x001f }, + { 0x0016, 0x0020 }, + { 0x0016, 0x0021 }, + { 0x0016, 0x0022 }, + { 0x0011, 0x000d }, + { 0x0010, 0x0009 }, + { 0x0012, 0x0012 }, + { 0x0012, 0x0013 }, + { 0x0014, 0x0025 }, + { 0x0015, 0x003d }, + { 0x0014, 0x0026 }, + { 0x0016, 0x0023 }, + { 0x0016, 0x0024 }, + { 0x0016, 0x0025 }, + { 0x0016, 0x0026 }, + { 0x0016, 0x0027 }, + { 0x0016, 0x0028 }, + { 0x0016, 0x0029 }, + { 0x0014, 0x0027 }, + { 0x0013, 0x0019 }, + { 0x0014, 0x0028 }, + { 0x0014, 0x0029 }, + { 0x0014, 0x002a }, + { 0x0016, 0x002a }, + { 0x0016, 0x002b }, + { 0x0016, 0x002c }, + { 0x0016, 0x002d }, + { 0x0016, 0x002e }, + { 0x0016, 0x002f }, + { 0x0016, 0x0030 }, + { 0x0016, 0x0031 }, + { 0x0016, 0x0032 }, + { 0x0014, 0x002b }, + { 0x0014, 0x002c }, + { 0x0014, 0x002d }, + { 0x0016, 0x0033 }, + { 0x0016, 0x0034 }, + { 0x0016, 0x0035 }, + { 0x0016, 0x0036 }, + { 0x0016, 0x0037 }, + { 0x0016, 0x0038 }, + { 0x0016, 0x0039 }, + { 0x0016, 0x003a }, + { 0x0016, 0x003b }, + { 0x0016, 0x003c }, + { 0x0016, 0x003d }, + { 0x0016, 0x003e }, + { 0x0016, 0x003f }, + { 0x0016, 0x0040 }, + { 0x0016, 0x0041 }, + { 0x0016, 0x0042 }, + { 0x0016, 0x0043 }, + { 0x0016, 0x0044 }, + { 0x0016, 0x0045 }, + { 0x0016, 0x0046 }, + { 0x0016, 0x0047 }, + { 0x0016, 0x0048 }, + { 0x0016, 0x0049 }, + { 0x0016, 0x004a }, + { 0x0016, 0x004b }, + { 0x0016, 0x004c }, + { 0x0016, 0x004d }, + { 0x0016, 0x004e }, + { 0x0016, 0x004f }, + { 0x0016, 0x0050 }, + { 0x0016, 0x0051 }, + { 0x0016, 0x0052 }, + { 0x0016, 0x0053 }, + { 0x0016, 0x0054 }, + { 0x0016, 0x0055 }, + { 0x0016, 0x0056 }, + { 0x0016, 0x0057 }, + { 0x0016, 0x0058 }, + { 0x0016, 0x0059 }, + { 0x0016, 0x005a }, + { 0x0016, 0x005b }, + { 0x0016, 0x005c }, + { 0x0016, 0x005d }, + { 0x0016, 0x005e }, + { 0x0016, 0x005f }, + { 0x0016, 0x0060 }, + { 0x0016, 0x0061 }, + { 0x0016, 0x0062 }, + { 0x0016, 0x0063 }, + { 0x0016, 0x0064 }, + { 0x0016, 0x0065 }, + { 0x0016, 0x0066 }, + { 0x0016, 0x0067 }, + { 0x0016, 0x0068 }, + { 0x0016, 0x0069 }, + { 0x0016, 0x006a }, + { 0x0016, 0x006b }, + { 0x0016, 0x006c }, + { 0x0016, 0x006d }, + { 0x0016, 0x006e }, + { 0x0016, 0x006f }, + { 0x0016, 0x0070 }, + { 0x0016, 0x0071 }, + { 0x0016, 0x0072 }, + { 0x0016, 0x0073 }, + { 0x0016, 0x0074 }, + { 0x0016, 0x0075 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec11[50][16] = { + { + 0x0003ffff, + 0x0001ffff, + 0x0002ffff, + 0x00000001, + 0x0000000e, + 0x0000001d, + 0x0001000f, + 0x0001000f, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002002b, + 0x0002002b, + 0x0002002b, + 0x0002002b, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + }, + { + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + }, + { + 0x0007ffff, + 0x0005ffff, + 0x0004ffff, + 0x0006ffff, + 0x00010003, + 0x00010003, + 0x0001001f, + 0x0001001f, + 0x0001002a, + 0x0001002a, + 0x0001002c, + 0x0001002c, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020011, + }, + { + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + }, + { + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020020, + 0x0002003a, + 0x0002003a, + 0x0002003a, + 0x0002003a, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + }, + { + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + }, + { + 0x000bffff, + 0x000affff, + 0x0008ffff, + 0x0009ffff, + 0x00000005, + 0x00000021, + 0x00000046, + 0x00000048, + 0x00010013, + 0x00010013, + 0x0001002e, + 0x0001002e, + 0x0001003b, + 0x0001003b, + 0x00010047, + 0x00010047, + }, + { + 0x00020055, + 0x00020055, + 0x00020055, + 0x00020055, + 0x00020056, + 0x00020056, + 0x00020056, + 0x00020056, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + }, + { + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + }, + { + 0x00010054, + 0x00010054, + 0x00010057, + 0x00010057, + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020022, + 0x00020022, + 0x00020022, + 0x00020022, + 0x0002004a, + 0x0002004a, + 0x0002004a, + 0x0002004a, + }, + { + 0x0014ffff, + 0x0011ffff, + 0x0010ffff, + 0x000effff, + 0x000fffff, + 0x000cffff, + 0x000dffff, + 0x00000015, + 0x0000004b, + 0x00000063, + 0x00010006, + 0x00010006, + 0x00010030, + 0x00010030, + 0x0001003d, + 0x0001003d, + }, + { + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + }, + { + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030062, + 0x00030062, + 0x00030062, + 0x00030062, + 0x00030062, + 0x00030062, + 0x00030062, + 0x00030062, + }, + { + 0x00010059, + 0x00010059, + 0x00010071, + 0x00010071, + 0x00020007, + 0x00020007, + 0x00020007, + 0x00020007, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020024, + 0x00020024, + 0x00020024, + 0x00020024, + }, + { + 0x00020031, + 0x00020031, + 0x00020031, + 0x00020031, + 0x0002004c, + 0x0002004c, + 0x0002004c, + 0x0002004c, + 0x00020064, + 0x00020064, + 0x00020064, + 0x00020064, + 0x00020065, + 0x00020065, + 0x00020065, + 0x00020065, + }, + { + 0x00000017, + 0x00000032, + 0x00000040, + 0x0000004d, + 0x0000005a, + 0x00000066, + 0x00000068, + 0x00000070, + 0x00000072, + 0x00000073, + 0x00000074, + 0x0000007e, + 0x0000007f, + 0x00000080, + 0x0001003f, + 0x0001003f, + }, + { + 0x0025ffff, + 0x0026ffff, + 0x0027ffff, + 0x0028ffff, + 0x0029ffff, + 0x002affff, + 0x002bffff, + 0x002cffff, + 0x002dffff, + 0x002effff, + 0x002fffff, + 0x0030ffff, + 0x0031ffff, + 0x0013ffff, + 0x0012ffff, + 0x00000008, + }, + { + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x00030067, + 0x00030067, + 0x00030067, + 0x00030067, + 0x00030067, + 0x00030067, + 0x00030067, + 0x00030067, + }, + { + 0x000200c2, + 0x000200c2, + 0x000200c2, + 0x000200c2, + 0x000200c3, + 0x000200c3, + 0x000200c3, + 0x000200c3, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + }, + { + 0x001affff, + 0x0019ffff, + 0x0015ffff, + 0x0018ffff, + 0x001dffff, + 0x0016ffff, + 0x0017ffff, + 0x001bffff, + 0x001cffff, + 0x001effff, + 0x001fffff, + 0x0020ffff, + 0x0021ffff, + 0x0022ffff, + 0x0023ffff, + 0x0024ffff, + }, + { + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x00020026, + 0x00020026, + 0x00020026, + 0x00020026, + 0x00020027, + 0x00020027, + 0x00020027, + 0x00020027, + 0x00020028, + 0x00020028, + 0x00020028, + 0x00020028, + }, + { + 0x00020043, + 0x00020043, + 0x00020043, + 0x00020043, + 0x00020044, + 0x00020044, + 0x00020044, + 0x00020044, + 0x00020045, + 0x00020045, + 0x00020045, + 0x00020045, + 0x0002004f, + 0x0002004f, + 0x0002004f, + 0x0002004f, + }, + { + 0x00020050, + 0x00020050, + 0x00020050, + 0x00020050, + 0x00020051, + 0x00020051, + 0x00020051, + 0x00020051, + 0x00020052, + 0x00020052, + 0x00020052, + 0x00020052, + 0x00020053, + 0x00020053, + 0x00020053, + 0x00020053, + }, + { + 0x00020029, + 0x00020029, + 0x00020029, + 0x00020029, + 0x00020033, + 0x00020033, + 0x00020033, + 0x00020033, + 0x00020034, + 0x00020034, + 0x00020034, + 0x00020034, + 0x00020035, + 0x00020035, + 0x00020035, + 0x00020035, + }, + { + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020019, + 0x00020019, + 0x00020019, + 0x00020019, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001a, + }, + { + 0x00020009, + 0x00020009, + 0x00020009, + 0x00020009, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000c, + }, + { + 0x0002005b, + 0x0002005b, + 0x0002005b, + 0x0002005b, + 0x0002005c, + 0x0002005c, + 0x0002005c, + 0x0002005c, + 0x0002005d, + 0x0002005d, + 0x0002005d, + 0x0002005d, + 0x0002005e, + 0x0002005e, + 0x0002005e, + 0x0002005e, + }, + { + 0x0002005f, + 0x0002005f, + 0x0002005f, + 0x0002005f, + 0x00020060, + 0x00020060, + 0x00020060, + 0x00020060, + 0x00020061, + 0x00020061, + 0x00020061, + 0x00020061, + 0x00020069, + 0x00020069, + 0x00020069, + 0x00020069, + }, + { + 0x00020036, + 0x00020036, + 0x00020036, + 0x00020036, + 0x00020037, + 0x00020037, + 0x00020037, + 0x00020037, + 0x00020041, + 0x00020041, + 0x00020041, + 0x00020041, + 0x00020042, + 0x00020042, + 0x00020042, + 0x00020042, + }, + { + 0x0002006a, + 0x0002006a, + 0x0002006a, + 0x0002006a, + 0x0002006b, + 0x0002006b, + 0x0002006b, + 0x0002006b, + 0x0002006c, + 0x0002006c, + 0x0002006c, + 0x0002006c, + 0x0002006d, + 0x0002006d, + 0x0002006d, + 0x0002006d, + }, + { + 0x0002006e, + 0x0002006e, + 0x0002006e, + 0x0002006e, + 0x0002006f, + 0x0002006f, + 0x0002006f, + 0x0002006f, + 0x00020075, + 0x00020075, + 0x00020075, + 0x00020075, + 0x00020076, + 0x00020076, + 0x00020076, + 0x00020076, + }, + { + 0x00020077, + 0x00020077, + 0x00020077, + 0x00020077, + 0x00020078, + 0x00020078, + 0x00020078, + 0x00020078, + 0x00020079, + 0x00020079, + 0x00020079, + 0x00020079, + 0x0002007a, + 0x0002007a, + 0x0002007a, + 0x0002007a, + }, + { + 0x0002007b, + 0x0002007b, + 0x0002007b, + 0x0002007b, + 0x0002007c, + 0x0002007c, + 0x0002007c, + 0x0002007c, + 0x0002007d, + 0x0002007d, + 0x0002007d, + 0x0002007d, + 0x00020081, + 0x00020081, + 0x00020081, + 0x00020081, + }, + { + 0x00020082, + 0x00020082, + 0x00020082, + 0x00020082, + 0x00020083, + 0x00020083, + 0x00020083, + 0x00020083, + 0x00020084, + 0x00020084, + 0x00020084, + 0x00020084, + 0x00020085, + 0x00020085, + 0x00020085, + 0x00020085, + }, + { + 0x00020086, + 0x00020086, + 0x00020086, + 0x00020086, + 0x00020087, + 0x00020087, + 0x00020087, + 0x00020087, + 0x00020088, + 0x00020088, + 0x00020088, + 0x00020088, + 0x00020089, + 0x00020089, + 0x00020089, + 0x00020089, + }, + { + 0x0002008a, + 0x0002008a, + 0x0002008a, + 0x0002008a, + 0x0002008b, + 0x0002008b, + 0x0002008b, + 0x0002008b, + 0x0002008c, + 0x0002008c, + 0x0002008c, + 0x0002008c, + 0x0002008d, + 0x0002008d, + 0x0002008d, + 0x0002008d, + }, + { + 0x0002008e, + 0x0002008e, + 0x0002008e, + 0x0002008e, + 0x0002008f, + 0x0002008f, + 0x0002008f, + 0x0002008f, + 0x00020090, + 0x00020090, + 0x00020090, + 0x00020090, + 0x00020091, + 0x00020091, + 0x00020091, + 0x00020091, + }, + { + 0x00020092, + 0x00020092, + 0x00020092, + 0x00020092, + 0x00020093, + 0x00020093, + 0x00020093, + 0x00020093, + 0x00020094, + 0x00020094, + 0x00020094, + 0x00020094, + 0x00020095, + 0x00020095, + 0x00020095, + 0x00020095, + }, + { + 0x00020096, + 0x00020096, + 0x00020096, + 0x00020096, + 0x00020097, + 0x00020097, + 0x00020097, + 0x00020097, + 0x00020098, + 0x00020098, + 0x00020098, + 0x00020098, + 0x00020099, + 0x00020099, + 0x00020099, + 0x00020099, + }, + { + 0x0002009a, + 0x0002009a, + 0x0002009a, + 0x0002009a, + 0x0002009b, + 0x0002009b, + 0x0002009b, + 0x0002009b, + 0x0002009c, + 0x0002009c, + 0x0002009c, + 0x0002009c, + 0x0002009d, + 0x0002009d, + 0x0002009d, + 0x0002009d, + }, + { + 0x0002009e, + 0x0002009e, + 0x0002009e, + 0x0002009e, + 0x0002009f, + 0x0002009f, + 0x0002009f, + 0x0002009f, + 0x000200a0, + 0x000200a0, + 0x000200a0, + 0x000200a0, + 0x000200a1, + 0x000200a1, + 0x000200a1, + 0x000200a1, + }, + { + 0x000200a2, + 0x000200a2, + 0x000200a2, + 0x000200a2, + 0x000200a3, + 0x000200a3, + 0x000200a3, + 0x000200a3, + 0x000200a4, + 0x000200a4, + 0x000200a4, + 0x000200a4, + 0x000200a5, + 0x000200a5, + 0x000200a5, + 0x000200a5, + }, + { + 0x000200a6, + 0x000200a6, + 0x000200a6, + 0x000200a6, + 0x000200a7, + 0x000200a7, + 0x000200a7, + 0x000200a7, + 0x000200a8, + 0x000200a8, + 0x000200a8, + 0x000200a8, + 0x000200a9, + 0x000200a9, + 0x000200a9, + 0x000200a9, + }, + { + 0x000200aa, + 0x000200aa, + 0x000200aa, + 0x000200aa, + 0x000200ab, + 0x000200ab, + 0x000200ab, + 0x000200ab, + 0x000200ac, + 0x000200ac, + 0x000200ac, + 0x000200ac, + 0x000200ad, + 0x000200ad, + 0x000200ad, + 0x000200ad, + }, + { + 0x000200ae, + 0x000200ae, + 0x000200ae, + 0x000200ae, + 0x000200af, + 0x000200af, + 0x000200af, + 0x000200af, + 0x000200b0, + 0x000200b0, + 0x000200b0, + 0x000200b0, + 0x000200b1, + 0x000200b1, + 0x000200b1, + 0x000200b1, + }, + { + 0x000200b2, + 0x000200b2, + 0x000200b2, + 0x000200b2, + 0x000200b3, + 0x000200b3, + 0x000200b3, + 0x000200b3, + 0x000200b4, + 0x000200b4, + 0x000200b4, + 0x000200b4, + 0x000200b5, + 0x000200b5, + 0x000200b5, + 0x000200b5, + }, + { + 0x000200b6, + 0x000200b6, + 0x000200b6, + 0x000200b6, + 0x000200b7, + 0x000200b7, + 0x000200b7, + 0x000200b7, + 0x000200b8, + 0x000200b8, + 0x000200b8, + 0x000200b8, + 0x000200b9, + 0x000200b9, + 0x000200b9, + 0x000200b9, + }, + { + 0x000200ba, + 0x000200ba, + 0x000200ba, + 0x000200ba, + 0x000200bb, + 0x000200bb, + 0x000200bb, + 0x000200bb, + 0x000200bc, + 0x000200bc, + 0x000200bc, + 0x000200bc, + 0x000200bd, + 0x000200bd, + 0x000200bd, + 0x000200bd, + }, + { + 0x000200be, + 0x000200be, + 0x000200be, + 0x000200be, + 0x000200bf, + 0x000200bf, + 0x000200bf, + 0x000200bf, + 0x000200c0, + 0x000200c0, + 0x000200c0, + 0x000200c0, + 0x000200c1, + 0x000200c1, + 0x000200c1, + 0x000200c1, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc12[289][2] = +#else +const uint16_t c_aauiCQMFHuffEnc12[289][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0004, 0x0004 }, + { 0x0005, 0x0004 }, + { 0x0007, 0x0004 }, + { 0x0008, 0x0002 }, + { 0x000b, 0x0004 }, + { 0x000e, 0x0006 }, + { 0x0010, 0x0009 }, + { 0x0012, 0x0014 }, + { 0x0013, 0x001f }, + { 0x0016, 0x0000 }, + { 0x0016, 0x0001 }, + { 0x0016, 0x0002 }, + { 0x0016, 0x0003 }, + { 0x0016, 0x0004 }, + { 0x0016, 0x0005 }, + { 0x0016, 0x0006 }, + { 0x0004, 0x0005 }, + { 0x0004, 0x0006 }, + { 0x0005, 0x0005 }, + { 0x0006, 0x0003 }, + { 0x0008, 0x0003 }, + { 0x000a, 0x0004 }, + { 0x000d, 0x0006 }, + { 0x000f, 0x0008 }, + { 0x0011, 0x000c }, + { 0x0013, 0x0020 }, + { 0x0016, 0x0007 }, + { 0x0015, 0x0063 }, + { 0x0016, 0x0008 }, + { 0x0016, 0x0009 }, + { 0x0016, 0x000a }, + { 0x0016, 0x000b }, + { 0x0016, 0x000c }, + { 0x0005, 0x0006 }, + { 0x0004, 0x0007 }, + { 0x0005, 0x0007 }, + { 0x0006, 0x0004 }, + { 0x0008, 0x0004 }, + { 0x000b, 0x0005 }, + { 0x000d, 0x0007 }, + { 0x0010, 0x000a }, + { 0x0012, 0x0015 }, + { 0x0015, 0x0064 }, + { 0x0016, 0x000d }, + { 0x0016, 0x000e }, + { 0x0016, 0x000f }, + { 0x0016, 0x0010 }, + { 0x0016, 0x0011 }, + { 0x0016, 0x0012 }, + { 0x0016, 0x0013 }, + { 0x0006, 0x0005 }, + { 0x0006, 0x0006 }, + { 0x0006, 0x0007 }, + { 0x0008, 0x0005 }, + { 0x000a, 0x0005 }, + { 0x000c, 0x0005 }, + { 0x000e, 0x0007 }, + { 0x0010, 0x000b }, + { 0x0012, 0x0016 }, + { 0x0014, 0x0037 }, + { 0x0015, 0x0065 }, + { 0x0016, 0x0014 }, + { 0x0016, 0x0015 }, + { 0x0016, 0x0016 }, + { 0x0016, 0x0017 }, + { 0x0016, 0x0018 }, + { 0x0016, 0x0019 }, + { 0x0008, 0x0006 }, + { 0x0007, 0x0005 }, + { 0x0008, 0x0007 }, + { 0x000a, 0x0006 }, + { 0x000c, 0x0006 }, + { 0x000e, 0x0008 }, + { 0x0010, 0x000c }, + { 0x0011, 0x000d }, + { 0x0013, 0x0021 }, + { 0x0015, 0x0066 }, + { 0x0016, 0x001a }, + { 0x0016, 0x001b }, + { 0x0016, 0x001c }, + { 0x0016, 0x001d }, + { 0x0016, 0x001e }, + { 0x0016, 0x001f }, + { 0x0016, 0x0020 }, + { 0x000b, 0x0006 }, + { 0x000a, 0x0007 }, + { 0x000b, 0x0007 }, + { 0x000c, 0x0007 }, + { 0x000e, 0x0009 }, + { 0x000f, 0x0009 }, + { 0x0011, 0x000e }, + { 0x0013, 0x0022 }, + { 0x0015, 0x0067 }, + { 0x0015, 0x0068 }, + { 0x0016, 0x0021 }, + { 0x0016, 0x0022 }, + { 0x0016, 0x0023 }, + { 0x0016, 0x0024 }, + { 0x0016, 0x0025 }, + { 0x0016, 0x0026 }, + { 0x0016, 0x0027 }, + { 0x000e, 0x000a }, + { 0x000d, 0x0008 }, + { 0x000d, 0x0009 }, + { 0x000e, 0x000b }, + { 0x000f, 0x000a }, + { 0x0011, 0x000f }, + { 0x0013, 0x0023 }, + { 0x0014, 0x0038 }, + { 0x0016, 0x0028 }, + { 0x0016, 0x0029 }, + { 0x0016, 0x002a }, + { 0x0016, 0x002b }, + { 0x0016, 0x002c }, + { 0x0016, 0x002d }, + { 0x0016, 0x002e }, + { 0x0016, 0x002f }, + { 0x0016, 0x0030 }, + { 0x0010, 0x000d }, + { 0x000f, 0x000b }, + { 0x0010, 0x000e }, + { 0x0010, 0x000f }, + { 0x0012, 0x0017 }, + { 0x0013, 0x0024 }, + { 0x0014, 0x0039 }, + { 0x0016, 0x0031 }, + { 0x0016, 0x0032 }, + { 0x0016, 0x0033 }, + { 0x0016, 0x0034 }, + { 0x0016, 0x0035 }, + { 0x0016, 0x0036 }, + { 0x0016, 0x0037 }, + { 0x0016, 0x0038 }, + { 0x0016, 0x0039 }, + { 0x0016, 0x003a }, + { 0x0013, 0x0025 }, + { 0x0011, 0x0010 }, + { 0x0011, 0x0011 }, + { 0x0013, 0x0026 }, + { 0x0013, 0x0027 }, + { 0x0014, 0x003a }, + { 0x0014, 0x003b }, + { 0x0016, 0x003b }, + { 0x0016, 0x003c }, + { 0x0016, 0x003d }, + { 0x0016, 0x003e }, + { 0x0016, 0x003f }, + { 0x0016, 0x0040 }, + { 0x0016, 0x0041 }, + { 0x0016, 0x0042 }, + { 0x0016, 0x0043 }, + { 0x0016, 0x0044 }, + { 0x0015, 0x0069 }, + { 0x0014, 0x003c }, + { 0x0014, 0x003d }, + { 0x0015, 0x006a }, + { 0x0015, 0x006b }, + { 0x0015, 0x006c }, + { 0x0016, 0x0045 }, + { 0x0016, 0x0046 }, + { 0x0016, 0x0047 }, + { 0x0016, 0x0048 }, + { 0x0016, 0x0049 }, + { 0x0016, 0x004a }, + { 0x0016, 0x004b }, + { 0x0016, 0x004c }, + { 0x0016, 0x004d }, + { 0x0016, 0x004e }, + { 0x0016, 0x004f }, + { 0x0016, 0x0050 }, + { 0x0016, 0x0051 }, + { 0x0015, 0x006d }, + { 0x0016, 0x0052 }, + { 0x0016, 0x0053 }, + { 0x0016, 0x0054 }, + { 0x0016, 0x0055 }, + { 0x0016, 0x0056 }, + { 0x0016, 0x0057 }, + { 0x0016, 0x0058 }, + { 0x0016, 0x0059 }, + { 0x0016, 0x005a }, + { 0x0016, 0x005b }, + { 0x0016, 0x005c }, + { 0x0016, 0x005d }, + { 0x0016, 0x005e }, + { 0x0016, 0x005f }, + { 0x0016, 0x0060 }, + { 0x0016, 0x0061 }, + { 0x0016, 0x0062 }, + { 0x0016, 0x0063 }, + { 0x0016, 0x0064 }, + { 0x0016, 0x0065 }, + { 0x0016, 0x0066 }, + { 0x0016, 0x0067 }, + { 0x0016, 0x0068 }, + { 0x0016, 0x0069 }, + { 0x0016, 0x006a }, + { 0x0016, 0x006b }, + { 0x0016, 0x006c }, + { 0x0016, 0x006d }, + { 0x0016, 0x006e }, + { 0x0016, 0x006f }, + { 0x0016, 0x0070 }, + { 0x0016, 0x0071 }, + { 0x0016, 0x0072 }, + { 0x0016, 0x0073 }, + { 0x0016, 0x0074 }, + { 0x0016, 0x0075 }, + { 0x0016, 0x0076 }, + { 0x0016, 0x0077 }, + { 0x0016, 0x0078 }, + { 0x0016, 0x0079 }, + { 0x0016, 0x007a }, + { 0x0016, 0x007b }, + { 0x0016, 0x007c }, + { 0x0016, 0x007d }, + { 0x0016, 0x007e }, + { 0x0016, 0x007f }, + { 0x0016, 0x0080 }, + { 0x0016, 0x0081 }, + { 0x0016, 0x0082 }, + { 0x0016, 0x0083 }, + { 0x0016, 0x0084 }, + { 0x0016, 0x0085 }, + { 0x0016, 0x0086 }, + { 0x0016, 0x0087 }, + { 0x0016, 0x0088 }, + { 0x0016, 0x0089 }, + { 0x0016, 0x008a }, + { 0x0016, 0x008b }, + { 0x0016, 0x008c }, + { 0x0016, 0x008d }, + { 0x0016, 0x008e }, + { 0x0016, 0x008f }, + { 0x0016, 0x0090 }, + { 0x0016, 0x0091 }, + { 0x0016, 0x0092 }, + { 0x0016, 0x0093 }, + { 0x0016, 0x0094 }, + { 0x0016, 0x0095 }, + { 0x0016, 0x0096 }, + { 0x0016, 0x0097 }, + { 0x0016, 0x0098 }, + { 0x0016, 0x0099 }, + { 0x0016, 0x009a }, + { 0x0016, 0x009b }, + { 0x0016, 0x009c }, + { 0x0016, 0x009d }, + { 0x0016, 0x009e }, + { 0x0016, 0x009f }, + { 0x0016, 0x00a0 }, + { 0x0016, 0x00a1 }, + { 0x0016, 0x00a2 }, + { 0x0016, 0x00a3 }, + { 0x0016, 0x00a4 }, + { 0x0016, 0x00a5 }, + { 0x0016, 0x00a6 }, + { 0x0016, 0x00a7 }, + { 0x0016, 0x00a8 }, + { 0x0016, 0x00a9 }, + { 0x0016, 0x00aa }, + { 0x0016, 0x00ab }, + { 0x0016, 0x00ac }, + { 0x0016, 0x00ad }, + { 0x0016, 0x00ae }, + { 0x0016, 0x00af }, + { 0x0016, 0x00b0 }, + { 0x0016, 0x00b1 }, + { 0x0016, 0x00b2 }, + { 0x0016, 0x00b3 }, + { 0x0016, 0x00b4 }, + { 0x0016, 0x00b5 }, + { 0x0016, 0x00b6 }, + { 0x0016, 0x00b7 }, + { 0x0016, 0x00b8 }, + { 0x0016, 0x00b9 }, + { 0x0016, 0x00ba }, + { 0x0016, 0x00bb }, + { 0x0016, 0x00bc }, + { 0x0016, 0x00bd }, + { 0x0016, 0x00be }, + { 0x0016, 0x00bf }, + { 0x0016, 0x00c0 }, + { 0x0016, 0x00c1 }, + { 0x0016, 0x00c2 }, + { 0x0016, 0x00c3 }, + { 0x0016, 0x00c4 }, + { 0x0016, 0x00c5 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec12[76][16] = { + { + 0x0003ffff, + 0x0004ffff, + 0x0001ffff, + 0x0002ffff, + 0x00000001, + 0x00000011, + 0x00000012, + 0x00000023, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + }, + { + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + }, + { + 0x0006ffff, + 0x0005ffff, + 0x00000004, + 0x00000015, + 0x00000026, + 0x00000036, + 0x00000044, + 0x00000046, + 0x00010003, + 0x00010003, + 0x00010045, + 0x00010045, + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020014, + }, + { + 0x00020025, + 0x00020025, + 0x00020025, + 0x00020025, + 0x00020033, + 0x00020033, + 0x00020033, + 0x00020033, + 0x00020034, + 0x00020034, + 0x00020034, + 0x00020034, + 0x00020035, + 0x00020035, + 0x00020035, + 0x00020035, + }, + { + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020037, + 0x00020037, + 0x00020037, + 0x00020037, + 0x00020047, + 0x00020047, + 0x00020047, + 0x00020047, + 0x00020056, + 0x00020056, + 0x00020056, + 0x00020056, + }, + { + 0x000bffff, + 0x0009ffff, + 0x000affff, + 0x0007ffff, + 0x0008ffff, + 0x00000038, + 0x00000048, + 0x00000058, + 0x00010005, + 0x00010005, + 0x00010027, + 0x00010027, + 0x00010055, + 0x00010055, + 0x00010057, + 0x00010057, + }, + { + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + }, + { + 0x00030067, + 0x00030067, + 0x00030067, + 0x00030067, + 0x00030067, + 0x00030067, + 0x00030067, + 0x00030067, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + }, + { + 0x00010018, + 0x00010018, + 0x0001005a, + 0x0001005a, + 0x0001006a, + 0x0001006a, + 0x00010078, + 0x00010078, + 0x00020006, + 0x00020006, + 0x00020006, + 0x00020006, + 0x00020039, + 0x00020039, + 0x00020039, + 0x00020039, + }, + { + 0x00020049, + 0x00020049, + 0x00020049, + 0x00020049, + 0x00020059, + 0x00020059, + 0x00020059, + 0x00020059, + 0x00020066, + 0x00020066, + 0x00020066, + 0x00020066, + 0x00020069, + 0x00020069, + 0x00020069, + 0x00020069, + }, + { + 0x0018ffff, + 0x0029ffff, + 0x003affff, + 0x0010ffff, + 0x0011ffff, + 0x000fffff, + 0x000cffff, + 0x000dffff, + 0x000effff, + 0x00000007, + 0x00000029, + 0x0000003a, + 0x0000004a, + 0x00000077, + 0x00000079, + 0x0000007a, + }, + { + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004b, + }, + { + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x0003006b, + }, + { + 0x00030089, + 0x00030089, + 0x00030089, + 0x00030089, + 0x00030089, + 0x00030089, + 0x00030089, + 0x00030089, + 0x0003008a, + 0x0003008a, + 0x0003008a, + 0x0003008a, + 0x0003008a, + 0x0003008a, + 0x0003008a, + 0x0003008a, + }, + { + 0x00020008, + 0x00020008, + 0x00020008, + 0x00020008, + 0x0002002a, + 0x0002002a, + 0x0002002a, + 0x0002002a, + 0x0002003b, + 0x0002003b, + 0x0002003b, + 0x0002003b, + 0x0002007b, + 0x0002007b, + 0x0002007b, + 0x0002007b, + }, + { + 0x004bffff, + 0x0012ffff, + 0x0015ffff, + 0x0013ffff, + 0x0014ffff, + 0x0016ffff, + 0x0017ffff, + 0x0000003c, + 0x0000006d, + 0x0000007d, + 0x0000008d, + 0x0000008e, + 0x0000009a, + 0x0000009b, + 0x00010009, + 0x00010009, + }, + { + 0x0001001a, + 0x0001001a, + 0x0001004c, + 0x0001004c, + 0x0001005c, + 0x0001005c, + 0x0001006c, + 0x0001006c, + 0x0001007c, + 0x0001007c, + 0x00010088, + 0x00010088, + 0x0001008b, + 0x0001008b, + 0x0001008c, + 0x0001008c, + }, + { + 0x0002011f, + 0x0002011f, + 0x0002011f, + 0x0002011f, + 0x00020120, + 0x00020120, + 0x00020120, + 0x00020120, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + }, + { + 0x0003004d, + 0x0003004d, + 0x0003004d, + 0x0003004d, + 0x0003004d, + 0x0003004d, + 0x0003004d, + 0x0003004d, + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005d, + }, + { + 0x0003005e, + 0x0003005e, + 0x0003005e, + 0x0003005e, + 0x0003005e, + 0x0003005e, + 0x0003005e, + 0x0003005e, + 0x00030099, + 0x00030099, + 0x00030099, + 0x00030099, + 0x00030099, + 0x00030099, + 0x00030099, + 0x00030099, + }, + { + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + }, + { + 0x0003009c, + 0x0003009c, + 0x0003009c, + 0x0003009c, + 0x0003009c, + 0x0003009c, + 0x0003009c, + 0x0003009c, + 0x0003009d, + 0x0003009d, + 0x0003009d, + 0x0003009d, + 0x0003009d, + 0x0003009d, + 0x0003009d, + 0x0003009d, + }, + { + 0x0003009e, + 0x0003009e, + 0x0003009e, + 0x0003009e, + 0x0003009e, + 0x0003009e, + 0x0003009e, + 0x0003009e, + 0x000300ac, + 0x000300ac, + 0x000300ac, + 0x000300ac, + 0x000300ac, + 0x000300ac, + 0x000300ac, + 0x000300ac, + }, + { + 0x0025ffff, + 0x001fffff, + 0x0019ffff, + 0x0020ffff, + 0x001effff, + 0x0021ffff, + 0x001affff, + 0x001bffff, + 0x001cffff, + 0x001dffff, + 0x0022ffff, + 0x0023ffff, + 0x0024ffff, + 0x0026ffff, + 0x0027ffff, + 0x0028ffff, + }, + { + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020020, + }, + { + 0x00020042, + 0x00020042, + 0x00020042, + 0x00020042, + 0x00020043, + 0x00020043, + 0x00020043, + 0x00020043, + 0x0002004e, + 0x0002004e, + 0x0002004e, + 0x0002004e, + 0x0002004f, + 0x0002004f, + 0x0002004f, + 0x0002004f, + }, + { + 0x00020050, + 0x00020050, + 0x00020050, + 0x00020050, + 0x00020051, + 0x00020051, + 0x00020051, + 0x00020051, + 0x00020052, + 0x00020052, + 0x00020052, + 0x00020052, + 0x00020053, + 0x00020053, + 0x00020053, + 0x00020053, + }, + { + 0x00020054, + 0x00020054, + 0x00020054, + 0x00020054, + 0x0002005f, + 0x0002005f, + 0x0002005f, + 0x0002005f, + 0x00020060, + 0x00020060, + 0x00020060, + 0x00020060, + 0x00020061, + 0x00020061, + 0x00020061, + 0x00020061, + }, + { + 0x00020062, + 0x00020062, + 0x00020062, + 0x00020062, + 0x00020063, + 0x00020063, + 0x00020063, + 0x00020063, + 0x00020064, + 0x00020064, + 0x00020064, + 0x00020064, + 0x00020065, + 0x00020065, + 0x00020065, + 0x00020065, + }, + { + 0x0002002f, + 0x0002002f, + 0x0002002f, + 0x0002002f, + 0x00020030, + 0x00020030, + 0x00020030, + 0x00020030, + 0x00020031, + 0x00020031, + 0x00020031, + 0x00020031, + 0x00020032, + 0x00020032, + 0x00020032, + 0x00020032, + }, + { + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020010, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001b, + }, + { + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020021, + 0x0002002c, + 0x0002002c, + 0x0002002c, + 0x0002002c, + 0x0002002d, + 0x0002002d, + 0x0002002d, + 0x0002002d, + 0x0002002e, + 0x0002002e, + 0x0002002e, + 0x0002002e, + }, + { + 0x0002003e, + 0x0002003e, + 0x0002003e, + 0x0002003e, + 0x0002003f, + 0x0002003f, + 0x0002003f, + 0x0002003f, + 0x00020040, + 0x00020040, + 0x00020040, + 0x00020040, + 0x00020041, + 0x00020041, + 0x00020041, + 0x00020041, + }, + { + 0x0002006e, + 0x0002006e, + 0x0002006e, + 0x0002006e, + 0x0002006f, + 0x0002006f, + 0x0002006f, + 0x0002006f, + 0x00020070, + 0x00020070, + 0x00020070, + 0x00020070, + 0x00020071, + 0x00020071, + 0x00020071, + 0x00020071, + }, + { + 0x00020072, + 0x00020072, + 0x00020072, + 0x00020072, + 0x00020073, + 0x00020073, + 0x00020073, + 0x00020073, + 0x00020074, + 0x00020074, + 0x00020074, + 0x00020074, + 0x00020075, + 0x00020075, + 0x00020075, + 0x00020075, + }, + { + 0x00020076, + 0x00020076, + 0x00020076, + 0x00020076, + 0x0002007e, + 0x0002007e, + 0x0002007e, + 0x0002007e, + 0x0002007f, + 0x0002007f, + 0x0002007f, + 0x0002007f, + 0x00020080, + 0x00020080, + 0x00020080, + 0x00020080, + }, + { + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000d, + }, + { + 0x00020081, + 0x00020081, + 0x00020081, + 0x00020081, + 0x00020082, + 0x00020082, + 0x00020082, + 0x00020082, + 0x00020083, + 0x00020083, + 0x00020083, + 0x00020083, + 0x00020084, + 0x00020084, + 0x00020084, + 0x00020084, + }, + { + 0x00020085, + 0x00020085, + 0x00020085, + 0x00020085, + 0x00020086, + 0x00020086, + 0x00020086, + 0x00020086, + 0x00020087, + 0x00020087, + 0x00020087, + 0x00020087, + 0x0002008f, + 0x0002008f, + 0x0002008f, + 0x0002008f, + }, + { + 0x00020090, + 0x00020090, + 0x00020090, + 0x00020090, + 0x00020091, + 0x00020091, + 0x00020091, + 0x00020091, + 0x00020092, + 0x00020092, + 0x00020092, + 0x00020092, + 0x00020093, + 0x00020093, + 0x00020093, + 0x00020093, + }, + { + 0x002affff, + 0x002bffff, + 0x002cffff, + 0x002dffff, + 0x002effff, + 0x002fffff, + 0x0030ffff, + 0x0031ffff, + 0x0032ffff, + 0x0033ffff, + 0x0034ffff, + 0x0035ffff, + 0x0036ffff, + 0x0037ffff, + 0x0038ffff, + 0x0039ffff, + }, + { + 0x00020094, + 0x00020094, + 0x00020094, + 0x00020094, + 0x00020095, + 0x00020095, + 0x00020095, + 0x00020095, + 0x00020096, + 0x00020096, + 0x00020096, + 0x00020096, + 0x00020097, + 0x00020097, + 0x00020097, + 0x00020097, + }, + { + 0x00020098, + 0x00020098, + 0x00020098, + 0x00020098, + 0x0002009f, + 0x0002009f, + 0x0002009f, + 0x0002009f, + 0x000200a0, + 0x000200a0, + 0x000200a0, + 0x000200a0, + 0x000200a1, + 0x000200a1, + 0x000200a1, + 0x000200a1, + }, + { + 0x000200a2, + 0x000200a2, + 0x000200a2, + 0x000200a2, + 0x000200a3, + 0x000200a3, + 0x000200a3, + 0x000200a3, + 0x000200a4, + 0x000200a4, + 0x000200a4, + 0x000200a4, + 0x000200a5, + 0x000200a5, + 0x000200a5, + 0x000200a5, + }, + { + 0x000200a6, + 0x000200a6, + 0x000200a6, + 0x000200a6, + 0x000200a7, + 0x000200a7, + 0x000200a7, + 0x000200a7, + 0x000200a8, + 0x000200a8, + 0x000200a8, + 0x000200a8, + 0x000200a9, + 0x000200a9, + 0x000200a9, + 0x000200a9, + }, + { + 0x000200aa, + 0x000200aa, + 0x000200aa, + 0x000200aa, + 0x000200ab, + 0x000200ab, + 0x000200ab, + 0x000200ab, + 0x000200ad, + 0x000200ad, + 0x000200ad, + 0x000200ad, + 0x000200ae, + 0x000200ae, + 0x000200ae, + 0x000200ae, + }, + { + 0x000200af, + 0x000200af, + 0x000200af, + 0x000200af, + 0x000200b0, + 0x000200b0, + 0x000200b0, + 0x000200b0, + 0x000200b1, + 0x000200b1, + 0x000200b1, + 0x000200b1, + 0x000200b2, + 0x000200b2, + 0x000200b2, + 0x000200b2, + }, + { + 0x000200b3, + 0x000200b3, + 0x000200b3, + 0x000200b3, + 0x000200b4, + 0x000200b4, + 0x000200b4, + 0x000200b4, + 0x000200b5, + 0x000200b5, + 0x000200b5, + 0x000200b5, + 0x000200b6, + 0x000200b6, + 0x000200b6, + 0x000200b6, + }, + { + 0x000200b7, + 0x000200b7, + 0x000200b7, + 0x000200b7, + 0x000200b8, + 0x000200b8, + 0x000200b8, + 0x000200b8, + 0x000200b9, + 0x000200b9, + 0x000200b9, + 0x000200b9, + 0x000200ba, + 0x000200ba, + 0x000200ba, + 0x000200ba, + }, + { + 0x000200bb, + 0x000200bb, + 0x000200bb, + 0x000200bb, + 0x000200bc, + 0x000200bc, + 0x000200bc, + 0x000200bc, + 0x000200bd, + 0x000200bd, + 0x000200bd, + 0x000200bd, + 0x000200be, + 0x000200be, + 0x000200be, + 0x000200be, + }, + { + 0x000200bf, + 0x000200bf, + 0x000200bf, + 0x000200bf, + 0x000200c0, + 0x000200c0, + 0x000200c0, + 0x000200c0, + 0x000200c1, + 0x000200c1, + 0x000200c1, + 0x000200c1, + 0x000200c2, + 0x000200c2, + 0x000200c2, + 0x000200c2, + }, + { + 0x000200c3, + 0x000200c3, + 0x000200c3, + 0x000200c3, + 0x000200c4, + 0x000200c4, + 0x000200c4, + 0x000200c4, + 0x000200c5, + 0x000200c5, + 0x000200c5, + 0x000200c5, + 0x000200c6, + 0x000200c6, + 0x000200c6, + 0x000200c6, + }, + { + 0x000200c7, + 0x000200c7, + 0x000200c7, + 0x000200c7, + 0x000200c8, + 0x000200c8, + 0x000200c8, + 0x000200c8, + 0x000200c9, + 0x000200c9, + 0x000200c9, + 0x000200c9, + 0x000200ca, + 0x000200ca, + 0x000200ca, + 0x000200ca, + }, + { + 0x000200cb, + 0x000200cb, + 0x000200cb, + 0x000200cb, + 0x000200cc, + 0x000200cc, + 0x000200cc, + 0x000200cc, + 0x000200cd, + 0x000200cd, + 0x000200cd, + 0x000200cd, + 0x000200ce, + 0x000200ce, + 0x000200ce, + 0x000200ce, + }, + { + 0x000200cf, + 0x000200cf, + 0x000200cf, + 0x000200cf, + 0x000200d0, + 0x000200d0, + 0x000200d0, + 0x000200d0, + 0x000200d1, + 0x000200d1, + 0x000200d1, + 0x000200d1, + 0x000200d2, + 0x000200d2, + 0x000200d2, + 0x000200d2, + }, + { + 0x000200d3, + 0x000200d3, + 0x000200d3, + 0x000200d3, + 0x000200d4, + 0x000200d4, + 0x000200d4, + 0x000200d4, + 0x000200d5, + 0x000200d5, + 0x000200d5, + 0x000200d5, + 0x000200d6, + 0x000200d6, + 0x000200d6, + 0x000200d6, + }, + { + 0x000200d7, + 0x000200d7, + 0x000200d7, + 0x000200d7, + 0x000200d8, + 0x000200d8, + 0x000200d8, + 0x000200d8, + 0x000200d9, + 0x000200d9, + 0x000200d9, + 0x000200d9, + 0x000200da, + 0x000200da, + 0x000200da, + 0x000200da, + }, + { + 0x003bffff, + 0x003cffff, + 0x003dffff, + 0x003effff, + 0x003fffff, + 0x0040ffff, + 0x0041ffff, + 0x0042ffff, + 0x0043ffff, + 0x0044ffff, + 0x0045ffff, + 0x0046ffff, + 0x0047ffff, + 0x0048ffff, + 0x0049ffff, + 0x004affff, + }, + { + 0x000200db, + 0x000200db, + 0x000200db, + 0x000200db, + 0x000200dc, + 0x000200dc, + 0x000200dc, + 0x000200dc, + 0x000200dd, + 0x000200dd, + 0x000200dd, + 0x000200dd, + 0x000200de, + 0x000200de, + 0x000200de, + 0x000200de, + }, + { + 0x000200df, + 0x000200df, + 0x000200df, + 0x000200df, + 0x000200e0, + 0x000200e0, + 0x000200e0, + 0x000200e0, + 0x000200e1, + 0x000200e1, + 0x000200e1, + 0x000200e1, + 0x000200e2, + 0x000200e2, + 0x000200e2, + 0x000200e2, + }, + { + 0x000200e3, + 0x000200e3, + 0x000200e3, + 0x000200e3, + 0x000200e4, + 0x000200e4, + 0x000200e4, + 0x000200e4, + 0x000200e5, + 0x000200e5, + 0x000200e5, + 0x000200e5, + 0x000200e6, + 0x000200e6, + 0x000200e6, + 0x000200e6, + }, + { + 0x000200e7, + 0x000200e7, + 0x000200e7, + 0x000200e7, + 0x000200e8, + 0x000200e8, + 0x000200e8, + 0x000200e8, + 0x000200e9, + 0x000200e9, + 0x000200e9, + 0x000200e9, + 0x000200ea, + 0x000200ea, + 0x000200ea, + 0x000200ea, + }, + { + 0x000200eb, + 0x000200eb, + 0x000200eb, + 0x000200eb, + 0x000200ec, + 0x000200ec, + 0x000200ec, + 0x000200ec, + 0x000200ed, + 0x000200ed, + 0x000200ed, + 0x000200ed, + 0x000200ee, + 0x000200ee, + 0x000200ee, + 0x000200ee, + }, + { + 0x000200ef, + 0x000200ef, + 0x000200ef, + 0x000200ef, + 0x000200f0, + 0x000200f0, + 0x000200f0, + 0x000200f0, + 0x000200f1, + 0x000200f1, + 0x000200f1, + 0x000200f1, + 0x000200f2, + 0x000200f2, + 0x000200f2, + 0x000200f2, + }, + { + 0x000200f3, + 0x000200f3, + 0x000200f3, + 0x000200f3, + 0x000200f4, + 0x000200f4, + 0x000200f4, + 0x000200f4, + 0x000200f5, + 0x000200f5, + 0x000200f5, + 0x000200f5, + 0x000200f6, + 0x000200f6, + 0x000200f6, + 0x000200f6, + }, + { + 0x000200f7, + 0x000200f7, + 0x000200f7, + 0x000200f7, + 0x000200f8, + 0x000200f8, + 0x000200f8, + 0x000200f8, + 0x000200f9, + 0x000200f9, + 0x000200f9, + 0x000200f9, + 0x000200fa, + 0x000200fa, + 0x000200fa, + 0x000200fa, + }, + { + 0x000200fb, + 0x000200fb, + 0x000200fb, + 0x000200fb, + 0x000200fc, + 0x000200fc, + 0x000200fc, + 0x000200fc, + 0x000200fd, + 0x000200fd, + 0x000200fd, + 0x000200fd, + 0x000200fe, + 0x000200fe, + 0x000200fe, + 0x000200fe, + }, + { + 0x000200ff, + 0x000200ff, + 0x000200ff, + 0x000200ff, + 0x00020100, + 0x00020100, + 0x00020100, + 0x00020100, + 0x00020101, + 0x00020101, + 0x00020101, + 0x00020101, + 0x00020102, + 0x00020102, + 0x00020102, + 0x00020102, + }, + { + 0x00020103, + 0x00020103, + 0x00020103, + 0x00020103, + 0x00020104, + 0x00020104, + 0x00020104, + 0x00020104, + 0x00020105, + 0x00020105, + 0x00020105, + 0x00020105, + 0x00020106, + 0x00020106, + 0x00020106, + 0x00020106, + }, + { + 0x00020107, + 0x00020107, + 0x00020107, + 0x00020107, + 0x00020108, + 0x00020108, + 0x00020108, + 0x00020108, + 0x00020109, + 0x00020109, + 0x00020109, + 0x00020109, + 0x0002010a, + 0x0002010a, + 0x0002010a, + 0x0002010a, + }, + { + 0x0002010b, + 0x0002010b, + 0x0002010b, + 0x0002010b, + 0x0002010c, + 0x0002010c, + 0x0002010c, + 0x0002010c, + 0x0002010d, + 0x0002010d, + 0x0002010d, + 0x0002010d, + 0x0002010e, + 0x0002010e, + 0x0002010e, + 0x0002010e, + }, + { + 0x0002010f, + 0x0002010f, + 0x0002010f, + 0x0002010f, + 0x00020110, + 0x00020110, + 0x00020110, + 0x00020110, + 0x00020111, + 0x00020111, + 0x00020111, + 0x00020111, + 0x00020112, + 0x00020112, + 0x00020112, + 0x00020112, + }, + { + 0x00020113, + 0x00020113, + 0x00020113, + 0x00020113, + 0x00020114, + 0x00020114, + 0x00020114, + 0x00020114, + 0x00020115, + 0x00020115, + 0x00020115, + 0x00020115, + 0x00020116, + 0x00020116, + 0x00020116, + 0x00020116, + }, + { + 0x00020117, + 0x00020117, + 0x00020117, + 0x00020117, + 0x00020118, + 0x00020118, + 0x00020118, + 0x00020118, + 0x00020119, + 0x00020119, + 0x00020119, + 0x00020119, + 0x0002011a, + 0x0002011a, + 0x0002011a, + 0x0002011a, + }, + { + 0x0002011b, + 0x0002011b, + 0x0002011b, + 0x0002011b, + 0x0002011c, + 0x0002011c, + 0x0002011c, + 0x0002011c, + 0x0002011d, + 0x0002011d, + 0x0002011d, + 0x0002011d, + 0x0002011e, + 0x0002011e, + 0x0002011e, + 0x0002011e, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc13[324][2] = +#else +const uint16_t c_aauiCQMFHuffEnc13[324][2] = +#endif + { + { 0x0004, 0x0006 }, + { 0x0004, 0x0007 }, + { 0x0005, 0x0005 }, + { 0x0005, 0x0006 }, + { 0x0006, 0x0004 }, + { 0x0008, 0x0005 }, + { 0x000a, 0x0005 }, + { 0x000c, 0x0007 }, + { 0x000e, 0x000b }, + { 0x0010, 0x0011 }, + { 0x0012, 0x002d }, + { 0x0015, 0x0000 }, + { 0x0014, 0x0035 }, + { 0x0015, 0x0001 }, + { 0x0015, 0x0002 }, + { 0x0015, 0x0003 }, + { 0x0015, 0x0004 }, + { 0x0015, 0x0005 }, + { 0x0004, 0x0008 }, + { 0x0003, 0x0007 }, + { 0x0004, 0x0009 }, + { 0x0004, 0x000a }, + { 0x0006, 0x0005 }, + { 0x0008, 0x0006 }, + { 0x0009, 0x0006 }, + { 0x000c, 0x0008 }, + { 0x000d, 0x0009 }, + { 0x0010, 0x0012 }, + { 0x0011, 0x001a }, + { 0x0015, 0x0006 }, + { 0x0015, 0x0007 }, + { 0x0015, 0x0008 }, + { 0x0015, 0x0009 }, + { 0x0015, 0x000a }, + { 0x0015, 0x000b }, + { 0x0015, 0x000c }, + { 0x0005, 0x0007 }, + { 0x0004, 0x000b }, + { 0x0004, 0x000c }, + { 0x0005, 0x0008 }, + { 0x0006, 0x0006 }, + { 0x0008, 0x0007 }, + { 0x000a, 0x0006 }, + { 0x000c, 0x0009 }, + { 0x000e, 0x000c }, + { 0x0010, 0x0013 }, + { 0x0012, 0x002e }, + { 0x0015, 0x000d }, + { 0x0015, 0x000e }, + { 0x0015, 0x000f }, + { 0x0015, 0x0010 }, + { 0x0015, 0x0011 }, + { 0x0015, 0x0012 }, + { 0x0015, 0x0013 }, + { 0x0005, 0x0009 }, + { 0x0004, 0x000d }, + { 0x0005, 0x000a }, + { 0x0006, 0x0007 }, + { 0x0007, 0x0005 }, + { 0x0009, 0x0007 }, + { 0x000b, 0x0008 }, + { 0x000d, 0x000a }, + { 0x000f, 0x000e }, + { 0x0010, 0x0014 }, + { 0x0011, 0x001b }, + { 0x0014, 0x0036 }, + { 0x0015, 0x0014 }, + { 0x0015, 0x0015 }, + { 0x0015, 0x0016 }, + { 0x0015, 0x0017 }, + { 0x0015, 0x0018 }, + { 0x0015, 0x0019 }, + { 0x0006, 0x0008 }, + { 0x0005, 0x000b }, + { 0x0006, 0x0009 }, + { 0x0007, 0x0006 }, + { 0x0009, 0x0008 }, + { 0x000a, 0x0007 }, + { 0x000c, 0x000a }, + { 0x000e, 0x000d }, + { 0x0010, 0x0015 }, + { 0x0011, 0x001c }, + { 0x0013, 0x0053 }, + { 0x0015, 0x001a }, + { 0x0015, 0x001b }, + { 0x0015, 0x001c }, + { 0x0015, 0x001d }, + { 0x0015, 0x001e }, + { 0x0015, 0x001f }, + { 0x0015, 0x0020 }, + { 0x0008, 0x0008 }, + { 0x0007, 0x0007 }, + { 0x0008, 0x0009 }, + { 0x0009, 0x0009 }, + { 0x000a, 0x0008 }, + { 0x000c, 0x000b }, + { 0x000d, 0x000b }, + { 0x000f, 0x000f }, + { 0x0010, 0x0016 }, + { 0x0011, 0x001d }, + { 0x0014, 0x0037 }, + { 0x0015, 0x0021 }, + { 0x0015, 0x0022 }, + { 0x0015, 0x0023 }, + { 0x0015, 0x0024 }, + { 0x0015, 0x0025 }, + { 0x0015, 0x0026 }, + { 0x0015, 0x0027 }, + { 0x000a, 0x0009 }, + { 0x000a, 0x000a }, + { 0x000a, 0x000b }, + { 0x000b, 0x0009 }, + { 0x000c, 0x000c }, + { 0x000d, 0x000c }, + { 0x000f, 0x0010 }, + { 0x0010, 0x0017 }, + { 0x0012, 0x002f }, + { 0x0015, 0x0028 }, + { 0x0015, 0x0029 }, + { 0x0015, 0x002a }, + { 0x0015, 0x002b }, + { 0x0015, 0x002c }, + { 0x0015, 0x002d }, + { 0x0015, 0x002e }, + { 0x0015, 0x002f }, + { 0x0015, 0x0030 }, + { 0x000c, 0x000d }, + { 0x000c, 0x000e }, + { 0x000c, 0x000f }, + { 0x000d, 0x000d }, + { 0x000e, 0x000e }, + { 0x000f, 0x0011 }, + { 0x0010, 0x0018 }, + { 0x0011, 0x001e }, + { 0x0014, 0x0038 }, + { 0x0015, 0x0031 }, + { 0x0015, 0x0032 }, + { 0x0015, 0x0033 }, + { 0x0015, 0x0034 }, + { 0x0015, 0x0035 }, + { 0x0015, 0x0036 }, + { 0x0015, 0x0037 }, + { 0x0015, 0x0038 }, + { 0x0015, 0x0039 }, + { 0x000f, 0x0012 }, + { 0x000e, 0x000f }, + { 0x000e, 0x0010 }, + { 0x000e, 0x0011 }, + { 0x000f, 0x0013 }, + { 0x0010, 0x0019 }, + { 0x0011, 0x001f }, + { 0x0013, 0x0054 }, + { 0x0015, 0x003a }, + { 0x0014, 0x0039 }, + { 0x0015, 0x003b }, + { 0x0015, 0x003c }, + { 0x0015, 0x003d }, + { 0x0015, 0x003e }, + { 0x0015, 0x003f }, + { 0x0015, 0x0040 }, + { 0x0015, 0x0041 }, + { 0x0015, 0x0042 }, + { 0x0010, 0x001a }, + { 0x000f, 0x0014 }, + { 0x000f, 0x0015 }, + { 0x0010, 0x001b }, + { 0x0011, 0x0020 }, + { 0x0012, 0x0030 }, + { 0x0013, 0x0055 }, + { 0x0015, 0x0043 }, + { 0x0015, 0x0044 }, + { 0x0014, 0x003a }, + { 0x0015, 0x0045 }, + { 0x0015, 0x0046 }, + { 0x0015, 0x0047 }, + { 0x0015, 0x0048 }, + { 0x0015, 0x0049 }, + { 0x0015, 0x004a }, + { 0x0015, 0x004b }, + { 0x0015, 0x004c }, + { 0x0012, 0x0031 }, + { 0x0011, 0x0021 }, + { 0x0013, 0x0056 }, + { 0x0013, 0x0057 }, + { 0x0012, 0x0032 }, + { 0x0015, 0x004d }, + { 0x0015, 0x004e }, + { 0x0015, 0x004f }, + { 0x0015, 0x0050 }, + { 0x0015, 0x0051 }, + { 0x0015, 0x0052 }, + { 0x0015, 0x0053 }, + { 0x0015, 0x0054 }, + { 0x0015, 0x0055 }, + { 0x0015, 0x0056 }, + { 0x0015, 0x0057 }, + { 0x0015, 0x0058 }, + { 0x0015, 0x0059 }, + { 0x0015, 0x005a }, + { 0x0014, 0x003b }, + { 0x0012, 0x0033 }, + { 0x0013, 0x0058 }, + { 0x0013, 0x0059 }, + { 0x0015, 0x005b }, + { 0x0015, 0x005c }, + { 0x0015, 0x005d }, + { 0x0015, 0x005e }, + { 0x0015, 0x005f }, + { 0x0015, 0x0060 }, + { 0x0015, 0x0061 }, + { 0x0015, 0x0062 }, + { 0x0015, 0x0063 }, + { 0x0015, 0x0064 }, + { 0x0015, 0x0065 }, + { 0x0015, 0x0066 }, + { 0x0015, 0x0067 }, + { 0x0015, 0x0068 }, + { 0x0015, 0x0069 }, + { 0x0014, 0x003c }, + { 0x0014, 0x003d }, + { 0x0014, 0x003e }, + { 0x0014, 0x003f }, + { 0x0014, 0x0040 }, + { 0x0014, 0x0041 }, + { 0x0014, 0x0042 }, + { 0x0014, 0x0043 }, + { 0x0014, 0x0044 }, + { 0x0014, 0x0045 }, + { 0x0014, 0x0046 }, + { 0x0014, 0x0047 }, + { 0x0014, 0x0048 }, + { 0x0014, 0x0049 }, + { 0x0014, 0x004a }, + { 0x0014, 0x004b }, + { 0x0014, 0x004c }, + { 0x0014, 0x004d }, + { 0x0014, 0x004e }, + { 0x0014, 0x004f }, + { 0x0014, 0x0050 }, + { 0x0014, 0x0051 }, + { 0x0014, 0x0052 }, + { 0x0014, 0x0053 }, + { 0x0014, 0x0054 }, + { 0x0014, 0x0055 }, + { 0x0014, 0x0056 }, + { 0x0014, 0x0057 }, + { 0x0014, 0x0058 }, + { 0x0014, 0x0059 }, + { 0x0014, 0x005a }, + { 0x0014, 0x005b }, + { 0x0014, 0x005c }, + { 0x0014, 0x005d }, + { 0x0014, 0x005e }, + { 0x0014, 0x005f }, + { 0x0014, 0x0060 }, + { 0x0014, 0x0061 }, + { 0x0014, 0x0062 }, + { 0x0014, 0x0063 }, + { 0x0014, 0x0064 }, + { 0x0014, 0x0065 }, + { 0x0014, 0x0066 }, + { 0x0014, 0x0067 }, + { 0x0014, 0x0068 }, + { 0x0014, 0x0069 }, + { 0x0014, 0x006a }, + { 0x0014, 0x006b }, + { 0x0014, 0x006c }, + { 0x0014, 0x006d }, + { 0x0014, 0x006e }, + { 0x0014, 0x006f }, + { 0x0014, 0x0070 }, + { 0x0014, 0x0071 }, + { 0x0014, 0x0072 }, + { 0x0014, 0x0073 }, + { 0x0014, 0x0074 }, + { 0x0014, 0x0075 }, + { 0x0014, 0x0076 }, + { 0x0014, 0x0077 }, + { 0x0014, 0x0078 }, + { 0x0014, 0x0079 }, + { 0x0014, 0x007a }, + { 0x0014, 0x007b }, + { 0x0014, 0x007c }, + { 0x0014, 0x007d }, + { 0x0014, 0x007e }, + { 0x0014, 0x007f }, + { 0x0014, 0x0080 }, + { 0x0014, 0x0081 }, + { 0x0014, 0x0082 }, + { 0x0014, 0x0083 }, + { 0x0014, 0x0084 }, + { 0x0014, 0x0085 }, + { 0x0014, 0x0086 }, + { 0x0014, 0x0087 }, + { 0x0014, 0x0088 }, + { 0x0014, 0x0089 }, + { 0x0014, 0x008a }, + { 0x0014, 0x008b }, + { 0x0014, 0x008c }, + { 0x0014, 0x008d }, + { 0x0014, 0x008e }, + { 0x0014, 0x008f }, + { 0x0014, 0x0090 }, + { 0x0014, 0x0091 }, + { 0x0014, 0x0092 }, + { 0x0014, 0x0093 }, + { 0x0014, 0x0094 }, + { 0x0014, 0x0095 }, + { 0x0014, 0x0096 }, + { 0x0014, 0x0097 }, + { 0x0014, 0x0098 }, + { 0x0014, 0x0099 }, + { 0x0014, 0x009a }, + { 0x0014, 0x009b }, + { 0x0014, 0x009c }, + { 0x0014, 0x009d }, + { 0x0014, 0x009e }, + { 0x0014, 0x009f }, + { 0x0014, 0x00a0 }, + { 0x0014, 0x00a1 }, + { 0x0014, 0x00a2 }, + { 0x0014, 0x00a3 }, + { 0x0014, 0x00a4 }, + { 0x0014, 0x00a5 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec13[89][16] = { + { + 0x0006ffff, + 0x0005ffff, + 0x0001ffff, + 0x0002ffff, + 0x0003ffff, + 0x0004ffff, + 0x00000000, + 0x00000001, + 0x00000012, + 0x00000014, + 0x00000015, + 0x00000025, + 0x00000026, + 0x00000037, + 0x00010013, + 0x00010013, + }, + { + 0x00020048, + 0x00020048, + 0x00020048, + 0x00020048, + 0x0002004a, + 0x0002004a, + 0x0002004a, + 0x0002004a, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + }, + { + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + }, + { + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + }, + { + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + }, + { + 0x00020004, + 0x00020004, + 0x00020004, + 0x00020004, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020028, + 0x00020028, + 0x00020028, + 0x00020028, + 0x00020039, + 0x00020039, + 0x00020039, + 0x00020039, + }, + { + 0x000bffff, + 0x0009ffff, + 0x000affff, + 0x0007ffff, + 0x0008ffff, + 0x00000005, + 0x00000017, + 0x00000029, + 0x0000005a, + 0x0000005c, + 0x0001003a, + 0x0001003a, + 0x0001004b, + 0x0001004b, + 0x0001005b, + 0x0001005b, + }, + { + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + }, + { + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005d, + }, + { + 0x0001003c, + 0x0001003c, + 0x0001006f, + 0x0001006f, + 0x00020006, + 0x00020006, + 0x00020006, + 0x00020006, + 0x0002002a, + 0x0002002a, + 0x0002002a, + 0x0002002a, + 0x0002004d, + 0x0002004d, + 0x0002004d, + 0x0002004d, + }, + { + 0x0002005e, + 0x0002005e, + 0x0002005e, + 0x0002005e, + 0x0002006c, + 0x0002006c, + 0x0002006c, + 0x0002006c, + 0x0002006d, + 0x0002006d, + 0x0002006d, + 0x0002006d, + 0x0002006e, + 0x0002006e, + 0x0002006e, + 0x0002006e, + }, + { + 0x0012ffff, + 0x0011ffff, + 0x0010ffff, + 0x000fffff, + 0x000dffff, + 0x000cffff, + 0x000effff, + 0x00000007, + 0x00000019, + 0x0000002b, + 0x0000004e, + 0x0000005f, + 0x00000070, + 0x0000007e, + 0x0000007f, + 0x00000080, + }, + { + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x00030060, + 0x00030060, + 0x00030060, + 0x00030060, + 0x00030060, + 0x00030060, + 0x00030060, + 0x00030060, + }, + { + 0x00020092, + 0x00020092, + 0x00020092, + 0x00020092, + 0x00020093, + 0x00020093, + 0x00020093, + 0x00020093, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + }, + { + 0x00030071, + 0x00030071, + 0x00030071, + 0x00030071, + 0x00030071, + 0x00030071, + 0x00030071, + 0x00030071, + 0x00030081, + 0x00030081, + 0x00030081, + 0x00030081, + 0x00030081, + 0x00030081, + 0x00030081, + 0x00030081, + }, + { + 0x0002002c, + 0x0002002c, + 0x0002002c, + 0x0002002c, + 0x0002004f, + 0x0002004f, + 0x0002004f, + 0x0002004f, + 0x00020082, + 0x00020082, + 0x00020082, + 0x00020082, + 0x00020091, + 0x00020091, + 0x00020091, + 0x00020091, + }, + { + 0x00010072, + 0x00010072, + 0x00010083, + 0x00010083, + 0x00010090, + 0x00010090, + 0x00010094, + 0x00010094, + 0x000100a3, + 0x000100a3, + 0x000100a4, + 0x000100a4, + 0x00020008, + 0x00020008, + 0x00020008, + 0x00020008, + }, + { + 0x0016ffff, + 0x00000009, + 0x0000001b, + 0x0000002d, + 0x0000003f, + 0x00000050, + 0x00000062, + 0x00000073, + 0x00000084, + 0x00000095, + 0x000000a2, + 0x000000a5, + 0x0001003e, + 0x0001003e, + 0x00010061, + 0x00010061, + }, + { + 0x0021ffff, + 0x0024ffff, + 0x003dffff, + 0x001affff, + 0x001bffff, + 0x001cffff, + 0x001dffff, + 0x001effff, + 0x001fffff, + 0x0020ffff, + 0x0019ffff, + 0x0017ffff, + 0x0018ffff, + 0x0013ffff, + 0x0014ffff, + 0x0015ffff, + }, + { + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x00030040, + 0x00030040, + 0x00030040, + 0x00030040, + 0x00030040, + 0x00030040, + 0x00030040, + 0x00030040, + }, + { + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030063, + 0x00030063, + 0x00030063, + 0x00030063, + 0x00030063, + 0x00030063, + 0x00030063, + 0x00030063, + }, + { + 0x00030085, + 0x00030085, + 0x00030085, + 0x00030085, + 0x00030085, + 0x00030085, + 0x00030085, + 0x00030085, + 0x00030096, + 0x00030096, + 0x00030096, + 0x00030096, + 0x00030096, + 0x00030096, + 0x00030096, + 0x00030096, + }, + { + 0x000300a6, + 0x000300a6, + 0x000300a6, + 0x000300a6, + 0x000300a6, + 0x000300a6, + 0x000300a6, + 0x000300a6, + 0x000300b5, + 0x000300b5, + 0x000300b5, + 0x000300b5, + 0x000300b5, + 0x000300b5, + 0x000300b5, + 0x000300b5, + }, + { + 0x000100c9, + 0x000100c9, + 0x000100ca, + 0x000100ca, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002002e, + 0x0002002e, + 0x0002002e, + 0x0002002e, + 0x00020074, + 0x00020074, + 0x00020074, + 0x00020074, + }, + { + 0x000200a7, + 0x000200a7, + 0x000200a7, + 0x000200a7, + 0x000200b4, + 0x000200b4, + 0x000200b4, + 0x000200b4, + 0x000200b8, + 0x000200b8, + 0x000200b8, + 0x000200b8, + 0x000200c8, + 0x000200c8, + 0x000200c8, + 0x000200c8, + }, + { + 0x0000013e, + 0x0000013f, + 0x00000140, + 0x00000141, + 0x00000142, + 0x00000143, + 0x00010052, + 0x00010052, + 0x00010097, + 0x00010097, + 0x000100a8, + 0x000100a8, + 0x000100b6, + 0x000100b6, + 0x000100b7, + 0x000100b7, + }, + { + 0x0054ffff, + 0x0055ffff, + 0x0056ffff, + 0x0057ffff, + 0x0058ffff, + 0x0000000c, + 0x00000041, + 0x00000064, + 0x00000086, + 0x00000099, + 0x000000ab, + 0x000000c7, + 0x000000da, + 0x000000db, + 0x000000dc, + 0x000000dd, + }, + { + 0x000000de, + 0x000000df, + 0x000000e0, + 0x000000e1, + 0x000000e2, + 0x000000e3, + 0x000000e4, + 0x000000e5, + 0x000000e6, + 0x000000e7, + 0x000000e8, + 0x000000e9, + 0x000000ea, + 0x000000eb, + 0x000000ec, + 0x000000ed, + }, + { + 0x000000ee, + 0x000000ef, + 0x000000f0, + 0x000000f1, + 0x000000f2, + 0x000000f3, + 0x000000f4, + 0x000000f5, + 0x000000f6, + 0x000000f7, + 0x000000f8, + 0x000000f9, + 0x000000fa, + 0x000000fb, + 0x000000fc, + 0x000000fd, + }, + { + 0x000000fe, + 0x000000ff, + 0x00000100, + 0x00000101, + 0x00000102, + 0x00000103, + 0x00000104, + 0x00000105, + 0x00000106, + 0x00000107, + 0x00000108, + 0x00000109, + 0x0000010a, + 0x0000010b, + 0x0000010c, + 0x0000010d, + }, + { + 0x0000010e, + 0x0000010f, + 0x00000110, + 0x00000111, + 0x00000112, + 0x00000113, + 0x00000114, + 0x00000115, + 0x00000116, + 0x00000117, + 0x00000118, + 0x00000119, + 0x0000011a, + 0x0000011b, + 0x0000011c, + 0x0000011d, + }, + { + 0x0000011e, + 0x0000011f, + 0x00000120, + 0x00000121, + 0x00000122, + 0x00000123, + 0x00000124, + 0x00000125, + 0x00000126, + 0x00000127, + 0x00000128, + 0x00000129, + 0x0000012a, + 0x0000012b, + 0x0000012c, + 0x0000012d, + }, + { + 0x0000012e, + 0x0000012f, + 0x00000130, + 0x00000131, + 0x00000132, + 0x00000133, + 0x00000134, + 0x00000135, + 0x00000136, + 0x00000137, + 0x00000138, + 0x00000139, + 0x0000013a, + 0x0000013b, + 0x0000013c, + 0x0000013d, + }, + { + 0x0026ffff, + 0x002dffff, + 0x0037ffff, + 0x0023ffff, + 0x0044ffff, + 0x002effff, + 0x003affff, + 0x0022ffff, + 0x002cffff, + 0x0035ffff, + 0x002fffff, + 0x0036ffff, + 0x0040ffff, + 0x0049ffff, + 0x0030ffff, + 0x0038ffff, + }, + { + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + }, + { + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + }, + { + 0x0041ffff, + 0x004affff, + 0x0042ffff, + 0x0025ffff, + 0x0027ffff, + 0x0028ffff, + 0x0029ffff, + 0x002affff, + 0x002bffff, + 0x0031ffff, + 0x0032ffff, + 0x0033ffff, + 0x0034ffff, + 0x0039ffff, + 0x003bffff, + 0x003cffff, + }, + { + 0x0003006a, + 0x0003006a, + 0x0003006a, + 0x0003006a, + 0x0003006a, + 0x0003006a, + 0x0003006a, + 0x0003006a, + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x0003006b, + }, + { + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + }, + { + 0x00030075, + 0x00030075, + 0x00030075, + 0x00030075, + 0x00030075, + 0x00030075, + 0x00030075, + 0x00030075, + 0x00030076, + 0x00030076, + 0x00030076, + 0x00030076, + 0x00030076, + 0x00030076, + 0x00030076, + 0x00030076, + }, + { + 0x00030077, + 0x00030077, + 0x00030077, + 0x00030077, + 0x00030077, + 0x00030077, + 0x00030077, + 0x00030077, + 0x00030078, + 0x00030078, + 0x00030078, + 0x00030078, + 0x00030078, + 0x00030078, + 0x00030078, + 0x00030078, + }, + { + 0x00030079, + 0x00030079, + 0x00030079, + 0x00030079, + 0x00030079, + 0x00030079, + 0x00030079, + 0x00030079, + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x0003007a, + }, + { + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x0003007c, + 0x0003007c, + 0x0003007c, + 0x0003007c, + 0x0003007c, + 0x0003007c, + 0x0003007c, + 0x0003007c, + }, + { + 0x0003007d, + 0x0003007d, + 0x0003007d, + 0x0003007d, + 0x0003007d, + 0x0003007d, + 0x0003007d, + 0x0003007d, + 0x00030087, + 0x00030087, + 0x00030087, + 0x00030087, + 0x00030087, + 0x00030087, + 0x00030087, + 0x00030087, + }, + { + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + }, + { + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + }, + { + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + }, + { + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + }, + { + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030056, + }, + { + 0x00030088, + 0x00030088, + 0x00030088, + 0x00030088, + 0x00030088, + 0x00030088, + 0x00030088, + 0x00030088, + 0x00030089, + 0x00030089, + 0x00030089, + 0x00030089, + 0x00030089, + 0x00030089, + 0x00030089, + 0x00030089, + }, + { + 0x0003008a, + 0x0003008a, + 0x0003008a, + 0x0003008a, + 0x0003008a, + 0x0003008a, + 0x0003008a, + 0x0003008a, + 0x0003008b, + 0x0003008b, + 0x0003008b, + 0x0003008b, + 0x0003008b, + 0x0003008b, + 0x0003008b, + 0x0003008b, + }, + { + 0x0003008c, + 0x0003008c, + 0x0003008c, + 0x0003008c, + 0x0003008c, + 0x0003008c, + 0x0003008c, + 0x0003008c, + 0x0003008d, + 0x0003008d, + 0x0003008d, + 0x0003008d, + 0x0003008d, + 0x0003008d, + 0x0003008d, + 0x0003008d, + }, + { + 0x0003008e, + 0x0003008e, + 0x0003008e, + 0x0003008e, + 0x0003008e, + 0x0003008e, + 0x0003008e, + 0x0003008e, + 0x0003008f, + 0x0003008f, + 0x0003008f, + 0x0003008f, + 0x0003008f, + 0x0003008f, + 0x0003008f, + 0x0003008f, + }, + { + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + }, + { + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + }, + { + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + }, + { + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + }, + { + 0x00030098, + 0x00030098, + 0x00030098, + 0x00030098, + 0x00030098, + 0x00030098, + 0x00030098, + 0x00030098, + 0x0003009a, + 0x0003009a, + 0x0003009a, + 0x0003009a, + 0x0003009a, + 0x0003009a, + 0x0003009a, + 0x0003009a, + }, + { + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + }, + { + 0x0003009b, + 0x0003009b, + 0x0003009b, + 0x0003009b, + 0x0003009b, + 0x0003009b, + 0x0003009b, + 0x0003009b, + 0x0003009c, + 0x0003009c, + 0x0003009c, + 0x0003009c, + 0x0003009c, + 0x0003009c, + 0x0003009c, + 0x0003009c, + }, + { + 0x0003009d, + 0x0003009d, + 0x0003009d, + 0x0003009d, + 0x0003009d, + 0x0003009d, + 0x0003009d, + 0x0003009d, + 0x0003009e, + 0x0003009e, + 0x0003009e, + 0x0003009e, + 0x0003009e, + 0x0003009e, + 0x0003009e, + 0x0003009e, + }, + { + 0x003effff, + 0x003fffff, + 0x0043ffff, + 0x0045ffff, + 0x0046ffff, + 0x0047ffff, + 0x0048ffff, + 0x004bffff, + 0x004cffff, + 0x004dffff, + 0x004effff, + 0x004fffff, + 0x0050ffff, + 0x0051ffff, + 0x0052ffff, + 0x0053ffff, + }, + { + 0x0003009f, + 0x0003009f, + 0x0003009f, + 0x0003009f, + 0x0003009f, + 0x0003009f, + 0x0003009f, + 0x0003009f, + 0x000300a0, + 0x000300a0, + 0x000300a0, + 0x000300a0, + 0x000300a0, + 0x000300a0, + 0x000300a0, + 0x000300a0, + }, + { + 0x000300a1, + 0x000300a1, + 0x000300a1, + 0x000300a1, + 0x000300a1, + 0x000300a1, + 0x000300a1, + 0x000300a1, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + }, + { + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + }, + { + 0x00030059, + 0x00030059, + 0x00030059, + 0x00030059, + 0x00030059, + 0x00030059, + 0x00030059, + 0x00030059, + 0x00030065, + 0x00030065, + 0x00030065, + 0x00030065, + 0x00030065, + 0x00030065, + 0x00030065, + 0x00030065, + }, + { + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + }, + { + 0x000300aa, + 0x000300aa, + 0x000300aa, + 0x000300aa, + 0x000300aa, + 0x000300aa, + 0x000300aa, + 0x000300aa, + 0x000300ac, + 0x000300ac, + 0x000300ac, + 0x000300ac, + 0x000300ac, + 0x000300ac, + 0x000300ac, + 0x000300ac, + }, + { + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + }, + { + 0x000300ad, + 0x000300ad, + 0x000300ad, + 0x000300ad, + 0x000300ad, + 0x000300ad, + 0x000300ad, + 0x000300ad, + 0x000300ae, + 0x000300ae, + 0x000300ae, + 0x000300ae, + 0x000300ae, + 0x000300ae, + 0x000300ae, + 0x000300ae, + }, + { + 0x000300af, + 0x000300af, + 0x000300af, + 0x000300af, + 0x000300af, + 0x000300af, + 0x000300af, + 0x000300af, + 0x000300b0, + 0x000300b0, + 0x000300b0, + 0x000300b0, + 0x000300b0, + 0x000300b0, + 0x000300b0, + 0x000300b0, + }, + { + 0x000300b1, + 0x000300b1, + 0x000300b1, + 0x000300b1, + 0x000300b1, + 0x000300b1, + 0x000300b1, + 0x000300b1, + 0x000300b2, + 0x000300b2, + 0x000300b2, + 0x000300b2, + 0x000300b2, + 0x000300b2, + 0x000300b2, + 0x000300b2, + }, + { + 0x000300b3, + 0x000300b3, + 0x000300b3, + 0x000300b3, + 0x000300b3, + 0x000300b3, + 0x000300b3, + 0x000300b3, + 0x000300b9, + 0x000300b9, + 0x000300b9, + 0x000300b9, + 0x000300b9, + 0x000300b9, + 0x000300b9, + 0x000300b9, + }, + { + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + }, + { + 0x00030066, + 0x00030066, + 0x00030066, + 0x00030066, + 0x00030066, + 0x00030066, + 0x00030066, + 0x00030066, + 0x00030067, + 0x00030067, + 0x00030067, + 0x00030067, + 0x00030067, + 0x00030067, + 0x00030067, + 0x00030067, + }, + { + 0x000300ba, + 0x000300ba, + 0x000300ba, + 0x000300ba, + 0x000300ba, + 0x000300ba, + 0x000300ba, + 0x000300ba, + 0x000300bb, + 0x000300bb, + 0x000300bb, + 0x000300bb, + 0x000300bb, + 0x000300bb, + 0x000300bb, + 0x000300bb, + }, + { + 0x000300bc, + 0x000300bc, + 0x000300bc, + 0x000300bc, + 0x000300bc, + 0x000300bc, + 0x000300bc, + 0x000300bc, + 0x000300bd, + 0x000300bd, + 0x000300bd, + 0x000300bd, + 0x000300bd, + 0x000300bd, + 0x000300bd, + 0x000300bd, + }, + { + 0x000300be, + 0x000300be, + 0x000300be, + 0x000300be, + 0x000300be, + 0x000300be, + 0x000300be, + 0x000300be, + 0x000300bf, + 0x000300bf, + 0x000300bf, + 0x000300bf, + 0x000300bf, + 0x000300bf, + 0x000300bf, + 0x000300bf, + }, + { + 0x000300c0, + 0x000300c0, + 0x000300c0, + 0x000300c0, + 0x000300c0, + 0x000300c0, + 0x000300c0, + 0x000300c0, + 0x000300c1, + 0x000300c1, + 0x000300c1, + 0x000300c1, + 0x000300c1, + 0x000300c1, + 0x000300c1, + 0x000300c1, + }, + { + 0x000300c2, + 0x000300c2, + 0x000300c2, + 0x000300c2, + 0x000300c2, + 0x000300c2, + 0x000300c2, + 0x000300c2, + 0x000300c3, + 0x000300c3, + 0x000300c3, + 0x000300c3, + 0x000300c3, + 0x000300c3, + 0x000300c3, + 0x000300c3, + }, + { + 0x000300c4, + 0x000300c4, + 0x000300c4, + 0x000300c4, + 0x000300c4, + 0x000300c4, + 0x000300c4, + 0x000300c4, + 0x000300c5, + 0x000300c5, + 0x000300c5, + 0x000300c5, + 0x000300c5, + 0x000300c5, + 0x000300c5, + 0x000300c5, + }, + { + 0x000300c6, + 0x000300c6, + 0x000300c6, + 0x000300c6, + 0x000300c6, + 0x000300c6, + 0x000300c6, + 0x000300c6, + 0x000300cb, + 0x000300cb, + 0x000300cb, + 0x000300cb, + 0x000300cb, + 0x000300cb, + 0x000300cb, + 0x000300cb, + }, + { + 0x000300cc, + 0x000300cc, + 0x000300cc, + 0x000300cc, + 0x000300cc, + 0x000300cc, + 0x000300cc, + 0x000300cc, + 0x000300cd, + 0x000300cd, + 0x000300cd, + 0x000300cd, + 0x000300cd, + 0x000300cd, + 0x000300cd, + 0x000300cd, + }, + { + 0x000300ce, + 0x000300ce, + 0x000300ce, + 0x000300ce, + 0x000300ce, + 0x000300ce, + 0x000300ce, + 0x000300ce, + 0x000300cf, + 0x000300cf, + 0x000300cf, + 0x000300cf, + 0x000300cf, + 0x000300cf, + 0x000300cf, + 0x000300cf, + }, + { + 0x000300d0, + 0x000300d0, + 0x000300d0, + 0x000300d0, + 0x000300d0, + 0x000300d0, + 0x000300d0, + 0x000300d0, + 0x000300d1, + 0x000300d1, + 0x000300d1, + 0x000300d1, + 0x000300d1, + 0x000300d1, + 0x000300d1, + 0x000300d1, + }, + { + 0x000300d2, + 0x000300d2, + 0x000300d2, + 0x000300d2, + 0x000300d2, + 0x000300d2, + 0x000300d2, + 0x000300d2, + 0x000300d3, + 0x000300d3, + 0x000300d3, + 0x000300d3, + 0x000300d3, + 0x000300d3, + 0x000300d3, + 0x000300d3, + }, + { + 0x000300d4, + 0x000300d4, + 0x000300d4, + 0x000300d4, + 0x000300d4, + 0x000300d4, + 0x000300d4, + 0x000300d4, + 0x000300d5, + 0x000300d5, + 0x000300d5, + 0x000300d5, + 0x000300d5, + 0x000300d5, + 0x000300d5, + 0x000300d5, + }, + { + 0x000300d6, + 0x000300d6, + 0x000300d6, + 0x000300d6, + 0x000300d6, + 0x000300d6, + 0x000300d6, + 0x000300d6, + 0x000300d7, + 0x000300d7, + 0x000300d7, + 0x000300d7, + 0x000300d7, + 0x000300d7, + 0x000300d7, + 0x000300d7, + }, + { + 0x000300d8, + 0x000300d8, + 0x000300d8, + 0x000300d8, + 0x000300d8, + 0x000300d8, + 0x000300d8, + 0x000300d8, + 0x000300d9, + 0x000300d9, + 0x000300d9, + 0x000300d9, + 0x000300d9, + 0x000300d9, + 0x000300d9, + 0x000300d9, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc14[400][2] = +#else +const uint16_t c_aauiCQMFHuffEnc14[400][2] = +#endif + { + { 0x0005, 0x0007 }, + { 0x0004, 0x0009 }, + { 0x0005, 0x0008 }, + { 0x0005, 0x0009 }, + { 0x0006, 0x0006 }, + { 0x0007, 0x0006 }, + { 0x0009, 0x0007 }, + { 0x000b, 0x0008 }, + { 0x000d, 0x000c }, + { 0x000f, 0x0013 }, + { 0x0010, 0x001b }, + { 0x0013, 0x0082 }, + { 0x0013, 0x0083 }, + { 0x0014, 0x0000 }, + { 0x0014, 0x0001 }, + { 0x0014, 0x0002 }, + { 0x0014, 0x0003 }, + { 0x0014, 0x0004 }, + { 0x0014, 0x0005 }, + { 0x0014, 0x0006 }, + { 0x0004, 0x000a }, + { 0x0004, 0x000b }, + { 0x0004, 0x000c }, + { 0x0005, 0x000a }, + { 0x0005, 0x000b }, + { 0x0006, 0x0007 }, + { 0x0008, 0x0006 }, + { 0x000a, 0x0007 }, + { 0x000c, 0x000a }, + { 0x000e, 0x000e }, + { 0x000f, 0x0014 }, + { 0x0011, 0x002a }, + { 0x0012, 0x004a }, + { 0x0013, 0x0084 }, + { 0x0014, 0x0007 }, + { 0x0014, 0x0008 }, + { 0x0014, 0x0009 }, + { 0x0014, 0x000a }, + { 0x0014, 0x000b }, + { 0x0014, 0x000c }, + { 0x0005, 0x000c }, + { 0x0004, 0x000d }, + { 0x0004, 0x000e }, + { 0x0005, 0x000d }, + { 0x0006, 0x0008 }, + { 0x0007, 0x0007 }, + { 0x0008, 0x0007 }, + { 0x000a, 0x0008 }, + { 0x000c, 0x000b }, + { 0x000e, 0x000f }, + { 0x000f, 0x0015 }, + { 0x0012, 0x004b }, + { 0x0013, 0x0085 }, + { 0x0014, 0x000d }, + { 0x0014, 0x000e }, + { 0x0014, 0x000f }, + { 0x0014, 0x0010 }, + { 0x0014, 0x0011 }, + { 0x0014, 0x0012 }, + { 0x0014, 0x0013 }, + { 0x0005, 0x000e }, + { 0x0004, 0x000f }, + { 0x0005, 0x000f }, + { 0x0005, 0x0010 }, + { 0x0006, 0x0009 }, + { 0x0008, 0x0008 }, + { 0x0009, 0x0008 }, + { 0x000b, 0x0009 }, + { 0x000d, 0x000d }, + { 0x000e, 0x0010 }, + { 0x0010, 0x001c }, + { 0x0011, 0x002b }, + { 0x0014, 0x0014 }, + { 0x0014, 0x0015 }, + { 0x0014, 0x0016 }, + { 0x0014, 0x0017 }, + { 0x0014, 0x0018 }, + { 0x0014, 0x0019 }, + { 0x0014, 0x001a }, + { 0x0014, 0x001b }, + { 0x0006, 0x000a }, + { 0x0005, 0x0011 }, + { 0x0006, 0x000b }, + { 0x0006, 0x000c }, + { 0x0007, 0x0008 }, + { 0x0008, 0x0009 }, + { 0x000a, 0x0009 }, + { 0x000c, 0x000c }, + { 0x000e, 0x0011 }, + { 0x000f, 0x0016 }, + { 0x0010, 0x001d }, + { 0x0012, 0x004c }, + { 0x0014, 0x001c }, + { 0x0014, 0x001d }, + { 0x0014, 0x001e }, + { 0x0014, 0x001f }, + { 0x0014, 0x0020 }, + { 0x0014, 0x0021 }, + { 0x0014, 0x0022 }, + { 0x0014, 0x0023 }, + { 0x0007, 0x0009 }, + { 0x0006, 0x000d }, + { 0x0007, 0x000a }, + { 0x0007, 0x000b }, + { 0x0009, 0x0009 }, + { 0x000a, 0x000a }, + { 0x000b, 0x000a }, + { 0x000d, 0x000e }, + { 0x000f, 0x0017 }, + { 0x0011, 0x002c }, + { 0x0010, 0x001e }, + { 0x0014, 0x0024 }, + { 0x0014, 0x0025 }, + { 0x0014, 0x0026 }, + { 0x0014, 0x0027 }, + { 0x0014, 0x0028 }, + { 0x0014, 0x0029 }, + { 0x0014, 0x002a }, + { 0x0014, 0x002b }, + { 0x0014, 0x002c }, + { 0x0009, 0x000a }, + { 0x0008, 0x000a }, + { 0x0008, 0x000b }, + { 0x0009, 0x000b }, + { 0x000a, 0x000b }, + { 0x000b, 0x000b }, + { 0x000d, 0x000f }, + { 0x000e, 0x0012 }, + { 0x000f, 0x0018 }, + { 0x0011, 0x002d }, + { 0x0011, 0x002e }, + { 0x0013, 0x0086 }, + { 0x0014, 0x002d }, + { 0x0014, 0x002e }, + { 0x0014, 0x002f }, + { 0x0014, 0x0030 }, + { 0x0014, 0x0031 }, + { 0x0014, 0x0032 }, + { 0x0014, 0x0033 }, + { 0x0014, 0x0034 }, + { 0x000b, 0x000c }, + { 0x000a, 0x000c }, + { 0x000a, 0x000d }, + { 0x000b, 0x000d }, + { 0x000c, 0x000d }, + { 0x000d, 0x0010 }, + { 0x000e, 0x0013 }, + { 0x000f, 0x0019 }, + { 0x0010, 0x001f }, + { 0x0013, 0x0087 }, + { 0x0014, 0x0035 }, + { 0x0014, 0x0036 }, + { 0x0013, 0x0088 }, + { 0x0014, 0x0037 }, + { 0x0014, 0x0038 }, + { 0x0014, 0x0039 }, + { 0x0014, 0x003a }, + { 0x0014, 0x003b }, + { 0x0014, 0x003c }, + { 0x0014, 0x003d }, + { 0x000d, 0x0011 }, + { 0x000c, 0x000e }, + { 0x000c, 0x000f }, + { 0x000d, 0x0012 }, + { 0x000d, 0x0013 }, + { 0x000e, 0x0014 }, + { 0x0010, 0x0020 }, + { 0x0010, 0x0021 }, + { 0x0012, 0x004d }, + { 0x0011, 0x002f }, + { 0x0014, 0x003e }, + { 0x0014, 0x003f }, + { 0x0014, 0x0040 }, + { 0x0014, 0x0041 }, + { 0x0014, 0x0042 }, + { 0x0014, 0x0043 }, + { 0x0014, 0x0044 }, + { 0x0014, 0x0045 }, + { 0x0014, 0x0046 }, + { 0x0014, 0x0047 }, + { 0x000f, 0x001a }, + { 0x000e, 0x0015 }, + { 0x000e, 0x0016 }, + { 0x000e, 0x0017 }, + { 0x000f, 0x001b }, + { 0x0011, 0x0030 }, + { 0x0011, 0x0031 }, + { 0x0013, 0x0089 }, + { 0x0013, 0x008a }, + { 0x0013, 0x008b }, + { 0x0014, 0x0048 }, + { 0x0014, 0x0049 }, + { 0x0014, 0x004a }, + { 0x0014, 0x004b }, + { 0x0014, 0x004c }, + { 0x0014, 0x004d }, + { 0x0014, 0x004e }, + { 0x0014, 0x004f }, + { 0x0014, 0x0050 }, + { 0x0014, 0x0051 }, + { 0x0010, 0x0022 }, + { 0x0010, 0x0023 }, + { 0x0010, 0x0024 }, + { 0x0010, 0x0025 }, + { 0x0011, 0x0032 }, + { 0x0011, 0x0033 }, + { 0x0012, 0x004e }, + { 0x0012, 0x004f }, + { 0x0014, 0x0052 }, + { 0x0013, 0x008c }, + { 0x0013, 0x008d }, + { 0x0014, 0x0053 }, + { 0x0014, 0x0054 }, + { 0x0014, 0x0055 }, + { 0x0014, 0x0056 }, + { 0x0014, 0x0057 }, + { 0x0014, 0x0058 }, + { 0x0014, 0x0059 }, + { 0x0014, 0x005a }, + { 0x0014, 0x005b }, + { 0x0011, 0x0034 }, + { 0x0011, 0x0035 }, + { 0x0012, 0x0050 }, + { 0x0012, 0x0051 }, + { 0x0013, 0x008e }, + { 0x0014, 0x005c }, + { 0x0014, 0x005d }, + { 0x0014, 0x005e }, + { 0x0014, 0x005f }, + { 0x0014, 0x0060 }, + { 0x0014, 0x0061 }, + { 0x0014, 0x0062 }, + { 0x0014, 0x0063 }, + { 0x0014, 0x0064 }, + { 0x0014, 0x0065 }, + { 0x0014, 0x0066 }, + { 0x0014, 0x0067 }, + { 0x0014, 0x0068 }, + { 0x0014, 0x0069 }, + { 0x0014, 0x006a }, + { 0x0012, 0x0052 }, + { 0x0013, 0x008f }, + { 0x0013, 0x0090 }, + { 0x0014, 0x006b }, + { 0x0013, 0x0091 }, + { 0x0014, 0x006c }, + { 0x0014, 0x006d }, + { 0x0014, 0x006e }, + { 0x0014, 0x006f }, + { 0x0014, 0x0070 }, + { 0x0014, 0x0071 }, + { 0x0014, 0x0072 }, + { 0x0014, 0x0073 }, + { 0x0014, 0x0074 }, + { 0x0014, 0x0075 }, + { 0x0014, 0x0076 }, + { 0x0014, 0x0077 }, + { 0x0014, 0x0078 }, + { 0x0014, 0x0079 }, + { 0x0014, 0x007a }, + { 0x0014, 0x007b }, + { 0x0014, 0x007c }, + { 0x0013, 0x0092 }, + { 0x0012, 0x0053 }, + { 0x0014, 0x007d }, + { 0x0014, 0x007e }, + { 0x0014, 0x007f }, + { 0x0014, 0x0080 }, + { 0x0014, 0x0081 }, + { 0x0014, 0x0082 }, + { 0x0014, 0x0083 }, + { 0x0014, 0x0084 }, + { 0x0014, 0x0085 }, + { 0x0014, 0x0086 }, + { 0x0014, 0x0087 }, + { 0x0014, 0x0088 }, + { 0x0014, 0x0089 }, + { 0x0014, 0x008a }, + { 0x0014, 0x008b }, + { 0x0014, 0x008c }, + { 0x0014, 0x008d }, + { 0x0014, 0x008e }, + { 0x0013, 0x0093 }, + { 0x0014, 0x008f }, + { 0x0014, 0x0090 }, + { 0x0014, 0x0091 }, + { 0x0014, 0x0092 }, + { 0x0014, 0x0093 }, + { 0x0014, 0x0094 }, + { 0x0014, 0x0095 }, + { 0x0014, 0x0096 }, + { 0x0014, 0x0097 }, + { 0x0014, 0x0098 }, + { 0x0014, 0x0099 }, + { 0x0014, 0x009a }, + { 0x0014, 0x009b }, + { 0x0014, 0x009c }, + { 0x0014, 0x009d }, + { 0x0014, 0x009e }, + { 0x0014, 0x009f }, + { 0x0014, 0x00a0 }, + { 0x0014, 0x00a1 }, + { 0x0014, 0x00a2 }, + { 0x0014, 0x00a3 }, + { 0x0014, 0x00a4 }, + { 0x0014, 0x00a5 }, + { 0x0014, 0x00a6 }, + { 0x0014, 0x00a7 }, + { 0x0014, 0x00a8 }, + { 0x0014, 0x00a9 }, + { 0x0014, 0x00aa }, + { 0x0014, 0x00ab }, + { 0x0014, 0x00ac }, + { 0x0014, 0x00ad }, + { 0x0014, 0x00ae }, + { 0x0014, 0x00af }, + { 0x0014, 0x00b0 }, + { 0x0014, 0x00b1 }, + { 0x0014, 0x00b2 }, + { 0x0014, 0x00b3 }, + { 0x0014, 0x00b4 }, + { 0x0014, 0x00b5 }, + { 0x0014, 0x00b6 }, + { 0x0014, 0x00b7 }, + { 0x0014, 0x00b8 }, + { 0x0014, 0x00b9 }, + { 0x0014, 0x00ba }, + { 0x0014, 0x00bb }, + { 0x0014, 0x00bc }, + { 0x0014, 0x00bd }, + { 0x0014, 0x00be }, + { 0x0014, 0x00bf }, + { 0x0014, 0x00c0 }, + { 0x0014, 0x00c1 }, + { 0x0014, 0x00c2 }, + { 0x0014, 0x00c3 }, + { 0x0014, 0x00c4 }, + { 0x0014, 0x00c5 }, + { 0x0014, 0x00c6 }, + { 0x0014, 0x00c7 }, + { 0x0014, 0x00c8 }, + { 0x0014, 0x00c9 }, + { 0x0014, 0x00ca }, + { 0x0014, 0x00cb }, + { 0x0014, 0x00cc }, + { 0x0014, 0x00cd }, + { 0x0014, 0x00ce }, + { 0x0014, 0x00cf }, + { 0x0014, 0x00d0 }, + { 0x0014, 0x00d1 }, + { 0x0014, 0x00d2 }, + { 0x0014, 0x00d3 }, + { 0x0014, 0x00d4 }, + { 0x0014, 0x00d5 }, + { 0x0014, 0x00d6 }, + { 0x0014, 0x00d7 }, + { 0x0014, 0x00d8 }, + { 0x0014, 0x00d9 }, + { 0x0014, 0x00da }, + { 0x0014, 0x00db }, + { 0x0014, 0x00dc }, + { 0x0014, 0x00dd }, + { 0x0014, 0x00de }, + { 0x0014, 0x00df }, + { 0x0014, 0x00e0 }, + { 0x0014, 0x00e1 }, + { 0x0014, 0x00e2 }, + { 0x0014, 0x00e3 }, + { 0x0014, 0x00e4 }, + { 0x0014, 0x00e5 }, + { 0x0014, 0x00e6 }, + { 0x0014, 0x00e7 }, + { 0x0014, 0x00e8 }, + { 0x0014, 0x00e9 }, + { 0x0014, 0x00ea }, + { 0x0014, 0x00eb }, + { 0x0014, 0x00ec }, + { 0x0014, 0x00ed }, + { 0x0014, 0x00ee }, + { 0x0014, 0x00ef }, + { 0x0014, 0x00f0 }, + { 0x0014, 0x00f1 }, + { 0x0014, 0x00f2 }, + { 0x0014, 0x00f3 }, + { 0x0014, 0x00f4 }, + { 0x0014, 0x00f5 }, + { 0x0014, 0x00f6 }, + { 0x0014, 0x00f7 }, + { 0x0014, 0x00f8 }, + { 0x0014, 0x00f9 }, + { 0x0014, 0x00fa }, + { 0x0014, 0x00fb }, + { 0x0014, 0x00fc }, + { 0x0014, 0x00fd }, + { 0x0014, 0x00fe }, + { 0x0014, 0x00ff }, + { 0x0014, 0x0100 }, + { 0x0014, 0x0101 }, + { 0x0014, 0x0102 }, + { 0x0014, 0x0103 }, + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec14[53][16] = { + { + 0x0009ffff, + 0x0007ffff, + 0x0008ffff, + 0x0001ffff, + 0x0002ffff, + 0x0003ffff, + 0x0004ffff, + 0x0005ffff, + 0x0006ffff, + 0x00000001, + 0x00000014, + 0x00000015, + 0x00000016, + 0x00000029, + 0x0000002a, + 0x0000003d, + }, + { + 0x00020053, + 0x00020053, + 0x00020053, + 0x00020053, + 0x00020065, + 0x00020065, + 0x00020065, + 0x00020065, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + }, + { + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + }, + { + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + }, + { + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + }, + { + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + }, + { + 0x00010054, + 0x00010054, + 0x00010064, + 0x00010064, + 0x00010066, + 0x00010066, + 0x00010067, + 0x00010067, + 0x00020004, + 0x00020004, + 0x00020004, + 0x00020004, + 0x00020019, + 0x00020019, + 0x00020019, + 0x00020019, + }, + { + 0x0002002c, + 0x0002002c, + 0x0002002c, + 0x0002002c, + 0x00020040, + 0x00020040, + 0x00020040, + 0x00020040, + 0x00020050, + 0x00020050, + 0x00020050, + 0x00020050, + 0x00020052, + 0x00020052, + 0x00020052, + 0x00020052, + }, + { + 0x000fffff, + 0x000dffff, + 0x000effff, + 0x000affff, + 0x000bffff, + 0x000cffff, + 0x0000001a, + 0x0000002e, + 0x00000041, + 0x00000055, + 0x00000079, + 0x0000007a, + 0x00010005, + 0x00010005, + 0x0001002d, + 0x0001002d, + }, + { + 0x0002008d, + 0x0002008d, + 0x0002008d, + 0x0002008d, + 0x0002008e, + 0x0002008e, + 0x0002008e, + 0x0002008e, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + }, + { + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + }, + { + 0x00030078, + 0x00030078, + 0x00030078, + 0x00030078, + 0x00030078, + 0x00030078, + 0x00030078, + 0x00030078, + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x0003007b, + }, + { + 0x00010007, + 0x00010007, + 0x00010043, + 0x00010043, + 0x0001006a, + 0x0001006a, + 0x0001007d, + 0x0001007d, + 0x0001008c, + 0x0001008c, + 0x0001008f, + 0x0001008f, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001b, + }, + { + 0x0002002f, + 0x0002002f, + 0x0002002f, + 0x0002002f, + 0x00020056, + 0x00020056, + 0x00020056, + 0x00020056, + 0x00020069, + 0x00020069, + 0x00020069, + 0x00020069, + 0x0002007c, + 0x0002007c, + 0x0002007c, + 0x0002007c, + }, + { + 0x0024ffff, + 0x0018ffff, + 0x0017ffff, + 0x0015ffff, + 0x0014ffff, + 0x0016ffff, + 0x0010ffff, + 0x0011ffff, + 0x0012ffff, + 0x0013ffff, + 0x0000001c, + 0x00000030, + 0x00000057, + 0x00000090, + 0x000000a1, + 0x000000a2, + }, + { + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + }, + { + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x0003006b, + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x0003007e, + }, + { + 0x00030091, + 0x00030091, + 0x00030091, + 0x00030091, + 0x00030091, + 0x00030091, + 0x00030091, + 0x00030091, + 0x000300a0, + 0x000300a0, + 0x000300a0, + 0x000300a0, + 0x000300a0, + 0x000300a0, + 0x000300a0, + 0x000300a0, + }, + { + 0x000300a3, + 0x000300a3, + 0x000300a3, + 0x000300a3, + 0x000300a3, + 0x000300a3, + 0x000300a3, + 0x000300a3, + 0x000300a4, + 0x000300a4, + 0x000300a4, + 0x000300a4, + 0x000300a4, + 0x000300a4, + 0x000300a4, + 0x000300a4, + }, + { + 0x00020045, + 0x00020045, + 0x00020045, + 0x00020045, + 0x00020058, + 0x00020058, + 0x00020058, + 0x00020058, + 0x0002007f, + 0x0002007f, + 0x0002007f, + 0x0002007f, + 0x00020092, + 0x00020092, + 0x00020092, + 0x00020092, + }, + { + 0x00010080, + 0x00010080, + 0x00010093, + 0x00010093, + 0x000100b4, + 0x000100b4, + 0x000100b8, + 0x000100b8, + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x00020031, + 0x00020031, + 0x00020031, + 0x00020031, + }, + { + 0x000200a5, + 0x000200a5, + 0x000200a5, + 0x000200a5, + 0x000200b5, + 0x000200b5, + 0x000200b5, + 0x000200b5, + 0x000200b6, + 0x000200b6, + 0x000200b6, + 0x000200b6, + 0x000200b7, + 0x000200b7, + 0x000200b7, + 0x000200b7, + }, + { + 0x000000a6, + 0x000000a7, + 0x000000c8, + 0x000000c9, + 0x000000ca, + 0x000000cb, + 0x00010009, + 0x00010009, + 0x0001001e, + 0x0001001e, + 0x00010032, + 0x00010032, + 0x00010059, + 0x00010059, + 0x0001006c, + 0x0001006c, + }, + { + 0x0022ffff, + 0x0023ffff, + 0x001fffff, + 0x0020ffff, + 0x0021ffff, + 0x0019ffff, + 0x001affff, + 0x001bffff, + 0x001cffff, + 0x001dffff, + 0x001effff, + 0x0000000a, + 0x00000046, + 0x0000005a, + 0x0000006e, + 0x00000094, + }, + { + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + }, + { + 0x0003006d, + 0x0003006d, + 0x0003006d, + 0x0003006d, + 0x0003006d, + 0x0003006d, + 0x0003006d, + 0x0003006d, + 0x00030081, + 0x00030081, + 0x00030081, + 0x00030081, + 0x00030081, + 0x00030081, + 0x00030081, + 0x00030081, + }, + { + 0x00030082, + 0x00030082, + 0x00030082, + 0x00030082, + 0x00030082, + 0x00030082, + 0x00030082, + 0x00030082, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + }, + { + 0x000300b9, + 0x000300b9, + 0x000300b9, + 0x000300b9, + 0x000300b9, + 0x000300b9, + 0x000300b9, + 0x000300b9, + 0x000300ba, + 0x000300ba, + 0x000300ba, + 0x000300ba, + 0x000300ba, + 0x000300ba, + 0x000300ba, + 0x000300ba, + }, + { + 0x000300cc, + 0x000300cc, + 0x000300cc, + 0x000300cc, + 0x000300cc, + 0x000300cc, + 0x000300cc, + 0x000300cc, + 0x000300cd, + 0x000300cd, + 0x000300cd, + 0x000300cd, + 0x000300cd, + 0x000300cd, + 0x000300cd, + 0x000300cd, + }, + { + 0x000300dc, + 0x000300dc, + 0x000300dc, + 0x000300dc, + 0x000300dc, + 0x000300dc, + 0x000300dc, + 0x000300dc, + 0x000300dd, + 0x000300dd, + 0x000300dd, + 0x000300dd, + 0x000300dd, + 0x000300dd, + 0x000300dd, + 0x000300dd, + }, + { + 0x000100f2, + 0x000100f2, + 0x000100f4, + 0x000100f4, + 0x00010106, + 0x00010106, + 0x0001011a, + 0x0001011a, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020033, + 0x00020033, + 0x00020033, + 0x00020033, + }, + { + 0x0002005b, + 0x0002005b, + 0x0002005b, + 0x0002005b, + 0x000200a8, + 0x000200a8, + 0x000200a8, + 0x000200a8, + 0x000200ce, + 0x000200ce, + 0x000200ce, + 0x000200ce, + 0x000200cf, + 0x000200cf, + 0x000200cf, + 0x000200cf, + }, + { + 0x000200de, + 0x000200de, + 0x000200de, + 0x000200de, + 0x000200df, + 0x000200df, + 0x000200df, + 0x000200df, + 0x000200f0, + 0x000200f0, + 0x000200f0, + 0x000200f0, + 0x00020107, + 0x00020107, + 0x00020107, + 0x00020107, + }, + { + 0x0000018c, + 0x0000018d, + 0x0000018e, + 0x0000018f, + 0x0001000b, + 0x0001000b, + 0x0001000c, + 0x0001000c, + 0x00010021, + 0x00010021, + 0x00010034, + 0x00010034, + 0x00010083, + 0x00010083, + 0x00010095, + 0x00010095, + }, + { + 0x00010098, + 0x00010098, + 0x000100bb, + 0x000100bb, + 0x000100bc, + 0x000100bc, + 0x000100bd, + 0x000100bd, + 0x000100d1, + 0x000100d1, + 0x000100d2, + 0x000100d2, + 0x000100e0, + 0x000100e0, + 0x000100f1, + 0x000100f1, + }, + { + 0x0025ffff, + 0x0026ffff, + 0x0028ffff, + 0x0027ffff, + 0x0029ffff, + 0x002affff, + 0x002bffff, + 0x002cffff, + 0x002dffff, + 0x002effff, + 0x002fffff, + 0x0030ffff, + 0x0031ffff, + 0x0032ffff, + 0x0033ffff, + 0x0034ffff, + }, + { + 0x0000000d, + 0x0000000e, + 0x0000000f, + 0x00000010, + 0x00000011, + 0x00000012, + 0x00000013, + 0x00000022, + 0x00000023, + 0x00000024, + 0x00000025, + 0x00000026, + 0x00000027, + 0x00000035, + 0x00000036, + 0x00000037, + }, + { + 0x00000038, + 0x00000039, + 0x0000003a, + 0x0000003b, + 0x00000048, + 0x00000049, + 0x0000004a, + 0x0000004b, + 0x0000004c, + 0x0000004d, + 0x0000004e, + 0x0000004f, + 0x0000005c, + 0x0000005d, + 0x0000005e, + 0x0000005f, + }, + { + 0x00000087, + 0x00000088, + 0x00000089, + 0x0000008a, + 0x0000008b, + 0x00000096, + 0x00000097, + 0x00000099, + 0x0000009a, + 0x0000009b, + 0x0000009c, + 0x0000009d, + 0x0000009e, + 0x0000009f, + 0x000000aa, + 0x000000ab, + }, + { + 0x00000060, + 0x00000061, + 0x00000062, + 0x00000063, + 0x0000006f, + 0x00000070, + 0x00000071, + 0x00000072, + 0x00000073, + 0x00000074, + 0x00000075, + 0x00000076, + 0x00000077, + 0x00000084, + 0x00000085, + 0x00000086, + }, + { + 0x000000ac, + 0x000000ad, + 0x000000ae, + 0x000000af, + 0x000000b0, + 0x000000b1, + 0x000000b2, + 0x000000b3, + 0x000000be, + 0x000000bf, + 0x000000c0, + 0x000000c1, + 0x000000c2, + 0x000000c3, + 0x000000c4, + 0x000000c5, + }, + { + 0x000000c6, + 0x000000c7, + 0x000000d0, + 0x000000d3, + 0x000000d4, + 0x000000d5, + 0x000000d6, + 0x000000d7, + 0x000000d8, + 0x000000d9, + 0x000000da, + 0x000000db, + 0x000000e1, + 0x000000e2, + 0x000000e3, + 0x000000e4, + }, + { + 0x000000e5, + 0x000000e6, + 0x000000e7, + 0x000000e8, + 0x000000e9, + 0x000000ea, + 0x000000eb, + 0x000000ec, + 0x000000ed, + 0x000000ee, + 0x000000ef, + 0x000000f3, + 0x000000f5, + 0x000000f6, + 0x000000f7, + 0x000000f8, + }, + { + 0x000000f9, + 0x000000fa, + 0x000000fb, + 0x000000fc, + 0x000000fd, + 0x000000fe, + 0x000000ff, + 0x00000100, + 0x00000101, + 0x00000102, + 0x00000103, + 0x00000104, + 0x00000105, + 0x00000108, + 0x00000109, + 0x0000010a, + }, + { + 0x0000010b, + 0x0000010c, + 0x0000010d, + 0x0000010e, + 0x0000010f, + 0x00000110, + 0x00000111, + 0x00000112, + 0x00000113, + 0x00000114, + 0x00000115, + 0x00000116, + 0x00000117, + 0x00000118, + 0x00000119, + 0x0000011b, + }, + { + 0x0000011c, + 0x0000011d, + 0x0000011e, + 0x0000011f, + 0x00000120, + 0x00000121, + 0x00000122, + 0x00000123, + 0x00000124, + 0x00000125, + 0x00000126, + 0x00000127, + 0x00000128, + 0x00000129, + 0x0000012a, + 0x0000012b, + }, + { + 0x0000012c, + 0x0000012d, + 0x0000012e, + 0x0000012f, + 0x00000130, + 0x00000131, + 0x00000132, + 0x00000133, + 0x00000134, + 0x00000135, + 0x00000136, + 0x00000137, + 0x00000138, + 0x00000139, + 0x0000013a, + 0x0000013b, + }, + { + 0x0000013c, + 0x0000013d, + 0x0000013e, + 0x0000013f, + 0x00000140, + 0x00000141, + 0x00000142, + 0x00000143, + 0x00000144, + 0x00000145, + 0x00000146, + 0x00000147, + 0x00000148, + 0x00000149, + 0x0000014a, + 0x0000014b, + }, + { + 0x0000014c, + 0x0000014d, + 0x0000014e, + 0x0000014f, + 0x00000150, + 0x00000151, + 0x00000152, + 0x00000153, + 0x00000154, + 0x00000155, + 0x00000156, + 0x00000157, + 0x00000158, + 0x00000159, + 0x0000015a, + 0x0000015b, + }, + { + 0x0000015c, + 0x0000015d, + 0x0000015e, + 0x0000015f, + 0x00000160, + 0x00000161, + 0x00000162, + 0x00000163, + 0x00000164, + 0x00000165, + 0x00000166, + 0x00000167, + 0x00000168, + 0x00000169, + 0x0000016a, + 0x0000016b, + }, + { + 0x0000016c, + 0x0000016d, + 0x0000016e, + 0x0000016f, + 0x00000170, + 0x00000171, + 0x00000172, + 0x00000173, + 0x00000174, + 0x00000175, + 0x00000176, + 0x00000177, + 0x00000178, + 0x00000179, + 0x0000017a, + 0x0000017b, + }, + { + 0x0000017c, + 0x0000017d, + 0x0000017e, + 0x0000017f, + 0x00000180, + 0x00000181, + 0x00000182, + 0x00000183, + 0x00000184, + 0x00000185, + 0x00000186, + 0x00000187, + 0x00000188, + 0x00000189, + 0x0000018a, + 0x0000018b, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc15[576][2] = +#else +const uint16_t c_aauiCQMFHuffEnc15[576][2] = +#endif + { + { 0x0005, 0x000a }, + { 0x0005, 0x000b }, + { 0x0005, 0x000c }, + { 0x0006, 0x0009 }, + { 0x0006, 0x000a }, + { 0x0007, 0x0008 }, + { 0x0008, 0x0009 }, + { 0x0009, 0x0008 }, + { 0x000b, 0x000b }, + { 0x000d, 0x000e }, + { 0x000e, 0x0011 }, + { 0x000f, 0x001a }, + { 0x0012, 0x006e }, + { 0x0014, 0x0000 }, + { 0x0013, 0x00cc }, + { 0x0014, 0x0001 }, + { 0x0014, 0x0002 }, + { 0x0014, 0x0003 }, + { 0x0014, 0x0004 }, + { 0x0014, 0x0005 }, + { 0x0014, 0x0006 }, + { 0x0014, 0x0007 }, + { 0x0014, 0x0008 }, + { 0x0014, 0x0009 }, + { 0x0005, 0x000d }, + { 0x0004, 0x000c }, + { 0x0004, 0x000d }, + { 0x0005, 0x000e }, + { 0x0005, 0x000f }, + { 0x0006, 0x000b }, + { 0x0007, 0x0009 }, + { 0x0008, 0x000a }, + { 0x000a, 0x000a }, + { 0x000c, 0x000c }, + { 0x000d, 0x000f }, + { 0x000f, 0x001b }, + { 0x0011, 0x003d }, + { 0x0011, 0x003e }, + { 0x0013, 0x00cd }, + { 0x0014, 0x000a }, + { 0x0014, 0x000b }, + { 0x0014, 0x000c }, + { 0x0014, 0x000d }, + { 0x0014, 0x000e }, + { 0x0014, 0x000f }, + { 0x0014, 0x0010 }, + { 0x0014, 0x0011 }, + { 0x0014, 0x0012 }, + { 0x0005, 0x0010 }, + { 0x0004, 0x000e }, + { 0x0004, 0x000f }, + { 0x0005, 0x0011 }, + { 0x0005, 0x0012 }, + { 0x0006, 0x000c }, + { 0x0007, 0x000a }, + { 0x0009, 0x0009 }, + { 0x000a, 0x000b }, + { 0x000c, 0x000d }, + { 0x000e, 0x0012 }, + { 0x0010, 0x0027 }, + { 0x0011, 0x003f }, + { 0x0012, 0x006f }, + { 0x0014, 0x0013 }, + { 0x0014, 0x0014 }, + { 0x0014, 0x0015 }, + { 0x0014, 0x0016 }, + { 0x0014, 0x0017 }, + { 0x0014, 0x0018 }, + { 0x0014, 0x0019 }, + { 0x0014, 0x001a }, + { 0x0014, 0x001b }, + { 0x0014, 0x001c }, + { 0x0006, 0x000d }, + { 0x0005, 0x0013 }, + { 0x0005, 0x0014 }, + { 0x0005, 0x0015 }, + { 0x0006, 0x000e }, + { 0x0007, 0x000b }, + { 0x0008, 0x000b }, + { 0x0009, 0x000a }, + { 0x000b, 0x000c }, + { 0x000c, 0x000e }, + { 0x000e, 0x0013 }, + { 0x000f, 0x001c }, + { 0x0011, 0x0040 }, + { 0x0012, 0x0070 }, + { 0x0014, 0x001d }, + { 0x0014, 0x001e }, + { 0x0014, 0x001f }, + { 0x0014, 0x0020 }, + { 0x0014, 0x0021 }, + { 0x0014, 0x0022 }, + { 0x0014, 0x0023 }, + { 0x0014, 0x0024 }, + { 0x0014, 0x0025 }, + { 0x0014, 0x0026 }, + { 0x0006, 0x000f }, + { 0x0005, 0x0016 }, + { 0x0005, 0x0017 }, + { 0x0006, 0x0010 }, + { 0x0006, 0x0011 }, + { 0x0007, 0x000c }, + { 0x0009, 0x000b }, + { 0x000a, 0x000c }, + { 0x000b, 0x000d }, + { 0x000d, 0x0010 }, + { 0x000e, 0x0014 }, + { 0x0010, 0x0028 }, + { 0x0011, 0x0041 }, + { 0x0013, 0x00ce }, + { 0x0014, 0x0027 }, + { 0x0014, 0x0028 }, + { 0x0014, 0x0029 }, + { 0x0014, 0x002a }, + { 0x0014, 0x002b }, + { 0x0014, 0x002c }, + { 0x0014, 0x002d }, + { 0x0014, 0x002e }, + { 0x0014, 0x002f }, + { 0x0014, 0x0030 }, + { 0x0007, 0x000d }, + { 0x0006, 0x0012 }, + { 0x0006, 0x0013 }, + { 0x0007, 0x000e }, + { 0x0007, 0x000f }, + { 0x0008, 0x000c }, + { 0x0009, 0x000c }, + { 0x000b, 0x000e }, + { 0x000c, 0x000f }, + { 0x000e, 0x0015 }, + { 0x0010, 0x0029 }, + { 0x0011, 0x0042 }, + { 0x0014, 0x0031 }, + { 0x0014, 0x0032 }, + { 0x0014, 0x0033 }, + { 0x0014, 0x0034 }, + { 0x0014, 0x0035 }, + { 0x0014, 0x0036 }, + { 0x0014, 0x0037 }, + { 0x0014, 0x0038 }, + { 0x0014, 0x0039 }, + { 0x0014, 0x003a }, + { 0x0014, 0x003b }, + { 0x0014, 0x003c }, + { 0x0008, 0x000d }, + { 0x0007, 0x0010 }, + { 0x0007, 0x0011 }, + { 0x0008, 0x000e }, + { 0x0009, 0x000d }, + { 0x0009, 0x000e }, + { 0x000b, 0x000f }, + { 0x000c, 0x0010 }, + { 0x000d, 0x0011 }, + { 0x000f, 0x001d }, + { 0x0010, 0x002a }, + { 0x0011, 0x0043 }, + { 0x0014, 0x003d }, + { 0x0013, 0x00cf }, + { 0x0014, 0x003e }, + { 0x0014, 0x003f }, + { 0x0014, 0x0040 }, + { 0x0014, 0x0041 }, + { 0x0014, 0x0042 }, + { 0x0014, 0x0043 }, + { 0x0014, 0x0044 }, + { 0x0014, 0x0045 }, + { 0x0014, 0x0046 }, + { 0x0014, 0x0047 }, + { 0x0009, 0x000f }, + { 0x0008, 0x000f }, + { 0x0009, 0x0010 }, + { 0x0009, 0x0011 }, + { 0x000a, 0x000d }, + { 0x000b, 0x0010 }, + { 0x000c, 0x0011 }, + { 0x000d, 0x0012 }, + { 0x000e, 0x0016 }, + { 0x0010, 0x002b }, + { 0x0011, 0x0044 }, + { 0x0012, 0x0071 }, + { 0x0014, 0x0048 }, + { 0x0014, 0x0049 }, + { 0x0014, 0x004a }, + { 0x0014, 0x004b }, + { 0x0014, 0x004c }, + { 0x0014, 0x004d }, + { 0x0014, 0x004e }, + { 0x0014, 0x004f }, + { 0x0014, 0x0050 }, + { 0x0014, 0x0051 }, + { 0x0014, 0x0052 }, + { 0x0014, 0x0053 }, + { 0x000b, 0x0011 }, + { 0x000a, 0x000e }, + { 0x000a, 0x000f }, + { 0x000b, 0x0012 }, + { 0x000b, 0x0013 }, + { 0x000c, 0x0012 }, + { 0x000d, 0x0013 }, + { 0x000e, 0x0017 }, + { 0x0010, 0x002c }, + { 0x0012, 0x0072 }, + { 0x0011, 0x0045 }, + { 0x0013, 0x00d0 }, + { 0x0013, 0x00d1 }, + { 0x0014, 0x0054 }, + { 0x0014, 0x0055 }, + { 0x0014, 0x0056 }, + { 0x0014, 0x0057 }, + { 0x0014, 0x0058 }, + { 0x0014, 0x0059 }, + { 0x0014, 0x005a }, + { 0x0014, 0x005b }, + { 0x0014, 0x005c }, + { 0x0014, 0x005d }, + { 0x0014, 0x005e }, + { 0x000c, 0x0013 }, + { 0x000c, 0x0014 }, + { 0x000c, 0x0015 }, + { 0x000d, 0x0014 }, + { 0x000d, 0x0015 }, + { 0x000e, 0x0018 }, + { 0x000f, 0x001e }, + { 0x0010, 0x002d }, + { 0x0011, 0x0046 }, + { 0x0011, 0x0047 }, + { 0x0011, 0x0048 }, + { 0x0014, 0x005f }, + { 0x0014, 0x0060 }, + { 0x0014, 0x0061 }, + { 0x0014, 0x0062 }, + { 0x0014, 0x0063 }, + { 0x0014, 0x0064 }, + { 0x0014, 0x0065 }, + { 0x0014, 0x0066 }, + { 0x0014, 0x0067 }, + { 0x0014, 0x0068 }, + { 0x0014, 0x0069 }, + { 0x0014, 0x006a }, + { 0x0014, 0x006b }, + { 0x000e, 0x0019 }, + { 0x000d, 0x0016 }, + { 0x000d, 0x0017 }, + { 0x000e, 0x001a }, + { 0x000e, 0x001b }, + { 0x000f, 0x001f }, + { 0x0010, 0x002e }, + { 0x0011, 0x0049 }, + { 0x0012, 0x0073 }, + { 0x0014, 0x006c }, + { 0x0014, 0x006d }, + { 0x0014, 0x006e }, + { 0x0014, 0x006f }, + { 0x0014, 0x0070 }, + { 0x0014, 0x0071 }, + { 0x0014, 0x0072 }, + { 0x0014, 0x0073 }, + { 0x0014, 0x0074 }, + { 0x0014, 0x0075 }, + { 0x0014, 0x0076 }, + { 0x0014, 0x0077 }, + { 0x0014, 0x0078 }, + { 0x0014, 0x0079 }, + { 0x0014, 0x007a }, + { 0x0010, 0x002f }, + { 0x000f, 0x0020 }, + { 0x0010, 0x0030 }, + { 0x000f, 0x0021 }, + { 0x0010, 0x0031 }, + { 0x0011, 0x004a }, + { 0x0011, 0x004b }, + { 0x0012, 0x0074 }, + { 0x0014, 0x007b }, + { 0x0014, 0x007c }, + { 0x0013, 0x00d2 }, + { 0x0014, 0x007d }, + { 0x0014, 0x007e }, + { 0x0014, 0x007f }, + { 0x0014, 0x0080 }, + { 0x0014, 0x0081 }, + { 0x0014, 0x0082 }, + { 0x0014, 0x0083 }, + { 0x0014, 0x0084 }, + { 0x0014, 0x0085 }, + { 0x0014, 0x0086 }, + { 0x0014, 0x0087 }, + { 0x0014, 0x0088 }, + { 0x0014, 0x0089 }, + { 0x0012, 0x0075 }, + { 0x0010, 0x0032 }, + { 0x0010, 0x0033 }, + { 0x0011, 0x004c }, + { 0x0011, 0x004d }, + { 0x0013, 0x00d3 }, + { 0x0013, 0x00d4 }, + { 0x0012, 0x0076 }, + { 0x0013, 0x00d5 }, + { 0x0014, 0x008a }, + { 0x0014, 0x008b }, + { 0x0014, 0x008c }, + { 0x0014, 0x008d }, + { 0x0014, 0x008e }, + { 0x0014, 0x008f }, + { 0x0014, 0x0090 }, + { 0x0014, 0x0091 }, + { 0x0014, 0x0092 }, + { 0x0014, 0x0093 }, + { 0x0014, 0x0094 }, + { 0x0014, 0x0095 }, + { 0x0014, 0x0096 }, + { 0x0014, 0x0097 }, + { 0x0014, 0x0098 }, + { 0x0013, 0x00d6 }, + { 0x0013, 0x00d7 }, + { 0x0012, 0x0077 }, + { 0x0012, 0x0078 }, + { 0x0014, 0x0099 }, + { 0x0014, 0x009a }, + { 0x0013, 0x00d8 }, + { 0x0014, 0x009b }, + { 0x0014, 0x009c }, + { 0x0014, 0x009d }, + { 0x0014, 0x009e }, + { 0x0014, 0x009f }, + { 0x0014, 0x00a0 }, + { 0x0014, 0x00a1 }, + { 0x0014, 0x00a2 }, + { 0x0014, 0x00a3 }, + { 0x0014, 0x00a4 }, + { 0x0014, 0x00a5 }, + { 0x0014, 0x00a6 }, + { 0x0014, 0x00a7 }, + { 0x0014, 0x00a8 }, + { 0x0014, 0x00a9 }, + { 0x0014, 0x00aa }, + { 0x0014, 0x00ab }, + { 0x0014, 0x00ac }, + { 0x0014, 0x00ad }, + { 0x0014, 0x00ae }, + { 0x0014, 0x00af }, + { 0x0012, 0x0079 }, + { 0x0014, 0x00b0 }, + { 0x0014, 0x00b1 }, + { 0x0014, 0x00b2 }, + { 0x0014, 0x00b3 }, + { 0x0014, 0x00b4 }, + { 0x0014, 0x00b5 }, + { 0x0014, 0x00b6 }, + { 0x0014, 0x00b7 }, + { 0x0014, 0x00b8 }, + { 0x0014, 0x00b9 }, + { 0x0014, 0x00ba }, + { 0x0014, 0x00bb }, + { 0x0014, 0x00bc }, + { 0x0014, 0x00bd }, + { 0x0014, 0x00be }, + { 0x0014, 0x00bf }, + { 0x0014, 0x00c0 }, + { 0x0014, 0x00c1 }, + { 0x0014, 0x00c2 }, + { 0x0014, 0x00c3 }, + { 0x0014, 0x00c4 }, + { 0x0014, 0x00c5 }, + { 0x0014, 0x00c6 }, + { 0x0013, 0x00d9 }, + { 0x0013, 0x00da }, + { 0x0014, 0x00c7 }, + { 0x0014, 0x00c8 }, + { 0x0014, 0x00c9 }, + { 0x0014, 0x00ca }, + { 0x0014, 0x00cb }, + { 0x0014, 0x00cc }, + { 0x0014, 0x00cd }, + { 0x0014, 0x00ce }, + { 0x0014, 0x00cf }, + { 0x0014, 0x00d0 }, + { 0x0014, 0x00d1 }, + { 0x0014, 0x00d2 }, + { 0x0014, 0x00d3 }, + { 0x0014, 0x00d4 }, + { 0x0014, 0x00d5 }, + { 0x0014, 0x00d6 }, + { 0x0014, 0x00d7 }, + { 0x0014, 0x00d8 }, + { 0x0014, 0x00d9 }, + { 0x0014, 0x00da }, + { 0x0014, 0x00db }, + { 0x0014, 0x00dc }, + { 0x0014, 0x00dd }, + { 0x0014, 0x00de }, + { 0x0014, 0x00df }, + { 0x0014, 0x00e0 }, + { 0x0014, 0x00e1 }, + { 0x0014, 0x00e2 }, + { 0x0014, 0x00e3 }, + { 0x0014, 0x00e4 }, + { 0x0014, 0x00e5 }, + { 0x0014, 0x00e6 }, + { 0x0014, 0x00e7 }, + { 0x0014, 0x00e8 }, + { 0x0014, 0x00e9 }, + { 0x0014, 0x00ea }, + { 0x0014, 0x00eb }, + { 0x0014, 0x00ec }, + { 0x0014, 0x00ed }, + { 0x0014, 0x00ee }, + { 0x0014, 0x00ef }, + { 0x0014, 0x00f0 }, + { 0x0014, 0x00f1 }, + { 0x0014, 0x00f2 }, + { 0x0014, 0x00f3 }, + { 0x0014, 0x00f4 }, + { 0x0014, 0x00f5 }, + { 0x0014, 0x00f6 }, + { 0x0014, 0x00f7 }, + { 0x0014, 0x00f8 }, + { 0x0014, 0x00f9 }, + { 0x0014, 0x00fa }, + { 0x0014, 0x00fb }, + { 0x0014, 0x00fc }, + { 0x0014, 0x00fd }, + { 0x0014, 0x00fe }, + { 0x0014, 0x00ff }, + { 0x0014, 0x0100 }, + { 0x0014, 0x0101 }, + { 0x0014, 0x0102 }, + { 0x0014, 0x0103 }, + { 0x0014, 0x0104 }, + { 0x0014, 0x0105 }, + { 0x0014, 0x0106 }, + { 0x0014, 0x0107 }, + { 0x0014, 0x0108 }, + { 0x0014, 0x0109 }, + { 0x0014, 0x010a }, + { 0x0014, 0x010b }, + { 0x0014, 0x010c }, + { 0x0014, 0x010d }, + { 0x0014, 0x010e }, + { 0x0014, 0x010f }, + { 0x0014, 0x0110 }, + { 0x0014, 0x0111 }, + { 0x0014, 0x0112 }, + { 0x0014, 0x0113 }, + { 0x0014, 0x0114 }, + { 0x0014, 0x0115 }, + { 0x0014, 0x0116 }, + { 0x0014, 0x0117 }, + { 0x0014, 0x0118 }, + { 0x0014, 0x0119 }, + { 0x0014, 0x011a }, + { 0x0014, 0x011b }, + { 0x0014, 0x011c }, + { 0x0014, 0x011d }, + { 0x0014, 0x011e }, + { 0x0014, 0x011f }, + { 0x0014, 0x0120 }, + { 0x0014, 0x0121 }, + { 0x0014, 0x0122 }, + { 0x0014, 0x0123 }, + { 0x0014, 0x0124 }, + { 0x0014, 0x0125 }, + { 0x0014, 0x0126 }, + { 0x0014, 0x0127 }, + { 0x0014, 0x0128 }, + { 0x0014, 0x0129 }, + { 0x0014, 0x012a }, + { 0x0014, 0x012b }, + { 0x0014, 0x012c }, + { 0x0014, 0x012d }, + { 0x0014, 0x012e }, + { 0x0014, 0x012f }, + { 0x0014, 0x0130 }, + { 0x0014, 0x0131 }, + { 0x0014, 0x0132 }, + { 0x0014, 0x0133 }, + { 0x0014, 0x0134 }, + { 0x0014, 0x0135 }, + { 0x0014, 0x0136 }, + { 0x0014, 0x0137 }, + { 0x0014, 0x0138 }, + { 0x0014, 0x0139 }, + { 0x0014, 0x013a }, + { 0x0014, 0x013b }, + { 0x0014, 0x013c }, + { 0x0014, 0x013d }, + { 0x0014, 0x013e }, + { 0x0014, 0x013f }, + { 0x0014, 0x0140 }, + { 0x0014, 0x0141 }, + { 0x0014, 0x0142 }, + { 0x0014, 0x0143 }, + { 0x0014, 0x0144 }, + { 0x0014, 0x0145 }, + { 0x0014, 0x0146 }, + { 0x0014, 0x0147 }, + { 0x0014, 0x0148 }, + { 0x0014, 0x0149 }, + { 0x0014, 0x014a }, + { 0x0014, 0x014b }, + { 0x0014, 0x014c }, + { 0x0014, 0x014d }, + { 0x0014, 0x014e }, + { 0x0014, 0x014f }, + { 0x0014, 0x0150 }, + { 0x0014, 0x0151 }, + { 0x0014, 0x0152 }, + { 0x0014, 0x0153 }, + { 0x0014, 0x0154 }, + { 0x0014, 0x0155 }, + { 0x0014, 0x0156 }, + { 0x0014, 0x0157 }, + { 0x0014, 0x0158 }, + { 0x0014, 0x0159 }, + { 0x0014, 0x015a }, + { 0x0014, 0x015b }, + { 0x0014, 0x015c }, + { 0x0014, 0x015d }, + { 0x0014, 0x015e }, + { 0x0014, 0x015f }, + { 0x0014, 0x0160 }, + { 0x0014, 0x0161 }, + { 0x0014, 0x0162 }, + { 0x0014, 0x0163 }, + { 0x0014, 0x0164 }, + { 0x0014, 0x0165 }, + { 0x0014, 0x0166 }, + { 0x0014, 0x0167 }, + { 0x0014, 0x0168 }, + { 0x0014, 0x0169 }, + { 0x0014, 0x016a }, + { 0x0014, 0x016b }, + { 0x0014, 0x016c }, + { 0x0014, 0x016d }, + { 0x0014, 0x016e }, + { 0x0014, 0x016f }, + { 0x0014, 0x0170 }, + { 0x0014, 0x0171 }, + { 0x0014, 0x0172 }, + { 0x0014, 0x0173 }, + { 0x0014, 0x0174 }, + { 0x0014, 0x0175 }, + { 0x0014, 0x0176 }, + { 0x0014, 0x0177 }, + { 0x0014, 0x0178 }, + { 0x0014, 0x0179 }, + { 0x0014, 0x017a }, + { 0x0014, 0x017b }, + { 0x0014, 0x017c }, + { 0x0014, 0x017d }, + { 0x0014, 0x017e }, + { 0x0014, 0x017f }, + { 0x0014, 0x0180 }, + { 0x0014, 0x0181 }, + { 0x0014, 0x0182 }, + { 0x0014, 0x0183 }, + { 0x0014, 0x0184 }, + { 0x0014, 0x0185 }, + { 0x0014, 0x0186 }, + { 0x0014, 0x0187 }, + { 0x0014, 0x0188 }, + { 0x0014, 0x0189 }, + { 0x0014, 0x018a }, + { 0x0014, 0x018b }, + { 0x0014, 0x018c }, + { 0x0014, 0x018d }, + { 0x0014, 0x018e }, + { 0x0014, 0x018f }, + { 0x0014, 0x0190 }, + { 0x0014, 0x0191 }, + { 0x0014, 0x0192 }, + { 0x0014, 0x0193 }, + { 0x0014, 0x0194 }, + { 0x0014, 0x0195 }, + { 0x0014, 0x0196 }, + { 0x0014, 0x0197 }, + { 0x0013, 0x00db }, + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec15[73][16] = { + { + 0x000cffff, + 0x000bffff, + 0x0008ffff, + 0x0009ffff, + 0x000affff, + 0x0002ffff, + 0x0001ffff, + 0x0003ffff, + 0x0004ffff, + 0x0005ffff, + 0x0006ffff, + 0x0007ffff, + 0x00000019, + 0x0000001a, + 0x00000031, + 0x00000032, + }, + { + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + }, + { + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + }, + { + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + }, + { + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + }, + { + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + }, + { + 0x0003004a, + 0x0003004a, + 0x0003004a, + 0x0003004a, + 0x0003004a, + 0x0003004a, + 0x0003004a, + 0x0003004a, + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004b, + }, + { + 0x00030061, + 0x00030061, + 0x00030061, + 0x00030061, + 0x00030061, + 0x00030061, + 0x00030061, + 0x00030061, + 0x00030062, + 0x00030062, + 0x00030062, + 0x00030062, + 0x00030062, + 0x00030062, + 0x00030062, + 0x00030062, + }, + { + 0x00010091, + 0x00010091, + 0x00010092, + 0x00010092, + 0x00020003, + 0x00020003, + 0x00020003, + 0x00020003, + 0x00020004, + 0x00020004, + 0x00020004, + 0x00020004, + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x0002001d, + }, + { + 0x00020035, + 0x00020035, + 0x00020035, + 0x00020035, + 0x00020048, + 0x00020048, + 0x00020048, + 0x00020048, + 0x0002004c, + 0x0002004c, + 0x0002004c, + 0x0002004c, + 0x00020060, + 0x00020060, + 0x00020060, + 0x00020060, + }, + { + 0x00020063, + 0x00020063, + 0x00020063, + 0x00020063, + 0x00020064, + 0x00020064, + 0x00020064, + 0x00020064, + 0x00020079, + 0x00020079, + 0x00020079, + 0x00020079, + 0x0002007a, + 0x0002007a, + 0x0002007a, + 0x0002007a, + }, + { + 0x00010005, + 0x00010005, + 0x0001001e, + 0x0001001e, + 0x00010036, + 0x00010036, + 0x0001004d, + 0x0001004d, + 0x00010065, + 0x00010065, + 0x00010078, + 0x00010078, + 0x0001007b, + 0x0001007b, + 0x0001007c, + 0x0001007c, + }, + { + 0x0015ffff, + 0x0014ffff, + 0x0012ffff, + 0x0013ffff, + 0x000dffff, + 0x000effff, + 0x000fffff, + 0x0010ffff, + 0x0011ffff, + 0x00000006, + 0x0000001f, + 0x0000004e, + 0x0000007d, + 0x00000090, + 0x00000093, + 0x000000a9, + }, + { + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + }, + { + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x00030066, + 0x00030066, + 0x00030066, + 0x00030066, + 0x00030066, + 0x00030066, + 0x00030066, + 0x00030066, + }, + { + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x00030094, + 0x00030094, + 0x00030094, + 0x00030094, + 0x00030094, + 0x00030094, + 0x00030094, + 0x00030094, + }, + { + 0x00030095, + 0x00030095, + 0x00030095, + 0x00030095, + 0x00030095, + 0x00030095, + 0x00030095, + 0x00030095, + 0x000300a8, + 0x000300a8, + 0x000300a8, + 0x000300a8, + 0x000300a8, + 0x000300a8, + 0x000300a8, + 0x000300a8, + }, + { + 0x000300aa, + 0x000300aa, + 0x000300aa, + 0x000300aa, + 0x000300aa, + 0x000300aa, + 0x000300aa, + 0x000300aa, + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300ab, + }, + { + 0x000100ad, + 0x000100ad, + 0x000100c0, + 0x000100c0, + 0x000100c3, + 0x000100c3, + 0x000100c4, + 0x000100c4, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020038, + 0x00020038, + 0x00020038, + 0x00020038, + }, + { + 0x00020067, + 0x00020067, + 0x00020067, + 0x00020067, + 0x000200ac, + 0x000200ac, + 0x000200ac, + 0x000200ac, + 0x000200c1, + 0x000200c1, + 0x000200c1, + 0x000200c1, + 0x000200c2, + 0x000200c2, + 0x000200c2, + 0x000200c2, + }, + { + 0x00000097, + 0x000000ae, + 0x000000c5, + 0x000000d8, + 0x000000d9, + 0x000000da, + 0x00010008, + 0x00010008, + 0x00010050, + 0x00010050, + 0x00010068, + 0x00010068, + 0x0001007f, + 0x0001007f, + 0x00010096, + 0x00010096, + }, + { + 0x002fffff, + 0x0020ffff, + 0x001fffff, + 0x001effff, + 0x001bffff, + 0x001cffff, + 0x001dffff, + 0x0016ffff, + 0x0017ffff, + 0x0018ffff, + 0x0019ffff, + 0x001affff, + 0x00000021, + 0x00000039, + 0x00000051, + 0x00000080, + }, + { + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + }, + { + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030098, + 0x00030098, + 0x00030098, + 0x00030098, + 0x00030098, + 0x00030098, + 0x00030098, + 0x00030098, + }, + { + 0x000300af, + 0x000300af, + 0x000300af, + 0x000300af, + 0x000300af, + 0x000300af, + 0x000300af, + 0x000300af, + 0x000300c6, + 0x000300c6, + 0x000300c6, + 0x000300c6, + 0x000300c6, + 0x000300c6, + 0x000300c6, + 0x000300c6, + }, + { + 0x000300db, + 0x000300db, + 0x000300db, + 0x000300db, + 0x000300db, + 0x000300db, + 0x000300db, + 0x000300db, + 0x000300dc, + 0x000300dc, + 0x000300dc, + 0x000300dc, + 0x000300dc, + 0x000300dc, + 0x000300dc, + 0x000300dc, + }, + { + 0x000300f1, + 0x000300f1, + 0x000300f1, + 0x000300f1, + 0x000300f1, + 0x000300f1, + 0x000300f1, + 0x000300f1, + 0x000300f2, + 0x000300f2, + 0x000300f2, + 0x000300f2, + 0x000300f2, + 0x000300f2, + 0x000300f2, + 0x000300f2, + }, + { + 0x00010109, + 0x00010109, + 0x0001010b, + 0x0001010b, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002003a, + 0x0002003a, + 0x0002003a, + 0x0002003a, + 0x00020052, + 0x00020052, + 0x00020052, + 0x00020052, + }, + { + 0x0002006a, + 0x0002006a, + 0x0002006a, + 0x0002006a, + 0x00020081, + 0x00020081, + 0x00020081, + 0x00020081, + 0x000200b0, + 0x000200b0, + 0x000200b0, + 0x000200b0, + 0x000200c7, + 0x000200c7, + 0x000200c7, + 0x000200c7, + }, + { + 0x000200dd, + 0x000200dd, + 0x000200dd, + 0x000200dd, + 0x000200f0, + 0x000200f0, + 0x000200f0, + 0x000200f0, + 0x000200f3, + 0x000200f3, + 0x000200f3, + 0x000200f3, + 0x000200f4, + 0x000200f4, + 0x000200f4, + 0x000200f4, + }, + { + 0x0000010a, + 0x0000010c, + 0x00000121, + 0x00000122, + 0x0001000b, + 0x0001000b, + 0x00010023, + 0x00010023, + 0x00010053, + 0x00010053, + 0x00010099, + 0x00010099, + 0x000100de, + 0x000100de, + 0x000100f5, + 0x000100f5, + }, + { + 0x0024ffff, + 0x0022ffff, + 0x0025ffff, + 0x0026ffff, + 0x0027ffff, + 0x0028ffff, + 0x0029ffff, + 0x0000003b, + 0x0000006b, + 0x00000082, + 0x0000009a, + 0x000000b1, + 0x000000c8, + 0x000000df, + 0x000000f6, + 0x00000108, + }, + { + 0x0040ffff, + 0x0041ffff, + 0x0042ffff, + 0x0043ffff, + 0x0044ffff, + 0x0045ffff, + 0x0046ffff, + 0x0047ffff, + 0x0048ffff, + 0x002dffff, + 0x002effff, + 0x002affff, + 0x002bffff, + 0x002cffff, + 0x0021ffff, + 0x0023ffff, + }, + { + 0x0002013b, + 0x0002013b, + 0x0002013b, + 0x0002013b, + 0x00020154, + 0x00020154, + 0x00020154, + 0x00020154, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + }, + { + 0x00030083, + 0x00030083, + 0x00030083, + 0x00030083, + 0x00030083, + 0x00030083, + 0x00030083, + 0x00030083, + 0x0003009b, + 0x0003009b, + 0x0003009b, + 0x0003009b, + 0x0003009b, + 0x0003009b, + 0x0003009b, + 0x0003009b, + }, + { + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + }, + { + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x0003006c, + 0x0003006c, + 0x0003006c, + 0x0003006c, + 0x0003006c, + 0x0003006c, + 0x0003006c, + 0x0003006c, + }, + { + 0x000300b2, + 0x000300b2, + 0x000300b2, + 0x000300b2, + 0x000300b2, + 0x000300b2, + 0x000300b2, + 0x000300b2, + 0x000300ca, + 0x000300ca, + 0x000300ca, + 0x000300ca, + 0x000300ca, + 0x000300ca, + 0x000300ca, + 0x000300ca, + }, + { + 0x000300e0, + 0x000300e0, + 0x000300e0, + 0x000300e0, + 0x000300e0, + 0x000300e0, + 0x000300e0, + 0x000300e0, + 0x000300e1, + 0x000300e1, + 0x000300e1, + 0x000300e1, + 0x000300e1, + 0x000300e1, + 0x000300e1, + 0x000300e1, + }, + { + 0x000300e2, + 0x000300e2, + 0x000300e2, + 0x000300e2, + 0x000300e2, + 0x000300e2, + 0x000300e2, + 0x000300e2, + 0x000300f7, + 0x000300f7, + 0x000300f7, + 0x000300f7, + 0x000300f7, + 0x000300f7, + 0x000300f7, + 0x000300f7, + }, + { + 0x0003010d, + 0x0003010d, + 0x0003010d, + 0x0003010d, + 0x0003010d, + 0x0003010d, + 0x0003010d, + 0x0003010d, + 0x0003010e, + 0x0003010e, + 0x0003010e, + 0x0003010e, + 0x0003010e, + 0x0003010e, + 0x0003010e, + 0x0003010e, + }, + { + 0x00030123, + 0x00030123, + 0x00030123, + 0x00030123, + 0x00030123, + 0x00030123, + 0x00030123, + 0x00030123, + 0x00030124, + 0x00030124, + 0x00030124, + 0x00030124, + 0x00030124, + 0x00030124, + 0x00030124, + 0x00030124, + }, + { + 0x0001013e, + 0x0001013e, + 0x0001016c, + 0x0001016c, + 0x0001016d, + 0x0001016d, + 0x0001023f, + 0x0001023f, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002003d, + 0x0002003d, + 0x0002003d, + 0x0002003d, + }, + { + 0x00020055, + 0x00020055, + 0x00020055, + 0x00020055, + 0x000200b3, + 0x000200b3, + 0x000200b3, + 0x000200b3, + 0x000200c9, + 0x000200c9, + 0x000200c9, + 0x000200c9, + 0x000200f8, + 0x000200f8, + 0x000200f8, + 0x000200f8, + }, + { + 0x0002010f, + 0x0002010f, + 0x0002010f, + 0x0002010f, + 0x00020120, + 0x00020120, + 0x00020120, + 0x00020120, + 0x00020127, + 0x00020127, + 0x00020127, + 0x00020127, + 0x0002013a, + 0x0002013a, + 0x0002013a, + 0x0002013a, + }, + { + 0x00000237, + 0x00000238, + 0x00000239, + 0x0000023a, + 0x0000023b, + 0x0000023c, + 0x0000023d, + 0x0000023e, + 0x0001000e, + 0x0001000e, + 0x00010026, + 0x00010026, + 0x0001006d, + 0x0001006d, + 0x0001009d, + 0x0001009d, + }, + { + 0x000100cb, + 0x000100cb, + 0x000100cc, + 0x000100cc, + 0x00010112, + 0x00010112, + 0x00010125, + 0x00010125, + 0x00010126, + 0x00010126, + 0x00010128, + 0x00010128, + 0x00010138, + 0x00010138, + 0x00010139, + 0x00010139, + }, + { + 0x0030ffff, + 0x0031ffff, + 0x0032ffff, + 0x0033ffff, + 0x0034ffff, + 0x0035ffff, + 0x0036ffff, + 0x0037ffff, + 0x0038ffff, + 0x0039ffff, + 0x003affff, + 0x003bffff, + 0x003cffff, + 0x003dffff, + 0x003effff, + 0x003fffff, + }, + { + 0x0000000d, + 0x0000000f, + 0x00000010, + 0x00000011, + 0x00000012, + 0x00000013, + 0x00000014, + 0x00000015, + 0x00000016, + 0x00000017, + 0x00000027, + 0x00000028, + 0x00000029, + 0x0000002a, + 0x0000002b, + 0x0000002c, + }, + { + 0x0000002d, + 0x0000002e, + 0x0000002f, + 0x0000003e, + 0x0000003f, + 0x00000040, + 0x00000041, + 0x00000042, + 0x00000043, + 0x00000044, + 0x00000045, + 0x00000046, + 0x00000047, + 0x00000056, + 0x00000057, + 0x00000058, + }, + { + 0x00000059, + 0x0000005a, + 0x0000005b, + 0x0000005c, + 0x0000005d, + 0x0000005e, + 0x0000005f, + 0x0000006e, + 0x0000006f, + 0x00000070, + 0x00000071, + 0x00000072, + 0x00000073, + 0x00000074, + 0x00000075, + 0x00000076, + }, + { + 0x00000077, + 0x00000084, + 0x00000085, + 0x00000086, + 0x00000087, + 0x00000088, + 0x00000089, + 0x0000008a, + 0x0000008b, + 0x0000008c, + 0x0000008d, + 0x0000008e, + 0x0000008f, + 0x0000009c, + 0x0000009e, + 0x0000009f, + }, + { + 0x000000a0, + 0x000000a1, + 0x000000a2, + 0x000000a3, + 0x000000a4, + 0x000000a5, + 0x000000a6, + 0x000000a7, + 0x000000b4, + 0x000000b5, + 0x000000b6, + 0x000000b7, + 0x000000b8, + 0x000000b9, + 0x000000ba, + 0x000000bb, + }, + { + 0x000000bc, + 0x000000bd, + 0x000000be, + 0x000000bf, + 0x000000cd, + 0x000000ce, + 0x000000cf, + 0x000000d0, + 0x000000d1, + 0x000000d2, + 0x000000d3, + 0x000000d4, + 0x000000d5, + 0x000000d6, + 0x000000d7, + 0x000000e3, + }, + { + 0x000000e4, + 0x000000e5, + 0x000000e6, + 0x000000e7, + 0x000000e8, + 0x000000e9, + 0x000000ea, + 0x000000eb, + 0x000000ec, + 0x000000ed, + 0x000000ee, + 0x000000ef, + 0x000000f9, + 0x000000fa, + 0x000000fb, + 0x000000fc, + }, + { + 0x000000fd, + 0x000000fe, + 0x000000ff, + 0x00000100, + 0x00000101, + 0x00000102, + 0x00000103, + 0x00000104, + 0x00000105, + 0x00000106, + 0x00000107, + 0x00000110, + 0x00000111, + 0x00000113, + 0x00000114, + 0x00000115, + }, + { + 0x00000116, + 0x00000117, + 0x00000118, + 0x00000119, + 0x0000011a, + 0x0000011b, + 0x0000011c, + 0x0000011d, + 0x0000011e, + 0x0000011f, + 0x00000129, + 0x0000012a, + 0x0000012b, + 0x0000012c, + 0x0000012d, + 0x0000012e, + }, + { + 0x0000012f, + 0x00000130, + 0x00000131, + 0x00000132, + 0x00000133, + 0x00000134, + 0x00000135, + 0x00000136, + 0x00000137, + 0x0000013c, + 0x0000013d, + 0x0000013f, + 0x00000140, + 0x00000141, + 0x00000142, + 0x00000143, + }, + { + 0x00000144, + 0x00000145, + 0x00000146, + 0x00000147, + 0x00000148, + 0x00000149, + 0x0000014a, + 0x0000014b, + 0x0000014c, + 0x0000014d, + 0x0000014e, + 0x0000014f, + 0x00000150, + 0x00000151, + 0x00000152, + 0x00000153, + }, + { + 0x00000155, + 0x00000156, + 0x00000157, + 0x00000158, + 0x00000159, + 0x0000015a, + 0x0000015b, + 0x0000015c, + 0x0000015d, + 0x0000015e, + 0x0000015f, + 0x00000160, + 0x00000161, + 0x00000162, + 0x00000163, + 0x00000164, + }, + { + 0x00000165, + 0x00000166, + 0x00000167, + 0x00000168, + 0x00000169, + 0x0000016a, + 0x0000016b, + 0x0000016e, + 0x0000016f, + 0x00000170, + 0x00000171, + 0x00000172, + 0x00000173, + 0x00000174, + 0x00000175, + 0x00000176, + }, + { + 0x00000177, + 0x00000178, + 0x00000179, + 0x0000017a, + 0x0000017b, + 0x0000017c, + 0x0000017d, + 0x0000017e, + 0x0000017f, + 0x00000180, + 0x00000181, + 0x00000182, + 0x00000183, + 0x00000184, + 0x00000185, + 0x00000186, + }, + { + 0x00000187, + 0x00000188, + 0x00000189, + 0x0000018a, + 0x0000018b, + 0x0000018c, + 0x0000018d, + 0x0000018e, + 0x0000018f, + 0x00000190, + 0x00000191, + 0x00000192, + 0x00000193, + 0x00000194, + 0x00000195, + 0x00000196, + }, + { + 0x00000197, + 0x00000198, + 0x00000199, + 0x0000019a, + 0x0000019b, + 0x0000019c, + 0x0000019d, + 0x0000019e, + 0x0000019f, + 0x000001a0, + 0x000001a1, + 0x000001a2, + 0x000001a3, + 0x000001a4, + 0x000001a5, + 0x000001a6, + }, + { + 0x000001a7, + 0x000001a8, + 0x000001a9, + 0x000001aa, + 0x000001ab, + 0x000001ac, + 0x000001ad, + 0x000001ae, + 0x000001af, + 0x000001b0, + 0x000001b1, + 0x000001b2, + 0x000001b3, + 0x000001b4, + 0x000001b5, + 0x000001b6, + }, + { + 0x000001b7, + 0x000001b8, + 0x000001b9, + 0x000001ba, + 0x000001bb, + 0x000001bc, + 0x000001bd, + 0x000001be, + 0x000001bf, + 0x000001c0, + 0x000001c1, + 0x000001c2, + 0x000001c3, + 0x000001c4, + 0x000001c5, + 0x000001c6, + }, + { + 0x000001c7, + 0x000001c8, + 0x000001c9, + 0x000001ca, + 0x000001cb, + 0x000001cc, + 0x000001cd, + 0x000001ce, + 0x000001cf, + 0x000001d0, + 0x000001d1, + 0x000001d2, + 0x000001d3, + 0x000001d4, + 0x000001d5, + 0x000001d6, + }, + { + 0x000001d7, + 0x000001d8, + 0x000001d9, + 0x000001da, + 0x000001db, + 0x000001dc, + 0x000001dd, + 0x000001de, + 0x000001df, + 0x000001e0, + 0x000001e1, + 0x000001e2, + 0x000001e3, + 0x000001e4, + 0x000001e5, + 0x000001e6, + }, + { + 0x000001e7, + 0x000001e8, + 0x000001e9, + 0x000001ea, + 0x000001eb, + 0x000001ec, + 0x000001ed, + 0x000001ee, + 0x000001ef, + 0x000001f0, + 0x000001f1, + 0x000001f2, + 0x000001f3, + 0x000001f4, + 0x000001f5, + 0x000001f6, + }, + { + 0x000001f7, + 0x000001f8, + 0x000001f9, + 0x000001fa, + 0x000001fb, + 0x000001fc, + 0x000001fd, + 0x000001fe, + 0x000001ff, + 0x00000200, + 0x00000201, + 0x00000202, + 0x00000203, + 0x00000204, + 0x00000205, + 0x00000206, + }, + { + 0x00000207, + 0x00000208, + 0x00000209, + 0x0000020a, + 0x0000020b, + 0x0000020c, + 0x0000020d, + 0x0000020e, + 0x0000020f, + 0x00000210, + 0x00000211, + 0x00000212, + 0x00000213, + 0x00000214, + 0x00000215, + 0x00000216, + }, + { + 0x00000217, + 0x00000218, + 0x00000219, + 0x0000021a, + 0x0000021b, + 0x0000021c, + 0x0000021d, + 0x0000021e, + 0x0000021f, + 0x00000220, + 0x00000221, + 0x00000222, + 0x00000223, + 0x00000224, + 0x00000225, + 0x00000226, + }, + { + 0x00000227, + 0x00000228, + 0x00000229, + 0x0000022a, + 0x0000022b, + 0x0000022c, + 0x0000022d, + 0x0000022e, + 0x0000022f, + 0x00000230, + 0x00000231, + 0x00000232, + 0x00000233, + 0x00000234, + 0x00000235, + 0x00000236, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc16[729][2] = +#else +const uint16_t c_aauiCQMFHuffEnc16[729][2] = +#endif + { + { 0x0006, 0x000d }, + { 0x0005, 0x0010 }, + { 0x0006, 0x000e }, + { 0x0006, 0x000f }, + { 0x0006, 0x0010 }, + { 0x0007, 0x000a }, + { 0x0007, 0x000b }, + { 0x0008, 0x000a }, + { 0x0009, 0x000b }, + { 0x000b, 0x000d }, + { 0x000c, 0x000e }, + { 0x000e, 0x0016 }, + { 0x0010, 0x002d }, + { 0x0011, 0x0051 }, + { 0x0012, 0x008c }, + { 0x0014, 0x0000 }, + { 0x0014, 0x0001 }, + { 0x0014, 0x0002 }, + { 0x0014, 0x0003 }, + { 0x0014, 0x0004 }, + { 0x0014, 0x0005 }, + { 0x0014, 0x0006 }, + { 0x0014, 0x0007 }, + { 0x0014, 0x0008 }, + { 0x0014, 0x0009 }, + { 0x0014, 0x000a }, + { 0x0014, 0x000b }, + { 0x0005, 0x0011 }, + { 0x0004, 0x000f }, + { 0x0005, 0x0012 }, + { 0x0005, 0x0013 }, + { 0x0005, 0x0014 }, + { 0x0006, 0x0011 }, + { 0x0006, 0x0012 }, + { 0x0007, 0x000c }, + { 0x0008, 0x000b }, + { 0x000a, 0x000c }, + { 0x000b, 0x000e }, + { 0x000d, 0x0010 }, + { 0x000e, 0x0017 }, + { 0x000f, 0x001c }, + { 0x0013, 0x010b }, + { 0x0013, 0x010c }, + { 0x0014, 0x000c }, + { 0x0014, 0x000d }, + { 0x0014, 0x000e }, + { 0x0014, 0x000f }, + { 0x0014, 0x0010 }, + { 0x0014, 0x0011 }, + { 0x0014, 0x0012 }, + { 0x0014, 0x0013 }, + { 0x0014, 0x0014 }, + { 0x0014, 0x0015 }, + { 0x0014, 0x0016 }, + { 0x0006, 0x0013 }, + { 0x0005, 0x0015 }, + { 0x0005, 0x0016 }, + { 0x0005, 0x0017 }, + { 0x0005, 0x0018 }, + { 0x0006, 0x0014 }, + { 0x0007, 0x000d }, + { 0x0007, 0x000e }, + { 0x0009, 0x000c }, + { 0x000a, 0x000d }, + { 0x000c, 0x000f }, + { 0x000d, 0x0011 }, + { 0x000f, 0x001d }, + { 0x0011, 0x0052 }, + { 0x0012, 0x008d }, + { 0x0012, 0x008e }, + { 0x0014, 0x0017 }, + { 0x0014, 0x0018 }, + { 0x0014, 0x0019 }, + { 0x0014, 0x001a }, + { 0x0014, 0x001b }, + { 0x0014, 0x001c }, + { 0x0014, 0x001d }, + { 0x0014, 0x001e }, + { 0x0014, 0x001f }, + { 0x0014, 0x0020 }, + { 0x0014, 0x0021 }, + { 0x0006, 0x0015 }, + { 0x0005, 0x0019 }, + { 0x0005, 0x001a }, + { 0x0005, 0x001b }, + { 0x0006, 0x0016 }, + { 0x0006, 0x0017 }, + { 0x0007, 0x000f }, + { 0x0008, 0x000c }, + { 0x0009, 0x000d }, + { 0x000b, 0x000f }, + { 0x000c, 0x0010 }, + { 0x000d, 0x0012 }, + { 0x000f, 0x001e }, + { 0x0012, 0x008f }, + { 0x0014, 0x0022 }, + { 0x0014, 0x0023 }, + { 0x0014, 0x0024 }, + { 0x0014, 0x0025 }, + { 0x0014, 0x0026 }, + { 0x0014, 0x0027 }, + { 0x0014, 0x0028 }, + { 0x0014, 0x0029 }, + { 0x0014, 0x002a }, + { 0x0014, 0x002b }, + { 0x0014, 0x002c }, + { 0x0014, 0x002d }, + { 0x0014, 0x002e }, + { 0x0006, 0x0018 }, + { 0x0005, 0x001c }, + { 0x0005, 0x001d }, + { 0x0006, 0x0019 }, + { 0x0006, 0x001a }, + { 0x0007, 0x0010 }, + { 0x0007, 0x0011 }, + { 0x0008, 0x000d }, + { 0x000a, 0x000e }, + { 0x000b, 0x0010 }, + { 0x000c, 0x0011 }, + { 0x000e, 0x0018 }, + { 0x0010, 0x002e }, + { 0x0012, 0x0090 }, + { 0x0013, 0x010d }, + { 0x0013, 0x010e }, + { 0x0014, 0x002f }, + { 0x0014, 0x0030 }, + { 0x0014, 0x0031 }, + { 0x0014, 0x0032 }, + { 0x0014, 0x0033 }, + { 0x0014, 0x0034 }, + { 0x0014, 0x0035 }, + { 0x0014, 0x0036 }, + { 0x0014, 0x0037 }, + { 0x0014, 0x0038 }, + { 0x0014, 0x0039 }, + { 0x0007, 0x0012 }, + { 0x0006, 0x001b }, + { 0x0006, 0x001c }, + { 0x0006, 0x001d }, + { 0x0007, 0x0013 }, + { 0x0007, 0x0014 }, + { 0x0008, 0x000e }, + { 0x0009, 0x000e }, + { 0x000b, 0x0011 }, + { 0x000c, 0x0012 }, + { 0x000d, 0x0013 }, + { 0x000e, 0x0019 }, + { 0x0010, 0x002f }, + { 0x0012, 0x0091 }, + { 0x0014, 0x003a }, + { 0x0014, 0x003b }, + { 0x0014, 0x003c }, + { 0x0014, 0x003d }, + { 0x0014, 0x003e }, + { 0x0014, 0x003f }, + { 0x0014, 0x0040 }, + { 0x0014, 0x0041 }, + { 0x0014, 0x0042 }, + { 0x0014, 0x0043 }, + { 0x0014, 0x0044 }, + { 0x0014, 0x0045 }, + { 0x0014, 0x0046 }, + { 0x0007, 0x0015 }, + { 0x0006, 0x001e }, + { 0x0006, 0x001f }, + { 0x0007, 0x0016 }, + { 0x0007, 0x0017 }, + { 0x0008, 0x000f }, + { 0x0009, 0x000f }, + { 0x000a, 0x000f }, + { 0x000b, 0x0012 }, + { 0x000d, 0x0014 }, + { 0x000e, 0x001a }, + { 0x000f, 0x001f }, + { 0x0013, 0x010f }, + { 0x0011, 0x0053 }, + { 0x0014, 0x0047 }, + { 0x0014, 0x0048 }, + { 0x0014, 0x0049 }, + { 0x0014, 0x004a }, + { 0x0014, 0x004b }, + { 0x0014, 0x004c }, + { 0x0014, 0x004d }, + { 0x0014, 0x004e }, + { 0x0014, 0x004f }, + { 0x0014, 0x0050 }, + { 0x0014, 0x0051 }, + { 0x0014, 0x0052 }, + { 0x0014, 0x0053 }, + { 0x0008, 0x0010 }, + { 0x0007, 0x0018 }, + { 0x0007, 0x0019 }, + { 0x0008, 0x0011 }, + { 0x0008, 0x0012 }, + { 0x0009, 0x0010 }, + { 0x000a, 0x0010 }, + { 0x000b, 0x0013 }, + { 0x000c, 0x0013 }, + { 0x000e, 0x001b }, + { 0x000f, 0x0020 }, + { 0x0010, 0x0030 }, + { 0x0012, 0x0092 }, + { 0x0014, 0x0054 }, + { 0x0014, 0x0055 }, + { 0x0014, 0x0056 }, + { 0x0014, 0x0057 }, + { 0x0014, 0x0058 }, + { 0x0014, 0x0059 }, + { 0x0014, 0x005a }, + { 0x0014, 0x005b }, + { 0x0014, 0x005c }, + { 0x0014, 0x005d }, + { 0x0014, 0x005e }, + { 0x0014, 0x005f }, + { 0x0014, 0x0060 }, + { 0x0014, 0x0061 }, + { 0x0009, 0x0011 }, + { 0x0008, 0x0013 }, + { 0x0009, 0x0012 }, + { 0x0009, 0x0013 }, + { 0x000a, 0x0011 }, + { 0x000a, 0x0012 }, + { 0x000b, 0x0014 }, + { 0x000c, 0x0014 }, + { 0x000d, 0x0015 }, + { 0x000e, 0x001c }, + { 0x000f, 0x0021 }, + { 0x0013, 0x0110 }, + { 0x0012, 0x0093 }, + { 0x0012, 0x0094 }, + { 0x0014, 0x0062 }, + { 0x0014, 0x0063 }, + { 0x0014, 0x0064 }, + { 0x0014, 0x0065 }, + { 0x0014, 0x0066 }, + { 0x0014, 0x0067 }, + { 0x0014, 0x0068 }, + { 0x0014, 0x0069 }, + { 0x0014, 0x006a }, + { 0x0014, 0x006b }, + { 0x0014, 0x006c }, + { 0x0014, 0x006d }, + { 0x0014, 0x006e }, + { 0x000b, 0x0015 }, + { 0x000a, 0x0013 }, + { 0x000a, 0x0014 }, + { 0x000a, 0x0015 }, + { 0x000b, 0x0016 }, + { 0x000c, 0x0015 }, + { 0x000d, 0x0016 }, + { 0x000d, 0x0017 }, + { 0x000f, 0x0022 }, + { 0x0010, 0x0031 }, + { 0x0012, 0x0095 }, + { 0x0012, 0x0096 }, + { 0x0014, 0x006f }, + { 0x0013, 0x0111 }, + { 0x0014, 0x0070 }, + { 0x0014, 0x0071 }, + { 0x0014, 0x0072 }, + { 0x0014, 0x0073 }, + { 0x0014, 0x0074 }, + { 0x0014, 0x0075 }, + { 0x0014, 0x0076 }, + { 0x0014, 0x0077 }, + { 0x0014, 0x0078 }, + { 0x0014, 0x0079 }, + { 0x0014, 0x007a }, + { 0x0014, 0x007b }, + { 0x0014, 0x007c }, + { 0x000c, 0x0016 }, + { 0x000b, 0x0017 }, + { 0x000c, 0x0017 }, + { 0x000c, 0x0018 }, + { 0x000c, 0x0019 }, + { 0x000d, 0x0018 }, + { 0x000e, 0x001d }, + { 0x000f, 0x0023 }, + { 0x000f, 0x0024 }, + { 0x0011, 0x0054 }, + { 0x0012, 0x0097 }, + { 0x0014, 0x007d }, + { 0x0014, 0x007e }, + { 0x0014, 0x007f }, + { 0x0014, 0x0080 }, + { 0x0014, 0x0081 }, + { 0x0014, 0x0082 }, + { 0x0014, 0x0083 }, + { 0x0014, 0x0084 }, + { 0x0014, 0x0085 }, + { 0x0014, 0x0086 }, + { 0x0014, 0x0087 }, + { 0x0014, 0x0088 }, + { 0x0014, 0x0089 }, + { 0x0014, 0x008a }, + { 0x0014, 0x008b }, + { 0x0014, 0x008c }, + { 0x000e, 0x001e }, + { 0x000d, 0x0019 }, + { 0x000d, 0x001a }, + { 0x000d, 0x001b }, + { 0x000e, 0x001f }, + { 0x000f, 0x0025 }, + { 0x000f, 0x0026 }, + { 0x0010, 0x0032 }, + { 0x0010, 0x0033 }, + { 0x0012, 0x0098 }, + { 0x0013, 0x0112 }, + { 0x0014, 0x008d }, + { 0x0014, 0x008e }, + { 0x0014, 0x008f }, + { 0x0014, 0x0090 }, + { 0x0014, 0x0091 }, + { 0x0014, 0x0092 }, + { 0x0014, 0x0093 }, + { 0x0014, 0x0094 }, + { 0x0014, 0x0095 }, + { 0x0014, 0x0096 }, + { 0x0014, 0x0097 }, + { 0x0014, 0x0098 }, + { 0x0014, 0x0099 }, + { 0x0014, 0x009a }, + { 0x0014, 0x009b }, + { 0x0014, 0x009c }, + { 0x000f, 0x0027 }, + { 0x000f, 0x0028 }, + { 0x000f, 0x0029 }, + { 0x000f, 0x002a }, + { 0x0010, 0x0034 }, + { 0x000f, 0x002b }, + { 0x0011, 0x0055 }, + { 0x0012, 0x0099 }, + { 0x0012, 0x009a }, + { 0x0012, 0x009b }, + { 0x0014, 0x009d }, + { 0x0013, 0x0113 }, + { 0x0014, 0x009e }, + { 0x0014, 0x009f }, + { 0x0014, 0x00a0 }, + { 0x0014, 0x00a1 }, + { 0x0014, 0x00a2 }, + { 0x0014, 0x00a3 }, + { 0x0014, 0x00a4 }, + { 0x0014, 0x00a5 }, + { 0x0014, 0x00a6 }, + { 0x0014, 0x00a7 }, + { 0x0014, 0x00a8 }, + { 0x0014, 0x00a9 }, + { 0x0014, 0x00aa }, + { 0x0014, 0x00ab }, + { 0x0014, 0x00ac }, + { 0x0011, 0x0056 }, + { 0x0010, 0x0035 }, + { 0x0010, 0x0036 }, + { 0x0010, 0x0037 }, + { 0x0011, 0x0057 }, + { 0x0012, 0x009c }, + { 0x0012, 0x009d }, + { 0x0012, 0x009e }, + { 0x0014, 0x00ad }, + { 0x0014, 0x00ae }, + { 0x0014, 0x00af }, + { 0x0014, 0x00b0 }, + { 0x0014, 0x00b1 }, + { 0x0014, 0x00b2 }, + { 0x0014, 0x00b3 }, + { 0x0014, 0x00b4 }, + { 0x0014, 0x00b5 }, + { 0x0014, 0x00b6 }, + { 0x0014, 0x00b7 }, + { 0x0014, 0x00b8 }, + { 0x0014, 0x00b9 }, + { 0x0014, 0x00ba }, + { 0x0014, 0x00bb }, + { 0x0014, 0x00bc }, + { 0x0014, 0x00bd }, + { 0x0014, 0x00be }, + { 0x0014, 0x00bf }, + { 0x0012, 0x009f }, + { 0x0011, 0x0058 }, + { 0x0012, 0x00a0 }, + { 0x0014, 0x00c0 }, + { 0x0011, 0x0059 }, + { 0x0013, 0x0114 }, + { 0x0012, 0x00a1 }, + { 0x0014, 0x00c1 }, + { 0x0013, 0x0115 }, + { 0x0014, 0x00c2 }, + { 0x0014, 0x00c3 }, + { 0x0014, 0x00c4 }, + { 0x0014, 0x00c5 }, + { 0x0014, 0x00c6 }, + { 0x0014, 0x00c7 }, + { 0x0014, 0x00c8 }, + { 0x0014, 0x00c9 }, + { 0x0014, 0x00ca }, + { 0x0014, 0x00cb }, + { 0x0014, 0x00cc }, + { 0x0014, 0x00cd }, + { 0x0014, 0x00ce }, + { 0x0014, 0x00cf }, + { 0x0014, 0x00d0 }, + { 0x0014, 0x00d1 }, + { 0x0014, 0x00d2 }, + { 0x0014, 0x00d3 }, + { 0x0014, 0x00d4 }, + { 0x0014, 0x00d5 }, + { 0x0014, 0x00d6 }, + { 0x0014, 0x00d7 }, + { 0x0014, 0x00d8 }, + { 0x0014, 0x00d9 }, + { 0x0014, 0x00da }, + { 0x0014, 0x00db }, + { 0x0014, 0x00dc }, + { 0x0014, 0x00dd }, + { 0x0014, 0x00de }, + { 0x0014, 0x00df }, + { 0x0014, 0x00e0 }, + { 0x0014, 0x00e1 }, + { 0x0014, 0x00e2 }, + { 0x0014, 0x00e3 }, + { 0x0014, 0x00e4 }, + { 0x0014, 0x00e5 }, + { 0x0014, 0x00e6 }, + { 0x0014, 0x00e7 }, + { 0x0014, 0x00e8 }, + { 0x0014, 0x00e9 }, + { 0x0014, 0x00ea }, + { 0x0014, 0x00eb }, + { 0x0014, 0x00ec }, + { 0x0014, 0x00ed }, + { 0x0014, 0x00ee }, + { 0x0014, 0x00ef }, + { 0x0014, 0x00f0 }, + { 0x0014, 0x00f1 }, + { 0x0014, 0x00f2 }, + { 0x0014, 0x00f3 }, + { 0x0014, 0x00f4 }, + { 0x0014, 0x00f5 }, + { 0x0014, 0x00f6 }, + { 0x0014, 0x00f7 }, + { 0x0014, 0x00f8 }, + { 0x0014, 0x00f9 }, + { 0x0014, 0x00fa }, + { 0x0014, 0x00fb }, + { 0x0014, 0x00fc }, + { 0x0014, 0x00fd }, + { 0x0014, 0x00fe }, + { 0x0014, 0x00ff }, + { 0x0014, 0x0100 }, + { 0x0014, 0x0101 }, + { 0x0014, 0x0102 }, + { 0x0014, 0x0103 }, + { 0x0014, 0x0104 }, + { 0x0014, 0x0105 }, + { 0x0014, 0x0106 }, + { 0x0014, 0x0107 }, + { 0x0014, 0x0108 }, + { 0x0014, 0x0109 }, + { 0x0014, 0x010a }, + { 0x0014, 0x010b }, + { 0x0014, 0x010c }, + { 0x0014, 0x010d }, + { 0x0014, 0x010e }, + { 0x0014, 0x010f }, + { 0x0014, 0x0110 }, + { 0x0014, 0x0111 }, + { 0x0014, 0x0112 }, + { 0x0014, 0x0113 }, + { 0x0014, 0x0114 }, + { 0x0014, 0x0115 }, + { 0x0014, 0x0116 }, + { 0x0014, 0x0117 }, + { 0x0014, 0x0118 }, + { 0x0014, 0x0119 }, + { 0x0014, 0x011a }, + { 0x0014, 0x011b }, + { 0x0014, 0x011c }, + { 0x0014, 0x011d }, + { 0x0014, 0x011e }, + { 0x0014, 0x011f }, + { 0x0014, 0x0120 }, + { 0x0014, 0x0121 }, + { 0x0014, 0x0122 }, + { 0x0014, 0x0123 }, + { 0x0014, 0x0124 }, + { 0x0014, 0x0125 }, + { 0x0013, 0x0116 }, + { 0x0014, 0x0126 }, + { 0x0014, 0x0127 }, + { 0x0014, 0x0128 }, + { 0x0014, 0x0129 }, + { 0x0014, 0x012a }, + { 0x0014, 0x012b }, + { 0x0014, 0x012c }, + { 0x0014, 0x012d }, + { 0x0014, 0x012e }, + { 0x0014, 0x012f }, + { 0x0014, 0x0130 }, + { 0x0014, 0x0131 }, + { 0x0014, 0x0132 }, + { 0x0014, 0x0133 }, + { 0x0014, 0x0134 }, + { 0x0014, 0x0135 }, + { 0x0014, 0x0136 }, + { 0x0014, 0x0137 }, + { 0x0014, 0x0138 }, + { 0x0014, 0x0139 }, + { 0x0014, 0x013a }, + { 0x0014, 0x013b }, + { 0x0014, 0x013c }, + { 0x0014, 0x013d }, + { 0x0014, 0x013e }, + { 0x0014, 0x013f }, + { 0x0014, 0x0140 }, + { 0x0014, 0x0141 }, + { 0x0014, 0x0142 }, + { 0x0014, 0x0143 }, + { 0x0014, 0x0144 }, + { 0x0014, 0x0145 }, + { 0x0014, 0x0146 }, + { 0x0014, 0x0147 }, + { 0x0014, 0x0148 }, + { 0x0014, 0x0149 }, + { 0x0014, 0x014a }, + { 0x0014, 0x014b }, + { 0x0014, 0x014c }, + { 0x0014, 0x014d }, + { 0x0014, 0x014e }, + { 0x0014, 0x014f }, + { 0x0014, 0x0150 }, + { 0x0014, 0x0151 }, + { 0x0014, 0x0152 }, + { 0x0014, 0x0153 }, + { 0x0014, 0x0154 }, + { 0x0014, 0x0155 }, + { 0x0014, 0x0156 }, + { 0x0014, 0x0157 }, + { 0x0014, 0x0158 }, + { 0x0014, 0x0159 }, + { 0x0014, 0x015a }, + { 0x0014, 0x015b }, + { 0x0014, 0x015c }, + { 0x0014, 0x015d }, + { 0x0014, 0x015e }, + { 0x0014, 0x015f }, + { 0x0014, 0x0160 }, + { 0x0014, 0x0161 }, + { 0x0014, 0x0162 }, + { 0x0014, 0x0163 }, + { 0x0014, 0x0164 }, + { 0x0014, 0x0165 }, + { 0x0014, 0x0166 }, + { 0x0014, 0x0167 }, + { 0x0014, 0x0168 }, + { 0x0014, 0x0169 }, + { 0x0014, 0x016a }, + { 0x0014, 0x016b }, + { 0x0014, 0x016c }, + { 0x0014, 0x016d }, + { 0x0014, 0x016e }, + { 0x0014, 0x016f }, + { 0x0014, 0x0170 }, + { 0x0014, 0x0171 }, + { 0x0014, 0x0172 }, + { 0x0014, 0x0173 }, + { 0x0014, 0x0174 }, + { 0x0014, 0x0175 }, + { 0x0014, 0x0176 }, + { 0x0014, 0x0177 }, + { 0x0014, 0x0178 }, + { 0x0014, 0x0179 }, + { 0x0014, 0x017a }, + { 0x0014, 0x017b }, + { 0x0014, 0x017c }, + { 0x0014, 0x017d }, + { 0x0014, 0x017e }, + { 0x0014, 0x017f }, + { 0x0014, 0x0180 }, + { 0x0014, 0x0181 }, + { 0x0014, 0x0182 }, + { 0x0014, 0x0183 }, + { 0x0014, 0x0184 }, + { 0x0014, 0x0185 }, + { 0x0014, 0x0186 }, + { 0x0014, 0x0187 }, + { 0x0014, 0x0188 }, + { 0x0014, 0x0189 }, + { 0x0014, 0x018a }, + { 0x0014, 0x018b }, + { 0x0014, 0x018c }, + { 0x0014, 0x018d }, + { 0x0014, 0x018e }, + { 0x0014, 0x018f }, + { 0x0014, 0x0190 }, + { 0x0014, 0x0191 }, + { 0x0014, 0x0192 }, + { 0x0014, 0x0193 }, + { 0x0014, 0x0194 }, + { 0x0014, 0x0195 }, + { 0x0014, 0x0196 }, + { 0x0014, 0x0197 }, + { 0x0014, 0x0198 }, + { 0x0014, 0x0199 }, + { 0x0014, 0x019a }, + { 0x0014, 0x019b }, + { 0x0014, 0x019c }, + { 0x0014, 0x019d }, + { 0x0014, 0x019e }, + { 0x0014, 0x019f }, + { 0x0014, 0x01a0 }, + { 0x0014, 0x01a1 }, + { 0x0014, 0x01a2 }, + { 0x0014, 0x01a3 }, + { 0x0014, 0x01a4 }, + { 0x0014, 0x01a5 }, + { 0x0014, 0x01a6 }, + { 0x0014, 0x01a7 }, + { 0x0014, 0x01a8 }, + { 0x0014, 0x01a9 }, + { 0x0014, 0x01aa }, + { 0x0014, 0x01ab }, + { 0x0014, 0x01ac }, + { 0x0014, 0x01ad }, + { 0x0014, 0x01ae }, + { 0x0014, 0x01af }, + { 0x0014, 0x01b0 }, + { 0x0014, 0x01b1 }, + { 0x0014, 0x01b2 }, + { 0x0014, 0x01b3 }, + { 0x0014, 0x01b4 }, + { 0x0014, 0x01b5 }, + { 0x0014, 0x01b6 }, + { 0x0014, 0x01b7 }, + { 0x0014, 0x01b8 }, + { 0x0014, 0x01b9 }, + { 0x0014, 0x01ba }, + { 0x0014, 0x01bb }, + { 0x0014, 0x01bc }, + { 0x0014, 0x01bd }, + { 0x0014, 0x01be }, + { 0x0014, 0x01bf }, + { 0x0014, 0x01c0 }, + { 0x0014, 0x01c1 }, + { 0x0014, 0x01c2 }, + { 0x0014, 0x01c3 }, + { 0x0014, 0x01c4 }, + { 0x0014, 0x01c5 }, + { 0x0014, 0x01c6 }, + { 0x0014, 0x01c7 }, + { 0x0014, 0x01c8 }, + { 0x0014, 0x01c9 }, + { 0x0014, 0x01ca }, + { 0x0014, 0x01cb }, + { 0x0014, 0x01cc }, + { 0x0014, 0x01cd }, + { 0x0014, 0x01ce }, + { 0x0014, 0x01cf }, + { 0x0014, 0x01d0 }, + { 0x0014, 0x01d1 }, + { 0x0014, 0x01d2 }, + { 0x0014, 0x01d3 }, + { 0x0014, 0x01d4 }, + { 0x0014, 0x01d5 }, + { 0x0014, 0x01d6 }, + { 0x0014, 0x01d7 }, + { 0x0014, 0x01d8 }, + { 0x0014, 0x01d9 }, + { 0x0014, 0x01da }, + { 0x0014, 0x01db }, + { 0x0014, 0x01dc }, + { 0x0014, 0x01dd }, + { 0x0014, 0x01de }, + { 0x0014, 0x01df }, + { 0x0014, 0x01e0 }, + { 0x0014, 0x01e1 }, + { 0x0014, 0x01e2 }, + { 0x0014, 0x01e3 }, + { 0x0014, 0x01e4 }, + { 0x0014, 0x01e5 }, + { 0x0014, 0x01e6 }, + { 0x0014, 0x01e7 }, + { 0x0014, 0x01e8 }, + { 0x0014, 0x01e9 }, + { 0x0014, 0x01ea }, + { 0x0014, 0x01eb }, + { 0x0014, 0x01ec }, + { 0x0014, 0x01ed }, + { 0x0014, 0x01ee }, + { 0x0014, 0x01ef }, + { 0x0014, 0x01f0 }, + { 0x0014, 0x01f1 }, + { 0x0014, 0x01f2 }, + { 0x0014, 0x01f3 }, + { 0x0014, 0x01f4 }, + { 0x0014, 0x01f5 }, + { 0x0014, 0x01f6 }, + { 0x0014, 0x01f7 }, + { 0x0014, 0x01f8 }, + { 0x0014, 0x01f9 }, + { 0x0014, 0x01fa }, + { 0x0014, 0x01fb }, + { 0x0014, 0x01fc }, + { 0x0014, 0x01fd }, + { 0x0014, 0x01fe }, + { 0x0014, 0x01ff }, + { 0x0014, 0x0200 }, + { 0x0014, 0x0201 }, + { 0x0014, 0x0202 }, + { 0x0014, 0x0203 }, + { 0x0014, 0x0204 }, + { 0x0014, 0x0205 }, + { 0x0014, 0x0206 }, + { 0x0014, 0x0207 }, + { 0x0014, 0x0208 }, + { 0x0014, 0x0209 }, + { 0x0014, 0x020a }, + { 0x0014, 0x020b }, + { 0x0014, 0x020c }, + { 0x0014, 0x020d }, + { 0x0014, 0x020e }, + { 0x0014, 0x020f }, + { 0x0014, 0x0210 }, + { 0x0014, 0x0211 }, + { 0x0014, 0x0212 }, + { 0x0014, 0x0213 }, + { 0x0014, 0x0214 }, + { 0x0014, 0x0215 }, + { 0x0013, 0x0117 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec16[85][16] = { + { + 0x000fffff, + 0x000dffff, + 0x000effff, + 0x0008ffff, + 0x0009ffff, + 0x000affff, + 0x000bffff, + 0x000cffff, + 0x0001ffff, + 0x0002ffff, + 0x0003ffff, + 0x0004ffff, + 0x0005ffff, + 0x0006ffff, + 0x0007ffff, + 0x0000001c, + }, + { + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + }, + { + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + }, + { + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + }, + { + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + }, + { + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030052, + }, + { + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + }, + { + 0x0003006d, + 0x0003006d, + 0x0003006d, + 0x0003006d, + 0x0003006d, + 0x0003006d, + 0x0003006d, + 0x0003006d, + 0x0003006e, + 0x0003006e, + 0x0003006e, + 0x0003006e, + 0x0003006e, + 0x0003006e, + 0x0003006e, + 0x0003006e, + }, + { + 0x000100be, + 0x000100be, + 0x000100bf, + 0x000100bf, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020003, + 0x00020003, + 0x00020003, + 0x00020003, + }, + { + 0x00020004, + 0x00020004, + 0x00020004, + 0x00020004, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020036, + 0x00020036, + 0x00020036, + 0x00020036, + }, + { + 0x0002003b, + 0x0002003b, + 0x0002003b, + 0x0002003b, + 0x00020051, + 0x00020051, + 0x00020051, + 0x00020051, + 0x00020055, + 0x00020055, + 0x00020055, + 0x00020055, + 0x00020056, + 0x00020056, + 0x00020056, + 0x00020056, + }, + { + 0x0002006c, + 0x0002006c, + 0x0002006c, + 0x0002006c, + 0x0002006f, + 0x0002006f, + 0x0002006f, + 0x0002006f, + 0x00020070, + 0x00020070, + 0x00020070, + 0x00020070, + 0x00020088, + 0x00020088, + 0x00020088, + 0x00020088, + }, + { + 0x00020089, + 0x00020089, + 0x00020089, + 0x00020089, + 0x0002008a, + 0x0002008a, + 0x0002008a, + 0x0002008a, + 0x000200a3, + 0x000200a3, + 0x000200a3, + 0x000200a3, + 0x000200a4, + 0x000200a4, + 0x000200a4, + 0x000200a4, + }, + { + 0x000000bd, + 0x000000c0, + 0x000000c1, + 0x000000d9, + 0x00010005, + 0x00010005, + 0x00010006, + 0x00010006, + 0x00010022, + 0x00010022, + 0x0001003c, + 0x0001003c, + 0x0001003d, + 0x0001003d, + 0x00010057, + 0x00010057, + }, + { + 0x00010071, + 0x00010071, + 0x00010072, + 0x00010072, + 0x00010087, + 0x00010087, + 0x0001008b, + 0x0001008b, + 0x0001008c, + 0x0001008c, + 0x000100a2, + 0x000100a2, + 0x000100a5, + 0x000100a5, + 0x000100a6, + 0x000100a6, + }, + { + 0x0019ffff, + 0x0017ffff, + 0x0018ffff, + 0x0015ffff, + 0x0016ffff, + 0x0012ffff, + 0x0010ffff, + 0x0011ffff, + 0x0013ffff, + 0x0014ffff, + 0x00000007, + 0x00000023, + 0x00000058, + 0x00000073, + 0x0000008d, + 0x000000a7, + }, + { + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x00030059, + 0x00030059, + 0x00030059, + 0x00030059, + 0x00030059, + 0x00030059, + 0x00030059, + 0x00030059, + }, + { + 0x0003008e, + 0x0003008e, + 0x0003008e, + 0x0003008e, + 0x0003008e, + 0x0003008e, + 0x0003008e, + 0x0003008e, + 0x000300a8, + 0x000300a8, + 0x000300a8, + 0x000300a8, + 0x000300a8, + 0x000300a8, + 0x000300a8, + 0x000300a8, + }, + { + 0x000200f5, + 0x000200f5, + 0x000200f5, + 0x000200f5, + 0x000200f6, + 0x000200f6, + 0x000200f6, + 0x000200f6, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + }, + { + 0x000300c2, + 0x000300c2, + 0x000300c2, + 0x000300c2, + 0x000300c2, + 0x000300c2, + 0x000300c2, + 0x000300c2, + 0x000300d8, + 0x000300d8, + 0x000300d8, + 0x000300d8, + 0x000300d8, + 0x000300d8, + 0x000300d8, + 0x000300d8, + }, + { + 0x000300da, + 0x000300da, + 0x000300da, + 0x000300da, + 0x000300da, + 0x000300da, + 0x000300da, + 0x000300da, + 0x000300db, + 0x000300db, + 0x000300db, + 0x000300db, + 0x000300db, + 0x000300db, + 0x000300db, + 0x000300db, + }, + { + 0x00020024, + 0x00020024, + 0x00020024, + 0x00020024, + 0x0002003f, + 0x0002003f, + 0x0002003f, + 0x0002003f, + 0x00020074, + 0x00020074, + 0x00020074, + 0x00020074, + 0x000200a9, + 0x000200a9, + 0x000200a9, + 0x000200a9, + }, + { + 0x000200c3, + 0x000200c3, + 0x000200c3, + 0x000200c3, + 0x000200dc, + 0x000200dc, + 0x000200dc, + 0x000200dc, + 0x000200dd, + 0x000200dd, + 0x000200dd, + 0x000200dd, + 0x000200f4, + 0x000200f4, + 0x000200f4, + 0x000200f4, + }, + { + 0x0000005b, + 0x00000076, + 0x00000090, + 0x000000c5, + 0x000000df, + 0x000000f8, + 0x0000010e, + 0x00000110, + 0x00000111, + 0x00000112, + 0x00010009, + 0x00010009, + 0x00010025, + 0x00010025, + 0x0001005a, + 0x0001005a, + }, + { + 0x00010075, + 0x00010075, + 0x0001008f, + 0x0001008f, + 0x000100aa, + 0x000100aa, + 0x000100c4, + 0x000100c4, + 0x000100de, + 0x000100de, + 0x000100f3, + 0x000100f3, + 0x000100f7, + 0x000100f7, + 0x0001010f, + 0x0001010f, + }, + { + 0x0032ffff, + 0x0043ffff, + 0x0025ffff, + 0x0023ffff, + 0x0024ffff, + 0x0021ffff, + 0x0020ffff, + 0x0022ffff, + 0x001cffff, + 0x001affff, + 0x001bffff, + 0x001dffff, + 0x001effff, + 0x001fffff, + 0x0000000a, + 0x00000040, + }, + { + 0x0003005c, + 0x0003005c, + 0x0003005c, + 0x0003005c, + 0x0003005c, + 0x0003005c, + 0x0003005c, + 0x0003005c, + 0x00030091, + 0x00030091, + 0x00030091, + 0x00030091, + 0x00030091, + 0x00030091, + 0x00030091, + 0x00030091, + }, + { + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300e0, + 0x000300e0, + 0x000300e0, + 0x000300e0, + 0x000300e0, + 0x000300e0, + 0x000300e0, + 0x000300e0, + }, + { + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030041, + 0x00030041, + 0x00030041, + 0x00030041, + 0x00030041, + 0x00030041, + 0x00030041, + 0x00030041, + }, + { + 0x000300f9, + 0x000300f9, + 0x000300f9, + 0x000300f9, + 0x000300f9, + 0x000300f9, + 0x000300f9, + 0x000300f9, + 0x000300fa, + 0x000300fa, + 0x000300fa, + 0x000300fa, + 0x000300fa, + 0x000300fa, + 0x000300fa, + 0x000300fa, + }, + { + 0x00030113, + 0x00030113, + 0x00030113, + 0x00030113, + 0x00030113, + 0x00030113, + 0x00030113, + 0x00030113, + 0x0003012a, + 0x0003012a, + 0x0003012a, + 0x0003012a, + 0x0003012a, + 0x0003012a, + 0x0003012a, + 0x0003012a, + }, + { + 0x0003012b, + 0x0003012b, + 0x0003012b, + 0x0003012b, + 0x0003012b, + 0x0003012b, + 0x0003012b, + 0x0003012b, + 0x0003012c, + 0x0003012c, + 0x0003012c, + 0x0003012c, + 0x0003012c, + 0x0003012c, + 0x0003012c, + 0x0003012c, + }, + { + 0x00020077, + 0x00020077, + 0x00020077, + 0x00020077, + 0x00020092, + 0x00020092, + 0x00020092, + 0x00020092, + 0x000200ac, + 0x000200ac, + 0x000200ac, + 0x000200ac, + 0x000200c6, + 0x000200c6, + 0x000200c6, + 0x000200c6, + }, + { + 0x00010145, + 0x00010145, + 0x00010146, + 0x00010146, + 0x00010147, + 0x00010147, + 0x00010149, + 0x00010149, + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x00020027, + 0x00020027, + 0x00020027, + 0x00020027, + }, + { + 0x000200e1, + 0x000200e1, + 0x000200e1, + 0x000200e1, + 0x00020114, + 0x00020114, + 0x00020114, + 0x00020114, + 0x00020129, + 0x00020129, + 0x00020129, + 0x00020129, + 0x0002012d, + 0x0002012d, + 0x0002012d, + 0x0002012d, + }, + { + 0x000000c8, + 0x000000fc, + 0x00000130, + 0x00000131, + 0x00000148, + 0x00000160, + 0x00000161, + 0x00000162, + 0x00010028, + 0x00010028, + 0x00010042, + 0x00010042, + 0x0001005d, + 0x0001005d, + 0x000100ad, + 0x000100ad, + }, + { + 0x000100c7, + 0x000100c7, + 0x000100e2, + 0x000100e2, + 0x000100fb, + 0x000100fb, + 0x00010115, + 0x00010115, + 0x00010116, + 0x00010116, + 0x0001012e, + 0x0001012e, + 0x0001012f, + 0x0001012f, + 0x00010144, + 0x00010144, + }, + { + 0x0054ffff, + 0x0031ffff, + 0x0030ffff, + 0x002bffff, + 0x002cffff, + 0x002dffff, + 0x002effff, + 0x002fffff, + 0x0027ffff, + 0x0026ffff, + 0x0028ffff, + 0x0029ffff, + 0x002affff, + 0x0000000c, + 0x00000078, + 0x00000093, + }, + { + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x000300af, + 0x000300af, + 0x000300af, + 0x000300af, + 0x000300af, + 0x000300af, + 0x000300af, + 0x000300af, + }, + { + 0x0002017c, + 0x0002017c, + 0x0002017c, + 0x0002017c, + 0x00020180, + 0x00020180, + 0x00020180, + 0x00020180, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + }, + { + 0x00030117, + 0x00030117, + 0x00030117, + 0x00030117, + 0x00030117, + 0x00030117, + 0x00030117, + 0x00030117, + 0x0003014a, + 0x0003014a, + 0x0003014a, + 0x0003014a, + 0x0003014a, + 0x0003014a, + 0x0003014a, + 0x0003014a, + }, + { + 0x0003015f, + 0x0003015f, + 0x0003015f, + 0x0003015f, + 0x0003015f, + 0x0003015f, + 0x0003015f, + 0x0003015f, + 0x00030163, + 0x00030163, + 0x00030163, + 0x00030163, + 0x00030163, + 0x00030163, + 0x00030163, + 0x00030163, + }, + { + 0x0003017b, + 0x0003017b, + 0x0003017b, + 0x0003017b, + 0x0003017b, + 0x0003017b, + 0x0003017b, + 0x0003017b, + 0x0003017e, + 0x0003017e, + 0x0003017e, + 0x0003017e, + 0x0003017e, + 0x0003017e, + 0x0003017e, + 0x0003017e, + }, + { + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x00020044, + 0x00020044, + 0x00020044, + 0x00020044, + 0x00020045, + 0x00020045, + 0x00020045, + 0x00020045, + 0x0002005e, + 0x0002005e, + 0x0002005e, + 0x0002005e, + }, + { + 0x00020079, + 0x00020079, + 0x00020079, + 0x00020079, + 0x00020094, + 0x00020094, + 0x00020094, + 0x00020094, + 0x000200c9, + 0x000200c9, + 0x000200c9, + 0x000200c9, + 0x000200e4, + 0x000200e4, + 0x000200e4, + 0x000200e4, + }, + { + 0x000200e5, + 0x000200e5, + 0x000200e5, + 0x000200e5, + 0x000200fd, + 0x000200fd, + 0x000200fd, + 0x000200fd, + 0x000200fe, + 0x000200fe, + 0x000200fe, + 0x000200fe, + 0x00020118, + 0x00020118, + 0x00020118, + 0x00020118, + }, + { + 0x00020132, + 0x00020132, + 0x00020132, + 0x00020132, + 0x0002014b, + 0x0002014b, + 0x0002014b, + 0x0002014b, + 0x0002014c, + 0x0002014c, + 0x0002014c, + 0x0002014c, + 0x0002014d, + 0x0002014d, + 0x0002014d, + 0x0002014d, + }, + { + 0x00020164, + 0x00020164, + 0x00020164, + 0x00020164, + 0x00020165, + 0x00020165, + 0x00020165, + 0x00020165, + 0x00020166, + 0x00020166, + 0x00020166, + 0x00020166, + 0x0002017a, + 0x0002017a, + 0x0002017a, + 0x0002017a, + }, + { + 0x000100e3, + 0x000100e3, + 0x00010100, + 0x00010100, + 0x00010133, + 0x00010133, + 0x0001014f, + 0x0001014f, + 0x0001017f, + 0x0001017f, + 0x00010182, + 0x00010182, + 0x000101e7, + 0x000101e7, + 0x000102d8, + 0x000102d8, + }, + { + 0x000002d2, + 0x000002d3, + 0x000002d4, + 0x000002d5, + 0x000002d6, + 0x000002d7, + 0x00010029, + 0x00010029, + 0x0001002a, + 0x0001002a, + 0x0001007a, + 0x0001007a, + 0x0001007b, + 0x0001007b, + 0x000100ae, + 0x000100ae, + }, + { + 0x0034ffff, + 0x0033ffff, + 0x0035ffff, + 0x0036ffff, + 0x0039ffff, + 0x0037ffff, + 0x0038ffff, + 0x003affff, + 0x003bffff, + 0x003cffff, + 0x003dffff, + 0x003effff, + 0x003fffff, + 0x0040ffff, + 0x0041ffff, + 0x0042ffff, + }, + { + 0x0000002f, + 0x00000030, + 0x00000031, + 0x00000032, + 0x00000033, + 0x00000034, + 0x00000035, + 0x00000046, + 0x00000047, + 0x00000048, + 0x00000049, + 0x0000004a, + 0x0000004b, + 0x0000004c, + 0x0000004d, + 0x0000004e, + }, + { + 0x0000000f, + 0x00000010, + 0x00000011, + 0x00000012, + 0x00000013, + 0x00000014, + 0x00000015, + 0x00000016, + 0x00000017, + 0x00000018, + 0x00000019, + 0x0000001a, + 0x0000002b, + 0x0000002c, + 0x0000002d, + 0x0000002e, + }, + { + 0x0000004f, + 0x00000050, + 0x0000005f, + 0x00000060, + 0x00000061, + 0x00000062, + 0x00000063, + 0x00000064, + 0x00000065, + 0x00000066, + 0x00000067, + 0x00000068, + 0x00000069, + 0x0000006a, + 0x0000006b, + 0x0000007c, + }, + { + 0x0000007d, + 0x0000007e, + 0x0000007f, + 0x00000080, + 0x00000081, + 0x00000082, + 0x00000083, + 0x00000084, + 0x00000085, + 0x00000086, + 0x00000095, + 0x00000096, + 0x00000097, + 0x00000098, + 0x00000099, + 0x0000009a, + }, + { + 0x000000b9, + 0x000000ba, + 0x000000bb, + 0x000000bc, + 0x000000ca, + 0x000000cb, + 0x000000cc, + 0x000000cd, + 0x000000ce, + 0x000000cf, + 0x000000d0, + 0x000000d1, + 0x000000d2, + 0x000000d3, + 0x000000d4, + 0x000000d5, + }, + { + 0x000000d6, + 0x000000d7, + 0x000000e6, + 0x000000e7, + 0x000000e8, + 0x000000e9, + 0x000000ea, + 0x000000eb, + 0x000000ec, + 0x000000ed, + 0x000000ee, + 0x000000ef, + 0x000000f0, + 0x000000f1, + 0x000000f2, + 0x000000ff, + }, + { + 0x0000009b, + 0x0000009c, + 0x0000009d, + 0x0000009e, + 0x0000009f, + 0x000000a0, + 0x000000a1, + 0x000000b0, + 0x000000b1, + 0x000000b2, + 0x000000b3, + 0x000000b4, + 0x000000b5, + 0x000000b6, + 0x000000b7, + 0x000000b8, + }, + { + 0x00000101, + 0x00000102, + 0x00000103, + 0x00000104, + 0x00000105, + 0x00000106, + 0x00000107, + 0x00000108, + 0x00000109, + 0x0000010a, + 0x0000010b, + 0x0000010c, + 0x0000010d, + 0x00000119, + 0x0000011a, + 0x0000011b, + }, + { + 0x0000011c, + 0x0000011d, + 0x0000011e, + 0x0000011f, + 0x00000120, + 0x00000121, + 0x00000122, + 0x00000123, + 0x00000124, + 0x00000125, + 0x00000126, + 0x00000127, + 0x00000128, + 0x00000134, + 0x00000135, + 0x00000136, + }, + { + 0x00000137, + 0x00000138, + 0x00000139, + 0x0000013a, + 0x0000013b, + 0x0000013c, + 0x0000013d, + 0x0000013e, + 0x0000013f, + 0x00000140, + 0x00000141, + 0x00000142, + 0x00000143, + 0x0000014e, + 0x00000150, + 0x00000151, + }, + { + 0x00000152, + 0x00000153, + 0x00000154, + 0x00000155, + 0x00000156, + 0x00000157, + 0x00000158, + 0x00000159, + 0x0000015a, + 0x0000015b, + 0x0000015c, + 0x0000015d, + 0x0000015e, + 0x00000167, + 0x00000168, + 0x00000169, + }, + { + 0x0000016a, + 0x0000016b, + 0x0000016c, + 0x0000016d, + 0x0000016e, + 0x0000016f, + 0x00000170, + 0x00000171, + 0x00000172, + 0x00000173, + 0x00000174, + 0x00000175, + 0x00000176, + 0x00000177, + 0x00000178, + 0x00000179, + }, + { + 0x0000017d, + 0x00000181, + 0x00000183, + 0x00000184, + 0x00000185, + 0x00000186, + 0x00000187, + 0x00000188, + 0x00000189, + 0x0000018a, + 0x0000018b, + 0x0000018c, + 0x0000018d, + 0x0000018e, + 0x0000018f, + 0x00000190, + }, + { + 0x00000191, + 0x00000192, + 0x00000193, + 0x00000194, + 0x00000195, + 0x00000196, + 0x00000197, + 0x00000198, + 0x00000199, + 0x0000019a, + 0x0000019b, + 0x0000019c, + 0x0000019d, + 0x0000019e, + 0x0000019f, + 0x000001a0, + }, + { + 0x000001a1, + 0x000001a2, + 0x000001a3, + 0x000001a4, + 0x000001a5, + 0x000001a6, + 0x000001a7, + 0x000001a8, + 0x000001a9, + 0x000001aa, + 0x000001ab, + 0x000001ac, + 0x000001ad, + 0x000001ae, + 0x000001af, + 0x000001b0, + }, + { + 0x000001b1, + 0x000001b2, + 0x000001b3, + 0x000001b4, + 0x000001b5, + 0x000001b6, + 0x000001b7, + 0x000001b8, + 0x000001b9, + 0x000001ba, + 0x000001bb, + 0x000001bc, + 0x000001bd, + 0x000001be, + 0x000001bf, + 0x000001c0, + }, + { + 0x0044ffff, + 0x0045ffff, + 0x0046ffff, + 0x0047ffff, + 0x0048ffff, + 0x0049ffff, + 0x004affff, + 0x004bffff, + 0x004cffff, + 0x004dffff, + 0x004effff, + 0x004fffff, + 0x0050ffff, + 0x0051ffff, + 0x0052ffff, + 0x0053ffff, + }, + { + 0x000001c1, + 0x000001c2, + 0x000001c3, + 0x000001c4, + 0x000001c5, + 0x000001c6, + 0x000001c7, + 0x000001c8, + 0x000001c9, + 0x000001ca, + 0x000001cb, + 0x000001cc, + 0x000001cd, + 0x000001ce, + 0x000001cf, + 0x000001d0, + }, + { + 0x000001d1, + 0x000001d2, + 0x000001d3, + 0x000001d4, + 0x000001d5, + 0x000001d6, + 0x000001d7, + 0x000001d8, + 0x000001d9, + 0x000001da, + 0x000001db, + 0x000001dc, + 0x000001dd, + 0x000001de, + 0x000001df, + 0x000001e0, + }, + { + 0x000001e1, + 0x000001e2, + 0x000001e3, + 0x000001e4, + 0x000001e5, + 0x000001e6, + 0x000001e8, + 0x000001e9, + 0x000001ea, + 0x000001eb, + 0x000001ec, + 0x000001ed, + 0x000001ee, + 0x000001ef, + 0x000001f0, + 0x000001f1, + }, + { + 0x000001f2, + 0x000001f3, + 0x000001f4, + 0x000001f5, + 0x000001f6, + 0x000001f7, + 0x000001f8, + 0x000001f9, + 0x000001fa, + 0x000001fb, + 0x000001fc, + 0x000001fd, + 0x000001fe, + 0x000001ff, + 0x00000200, + 0x00000201, + }, + { + 0x00000202, + 0x00000203, + 0x00000204, + 0x00000205, + 0x00000206, + 0x00000207, + 0x00000208, + 0x00000209, + 0x0000020a, + 0x0000020b, + 0x0000020c, + 0x0000020d, + 0x0000020e, + 0x0000020f, + 0x00000210, + 0x00000211, + }, + { + 0x00000212, + 0x00000213, + 0x00000214, + 0x00000215, + 0x00000216, + 0x00000217, + 0x00000218, + 0x00000219, + 0x0000021a, + 0x0000021b, + 0x0000021c, + 0x0000021d, + 0x0000021e, + 0x0000021f, + 0x00000220, + 0x00000221, + }, + { + 0x00000222, + 0x00000223, + 0x00000224, + 0x00000225, + 0x00000226, + 0x00000227, + 0x00000228, + 0x00000229, + 0x0000022a, + 0x0000022b, + 0x0000022c, + 0x0000022d, + 0x0000022e, + 0x0000022f, + 0x00000230, + 0x00000231, + }, + { + 0x00000232, + 0x00000233, + 0x00000234, + 0x00000235, + 0x00000236, + 0x00000237, + 0x00000238, + 0x00000239, + 0x0000023a, + 0x0000023b, + 0x0000023c, + 0x0000023d, + 0x0000023e, + 0x0000023f, + 0x00000240, + 0x00000241, + }, + { + 0x00000242, + 0x00000243, + 0x00000244, + 0x00000245, + 0x00000246, + 0x00000247, + 0x00000248, + 0x00000249, + 0x0000024a, + 0x0000024b, + 0x0000024c, + 0x0000024d, + 0x0000024e, + 0x0000024f, + 0x00000250, + 0x00000251, + }, + { + 0x00000252, + 0x00000253, + 0x00000254, + 0x00000255, + 0x00000256, + 0x00000257, + 0x00000258, + 0x00000259, + 0x0000025a, + 0x0000025b, + 0x0000025c, + 0x0000025d, + 0x0000025e, + 0x0000025f, + 0x00000260, + 0x00000261, + }, + { + 0x00000262, + 0x00000263, + 0x00000264, + 0x00000265, + 0x00000266, + 0x00000267, + 0x00000268, + 0x00000269, + 0x0000026a, + 0x0000026b, + 0x0000026c, + 0x0000026d, + 0x0000026e, + 0x0000026f, + 0x00000270, + 0x00000271, + }, + { + 0x00000272, + 0x00000273, + 0x00000274, + 0x00000275, + 0x00000276, + 0x00000277, + 0x00000278, + 0x00000279, + 0x0000027a, + 0x0000027b, + 0x0000027c, + 0x0000027d, + 0x0000027e, + 0x0000027f, + 0x00000280, + 0x00000281, + }, + { + 0x00000282, + 0x00000283, + 0x00000284, + 0x00000285, + 0x00000286, + 0x00000287, + 0x00000288, + 0x00000289, + 0x0000028a, + 0x0000028b, + 0x0000028c, + 0x0000028d, + 0x0000028e, + 0x0000028f, + 0x00000290, + 0x00000291, + }, + { + 0x00000292, + 0x00000293, + 0x00000294, + 0x00000295, + 0x00000296, + 0x00000297, + 0x00000298, + 0x00000299, + 0x0000029a, + 0x0000029b, + 0x0000029c, + 0x0000029d, + 0x0000029e, + 0x0000029f, + 0x000002a0, + 0x000002a1, + }, + { + 0x000002a2, + 0x000002a3, + 0x000002a4, + 0x000002a5, + 0x000002a6, + 0x000002a7, + 0x000002a8, + 0x000002a9, + 0x000002aa, + 0x000002ab, + 0x000002ac, + 0x000002ad, + 0x000002ae, + 0x000002af, + 0x000002b0, + 0x000002b1, + }, + { + 0x000002b2, + 0x000002b3, + 0x000002b4, + 0x000002b5, + 0x000002b6, + 0x000002b7, + 0x000002b8, + 0x000002b9, + 0x000002ba, + 0x000002bb, + 0x000002bc, + 0x000002bd, + 0x000002be, + 0x000002bf, + 0x000002c0, + 0x000002c1, + }, + { + 0x000002c2, + 0x000002c3, + 0x000002c4, + 0x000002c5, + 0x000002c6, + 0x000002c7, + 0x000002c8, + 0x000002c9, + 0x000002ca, + 0x000002cb, + 0x000002cc, + 0x000002cd, + 0x000002ce, + 0x000002cf, + 0x000002d0, + 0x000002d1, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc17[729][2] = +#else +const uint16_t c_aauiCQMFHuffEnc17[729][2] = +#endif + { + { 0x0006, 0x0012 }, + { 0x0006, 0x0013 }, + { 0x0006, 0x0014 }, + { 0x0006, 0x0015 }, + { 0x0007, 0x000f }, + { 0x0007, 0x0010 }, + { 0x0007, 0x0011 }, + { 0x0008, 0x000e }, + { 0x0008, 0x000f }, + { 0x0009, 0x000f }, + { 0x000a, 0x000f }, + { 0x000c, 0x0011 }, + { 0x000d, 0x0014 }, + { 0x000e, 0x0017 }, + { 0x0010, 0x002d }, + { 0x0011, 0x004c }, + { 0x0012, 0x008a }, + { 0x0014, 0x0000 }, + { 0x0014, 0x0001 }, + { 0x0014, 0x0002 }, + { 0x0014, 0x0003 }, + { 0x0014, 0x0004 }, + { 0x0014, 0x0005 }, + { 0x0014, 0x0006 }, + { 0x0014, 0x0007 }, + { 0x0014, 0x0008 }, + { 0x0014, 0x0009 }, + { 0x0006, 0x0016 }, + { 0x0005, 0x0018 }, + { 0x0005, 0x0019 }, + { 0x0005, 0x001a }, + { 0x0006, 0x0017 }, + { 0x0006, 0x0018 }, + { 0x0006, 0x0019 }, + { 0x0007, 0x0012 }, + { 0x0007, 0x0013 }, + { 0x0008, 0x0010 }, + { 0x000a, 0x0010 }, + { 0x000b, 0x0011 }, + { 0x000c, 0x0012 }, + { 0x000e, 0x0018 }, + { 0x000f, 0x0020 }, + { 0x0011, 0x004d }, + { 0x0013, 0x00e4 }, + { 0x0014, 0x000a }, + { 0x0014, 0x000b }, + { 0x0014, 0x000c }, + { 0x0014, 0x000d }, + { 0x0014, 0x000e }, + { 0x0014, 0x000f }, + { 0x0014, 0x0010 }, + { 0x0014, 0x0011 }, + { 0x0014, 0x0012 }, + { 0x0014, 0x0013 }, + { 0x0006, 0x001a }, + { 0x0005, 0x001b }, + { 0x0005, 0x001c }, + { 0x0005, 0x001d }, + { 0x0006, 0x001b }, + { 0x0006, 0x001c }, + { 0x0006, 0x001d }, + { 0x0007, 0x0014 }, + { 0x0008, 0x0011 }, + { 0x0009, 0x0010 }, + { 0x000a, 0x0011 }, + { 0x000b, 0x0012 }, + { 0x000c, 0x0013 }, + { 0x000e, 0x0019 }, + { 0x000f, 0x0021 }, + { 0x0010, 0x002e }, + { 0x0013, 0x00e5 }, + { 0x0013, 0x00e6 }, + { 0x0014, 0x0014 }, + { 0x0014, 0x0015 }, + { 0x0014, 0x0016 }, + { 0x0014, 0x0017 }, + { 0x0014, 0x0018 }, + { 0x0014, 0x0019 }, + { 0x0014, 0x001a }, + { 0x0014, 0x001b }, + { 0x0014, 0x001c }, + { 0x0006, 0x001e }, + { 0x0005, 0x001e }, + { 0x0005, 0x001f }, + { 0x0006, 0x001f }, + { 0x0006, 0x0020 }, + { 0x0006, 0x0021 }, + { 0x0006, 0x0022 }, + { 0x0007, 0x0015 }, + { 0x0008, 0x0012 }, + { 0x0009, 0x0011 }, + { 0x000a, 0x0012 }, + { 0x000b, 0x0013 }, + { 0x000c, 0x0014 }, + { 0x000e, 0x001a }, + { 0x000f, 0x0022 }, + { 0x0010, 0x002f }, + { 0x0013, 0x00e7 }, + { 0x0013, 0x00e8 }, + { 0x0014, 0x001d }, + { 0x0014, 0x001e }, + { 0x0014, 0x001f }, + { 0x0014, 0x0020 }, + { 0x0014, 0x0021 }, + { 0x0014, 0x0022 }, + { 0x0014, 0x0023 }, + { 0x0014, 0x0024 }, + { 0x0014, 0x0025 }, + { 0x0006, 0x0023 }, + { 0x0006, 0x0024 }, + { 0x0006, 0x0025 }, + { 0x0006, 0x0026 }, + { 0x0006, 0x0027 }, + { 0x0006, 0x0028 }, + { 0x0007, 0x0016 }, + { 0x0007, 0x0017 }, + { 0x0008, 0x0013 }, + { 0x0009, 0x0012 }, + { 0x000a, 0x0013 }, + { 0x000c, 0x0015 }, + { 0x000d, 0x0015 }, + { 0x000f, 0x0023 }, + { 0x0010, 0x0030 }, + { 0x0011, 0x004e }, + { 0x0014, 0x0026 }, + { 0x0014, 0x0027 }, + { 0x0014, 0x0028 }, + { 0x0014, 0x0029 }, + { 0x0014, 0x002a }, + { 0x0014, 0x002b }, + { 0x0014, 0x002c }, + { 0x0014, 0x002d }, + { 0x0014, 0x002e }, + { 0x0014, 0x002f }, + { 0x0014, 0x0030 }, + { 0x0007, 0x0018 }, + { 0x0006, 0x0029 }, + { 0x0006, 0x002a }, + { 0x0006, 0x002b }, + { 0x0006, 0x002c }, + { 0x0007, 0x0019 }, + { 0x0007, 0x001a }, + { 0x0008, 0x0014 }, + { 0x0009, 0x0013 }, + { 0x000a, 0x0014 }, + { 0x000b, 0x0014 }, + { 0x000c, 0x0016 }, + { 0x000d, 0x0016 }, + { 0x000f, 0x0024 }, + { 0x0010, 0x0031 }, + { 0x0011, 0x004f }, + { 0x0014, 0x0031 }, + { 0x0014, 0x0032 }, + { 0x0014, 0x0033 }, + { 0x0014, 0x0034 }, + { 0x0014, 0x0035 }, + { 0x0014, 0x0036 }, + { 0x0014, 0x0037 }, + { 0x0014, 0x0038 }, + { 0x0014, 0x0039 }, + { 0x0014, 0x003a }, + { 0x0014, 0x003b }, + { 0x0007, 0x001b }, + { 0x0006, 0x002d }, + { 0x0006, 0x002e }, + { 0x0006, 0x002f }, + { 0x0007, 0x001c }, + { 0x0007, 0x001d }, + { 0x0008, 0x0015 }, + { 0x0009, 0x0014 }, + { 0x000a, 0x0015 }, + { 0x000a, 0x0016 }, + { 0x000c, 0x0017 }, + { 0x000d, 0x0017 }, + { 0x000e, 0x001b }, + { 0x000f, 0x0025 }, + { 0x0011, 0x0050 }, + { 0x0011, 0x0051 }, + { 0x0014, 0x003c }, + { 0x0014, 0x003d }, + { 0x0014, 0x003e }, + { 0x0014, 0x003f }, + { 0x0014, 0x0040 }, + { 0x0014, 0x0041 }, + { 0x0014, 0x0042 }, + { 0x0014, 0x0043 }, + { 0x0014, 0x0044 }, + { 0x0014, 0x0045 }, + { 0x0014, 0x0046 }, + { 0x0008, 0x0016 }, + { 0x0007, 0x001e }, + { 0x0007, 0x001f }, + { 0x0007, 0x0020 }, + { 0x0007, 0x0021 }, + { 0x0008, 0x0017 }, + { 0x0008, 0x0018 }, + { 0x0009, 0x0015 }, + { 0x000a, 0x0017 }, + { 0x000b, 0x0015 }, + { 0x000c, 0x0018 }, + { 0x000e, 0x001c }, + { 0x000e, 0x001d }, + { 0x0010, 0x0032 }, + { 0x0012, 0x008b }, + { 0x0012, 0x008c }, + { 0x0014, 0x0047 }, + { 0x0014, 0x0048 }, + { 0x0014, 0x0049 }, + { 0x0014, 0x004a }, + { 0x0014, 0x004b }, + { 0x0014, 0x004c }, + { 0x0014, 0x004d }, + { 0x0014, 0x004e }, + { 0x0014, 0x004f }, + { 0x0014, 0x0050 }, + { 0x0014, 0x0051 }, + { 0x0008, 0x0019 }, + { 0x0007, 0x0022 }, + { 0x0007, 0x0023 }, + { 0x0008, 0x001a }, + { 0x0008, 0x001b }, + { 0x0009, 0x0016 }, + { 0x0009, 0x0017 }, + { 0x000a, 0x0018 }, + { 0x000b, 0x0016 }, + { 0x000c, 0x0019 }, + { 0x000d, 0x0018 }, + { 0x000e, 0x001e }, + { 0x0010, 0x0033 }, + { 0x0011, 0x0052 }, + { 0x0014, 0x0052 }, + { 0x0013, 0x00e9 }, + { 0x0014, 0x0053 }, + { 0x0014, 0x0054 }, + { 0x0014, 0x0055 }, + { 0x0014, 0x0056 }, + { 0x0014, 0x0057 }, + { 0x0014, 0x0058 }, + { 0x0014, 0x0059 }, + { 0x0014, 0x005a }, + { 0x0014, 0x005b }, + { 0x0014, 0x005c }, + { 0x0014, 0x005d }, + { 0x0009, 0x0018 }, + { 0x0008, 0x001c }, + { 0x0008, 0x001d }, + { 0x0009, 0x0019 }, + { 0x0009, 0x001a }, + { 0x000a, 0x0019 }, + { 0x000a, 0x001a }, + { 0x000b, 0x0017 }, + { 0x000c, 0x001a }, + { 0x000d, 0x0019 }, + { 0x000e, 0x001f }, + { 0x000f, 0x0026 }, + { 0x0010, 0x0034 }, + { 0x0012, 0x008d }, + { 0x0013, 0x00ea }, + { 0x0014, 0x005e }, + { 0x0014, 0x005f }, + { 0x0014, 0x0060 }, + { 0x0014, 0x0061 }, + { 0x0014, 0x0062 }, + { 0x0014, 0x0063 }, + { 0x0014, 0x0064 }, + { 0x0014, 0x0065 }, + { 0x0014, 0x0066 }, + { 0x0014, 0x0067 }, + { 0x0014, 0x0068 }, + { 0x0014, 0x0069 }, + { 0x000b, 0x0018 }, + { 0x0009, 0x001b }, + { 0x000a, 0x001b }, + { 0x000a, 0x001c }, + { 0x000a, 0x001d }, + { 0x000b, 0x0019 }, + { 0x000b, 0x001a }, + { 0x000c, 0x001b }, + { 0x000d, 0x001a }, + { 0x000e, 0x0020 }, + { 0x000f, 0x0027 }, + { 0x0012, 0x008e }, + { 0x0011, 0x0053 }, + { 0x0013, 0x00eb }, + { 0x0014, 0x006a }, + { 0x0014, 0x006b }, + { 0x0014, 0x006c }, + { 0x0014, 0x006d }, + { 0x0014, 0x006e }, + { 0x0014, 0x006f }, + { 0x0014, 0x0070 }, + { 0x0014, 0x0071 }, + { 0x0014, 0x0072 }, + { 0x0014, 0x0073 }, + { 0x0014, 0x0074 }, + { 0x0014, 0x0075 }, + { 0x0014, 0x0076 }, + { 0x000c, 0x001c }, + { 0x000b, 0x001b }, + { 0x000b, 0x001c }, + { 0x000b, 0x001d }, + { 0x000c, 0x001d }, + { 0x000c, 0x001e }, + { 0x000d, 0x001b }, + { 0x000d, 0x001c }, + { 0x000e, 0x0021 }, + { 0x0010, 0x0035 }, + { 0x0010, 0x0036 }, + { 0x0011, 0x0054 }, + { 0x0013, 0x00ec }, + { 0x0014, 0x0077 }, + { 0x0014, 0x0078 }, + { 0x0014, 0x0079 }, + { 0x0014, 0x007a }, + { 0x0014, 0x007b }, + { 0x0014, 0x007c }, + { 0x0014, 0x007d }, + { 0x0014, 0x007e }, + { 0x0014, 0x007f }, + { 0x0014, 0x0080 }, + { 0x0014, 0x0081 }, + { 0x0014, 0x0082 }, + { 0x0014, 0x0083 }, + { 0x0014, 0x0084 }, + { 0x000d, 0x001d }, + { 0x000c, 0x001f }, + { 0x000c, 0x0020 }, + { 0x000c, 0x0021 }, + { 0x000d, 0x001e }, + { 0x000d, 0x001f }, + { 0x000e, 0x0022 }, + { 0x000f, 0x0028 }, + { 0x0010, 0x0037 }, + { 0x0010, 0x0038 }, + { 0x0010, 0x0039 }, + { 0x0012, 0x008f }, + { 0x0013, 0x00ed }, + { 0x0014, 0x0085 }, + { 0x0014, 0x0086 }, + { 0x0014, 0x0087 }, + { 0x0014, 0x0088 }, + { 0x0014, 0x0089 }, + { 0x0014, 0x008a }, + { 0x0014, 0x008b }, + { 0x0014, 0x008c }, + { 0x0014, 0x008d }, + { 0x0014, 0x008e }, + { 0x0014, 0x008f }, + { 0x0014, 0x0090 }, + { 0x0014, 0x0091 }, + { 0x0014, 0x0092 }, + { 0x000e, 0x0023 }, + { 0x000d, 0x0020 }, + { 0x000d, 0x0021 }, + { 0x000e, 0x0024 }, + { 0x000e, 0x0025 }, + { 0x000e, 0x0026 }, + { 0x000f, 0x0029 }, + { 0x0010, 0x003a }, + { 0x0010, 0x003b }, + { 0x0012, 0x0090 }, + { 0x0014, 0x0093 }, + { 0x0014, 0x0094 }, + { 0x0014, 0x0095 }, + { 0x0014, 0x0096 }, + { 0x0014, 0x0097 }, + { 0x0014, 0x0098 }, + { 0x0014, 0x0099 }, + { 0x0014, 0x009a }, + { 0x0014, 0x009b }, + { 0x0014, 0x009c }, + { 0x0014, 0x009d }, + { 0x0014, 0x009e }, + { 0x0014, 0x009f }, + { 0x0014, 0x00a0 }, + { 0x0014, 0x00a1 }, + { 0x0014, 0x00a2 }, + { 0x0014, 0x00a3 }, + { 0x000f, 0x002a }, + { 0x000e, 0x0027 }, + { 0x000f, 0x002b }, + { 0x000f, 0x002c }, + { 0x000f, 0x002d }, + { 0x0010, 0x003c }, + { 0x0010, 0x003d }, + { 0x0011, 0x0055 }, + { 0x0011, 0x0056 }, + { 0x0014, 0x00a4 }, + { 0x0014, 0x00a5 }, + { 0x0014, 0x00a6 }, + { 0x0014, 0x00a7 }, + { 0x0014, 0x00a8 }, + { 0x0014, 0x00a9 }, + { 0x0014, 0x00aa }, + { 0x0014, 0x00ab }, + { 0x0014, 0x00ac }, + { 0x0014, 0x00ad }, + { 0x0014, 0x00ae }, + { 0x0014, 0x00af }, + { 0x0014, 0x00b0 }, + { 0x0014, 0x00b1 }, + { 0x0014, 0x00b2 }, + { 0x0014, 0x00b3 }, + { 0x0014, 0x00b4 }, + { 0x0014, 0x00b5 }, + { 0x0012, 0x0091 }, + { 0x0010, 0x003e }, + { 0x0010, 0x003f }, + { 0x0011, 0x0057 }, + { 0x0011, 0x0058 }, + { 0x0011, 0x0059 }, + { 0x0012, 0x0092 }, + { 0x0013, 0x00ee }, + { 0x0013, 0x00ef }, + { 0x0012, 0x0093 }, + { 0x0014, 0x00b6 }, + { 0x0014, 0x00b7 }, + { 0x0014, 0x00b8 }, + { 0x0014, 0x00b9 }, + { 0x0014, 0x00ba }, + { 0x0014, 0x00bb }, + { 0x0014, 0x00bc }, + { 0x0014, 0x00bd }, + { 0x0014, 0x00be }, + { 0x0014, 0x00bf }, + { 0x0014, 0x00c0 }, + { 0x0014, 0x00c1 }, + { 0x0014, 0x00c2 }, + { 0x0014, 0x00c3 }, + { 0x0014, 0x00c4 }, + { 0x0014, 0x00c5 }, + { 0x0014, 0x00c6 }, + { 0x0013, 0x00f0 }, + { 0x0012, 0x0094 }, + { 0x0012, 0x0095 }, + { 0x0012, 0x0096 }, + { 0x0014, 0x00c7 }, + { 0x0014, 0x00c8 }, + { 0x0014, 0x00c9 }, + { 0x0014, 0x00ca }, + { 0x0014, 0x00cb }, + { 0x0014, 0x00cc }, + { 0x0014, 0x00cd }, + { 0x0014, 0x00ce }, + { 0x0014, 0x00cf }, + { 0x0014, 0x00d0 }, + { 0x0014, 0x00d1 }, + { 0x0014, 0x00d2 }, + { 0x0014, 0x00d3 }, + { 0x0014, 0x00d4 }, + { 0x0014, 0x00d5 }, + { 0x0014, 0x00d6 }, + { 0x0014, 0x00d7 }, + { 0x0014, 0x00d8 }, + { 0x0014, 0x00d9 }, + { 0x0014, 0x00da }, + { 0x0014, 0x00db }, + { 0x0014, 0x00dc }, + { 0x0014, 0x00dd }, + { 0x0014, 0x00de }, + { 0x0012, 0x0097 }, + { 0x0014, 0x00df }, + { 0x0014, 0x00e0 }, + { 0x0014, 0x00e1 }, + { 0x0014, 0x00e2 }, + { 0x0014, 0x00e3 }, + { 0x0014, 0x00e4 }, + { 0x0014, 0x00e5 }, + { 0x0014, 0x00e6 }, + { 0x0014, 0x00e7 }, + { 0x0014, 0x00e8 }, + { 0x0014, 0x00e9 }, + { 0x0014, 0x00ea }, + { 0x0014, 0x00eb }, + { 0x0014, 0x00ec }, + { 0x0014, 0x00ed }, + { 0x0014, 0x00ee }, + { 0x0014, 0x00ef }, + { 0x0014, 0x00f0 }, + { 0x0014, 0x00f1 }, + { 0x0014, 0x00f2 }, + { 0x0014, 0x00f3 }, + { 0x0014, 0x00f4 }, + { 0x0014, 0x00f5 }, + { 0x0014, 0x00f6 }, + { 0x0014, 0x00f7 }, + { 0x0014, 0x00f8 }, + { 0x0014, 0x00f9 }, + { 0x0014, 0x00fa }, + { 0x0014, 0x00fb }, + { 0x0014, 0x00fc }, + { 0x0014, 0x00fd }, + { 0x0014, 0x00fe }, + { 0x0014, 0x00ff }, + { 0x0014, 0x0100 }, + { 0x0014, 0x0101 }, + { 0x0014, 0x0102 }, + { 0x0014, 0x0103 }, + { 0x0014, 0x0104 }, + { 0x0014, 0x0105 }, + { 0x0014, 0x0106 }, + { 0x0014, 0x0107 }, + { 0x0014, 0x0108 }, + { 0x0014, 0x0109 }, + { 0x0014, 0x010a }, + { 0x0014, 0x010b }, + { 0x0014, 0x010c }, + { 0x0014, 0x010d }, + { 0x0014, 0x010e }, + { 0x0014, 0x010f }, + { 0x0014, 0x0110 }, + { 0x0014, 0x0111 }, + { 0x0014, 0x0112 }, + { 0x0014, 0x0113 }, + { 0x0014, 0x0114 }, + { 0x0014, 0x0115 }, + { 0x0014, 0x0116 }, + { 0x0014, 0x0117 }, + { 0x0014, 0x0118 }, + { 0x0014, 0x0119 }, + { 0x0014, 0x011a }, + { 0x0014, 0x011b }, + { 0x0014, 0x011c }, + { 0x0014, 0x011d }, + { 0x0014, 0x011e }, + { 0x0014, 0x011f }, + { 0x0014, 0x0120 }, + { 0x0014, 0x0121 }, + { 0x0014, 0x0122 }, + { 0x0014, 0x0123 }, + { 0x0014, 0x0124 }, + { 0x0014, 0x0125 }, + { 0x0014, 0x0126 }, + { 0x0014, 0x0127 }, + { 0x0014, 0x0128 }, + { 0x0014, 0x0129 }, + { 0x0014, 0x012a }, + { 0x0014, 0x012b }, + { 0x0014, 0x012c }, + { 0x0014, 0x012d }, + { 0x0014, 0x012e }, + { 0x0014, 0x012f }, + { 0x0014, 0x0130 }, + { 0x0014, 0x0131 }, + { 0x0014, 0x0132 }, + { 0x0014, 0x0133 }, + { 0x0014, 0x0134 }, + { 0x0014, 0x0135 }, + { 0x0014, 0x0136 }, + { 0x0014, 0x0137 }, + { 0x0014, 0x0138 }, + { 0x0014, 0x0139 }, + { 0x0014, 0x013a }, + { 0x0014, 0x013b }, + { 0x0014, 0x013c }, + { 0x0014, 0x013d }, + { 0x0014, 0x013e }, + { 0x0014, 0x013f }, + { 0x0014, 0x0140 }, + { 0x0014, 0x0141 }, + { 0x0014, 0x0142 }, + { 0x0014, 0x0143 }, + { 0x0014, 0x0144 }, + { 0x0014, 0x0145 }, + { 0x0014, 0x0146 }, + { 0x0014, 0x0147 }, + { 0x0014, 0x0148 }, + { 0x0014, 0x0149 }, + { 0x0014, 0x014a }, + { 0x0014, 0x014b }, + { 0x0014, 0x014c }, + { 0x0014, 0x014d }, + { 0x0014, 0x014e }, + { 0x0014, 0x014f }, + { 0x0014, 0x0150 }, + { 0x0014, 0x0151 }, + { 0x0014, 0x0152 }, + { 0x0014, 0x0153 }, + { 0x0014, 0x0154 }, + { 0x0014, 0x0155 }, + { 0x0014, 0x0156 }, + { 0x0014, 0x0157 }, + { 0x0014, 0x0158 }, + { 0x0014, 0x0159 }, + { 0x0014, 0x015a }, + { 0x0014, 0x015b }, + { 0x0014, 0x015c }, + { 0x0014, 0x015d }, + { 0x0014, 0x015e }, + { 0x0014, 0x015f }, + { 0x0014, 0x0160 }, + { 0x0014, 0x0161 }, + { 0x0014, 0x0162 }, + { 0x0014, 0x0163 }, + { 0x0014, 0x0164 }, + { 0x0014, 0x0165 }, + { 0x0014, 0x0166 }, + { 0x0014, 0x0167 }, + { 0x0014, 0x0168 }, + { 0x0014, 0x0169 }, + { 0x0014, 0x016a }, + { 0x0014, 0x016b }, + { 0x0014, 0x016c }, + { 0x0014, 0x016d }, + { 0x0014, 0x016e }, + { 0x0014, 0x016f }, + { 0x0014, 0x0170 }, + { 0x0014, 0x0171 }, + { 0x0014, 0x0172 }, + { 0x0014, 0x0173 }, + { 0x0014, 0x0174 }, + { 0x0014, 0x0175 }, + { 0x0014, 0x0176 }, + { 0x0014, 0x0177 }, + { 0x0014, 0x0178 }, + { 0x0014, 0x0179 }, + { 0x0014, 0x017a }, + { 0x0014, 0x017b }, + { 0x0014, 0x017c }, + { 0x0014, 0x017d }, + { 0x0014, 0x017e }, + { 0x0014, 0x017f }, + { 0x0014, 0x0180 }, + { 0x0014, 0x0181 }, + { 0x0014, 0x0182 }, + { 0x0014, 0x0183 }, + { 0x0014, 0x0184 }, + { 0x0014, 0x0185 }, + { 0x0014, 0x0186 }, + { 0x0014, 0x0187 }, + { 0x0014, 0x0188 }, + { 0x0014, 0x0189 }, + { 0x0014, 0x018a }, + { 0x0014, 0x018b }, + { 0x0014, 0x018c }, + { 0x0014, 0x018d }, + { 0x0014, 0x018e }, + { 0x0014, 0x018f }, + { 0x0014, 0x0190 }, + { 0x0014, 0x0191 }, + { 0x0014, 0x0192 }, + { 0x0014, 0x0193 }, + { 0x0014, 0x0194 }, + { 0x0014, 0x0195 }, + { 0x0014, 0x0196 }, + { 0x0014, 0x0197 }, + { 0x0014, 0x0198 }, + { 0x0014, 0x0199 }, + { 0x0014, 0x019a }, + { 0x0014, 0x019b }, + { 0x0014, 0x019c }, + { 0x0014, 0x019d }, + { 0x0014, 0x019e }, + { 0x0014, 0x019f }, + { 0x0014, 0x01a0 }, + { 0x0014, 0x01a1 }, + { 0x0014, 0x01a2 }, + { 0x0014, 0x01a3 }, + { 0x0014, 0x01a4 }, + { 0x0014, 0x01a5 }, + { 0x0014, 0x01a6 }, + { 0x0014, 0x01a7 }, + { 0x0014, 0x01a8 }, + { 0x0014, 0x01a9 }, + { 0x0014, 0x01aa }, + { 0x0014, 0x01ab }, + { 0x0014, 0x01ac }, + { 0x0014, 0x01ad }, + { 0x0014, 0x01ae }, + { 0x0014, 0x01af }, + { 0x0014, 0x01b0 }, + { 0x0014, 0x01b1 }, + { 0x0014, 0x01b2 }, + { 0x0014, 0x01b3 }, + { 0x0014, 0x01b4 }, + { 0x0014, 0x01b5 }, + { 0x0014, 0x01b6 }, + { 0x0014, 0x01b7 }, + { 0x0014, 0x01b8 }, + { 0x0014, 0x01b9 }, + { 0x0014, 0x01ba }, + { 0x0014, 0x01bb }, + { 0x0014, 0x01bc }, + { 0x0014, 0x01bd }, + { 0x0014, 0x01be }, + { 0x0014, 0x01bf }, + { 0x0014, 0x01c0 }, + { 0x0014, 0x01c1 }, + { 0x0014, 0x01c2 }, + { 0x0014, 0x01c3 }, + { 0x0014, 0x01c4 }, + { 0x0014, 0x01c5 }, + { 0x0014, 0x01c6 }, + { 0x0014, 0x01c7 }, + { 0x0013, 0x00f1 }, + { 0x0013, 0x00f2 }, + { 0x0013, 0x00f3 }, + { 0x0013, 0x00f4 }, + { 0x0013, 0x00f5 }, + { 0x0013, 0x00f6 }, + { 0x0013, 0x00f7 }, + { 0x0013, 0x00f8 }, + { 0x0013, 0x00f9 }, + { 0x0013, 0x00fa }, + { 0x0013, 0x00fb }, + { 0x0013, 0x00fc }, + { 0x0013, 0x00fd }, + { 0x0013, 0x00fe }, + { 0x0013, 0x00ff }, + { 0x0013, 0x0100 }, + { 0x0013, 0x0101 }, + { 0x0013, 0x0102 }, + { 0x0013, 0x0103 }, + { 0x0013, 0x0104 }, + { 0x0013, 0x0105 }, + { 0x0013, 0x0106 }, + { 0x0013, 0x0107 }, + { 0x0013, 0x0108 }, + { 0x0013, 0x0109 }, + { 0x0013, 0x010a }, + { 0x0013, 0x010b }, + { 0x0013, 0x010c }, + { 0x0013, 0x010d }, + { 0x0013, 0x010e }, + { 0x0013, 0x010f }, + { 0x0013, 0x0110 }, + { 0x0013, 0x0111 }, + { 0x0013, 0x0112 }, + { 0x0013, 0x0113 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec17[93][16] = { + { + 0x0010ffff, + 0x000dffff, + 0x000effff, + 0x000fffff, + 0x0006ffff, + 0x0005ffff, + 0x0007ffff, + 0x0008ffff, + 0x0009ffff, + 0x000affff, + 0x000bffff, + 0x000cffff, + 0x0001ffff, + 0x0002ffff, + 0x0003ffff, + 0x0004ffff, + }, + { + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + }, + { + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + }, + { + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + }, + { + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + }, + { + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020003, + 0x00020003, + 0x00020003, + 0x00020003, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x0002001f, + }, + { + 0x000100c0, + 0x000100c0, + 0x000100c1, + 0x000100c1, + 0x000100d9, + 0x000100d9, + 0x000100da, + 0x000100da, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00020001, + }, + { + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020036, + 0x00020036, + 0x00020036, + 0x00020036, + 0x0002003a, + 0x0002003a, + 0x0002003a, + 0x0002003a, + }, + { + 0x0002003b, + 0x0002003b, + 0x0002003b, + 0x0002003b, + 0x0002003c, + 0x0002003c, + 0x0002003c, + 0x0002003c, + 0x00020051, + 0x00020051, + 0x00020051, + 0x00020051, + 0x00020054, + 0x00020054, + 0x00020054, + 0x00020054, + }, + { + 0x00020055, + 0x00020055, + 0x00020055, + 0x00020055, + 0x00020056, + 0x00020056, + 0x00020056, + 0x00020056, + 0x00020057, + 0x00020057, + 0x00020057, + 0x00020057, + 0x0002006c, + 0x0002006c, + 0x0002006c, + 0x0002006c, + }, + { + 0x0002006d, + 0x0002006d, + 0x0002006d, + 0x0002006d, + 0x0002006e, + 0x0002006e, + 0x0002006e, + 0x0002006e, + 0x0002006f, + 0x0002006f, + 0x0002006f, + 0x0002006f, + 0x00020070, + 0x00020070, + 0x00020070, + 0x00020070, + }, + { + 0x00020071, + 0x00020071, + 0x00020071, + 0x00020071, + 0x00020088, + 0x00020088, + 0x00020088, + 0x00020088, + 0x00020089, + 0x00020089, + 0x00020089, + 0x00020089, + 0x0002008a, + 0x0002008a, + 0x0002008a, + 0x0002008a, + }, + { + 0x0002008b, + 0x0002008b, + 0x0002008b, + 0x0002008b, + 0x000200a3, + 0x000200a3, + 0x000200a3, + 0x000200a3, + 0x000200a4, + 0x000200a4, + 0x000200a4, + 0x000200a4, + 0x000200a5, + 0x000200a5, + 0x000200a5, + 0x000200a5, + }, + { + 0x00000024, + 0x0000003e, + 0x00000059, + 0x00000074, + 0x0000008e, + 0x000000a8, + 0x000000bd, + 0x000000c2, + 0x000000c3, + 0x000000d8, + 0x000000db, + 0x000000dc, + 0x000000f4, + 0x000000f5, + 0x00010004, + 0x00010004, + }, + { + 0x00010005, + 0x00010005, + 0x00010006, + 0x00010006, + 0x00010022, + 0x00010022, + 0x00010023, + 0x00010023, + 0x0001003d, + 0x0001003d, + 0x00010058, + 0x00010058, + 0x00010072, + 0x00010072, + 0x00010073, + 0x00010073, + }, + { + 0x00010087, + 0x00010087, + 0x0001008c, + 0x0001008c, + 0x0001008d, + 0x0001008d, + 0x000100a2, + 0x000100a2, + 0x000100a6, + 0x000100a6, + 0x000100a7, + 0x000100a7, + 0x000100be, + 0x000100be, + 0x000100bf, + 0x000100bf, + }, + { + 0x001effff, + 0x001dffff, + 0x001cffff, + 0x0019ffff, + 0x0018ffff, + 0x001affff, + 0x001bffff, + 0x0012ffff, + 0x0011ffff, + 0x0013ffff, + 0x0014ffff, + 0x0015ffff, + 0x0016ffff, + 0x0017ffff, + 0x00000007, + 0x00000008, + }, + { + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003005a, + 0x0003005a, + 0x0003005a, + 0x0003005a, + 0x0003005a, + 0x0003005a, + 0x0003005a, + 0x0003005a, + }, + { + 0x00020111, + 0x00020111, + 0x00020111, + 0x00020111, + 0x00020112, + 0x00020112, + 0x00020112, + 0x00020112, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + }, + { + 0x00030075, + 0x00030075, + 0x00030075, + 0x00030075, + 0x00030075, + 0x00030075, + 0x00030075, + 0x00030075, + 0x0003008f, + 0x0003008f, + 0x0003008f, + 0x0003008f, + 0x0003008f, + 0x0003008f, + 0x0003008f, + 0x0003008f, + }, + { + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300c4, + 0x000300c4, + 0x000300c4, + 0x000300c4, + 0x000300c4, + 0x000300c4, + 0x000300c4, + 0x000300c4, + }, + { + 0x000300dd, + 0x000300dd, + 0x000300dd, + 0x000300dd, + 0x000300dd, + 0x000300dd, + 0x000300dd, + 0x000300dd, + 0x000300de, + 0x000300de, + 0x000300de, + 0x000300de, + 0x000300de, + 0x000300de, + 0x000300de, + 0x000300de, + }, + { + 0x000300f3, + 0x000300f3, + 0x000300f3, + 0x000300f3, + 0x000300f3, + 0x000300f3, + 0x000300f3, + 0x000300f3, + 0x000300f6, + 0x000300f6, + 0x000300f6, + 0x000300f6, + 0x000300f6, + 0x000300f6, + 0x000300f6, + 0x000300f6, + }, + { + 0x000300f7, + 0x000300f7, + 0x000300f7, + 0x000300f7, + 0x000300f7, + 0x000300f7, + 0x000300f7, + 0x000300f7, + 0x0003010f, + 0x0003010f, + 0x0003010f, + 0x0003010f, + 0x0003010f, + 0x0003010f, + 0x0003010f, + 0x0003010f, + }, + { + 0x00020025, + 0x00020025, + 0x00020025, + 0x00020025, + 0x00020040, + 0x00020040, + 0x00020040, + 0x00020040, + 0x0002005b, + 0x0002005b, + 0x0002005b, + 0x0002005b, + 0x00020076, + 0x00020076, + 0x00020076, + 0x00020076, + }, + { + 0x0001010e, + 0x0001010e, + 0x00010113, + 0x00010113, + 0x00010114, + 0x00010114, + 0x0001012a, + 0x0001012a, + 0x0001012b, + 0x0001012b, + 0x0001012c, + 0x0001012c, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000a, + }, + { + 0x00020090, + 0x00020090, + 0x00020090, + 0x00020090, + 0x000200aa, + 0x000200aa, + 0x000200aa, + 0x000200aa, + 0x000200ab, + 0x000200ab, + 0x000200ab, + 0x000200ab, + 0x000200c5, + 0x000200c5, + 0x000200c5, + 0x000200c5, + }, + { + 0x000200df, + 0x000200df, + 0x000200df, + 0x000200df, + 0x000200f8, + 0x000200f8, + 0x000200f8, + 0x000200f8, + 0x000200f9, + 0x000200f9, + 0x000200f9, + 0x000200f9, + 0x00020110, + 0x00020110, + 0x00020110, + 0x00020110, + }, + { + 0x00000146, + 0x00000147, + 0x00010026, + 0x00010026, + 0x00010041, + 0x00010041, + 0x0001005c, + 0x0001005c, + 0x00010091, + 0x00010091, + 0x000100c6, + 0x000100c6, + 0x000100e0, + 0x000100e0, + 0x000100fa, + 0x000100fa, + }, + { + 0x0025ffff, + 0x0000000b, + 0x00000027, + 0x00000042, + 0x0000005d, + 0x00000077, + 0x00000092, + 0x000000ac, + 0x000000c7, + 0x000000e1, + 0x000000fb, + 0x00000115, + 0x00000129, + 0x0000012d, + 0x0000012e, + 0x00000145, + }, + { + 0x0040ffff, + 0x0039ffff, + 0x002dffff, + 0x002cffff, + 0x002bffff, + 0x0028ffff, + 0x0026ffff, + 0x0027ffff, + 0x0029ffff, + 0x002affff, + 0x001fffff, + 0x0020ffff, + 0x0021ffff, + 0x0022ffff, + 0x0023ffff, + 0x0024ffff, + }, + { + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x00030078, + 0x00030078, + 0x00030078, + 0x00030078, + 0x00030078, + 0x00030078, + 0x00030078, + 0x00030078, + }, + { + 0x00030093, + 0x00030093, + 0x00030093, + 0x00030093, + 0x00030093, + 0x00030093, + 0x00030093, + 0x00030093, + 0x000300ad, + 0x000300ad, + 0x000300ad, + 0x000300ad, + 0x000300ad, + 0x000300ad, + 0x000300ad, + 0x000300ad, + }, + { + 0x000300e2, + 0x000300e2, + 0x000300e2, + 0x000300e2, + 0x000300e2, + 0x000300e2, + 0x000300e2, + 0x000300e2, + 0x000300fc, + 0x000300fc, + 0x000300fc, + 0x000300fc, + 0x000300fc, + 0x000300fc, + 0x000300fc, + 0x000300fc, + }, + { + 0x00030116, + 0x00030116, + 0x00030116, + 0x00030116, + 0x00030116, + 0x00030116, + 0x00030116, + 0x00030116, + 0x0003012f, + 0x0003012f, + 0x0003012f, + 0x0003012f, + 0x0003012f, + 0x0003012f, + 0x0003012f, + 0x0003012f, + }, + { + 0x00030130, + 0x00030130, + 0x00030130, + 0x00030130, + 0x00030130, + 0x00030130, + 0x00030130, + 0x00030130, + 0x00030144, + 0x00030144, + 0x00030144, + 0x00030144, + 0x00030144, + 0x00030144, + 0x00030144, + 0x00030144, + }, + { + 0x00030148, + 0x00030148, + 0x00030148, + 0x00030148, + 0x00030148, + 0x00030148, + 0x00030148, + 0x00030148, + 0x00030149, + 0x00030149, + 0x00030149, + 0x00030149, + 0x00030149, + 0x00030149, + 0x00030149, + 0x00030149, + }, + { + 0x00030160, + 0x00030160, + 0x00030160, + 0x00030160, + 0x00030160, + 0x00030160, + 0x00030160, + 0x00030160, + 0x00030161, + 0x00030161, + 0x00030161, + 0x00030161, + 0x00030161, + 0x00030161, + 0x00030161, + 0x00030161, + }, + { + 0x00020028, + 0x00020028, + 0x00020028, + 0x00020028, + 0x00020043, + 0x00020043, + 0x00020043, + 0x00020043, + 0x0002005e, + 0x0002005e, + 0x0002005e, + 0x0002005e, + 0x000200ae, + 0x000200ae, + 0x000200ae, + 0x000200ae, + }, + { + 0x000200c8, + 0x000200c8, + 0x000200c8, + 0x000200c8, + 0x000200c9, + 0x000200c9, + 0x000200c9, + 0x000200c9, + 0x000200e3, + 0x000200e3, + 0x000200e3, + 0x000200e3, + 0x000200fd, + 0x000200fd, + 0x000200fd, + 0x000200fd, + }, + { + 0x0001014b, + 0x0001014b, + 0x00010165, + 0x00010165, + 0x0001017a, + 0x0001017a, + 0x0001017c, + 0x0001017c, + 0x0001017d, + 0x0001017d, + 0x0001017e, + 0x0001017e, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000d, + }, + { + 0x00020117, + 0x00020117, + 0x00020117, + 0x00020117, + 0x00020131, + 0x00020131, + 0x00020131, + 0x00020131, + 0x0002014a, + 0x0002014a, + 0x0002014a, + 0x0002014a, + 0x0002015f, + 0x0002015f, + 0x0002015f, + 0x0002015f, + }, + { + 0x00020162, + 0x00020162, + 0x00020162, + 0x00020162, + 0x00020163, + 0x00020163, + 0x00020163, + 0x00020163, + 0x00020164, + 0x00020164, + 0x00020164, + 0x00020164, + 0x0002017b, + 0x0002017b, + 0x0002017b, + 0x0002017b, + }, + { + 0x00010029, + 0x00010029, + 0x00010044, + 0x00010044, + 0x0001005f, + 0x0001005f, + 0x00010079, + 0x00010079, + 0x00010094, + 0x00010094, + 0x000100af, + 0x000100af, + 0x000100fe, + 0x000100fe, + 0x00010118, + 0x00010118, + }, + { + 0x0000007a, + 0x00000095, + 0x000000ca, + 0x000000e4, + 0x000000ff, + 0x00000132, + 0x00000133, + 0x0000014c, + 0x0000014d, + 0x0000014e, + 0x00000166, + 0x00000167, + 0x0000017f, + 0x00000180, + 0x00000196, + 0x00000197, + }, + { + 0x003effff, + 0x003fffff, + 0x0036ffff, + 0x0035ffff, + 0x0037ffff, + 0x0038ffff, + 0x0031ffff, + 0x002effff, + 0x0032ffff, + 0x002fffff, + 0x0030ffff, + 0x0033ffff, + 0x0034ffff, + 0x0000000e, + 0x00000045, + 0x00000060, + }, + { + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x00030096, + 0x00030096, + 0x00030096, + 0x00030096, + 0x00030096, + 0x00030096, + 0x00030096, + 0x00030096, + }, + { + 0x000300e5, + 0x000300e5, + 0x000300e5, + 0x000300e5, + 0x000300e5, + 0x000300e5, + 0x000300e5, + 0x000300e5, + 0x0003011a, + 0x0003011a, + 0x0003011a, + 0x0003011a, + 0x0003011a, + 0x0003011a, + 0x0003011a, + 0x0003011a, + }, + { + 0x00030134, + 0x00030134, + 0x00030134, + 0x00030134, + 0x00030134, + 0x00030134, + 0x00030134, + 0x00030134, + 0x00030181, + 0x00030181, + 0x00030181, + 0x00030181, + 0x00030181, + 0x00030181, + 0x00030181, + 0x00030181, + }, + { + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + }, + { + 0x000300b0, + 0x000300b0, + 0x000300b0, + 0x000300b0, + 0x000300b0, + 0x000300b0, + 0x000300b0, + 0x000300b0, + 0x000300b1, + 0x000300b1, + 0x000300b1, + 0x000300b1, + 0x000300b1, + 0x000300b1, + 0x000300b1, + 0x000300b1, + }, + { + 0x00030182, + 0x00030182, + 0x00030182, + 0x00030182, + 0x00030182, + 0x00030182, + 0x00030182, + 0x00030182, + 0x00030198, + 0x00030198, + 0x00030198, + 0x00030198, + 0x00030198, + 0x00030198, + 0x00030198, + 0x00030198, + }, + { + 0x00030199, + 0x00030199, + 0x00030199, + 0x00030199, + 0x00030199, + 0x00030199, + 0x00030199, + 0x00030199, + 0x0003019a, + 0x0003019a, + 0x0003019a, + 0x0003019a, + 0x0003019a, + 0x0003019a, + 0x0003019a, + 0x0003019a, + }, + { + 0x000200cc, + 0x000200cc, + 0x000200cc, + 0x000200cc, + 0x00020100, + 0x00020100, + 0x00020100, + 0x00020100, + 0x00020119, + 0x00020119, + 0x00020119, + 0x00020119, + 0x0002014f, + 0x0002014f, + 0x0002014f, + 0x0002014f, + }, + { + 0x000102d5, + 0x000102d5, + 0x000102d6, + 0x000102d6, + 0x000102d7, + 0x000102d7, + 0x000102d8, + 0x000102d8, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020010, + 0x000200cb, + 0x000200cb, + 0x000200cb, + 0x000200cb, + }, + { + 0x00020168, + 0x00020168, + 0x00020168, + 0x00020168, + 0x00020195, + 0x00020195, + 0x00020195, + 0x00020195, + 0x0002019b, + 0x0002019b, + 0x0002019b, + 0x0002019b, + 0x0002019e, + 0x0002019e, + 0x0002019e, + 0x0002019e, + }, + { + 0x000201b1, + 0x000201b1, + 0x000201b1, + 0x000201b1, + 0x000201b2, + 0x000201b2, + 0x000201b2, + 0x000201b2, + 0x000201b3, + 0x000201b3, + 0x000201b3, + 0x000201b3, + 0x000201cc, + 0x000201cc, + 0x000201cc, + 0x000201cc, + }, + { + 0x0051ffff, + 0x0052ffff, + 0x0053ffff, + 0x0054ffff, + 0x0055ffff, + 0x0056ffff, + 0x0057ffff, + 0x0058ffff, + 0x0059ffff, + 0x005affff, + 0x005bffff, + 0x005cffff, + 0x003bffff, + 0x003affff, + 0x003cffff, + 0x003dffff, + }, + { + 0x00010062, + 0x00010062, + 0x000100e7, + 0x000100e7, + 0x00010101, + 0x00010101, + 0x0001011b, + 0x0001011b, + 0x00010135, + 0x00010135, + 0x00010150, + 0x00010150, + 0x0001019c, + 0x0001019c, + 0x0001019d, + 0x0001019d, + }, + { + 0x000002ae, + 0x000002af, + 0x000002b0, + 0x000002b1, + 0x000002b2, + 0x000002b3, + 0x000002b4, + 0x000002b5, + 0x0001002b, + 0x0001002b, + 0x00010046, + 0x00010046, + 0x00010047, + 0x00010047, + 0x00010061, + 0x00010061, + }, + { + 0x000101b0, + 0x000101b0, + 0x000102b6, + 0x000102b6, + 0x000102b7, + 0x000102b7, + 0x000102b8, + 0x000102b8, + 0x000102b9, + 0x000102b9, + 0x000102ba, + 0x000102ba, + 0x000102bb, + 0x000102bb, + 0x000102bc, + 0x000102bc, + }, + { + 0x000102bd, + 0x000102bd, + 0x000102be, + 0x000102be, + 0x000102bf, + 0x000102bf, + 0x000102c0, + 0x000102c0, + 0x000102c1, + 0x000102c1, + 0x000102c2, + 0x000102c2, + 0x000102c3, + 0x000102c3, + 0x000102c4, + 0x000102c4, + }, + { + 0x000102c5, + 0x000102c5, + 0x000102c6, + 0x000102c6, + 0x000102c7, + 0x000102c7, + 0x000102c8, + 0x000102c8, + 0x000102c9, + 0x000102c9, + 0x000102ca, + 0x000102ca, + 0x000102cb, + 0x000102cb, + 0x000102cc, + 0x000102cc, + }, + { + 0x000102cd, + 0x000102cd, + 0x000102ce, + 0x000102ce, + 0x000102cf, + 0x000102cf, + 0x000102d0, + 0x000102d0, + 0x000102d1, + 0x000102d1, + 0x000102d2, + 0x000102d2, + 0x000102d3, + 0x000102d3, + 0x000102d4, + 0x000102d4, + }, + { + 0x0044ffff, + 0x0041ffff, + 0x0042ffff, + 0x0043ffff, + 0x0045ffff, + 0x0048ffff, + 0x0046ffff, + 0x0047ffff, + 0x0049ffff, + 0x004affff, + 0x004bffff, + 0x004cffff, + 0x004dffff, + 0x004effff, + 0x004fffff, + 0x0050ffff, + }, + { + 0x00000032, + 0x00000033, + 0x00000034, + 0x00000035, + 0x00000048, + 0x00000049, + 0x0000004a, + 0x0000004b, + 0x0000004c, + 0x0000004d, + 0x0000004e, + 0x0000004f, + 0x00000050, + 0x00000063, + 0x00000064, + 0x00000065, + }, + { + 0x00000066, + 0x00000067, + 0x00000068, + 0x00000069, + 0x0000006a, + 0x0000006b, + 0x0000007c, + 0x0000007d, + 0x0000007e, + 0x0000007f, + 0x00000080, + 0x00000081, + 0x00000082, + 0x00000083, + 0x00000084, + 0x00000085, + }, + { + 0x00000086, + 0x00000097, + 0x00000098, + 0x00000099, + 0x0000009a, + 0x0000009b, + 0x0000009c, + 0x0000009d, + 0x0000009e, + 0x0000009f, + 0x000000a0, + 0x000000a1, + 0x000000b2, + 0x000000b3, + 0x000000b4, + 0x000000b5, + }, + { + 0x00000011, + 0x00000012, + 0x00000013, + 0x00000014, + 0x00000015, + 0x00000016, + 0x00000017, + 0x00000018, + 0x00000019, + 0x0000001a, + 0x0000002c, + 0x0000002d, + 0x0000002e, + 0x0000002f, + 0x00000030, + 0x00000031, + }, + { + 0x000000b6, + 0x000000b7, + 0x000000b8, + 0x000000b9, + 0x000000ba, + 0x000000bb, + 0x000000bc, + 0x000000cd, + 0x000000ce, + 0x000000cf, + 0x000000d0, + 0x000000d1, + 0x000000d2, + 0x000000d3, + 0x000000d4, + 0x000000d5, + }, + { + 0x00000104, + 0x00000105, + 0x00000106, + 0x00000107, + 0x00000108, + 0x00000109, + 0x0000010a, + 0x0000010b, + 0x0000010c, + 0x0000010d, + 0x0000011c, + 0x0000011d, + 0x0000011e, + 0x0000011f, + 0x00000120, + 0x00000121, + }, + { + 0x00000122, + 0x00000123, + 0x00000124, + 0x00000125, + 0x00000126, + 0x00000127, + 0x00000128, + 0x00000136, + 0x00000137, + 0x00000138, + 0x00000139, + 0x0000013a, + 0x0000013b, + 0x0000013c, + 0x0000013d, + 0x0000013e, + }, + { + 0x000000d6, + 0x000000d7, + 0x000000e6, + 0x000000e8, + 0x000000e9, + 0x000000ea, + 0x000000eb, + 0x000000ec, + 0x000000ed, + 0x000000ee, + 0x000000ef, + 0x000000f0, + 0x000000f1, + 0x000000f2, + 0x00000102, + 0x00000103, + }, + { + 0x0000013f, + 0x00000140, + 0x00000141, + 0x00000142, + 0x00000143, + 0x00000151, + 0x00000152, + 0x00000153, + 0x00000154, + 0x00000155, + 0x00000156, + 0x00000157, + 0x00000158, + 0x00000159, + 0x0000015a, + 0x0000015b, + }, + { + 0x0000015c, + 0x0000015d, + 0x0000015e, + 0x00000169, + 0x0000016a, + 0x0000016b, + 0x0000016c, + 0x0000016d, + 0x0000016e, + 0x0000016f, + 0x00000170, + 0x00000171, + 0x00000172, + 0x00000173, + 0x00000174, + 0x00000175, + }, + { + 0x00000176, + 0x00000177, + 0x00000178, + 0x00000179, + 0x00000183, + 0x00000184, + 0x00000185, + 0x00000186, + 0x00000187, + 0x00000188, + 0x00000189, + 0x0000018a, + 0x0000018b, + 0x0000018c, + 0x0000018d, + 0x0000018e, + }, + { + 0x0000018f, + 0x00000190, + 0x00000191, + 0x00000192, + 0x00000193, + 0x00000194, + 0x0000019f, + 0x000001a0, + 0x000001a1, + 0x000001a2, + 0x000001a3, + 0x000001a4, + 0x000001a5, + 0x000001a6, + 0x000001a7, + 0x000001a8, + }, + { + 0x000001a9, + 0x000001aa, + 0x000001ab, + 0x000001ac, + 0x000001ad, + 0x000001ae, + 0x000001af, + 0x000001b4, + 0x000001b5, + 0x000001b6, + 0x000001b7, + 0x000001b8, + 0x000001b9, + 0x000001ba, + 0x000001bb, + 0x000001bc, + }, + { + 0x000001bd, + 0x000001be, + 0x000001bf, + 0x000001c0, + 0x000001c1, + 0x000001c2, + 0x000001c3, + 0x000001c4, + 0x000001c5, + 0x000001c6, + 0x000001c7, + 0x000001c8, + 0x000001c9, + 0x000001ca, + 0x000001cb, + 0x000001cd, + }, + { + 0x000001ce, + 0x000001cf, + 0x000001d0, + 0x000001d1, + 0x000001d2, + 0x000001d3, + 0x000001d4, + 0x000001d5, + 0x000001d6, + 0x000001d7, + 0x000001d8, + 0x000001d9, + 0x000001da, + 0x000001db, + 0x000001dc, + 0x000001dd, + }, + { + 0x000001de, + 0x000001df, + 0x000001e0, + 0x000001e1, + 0x000001e2, + 0x000001e3, + 0x000001e4, + 0x000001e5, + 0x000001e6, + 0x000001e7, + 0x000001e8, + 0x000001e9, + 0x000001ea, + 0x000001eb, + 0x000001ec, + 0x000001ed, + }, + { + 0x000001ee, + 0x000001ef, + 0x000001f0, + 0x000001f1, + 0x000001f2, + 0x000001f3, + 0x000001f4, + 0x000001f5, + 0x000001f6, + 0x000001f7, + 0x000001f8, + 0x000001f9, + 0x000001fa, + 0x000001fb, + 0x000001fc, + 0x000001fd, + }, + { + 0x000001fe, + 0x000001ff, + 0x00000200, + 0x00000201, + 0x00000202, + 0x00000203, + 0x00000204, + 0x00000205, + 0x00000206, + 0x00000207, + 0x00000208, + 0x00000209, + 0x0000020a, + 0x0000020b, + 0x0000020c, + 0x0000020d, + }, + { + 0x0000020e, + 0x0000020f, + 0x00000210, + 0x00000211, + 0x00000212, + 0x00000213, + 0x00000214, + 0x00000215, + 0x00000216, + 0x00000217, + 0x00000218, + 0x00000219, + 0x0000021a, + 0x0000021b, + 0x0000021c, + 0x0000021d, + }, + { + 0x0000021e, + 0x0000021f, + 0x00000220, + 0x00000221, + 0x00000222, + 0x00000223, + 0x00000224, + 0x00000225, + 0x00000226, + 0x00000227, + 0x00000228, + 0x00000229, + 0x0000022a, + 0x0000022b, + 0x0000022c, + 0x0000022d, + }, + { + 0x0000022e, + 0x0000022f, + 0x00000230, + 0x00000231, + 0x00000232, + 0x00000233, + 0x00000234, + 0x00000235, + 0x00000236, + 0x00000237, + 0x00000238, + 0x00000239, + 0x0000023a, + 0x0000023b, + 0x0000023c, + 0x0000023d, + }, + { + 0x0000023e, + 0x0000023f, + 0x00000240, + 0x00000241, + 0x00000242, + 0x00000243, + 0x00000244, + 0x00000245, + 0x00000246, + 0x00000247, + 0x00000248, + 0x00000249, + 0x0000024a, + 0x0000024b, + 0x0000024c, + 0x0000024d, + }, + { + 0x0000024e, + 0x0000024f, + 0x00000250, + 0x00000251, + 0x00000252, + 0x00000253, + 0x00000254, + 0x00000255, + 0x00000256, + 0x00000257, + 0x00000258, + 0x00000259, + 0x0000025a, + 0x0000025b, + 0x0000025c, + 0x0000025d, + }, + { + 0x0000025e, + 0x0000025f, + 0x00000260, + 0x00000261, + 0x00000262, + 0x00000263, + 0x00000264, + 0x00000265, + 0x00000266, + 0x00000267, + 0x00000268, + 0x00000269, + 0x0000026a, + 0x0000026b, + 0x0000026c, + 0x0000026d, + }, + { + 0x0000026e, + 0x0000026f, + 0x00000270, + 0x00000271, + 0x00000272, + 0x00000273, + 0x00000274, + 0x00000275, + 0x00000276, + 0x00000277, + 0x00000278, + 0x00000279, + 0x0000027a, + 0x0000027b, + 0x0000027c, + 0x0000027d, + }, + { + 0x0000027e, + 0x0000027f, + 0x00000280, + 0x00000281, + 0x00000282, + 0x00000283, + 0x00000284, + 0x00000285, + 0x00000286, + 0x00000287, + 0x00000288, + 0x00000289, + 0x0000028a, + 0x0000028b, + 0x0000028c, + 0x0000028d, + }, + { + 0x0000028e, + 0x0000028f, + 0x00000290, + 0x00000291, + 0x00000292, + 0x00000293, + 0x00000294, + 0x00000295, + 0x00000296, + 0x00000297, + 0x00000298, + 0x00000299, + 0x0000029a, + 0x0000029b, + 0x0000029c, + 0x0000029d, + }, + { + 0x0000029e, + 0x0000029f, + 0x000002a0, + 0x000002a1, + 0x000002a2, + 0x000002a3, + 0x000002a4, + 0x000002a5, + 0x000002a6, + 0x000002a7, + 0x000002a8, + 0x000002a9, + 0x000002aa, + 0x000002ab, + 0x000002ac, + 0x000002ad, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc18[28][2] = +#else +const uint16_t c_aauiCQMFHuffEnc18[28][2] = +#endif + { + { 0x0004, 0x0001 }, + { 0x0003, 0x0002 }, + { 0x0003, 0x0003 }, + { 0x0003, 0x0004 }, + { 0x0003, 0x0005 }, + { 0x0003, 0x0006 }, + { 0x0003, 0x0007 }, + { 0x0004, 0x0002 }, + { 0x0004, 0x0003 }, + { 0x0005, 0x0001 }, + { 0x0006, 0x0001 }, + { 0x0007, 0x0001 }, + { 0x0008, 0x0001 }, + { 0x0009, 0x0001 }, + { 0x000a, 0x0001 }, + { 0x000b, 0x0001 }, + { 0x000c, 0x0001 }, + { 0x000d, 0x0001 }, + { 0x000e, 0x0001 }, + { 0x000f, 0x0001 }, + { 0x0011, 0x0003 }, + { 0x0012, 0x0001 }, + { 0x0012, 0x0002 }, + { 0x0012, 0x0003 }, + { 0x0013, 0x0000 }, + { 0x0013, 0x0001 }, + { 0x0012, 0x0004 }, + { 0x0012, 0x0005 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec18[6][16] = { + { + 0x0001ffff, + 0x00000000, + 0x00000007, + 0x00000008, + 0x00010001, + 0x00010001, + 0x00010002, + 0x00010002, + 0x00010003, + 0x00010003, + 0x00010004, + 0x00010004, + 0x00010005, + 0x00010005, + 0x00010006, + 0x00010006, + }, + { + 0x0002ffff, + 0x0000000c, + 0x0001000b, + 0x0001000b, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + }, + { + 0x0003ffff, + 0x00000010, + 0x0001000f, + 0x0001000f, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + }, + { + 0x0005ffff, + 0x0004ffff, + 0x00010013, + 0x00010013, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + }, + { + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + }, + { + 0x00010018, + 0x00010018, + 0x00010019, + 0x00010019, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020017, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc19[29][2] = +#else +const uint16_t c_aauiCQMFHuffEnc19[29][2] = +#endif + { + { 0x0004, 0x0002 }, + { 0x0003, 0x0003 }, + { 0x0003, 0x0004 }, + { 0x0003, 0x0005 }, + { 0x0003, 0x0006 }, + { 0x0003, 0x0007 }, + { 0x0004, 0x0003 }, + { 0x0004, 0x0004 }, + { 0x0004, 0x0005 }, + { 0x0005, 0x0001 }, + { 0x0005, 0x0002 }, + { 0x0005, 0x0003 }, + { 0x0006, 0x0001 }, + { 0x0007, 0x0001 }, + { 0x0008, 0x0001 }, + { 0x0009, 0x0001 }, + { 0x000a, 0x0001 }, + { 0x000b, 0x0001 }, + { 0x000c, 0x0001 }, + { 0x000d, 0x0001 }, + { 0x000e, 0x0001 }, + { 0x000f, 0x0001 }, + { 0x0010, 0x0001 }, + { 0x0012, 0x0002 }, + { 0x0013, 0x0000 }, + { 0x0013, 0x0001 }, + { 0x0013, 0x0002 }, + { 0x0013, 0x0003 }, + { 0x0012, 0x0003 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec19[6][16] = { + { + 0x0001ffff, + 0x0002ffff, + 0x00000000, + 0x00000006, + 0x00000007, + 0x00000008, + 0x00010001, + 0x00010001, + 0x00010002, + 0x00010002, + 0x00010003, + 0x00010003, + 0x00010004, + 0x00010004, + 0x00010005, + 0x00010005, + }, + { + 0x0003ffff, + 0x0000000e, + 0x0001000d, + 0x0001000d, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + }, + { + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + }, + { + 0x0004ffff, + 0x00000012, + 0x00010011, + 0x00010011, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020010, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + }, + { + 0x0005ffff, + 0x00000016, + 0x00010015, + 0x00010015, + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020014, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + }, + { + 0x00010018, + 0x00010018, + 0x00010019, + 0x00010019, + 0x0001001a, + 0x0001001a, + 0x0001001b, + 0x0001001b, + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020017, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001c, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc20[32][2] = +#else +const uint16_t c_aauiCQMFHuffEnc20[32][2] = +#endif + { + { 0x0004, 0x0002 }, + { 0x0003, 0x0005 }, + { 0x0003, 0x0006 }, + { 0x0003, 0x0007 }, + { 0x0004, 0x0003 }, + { 0x0004, 0x0004 }, + { 0x0004, 0x0005 }, + { 0x0004, 0x0006 }, + { 0x0004, 0x0007 }, + { 0x0004, 0x0008 }, + { 0x0004, 0x0009 }, + { 0x0005, 0x0002 }, + { 0x0005, 0x0003 }, + { 0x0006, 0x0001 }, + { 0x0006, 0x0002 }, + { 0x0006, 0x0003 }, + { 0x0007, 0x0001 }, + { 0x0008, 0x0001 }, + { 0x0009, 0x0001 }, + { 0x000a, 0x0001 }, + { 0x000b, 0x0001 }, + { 0x000c, 0x0001 }, + { 0x000d, 0x0001 }, + { 0x000e, 0x0001 }, + { 0x000f, 0x0001 }, + { 0x0010, 0x0001 }, + { 0x0011, 0x0001 }, + { 0x0014, 0x0000 }, + { 0x0014, 0x0001 }, + { 0x0013, 0x0001 }, + { 0x0013, 0x0002 }, + { 0x0013, 0x0003 }, + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec20[6][16] = { + { + 0x0002ffff, + 0x0001ffff, + 0x00000000, + 0x00000004, + 0x00000005, + 0x00000006, + 0x00000007, + 0x00000008, + 0x00000009, + 0x0000000a, + 0x00010001, + 0x00010001, + 0x00010002, + 0x00010002, + 0x00010003, + 0x00010003, + }, + { + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + }, + { + 0x0003ffff, + 0x00000011, + 0x00010010, + 0x00010010, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x0002000f, + }, + { + 0x0004ffff, + 0x00000015, + 0x00010014, + 0x00010014, + 0x00020013, + 0x00020013, + 0x00020013, + 0x00020013, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + }, + { + 0x0005ffff, + 0x00000019, + 0x00010018, + 0x00010018, + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020017, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + }, + { + 0x0000001b, + 0x0000001c, + 0x0001001d, + 0x0001001d, + 0x0001001e, + 0x0001001e, + 0x0001001f, + 0x0001001f, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc21[37][2] = +#else +const uint16_t c_aauiCQMFHuffEnc21[37][2] = +#endif + { + { 0x0005, 0x0002 }, + { 0x0003, 0x0006 }, + { 0x0003, 0x0007 }, + { 0x0004, 0x0003 }, + { 0x0004, 0x0004 }, + { 0x0004, 0x0005 }, + { 0x0004, 0x0006 }, + { 0x0004, 0x0007 }, + { 0x0004, 0x0008 }, + { 0x0004, 0x0009 }, + { 0x0004, 0x000a }, + { 0x0004, 0x000b }, + { 0x0005, 0x0003 }, + { 0x0005, 0x0004 }, + { 0x0005, 0x0005 }, + { 0x0006, 0x0002 }, + { 0x0006, 0x0003 }, + { 0x0007, 0x0002 }, + { 0x0007, 0x0003 }, + { 0x0008, 0x0001 }, + { 0x0008, 0x0002 }, + { 0x0008, 0x0003 }, + { 0x0009, 0x0001 }, + { 0x000b, 0x0001 }, + { 0x000b, 0x0002 }, + { 0x000b, 0x0003 }, + { 0x000c, 0x0001 }, + { 0x000d, 0x0001 }, + { 0x000e, 0x0001 }, + { 0x000f, 0x0001 }, + { 0x0010, 0x0001 }, + { 0x0011, 0x0001 }, + { 0x0014, 0x0000 }, + { 0x0014, 0x0001 }, + { 0x0013, 0x0001 }, + { 0x0013, 0x0002 }, + { 0x0013, 0x0003 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec21[7][16] = { + { + 0x0003ffff, + 0x0001ffff, + 0x0002ffff, + 0x00000003, + 0x00000004, + 0x00000005, + 0x00000006, + 0x00000007, + 0x00000008, + 0x00000009, + 0x0000000a, + 0x0000000b, + 0x00010001, + 0x00010001, + 0x00010002, + 0x00010002, + }, + { + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + }, + { + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + }, + { + 0x0004ffff, + 0x00000013, + 0x00000014, + 0x00000015, + 0x00010011, + 0x00010011, + 0x00010012, + 0x00010012, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020010, + }, + { + 0x0005ffff, + 0x0000001a, + 0x00010017, + 0x00010017, + 0x00010018, + 0x00010018, + 0x00010019, + 0x00010019, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + }, + { + 0x0006ffff, + 0x0000001e, + 0x0001001d, + 0x0001001d, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + }, + { + 0x00000020, + 0x00000021, + 0x00010022, + 0x00010022, + 0x00010023, + 0x00010023, + 0x00010024, + 0x00010024, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc22[39][2] = +#else +const uint16_t c_aauiCQMFHuffEnc22[39][2] = +#endif + { + { 0x0005, 0x0002 }, + { 0x0004, 0x0004 }, + { 0x0004, 0x0005 }, + { 0x0004, 0x0006 }, + { 0x0004, 0x0007 }, + { 0x0004, 0x0008 }, + { 0x0004, 0x0009 }, + { 0x0004, 0x000a }, + { 0x0004, 0x000b }, + { 0x0004, 0x000c }, + { 0x0004, 0x000d }, + { 0x0004, 0x000e }, + { 0x0004, 0x000f }, + { 0x0005, 0x0003 }, + { 0x0005, 0x0004 }, + { 0x0005, 0x0005 }, + { 0x0005, 0x0006 }, + { 0x0005, 0x0007 }, + { 0x0006, 0x0002 }, + { 0x0006, 0x0003 }, + { 0x0007, 0x0002 }, + { 0x0007, 0x0003 }, + { 0x0008, 0x0002 }, + { 0x0008, 0x0003 }, + { 0x0009, 0x0002 }, + { 0x0009, 0x0003 }, + { 0x000a, 0x0001 }, + { 0x000a, 0x0002 }, + { 0x000a, 0x0003 }, + { 0x000c, 0x0001 }, + { 0x000c, 0x0002 }, + { 0x000c, 0x0003 }, + { 0x000e, 0x0001 }, + { 0x000e, 0x0002 }, + { 0x000f, 0x0001 }, + { 0x000e, 0x0003 }, + { 0x0011, 0x0000 }, + { 0x0010, 0x0001 }, + { 0x0011, 0x0001 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec22[9][16] = { + { + 0x0004ffff, + 0x0001ffff, + 0x0002ffff, + 0x0003ffff, + 0x00000001, + 0x00000002, + 0x00000003, + 0x00000004, + 0x00000005, + 0x00000006, + 0x00000007, + 0x00000008, + 0x00000009, + 0x0000000a, + 0x0000000b, + 0x0000000c, + }, + { + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + }, + { + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + }, + { + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + }, + { + 0x0006ffff, + 0x0005ffff, + 0x00000016, + 0x00000017, + 0x00010014, + 0x00010014, + 0x00010015, + 0x00010015, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020013, + 0x00020013, + 0x00020013, + 0x00020013, + }, + { + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + }, + { + 0x0007ffff, + 0x0000001d, + 0x0000001e, + 0x0000001f, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001c, + }, + { + 0x0008ffff, + 0x00000025, + 0x00010022, + 0x00010022, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020023, + 0x00020023, + 0x00020023, + 0x00020023, + }, + { + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc23[46][2] = +#else +const uint16_t c_aauiCQMFHuffEnc23[46][2] = +#endif + { + { 0x0005, 0x0003 }, + { 0x0004, 0x0006 }, + { 0x0004, 0x0007 }, + { 0x0004, 0x0008 }, + { 0x0004, 0x0009 }, + { 0x0004, 0x000a }, + { 0x0004, 0x000b }, + { 0x0004, 0x000c }, + { 0x0004, 0x000d }, + { 0x0004, 0x000e }, + { 0x0004, 0x000f }, + { 0x0005, 0x0004 }, + { 0x0005, 0x0005 }, + { 0x0005, 0x0006 }, + { 0x0005, 0x0007 }, + { 0x0005, 0x0008 }, + { 0x0005, 0x0009 }, + { 0x0005, 0x000a }, + { 0x0005, 0x000b }, + { 0x0006, 0x0003 }, + { 0x0006, 0x0004 }, + { 0x0006, 0x0005 }, + { 0x0007, 0x0002 }, + { 0x0007, 0x0003 }, + { 0x0007, 0x0004 }, + { 0x0007, 0x0005 }, + { 0x0008, 0x0002 }, + { 0x0008, 0x0003 }, + { 0x0009, 0x0002 }, + { 0x0009, 0x0003 }, + { 0x000a, 0x0002 }, + { 0x000a, 0x0003 }, + { 0x000b, 0x0002 }, + { 0x000b, 0x0003 }, + { 0x000c, 0x0002 }, + { 0x000c, 0x0003 }, + { 0x000d, 0x0002 }, + { 0x000d, 0x0003 }, + { 0x000e, 0x0001 }, + { 0x000e, 0x0002 }, + { 0x000e, 0x0003 }, + { 0x000f, 0x0001 }, + { 0x0010, 0x0001 }, + { 0x0012, 0x0000 }, + { 0x0012, 0x0001 }, + { 0x0011, 0x0001 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec23[12][16] = { + { + 0x0006ffff, + 0x0001ffff, + 0x0002ffff, + 0x0003ffff, + 0x0004ffff, + 0x0005ffff, + 0x00000001, + 0x00000002, + 0x00000003, + 0x00000004, + 0x00000005, + 0x00000006, + 0x00000007, + 0x00000008, + 0x00000009, + 0x0000000a, + }, + { + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + }, + { + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + }, + { + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + }, + { + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + }, + { + 0x0008ffff, + 0x0007ffff, + 0x0000001a, + 0x0000001b, + 0x00010016, + 0x00010016, + 0x00010017, + 0x00010017, + 0x00010018, + 0x00010018, + 0x00010019, + 0x00010019, + 0x00020013, + 0x00020013, + 0x00020013, + 0x00020013, + }, + { + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + }, + { + 0x000affff, + 0x0009ffff, + 0x00000022, + 0x00000023, + 0x00010020, + 0x00010020, + 0x00010021, + 0x00010021, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x0002001f, + }, + { + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + }, + { + 0x000bffff, + 0x0000002a, + 0x00010029, + 0x00010029, + 0x00020026, + 0x00020026, + 0x00020026, + 0x00020026, + 0x00020027, + 0x00020027, + 0x00020027, + 0x00020027, + 0x00020028, + 0x00020028, + 0x00020028, + 0x00020028, + }, + { + 0x0002002b, + 0x0002002b, + 0x0002002b, + 0x0002002b, + 0x0002002c, + 0x0002002c, + 0x0002002c, + 0x0002002c, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc24[55][2] = +#else +const uint16_t c_aauiCQMFHuffEnc24[55][2] = +#endif + { + { 0x0005, 0x0004 }, + { 0x0004, 0x0009 }, + { 0x0004, 0x000a }, + { 0x0004, 0x000b }, + { 0x0004, 0x000c }, + { 0x0004, 0x000d }, + { 0x0004, 0x000e }, + { 0x0004, 0x000f }, + { 0x0005, 0x0005 }, + { 0x0005, 0x0006 }, + { 0x0005, 0x0007 }, + { 0x0005, 0x0008 }, + { 0x0005, 0x0009 }, + { 0x0005, 0x000a }, + { 0x0005, 0x000b }, + { 0x0005, 0x000c }, + { 0x0005, 0x000d }, + { 0x0005, 0x000e }, + { 0x0005, 0x000f }, + { 0x0005, 0x0010 }, + { 0x0005, 0x0011 }, + { 0x0006, 0x0003 }, + { 0x0006, 0x0004 }, + { 0x0006, 0x0005 }, + { 0x0006, 0x0006 }, + { 0x0006, 0x0007 }, + { 0x0007, 0x0003 }, + { 0x0007, 0x0004 }, + { 0x0007, 0x0005 }, + { 0x0008, 0x0003 }, + { 0x0008, 0x0004 }, + { 0x0008, 0x0005 }, + { 0x0009, 0x0002 }, + { 0x0009, 0x0003 }, + { 0x0009, 0x0004 }, + { 0x0009, 0x0005 }, + { 0x000a, 0x0002 }, + { 0x000a, 0x0003 }, + { 0x000b, 0x0002 }, + { 0x000b, 0x0003 }, + { 0x000c, 0x0003 }, + { 0x000d, 0x0002 }, + { 0x000d, 0x0003 }, + { 0x000d, 0x0004 }, + { 0x000d, 0x0005 }, + { 0x000e, 0x0002 }, + { 0x000e, 0x0003 }, + { 0x000f, 0x0001 }, + { 0x000f, 0x0002 }, + { 0x000f, 0x0003 }, + { 0x0010, 0x0001 }, + { 0x0011, 0x0001 }, + { 0x0013, 0x0000 }, + { 0x0012, 0x0001 }, + { 0x0013, 0x0001 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec24[17][16] = { + { + 0x0008ffff, + 0x0009ffff, + 0x0001ffff, + 0x0002ffff, + 0x0003ffff, + 0x0004ffff, + 0x0005ffff, + 0x0006ffff, + 0x0007ffff, + 0x00000001, + 0x00000002, + 0x00000003, + 0x00000004, + 0x00000005, + 0x00000006, + 0x00000007, + }, + { + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + }, + { + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + }, + { + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + }, + { + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + }, + { + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + }, + { + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + }, + { + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + }, + { + 0x000cffff, + 0x000affff, + 0x000bffff, + 0x0000001d, + 0x0000001e, + 0x0000001f, + 0x0001001a, + 0x0001001a, + 0x0001001b, + 0x0001001b, + 0x0001001c, + 0x0001001c, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020015, + }, + { + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020019, + 0x00020019, + 0x00020019, + 0x00020019, + }, + { + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + }, + { + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + }, + { + 0x000fffff, + 0x000dffff, + 0x000effff, + 0x00000028, + 0x00010026, + 0x00010026, + 0x00010027, + 0x00010027, + 0x00020024, + 0x00020024, + 0x00020024, + 0x00020024, + 0x00020025, + 0x00020025, + 0x00020025, + 0x00020025, + }, + { + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + }, + { + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + }, + { + 0x0010ffff, + 0x00000032, + 0x0001002f, + 0x0001002f, + 0x00010030, + 0x00010030, + 0x00010031, + 0x00010031, + 0x0002002d, + 0x0002002d, + 0x0002002d, + 0x0002002d, + 0x0002002e, + 0x0002002e, + 0x0002002e, + 0x0002002e, + }, + { + 0x00010034, + 0x00010034, + 0x00010036, + 0x00010036, + 0x00020035, + 0x00020035, + 0x00020035, + 0x00020035, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc25[65][2] = +#else +const uint16_t c_aauiCQMFHuffEnc25[65][2] = +#endif + { + { 0x0005, 0x0005 }, + { 0x0004, 0x000c }, + { 0x0004, 0x000d }, + { 0x0004, 0x000e }, + { 0x0005, 0x0006 }, + { 0x0004, 0x000f }, + { 0x0005, 0x0007 }, + { 0x0005, 0x0008 }, + { 0x0005, 0x0009 }, + { 0x0005, 0x000a }, + { 0x0005, 0x000b }, + { 0x0005, 0x000c }, + { 0x0005, 0x000d }, + { 0x0005, 0x000e }, + { 0x0005, 0x000f }, + { 0x0005, 0x0010 }, + { 0x0005, 0x0011 }, + { 0x0005, 0x0012 }, + { 0x0005, 0x0013 }, + { 0x0005, 0x0014 }, + { 0x0005, 0x0015 }, + { 0x0005, 0x0016 }, + { 0x0005, 0x0017 }, + { 0x0006, 0x0004 }, + { 0x0006, 0x0005 }, + { 0x0006, 0x0006 }, + { 0x0006, 0x0007 }, + { 0x0006, 0x0008 }, + { 0x0006, 0x0009 }, + { 0x0007, 0x0003 }, + { 0x0007, 0x0004 }, + { 0x0007, 0x0005 }, + { 0x0007, 0x0006 }, + { 0x0007, 0x0007 }, + { 0x0008, 0x0003 }, + { 0x0008, 0x0004 }, + { 0x0008, 0x0005 }, + { 0x0009, 0x0003 }, + { 0x0009, 0x0004 }, + { 0x0009, 0x0005 }, + { 0x000a, 0x0003 }, + { 0x000a, 0x0004 }, + { 0x000a, 0x0005 }, + { 0x000b, 0x0003 }, + { 0x000b, 0x0004 }, + { 0x000b, 0x0005 }, + { 0x000c, 0x0002 }, + { 0x000c, 0x0003 }, + { 0x000c, 0x0004 }, + { 0x000c, 0x0005 }, + { 0x000d, 0x0003 }, + { 0x000e, 0x0003 }, + { 0x000e, 0x0004 }, + { 0x000f, 0x0003 }, + { 0x000e, 0x0005 }, + { 0x000f, 0x0004 }, + { 0x0010, 0x0001 }, + { 0x000f, 0x0005 }, + { 0x0010, 0x0002 }, + { 0x0010, 0x0003 }, + { 0x0010, 0x0004 }, + { 0x0010, 0x0005 }, + { 0x0011, 0x0001 }, + { 0x0012, 0x0000 }, + { 0x0012, 0x0001 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec25[19][16] = { + { + 0x000cffff, + 0x000bffff, + 0x0002ffff, + 0x0001ffff, + 0x0003ffff, + 0x0004ffff, + 0x0005ffff, + 0x0006ffff, + 0x0007ffff, + 0x0008ffff, + 0x0009ffff, + 0x000affff, + 0x00000001, + 0x00000002, + 0x00000003, + 0x00000005, + }, + { + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + }, + { + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + }, + { + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + }, + { + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + }, + { + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + }, + { + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + }, + { + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + }, + { + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + }, + { + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + }, + { + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020019, + 0x00020019, + 0x00020019, + 0x00020019, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001a, + }, + { + 0x000fffff, + 0x000dffff, + 0x000effff, + 0x00000022, + 0x00000023, + 0x00000024, + 0x0001001d, + 0x0001001d, + 0x0001001e, + 0x0001001e, + 0x0001001f, + 0x0001001f, + 0x00010020, + 0x00010020, + 0x00010021, + 0x00010021, + }, + { + 0x00020029, + 0x00020029, + 0x00020029, + 0x00020029, + 0x0002002a, + 0x0002002a, + 0x0002002a, + 0x0002002a, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + }, + { + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + }, + { + 0x0011ffff, + 0x0010ffff, + 0x0000002e, + 0x0000002f, + 0x00000030, + 0x00000031, + 0x0001002b, + 0x0001002b, + 0x0001002c, + 0x0001002c, + 0x0001002d, + 0x0001002d, + 0x00020028, + 0x00020028, + 0x00020028, + 0x00020028, + }, + { + 0x00020034, + 0x00020034, + 0x00020034, + 0x00020034, + 0x00020036, + 0x00020036, + 0x00020036, + 0x00020036, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + }, + { + 0x0012ffff, + 0x00000038, + 0x0000003a, + 0x0000003b, + 0x0000003c, + 0x0000003d, + 0x00010035, + 0x00010035, + 0x00010037, + 0x00010037, + 0x00010039, + 0x00010039, + 0x00020033, + 0x00020033, + 0x00020033, + 0x00020033, + }, + { + 0x0002003f, + 0x0002003f, + 0x0002003f, + 0x0002003f, + 0x00020040, + 0x00020040, + 0x00020040, + 0x00020040, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc26[77][2] = +#else +const uint16_t c_aauiCQMFHuffEnc26[77][2] = +#endif + { + { 0x0006, 0x0004 }, + { 0x0005, 0x0007 }, + { 0x0005, 0x0008 }, + { 0x0005, 0x0009 }, + { 0x0005, 0x000a }, + { 0x0005, 0x000b }, + { 0x0005, 0x000c }, + { 0x0005, 0x000d }, + { 0x0005, 0x000e }, + { 0x0005, 0x000f }, + { 0x0005, 0x0010 }, + { 0x0005, 0x0011 }, + { 0x0005, 0x0012 }, + { 0x0005, 0x0013 }, + { 0x0005, 0x0014 }, + { 0x0005, 0x0015 }, + { 0x0005, 0x0016 }, + { 0x0005, 0x0017 }, + { 0x0005, 0x0018 }, + { 0x0005, 0x0019 }, + { 0x0005, 0x001a }, + { 0x0005, 0x001b }, + { 0x0005, 0x001c }, + { 0x0005, 0x001d }, + { 0x0005, 0x001e }, + { 0x0005, 0x001f }, + { 0x0006, 0x0005 }, + { 0x0006, 0x0006 }, + { 0x0006, 0x0007 }, + { 0x0006, 0x0008 }, + { 0x0006, 0x0009 }, + { 0x0006, 0x000a }, + { 0x0006, 0x000b }, + { 0x0006, 0x000c }, + { 0x0006, 0x000d }, + { 0x0007, 0x0004 }, + { 0x0007, 0x0005 }, + { 0x0007, 0x0006 }, + { 0x0007, 0x0007 }, + { 0x0008, 0x0004 }, + { 0x0008, 0x0005 }, + { 0x0008, 0x0006 }, + { 0x0008, 0x0007 }, + { 0x0009, 0x0003 }, + { 0x0009, 0x0004 }, + { 0x0009, 0x0005 }, + { 0x0009, 0x0006 }, + { 0x0009, 0x0007 }, + { 0x000a, 0x0003 }, + { 0x000a, 0x0004 }, + { 0x000a, 0x0005 }, + { 0x000b, 0x0004 }, + { 0x000b, 0x0005 }, + { 0x000c, 0x0003 }, + { 0x000c, 0x0004 }, + { 0x000c, 0x0005 }, + { 0x000c, 0x0006 }, + { 0x000c, 0x0007 }, + { 0x000d, 0x0003 }, + { 0x000d, 0x0004 }, + { 0x000e, 0x0002 }, + { 0x000d, 0x0005 }, + { 0x000e, 0x0003 }, + { 0x000e, 0x0004 }, + { 0x000f, 0x0003 }, + { 0x000e, 0x0005 }, + { 0x0010, 0x0002 }, + { 0x0010, 0x0003 }, + { 0x0010, 0x0004 }, + { 0x0011, 0x0002 }, + { 0x0012, 0x0001 }, + { 0x0010, 0x0005 }, + { 0x0012, 0x0002 }, + { 0x0011, 0x0003 }, + { 0x0012, 0x0003 }, + { 0x0013, 0x0000 }, + { 0x0013, 0x0001 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec26[26][16] = { + { + 0x0010ffff, + 0x000effff, + 0x000fffff, + 0x0001ffff, + 0x0002ffff, + 0x0003ffff, + 0x0004ffff, + 0x0005ffff, + 0x0006ffff, + 0x0007ffff, + 0x0008ffff, + 0x0009ffff, + 0x000affff, + 0x000bffff, + 0x000cffff, + 0x000dffff, + }, + { + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020022, + 0x00020022, + 0x00020022, + 0x00020022, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + }, + { + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + }, + { + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + }, + { + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + }, + { + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + }, + { + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + }, + { + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + }, + { + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + }, + { + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + }, + { + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + }, + { + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + }, + { + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + }, + { + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + }, + { + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020000, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001c, + }, + { + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020020, + }, + { + 0x0014ffff, + 0x0011ffff, + 0x0012ffff, + 0x0013ffff, + 0x00000027, + 0x00000028, + 0x00000029, + 0x0000002a, + 0x00010023, + 0x00010023, + 0x00010024, + 0x00010024, + 0x00010025, + 0x00010025, + 0x00010026, + 0x00010026, + }, + { + 0x00020031, + 0x00020031, + 0x00020031, + 0x00020031, + 0x00020032, + 0x00020032, + 0x00020032, + 0x00020032, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + }, + { + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + }, + { + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + }, + { + 0x0017ffff, + 0x0015ffff, + 0x0016ffff, + 0x00000035, + 0x00000036, + 0x00000037, + 0x00000038, + 0x00000039, + 0x00010033, + 0x00010033, + 0x00010034, + 0x00010034, + 0x00020030, + 0x00020030, + 0x00020030, + 0x00020030, + }, + { + 0x0002003f, + 0x0002003f, + 0x0002003f, + 0x0002003f, + 0x00020041, + 0x00020041, + 0x00020041, + 0x00020041, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + }, + { + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + }, + { + 0x0019ffff, + 0x0018ffff, + 0x00000042, + 0x00000043, + 0x00000044, + 0x00000047, + 0x00010040, + 0x00010040, + 0x0002003c, + 0x0002003c, + 0x0002003c, + 0x0002003c, + 0x0002003e, + 0x0002003e, + 0x0002003e, + 0x0002003e, + }, + { + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + }, + { + 0x0001004b, + 0x0001004b, + 0x0001004c, + 0x0001004c, + 0x00020046, + 0x00020046, + 0x00020046, + 0x00020046, + 0x00020048, + 0x00020048, + 0x00020048, + 0x00020048, + 0x0002004a, + 0x0002004a, + 0x0002004a, + 0x0002004a, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc27[91][2] = +#else +const uint16_t c_aauiCQMFHuffEnc27[91][2] = +#endif + { + { 0x0006, 0x0006 }, + { 0x0005, 0x000b }, + { 0x0005, 0x000c }, + { 0x0005, 0x000d }, + { 0x0005, 0x000e }, + { 0x0005, 0x000f }, + { 0x0005, 0x0010 }, + { 0x0005, 0x0011 }, + { 0x0005, 0x0012 }, + { 0x0005, 0x0013 }, + { 0x0005, 0x0014 }, + { 0x0005, 0x0015 }, + { 0x0005, 0x0016 }, + { 0x0005, 0x0017 }, + { 0x0005, 0x0018 }, + { 0x0005, 0x0019 }, + { 0x0005, 0x001a }, + { 0x0005, 0x001b }, + { 0x0005, 0x001c }, + { 0x0005, 0x001d }, + { 0x0005, 0x001e }, + { 0x0005, 0x001f }, + { 0x0006, 0x0007 }, + { 0x0006, 0x0008 }, + { 0x0006, 0x0009 }, + { 0x0006, 0x000a }, + { 0x0006, 0x000b }, + { 0x0006, 0x000c }, + { 0x0006, 0x000d }, + { 0x0006, 0x000e }, + { 0x0006, 0x000f }, + { 0x0006, 0x0010 }, + { 0x0006, 0x0011 }, + { 0x0006, 0x0012 }, + { 0x0006, 0x0013 }, + { 0x0006, 0x0014 }, + { 0x0006, 0x0015 }, + { 0x0007, 0x0005 }, + { 0x0007, 0x0006 }, + { 0x0007, 0x0007 }, + { 0x0007, 0x0008 }, + { 0x0007, 0x0009 }, + { 0x0007, 0x000a }, + { 0x0007, 0x000b }, + { 0x0008, 0x0004 }, + { 0x0008, 0x0005 }, + { 0x0008, 0x0006 }, + { 0x0008, 0x0007 }, + { 0x0008, 0x0008 }, + { 0x0008, 0x0009 }, + { 0x0009, 0x0004 }, + { 0x0009, 0x0005 }, + { 0x0009, 0x0006 }, + { 0x0009, 0x0007 }, + { 0x000a, 0x0004 }, + { 0x000a, 0x0005 }, + { 0x000a, 0x0006 }, + { 0x000a, 0x0007 }, + { 0x000b, 0x0004 }, + { 0x000b, 0x0005 }, + { 0x000b, 0x0006 }, + { 0x000b, 0x0007 }, + { 0x000c, 0x0004 }, + { 0x000c, 0x0005 }, + { 0x000c, 0x0006 }, + { 0x000c, 0x0007 }, + { 0x000d, 0x0004 }, + { 0x000d, 0x0005 }, + { 0x000d, 0x0006 }, + { 0x000d, 0x0007 }, + { 0x000e, 0x0003 }, + { 0x000e, 0x0004 }, + { 0x000e, 0x0005 }, + { 0x000e, 0x0006 }, + { 0x000e, 0x0007 }, + { 0x000f, 0x0003 }, + { 0x000f, 0x0004 }, + { 0x0010, 0x0003 }, + { 0x000f, 0x0005 }, + { 0x0012, 0x0000 }, + { 0x0010, 0x0004 }, + { 0x0010, 0x0005 }, + { 0x0012, 0x0001 }, + { 0x0012, 0x0002 }, + { 0x0011, 0x0004 }, + { 0x0011, 0x0005 }, + { 0x0012, 0x0003 }, + { 0x0012, 0x0004 }, + { 0x0012, 0x0005 }, + { 0x0012, 0x0006 }, + { 0x0012, 0x0007 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec27[28][16] = { + { + 0x0010ffff, + 0x000cffff, + 0x000dffff, + 0x000effff, + 0x000fffff, + 0x0001ffff, + 0x0002ffff, + 0x0003ffff, + 0x0004ffff, + 0x0005ffff, + 0x0006ffff, + 0x0007ffff, + 0x0008ffff, + 0x0009ffff, + 0x000affff, + 0x000bffff, + }, + { + 0x00020023, + 0x00020023, + 0x00020023, + 0x00020023, + 0x00020024, + 0x00020024, + 0x00020024, + 0x00020024, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + }, + { + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + }, + { + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + }, + { + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + }, + { + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + }, + { + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + }, + { + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + }, + { + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + }, + { + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + }, + { + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + }, + { + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + }, + { + 0x00010028, + 0x00010028, + 0x00010029, + 0x00010029, + 0x0001002a, + 0x0001002a, + 0x0001002b, + 0x0001002b, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020016, + }, + { + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020019, + 0x00020019, + 0x00020019, + 0x00020019, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001a, + }, + { + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001e, + }, + { + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020022, + 0x00020022, + 0x00020022, + 0x00020022, + }, + { + 0x0014ffff, + 0x0013ffff, + 0x0011ffff, + 0x0012ffff, + 0x0000002c, + 0x0000002d, + 0x0000002e, + 0x0000002f, + 0x00000030, + 0x00000031, + 0x00010025, + 0x00010025, + 0x00010026, + 0x00010026, + 0x00010027, + 0x00010027, + }, + { + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + }, + { + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + }, + { + 0x00020036, + 0x00020036, + 0x00020036, + 0x00020036, + 0x00020037, + 0x00020037, + 0x00020037, + 0x00020037, + 0x00020038, + 0x00020038, + 0x00020038, + 0x00020038, + 0x00020039, + 0x00020039, + 0x00020039, + 0x00020039, + }, + { + 0x0017ffff, + 0x0018ffff, + 0x0015ffff, + 0x0016ffff, + 0x0000003e, + 0x0000003f, + 0x00000040, + 0x00000041, + 0x0001003a, + 0x0001003a, + 0x0001003b, + 0x0001003b, + 0x0001003c, + 0x0001003c, + 0x0001003d, + 0x0001003d, + }, + { + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + }, + { + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + }, + { + 0x001affff, + 0x001bffff, + 0x0019ffff, + 0x0000004d, + 0x00000050, + 0x00000051, + 0x0001004b, + 0x0001004b, + 0x0001004c, + 0x0001004c, + 0x0001004e, + 0x0001004e, + 0x00020046, + 0x00020046, + 0x00020046, + 0x00020046, + }, + { + 0x00020047, + 0x00020047, + 0x00020047, + 0x00020047, + 0x00020048, + 0x00020048, + 0x00020048, + 0x00020048, + 0x00020049, + 0x00020049, + 0x00020049, + 0x00020049, + 0x0002004a, + 0x0002004a, + 0x0002004a, + 0x0002004a, + }, + { + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + }, + { + 0x0002004f, + 0x0002004f, + 0x0002004f, + 0x0002004f, + 0x00020052, + 0x00020052, + 0x00020052, + 0x00020052, + 0x00020053, + 0x00020053, + 0x00020053, + 0x00020053, + 0x00020056, + 0x00020056, + 0x00020056, + 0x00020056, + }, + { + 0x00020057, + 0x00020057, + 0x00020057, + 0x00020057, + 0x00020058, + 0x00020058, + 0x00020058, + 0x00020058, + 0x00020059, + 0x00020059, + 0x00020059, + 0x00020059, + 0x0002005a, + 0x0002005a, + 0x0002005a, + 0x0002005a, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc28[109][2] = +#else +const uint16_t c_aauiCQMFHuffEnc28[109][2] = +#endif + { + { 0x0006, 0x0008 }, + { 0x0005, 0x0010 }, + { 0x0005, 0x0011 }, + { 0x0005, 0x0012 }, + { 0x0005, 0x0013 }, + { 0x0005, 0x0014 }, + { 0x0005, 0x0015 }, + { 0x0005, 0x0016 }, + { 0x0005, 0x0017 }, + { 0x0005, 0x0018 }, + { 0x0005, 0x0019 }, + { 0x0005, 0x001a }, + { 0x0005, 0x001b }, + { 0x0005, 0x001c }, + { 0x0005, 0x001d }, + { 0x0005, 0x001e }, + { 0x0006, 0x0009 }, + { 0x0005, 0x001f }, + { 0x0006, 0x000a }, + { 0x0006, 0x000b }, + { 0x0006, 0x000c }, + { 0x0006, 0x000d }, + { 0x0006, 0x000e }, + { 0x0006, 0x000f }, + { 0x0006, 0x0010 }, + { 0x0006, 0x0011 }, + { 0x0006, 0x0012 }, + { 0x0006, 0x0013 }, + { 0x0006, 0x0014 }, + { 0x0006, 0x0015 }, + { 0x0006, 0x0016 }, + { 0x0006, 0x0017 }, + { 0x0006, 0x0018 }, + { 0x0006, 0x0019 }, + { 0x0006, 0x001a }, + { 0x0006, 0x001b }, + { 0x0006, 0x001c }, + { 0x0006, 0x001d }, + { 0x0006, 0x001e }, + { 0x0006, 0x001f }, + { 0x0007, 0x0006 }, + { 0x0007, 0x0007 }, + { 0x0007, 0x0008 }, + { 0x0007, 0x0009 }, + { 0x0007, 0x000a }, + { 0x0007, 0x000b }, + { 0x0007, 0x000c }, + { 0x0007, 0x000d }, + { 0x0007, 0x000e }, + { 0x0007, 0x000f }, + { 0x0008, 0x0005 }, + { 0x0008, 0x0006 }, + { 0x0008, 0x0007 }, + { 0x0008, 0x0008 }, + { 0x0008, 0x0009 }, + { 0x0008, 0x000a }, + { 0x0008, 0x000b }, + { 0x0009, 0x0004 }, + { 0x0009, 0x0005 }, + { 0x0009, 0x0006 }, + { 0x0009, 0x0007 }, + { 0x0009, 0x0008 }, + { 0x0009, 0x0009 }, + { 0x000a, 0x0005 }, + { 0x000a, 0x0006 }, + { 0x000a, 0x0007 }, + { 0x000b, 0x0005 }, + { 0x000b, 0x0006 }, + { 0x000b, 0x0007 }, + { 0x000b, 0x0008 }, + { 0x000b, 0x0009 }, + { 0x000c, 0x0004 }, + { 0x000c, 0x0005 }, + { 0x000c, 0x0006 }, + { 0x000c, 0x0007 }, + { 0x000c, 0x0008 }, + { 0x000c, 0x0009 }, + { 0x000d, 0x0004 }, + { 0x000d, 0x0005 }, + { 0x000d, 0x0006 }, + { 0x000d, 0x0007 }, + { 0x000e, 0x0004 }, + { 0x000e, 0x0005 }, + { 0x000e, 0x0006 }, + { 0x000e, 0x0007 }, + { 0x0010, 0x0004 }, + { 0x000f, 0x0005 }, + { 0x0010, 0x0005 }, + { 0x000f, 0x0006 }, + { 0x000f, 0x0007 }, + { 0x0010, 0x0006 }, + { 0x0011, 0x0006 }, + { 0x0010, 0x0007 }, + { 0x0013, 0x0000 }, + { 0x0010, 0x0008 }, + { 0x0010, 0x0009 }, + { 0x0013, 0x0001 }, + { 0x0011, 0x0007 }, + { 0x0012, 0x0001 }, + { 0x0012, 0x0002 }, + { 0x0012, 0x0003 }, + { 0x0012, 0x0004 }, + { 0x0012, 0x0005 }, + { 0x0012, 0x0006 }, + { 0x0012, 0x0007 }, + { 0x0012, 0x0008 }, + { 0x0012, 0x0009 }, + { 0x0012, 0x000a }, + { 0x0012, 0x000b }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec28[30][16] = { + { + 0x000fffff, + 0x0010ffff, + 0x0009ffff, + 0x000affff, + 0x000bffff, + 0x000cffff, + 0x000dffff, + 0x000effff, + 0x0001ffff, + 0x0002ffff, + 0x0003ffff, + 0x0004ffff, + 0x0005ffff, + 0x0006ffff, + 0x0007ffff, + 0x0008ffff, + }, + { + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + }, + { + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + }, + { + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + }, + { + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + }, + { + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + }, + { + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + }, + { + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + }, + { + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + }, + { + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020013, + 0x00020013, + 0x00020013, + 0x00020013, + }, + { + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020017, + }, + { + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020019, + 0x00020019, + 0x00020019, + 0x00020019, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001b, + }, + { + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x0002001f, + }, + { + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020022, + 0x00020022, + 0x00020022, + 0x00020022, + 0x00020023, + 0x00020023, + 0x00020023, + 0x00020023, + }, + { + 0x00020024, + 0x00020024, + 0x00020024, + 0x00020024, + 0x00020025, + 0x00020025, + 0x00020025, + 0x00020025, + 0x00020026, + 0x00020026, + 0x00020026, + 0x00020026, + 0x00020027, + 0x00020027, + 0x00020027, + 0x00020027, + }, + { + 0x0015ffff, + 0x0014ffff, + 0x0011ffff, + 0x0012ffff, + 0x0013ffff, + 0x00000032, + 0x00000033, + 0x00000034, + 0x00000035, + 0x00000036, + 0x00000037, + 0x00000038, + 0x00010028, + 0x00010028, + 0x00010029, + 0x00010029, + }, + { + 0x0001002a, + 0x0001002a, + 0x0001002b, + 0x0001002b, + 0x0001002c, + 0x0001002c, + 0x0001002d, + 0x0001002d, + 0x0001002e, + 0x0001002e, + 0x0001002f, + 0x0001002f, + 0x00010030, + 0x00010030, + 0x00010031, + 0x00010031, + }, + { + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + }, + { + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + }, + { + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + }, + { + 0x00010045, + 0x00010045, + 0x00010046, + 0x00010046, + 0x0002003f, + 0x0002003f, + 0x0002003f, + 0x0002003f, + 0x00020040, + 0x00020040, + 0x00020040, + 0x00020040, + 0x00020041, + 0x00020041, + 0x00020041, + 0x00020041, + }, + { + 0x0019ffff, + 0x0018ffff, + 0x0016ffff, + 0x0017ffff, + 0x00000047, + 0x00000048, + 0x00000049, + 0x0000004a, + 0x0000004b, + 0x0000004c, + 0x00010042, + 0x00010042, + 0x00010043, + 0x00010043, + 0x00010044, + 0x00010044, + }, + { + 0x0003004d, + 0x0003004d, + 0x0003004d, + 0x0003004d, + 0x0003004d, + 0x0003004d, + 0x0003004d, + 0x0003004d, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + }, + { + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030050, + }, + { + 0x00020051, + 0x00020051, + 0x00020051, + 0x00020051, + 0x00020052, + 0x00020052, + 0x00020052, + 0x00020052, + 0x00020053, + 0x00020053, + 0x00020053, + 0x00020053, + 0x00020054, + 0x00020054, + 0x00020054, + 0x00020054, + }, + { + 0x001bffff, + 0x001cffff, + 0x001dffff, + 0x001affff, + 0x00000055, + 0x00000057, + 0x0000005a, + 0x0000005c, + 0x0000005e, + 0x0000005f, + 0x00010056, + 0x00010056, + 0x00010058, + 0x00010058, + 0x00010059, + 0x00010059, + }, + { + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x00030061, + 0x00030061, + 0x00030061, + 0x00030061, + 0x00030061, + 0x00030061, + 0x00030061, + 0x00030061, + }, + { + 0x0001005d, + 0x0001005d, + 0x00010060, + 0x00010060, + 0x00020062, + 0x00020062, + 0x00020062, + 0x00020062, + 0x00020063, + 0x00020063, + 0x00020063, + 0x00020063, + 0x00020064, + 0x00020064, + 0x00020064, + 0x00020064, + }, + { + 0x00020065, + 0x00020065, + 0x00020065, + 0x00020065, + 0x00020066, + 0x00020066, + 0x00020066, + 0x00020066, + 0x00020067, + 0x00020067, + 0x00020067, + 0x00020067, + 0x00020068, + 0x00020068, + 0x00020068, + 0x00020068, + }, + { + 0x00020069, + 0x00020069, + 0x00020069, + 0x00020069, + 0x0002006a, + 0x0002006a, + 0x0002006a, + 0x0002006a, + 0x0002006b, + 0x0002006b, + 0x0002006b, + 0x0002006b, + 0x0002006c, + 0x0002006c, + 0x0002006c, + 0x0002006c, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc29[129][2] = +#else +const uint16_t c_aauiCQMFHuffEnc29[129][2] = +#endif + { + { 0x0006, 0x0009 }, + { 0x0005, 0x0019 }, + { 0x0006, 0x000a }, + { 0x0005, 0x001a }, + { 0x0005, 0x001b }, + { 0x0005, 0x001c }, + { 0x0006, 0x000b }, + { 0x0005, 0x001d }, + { 0x0005, 0x001e }, + { 0x0006, 0x000c }, + { 0x0006, 0x000d }, + { 0x0005, 0x001f }, + { 0x0006, 0x000e }, + { 0x0006, 0x000f }, + { 0x0006, 0x0010 }, + { 0x0006, 0x0011 }, + { 0x0006, 0x0012 }, + { 0x0006, 0x0013 }, + { 0x0006, 0x0014 }, + { 0x0006, 0x0015 }, + { 0x0006, 0x0016 }, + { 0x0006, 0x0017 }, + { 0x0006, 0x0018 }, + { 0x0006, 0x0019 }, + { 0x0006, 0x001a }, + { 0x0006, 0x001b }, + { 0x0006, 0x001c }, + { 0x0006, 0x001d }, + { 0x0006, 0x001e }, + { 0x0006, 0x001f }, + { 0x0006, 0x0020 }, + { 0x0006, 0x0021 }, + { 0x0006, 0x0022 }, + { 0x0006, 0x0023 }, + { 0x0006, 0x0024 }, + { 0x0006, 0x0025 }, + { 0x0006, 0x0026 }, + { 0x0006, 0x0027 }, + { 0x0006, 0x0028 }, + { 0x0006, 0x0029 }, + { 0x0006, 0x002a }, + { 0x0006, 0x002b }, + { 0x0006, 0x002c }, + { 0x0006, 0x002d }, + { 0x0006, 0x002e }, + { 0x0006, 0x002f }, + { 0x0006, 0x0030 }, + { 0x0006, 0x0031 }, + { 0x0007, 0x0007 }, + { 0x0007, 0x0008 }, + { 0x0007, 0x0009 }, + { 0x0007, 0x000a }, + { 0x0007, 0x000b }, + { 0x0007, 0x000c }, + { 0x0007, 0x000d }, + { 0x0007, 0x000e }, + { 0x0007, 0x000f }, + { 0x0007, 0x0010 }, + { 0x0007, 0x0011 }, + { 0x0008, 0x0006 }, + { 0x0008, 0x0007 }, + { 0x0008, 0x0008 }, + { 0x0008, 0x0009 }, + { 0x0008, 0x000a }, + { 0x0008, 0x000b }, + { 0x0008, 0x000c }, + { 0x0008, 0x000d }, + { 0x0009, 0x0006 }, + { 0x0009, 0x0007 }, + { 0x0009, 0x0008 }, + { 0x0009, 0x0009 }, + { 0x0009, 0x000a }, + { 0x0009, 0x000b }, + { 0x000a, 0x0005 }, + { 0x000a, 0x0006 }, + { 0x000a, 0x0007 }, + { 0x000a, 0x0008 }, + { 0x000a, 0x0009 }, + { 0x000a, 0x000a }, + { 0x000a, 0x000b }, + { 0x000b, 0x0006 }, + { 0x000b, 0x0007 }, + { 0x000b, 0x0008 }, + { 0x000b, 0x0009 }, + { 0x000c, 0x0006 }, + { 0x000c, 0x0007 }, + { 0x000c, 0x0008 }, + { 0x000c, 0x0009 }, + { 0x000c, 0x000a }, + { 0x000c, 0x000b }, + { 0x000d, 0x0005 }, + { 0x000d, 0x0006 }, + { 0x000d, 0x0007 }, + { 0x000d, 0x0008 }, + { 0x000d, 0x0009 }, + { 0x000d, 0x000a }, + { 0x000d, 0x000b }, + { 0x000e, 0x0006 }, + { 0x000e, 0x0007 }, + { 0x000e, 0x0008 }, + { 0x000e, 0x0009 }, + { 0x000f, 0x0004 }, + { 0x000f, 0x0005 }, + { 0x000f, 0x0006 }, + { 0x000f, 0x0007 }, + { 0x0011, 0x0007 }, + { 0x000f, 0x0008 }, + { 0x0012, 0x0000 }, + { 0x000f, 0x0009 }, + { 0x0010, 0x0005 }, + { 0x000f, 0x000a }, + { 0x000f, 0x000b }, + { 0x0012, 0x0001 }, + { 0x0010, 0x0006 }, + { 0x0010, 0x0007 }, + { 0x0012, 0x0002 }, + { 0x0012, 0x0003 }, + { 0x0012, 0x0004 }, + { 0x0012, 0x0005 }, + { 0x0012, 0x0006 }, + { 0x0012, 0x0007 }, + { 0x0012, 0x0008 }, + { 0x0011, 0x0008 }, + { 0x0012, 0x0009 }, + { 0x0012, 0x000a }, + { 0x0012, 0x000b }, + { 0x0012, 0x000c }, + { 0x0012, 0x000d }, + { 0x0011, 0x0009 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec29[34][16] = { + { + 0x000fffff, + 0x0010ffff, + 0x0005ffff, + 0x0006ffff, + 0x0007ffff, + 0x0008ffff, + 0x0009ffff, + 0x000affff, + 0x000bffff, + 0x000cffff, + 0x000dffff, + 0x000effff, + 0x0001ffff, + 0x0002ffff, + 0x0003ffff, + 0x0004ffff, + }, + { + 0x0002002e, + 0x0002002e, + 0x0002002e, + 0x0002002e, + 0x0002002f, + 0x0002002f, + 0x0002002f, + 0x0002002f, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + 0x00030001, + }, + { + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + }, + { + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + }, + { + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + }, + { + 0x00010039, + 0x00010039, + 0x0001003a, + 0x0001003a, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020006, + 0x00020006, + 0x00020006, + 0x00020006, + }, + { + 0x00020009, + 0x00020009, + 0x00020009, + 0x00020009, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000d, + }, + { + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020011, + }, + { + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020013, + 0x00020013, + 0x00020013, + 0x00020013, + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020015, + }, + { + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020019, + 0x00020019, + 0x00020019, + 0x00020019, + }, + { + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x0002001d, + }, + { + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020021, + }, + { + 0x00020022, + 0x00020022, + 0x00020022, + 0x00020022, + 0x00020023, + 0x00020023, + 0x00020023, + 0x00020023, + 0x00020024, + 0x00020024, + 0x00020024, + 0x00020024, + 0x00020025, + 0x00020025, + 0x00020025, + 0x00020025, + }, + { + 0x00020026, + 0x00020026, + 0x00020026, + 0x00020026, + 0x00020027, + 0x00020027, + 0x00020027, + 0x00020027, + 0x00020028, + 0x00020028, + 0x00020028, + 0x00020028, + 0x00020029, + 0x00020029, + 0x00020029, + 0x00020029, + }, + { + 0x0002002a, + 0x0002002a, + 0x0002002a, + 0x0002002a, + 0x0002002b, + 0x0002002b, + 0x0002002b, + 0x0002002b, + 0x0002002c, + 0x0002002c, + 0x0002002c, + 0x0002002c, + 0x0002002d, + 0x0002002d, + 0x0002002d, + 0x0002002d, + }, + { + 0x0016ffff, + 0x0014ffff, + 0x0015ffff, + 0x0011ffff, + 0x0012ffff, + 0x0013ffff, + 0x0000003b, + 0x0000003c, + 0x0000003d, + 0x0000003e, + 0x0000003f, + 0x00000040, + 0x00000041, + 0x00000042, + 0x00010030, + 0x00010030, + }, + { + 0x00010031, + 0x00010031, + 0x00010032, + 0x00010032, + 0x00010033, + 0x00010033, + 0x00010034, + 0x00010034, + 0x00010035, + 0x00010035, + 0x00010036, + 0x00010036, + 0x00010037, + 0x00010037, + 0x00010038, + 0x00010038, + }, + { + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + }, + { + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + }, + { + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + }, + { + 0x00010052, + 0x00010052, + 0x00010053, + 0x00010053, + 0x00020049, + 0x00020049, + 0x00020049, + 0x00020049, + 0x0002004a, + 0x0002004a, + 0x0002004a, + 0x0002004a, + 0x0002004b, + 0x0002004b, + 0x0002004b, + 0x0002004b, + }, + { + 0x0002004c, + 0x0002004c, + 0x0002004c, + 0x0002004c, + 0x0002004d, + 0x0002004d, + 0x0002004d, + 0x0002004d, + 0x0002004e, + 0x0002004e, + 0x0002004e, + 0x0002004e, + 0x0002004f, + 0x0002004f, + 0x0002004f, + 0x0002004f, + }, + { + 0x001cffff, + 0x001bffff, + 0x0017ffff, + 0x0018ffff, + 0x0019ffff, + 0x001affff, + 0x00000054, + 0x00000055, + 0x00000056, + 0x00000057, + 0x00000058, + 0x00000059, + 0x00010050, + 0x00010050, + 0x00010051, + 0x00010051, + }, + { + 0x00020063, + 0x00020063, + 0x00020063, + 0x00020063, + 0x00020064, + 0x00020064, + 0x00020064, + 0x00020064, + 0x0003005a, + 0x0003005a, + 0x0003005a, + 0x0003005a, + 0x0003005a, + 0x0003005a, + 0x0003005a, + 0x0003005a, + }, + { + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005c, + 0x0003005c, + 0x0003005c, + 0x0003005c, + 0x0003005c, + 0x0003005c, + 0x0003005c, + 0x0003005c, + }, + { + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005e, + 0x0003005e, + 0x0003005e, + 0x0003005e, + 0x0003005e, + 0x0003005e, + 0x0003005e, + 0x0003005e, + }, + { + 0x0003005f, + 0x0003005f, + 0x0003005f, + 0x0003005f, + 0x0003005f, + 0x0003005f, + 0x0003005f, + 0x0003005f, + 0x00030060, + 0x00030060, + 0x00030060, + 0x00030060, + 0x00030060, + 0x00030060, + 0x00030060, + 0x00030060, + }, + { + 0x0001006a, + 0x0001006a, + 0x0001006c, + 0x0001006c, + 0x0001006e, + 0x0001006e, + 0x0001006f, + 0x0001006f, + 0x00020061, + 0x00020061, + 0x00020061, + 0x00020061, + 0x00020062, + 0x00020062, + 0x00020062, + 0x00020062, + }, + { + 0x001fffff, + 0x0020ffff, + 0x0021ffff, + 0x001dffff, + 0x001effff, + 0x0000006d, + 0x00000071, + 0x00000072, + 0x00010065, + 0x00010065, + 0x00010066, + 0x00010066, + 0x00010067, + 0x00010067, + 0x00010068, + 0x00010068, + }, + { + 0x0002007e, + 0x0002007e, + 0x0002007e, + 0x0002007e, + 0x0002007f, + 0x0002007f, + 0x0002007f, + 0x0002007f, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + }, + { + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x00030080, + 0x00030080, + 0x00030080, + 0x00030080, + 0x00030080, + 0x00030080, + 0x00030080, + 0x00030080, + }, + { + 0x0002006b, + 0x0002006b, + 0x0002006b, + 0x0002006b, + 0x00020070, + 0x00020070, + 0x00020070, + 0x00020070, + 0x00020073, + 0x00020073, + 0x00020073, + 0x00020073, + 0x00020074, + 0x00020074, + 0x00020074, + 0x00020074, + }, + { + 0x00020075, + 0x00020075, + 0x00020075, + 0x00020075, + 0x00020076, + 0x00020076, + 0x00020076, + 0x00020076, + 0x00020077, + 0x00020077, + 0x00020077, + 0x00020077, + 0x00020078, + 0x00020078, + 0x00020078, + 0x00020078, + }, + { + 0x00020079, + 0x00020079, + 0x00020079, + 0x00020079, + 0x0002007b, + 0x0002007b, + 0x0002007b, + 0x0002007b, + 0x0002007c, + 0x0002007c, + 0x0002007c, + 0x0002007c, + 0x0002007d, + 0x0002007d, + 0x0002007d, + 0x0002007d, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc30[153][2] = +#else +const uint16_t c_aauiCQMFHuffEnc30[153][2] = +#endif + { + { 0x0007, 0x0009 }, + { 0x0006, 0x000e }, + { 0x0006, 0x000f }, + { 0x0006, 0x0010 }, + { 0x0006, 0x0011 }, + { 0x0006, 0x0012 }, + { 0x0006, 0x0013 }, + { 0x0006, 0x0014 }, + { 0x0006, 0x0015 }, + { 0x0006, 0x0016 }, + { 0x0006, 0x0017 }, + { 0x0006, 0x0018 }, + { 0x0006, 0x0019 }, + { 0x0006, 0x001a }, + { 0x0006, 0x001b }, + { 0x0006, 0x001c }, + { 0x0006, 0x001d }, + { 0x0006, 0x001e }, + { 0x0006, 0x001f }, + { 0x0006, 0x0020 }, + { 0x0006, 0x0021 }, + { 0x0006, 0x0022 }, + { 0x0006, 0x0023 }, + { 0x0006, 0x0024 }, + { 0x0006, 0x0025 }, + { 0x0006, 0x0026 }, + { 0x0006, 0x0027 }, + { 0x0006, 0x0028 }, + { 0x0006, 0x0029 }, + { 0x0006, 0x002a }, + { 0x0006, 0x002b }, + { 0x0006, 0x002c }, + { 0x0006, 0x002d }, + { 0x0006, 0x002e }, + { 0x0006, 0x002f }, + { 0x0006, 0x0030 }, + { 0x0006, 0x0031 }, + { 0x0006, 0x0032 }, + { 0x0006, 0x0033 }, + { 0x0006, 0x0034 }, + { 0x0006, 0x0035 }, + { 0x0006, 0x0036 }, + { 0x0006, 0x0037 }, + { 0x0006, 0x0038 }, + { 0x0006, 0x0039 }, + { 0x0006, 0x003a }, + { 0x0006, 0x003b }, + { 0x0006, 0x003c }, + { 0x0006, 0x003d }, + { 0x0006, 0x003e }, + { 0x0006, 0x003f }, + { 0x0007, 0x000a }, + { 0x0007, 0x000b }, + { 0x0007, 0x000c }, + { 0x0007, 0x000d }, + { 0x0007, 0x000e }, + { 0x0007, 0x000f }, + { 0x0007, 0x0010 }, + { 0x0007, 0x0011 }, + { 0x0007, 0x0012 }, + { 0x0007, 0x0013 }, + { 0x0007, 0x0014 }, + { 0x0007, 0x0015 }, + { 0x0007, 0x0016 }, + { 0x0007, 0x0017 }, + { 0x0007, 0x0018 }, + { 0x0007, 0x0019 }, + { 0x0007, 0x001a }, + { 0x0007, 0x001b }, + { 0x0008, 0x0008 }, + { 0x0008, 0x0009 }, + { 0x0008, 0x000a }, + { 0x0008, 0x000b }, + { 0x0008, 0x000c }, + { 0x0008, 0x000d }, + { 0x0008, 0x000e }, + { 0x0008, 0x000f }, + { 0x0008, 0x0010 }, + { 0x0008, 0x0011 }, + { 0x0009, 0x0007 }, + { 0x0009, 0x0008 }, + { 0x0009, 0x0009 }, + { 0x0009, 0x000a }, + { 0x0009, 0x000b }, + { 0x0009, 0x000c }, + { 0x0009, 0x000d }, + { 0x0009, 0x000e }, + { 0x000a, 0x0008 }, + { 0x0009, 0x000f }, + { 0x000a, 0x0009 }, + { 0x000a, 0x000a }, + { 0x000a, 0x000b }, + { 0x000a, 0x000c }, + { 0x000a, 0x000d }, + { 0x000b, 0x0007 }, + { 0x000b, 0x0008 }, + { 0x000b, 0x0009 }, + { 0x000b, 0x000a }, + { 0x000b, 0x000b }, + { 0x000b, 0x000c }, + { 0x000b, 0x000d }, + { 0x000c, 0x0008 }, + { 0x000b, 0x000e }, + { 0x000b, 0x000f }, + { 0x000c, 0x0009 }, + { 0x000c, 0x000a }, + { 0x000d, 0x0008 }, + { 0x000c, 0x000b }, + { 0x000c, 0x000c }, + { 0x000d, 0x0009 }, + { 0x000c, 0x000d }, + { 0x000d, 0x000a }, + { 0x000d, 0x000b }, + { 0x000d, 0x000c }, + { 0x000d, 0x000d }, + { 0x000e, 0x0008 }, + { 0x000d, 0x000e }, + { 0x000d, 0x000f }, + { 0x000e, 0x0009 }, + { 0x000e, 0x000a }, + { 0x000e, 0x000b }, + { 0x000e, 0x000c }, + { 0x000f, 0x0006 }, + { 0x000f, 0x0007 }, + { 0x000f, 0x0008 }, + { 0x0010, 0x0006 }, + { 0x000e, 0x000d }, + { 0x000e, 0x000e }, + { 0x000e, 0x000f }, + { 0x0010, 0x0007 }, + { 0x000f, 0x0009 }, + { 0x0010, 0x0008 }, + { 0x000f, 0x000a }, + { 0x000f, 0x000b }, + { 0x000f, 0x000c }, + { 0x000f, 0x000d }, + { 0x0010, 0x0009 }, + { 0x0011, 0x0000 }, + { 0x0011, 0x0001 }, + { 0x0011, 0x0002 }, + { 0x000f, 0x000e }, + { 0x0010, 0x000a }, + { 0x0011, 0x0003 }, + { 0x0011, 0x0004 }, + { 0x0011, 0x0005 }, + { 0x000f, 0x000f }, + { 0x0011, 0x0006 }, + { 0x0011, 0x0007 }, + { 0x0011, 0x0008 }, + { 0x0011, 0x0009 }, + { 0x0011, 0x000a }, + { 0x0011, 0x000b }, + { 0x0010, 0x000b }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec30[39][16] = { + { + 0x0010ffff, + 0x000effff, + 0x000fffff, + 0x0001ffff, + 0x0002ffff, + 0x0003ffff, + 0x0004ffff, + 0x0005ffff, + 0x0006ffff, + 0x0007ffff, + 0x0008ffff, + 0x0009ffff, + 0x000affff, + 0x000bffff, + 0x000cffff, + 0x000dffff, + }, + { + 0x00010041, + 0x00010041, + 0x00010042, + 0x00010042, + 0x00010043, + 0x00010043, + 0x00010044, + 0x00010044, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + }, + { + 0x00020003, + 0x00020003, + 0x00020003, + 0x00020003, + 0x00020004, + 0x00020004, + 0x00020004, + 0x00020004, + 0x00020005, + 0x00020005, + 0x00020005, + 0x00020005, + 0x00020006, + 0x00020006, + 0x00020006, + 0x00020006, + }, + { + 0x00020007, + 0x00020007, + 0x00020007, + 0x00020007, + 0x00020008, + 0x00020008, + 0x00020008, + 0x00020008, + 0x00020009, + 0x00020009, + 0x00020009, + 0x00020009, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000a, + }, + { + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000e, + }, + { + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020012, + }, + { + 0x00020013, + 0x00020013, + 0x00020013, + 0x00020013, + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020016, + }, + { + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020019, + 0x00020019, + 0x00020019, + 0x00020019, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001a, + }, + { + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001e, + }, + { + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020022, + 0x00020022, + 0x00020022, + 0x00020022, + }, + { + 0x00020023, + 0x00020023, + 0x00020023, + 0x00020023, + 0x00020024, + 0x00020024, + 0x00020024, + 0x00020024, + 0x00020025, + 0x00020025, + 0x00020025, + 0x00020025, + 0x00020026, + 0x00020026, + 0x00020026, + 0x00020026, + }, + { + 0x00020027, + 0x00020027, + 0x00020027, + 0x00020027, + 0x00020028, + 0x00020028, + 0x00020028, + 0x00020028, + 0x00020029, + 0x00020029, + 0x00020029, + 0x00020029, + 0x0002002a, + 0x0002002a, + 0x0002002a, + 0x0002002a, + }, + { + 0x0002002b, + 0x0002002b, + 0x0002002b, + 0x0002002b, + 0x0002002c, + 0x0002002c, + 0x0002002c, + 0x0002002c, + 0x0002002d, + 0x0002002d, + 0x0002002d, + 0x0002002d, + 0x0002002e, + 0x0002002e, + 0x0002002e, + 0x0002002e, + }, + { + 0x0002002f, + 0x0002002f, + 0x0002002f, + 0x0002002f, + 0x00020030, + 0x00020030, + 0x00020030, + 0x00020030, + 0x00020031, + 0x00020031, + 0x00020031, + 0x00020031, + 0x00020032, + 0x00020032, + 0x00020032, + 0x00020032, + }, + { + 0x0000004d, + 0x0000004e, + 0x00010000, + 0x00010000, + 0x00010033, + 0x00010033, + 0x00010034, + 0x00010034, + 0x00010035, + 0x00010035, + 0x00010036, + 0x00010036, + 0x00010037, + 0x00010037, + 0x00010038, + 0x00010038, + }, + { + 0x00010039, + 0x00010039, + 0x0001003a, + 0x0001003a, + 0x0001003b, + 0x0001003b, + 0x0001003c, + 0x0001003c, + 0x0001003d, + 0x0001003d, + 0x0001003e, + 0x0001003e, + 0x0001003f, + 0x0001003f, + 0x00010040, + 0x00010040, + }, + { + 0x0017ffff, + 0x0018ffff, + 0x0016ffff, + 0x0011ffff, + 0x0012ffff, + 0x0013ffff, + 0x0014ffff, + 0x0015ffff, + 0x00000045, + 0x00000046, + 0x00000047, + 0x00000048, + 0x00000049, + 0x0000004a, + 0x0000004b, + 0x0000004c, + }, + { + 0x0002005c, + 0x0002005c, + 0x0002005c, + 0x0002005c, + 0x0002005d, + 0x0002005d, + 0x0002005d, + 0x0002005d, + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x0003004f, + }, + { + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + }, + { + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + }, + { + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + }, + { + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + }, + { + 0x00020057, + 0x00020057, + 0x00020057, + 0x00020057, + 0x00020059, + 0x00020059, + 0x00020059, + 0x00020059, + 0x0002005a, + 0x0002005a, + 0x0002005a, + 0x0002005a, + 0x0002005b, + 0x0002005b, + 0x0002005b, + 0x0002005b, + }, + { + 0x001fffff, + 0x0020ffff, + 0x001dffff, + 0x001effff, + 0x0019ffff, + 0x001affff, + 0x001bffff, + 0x001cffff, + 0x00000065, + 0x00000068, + 0x00000069, + 0x0000006b, + 0x0000006c, + 0x0000006e, + 0x0001005e, + 0x0001005e, + }, + { + 0x0001005f, + 0x0001005f, + 0x00010060, + 0x00010060, + 0x00010061, + 0x00010061, + 0x00010062, + 0x00010062, + 0x00010063, + 0x00010063, + 0x00010064, + 0x00010064, + 0x00010066, + 0x00010066, + 0x00010067, + 0x00010067, + }, + { + 0x0003006a, + 0x0003006a, + 0x0003006a, + 0x0003006a, + 0x0003006a, + 0x0003006a, + 0x0003006a, + 0x0003006a, + 0x0003006d, + 0x0003006d, + 0x0003006d, + 0x0003006d, + 0x0003006d, + 0x0003006d, + 0x0003006d, + 0x0003006d, + }, + { + 0x0003006f, + 0x0003006f, + 0x0003006f, + 0x0003006f, + 0x0003006f, + 0x0003006f, + 0x0003006f, + 0x0003006f, + 0x00030070, + 0x00030070, + 0x00030070, + 0x00030070, + 0x00030070, + 0x00030070, + 0x00030070, + 0x00030070, + }, + { + 0x00030071, + 0x00030071, + 0x00030071, + 0x00030071, + 0x00030071, + 0x00030071, + 0x00030071, + 0x00030071, + 0x00030072, + 0x00030072, + 0x00030072, + 0x00030072, + 0x00030072, + 0x00030072, + 0x00030072, + 0x00030072, + }, + { + 0x00030074, + 0x00030074, + 0x00030074, + 0x00030074, + 0x00030074, + 0x00030074, + 0x00030074, + 0x00030074, + 0x00030075, + 0x00030075, + 0x00030075, + 0x00030075, + 0x00030075, + 0x00030075, + 0x00030075, + 0x00030075, + }, + { + 0x00020073, + 0x00020073, + 0x00020073, + 0x00020073, + 0x00020076, + 0x00020076, + 0x00020076, + 0x00020076, + 0x00020077, + 0x00020077, + 0x00020077, + 0x00020077, + 0x00020078, + 0x00020078, + 0x00020078, + 0x00020078, + }, + { + 0x00020079, + 0x00020079, + 0x00020079, + 0x00020079, + 0x0002007e, + 0x0002007e, + 0x0002007e, + 0x0002007e, + 0x0002007f, + 0x0002007f, + 0x0002007f, + 0x0002007f, + 0x00020080, + 0x00020080, + 0x00020080, + 0x00020080, + }, + { + 0x0021ffff, + 0x0022ffff, + 0x0023ffff, + 0x0024ffff, + 0x0025ffff, + 0x0026ffff, + 0x0000007d, + 0x00000081, + 0x00000083, + 0x00000088, + 0x0000008d, + 0x00000098, + 0x0001007a, + 0x0001007a, + 0x0001007b, + 0x0001007b, + }, + { + 0x0001007c, + 0x0001007c, + 0x00010082, + 0x00010082, + 0x00010084, + 0x00010084, + 0x00010085, + 0x00010085, + 0x00010086, + 0x00010086, + 0x00010087, + 0x00010087, + 0x0001008c, + 0x0001008c, + 0x00010091, + 0x00010091, + }, + { + 0x00030089, + 0x00030089, + 0x00030089, + 0x00030089, + 0x00030089, + 0x00030089, + 0x00030089, + 0x00030089, + 0x0003008a, + 0x0003008a, + 0x0003008a, + 0x0003008a, + 0x0003008a, + 0x0003008a, + 0x0003008a, + 0x0003008a, + }, + { + 0x0003008b, + 0x0003008b, + 0x0003008b, + 0x0003008b, + 0x0003008b, + 0x0003008b, + 0x0003008b, + 0x0003008b, + 0x0003008e, + 0x0003008e, + 0x0003008e, + 0x0003008e, + 0x0003008e, + 0x0003008e, + 0x0003008e, + 0x0003008e, + }, + { + 0x0003008f, + 0x0003008f, + 0x0003008f, + 0x0003008f, + 0x0003008f, + 0x0003008f, + 0x0003008f, + 0x0003008f, + 0x00030090, + 0x00030090, + 0x00030090, + 0x00030090, + 0x00030090, + 0x00030090, + 0x00030090, + 0x00030090, + }, + { + 0x00030092, + 0x00030092, + 0x00030092, + 0x00030092, + 0x00030092, + 0x00030092, + 0x00030092, + 0x00030092, + 0x00030093, + 0x00030093, + 0x00030093, + 0x00030093, + 0x00030093, + 0x00030093, + 0x00030093, + 0x00030093, + }, + { + 0x00030094, + 0x00030094, + 0x00030094, + 0x00030094, + 0x00030094, + 0x00030094, + 0x00030094, + 0x00030094, + 0x00030095, + 0x00030095, + 0x00030095, + 0x00030095, + 0x00030095, + 0x00030095, + 0x00030095, + 0x00030095, + }, + { + 0x00030096, + 0x00030096, + 0x00030096, + 0x00030096, + 0x00030096, + 0x00030096, + 0x00030096, + 0x00030096, + 0x00030097, + 0x00030097, + 0x00030097, + 0x00030097, + 0x00030097, + 0x00030097, + 0x00030097, + 0x00030097, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc31[181][2] = +#else +const uint16_t c_aauiCQMFHuffEnc31[181][2] = +#endif + { + { 0x0007, 0x000b }, + { 0x0006, 0x0015 }, + { 0x0006, 0x0016 }, + { 0x0006, 0x0017 }, + { 0x0006, 0x0018 }, + { 0x0006, 0x0019 }, + { 0x0006, 0x001a }, + { 0x0006, 0x001b }, + { 0x0006, 0x001c }, + { 0x0006, 0x001d }, + { 0x0006, 0x001e }, + { 0x0006, 0x001f }, + { 0x0006, 0x0020 }, + { 0x0006, 0x0021 }, + { 0x0006, 0x0022 }, + { 0x0006, 0x0023 }, + { 0x0006, 0x0024 }, + { 0x0006, 0x0025 }, + { 0x0006, 0x0026 }, + { 0x0006, 0x0027 }, + { 0x0006, 0x0028 }, + { 0x0006, 0x0029 }, + { 0x0006, 0x002a }, + { 0x0006, 0x002b }, + { 0x0006, 0x002c }, + { 0x0006, 0x002d }, + { 0x0006, 0x002e }, + { 0x0006, 0x002f }, + { 0x0006, 0x0030 }, + { 0x0006, 0x0031 }, + { 0x0006, 0x0032 }, + { 0x0006, 0x0033 }, + { 0x0006, 0x0034 }, + { 0x0006, 0x0035 }, + { 0x0006, 0x0036 }, + { 0x0006, 0x0037 }, + { 0x0006, 0x0038 }, + { 0x0006, 0x0039 }, + { 0x0006, 0x003a }, + { 0x0006, 0x003b }, + { 0x0006, 0x003c }, + { 0x0006, 0x003d }, + { 0x0006, 0x003e }, + { 0x0007, 0x000c }, + { 0x0006, 0x003f }, + { 0x0007, 0x000d }, + { 0x0007, 0x000e }, + { 0x0007, 0x000f }, + { 0x0007, 0x0010 }, + { 0x0007, 0x0011 }, + { 0x0007, 0x0012 }, + { 0x0007, 0x0013 }, + { 0x0007, 0x0014 }, + { 0x0007, 0x0015 }, + { 0x0007, 0x0016 }, + { 0x0007, 0x0017 }, + { 0x0007, 0x0018 }, + { 0x0007, 0x0019 }, + { 0x0007, 0x001a }, + { 0x0007, 0x001b }, + { 0x0007, 0x001c }, + { 0x0007, 0x001d }, + { 0x0007, 0x001e }, + { 0x0007, 0x001f }, + { 0x0007, 0x0020 }, + { 0x0007, 0x0021 }, + { 0x0007, 0x0022 }, + { 0x0007, 0x0023 }, + { 0x0007, 0x0024 }, + { 0x0007, 0x0025 }, + { 0x0007, 0x0026 }, + { 0x0007, 0x0027 }, + { 0x0007, 0x0028 }, + { 0x0007, 0x0029 }, + { 0x0008, 0x0009 }, + { 0x0008, 0x000a }, + { 0x0008, 0x000b }, + { 0x0008, 0x000c }, + { 0x0008, 0x000d }, + { 0x0008, 0x000e }, + { 0x0008, 0x000f }, + { 0x0008, 0x0010 }, + { 0x0008, 0x0011 }, + { 0x0008, 0x0012 }, + { 0x0008, 0x0013 }, + { 0x0008, 0x0014 }, + { 0x0008, 0x0015 }, + { 0x0009, 0x0008 }, + { 0x0009, 0x0009 }, + { 0x0009, 0x000a }, + { 0x0009, 0x000b }, + { 0x0009, 0x000c }, + { 0x0009, 0x000d }, + { 0x0009, 0x000e }, + { 0x0009, 0x000f }, + { 0x0009, 0x0010 }, + { 0x0009, 0x0011 }, + { 0x000a, 0x0008 }, + { 0x000a, 0x0009 }, + { 0x000a, 0x000a }, + { 0x000a, 0x000b }, + { 0x000a, 0x000c }, + { 0x000a, 0x000d }, + { 0x000a, 0x000e }, + { 0x000a, 0x000f }, + { 0x000b, 0x0008 }, + { 0x000b, 0x0009 }, + { 0x000b, 0x000a }, + { 0x000b, 0x000b }, + { 0x000b, 0x000c }, + { 0x000b, 0x000d }, + { 0x000b, 0x000e }, + { 0x000c, 0x0008 }, + { 0x000c, 0x0009 }, + { 0x000b, 0x000f }, + { 0x000c, 0x000a }, + { 0x000c, 0x000b }, + { 0x000c, 0x000c }, + { 0x000c, 0x000d }, + { 0x000d, 0x0008 }, + { 0x000c, 0x000e }, + { 0x000d, 0x0009 }, + { 0x000d, 0x000a }, + { 0x000c, 0x000f }, + { 0x000d, 0x000b }, + { 0x000d, 0x000c }, + { 0x000d, 0x000d }, + { 0x000d, 0x000e }, + { 0x000d, 0x000f }, + { 0x000e, 0x0008 }, + { 0x000e, 0x0009 }, + { 0x000e, 0x000a }, + { 0x000e, 0x000b }, + { 0x000e, 0x000c }, + { 0x000e, 0x000d }, + { 0x000e, 0x000e }, + { 0x000e, 0x000f }, + { 0x000f, 0x0009 }, + { 0x000f, 0x000a }, + { 0x000f, 0x000b }, + { 0x000f, 0x000c }, + { 0x0010, 0x0009 }, + { 0x000f, 0x000d }, + { 0x000f, 0x000e }, + { 0x0010, 0x000a }, + { 0x0010, 0x000b }, + { 0x0010, 0x000c }, + { 0x0010, 0x000d }, + { 0x0011, 0x000a }, + { 0x0010, 0x000e }, + { 0x000f, 0x000f }, + { 0x0010, 0x000f }, + { 0x0012, 0x0000 }, + { 0x0012, 0x0001 }, + { 0x0011, 0x000b }, + { 0x0011, 0x000c }, + { 0x0010, 0x0010 }, + { 0x0012, 0x0002 }, + { 0x0012, 0x0003 }, + { 0x0011, 0x000d }, + { 0x0011, 0x000e }, + { 0x0011, 0x000f }, + { 0x0011, 0x0010 }, + { 0x0011, 0x0011 }, + { 0x0010, 0x0011 }, + { 0x0012, 0x0004 }, + { 0x0012, 0x0005 }, + { 0x0012, 0x0006 }, + { 0x0012, 0x0007 }, + { 0x0012, 0x0008 }, + { 0x0012, 0x0009 }, + { 0x0012, 0x000a }, + { 0x0012, 0x000b }, + { 0x0012, 0x000c }, + { 0x0012, 0x000d }, + { 0x0012, 0x000e }, + { 0x0012, 0x000f }, + { 0x0012, 0x0010 }, + { 0x0012, 0x0011 }, + { 0x0012, 0x0012 }, + { 0x0012, 0x0013 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec31[43][16] = { + { + 0x0010ffff, + 0x000cffff, + 0x000dffff, + 0x000effff, + 0x000fffff, + 0x0001ffff, + 0x0002ffff, + 0x0003ffff, + 0x0004ffff, + 0x0005ffff, + 0x0006ffff, + 0x0007ffff, + 0x0008ffff, + 0x0009ffff, + 0x000affff, + 0x000bffff, + }, + { + 0x00010048, + 0x00010048, + 0x00010049, + 0x00010049, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020003, + 0x00020003, + 0x00020003, + 0x00020003, + }, + { + 0x00020004, + 0x00020004, + 0x00020004, + 0x00020004, + 0x00020005, + 0x00020005, + 0x00020005, + 0x00020005, + 0x00020006, + 0x00020006, + 0x00020006, + 0x00020006, + 0x00020007, + 0x00020007, + 0x00020007, + 0x00020007, + }, + { + 0x00020008, + 0x00020008, + 0x00020008, + 0x00020008, + 0x00020009, + 0x00020009, + 0x00020009, + 0x00020009, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x0002000b, + }, + { + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x0002000f, + }, + { + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020013, + 0x00020013, + 0x00020013, + 0x00020013, + }, + { + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020017, + }, + { + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020019, + 0x00020019, + 0x00020019, + 0x00020019, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001b, + }, + { + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x0002001f, + }, + { + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020022, + 0x00020022, + 0x00020022, + 0x00020022, + 0x00020023, + 0x00020023, + 0x00020023, + 0x00020023, + }, + { + 0x00020024, + 0x00020024, + 0x00020024, + 0x00020024, + 0x00020025, + 0x00020025, + 0x00020025, + 0x00020025, + 0x00020026, + 0x00020026, + 0x00020026, + 0x00020026, + 0x00020027, + 0x00020027, + 0x00020027, + 0x00020027, + }, + { + 0x00020028, + 0x00020028, + 0x00020028, + 0x00020028, + 0x00020029, + 0x00020029, + 0x00020029, + 0x00020029, + 0x0002002a, + 0x0002002a, + 0x0002002a, + 0x0002002a, + 0x0002002c, + 0x0002002c, + 0x0002002c, + 0x0002002c, + }, + { + 0x00000051, + 0x00000052, + 0x00000053, + 0x00000054, + 0x00000055, + 0x00000056, + 0x00010000, + 0x00010000, + 0x0001002b, + 0x0001002b, + 0x0001002d, + 0x0001002d, + 0x0001002e, + 0x0001002e, + 0x0001002f, + 0x0001002f, + }, + { + 0x00010030, + 0x00010030, + 0x00010031, + 0x00010031, + 0x00010032, + 0x00010032, + 0x00010033, + 0x00010033, + 0x00010034, + 0x00010034, + 0x00010035, + 0x00010035, + 0x00010036, + 0x00010036, + 0x00010037, + 0x00010037, + }, + { + 0x00010038, + 0x00010038, + 0x00010039, + 0x00010039, + 0x0001003a, + 0x0001003a, + 0x0001003b, + 0x0001003b, + 0x0001003c, + 0x0001003c, + 0x0001003d, + 0x0001003d, + 0x0001003e, + 0x0001003e, + 0x0001003f, + 0x0001003f, + }, + { + 0x00010040, + 0x00010040, + 0x00010041, + 0x00010041, + 0x00010042, + 0x00010042, + 0x00010043, + 0x00010043, + 0x00010044, + 0x00010044, + 0x00010045, + 0x00010045, + 0x00010046, + 0x00010046, + 0x00010047, + 0x00010047, + }, + { + 0x0019ffff, + 0x0018ffff, + 0x0016ffff, + 0x0017ffff, + 0x0011ffff, + 0x0012ffff, + 0x0013ffff, + 0x0014ffff, + 0x0015ffff, + 0x0000004a, + 0x0000004b, + 0x0000004c, + 0x0000004d, + 0x0000004e, + 0x0000004f, + 0x00000050, + }, + { + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + }, + { + 0x00030059, + 0x00030059, + 0x00030059, + 0x00030059, + 0x00030059, + 0x00030059, + 0x00030059, + 0x00030059, + 0x0003005a, + 0x0003005a, + 0x0003005a, + 0x0003005a, + 0x0003005a, + 0x0003005a, + 0x0003005a, + 0x0003005a, + }, + { + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005c, + 0x0003005c, + 0x0003005c, + 0x0003005c, + 0x0003005c, + 0x0003005c, + 0x0003005c, + 0x0003005c, + }, + { + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005d, + 0x0003005e, + 0x0003005e, + 0x0003005e, + 0x0003005e, + 0x0003005e, + 0x0003005e, + 0x0003005e, + 0x0003005e, + }, + { + 0x0003005f, + 0x0003005f, + 0x0003005f, + 0x0003005f, + 0x0003005f, + 0x0003005f, + 0x0003005f, + 0x0003005f, + 0x00030060, + 0x00030060, + 0x00030060, + 0x00030060, + 0x00030060, + 0x00030060, + 0x00030060, + 0x00030060, + }, + { + 0x00020061, + 0x00020061, + 0x00020061, + 0x00020061, + 0x00020062, + 0x00020062, + 0x00020062, + 0x00020062, + 0x00020063, + 0x00020063, + 0x00020063, + 0x00020063, + 0x00020064, + 0x00020064, + 0x00020064, + 0x00020064, + }, + { + 0x00020065, + 0x00020065, + 0x00020065, + 0x00020065, + 0x00020066, + 0x00020066, + 0x00020066, + 0x00020066, + 0x00020067, + 0x00020067, + 0x00020067, + 0x00020067, + 0x00020068, + 0x00020068, + 0x00020068, + 0x00020068, + }, + { + 0x00010069, + 0x00010069, + 0x0001006a, + 0x0001006a, + 0x0001006b, + 0x0001006b, + 0x0001006c, + 0x0001006c, + 0x0001006d, + 0x0001006d, + 0x0001006e, + 0x0001006e, + 0x0001006f, + 0x0001006f, + 0x00010072, + 0x00010072, + }, + { + 0x0021ffff, + 0x0020ffff, + 0x001effff, + 0x001fffff, + 0x001affff, + 0x001bffff, + 0x001cffff, + 0x001dffff, + 0x00000070, + 0x00000071, + 0x00000073, + 0x00000074, + 0x00000075, + 0x00000076, + 0x00000078, + 0x0000007b, + }, + { + 0x00030077, + 0x00030077, + 0x00030077, + 0x00030077, + 0x00030077, + 0x00030077, + 0x00030077, + 0x00030077, + 0x00030079, + 0x00030079, + 0x00030079, + 0x00030079, + 0x00030079, + 0x00030079, + 0x00030079, + 0x00030079, + }, + { + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x0003007c, + 0x0003007c, + 0x0003007c, + 0x0003007c, + 0x0003007c, + 0x0003007c, + 0x0003007c, + 0x0003007c, + }, + { + 0x0003007d, + 0x0003007d, + 0x0003007d, + 0x0003007d, + 0x0003007d, + 0x0003007d, + 0x0003007d, + 0x0003007d, + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x0003007e, + }, + { + 0x0003007f, + 0x0003007f, + 0x0003007f, + 0x0003007f, + 0x0003007f, + 0x0003007f, + 0x0003007f, + 0x0003007f, + 0x00030080, + 0x00030080, + 0x00030080, + 0x00030080, + 0x00030080, + 0x00030080, + 0x00030080, + 0x00030080, + }, + { + 0x00020081, + 0x00020081, + 0x00020081, + 0x00020081, + 0x00020082, + 0x00020082, + 0x00020082, + 0x00020082, + 0x00020083, + 0x00020083, + 0x00020083, + 0x00020083, + 0x00020084, + 0x00020084, + 0x00020084, + 0x00020084, + }, + { + 0x00020085, + 0x00020085, + 0x00020085, + 0x00020085, + 0x00020086, + 0x00020086, + 0x00020086, + 0x00020086, + 0x00020087, + 0x00020087, + 0x00020087, + 0x00020087, + 0x00020088, + 0x00020088, + 0x00020088, + 0x00020088, + }, + { + 0x0000009c, + 0x000000a4, + 0x00010089, + 0x00010089, + 0x0001008a, + 0x0001008a, + 0x0001008b, + 0x0001008b, + 0x0001008c, + 0x0001008c, + 0x0001008e, + 0x0001008e, + 0x0001008f, + 0x0001008f, + 0x00010096, + 0x00010096, + }, + { + 0x0026ffff, + 0x0027ffff, + 0x0028ffff, + 0x0029ffff, + 0x002affff, + 0x0022ffff, + 0x0023ffff, + 0x0024ffff, + 0x0025ffff, + 0x0000008d, + 0x00000090, + 0x00000091, + 0x00000092, + 0x00000093, + 0x00000095, + 0x00000097, + }, + { + 0x00030094, + 0x00030094, + 0x00030094, + 0x00030094, + 0x00030094, + 0x00030094, + 0x00030094, + 0x00030094, + 0x0003009a, + 0x0003009a, + 0x0003009a, + 0x0003009a, + 0x0003009a, + 0x0003009a, + 0x0003009a, + 0x0003009a, + }, + { + 0x0003009b, + 0x0003009b, + 0x0003009b, + 0x0003009b, + 0x0003009b, + 0x0003009b, + 0x0003009b, + 0x0003009b, + 0x0003009f, + 0x0003009f, + 0x0003009f, + 0x0003009f, + 0x0003009f, + 0x0003009f, + 0x0003009f, + 0x0003009f, + }, + { + 0x000300a0, + 0x000300a0, + 0x000300a0, + 0x000300a0, + 0x000300a0, + 0x000300a0, + 0x000300a0, + 0x000300a0, + 0x000300a1, + 0x000300a1, + 0x000300a1, + 0x000300a1, + 0x000300a1, + 0x000300a1, + 0x000300a1, + 0x000300a1, + }, + { + 0x000300a2, + 0x000300a2, + 0x000300a2, + 0x000300a2, + 0x000300a2, + 0x000300a2, + 0x000300a2, + 0x000300a2, + 0x000300a3, + 0x000300a3, + 0x000300a3, + 0x000300a3, + 0x000300a3, + 0x000300a3, + 0x000300a3, + 0x000300a3, + }, + { + 0x00020098, + 0x00020098, + 0x00020098, + 0x00020098, + 0x00020099, + 0x00020099, + 0x00020099, + 0x00020099, + 0x0002009d, + 0x0002009d, + 0x0002009d, + 0x0002009d, + 0x0002009e, + 0x0002009e, + 0x0002009e, + 0x0002009e, + }, + { + 0x000200a5, + 0x000200a5, + 0x000200a5, + 0x000200a5, + 0x000200a6, + 0x000200a6, + 0x000200a6, + 0x000200a6, + 0x000200a7, + 0x000200a7, + 0x000200a7, + 0x000200a7, + 0x000200a8, + 0x000200a8, + 0x000200a8, + 0x000200a8, + }, + { + 0x000200a9, + 0x000200a9, + 0x000200a9, + 0x000200a9, + 0x000200aa, + 0x000200aa, + 0x000200aa, + 0x000200aa, + 0x000200ab, + 0x000200ab, + 0x000200ab, + 0x000200ab, + 0x000200ac, + 0x000200ac, + 0x000200ac, + 0x000200ac, + }, + { + 0x000200ad, + 0x000200ad, + 0x000200ad, + 0x000200ad, + 0x000200ae, + 0x000200ae, + 0x000200ae, + 0x000200ae, + 0x000200af, + 0x000200af, + 0x000200af, + 0x000200af, + 0x000200b0, + 0x000200b0, + 0x000200b0, + 0x000200b0, + }, + { + 0x000200b1, + 0x000200b1, + 0x000200b1, + 0x000200b1, + 0x000200b2, + 0x000200b2, + 0x000200b2, + 0x000200b2, + 0x000200b3, + 0x000200b3, + 0x000200b3, + 0x000200b3, + 0x000200b4, + 0x000200b4, + 0x000200b4, + 0x000200b4, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc33[16][2] = +#else +const uint16_t c_aauiCQMFHuffEnc33[16][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0003, 0x0001 }, + { 0x0008, 0x0000 }, + { 0x0008, 0x0001 }, + { 0x0002, 0x0001 }, + { 0x0004, 0x0001 }, + { 0x0008, 0x0002 }, + { 0x0008, 0x0003 }, + { 0x0008, 0x0004 }, + { 0x0008, 0x0005 }, + { 0x0008, 0x0006 }, + { 0x0008, 0x0007 }, + { 0x0007, 0x0004 }, + { 0x0007, 0x0005 }, + { 0x0007, 0x0006 }, + { 0x0007, 0x0007 }, + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec33[2][16] = { + { + 0x0001ffff, + 0x00000005, + 0x00010001, + 0x00010001, + 0x00020004, + 0x00020004, + 0x00020004, + 0x00020004, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x00000002, + 0x00000003, + 0x00000006, + 0x00000007, + 0x00000008, + 0x00000009, + 0x0000000a, + 0x0000000b, + 0x0001000c, + 0x0001000c, + 0x0001000d, + 0x0001000d, + 0x0001000e, + 0x0001000e, + 0x0001000f, + 0x0001000f, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc34[16][2] = +#else +const uint16_t c_aauiCQMFHuffEnc34[16][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0003, 0x0001 }, + { 0x0008, 0x0000 }, + { 0x0008, 0x0001 }, + { 0x0002, 0x0001 }, + { 0x0004, 0x0001 }, + { 0x0008, 0x0002 }, + { 0x0008, 0x0003 }, + { 0x0008, 0x0004 }, + { 0x0008, 0x0005 }, + { 0x0008, 0x0006 }, + { 0x0008, 0x0007 }, + { 0x0007, 0x0004 }, + { 0x0007, 0x0005 }, + { 0x0007, 0x0006 }, + { 0x0007, 0x0007 }, + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec34[2][16] = { + { + 0x0001ffff, + 0x00000005, + 0x00010001, + 0x00010001, + 0x00020004, + 0x00020004, + 0x00020004, + 0x00020004, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x00000002, + 0x00000003, + 0x00000006, + 0x00000007, + 0x00000008, + 0x00000009, + 0x0000000a, + 0x0000000b, + 0x0001000c, + 0x0001000c, + 0x0001000d, + 0x0001000d, + 0x0001000e, + 0x0001000e, + 0x0001000f, + 0x0001000f, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc35[25][2] = +#else +const uint16_t c_aauiCQMFHuffEnc35[25][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0003, 0x0001 }, + { 0x0007, 0x0006 }, + { 0x0009, 0x0000 }, + { 0x0009, 0x0001 }, + { 0x0002, 0x0001 }, + { 0x0004, 0x0001 }, + { 0x0009, 0x0002 }, + { 0x0009, 0x0003 }, + { 0x0009, 0x0004 }, + { 0x0007, 0x0007 }, + { 0x0009, 0x0005 }, + { 0x0009, 0x0006 }, + { 0x0009, 0x0007 }, + { 0x0009, 0x0008 }, + { 0x0009, 0x0009 }, + { 0x0009, 0x000a }, + { 0x0009, 0x000b }, + { 0x0009, 0x000c }, + { 0x0009, 0x000d }, + { 0x0008, 0x0007 }, + { 0x0008, 0x0008 }, + { 0x0008, 0x0009 }, + { 0x0008, 0x000a }, + { 0x0008, 0x000b }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec35[9][16] = { + { + 0x0001ffff, + 0x00000006, + 0x00010001, + 0x00010001, + 0x00020005, + 0x00020005, + 0x00020005, + 0x00020005, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x0007ffff, + 0x0008ffff, + 0x0002ffff, + 0x0003ffff, + 0x0004ffff, + 0x0005ffff, + 0x0006ffff, + 0x00000014, + 0x00000015, + 0x00000016, + 0x00000017, + 0x00000018, + 0x00010002, + 0x00010002, + 0x0001000a, + 0x0001000a, + }, + { + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + }, + { + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + }, + { + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + }, + { + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + }, + { + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + }, + { + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + }, + { + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc36[36][2] = +#else +const uint16_t c_aauiCQMFHuffEnc36[36][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0002, 0x0001 }, + { 0x0006, 0x0002 }, + { 0x000b, 0x0000 }, + { 0x000b, 0x0001 }, + { 0x000b, 0x0002 }, + { 0x0003, 0x0001 }, + { 0x0004, 0x0001 }, + { 0x0008, 0x0005 }, + { 0x000b, 0x0003 }, + { 0x000b, 0x0004 }, + { 0x000b, 0x0005 }, + { 0x0006, 0x0003 }, + { 0x0007, 0x0003 }, + { 0x000b, 0x0006 }, + { 0x000b, 0x0007 }, + { 0x000b, 0x0008 }, + { 0x000b, 0x0009 }, + { 0x000b, 0x000a }, + { 0x000b, 0x000b }, + { 0x000b, 0x000c }, + { 0x000b, 0x000d }, + { 0x000b, 0x000e }, + { 0x000b, 0x000f }, + { 0x000a, 0x0008 }, + { 0x000a, 0x0009 }, + { 0x000a, 0x000a }, + { 0x000a, 0x000b }, + { 0x000a, 0x000c }, + { 0x000a, 0x000d }, + { 0x000a, 0x000e }, + { 0x000a, 0x000f }, + { 0x000a, 0x0010 }, + { 0x000a, 0x0011 }, + { 0x000a, 0x0012 }, + { 0x000a, 0x0013 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec36[7][16] = { + { + 0x0001ffff, + 0x00000007, + 0x00010006, + 0x00010006, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x0006ffff, + 0x0005ffff, + 0x0002ffff, + 0x0003ffff, + 0x0004ffff, + 0x00000008, + 0x0001000d, + 0x0001000d, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000c, + }, + { + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020019, + 0x00020019, + 0x00020019, + 0x00020019, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001b, + }, + { + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x0002001f, + }, + { + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020022, + 0x00020022, + 0x00020022, + 0x00020022, + 0x00020023, + 0x00020023, + 0x00020023, + 0x00020023, + }, + { + 0x00010010, + 0x00010010, + 0x00010011, + 0x00010011, + 0x00010012, + 0x00010012, + 0x00010013, + 0x00010013, + 0x00010014, + 0x00010014, + 0x00010015, + 0x00010015, + 0x00010016, + 0x00010016, + 0x00010017, + 0x00010017, + }, + { + 0x00010003, + 0x00010003, + 0x00010004, + 0x00010004, + 0x00010005, + 0x00010005, + 0x00010009, + 0x00010009, + 0x0001000a, + 0x0001000a, + 0x0001000b, + 0x0001000b, + 0x0001000e, + 0x0001000e, + 0x0001000f, + 0x0001000f, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc37[36][2] = +#else +const uint16_t c_aauiCQMFHuffEnc37[36][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0002, 0x0001 }, + { 0x0006, 0x0001 }, + { 0x000c, 0x0000 }, + { 0x000c, 0x0001 }, + { 0x000c, 0x0002 }, + { 0x0003, 0x0001 }, + { 0x0004, 0x0001 }, + { 0x0006, 0x0002 }, + { 0x000c, 0x0003 }, + { 0x000c, 0x0004 }, + { 0x000c, 0x0005 }, + { 0x0006, 0x0003 }, + { 0x0007, 0x0001 }, + { 0x000a, 0x0007 }, + { 0x000c, 0x0006 }, + { 0x000c, 0x0007 }, + { 0x000c, 0x0008 }, + { 0x000c, 0x0009 }, + { 0x000c, 0x000a }, + { 0x000c, 0x000b }, + { 0x000c, 0x000c }, + { 0x000c, 0x000d }, + { 0x000c, 0x000e }, + { 0x000c, 0x000f }, + { 0x000c, 0x0010 }, + { 0x000c, 0x0011 }, + { 0x000c, 0x0012 }, + { 0x000c, 0x0013 }, + { 0x000c, 0x0014 }, + { 0x000c, 0x0015 }, + { 0x000c, 0x0016 }, + { 0x000c, 0x0017 }, + { 0x000c, 0x0018 }, + { 0x000c, 0x0019 }, + { 0x000b, 0x000d }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec37[4][16] = { + { + 0x0001ffff, + 0x00000007, + 0x00010006, + 0x00010006, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x0003ffff, + 0x0002ffff, + 0x0001000d, + 0x0001000d, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020008, + 0x00020008, + 0x00020008, + 0x00020008, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000c, + }, + { + 0x00000019, + 0x0000001a, + 0x0000001b, + 0x0000001c, + 0x0000001d, + 0x0000001e, + 0x0000001f, + 0x00000020, + 0x00000021, + 0x00000022, + 0x00010023, + 0x00010023, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000e, + }, + { + 0x00000003, + 0x00000004, + 0x00000005, + 0x00000009, + 0x0000000a, + 0x0000000b, + 0x0000000f, + 0x00000010, + 0x00000011, + 0x00000012, + 0x00000013, + 0x00000014, + 0x00000015, + 0x00000016, + 0x00000017, + 0x00000018, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc38[49][2] = +#else +const uint16_t c_aauiCQMFHuffEnc38[49][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0003, 0x0001 }, + { 0x0006, 0x0001 }, + { 0x000c, 0x0012 }, + { 0x000d, 0x0000 }, + { 0x000d, 0x0001 }, + { 0x000d, 0x0002 }, + { 0x0002, 0x0001 }, + { 0x0004, 0x0001 }, + { 0x0007, 0x0001 }, + { 0x000b, 0x000a }, + { 0x000d, 0x0003 }, + { 0x000d, 0x0004 }, + { 0x000d, 0x0005 }, + { 0x0006, 0x0002 }, + { 0x0006, 0x0003 }, + { 0x0009, 0x0003 }, + { 0x000d, 0x0006 }, + { 0x000d, 0x0007 }, + { 0x000d, 0x0008 }, + { 0x000d, 0x0009 }, + { 0x000c, 0x0013 }, + { 0x000b, 0x000b }, + { 0x000d, 0x000a }, + { 0x000d, 0x000b }, + { 0x000d, 0x000c }, + { 0x000d, 0x000d }, + { 0x000d, 0x000e }, + { 0x000d, 0x000f }, + { 0x000d, 0x0010 }, + { 0x000d, 0x0011 }, + { 0x000d, 0x0012 }, + { 0x000d, 0x0013 }, + { 0x000d, 0x0014 }, + { 0x000d, 0x0015 }, + { 0x000d, 0x0016 }, + { 0x000d, 0x0017 }, + { 0x000d, 0x0018 }, + { 0x000d, 0x0019 }, + { 0x000d, 0x001a }, + { 0x000d, 0x001b }, + { 0x000d, 0x001c }, + { 0x000d, 0x001d }, + { 0x000d, 0x001e }, + { 0x000d, 0x001f }, + { 0x000d, 0x0020 }, + { 0x000d, 0x0021 }, + { 0x000d, 0x0022 }, + { 0x000d, 0x0023 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec38[22][16] = { + { + 0x0001ffff, + 0x00000008, + 0x00010001, + 0x00010001, + 0x00020007, + 0x00020007, + 0x00020007, + 0x00020007, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x0003ffff, + 0x0002ffff, + 0x00010009, + 0x00010009, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x0002000f, + }, + { + 0x0014ffff, + 0x0015ffff, + 0x00000003, + 0x00000015, + 0x0001000a, + 0x0001000a, + 0x00010016, + 0x00010016, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + }, + { + 0x0005ffff, + 0x0006ffff, + 0x0004ffff, + 0x0007ffff, + 0x0008ffff, + 0x0009ffff, + 0x000affff, + 0x000bffff, + 0x000cffff, + 0x000dffff, + 0x000effff, + 0x000fffff, + 0x0010ffff, + 0x0011ffff, + 0x0012ffff, + 0x0013ffff, + }, + { + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + }, + { + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + }, + { + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + }, + { + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + }, + { + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + }, + { + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + }, + { + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + }, + { + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + }, + { + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + }, + { + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + }, + { + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + }, + { + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + }, + { + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + }, + { + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + }, + { + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + }, + { + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + }, + { + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + }, + { + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc39[64][2] = +#else +const uint16_t c_aauiCQMFHuffEnc39[64][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0002, 0x0001 }, + { 0x0006, 0x0001 }, + { 0x000a, 0x0002 }, + { 0x000f, 0x0000 }, + { 0x000f, 0x0001 }, + { 0x000f, 0x0002 }, + { 0x000f, 0x0003 }, + { 0x0003, 0x0001 }, + { 0x0004, 0x0001 }, + { 0x0007, 0x0001 }, + { 0x000a, 0x0003 }, + { 0x000f, 0x0004 }, + { 0x000f, 0x0005 }, + { 0x000f, 0x0006 }, + { 0x000f, 0x0007 }, + { 0x0006, 0x0002 }, + { 0x0006, 0x0003 }, + { 0x0009, 0x0003 }, + { 0x000d, 0x000e }, + { 0x000f, 0x0008 }, + { 0x000f, 0x0009 }, + { 0x000f, 0x000a }, + { 0x000f, 0x000b }, + { 0x000a, 0x0004 }, + { 0x000a, 0x0005 }, + { 0x000d, 0x000f }, + { 0x000f, 0x000c }, + { 0x000f, 0x000d }, + { 0x000f, 0x000e }, + { 0x000f, 0x000f }, + { 0x000f, 0x0010 }, + { 0x000f, 0x0011 }, + { 0x000f, 0x0012 }, + { 0x000f, 0x0013 }, + { 0x000f, 0x0014 }, + { 0x000f, 0x0015 }, + { 0x000f, 0x0016 }, + { 0x000f, 0x0017 }, + { 0x000f, 0x0018 }, + { 0x000f, 0x0019 }, + { 0x000f, 0x001a }, + { 0x000f, 0x001b }, + { 0x000f, 0x001c }, + { 0x000f, 0x001d }, + { 0x000f, 0x001e }, + { 0x000f, 0x001f }, + { 0x000f, 0x0020 }, + { 0x000f, 0x0021 }, + { 0x000f, 0x0022 }, + { 0x000f, 0x0023 }, + { 0x000f, 0x0024 }, + { 0x000f, 0x0025 }, + { 0x000f, 0x0026 }, + { 0x000f, 0x0027 }, + { 0x000f, 0x0028 }, + { 0x000f, 0x0029 }, + { 0x000e, 0x0015 }, + { 0x000e, 0x0016 }, + { 0x000e, 0x0017 }, + { 0x000e, 0x0018 }, + { 0x000e, 0x0019 }, + { 0x000e, 0x001a }, + { 0x000e, 0x001b }, + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec39[12][16] = { + { + 0x0001ffff, + 0x00000009, + 0x00010008, + 0x00010008, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x0003ffff, + 0x0002ffff, + 0x0001000a, + 0x0001000a, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020011, + }, + { + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020019, + 0x00020019, + 0x00020019, + 0x00020019, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + 0x00030012, + }, + { + 0x0008ffff, + 0x0007ffff, + 0x0009ffff, + 0x000affff, + 0x000bffff, + 0x0005ffff, + 0x0006ffff, + 0x0004ffff, + 0x00020003, + 0x00020003, + 0x00020003, + 0x00020003, + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x0002000b, + }, + { + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + }, + { + 0x00010037, + 0x00010037, + 0x00010038, + 0x00010038, + 0x00020039, + 0x00020039, + 0x00020039, + 0x00020039, + 0x0002003a, + 0x0002003a, + 0x0002003a, + 0x0002003a, + 0x0002003b, + 0x0002003b, + 0x0002003b, + 0x0002003b, + }, + { + 0x0002003c, + 0x0002003c, + 0x0002003c, + 0x0002003c, + 0x0002003d, + 0x0002003d, + 0x0002003d, + 0x0002003d, + 0x0002003e, + 0x0002003e, + 0x0002003e, + 0x0002003e, + 0x0002003f, + 0x0002003f, + 0x0002003f, + 0x0002003f, + }, + { + 0x00010014, + 0x00010014, + 0x00010015, + 0x00010015, + 0x00010016, + 0x00010016, + 0x00010017, + 0x00010017, + 0x0001001b, + 0x0001001b, + 0x0001001c, + 0x0001001c, + 0x0001001d, + 0x0001001d, + 0x0001001e, + 0x0001001e, + }, + { + 0x00010004, + 0x00010004, + 0x00010005, + 0x00010005, + 0x00010006, + 0x00010006, + 0x00010007, + 0x00010007, + 0x0001000c, + 0x0001000c, + 0x0001000d, + 0x0001000d, + 0x0001000e, + 0x0001000e, + 0x0001000f, + 0x0001000f, + }, + { + 0x0001001f, + 0x0001001f, + 0x00010020, + 0x00010020, + 0x00010021, + 0x00010021, + 0x00010022, + 0x00010022, + 0x00010023, + 0x00010023, + 0x00010024, + 0x00010024, + 0x00010025, + 0x00010025, + 0x00010026, + 0x00010026, + }, + { + 0x00010027, + 0x00010027, + 0x00010028, + 0x00010028, + 0x00010029, + 0x00010029, + 0x0001002a, + 0x0001002a, + 0x0001002b, + 0x0001002b, + 0x0001002c, + 0x0001002c, + 0x0001002d, + 0x0001002d, + 0x0001002e, + 0x0001002e, + }, + { + 0x0001002f, + 0x0001002f, + 0x00010030, + 0x00010030, + 0x00010031, + 0x00010031, + 0x00010032, + 0x00010032, + 0x00010033, + 0x00010033, + 0x00010034, + 0x00010034, + 0x00010035, + 0x00010035, + 0x00010036, + 0x00010036, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc40[81][2] = +#else +const uint16_t c_aauiCQMFHuffEnc40[81][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0002, 0x0001 }, + { 0x0006, 0x0001 }, + { 0x000b, 0x0002 }, + { 0x000f, 0x0011 }, + { 0x0011, 0x0000 }, + { 0x0011, 0x0001 }, + { 0x0011, 0x0002 }, + { 0x0011, 0x0003 }, + { 0x0003, 0x0001 }, + { 0x0004, 0x0001 }, + { 0x0007, 0x0001 }, + { 0x000a, 0x0002 }, + { 0x000e, 0x0009 }, + { 0x0011, 0x0004 }, + { 0x0011, 0x0005 }, + { 0x0011, 0x0006 }, + { 0x0011, 0x0007 }, + { 0x0006, 0x0002 }, + { 0x0006, 0x0003 }, + { 0x0008, 0x0001 }, + { 0x000d, 0x0005 }, + { 0x0011, 0x0008 }, + { 0x0011, 0x0009 }, + { 0x0011, 0x000a }, + { 0x0011, 0x000b }, + { 0x0011, 0x000c }, + { 0x000b, 0x0003 }, + { 0x000a, 0x0003 }, + { 0x000c, 0x0003 }, + { 0x0011, 0x000d }, + { 0x0011, 0x000e }, + { 0x0011, 0x000f }, + { 0x0011, 0x0010 }, + { 0x0011, 0x0011 }, + { 0x0011, 0x0012 }, + { 0x0011, 0x0013 }, + { 0x0011, 0x0014 }, + { 0x0011, 0x0015 }, + { 0x0011, 0x0016 }, + { 0x0011, 0x0017 }, + { 0x0011, 0x0018 }, + { 0x0011, 0x0019 }, + { 0x0011, 0x001a }, + { 0x0011, 0x001b }, + { 0x0011, 0x001c }, + { 0x0011, 0x001d }, + { 0x0011, 0x001e }, + { 0x0011, 0x001f }, + { 0x0011, 0x0020 }, + { 0x0011, 0x0021 }, + { 0x0011, 0x0022 }, + { 0x0011, 0x0023 }, + { 0x0011, 0x0024 }, + { 0x0011, 0x0025 }, + { 0x0011, 0x0026 }, + { 0x0011, 0x0027 }, + { 0x0011, 0x0028 }, + { 0x0011, 0x0029 }, + { 0x0011, 0x002a }, + { 0x0011, 0x002b }, + { 0x0011, 0x002c }, + { 0x0011, 0x002d }, + { 0x0011, 0x002e }, + { 0x0011, 0x002f }, + { 0x0011, 0x0030 }, + { 0x0011, 0x0031 }, + { 0x0011, 0x0032 }, + { 0x0011, 0x0033 }, + { 0x0011, 0x0034 }, + { 0x0011, 0x0035 }, + { 0x0011, 0x0036 }, + { 0x0011, 0x0037 }, + { 0x0011, 0x0038 }, + { 0x0011, 0x0039 }, + { 0x0011, 0x003a }, + { 0x0011, 0x003b }, + { 0x0010, 0x001e }, + { 0x0010, 0x001f }, + { 0x0010, 0x0020 }, + { 0x0010, 0x0021 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec40[36][16] = { + { + 0x0001ffff, + 0x0000000a, + 0x00010009, + 0x00010009, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x0002ffff, + 0x00000014, + 0x0001000b, + 0x0001000b, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020013, + 0x00020013, + 0x00020013, + 0x00020013, + }, + { + 0x0005ffff, + 0x0004ffff, + 0x0003ffff, + 0x0000001d, + 0x00010003, + 0x00010003, + 0x0001001b, + 0x0001001b, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001c, + }, + { + 0x0000004f, + 0x00000050, + 0x00010004, + 0x00010004, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + }, + { + 0x0015ffff, + 0x0016ffff, + 0x0017ffff, + 0x0018ffff, + 0x0019ffff, + 0x001affff, + 0x001bffff, + 0x001cffff, + 0x001dffff, + 0x001effff, + 0x001fffff, + 0x0020ffff, + 0x0021ffff, + 0x0022ffff, + 0x0000004d, + 0x0000004e, + }, + { + 0x0023ffff, + 0x000affff, + 0x0006ffff, + 0x000bffff, + 0x0007ffff, + 0x0008ffff, + 0x0009ffff, + 0x000cffff, + 0x000dffff, + 0x000effff, + 0x000fffff, + 0x0010ffff, + 0x0011ffff, + 0x0012ffff, + 0x0013ffff, + 0x0014ffff, + }, + { + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + }, + { + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + }, + { + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + }, + { + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + }, + { + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + }, + { + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + }, + { + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + }, + { + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + }, + { + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + }, + { + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + }, + { + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + }, + { + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + }, + { + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + }, + { + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + }, + { + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + }, + { + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + }, + { + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + }, + { + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + }, + { + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + }, + { + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + }, + { + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + }, + { + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + }, + { + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x00030040, + 0x00030040, + 0x00030040, + 0x00030040, + 0x00030040, + 0x00030040, + 0x00030040, + 0x00030040, + }, + { + 0x00030041, + 0x00030041, + 0x00030041, + 0x00030041, + 0x00030041, + 0x00030041, + 0x00030041, + 0x00030041, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + }, + { + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + 0x00030044, + }, + { + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + }, + { + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + }, + { + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x0003004a, + 0x0003004a, + 0x0003004a, + 0x0003004a, + 0x0003004a, + 0x0003004a, + 0x0003004a, + 0x0003004a, + }, + { + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + }, + { + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc41[100][2] = +#else +const uint16_t c_aauiCQMFHuffEnc41[100][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0003, 0x0001 }, + { 0x0006, 0x0001 }, + { 0x000b, 0x0001 }, + { 0x0011, 0x0014 }, + { 0x0013, 0x0000 }, + { 0x0013, 0x0001 }, + { 0x0013, 0x0002 }, + { 0x0013, 0x0003 }, + { 0x0013, 0x0004 }, + { 0x0002, 0x0001 }, + { 0x0004, 0x0001 }, + { 0x0007, 0x0001 }, + { 0x000a, 0x0001 }, + { 0x0010, 0x000b }, + { 0x0013, 0x0005 }, + { 0x0013, 0x0006 }, + { 0x0013, 0x0007 }, + { 0x0013, 0x0008 }, + { 0x0013, 0x0009 }, + { 0x0006, 0x0002 }, + { 0x0006, 0x0003 }, + { 0x0008, 0x0001 }, + { 0x000d, 0x0002 }, + { 0x0011, 0x0015 }, + { 0x0013, 0x000a }, + { 0x0013, 0x000b }, + { 0x0013, 0x000c }, + { 0x0013, 0x000d }, + { 0x0013, 0x000e }, + { 0x000a, 0x0002 }, + { 0x000a, 0x0003 }, + { 0x000d, 0x0003 }, + { 0x0010, 0x000c }, + { 0x0013, 0x000f }, + { 0x0013, 0x0010 }, + { 0x0013, 0x0011 }, + { 0x0013, 0x0012 }, + { 0x0013, 0x0013 }, + { 0x0013, 0x0014 }, + { 0x0010, 0x000d }, + { 0x000f, 0x0007 }, + { 0x0012, 0x0027 }, + { 0x0013, 0x0015 }, + { 0x0013, 0x0016 }, + { 0x0013, 0x0017 }, + { 0x0013, 0x0018 }, + { 0x0013, 0x0019 }, + { 0x0013, 0x001a }, + { 0x0013, 0x001b }, + { 0x0013, 0x001c }, + { 0x0013, 0x001d }, + { 0x0013, 0x001e }, + { 0x0013, 0x001f }, + { 0x0013, 0x0020 }, + { 0x0013, 0x0021 }, + { 0x0013, 0x0022 }, + { 0x0013, 0x0023 }, + { 0x0013, 0x0024 }, + { 0x0013, 0x0025 }, + { 0x0013, 0x0026 }, + { 0x0013, 0x0027 }, + { 0x0013, 0x0028 }, + { 0x0013, 0x0029 }, + { 0x0013, 0x002a }, + { 0x0013, 0x002b }, + { 0x0013, 0x002c }, + { 0x0013, 0x002d }, + { 0x0013, 0x002e }, + { 0x0013, 0x002f }, + { 0x0013, 0x0030 }, + { 0x0013, 0x0031 }, + { 0x0013, 0x0032 }, + { 0x0013, 0x0033 }, + { 0x0013, 0x0034 }, + { 0x0013, 0x0035 }, + { 0x0013, 0x0036 }, + { 0x0013, 0x0037 }, + { 0x0013, 0x0038 }, + { 0x0013, 0x0039 }, + { 0x0013, 0x003a }, + { 0x0013, 0x003b }, + { 0x0013, 0x003c }, + { 0x0013, 0x003d }, + { 0x0013, 0x003e }, + { 0x0013, 0x003f }, + { 0x0013, 0x0040 }, + { 0x0013, 0x0041 }, + { 0x0013, 0x0042 }, + { 0x0013, 0x0043 }, + { 0x0013, 0x0044 }, + { 0x0013, 0x0045 }, + { 0x0013, 0x0046 }, + { 0x0013, 0x0047 }, + { 0x0013, 0x0048 }, + { 0x0013, 0x0049 }, + { 0x0013, 0x004a }, + { 0x0013, 0x004b }, + { 0x0013, 0x004c }, + { 0x0013, 0x004d }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec41[16][16] = { + { + 0x0001ffff, + 0x0000000b, + 0x00010001, + 0x00010001, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x0002ffff, + 0x00000016, + 0x0001000c, + 0x0001000c, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020015, + }, + { + 0x0004ffff, + 0x0003ffff, + 0x00010003, + 0x00010003, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x0002001f, + }, + { + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + }, + { + 0x0007ffff, + 0x0008ffff, + 0x0009ffff, + 0x000affff, + 0x000bffff, + 0x000cffff, + 0x000dffff, + 0x000effff, + 0x000fffff, + 0x0006ffff, + 0x0005ffff, + 0x0000000e, + 0x00000021, + 0x00000028, + 0x00010029, + 0x00010029, + }, + { + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + }, + { + 0x0001005e, + 0x0001005e, + 0x0001005f, + 0x0001005f, + 0x00010060, + 0x00010060, + 0x00010061, + 0x00010061, + 0x00010062, + 0x00010062, + 0x00010063, + 0x00010063, + 0x0002002a, + 0x0002002a, + 0x0002002a, + 0x0002002a, + }, + { + 0x00010005, + 0x00010005, + 0x00010006, + 0x00010006, + 0x00010007, + 0x00010007, + 0x00010008, + 0x00010008, + 0x00010009, + 0x00010009, + 0x0001000f, + 0x0001000f, + 0x00010010, + 0x00010010, + 0x00010011, + 0x00010011, + }, + { + 0x00010012, + 0x00010012, + 0x00010013, + 0x00010013, + 0x00010019, + 0x00010019, + 0x0001001a, + 0x0001001a, + 0x0001001b, + 0x0001001b, + 0x0001001c, + 0x0001001c, + 0x0001001d, + 0x0001001d, + 0x00010022, + 0x00010022, + }, + { + 0x00010023, + 0x00010023, + 0x00010024, + 0x00010024, + 0x00010025, + 0x00010025, + 0x00010026, + 0x00010026, + 0x00010027, + 0x00010027, + 0x0001002b, + 0x0001002b, + 0x0001002c, + 0x0001002c, + 0x0001002d, + 0x0001002d, + }, + { + 0x0001002e, + 0x0001002e, + 0x0001002f, + 0x0001002f, + 0x00010030, + 0x00010030, + 0x00010031, + 0x00010031, + 0x00010032, + 0x00010032, + 0x00010033, + 0x00010033, + 0x00010034, + 0x00010034, + 0x00010035, + 0x00010035, + }, + { + 0x00010036, + 0x00010036, + 0x00010037, + 0x00010037, + 0x00010038, + 0x00010038, + 0x00010039, + 0x00010039, + 0x0001003a, + 0x0001003a, + 0x0001003b, + 0x0001003b, + 0x0001003c, + 0x0001003c, + 0x0001003d, + 0x0001003d, + }, + { + 0x0001003e, + 0x0001003e, + 0x0001003f, + 0x0001003f, + 0x00010040, + 0x00010040, + 0x00010041, + 0x00010041, + 0x00010042, + 0x00010042, + 0x00010043, + 0x00010043, + 0x00010044, + 0x00010044, + 0x00010045, + 0x00010045, + }, + { + 0x00010046, + 0x00010046, + 0x00010047, + 0x00010047, + 0x00010048, + 0x00010048, + 0x00010049, + 0x00010049, + 0x0001004a, + 0x0001004a, + 0x0001004b, + 0x0001004b, + 0x0001004c, + 0x0001004c, + 0x0001004d, + 0x0001004d, + }, + { + 0x0001004e, + 0x0001004e, + 0x0001004f, + 0x0001004f, + 0x00010050, + 0x00010050, + 0x00010051, + 0x00010051, + 0x00010052, + 0x00010052, + 0x00010053, + 0x00010053, + 0x00010054, + 0x00010054, + 0x00010055, + 0x00010055, + }, + { + 0x00010056, + 0x00010056, + 0x00010057, + 0x00010057, + 0x00010058, + 0x00010058, + 0x00010059, + 0x00010059, + 0x0001005a, + 0x0001005a, + 0x0001005b, + 0x0001005b, + 0x0001005c, + 0x0001005c, + 0x0001005d, + 0x0001005d, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc42[169][2] = +#else +const uint16_t c_aauiCQMFHuffEnc42[169][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0003, 0x0001 }, + { 0x0006, 0x0001 }, + { 0x0009, 0x0001 }, + { 0x000e, 0x0006 }, + { 0x0013, 0x0000 }, + { 0x0013, 0x0001 }, + { 0x0013, 0x0002 }, + { 0x0013, 0x0003 }, + { 0x0013, 0x0004 }, + { 0x0013, 0x0005 }, + { 0x0013, 0x0006 }, + { 0x0013, 0x0007 }, + { 0x0003, 0x0002 }, + { 0x0003, 0x0003 }, + { 0x0005, 0x0001 }, + { 0x0009, 0x0002 }, + { 0x000d, 0x0004 }, + { 0x0010, 0x0013 }, + { 0x0013, 0x0008 }, + { 0x0013, 0x0009 }, + { 0x0013, 0x000a }, + { 0x0013, 0x000b }, + { 0x0013, 0x000c }, + { 0x0013, 0x000d }, + { 0x0013, 0x000e }, + { 0x0005, 0x0002 }, + { 0x0005, 0x0003 }, + { 0x0008, 0x0002 }, + { 0x000b, 0x0002 }, + { 0x000f, 0x000b }, + { 0x0011, 0x0025 }, + { 0x0013, 0x000f }, + { 0x0013, 0x0010 }, + { 0x0013, 0x0011 }, + { 0x0013, 0x0012 }, + { 0x0013, 0x0013 }, + { 0x0013, 0x0014 }, + { 0x0013, 0x0015 }, + { 0x0009, 0x0003 }, + { 0x0008, 0x0003 }, + { 0x000b, 0x0003 }, + { 0x000d, 0x0005 }, + { 0x0010, 0x0014 }, + { 0x0013, 0x0016 }, + { 0x0013, 0x0017 }, + { 0x0013, 0x0018 }, + { 0x0013, 0x0019 }, + { 0x0013, 0x001a }, + { 0x0013, 0x001b }, + { 0x0013, 0x001c }, + { 0x0013, 0x001d }, + { 0x000d, 0x0006 }, + { 0x000d, 0x0007 }, + { 0x000e, 0x0007 }, + { 0x0010, 0x0015 }, + { 0x0013, 0x001e }, + { 0x0013, 0x001f }, + { 0x0013, 0x0020 }, + { 0x0013, 0x0021 }, + { 0x0013, 0x0022 }, + { 0x0013, 0x0023 }, + { 0x0013, 0x0024 }, + { 0x0013, 0x0025 }, + { 0x0013, 0x0026 }, + { 0x0012, 0x0045 }, + { 0x0013, 0x0027 }, + { 0x0013, 0x0028 }, + { 0x0013, 0x0029 }, + { 0x0013, 0x002a }, + { 0x0013, 0x002b }, + { 0x0013, 0x002c }, + { 0x0013, 0x002d }, + { 0x0013, 0x002e }, + { 0x0013, 0x002f }, + { 0x0013, 0x0030 }, + { 0x0013, 0x0031 }, + { 0x0013, 0x0032 }, + { 0x0013, 0x0033 }, + { 0x0013, 0x0034 }, + { 0x0013, 0x0035 }, + { 0x0013, 0x0036 }, + { 0x0013, 0x0037 }, + { 0x0013, 0x0038 }, + { 0x0013, 0x0039 }, + { 0x0013, 0x003a }, + { 0x0013, 0x003b }, + { 0x0013, 0x003c }, + { 0x0013, 0x003d }, + { 0x0013, 0x003e }, + { 0x0013, 0x003f }, + { 0x0013, 0x0040 }, + { 0x0013, 0x0041 }, + { 0x0013, 0x0042 }, + { 0x0013, 0x0043 }, + { 0x0013, 0x0044 }, + { 0x0013, 0x0045 }, + { 0x0013, 0x0046 }, + { 0x0013, 0x0047 }, + { 0x0013, 0x0048 }, + { 0x0013, 0x0049 }, + { 0x0013, 0x004a }, + { 0x0013, 0x004b }, + { 0x0013, 0x004c }, + { 0x0013, 0x004d }, + { 0x0013, 0x004e }, + { 0x0013, 0x004f }, + { 0x0013, 0x0050 }, + { 0x0013, 0x0051 }, + { 0x0013, 0x0052 }, + { 0x0013, 0x0053 }, + { 0x0013, 0x0054 }, + { 0x0013, 0x0055 }, + { 0x0013, 0x0056 }, + { 0x0013, 0x0057 }, + { 0x0013, 0x0058 }, + { 0x0013, 0x0059 }, + { 0x0013, 0x005a }, + { 0x0013, 0x005b }, + { 0x0013, 0x005c }, + { 0x0013, 0x005d }, + { 0x0013, 0x005e }, + { 0x0013, 0x005f }, + { 0x0013, 0x0060 }, + { 0x0013, 0x0061 }, + { 0x0013, 0x0062 }, + { 0x0013, 0x0063 }, + { 0x0013, 0x0064 }, + { 0x0013, 0x0065 }, + { 0x0013, 0x0066 }, + { 0x0013, 0x0067 }, + { 0x0013, 0x0068 }, + { 0x0013, 0x0069 }, + { 0x0013, 0x006a }, + { 0x0013, 0x006b }, + { 0x0013, 0x006c }, + { 0x0013, 0x006d }, + { 0x0013, 0x006e }, + { 0x0013, 0x006f }, + { 0x0013, 0x0070 }, + { 0x0013, 0x0071 }, + { 0x0013, 0x0072 }, + { 0x0013, 0x0073 }, + { 0x0013, 0x0074 }, + { 0x0013, 0x0075 }, + { 0x0013, 0x0076 }, + { 0x0013, 0x0077 }, + { 0x0013, 0x0078 }, + { 0x0013, 0x0079 }, + { 0x0013, 0x007a }, + { 0x0013, 0x007b }, + { 0x0013, 0x007c }, + { 0x0013, 0x007d }, + { 0x0013, 0x007e }, + { 0x0013, 0x007f }, + { 0x0013, 0x0080 }, + { 0x0013, 0x0081 }, + { 0x0013, 0x0082 }, + { 0x0013, 0x0083 }, + { 0x0013, 0x0084 }, + { 0x0013, 0x0085 }, + { 0x0013, 0x0086 }, + { 0x0013, 0x0087 }, + { 0x0013, 0x0088 }, + { 0x0013, 0x0089 }, + { 0x0012, 0x0046 }, + { 0x0012, 0x0047 }, + { 0x0012, 0x0048 }, + { 0x0012, 0x0049 }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec42[28][16] = { + { + 0x0001ffff, + 0x0002ffff, + 0x00010001, + 0x00010001, + 0x0001000d, + 0x0001000d, + 0x0001000e, + 0x0001000e, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x0003ffff, + 0x0004ffff, + 0x0000001c, + 0x00000028, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + }, + { + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001a, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + }, + { + 0x000affff, + 0x0007ffff, + 0x0005ffff, + 0x0006ffff, + 0x0001001d, + 0x0001001d, + 0x00010029, + 0x00010029, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + }, + { + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + }, + { + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + }, + { + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + }, + { + 0x001bffff, + 0x0009ffff, + 0x0008ffff, + 0x00000012, + 0x0000002b, + 0x00000037, + 0x0001001e, + 0x0001001e, + 0x00020004, + 0x00020004, + 0x00020004, + 0x00020004, + 0x00020036, + 0x00020036, + 0x00020036, + 0x00020036, + }, + { + 0x000200a7, + 0x000200a7, + 0x000200a7, + 0x000200a7, + 0x000200a8, + 0x000200a8, + 0x000200a8, + 0x000200a8, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + }, + { + 0x000100a3, + 0x000100a3, + 0x000100a4, + 0x000100a4, + 0x00020041, + 0x00020041, + 0x00020041, + 0x00020041, + 0x000200a5, + 0x000200a5, + 0x000200a5, + 0x000200a5, + 0x000200a6, + 0x000200a6, + 0x000200a6, + 0x000200a6, + }, + { + 0x000dffff, + 0x000bffff, + 0x000cffff, + 0x000effff, + 0x000fffff, + 0x0010ffff, + 0x0011ffff, + 0x0012ffff, + 0x0013ffff, + 0x0014ffff, + 0x0015ffff, + 0x0016ffff, + 0x0017ffff, + 0x0018ffff, + 0x0019ffff, + 0x001affff, + }, + { + 0x00010013, + 0x00010013, + 0x00010014, + 0x00010014, + 0x00010015, + 0x00010015, + 0x00010016, + 0x00010016, + 0x00010017, + 0x00010017, + 0x00010018, + 0x00010018, + 0x00010019, + 0x00010019, + 0x00010020, + 0x00010020, + }, + { + 0x00010021, + 0x00010021, + 0x00010022, + 0x00010022, + 0x00010023, + 0x00010023, + 0x00010024, + 0x00010024, + 0x00010025, + 0x00010025, + 0x00010026, + 0x00010026, + 0x0001002c, + 0x0001002c, + 0x0001002d, + 0x0001002d, + }, + { + 0x00010005, + 0x00010005, + 0x00010006, + 0x00010006, + 0x00010007, + 0x00010007, + 0x00010008, + 0x00010008, + 0x00010009, + 0x00010009, + 0x0001000a, + 0x0001000a, + 0x0001000b, + 0x0001000b, + 0x0001000c, + 0x0001000c, + }, + { + 0x0001002e, + 0x0001002e, + 0x0001002f, + 0x0001002f, + 0x00010030, + 0x00010030, + 0x00010031, + 0x00010031, + 0x00010032, + 0x00010032, + 0x00010033, + 0x00010033, + 0x00010038, + 0x00010038, + 0x00010039, + 0x00010039, + }, + { + 0x0001003a, + 0x0001003a, + 0x0001003b, + 0x0001003b, + 0x0001003c, + 0x0001003c, + 0x0001003d, + 0x0001003d, + 0x0001003e, + 0x0001003e, + 0x0001003f, + 0x0001003f, + 0x00010040, + 0x00010040, + 0x00010042, + 0x00010042, + }, + { + 0x00010043, + 0x00010043, + 0x00010044, + 0x00010044, + 0x00010045, + 0x00010045, + 0x00010046, + 0x00010046, + 0x00010047, + 0x00010047, + 0x00010048, + 0x00010048, + 0x00010049, + 0x00010049, + 0x0001004a, + 0x0001004a, + }, + { + 0x0001004b, + 0x0001004b, + 0x0001004c, + 0x0001004c, + 0x0001004d, + 0x0001004d, + 0x0001004e, + 0x0001004e, + 0x0001004f, + 0x0001004f, + 0x00010050, + 0x00010050, + 0x00010051, + 0x00010051, + 0x00010052, + 0x00010052, + }, + { + 0x00010053, + 0x00010053, + 0x00010054, + 0x00010054, + 0x00010055, + 0x00010055, + 0x00010056, + 0x00010056, + 0x00010057, + 0x00010057, + 0x00010058, + 0x00010058, + 0x00010059, + 0x00010059, + 0x0001005a, + 0x0001005a, + }, + { + 0x0001005b, + 0x0001005b, + 0x0001005c, + 0x0001005c, + 0x0001005d, + 0x0001005d, + 0x0001005e, + 0x0001005e, + 0x0001005f, + 0x0001005f, + 0x00010060, + 0x00010060, + 0x00010061, + 0x00010061, + 0x00010062, + 0x00010062, + }, + { + 0x00010063, + 0x00010063, + 0x00010064, + 0x00010064, + 0x00010065, + 0x00010065, + 0x00010066, + 0x00010066, + 0x00010067, + 0x00010067, + 0x00010068, + 0x00010068, + 0x00010069, + 0x00010069, + 0x0001006a, + 0x0001006a, + }, + { + 0x0001006b, + 0x0001006b, + 0x0001006c, + 0x0001006c, + 0x0001006d, + 0x0001006d, + 0x0001006e, + 0x0001006e, + 0x0001006f, + 0x0001006f, + 0x00010070, + 0x00010070, + 0x00010071, + 0x00010071, + 0x00010072, + 0x00010072, + }, + { + 0x00010073, + 0x00010073, + 0x00010074, + 0x00010074, + 0x00010075, + 0x00010075, + 0x00010076, + 0x00010076, + 0x00010077, + 0x00010077, + 0x00010078, + 0x00010078, + 0x00010079, + 0x00010079, + 0x0001007a, + 0x0001007a, + }, + { + 0x0001007b, + 0x0001007b, + 0x0001007c, + 0x0001007c, + 0x0001007d, + 0x0001007d, + 0x0001007e, + 0x0001007e, + 0x0001007f, + 0x0001007f, + 0x00010080, + 0x00010080, + 0x00010081, + 0x00010081, + 0x00010082, + 0x00010082, + }, + { + 0x00010083, + 0x00010083, + 0x00010084, + 0x00010084, + 0x00010085, + 0x00010085, + 0x00010086, + 0x00010086, + 0x00010087, + 0x00010087, + 0x00010088, + 0x00010088, + 0x00010089, + 0x00010089, + 0x0001008a, + 0x0001008a, + }, + { + 0x0001008b, + 0x0001008b, + 0x0001008c, + 0x0001008c, + 0x0001008d, + 0x0001008d, + 0x0001008e, + 0x0001008e, + 0x0001008f, + 0x0001008f, + 0x00010090, + 0x00010090, + 0x00010091, + 0x00010091, + 0x00010092, + 0x00010092, + }, + { + 0x00010093, + 0x00010093, + 0x00010094, + 0x00010094, + 0x00010095, + 0x00010095, + 0x00010096, + 0x00010096, + 0x00010097, + 0x00010097, + 0x00010098, + 0x00010098, + 0x00010099, + 0x00010099, + 0x0001009a, + 0x0001009a, + }, + { + 0x0001009b, + 0x0001009b, + 0x0001009c, + 0x0001009c, + 0x0001009d, + 0x0001009d, + 0x0001009e, + 0x0001009e, + 0x0001009f, + 0x0001009f, + 0x000100a0, + 0x000100a0, + 0x000100a1, + 0x000100a1, + 0x000100a2, + 0x000100a2, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc43[196][2] = +#else +const uint16_t c_aauiCQMFHuffEnc43[196][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0003, 0x0001 }, + { 0x0006, 0x0001 }, + { 0x0009, 0x0002 }, + { 0x000c, 0x0003 }, + { 0x0010, 0x0017 }, + { 0x0013, 0x0000 }, + { 0x0013, 0x0001 }, + { 0x0013, 0x0002 }, + { 0x0013, 0x0003 }, + { 0x0013, 0x0004 }, + { 0x0013, 0x0005 }, + { 0x0013, 0x0006 }, + { 0x0013, 0x0007 }, + { 0x0003, 0x0002 }, + { 0x0003, 0x0003 }, + { 0x0005, 0x0001 }, + { 0x0009, 0x0003 }, + { 0x000c, 0x0004 }, + { 0x0010, 0x0018 }, + { 0x0012, 0x0050 }, + { 0x0013, 0x0008 }, + { 0x0013, 0x0009 }, + { 0x0013, 0x000a }, + { 0x0013, 0x000b }, + { 0x0013, 0x000c }, + { 0x0013, 0x000d }, + { 0x0013, 0x000e }, + { 0x0005, 0x0002 }, + { 0x0005, 0x0003 }, + { 0x0008, 0x0003 }, + { 0x000a, 0x0002 }, + { 0x000d, 0x0004 }, + { 0x0011, 0x002a }, + { 0x0013, 0x000f }, + { 0x0013, 0x0010 }, + { 0x0013, 0x0011 }, + { 0x0013, 0x0012 }, + { 0x0013, 0x0013 }, + { 0x0013, 0x0014 }, + { 0x0013, 0x0015 }, + { 0x0013, 0x0016 }, + { 0x0009, 0x0004 }, + { 0x0009, 0x0005 }, + { 0x000a, 0x0003 }, + { 0x000c, 0x0005 }, + { 0x000f, 0x000d }, + { 0x0012, 0x0051 }, + { 0x0013, 0x0017 }, + { 0x0013, 0x0018 }, + { 0x0013, 0x0019 }, + { 0x0013, 0x001a }, + { 0x0013, 0x001b }, + { 0x0013, 0x001c }, + { 0x0013, 0x001d }, + { 0x0013, 0x001e }, + { 0x000c, 0x0006 }, + { 0x000c, 0x0007 }, + { 0x000d, 0x0005 }, + { 0x000f, 0x000e }, + { 0x0011, 0x002b }, + { 0x0013, 0x001f }, + { 0x0013, 0x0020 }, + { 0x0013, 0x0021 }, + { 0x0013, 0x0022 }, + { 0x0013, 0x0023 }, + { 0x0013, 0x0024 }, + { 0x0013, 0x0025 }, + { 0x0013, 0x0026 }, + { 0x0013, 0x0027 }, + { 0x0011, 0x002c }, + { 0x000f, 0x000f }, + { 0x0010, 0x0019 }, + { 0x0012, 0x0052 }, + { 0x0012, 0x0053 }, + { 0x0013, 0x0028 }, + { 0x0013, 0x0029 }, + { 0x0013, 0x002a }, + { 0x0013, 0x002b }, + { 0x0013, 0x002c }, + { 0x0013, 0x002d }, + { 0x0013, 0x002e }, + { 0x0013, 0x002f }, + { 0x0013, 0x0030 }, + { 0x0013, 0x0031 }, + { 0x0011, 0x002d }, + { 0x0013, 0x0032 }, + { 0x0013, 0x0033 }, + { 0x0013, 0x0034 }, + { 0x0013, 0x0035 }, + { 0x0013, 0x0036 }, + { 0x0013, 0x0037 }, + { 0x0013, 0x0038 }, + { 0x0013, 0x0039 }, + { 0x0013, 0x003a }, + { 0x0013, 0x003b }, + { 0x0013, 0x003c }, + { 0x0013, 0x003d }, + { 0x0013, 0x003e }, + { 0x0013, 0x003f }, + { 0x0013, 0x0040 }, + { 0x0013, 0x0041 }, + { 0x0013, 0x0042 }, + { 0x0013, 0x0043 }, + { 0x0013, 0x0044 }, + { 0x0013, 0x0045 }, + { 0x0013, 0x0046 }, + { 0x0013, 0x0047 }, + { 0x0013, 0x0048 }, + { 0x0013, 0x0049 }, + { 0x0013, 0x004a }, + { 0x0013, 0x004b }, + { 0x0013, 0x004c }, + { 0x0013, 0x004d }, + { 0x0013, 0x004e }, + { 0x0013, 0x004f }, + { 0x0013, 0x0050 }, + { 0x0013, 0x0051 }, + { 0x0013, 0x0052 }, + { 0x0013, 0x0053 }, + { 0x0013, 0x0054 }, + { 0x0013, 0x0055 }, + { 0x0013, 0x0056 }, + { 0x0013, 0x0057 }, + { 0x0013, 0x0058 }, + { 0x0013, 0x0059 }, + { 0x0013, 0x005a }, + { 0x0013, 0x005b }, + { 0x0013, 0x005c }, + { 0x0013, 0x005d }, + { 0x0013, 0x005e }, + { 0x0013, 0x005f }, + { 0x0013, 0x0060 }, + { 0x0013, 0x0061 }, + { 0x0013, 0x0062 }, + { 0x0013, 0x0063 }, + { 0x0013, 0x0064 }, + { 0x0013, 0x0065 }, + { 0x0013, 0x0066 }, + { 0x0013, 0x0067 }, + { 0x0013, 0x0068 }, + { 0x0013, 0x0069 }, + { 0x0013, 0x006a }, + { 0x0013, 0x006b }, + { 0x0013, 0x006c }, + { 0x0013, 0x006d }, + { 0x0013, 0x006e }, + { 0x0013, 0x006f }, + { 0x0013, 0x0070 }, + { 0x0013, 0x0071 }, + { 0x0013, 0x0072 }, + { 0x0013, 0x0073 }, + { 0x0013, 0x0074 }, + { 0x0013, 0x0075 }, + { 0x0013, 0x0076 }, + { 0x0013, 0x0077 }, + { 0x0013, 0x0078 }, + { 0x0013, 0x0079 }, + { 0x0013, 0x007a }, + { 0x0013, 0x007b }, + { 0x0013, 0x007c }, + { 0x0013, 0x007d }, + { 0x0013, 0x007e }, + { 0x0013, 0x007f }, + { 0x0013, 0x0080 }, + { 0x0013, 0x0081 }, + { 0x0013, 0x0082 }, + { 0x0013, 0x0083 }, + { 0x0013, 0x0084 }, + { 0x0013, 0x0085 }, + { 0x0013, 0x0086 }, + { 0x0013, 0x0087 }, + { 0x0013, 0x0088 }, + { 0x0013, 0x0089 }, + { 0x0013, 0x008a }, + { 0x0013, 0x008b }, + { 0x0013, 0x008c }, + { 0x0013, 0x008d }, + { 0x0013, 0x008e }, + { 0x0013, 0x008f }, + { 0x0013, 0x0090 }, + { 0x0013, 0x0091 }, + { 0x0013, 0x0092 }, + { 0x0013, 0x0093 }, + { 0x0013, 0x0094 }, + { 0x0013, 0x0095 }, + { 0x0013, 0x0096 }, + { 0x0013, 0x0097 }, + { 0x0013, 0x0098 }, + { 0x0013, 0x0099 }, + { 0x0013, 0x009a }, + { 0x0013, 0x009b }, + { 0x0013, 0x009c }, + { 0x0013, 0x009d }, + { 0x0013, 0x009e }, + { 0x0013, 0x009f }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec43[32][16] = { + { + 0x0001ffff, + 0x0002ffff, + 0x00010001, + 0x00010001, + 0x0001000e, + 0x0001000e, + 0x0001000f, + 0x0001000f, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x0005ffff, + 0x0003ffff, + 0x0004ffff, + 0x0000001e, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + }, + { + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + }, + { + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030003, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + 0x00030011, + }, + { + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + }, + { + 0x000bffff, + 0x0007ffff, + 0x0006ffff, + 0x00000004, + 0x00000012, + 0x0000002d, + 0x00000038, + 0x00000039, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x0002002c, + 0x0002002c, + 0x0002002c, + 0x0002002c, + }, + { + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + }, + { + 0x001cffff, + 0x001dffff, + 0x001effff, + 0x001fffff, + 0x000affff, + 0x0008ffff, + 0x0009ffff, + 0x00000005, + 0x00000013, + 0x00000048, + 0x0001002e, + 0x0001002e, + 0x0001003b, + 0x0001003b, + 0x00010047, + 0x00010047, + }, + { + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + }, + { + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + }, + { + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020014, + 0x0002002f, + 0x0002002f, + 0x0002002f, + 0x0002002f, + 0x00020049, + 0x00020049, + 0x00020049, + 0x00020049, + 0x0002004a, + 0x0002004a, + 0x0002004a, + 0x0002004a, + }, + { + 0x000dffff, + 0x000effff, + 0x000cffff, + 0x000fffff, + 0x0010ffff, + 0x0011ffff, + 0x0012ffff, + 0x0013ffff, + 0x0014ffff, + 0x0015ffff, + 0x0016ffff, + 0x0017ffff, + 0x0018ffff, + 0x0019ffff, + 0x001affff, + 0x001bffff, + }, + { + 0x00010023, + 0x00010023, + 0x00010024, + 0x00010024, + 0x00010025, + 0x00010025, + 0x00010026, + 0x00010026, + 0x00010027, + 0x00010027, + 0x00010028, + 0x00010028, + 0x00010029, + 0x00010029, + 0x00010030, + 0x00010030, + }, + { + 0x00010006, + 0x00010006, + 0x00010007, + 0x00010007, + 0x00010008, + 0x00010008, + 0x00010009, + 0x00010009, + 0x0001000a, + 0x0001000a, + 0x0001000b, + 0x0001000b, + 0x0001000c, + 0x0001000c, + 0x0001000d, + 0x0001000d, + }, + { + 0x00010015, + 0x00010015, + 0x00010016, + 0x00010016, + 0x00010017, + 0x00010017, + 0x00010018, + 0x00010018, + 0x00010019, + 0x00010019, + 0x0001001a, + 0x0001001a, + 0x0001001b, + 0x0001001b, + 0x00010022, + 0x00010022, + }, + { + 0x00010031, + 0x00010031, + 0x00010032, + 0x00010032, + 0x00010033, + 0x00010033, + 0x00010034, + 0x00010034, + 0x00010035, + 0x00010035, + 0x00010036, + 0x00010036, + 0x00010037, + 0x00010037, + 0x0001003d, + 0x0001003d, + }, + { + 0x0001003e, + 0x0001003e, + 0x0001003f, + 0x0001003f, + 0x00010040, + 0x00010040, + 0x00010041, + 0x00010041, + 0x00010042, + 0x00010042, + 0x00010043, + 0x00010043, + 0x00010044, + 0x00010044, + 0x00010045, + 0x00010045, + }, + { + 0x0001004b, + 0x0001004b, + 0x0001004c, + 0x0001004c, + 0x0001004d, + 0x0001004d, + 0x0001004e, + 0x0001004e, + 0x0001004f, + 0x0001004f, + 0x00010050, + 0x00010050, + 0x00010051, + 0x00010051, + 0x00010052, + 0x00010052, + }, + { + 0x00010053, + 0x00010053, + 0x00010054, + 0x00010054, + 0x00010056, + 0x00010056, + 0x00010057, + 0x00010057, + 0x00010058, + 0x00010058, + 0x00010059, + 0x00010059, + 0x0001005a, + 0x0001005a, + 0x0001005b, + 0x0001005b, + }, + { + 0x0001005c, + 0x0001005c, + 0x0001005d, + 0x0001005d, + 0x0001005e, + 0x0001005e, + 0x0001005f, + 0x0001005f, + 0x00010060, + 0x00010060, + 0x00010061, + 0x00010061, + 0x00010062, + 0x00010062, + 0x00010063, + 0x00010063, + }, + { + 0x00010064, + 0x00010064, + 0x00010065, + 0x00010065, + 0x00010066, + 0x00010066, + 0x00010067, + 0x00010067, + 0x00010068, + 0x00010068, + 0x00010069, + 0x00010069, + 0x0001006a, + 0x0001006a, + 0x0001006b, + 0x0001006b, + }, + { + 0x0001006c, + 0x0001006c, + 0x0001006d, + 0x0001006d, + 0x0001006e, + 0x0001006e, + 0x0001006f, + 0x0001006f, + 0x00010070, + 0x00010070, + 0x00010071, + 0x00010071, + 0x00010072, + 0x00010072, + 0x00010073, + 0x00010073, + }, + { + 0x00010074, + 0x00010074, + 0x00010075, + 0x00010075, + 0x00010076, + 0x00010076, + 0x00010077, + 0x00010077, + 0x00010078, + 0x00010078, + 0x00010079, + 0x00010079, + 0x0001007a, + 0x0001007a, + 0x0001007b, + 0x0001007b, + }, + { + 0x0001007c, + 0x0001007c, + 0x0001007d, + 0x0001007d, + 0x0001007e, + 0x0001007e, + 0x0001007f, + 0x0001007f, + 0x00010080, + 0x00010080, + 0x00010081, + 0x00010081, + 0x00010082, + 0x00010082, + 0x00010083, + 0x00010083, + }, + { + 0x00010084, + 0x00010084, + 0x00010085, + 0x00010085, + 0x00010086, + 0x00010086, + 0x00010087, + 0x00010087, + 0x00010088, + 0x00010088, + 0x00010089, + 0x00010089, + 0x0001008a, + 0x0001008a, + 0x0001008b, + 0x0001008b, + }, + { + 0x0001008c, + 0x0001008c, + 0x0001008d, + 0x0001008d, + 0x0001008e, + 0x0001008e, + 0x0001008f, + 0x0001008f, + 0x00010090, + 0x00010090, + 0x00010091, + 0x00010091, + 0x00010092, + 0x00010092, + 0x00010093, + 0x00010093, + }, + { + 0x00010094, + 0x00010094, + 0x00010095, + 0x00010095, + 0x00010096, + 0x00010096, + 0x00010097, + 0x00010097, + 0x00010098, + 0x00010098, + 0x00010099, + 0x00010099, + 0x0001009a, + 0x0001009a, + 0x0001009b, + 0x0001009b, + }, + { + 0x0001009c, + 0x0001009c, + 0x0001009d, + 0x0001009d, + 0x0001009e, + 0x0001009e, + 0x0001009f, + 0x0001009f, + 0x000100a0, + 0x000100a0, + 0x000100a1, + 0x000100a1, + 0x000100a2, + 0x000100a2, + 0x000100a3, + 0x000100a3, + }, + { + 0x000100a4, + 0x000100a4, + 0x000100a5, + 0x000100a5, + 0x000100a6, + 0x000100a6, + 0x000100a7, + 0x000100a7, + 0x000100a8, + 0x000100a8, + 0x000100a9, + 0x000100a9, + 0x000100aa, + 0x000100aa, + 0x000100ab, + 0x000100ab, + }, + { + 0x000100ac, + 0x000100ac, + 0x000100ad, + 0x000100ad, + 0x000100ae, + 0x000100ae, + 0x000100af, + 0x000100af, + 0x000100b0, + 0x000100b0, + 0x000100b1, + 0x000100b1, + 0x000100b2, + 0x000100b2, + 0x000100b3, + 0x000100b3, + }, + { + 0x000100b4, + 0x000100b4, + 0x000100b5, + 0x000100b5, + 0x000100b6, + 0x000100b6, + 0x000100b7, + 0x000100b7, + 0x000100b8, + 0x000100b8, + 0x000100b9, + 0x000100b9, + 0x000100ba, + 0x000100ba, + 0x000100bb, + 0x000100bb, + }, + { + 0x000100bc, + 0x000100bc, + 0x000100bd, + 0x000100bd, + 0x000100be, + 0x000100be, + 0x000100bf, + 0x000100bf, + 0x000100c0, + 0x000100c0, + 0x000100c1, + 0x000100c1, + 0x000100c2, + 0x000100c2, + 0x000100c3, + 0x000100c3, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc44[289][2] = +#else +const uint16_t c_aauiCQMFHuffEnc44[289][2] = +#endif + { + { 0x0001, 0x0001 }, + { 0x0003, 0x0001 }, + { 0x0006, 0x0002 }, + { 0x0008, 0x0002 }, + { 0x000b, 0x0002 }, + { 0x000f, 0x000a }, + { 0x0011, 0x0022 }, + { 0x0014, 0x0000 }, + { 0x0014, 0x0001 }, + { 0x0014, 0x0002 }, + { 0x0014, 0x0003 }, + { 0x0014, 0x0004 }, + { 0x0014, 0x0005 }, + { 0x0014, 0x0006 }, + { 0x0014, 0x0007 }, + { 0x0014, 0x0008 }, + { 0x0014, 0x0009 }, + { 0x0003, 0x0002 }, + { 0x0003, 0x0003 }, + { 0x0005, 0x0002 }, + { 0x0008, 0x0003 }, + { 0x000b, 0x0003 }, + { 0x000e, 0x0007 }, + { 0x0012, 0x003f }, + { 0x0014, 0x000a }, + { 0x0014, 0x000b }, + { 0x0014, 0x000c }, + { 0x0014, 0x000d }, + { 0x0014, 0x000e }, + { 0x0014, 0x000f }, + { 0x0014, 0x0010 }, + { 0x0014, 0x0011 }, + { 0x0014, 0x0012 }, + { 0x0014, 0x0013 }, + { 0x0006, 0x0003 }, + { 0x0005, 0x0003 }, + { 0x0007, 0x0003 }, + { 0x0009, 0x0002 }, + { 0x000c, 0x0003 }, + { 0x000f, 0x000b }, + { 0x0012, 0x0040 }, + { 0x0014, 0x0014 }, + { 0x0014, 0x0015 }, + { 0x0014, 0x0016 }, + { 0x0014, 0x0017 }, + { 0x0014, 0x0018 }, + { 0x0014, 0x0019 }, + { 0x0014, 0x001a }, + { 0x0014, 0x001b }, + { 0x0014, 0x001c }, + { 0x0014, 0x001d }, + { 0x0008, 0x0004 }, + { 0x0008, 0x0005 }, + { 0x0009, 0x0003 }, + { 0x000b, 0x0004 }, + { 0x000d, 0x0005 }, + { 0x0010, 0x0013 }, + { 0x0014, 0x001e }, + { 0x0014, 0x001f }, + { 0x0014, 0x0020 }, + { 0x0014, 0x0021 }, + { 0x0014, 0x0022 }, + { 0x0014, 0x0023 }, + { 0x0014, 0x0024 }, + { 0x0014, 0x0025 }, + { 0x0014, 0x0026 }, + { 0x0014, 0x0027 }, + { 0x0014, 0x0028 }, + { 0x000b, 0x0005 }, + { 0x000b, 0x0006 }, + { 0x000b, 0x0007 }, + { 0x000e, 0x0008 }, + { 0x0011, 0x0023 }, + { 0x0012, 0x0041 }, + { 0x0014, 0x0029 }, + { 0x0014, 0x002a }, + { 0x0013, 0x007b }, + { 0x0014, 0x002b }, + { 0x0014, 0x002c }, + { 0x0014, 0x002d }, + { 0x0014, 0x002e }, + { 0x0014, 0x002f }, + { 0x0014, 0x0030 }, + { 0x0014, 0x0031 }, + { 0x0014, 0x0032 }, + { 0x000f, 0x000c }, + { 0x000e, 0x0009 }, + { 0x000f, 0x000d }, + { 0x0011, 0x0024 }, + { 0x0012, 0x0042 }, + { 0x0014, 0x0033 }, + { 0x0014, 0x0034 }, + { 0x0014, 0x0035 }, + { 0x0014, 0x0036 }, + { 0x0014, 0x0037 }, + { 0x0014, 0x0038 }, + { 0x0014, 0x0039 }, + { 0x0014, 0x003a }, + { 0x0014, 0x003b }, + { 0x0014, 0x003c }, + { 0x0014, 0x003d }, + { 0x0014, 0x003e }, + { 0x0013, 0x007c }, + { 0x0011, 0x0025 }, + { 0x0012, 0x0043 }, + { 0x0014, 0x003f }, + { 0x0014, 0x0040 }, + { 0x0014, 0x0041 }, + { 0x0014, 0x0042 }, + { 0x0014, 0x0043 }, + { 0x0014, 0x0044 }, + { 0x0014, 0x0045 }, + { 0x0014, 0x0046 }, + { 0x0014, 0x0047 }, + { 0x0014, 0x0048 }, + { 0x0014, 0x0049 }, + { 0x0014, 0x004a }, + { 0x0014, 0x004b }, + { 0x0014, 0x004c }, + { 0x0014, 0x004d }, + { 0x0014, 0x004e }, + { 0x0014, 0x004f }, + { 0x0014, 0x0050 }, + { 0x0014, 0x0051 }, + { 0x0014, 0x0052 }, + { 0x0014, 0x0053 }, + { 0x0014, 0x0054 }, + { 0x0014, 0x0055 }, + { 0x0014, 0x0056 }, + { 0x0014, 0x0057 }, + { 0x0014, 0x0058 }, + { 0x0014, 0x0059 }, + { 0x0014, 0x005a }, + { 0x0014, 0x005b }, + { 0x0014, 0x005c }, + { 0x0014, 0x005d }, + { 0x0014, 0x005e }, + { 0x0014, 0x005f }, + { 0x0014, 0x0060 }, + { 0x0014, 0x0061 }, + { 0x0014, 0x0062 }, + { 0x0014, 0x0063 }, + { 0x0014, 0x0064 }, + { 0x0014, 0x0065 }, + { 0x0014, 0x0066 }, + { 0x0014, 0x0067 }, + { 0x0014, 0x0068 }, + { 0x0014, 0x0069 }, + { 0x0014, 0x006a }, + { 0x0014, 0x006b }, + { 0x0014, 0x006c }, + { 0x0014, 0x006d }, + { 0x0014, 0x006e }, + { 0x0014, 0x006f }, + { 0x0014, 0x0070 }, + { 0x0014, 0x0071 }, + { 0x0014, 0x0072 }, + { 0x0014, 0x0073 }, + { 0x0014, 0x0074 }, + { 0x0014, 0x0075 }, + { 0x0014, 0x0076 }, + { 0x0014, 0x0077 }, + { 0x0014, 0x0078 }, + { 0x0014, 0x0079 }, + { 0x0014, 0x007a }, + { 0x0014, 0x007b }, + { 0x0014, 0x007c }, + { 0x0014, 0x007d }, + { 0x0014, 0x007e }, + { 0x0014, 0x007f }, + { 0x0014, 0x0080 }, + { 0x0014, 0x0081 }, + { 0x0014, 0x0082 }, + { 0x0014, 0x0083 }, + { 0x0014, 0x0084 }, + { 0x0014, 0x0085 }, + { 0x0014, 0x0086 }, + { 0x0014, 0x0087 }, + { 0x0014, 0x0088 }, + { 0x0014, 0x0089 }, + { 0x0014, 0x008a }, + { 0x0014, 0x008b }, + { 0x0014, 0x008c }, + { 0x0014, 0x008d }, + { 0x0014, 0x008e }, + { 0x0014, 0x008f }, + { 0x0014, 0x0090 }, + { 0x0014, 0x0091 }, + { 0x0014, 0x0092 }, + { 0x0014, 0x0093 }, + { 0x0014, 0x0094 }, + { 0x0014, 0x0095 }, + { 0x0014, 0x0096 }, + { 0x0014, 0x0097 }, + { 0x0014, 0x0098 }, + { 0x0014, 0x0099 }, + { 0x0014, 0x009a }, + { 0x0014, 0x009b }, + { 0x0014, 0x009c }, + { 0x0014, 0x009d }, + { 0x0014, 0x009e }, + { 0x0014, 0x009f }, + { 0x0014, 0x00a0 }, + { 0x0014, 0x00a1 }, + { 0x0014, 0x00a2 }, + { 0x0014, 0x00a3 }, + { 0x0014, 0x00a4 }, + { 0x0014, 0x00a5 }, + { 0x0014, 0x00a6 }, + { 0x0014, 0x00a7 }, + { 0x0014, 0x00a8 }, + { 0x0014, 0x00a9 }, + { 0x0014, 0x00aa }, + { 0x0014, 0x00ab }, + { 0x0014, 0x00ac }, + { 0x0014, 0x00ad }, + { 0x0014, 0x00ae }, + { 0x0014, 0x00af }, + { 0x0014, 0x00b0 }, + { 0x0014, 0x00b1 }, + { 0x0014, 0x00b2 }, + { 0x0014, 0x00b3 }, + { 0x0014, 0x00b4 }, + { 0x0014, 0x00b5 }, + { 0x0014, 0x00b6 }, + { 0x0014, 0x00b7 }, + { 0x0014, 0x00b8 }, + { 0x0014, 0x00b9 }, + { 0x0014, 0x00ba }, + { 0x0014, 0x00bb }, + { 0x0014, 0x00bc }, + { 0x0014, 0x00bd }, + { 0x0014, 0x00be }, + { 0x0014, 0x00bf }, + { 0x0014, 0x00c0 }, + { 0x0014, 0x00c1 }, + { 0x0014, 0x00c2 }, + { 0x0014, 0x00c3 }, + { 0x0014, 0x00c4 }, + { 0x0014, 0x00c5 }, + { 0x0014, 0x00c6 }, + { 0x0014, 0x00c7 }, + { 0x0014, 0x00c8 }, + { 0x0014, 0x00c9 }, + { 0x0014, 0x00ca }, + { 0x0014, 0x00cb }, + { 0x0014, 0x00cc }, + { 0x0014, 0x00cd }, + { 0x0014, 0x00ce }, + { 0x0014, 0x00cf }, + { 0x0014, 0x00d0 }, + { 0x0014, 0x00d1 }, + { 0x0014, 0x00d2 }, + { 0x0014, 0x00d3 }, + { 0x0014, 0x00d4 }, + { 0x0014, 0x00d5 }, + { 0x0014, 0x00d6 }, + { 0x0014, 0x00d7 }, + { 0x0014, 0x00d8 }, + { 0x0014, 0x00d9 }, + { 0x0014, 0x00da }, + { 0x0014, 0x00db }, + { 0x0014, 0x00dc }, + { 0x0014, 0x00dd }, + { 0x0014, 0x00de }, + { 0x0014, 0x00df }, + { 0x0014, 0x00e0 }, + { 0x0014, 0x00e1 }, + { 0x0014, 0x00e2 }, + { 0x0014, 0x00e3 }, + { 0x0014, 0x00e4 }, + { 0x0014, 0x00e5 }, + { 0x0014, 0x00e6 }, + { 0x0014, 0x00e7 }, + { 0x0014, 0x00e8 }, + { 0x0014, 0x00e9 }, + { 0x0014, 0x00ea }, + { 0x0014, 0x00eb }, + { 0x0014, 0x00ec }, + { 0x0014, 0x00ed }, + { 0x0014, 0x00ee }, + { 0x0014, 0x00ef }, + { 0x0014, 0x00f0 }, + { 0x0014, 0x00f1 }, + { 0x0014, 0x00f2 }, + { 0x0014, 0x00f3 }, + { 0x0014, 0x00f4 }, + { 0x0014, 0x00f5 }, + { 0x0013, 0x007d }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec44[27][16] = { + { + 0x0002ffff, + 0x0001ffff, + 0x00010001, + 0x00010001, + 0x00010011, + 0x00010011, + 0x00010012, + 0x00010012, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + 0x00030000, + }, + { + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + }, + { + 0x0004ffff, + 0x0003ffff, + 0x00000003, + 0x00000014, + 0x00000033, + 0x00000034, + 0x00010024, + 0x00010024, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020022, + 0x00020022, + 0x00020022, + 0x00020022, + }, + { + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + }, + { + 0x000affff, + 0x0006ffff, + 0x0005ffff, + 0x00000026, + 0x00010004, + 0x00010004, + 0x00010015, + 0x00010015, + 0x00010036, + 0x00010036, + 0x00010044, + 0x00010044, + 0x00010045, + 0x00010045, + 0x00010046, + 0x00010046, + }, + { + 0x00020047, + 0x00020047, + 0x00020047, + 0x00020047, + 0x00020056, + 0x00020056, + 0x00020056, + 0x00020056, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + }, + { + 0x0009ffff, + 0x0007ffff, + 0x0008ffff, + 0x00000038, + 0x00010005, + 0x00010005, + 0x00010027, + 0x00010027, + 0x00010055, + 0x00010055, + 0x00010057, + 0x00010057, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020016, + }, + { + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + }, + { + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030067, + 0x00030067, + 0x00030067, + 0x00030067, + 0x00030067, + 0x00030067, + 0x00030067, + 0x00030067, + }, + { + 0x00020028, + 0x00020028, + 0x00020028, + 0x00020028, + 0x00020049, + 0x00020049, + 0x00020049, + 0x00020049, + 0x00020059, + 0x00020059, + 0x00020059, + 0x00020059, + 0x00020068, + 0x00020068, + 0x00020068, + 0x00020068, + }, + { + 0x000dffff, + 0x000cffff, + 0x000effff, + 0x000fffff, + 0x0010ffff, + 0x0011ffff, + 0x0012ffff, + 0x0013ffff, + 0x0014ffff, + 0x0015ffff, + 0x0016ffff, + 0x0017ffff, + 0x0018ffff, + 0x0019ffff, + 0x001affff, + 0x000bffff, + }, + { + 0x0000011a, + 0x0000011b, + 0x0000011c, + 0x0000011d, + 0x0000011e, + 0x0000011f, + 0x0001004c, + 0x0001004c, + 0x00010066, + 0x00010066, + 0x00010120, + 0x00010120, + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020017, + }, + { + 0x0000001e, + 0x0000001f, + 0x00000020, + 0x00000021, + 0x00000029, + 0x0000002a, + 0x0000002b, + 0x0000002c, + 0x0000002d, + 0x0000002e, + 0x0000002f, + 0x00000030, + 0x00000031, + 0x00000032, + 0x00000039, + 0x0000003a, + }, + { + 0x00000007, + 0x00000008, + 0x00000009, + 0x0000000a, + 0x0000000b, + 0x0000000c, + 0x0000000d, + 0x0000000e, + 0x0000000f, + 0x00000010, + 0x00000018, + 0x00000019, + 0x0000001a, + 0x0000001b, + 0x0000001c, + 0x0000001d, + }, + { + 0x0000003b, + 0x0000003c, + 0x0000003d, + 0x0000003e, + 0x0000003f, + 0x00000040, + 0x00000041, + 0x00000042, + 0x00000043, + 0x0000004a, + 0x0000004b, + 0x0000004d, + 0x0000004e, + 0x0000004f, + 0x00000050, + 0x00000051, + }, + { + 0x00000052, + 0x00000053, + 0x00000054, + 0x0000005a, + 0x0000005b, + 0x0000005c, + 0x0000005d, + 0x0000005e, + 0x0000005f, + 0x00000060, + 0x00000061, + 0x00000062, + 0x00000063, + 0x00000064, + 0x00000065, + 0x00000069, + }, + { + 0x0000006a, + 0x0000006b, + 0x0000006c, + 0x0000006d, + 0x0000006e, + 0x0000006f, + 0x00000070, + 0x00000071, + 0x00000072, + 0x00000073, + 0x00000074, + 0x00000075, + 0x00000076, + 0x00000077, + 0x00000078, + 0x00000079, + }, + { + 0x0000007a, + 0x0000007b, + 0x0000007c, + 0x0000007d, + 0x0000007e, + 0x0000007f, + 0x00000080, + 0x00000081, + 0x00000082, + 0x00000083, + 0x00000084, + 0x00000085, + 0x00000086, + 0x00000087, + 0x00000088, + 0x00000089, + }, + { + 0x0000008a, + 0x0000008b, + 0x0000008c, + 0x0000008d, + 0x0000008e, + 0x0000008f, + 0x00000090, + 0x00000091, + 0x00000092, + 0x00000093, + 0x00000094, + 0x00000095, + 0x00000096, + 0x00000097, + 0x00000098, + 0x00000099, + }, + { + 0x0000009a, + 0x0000009b, + 0x0000009c, + 0x0000009d, + 0x0000009e, + 0x0000009f, + 0x000000a0, + 0x000000a1, + 0x000000a2, + 0x000000a3, + 0x000000a4, + 0x000000a5, + 0x000000a6, + 0x000000a7, + 0x000000a8, + 0x000000a9, + }, + { + 0x000000aa, + 0x000000ab, + 0x000000ac, + 0x000000ad, + 0x000000ae, + 0x000000af, + 0x000000b0, + 0x000000b1, + 0x000000b2, + 0x000000b3, + 0x000000b4, + 0x000000b5, + 0x000000b6, + 0x000000b7, + 0x000000b8, + 0x000000b9, + }, + { + 0x000000ba, + 0x000000bb, + 0x000000bc, + 0x000000bd, + 0x000000be, + 0x000000bf, + 0x000000c0, + 0x000000c1, + 0x000000c2, + 0x000000c3, + 0x000000c4, + 0x000000c5, + 0x000000c6, + 0x000000c7, + 0x000000c8, + 0x000000c9, + }, + { + 0x000000ca, + 0x000000cb, + 0x000000cc, + 0x000000cd, + 0x000000ce, + 0x000000cf, + 0x000000d0, + 0x000000d1, + 0x000000d2, + 0x000000d3, + 0x000000d4, + 0x000000d5, + 0x000000d6, + 0x000000d7, + 0x000000d8, + 0x000000d9, + }, + { + 0x000000da, + 0x000000db, + 0x000000dc, + 0x000000dd, + 0x000000de, + 0x000000df, + 0x000000e0, + 0x000000e1, + 0x000000e2, + 0x000000e3, + 0x000000e4, + 0x000000e5, + 0x000000e6, + 0x000000e7, + 0x000000e8, + 0x000000e9, + }, + { + 0x000000ea, + 0x000000eb, + 0x000000ec, + 0x000000ed, + 0x000000ee, + 0x000000ef, + 0x000000f0, + 0x000000f1, + 0x000000f2, + 0x000000f3, + 0x000000f4, + 0x000000f5, + 0x000000f6, + 0x000000f7, + 0x000000f8, + 0x000000f9, + }, + { + 0x000000fa, + 0x000000fb, + 0x000000fc, + 0x000000fd, + 0x000000fe, + 0x000000ff, + 0x00000100, + 0x00000101, + 0x00000102, + 0x00000103, + 0x00000104, + 0x00000105, + 0x00000106, + 0x00000107, + 0x00000108, + 0x00000109, + }, + { + 0x0000010a, + 0x0000010b, + 0x0000010c, + 0x0000010d, + 0x0000010e, + 0x0000010f, + 0x00000110, + 0x00000111, + 0x00000112, + 0x00000113, + 0x00000114, + 0x00000115, + 0x00000116, + 0x00000117, + 0x00000118, + 0x00000119, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc45[324][2] = +#else +const uint16_t c_aauiCQMFHuffEnc45[324][2] = +#endif + { + { 0x0002, 0x0002 }, + { 0x0003, 0x0002 }, + { 0x0005, 0x0003 }, + { 0x0007, 0x0002 }, + { 0x0009, 0x0003 }, + { 0x000c, 0x0005 }, + { 0x0010, 0x0025 }, + { 0x0012, 0x0088 }, + { 0x0013, 0x0000 }, + { 0x0013, 0x0001 }, + { 0x0013, 0x0002 }, + { 0x0013, 0x0003 }, + { 0x0013, 0x0004 }, + { 0x0013, 0x0005 }, + { 0x0013, 0x0006 }, + { 0x0013, 0x0007 }, + { 0x0013, 0x0008 }, + { 0x0013, 0x0009 }, + { 0x0002, 0x0003 }, + { 0x0003, 0x0003 }, + { 0x0005, 0x0004 }, + { 0x0006, 0x0003 }, + { 0x0009, 0x0004 }, + { 0x000b, 0x0004 }, + { 0x000f, 0x0014 }, + { 0x0011, 0x0048 }, + { 0x0013, 0x000a }, + { 0x0013, 0x000b }, + { 0x0013, 0x000c }, + { 0x0013, 0x000d }, + { 0x0013, 0x000e }, + { 0x0013, 0x000f }, + { 0x0013, 0x0010 }, + { 0x0013, 0x0011 }, + { 0x0013, 0x0012 }, + { 0x0013, 0x0013 }, + { 0x0005, 0x0005 }, + { 0x0004, 0x0003 }, + { 0x0006, 0x0004 }, + { 0x0007, 0x0003 }, + { 0x000a, 0x0004 }, + { 0x000d, 0x0007 }, + { 0x000f, 0x0015 }, + { 0x0013, 0x0014 }, + { 0x0013, 0x0015 }, + { 0x0013, 0x0016 }, + { 0x0013, 0x0017 }, + { 0x0013, 0x0018 }, + { 0x0013, 0x0019 }, + { 0x0013, 0x001a }, + { 0x0013, 0x001b }, + { 0x0013, 0x001c }, + { 0x0013, 0x001d }, + { 0x0013, 0x001e }, + { 0x0007, 0x0004 }, + { 0x0006, 0x0005 }, + { 0x0007, 0x0005 }, + { 0x0009, 0x0005 }, + { 0x000b, 0x0005 }, + { 0x000d, 0x0008 }, + { 0x0010, 0x0026 }, + { 0x0012, 0x0089 }, + { 0x0012, 0x008a }, + { 0x0013, 0x001f }, + { 0x0013, 0x0020 }, + { 0x0013, 0x0021 }, + { 0x0013, 0x0022 }, + { 0x0013, 0x0023 }, + { 0x0013, 0x0024 }, + { 0x0013, 0x0025 }, + { 0x0013, 0x0026 }, + { 0x0013, 0x0027 }, + { 0x0009, 0x0006 }, + { 0x0009, 0x0007 }, + { 0x000a, 0x0005 }, + { 0x000b, 0x0006 }, + { 0x000d, 0x0009 }, + { 0x000f, 0x0016 }, + { 0x0011, 0x0049 }, + { 0x0013, 0x0028 }, + { 0x0013, 0x0029 }, + { 0x0013, 0x002a }, + { 0x0013, 0x002b }, + { 0x0013, 0x002c }, + { 0x0013, 0x002d }, + { 0x0013, 0x002e }, + { 0x0013, 0x002f }, + { 0x0013, 0x0030 }, + { 0x0013, 0x0031 }, + { 0x0013, 0x0032 }, + { 0x000c, 0x0006 }, + { 0x000b, 0x0007 }, + { 0x000c, 0x0007 }, + { 0x000e, 0x000d }, + { 0x0010, 0x0027 }, + { 0x0012, 0x008b }, + { 0x0012, 0x008c }, + { 0x0013, 0x0033 }, + { 0x0013, 0x0034 }, + { 0x0013, 0x0035 }, + { 0x0013, 0x0036 }, + { 0x0013, 0x0037 }, + { 0x0013, 0x0038 }, + { 0x0013, 0x0039 }, + { 0x0013, 0x003a }, + { 0x0013, 0x003b }, + { 0x0013, 0x003c }, + { 0x0013, 0x003d }, + { 0x000f, 0x0017 }, + { 0x000f, 0x0018 }, + { 0x000f, 0x0019 }, + { 0x0012, 0x008d }, + { 0x0013, 0x003e }, + { 0x0013, 0x003f }, + { 0x0013, 0x0040 }, + { 0x0013, 0x0041 }, + { 0x0013, 0x0042 }, + { 0x0013, 0x0043 }, + { 0x0013, 0x0044 }, + { 0x0013, 0x0045 }, + { 0x0013, 0x0046 }, + { 0x0013, 0x0047 }, + { 0x0013, 0x0048 }, + { 0x0013, 0x0049 }, + { 0x0013, 0x004a }, + { 0x0013, 0x004b }, + { 0x0013, 0x004c }, + { 0x0012, 0x008e }, + { 0x0012, 0x008f }, + { 0x0013, 0x004d }, + { 0x0013, 0x004e }, + { 0x0013, 0x004f }, + { 0x0013, 0x0050 }, + { 0x0013, 0x0051 }, + { 0x0013, 0x0052 }, + { 0x0013, 0x0053 }, + { 0x0013, 0x0054 }, + { 0x0013, 0x0055 }, + { 0x0013, 0x0056 }, + { 0x0013, 0x0057 }, + { 0x0013, 0x0058 }, + { 0x0013, 0x0059 }, + { 0x0013, 0x005a }, + { 0x0013, 0x005b }, + { 0x0013, 0x005c }, + { 0x0013, 0x005d }, + { 0x0013, 0x005e }, + { 0x0013, 0x005f }, + { 0x0013, 0x0060 }, + { 0x0013, 0x0061 }, + { 0x0013, 0x0062 }, + { 0x0013, 0x0063 }, + { 0x0013, 0x0064 }, + { 0x0013, 0x0065 }, + { 0x0013, 0x0066 }, + { 0x0013, 0x0067 }, + { 0x0013, 0x0068 }, + { 0x0013, 0x0069 }, + { 0x0013, 0x006a }, + { 0x0013, 0x006b }, + { 0x0013, 0x006c }, + { 0x0013, 0x006d }, + { 0x0013, 0x006e }, + { 0x0013, 0x006f }, + { 0x0013, 0x0070 }, + { 0x0013, 0x0071 }, + { 0x0013, 0x0072 }, + { 0x0013, 0x0073 }, + { 0x0013, 0x0074 }, + { 0x0013, 0x0075 }, + { 0x0013, 0x0076 }, + { 0x0013, 0x0077 }, + { 0x0013, 0x0078 }, + { 0x0013, 0x0079 }, + { 0x0013, 0x007a }, + { 0x0013, 0x007b }, + { 0x0013, 0x007c }, + { 0x0013, 0x007d }, + { 0x0013, 0x007e }, + { 0x0013, 0x007f }, + { 0x0013, 0x0080 }, + { 0x0013, 0x0081 }, + { 0x0013, 0x0082 }, + { 0x0013, 0x0083 }, + { 0x0013, 0x0084 }, + { 0x0013, 0x0085 }, + { 0x0013, 0x0086 }, + { 0x0013, 0x0087 }, + { 0x0013, 0x0088 }, + { 0x0013, 0x0089 }, + { 0x0013, 0x008a }, + { 0x0013, 0x008b }, + { 0x0013, 0x008c }, + { 0x0013, 0x008d }, + { 0x0013, 0x008e }, + { 0x0013, 0x008f }, + { 0x0013, 0x0090 }, + { 0x0013, 0x0091 }, + { 0x0013, 0x0092 }, + { 0x0013, 0x0093 }, + { 0x0013, 0x0094 }, + { 0x0013, 0x0095 }, + { 0x0013, 0x0096 }, + { 0x0013, 0x0097 }, + { 0x0013, 0x0098 }, + { 0x0013, 0x0099 }, + { 0x0013, 0x009a }, + { 0x0013, 0x009b }, + { 0x0013, 0x009c }, + { 0x0013, 0x009d }, + { 0x0013, 0x009e }, + { 0x0013, 0x009f }, + { 0x0013, 0x00a0 }, + { 0x0013, 0x00a1 }, + { 0x0013, 0x00a2 }, + { 0x0013, 0x00a3 }, + { 0x0013, 0x00a4 }, + { 0x0013, 0x00a5 }, + { 0x0013, 0x00a6 }, + { 0x0013, 0x00a7 }, + { 0x0013, 0x00a8 }, + { 0x0013, 0x00a9 }, + { 0x0013, 0x00aa }, + { 0x0013, 0x00ab }, + { 0x0013, 0x00ac }, + { 0x0013, 0x00ad }, + { 0x0013, 0x00ae }, + { 0x0013, 0x00af }, + { 0x0013, 0x00b0 }, + { 0x0013, 0x00b1 }, + { 0x0013, 0x00b2 }, + { 0x0013, 0x00b3 }, + { 0x0013, 0x00b4 }, + { 0x0013, 0x00b5 }, + { 0x0013, 0x00b6 }, + { 0x0013, 0x00b7 }, + { 0x0013, 0x00b8 }, + { 0x0013, 0x00b9 }, + { 0x0013, 0x00ba }, + { 0x0013, 0x00bb }, + { 0x0013, 0x00bc }, + { 0x0013, 0x00bd }, + { 0x0013, 0x00be }, + { 0x0013, 0x00bf }, + { 0x0013, 0x00c0 }, + { 0x0013, 0x00c1 }, + { 0x0013, 0x00c2 }, + { 0x0013, 0x00c3 }, + { 0x0013, 0x00c4 }, + { 0x0013, 0x00c5 }, + { 0x0013, 0x00c6 }, + { 0x0013, 0x00c7 }, + { 0x0013, 0x00c8 }, + { 0x0013, 0x00c9 }, + { 0x0013, 0x00ca }, + { 0x0013, 0x00cb }, + { 0x0013, 0x00cc }, + { 0x0013, 0x00cd }, + { 0x0013, 0x00ce }, + { 0x0013, 0x00cf }, + { 0x0013, 0x00d0 }, + { 0x0013, 0x00d1 }, + { 0x0013, 0x00d2 }, + { 0x0013, 0x00d3 }, + { 0x0013, 0x00d4 }, + { 0x0013, 0x00d5 }, + { 0x0013, 0x00d6 }, + { 0x0013, 0x00d7 }, + { 0x0013, 0x00d8 }, + { 0x0013, 0x00d9 }, + { 0x0013, 0x00da }, + { 0x0013, 0x00db }, + { 0x0013, 0x00dc }, + { 0x0013, 0x00dd }, + { 0x0013, 0x00de }, + { 0x0013, 0x00df }, + { 0x0013, 0x00e0 }, + { 0x0013, 0x00e1 }, + { 0x0013, 0x00e2 }, + { 0x0013, 0x00e3 }, + { 0x0013, 0x00e4 }, + { 0x0013, 0x00e5 }, + { 0x0013, 0x00e6 }, + { 0x0013, 0x00e7 }, + { 0x0013, 0x00e8 }, + { 0x0013, 0x00e9 }, + { 0x0013, 0x00ea }, + { 0x0013, 0x00eb }, + { 0x0013, 0x00ec }, + { 0x0013, 0x00ed }, + { 0x0013, 0x00ee }, + { 0x0013, 0x00ef }, + { 0x0013, 0x00f0 }, + { 0x0013, 0x00f1 }, + { 0x0013, 0x00f2 }, + { 0x0013, 0x00f3 }, + { 0x0013, 0x00f4 }, + { 0x0013, 0x00f5 }, + { 0x0013, 0x00f6 }, + { 0x0013, 0x00f7 }, + { 0x0013, 0x00f8 }, + { 0x0013, 0x00f9 }, + { 0x0013, 0x00fa }, + { 0x0013, 0x00fb }, + { 0x0013, 0x00fc }, + { 0x0013, 0x00fd }, + { 0x0013, 0x00fe }, + { 0x0013, 0x00ff }, + { 0x0013, 0x0100 }, + { 0x0013, 0x0101 }, + { 0x0013, 0x0102 }, + { 0x0013, 0x0103 }, + { 0x0013, 0x0104 }, + { 0x0013, 0x0105 }, + { 0x0013, 0x0106 }, + { 0x0013, 0x0107 }, + { 0x0013, 0x0108 }, + { 0x0013, 0x0109 }, + { 0x0013, 0x010a }, + { 0x0013, 0x010b }, + { 0x0013, 0x010c }, + { 0x0013, 0x010d }, + { 0x0013, 0x010e }, + { 0x0013, 0x010f }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec45[50][16] = { + { + 0x0003ffff, + 0x0001ffff, + 0x0002ffff, + 0x00000025, + 0x00010001, + 0x00010001, + 0x00010013, + 0x00010013, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020012, + }, + { + 0x00020026, + 0x00020026, + 0x00020026, + 0x00020026, + 0x00020037, + 0x00020037, + 0x00020037, + 0x00020037, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + }, + { + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + }, + { + 0x0007ffff, + 0x0005ffff, + 0x0004ffff, + 0x0006ffff, + 0x00010003, + 0x00010003, + 0x00010027, + 0x00010027, + 0x00010036, + 0x00010036, + 0x00010038, + 0x00010038, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020015, + }, + { + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + 0x00030039, + }, + { + 0x00020028, + 0x00020028, + 0x00020028, + 0x00020028, + 0x0002004a, + 0x0002004a, + 0x0002004a, + 0x0002004a, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + }, + { + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + }, + { + 0x000effff, + 0x001fffff, + 0x000affff, + 0x0008ffff, + 0x0009ffff, + 0x00000005, + 0x0000005a, + 0x0000005c, + 0x00010017, + 0x00010017, + 0x0001003a, + 0x0001003a, + 0x0001004b, + 0x0001004b, + 0x0001005b, + 0x0001005b, + }, + { + 0x0001006d, + 0x0001006d, + 0x0001006e, + 0x0001006e, + 0x0002005d, + 0x0002005d, + 0x0002005d, + 0x0002005d, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + }, + { + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + }, + { + 0x0030ffff, + 0x0031ffff, + 0x000cffff, + 0x000dffff, + 0x000bffff, + 0x00000006, + 0x0000003c, + 0x0000005e, + 0x00010018, + 0x00010018, + 0x0001002a, + 0x0001002a, + 0x0001004d, + 0x0001004d, + 0x0001006c, + 0x0001006c, + }, + { + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + }, + { + 0x00020007, + 0x00020007, + 0x00020007, + 0x00020007, + 0x0002003d, + 0x0002003d, + 0x0002003d, + 0x0002003d, + 0x0002003e, + 0x0002003e, + 0x0002003e, + 0x0002003e, + 0x0002005f, + 0x0002005f, + 0x0002005f, + 0x0002005f, + }, + { + 0x00020060, + 0x00020060, + 0x00020060, + 0x00020060, + 0x0002006f, + 0x0002006f, + 0x0002006f, + 0x0002006f, + 0x0002007f, + 0x0002007f, + 0x0002007f, + 0x0002007f, + 0x00020080, + 0x00020080, + 0x00020080, + 0x00020080, + }, + { + 0x0010ffff, + 0x0011ffff, + 0x0012ffff, + 0x000fffff, + 0x0013ffff, + 0x0014ffff, + 0x0015ffff, + 0x0016ffff, + 0x0017ffff, + 0x0018ffff, + 0x0019ffff, + 0x001affff, + 0x001bffff, + 0x001cffff, + 0x001dffff, + 0x001effff, + }, + { + 0x0001002f, + 0x0001002f, + 0x00010030, + 0x00010030, + 0x00010031, + 0x00010031, + 0x00010032, + 0x00010032, + 0x00010033, + 0x00010033, + 0x00010034, + 0x00010034, + 0x00010035, + 0x00010035, + 0x0001003f, + 0x0001003f, + }, + { + 0x00010008, + 0x00010008, + 0x00010009, + 0x00010009, + 0x0001000a, + 0x0001000a, + 0x0001000b, + 0x0001000b, + 0x0001000c, + 0x0001000c, + 0x0001000d, + 0x0001000d, + 0x0001000e, + 0x0001000e, + 0x0001000f, + 0x0001000f, + }, + { + 0x00010010, + 0x00010010, + 0x00010011, + 0x00010011, + 0x0001001a, + 0x0001001a, + 0x0001001b, + 0x0001001b, + 0x0001001c, + 0x0001001c, + 0x0001001d, + 0x0001001d, + 0x0001001e, + 0x0001001e, + 0x0001001f, + 0x0001001f, + }, + { + 0x00010020, + 0x00010020, + 0x00010021, + 0x00010021, + 0x00010022, + 0x00010022, + 0x00010023, + 0x00010023, + 0x0001002b, + 0x0001002b, + 0x0001002c, + 0x0001002c, + 0x0001002d, + 0x0001002d, + 0x0001002e, + 0x0001002e, + }, + { + 0x00010040, + 0x00010040, + 0x00010041, + 0x00010041, + 0x00010042, + 0x00010042, + 0x00010043, + 0x00010043, + 0x00010044, + 0x00010044, + 0x00010045, + 0x00010045, + 0x00010046, + 0x00010046, + 0x00010047, + 0x00010047, + }, + { + 0x0001004f, + 0x0001004f, + 0x00010050, + 0x00010050, + 0x00010051, + 0x00010051, + 0x00010052, + 0x00010052, + 0x00010053, + 0x00010053, + 0x00010054, + 0x00010054, + 0x00010055, + 0x00010055, + 0x00010056, + 0x00010056, + }, + { + 0x00010057, + 0x00010057, + 0x00010058, + 0x00010058, + 0x00010059, + 0x00010059, + 0x00010061, + 0x00010061, + 0x00010062, + 0x00010062, + 0x00010063, + 0x00010063, + 0x00010064, + 0x00010064, + 0x00010065, + 0x00010065, + }, + { + 0x00010066, + 0x00010066, + 0x00010067, + 0x00010067, + 0x00010068, + 0x00010068, + 0x00010069, + 0x00010069, + 0x0001006a, + 0x0001006a, + 0x0001006b, + 0x0001006b, + 0x00010070, + 0x00010070, + 0x00010071, + 0x00010071, + }, + { + 0x00010072, + 0x00010072, + 0x00010073, + 0x00010073, + 0x00010074, + 0x00010074, + 0x00010075, + 0x00010075, + 0x00010076, + 0x00010076, + 0x00010077, + 0x00010077, + 0x00010078, + 0x00010078, + 0x00010079, + 0x00010079, + }, + { + 0x0001007a, + 0x0001007a, + 0x0001007b, + 0x0001007b, + 0x0001007c, + 0x0001007c, + 0x0001007d, + 0x0001007d, + 0x0001007e, + 0x0001007e, + 0x00010081, + 0x00010081, + 0x00010082, + 0x00010082, + 0x00010083, + 0x00010083, + }, + { + 0x00010084, + 0x00010084, + 0x00010085, + 0x00010085, + 0x00010086, + 0x00010086, + 0x00010087, + 0x00010087, + 0x00010088, + 0x00010088, + 0x00010089, + 0x00010089, + 0x0001008a, + 0x0001008a, + 0x0001008b, + 0x0001008b, + }, + { + 0x0001008c, + 0x0001008c, + 0x0001008d, + 0x0001008d, + 0x0001008e, + 0x0001008e, + 0x0001008f, + 0x0001008f, + 0x00010090, + 0x00010090, + 0x00010091, + 0x00010091, + 0x00010092, + 0x00010092, + 0x00010093, + 0x00010093, + }, + { + 0x00010094, + 0x00010094, + 0x00010095, + 0x00010095, + 0x00010096, + 0x00010096, + 0x00010097, + 0x00010097, + 0x00010098, + 0x00010098, + 0x00010099, + 0x00010099, + 0x0001009a, + 0x0001009a, + 0x0001009b, + 0x0001009b, + }, + { + 0x0001009c, + 0x0001009c, + 0x0001009d, + 0x0001009d, + 0x0001009e, + 0x0001009e, + 0x0001009f, + 0x0001009f, + 0x000100a0, + 0x000100a0, + 0x000100a1, + 0x000100a1, + 0x000100a2, + 0x000100a2, + 0x000100a3, + 0x000100a3, + }, + { + 0x000100a4, + 0x000100a4, + 0x000100a5, + 0x000100a5, + 0x000100a6, + 0x000100a6, + 0x000100a7, + 0x000100a7, + 0x000100a8, + 0x000100a8, + 0x000100a9, + 0x000100a9, + 0x000100aa, + 0x000100aa, + 0x000100ab, + 0x000100ab, + }, + { + 0x000100ac, + 0x000100ac, + 0x000100ad, + 0x000100ad, + 0x000100ae, + 0x000100ae, + 0x000100af, + 0x000100af, + 0x000100b0, + 0x000100b0, + 0x000100b1, + 0x000100b1, + 0x000100b2, + 0x000100b2, + 0x000100b3, + 0x000100b3, + }, + { + 0x0020ffff, + 0x0021ffff, + 0x0022ffff, + 0x0023ffff, + 0x0024ffff, + 0x0025ffff, + 0x0026ffff, + 0x0027ffff, + 0x0028ffff, + 0x0029ffff, + 0x002affff, + 0x002bffff, + 0x002cffff, + 0x002dffff, + 0x002effff, + 0x002fffff, + }, + { + 0x000100b4, + 0x000100b4, + 0x000100b5, + 0x000100b5, + 0x000100b6, + 0x000100b6, + 0x000100b7, + 0x000100b7, + 0x000100b8, + 0x000100b8, + 0x000100b9, + 0x000100b9, + 0x000100ba, + 0x000100ba, + 0x000100bb, + 0x000100bb, + }, + { + 0x000100bc, + 0x000100bc, + 0x000100bd, + 0x000100bd, + 0x000100be, + 0x000100be, + 0x000100bf, + 0x000100bf, + 0x000100c0, + 0x000100c0, + 0x000100c1, + 0x000100c1, + 0x000100c2, + 0x000100c2, + 0x000100c3, + 0x000100c3, + }, + { + 0x000100c4, + 0x000100c4, + 0x000100c5, + 0x000100c5, + 0x000100c6, + 0x000100c6, + 0x000100c7, + 0x000100c7, + 0x000100c8, + 0x000100c8, + 0x000100c9, + 0x000100c9, + 0x000100ca, + 0x000100ca, + 0x000100cb, + 0x000100cb, + }, + { + 0x000100cc, + 0x000100cc, + 0x000100cd, + 0x000100cd, + 0x000100ce, + 0x000100ce, + 0x000100cf, + 0x000100cf, + 0x000100d0, + 0x000100d0, + 0x000100d1, + 0x000100d1, + 0x000100d2, + 0x000100d2, + 0x000100d3, + 0x000100d3, + }, + { + 0x000100d4, + 0x000100d4, + 0x000100d5, + 0x000100d5, + 0x000100d6, + 0x000100d6, + 0x000100d7, + 0x000100d7, + 0x000100d8, + 0x000100d8, + 0x000100d9, + 0x000100d9, + 0x000100da, + 0x000100da, + 0x000100db, + 0x000100db, + }, + { + 0x000100dc, + 0x000100dc, + 0x000100dd, + 0x000100dd, + 0x000100de, + 0x000100de, + 0x000100df, + 0x000100df, + 0x000100e0, + 0x000100e0, + 0x000100e1, + 0x000100e1, + 0x000100e2, + 0x000100e2, + 0x000100e3, + 0x000100e3, + }, + { + 0x000100e4, + 0x000100e4, + 0x000100e5, + 0x000100e5, + 0x000100e6, + 0x000100e6, + 0x000100e7, + 0x000100e7, + 0x000100e8, + 0x000100e8, + 0x000100e9, + 0x000100e9, + 0x000100ea, + 0x000100ea, + 0x000100eb, + 0x000100eb, + }, + { + 0x000100ec, + 0x000100ec, + 0x000100ed, + 0x000100ed, + 0x000100ee, + 0x000100ee, + 0x000100ef, + 0x000100ef, + 0x000100f0, + 0x000100f0, + 0x000100f1, + 0x000100f1, + 0x000100f2, + 0x000100f2, + 0x000100f3, + 0x000100f3, + }, + { + 0x000100f4, + 0x000100f4, + 0x000100f5, + 0x000100f5, + 0x000100f6, + 0x000100f6, + 0x000100f7, + 0x000100f7, + 0x000100f8, + 0x000100f8, + 0x000100f9, + 0x000100f9, + 0x000100fa, + 0x000100fa, + 0x000100fb, + 0x000100fb, + }, + { + 0x000100fc, + 0x000100fc, + 0x000100fd, + 0x000100fd, + 0x000100fe, + 0x000100fe, + 0x000100ff, + 0x000100ff, + 0x00010100, + 0x00010100, + 0x00010101, + 0x00010101, + 0x00010102, + 0x00010102, + 0x00010103, + 0x00010103, + }, + { + 0x00010104, + 0x00010104, + 0x00010105, + 0x00010105, + 0x00010106, + 0x00010106, + 0x00010107, + 0x00010107, + 0x00010108, + 0x00010108, + 0x00010109, + 0x00010109, + 0x0001010a, + 0x0001010a, + 0x0001010b, + 0x0001010b, + }, + { + 0x0001010c, + 0x0001010c, + 0x0001010d, + 0x0001010d, + 0x0001010e, + 0x0001010e, + 0x0001010f, + 0x0001010f, + 0x00010110, + 0x00010110, + 0x00010111, + 0x00010111, + 0x00010112, + 0x00010112, + 0x00010113, + 0x00010113, + }, + { + 0x00010114, + 0x00010114, + 0x00010115, + 0x00010115, + 0x00010116, + 0x00010116, + 0x00010117, + 0x00010117, + 0x00010118, + 0x00010118, + 0x00010119, + 0x00010119, + 0x0001011a, + 0x0001011a, + 0x0001011b, + 0x0001011b, + }, + { + 0x0001011c, + 0x0001011c, + 0x0001011d, + 0x0001011d, + 0x0001011e, + 0x0001011e, + 0x0001011f, + 0x0001011f, + 0x00010120, + 0x00010120, + 0x00010121, + 0x00010121, + 0x00010122, + 0x00010122, + 0x00010123, + 0x00010123, + }, + { + 0x00010124, + 0x00010124, + 0x00010125, + 0x00010125, + 0x00010126, + 0x00010126, + 0x00010127, + 0x00010127, + 0x00010128, + 0x00010128, + 0x00010129, + 0x00010129, + 0x0001012a, + 0x0001012a, + 0x0001012b, + 0x0001012b, + }, + { + 0x0001012c, + 0x0001012c, + 0x0001012d, + 0x0001012d, + 0x0001012e, + 0x0001012e, + 0x0001012f, + 0x0001012f, + 0x00010130, + 0x00010130, + 0x00010131, + 0x00010131, + 0x00010132, + 0x00010132, + 0x00010133, + 0x00010133, + }, + { + 0x00010134, + 0x00010134, + 0x00010135, + 0x00010135, + 0x00010136, + 0x00010136, + 0x00010137, + 0x00010137, + 0x00010138, + 0x00010138, + 0x00010139, + 0x00010139, + 0x0001013a, + 0x0001013a, + 0x0001013b, + 0x0001013b, + }, + { + 0x0001013c, + 0x0001013c, + 0x0001013d, + 0x0001013d, + 0x0001013e, + 0x0001013e, + 0x0001013f, + 0x0001013f, + 0x00010140, + 0x00010140, + 0x00010141, + 0x00010141, + 0x00010142, + 0x00010142, + 0x00010143, + 0x00010143, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc46[400][2] = +#else +const uint16_t c_aauiCQMFHuffEnc46[400][2] = +#endif + { + { 0x0002, 0x0002 }, + { 0x0003, 0x0002 }, + { 0x0005, 0x0003 }, + { 0x0007, 0x0004 }, + { 0x0009, 0x0005 }, + { 0x000b, 0x0006 }, + { 0x000d, 0x000a }, + { 0x000f, 0x0018 }, + { 0x0012, 0x00a6 }, + { 0x0013, 0x0000 }, + { 0x0013, 0x0001 }, + { 0x0013, 0x0002 }, + { 0x0013, 0x0003 }, + { 0x0013, 0x0004 }, + { 0x0013, 0x0005 }, + { 0x0013, 0x0006 }, + { 0x0013, 0x0007 }, + { 0x0013, 0x0008 }, + { 0x0013, 0x0009 }, + { 0x0013, 0x000a }, + { 0x0002, 0x0003 }, + { 0x0003, 0x0003 }, + { 0x0005, 0x0004 }, + { 0x0006, 0x0004 }, + { 0x0008, 0x0004 }, + { 0x000a, 0x0006 }, + { 0x000c, 0x0008 }, + { 0x000e, 0x0011 }, + { 0x0012, 0x00a7 }, + { 0x0013, 0x000b }, + { 0x0013, 0x000c }, + { 0x0013, 0x000d }, + { 0x0013, 0x000e }, + { 0x0013, 0x000f }, + { 0x0013, 0x0010 }, + { 0x0013, 0x0011 }, + { 0x0013, 0x0012 }, + { 0x0013, 0x0013 }, + { 0x0013, 0x0014 }, + { 0x0013, 0x0015 }, + { 0x0005, 0x0005 }, + { 0x0005, 0x0006 }, + { 0x0005, 0x0007 }, + { 0x0007, 0x0005 }, + { 0x0009, 0x0006 }, + { 0x000b, 0x0007 }, + { 0x000d, 0x000b }, + { 0x000f, 0x0019 }, + { 0x0013, 0x0016 }, + { 0x0013, 0x0017 }, + { 0x0013, 0x0018 }, + { 0x0013, 0x0019 }, + { 0x0013, 0x001a }, + { 0x0013, 0x001b }, + { 0x0013, 0x001c }, + { 0x0013, 0x001d }, + { 0x0013, 0x001e }, + { 0x0013, 0x001f }, + { 0x0013, 0x0020 }, + { 0x0013, 0x0021 }, + { 0x0007, 0x0006 }, + { 0x0006, 0x0005 }, + { 0x0007, 0x0007 }, + { 0x0008, 0x0005 }, + { 0x000a, 0x0007 }, + { 0x000c, 0x0009 }, + { 0x000e, 0x0012 }, + { 0x000f, 0x001a }, + { 0x0012, 0x00a8 }, + { 0x0013, 0x0022 }, + { 0x0013, 0x0023 }, + { 0x0013, 0x0024 }, + { 0x0013, 0x0025 }, + { 0x0013, 0x0026 }, + { 0x0013, 0x0027 }, + { 0x0013, 0x0028 }, + { 0x0013, 0x0029 }, + { 0x0013, 0x002a }, + { 0x0013, 0x002b }, + { 0x0013, 0x002c }, + { 0x0009, 0x0007 }, + { 0x0008, 0x0006 }, + { 0x0008, 0x0007 }, + { 0x000a, 0x0008 }, + { 0x000b, 0x0008 }, + { 0x000d, 0x000c }, + { 0x000e, 0x0013 }, + { 0x0010, 0x002c }, + { 0x0013, 0x002d }, + { 0x0013, 0x002e }, + { 0x0013, 0x002f }, + { 0x0013, 0x0030 }, + { 0x0013, 0x0031 }, + { 0x0013, 0x0032 }, + { 0x0013, 0x0033 }, + { 0x0013, 0x0034 }, + { 0x0013, 0x0035 }, + { 0x0013, 0x0036 }, + { 0x0013, 0x0037 }, + { 0x0013, 0x0038 }, + { 0x000b, 0x0009 }, + { 0x000a, 0x0009 }, + { 0x000b, 0x000a }, + { 0x000b, 0x000b }, + { 0x000d, 0x000d }, + { 0x000f, 0x001b }, + { 0x0010, 0x002d }, + { 0x0013, 0x0039 }, + { 0x0013, 0x003a }, + { 0x0013, 0x003b }, + { 0x0013, 0x003c }, + { 0x0013, 0x003d }, + { 0x0013, 0x003e }, + { 0x0013, 0x003f }, + { 0x0013, 0x0040 }, + { 0x0013, 0x0041 }, + { 0x0013, 0x0042 }, + { 0x0013, 0x0043 }, + { 0x0013, 0x0044 }, + { 0x0013, 0x0045 }, + { 0x000d, 0x000e }, + { 0x000c, 0x000a }, + { 0x000c, 0x000b }, + { 0x000d, 0x000f }, + { 0x000f, 0x001c }, + { 0x000f, 0x001d }, + { 0x0013, 0x0046 }, + { 0x0013, 0x0047 }, + { 0x0013, 0x0048 }, + { 0x0013, 0x0049 }, + { 0x0013, 0x004a }, + { 0x0013, 0x004b }, + { 0x0013, 0x004c }, + { 0x0013, 0x004d }, + { 0x0013, 0x004e }, + { 0x0013, 0x004f }, + { 0x0013, 0x0050 }, + { 0x0013, 0x0051 }, + { 0x0013, 0x0052 }, + { 0x0013, 0x0053 }, + { 0x000f, 0x001e }, + { 0x000f, 0x001f }, + { 0x000f, 0x0020 }, + { 0x000f, 0x0021 }, + { 0x0010, 0x002e }, + { 0x0012, 0x00a9 }, + { 0x0013, 0x0054 }, + { 0x0013, 0x0055 }, + { 0x0012, 0x00aa }, + { 0x0013, 0x0056 }, + { 0x0013, 0x0057 }, + { 0x0013, 0x0058 }, + { 0x0013, 0x0059 }, + { 0x0013, 0x005a }, + { 0x0013, 0x005b }, + { 0x0013, 0x005c }, + { 0x0013, 0x005d }, + { 0x0013, 0x005e }, + { 0x0013, 0x005f }, + { 0x0013, 0x0060 }, + { 0x0013, 0x0061 }, + { 0x0010, 0x002f }, + { 0x0013, 0x0062 }, + { 0x0011, 0x0057 }, + { 0x0013, 0x0063 }, + { 0x0013, 0x0064 }, + { 0x0013, 0x0065 }, + { 0x0013, 0x0066 }, + { 0x0013, 0x0067 }, + { 0x0013, 0x0068 }, + { 0x0013, 0x0069 }, + { 0x0013, 0x006a }, + { 0x0013, 0x006b }, + { 0x0013, 0x006c }, + { 0x0013, 0x006d }, + { 0x0013, 0x006e }, + { 0x0013, 0x006f }, + { 0x0013, 0x0070 }, + { 0x0013, 0x0071 }, + { 0x0013, 0x0072 }, + { 0x0013, 0x0073 }, + { 0x0013, 0x0074 }, + { 0x0013, 0x0075 }, + { 0x0013, 0x0076 }, + { 0x0013, 0x0077 }, + { 0x0013, 0x0078 }, + { 0x0013, 0x0079 }, + { 0x0013, 0x007a }, + { 0x0013, 0x007b }, + { 0x0013, 0x007c }, + { 0x0013, 0x007d }, + { 0x0013, 0x007e }, + { 0x0013, 0x007f }, + { 0x0013, 0x0080 }, + { 0x0013, 0x0081 }, + { 0x0013, 0x0082 }, + { 0x0013, 0x0083 }, + { 0x0013, 0x0084 }, + { 0x0013, 0x0085 }, + { 0x0013, 0x0086 }, + { 0x0013, 0x0087 }, + { 0x0013, 0x0088 }, + { 0x0013, 0x0089 }, + { 0x0013, 0x008a }, + { 0x0013, 0x008b }, + { 0x0013, 0x008c }, + { 0x0013, 0x008d }, + { 0x0013, 0x008e }, + { 0x0013, 0x008f }, + { 0x0013, 0x0090 }, + { 0x0013, 0x0091 }, + { 0x0013, 0x0092 }, + { 0x0013, 0x0093 }, + { 0x0013, 0x0094 }, + { 0x0013, 0x0095 }, + { 0x0013, 0x0096 }, + { 0x0013, 0x0097 }, + { 0x0013, 0x0098 }, + { 0x0013, 0x0099 }, + { 0x0013, 0x009a }, + { 0x0013, 0x009b }, + { 0x0013, 0x009c }, + { 0x0013, 0x009d }, + { 0x0013, 0x009e }, + { 0x0013, 0x009f }, + { 0x0013, 0x00a0 }, + { 0x0013, 0x00a1 }, + { 0x0013, 0x00a2 }, + { 0x0013, 0x00a3 }, + { 0x0013, 0x00a4 }, + { 0x0013, 0x00a5 }, + { 0x0013, 0x00a6 }, + { 0x0013, 0x00a7 }, + { 0x0013, 0x00a8 }, + { 0x0013, 0x00a9 }, + { 0x0013, 0x00aa }, + { 0x0013, 0x00ab }, + { 0x0013, 0x00ac }, + { 0x0013, 0x00ad }, + { 0x0013, 0x00ae }, + { 0x0013, 0x00af }, + { 0x0013, 0x00b0 }, + { 0x0013, 0x00b1 }, + { 0x0013, 0x00b2 }, + { 0x0013, 0x00b3 }, + { 0x0013, 0x00b4 }, + { 0x0013, 0x00b5 }, + { 0x0013, 0x00b6 }, + { 0x0013, 0x00b7 }, + { 0x0013, 0x00b8 }, + { 0x0013, 0x00b9 }, + { 0x0013, 0x00ba }, + { 0x0013, 0x00bb }, + { 0x0013, 0x00bc }, + { 0x0013, 0x00bd }, + { 0x0013, 0x00be }, + { 0x0013, 0x00bf }, + { 0x0013, 0x00c0 }, + { 0x0013, 0x00c1 }, + { 0x0013, 0x00c2 }, + { 0x0013, 0x00c3 }, + { 0x0013, 0x00c4 }, + { 0x0013, 0x00c5 }, + { 0x0013, 0x00c6 }, + { 0x0013, 0x00c7 }, + { 0x0013, 0x00c8 }, + { 0x0013, 0x00c9 }, + { 0x0013, 0x00ca }, + { 0x0013, 0x00cb }, + { 0x0013, 0x00cc }, + { 0x0013, 0x00cd }, + { 0x0013, 0x00ce }, + { 0x0013, 0x00cf }, + { 0x0013, 0x00d0 }, + { 0x0013, 0x00d1 }, + { 0x0013, 0x00d2 }, + { 0x0013, 0x00d3 }, + { 0x0013, 0x00d4 }, + { 0x0013, 0x00d5 }, + { 0x0013, 0x00d6 }, + { 0x0013, 0x00d7 }, + { 0x0013, 0x00d8 }, + { 0x0013, 0x00d9 }, + { 0x0013, 0x00da }, + { 0x0013, 0x00db }, + { 0x0013, 0x00dc }, + { 0x0013, 0x00dd }, + { 0x0013, 0x00de }, + { 0x0013, 0x00df }, + { 0x0013, 0x00e0 }, + { 0x0013, 0x00e1 }, + { 0x0013, 0x00e2 }, + { 0x0013, 0x00e3 }, + { 0x0013, 0x00e4 }, + { 0x0013, 0x00e5 }, + { 0x0013, 0x00e6 }, + { 0x0013, 0x00e7 }, + { 0x0013, 0x00e8 }, + { 0x0013, 0x00e9 }, + { 0x0013, 0x00ea }, + { 0x0013, 0x00eb }, + { 0x0013, 0x00ec }, + { 0x0013, 0x00ed }, + { 0x0013, 0x00ee }, + { 0x0013, 0x00ef }, + { 0x0013, 0x00f0 }, + { 0x0013, 0x00f1 }, + { 0x0013, 0x00f2 }, + { 0x0013, 0x00f3 }, + { 0x0013, 0x00f4 }, + { 0x0013, 0x00f5 }, + { 0x0013, 0x00f6 }, + { 0x0013, 0x00f7 }, + { 0x0013, 0x00f8 }, + { 0x0013, 0x00f9 }, + { 0x0013, 0x00fa }, + { 0x0013, 0x00fb }, + { 0x0013, 0x00fc }, + { 0x0013, 0x00fd }, + { 0x0013, 0x00fe }, + { 0x0013, 0x00ff }, + { 0x0013, 0x0100 }, + { 0x0013, 0x0101 }, + { 0x0013, 0x0102 }, + { 0x0013, 0x0103 }, + { 0x0013, 0x0104 }, + { 0x0013, 0x0105 }, + { 0x0013, 0x0106 }, + { 0x0013, 0x0107 }, + { 0x0013, 0x0108 }, + { 0x0013, 0x0109 }, + { 0x0013, 0x010a }, + { 0x0013, 0x010b }, + { 0x0013, 0x010c }, + { 0x0013, 0x010d }, + { 0x0013, 0x010e }, + { 0x0013, 0x010f }, + { 0x0013, 0x0110 }, + { 0x0013, 0x0111 }, + { 0x0013, 0x0112 }, + { 0x0013, 0x0113 }, + { 0x0013, 0x0114 }, + { 0x0013, 0x0115 }, + { 0x0013, 0x0116 }, + { 0x0013, 0x0117 }, + { 0x0013, 0x0118 }, + { 0x0013, 0x0119 }, + { 0x0013, 0x011a }, + { 0x0013, 0x011b }, + { 0x0013, 0x011c }, + { 0x0013, 0x011d }, + { 0x0013, 0x011e }, + { 0x0013, 0x011f }, + { 0x0013, 0x0120 }, + { 0x0013, 0x0121 }, + { 0x0013, 0x0122 }, + { 0x0013, 0x0123 }, + { 0x0013, 0x0124 }, + { 0x0013, 0x0125 }, + { 0x0013, 0x0126 }, + { 0x0013, 0x0127 }, + { 0x0013, 0x0128 }, + { 0x0013, 0x0129 }, + { 0x0013, 0x012a }, + { 0x0013, 0x012b }, + { 0x0013, 0x012c }, + { 0x0013, 0x012d }, + { 0x0013, 0x012e }, + { 0x0013, 0x012f }, + { 0x0013, 0x0130 }, + { 0x0013, 0x0131 }, + { 0x0013, 0x0132 }, + { 0x0013, 0x0133 }, + { 0x0013, 0x0134 }, + { 0x0013, 0x0135 }, + { 0x0013, 0x0136 }, + { 0x0013, 0x0137 }, + { 0x0013, 0x0138 }, + { 0x0013, 0x0139 }, + { 0x0013, 0x013a }, + { 0x0013, 0x013b }, + { 0x0013, 0x013c }, + { 0x0013, 0x013d }, + { 0x0013, 0x013e }, + { 0x0013, 0x013f }, + { 0x0013, 0x0140 }, + { 0x0013, 0x0141 }, + { 0x0013, 0x0142 }, + { 0x0013, 0x0143 }, + { 0x0013, 0x0144 }, + { 0x0013, 0x0145 }, + { 0x0013, 0x0146 }, + { 0x0013, 0x0147 }, + { 0x0013, 0x0148 }, + { 0x0013, 0x0149 }, + { 0x0013, 0x014a }, + { 0x0013, 0x014b }, + { 0x0012, 0x00ab }, + { 0x0012, 0x00ac }, + { 0x0012, 0x00ad }, + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec46[61][16] = { + { + 0x0004ffff, + 0x0001ffff, + 0x0002ffff, + 0x0003ffff, + 0x00010001, + 0x00010001, + 0x00010015, + 0x00010015, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020014, + }, + { + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020017, + 0x0002003d, + 0x0002003d, + 0x0002003d, + 0x0002003d, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + }, + { + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + }, + { + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + }, + { + 0x0008ffff, + 0x0007ffff, + 0x0005ffff, + 0x0006ffff, + 0x00000018, + 0x0000003f, + 0x00000051, + 0x00000052, + 0x00010003, + 0x00010003, + 0x0001002b, + 0x0001002b, + 0x0001003c, + 0x0001003c, + 0x0001003e, + 0x0001003e, + }, + { + 0x00020053, + 0x00020053, + 0x00020053, + 0x00020053, + 0x00020065, + 0x00020065, + 0x00020065, + 0x00020065, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + }, + { + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030050, + 0x00030050, + }, + { + 0x00010054, + 0x00010054, + 0x00010064, + 0x00010064, + 0x00010066, + 0x00010066, + 0x00010067, + 0x00010067, + 0x00020019, + 0x00020019, + 0x00020019, + 0x00020019, + 0x00020040, + 0x00020040, + 0x00020040, + 0x00020040, + }, + { + 0x0012ffff, + 0x0023ffff, + 0x000effff, + 0x000dffff, + 0x000cffff, + 0x0009ffff, + 0x000affff, + 0x000bffff, + 0x0000001a, + 0x00000041, + 0x00000079, + 0x0000007a, + 0x00010005, + 0x00010005, + 0x0001002d, + 0x0001002d, + }, + { + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + }, + { + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + }, + { + 0x00030078, + 0x00030078, + 0x00030078, + 0x00030078, + 0x00030078, + 0x00030078, + 0x00030078, + 0x00030078, + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x0003007b, + 0x0003007b, + }, + { + 0x0001008e, + 0x0001008e, + 0x0001008f, + 0x0001008f, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x00020042, + 0x00020042, + 0x00020042, + 0x00020042, + 0x00020056, + 0x00020056, + 0x00020056, + 0x00020056, + }, + { + 0x00010007, + 0x00010007, + 0x0001002f, + 0x0001002f, + 0x00010043, + 0x00010043, + 0x00010069, + 0x00010069, + 0x0001007c, + 0x0001007c, + 0x0001007d, + 0x0001007d, + 0x0001008c, + 0x0001008c, + 0x0001008d, + 0x0001008d, + }, + { + 0x0034ffff, + 0x0035ffff, + 0x0036ffff, + 0x0037ffff, + 0x0038ffff, + 0x0039ffff, + 0x003affff, + 0x003bffff, + 0x003cffff, + 0x0010ffff, + 0x0011ffff, + 0x000fffff, + 0x00000057, + 0x0000006a, + 0x00000090, + 0x000000a1, + }, + { + 0x0002018e, + 0x0002018e, + 0x0002018e, + 0x0002018e, + 0x0002018f, + 0x0002018f, + 0x0002018f, + 0x0002018f, + 0x000300a3, + 0x000300a3, + 0x000300a3, + 0x000300a3, + 0x000300a3, + 0x000300a3, + 0x000300a3, + 0x000300a3, + }, + { + 0x00010189, + 0x00010189, + 0x0001018a, + 0x0001018a, + 0x0001018b, + 0x0001018b, + 0x0001018c, + 0x0001018c, + 0x00020008, + 0x00020008, + 0x00020008, + 0x00020008, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001c, + }, + { + 0x00020044, + 0x00020044, + 0x00020044, + 0x00020044, + 0x00020091, + 0x00020091, + 0x00020091, + 0x00020091, + 0x00020094, + 0x00020094, + 0x00020094, + 0x00020094, + 0x0002018d, + 0x0002018d, + 0x0002018d, + 0x0002018d, + }, + { + 0x0013ffff, + 0x0016ffff, + 0x0017ffff, + 0x0018ffff, + 0x0014ffff, + 0x0015ffff, + 0x0019ffff, + 0x001affff, + 0x001bffff, + 0x001cffff, + 0x001dffff, + 0x001effff, + 0x001fffff, + 0x0020ffff, + 0x0021ffff, + 0x0022ffff, + }, + { + 0x00010009, + 0x00010009, + 0x0001000a, + 0x0001000a, + 0x0001000b, + 0x0001000b, + 0x0001000c, + 0x0001000c, + 0x0001000d, + 0x0001000d, + 0x0001000e, + 0x0001000e, + 0x0001000f, + 0x0001000f, + 0x00010010, + 0x00010010, + }, + { + 0x0001003a, + 0x0001003a, + 0x0001003b, + 0x0001003b, + 0x00010045, + 0x00010045, + 0x00010046, + 0x00010046, + 0x00010047, + 0x00010047, + 0x00010048, + 0x00010048, + 0x00010049, + 0x00010049, + 0x0001004a, + 0x0001004a, + }, + { + 0x0001004b, + 0x0001004b, + 0x0001004c, + 0x0001004c, + 0x0001004d, + 0x0001004d, + 0x0001004e, + 0x0001004e, + 0x0001004f, + 0x0001004f, + 0x00010058, + 0x00010058, + 0x00010059, + 0x00010059, + 0x0001005a, + 0x0001005a, + }, + { + 0x00010011, + 0x00010011, + 0x00010012, + 0x00010012, + 0x00010013, + 0x00010013, + 0x0001001d, + 0x0001001d, + 0x0001001e, + 0x0001001e, + 0x0001001f, + 0x0001001f, + 0x00010020, + 0x00010020, + 0x00010021, + 0x00010021, + }, + { + 0x00010022, + 0x00010022, + 0x00010023, + 0x00010023, + 0x00010024, + 0x00010024, + 0x00010025, + 0x00010025, + 0x00010026, + 0x00010026, + 0x00010027, + 0x00010027, + 0x00010030, + 0x00010030, + 0x00010031, + 0x00010031, + }, + { + 0x00010032, + 0x00010032, + 0x00010033, + 0x00010033, + 0x00010034, + 0x00010034, + 0x00010035, + 0x00010035, + 0x00010036, + 0x00010036, + 0x00010037, + 0x00010037, + 0x00010038, + 0x00010038, + 0x00010039, + 0x00010039, + }, + { + 0x0001005b, + 0x0001005b, + 0x0001005c, + 0x0001005c, + 0x0001005d, + 0x0001005d, + 0x0001005e, + 0x0001005e, + 0x0001005f, + 0x0001005f, + 0x00010060, + 0x00010060, + 0x00010061, + 0x00010061, + 0x00010062, + 0x00010062, + }, + { + 0x00010063, + 0x00010063, + 0x0001006b, + 0x0001006b, + 0x0001006c, + 0x0001006c, + 0x0001006d, + 0x0001006d, + 0x0001006e, + 0x0001006e, + 0x0001006f, + 0x0001006f, + 0x00010070, + 0x00010070, + 0x00010071, + 0x00010071, + }, + { + 0x00010072, + 0x00010072, + 0x00010073, + 0x00010073, + 0x00010074, + 0x00010074, + 0x00010075, + 0x00010075, + 0x00010076, + 0x00010076, + 0x00010077, + 0x00010077, + 0x0001007e, + 0x0001007e, + 0x0001007f, + 0x0001007f, + }, + { + 0x00010080, + 0x00010080, + 0x00010081, + 0x00010081, + 0x00010082, + 0x00010082, + 0x00010083, + 0x00010083, + 0x00010084, + 0x00010084, + 0x00010085, + 0x00010085, + 0x00010086, + 0x00010086, + 0x00010087, + 0x00010087, + }, + { + 0x00010088, + 0x00010088, + 0x00010089, + 0x00010089, + 0x0001008a, + 0x0001008a, + 0x0001008b, + 0x0001008b, + 0x00010092, + 0x00010092, + 0x00010093, + 0x00010093, + 0x00010095, + 0x00010095, + 0x00010096, + 0x00010096, + }, + { + 0x00010097, + 0x00010097, + 0x00010098, + 0x00010098, + 0x00010099, + 0x00010099, + 0x0001009a, + 0x0001009a, + 0x0001009b, + 0x0001009b, + 0x0001009c, + 0x0001009c, + 0x0001009d, + 0x0001009d, + 0x0001009e, + 0x0001009e, + }, + { + 0x0001009f, + 0x0001009f, + 0x000100a0, + 0x000100a0, + 0x000100a2, + 0x000100a2, + 0x000100a4, + 0x000100a4, + 0x000100a5, + 0x000100a5, + 0x000100a6, + 0x000100a6, + 0x000100a7, + 0x000100a7, + 0x000100a8, + 0x000100a8, + }, + { + 0x000100a9, + 0x000100a9, + 0x000100aa, + 0x000100aa, + 0x000100ab, + 0x000100ab, + 0x000100ac, + 0x000100ac, + 0x000100ad, + 0x000100ad, + 0x000100ae, + 0x000100ae, + 0x000100af, + 0x000100af, + 0x000100b0, + 0x000100b0, + }, + { + 0x000100b1, + 0x000100b1, + 0x000100b2, + 0x000100b2, + 0x000100b3, + 0x000100b3, + 0x000100b4, + 0x000100b4, + 0x000100b5, + 0x000100b5, + 0x000100b6, + 0x000100b6, + 0x000100b7, + 0x000100b7, + 0x000100b8, + 0x000100b8, + }, + { + 0x000100b9, + 0x000100b9, + 0x000100ba, + 0x000100ba, + 0x000100bb, + 0x000100bb, + 0x000100bc, + 0x000100bc, + 0x000100bd, + 0x000100bd, + 0x000100be, + 0x000100be, + 0x000100bf, + 0x000100bf, + 0x000100c0, + 0x000100c0, + }, + { + 0x0024ffff, + 0x0025ffff, + 0x0026ffff, + 0x0027ffff, + 0x0028ffff, + 0x0029ffff, + 0x002affff, + 0x002bffff, + 0x002cffff, + 0x002dffff, + 0x002effff, + 0x002fffff, + 0x0030ffff, + 0x0031ffff, + 0x0032ffff, + 0x0033ffff, + }, + { + 0x000100c1, + 0x000100c1, + 0x000100c2, + 0x000100c2, + 0x000100c3, + 0x000100c3, + 0x000100c4, + 0x000100c4, + 0x000100c5, + 0x000100c5, + 0x000100c6, + 0x000100c6, + 0x000100c7, + 0x000100c7, + 0x000100c8, + 0x000100c8, + }, + { + 0x000100c9, + 0x000100c9, + 0x000100ca, + 0x000100ca, + 0x000100cb, + 0x000100cb, + 0x000100cc, + 0x000100cc, + 0x000100cd, + 0x000100cd, + 0x000100ce, + 0x000100ce, + 0x000100cf, + 0x000100cf, + 0x000100d0, + 0x000100d0, + }, + { + 0x000100d1, + 0x000100d1, + 0x000100d2, + 0x000100d2, + 0x000100d3, + 0x000100d3, + 0x000100d4, + 0x000100d4, + 0x000100d5, + 0x000100d5, + 0x000100d6, + 0x000100d6, + 0x000100d7, + 0x000100d7, + 0x000100d8, + 0x000100d8, + }, + { + 0x000100d9, + 0x000100d9, + 0x000100da, + 0x000100da, + 0x000100db, + 0x000100db, + 0x000100dc, + 0x000100dc, + 0x000100dd, + 0x000100dd, + 0x000100de, + 0x000100de, + 0x000100df, + 0x000100df, + 0x000100e0, + 0x000100e0, + }, + { + 0x000100e1, + 0x000100e1, + 0x000100e2, + 0x000100e2, + 0x000100e3, + 0x000100e3, + 0x000100e4, + 0x000100e4, + 0x000100e5, + 0x000100e5, + 0x000100e6, + 0x000100e6, + 0x000100e7, + 0x000100e7, + 0x000100e8, + 0x000100e8, + }, + { + 0x000100e9, + 0x000100e9, + 0x000100ea, + 0x000100ea, + 0x000100eb, + 0x000100eb, + 0x000100ec, + 0x000100ec, + 0x000100ed, + 0x000100ed, + 0x000100ee, + 0x000100ee, + 0x000100ef, + 0x000100ef, + 0x000100f0, + 0x000100f0, + }, + { + 0x000100f1, + 0x000100f1, + 0x000100f2, + 0x000100f2, + 0x000100f3, + 0x000100f3, + 0x000100f4, + 0x000100f4, + 0x000100f5, + 0x000100f5, + 0x000100f6, + 0x000100f6, + 0x000100f7, + 0x000100f7, + 0x000100f8, + 0x000100f8, + }, + { + 0x000100f9, + 0x000100f9, + 0x000100fa, + 0x000100fa, + 0x000100fb, + 0x000100fb, + 0x000100fc, + 0x000100fc, + 0x000100fd, + 0x000100fd, + 0x000100fe, + 0x000100fe, + 0x000100ff, + 0x000100ff, + 0x00010100, + 0x00010100, + }, + { + 0x00010101, + 0x00010101, + 0x00010102, + 0x00010102, + 0x00010103, + 0x00010103, + 0x00010104, + 0x00010104, + 0x00010105, + 0x00010105, + 0x00010106, + 0x00010106, + 0x00010107, + 0x00010107, + 0x00010108, + 0x00010108, + }, + { + 0x00010109, + 0x00010109, + 0x0001010a, + 0x0001010a, + 0x0001010b, + 0x0001010b, + 0x0001010c, + 0x0001010c, + 0x0001010d, + 0x0001010d, + 0x0001010e, + 0x0001010e, + 0x0001010f, + 0x0001010f, + 0x00010110, + 0x00010110, + }, + { + 0x00010111, + 0x00010111, + 0x00010112, + 0x00010112, + 0x00010113, + 0x00010113, + 0x00010114, + 0x00010114, + 0x00010115, + 0x00010115, + 0x00010116, + 0x00010116, + 0x00010117, + 0x00010117, + 0x00010118, + 0x00010118, + }, + { + 0x00010119, + 0x00010119, + 0x0001011a, + 0x0001011a, + 0x0001011b, + 0x0001011b, + 0x0001011c, + 0x0001011c, + 0x0001011d, + 0x0001011d, + 0x0001011e, + 0x0001011e, + 0x0001011f, + 0x0001011f, + 0x00010120, + 0x00010120, + }, + { + 0x00010121, + 0x00010121, + 0x00010122, + 0x00010122, + 0x00010123, + 0x00010123, + 0x00010124, + 0x00010124, + 0x00010125, + 0x00010125, + 0x00010126, + 0x00010126, + 0x00010127, + 0x00010127, + 0x00010128, + 0x00010128, + }, + { + 0x00010129, + 0x00010129, + 0x0001012a, + 0x0001012a, + 0x0001012b, + 0x0001012b, + 0x0001012c, + 0x0001012c, + 0x0001012d, + 0x0001012d, + 0x0001012e, + 0x0001012e, + 0x0001012f, + 0x0001012f, + 0x00010130, + 0x00010130, + }, + { + 0x00010131, + 0x00010131, + 0x00010132, + 0x00010132, + 0x00010133, + 0x00010133, + 0x00010134, + 0x00010134, + 0x00010135, + 0x00010135, + 0x00010136, + 0x00010136, + 0x00010137, + 0x00010137, + 0x00010138, + 0x00010138, + }, + { + 0x00010139, + 0x00010139, + 0x0001013a, + 0x0001013a, + 0x0001013b, + 0x0001013b, + 0x0001013c, + 0x0001013c, + 0x0001013d, + 0x0001013d, + 0x0001013e, + 0x0001013e, + 0x0001013f, + 0x0001013f, + 0x00010140, + 0x00010140, + }, + { + 0x00010141, + 0x00010141, + 0x00010142, + 0x00010142, + 0x00010143, + 0x00010143, + 0x00010144, + 0x00010144, + 0x00010145, + 0x00010145, + 0x00010146, + 0x00010146, + 0x00010147, + 0x00010147, + 0x00010148, + 0x00010148, + }, + { + 0x00010149, + 0x00010149, + 0x0001014a, + 0x0001014a, + 0x0001014b, + 0x0001014b, + 0x0001014c, + 0x0001014c, + 0x0001014d, + 0x0001014d, + 0x0001014e, + 0x0001014e, + 0x0001014f, + 0x0001014f, + 0x00010150, + 0x00010150, + }, + { + 0x00010151, + 0x00010151, + 0x00010152, + 0x00010152, + 0x00010153, + 0x00010153, + 0x00010154, + 0x00010154, + 0x00010155, + 0x00010155, + 0x00010156, + 0x00010156, + 0x00010157, + 0x00010157, + 0x00010158, + 0x00010158, + }, + { + 0x00010159, + 0x00010159, + 0x0001015a, + 0x0001015a, + 0x0001015b, + 0x0001015b, + 0x0001015c, + 0x0001015c, + 0x0001015d, + 0x0001015d, + 0x0001015e, + 0x0001015e, + 0x0001015f, + 0x0001015f, + 0x00010160, + 0x00010160, + }, + { + 0x00010161, + 0x00010161, + 0x00010162, + 0x00010162, + 0x00010163, + 0x00010163, + 0x00010164, + 0x00010164, + 0x00010165, + 0x00010165, + 0x00010166, + 0x00010166, + 0x00010167, + 0x00010167, + 0x00010168, + 0x00010168, + }, + { + 0x00010169, + 0x00010169, + 0x0001016a, + 0x0001016a, + 0x0001016b, + 0x0001016b, + 0x0001016c, + 0x0001016c, + 0x0001016d, + 0x0001016d, + 0x0001016e, + 0x0001016e, + 0x0001016f, + 0x0001016f, + 0x00010170, + 0x00010170, + }, + { + 0x00010171, + 0x00010171, + 0x00010172, + 0x00010172, + 0x00010173, + 0x00010173, + 0x00010174, + 0x00010174, + 0x00010175, + 0x00010175, + 0x00010176, + 0x00010176, + 0x00010177, + 0x00010177, + 0x00010178, + 0x00010178, + }, + { + 0x00010179, + 0x00010179, + 0x0001017a, + 0x0001017a, + 0x0001017b, + 0x0001017b, + 0x0001017c, + 0x0001017c, + 0x0001017d, + 0x0001017d, + 0x0001017e, + 0x0001017e, + 0x0001017f, + 0x0001017f, + 0x00010180, + 0x00010180, + }, + { + 0x00010181, + 0x00010181, + 0x00010182, + 0x00010182, + 0x00010183, + 0x00010183, + 0x00010184, + 0x00010184, + 0x00010185, + 0x00010185, + 0x00010186, + 0x00010186, + 0x00010187, + 0x00010187, + 0x00010188, + 0x00010188, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc47[576][2] = +#else +const uint16_t c_aauiCQMFHuffEnc47[576][2] = +#endif + { + { 0x0002, 0x0003 }, + { 0x0003, 0x0003 }, + { 0x0005, 0x0005 }, + { 0x0006, 0x0004 }, + { 0x0008, 0x0006 }, + { 0x000a, 0x0007 }, + { 0x000c, 0x000b }, + { 0x000d, 0x000d }, + { 0x0010, 0x0041 }, + { 0x0013, 0x0000 }, + { 0x0013, 0x0001 }, + { 0x0013, 0x0002 }, + { 0x0013, 0x0003 }, + { 0x0013, 0x0004 }, + { 0x0013, 0x0005 }, + { 0x0013, 0x0006 }, + { 0x0013, 0x0007 }, + { 0x0013, 0x0008 }, + { 0x0013, 0x0009 }, + { 0x0013, 0x000a }, + { 0x0013, 0x000b }, + { 0x0013, 0x000c }, + { 0x0013, 0x000d }, + { 0x0013, 0x000e }, + { 0x0003, 0x0004 }, + { 0x0003, 0x0005 }, + { 0x0004, 0x0004 }, + { 0x0006, 0x0005 }, + { 0x0007, 0x0005 }, + { 0x0009, 0x0006 }, + { 0x000b, 0x0007 }, + { 0x000d, 0x000e }, + { 0x000f, 0x0025 }, + { 0x000f, 0x0026 }, + { 0x0012, 0x00f6 }, + { 0x0013, 0x000f }, + { 0x0013, 0x0010 }, + { 0x0013, 0x0011 }, + { 0x0013, 0x0012 }, + { 0x0013, 0x0013 }, + { 0x0013, 0x0014 }, + { 0x0013, 0x0015 }, + { 0x0013, 0x0016 }, + { 0x0013, 0x0017 }, + { 0x0013, 0x0018 }, + { 0x0013, 0x0019 }, + { 0x0013, 0x001a }, + { 0x0013, 0x001b }, + { 0x0005, 0x0006 }, + { 0x0004, 0x0005 }, + { 0x0005, 0x0007 }, + { 0x0006, 0x0006 }, + { 0x0008, 0x0007 }, + { 0x0009, 0x0007 }, + { 0x000b, 0x0008 }, + { 0x000d, 0x000f }, + { 0x000f, 0x0027 }, + { 0x0012, 0x00f7 }, + { 0x0013, 0x001c }, + { 0x0013, 0x001d }, + { 0x0013, 0x001e }, + { 0x0013, 0x001f }, + { 0x0013, 0x0020 }, + { 0x0013, 0x0021 }, + { 0x0013, 0x0022 }, + { 0x0013, 0x0023 }, + { 0x0013, 0x0024 }, + { 0x0013, 0x0025 }, + { 0x0013, 0x0026 }, + { 0x0013, 0x0027 }, + { 0x0013, 0x0028 }, + { 0x0013, 0x0029 }, + { 0x0006, 0x0007 }, + { 0x0006, 0x0008 }, + { 0x0006, 0x0009 }, + { 0x0007, 0x0006 }, + { 0x0009, 0x0008 }, + { 0x000a, 0x0008 }, + { 0x000c, 0x000c }, + { 0x000e, 0x0017 }, + { 0x0010, 0x0042 }, + { 0x0012, 0x00f8 }, + { 0x0013, 0x002a }, + { 0x0013, 0x002b }, + { 0x0013, 0x002c }, + { 0x0013, 0x002d }, + { 0x0013, 0x002e }, + { 0x0013, 0x002f }, + { 0x0013, 0x0030 }, + { 0x0013, 0x0031 }, + { 0x0013, 0x0032 }, + { 0x0013, 0x0033 }, + { 0x0013, 0x0034 }, + { 0x0013, 0x0035 }, + { 0x0013, 0x0036 }, + { 0x0013, 0x0037 }, + { 0x0008, 0x0008 }, + { 0x0007, 0x0007 }, + { 0x0008, 0x0009 }, + { 0x0009, 0x0009 }, + { 0x000a, 0x0009 }, + { 0x000b, 0x0009 }, + { 0x000d, 0x0010 }, + { 0x000f, 0x0028 }, + { 0x000f, 0x0029 }, + { 0x0011, 0x007f }, + { 0x0013, 0x0038 }, + { 0x0013, 0x0039 }, + { 0x0013, 0x003a }, + { 0x0013, 0x003b }, + { 0x0013, 0x003c }, + { 0x0013, 0x003d }, + { 0x0013, 0x003e }, + { 0x0013, 0x003f }, + { 0x0013, 0x0040 }, + { 0x0013, 0x0041 }, + { 0x0013, 0x0042 }, + { 0x0013, 0x0043 }, + { 0x0013, 0x0044 }, + { 0x0013, 0x0045 }, + { 0x000a, 0x000a }, + { 0x0009, 0x000a }, + { 0x0009, 0x000b }, + { 0x000a, 0x000b }, + { 0x000b, 0x000a }, + { 0x000d, 0x0011 }, + { 0x000f, 0x002a }, + { 0x0010, 0x0043 }, + { 0x0012, 0x00f9 }, + { 0x0013, 0x0046 }, + { 0x0013, 0x0047 }, + { 0x0013, 0x0048 }, + { 0x0013, 0x0049 }, + { 0x0013, 0x004a }, + { 0x0013, 0x004b }, + { 0x0013, 0x004c }, + { 0x0013, 0x004d }, + { 0x0013, 0x004e }, + { 0x0013, 0x004f }, + { 0x0013, 0x0050 }, + { 0x0013, 0x0051 }, + { 0x0013, 0x0052 }, + { 0x0013, 0x0053 }, + { 0x0013, 0x0054 }, + { 0x000b, 0x000b }, + { 0x000b, 0x000c }, + { 0x000b, 0x000d }, + { 0x000c, 0x000d }, + { 0x000d, 0x0012 }, + { 0x000e, 0x0018 }, + { 0x0010, 0x0044 }, + { 0x0013, 0x0055 }, + { 0x0013, 0x0056 }, + { 0x0013, 0x0057 }, + { 0x0013, 0x0058 }, + { 0x0013, 0x0059 }, + { 0x0013, 0x005a }, + { 0x0013, 0x005b }, + { 0x0013, 0x005c }, + { 0x0013, 0x005d }, + { 0x0013, 0x005e }, + { 0x0013, 0x005f }, + { 0x0013, 0x0060 }, + { 0x0013, 0x0061 }, + { 0x0013, 0x0062 }, + { 0x0013, 0x0063 }, + { 0x0013, 0x0064 }, + { 0x0013, 0x0065 }, + { 0x000e, 0x0019 }, + { 0x000d, 0x0013 }, + { 0x000d, 0x0014 }, + { 0x000d, 0x0015 }, + { 0x000f, 0x002b }, + { 0x0010, 0x0045 }, + { 0x0013, 0x0066 }, + { 0x0012, 0x00fa }, + { 0x0013, 0x0067 }, + { 0x0013, 0x0068 }, + { 0x0013, 0x0069 }, + { 0x0013, 0x006a }, + { 0x0013, 0x006b }, + { 0x0013, 0x006c }, + { 0x0013, 0x006d }, + { 0x0013, 0x006e }, + { 0x0013, 0x006f }, + { 0x0013, 0x0070 }, + { 0x0013, 0x0071 }, + { 0x0013, 0x0072 }, + { 0x0013, 0x0073 }, + { 0x0013, 0x0074 }, + { 0x0013, 0x0075 }, + { 0x0013, 0x0076 }, + { 0x0010, 0x0046 }, + { 0x000f, 0x002c }, + { 0x000f, 0x002d }, + { 0x0010, 0x0047 }, + { 0x0011, 0x0080 }, + { 0x0013, 0x0077 }, + { 0x0013, 0x0078 }, + { 0x0013, 0x0079 }, + { 0x0013, 0x007a }, + { 0x0013, 0x007b }, + { 0x0013, 0x007c }, + { 0x0013, 0x007d }, + { 0x0013, 0x007e }, + { 0x0013, 0x007f }, + { 0x0013, 0x0080 }, + { 0x0013, 0x0081 }, + { 0x0013, 0x0082 }, + { 0x0013, 0x0083 }, + { 0x0013, 0x0084 }, + { 0x0013, 0x0085 }, + { 0x0013, 0x0086 }, + { 0x0013, 0x0087 }, + { 0x0013, 0x0088 }, + { 0x0013, 0x0089 }, + { 0x0013, 0x008a }, + { 0x0010, 0x0048 }, + { 0x0010, 0x0049 }, + { 0x0011, 0x0081 }, + { 0x0013, 0x008b }, + { 0x0012, 0x00fb }, + { 0x0013, 0x008c }, + { 0x0013, 0x008d }, + { 0x0013, 0x008e }, + { 0x0013, 0x008f }, + { 0x0013, 0x0090 }, + { 0x0013, 0x0091 }, + { 0x0013, 0x0092 }, + { 0x0013, 0x0093 }, + { 0x0013, 0x0094 }, + { 0x0013, 0x0095 }, + { 0x0013, 0x0096 }, + { 0x0013, 0x0097 }, + { 0x0013, 0x0098 }, + { 0x0013, 0x0099 }, + { 0x0013, 0x009a }, + { 0x0013, 0x009b }, + { 0x0013, 0x009c }, + { 0x0013, 0x009d }, + { 0x0013, 0x009e }, + { 0x0013, 0x009f }, + { 0x0013, 0x00a0 }, + { 0x0012, 0x00fc }, + { 0x0013, 0x00a1 }, + { 0x0013, 0x00a2 }, + { 0x0013, 0x00a3 }, + { 0x0013, 0x00a4 }, + { 0x0013, 0x00a5 }, + { 0x0013, 0x00a6 }, + { 0x0013, 0x00a7 }, + { 0x0013, 0x00a8 }, + { 0x0013, 0x00a9 }, + { 0x0013, 0x00aa }, + { 0x0013, 0x00ab }, + { 0x0013, 0x00ac }, + { 0x0013, 0x00ad }, + { 0x0013, 0x00ae }, + { 0x0013, 0x00af }, + { 0x0013, 0x00b0 }, + { 0x0013, 0x00b1 }, + { 0x0013, 0x00b2 }, + { 0x0013, 0x00b3 }, + { 0x0013, 0x00b4 }, + { 0x0013, 0x00b5 }, + { 0x0013, 0x00b6 }, + { 0x0013, 0x00b7 }, + { 0x0013, 0x00b8 }, + { 0x0013, 0x00b9 }, + { 0x0013, 0x00ba }, + { 0x0013, 0x00bb }, + { 0x0013, 0x00bc }, + { 0x0013, 0x00bd }, + { 0x0013, 0x00be }, + { 0x0013, 0x00bf }, + { 0x0013, 0x00c0 }, + { 0x0013, 0x00c1 }, + { 0x0013, 0x00c2 }, + { 0x0013, 0x00c3 }, + { 0x0013, 0x00c4 }, + { 0x0013, 0x00c5 }, + { 0x0013, 0x00c6 }, + { 0x0013, 0x00c7 }, + { 0x0013, 0x00c8 }, + { 0x0013, 0x00c9 }, + { 0x0013, 0x00ca }, + { 0x0013, 0x00cb }, + { 0x0013, 0x00cc }, + { 0x0013, 0x00cd }, + { 0x0013, 0x00ce }, + { 0x0013, 0x00cf }, + { 0x0013, 0x00d0 }, + { 0x0013, 0x00d1 }, + { 0x0013, 0x00d2 }, + { 0x0013, 0x00d3 }, + { 0x0013, 0x00d4 }, + { 0x0013, 0x00d5 }, + { 0x0013, 0x00d6 }, + { 0x0013, 0x00d7 }, + { 0x0013, 0x00d8 }, + { 0x0013, 0x00d9 }, + { 0x0013, 0x00da }, + { 0x0013, 0x00db }, + { 0x0013, 0x00dc }, + { 0x0013, 0x00dd }, + { 0x0013, 0x00de }, + { 0x0013, 0x00df }, + { 0x0013, 0x00e0 }, + { 0x0013, 0x00e1 }, + { 0x0013, 0x00e2 }, + { 0x0013, 0x00e3 }, + { 0x0013, 0x00e4 }, + { 0x0013, 0x00e5 }, + { 0x0013, 0x00e6 }, + { 0x0013, 0x00e7 }, + { 0x0013, 0x00e8 }, + { 0x0013, 0x00e9 }, + { 0x0013, 0x00ea }, + { 0x0013, 0x00eb }, + { 0x0013, 0x00ec }, + { 0x0013, 0x00ed }, + { 0x0013, 0x00ee }, + { 0x0013, 0x00ef }, + { 0x0013, 0x00f0 }, + { 0x0013, 0x00f1 }, + { 0x0013, 0x00f2 }, + { 0x0013, 0x00f3 }, + { 0x0013, 0x00f4 }, + { 0x0013, 0x00f5 }, + { 0x0013, 0x00f6 }, + { 0x0013, 0x00f7 }, + { 0x0013, 0x00f8 }, + { 0x0013, 0x00f9 }, + { 0x0013, 0x00fa }, + { 0x0013, 0x00fb }, + { 0x0013, 0x00fc }, + { 0x0013, 0x00fd }, + { 0x0013, 0x00fe }, + { 0x0013, 0x00ff }, + { 0x0013, 0x0100 }, + { 0x0013, 0x0101 }, + { 0x0013, 0x0102 }, + { 0x0013, 0x0103 }, + { 0x0013, 0x0104 }, + { 0x0013, 0x0105 }, + { 0x0013, 0x0106 }, + { 0x0013, 0x0107 }, + { 0x0013, 0x0108 }, + { 0x0013, 0x0109 }, + { 0x0013, 0x010a }, + { 0x0013, 0x010b }, + { 0x0013, 0x010c }, + { 0x0013, 0x010d }, + { 0x0013, 0x010e }, + { 0x0013, 0x010f }, + { 0x0013, 0x0110 }, + { 0x0013, 0x0111 }, + { 0x0013, 0x0112 }, + { 0x0013, 0x0113 }, + { 0x0013, 0x0114 }, + { 0x0013, 0x0115 }, + { 0x0013, 0x0116 }, + { 0x0013, 0x0117 }, + { 0x0013, 0x0118 }, + { 0x0013, 0x0119 }, + { 0x0013, 0x011a }, + { 0x0013, 0x011b }, + { 0x0013, 0x011c }, + { 0x0013, 0x011d }, + { 0x0013, 0x011e }, + { 0x0013, 0x011f }, + { 0x0013, 0x0120 }, + { 0x0013, 0x0121 }, + { 0x0013, 0x0122 }, + { 0x0013, 0x0123 }, + { 0x0013, 0x0124 }, + { 0x0013, 0x0125 }, + { 0x0013, 0x0126 }, + { 0x0013, 0x0127 }, + { 0x0013, 0x0128 }, + { 0x0013, 0x0129 }, + { 0x0013, 0x012a }, + { 0x0013, 0x012b }, + { 0x0013, 0x012c }, + { 0x0013, 0x012d }, + { 0x0013, 0x012e }, + { 0x0013, 0x012f }, + { 0x0013, 0x0130 }, + { 0x0013, 0x0131 }, + { 0x0013, 0x0132 }, + { 0x0013, 0x0133 }, + { 0x0013, 0x0134 }, + { 0x0013, 0x0135 }, + { 0x0013, 0x0136 }, + { 0x0013, 0x0137 }, + { 0x0013, 0x0138 }, + { 0x0013, 0x0139 }, + { 0x0013, 0x013a }, + { 0x0013, 0x013b }, + { 0x0013, 0x013c }, + { 0x0013, 0x013d }, + { 0x0013, 0x013e }, + { 0x0013, 0x013f }, + { 0x0013, 0x0140 }, + { 0x0013, 0x0141 }, + { 0x0013, 0x0142 }, + { 0x0013, 0x0143 }, + { 0x0013, 0x0144 }, + { 0x0013, 0x0145 }, + { 0x0013, 0x0146 }, + { 0x0013, 0x0147 }, + { 0x0013, 0x0148 }, + { 0x0013, 0x0149 }, + { 0x0013, 0x014a }, + { 0x0013, 0x014b }, + { 0x0013, 0x014c }, + { 0x0013, 0x014d }, + { 0x0013, 0x014e }, + { 0x0013, 0x014f }, + { 0x0013, 0x0150 }, + { 0x0013, 0x0151 }, + { 0x0013, 0x0152 }, + { 0x0013, 0x0153 }, + { 0x0013, 0x0154 }, + { 0x0013, 0x0155 }, + { 0x0013, 0x0156 }, + { 0x0013, 0x0157 }, + { 0x0013, 0x0158 }, + { 0x0013, 0x0159 }, + { 0x0013, 0x015a }, + { 0x0013, 0x015b }, + { 0x0013, 0x015c }, + { 0x0013, 0x015d }, + { 0x0013, 0x015e }, + { 0x0013, 0x015f }, + { 0x0013, 0x0160 }, + { 0x0013, 0x0161 }, + { 0x0013, 0x0162 }, + { 0x0013, 0x0163 }, + { 0x0013, 0x0164 }, + { 0x0013, 0x0165 }, + { 0x0013, 0x0166 }, + { 0x0013, 0x0167 }, + { 0x0013, 0x0168 }, + { 0x0013, 0x0169 }, + { 0x0013, 0x016a }, + { 0x0013, 0x016b }, + { 0x0013, 0x016c }, + { 0x0013, 0x016d }, + { 0x0013, 0x016e }, + { 0x0013, 0x016f }, + { 0x0013, 0x0170 }, + { 0x0013, 0x0171 }, + { 0x0013, 0x0172 }, + { 0x0013, 0x0173 }, + { 0x0013, 0x0174 }, + { 0x0013, 0x0175 }, + { 0x0013, 0x0176 }, + { 0x0013, 0x0177 }, + { 0x0013, 0x0178 }, + { 0x0013, 0x0179 }, + { 0x0013, 0x017a }, + { 0x0013, 0x017b }, + { 0x0013, 0x017c }, + { 0x0013, 0x017d }, + { 0x0013, 0x017e }, + { 0x0013, 0x017f }, + { 0x0013, 0x0180 }, + { 0x0013, 0x0181 }, + { 0x0013, 0x0182 }, + { 0x0013, 0x0183 }, + { 0x0013, 0x0184 }, + { 0x0013, 0x0185 }, + { 0x0013, 0x0186 }, + { 0x0013, 0x0187 }, + { 0x0013, 0x0188 }, + { 0x0013, 0x0189 }, + { 0x0013, 0x018a }, + { 0x0013, 0x018b }, + { 0x0013, 0x018c }, + { 0x0013, 0x018d }, + { 0x0013, 0x018e }, + { 0x0013, 0x018f }, + { 0x0013, 0x0190 }, + { 0x0013, 0x0191 }, + { 0x0013, 0x0192 }, + { 0x0013, 0x0193 }, + { 0x0013, 0x0194 }, + { 0x0013, 0x0195 }, + { 0x0013, 0x0196 }, + { 0x0013, 0x0197 }, + { 0x0013, 0x0198 }, + { 0x0013, 0x0199 }, + { 0x0013, 0x019a }, + { 0x0013, 0x019b }, + { 0x0013, 0x019c }, + { 0x0013, 0x019d }, + { 0x0013, 0x019e }, + { 0x0013, 0x019f }, + { 0x0013, 0x01a0 }, + { 0x0013, 0x01a1 }, + { 0x0013, 0x01a2 }, + { 0x0013, 0x01a3 }, + { 0x0013, 0x01a4 }, + { 0x0013, 0x01a5 }, + { 0x0013, 0x01a6 }, + { 0x0013, 0x01a7 }, + { 0x0013, 0x01a8 }, + { 0x0013, 0x01a9 }, + { 0x0013, 0x01aa }, + { 0x0013, 0x01ab }, + { 0x0013, 0x01ac }, + { 0x0013, 0x01ad }, + { 0x0013, 0x01ae }, + { 0x0013, 0x01af }, + { 0x0013, 0x01b0 }, + { 0x0013, 0x01b1 }, + { 0x0013, 0x01b2 }, + { 0x0013, 0x01b3 }, + { 0x0013, 0x01b4 }, + { 0x0013, 0x01b5 }, + { 0x0013, 0x01b6 }, + { 0x0013, 0x01b7 }, + { 0x0013, 0x01b8 }, + { 0x0013, 0x01b9 }, + { 0x0013, 0x01ba }, + { 0x0013, 0x01bb }, + { 0x0013, 0x01bc }, + { 0x0013, 0x01bd }, + { 0x0013, 0x01be }, + { 0x0013, 0x01bf }, + { 0x0013, 0x01c0 }, + { 0x0013, 0x01c1 }, + { 0x0013, 0x01c2 }, + { 0x0013, 0x01c3 }, + { 0x0013, 0x01c4 }, + { 0x0013, 0x01c5 }, + { 0x0013, 0x01c6 }, + { 0x0013, 0x01c7 }, + { 0x0013, 0x01c8 }, + { 0x0013, 0x01c9 }, + { 0x0013, 0x01ca }, + { 0x0013, 0x01cb }, + { 0x0013, 0x01cc }, + { 0x0013, 0x01cd }, + { 0x0013, 0x01ce }, + { 0x0013, 0x01cf }, + { 0x0013, 0x01d0 }, + { 0x0013, 0x01d1 }, + { 0x0013, 0x01d2 }, + { 0x0013, 0x01d3 }, + { 0x0013, 0x01d4 }, + { 0x0013, 0x01d5 }, + { 0x0013, 0x01d6 }, + { 0x0013, 0x01d7 }, + { 0x0013, 0x01d8 }, + { 0x0013, 0x01d9 }, + { 0x0013, 0x01da }, + { 0x0013, 0x01db }, + { 0x0013, 0x01dc }, + { 0x0013, 0x01dd }, + { 0x0013, 0x01de }, + { 0x0013, 0x01df }, + { 0x0013, 0x01e0 }, + { 0x0013, 0x01e1 }, + { 0x0013, 0x01e2 }, + { 0x0013, 0x01e3 }, + { 0x0013, 0x01e4 }, + { 0x0013, 0x01e5 }, + { 0x0013, 0x01e6 }, + { 0x0013, 0x01e7 }, + { 0x0013, 0x01e8 }, + { 0x0013, 0x01e9 }, + { 0x0013, 0x01ea }, + { 0x0013, 0x01eb }, + { 0x0012, 0x00fd }, + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec47[87][16] = { + { + 0x0004ffff, + 0x0003ffff, + 0x0001ffff, + 0x0002ffff, + 0x0000001a, + 0x00000031, + 0x00010001, + 0x00010001, + 0x00010018, + 0x00010018, + 0x00010019, + 0x00010019, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020000, + }, + { + 0x00020049, + 0x00020049, + 0x00020049, + 0x00020049, + 0x0002004a, + 0x0002004a, + 0x0002004a, + 0x0002004a, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + }, + { + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + }, + { + 0x00020003, + 0x00020003, + 0x00020003, + 0x00020003, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x00020033, + 0x00020033, + 0x00020033, + 0x00020033, + 0x00020048, + 0x00020048, + 0x00020048, + 0x00020048, + }, + { + 0x000affff, + 0x0008ffff, + 0x0009ffff, + 0x0005ffff, + 0x0006ffff, + 0x0007ffff, + 0x00000004, + 0x00000034, + 0x00000060, + 0x00000062, + 0x0001001c, + 0x0001001c, + 0x0001004b, + 0x0001004b, + 0x00010061, + 0x00010061, + }, + { + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + }, + { + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x00030063, + 0x00030063, + 0x00030063, + 0x00030063, + 0x00030063, + 0x00030063, + 0x00030063, + 0x00030063, + }, + { + 0x00030079, + 0x00030079, + 0x00030079, + 0x00030079, + 0x00030079, + 0x00030079, + 0x00030079, + 0x00030079, + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x0003007a, + 0x0003007a, + }, + { + 0x00010036, + 0x00010036, + 0x00010065, + 0x00010065, + 0x0001007c, + 0x0001007c, + 0x00010090, + 0x00010090, + 0x00010091, + 0x00010091, + 0x00010092, + 0x00010092, + 0x00020005, + 0x00020005, + 0x00020005, + 0x00020005, + }, + { + 0x0002004d, + 0x0002004d, + 0x0002004d, + 0x0002004d, + 0x00020064, + 0x00020064, + 0x00020064, + 0x00020064, + 0x00020078, + 0x00020078, + 0x00020078, + 0x00020078, + 0x0002007b, + 0x0002007b, + 0x0002007b, + 0x0002007b, + }, + { + 0x0017ffff, + 0x0028ffff, + 0x0039ffff, + 0x0012ffff, + 0x0011ffff, + 0x0010ffff, + 0x000bffff, + 0x000cffff, + 0x000dffff, + 0x000effff, + 0x000fffff, + 0x00000006, + 0x0000004e, + 0x00000093, + 0x0001001e, + 0x0001001e, + }, + { + 0x00020095, + 0x00020095, + 0x00020095, + 0x00020095, + 0x000200a8, + 0x000200a8, + 0x000200a8, + 0x000200a8, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + }, + { + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + }, + { + 0x00030066, + 0x00030066, + 0x00030066, + 0x00030066, + 0x00030066, + 0x00030066, + 0x00030066, + 0x00030066, + 0x0003007d, + 0x0003007d, + 0x0003007d, + 0x0003007d, + 0x0003007d, + 0x0003007d, + 0x0003007d, + 0x0003007d, + }, + { + 0x00030094, + 0x00030094, + 0x00030094, + 0x00030094, + 0x00030094, + 0x00030094, + 0x00030094, + 0x00030094, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + }, + { + 0x000300aa, + 0x000300aa, + 0x000300aa, + 0x000300aa, + 0x000300aa, + 0x000300aa, + 0x000300aa, + 0x000300aa, + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300ab, + }, + { + 0x00010067, + 0x00010067, + 0x00010068, + 0x00010068, + 0x0001007e, + 0x0001007e, + 0x000100ac, + 0x000100ac, + 0x000100c1, + 0x000100c1, + 0x000100c2, + 0x000100c2, + 0x0002004f, + 0x0002004f, + 0x0002004f, + 0x0002004f, + }, + { + 0x0014ffff, + 0x00000008, + 0x00000050, + 0x0000007f, + 0x00000096, + 0x000000ad, + 0x000000c0, + 0x000000c3, + 0x000000d9, + 0x000000da, + 0x00010020, + 0x00010020, + 0x00010021, + 0x00010021, + 0x00010038, + 0x00010038, + }, + { + 0x004affff, + 0x004bffff, + 0x004cffff, + 0x004dffff, + 0x004effff, + 0x004fffff, + 0x0050ffff, + 0x0051ffff, + 0x0052ffff, + 0x0053ffff, + 0x0054ffff, + 0x0055ffff, + 0x0056ffff, + 0x0016ffff, + 0x0015ffff, + 0x0013ffff, + }, + { + 0x000200f3, + 0x000200f3, + 0x000200f3, + 0x000200f3, + 0x0002023f, + 0x0002023f, + 0x0002023f, + 0x0002023f, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + 0x00030069, + }, + { + 0x000300c4, + 0x000300c4, + 0x000300c4, + 0x000300c4, + 0x000300c4, + 0x000300c4, + 0x000300c4, + 0x000300c4, + 0x000300db, + 0x000300db, + 0x000300db, + 0x000300db, + 0x000300db, + 0x000300db, + 0x000300db, + 0x000300db, + }, + { + 0x00020051, + 0x00020051, + 0x00020051, + 0x00020051, + 0x00020080, + 0x00020080, + 0x00020080, + 0x00020080, + 0x000200af, + 0x000200af, + 0x000200af, + 0x000200af, + 0x000200dd, + 0x000200dd, + 0x000200dd, + 0x000200dd, + }, + { + 0x0001023b, + 0x0001023b, + 0x0001023c, + 0x0001023c, + 0x0001023d, + 0x0001023d, + 0x0001023e, + 0x0001023e, + 0x00020022, + 0x00020022, + 0x00020022, + 0x00020022, + 0x00020039, + 0x00020039, + 0x00020039, + 0x00020039, + }, + { + 0x001bffff, + 0x001affff, + 0x001dffff, + 0x001cffff, + 0x0020ffff, + 0x0018ffff, + 0x0019ffff, + 0x001effff, + 0x001fffff, + 0x0021ffff, + 0x0022ffff, + 0x0023ffff, + 0x0024ffff, + 0x0025ffff, + 0x0026ffff, + 0x0027ffff, + }, + { + 0x00010046, + 0x00010046, + 0x00010047, + 0x00010047, + 0x00010052, + 0x00010052, + 0x00010053, + 0x00010053, + 0x00010054, + 0x00010054, + 0x00010055, + 0x00010055, + 0x00010056, + 0x00010056, + 0x00010057, + 0x00010057, + }, + { + 0x00010058, + 0x00010058, + 0x00010059, + 0x00010059, + 0x0001005a, + 0x0001005a, + 0x0001005b, + 0x0001005b, + 0x0001005c, + 0x0001005c, + 0x0001005d, + 0x0001005d, + 0x0001005e, + 0x0001005e, + 0x0001005f, + 0x0001005f, + }, + { + 0x00010011, + 0x00010011, + 0x00010012, + 0x00010012, + 0x00010013, + 0x00010013, + 0x00010014, + 0x00010014, + 0x00010015, + 0x00010015, + 0x00010016, + 0x00010016, + 0x00010017, + 0x00010017, + 0x00010023, + 0x00010023, + }, + { + 0x00010009, + 0x00010009, + 0x0001000a, + 0x0001000a, + 0x0001000b, + 0x0001000b, + 0x0001000c, + 0x0001000c, + 0x0001000d, + 0x0001000d, + 0x0001000e, + 0x0001000e, + 0x0001000f, + 0x0001000f, + 0x00010010, + 0x00010010, + }, + { + 0x0001002c, + 0x0001002c, + 0x0001002d, + 0x0001002d, + 0x0001002e, + 0x0001002e, + 0x0001002f, + 0x0001002f, + 0x0001003a, + 0x0001003a, + 0x0001003b, + 0x0001003b, + 0x0001003c, + 0x0001003c, + 0x0001003d, + 0x0001003d, + }, + { + 0x00010024, + 0x00010024, + 0x00010025, + 0x00010025, + 0x00010026, + 0x00010026, + 0x00010027, + 0x00010027, + 0x00010028, + 0x00010028, + 0x00010029, + 0x00010029, + 0x0001002a, + 0x0001002a, + 0x0001002b, + 0x0001002b, + }, + { + 0x0001006a, + 0x0001006a, + 0x0001006b, + 0x0001006b, + 0x0001006c, + 0x0001006c, + 0x0001006d, + 0x0001006d, + 0x0001006e, + 0x0001006e, + 0x0001006f, + 0x0001006f, + 0x00010070, + 0x00010070, + 0x00010071, + 0x00010071, + }, + { + 0x00010072, + 0x00010072, + 0x00010073, + 0x00010073, + 0x00010074, + 0x00010074, + 0x00010075, + 0x00010075, + 0x00010076, + 0x00010076, + 0x00010077, + 0x00010077, + 0x00010081, + 0x00010081, + 0x00010082, + 0x00010082, + }, + { + 0x0001003e, + 0x0001003e, + 0x0001003f, + 0x0001003f, + 0x00010040, + 0x00010040, + 0x00010041, + 0x00010041, + 0x00010042, + 0x00010042, + 0x00010043, + 0x00010043, + 0x00010044, + 0x00010044, + 0x00010045, + 0x00010045, + }, + { + 0x00010083, + 0x00010083, + 0x00010084, + 0x00010084, + 0x00010085, + 0x00010085, + 0x00010086, + 0x00010086, + 0x00010087, + 0x00010087, + 0x00010088, + 0x00010088, + 0x00010089, + 0x00010089, + 0x0001008a, + 0x0001008a, + }, + { + 0x0001008b, + 0x0001008b, + 0x0001008c, + 0x0001008c, + 0x0001008d, + 0x0001008d, + 0x0001008e, + 0x0001008e, + 0x0001008f, + 0x0001008f, + 0x00010097, + 0x00010097, + 0x00010098, + 0x00010098, + 0x00010099, + 0x00010099, + }, + { + 0x0001009a, + 0x0001009a, + 0x0001009b, + 0x0001009b, + 0x0001009c, + 0x0001009c, + 0x0001009d, + 0x0001009d, + 0x0001009e, + 0x0001009e, + 0x0001009f, + 0x0001009f, + 0x000100a0, + 0x000100a0, + 0x000100a1, + 0x000100a1, + }, + { + 0x000100a2, + 0x000100a2, + 0x000100a3, + 0x000100a3, + 0x000100a4, + 0x000100a4, + 0x000100a5, + 0x000100a5, + 0x000100a6, + 0x000100a6, + 0x000100a7, + 0x000100a7, + 0x000100ae, + 0x000100ae, + 0x000100b0, + 0x000100b0, + }, + { + 0x000100b1, + 0x000100b1, + 0x000100b2, + 0x000100b2, + 0x000100b3, + 0x000100b3, + 0x000100b4, + 0x000100b4, + 0x000100b5, + 0x000100b5, + 0x000100b6, + 0x000100b6, + 0x000100b7, + 0x000100b7, + 0x000100b8, + 0x000100b8, + }, + { + 0x000100b9, + 0x000100b9, + 0x000100ba, + 0x000100ba, + 0x000100bb, + 0x000100bb, + 0x000100bc, + 0x000100bc, + 0x000100bd, + 0x000100bd, + 0x000100be, + 0x000100be, + 0x000100bf, + 0x000100bf, + 0x000100c5, + 0x000100c5, + }, + { + 0x000100c6, + 0x000100c6, + 0x000100c7, + 0x000100c7, + 0x000100c8, + 0x000100c8, + 0x000100c9, + 0x000100c9, + 0x000100ca, + 0x000100ca, + 0x000100cb, + 0x000100cb, + 0x000100cc, + 0x000100cc, + 0x000100cd, + 0x000100cd, + }, + { + 0x0029ffff, + 0x002affff, + 0x002bffff, + 0x002cffff, + 0x002dffff, + 0x002effff, + 0x002fffff, + 0x0030ffff, + 0x0031ffff, + 0x0032ffff, + 0x0033ffff, + 0x0034ffff, + 0x0035ffff, + 0x0036ffff, + 0x0037ffff, + 0x0038ffff, + }, + { + 0x000100ce, + 0x000100ce, + 0x000100cf, + 0x000100cf, + 0x000100d0, + 0x000100d0, + 0x000100d1, + 0x000100d1, + 0x000100d2, + 0x000100d2, + 0x000100d3, + 0x000100d3, + 0x000100d4, + 0x000100d4, + 0x000100d5, + 0x000100d5, + }, + { + 0x000100d6, + 0x000100d6, + 0x000100d7, + 0x000100d7, + 0x000100d8, + 0x000100d8, + 0x000100dc, + 0x000100dc, + 0x000100de, + 0x000100de, + 0x000100df, + 0x000100df, + 0x000100e0, + 0x000100e0, + 0x000100e1, + 0x000100e1, + }, + { + 0x000100e2, + 0x000100e2, + 0x000100e3, + 0x000100e3, + 0x000100e4, + 0x000100e4, + 0x000100e5, + 0x000100e5, + 0x000100e6, + 0x000100e6, + 0x000100e7, + 0x000100e7, + 0x000100e8, + 0x000100e8, + 0x000100e9, + 0x000100e9, + }, + { + 0x000100ea, + 0x000100ea, + 0x000100eb, + 0x000100eb, + 0x000100ec, + 0x000100ec, + 0x000100ed, + 0x000100ed, + 0x000100ee, + 0x000100ee, + 0x000100ef, + 0x000100ef, + 0x000100f0, + 0x000100f0, + 0x000100f1, + 0x000100f1, + }, + { + 0x000100f2, + 0x000100f2, + 0x000100f4, + 0x000100f4, + 0x000100f5, + 0x000100f5, + 0x000100f6, + 0x000100f6, + 0x000100f7, + 0x000100f7, + 0x000100f8, + 0x000100f8, + 0x000100f9, + 0x000100f9, + 0x000100fa, + 0x000100fa, + }, + { + 0x000100fb, + 0x000100fb, + 0x000100fc, + 0x000100fc, + 0x000100fd, + 0x000100fd, + 0x000100fe, + 0x000100fe, + 0x000100ff, + 0x000100ff, + 0x00010100, + 0x00010100, + 0x00010101, + 0x00010101, + 0x00010102, + 0x00010102, + }, + { + 0x00010103, + 0x00010103, + 0x00010104, + 0x00010104, + 0x00010105, + 0x00010105, + 0x00010106, + 0x00010106, + 0x00010107, + 0x00010107, + 0x00010108, + 0x00010108, + 0x00010109, + 0x00010109, + 0x0001010a, + 0x0001010a, + }, + { + 0x0001010b, + 0x0001010b, + 0x0001010c, + 0x0001010c, + 0x0001010d, + 0x0001010d, + 0x0001010e, + 0x0001010e, + 0x0001010f, + 0x0001010f, + 0x00010110, + 0x00010110, + 0x00010111, + 0x00010111, + 0x00010112, + 0x00010112, + }, + { + 0x00010113, + 0x00010113, + 0x00010114, + 0x00010114, + 0x00010115, + 0x00010115, + 0x00010116, + 0x00010116, + 0x00010117, + 0x00010117, + 0x00010118, + 0x00010118, + 0x00010119, + 0x00010119, + 0x0001011a, + 0x0001011a, + }, + { + 0x0001011b, + 0x0001011b, + 0x0001011c, + 0x0001011c, + 0x0001011d, + 0x0001011d, + 0x0001011e, + 0x0001011e, + 0x0001011f, + 0x0001011f, + 0x00010120, + 0x00010120, + 0x00010121, + 0x00010121, + 0x00010122, + 0x00010122, + }, + { + 0x00010123, + 0x00010123, + 0x00010124, + 0x00010124, + 0x00010125, + 0x00010125, + 0x00010126, + 0x00010126, + 0x00010127, + 0x00010127, + 0x00010128, + 0x00010128, + 0x00010129, + 0x00010129, + 0x0001012a, + 0x0001012a, + }, + { + 0x0001012b, + 0x0001012b, + 0x0001012c, + 0x0001012c, + 0x0001012d, + 0x0001012d, + 0x0001012e, + 0x0001012e, + 0x0001012f, + 0x0001012f, + 0x00010130, + 0x00010130, + 0x00010131, + 0x00010131, + 0x00010132, + 0x00010132, + }, + { + 0x00010133, + 0x00010133, + 0x00010134, + 0x00010134, + 0x00010135, + 0x00010135, + 0x00010136, + 0x00010136, + 0x00010137, + 0x00010137, + 0x00010138, + 0x00010138, + 0x00010139, + 0x00010139, + 0x0001013a, + 0x0001013a, + }, + { + 0x0001013b, + 0x0001013b, + 0x0001013c, + 0x0001013c, + 0x0001013d, + 0x0001013d, + 0x0001013e, + 0x0001013e, + 0x0001013f, + 0x0001013f, + 0x00010140, + 0x00010140, + 0x00010141, + 0x00010141, + 0x00010142, + 0x00010142, + }, + { + 0x00010143, + 0x00010143, + 0x00010144, + 0x00010144, + 0x00010145, + 0x00010145, + 0x00010146, + 0x00010146, + 0x00010147, + 0x00010147, + 0x00010148, + 0x00010148, + 0x00010149, + 0x00010149, + 0x0001014a, + 0x0001014a, + }, + { + 0x0001014b, + 0x0001014b, + 0x0001014c, + 0x0001014c, + 0x0001014d, + 0x0001014d, + 0x0001014e, + 0x0001014e, + 0x0001014f, + 0x0001014f, + 0x00010150, + 0x00010150, + 0x00010151, + 0x00010151, + 0x00010152, + 0x00010152, + }, + { + 0x003affff, + 0x003bffff, + 0x003cffff, + 0x003dffff, + 0x003effff, + 0x003fffff, + 0x0040ffff, + 0x0041ffff, + 0x0042ffff, + 0x0043ffff, + 0x0044ffff, + 0x0045ffff, + 0x0046ffff, + 0x0047ffff, + 0x0048ffff, + 0x0049ffff, + }, + { + 0x00010153, + 0x00010153, + 0x00010154, + 0x00010154, + 0x00010155, + 0x00010155, + 0x00010156, + 0x00010156, + 0x00010157, + 0x00010157, + 0x00010158, + 0x00010158, + 0x00010159, + 0x00010159, + 0x0001015a, + 0x0001015a, + }, + { + 0x0001015b, + 0x0001015b, + 0x0001015c, + 0x0001015c, + 0x0001015d, + 0x0001015d, + 0x0001015e, + 0x0001015e, + 0x0001015f, + 0x0001015f, + 0x00010160, + 0x00010160, + 0x00010161, + 0x00010161, + 0x00010162, + 0x00010162, + }, + { + 0x00010163, + 0x00010163, + 0x00010164, + 0x00010164, + 0x00010165, + 0x00010165, + 0x00010166, + 0x00010166, + 0x00010167, + 0x00010167, + 0x00010168, + 0x00010168, + 0x00010169, + 0x00010169, + 0x0001016a, + 0x0001016a, + }, + { + 0x0001016b, + 0x0001016b, + 0x0001016c, + 0x0001016c, + 0x0001016d, + 0x0001016d, + 0x0001016e, + 0x0001016e, + 0x0001016f, + 0x0001016f, + 0x00010170, + 0x00010170, + 0x00010171, + 0x00010171, + 0x00010172, + 0x00010172, + }, + { + 0x00010173, + 0x00010173, + 0x00010174, + 0x00010174, + 0x00010175, + 0x00010175, + 0x00010176, + 0x00010176, + 0x00010177, + 0x00010177, + 0x00010178, + 0x00010178, + 0x00010179, + 0x00010179, + 0x0001017a, + 0x0001017a, + }, + { + 0x0001017b, + 0x0001017b, + 0x0001017c, + 0x0001017c, + 0x0001017d, + 0x0001017d, + 0x0001017e, + 0x0001017e, + 0x0001017f, + 0x0001017f, + 0x00010180, + 0x00010180, + 0x00010181, + 0x00010181, + 0x00010182, + 0x00010182, + }, + { + 0x00010183, + 0x00010183, + 0x00010184, + 0x00010184, + 0x00010185, + 0x00010185, + 0x00010186, + 0x00010186, + 0x00010187, + 0x00010187, + 0x00010188, + 0x00010188, + 0x00010189, + 0x00010189, + 0x0001018a, + 0x0001018a, + }, + { + 0x0001018b, + 0x0001018b, + 0x0001018c, + 0x0001018c, + 0x0001018d, + 0x0001018d, + 0x0001018e, + 0x0001018e, + 0x0001018f, + 0x0001018f, + 0x00010190, + 0x00010190, + 0x00010191, + 0x00010191, + 0x00010192, + 0x00010192, + }, + { + 0x00010193, + 0x00010193, + 0x00010194, + 0x00010194, + 0x00010195, + 0x00010195, + 0x00010196, + 0x00010196, + 0x00010197, + 0x00010197, + 0x00010198, + 0x00010198, + 0x00010199, + 0x00010199, + 0x0001019a, + 0x0001019a, + }, + { + 0x0001019b, + 0x0001019b, + 0x0001019c, + 0x0001019c, + 0x0001019d, + 0x0001019d, + 0x0001019e, + 0x0001019e, + 0x0001019f, + 0x0001019f, + 0x000101a0, + 0x000101a0, + 0x000101a1, + 0x000101a1, + 0x000101a2, + 0x000101a2, + }, + { + 0x000101a3, + 0x000101a3, + 0x000101a4, + 0x000101a4, + 0x000101a5, + 0x000101a5, + 0x000101a6, + 0x000101a6, + 0x000101a7, + 0x000101a7, + 0x000101a8, + 0x000101a8, + 0x000101a9, + 0x000101a9, + 0x000101aa, + 0x000101aa, + }, + { + 0x000101ab, + 0x000101ab, + 0x000101ac, + 0x000101ac, + 0x000101ad, + 0x000101ad, + 0x000101ae, + 0x000101ae, + 0x000101af, + 0x000101af, + 0x000101b0, + 0x000101b0, + 0x000101b1, + 0x000101b1, + 0x000101b2, + 0x000101b2, + }, + { + 0x000101b3, + 0x000101b3, + 0x000101b4, + 0x000101b4, + 0x000101b5, + 0x000101b5, + 0x000101b6, + 0x000101b6, + 0x000101b7, + 0x000101b7, + 0x000101b8, + 0x000101b8, + 0x000101b9, + 0x000101b9, + 0x000101ba, + 0x000101ba, + }, + { + 0x000101bb, + 0x000101bb, + 0x000101bc, + 0x000101bc, + 0x000101bd, + 0x000101bd, + 0x000101be, + 0x000101be, + 0x000101bf, + 0x000101bf, + 0x000101c0, + 0x000101c0, + 0x000101c1, + 0x000101c1, + 0x000101c2, + 0x000101c2, + }, + { + 0x000101c3, + 0x000101c3, + 0x000101c4, + 0x000101c4, + 0x000101c5, + 0x000101c5, + 0x000101c6, + 0x000101c6, + 0x000101c7, + 0x000101c7, + 0x000101c8, + 0x000101c8, + 0x000101c9, + 0x000101c9, + 0x000101ca, + 0x000101ca, + }, + { + 0x000101cb, + 0x000101cb, + 0x000101cc, + 0x000101cc, + 0x000101cd, + 0x000101cd, + 0x000101ce, + 0x000101ce, + 0x000101cf, + 0x000101cf, + 0x000101d0, + 0x000101d0, + 0x000101d1, + 0x000101d1, + 0x000101d2, + 0x000101d2, + }, + { + 0x000101d3, + 0x000101d3, + 0x000101d4, + 0x000101d4, + 0x000101d5, + 0x000101d5, + 0x000101d6, + 0x000101d6, + 0x000101d7, + 0x000101d7, + 0x000101d8, + 0x000101d8, + 0x000101d9, + 0x000101d9, + 0x000101da, + 0x000101da, + }, + { + 0x000101db, + 0x000101db, + 0x000101dc, + 0x000101dc, + 0x000101dd, + 0x000101dd, + 0x000101de, + 0x000101de, + 0x000101df, + 0x000101df, + 0x000101e0, + 0x000101e0, + 0x000101e1, + 0x000101e1, + 0x000101e2, + 0x000101e2, + }, + { + 0x000101e3, + 0x000101e3, + 0x000101e4, + 0x000101e4, + 0x000101e5, + 0x000101e5, + 0x000101e6, + 0x000101e6, + 0x000101e7, + 0x000101e7, + 0x000101e8, + 0x000101e8, + 0x000101e9, + 0x000101e9, + 0x000101ea, + 0x000101ea, + }, + { + 0x000101eb, + 0x000101eb, + 0x000101ec, + 0x000101ec, + 0x000101ed, + 0x000101ed, + 0x000101ee, + 0x000101ee, + 0x000101ef, + 0x000101ef, + 0x000101f0, + 0x000101f0, + 0x000101f1, + 0x000101f1, + 0x000101f2, + 0x000101f2, + }, + { + 0x000101f3, + 0x000101f3, + 0x000101f4, + 0x000101f4, + 0x000101f5, + 0x000101f5, + 0x000101f6, + 0x000101f6, + 0x000101f7, + 0x000101f7, + 0x000101f8, + 0x000101f8, + 0x000101f9, + 0x000101f9, + 0x000101fa, + 0x000101fa, + }, + { + 0x000101fb, + 0x000101fb, + 0x000101fc, + 0x000101fc, + 0x000101fd, + 0x000101fd, + 0x000101fe, + 0x000101fe, + 0x000101ff, + 0x000101ff, + 0x00010200, + 0x00010200, + 0x00010201, + 0x00010201, + 0x00010202, + 0x00010202, + }, + { + 0x00010203, + 0x00010203, + 0x00010204, + 0x00010204, + 0x00010205, + 0x00010205, + 0x00010206, + 0x00010206, + 0x00010207, + 0x00010207, + 0x00010208, + 0x00010208, + 0x00010209, + 0x00010209, + 0x0001020a, + 0x0001020a, + }, + { + 0x0001020b, + 0x0001020b, + 0x0001020c, + 0x0001020c, + 0x0001020d, + 0x0001020d, + 0x0001020e, + 0x0001020e, + 0x0001020f, + 0x0001020f, + 0x00010210, + 0x00010210, + 0x00010211, + 0x00010211, + 0x00010212, + 0x00010212, + }, + { + 0x00010213, + 0x00010213, + 0x00010214, + 0x00010214, + 0x00010215, + 0x00010215, + 0x00010216, + 0x00010216, + 0x00010217, + 0x00010217, + 0x00010218, + 0x00010218, + 0x00010219, + 0x00010219, + 0x0001021a, + 0x0001021a, + }, + { + 0x0001021b, + 0x0001021b, + 0x0001021c, + 0x0001021c, + 0x0001021d, + 0x0001021d, + 0x0001021e, + 0x0001021e, + 0x0001021f, + 0x0001021f, + 0x00010220, + 0x00010220, + 0x00010221, + 0x00010221, + 0x00010222, + 0x00010222, + }, + { + 0x00010223, + 0x00010223, + 0x00010224, + 0x00010224, + 0x00010225, + 0x00010225, + 0x00010226, + 0x00010226, + 0x00010227, + 0x00010227, + 0x00010228, + 0x00010228, + 0x00010229, + 0x00010229, + 0x0001022a, + 0x0001022a, + }, + { + 0x0001022b, + 0x0001022b, + 0x0001022c, + 0x0001022c, + 0x0001022d, + 0x0001022d, + 0x0001022e, + 0x0001022e, + 0x0001022f, + 0x0001022f, + 0x00010230, + 0x00010230, + 0x00010231, + 0x00010231, + 0x00010232, + 0x00010232, + }, + { + 0x00010233, + 0x00010233, + 0x00010234, + 0x00010234, + 0x00010235, + 0x00010235, + 0x00010236, + 0x00010236, + 0x00010237, + 0x00010237, + 0x00010238, + 0x00010238, + 0x00010239, + 0x00010239, + 0x0001023a, + 0x0001023a, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc48[729][2] = +#else +const uint16_t c_aauiCQMFHuffEnc48[729][2] = +#endif + { + { 0x0002, 0x0003 }, + { 0x0003, 0x0003 }, + { 0x0005, 0x0006 }, + { 0x0006, 0x0006 }, + { 0x0008, 0x0006 }, + { 0x0009, 0x0007 }, + { 0x000b, 0x000b }, + { 0x000c, 0x000d }, + { 0x000f, 0x0030 }, + { 0x0010, 0x0055 }, + { 0x0012, 0x0136 }, + { 0x0013, 0x0000 }, + { 0x0013, 0x0001 }, + { 0x0013, 0x0002 }, + { 0x0013, 0x0003 }, + { 0x0013, 0x0004 }, + { 0x0013, 0x0005 }, + { 0x0013, 0x0006 }, + { 0x0013, 0x0007 }, + { 0x0013, 0x0008 }, + { 0x0013, 0x0009 }, + { 0x0013, 0x000a }, + { 0x0013, 0x000b }, + { 0x0013, 0x000c }, + { 0x0013, 0x000d }, + { 0x0013, 0x000e }, + { 0x0013, 0x000f }, + { 0x0003, 0x0004 }, + { 0x0003, 0x0005 }, + { 0x0005, 0x0007 }, + { 0x0006, 0x0007 }, + { 0x0007, 0x0007 }, + { 0x0008, 0x0007 }, + { 0x000a, 0x0008 }, + { 0x000c, 0x000e }, + { 0x000d, 0x0012 }, + { 0x000f, 0x0031 }, + { 0x0011, 0x00a0 }, + { 0x0013, 0x0010 }, + { 0x0013, 0x0011 }, + { 0x0013, 0x0012 }, + { 0x0013, 0x0013 }, + { 0x0013, 0x0014 }, + { 0x0013, 0x0015 }, + { 0x0013, 0x0016 }, + { 0x0013, 0x0017 }, + { 0x0013, 0x0018 }, + { 0x0013, 0x0019 }, + { 0x0013, 0x001a }, + { 0x0013, 0x001b }, + { 0x0013, 0x001c }, + { 0x0013, 0x001d }, + { 0x0013, 0x001e }, + { 0x0013, 0x001f }, + { 0x0005, 0x0008 }, + { 0x0004, 0x0005 }, + { 0x0005, 0x0009 }, + { 0x0006, 0x0008 }, + { 0x0007, 0x0008 }, + { 0x0008, 0x0008 }, + { 0x000a, 0x0009 }, + { 0x000c, 0x000f }, + { 0x000d, 0x0013 }, + { 0x000f, 0x0032 }, + { 0x0011, 0x00a1 }, + { 0x0013, 0x0020 }, + { 0x0013, 0x0021 }, + { 0x0013, 0x0022 }, + { 0x0013, 0x0023 }, + { 0x0013, 0x0024 }, + { 0x0013, 0x0025 }, + { 0x0013, 0x0026 }, + { 0x0013, 0x0027 }, + { 0x0013, 0x0028 }, + { 0x0013, 0x0029 }, + { 0x0013, 0x002a }, + { 0x0013, 0x002b }, + { 0x0013, 0x002c }, + { 0x0013, 0x002d }, + { 0x0013, 0x002e }, + { 0x0013, 0x002f }, + { 0x0006, 0x0009 }, + { 0x0006, 0x000a }, + { 0x0006, 0x000b }, + { 0x0007, 0x0009 }, + { 0x0008, 0x0009 }, + { 0x0009, 0x0008 }, + { 0x000b, 0x000c }, + { 0x000d, 0x0014 }, + { 0x000e, 0x001d }, + { 0x000f, 0x0033 }, + { 0x0012, 0x0137 }, + { 0x0013, 0x0030 }, + { 0x0013, 0x0031 }, + { 0x0013, 0x0032 }, + { 0x0013, 0x0033 }, + { 0x0013, 0x0034 }, + { 0x0013, 0x0035 }, + { 0x0013, 0x0036 }, + { 0x0013, 0x0037 }, + { 0x0013, 0x0038 }, + { 0x0013, 0x0039 }, + { 0x0013, 0x003a }, + { 0x0013, 0x003b }, + { 0x0013, 0x003c }, + { 0x0013, 0x003d }, + { 0x0013, 0x003e }, + { 0x0013, 0x003f }, + { 0x0008, 0x000a }, + { 0x0007, 0x000a }, + { 0x0007, 0x000b }, + { 0x0008, 0x000b }, + { 0x0009, 0x0009 }, + { 0x000a, 0x000a }, + { 0x000c, 0x0010 }, + { 0x000d, 0x0015 }, + { 0x000f, 0x0034 }, + { 0x0010, 0x0056 }, + { 0x0012, 0x0138 }, + { 0x0013, 0x0040 }, + { 0x0013, 0x0041 }, + { 0x0013, 0x0042 }, + { 0x0013, 0x0043 }, + { 0x0013, 0x0044 }, + { 0x0013, 0x0045 }, + { 0x0013, 0x0046 }, + { 0x0013, 0x0047 }, + { 0x0013, 0x0048 }, + { 0x0013, 0x0049 }, + { 0x0013, 0x004a }, + { 0x0013, 0x004b }, + { 0x0013, 0x004c }, + { 0x0013, 0x004d }, + { 0x0013, 0x004e }, + { 0x0013, 0x004f }, + { 0x0009, 0x000a }, + { 0x0008, 0x000c }, + { 0x0008, 0x000d }, + { 0x0009, 0x000b }, + { 0x000a, 0x000b }, + { 0x000c, 0x0011 }, + { 0x000d, 0x0016 }, + { 0x000e, 0x001e }, + { 0x0010, 0x0057 }, + { 0x0011, 0x00a2 }, + { 0x0011, 0x00a3 }, + { 0x0013, 0x0050 }, + { 0x0013, 0x0051 }, + { 0x0013, 0x0052 }, + { 0x0013, 0x0053 }, + { 0x0013, 0x0054 }, + { 0x0013, 0x0055 }, + { 0x0013, 0x0056 }, + { 0x0013, 0x0057 }, + { 0x0013, 0x0058 }, + { 0x0013, 0x0059 }, + { 0x0013, 0x005a }, + { 0x0013, 0x005b }, + { 0x0013, 0x005c }, + { 0x0013, 0x005d }, + { 0x0013, 0x005e }, + { 0x0013, 0x005f }, + { 0x000b, 0x000d }, + { 0x000a, 0x000c }, + { 0x000a, 0x000d }, + { 0x000b, 0x000e }, + { 0x000c, 0x0012 }, + { 0x000d, 0x0017 }, + { 0x000e, 0x001f }, + { 0x0010, 0x0058 }, + { 0x0012, 0x0139 }, + { 0x0011, 0x00a4 }, + { 0x0012, 0x013a }, + { 0x0013, 0x0060 }, + { 0x0013, 0x0061 }, + { 0x0013, 0x0062 }, + { 0x0013, 0x0063 }, + { 0x0013, 0x0064 }, + { 0x0013, 0x0065 }, + { 0x0013, 0x0066 }, + { 0x0013, 0x0067 }, + { 0x0013, 0x0068 }, + { 0x0013, 0x0069 }, + { 0x0013, 0x006a }, + { 0x0013, 0x006b }, + { 0x0013, 0x006c }, + { 0x0013, 0x006d }, + { 0x0013, 0x006e }, + { 0x0013, 0x006f }, + { 0x000c, 0x0013 }, + { 0x000b, 0x000f }, + { 0x000c, 0x0014 }, + { 0x000c, 0x0015 }, + { 0x000d, 0x0018 }, + { 0x000e, 0x0020 }, + { 0x000f, 0x0035 }, + { 0x0012, 0x013b }, + { 0x0013, 0x0070 }, + { 0x0013, 0x0071 }, + { 0x0013, 0x0072 }, + { 0x0013, 0x0073 }, + { 0x0013, 0x0074 }, + { 0x0013, 0x0075 }, + { 0x0013, 0x0076 }, + { 0x0013, 0x0077 }, + { 0x0013, 0x0078 }, + { 0x0013, 0x0079 }, + { 0x0013, 0x007a }, + { 0x0013, 0x007b }, + { 0x0013, 0x007c }, + { 0x0013, 0x007d }, + { 0x0013, 0x007e }, + { 0x0013, 0x007f }, + { 0x0013, 0x0080 }, + { 0x0013, 0x0081 }, + { 0x0013, 0x0082 }, + { 0x000e, 0x0021 }, + { 0x000d, 0x0019 }, + { 0x000e, 0x0022 }, + { 0x000e, 0x0023 }, + { 0x000f, 0x0036 }, + { 0x0010, 0x0059 }, + { 0x0011, 0x00a5 }, + { 0x0013, 0x0083 }, + { 0x0011, 0x00a6 }, + { 0x0012, 0x013c }, + { 0x0013, 0x0084 }, + { 0x0013, 0x0085 }, + { 0x0013, 0x0086 }, + { 0x0013, 0x0087 }, + { 0x0013, 0x0088 }, + { 0x0013, 0x0089 }, + { 0x0013, 0x008a }, + { 0x0013, 0x008b }, + { 0x0013, 0x008c }, + { 0x0013, 0x008d }, + { 0x0013, 0x008e }, + { 0x0013, 0x008f }, + { 0x0013, 0x0090 }, + { 0x0013, 0x0091 }, + { 0x0013, 0x0092 }, + { 0x0013, 0x0093 }, + { 0x0013, 0x0094 }, + { 0x0010, 0x005a }, + { 0x000f, 0x0037 }, + { 0x000f, 0x0038 }, + { 0x000f, 0x0039 }, + { 0x0010, 0x005b }, + { 0x0010, 0x005c }, + { 0x0013, 0x0095 }, + { 0x0011, 0x00a7 }, + { 0x0013, 0x0096 }, + { 0x0013, 0x0097 }, + { 0x0013, 0x0098 }, + { 0x0013, 0x0099 }, + { 0x0013, 0x009a }, + { 0x0013, 0x009b }, + { 0x0013, 0x009c }, + { 0x0013, 0x009d }, + { 0x0013, 0x009e }, + { 0x0013, 0x009f }, + { 0x0013, 0x00a0 }, + { 0x0013, 0x00a1 }, + { 0x0013, 0x00a2 }, + { 0x0013, 0x00a3 }, + { 0x0013, 0x00a4 }, + { 0x0013, 0x00a5 }, + { 0x0013, 0x00a6 }, + { 0x0013, 0x00a7 }, + { 0x0013, 0x00a8 }, + { 0x0010, 0x005d }, + { 0x0010, 0x005e }, + { 0x0013, 0x00a9 }, + { 0x0010, 0x005f }, + { 0x0013, 0x00aa }, + { 0x0012, 0x013d }, + { 0x0013, 0x00ab }, + { 0x0013, 0x00ac }, + { 0x0013, 0x00ad }, + { 0x0013, 0x00ae }, + { 0x0013, 0x00af }, + { 0x0013, 0x00b0 }, + { 0x0013, 0x00b1 }, + { 0x0013, 0x00b2 }, + { 0x0013, 0x00b3 }, + { 0x0013, 0x00b4 }, + { 0x0013, 0x00b5 }, + { 0x0013, 0x00b6 }, + { 0x0013, 0x00b7 }, + { 0x0013, 0x00b8 }, + { 0x0013, 0x00b9 }, + { 0x0013, 0x00ba }, + { 0x0013, 0x00bb }, + { 0x0013, 0x00bc }, + { 0x0013, 0x00bd }, + { 0x0013, 0x00be }, + { 0x0013, 0x00bf }, + { 0x0013, 0x00c0 }, + { 0x0011, 0x00a8 }, + { 0x0013, 0x00c1 }, + { 0x0011, 0x00a9 }, + { 0x0013, 0x00c2 }, + { 0x0013, 0x00c3 }, + { 0x0013, 0x00c4 }, + { 0x0013, 0x00c5 }, + { 0x0013, 0x00c6 }, + { 0x0013, 0x00c7 }, + { 0x0013, 0x00c8 }, + { 0x0013, 0x00c9 }, + { 0x0013, 0x00ca }, + { 0x0013, 0x00cb }, + { 0x0013, 0x00cc }, + { 0x0013, 0x00cd }, + { 0x0013, 0x00ce }, + { 0x0013, 0x00cf }, + { 0x0013, 0x00d0 }, + { 0x0013, 0x00d1 }, + { 0x0013, 0x00d2 }, + { 0x0013, 0x00d3 }, + { 0x0013, 0x00d4 }, + { 0x0013, 0x00d5 }, + { 0x0013, 0x00d6 }, + { 0x0013, 0x00d7 }, + { 0x0013, 0x00d8 }, + { 0x0013, 0x00d9 }, + { 0x0013, 0x00da }, + { 0x0012, 0x013e }, + { 0x0013, 0x00db }, + { 0x0013, 0x00dc }, + { 0x0013, 0x00dd }, + { 0x0013, 0x00de }, + { 0x0013, 0x00df }, + { 0x0013, 0x00e0 }, + { 0x0013, 0x00e1 }, + { 0x0013, 0x00e2 }, + { 0x0013, 0x00e3 }, + { 0x0013, 0x00e4 }, + { 0x0013, 0x00e5 }, + { 0x0013, 0x00e6 }, + { 0x0013, 0x00e7 }, + { 0x0013, 0x00e8 }, + { 0x0013, 0x00e9 }, + { 0x0013, 0x00ea }, + { 0x0013, 0x00eb }, + { 0x0013, 0x00ec }, + { 0x0013, 0x00ed }, + { 0x0013, 0x00ee }, + { 0x0013, 0x00ef }, + { 0x0013, 0x00f0 }, + { 0x0013, 0x00f1 }, + { 0x0013, 0x00f2 }, + { 0x0013, 0x00f3 }, + { 0x0013, 0x00f4 }, + { 0x0013, 0x00f5 }, + { 0x0013, 0x00f6 }, + { 0x0013, 0x00f7 }, + { 0x0013, 0x00f8 }, + { 0x0013, 0x00f9 }, + { 0x0013, 0x00fa }, + { 0x0013, 0x00fb }, + { 0x0013, 0x00fc }, + { 0x0013, 0x00fd }, + { 0x0013, 0x00fe }, + { 0x0013, 0x00ff }, + { 0x0013, 0x0100 }, + { 0x0013, 0x0101 }, + { 0x0013, 0x0102 }, + { 0x0013, 0x0103 }, + { 0x0013, 0x0104 }, + { 0x0013, 0x0105 }, + { 0x0013, 0x0106 }, + { 0x0013, 0x0107 }, + { 0x0013, 0x0108 }, + { 0x0013, 0x0109 }, + { 0x0013, 0x010a }, + { 0x0013, 0x010b }, + { 0x0013, 0x010c }, + { 0x0013, 0x010d }, + { 0x0013, 0x010e }, + { 0x0013, 0x010f }, + { 0x0013, 0x0110 }, + { 0x0013, 0x0111 }, + { 0x0013, 0x0112 }, + { 0x0013, 0x0113 }, + { 0x0013, 0x0114 }, + { 0x0013, 0x0115 }, + { 0x0013, 0x0116 }, + { 0x0013, 0x0117 }, + { 0x0013, 0x0118 }, + { 0x0013, 0x0119 }, + { 0x0013, 0x011a }, + { 0x0013, 0x011b }, + { 0x0013, 0x011c }, + { 0x0013, 0x011d }, + { 0x0013, 0x011e }, + { 0x0013, 0x011f }, + { 0x0013, 0x0120 }, + { 0x0013, 0x0121 }, + { 0x0013, 0x0122 }, + { 0x0013, 0x0123 }, + { 0x0013, 0x0124 }, + { 0x0013, 0x0125 }, + { 0x0013, 0x0126 }, + { 0x0013, 0x0127 }, + { 0x0013, 0x0128 }, + { 0x0013, 0x0129 }, + { 0x0013, 0x012a }, + { 0x0013, 0x012b }, + { 0x0013, 0x012c }, + { 0x0013, 0x012d }, + { 0x0013, 0x012e }, + { 0x0013, 0x012f }, + { 0x0013, 0x0130 }, + { 0x0013, 0x0131 }, + { 0x0013, 0x0132 }, + { 0x0013, 0x0133 }, + { 0x0013, 0x0134 }, + { 0x0013, 0x0135 }, + { 0x0013, 0x0136 }, + { 0x0013, 0x0137 }, + { 0x0013, 0x0138 }, + { 0x0013, 0x0139 }, + { 0x0013, 0x013a }, + { 0x0013, 0x013b }, + { 0x0013, 0x013c }, + { 0x0013, 0x013d }, + { 0x0013, 0x013e }, + { 0x0013, 0x013f }, + { 0x0013, 0x0140 }, + { 0x0013, 0x0141 }, + { 0x0013, 0x0142 }, + { 0x0013, 0x0143 }, + { 0x0013, 0x0144 }, + { 0x0013, 0x0145 }, + { 0x0013, 0x0146 }, + { 0x0013, 0x0147 }, + { 0x0013, 0x0148 }, + { 0x0013, 0x0149 }, + { 0x0013, 0x014a }, + { 0x0013, 0x014b }, + { 0x0013, 0x014c }, + { 0x0013, 0x014d }, + { 0x0013, 0x014e }, + { 0x0013, 0x014f }, + { 0x0013, 0x0150 }, + { 0x0013, 0x0151 }, + { 0x0013, 0x0152 }, + { 0x0013, 0x0153 }, + { 0x0013, 0x0154 }, + { 0x0013, 0x0155 }, + { 0x0013, 0x0156 }, + { 0x0013, 0x0157 }, + { 0x0013, 0x0158 }, + { 0x0013, 0x0159 }, + { 0x0013, 0x015a }, + { 0x0013, 0x015b }, + { 0x0013, 0x015c }, + { 0x0013, 0x015d }, + { 0x0013, 0x015e }, + { 0x0013, 0x015f }, + { 0x0013, 0x0160 }, + { 0x0013, 0x0161 }, + { 0x0013, 0x0162 }, + { 0x0013, 0x0163 }, + { 0x0013, 0x0164 }, + { 0x0013, 0x0165 }, + { 0x0013, 0x0166 }, + { 0x0013, 0x0167 }, + { 0x0013, 0x0168 }, + { 0x0013, 0x0169 }, + { 0x0013, 0x016a }, + { 0x0013, 0x016b }, + { 0x0013, 0x016c }, + { 0x0013, 0x016d }, + { 0x0013, 0x016e }, + { 0x0013, 0x016f }, + { 0x0013, 0x0170 }, + { 0x0013, 0x0171 }, + { 0x0013, 0x0172 }, + { 0x0013, 0x0173 }, + { 0x0013, 0x0174 }, + { 0x0013, 0x0175 }, + { 0x0013, 0x0176 }, + { 0x0013, 0x0177 }, + { 0x0013, 0x0178 }, + { 0x0013, 0x0179 }, + { 0x0013, 0x017a }, + { 0x0013, 0x017b }, + { 0x0013, 0x017c }, + { 0x0013, 0x017d }, + { 0x0013, 0x017e }, + { 0x0013, 0x017f }, + { 0x0013, 0x0180 }, + { 0x0013, 0x0181 }, + { 0x0013, 0x0182 }, + { 0x0013, 0x0183 }, + { 0x0013, 0x0184 }, + { 0x0013, 0x0185 }, + { 0x0013, 0x0186 }, + { 0x0013, 0x0187 }, + { 0x0013, 0x0188 }, + { 0x0013, 0x0189 }, + { 0x0013, 0x018a }, + { 0x0013, 0x018b }, + { 0x0013, 0x018c }, + { 0x0013, 0x018d }, + { 0x0013, 0x018e }, + { 0x0013, 0x018f }, + { 0x0013, 0x0190 }, + { 0x0013, 0x0191 }, + { 0x0013, 0x0192 }, + { 0x0013, 0x0193 }, + { 0x0013, 0x0194 }, + { 0x0013, 0x0195 }, + { 0x0013, 0x0196 }, + { 0x0013, 0x0197 }, + { 0x0013, 0x0198 }, + { 0x0013, 0x0199 }, + { 0x0013, 0x019a }, + { 0x0013, 0x019b }, + { 0x0013, 0x019c }, + { 0x0013, 0x019d }, + { 0x0013, 0x019e }, + { 0x0013, 0x019f }, + { 0x0013, 0x01a0 }, + { 0x0013, 0x01a1 }, + { 0x0013, 0x01a2 }, + { 0x0013, 0x01a3 }, + { 0x0013, 0x01a4 }, + { 0x0013, 0x01a5 }, + { 0x0013, 0x01a6 }, + { 0x0013, 0x01a7 }, + { 0x0013, 0x01a8 }, + { 0x0013, 0x01a9 }, + { 0x0013, 0x01aa }, + { 0x0013, 0x01ab }, + { 0x0013, 0x01ac }, + { 0x0013, 0x01ad }, + { 0x0013, 0x01ae }, + { 0x0013, 0x01af }, + { 0x0013, 0x01b0 }, + { 0x0013, 0x01b1 }, + { 0x0013, 0x01b2 }, + { 0x0013, 0x01b3 }, + { 0x0013, 0x01b4 }, + { 0x0013, 0x01b5 }, + { 0x0013, 0x01b6 }, + { 0x0013, 0x01b7 }, + { 0x0013, 0x01b8 }, + { 0x0013, 0x01b9 }, + { 0x0013, 0x01ba }, + { 0x0013, 0x01bb }, + { 0x0013, 0x01bc }, + { 0x0013, 0x01bd }, + { 0x0013, 0x01be }, + { 0x0013, 0x01bf }, + { 0x0013, 0x01c0 }, + { 0x0013, 0x01c1 }, + { 0x0013, 0x01c2 }, + { 0x0013, 0x01c3 }, + { 0x0013, 0x01c4 }, + { 0x0013, 0x01c5 }, + { 0x0013, 0x01c6 }, + { 0x0013, 0x01c7 }, + { 0x0013, 0x01c8 }, + { 0x0013, 0x01c9 }, + { 0x0013, 0x01ca }, + { 0x0013, 0x01cb }, + { 0x0013, 0x01cc }, + { 0x0013, 0x01cd }, + { 0x0013, 0x01ce }, + { 0x0013, 0x01cf }, + { 0x0013, 0x01d0 }, + { 0x0013, 0x01d1 }, + { 0x0013, 0x01d2 }, + { 0x0013, 0x01d3 }, + { 0x0013, 0x01d4 }, + { 0x0013, 0x01d5 }, + { 0x0013, 0x01d6 }, + { 0x0013, 0x01d7 }, + { 0x0013, 0x01d8 }, + { 0x0013, 0x01d9 }, + { 0x0013, 0x01da }, + { 0x0013, 0x01db }, + { 0x0013, 0x01dc }, + { 0x0013, 0x01dd }, + { 0x0013, 0x01de }, + { 0x0013, 0x01df }, + { 0x0013, 0x01e0 }, + { 0x0013, 0x01e1 }, + { 0x0013, 0x01e2 }, + { 0x0013, 0x01e3 }, + { 0x0013, 0x01e4 }, + { 0x0013, 0x01e5 }, + { 0x0013, 0x01e6 }, + { 0x0013, 0x01e7 }, + { 0x0013, 0x01e8 }, + { 0x0013, 0x01e9 }, + { 0x0013, 0x01ea }, + { 0x0013, 0x01eb }, + { 0x0013, 0x01ec }, + { 0x0013, 0x01ed }, + { 0x0013, 0x01ee }, + { 0x0013, 0x01ef }, + { 0x0013, 0x01f0 }, + { 0x0013, 0x01f1 }, + { 0x0013, 0x01f2 }, + { 0x0013, 0x01f3 }, + { 0x0013, 0x01f4 }, + { 0x0013, 0x01f5 }, + { 0x0013, 0x01f6 }, + { 0x0013, 0x01f7 }, + { 0x0013, 0x01f8 }, + { 0x0013, 0x01f9 }, + { 0x0013, 0x01fa }, + { 0x0013, 0x01fb }, + { 0x0013, 0x01fc }, + { 0x0013, 0x01fd }, + { 0x0013, 0x01fe }, + { 0x0013, 0x01ff }, + { 0x0013, 0x0200 }, + { 0x0013, 0x0201 }, + { 0x0013, 0x0202 }, + { 0x0013, 0x0203 }, + { 0x0013, 0x0204 }, + { 0x0013, 0x0205 }, + { 0x0013, 0x0206 }, + { 0x0013, 0x0207 }, + { 0x0013, 0x0208 }, + { 0x0013, 0x0209 }, + { 0x0013, 0x020a }, + { 0x0013, 0x020b }, + { 0x0013, 0x020c }, + { 0x0013, 0x020d }, + { 0x0013, 0x020e }, + { 0x0013, 0x020f }, + { 0x0013, 0x0210 }, + { 0x0013, 0x0211 }, + { 0x0013, 0x0212 }, + { 0x0013, 0x0213 }, + { 0x0013, 0x0214 }, + { 0x0013, 0x0215 }, + { 0x0013, 0x0216 }, + { 0x0013, 0x0217 }, + { 0x0013, 0x0218 }, + { 0x0013, 0x0219 }, + { 0x0013, 0x021a }, + { 0x0013, 0x021b }, + { 0x0013, 0x021c }, + { 0x0013, 0x021d }, + { 0x0013, 0x021e }, + { 0x0013, 0x021f }, + { 0x0013, 0x0220 }, + { 0x0013, 0x0221 }, + { 0x0013, 0x0222 }, + { 0x0013, 0x0223 }, + { 0x0013, 0x0224 }, + { 0x0013, 0x0225 }, + { 0x0013, 0x0226 }, + { 0x0013, 0x0227 }, + { 0x0013, 0x0228 }, + { 0x0013, 0x0229 }, + { 0x0013, 0x022a }, + { 0x0013, 0x022b }, + { 0x0013, 0x022c }, + { 0x0013, 0x022d }, + { 0x0013, 0x022e }, + { 0x0013, 0x022f }, + { 0x0013, 0x0230 }, + { 0x0013, 0x0231 }, + { 0x0013, 0x0232 }, + { 0x0013, 0x0233 }, + { 0x0013, 0x0234 }, + { 0x0013, 0x0235 }, + { 0x0013, 0x0236 }, + { 0x0013, 0x0237 }, + { 0x0013, 0x0238 }, + { 0x0013, 0x0239 }, + { 0x0013, 0x023a }, + { 0x0013, 0x023b }, + { 0x0013, 0x023c }, + { 0x0013, 0x023d }, + { 0x0013, 0x023e }, + { 0x0013, 0x023f }, + { 0x0013, 0x0240 }, + { 0x0013, 0x0241 }, + { 0x0013, 0x0242 }, + { 0x0013, 0x0243 }, + { 0x0013, 0x0244 }, + { 0x0013, 0x0245 }, + { 0x0013, 0x0246 }, + { 0x0013, 0x0247 }, + { 0x0013, 0x0248 }, + { 0x0013, 0x0249 }, + { 0x0013, 0x024a }, + { 0x0013, 0x024b }, + { 0x0013, 0x024c }, + { 0x0013, 0x024d }, + { 0x0013, 0x024e }, + { 0x0013, 0x024f }, + { 0x0013, 0x0250 }, + { 0x0013, 0x0251 }, + { 0x0013, 0x0252 }, + { 0x0013, 0x0253 }, + { 0x0013, 0x0254 }, + { 0x0013, 0x0255 }, + { 0x0013, 0x0256 }, + { 0x0013, 0x0257 }, + { 0x0013, 0x0258 }, + { 0x0013, 0x0259 }, + { 0x0013, 0x025a }, + { 0x0013, 0x025b }, + { 0x0013, 0x025c }, + { 0x0013, 0x025d }, + { 0x0013, 0x025e }, + { 0x0013, 0x025f }, + { 0x0013, 0x0260 }, + { 0x0013, 0x0261 }, + { 0x0013, 0x0262 }, + { 0x0013, 0x0263 }, + { 0x0013, 0x0264 }, + { 0x0013, 0x0265 }, + { 0x0013, 0x0266 }, + { 0x0013, 0x0267 }, + { 0x0013, 0x0268 }, + { 0x0013, 0x0269 }, + { 0x0013, 0x026a }, + { 0x0013, 0x026b }, + { 0x0012, 0x013f }, + + }; + +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec48[110][16] = { + { + 0x0005ffff, + 0x0003ffff, + 0x0004ffff, + 0x0001ffff, + 0x0002ffff, + 0x00000037, + 0x00010001, + 0x00010001, + 0x0001001b, + 0x0001001b, + 0x0001001c, + 0x0001001c, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020000, + }, + { + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + }, + { + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + }, + { + 0x0001003a, + 0x0001003a, + 0x00010054, + 0x00010054, + 0x0001006d, + 0x0001006d, + 0x0001006e, + 0x0001006e, + 0x00020003, + 0x00020003, + 0x00020003, + 0x00020003, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001e, + }, + { + 0x00020039, + 0x00020039, + 0x00020039, + 0x00020039, + 0x00020051, + 0x00020051, + 0x00020051, + 0x00020051, + 0x00020052, + 0x00020052, + 0x00020052, + 0x00020052, + 0x00020053, + 0x00020053, + 0x00020053, + 0x00020053, + }, + { + 0x000bffff, + 0x000affff, + 0x0009ffff, + 0x0008ffff, + 0x0006ffff, + 0x0007ffff, + 0x00000004, + 0x00000020, + 0x0000003b, + 0x00000055, + 0x0000006c, + 0x0000006f, + 0x00000088, + 0x00000089, + 0x0001001f, + 0x0001001f, + }, + { + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030070, + 0x00030070, + 0x00030070, + 0x00030070, + 0x00030070, + 0x00030070, + 0x00030070, + 0x00030070, + }, + { + 0x00030087, + 0x00030087, + 0x00030087, + 0x00030087, + 0x00030087, + 0x00030087, + 0x00030087, + 0x00030087, + 0x0003008a, + 0x0003008a, + 0x0003008a, + 0x0003008a, + 0x0003008a, + 0x0003008a, + 0x0003008a, + 0x0003008a, + }, + { + 0x000200a3, + 0x000200a3, + 0x000200a3, + 0x000200a3, + 0x000200a4, + 0x000200a4, + 0x000200a4, + 0x000200a4, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + }, + { + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020021, + 0x0002003c, + 0x0002003c, + 0x0002003c, + 0x0002003c, + 0x00020071, + 0x00020071, + 0x00020071, + 0x00020071, + 0x0002008b, + 0x0002008b, + 0x0002008b, + 0x0002008b, + }, + { + 0x00000072, + 0x0000008c, + 0x000000a6, + 0x000000bd, + 0x000000bf, + 0x000000c0, + 0x00010006, + 0x00010006, + 0x00010057, + 0x00010057, + 0x000100a2, + 0x000100a2, + 0x000100a5, + 0x000100a5, + 0x000100be, + 0x000100be, + }, + { + 0x001dffff, + 0x002effff, + 0x003fffff, + 0x0050ffff, + 0x0019ffff, + 0x0013ffff, + 0x0012ffff, + 0x0010ffff, + 0x0011ffff, + 0x000cffff, + 0x000dffff, + 0x000effff, + 0x000fffff, + 0x00000007, + 0x00000022, + 0x0000003d, + }, + { + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + }, + { + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030073, + 0x00030073, + 0x00030073, + 0x00030073, + 0x00030073, + 0x00030073, + 0x00030073, + 0x00030073, + }, + { + 0x0003008d, + 0x0003008d, + 0x0003008d, + 0x0003008d, + 0x0003008d, + 0x0003008d, + 0x0003008d, + 0x0003008d, + 0x000300a7, + 0x000300a7, + 0x000300a7, + 0x000300a7, + 0x000300a7, + 0x000300a7, + 0x000300a7, + 0x000300a7, + }, + { + 0x000300c1, + 0x000300c1, + 0x000300c1, + 0x000300c1, + 0x000300c1, + 0x000300c1, + 0x000300c1, + 0x000300c1, + 0x000300d9, + 0x000300d9, + 0x000300d9, + 0x000300d9, + 0x000300d9, + 0x000300d9, + 0x000300d9, + 0x000300d9, + }, + { + 0x000100f5, + 0x000100f5, + 0x000100f6, + 0x000100f6, + 0x00020059, + 0x00020059, + 0x00020059, + 0x00020059, + 0x0002008e, + 0x0002008e, + 0x0002008e, + 0x0002008e, + 0x000200a8, + 0x000200a8, + 0x000200a8, + 0x000200a8, + }, + { + 0x000200c2, + 0x000200c2, + 0x000200c2, + 0x000200c2, + 0x000200d8, + 0x000200d8, + 0x000200d8, + 0x000200d8, + 0x000200da, + 0x000200da, + 0x000200da, + 0x000200da, + 0x000200db, + 0x000200db, + 0x000200db, + 0x000200db, + }, + { + 0x00010008, + 0x00010008, + 0x00010024, + 0x00010024, + 0x0001003f, + 0x0001003f, + 0x0001005a, + 0x0001005a, + 0x00010074, + 0x00010074, + 0x000100c3, + 0x000100c3, + 0x000100dc, + 0x000100dc, + 0x000100f4, + 0x000100f4, + }, + { + 0x0015ffff, + 0x0014ffff, + 0x0016ffff, + 0x0017ffff, + 0x0018ffff, + 0x00000009, + 0x00000075, + 0x0000008f, + 0x000000a9, + 0x000000dd, + 0x000000f3, + 0x000000f7, + 0x000000f8, + 0x0000010e, + 0x0000010f, + 0x00000111, + }, + { + 0x00030090, + 0x00030090, + 0x00030090, + 0x00030090, + 0x00030090, + 0x00030090, + 0x00030090, + 0x00030090, + 0x00030091, + 0x00030091, + 0x00030091, + 0x00030091, + 0x00030091, + 0x00030091, + 0x00030091, + 0x00030091, + }, + { + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030040, + 0x00030040, + 0x00030040, + 0x00030040, + 0x00030040, + 0x00030040, + 0x00030040, + 0x00030040, + }, + { + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300ab, + 0x000300de, + 0x000300de, + 0x000300de, + 0x000300de, + 0x000300de, + 0x000300de, + 0x000300de, + 0x000300de, + }, + { + 0x000300e0, + 0x000300e0, + 0x000300e0, + 0x000300e0, + 0x000300e0, + 0x000300e0, + 0x000300e0, + 0x000300e0, + 0x000300fa, + 0x000300fa, + 0x000300fa, + 0x000300fa, + 0x000300fa, + 0x000300fa, + 0x000300fa, + 0x000300fa, + }, + { + 0x0003012a, + 0x0003012a, + 0x0003012a, + 0x0003012a, + 0x0003012a, + 0x0003012a, + 0x0003012a, + 0x0003012a, + 0x0003012c, + 0x0003012c, + 0x0003012c, + 0x0003012c, + 0x0003012c, + 0x0003012c, + 0x0003012c, + 0x0003012c, + }, + { + 0x0061ffff, + 0x0062ffff, + 0x0063ffff, + 0x0064ffff, + 0x0065ffff, + 0x0066ffff, + 0x0067ffff, + 0x0068ffff, + 0x0069ffff, + 0x006affff, + 0x006bffff, + 0x006cffff, + 0x006dffff, + 0x001bffff, + 0x001affff, + 0x001cffff, + }, + { + 0x00020076, + 0x00020076, + 0x00020076, + 0x00020076, + 0x000200aa, + 0x000200aa, + 0x000200aa, + 0x000200aa, + 0x000200ac, + 0x000200ac, + 0x000200ac, + 0x000200ac, + 0x000200c4, + 0x000200c4, + 0x000200c4, + 0x000200c4, + }, + { + 0x000102d4, + 0x000102d4, + 0x000102d5, + 0x000102d5, + 0x000102d6, + 0x000102d6, + 0x000102d7, + 0x000102d7, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002005b, + 0x0002005b, + 0x0002005b, + 0x0002005b, + }, + { + 0x000200e1, + 0x000200e1, + 0x000200e1, + 0x000200e1, + 0x00020113, + 0x00020113, + 0x00020113, + 0x00020113, + 0x00020146, + 0x00020146, + 0x00020146, + 0x00020146, + 0x000202d8, + 0x000202d8, + 0x000202d8, + 0x000202d8, + }, + { + 0x001effff, + 0x001fffff, + 0x0020ffff, + 0x0021ffff, + 0x0022ffff, + 0x0023ffff, + 0x0024ffff, + 0x0027ffff, + 0x0025ffff, + 0x0026ffff, + 0x0028ffff, + 0x0029ffff, + 0x002affff, + 0x002bffff, + 0x002cffff, + 0x002dffff, + }, + { + 0x0001000b, + 0x0001000b, + 0x0001000c, + 0x0001000c, + 0x0001000d, + 0x0001000d, + 0x0001000e, + 0x0001000e, + 0x0001000f, + 0x0001000f, + 0x00010010, + 0x00010010, + 0x00010011, + 0x00010011, + 0x00010012, + 0x00010012, + }, + { + 0x00010013, + 0x00010013, + 0x00010014, + 0x00010014, + 0x00010015, + 0x00010015, + 0x00010016, + 0x00010016, + 0x00010017, + 0x00010017, + 0x00010018, + 0x00010018, + 0x00010019, + 0x00010019, + 0x0001001a, + 0x0001001a, + }, + { + 0x00010026, + 0x00010026, + 0x00010027, + 0x00010027, + 0x00010028, + 0x00010028, + 0x00010029, + 0x00010029, + 0x0001002a, + 0x0001002a, + 0x0001002b, + 0x0001002b, + 0x0001002c, + 0x0001002c, + 0x0001002d, + 0x0001002d, + }, + { + 0x0001002e, + 0x0001002e, + 0x0001002f, + 0x0001002f, + 0x00010030, + 0x00010030, + 0x00010031, + 0x00010031, + 0x00010032, + 0x00010032, + 0x00010033, + 0x00010033, + 0x00010034, + 0x00010034, + 0x00010035, + 0x00010035, + }, + { + 0x00010041, + 0x00010041, + 0x00010042, + 0x00010042, + 0x00010043, + 0x00010043, + 0x00010044, + 0x00010044, + 0x00010045, + 0x00010045, + 0x00010046, + 0x00010046, + 0x00010047, + 0x00010047, + 0x00010048, + 0x00010048, + }, + { + 0x00010049, + 0x00010049, + 0x0001004a, + 0x0001004a, + 0x0001004b, + 0x0001004b, + 0x0001004c, + 0x0001004c, + 0x0001004d, + 0x0001004d, + 0x0001004e, + 0x0001004e, + 0x0001004f, + 0x0001004f, + 0x00010050, + 0x00010050, + }, + { + 0x0001005c, + 0x0001005c, + 0x0001005d, + 0x0001005d, + 0x0001005e, + 0x0001005e, + 0x0001005f, + 0x0001005f, + 0x00010060, + 0x00010060, + 0x00010061, + 0x00010061, + 0x00010062, + 0x00010062, + 0x00010063, + 0x00010063, + }, + { + 0x00010077, + 0x00010077, + 0x00010078, + 0x00010078, + 0x00010079, + 0x00010079, + 0x0001007a, + 0x0001007a, + 0x0001007b, + 0x0001007b, + 0x0001007c, + 0x0001007c, + 0x0001007d, + 0x0001007d, + 0x0001007e, + 0x0001007e, + }, + { + 0x0001007f, + 0x0001007f, + 0x00010080, + 0x00010080, + 0x00010081, + 0x00010081, + 0x00010082, + 0x00010082, + 0x00010083, + 0x00010083, + 0x00010084, + 0x00010084, + 0x00010085, + 0x00010085, + 0x00010086, + 0x00010086, + }, + { + 0x00010064, + 0x00010064, + 0x00010065, + 0x00010065, + 0x00010066, + 0x00010066, + 0x00010067, + 0x00010067, + 0x00010068, + 0x00010068, + 0x00010069, + 0x00010069, + 0x0001006a, + 0x0001006a, + 0x0001006b, + 0x0001006b, + }, + { + 0x00010092, + 0x00010092, + 0x00010093, + 0x00010093, + 0x00010094, + 0x00010094, + 0x00010095, + 0x00010095, + 0x00010096, + 0x00010096, + 0x00010097, + 0x00010097, + 0x00010098, + 0x00010098, + 0x00010099, + 0x00010099, + }, + { + 0x0001009a, + 0x0001009a, + 0x0001009b, + 0x0001009b, + 0x0001009c, + 0x0001009c, + 0x0001009d, + 0x0001009d, + 0x0001009e, + 0x0001009e, + 0x0001009f, + 0x0001009f, + 0x000100a0, + 0x000100a0, + 0x000100a1, + 0x000100a1, + }, + { + 0x000100ad, + 0x000100ad, + 0x000100ae, + 0x000100ae, + 0x000100af, + 0x000100af, + 0x000100b0, + 0x000100b0, + 0x000100b1, + 0x000100b1, + 0x000100b2, + 0x000100b2, + 0x000100b3, + 0x000100b3, + 0x000100b4, + 0x000100b4, + }, + { + 0x000100b5, + 0x000100b5, + 0x000100b6, + 0x000100b6, + 0x000100b7, + 0x000100b7, + 0x000100b8, + 0x000100b8, + 0x000100b9, + 0x000100b9, + 0x000100ba, + 0x000100ba, + 0x000100bb, + 0x000100bb, + 0x000100bc, + 0x000100bc, + }, + { + 0x000100c5, + 0x000100c5, + 0x000100c6, + 0x000100c6, + 0x000100c7, + 0x000100c7, + 0x000100c8, + 0x000100c8, + 0x000100c9, + 0x000100c9, + 0x000100ca, + 0x000100ca, + 0x000100cb, + 0x000100cb, + 0x000100cc, + 0x000100cc, + }, + { + 0x000100cd, + 0x000100cd, + 0x000100ce, + 0x000100ce, + 0x000100cf, + 0x000100cf, + 0x000100d0, + 0x000100d0, + 0x000100d1, + 0x000100d1, + 0x000100d2, + 0x000100d2, + 0x000100d3, + 0x000100d3, + 0x000100d4, + 0x000100d4, + }, + { + 0x002fffff, + 0x0030ffff, + 0x0031ffff, + 0x0032ffff, + 0x0033ffff, + 0x0034ffff, + 0x0035ffff, + 0x0036ffff, + 0x0037ffff, + 0x0038ffff, + 0x0039ffff, + 0x003affff, + 0x003bffff, + 0x003cffff, + 0x003dffff, + 0x003effff, + }, + { + 0x000100d5, + 0x000100d5, + 0x000100d6, + 0x000100d6, + 0x000100d7, + 0x000100d7, + 0x000100df, + 0x000100df, + 0x000100e2, + 0x000100e2, + 0x000100e3, + 0x000100e3, + 0x000100e4, + 0x000100e4, + 0x000100e5, + 0x000100e5, + }, + { + 0x000100e6, + 0x000100e6, + 0x000100e7, + 0x000100e7, + 0x000100e8, + 0x000100e8, + 0x000100e9, + 0x000100e9, + 0x000100ea, + 0x000100ea, + 0x000100eb, + 0x000100eb, + 0x000100ec, + 0x000100ec, + 0x000100ed, + 0x000100ed, + }, + { + 0x000100ee, + 0x000100ee, + 0x000100ef, + 0x000100ef, + 0x000100f0, + 0x000100f0, + 0x000100f1, + 0x000100f1, + 0x000100f2, + 0x000100f2, + 0x000100f9, + 0x000100f9, + 0x000100fb, + 0x000100fb, + 0x000100fc, + 0x000100fc, + }, + { + 0x000100fd, + 0x000100fd, + 0x000100fe, + 0x000100fe, + 0x000100ff, + 0x000100ff, + 0x00010100, + 0x00010100, + 0x00010101, + 0x00010101, + 0x00010102, + 0x00010102, + 0x00010103, + 0x00010103, + 0x00010104, + 0x00010104, + }, + { + 0x00010105, + 0x00010105, + 0x00010106, + 0x00010106, + 0x00010107, + 0x00010107, + 0x00010108, + 0x00010108, + 0x00010109, + 0x00010109, + 0x0001010a, + 0x0001010a, + 0x0001010b, + 0x0001010b, + 0x0001010c, + 0x0001010c, + }, + { + 0x0001010d, + 0x0001010d, + 0x00010110, + 0x00010110, + 0x00010112, + 0x00010112, + 0x00010114, + 0x00010114, + 0x00010115, + 0x00010115, + 0x00010116, + 0x00010116, + 0x00010117, + 0x00010117, + 0x00010118, + 0x00010118, + }, + { + 0x00010119, + 0x00010119, + 0x0001011a, + 0x0001011a, + 0x0001011b, + 0x0001011b, + 0x0001011c, + 0x0001011c, + 0x0001011d, + 0x0001011d, + 0x0001011e, + 0x0001011e, + 0x0001011f, + 0x0001011f, + 0x00010120, + 0x00010120, + }, + { + 0x00010121, + 0x00010121, + 0x00010122, + 0x00010122, + 0x00010123, + 0x00010123, + 0x00010124, + 0x00010124, + 0x00010125, + 0x00010125, + 0x00010126, + 0x00010126, + 0x00010127, + 0x00010127, + 0x00010128, + 0x00010128, + }, + { + 0x00010129, + 0x00010129, + 0x0001012b, + 0x0001012b, + 0x0001012d, + 0x0001012d, + 0x0001012e, + 0x0001012e, + 0x0001012f, + 0x0001012f, + 0x00010130, + 0x00010130, + 0x00010131, + 0x00010131, + 0x00010132, + 0x00010132, + }, + { + 0x00010133, + 0x00010133, + 0x00010134, + 0x00010134, + 0x00010135, + 0x00010135, + 0x00010136, + 0x00010136, + 0x00010137, + 0x00010137, + 0x00010138, + 0x00010138, + 0x00010139, + 0x00010139, + 0x0001013a, + 0x0001013a, + }, + { + 0x0001013b, + 0x0001013b, + 0x0001013c, + 0x0001013c, + 0x0001013d, + 0x0001013d, + 0x0001013e, + 0x0001013e, + 0x0001013f, + 0x0001013f, + 0x00010140, + 0x00010140, + 0x00010141, + 0x00010141, + 0x00010142, + 0x00010142, + }, + { + 0x00010143, + 0x00010143, + 0x00010144, + 0x00010144, + 0x00010145, + 0x00010145, + 0x00010147, + 0x00010147, + 0x00010148, + 0x00010148, + 0x00010149, + 0x00010149, + 0x0001014a, + 0x0001014a, + 0x0001014b, + 0x0001014b, + }, + { + 0x0001014c, + 0x0001014c, + 0x0001014d, + 0x0001014d, + 0x0001014e, + 0x0001014e, + 0x0001014f, + 0x0001014f, + 0x00010150, + 0x00010150, + 0x00010151, + 0x00010151, + 0x00010152, + 0x00010152, + 0x00010153, + 0x00010153, + }, + { + 0x00010154, + 0x00010154, + 0x00010155, + 0x00010155, + 0x00010156, + 0x00010156, + 0x00010157, + 0x00010157, + 0x00010158, + 0x00010158, + 0x00010159, + 0x00010159, + 0x0001015a, + 0x0001015a, + 0x0001015b, + 0x0001015b, + }, + { + 0x0001015c, + 0x0001015c, + 0x0001015d, + 0x0001015d, + 0x0001015e, + 0x0001015e, + 0x0001015f, + 0x0001015f, + 0x00010160, + 0x00010160, + 0x00010161, + 0x00010161, + 0x00010162, + 0x00010162, + 0x00010163, + 0x00010163, + }, + { + 0x00010164, + 0x00010164, + 0x00010165, + 0x00010165, + 0x00010166, + 0x00010166, + 0x00010167, + 0x00010167, + 0x00010168, + 0x00010168, + 0x00010169, + 0x00010169, + 0x0001016a, + 0x0001016a, + 0x0001016b, + 0x0001016b, + }, + { + 0x0040ffff, + 0x0041ffff, + 0x0042ffff, + 0x0043ffff, + 0x0044ffff, + 0x0045ffff, + 0x0046ffff, + 0x0047ffff, + 0x0048ffff, + 0x0049ffff, + 0x004affff, + 0x004bffff, + 0x004cffff, + 0x004dffff, + 0x004effff, + 0x004fffff, + }, + { + 0x0001016c, + 0x0001016c, + 0x0001016d, + 0x0001016d, + 0x0001016e, + 0x0001016e, + 0x0001016f, + 0x0001016f, + 0x00010170, + 0x00010170, + 0x00010171, + 0x00010171, + 0x00010172, + 0x00010172, + 0x00010173, + 0x00010173, + }, + { + 0x00010174, + 0x00010174, + 0x00010175, + 0x00010175, + 0x00010176, + 0x00010176, + 0x00010177, + 0x00010177, + 0x00010178, + 0x00010178, + 0x00010179, + 0x00010179, + 0x0001017a, + 0x0001017a, + 0x0001017b, + 0x0001017b, + }, + { + 0x0001017c, + 0x0001017c, + 0x0001017d, + 0x0001017d, + 0x0001017e, + 0x0001017e, + 0x0001017f, + 0x0001017f, + 0x00010180, + 0x00010180, + 0x00010181, + 0x00010181, + 0x00010182, + 0x00010182, + 0x00010183, + 0x00010183, + }, + { + 0x00010184, + 0x00010184, + 0x00010185, + 0x00010185, + 0x00010186, + 0x00010186, + 0x00010187, + 0x00010187, + 0x00010188, + 0x00010188, + 0x00010189, + 0x00010189, + 0x0001018a, + 0x0001018a, + 0x0001018b, + 0x0001018b, + }, + { + 0x0001018c, + 0x0001018c, + 0x0001018d, + 0x0001018d, + 0x0001018e, + 0x0001018e, + 0x0001018f, + 0x0001018f, + 0x00010190, + 0x00010190, + 0x00010191, + 0x00010191, + 0x00010192, + 0x00010192, + 0x00010193, + 0x00010193, + }, + { + 0x00010194, + 0x00010194, + 0x00010195, + 0x00010195, + 0x00010196, + 0x00010196, + 0x00010197, + 0x00010197, + 0x00010198, + 0x00010198, + 0x00010199, + 0x00010199, + 0x0001019a, + 0x0001019a, + 0x0001019b, + 0x0001019b, + }, + { + 0x0001019c, + 0x0001019c, + 0x0001019d, + 0x0001019d, + 0x0001019e, + 0x0001019e, + 0x0001019f, + 0x0001019f, + 0x000101a0, + 0x000101a0, + 0x000101a1, + 0x000101a1, + 0x000101a2, + 0x000101a2, + 0x000101a3, + 0x000101a3, + }, + { + 0x000101a4, + 0x000101a4, + 0x000101a5, + 0x000101a5, + 0x000101a6, + 0x000101a6, + 0x000101a7, + 0x000101a7, + 0x000101a8, + 0x000101a8, + 0x000101a9, + 0x000101a9, + 0x000101aa, + 0x000101aa, + 0x000101ab, + 0x000101ab, + }, + { + 0x000101ac, + 0x000101ac, + 0x000101ad, + 0x000101ad, + 0x000101ae, + 0x000101ae, + 0x000101af, + 0x000101af, + 0x000101b0, + 0x000101b0, + 0x000101b1, + 0x000101b1, + 0x000101b2, + 0x000101b2, + 0x000101b3, + 0x000101b3, + }, + { + 0x000101b4, + 0x000101b4, + 0x000101b5, + 0x000101b5, + 0x000101b6, + 0x000101b6, + 0x000101b7, + 0x000101b7, + 0x000101b8, + 0x000101b8, + 0x000101b9, + 0x000101b9, + 0x000101ba, + 0x000101ba, + 0x000101bb, + 0x000101bb, + }, + { + 0x000101bc, + 0x000101bc, + 0x000101bd, + 0x000101bd, + 0x000101be, + 0x000101be, + 0x000101bf, + 0x000101bf, + 0x000101c0, + 0x000101c0, + 0x000101c1, + 0x000101c1, + 0x000101c2, + 0x000101c2, + 0x000101c3, + 0x000101c3, + }, + { + 0x000101c4, + 0x000101c4, + 0x000101c5, + 0x000101c5, + 0x000101c6, + 0x000101c6, + 0x000101c7, + 0x000101c7, + 0x000101c8, + 0x000101c8, + 0x000101c9, + 0x000101c9, + 0x000101ca, + 0x000101ca, + 0x000101cb, + 0x000101cb, + }, + { + 0x000101cc, + 0x000101cc, + 0x000101cd, + 0x000101cd, + 0x000101ce, + 0x000101ce, + 0x000101cf, + 0x000101cf, + 0x000101d0, + 0x000101d0, + 0x000101d1, + 0x000101d1, + 0x000101d2, + 0x000101d2, + 0x000101d3, + 0x000101d3, + }, + { + 0x000101d4, + 0x000101d4, + 0x000101d5, + 0x000101d5, + 0x000101d6, + 0x000101d6, + 0x000101d7, + 0x000101d7, + 0x000101d8, + 0x000101d8, + 0x000101d9, + 0x000101d9, + 0x000101da, + 0x000101da, + 0x000101db, + 0x000101db, + }, + { + 0x000101dc, + 0x000101dc, + 0x000101dd, + 0x000101dd, + 0x000101de, + 0x000101de, + 0x000101df, + 0x000101df, + 0x000101e0, + 0x000101e0, + 0x000101e1, + 0x000101e1, + 0x000101e2, + 0x000101e2, + 0x000101e3, + 0x000101e3, + }, + { + 0x000101e4, + 0x000101e4, + 0x000101e5, + 0x000101e5, + 0x000101e6, + 0x000101e6, + 0x000101e7, + 0x000101e7, + 0x000101e8, + 0x000101e8, + 0x000101e9, + 0x000101e9, + 0x000101ea, + 0x000101ea, + 0x000101eb, + 0x000101eb, + }, + { + 0x0051ffff, + 0x0052ffff, + 0x0053ffff, + 0x0054ffff, + 0x0055ffff, + 0x0056ffff, + 0x0057ffff, + 0x0058ffff, + 0x0059ffff, + 0x005affff, + 0x005bffff, + 0x005cffff, + 0x005dffff, + 0x005effff, + 0x005fffff, + 0x0060ffff, + }, + { + 0x000101ec, + 0x000101ec, + 0x000101ed, + 0x000101ed, + 0x000101ee, + 0x000101ee, + 0x000101ef, + 0x000101ef, + 0x000101f0, + 0x000101f0, + 0x000101f1, + 0x000101f1, + 0x000101f2, + 0x000101f2, + 0x000101f3, + 0x000101f3, + }, + { + 0x000101f4, + 0x000101f4, + 0x000101f5, + 0x000101f5, + 0x000101f6, + 0x000101f6, + 0x000101f7, + 0x000101f7, + 0x000101f8, + 0x000101f8, + 0x000101f9, + 0x000101f9, + 0x000101fa, + 0x000101fa, + 0x000101fb, + 0x000101fb, + }, + { + 0x000101fc, + 0x000101fc, + 0x000101fd, + 0x000101fd, + 0x000101fe, + 0x000101fe, + 0x000101ff, + 0x000101ff, + 0x00010200, + 0x00010200, + 0x00010201, + 0x00010201, + 0x00010202, + 0x00010202, + 0x00010203, + 0x00010203, + }, + { + 0x00010204, + 0x00010204, + 0x00010205, + 0x00010205, + 0x00010206, + 0x00010206, + 0x00010207, + 0x00010207, + 0x00010208, + 0x00010208, + 0x00010209, + 0x00010209, + 0x0001020a, + 0x0001020a, + 0x0001020b, + 0x0001020b, + }, + { + 0x0001020c, + 0x0001020c, + 0x0001020d, + 0x0001020d, + 0x0001020e, + 0x0001020e, + 0x0001020f, + 0x0001020f, + 0x00010210, + 0x00010210, + 0x00010211, + 0x00010211, + 0x00010212, + 0x00010212, + 0x00010213, + 0x00010213, + }, + { + 0x00010214, + 0x00010214, + 0x00010215, + 0x00010215, + 0x00010216, + 0x00010216, + 0x00010217, + 0x00010217, + 0x00010218, + 0x00010218, + 0x00010219, + 0x00010219, + 0x0001021a, + 0x0001021a, + 0x0001021b, + 0x0001021b, + }, + { + 0x0001021c, + 0x0001021c, + 0x0001021d, + 0x0001021d, + 0x0001021e, + 0x0001021e, + 0x0001021f, + 0x0001021f, + 0x00010220, + 0x00010220, + 0x00010221, + 0x00010221, + 0x00010222, + 0x00010222, + 0x00010223, + 0x00010223, + }, + { + 0x00010224, + 0x00010224, + 0x00010225, + 0x00010225, + 0x00010226, + 0x00010226, + 0x00010227, + 0x00010227, + 0x00010228, + 0x00010228, + 0x00010229, + 0x00010229, + 0x0001022a, + 0x0001022a, + 0x0001022b, + 0x0001022b, + }, + { + 0x0001022c, + 0x0001022c, + 0x0001022d, + 0x0001022d, + 0x0001022e, + 0x0001022e, + 0x0001022f, + 0x0001022f, + 0x00010230, + 0x00010230, + 0x00010231, + 0x00010231, + 0x00010232, + 0x00010232, + 0x00010233, + 0x00010233, + }, + { + 0x00010234, + 0x00010234, + 0x00010235, + 0x00010235, + 0x00010236, + 0x00010236, + 0x00010237, + 0x00010237, + 0x00010238, + 0x00010238, + 0x00010239, + 0x00010239, + 0x0001023a, + 0x0001023a, + 0x0001023b, + 0x0001023b, + }, + { + 0x0001023c, + 0x0001023c, + 0x0001023d, + 0x0001023d, + 0x0001023e, + 0x0001023e, + 0x0001023f, + 0x0001023f, + 0x00010240, + 0x00010240, + 0x00010241, + 0x00010241, + 0x00010242, + 0x00010242, + 0x00010243, + 0x00010243, + }, + { + 0x00010244, + 0x00010244, + 0x00010245, + 0x00010245, + 0x00010246, + 0x00010246, + 0x00010247, + 0x00010247, + 0x00010248, + 0x00010248, + 0x00010249, + 0x00010249, + 0x0001024a, + 0x0001024a, + 0x0001024b, + 0x0001024b, + }, + { + 0x0001024c, + 0x0001024c, + 0x0001024d, + 0x0001024d, + 0x0001024e, + 0x0001024e, + 0x0001024f, + 0x0001024f, + 0x00010250, + 0x00010250, + 0x00010251, + 0x00010251, + 0x00010252, + 0x00010252, + 0x00010253, + 0x00010253, + }, + { + 0x00010254, + 0x00010254, + 0x00010255, + 0x00010255, + 0x00010256, + 0x00010256, + 0x00010257, + 0x00010257, + 0x00010258, + 0x00010258, + 0x00010259, + 0x00010259, + 0x0001025a, + 0x0001025a, + 0x0001025b, + 0x0001025b, + }, + { + 0x0001025c, + 0x0001025c, + 0x0001025d, + 0x0001025d, + 0x0001025e, + 0x0001025e, + 0x0001025f, + 0x0001025f, + 0x00010260, + 0x00010260, + 0x00010261, + 0x00010261, + 0x00010262, + 0x00010262, + 0x00010263, + 0x00010263, + }, + { + 0x00010264, + 0x00010264, + 0x00010265, + 0x00010265, + 0x00010266, + 0x00010266, + 0x00010267, + 0x00010267, + 0x00010268, + 0x00010268, + 0x00010269, + 0x00010269, + 0x0001026a, + 0x0001026a, + 0x0001026b, + 0x0001026b, + }, + { + 0x0001026c, + 0x0001026c, + 0x0001026d, + 0x0001026d, + 0x0001026e, + 0x0001026e, + 0x0001026f, + 0x0001026f, + 0x00010270, + 0x00010270, + 0x00010271, + 0x00010271, + 0x00010272, + 0x00010272, + 0x00010273, + 0x00010273, + }, + { + 0x00010274, + 0x00010274, + 0x00010275, + 0x00010275, + 0x00010276, + 0x00010276, + 0x00010277, + 0x00010277, + 0x00010278, + 0x00010278, + 0x00010279, + 0x00010279, + 0x0001027a, + 0x0001027a, + 0x0001027b, + 0x0001027b, + }, + { + 0x0001027c, + 0x0001027c, + 0x0001027d, + 0x0001027d, + 0x0001027e, + 0x0001027e, + 0x0001027f, + 0x0001027f, + 0x00010280, + 0x00010280, + 0x00010281, + 0x00010281, + 0x00010282, + 0x00010282, + 0x00010283, + 0x00010283, + }, + { + 0x00010284, + 0x00010284, + 0x00010285, + 0x00010285, + 0x00010286, + 0x00010286, + 0x00010287, + 0x00010287, + 0x00010288, + 0x00010288, + 0x00010289, + 0x00010289, + 0x0001028a, + 0x0001028a, + 0x0001028b, + 0x0001028b, + }, + { + 0x0001028c, + 0x0001028c, + 0x0001028d, + 0x0001028d, + 0x0001028e, + 0x0001028e, + 0x0001028f, + 0x0001028f, + 0x00010290, + 0x00010290, + 0x00010291, + 0x00010291, + 0x00010292, + 0x00010292, + 0x00010293, + 0x00010293, + }, + { + 0x00010294, + 0x00010294, + 0x00010295, + 0x00010295, + 0x00010296, + 0x00010296, + 0x00010297, + 0x00010297, + 0x00010298, + 0x00010298, + 0x00010299, + 0x00010299, + 0x0001029a, + 0x0001029a, + 0x0001029b, + 0x0001029b, + }, + { + 0x0001029c, + 0x0001029c, + 0x0001029d, + 0x0001029d, + 0x0001029e, + 0x0001029e, + 0x0001029f, + 0x0001029f, + 0x000102a0, + 0x000102a0, + 0x000102a1, + 0x000102a1, + 0x000102a2, + 0x000102a2, + 0x000102a3, + 0x000102a3, + }, + { + 0x000102a4, + 0x000102a4, + 0x000102a5, + 0x000102a5, + 0x000102a6, + 0x000102a6, + 0x000102a7, + 0x000102a7, + 0x000102a8, + 0x000102a8, + 0x000102a9, + 0x000102a9, + 0x000102aa, + 0x000102aa, + 0x000102ab, + 0x000102ab, + }, + { + 0x000102ac, + 0x000102ac, + 0x000102ad, + 0x000102ad, + 0x000102ae, + 0x000102ae, + 0x000102af, + 0x000102af, + 0x000102b0, + 0x000102b0, + 0x000102b1, + 0x000102b1, + 0x000102b2, + 0x000102b2, + 0x000102b3, + 0x000102b3, + }, + { + 0x000102b4, + 0x000102b4, + 0x000102b5, + 0x000102b5, + 0x000102b6, + 0x000102b6, + 0x000102b7, + 0x000102b7, + 0x000102b8, + 0x000102b8, + 0x000102b9, + 0x000102b9, + 0x000102ba, + 0x000102ba, + 0x000102bb, + 0x000102bb, + }, + { + 0x000102bc, + 0x000102bc, + 0x000102bd, + 0x000102bd, + 0x000102be, + 0x000102be, + 0x000102bf, + 0x000102bf, + 0x000102c0, + 0x000102c0, + 0x000102c1, + 0x000102c1, + 0x000102c2, + 0x000102c2, + 0x000102c3, + 0x000102c3, + }, + { + 0x000102c4, + 0x000102c4, + 0x000102c5, + 0x000102c5, + 0x000102c6, + 0x000102c6, + 0x000102c7, + 0x000102c7, + 0x000102c8, + 0x000102c8, + 0x000102c9, + 0x000102c9, + 0x000102ca, + 0x000102ca, + 0x000102cb, + 0x000102cb, + }, + { + 0x000102cc, + 0x000102cc, + 0x000102cd, + 0x000102cd, + 0x000102ce, + 0x000102ce, + 0x000102cf, + 0x000102cf, + 0x000102d0, + 0x000102d0, + 0x000102d1, + 0x000102d1, + 0x000102d2, + 0x000102d2, + 0x000102d3, + 0x000102d3, + }, +}; + +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc49[729][2] = +#else +const uint16_t c_aauiCQMFHuffEnc49[729][2] = +#endif + { + { 0x0002, 0x0003 }, + { 0x0003, 0x0003 }, + { 0x0005, 0x0007 }, + { 0x0007, 0x000a }, + { 0x0008, 0x0009 }, + { 0x0008, 0x000a }, + { 0x0009, 0x0009 }, + { 0x000b, 0x000d }, + { 0x000d, 0x0014 }, + { 0x000d, 0x0015 }, + { 0x0010, 0x0052 }, + { 0x0011, 0x0098 }, + { 0x0013, 0x0000 }, + { 0x0013, 0x0001 }, + { 0x0013, 0x0002 }, + { 0x0013, 0x0003 }, + { 0x0013, 0x0004 }, + { 0x0013, 0x0005 }, + { 0x0013, 0x0006 }, + { 0x0013, 0x0007 }, + { 0x0013, 0x0008 }, + { 0x0013, 0x0009 }, + { 0x0013, 0x000a }, + { 0x0013, 0x000b }, + { 0x0013, 0x000c }, + { 0x0013, 0x000d }, + { 0x0013, 0x000e }, + { 0x0003, 0x0004 }, + { 0x0003, 0x0005 }, + { 0x0005, 0x0008 }, + { 0x0006, 0x000a }, + { 0x0007, 0x000b }, + { 0x0008, 0x000b }, + { 0x0008, 0x000c }, + { 0x000a, 0x000a }, + { 0x000b, 0x000e }, + { 0x000d, 0x0016 }, + { 0x000f, 0x0031 }, + { 0x0010, 0x0053 }, + { 0x0012, 0x012a }, + { 0x0013, 0x000f }, + { 0x0013, 0x0010 }, + { 0x0013, 0x0011 }, + { 0x0013, 0x0012 }, + { 0x0013, 0x0013 }, + { 0x0013, 0x0014 }, + { 0x0013, 0x0015 }, + { 0x0013, 0x0016 }, + { 0x0013, 0x0017 }, + { 0x0013, 0x0018 }, + { 0x0013, 0x0019 }, + { 0x0013, 0x001a }, + { 0x0013, 0x001b }, + { 0x0013, 0x001c }, + { 0x0005, 0x0009 }, + { 0x0005, 0x000a }, + { 0x0005, 0x000b }, + { 0x0006, 0x000b }, + { 0x0007, 0x000c }, + { 0x0008, 0x000d }, + { 0x0009, 0x000a }, + { 0x000a, 0x000b }, + { 0x000c, 0x000f }, + { 0x000d, 0x0017 }, + { 0x000f, 0x0032 }, + { 0x0010, 0x0054 }, + { 0x0013, 0x001d }, + { 0x0013, 0x001e }, + { 0x0013, 0x001f }, + { 0x0013, 0x0020 }, + { 0x0013, 0x0021 }, + { 0x0013, 0x0022 }, + { 0x0013, 0x0023 }, + { 0x0013, 0x0024 }, + { 0x0013, 0x0025 }, + { 0x0013, 0x0026 }, + { 0x0013, 0x0027 }, + { 0x0013, 0x0028 }, + { 0x0013, 0x0029 }, + { 0x0013, 0x002a }, + { 0x0013, 0x002b }, + { 0x0007, 0x000d }, + { 0x0006, 0x000c }, + { 0x0006, 0x000d }, + { 0x0007, 0x000e }, + { 0x0007, 0x000f }, + { 0x0008, 0x000e }, + { 0x0009, 0x000b }, + { 0x000b, 0x000f }, + { 0x000c, 0x0010 }, + { 0x000e, 0x001d }, + { 0x000f, 0x0033 }, + { 0x0011, 0x0099 }, + { 0x0013, 0x002c }, + { 0x0013, 0x002d }, + { 0x0013, 0x002e }, + { 0x0013, 0x002f }, + { 0x0013, 0x0030 }, + { 0x0013, 0x0031 }, + { 0x0013, 0x0032 }, + { 0x0013, 0x0033 }, + { 0x0013, 0x0034 }, + { 0x0013, 0x0035 }, + { 0x0013, 0x0036 }, + { 0x0013, 0x0037 }, + { 0x0013, 0x0038 }, + { 0x0013, 0x0039 }, + { 0x0013, 0x003a }, + { 0x0008, 0x000f }, + { 0x0007, 0x0010 }, + { 0x0007, 0x0011 }, + { 0x0007, 0x0012 }, + { 0x0008, 0x0010 }, + { 0x0009, 0x000c }, + { 0x000a, 0x000c }, + { 0x000c, 0x0011 }, + { 0x000d, 0x0018 }, + { 0x000e, 0x001e }, + { 0x0011, 0x009a }, + { 0x0011, 0x009b }, + { 0x0013, 0x003b }, + { 0x0013, 0x003c }, + { 0x0013, 0x003d }, + { 0x0013, 0x003e }, + { 0x0013, 0x003f }, + { 0x0013, 0x0040 }, + { 0x0013, 0x0041 }, + { 0x0013, 0x0042 }, + { 0x0013, 0x0043 }, + { 0x0013, 0x0044 }, + { 0x0013, 0x0045 }, + { 0x0013, 0x0046 }, + { 0x0013, 0x0047 }, + { 0x0013, 0x0048 }, + { 0x0013, 0x0049 }, + { 0x0008, 0x0011 }, + { 0x0007, 0x0013 }, + { 0x0008, 0x0012 }, + { 0x0008, 0x0013 }, + { 0x0009, 0x000d }, + { 0x000a, 0x000d }, + { 0x000b, 0x0010 }, + { 0x000c, 0x0012 }, + { 0x000e, 0x001f }, + { 0x000e, 0x0020 }, + { 0x0010, 0x0055 }, + { 0x0011, 0x009c }, + { 0x0013, 0x004a }, + { 0x0013, 0x004b }, + { 0x0013, 0x004c }, + { 0x0013, 0x004d }, + { 0x0013, 0x004e }, + { 0x0013, 0x004f }, + { 0x0013, 0x0050 }, + { 0x0013, 0x0051 }, + { 0x0013, 0x0052 }, + { 0x0013, 0x0053 }, + { 0x0013, 0x0054 }, + { 0x0013, 0x0055 }, + { 0x0013, 0x0056 }, + { 0x0013, 0x0057 }, + { 0x0013, 0x0058 }, + { 0x0009, 0x000e }, + { 0x0009, 0x000f }, + { 0x0009, 0x0010 }, + { 0x0009, 0x0011 }, + { 0x000a, 0x000e }, + { 0x000b, 0x0011 }, + { 0x000c, 0x0013 }, + { 0x000d, 0x0019 }, + { 0x000e, 0x0021 }, + { 0x0010, 0x0056 }, + { 0x0010, 0x0057 }, + { 0x0013, 0x0059 }, + { 0x0013, 0x005a }, + { 0x0013, 0x005b }, + { 0x0013, 0x005c }, + { 0x0013, 0x005d }, + { 0x0013, 0x005e }, + { 0x0013, 0x005f }, + { 0x0013, 0x0060 }, + { 0x0013, 0x0061 }, + { 0x0013, 0x0062 }, + { 0x0013, 0x0063 }, + { 0x0013, 0x0064 }, + { 0x0013, 0x0065 }, + { 0x0013, 0x0066 }, + { 0x0013, 0x0067 }, + { 0x0013, 0x0068 }, + { 0x000b, 0x0012 }, + { 0x000a, 0x000f }, + { 0x000a, 0x0010 }, + { 0x000a, 0x0011 }, + { 0x000c, 0x0014 }, + { 0x000c, 0x0015 }, + { 0x000d, 0x001a }, + { 0x000e, 0x0022 }, + { 0x0010, 0x0058 }, + { 0x0010, 0x0059 }, + { 0x0013, 0x0069 }, + { 0x0013, 0x006a }, + { 0x0013, 0x006b }, + { 0x0013, 0x006c }, + { 0x0013, 0x006d }, + { 0x0013, 0x006e }, + { 0x0013, 0x006f }, + { 0x0013, 0x0070 }, + { 0x0013, 0x0071 }, + { 0x0013, 0x0072 }, + { 0x0013, 0x0073 }, + { 0x0013, 0x0074 }, + { 0x0013, 0x0075 }, + { 0x0013, 0x0076 }, + { 0x0013, 0x0077 }, + { 0x0013, 0x0078 }, + { 0x0013, 0x0079 }, + { 0x000c, 0x0016 }, + { 0x000b, 0x0013 }, + { 0x000c, 0x0017 }, + { 0x000c, 0x0018 }, + { 0x000c, 0x0019 }, + { 0x000e, 0x0023 }, + { 0x000e, 0x0024 }, + { 0x000f, 0x0034 }, + { 0x0010, 0x005a }, + { 0x0011, 0x009d }, + { 0x0013, 0x007a }, + { 0x0013, 0x007b }, + { 0x0013, 0x007c }, + { 0x0013, 0x007d }, + { 0x0013, 0x007e }, + { 0x0013, 0x007f }, + { 0x0013, 0x0080 }, + { 0x0013, 0x0081 }, + { 0x0013, 0x0082 }, + { 0x0013, 0x0083 }, + { 0x0013, 0x0084 }, + { 0x0013, 0x0085 }, + { 0x0013, 0x0086 }, + { 0x0013, 0x0087 }, + { 0x0013, 0x0088 }, + { 0x0013, 0x0089 }, + { 0x0013, 0x008a }, + { 0x000e, 0x0025 }, + { 0x000d, 0x001b }, + { 0x000d, 0x001c }, + { 0x000d, 0x001d }, + { 0x000e, 0x0026 }, + { 0x000f, 0x0035 }, + { 0x0010, 0x005b }, + { 0x0011, 0x009e }, + { 0x0011, 0x009f }, + { 0x0012, 0x012b }, + { 0x0013, 0x008b }, + { 0x0013, 0x008c }, + { 0x0013, 0x008d }, + { 0x0013, 0x008e }, + { 0x0013, 0x008f }, + { 0x0013, 0x0090 }, + { 0x0013, 0x0091 }, + { 0x0013, 0x0092 }, + { 0x0013, 0x0093 }, + { 0x0013, 0x0094 }, + { 0x0013, 0x0095 }, + { 0x0013, 0x0096 }, + { 0x0013, 0x0097 }, + { 0x0013, 0x0098 }, + { 0x0013, 0x0099 }, + { 0x0013, 0x009a }, + { 0x0013, 0x009b }, + { 0x0010, 0x005c }, + { 0x000f, 0x0036 }, + { 0x000e, 0x0027 }, + { 0x000f, 0x0037 }, + { 0x000f, 0x0038 }, + { 0x0010, 0x005d }, + { 0x0011, 0x00a0 }, + { 0x0013, 0x009c }, + { 0x0012, 0x012c }, + { 0x0013, 0x009d }, + { 0x0013, 0x009e }, + { 0x0013, 0x009f }, + { 0x0013, 0x00a0 }, + { 0x0013, 0x00a1 }, + { 0x0013, 0x00a2 }, + { 0x0013, 0x00a3 }, + { 0x0013, 0x00a4 }, + { 0x0013, 0x00a5 }, + { 0x0013, 0x00a6 }, + { 0x0013, 0x00a7 }, + { 0x0013, 0x00a8 }, + { 0x0013, 0x00a9 }, + { 0x0013, 0x00aa }, + { 0x0013, 0x00ab }, + { 0x0013, 0x00ac }, + { 0x0013, 0x00ad }, + { 0x0013, 0x00ae }, + { 0x0010, 0x005e }, + { 0x000f, 0x0039 }, + { 0x0010, 0x005f }, + { 0x0010, 0x0060 }, + { 0x0011, 0x00a1 }, + { 0x0010, 0x0061 }, + { 0x0013, 0x00af }, + { 0x0013, 0x00b0 }, + { 0x0012, 0x012d }, + { 0x0013, 0x00b1 }, + { 0x0013, 0x00b2 }, + { 0x0013, 0x00b3 }, + { 0x0013, 0x00b4 }, + { 0x0013, 0x00b5 }, + { 0x0013, 0x00b6 }, + { 0x0013, 0x00b7 }, + { 0x0013, 0x00b8 }, + { 0x0013, 0x00b9 }, + { 0x0013, 0x00ba }, + { 0x0013, 0x00bb }, + { 0x0013, 0x00bc }, + { 0x0013, 0x00bd }, + { 0x0013, 0x00be }, + { 0x0013, 0x00bf }, + { 0x0013, 0x00c0 }, + { 0x0013, 0x00c1 }, + { 0x0013, 0x00c2 }, + { 0x0012, 0x012e }, + { 0x0011, 0x00a2 }, + { 0x0011, 0x00a3 }, + { 0x0013, 0x00c3 }, + { 0x0013, 0x00c4 }, + { 0x0013, 0x00c5 }, + { 0x0013, 0x00c6 }, + { 0x0013, 0x00c7 }, + { 0x0013, 0x00c8 }, + { 0x0013, 0x00c9 }, + { 0x0013, 0x00ca }, + { 0x0013, 0x00cb }, + { 0x0013, 0x00cc }, + { 0x0013, 0x00cd }, + { 0x0013, 0x00ce }, + { 0x0013, 0x00cf }, + { 0x0013, 0x00d0 }, + { 0x0013, 0x00d1 }, + { 0x0013, 0x00d2 }, + { 0x0013, 0x00d3 }, + { 0x0013, 0x00d4 }, + { 0x0013, 0x00d5 }, + { 0x0013, 0x00d6 }, + { 0x0013, 0x00d7 }, + { 0x0013, 0x00d8 }, + { 0x0013, 0x00d9 }, + { 0x0013, 0x00da }, + { 0x0013, 0x00db }, + { 0x0013, 0x00dc }, + { 0x0013, 0x00dd }, + { 0x0013, 0x00de }, + { 0x0013, 0x00df }, + { 0x0012, 0x012f }, + { 0x0013, 0x00e0 }, + { 0x0013, 0x00e1 }, + { 0x0013, 0x00e2 }, + { 0x0013, 0x00e3 }, + { 0x0013, 0x00e4 }, + { 0x0013, 0x00e5 }, + { 0x0013, 0x00e6 }, + { 0x0013, 0x00e7 }, + { 0x0013, 0x00e8 }, + { 0x0013, 0x00e9 }, + { 0x0013, 0x00ea }, + { 0x0013, 0x00eb }, + { 0x0013, 0x00ec }, + { 0x0013, 0x00ed }, + { 0x0013, 0x00ee }, + { 0x0013, 0x00ef }, + { 0x0013, 0x00f0 }, + { 0x0013, 0x00f1 }, + { 0x0013, 0x00f2 }, + { 0x0013, 0x00f3 }, + { 0x0013, 0x00f4 }, + { 0x0013, 0x00f5 }, + { 0x0013, 0x00f6 }, + { 0x0013, 0x00f7 }, + { 0x0013, 0x00f8 }, + { 0x0013, 0x00f9 }, + { 0x0013, 0x00fa }, + { 0x0013, 0x00fb }, + { 0x0013, 0x00fc }, + { 0x0013, 0x00fd }, + { 0x0013, 0x00fe }, + { 0x0013, 0x00ff }, + { 0x0013, 0x0100 }, + { 0x0013, 0x0101 }, + { 0x0013, 0x0102 }, + { 0x0013, 0x0103 }, + { 0x0013, 0x0104 }, + { 0x0013, 0x0105 }, + { 0x0013, 0x0106 }, + { 0x0013, 0x0107 }, + { 0x0013, 0x0108 }, + { 0x0013, 0x0109 }, + { 0x0013, 0x010a }, + { 0x0013, 0x010b }, + { 0x0013, 0x010c }, + { 0x0013, 0x010d }, + { 0x0013, 0x010e }, + { 0x0013, 0x010f }, + { 0x0013, 0x0110 }, + { 0x0013, 0x0111 }, + { 0x0013, 0x0112 }, + { 0x0013, 0x0113 }, + { 0x0013, 0x0114 }, + { 0x0013, 0x0115 }, + { 0x0013, 0x0116 }, + { 0x0013, 0x0117 }, + { 0x0013, 0x0118 }, + { 0x0013, 0x0119 }, + { 0x0013, 0x011a }, + { 0x0013, 0x011b }, + { 0x0013, 0x011c }, + { 0x0013, 0x011d }, + { 0x0013, 0x011e }, + { 0x0013, 0x011f }, + { 0x0013, 0x0120 }, + { 0x0013, 0x0121 }, + { 0x0013, 0x0122 }, + { 0x0013, 0x0123 }, + { 0x0013, 0x0124 }, + { 0x0013, 0x0125 }, + { 0x0013, 0x0126 }, + { 0x0013, 0x0127 }, + { 0x0013, 0x0128 }, + { 0x0013, 0x0129 }, + { 0x0013, 0x012a }, + { 0x0013, 0x012b }, + { 0x0013, 0x012c }, + { 0x0013, 0x012d }, + { 0x0013, 0x012e }, + { 0x0013, 0x012f }, + { 0x0013, 0x0130 }, + { 0x0013, 0x0131 }, + { 0x0013, 0x0132 }, + { 0x0013, 0x0133 }, + { 0x0013, 0x0134 }, + { 0x0013, 0x0135 }, + { 0x0013, 0x0136 }, + { 0x0013, 0x0137 }, + { 0x0013, 0x0138 }, + { 0x0013, 0x0139 }, + { 0x0013, 0x013a }, + { 0x0013, 0x013b }, + { 0x0013, 0x013c }, + { 0x0013, 0x013d }, + { 0x0013, 0x013e }, + { 0x0013, 0x013f }, + { 0x0013, 0x0140 }, + { 0x0013, 0x0141 }, + { 0x0013, 0x0142 }, + { 0x0013, 0x0143 }, + { 0x0013, 0x0144 }, + { 0x0013, 0x0145 }, + { 0x0013, 0x0146 }, + { 0x0013, 0x0147 }, + { 0x0013, 0x0148 }, + { 0x0013, 0x0149 }, + { 0x0013, 0x014a }, + { 0x0013, 0x014b }, + { 0x0013, 0x014c }, + { 0x0013, 0x014d }, + { 0x0013, 0x014e }, + { 0x0013, 0x014f }, + { 0x0013, 0x0150 }, + { 0x0013, 0x0151 }, + { 0x0013, 0x0152 }, + { 0x0013, 0x0153 }, + { 0x0013, 0x0154 }, + { 0x0013, 0x0155 }, + { 0x0013, 0x0156 }, + { 0x0013, 0x0157 }, + { 0x0013, 0x0158 }, + { 0x0013, 0x0159 }, + { 0x0013, 0x015a }, + { 0x0013, 0x015b }, + { 0x0013, 0x015c }, + { 0x0013, 0x015d }, + { 0x0013, 0x015e }, + { 0x0013, 0x015f }, + { 0x0013, 0x0160 }, + { 0x0013, 0x0161 }, + { 0x0013, 0x0162 }, + { 0x0013, 0x0163 }, + { 0x0013, 0x0164 }, + { 0x0013, 0x0165 }, + { 0x0013, 0x0166 }, + { 0x0013, 0x0167 }, + { 0x0013, 0x0168 }, + { 0x0013, 0x0169 }, + { 0x0013, 0x016a }, + { 0x0013, 0x016b }, + { 0x0013, 0x016c }, + { 0x0013, 0x016d }, + { 0x0013, 0x016e }, + { 0x0013, 0x016f }, + { 0x0013, 0x0170 }, + { 0x0013, 0x0171 }, + { 0x0013, 0x0172 }, + { 0x0013, 0x0173 }, + { 0x0013, 0x0174 }, + { 0x0013, 0x0175 }, + { 0x0013, 0x0176 }, + { 0x0013, 0x0177 }, + { 0x0013, 0x0178 }, + { 0x0013, 0x0179 }, + { 0x0013, 0x017a }, + { 0x0013, 0x017b }, + { 0x0013, 0x017c }, + { 0x0013, 0x017d }, + { 0x0013, 0x017e }, + { 0x0013, 0x017f }, + { 0x0013, 0x0180 }, + { 0x0013, 0x0181 }, + { 0x0013, 0x0182 }, + { 0x0013, 0x0183 }, + { 0x0013, 0x0184 }, + { 0x0013, 0x0185 }, + { 0x0013, 0x0186 }, + { 0x0013, 0x0187 }, + { 0x0013, 0x0188 }, + { 0x0013, 0x0189 }, + { 0x0013, 0x018a }, + { 0x0013, 0x018b }, + { 0x0013, 0x018c }, + { 0x0013, 0x018d }, + { 0x0013, 0x018e }, + { 0x0013, 0x018f }, + { 0x0013, 0x0190 }, + { 0x0013, 0x0191 }, + { 0x0013, 0x0192 }, + { 0x0013, 0x0193 }, + { 0x0013, 0x0194 }, + { 0x0013, 0x0195 }, + { 0x0013, 0x0196 }, + { 0x0013, 0x0197 }, + { 0x0013, 0x0198 }, + { 0x0013, 0x0199 }, + { 0x0013, 0x019a }, + { 0x0013, 0x019b }, + { 0x0013, 0x019c }, + { 0x0013, 0x019d }, + { 0x0013, 0x019e }, + { 0x0013, 0x019f }, + { 0x0013, 0x01a0 }, + { 0x0013, 0x01a1 }, + { 0x0013, 0x01a2 }, + { 0x0013, 0x01a3 }, + { 0x0013, 0x01a4 }, + { 0x0013, 0x01a5 }, + { 0x0013, 0x01a6 }, + { 0x0013, 0x01a7 }, + { 0x0013, 0x01a8 }, + { 0x0013, 0x01a9 }, + { 0x0013, 0x01aa }, + { 0x0013, 0x01ab }, + { 0x0013, 0x01ac }, + { 0x0013, 0x01ad }, + { 0x0013, 0x01ae }, + { 0x0013, 0x01af }, + { 0x0013, 0x01b0 }, + { 0x0013, 0x01b1 }, + { 0x0013, 0x01b2 }, + { 0x0013, 0x01b3 }, + { 0x0013, 0x01b4 }, + { 0x0013, 0x01b5 }, + { 0x0013, 0x01b6 }, + { 0x0013, 0x01b7 }, + { 0x0013, 0x01b8 }, + { 0x0013, 0x01b9 }, + { 0x0013, 0x01ba }, + { 0x0013, 0x01bb }, + { 0x0013, 0x01bc }, + { 0x0013, 0x01bd }, + { 0x0013, 0x01be }, + { 0x0013, 0x01bf }, + { 0x0013, 0x01c0 }, + { 0x0013, 0x01c1 }, + { 0x0013, 0x01c2 }, + { 0x0013, 0x01c3 }, + { 0x0013, 0x01c4 }, + { 0x0013, 0x01c5 }, + { 0x0013, 0x01c6 }, + { 0x0013, 0x01c7 }, + { 0x0013, 0x01c8 }, + { 0x0013, 0x01c9 }, + { 0x0013, 0x01ca }, + { 0x0013, 0x01cb }, + { 0x0013, 0x01cc }, + { 0x0013, 0x01cd }, + { 0x0013, 0x01ce }, + { 0x0013, 0x01cf }, + { 0x0013, 0x01d0 }, + { 0x0013, 0x01d1 }, + { 0x0013, 0x01d2 }, + { 0x0013, 0x01d3 }, + { 0x0013, 0x01d4 }, + { 0x0013, 0x01d5 }, + { 0x0013, 0x01d6 }, + { 0x0013, 0x01d7 }, + { 0x0013, 0x01d8 }, + { 0x0013, 0x01d9 }, + { 0x0013, 0x01da }, + { 0x0013, 0x01db }, + { 0x0013, 0x01dc }, + { 0x0013, 0x01dd }, + { 0x0013, 0x01de }, + { 0x0013, 0x01df }, + { 0x0013, 0x01e0 }, + { 0x0013, 0x01e1 }, + { 0x0013, 0x01e2 }, + { 0x0013, 0x01e3 }, + { 0x0013, 0x01e4 }, + { 0x0013, 0x01e5 }, + { 0x0013, 0x01e6 }, + { 0x0013, 0x01e7 }, + { 0x0013, 0x01e8 }, + { 0x0013, 0x01e9 }, + { 0x0013, 0x01ea }, + { 0x0013, 0x01eb }, + { 0x0013, 0x01ec }, + { 0x0013, 0x01ed }, + { 0x0013, 0x01ee }, + { 0x0013, 0x01ef }, + { 0x0013, 0x01f0 }, + { 0x0013, 0x01f1 }, + { 0x0013, 0x01f2 }, + { 0x0013, 0x01f3 }, + { 0x0013, 0x01f4 }, + { 0x0013, 0x01f5 }, + { 0x0013, 0x01f6 }, + { 0x0013, 0x01f7 }, + { 0x0013, 0x01f8 }, + { 0x0013, 0x01f9 }, + { 0x0013, 0x01fa }, + { 0x0013, 0x01fb }, + { 0x0013, 0x01fc }, + { 0x0013, 0x01fd }, + { 0x0013, 0x01fe }, + { 0x0013, 0x01ff }, + { 0x0013, 0x0200 }, + { 0x0013, 0x0201 }, + { 0x0013, 0x0202 }, + { 0x0013, 0x0203 }, + { 0x0013, 0x0204 }, + { 0x0013, 0x0205 }, + { 0x0013, 0x0206 }, + { 0x0013, 0x0207 }, + { 0x0013, 0x0208 }, + { 0x0013, 0x0209 }, + { 0x0013, 0x020a }, + { 0x0013, 0x020b }, + { 0x0013, 0x020c }, + { 0x0013, 0x020d }, + { 0x0013, 0x020e }, + { 0x0013, 0x020f }, + { 0x0013, 0x0210 }, + { 0x0013, 0x0211 }, + { 0x0013, 0x0212 }, + { 0x0013, 0x0213 }, + { 0x0013, 0x0214 }, + { 0x0013, 0x0215 }, + { 0x0013, 0x0216 }, + { 0x0013, 0x0217 }, + { 0x0013, 0x0218 }, + { 0x0013, 0x0219 }, + { 0x0013, 0x021a }, + { 0x0013, 0x021b }, + { 0x0013, 0x021c }, + { 0x0013, 0x021d }, + { 0x0013, 0x021e }, + { 0x0013, 0x021f }, + { 0x0013, 0x0220 }, + { 0x0013, 0x0221 }, + { 0x0013, 0x0222 }, + { 0x0013, 0x0223 }, + { 0x0013, 0x0224 }, + { 0x0013, 0x0225 }, + { 0x0013, 0x0226 }, + { 0x0013, 0x0227 }, + { 0x0013, 0x0228 }, + { 0x0013, 0x0229 }, + { 0x0013, 0x022a }, + { 0x0013, 0x022b }, + { 0x0013, 0x022c }, + { 0x0013, 0x022d }, + { 0x0013, 0x022e }, + { 0x0013, 0x022f }, + { 0x0013, 0x0230 }, + { 0x0013, 0x0231 }, + { 0x0013, 0x0232 }, + { 0x0013, 0x0233 }, + { 0x0013, 0x0234 }, + { 0x0013, 0x0235 }, + { 0x0013, 0x0236 }, + { 0x0013, 0x0237 }, + { 0x0013, 0x0238 }, + { 0x0013, 0x0239 }, + { 0x0013, 0x023a }, + { 0x0013, 0x023b }, + { 0x0013, 0x023c }, + { 0x0013, 0x023d }, + { 0x0013, 0x023e }, + { 0x0013, 0x023f }, + { 0x0013, 0x0240 }, + { 0x0013, 0x0241 }, + { 0x0013, 0x0242 }, + { 0x0013, 0x0243 }, + { 0x0013, 0x0244 }, + { 0x0013, 0x0245 }, + { 0x0013, 0x0246 }, + { 0x0013, 0x0247 }, + { 0x0013, 0x0248 }, + { 0x0013, 0x0249 }, + { 0x0013, 0x024a }, + { 0x0013, 0x024b }, + { 0x0013, 0x024c }, + { 0x0013, 0x024d }, + { 0x0013, 0x024e }, + { 0x0013, 0x024f }, + { 0x0013, 0x0250 }, + { 0x0013, 0x0251 }, + { 0x0013, 0x0252 }, + { 0x0013, 0x0253 }, + + }; +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec49[113][16] = { + { + 0x0006ffff, + 0x0005ffff, + 0x0004ffff, + 0x0001ffff, + 0x0002ffff, + 0x0003ffff, + 0x00010001, + 0x00010001, + 0x0001001b, + 0x0001001b, + 0x0001001c, + 0x0001001c, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020000, + }, + { + 0x00020052, + 0x00020052, + 0x00020052, + 0x00020052, + 0x00020053, + 0x00020053, + 0x00020053, + 0x00020053, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + 0x00030002, + }, + { + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + }, + { + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + }, + { + 0x0001006d, + 0x0001006d, + 0x0001006e, + 0x0001006e, + 0x0001006f, + 0x0001006f, + 0x00010088, + 0x00010088, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x00020039, + 0x00020039, + 0x00020039, + 0x00020039, + }, + { + 0x00000070, + 0x00000087, + 0x00000089, + 0x0000008a, + 0x00010003, + 0x00010003, + 0x0001001f, + 0x0001001f, + 0x0001003a, + 0x0001003a, + 0x00010051, + 0x00010051, + 0x00010054, + 0x00010054, + 0x00010055, + 0x00010055, + }, + { + 0x000fffff, + 0x000effff, + 0x000cffff, + 0x000dffff, + 0x0007ffff, + 0x0008ffff, + 0x0009ffff, + 0x000affff, + 0x000bffff, + 0x00000004, + 0x00000005, + 0x00000020, + 0x00000021, + 0x0000003b, + 0x00000056, + 0x0000006c, + }, + { + 0x000200bf, + 0x000200bf, + 0x000200bf, + 0x000200bf, + 0x000200c0, + 0x000200c0, + 0x000200c0, + 0x000200c0, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + }, + { + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x0003003c, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + }, + { + 0x00030071, + 0x00030071, + 0x00030071, + 0x00030071, + 0x00030071, + 0x00030071, + 0x00030071, + 0x00030071, + 0x0003008b, + 0x0003008b, + 0x0003008b, + 0x0003008b, + 0x0003008b, + 0x0003008b, + 0x0003008b, + 0x0003008b, + }, + { + 0x000300a2, + 0x000300a2, + 0x000300a2, + 0x000300a2, + 0x000300a2, + 0x000300a2, + 0x000300a2, + 0x000300a2, + 0x000300a3, + 0x000300a3, + 0x000300a3, + 0x000300a3, + 0x000300a3, + 0x000300a3, + 0x000300a3, + 0x000300a3, + }, + { + 0x000300a4, + 0x000300a4, + 0x000300a4, + 0x000300a4, + 0x000300a4, + 0x000300a4, + 0x000300a4, + 0x000300a4, + 0x000300a5, + 0x000300a5, + 0x000300a5, + 0x000300a5, + 0x000300a5, + 0x000300a5, + 0x000300a5, + 0x000300a5, + }, + { + 0x0001008d, + 0x0001008d, + 0x000100a7, + 0x000100a7, + 0x000100bd, + 0x000100bd, + 0x000100d9, + 0x000100d9, + 0x00020022, + 0x00020022, + 0x00020022, + 0x00020022, + 0x0002003d, + 0x0002003d, + 0x0002003d, + 0x0002003d, + }, + { + 0x00020072, + 0x00020072, + 0x00020072, + 0x00020072, + 0x0002008c, + 0x0002008c, + 0x0002008c, + 0x0002008c, + 0x000200a6, + 0x000200a6, + 0x000200a6, + 0x000200a6, + 0x000200be, + 0x000200be, + 0x000200be, + 0x000200be, + }, + { + 0x00000059, + 0x00000073, + 0x0000008e, + 0x000000a8, + 0x000000c1, + 0x000000c2, + 0x000000d8, + 0x000000da, + 0x000000db, + 0x000000dc, + 0x00010007, + 0x00010007, + 0x00010023, + 0x00010023, + 0x00010058, + 0x00010058, + }, + { + 0x0023ffff, + 0x0034ffff, + 0x0045ffff, + 0x0056ffff, + 0x001affff, + 0x0019ffff, + 0x0018ffff, + 0x0015ffff, + 0x0016ffff, + 0x0017ffff, + 0x0011ffff, + 0x0010ffff, + 0x0012ffff, + 0x0013ffff, + 0x0014ffff, + 0x0000003e, + }, + { + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + }, + { + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + }, + { + 0x00030074, + 0x00030074, + 0x00030074, + 0x00030074, + 0x00030074, + 0x00030074, + 0x00030074, + 0x00030074, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + 0x000300a9, + }, + { + 0x000300c3, + 0x000300c3, + 0x000300c3, + 0x000300c3, + 0x000300c3, + 0x000300c3, + 0x000300c3, + 0x000300c3, + 0x000300f4, + 0x000300f4, + 0x000300f4, + 0x000300f4, + 0x000300f4, + 0x000300f4, + 0x000300f4, + 0x000300f4, + }, + { + 0x000300f5, + 0x000300f5, + 0x000300f5, + 0x000300f5, + 0x000300f5, + 0x000300f5, + 0x000300f5, + 0x000300f5, + 0x000300f6, + 0x000300f6, + 0x000300f6, + 0x000300f6, + 0x000300f6, + 0x000300f6, + 0x000300f6, + 0x000300f6, + }, + { + 0x00010112, + 0x00010112, + 0x0001012a, + 0x0001012a, + 0x0002005a, + 0x0002005a, + 0x0002005a, + 0x0002005a, + 0x00020075, + 0x00020075, + 0x00020075, + 0x00020075, + 0x0002008f, + 0x0002008f, + 0x0002008f, + 0x0002008f, + }, + { + 0x00020090, + 0x00020090, + 0x00020090, + 0x00020090, + 0x000200aa, + 0x000200aa, + 0x000200aa, + 0x000200aa, + 0x000200c4, + 0x000200c4, + 0x000200c4, + 0x000200c4, + 0x000200dd, + 0x000200dd, + 0x000200dd, + 0x000200dd, + }, + { + 0x000200de, + 0x000200de, + 0x000200de, + 0x000200de, + 0x000200f3, + 0x000200f3, + 0x000200f3, + 0x000200f3, + 0x000200f7, + 0x000200f7, + 0x000200f7, + 0x000200f7, + 0x00020110, + 0x00020110, + 0x00020110, + 0x00020110, + }, + { + 0x0000012c, + 0x0000012e, + 0x00010025, + 0x00010025, + 0x00010040, + 0x00010040, + 0x0001005b, + 0x0001005b, + 0x000100df, + 0x000100df, + 0x000100f8, + 0x000100f8, + 0x0001010f, + 0x0001010f, + 0x00010111, + 0x00010111, + }, + { + 0x001fffff, + 0x0020ffff, + 0x0000000a, + 0x00000026, + 0x00000041, + 0x00000091, + 0x000000ab, + 0x000000ac, + 0x000000c5, + 0x000000c6, + 0x000000e0, + 0x000000f9, + 0x0000010e, + 0x00000113, + 0x00000129, + 0x0000012b, + }, + { + 0x0067ffff, + 0x0068ffff, + 0x0069ffff, + 0x006affff, + 0x006bffff, + 0x006cffff, + 0x006dffff, + 0x006effff, + 0x006fffff, + 0x0070ffff, + 0x0021ffff, + 0x0022ffff, + 0x001cffff, + 0x001bffff, + 0x001dffff, + 0x001effff, + }, + { + 0x00030076, + 0x00030076, + 0x00030076, + 0x00030076, + 0x00030076, + 0x00030076, + 0x00030076, + 0x00030076, + 0x00030077, + 0x00030077, + 0x00030077, + 0x00030077, + 0x00030077, + 0x00030077, + 0x00030077, + 0x00030077, + }, + { + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003005c, + 0x0003005c, + 0x0003005c, + 0x0003005c, + 0x0003005c, + 0x0003005c, + 0x0003005c, + 0x0003005c, + }, + { + 0x00030092, + 0x00030092, + 0x00030092, + 0x00030092, + 0x00030092, + 0x00030092, + 0x00030092, + 0x00030092, + 0x000300e1, + 0x000300e1, + 0x000300e1, + 0x000300e1, + 0x000300e1, + 0x000300e1, + 0x000300e1, + 0x000300e1, + }, + { + 0x000300fa, + 0x000300fa, + 0x000300fa, + 0x000300fa, + 0x000300fa, + 0x000300fa, + 0x000300fa, + 0x000300fa, + 0x000300fb, + 0x000300fb, + 0x000300fb, + 0x000300fb, + 0x000300fb, + 0x000300fb, + 0x000300fb, + 0x000300fb, + }, + { + 0x00030114, + 0x00030114, + 0x00030114, + 0x00030114, + 0x00030114, + 0x00030114, + 0x00030114, + 0x00030114, + 0x0003012d, + 0x0003012d, + 0x0003012d, + 0x0003012d, + 0x0003012d, + 0x0003012d, + 0x0003012d, + 0x0003012d, + }, + { + 0x00030145, + 0x00030145, + 0x00030145, + 0x00030145, + 0x00030145, + 0x00030145, + 0x00030145, + 0x00030145, + 0x00030146, + 0x00030146, + 0x00030146, + 0x00030146, + 0x00030146, + 0x00030146, + 0x00030146, + 0x00030146, + }, + { + 0x000102d5, + 0x000102d5, + 0x000102d6, + 0x000102d6, + 0x000102d7, + 0x000102d7, + 0x000102d8, + 0x000102d8, + 0x00020027, + 0x00020027, + 0x00020027, + 0x00020027, + 0x000200fc, + 0x000200fc, + 0x000200fc, + 0x000200fc, + }, + { + 0x00020116, + 0x00020116, + 0x00020116, + 0x00020116, + 0x00020131, + 0x00020131, + 0x00020131, + 0x00020131, + 0x00020144, + 0x00020144, + 0x00020144, + 0x00020144, + 0x00020164, + 0x00020164, + 0x00020164, + 0x00020164, + }, + { + 0x0025ffff, + 0x0026ffff, + 0x0028ffff, + 0x002affff, + 0x002effff, + 0x0029ffff, + 0x0027ffff, + 0x0033ffff, + 0x002dffff, + 0x0024ffff, + 0x002bffff, + 0x002cffff, + 0x002fffff, + 0x0030ffff, + 0x0031ffff, + 0x0032ffff, + }, + { + 0x00010085, + 0x00010085, + 0x00010086, + 0x00010086, + 0x00010093, + 0x00010093, + 0x00010094, + 0x00010094, + 0x00010095, + 0x00010095, + 0x00010096, + 0x00010096, + 0x00010097, + 0x00010097, + 0x00010098, + 0x00010098, + }, + { + 0x0001000c, + 0x0001000c, + 0x0001000d, + 0x0001000d, + 0x0001000e, + 0x0001000e, + 0x0001000f, + 0x0001000f, + 0x00010010, + 0x00010010, + 0x00010011, + 0x00010011, + 0x00010012, + 0x00010012, + 0x00010013, + 0x00010013, + }, + { + 0x00010014, + 0x00010014, + 0x00010015, + 0x00010015, + 0x00010016, + 0x00010016, + 0x00010017, + 0x00010017, + 0x00010018, + 0x00010018, + 0x00010019, + 0x00010019, + 0x0001001a, + 0x0001001a, + 0x00010028, + 0x00010028, + }, + { + 0x00010061, + 0x00010061, + 0x00010062, + 0x00010062, + 0x00010063, + 0x00010063, + 0x00010064, + 0x00010064, + 0x00010065, + 0x00010065, + 0x00010066, + 0x00010066, + 0x00010067, + 0x00010067, + 0x00010068, + 0x00010068, + }, + { + 0x00010029, + 0x00010029, + 0x0001002a, + 0x0001002a, + 0x0001002b, + 0x0001002b, + 0x0001002c, + 0x0001002c, + 0x0001002d, + 0x0001002d, + 0x0001002e, + 0x0001002e, + 0x0001002f, + 0x0001002f, + 0x00010030, + 0x00010030, + }, + { + 0x0001004d, + 0x0001004d, + 0x0001004e, + 0x0001004e, + 0x0001004f, + 0x0001004f, + 0x00010050, + 0x00010050, + 0x0001005d, + 0x0001005d, + 0x0001005e, + 0x0001005e, + 0x0001005f, + 0x0001005f, + 0x00010060, + 0x00010060, + }, + { + 0x00010031, + 0x00010031, + 0x00010032, + 0x00010032, + 0x00010033, + 0x00010033, + 0x00010034, + 0x00010034, + 0x00010035, + 0x00010035, + 0x00010042, + 0x00010042, + 0x00010043, + 0x00010043, + 0x00010044, + 0x00010044, + }, + { + 0x00010099, + 0x00010099, + 0x0001009a, + 0x0001009a, + 0x0001009b, + 0x0001009b, + 0x0001009c, + 0x0001009c, + 0x0001009d, + 0x0001009d, + 0x0001009e, + 0x0001009e, + 0x0001009f, + 0x0001009f, + 0x000100a0, + 0x000100a0, + }, + { + 0x000100a1, + 0x000100a1, + 0x000100ad, + 0x000100ad, + 0x000100ae, + 0x000100ae, + 0x000100af, + 0x000100af, + 0x000100b0, + 0x000100b0, + 0x000100b1, + 0x000100b1, + 0x000100b2, + 0x000100b2, + 0x000100b3, + 0x000100b3, + }, + { + 0x0001007d, + 0x0001007d, + 0x0001007e, + 0x0001007e, + 0x0001007f, + 0x0001007f, + 0x00010080, + 0x00010080, + 0x00010081, + 0x00010081, + 0x00010082, + 0x00010082, + 0x00010083, + 0x00010083, + 0x00010084, + 0x00010084, + }, + { + 0x00010045, + 0x00010045, + 0x00010046, + 0x00010046, + 0x00010047, + 0x00010047, + 0x00010048, + 0x00010048, + 0x00010049, + 0x00010049, + 0x0001004a, + 0x0001004a, + 0x0001004b, + 0x0001004b, + 0x0001004c, + 0x0001004c, + }, + { + 0x000100b4, + 0x000100b4, + 0x000100b5, + 0x000100b5, + 0x000100b6, + 0x000100b6, + 0x000100b7, + 0x000100b7, + 0x000100b8, + 0x000100b8, + 0x000100b9, + 0x000100b9, + 0x000100ba, + 0x000100ba, + 0x000100bb, + 0x000100bb, + }, + { + 0x000100bc, + 0x000100bc, + 0x000100c7, + 0x000100c7, + 0x000100c8, + 0x000100c8, + 0x000100c9, + 0x000100c9, + 0x000100ca, + 0x000100ca, + 0x000100cb, + 0x000100cb, + 0x000100cc, + 0x000100cc, + 0x000100cd, + 0x000100cd, + }, + { + 0x000100ce, + 0x000100ce, + 0x000100cf, + 0x000100cf, + 0x000100d0, + 0x000100d0, + 0x000100d1, + 0x000100d1, + 0x000100d2, + 0x000100d2, + 0x000100d3, + 0x000100d3, + 0x000100d4, + 0x000100d4, + 0x000100d5, + 0x000100d5, + }, + { + 0x000100d6, + 0x000100d6, + 0x000100d7, + 0x000100d7, + 0x000100e2, + 0x000100e2, + 0x000100e3, + 0x000100e3, + 0x000100e4, + 0x000100e4, + 0x000100e5, + 0x000100e5, + 0x000100e6, + 0x000100e6, + 0x000100e7, + 0x000100e7, + }, + { + 0x00010069, + 0x00010069, + 0x0001006a, + 0x0001006a, + 0x0001006b, + 0x0001006b, + 0x00010078, + 0x00010078, + 0x00010079, + 0x00010079, + 0x0001007a, + 0x0001007a, + 0x0001007b, + 0x0001007b, + 0x0001007c, + 0x0001007c, + }, + { + 0x0035ffff, + 0x0036ffff, + 0x0037ffff, + 0x0038ffff, + 0x0039ffff, + 0x003affff, + 0x003bffff, + 0x003cffff, + 0x003dffff, + 0x003effff, + 0x003fffff, + 0x0040ffff, + 0x0041ffff, + 0x0042ffff, + 0x0043ffff, + 0x0044ffff, + }, + { + 0x000100e8, + 0x000100e8, + 0x000100e9, + 0x000100e9, + 0x000100ea, + 0x000100ea, + 0x000100eb, + 0x000100eb, + 0x000100ec, + 0x000100ec, + 0x000100ed, + 0x000100ed, + 0x000100ee, + 0x000100ee, + 0x000100ef, + 0x000100ef, + }, + { + 0x000100f0, + 0x000100f0, + 0x000100f1, + 0x000100f1, + 0x000100f2, + 0x000100f2, + 0x000100fd, + 0x000100fd, + 0x000100fe, + 0x000100fe, + 0x000100ff, + 0x000100ff, + 0x00010100, + 0x00010100, + 0x00010101, + 0x00010101, + }, + { + 0x00010102, + 0x00010102, + 0x00010103, + 0x00010103, + 0x00010104, + 0x00010104, + 0x00010105, + 0x00010105, + 0x00010106, + 0x00010106, + 0x00010107, + 0x00010107, + 0x00010108, + 0x00010108, + 0x00010109, + 0x00010109, + }, + { + 0x0001010a, + 0x0001010a, + 0x0001010b, + 0x0001010b, + 0x0001010c, + 0x0001010c, + 0x0001010d, + 0x0001010d, + 0x00010115, + 0x00010115, + 0x00010117, + 0x00010117, + 0x00010118, + 0x00010118, + 0x00010119, + 0x00010119, + }, + { + 0x0001011a, + 0x0001011a, + 0x0001011b, + 0x0001011b, + 0x0001011c, + 0x0001011c, + 0x0001011d, + 0x0001011d, + 0x0001011e, + 0x0001011e, + 0x0001011f, + 0x0001011f, + 0x00010120, + 0x00010120, + 0x00010121, + 0x00010121, + }, + { + 0x00010122, + 0x00010122, + 0x00010123, + 0x00010123, + 0x00010124, + 0x00010124, + 0x00010125, + 0x00010125, + 0x00010126, + 0x00010126, + 0x00010127, + 0x00010127, + 0x00010128, + 0x00010128, + 0x0001012f, + 0x0001012f, + }, + { + 0x00010130, + 0x00010130, + 0x00010132, + 0x00010132, + 0x00010133, + 0x00010133, + 0x00010134, + 0x00010134, + 0x00010135, + 0x00010135, + 0x00010136, + 0x00010136, + 0x00010137, + 0x00010137, + 0x00010138, + 0x00010138, + }, + { + 0x00010139, + 0x00010139, + 0x0001013a, + 0x0001013a, + 0x0001013b, + 0x0001013b, + 0x0001013c, + 0x0001013c, + 0x0001013d, + 0x0001013d, + 0x0001013e, + 0x0001013e, + 0x0001013f, + 0x0001013f, + 0x00010140, + 0x00010140, + }, + { + 0x00010141, + 0x00010141, + 0x00010142, + 0x00010142, + 0x00010143, + 0x00010143, + 0x00010147, + 0x00010147, + 0x00010148, + 0x00010148, + 0x00010149, + 0x00010149, + 0x0001014a, + 0x0001014a, + 0x0001014b, + 0x0001014b, + }, + { + 0x0001014c, + 0x0001014c, + 0x0001014d, + 0x0001014d, + 0x0001014e, + 0x0001014e, + 0x0001014f, + 0x0001014f, + 0x00010150, + 0x00010150, + 0x00010151, + 0x00010151, + 0x00010152, + 0x00010152, + 0x00010153, + 0x00010153, + }, + { + 0x00010154, + 0x00010154, + 0x00010155, + 0x00010155, + 0x00010156, + 0x00010156, + 0x00010157, + 0x00010157, + 0x00010158, + 0x00010158, + 0x00010159, + 0x00010159, + 0x0001015a, + 0x0001015a, + 0x0001015b, + 0x0001015b, + }, + { + 0x0001015c, + 0x0001015c, + 0x0001015d, + 0x0001015d, + 0x0001015e, + 0x0001015e, + 0x0001015f, + 0x0001015f, + 0x00010160, + 0x00010160, + 0x00010161, + 0x00010161, + 0x00010162, + 0x00010162, + 0x00010163, + 0x00010163, + }, + { + 0x00010165, + 0x00010165, + 0x00010166, + 0x00010166, + 0x00010167, + 0x00010167, + 0x00010168, + 0x00010168, + 0x00010169, + 0x00010169, + 0x0001016a, + 0x0001016a, + 0x0001016b, + 0x0001016b, + 0x0001016c, + 0x0001016c, + }, + { + 0x0001016d, + 0x0001016d, + 0x0001016e, + 0x0001016e, + 0x0001016f, + 0x0001016f, + 0x00010170, + 0x00010170, + 0x00010171, + 0x00010171, + 0x00010172, + 0x00010172, + 0x00010173, + 0x00010173, + 0x00010174, + 0x00010174, + }, + { + 0x00010175, + 0x00010175, + 0x00010176, + 0x00010176, + 0x00010177, + 0x00010177, + 0x00010178, + 0x00010178, + 0x00010179, + 0x00010179, + 0x0001017a, + 0x0001017a, + 0x0001017b, + 0x0001017b, + 0x0001017c, + 0x0001017c, + }, + { + 0x0001017d, + 0x0001017d, + 0x0001017e, + 0x0001017e, + 0x0001017f, + 0x0001017f, + 0x00010180, + 0x00010180, + 0x00010181, + 0x00010181, + 0x00010182, + 0x00010182, + 0x00010183, + 0x00010183, + 0x00010184, + 0x00010184, + }, + { + 0x0046ffff, + 0x0047ffff, + 0x0048ffff, + 0x0049ffff, + 0x004affff, + 0x004bffff, + 0x004cffff, + 0x004dffff, + 0x004effff, + 0x004fffff, + 0x0050ffff, + 0x0051ffff, + 0x0052ffff, + 0x0053ffff, + 0x0054ffff, + 0x0055ffff, + }, + { + 0x00010185, + 0x00010185, + 0x00010186, + 0x00010186, + 0x00010187, + 0x00010187, + 0x00010188, + 0x00010188, + 0x00010189, + 0x00010189, + 0x0001018a, + 0x0001018a, + 0x0001018b, + 0x0001018b, + 0x0001018c, + 0x0001018c, + }, + { + 0x0001018d, + 0x0001018d, + 0x0001018e, + 0x0001018e, + 0x0001018f, + 0x0001018f, + 0x00010190, + 0x00010190, + 0x00010191, + 0x00010191, + 0x00010192, + 0x00010192, + 0x00010193, + 0x00010193, + 0x00010194, + 0x00010194, + }, + { + 0x00010195, + 0x00010195, + 0x00010196, + 0x00010196, + 0x00010197, + 0x00010197, + 0x00010198, + 0x00010198, + 0x00010199, + 0x00010199, + 0x0001019a, + 0x0001019a, + 0x0001019b, + 0x0001019b, + 0x0001019c, + 0x0001019c, + }, + { + 0x0001019d, + 0x0001019d, + 0x0001019e, + 0x0001019e, + 0x0001019f, + 0x0001019f, + 0x000101a0, + 0x000101a0, + 0x000101a1, + 0x000101a1, + 0x000101a2, + 0x000101a2, + 0x000101a3, + 0x000101a3, + 0x000101a4, + 0x000101a4, + }, + { + 0x000101a5, + 0x000101a5, + 0x000101a6, + 0x000101a6, + 0x000101a7, + 0x000101a7, + 0x000101a8, + 0x000101a8, + 0x000101a9, + 0x000101a9, + 0x000101aa, + 0x000101aa, + 0x000101ab, + 0x000101ab, + 0x000101ac, + 0x000101ac, + }, + { + 0x000101ad, + 0x000101ad, + 0x000101ae, + 0x000101ae, + 0x000101af, + 0x000101af, + 0x000101b0, + 0x000101b0, + 0x000101b1, + 0x000101b1, + 0x000101b2, + 0x000101b2, + 0x000101b3, + 0x000101b3, + 0x000101b4, + 0x000101b4, + }, + { + 0x000101b5, + 0x000101b5, + 0x000101b6, + 0x000101b6, + 0x000101b7, + 0x000101b7, + 0x000101b8, + 0x000101b8, + 0x000101b9, + 0x000101b9, + 0x000101ba, + 0x000101ba, + 0x000101bb, + 0x000101bb, + 0x000101bc, + 0x000101bc, + }, + { + 0x000101bd, + 0x000101bd, + 0x000101be, + 0x000101be, + 0x000101bf, + 0x000101bf, + 0x000101c0, + 0x000101c0, + 0x000101c1, + 0x000101c1, + 0x000101c2, + 0x000101c2, + 0x000101c3, + 0x000101c3, + 0x000101c4, + 0x000101c4, + }, + { + 0x000101c5, + 0x000101c5, + 0x000101c6, + 0x000101c6, + 0x000101c7, + 0x000101c7, + 0x000101c8, + 0x000101c8, + 0x000101c9, + 0x000101c9, + 0x000101ca, + 0x000101ca, + 0x000101cb, + 0x000101cb, + 0x000101cc, + 0x000101cc, + }, + { + 0x000101cd, + 0x000101cd, + 0x000101ce, + 0x000101ce, + 0x000101cf, + 0x000101cf, + 0x000101d0, + 0x000101d0, + 0x000101d1, + 0x000101d1, + 0x000101d2, + 0x000101d2, + 0x000101d3, + 0x000101d3, + 0x000101d4, + 0x000101d4, + }, + { + 0x000101d5, + 0x000101d5, + 0x000101d6, + 0x000101d6, + 0x000101d7, + 0x000101d7, + 0x000101d8, + 0x000101d8, + 0x000101d9, + 0x000101d9, + 0x000101da, + 0x000101da, + 0x000101db, + 0x000101db, + 0x000101dc, + 0x000101dc, + }, + { + 0x000101dd, + 0x000101dd, + 0x000101de, + 0x000101de, + 0x000101df, + 0x000101df, + 0x000101e0, + 0x000101e0, + 0x000101e1, + 0x000101e1, + 0x000101e2, + 0x000101e2, + 0x000101e3, + 0x000101e3, + 0x000101e4, + 0x000101e4, + }, + { + 0x000101e5, + 0x000101e5, + 0x000101e6, + 0x000101e6, + 0x000101e7, + 0x000101e7, + 0x000101e8, + 0x000101e8, + 0x000101e9, + 0x000101e9, + 0x000101ea, + 0x000101ea, + 0x000101eb, + 0x000101eb, + 0x000101ec, + 0x000101ec, + }, + { + 0x000101ed, + 0x000101ed, + 0x000101ee, + 0x000101ee, + 0x000101ef, + 0x000101ef, + 0x000101f0, + 0x000101f0, + 0x000101f1, + 0x000101f1, + 0x000101f2, + 0x000101f2, + 0x000101f3, + 0x000101f3, + 0x000101f4, + 0x000101f4, + }, + { + 0x000101f5, + 0x000101f5, + 0x000101f6, + 0x000101f6, + 0x000101f7, + 0x000101f7, + 0x000101f8, + 0x000101f8, + 0x000101f9, + 0x000101f9, + 0x000101fa, + 0x000101fa, + 0x000101fb, + 0x000101fb, + 0x000101fc, + 0x000101fc, + }, + { + 0x000101fd, + 0x000101fd, + 0x000101fe, + 0x000101fe, + 0x000101ff, + 0x000101ff, + 0x00010200, + 0x00010200, + 0x00010201, + 0x00010201, + 0x00010202, + 0x00010202, + 0x00010203, + 0x00010203, + 0x00010204, + 0x00010204, + }, + { + 0x0057ffff, + 0x0058ffff, + 0x0059ffff, + 0x005affff, + 0x005bffff, + 0x005cffff, + 0x005dffff, + 0x005effff, + 0x005fffff, + 0x0060ffff, + 0x0061ffff, + 0x0062ffff, + 0x0063ffff, + 0x0064ffff, + 0x0065ffff, + 0x0066ffff, + }, + { + 0x00010205, + 0x00010205, + 0x00010206, + 0x00010206, + 0x00010207, + 0x00010207, + 0x00010208, + 0x00010208, + 0x00010209, + 0x00010209, + 0x0001020a, + 0x0001020a, + 0x0001020b, + 0x0001020b, + 0x0001020c, + 0x0001020c, + }, + { + 0x0001020d, + 0x0001020d, + 0x0001020e, + 0x0001020e, + 0x0001020f, + 0x0001020f, + 0x00010210, + 0x00010210, + 0x00010211, + 0x00010211, + 0x00010212, + 0x00010212, + 0x00010213, + 0x00010213, + 0x00010214, + 0x00010214, + }, + { + 0x00010215, + 0x00010215, + 0x00010216, + 0x00010216, + 0x00010217, + 0x00010217, + 0x00010218, + 0x00010218, + 0x00010219, + 0x00010219, + 0x0001021a, + 0x0001021a, + 0x0001021b, + 0x0001021b, + 0x0001021c, + 0x0001021c, + }, + { + 0x0001021d, + 0x0001021d, + 0x0001021e, + 0x0001021e, + 0x0001021f, + 0x0001021f, + 0x00010220, + 0x00010220, + 0x00010221, + 0x00010221, + 0x00010222, + 0x00010222, + 0x00010223, + 0x00010223, + 0x00010224, + 0x00010224, + }, + { + 0x00010225, + 0x00010225, + 0x00010226, + 0x00010226, + 0x00010227, + 0x00010227, + 0x00010228, + 0x00010228, + 0x00010229, + 0x00010229, + 0x0001022a, + 0x0001022a, + 0x0001022b, + 0x0001022b, + 0x0001022c, + 0x0001022c, + }, + { + 0x0001022d, + 0x0001022d, + 0x0001022e, + 0x0001022e, + 0x0001022f, + 0x0001022f, + 0x00010230, + 0x00010230, + 0x00010231, + 0x00010231, + 0x00010232, + 0x00010232, + 0x00010233, + 0x00010233, + 0x00010234, + 0x00010234, + }, + { + 0x00010235, + 0x00010235, + 0x00010236, + 0x00010236, + 0x00010237, + 0x00010237, + 0x00010238, + 0x00010238, + 0x00010239, + 0x00010239, + 0x0001023a, + 0x0001023a, + 0x0001023b, + 0x0001023b, + 0x0001023c, + 0x0001023c, + }, + { + 0x0001023d, + 0x0001023d, + 0x0001023e, + 0x0001023e, + 0x0001023f, + 0x0001023f, + 0x00010240, + 0x00010240, + 0x00010241, + 0x00010241, + 0x00010242, + 0x00010242, + 0x00010243, + 0x00010243, + 0x00010244, + 0x00010244, + }, + { + 0x00010245, + 0x00010245, + 0x00010246, + 0x00010246, + 0x00010247, + 0x00010247, + 0x00010248, + 0x00010248, + 0x00010249, + 0x00010249, + 0x0001024a, + 0x0001024a, + 0x0001024b, + 0x0001024b, + 0x0001024c, + 0x0001024c, + }, + { + 0x0001024d, + 0x0001024d, + 0x0001024e, + 0x0001024e, + 0x0001024f, + 0x0001024f, + 0x00010250, + 0x00010250, + 0x00010251, + 0x00010251, + 0x00010252, + 0x00010252, + 0x00010253, + 0x00010253, + 0x00010254, + 0x00010254, + }, + { + 0x00010255, + 0x00010255, + 0x00010256, + 0x00010256, + 0x00010257, + 0x00010257, + 0x00010258, + 0x00010258, + 0x00010259, + 0x00010259, + 0x0001025a, + 0x0001025a, + 0x0001025b, + 0x0001025b, + 0x0001025c, + 0x0001025c, + }, + { + 0x0001025d, + 0x0001025d, + 0x0001025e, + 0x0001025e, + 0x0001025f, + 0x0001025f, + 0x00010260, + 0x00010260, + 0x00010261, + 0x00010261, + 0x00010262, + 0x00010262, + 0x00010263, + 0x00010263, + 0x00010264, + 0x00010264, + }, + { + 0x00010265, + 0x00010265, + 0x00010266, + 0x00010266, + 0x00010267, + 0x00010267, + 0x00010268, + 0x00010268, + 0x00010269, + 0x00010269, + 0x0001026a, + 0x0001026a, + 0x0001026b, + 0x0001026b, + 0x0001026c, + 0x0001026c, + }, + { + 0x0001026d, + 0x0001026d, + 0x0001026e, + 0x0001026e, + 0x0001026f, + 0x0001026f, + 0x00010270, + 0x00010270, + 0x00010271, + 0x00010271, + 0x00010272, + 0x00010272, + 0x00010273, + 0x00010273, + 0x00010274, + 0x00010274, + }, + { + 0x00010275, + 0x00010275, + 0x00010276, + 0x00010276, + 0x00010277, + 0x00010277, + 0x00010278, + 0x00010278, + 0x00010279, + 0x00010279, + 0x0001027a, + 0x0001027a, + 0x0001027b, + 0x0001027b, + 0x0001027c, + 0x0001027c, + }, + { + 0x0001027d, + 0x0001027d, + 0x0001027e, + 0x0001027e, + 0x0001027f, + 0x0001027f, + 0x00010280, + 0x00010280, + 0x00010281, + 0x00010281, + 0x00010282, + 0x00010282, + 0x00010283, + 0x00010283, + 0x00010284, + 0x00010284, + }, + { + 0x00010285, + 0x00010285, + 0x00010286, + 0x00010286, + 0x00010287, + 0x00010287, + 0x00010288, + 0x00010288, + 0x00010289, + 0x00010289, + 0x0001028a, + 0x0001028a, + 0x0001028b, + 0x0001028b, + 0x0001028c, + 0x0001028c, + }, + { + 0x0001028d, + 0x0001028d, + 0x0001028e, + 0x0001028e, + 0x0001028f, + 0x0001028f, + 0x00010290, + 0x00010290, + 0x00010291, + 0x00010291, + 0x00010292, + 0x00010292, + 0x00010293, + 0x00010293, + 0x00010294, + 0x00010294, + }, + { + 0x00010295, + 0x00010295, + 0x00010296, + 0x00010296, + 0x00010297, + 0x00010297, + 0x00010298, + 0x00010298, + 0x00010299, + 0x00010299, + 0x0001029a, + 0x0001029a, + 0x0001029b, + 0x0001029b, + 0x0001029c, + 0x0001029c, + }, + { + 0x0001029d, + 0x0001029d, + 0x0001029e, + 0x0001029e, + 0x0001029f, + 0x0001029f, + 0x000102a0, + 0x000102a0, + 0x000102a1, + 0x000102a1, + 0x000102a2, + 0x000102a2, + 0x000102a3, + 0x000102a3, + 0x000102a4, + 0x000102a4, + }, + { + 0x000102a5, + 0x000102a5, + 0x000102a6, + 0x000102a6, + 0x000102a7, + 0x000102a7, + 0x000102a8, + 0x000102a8, + 0x000102a9, + 0x000102a9, + 0x000102aa, + 0x000102aa, + 0x000102ab, + 0x000102ab, + 0x000102ac, + 0x000102ac, + }, + { + 0x000102ad, + 0x000102ad, + 0x000102ae, + 0x000102ae, + 0x000102af, + 0x000102af, + 0x000102b0, + 0x000102b0, + 0x000102b1, + 0x000102b1, + 0x000102b2, + 0x000102b2, + 0x000102b3, + 0x000102b3, + 0x000102b4, + 0x000102b4, + }, + { + 0x000102b5, + 0x000102b5, + 0x000102b6, + 0x000102b6, + 0x000102b7, + 0x000102b7, + 0x000102b8, + 0x000102b8, + 0x000102b9, + 0x000102b9, + 0x000102ba, + 0x000102ba, + 0x000102bb, + 0x000102bb, + 0x000102bc, + 0x000102bc, + }, + { + 0x000102bd, + 0x000102bd, + 0x000102be, + 0x000102be, + 0x000102bf, + 0x000102bf, + 0x000102c0, + 0x000102c0, + 0x000102c1, + 0x000102c1, + 0x000102c2, + 0x000102c2, + 0x000102c3, + 0x000102c3, + 0x000102c4, + 0x000102c4, + }, + { + 0x000102c5, + 0x000102c5, + 0x000102c6, + 0x000102c6, + 0x000102c7, + 0x000102c7, + 0x000102c8, + 0x000102c8, + 0x000102c9, + 0x000102c9, + 0x000102ca, + 0x000102ca, + 0x000102cb, + 0x000102cb, + 0x000102cc, + 0x000102cc, + }, + { + 0x000102cd, + 0x000102cd, + 0x000102ce, + 0x000102ce, + 0x000102cf, + 0x000102cf, + 0x000102d0, + 0x000102d0, + 0x000102d1, + 0x000102d1, + 0x000102d2, + 0x000102d2, + 0x000102d3, + 0x000102d3, + 0x000102d4, + 0x000102d4, + }, +}; +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc50[28][2] = +#else +const uint16_t c_aauiCQMFHuffEnc50[28][2] = +#endif + { + { 0x0002, 0x0001 }, + { 0x0002, 0x0002 }, + { 0x0002, 0x0003 }, + { 0x0003, 0x0001 }, + { 0x0004, 0x0001 }, + { 0x0005, 0x0001 }, + { 0x0006, 0x0001 }, + { 0x0007, 0x0001 }, + { 0x0008, 0x0001 }, + { 0x0009, 0x0001 }, + { 0x000a, 0x0001 }, + { 0x000b, 0x0001 }, + { 0x000c, 0x0001 }, + { 0x000d, 0x0001 }, + { 0x000e, 0x0001 }, + { 0x000f, 0x0001 }, + { 0x0011, 0x0003 }, + { 0x0012, 0x0005 }, + { 0x0013, 0x0000 }, + { 0x0013, 0x0001 }, + { 0x0013, 0x0002 }, + { 0x0013, 0x0003 }, + { 0x0013, 0x0004 }, + { 0x0013, 0x0005 }, + { 0x0013, 0x0006 }, + { 0x0013, 0x0007 }, + { 0x0013, 0x0008 }, + { 0x0013, 0x0009 }, + + }; +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec50[6][16] = { + { + 0x0001ffff, + 0x00000004, + 0x00010003, + 0x00010003, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + }, + { + 0x0002ffff, + 0x00000008, + 0x00010007, + 0x00010007, + 0x00020006, + 0x00020006, + 0x00020006, + 0x00020006, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + }, + { + 0x0003ffff, + 0x0000000c, + 0x0001000b, + 0x0001000b, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + }, + { + 0x0005ffff, + 0x0004ffff, + 0x0001000f, + 0x0001000f, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + }, + { + 0x0001001a, + 0x0001001a, + 0x0001001b, + 0x0001001b, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + 0x00030010, + }, + { + 0x00010012, + 0x00010012, + 0x00010013, + 0x00010013, + 0x00010014, + 0x00010014, + 0x00010015, + 0x00010015, + 0x00010016, + 0x00010016, + 0x00010017, + 0x00010017, + 0x00010018, + 0x00010018, + 0x00010019, + 0x00010019, + }, +}; +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc51[29][2] = +#else +const uint16_t c_aauiCQMFHuffEnc51[29][2] = +#endif + { + { 0x0002, 0x0002 }, + { 0x0002, 0x0003 }, + { 0x0003, 0x0002 }, + { 0x0003, 0x0003 }, + { 0x0004, 0x0001 }, + { 0x0004, 0x0002 }, + { 0x0004, 0x0003 }, + { 0x0005, 0x0001 }, + { 0x0006, 0x0001 }, + { 0x0007, 0x0001 }, + { 0x0008, 0x0001 }, + { 0x0009, 0x0001 }, + { 0x000a, 0x0001 }, + { 0x000b, 0x0001 }, + { 0x000c, 0x0001 }, + { 0x000d, 0x0001 }, + { 0x000e, 0x0001 }, + { 0x0010, 0x0002 }, + { 0x0010, 0x0003 }, + { 0x0012, 0x0002 }, + { 0x0012, 0x0003 }, + { 0x0013, 0x0000 }, + { 0x0013, 0x0001 }, + { 0x0013, 0x0002 }, + { 0x0013, 0x0003 }, + { 0x0012, 0x0004 }, + { 0x0012, 0x0005 }, + { 0x0012, 0x0006 }, + { 0x0012, 0x0007 }, + + }; +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec51[6][16] = { + { + 0x0001ffff, + 0x00000004, + 0x00000005, + 0x00000006, + 0x00010002, + 0x00010002, + 0x00010003, + 0x00010003, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00020001, + }, + { + 0x0002ffff, + 0x0000000a, + 0x00010009, + 0x00010009, + 0x00020008, + 0x00020008, + 0x00020008, + 0x00020008, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + }, + { + 0x0003ffff, + 0x0000000e, + 0x0001000d, + 0x0001000d, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + }, + { + 0x0004ffff, + 0x0005ffff, + 0x00000011, + 0x00000012, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020010, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + 0x0003000f, + }, + { + 0x00010015, + 0x00010015, + 0x00010016, + 0x00010016, + 0x00010017, + 0x00010017, + 0x00010018, + 0x00010018, + 0x00020013, + 0x00020013, + 0x00020013, + 0x00020013, + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020014, + }, + { + 0x00020019, + 0x00020019, + 0x00020019, + 0x00020019, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001c, + }, +}; +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc52[32][2] = +#else +const uint16_t c_aauiCQMFHuffEnc52[32][2] = +#endif + { + { 0x0002, 0x0002 }, + { 0x0002, 0x0003 }, + { 0x0003, 0x0002 }, + { 0x0003, 0x0003 }, + { 0x0004, 0x0002 }, + { 0x0004, 0x0003 }, + { 0x0005, 0x0001 }, + { 0x0005, 0x0002 }, + { 0x0005, 0x0003 }, + { 0x0006, 0x0001 }, + { 0x0007, 0x0001 }, + { 0x0008, 0x0001 }, + { 0x0009, 0x0001 }, + { 0x000a, 0x0001 }, + { 0x000b, 0x0001 }, + { 0x000c, 0x0001 }, + { 0x000e, 0x0001 }, + { 0x000e, 0x0002 }, + { 0x000e, 0x0003 }, + { 0x000f, 0x0001 }, + { 0x0011, 0x0002 }, + { 0x0011, 0x0003 }, + { 0x0012, 0x0003 }, + { 0x0014, 0x0000 }, + { 0x0013, 0x0003 }, + { 0x0014, 0x0001 }, + { 0x0014, 0x0002 }, + { 0x0014, 0x0003 }, + { 0x0014, 0x0004 }, + { 0x0014, 0x0005 }, + { 0x0013, 0x0004 }, + { 0x0013, 0x0005 }, + }; +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec52[7][16] = { + { + 0x0001ffff, + 0x0002ffff, + 0x00000004, + 0x00000005, + 0x00010002, + 0x00010002, + 0x00010003, + 0x00010003, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00020001, + }, + { + 0x0003ffff, + 0x0000000b, + 0x0001000a, + 0x0001000a, + 0x00020009, + 0x00020009, + 0x00020009, + 0x00020009, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + }, + { + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + }, + { + 0x0004ffff, + 0x0000000f, + 0x0001000e, + 0x0001000e, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + }, + { + 0x0006ffff, + 0x0005ffff, + 0x00010013, + 0x00010013, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020012, + }, + { + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + }, + { + 0x00000017, + 0x00000019, + 0x0000001a, + 0x0000001b, + 0x0000001c, + 0x0000001d, + 0x00010018, + 0x00010018, + 0x0001001e, + 0x0001001e, + 0x0001001f, + 0x0001001f, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020016, + }, +}; +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc53[37][2] = +#else +const uint16_t c_aauiCQMFHuffEnc53[37][2] = +#endif + { + { 0x0002, 0x0002 }, + { 0x0002, 0x0003 }, + { 0x0003, 0x0002 }, + { 0x0003, 0x0003 }, + { 0x0004, 0x0002 }, + { 0x0004, 0x0003 }, + { 0x0005, 0x0002 }, + { 0x0005, 0x0003 }, + { 0x0006, 0x0002 }, + { 0x0006, 0x0003 }, + { 0x0007, 0x0001 }, + { 0x0007, 0x0002 }, + { 0x0007, 0x0003 }, + { 0x0008, 0x0001 }, + { 0x0009, 0x0001 }, + { 0x000b, 0x0002 }, + { 0x000b, 0x0003 }, + { 0x000c, 0x0002 }, + { 0x000c, 0x0003 }, + { 0x000d, 0x0002 }, + { 0x000d, 0x0003 }, + { 0x000e, 0x0002 }, + { 0x000e, 0x0003 }, + { 0x000f, 0x0002 }, + { 0x000f, 0x0003 }, + { 0x0011, 0x0004 }, + { 0x0010, 0x0003 }, + { 0x0011, 0x0005 }, + { 0x0013, 0x0000 }, + { 0x0013, 0x0001 }, + { 0x0012, 0x0001 }, + { 0x0012, 0x0002 }, + { 0x0012, 0x0003 }, + { 0x0012, 0x0004 }, + { 0x0012, 0x0005 }, + { 0x0012, 0x0006 }, + { 0x0012, 0x0007 }, + + }; +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec53[9][16] = { + { + 0x0002ffff, + 0x0001ffff, + 0x00000004, + 0x00000005, + 0x00010002, + 0x00010002, + 0x00010003, + 0x00010003, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00020001, + }, + { + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + }, + { + 0x0003ffff, + 0x0000000d, + 0x0001000a, + 0x0001000a, + 0x0001000b, + 0x0001000b, + 0x0001000c, + 0x0001000c, + 0x00020008, + 0x00020008, + 0x00020008, + 0x00020008, + 0x00020009, + 0x00020009, + 0x00020009, + 0x00020009, + }, + { + 0x0005ffff, + 0x0004ffff, + 0x00000011, + 0x00000012, + 0x0001000f, + 0x0001000f, + 0x00010010, + 0x00010010, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + 0x0003000e, + }, + { + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + }, + { + 0x0007ffff, + 0x0008ffff, + 0x0006ffff, + 0x0000001a, + 0x00010017, + 0x00010017, + 0x00010018, + 0x00010018, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020016, + }, + { + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + }, + { + 0x0001001c, + 0x0001001c, + 0x0001001d, + 0x0001001d, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020020, + }, + { + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020022, + 0x00020022, + 0x00020022, + 0x00020022, + 0x00020023, + 0x00020023, + 0x00020023, + 0x00020023, + 0x00020024, + 0x00020024, + 0x00020024, + 0x00020024, + }, +}; +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc54[39][2] = +#else +const uint16_t c_aauiCQMFHuffEnc54[39][2] = +#endif + { + { 0x0002, 0x0002 }, + { 0x0002, 0x0003 }, + { 0x0003, 0x0002 }, + { 0x0003, 0x0003 }, + { 0x0004, 0x0003 }, + { 0x0005, 0x0003 }, + { 0x0005, 0x0004 }, + { 0x0005, 0x0005 }, + { 0x0006, 0x0002 }, + { 0x0006, 0x0003 }, + { 0x0006, 0x0004 }, + { 0x0006, 0x0005 }, + { 0x0007, 0x0002 }, + { 0x0007, 0x0003 }, + { 0x0008, 0x0001 }, + { 0x0008, 0x0002 }, + { 0x0008, 0x0003 }, + { 0x000a, 0x0002 }, + { 0x000a, 0x0003 }, + { 0x000b, 0x0002 }, + { 0x000b, 0x0003 }, + { 0x000c, 0x0002 }, + { 0x000c, 0x0003 }, + { 0x000d, 0x0002 }, + { 0x000d, 0x0003 }, + { 0x000e, 0x0002 }, + { 0x000e, 0x0003 }, + { 0x000f, 0x0002 }, + { 0x000f, 0x0003 }, + { 0x0011, 0x0002 }, + { 0x0010, 0x0002 }, + { 0x0010, 0x0003 }, + { 0x0011, 0x0003 }, + { 0x0012, 0x0002 }, + { 0x0012, 0x0003 }, + { 0x0013, 0x0000 }, + { 0x0013, 0x0001 }, + { 0x0013, 0x0002 }, + { 0x0013, 0x0003 }, + + }; +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec54[9][16] = { + { + 0x0003ffff, + 0x0001ffff, + 0x0002ffff, + 0x00000004, + 0x00010002, + 0x00010002, + 0x00010003, + 0x00010003, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020000, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00020001, + }, + { + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + }, + { + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + }, + { + 0x0004ffff, + 0x0000000e, + 0x0000000f, + 0x00000010, + 0x0001000c, + 0x0001000c, + 0x0001000d, + 0x0001000d, + 0x00020008, + 0x00020008, + 0x00020008, + 0x00020008, + 0x00020009, + 0x00020009, + 0x00020009, + 0x00020009, + }, + { + 0x0006ffff, + 0x0005ffff, + 0x00000015, + 0x00000016, + 0x00010013, + 0x00010013, + 0x00010014, + 0x00010014, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020012, + }, + { + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + }, + { + 0x0008ffff, + 0x0007ffff, + 0x0000001e, + 0x0000001f, + 0x0001001b, + 0x0001001b, + 0x0001001c, + 0x0001001c, + 0x00020019, + 0x00020019, + 0x00020019, + 0x00020019, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001a, + }, + { + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + 0x00030020, + }, + { + 0x00010023, + 0x00010023, + 0x00010024, + 0x00010024, + 0x00010025, + 0x00010025, + 0x00010026, + 0x00010026, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020022, + 0x00020022, + 0x00020022, + 0x00020022, + }, +}; +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc55[46][2] = +#else +const uint16_t c_aauiCQMFHuffEnc55[46][2] = +#endif + { + { 0x0003, 0x0003 }, + { 0x0002, 0x0003 }, + { 0x0003, 0x0004 }, + { 0x0003, 0x0005 }, + { 0x0004, 0x0003 }, + { 0x0004, 0x0004 }, + { 0x0004, 0x0005 }, + { 0x0005, 0x0003 }, + { 0x0005, 0x0004 }, + { 0x0005, 0x0005 }, + { 0x0006, 0x0003 }, + { 0x0006, 0x0004 }, + { 0x0006, 0x0005 }, + { 0x0007, 0x0002 }, + { 0x0007, 0x0003 }, + { 0x0007, 0x0004 }, + { 0x0007, 0x0005 }, + { 0x0008, 0x0002 }, + { 0x0008, 0x0003 }, + { 0x0009, 0x0002 }, + { 0x0009, 0x0003 }, + { 0x000a, 0x0002 }, + { 0x000a, 0x0003 }, + { 0x000b, 0x0002 }, + { 0x000b, 0x0003 }, + { 0x000c, 0x0002 }, + { 0x000c, 0x0003 }, + { 0x000d, 0x0002 }, + { 0x000d, 0x0003 }, + { 0x000e, 0x0002 }, + { 0x000e, 0x0003 }, + { 0x000f, 0x0003 }, + { 0x0010, 0x0002 }, + { 0x0010, 0x0003 }, + { 0x0010, 0x0004 }, + { 0x0010, 0x0005 }, + { 0x0011, 0x0003 }, + { 0x0012, 0x0003 }, + { 0x0012, 0x0004 }, + { 0x0012, 0x0005 }, + { 0x0013, 0x0000 }, + { 0x0013, 0x0001 }, + { 0x0013, 0x0002 }, + { 0x0013, 0x0003 }, + { 0x0013, 0x0004 }, + { 0x0013, 0x0005 }, + + }; +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec55[10][16] = { + { + 0x0003ffff, + 0x0001ffff, + 0x0002ffff, + 0x00000004, + 0x00000005, + 0x00000006, + 0x00010000, + 0x00010000, + 0x00010002, + 0x00010002, + 0x00010003, + 0x00010003, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00020001, + }, + { + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + }, + { + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + }, + { + 0x0005ffff, + 0x0004ffff, + 0x00000011, + 0x00000012, + 0x0001000d, + 0x0001000d, + 0x0001000e, + 0x0001000e, + 0x0001000f, + 0x0001000f, + 0x00010010, + 0x00010010, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000a, + }, + { + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030013, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + 0x00030014, + }, + { + 0x0007ffff, + 0x0006ffff, + 0x00000019, + 0x0000001a, + 0x00010017, + 0x00010017, + 0x00010018, + 0x00010018, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020016, + }, + { + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001b, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + }, + { + 0x0009ffff, + 0x0008ffff, + 0x00000020, + 0x00000021, + 0x00000022, + 0x00000023, + 0x0001001f, + 0x0001001f, + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x0002001d, + 0x0002001e, + 0x0002001e, + 0x0002001e, + 0x0002001e, + }, + { + 0x00020026, + 0x00020026, + 0x00020026, + 0x00020026, + 0x00020027, + 0x00020027, + 0x00020027, + 0x00020027, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + }, + { + 0x00010028, + 0x00010028, + 0x00010029, + 0x00010029, + 0x0001002a, + 0x0001002a, + 0x0001002b, + 0x0001002b, + 0x0001002c, + 0x0001002c, + 0x0001002d, + 0x0001002d, + 0x00020025, + 0x00020025, + 0x00020025, + 0x00020025, + }, +}; +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc56[55][2] = +#else +const uint16_t c_aauiCQMFHuffEnc56[55][2] = +#endif + { + { 0x0003, 0x0003 }, + { 0x0002, 0x0003 }, + { 0x0003, 0x0004 }, + { 0x0003, 0x0005 }, + { 0x0004, 0x0004 }, + { 0x0004, 0x0005 }, + { 0x0005, 0x0003 }, + { 0x0005, 0x0004 }, + { 0x0005, 0x0005 }, + { 0x0005, 0x0006 }, + { 0x0005, 0x0007 }, + { 0x0006, 0x0003 }, + { 0x0006, 0x0004 }, + { 0x0006, 0x0005 }, + { 0x0007, 0x0003 }, + { 0x0007, 0x0004 }, + { 0x0007, 0x0005 }, + { 0x0008, 0x0002 }, + { 0x0008, 0x0003 }, + { 0x0008, 0x0004 }, + { 0x0008, 0x0005 }, + { 0x0009, 0x0002 }, + { 0x0009, 0x0003 }, + { 0x000a, 0x0002 }, + { 0x000a, 0x0003 }, + { 0x000b, 0x0003 }, + { 0x000c, 0x0003 }, + { 0x000c, 0x0004 }, + { 0x000c, 0x0005 }, + { 0x000d, 0x0003 }, + { 0x000d, 0x0004 }, + { 0x000d, 0x0005 }, + { 0x000e, 0x0003 }, + { 0x000e, 0x0004 }, + { 0x000e, 0x0005 }, + { 0x000f, 0x0004 }, + { 0x000f, 0x0005 }, + { 0x0010, 0x0002 }, + { 0x0010, 0x0003 }, + { 0x0010, 0x0004 }, + { 0x0010, 0x0005 }, + { 0x0010, 0x0006 }, + { 0x0010, 0x0007 }, + { 0x0013, 0x0000 }, + { 0x0011, 0x0003 }, + { 0x0012, 0x0005 }, + { 0x0013, 0x0001 }, + { 0x0013, 0x0002 }, + { 0x0013, 0x0003 }, + { 0x0013, 0x0004 }, + { 0x0013, 0x0005 }, + { 0x0013, 0x0006 }, + { 0x0013, 0x0007 }, + { 0x0013, 0x0008 }, + { 0x0013, 0x0009 }, + + }; +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec56[12][16] = { + { + 0x0004ffff, + 0x0001ffff, + 0x0002ffff, + 0x0003ffff, + 0x00000004, + 0x00000005, + 0x00010000, + 0x00010000, + 0x00010002, + 0x00010002, + 0x00010003, + 0x00010003, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00020001, + }, + { + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + }, + { + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + }, + { + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + }, + { + 0x0006ffff, + 0x0005ffff, + 0x00000011, + 0x00000012, + 0x00000013, + 0x00000014, + 0x0001000e, + 0x0001000e, + 0x0001000f, + 0x0001000f, + 0x00010010, + 0x00010010, + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x0002000b, + }, + { + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030015, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + 0x00030016, + }, + { + 0x0009ffff, + 0x0007ffff, + 0x0008ffff, + 0x0000001a, + 0x0000001b, + 0x0000001c, + 0x00010019, + 0x00010019, + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020017, + 0x00020018, + 0x00020018, + 0x00020018, + 0x00020018, + }, + { + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020022, + 0x00020022, + 0x00020022, + 0x00020022, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + }, + { + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + 0x0003001f, + }, + { + 0x000bffff, + 0x000affff, + 0x00000025, + 0x00000026, + 0x00000027, + 0x00000028, + 0x00000029, + 0x0000002a, + 0x00010023, + 0x00010023, + 0x00010024, + 0x00010024, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020020, + }, + { + 0x00010035, + 0x00010035, + 0x00010036, + 0x00010036, + 0x0002002d, + 0x0002002d, + 0x0002002d, + 0x0002002d, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + }, + { + 0x0001002b, + 0x0001002b, + 0x0001002e, + 0x0001002e, + 0x0001002f, + 0x0001002f, + 0x00010030, + 0x00010030, + 0x00010031, + 0x00010031, + 0x00010032, + 0x00010032, + 0x00010033, + 0x00010033, + 0x00010034, + 0x00010034, + }, +}; +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc57[65][2] = +#else +const uint16_t c_aauiCQMFHuffEnc57[65][2] = +#endif + { + { 0x0003, 0x0004 }, + { 0x0002, 0x0003 }, + { 0x0003, 0x0005 }, + { 0x0004, 0x0004 }, + { 0x0004, 0x0005 }, + { 0x0004, 0x0006 }, + { 0x0004, 0x0007 }, + { 0x0005, 0x0004 }, + { 0x0005, 0x0005 }, + { 0x0005, 0x0006 }, + { 0x0005, 0x0007 }, + { 0x0006, 0x0004 }, + { 0x0006, 0x0005 }, + { 0x0006, 0x0006 }, + { 0x0006, 0x0007 }, + { 0x0007, 0x0003 }, + { 0x0007, 0x0004 }, + { 0x0007, 0x0005 }, + { 0x0007, 0x0006 }, + { 0x0007, 0x0007 }, + { 0x0008, 0x0003 }, + { 0x0008, 0x0004 }, + { 0x0008, 0x0005 }, + { 0x0009, 0x0003 }, + { 0x0009, 0x0004 }, + { 0x0009, 0x0005 }, + { 0x000a, 0x0003 }, + { 0x000a, 0x0004 }, + { 0x000a, 0x0005 }, + { 0x000b, 0x0003 }, + { 0x000b, 0x0004 }, + { 0x000b, 0x0005 }, + { 0x000c, 0x0003 }, + { 0x000c, 0x0004 }, + { 0x000d, 0x0003 }, + { 0x000c, 0x0005 }, + { 0x000d, 0x0004 }, + { 0x000d, 0x0005 }, + { 0x000e, 0x0003 }, + { 0x000e, 0x0004 }, + { 0x000e, 0x0005 }, + { 0x000f, 0x0003 }, + { 0x0010, 0x0003 }, + { 0x000f, 0x0004 }, + { 0x000f, 0x0005 }, + { 0x0010, 0x0004 }, + { 0x0010, 0x0005 }, + { 0x0013, 0x0000 }, + { 0x0011, 0x0005 }, + { 0x0013, 0x0001 }, + { 0x0013, 0x0002 }, + { 0x0012, 0x0007 }, + { 0x0013, 0x0003 }, + { 0x0013, 0x0004 }, + { 0x0012, 0x0008 }, + { 0x0012, 0x0009 }, + { 0x0013, 0x0005 }, + { 0x0013, 0x0006 }, + { 0x0013, 0x0007 }, + { 0x0013, 0x0008 }, + { 0x0013, 0x0009 }, + { 0x0013, 0x000a }, + { 0x0013, 0x000b }, + { 0x0013, 0x000c }, + { 0x0013, 0x000d }, + + }; +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec57[14][16] = { + { + 0x0004ffff, + 0x0003ffff, + 0x0001ffff, + 0x0002ffff, + 0x00000003, + 0x00000004, + 0x00000005, + 0x00000006, + 0x00010000, + 0x00010000, + 0x00010002, + 0x00010002, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00020001, + }, + { + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + }, + { + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + }, + { + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000e, + }, + { + 0x0007ffff, + 0x0005ffff, + 0x0006ffff, + 0x00000014, + 0x00000015, + 0x00000016, + 0x0001000f, + 0x0001000f, + 0x00010010, + 0x00010010, + 0x00010011, + 0x00010011, + 0x00010012, + 0x00010012, + 0x00010013, + 0x00010013, + }, + { + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001b, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x0002001c, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + 0x00030017, + }, + { + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030018, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + 0x00030019, + }, + { + 0x000affff, + 0x0008ffff, + 0x0009ffff, + 0x00000020, + 0x00000021, + 0x00000023, + 0x0001001d, + 0x0001001d, + 0x0001001e, + 0x0001001e, + 0x0001001f, + 0x0001001f, + 0x0002001a, + 0x0002001a, + 0x0002001a, + 0x0002001a, + }, + { + 0x00020027, + 0x00020027, + 0x00020027, + 0x00020027, + 0x00020028, + 0x00020028, + 0x00020028, + 0x00020028, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + }, + { + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + }, + { + 0x000dffff, + 0x000cffff, + 0x000bffff, + 0x0000002a, + 0x0000002d, + 0x0000002e, + 0x00010029, + 0x00010029, + 0x0001002b, + 0x0001002b, + 0x0001002c, + 0x0001002c, + 0x00020026, + 0x00020026, + 0x00020026, + 0x00020026, + }, + { + 0x00020036, + 0x00020036, + 0x00020036, + 0x00020036, + 0x00020037, + 0x00020037, + 0x00020037, + 0x00020037, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + }, + { + 0x0001003b, + 0x0001003b, + 0x0001003c, + 0x0001003c, + 0x0001003d, + 0x0001003d, + 0x0001003e, + 0x0001003e, + 0x0001003f, + 0x0001003f, + 0x00010040, + 0x00010040, + 0x00020033, + 0x00020033, + 0x00020033, + 0x00020033, + }, + { + 0x0001002f, + 0x0001002f, + 0x00010031, + 0x00010031, + 0x00010032, + 0x00010032, + 0x00010034, + 0x00010034, + 0x00010035, + 0x00010035, + 0x00010038, + 0x00010038, + 0x00010039, + 0x00010039, + 0x0001003a, + 0x0001003a, + }, +}; +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc58[77][2] = +#else +const uint16_t c_aauiCQMFHuffEnc58[77][2] = +#endif + { + { 0x0004, 0x0005 }, + { 0x0003, 0x0005 }, + { 0x0003, 0x0006 }, + { 0x0003, 0x0007 }, + { 0x0004, 0x0006 }, + { 0x0004, 0x0007 }, + { 0x0004, 0x0008 }, + { 0x0004, 0x0009 }, + { 0x0005, 0x0005 }, + { 0x0005, 0x0006 }, + { 0x0005, 0x0007 }, + { 0x0005, 0x0008 }, + { 0x0005, 0x0009 }, + { 0x0006, 0x0004 }, + { 0x0006, 0x0005 }, + { 0x0006, 0x0006 }, + { 0x0006, 0x0007 }, + { 0x0006, 0x0008 }, + { 0x0006, 0x0009 }, + { 0x0007, 0x0004 }, + { 0x0007, 0x0005 }, + { 0x0007, 0x0006 }, + { 0x0007, 0x0007 }, + { 0x0008, 0x0003 }, + { 0x0008, 0x0004 }, + { 0x0008, 0x0005 }, + { 0x0008, 0x0006 }, + { 0x0008, 0x0007 }, + { 0x0009, 0x0003 }, + { 0x0009, 0x0004 }, + { 0x0009, 0x0005 }, + { 0x000a, 0x0003 }, + { 0x000a, 0x0004 }, + { 0x000a, 0x0005 }, + { 0x000b, 0x0004 }, + { 0x000b, 0x0005 }, + { 0x000c, 0x0004 }, + { 0x000c, 0x0005 }, + { 0x000c, 0x0006 }, + { 0x000c, 0x0007 }, + { 0x000d, 0x0004 }, + { 0x000d, 0x0005 }, + { 0x000d, 0x0006 }, + { 0x000d, 0x0007 }, + { 0x000e, 0x0004 }, + { 0x000e, 0x0005 }, + { 0x000e, 0x0006 }, + { 0x000e, 0x0007 }, + { 0x000f, 0x0004 }, + { 0x000f, 0x0005 }, + { 0x000f, 0x0006 }, + { 0x0010, 0x0004 }, + { 0x000f, 0x0007 }, + { 0x0010, 0x0005 }, + { 0x0010, 0x0006 }, + { 0x0010, 0x0007 }, + { 0x0013, 0x0000 }, + { 0x0013, 0x0001 }, + { 0x0012, 0x0006 }, + { 0x0011, 0x0007 }, + { 0x0013, 0x0002 }, + { 0x0013, 0x0003 }, + { 0x0013, 0x0004 }, + { 0x0013, 0x0005 }, + { 0x0012, 0x0007 }, + { 0x0013, 0x0006 }, + { 0x0013, 0x0007 }, + { 0x0013, 0x0008 }, + { 0x0013, 0x0009 }, + { 0x0013, 0x000a }, + { 0x0013, 0x000b }, + { 0x0012, 0x0008 }, + { 0x0012, 0x0009 }, + { 0x0012, 0x000a }, + { 0x0012, 0x000b }, + { 0x0012, 0x000c }, + { 0x0012, 0x000d }, + + }; +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec58[17][16] = { + { + 0x0005ffff, + 0x0004ffff, + 0x0001ffff, + 0x0002ffff, + 0x0003ffff, + 0x00000000, + 0x00000004, + 0x00000005, + 0x00000006, + 0x00000007, + 0x00010001, + 0x00010001, + 0x00010002, + 0x00010002, + 0x00010003, + 0x00010003, + }, + { + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + }, + { + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + }, + { + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + }, + { + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020010, + }, + { + 0x0008ffff, + 0x0006ffff, + 0x0007ffff, + 0x00000017, + 0x00000018, + 0x00000019, + 0x0000001a, + 0x0000001b, + 0x00010013, + 0x00010013, + 0x00010014, + 0x00010014, + 0x00010015, + 0x00010015, + 0x00010016, + 0x00010016, + }, + { + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020020, + 0x00020021, + 0x00020021, + 0x00020021, + 0x00020021, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + 0x0003001c, + }, + { + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001d, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + 0x0003001e, + }, + { + 0x000cffff, + 0x000bffff, + 0x0009ffff, + 0x000affff, + 0x00000024, + 0x00000025, + 0x00000026, + 0x00000027, + 0x00010022, + 0x00010022, + 0x00010023, + 0x00010023, + 0x0002001f, + 0x0002001f, + 0x0002001f, + 0x0002001f, + }, + { + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + }, + { + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + }, + { + 0x0002002c, + 0x0002002c, + 0x0002002c, + 0x0002002c, + 0x0002002d, + 0x0002002d, + 0x0002002d, + 0x0002002d, + 0x0002002e, + 0x0002002e, + 0x0002002e, + 0x0002002e, + 0x0002002f, + 0x0002002f, + 0x0002002f, + 0x0002002f, + }, + { + 0x0010ffff, + 0x000effff, + 0x000fffff, + 0x000dffff, + 0x00000033, + 0x00000035, + 0x00000036, + 0x00000037, + 0x00010030, + 0x00010030, + 0x00010031, + 0x00010031, + 0x00010032, + 0x00010032, + 0x00010034, + 0x00010034, + }, + { + 0x0002004b, + 0x0002004b, + 0x0002004b, + 0x0002004b, + 0x0002004c, + 0x0002004c, + 0x0002004c, + 0x0002004c, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + }, + { + 0x00010043, + 0x00010043, + 0x00010044, + 0x00010044, + 0x00010045, + 0x00010045, + 0x00010046, + 0x00010046, + 0x0002003a, + 0x0002003a, + 0x0002003a, + 0x0002003a, + 0x00020040, + 0x00020040, + 0x00020040, + 0x00020040, + }, + { + 0x00020047, + 0x00020047, + 0x00020047, + 0x00020047, + 0x00020048, + 0x00020048, + 0x00020048, + 0x00020048, + 0x00020049, + 0x00020049, + 0x00020049, + 0x00020049, + 0x0002004a, + 0x0002004a, + 0x0002004a, + 0x0002004a, + }, + { + 0x00010038, + 0x00010038, + 0x00010039, + 0x00010039, + 0x0001003c, + 0x0001003c, + 0x0001003d, + 0x0001003d, + 0x0001003e, + 0x0001003e, + 0x0001003f, + 0x0001003f, + 0x00010041, + 0x00010041, + 0x00010042, + 0x00010042, + }, +}; +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc59[91][2] = +#else +const uint16_t c_aauiCQMFHuffEnc59[91][2] = +#endif + { + { 0x0003, 0x0005 }, + { 0x0003, 0x0006 }, + { 0x0003, 0x0007 }, + { 0x0004, 0x0006 }, + { 0x0004, 0x0007 }, + { 0x0004, 0x0008 }, + { 0x0004, 0x0009 }, + { 0x0005, 0x0006 }, + { 0x0005, 0x0007 }, + { 0x0005, 0x0008 }, + { 0x0005, 0x0009 }, + { 0x0005, 0x000a }, + { 0x0005, 0x000b }, + { 0x0006, 0x0006 }, + { 0x0006, 0x0007 }, + { 0x0006, 0x0008 }, + { 0x0006, 0x0009 }, + { 0x0006, 0x000a }, + { 0x0006, 0x000b }, + { 0x0007, 0x0005 }, + { 0x0007, 0x0006 }, + { 0x0007, 0x0007 }, + { 0x0007, 0x0008 }, + { 0x0007, 0x0009 }, + { 0x0007, 0x000a }, + { 0x0007, 0x000b }, + { 0x0008, 0x0003 }, + { 0x0008, 0x0004 }, + { 0x0008, 0x0005 }, + { 0x0008, 0x0006 }, + { 0x0008, 0x0007 }, + { 0x0008, 0x0008 }, + { 0x0008, 0x0009 }, + { 0x0009, 0x0004 }, + { 0x0009, 0x0005 }, + { 0x000a, 0x0004 }, + { 0x000a, 0x0005 }, + { 0x000a, 0x0006 }, + { 0x000a, 0x0007 }, + { 0x000b, 0x0004 }, + { 0x000b, 0x0005 }, + { 0x000b, 0x0006 }, + { 0x000b, 0x0007 }, + { 0x000c, 0x0004 }, + { 0x000c, 0x0005 }, + { 0x000c, 0x0006 }, + { 0x000c, 0x0007 }, + { 0x000d, 0x0003 }, + { 0x000d, 0x0004 }, + { 0x000d, 0x0005 }, + { 0x000d, 0x0006 }, + { 0x000d, 0x0007 }, + { 0x000e, 0x0003 }, + { 0x000e, 0x0004 }, + { 0x000e, 0x0005 }, + { 0x000f, 0x0003 }, + { 0x000f, 0x0004 }, + { 0x000f, 0x0005 }, + { 0x0011, 0x0008 }, + { 0x0011, 0x0009 }, + { 0x0013, 0x0000 }, + { 0x0011, 0x000a }, + { 0x0013, 0x0001 }, + { 0x0013, 0x0002 }, + { 0x0012, 0x000d }, + { 0x0012, 0x000e }, + { 0x0013, 0x0003 }, + { 0x0013, 0x0004 }, + { 0x0013, 0x0005 }, + { 0x0011, 0x000b }, + { 0x0013, 0x0006 }, + { 0x0013, 0x0007 }, + { 0x0013, 0x0008 }, + { 0x0013, 0x0009 }, + { 0x0013, 0x000a }, + { 0x0013, 0x000b }, + { 0x0013, 0x000c }, + { 0x0013, 0x000d }, + { 0x0013, 0x000e }, + { 0x0013, 0x000f }, + { 0x0013, 0x0010 }, + { 0x0013, 0x0011 }, + { 0x0013, 0x0012 }, + { 0x0013, 0x0013 }, + { 0x0013, 0x0014 }, + { 0x0013, 0x0015 }, + { 0x0013, 0x0016 }, + { 0x0013, 0x0017 }, + { 0x0013, 0x0018 }, + { 0x0013, 0x0019 }, + { 0x0012, 0x000f }, + + }; +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec59[20][16] = { + { + 0x0006ffff, + 0x0004ffff, + 0x0005ffff, + 0x0001ffff, + 0x0002ffff, + 0x0003ffff, + 0x00000003, + 0x00000004, + 0x00000005, + 0x00000006, + 0x00010000, + 0x00010000, + 0x00010001, + 0x00010001, + 0x00010002, + 0x00010002, + }, + { + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + }, + { + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + }, + { + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + }, + { + 0x00010016, + 0x00010016, + 0x00010017, + 0x00010017, + 0x00010018, + 0x00010018, + 0x00010019, + 0x00010019, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000e, + }, + { + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020012, + }, + { + 0x0009ffff, + 0x0008ffff, + 0x0007ffff, + 0x0000001a, + 0x0000001b, + 0x0000001c, + 0x0000001d, + 0x0000001e, + 0x0000001f, + 0x00000020, + 0x00010013, + 0x00010013, + 0x00010014, + 0x00010014, + 0x00010015, + 0x00010015, + }, + { + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + }, + { + 0x00020023, + 0x00020023, + 0x00020023, + 0x00020023, + 0x00020024, + 0x00020024, + 0x00020024, + 0x00020024, + 0x00020025, + 0x00020025, + 0x00020025, + 0x00020025, + 0x00020026, + 0x00020026, + 0x00020026, + 0x00020026, + }, + { + 0x000dffff, + 0x000affff, + 0x000bffff, + 0x000cffff, + 0x0000002b, + 0x0000002c, + 0x0000002d, + 0x0000002e, + 0x00010027, + 0x00010027, + 0x00010028, + 0x00010028, + 0x00010029, + 0x00010029, + 0x0001002a, + 0x0001002a, + }, + { + 0x00020035, + 0x00020035, + 0x00020035, + 0x00020035, + 0x00020036, + 0x00020036, + 0x00020036, + 0x00020036, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + }, + { + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + }, + { + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + }, + { + 0x0011ffff, + 0x0012ffff, + 0x0013ffff, + 0x0010ffff, + 0x000effff, + 0x000fffff, + 0x00010037, + 0x00010037, + 0x00010038, + 0x00010038, + 0x00010039, + 0x00010039, + 0x00020034, + 0x00020034, + 0x00020034, + 0x00020034, + }, + { + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + }, + { + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x0003003d, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + }, + { + 0x00010058, + 0x00010058, + 0x00010059, + 0x00010059, + 0x00020040, + 0x00020040, + 0x00020040, + 0x00020040, + 0x00020041, + 0x00020041, + 0x00020041, + 0x00020041, + 0x0002005a, + 0x0002005a, + 0x0002005a, + 0x0002005a, + }, + { + 0x0001003c, + 0x0001003c, + 0x0001003e, + 0x0001003e, + 0x0001003f, + 0x0001003f, + 0x00010042, + 0x00010042, + 0x00010043, + 0x00010043, + 0x00010044, + 0x00010044, + 0x00010046, + 0x00010046, + 0x00010047, + 0x00010047, + }, + { + 0x00010048, + 0x00010048, + 0x00010049, + 0x00010049, + 0x0001004a, + 0x0001004a, + 0x0001004b, + 0x0001004b, + 0x0001004c, + 0x0001004c, + 0x0001004d, + 0x0001004d, + 0x0001004e, + 0x0001004e, + 0x0001004f, + 0x0001004f, + }, + { + 0x00010050, + 0x00010050, + 0x00010051, + 0x00010051, + 0x00010052, + 0x00010052, + 0x00010053, + 0x00010053, + 0x00010054, + 0x00010054, + 0x00010055, + 0x00010055, + 0x00010056, + 0x00010056, + 0x00010057, + 0x00010057, + }, +}; +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc60[109][2] = +#else +const uint16_t c_aauiCQMFHuffEnc60[109][2] = +#endif + { + { 0x0004, 0x0007 }, + { 0x0002, 0x0003 }, + { 0x0003, 0x0005 }, + { 0x0004, 0x0008 }, + { 0x0004, 0x0009 }, + { 0x0005, 0x0007 }, + { 0x0005, 0x0008 }, + { 0x0005, 0x0009 }, + { 0x0005, 0x000a }, + { 0x0005, 0x000b }, + { 0x0005, 0x000c }, + { 0x0005, 0x000d }, + { 0x0006, 0x0007 }, + { 0x0006, 0x0008 }, + { 0x0006, 0x0009 }, + { 0x0006, 0x000a }, + { 0x0006, 0x000b }, + { 0x0006, 0x000c }, + { 0x0006, 0x000d }, + { 0x0007, 0x0006 }, + { 0x0007, 0x0007 }, + { 0x0007, 0x0008 }, + { 0x0007, 0x0009 }, + { 0x0007, 0x000a }, + { 0x0007, 0x000b }, + { 0x0007, 0x000c }, + { 0x0007, 0x000d }, + { 0x0008, 0x0006 }, + { 0x0008, 0x0007 }, + { 0x0008, 0x0008 }, + { 0x0008, 0x0009 }, + { 0x0008, 0x000a }, + { 0x0008, 0x000b }, + { 0x0009, 0x0004 }, + { 0x0009, 0x0005 }, + { 0x0009, 0x0006 }, + { 0x0009, 0x0007 }, + { 0x0009, 0x0008 }, + { 0x0009, 0x0009 }, + { 0x0009, 0x000a }, + { 0x0009, 0x000b }, + { 0x000a, 0x0004 }, + { 0x000a, 0x0005 }, + { 0x000a, 0x0006 }, + { 0x000a, 0x0007 }, + { 0x000b, 0x0004 }, + { 0x000b, 0x0005 }, + { 0x000b, 0x0006 }, + { 0x000b, 0x0007 }, + { 0x000c, 0x0004 }, + { 0x000c, 0x0005 }, + { 0x000c, 0x0006 }, + { 0x000d, 0x0005 }, + { 0x000d, 0x0006 }, + { 0x000d, 0x0007 }, + { 0x000c, 0x0007 }, + { 0x000e, 0x0005 }, + { 0x000e, 0x0006 }, + { 0x000e, 0x0007 }, + { 0x000e, 0x0008 }, + { 0x000f, 0x0005 }, + { 0x000e, 0x0009 }, + { 0x000f, 0x0006 }, + { 0x0010, 0x0006 }, + { 0x000f, 0x0007 }, + { 0x000f, 0x0008 }, + { 0x000f, 0x0009 }, + { 0x0010, 0x0007 }, + { 0x0010, 0x0008 }, + { 0x0010, 0x0009 }, + { 0x0011, 0x000a }, + { 0x0013, 0x0000 }, + { 0x0011, 0x000b }, + { 0x0013, 0x0001 }, + { 0x0013, 0x0002 }, + { 0x0012, 0x0011 }, + { 0x0012, 0x0012 }, + { 0x0013, 0x0003 }, + { 0x0013, 0x0004 }, + { 0x0013, 0x0005 }, + { 0x0013, 0x0006 }, + { 0x0013, 0x0007 }, + { 0x0013, 0x0008 }, + { 0x0013, 0x0009 }, + { 0x0013, 0x000a }, + { 0x0013, 0x000b }, + { 0x0013, 0x000c }, + { 0x0013, 0x000d }, + { 0x0013, 0x000e }, + { 0x0013, 0x000f }, + { 0x0013, 0x0010 }, + { 0x0013, 0x0011 }, + { 0x0013, 0x0012 }, + { 0x0013, 0x0013 }, + { 0x0013, 0x0014 }, + { 0x0013, 0x0015 }, + { 0x0013, 0x0016 }, + { 0x0013, 0x0017 }, + { 0x0013, 0x0018 }, + { 0x0013, 0x0019 }, + { 0x0013, 0x001a }, + { 0x0013, 0x001b }, + { 0x0013, 0x001c }, + { 0x0013, 0x001d }, + { 0x0013, 0x001e }, + { 0x0013, 0x001f }, + { 0x0013, 0x0020 }, + { 0x0013, 0x0021 }, + { 0x0012, 0x0013 }, + + }; +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec60[24][16] = { + { + 0x0007ffff, + 0x0005ffff, + 0x0006ffff, + 0x0001ffff, + 0x0002ffff, + 0x0003ffff, + 0x0004ffff, + 0x00000000, + 0x00000003, + 0x00000004, + 0x00010002, + 0x00010002, + 0x00020001, + 0x00020001, + 0x00020001, + 0x00020001, + }, + { + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + }, + { + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + }, + { + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + }, + { + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + }, + { + 0x00010015, + 0x00010015, + 0x00010016, + 0x00010016, + 0x00010017, + 0x00010017, + 0x00010018, + 0x00010018, + 0x00010019, + 0x00010019, + 0x0001001a, + 0x0001001a, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000c, + }, + { + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020010, + }, + { + 0x000dffff, + 0x000cffff, + 0x0008ffff, + 0x0009ffff, + 0x000affff, + 0x000bffff, + 0x0000001b, + 0x0000001c, + 0x0000001d, + 0x0000001e, + 0x0000001f, + 0x00000020, + 0x00010013, + 0x00010013, + 0x00010014, + 0x00010014, + }, + { + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030021, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + 0x00030022, + }, + { + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030023, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + 0x00030024, + }, + { + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030025, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + 0x00030026, + }, + { + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030027, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + }, + { + 0x00020029, + 0x00020029, + 0x00020029, + 0x00020029, + 0x0002002a, + 0x0002002a, + 0x0002002a, + 0x0002002a, + 0x0002002b, + 0x0002002b, + 0x0002002b, + 0x0002002b, + 0x0002002c, + 0x0002002c, + 0x0002002c, + 0x0002002c, + }, + { + 0x0011ffff, + 0x0010ffff, + 0x000fffff, + 0x000effff, + 0x00000031, + 0x00000032, + 0x00000033, + 0x00000037, + 0x0001002d, + 0x0001002d, + 0x0001002e, + 0x0001002e, + 0x0001002f, + 0x0001002f, + 0x00010030, + 0x00010030, + }, + { + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + }, + { + 0x0002003b, + 0x0002003b, + 0x0002003b, + 0x0002003b, + 0x0002003d, + 0x0002003d, + 0x0002003d, + 0x0002003d, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + }, + { + 0x00010041, + 0x00010041, + 0x00010042, + 0x00010042, + 0x00020038, + 0x00020038, + 0x00020038, + 0x00020038, + 0x00020039, + 0x00020039, + 0x00020039, + 0x00020039, + 0x0002003a, + 0x0002003a, + 0x0002003a, + 0x0002003a, + }, + { + 0x0014ffff, + 0x0015ffff, + 0x0016ffff, + 0x0017ffff, + 0x0013ffff, + 0x0012ffff, + 0x0000003f, + 0x00000043, + 0x00000044, + 0x00000045, + 0x0001003c, + 0x0001003c, + 0x0001003e, + 0x0001003e, + 0x00010040, + 0x00010040, + }, + { + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030046, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + 0x00030048, + }, + { + 0x0001006a, + 0x0001006a, + 0x0001006b, + 0x0001006b, + 0x0002004b, + 0x0002004b, + 0x0002004b, + 0x0002004b, + 0x0002004c, + 0x0002004c, + 0x0002004c, + 0x0002004c, + 0x0002006c, + 0x0002006c, + 0x0002006c, + 0x0002006c, + }, + { + 0x00010047, + 0x00010047, + 0x00010049, + 0x00010049, + 0x0001004a, + 0x0001004a, + 0x0001004d, + 0x0001004d, + 0x0001004e, + 0x0001004e, + 0x0001004f, + 0x0001004f, + 0x00010050, + 0x00010050, + 0x00010051, + 0x00010051, + }, + { + 0x00010052, + 0x00010052, + 0x00010053, + 0x00010053, + 0x00010054, + 0x00010054, + 0x00010055, + 0x00010055, + 0x00010056, + 0x00010056, + 0x00010057, + 0x00010057, + 0x00010058, + 0x00010058, + 0x00010059, + 0x00010059, + }, + { + 0x0001005a, + 0x0001005a, + 0x0001005b, + 0x0001005b, + 0x0001005c, + 0x0001005c, + 0x0001005d, + 0x0001005d, + 0x0001005e, + 0x0001005e, + 0x0001005f, + 0x0001005f, + 0x00010060, + 0x00010060, + 0x00010061, + 0x00010061, + }, + { + 0x00010062, + 0x00010062, + 0x00010063, + 0x00010063, + 0x00010064, + 0x00010064, + 0x00010065, + 0x00010065, + 0x00010066, + 0x00010066, + 0x00010067, + 0x00010067, + 0x00010068, + 0x00010068, + 0x00010069, + 0x00010069, + }, +}; +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc61[129][2] = +#else +const uint16_t c_aauiCQMFHuffEnc61[129][2] = +#endif + { + { 0x0004, 0x0008 }, + { 0x0003, 0x0006 }, + { 0x0003, 0x0007 }, + { 0x0004, 0x0009 }, + { 0x0004, 0x000a }, + { 0x0004, 0x000b }, + { 0x0005, 0x0008 }, + { 0x0005, 0x0009 }, + { 0x0005, 0x000a }, + { 0x0005, 0x000b }, + { 0x0005, 0x000c }, + { 0x0005, 0x000d }, + { 0x0005, 0x000e }, + { 0x0005, 0x000f }, + { 0x0006, 0x0008 }, + { 0x0006, 0x0009 }, + { 0x0006, 0x000a }, + { 0x0006, 0x000b }, + { 0x0006, 0x000c }, + { 0x0006, 0x000d }, + { 0x0006, 0x000e }, + { 0x0006, 0x000f }, + { 0x0007, 0x0008 }, + { 0x0007, 0x0009 }, + { 0x0007, 0x000a }, + { 0x0007, 0x000b }, + { 0x0007, 0x000c }, + { 0x0007, 0x000d }, + { 0x0007, 0x000e }, + { 0x0007, 0x000f }, + { 0x0008, 0x0006 }, + { 0x0008, 0x0007 }, + { 0x0008, 0x0008 }, + { 0x0008, 0x0009 }, + { 0x0008, 0x000a }, + { 0x0008, 0x000b }, + { 0x0008, 0x000c }, + { 0x0008, 0x000d }, + { 0x0008, 0x000e }, + { 0x0008, 0x000f }, + { 0x0009, 0x0006 }, + { 0x0009, 0x0007 }, + { 0x0009, 0x0008 }, + { 0x0009, 0x0009 }, + { 0x0009, 0x000a }, + { 0x0009, 0x000b }, + { 0x000a, 0x0005 }, + { 0x000a, 0x0006 }, + { 0x000a, 0x0007 }, + { 0x000a, 0x0008 }, + { 0x000a, 0x0009 }, + { 0x000a, 0x000a }, + { 0x000a, 0x000b }, + { 0x000b, 0x0005 }, + { 0x000b, 0x0006 }, + { 0x000b, 0x0007 }, + { 0x000b, 0x0008 }, + { 0x000b, 0x0009 }, + { 0x000c, 0x0006 }, + { 0x000c, 0x0007 }, + { 0x000c, 0x0008 }, + { 0x000c, 0x0009 }, + { 0x000d, 0x0005 }, + { 0x000d, 0x0006 }, + { 0x000d, 0x0007 }, + { 0x000d, 0x0008 }, + { 0x000d, 0x0009 }, + { 0x000d, 0x000a }, + { 0x000e, 0x0008 }, + { 0x000d, 0x000b }, + { 0x000e, 0x0009 }, + { 0x000f, 0x0009 }, + { 0x000f, 0x000a }, + { 0x000f, 0x000b }, + { 0x000f, 0x000c }, + { 0x000f, 0x000d }, + { 0x000f, 0x000e }, + { 0x0010, 0x000c }, + { 0x0011, 0x0015 }, + { 0x0010, 0x000d }, + { 0x000f, 0x000f }, + { 0x0010, 0x000e }, + { 0x0010, 0x000f }, + { 0x0012, 0x0000 }, + { 0x0011, 0x0016 }, + { 0x0010, 0x0010 }, + { 0x0010, 0x0011 }, + { 0x0011, 0x0017 }, + { 0x0012, 0x0001 }, + { 0x0012, 0x0002 }, + { 0x0012, 0x0003 }, + { 0x0012, 0x0004 }, + { 0x0012, 0x0005 }, + { 0x0012, 0x0006 }, + { 0x0012, 0x0007 }, + { 0x0012, 0x0008 }, + { 0x0012, 0x0009 }, + { 0x0012, 0x000a }, + { 0x0012, 0x000b }, + { 0x0012, 0x000c }, + { 0x0012, 0x000d }, + { 0x0012, 0x000e }, + { 0x0012, 0x000f }, + { 0x0012, 0x0010 }, + { 0x0012, 0x0011 }, + { 0x0012, 0x0012 }, + { 0x0012, 0x0013 }, + { 0x0012, 0x0014 }, + { 0x0012, 0x0015 }, + { 0x0012, 0x0016 }, + { 0x0012, 0x0017 }, + { 0x0012, 0x0018 }, + { 0x0012, 0x0019 }, + { 0x0012, 0x001a }, + { 0x0012, 0x001b }, + { 0x0012, 0x001c }, + { 0x0012, 0x001d }, + { 0x0012, 0x001e }, + { 0x0012, 0x001f }, + { 0x0012, 0x0020 }, + { 0x0012, 0x0021 }, + { 0x0012, 0x0022 }, + { 0x0012, 0x0023 }, + { 0x0012, 0x0024 }, + { 0x0012, 0x0025 }, + { 0x0012, 0x0026 }, + { 0x0012, 0x0027 }, + { 0x0012, 0x0028 }, + { 0x0012, 0x0029 }, + + }; +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec61[33][16] = { + { + 0x0008ffff, + 0x0007ffff, + 0x0005ffff, + 0x0006ffff, + 0x0001ffff, + 0x0002ffff, + 0x0003ffff, + 0x0004ffff, + 0x00000000, + 0x00000003, + 0x00000004, + 0x00000005, + 0x00010001, + 0x00010001, + 0x00010002, + 0x00010002, + }, + { + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + }, + { + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + }, + { + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + }, + { + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + 0x0003000d, + }, + { + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020011, + }, + { + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020013, + 0x00020013, + 0x00020013, + 0x00020013, + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020015, + }, + { + 0x00010016, + 0x00010016, + 0x00010017, + 0x00010017, + 0x00010018, + 0x00010018, + 0x00010019, + 0x00010019, + 0x0001001a, + 0x0001001a, + 0x0001001b, + 0x0001001b, + 0x0001001c, + 0x0001001c, + 0x0001001d, + 0x0001001d, + }, + { + 0x000effff, + 0x000cffff, + 0x000dffff, + 0x0009ffff, + 0x000affff, + 0x000bffff, + 0x0000001e, + 0x0000001f, + 0x00000020, + 0x00000021, + 0x00000022, + 0x00000023, + 0x00000024, + 0x00000025, + 0x00000026, + 0x00000027, + }, + { + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030028, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + 0x00030029, + }, + { + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002a, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + }, + { + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + }, + { + 0x00010038, + 0x00010038, + 0x00010039, + 0x00010039, + 0x0002002e, + 0x0002002e, + 0x0002002e, + 0x0002002e, + 0x0002002f, + 0x0002002f, + 0x0002002f, + 0x0002002f, + 0x00020030, + 0x00020030, + 0x00020030, + 0x00020030, + }, + { + 0x00020031, + 0x00020031, + 0x00020031, + 0x00020031, + 0x00020032, + 0x00020032, + 0x00020032, + 0x00020032, + 0x00020033, + 0x00020033, + 0x00020033, + 0x00020033, + 0x00020034, + 0x00020034, + 0x00020034, + 0x00020034, + }, + { + 0x0014ffff, + 0x0013ffff, + 0x000fffff, + 0x0010ffff, + 0x0011ffff, + 0x0012ffff, + 0x0000003a, + 0x0000003b, + 0x0000003c, + 0x0000003d, + 0x00010035, + 0x00010035, + 0x00010036, + 0x00010036, + 0x00010037, + 0x00010037, + }, + { + 0x00020044, + 0x00020044, + 0x00020044, + 0x00020044, + 0x00020046, + 0x00020046, + 0x00020046, + 0x00020046, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + 0x0003003e, + }, + { + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x0003003f, + 0x00030040, + 0x00030040, + 0x00030040, + 0x00030040, + 0x00030040, + 0x00030040, + 0x00030040, + 0x00030040, + }, + { + 0x00030041, + 0x00030041, + 0x00030041, + 0x00030041, + 0x00030041, + 0x00030041, + 0x00030041, + 0x00030041, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + 0x00030042, + }, + { + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030043, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + 0x00030045, + }, + { + 0x00000055, + 0x00000056, + 0x00010047, + 0x00010047, + 0x00010048, + 0x00010048, + 0x00010049, + 0x00010049, + 0x0001004a, + 0x0001004a, + 0x0001004b, + 0x0001004b, + 0x0001004c, + 0x0001004c, + 0x00010050, + 0x00010050, + }, + { + 0x0017ffff, + 0x0018ffff, + 0x0019ffff, + 0x001affff, + 0x001bffff, + 0x001cffff, + 0x001dffff, + 0x001effff, + 0x001fffff, + 0x0020ffff, + 0x0016ffff, + 0x0015ffff, + 0x0000004d, + 0x0000004f, + 0x00000051, + 0x00000052, + }, + { + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + }, + { + 0x0002007f, + 0x0002007f, + 0x0002007f, + 0x0002007f, + 0x00020080, + 0x00020080, + 0x00020080, + 0x00020080, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + }, + { + 0x00020053, + 0x00020053, + 0x00020053, + 0x00020053, + 0x00020058, + 0x00020058, + 0x00020058, + 0x00020058, + 0x00020059, + 0x00020059, + 0x00020059, + 0x00020059, + 0x0002005a, + 0x0002005a, + 0x0002005a, + 0x0002005a, + }, + { + 0x0002005b, + 0x0002005b, + 0x0002005b, + 0x0002005b, + 0x0002005c, + 0x0002005c, + 0x0002005c, + 0x0002005c, + 0x0002005d, + 0x0002005d, + 0x0002005d, + 0x0002005d, + 0x0002005e, + 0x0002005e, + 0x0002005e, + 0x0002005e, + }, + { + 0x0002005f, + 0x0002005f, + 0x0002005f, + 0x0002005f, + 0x00020060, + 0x00020060, + 0x00020060, + 0x00020060, + 0x00020061, + 0x00020061, + 0x00020061, + 0x00020061, + 0x00020062, + 0x00020062, + 0x00020062, + 0x00020062, + }, + { + 0x00020063, + 0x00020063, + 0x00020063, + 0x00020063, + 0x00020064, + 0x00020064, + 0x00020064, + 0x00020064, + 0x00020065, + 0x00020065, + 0x00020065, + 0x00020065, + 0x00020066, + 0x00020066, + 0x00020066, + 0x00020066, + }, + { + 0x00020067, + 0x00020067, + 0x00020067, + 0x00020067, + 0x00020068, + 0x00020068, + 0x00020068, + 0x00020068, + 0x00020069, + 0x00020069, + 0x00020069, + 0x00020069, + 0x0002006a, + 0x0002006a, + 0x0002006a, + 0x0002006a, + }, + { + 0x0002006b, + 0x0002006b, + 0x0002006b, + 0x0002006b, + 0x0002006c, + 0x0002006c, + 0x0002006c, + 0x0002006c, + 0x0002006d, + 0x0002006d, + 0x0002006d, + 0x0002006d, + 0x0002006e, + 0x0002006e, + 0x0002006e, + 0x0002006e, + }, + { + 0x0002006f, + 0x0002006f, + 0x0002006f, + 0x0002006f, + 0x00020070, + 0x00020070, + 0x00020070, + 0x00020070, + 0x00020071, + 0x00020071, + 0x00020071, + 0x00020071, + 0x00020072, + 0x00020072, + 0x00020072, + 0x00020072, + }, + { + 0x00020073, + 0x00020073, + 0x00020073, + 0x00020073, + 0x00020074, + 0x00020074, + 0x00020074, + 0x00020074, + 0x00020075, + 0x00020075, + 0x00020075, + 0x00020075, + 0x00020076, + 0x00020076, + 0x00020076, + 0x00020076, + }, + { + 0x00020077, + 0x00020077, + 0x00020077, + 0x00020077, + 0x00020078, + 0x00020078, + 0x00020078, + 0x00020078, + 0x00020079, + 0x00020079, + 0x00020079, + 0x00020079, + 0x0002007a, + 0x0002007a, + 0x0002007a, + 0x0002007a, + }, + { + 0x0002007b, + 0x0002007b, + 0x0002007b, + 0x0002007b, + 0x0002007c, + 0x0002007c, + 0x0002007c, + 0x0002007c, + 0x0002007d, + 0x0002007d, + 0x0002007d, + 0x0002007d, + 0x0002007e, + 0x0002007e, + 0x0002007e, + 0x0002007e, + }, +}; +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc62[153][2] = +#else +const uint16_t c_aauiCQMFHuffEnc62[153][2] = +#endif + { + { 0x0004, 0x0009 }, + { 0x0003, 0x0006 }, + { 0x0003, 0x0007 }, + { 0x0004, 0x000a }, + { 0x0004, 0x000b }, + { 0x0005, 0x000a }, + { 0x0005, 0x000b }, + { 0x0005, 0x000c }, + { 0x0005, 0x000d }, + { 0x0005, 0x000e }, + { 0x0005, 0x000f }, + { 0x0005, 0x0010 }, + { 0x0005, 0x0011 }, + { 0x0006, 0x000a }, + { 0x0006, 0x000b }, + { 0x0006, 0x000c }, + { 0x0006, 0x000d }, + { 0x0006, 0x000e }, + { 0x0006, 0x000f }, + { 0x0006, 0x0010 }, + { 0x0006, 0x0011 }, + { 0x0006, 0x0012 }, + { 0x0006, 0x0013 }, + { 0x0007, 0x0009 }, + { 0x0007, 0x000a }, + { 0x0007, 0x000b }, + { 0x0007, 0x000c }, + { 0x0007, 0x000d }, + { 0x0007, 0x000e }, + { 0x0007, 0x000f }, + { 0x0007, 0x0010 }, + { 0x0007, 0x0011 }, + { 0x0007, 0x0012 }, + { 0x0007, 0x0013 }, + { 0x0008, 0x0009 }, + { 0x0008, 0x000a }, + { 0x0008, 0x000b }, + { 0x0008, 0x000c }, + { 0x0008, 0x000d }, + { 0x0008, 0x000e }, + { 0x0008, 0x000f }, + { 0x0008, 0x0010 }, + { 0x0008, 0x0011 }, + { 0x0009, 0x0007 }, + { 0x0009, 0x0008 }, + { 0x0009, 0x0009 }, + { 0x0009, 0x000a }, + { 0x0009, 0x000b }, + { 0x0009, 0x000c }, + { 0x0009, 0x000d }, + { 0x0009, 0x000e }, + { 0x0009, 0x000f }, + { 0x0009, 0x0010 }, + { 0x0009, 0x0011 }, + { 0x000a, 0x0004 }, + { 0x000a, 0x0005 }, + { 0x000a, 0x0006 }, + { 0x000a, 0x0007 }, + { 0x000a, 0x0008 }, + { 0x000a, 0x0009 }, + { 0x000a, 0x000a }, + { 0x000a, 0x000b }, + { 0x000a, 0x000c }, + { 0x000a, 0x000d }, + { 0x000b, 0x0007 }, + { 0x000c, 0x0007 }, + { 0x000c, 0x0008 }, + { 0x000c, 0x0009 }, + { 0x000c, 0x000a }, + { 0x000c, 0x000b }, + { 0x000c, 0x000c }, + { 0x000d, 0x0007 }, + { 0x000c, 0x000d }, + { 0x000d, 0x0008 }, + { 0x000d, 0x0009 }, + { 0x000d, 0x000a }, + { 0x000d, 0x000b }, + { 0x000e, 0x0008 }, + { 0x000d, 0x000c }, + { 0x000d, 0x000d }, + { 0x000e, 0x0009 }, + { 0x000e, 0x000a }, + { 0x000e, 0x000b }, + { 0x000e, 0x000c }, + { 0x000f, 0x000c }, + { 0x000e, 0x000d }, + { 0x000f, 0x000d }, + { 0x000f, 0x000e }, + { 0x000f, 0x000f }, + { 0x0010, 0x000f }, + { 0x0010, 0x0010 }, + { 0x0011, 0x0019 }, + { 0x0010, 0x0011 }, + { 0x0010, 0x0012 }, + { 0x0010, 0x0013 }, + { 0x0010, 0x0014 }, + { 0x0010, 0x0015 }, + { 0x0012, 0x0000 }, + { 0x0010, 0x0016 }, + { 0x0011, 0x001a }, + { 0x0010, 0x0017 }, + { 0x0012, 0x0001 }, + { 0x0012, 0x0002 }, + { 0x0012, 0x0003 }, + { 0x0011, 0x001b }, + { 0x0012, 0x0004 }, + { 0x0012, 0x0005 }, + { 0x0012, 0x0006 }, + { 0x0012, 0x0007 }, + { 0x0012, 0x0008 }, + { 0x0012, 0x0009 }, + { 0x0012, 0x000a }, + { 0x0012, 0x000b }, + { 0x0012, 0x000c }, + { 0x0012, 0x000d }, + { 0x0012, 0x000e }, + { 0x0012, 0x000f }, + { 0x0012, 0x0010 }, + { 0x0012, 0x0011 }, + { 0x0012, 0x0012 }, + { 0x0012, 0x0013 }, + { 0x0012, 0x0014 }, + { 0x0012, 0x0015 }, + { 0x0012, 0x0016 }, + { 0x0012, 0x0017 }, + { 0x0012, 0x0018 }, + { 0x0011, 0x001c }, + { 0x0012, 0x0019 }, + { 0x0012, 0x001a }, + { 0x0012, 0x001b }, + { 0x0012, 0x001c }, + { 0x0012, 0x001d }, + { 0x0012, 0x001e }, + { 0x0012, 0x001f }, + { 0x0012, 0x0020 }, + { 0x0012, 0x0021 }, + { 0x0012, 0x0022 }, + { 0x0012, 0x0023 }, + { 0x0012, 0x0024 }, + { 0x0012, 0x0025 }, + { 0x0012, 0x0026 }, + { 0x0012, 0x0027 }, + { 0x0012, 0x0028 }, + { 0x0012, 0x0029 }, + { 0x0012, 0x002a }, + { 0x0012, 0x002b }, + { 0x0012, 0x002c }, + { 0x0012, 0x002d }, + { 0x0012, 0x002e }, + { 0x0012, 0x002f }, + { 0x0012, 0x0030 }, + { 0x0012, 0x0031 }, + { 0x0011, 0x001d }, + + }; +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec62[41][16] = { + { + 0x0009ffff, + 0x0008ffff, + 0x0005ffff, + 0x0006ffff, + 0x0007ffff, + 0x0001ffff, + 0x0002ffff, + 0x0003ffff, + 0x0004ffff, + 0x00000000, + 0x00000003, + 0x00000004, + 0x00010001, + 0x00010001, + 0x00010002, + 0x00010002, + }, + { + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + }, + { + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + 0x00030008, + }, + { + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x00030009, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + 0x0003000a, + }, + { + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000b, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + 0x0003000c, + }, + { + 0x0001001e, + 0x0001001e, + 0x0001001f, + 0x0001001f, + 0x00010020, + 0x00010020, + 0x00010021, + 0x00010021, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000e, + }, + { + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020012, + }, + { + 0x00020013, + 0x00020013, + 0x00020013, + 0x00020013, + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020014, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020015, + 0x00020016, + 0x00020016, + 0x00020016, + 0x00020016, + }, + { + 0x00000029, + 0x0000002a, + 0x00010017, + 0x00010017, + 0x00010018, + 0x00010018, + 0x00010019, + 0x00010019, + 0x0001001a, + 0x0001001a, + 0x0001001b, + 0x0001001b, + 0x0001001c, + 0x0001001c, + 0x0001001d, + 0x0001001d, + }, + { + 0x0012ffff, + 0x0010ffff, + 0x0011ffff, + 0x000affff, + 0x000bffff, + 0x000cffff, + 0x000dffff, + 0x000effff, + 0x000fffff, + 0x00000022, + 0x00000023, + 0x00000024, + 0x00000025, + 0x00000026, + 0x00000027, + 0x00000028, + }, + { + 0x0002003e, + 0x0002003e, + 0x0002003e, + 0x0002003e, + 0x0002003f, + 0x0002003f, + 0x0002003f, + 0x0002003f, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + }, + { + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + }, + { + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + }, + { + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + }, + { + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + }, + { + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + }, + { + 0x00020036, + 0x00020036, + 0x00020036, + 0x00020036, + 0x00020037, + 0x00020037, + 0x00020037, + 0x00020037, + 0x00020038, + 0x00020038, + 0x00020038, + 0x00020038, + 0x00020039, + 0x00020039, + 0x00020039, + 0x00020039, + }, + { + 0x0002003a, + 0x0002003a, + 0x0002003a, + 0x0002003a, + 0x0002003b, + 0x0002003b, + 0x0002003b, + 0x0002003b, + 0x0002003c, + 0x0002003c, + 0x0002003c, + 0x0002003c, + 0x0002003d, + 0x0002003d, + 0x0002003d, + 0x0002003d, + }, + { + 0x0019ffff, + 0x0018ffff, + 0x0017ffff, + 0x0013ffff, + 0x0014ffff, + 0x0015ffff, + 0x0016ffff, + 0x00000041, + 0x00000042, + 0x00000043, + 0x00000044, + 0x00000045, + 0x00000046, + 0x00000048, + 0x00010040, + 0x00010040, + }, + { + 0x00020053, + 0x00020053, + 0x00020053, + 0x00020053, + 0x00020055, + 0x00020055, + 0x00020055, + 0x00020055, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + 0x00030047, + }, + { + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x00030049, + 0x0003004a, + 0x0003004a, + 0x0003004a, + 0x0003004a, + 0x0003004a, + 0x0003004a, + 0x0003004a, + 0x0003004a, + }, + { + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004b, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + 0x0003004c, + }, + { + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004e, + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x0003004f, + 0x0003004f, + }, + { + 0x0002004d, + 0x0002004d, + 0x0002004d, + 0x0002004d, + 0x00020050, + 0x00020050, + 0x00020050, + 0x00020050, + 0x00020051, + 0x00020051, + 0x00020051, + 0x00020051, + 0x00020052, + 0x00020052, + 0x00020052, + 0x00020052, + }, + { + 0x0000005a, + 0x0000005c, + 0x0000005d, + 0x0000005e, + 0x0000005f, + 0x00000060, + 0x00000062, + 0x00000064, + 0x00010054, + 0x00010054, + 0x00010056, + 0x00010056, + 0x00010057, + 0x00010057, + 0x00010058, + 0x00010058, + }, + { + 0x001dffff, + 0x001effff, + 0x001fffff, + 0x0020ffff, + 0x0021ffff, + 0x0022ffff, + 0x0023ffff, + 0x0024ffff, + 0x0025ffff, + 0x0026ffff, + 0x0027ffff, + 0x0028ffff, + 0x001affff, + 0x001bffff, + 0x001cffff, + 0x00000059, + }, + { + 0x00020096, + 0x00020096, + 0x00020096, + 0x00020096, + 0x00020097, + 0x00020097, + 0x00020097, + 0x00020097, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + 0x0003005b, + }, + { + 0x00030063, + 0x00030063, + 0x00030063, + 0x00030063, + 0x00030063, + 0x00030063, + 0x00030063, + 0x00030063, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + 0x00030068, + }, + { + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x0003007e, + 0x00030098, + 0x00030098, + 0x00030098, + 0x00030098, + 0x00030098, + 0x00030098, + 0x00030098, + 0x00030098, + }, + { + 0x00020061, + 0x00020061, + 0x00020061, + 0x00020061, + 0x00020065, + 0x00020065, + 0x00020065, + 0x00020065, + 0x00020066, + 0x00020066, + 0x00020066, + 0x00020066, + 0x00020067, + 0x00020067, + 0x00020067, + 0x00020067, + }, + { + 0x00020069, + 0x00020069, + 0x00020069, + 0x00020069, + 0x0002006a, + 0x0002006a, + 0x0002006a, + 0x0002006a, + 0x0002006b, + 0x0002006b, + 0x0002006b, + 0x0002006b, + 0x0002006c, + 0x0002006c, + 0x0002006c, + 0x0002006c, + }, + { + 0x0002006d, + 0x0002006d, + 0x0002006d, + 0x0002006d, + 0x0002006e, + 0x0002006e, + 0x0002006e, + 0x0002006e, + 0x0002006f, + 0x0002006f, + 0x0002006f, + 0x0002006f, + 0x00020070, + 0x00020070, + 0x00020070, + 0x00020070, + }, + { + 0x00020071, + 0x00020071, + 0x00020071, + 0x00020071, + 0x00020072, + 0x00020072, + 0x00020072, + 0x00020072, + 0x00020073, + 0x00020073, + 0x00020073, + 0x00020073, + 0x00020074, + 0x00020074, + 0x00020074, + 0x00020074, + }, + { + 0x00020075, + 0x00020075, + 0x00020075, + 0x00020075, + 0x00020076, + 0x00020076, + 0x00020076, + 0x00020076, + 0x00020077, + 0x00020077, + 0x00020077, + 0x00020077, + 0x00020078, + 0x00020078, + 0x00020078, + 0x00020078, + }, + { + 0x00020079, + 0x00020079, + 0x00020079, + 0x00020079, + 0x0002007a, + 0x0002007a, + 0x0002007a, + 0x0002007a, + 0x0002007b, + 0x0002007b, + 0x0002007b, + 0x0002007b, + 0x0002007c, + 0x0002007c, + 0x0002007c, + 0x0002007c, + }, + { + 0x0002007d, + 0x0002007d, + 0x0002007d, + 0x0002007d, + 0x0002007f, + 0x0002007f, + 0x0002007f, + 0x0002007f, + 0x00020080, + 0x00020080, + 0x00020080, + 0x00020080, + 0x00020081, + 0x00020081, + 0x00020081, + 0x00020081, + }, + { + 0x00020082, + 0x00020082, + 0x00020082, + 0x00020082, + 0x00020083, + 0x00020083, + 0x00020083, + 0x00020083, + 0x00020084, + 0x00020084, + 0x00020084, + 0x00020084, + 0x00020085, + 0x00020085, + 0x00020085, + 0x00020085, + }, + { + 0x00020086, + 0x00020086, + 0x00020086, + 0x00020086, + 0x00020087, + 0x00020087, + 0x00020087, + 0x00020087, + 0x00020088, + 0x00020088, + 0x00020088, + 0x00020088, + 0x00020089, + 0x00020089, + 0x00020089, + 0x00020089, + }, + { + 0x0002008a, + 0x0002008a, + 0x0002008a, + 0x0002008a, + 0x0002008b, + 0x0002008b, + 0x0002008b, + 0x0002008b, + 0x0002008c, + 0x0002008c, + 0x0002008c, + 0x0002008c, + 0x0002008d, + 0x0002008d, + 0x0002008d, + 0x0002008d, + }, + { + 0x0002008e, + 0x0002008e, + 0x0002008e, + 0x0002008e, + 0x0002008f, + 0x0002008f, + 0x0002008f, + 0x0002008f, + 0x00020090, + 0x00020090, + 0x00020090, + 0x00020090, + 0x00020091, + 0x00020091, + 0x00020091, + 0x00020091, + }, + { + 0x00020092, + 0x00020092, + 0x00020092, + 0x00020092, + 0x00020093, + 0x00020093, + 0x00020093, + 0x00020093, + 0x00020094, + 0x00020094, + 0x00020094, + 0x00020094, + 0x00020095, + 0x00020095, + 0x00020095, + 0x00020095, + }, +}; +#endif +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffEnc63[181][2] = +#else +const uint16_t c_aauiCQMFHuffEnc63[181][2] = +#endif + { + { 0x0004, 0x0008 }, + { 0x0003, 0x0005 }, + { 0x0002, 0x0003 }, + { 0x0004, 0x0009 }, + { 0x0005, 0x000c }, + { 0x0005, 0x000d }, + { 0x0005, 0x000e }, + { 0x0005, 0x000f }, + { 0x0006, 0x000c }, + { 0x0006, 0x000d }, + { 0x0006, 0x000e }, + { 0x0006, 0x000f }, + { 0x0006, 0x0010 }, + { 0x0006, 0x0011 }, + { 0x0006, 0x0012 }, + { 0x0006, 0x0013 }, + { 0x0006, 0x0014 }, + { 0x0006, 0x0015 }, + { 0x0006, 0x0016 }, + { 0x0006, 0x0017 }, + { 0x0007, 0x000b }, + { 0x0007, 0x000c }, + { 0x0007, 0x000d }, + { 0x0007, 0x000e }, + { 0x0007, 0x000f }, + { 0x0007, 0x0010 }, + { 0x0007, 0x0011 }, + { 0x0007, 0x0012 }, + { 0x0007, 0x0013 }, + { 0x0007, 0x0014 }, + { 0x0007, 0x0015 }, + { 0x0007, 0x0016 }, + { 0x0007, 0x0017 }, + { 0x0008, 0x000c }, + { 0x0008, 0x000d }, + { 0x0008, 0x000e }, + { 0x0008, 0x000f }, + { 0x0008, 0x0010 }, + { 0x0008, 0x0011 }, + { 0x0008, 0x0012 }, + { 0x0008, 0x0013 }, + { 0x0008, 0x0014 }, + { 0x0008, 0x0015 }, + { 0x0009, 0x0008 }, + { 0x0009, 0x0009 }, + { 0x0009, 0x000a }, + { 0x0009, 0x000b }, + { 0x0009, 0x000c }, + { 0x0009, 0x000d }, + { 0x0009, 0x000e }, + { 0x0009, 0x000f }, + { 0x0009, 0x0010 }, + { 0x0009, 0x0011 }, + { 0x0009, 0x0012 }, + { 0x0009, 0x0013 }, + { 0x0009, 0x0014 }, + { 0x0009, 0x0015 }, + { 0x000a, 0x0007 }, + { 0x0009, 0x0016 }, + { 0x0009, 0x0017 }, + { 0x000a, 0x0008 }, + { 0x000a, 0x0009 }, + { 0x000a, 0x000a }, + { 0x000a, 0x000b }, + { 0x000a, 0x000c }, + { 0x000a, 0x000d }, + { 0x000a, 0x000e }, + { 0x000b, 0x0008 }, + { 0x000b, 0x0009 }, + { 0x000b, 0x000a }, + { 0x000a, 0x000f }, + { 0x000b, 0x000b }, + { 0x000b, 0x000c }, + { 0x000b, 0x000d }, + { 0x000c, 0x0009 }, + { 0x000c, 0x000a }, + { 0x000c, 0x000b }, + { 0x000c, 0x000c }, + { 0x000c, 0x000d }, + { 0x000c, 0x000e }, + { 0x000c, 0x000f }, + { 0x000d, 0x0008 }, + { 0x000d, 0x0009 }, + { 0x000d, 0x000a }, + { 0x000d, 0x000b }, + { 0x000d, 0x000c }, + { 0x000d, 0x000d }, + { 0x000d, 0x000e }, + { 0x000d, 0x000f }, + { 0x000d, 0x0010 }, + { 0x000d, 0x0011 }, + { 0x000e, 0x0007 }, + { 0x000e, 0x0008 }, + { 0x000e, 0x0009 }, + { 0x000e, 0x000a }, + { 0x000e, 0x000b }, + { 0x000e, 0x000c }, + { 0x000e, 0x000d }, + { 0x000e, 0x000e }, + { 0x000e, 0x000f }, + { 0x000f, 0x0008 }, + { 0x000f, 0x0009 }, + { 0x000f, 0x000a }, + { 0x000f, 0x000b }, + { 0x000f, 0x000c }, + { 0x0010, 0x0009 }, + { 0x0010, 0x000a }, + { 0x000f, 0x000d }, + { 0x0010, 0x000b }, + { 0x0010, 0x000c }, + { 0x0010, 0x000d }, + { 0x0011, 0x000e }, + { 0x0011, 0x000f }, + { 0x0010, 0x000e }, + { 0x0011, 0x0010 }, + { 0x0011, 0x0011 }, + { 0x0012, 0x0014 }, + { 0x0014, 0x0000 }, + { 0x0010, 0x000f }, + { 0x0012, 0x0015 }, + { 0x0012, 0x0016 }, + { 0x0014, 0x0001 }, + { 0x0012, 0x0017 }, + { 0x0012, 0x0018 }, + { 0x0012, 0x0019 }, + { 0x0013, 0x0010 }, + { 0x0012, 0x001a }, + { 0x0014, 0x0002 }, + { 0x0012, 0x001b }, + { 0x0014, 0x0003 }, + { 0x0014, 0x0004 }, + { 0x0014, 0x0005 }, + { 0x0013, 0x0011 }, + { 0x0014, 0x0006 }, + { 0x0013, 0x0012 }, + { 0x0014, 0x0007 }, + { 0x0014, 0x0008 }, + { 0x0014, 0x0009 }, + { 0x0014, 0x000a }, + { 0x0014, 0x000b }, + { 0x0014, 0x000c }, + { 0x0014, 0x000d }, + { 0x0014, 0x000e }, + { 0x0013, 0x0013 }, + { 0x0014, 0x000f }, + { 0x0014, 0x0010 }, + { 0x0014, 0x0011 }, + { 0x0014, 0x0012 }, + { 0x0014, 0x0013 }, + { 0x0014, 0x0014 }, + { 0x0014, 0x0015 }, + { 0x0014, 0x0016 }, + { 0x0014, 0x0017 }, + { 0x0014, 0x0018 }, + { 0x0014, 0x0019 }, + { 0x0014, 0x001a }, + { 0x0014, 0x001b }, + { 0x0014, 0x001c }, + { 0x0014, 0x001d }, + { 0x0014, 0x001e }, + { 0x0014, 0x001f }, + { 0x0013, 0x0014 }, + { 0x0013, 0x0015 }, + { 0x0013, 0x0016 }, + { 0x0013, 0x0017 }, + { 0x0013, 0x0018 }, + { 0x0013, 0x0019 }, + { 0x0013, 0x001a }, + { 0x0013, 0x001b }, + { 0x0013, 0x001c }, + { 0x0013, 0x001d }, + { 0x0013, 0x001e }, + { 0x0013, 0x001f }, + { 0x0013, 0x0020 }, + { 0x0013, 0x0021 }, + { 0x0013, 0x0022 }, + { 0x0013, 0x0023 }, + { 0x0013, 0x0024 }, + { 0x0013, 0x0025 }, + { 0x0013, 0x0026 }, + { 0x0013, 0x0027 }, + + }; +#ifndef ROM_TO_RAM +const uint32_t c_aauiCQMFHuffDec63[39][16] = { + { + 0x0008ffff, + 0x0006ffff, + 0x0007ffff, + 0x0003ffff, + 0x0004ffff, + 0x0005ffff, + 0x0001ffff, + 0x0002ffff, + 0x00000000, + 0x00000003, + 0x00010001, + 0x00010001, + 0x00020002, + 0x00020002, + 0x00020002, + 0x00020002, + }, + { + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030004, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + 0x00030005, + }, + { + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030006, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + 0x00030007, + }, + { + 0x00020008, + 0x00020008, + 0x00020008, + 0x00020008, + 0x00020009, + 0x00020009, + 0x00020009, + 0x00020009, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000a, + 0x0002000b, + 0x0002000b, + 0x0002000b, + 0x0002000b, + }, + { + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000c, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000d, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000e, + 0x0002000f, + 0x0002000f, + 0x0002000f, + 0x0002000f, + }, + { + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020010, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020011, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020012, + 0x00020013, + 0x00020013, + 0x00020013, + 0x00020013, + }, + { + 0x00000025, + 0x00000026, + 0x00000027, + 0x00000028, + 0x00000029, + 0x0000002a, + 0x00010014, + 0x00010014, + 0x00010015, + 0x00010015, + 0x00010016, + 0x00010016, + 0x00010017, + 0x00010017, + 0x00010018, + 0x00010018, + }, + { + 0x00010019, + 0x00010019, + 0x0001001a, + 0x0001001a, + 0x0001001b, + 0x0001001b, + 0x0001001c, + 0x0001001c, + 0x0001001d, + 0x0001001d, + 0x0001001e, + 0x0001001e, + 0x0001001f, + 0x0001001f, + 0x00010020, + 0x00010020, + }, + { + 0x0014ffff, + 0x0011ffff, + 0x0012ffff, + 0x0013ffff, + 0x0009ffff, + 0x000affff, + 0x000bffff, + 0x000cffff, + 0x000dffff, + 0x000effff, + 0x000fffff, + 0x0010ffff, + 0x00000021, + 0x00000022, + 0x00000023, + 0x00000024, + }, + { + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002b, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + 0x0003002c, + }, + { + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002d, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + 0x0003002e, + }, + { + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x0003002f, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + 0x00030030, + }, + { + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030031, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + 0x00030032, + }, + { + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030033, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + 0x00030034, + }, + { + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030035, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + 0x00030036, + }, + { + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030037, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + 0x00030038, + }, + { + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003a, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + 0x0003003b, + }, + { + 0x00010043, + 0x00010043, + 0x00010044, + 0x00010044, + 0x00010045, + 0x00010045, + 0x00010047, + 0x00010047, + 0x00010048, + 0x00010048, + 0x00010049, + 0x00010049, + 0x00020039, + 0x00020039, + 0x00020039, + 0x00020039, + }, + { + 0x0002003c, + 0x0002003c, + 0x0002003c, + 0x0002003c, + 0x0002003d, + 0x0002003d, + 0x0002003d, + 0x0002003d, + 0x0002003e, + 0x0002003e, + 0x0002003e, + 0x0002003e, + 0x0002003f, + 0x0002003f, + 0x0002003f, + 0x0002003f, + }, + { + 0x00020040, + 0x00020040, + 0x00020040, + 0x00020040, + 0x00020041, + 0x00020041, + 0x00020041, + 0x00020041, + 0x00020042, + 0x00020042, + 0x00020042, + 0x00020042, + 0x00020046, + 0x00020046, + 0x00020046, + 0x00020046, + }, + { + 0x001dffff, + 0x001affff, + 0x001bffff, + 0x001cffff, + 0x0015ffff, + 0x0016ffff, + 0x0017ffff, + 0x0018ffff, + 0x0019ffff, + 0x0000004a, + 0x0000004b, + 0x0000004c, + 0x0000004d, + 0x0000004e, + 0x0000004f, + 0x00000050, + }, + { + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030051, + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030052, + 0x00030052, + }, + { + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030053, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + 0x00030054, + }, + { + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030055, + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030056, + 0x00030056, + }, + { + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030057, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + 0x00030058, + }, + { + 0x00030059, + 0x00030059, + 0x00030059, + 0x00030059, + 0x00030059, + 0x00030059, + 0x00030059, + 0x00030059, + 0x0003005a, + 0x0003005a, + 0x0003005a, + 0x0003005a, + 0x0003005a, + 0x0003005a, + 0x0003005a, + 0x0003005a, + }, + { + 0x00010064, + 0x00010064, + 0x00010065, + 0x00010065, + 0x00010066, + 0x00010066, + 0x00010067, + 0x00010067, + 0x00010068, + 0x00010068, + 0x0001006b, + 0x0001006b, + 0x0002005b, + 0x0002005b, + 0x0002005b, + 0x0002005b, + }, + { + 0x0002005c, + 0x0002005c, + 0x0002005c, + 0x0002005c, + 0x0002005d, + 0x0002005d, + 0x0002005d, + 0x0002005d, + 0x0002005e, + 0x0002005e, + 0x0002005e, + 0x0002005e, + 0x0002005f, + 0x0002005f, + 0x0002005f, + 0x0002005f, + }, + { + 0x00020060, + 0x00020060, + 0x00020060, + 0x00020060, + 0x00020061, + 0x00020061, + 0x00020061, + 0x00020061, + 0x00020062, + 0x00020062, + 0x00020062, + 0x00020062, + 0x00020063, + 0x00020063, + 0x00020063, + 0x00020063, + }, + { + 0x0026ffff, + 0x0025ffff, + 0x0022ffff, + 0x0023ffff, + 0x0024ffff, + 0x0020ffff, + 0x0021ffff, + 0x001effff, + 0x001fffff, + 0x00000069, + 0x0000006a, + 0x0000006c, + 0x0000006d, + 0x0000006e, + 0x00000071, + 0x00000076, + }, + { + 0x0003006f, + 0x0003006f, + 0x0003006f, + 0x0003006f, + 0x0003006f, + 0x0003006f, + 0x0003006f, + 0x0003006f, + 0x00030070, + 0x00030070, + 0x00030070, + 0x00030070, + 0x00030070, + 0x00030070, + 0x00030070, + 0x00030070, + }, + { + 0x00030072, + 0x00030072, + 0x00030072, + 0x00030072, + 0x00030072, + 0x00030072, + 0x00030072, + 0x00030072, + 0x00030073, + 0x00030073, + 0x00030073, + 0x00030073, + 0x00030073, + 0x00030073, + 0x00030073, + 0x00030073, + }, + { + 0x00020074, + 0x00020074, + 0x00020074, + 0x00020074, + 0x00020077, + 0x00020077, + 0x00020077, + 0x00020077, + 0x00020078, + 0x00020078, + 0x00020078, + 0x00020078, + 0x0002007a, + 0x0002007a, + 0x0002007a, + 0x0002007a, + }, + { + 0x0002007b, + 0x0002007b, + 0x0002007b, + 0x0002007b, + 0x0002007c, + 0x0002007c, + 0x0002007c, + 0x0002007c, + 0x0002007e, + 0x0002007e, + 0x0002007e, + 0x0002007e, + 0x00020080, + 0x00020080, + 0x00020080, + 0x00020080, + }, + { + 0x0001007d, + 0x0001007d, + 0x00010084, + 0x00010084, + 0x00010086, + 0x00010086, + 0x0001008f, + 0x0001008f, + 0x000100a1, + 0x000100a1, + 0x000100a2, + 0x000100a2, + 0x000100a3, + 0x000100a3, + 0x000100a4, + 0x000100a4, + }, + { + 0x000100a5, + 0x000100a5, + 0x000100a6, + 0x000100a6, + 0x000100a7, + 0x000100a7, + 0x000100a8, + 0x000100a8, + 0x000100a9, + 0x000100a9, + 0x000100aa, + 0x000100aa, + 0x000100ab, + 0x000100ab, + 0x000100ac, + 0x000100ac, + }, + { + 0x000100ad, + 0x000100ad, + 0x000100ae, + 0x000100ae, + 0x000100af, + 0x000100af, + 0x000100b0, + 0x000100b0, + 0x000100b1, + 0x000100b1, + 0x000100b2, + 0x000100b2, + 0x000100b3, + 0x000100b3, + 0x000100b4, + 0x000100b4, + }, + { + 0x00000091, + 0x00000092, + 0x00000093, + 0x00000094, + 0x00000095, + 0x00000096, + 0x00000097, + 0x00000098, + 0x00000099, + 0x0000009a, + 0x0000009b, + 0x0000009c, + 0x0000009d, + 0x0000009e, + 0x0000009f, + 0x000000a0, + }, + { + 0x00000075, + 0x00000079, + 0x0000007f, + 0x00000081, + 0x00000082, + 0x00000083, + 0x00000085, + 0x00000087, + 0x00000088, + 0x00000089, + 0x0000008a, + 0x0000008b, + 0x0000008c, + 0x0000008d, + 0x0000008e, + 0x00000090, + }, +}; +#endif + +#ifndef ROM_TO_RAM +const uint32_t ( *c_apauiHuffEncTabels[2 * ALLOC_TABLE_SIZE] )[2] = +#else +const uint16_t ( *c_apauiHuffEncTabels[2 * ALLOC_TABLE_SIZE] )[2] = +#endif + { + NULL, + c_aauiCQMFHuffEnc1, + c_aauiCQMFHuffEnc2, + c_aauiCQMFHuffEnc3, + c_aauiCQMFHuffEnc4, + c_aauiCQMFHuffEnc5, + c_aauiCQMFHuffEnc6, + c_aauiCQMFHuffEnc7, + c_aauiCQMFHuffEnc8, + c_aauiCQMFHuffEnc9, + c_aauiCQMFHuffEnc10, + c_aauiCQMFHuffEnc11, + c_aauiCQMFHuffEnc12, + c_aauiCQMFHuffEnc13, + c_aauiCQMFHuffEnc14, + c_aauiCQMFHuffEnc15, + c_aauiCQMFHuffEnc16, + c_aauiCQMFHuffEnc17, + c_aauiCQMFHuffEnc18, + c_aauiCQMFHuffEnc19, + c_aauiCQMFHuffEnc20, + c_aauiCQMFHuffEnc21, + c_aauiCQMFHuffEnc22, + c_aauiCQMFHuffEnc23, + c_aauiCQMFHuffEnc24, + c_aauiCQMFHuffEnc25, + c_aauiCQMFHuffEnc26, + c_aauiCQMFHuffEnc27, + c_aauiCQMFHuffEnc28, + c_aauiCQMFHuffEnc29, + c_aauiCQMFHuffEnc30, + c_aauiCQMFHuffEnc31, + NULL, + c_aauiCQMFHuffEnc33, + c_aauiCQMFHuffEnc34, + c_aauiCQMFHuffEnc35, + c_aauiCQMFHuffEnc36, + c_aauiCQMFHuffEnc37, + c_aauiCQMFHuffEnc38, + c_aauiCQMFHuffEnc39, + c_aauiCQMFHuffEnc40, + c_aauiCQMFHuffEnc41, + c_aauiCQMFHuffEnc42, + c_aauiCQMFHuffEnc43, + c_aauiCQMFHuffEnc44, + c_aauiCQMFHuffEnc45, + c_aauiCQMFHuffEnc46, + c_aauiCQMFHuffEnc47, + c_aauiCQMFHuffEnc48, + c_aauiCQMFHuffEnc49, + c_aauiCQMFHuffEnc50, + c_aauiCQMFHuffEnc51, + c_aauiCQMFHuffEnc52, + c_aauiCQMFHuffEnc53, + c_aauiCQMFHuffEnc54, + c_aauiCQMFHuffEnc55, + c_aauiCQMFHuffEnc56, + c_aauiCQMFHuffEnc57, + c_aauiCQMFHuffEnc58, + c_aauiCQMFHuffEnc59, + c_aauiCQMFHuffEnc60, + c_aauiCQMFHuffEnc61, + c_aauiCQMFHuffEnc62, + c_aauiCQMFHuffEnc63, + }; +#ifndef ROM_TO_RAM +const uint32_t ( *c_apauiHuffDecTables[2 * ALLOC_TABLE_SIZE] )[HUFF_DEC_TABLE_SIZE] = { + NULL, + c_aauiCQMFHuffDec1, + c_aauiCQMFHuffDec2, + c_aauiCQMFHuffDec3, + c_aauiCQMFHuffDec4, + c_aauiCQMFHuffDec5, + c_aauiCQMFHuffDec6, + c_aauiCQMFHuffDec7, + c_aauiCQMFHuffDec8, + c_aauiCQMFHuffDec9, + c_aauiCQMFHuffDec10, + c_aauiCQMFHuffDec11, + c_aauiCQMFHuffDec12, + c_aauiCQMFHuffDec13, + c_aauiCQMFHuffDec14, + c_aauiCQMFHuffDec15, + c_aauiCQMFHuffDec16, + c_aauiCQMFHuffDec17, + c_aauiCQMFHuffDec18, + c_aauiCQMFHuffDec19, + c_aauiCQMFHuffDec20, + c_aauiCQMFHuffDec21, + c_aauiCQMFHuffDec22, + c_aauiCQMFHuffDec23, + c_aauiCQMFHuffDec24, + c_aauiCQMFHuffDec25, + c_aauiCQMFHuffDec26, + c_aauiCQMFHuffDec27, + c_aauiCQMFHuffDec28, + c_aauiCQMFHuffDec29, + c_aauiCQMFHuffDec30, + c_aauiCQMFHuffDec31, + NULL, + c_aauiCQMFHuffDec33, + c_aauiCQMFHuffDec34, + c_aauiCQMFHuffDec35, + c_aauiCQMFHuffDec36, + c_aauiCQMFHuffDec37, + c_aauiCQMFHuffDec38, + c_aauiCQMFHuffDec39, + c_aauiCQMFHuffDec40, + c_aauiCQMFHuffDec41, + c_aauiCQMFHuffDec42, + c_aauiCQMFHuffDec43, + c_aauiCQMFHuffDec44, + c_aauiCQMFHuffDec45, + c_aauiCQMFHuffDec46, + c_aauiCQMFHuffDec47, + c_aauiCQMFHuffDec48, + c_aauiCQMFHuffDec49, + c_aauiCQMFHuffDec50, + c_aauiCQMFHuffDec51, + c_aauiCQMFHuffDec52, + c_aauiCQMFHuffDec53, + c_aauiCQMFHuffDec54, + c_aauiCQMFHuffDec55, + c_aauiCQMFHuffDec56, + c_aauiCQMFHuffDec57, + c_aauiCQMFHuffDec58, + c_aauiCQMFHuffDec59, + c_aauiCQMFHuffDec60, + c_aauiCQMFHuffDec61, + c_aauiCQMFHuffDec62, + c_aauiCQMFHuffDec63, +}; +#else +const uint32_t num_row_aauiCQMFHuff[2 * ALLOC_TABLE_SIZE] = { 0, 16, 16, 25, 36, 36, 49, 64, 81, 100, + 169, 196, 289, 324, 400, 576, 729, 729, 28, 29, + 32, 37, 39, 46, 55, 65, 77, 91, 109, 129, + 153, 181, 0, 16, 16, 25, 36, 36, 49, 64, 81, + 100, 169, 196, 289, 324, 400, 576, 729, 729, 28, + 29, 32, 37, 39, 46, 55, 65, 77, 91, 109, + 129, 153, 181 }; +#endif +#ifdef USE_DEMOD_TABLES +const int32_t c_aaiHuffDemod1[16][2] = { + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 3, + 1, + 0, + 1, + 1, + 1, + 2, + 1, + 3, + 2, + 0, + 2, + 1, + 2, + 2, + 2, + 3, + 3, + 0, + 3, + 1, + 3, + 2, + 3, + 3, +}; + +const int32_t c_aaiHuffDemod2[16][2] = { + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 3, + 1, + 0, + 1, + 1, + 1, + 2, + 1, + 3, + 2, + 0, + 2, + 1, + 2, + 2, + 2, + 3, + 3, + 0, + 3, + 1, + 3, + 2, + 3, + 3, +}; + +const int32_t c_aaiHuffDemod3[25][2] = { + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 3, + 0, + 4, + 1, + 0, + 1, + 1, + 1, + 2, + 1, + 3, + 1, + 4, + 2, + 0, + 2, + 1, + 2, + 2, + 2, + 3, + 2, + 4, + 3, + 0, + 3, + 1, + 3, + 2, + 3, + 3, + 3, + 4, + 4, + 0, + 4, + 1, + 4, + 2, + 4, + 3, + 4, + 4, +}; + +const int32_t c_aaiHuffDemod4[36][2] = { + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 3, + 0, + 4, + 0, + 5, + 1, + 0, + 1, + 1, + 1, + 2, + 1, + 3, + 1, + 4, + 1, + 5, + 2, + 0, + 2, + 1, + 2, + 2, + 2, + 3, + 2, + 4, + 2, + 5, + 3, + 0, + 3, + 1, + 3, + 2, + 3, + 3, + 3, + 4, + 3, + 5, + 4, + 0, + 4, + 1, + 4, + 2, + 4, + 3, + 4, + 4, + 4, + 5, + 5, + 0, + 5, + 1, + 5, + 2, + 5, + 3, + 5, + 4, + 5, + 5, +}; + +const int32_t c_aaiHuffDemod5[36][2] = { + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 3, + 0, + 4, + 0, + 5, + 1, + 0, + 1, + 1, + 1, + 2, + 1, + 3, + 1, + 4, + 1, + 5, + 2, + 0, + 2, + 1, + 2, + 2, + 2, + 3, + 2, + 4, + 2, + 5, + 3, + 0, + 3, + 1, + 3, + 2, + 3, + 3, + 3, + 4, + 3, + 5, + 4, + 0, + 4, + 1, + 4, + 2, + 4, + 3, + 4, + 4, + 4, + 5, + 5, + 0, + 5, + 1, + 5, + 2, + 5, + 3, + 5, + 4, + 5, + 5, +}; + +const int32_t c_aaiHuffDemod6[49][2] = { + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 3, + 0, + 4, + 0, + 5, + 0, + 6, + 1, + 0, + 1, + 1, + 1, + 2, + 1, + 3, + 1, + 4, + 1, + 5, + 1, + 6, + 2, + 0, + 2, + 1, + 2, + 2, + 2, + 3, + 2, + 4, + 2, + 5, + 2, + 6, + 3, + 0, + 3, + 1, + 3, + 2, + 3, + 3, + 3, + 4, + 3, + 5, + 3, + 6, + 4, + 0, + 4, + 1, + 4, + 2, + 4, + 3, + 4, + 4, + 4, + 5, + 4, + 6, + 5, + 0, + 5, + 1, + 5, + 2, + 5, + 3, + 5, + 4, + 5, + 5, + 5, + 6, + 6, + 0, + 6, + 1, + 6, + 2, + 6, + 3, + 6, + 4, + 6, + 5, + 6, + 6, +}; + +const int32_t c_aaiHuffDemod7[64][2] = { + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 3, + 0, + 4, + 0, + 5, + 0, + 6, + 0, + 7, + 1, + 0, + 1, + 1, + 1, + 2, + 1, + 3, + 1, + 4, + 1, + 5, + 1, + 6, + 1, + 7, + 2, + 0, + 2, + 1, + 2, + 2, + 2, + 3, + 2, + 4, + 2, + 5, + 2, + 6, + 2, + 7, + 3, + 0, + 3, + 1, + 3, + 2, + 3, + 3, + 3, + 4, + 3, + 5, + 3, + 6, + 3, + 7, + 4, + 0, + 4, + 1, + 4, + 2, + 4, + 3, + 4, + 4, + 4, + 5, + 4, + 6, + 4, + 7, + 5, + 0, + 5, + 1, + 5, + 2, + 5, + 3, + 5, + 4, + 5, + 5, + 5, + 6, + 5, + 7, + 6, + 0, + 6, + 1, + 6, + 2, + 6, + 3, + 6, + 4, + 6, + 5, + 6, + 6, + 6, + 7, + 7, + 0, + 7, + 1, + 7, + 2, + 7, + 3, + 7, + 4, + 7, + 5, + 7, + 6, + 7, + 7, +}; + +const int32_t c_aaiHuffDemod8[81][2] = { + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 3, + 0, + 4, + 0, + 5, + 0, + 6, + 0, + 7, + 0, + 8, + 1, + 0, + 1, + 1, + 1, + 2, + 1, + 3, + 1, + 4, + 1, + 5, + 1, + 6, + 1, + 7, + 1, + 8, + 2, + 0, + 2, + 1, + 2, + 2, + 2, + 3, + 2, + 4, + 2, + 5, + 2, + 6, + 2, + 7, + 2, + 8, + 3, + 0, + 3, + 1, + 3, + 2, + 3, + 3, + 3, + 4, + 3, + 5, + 3, + 6, + 3, + 7, + 3, + 8, + 4, + 0, + 4, + 1, + 4, + 2, + 4, + 3, + 4, + 4, + 4, + 5, + 4, + 6, + 4, + 7, + 4, + 8, + 5, + 0, + 5, + 1, + 5, + 2, + 5, + 3, + 5, + 4, + 5, + 5, + 5, + 6, + 5, + 7, + 5, + 8, + 6, + 0, + 6, + 1, + 6, + 2, + 6, + 3, + 6, + 4, + 6, + 5, + 6, + 6, + 6, + 7, + 6, + 8, + 7, + 0, + 7, + 1, + 7, + 2, + 7, + 3, + 7, + 4, + 7, + 5, + 7, + 6, + 7, + 7, + 7, + 8, + 8, + 0, + 8, + 1, + 8, + 2, + 8, + 3, + 8, + 4, + 8, + 5, + 8, + 6, + 8, + 7, + 8, + 8, +}; + +const int32_t c_aaiHuffDemod9[100][2] = { + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 3, + 0, + 4, + 0, + 5, + 0, + 6, + 0, + 7, + 0, + 8, + 0, + 9, + 1, + 0, + 1, + 1, + 1, + 2, + 1, + 3, + 1, + 4, + 1, + 5, + 1, + 6, + 1, + 7, + 1, + 8, + 1, + 9, + 2, + 0, + 2, + 1, + 2, + 2, + 2, + 3, + 2, + 4, + 2, + 5, + 2, + 6, + 2, + 7, + 2, + 8, + 2, + 9, + 3, + 0, + 3, + 1, + 3, + 2, + 3, + 3, + 3, + 4, + 3, + 5, + 3, + 6, + 3, + 7, + 3, + 8, + 3, + 9, + 4, + 0, + 4, + 1, + 4, + 2, + 4, + 3, + 4, + 4, + 4, + 5, + 4, + 6, + 4, + 7, + 4, + 8, + 4, + 9, + 5, + 0, + 5, + 1, + 5, + 2, + 5, + 3, + 5, + 4, + 5, + 5, + 5, + 6, + 5, + 7, + 5, + 8, + 5, + 9, + 6, + 0, + 6, + 1, + 6, + 2, + 6, + 3, + 6, + 4, + 6, + 5, + 6, + 6, + 6, + 7, + 6, + 8, + 6, + 9, + 7, + 0, + 7, + 1, + 7, + 2, + 7, + 3, + 7, + 4, + 7, + 5, + 7, + 6, + 7, + 7, + 7, + 8, + 7, + 9, + 8, + 0, + 8, + 1, + 8, + 2, + 8, + 3, + 8, + 4, + 8, + 5, + 8, + 6, + 8, + 7, + 8, + 8, + 8, + 9, + 9, + 0, + 9, + 1, + 9, + 2, + 9, + 3, + 9, + 4, + 9, + 5, + 9, + 6, + 9, + 7, + 9, + 8, + 9, + 9, +}; + +const int32_t c_aaiHuffDemod10[169][2] = { + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 3, + 0, + 4, + 0, + 5, + 0, + 6, + 0, + 7, + 0, + 8, + 0, + 9, + 0, + 10, + 0, + 11, + 0, + 12, + 1, + 0, + 1, + 1, + 1, + 2, + 1, + 3, + 1, + 4, + 1, + 5, + 1, + 6, + 1, + 7, + 1, + 8, + 1, + 9, + 1, + 10, + 1, + 11, + 1, + 12, + 2, + 0, + 2, + 1, + 2, + 2, + 2, + 3, + 2, + 4, + 2, + 5, + 2, + 6, + 2, + 7, + 2, + 8, + 2, + 9, + 2, + 10, + 2, + 11, + 2, + 12, + 3, + 0, + 3, + 1, + 3, + 2, + 3, + 3, + 3, + 4, + 3, + 5, + 3, + 6, + 3, + 7, + 3, + 8, + 3, + 9, + 3, + 10, + 3, + 11, + 3, + 12, + 4, + 0, + 4, + 1, + 4, + 2, + 4, + 3, + 4, + 4, + 4, + 5, + 4, + 6, + 4, + 7, + 4, + 8, + 4, + 9, + 4, + 10, + 4, + 11, + 4, + 12, + 5, + 0, + 5, + 1, + 5, + 2, + 5, + 3, + 5, + 4, + 5, + 5, + 5, + 6, + 5, + 7, + 5, + 8, + 5, + 9, + 5, + 10, + 5, + 11, + 5, + 12, + 6, + 0, + 6, + 1, + 6, + 2, + 6, + 3, + 6, + 4, + 6, + 5, + 6, + 6, + 6, + 7, + 6, + 8, + 6, + 9, + 6, + 10, + 6, + 11, + 6, + 12, + 7, + 0, + 7, + 1, + 7, + 2, + 7, + 3, + 7, + 4, + 7, + 5, + 7, + 6, + 7, + 7, + 7, + 8, + 7, + 9, + 7, + 10, + 7, + 11, + 7, + 12, + 8, + 0, + 8, + 1, + 8, + 2, + 8, + 3, + 8, + 4, + 8, + 5, + 8, + 6, + 8, + 7, + 8, + 8, + 8, + 9, + 8, + 10, + 8, + 11, + 8, + 12, + 9, + 0, + 9, + 1, + 9, + 2, + 9, + 3, + 9, + 4, + 9, + 5, + 9, + 6, + 9, + 7, + 9, + 8, + 9, + 9, + 9, + 10, + 9, + 11, + 9, + 12, + 10, + 0, + 10, + 1, + 10, + 2, + 10, + 3, + 10, + 4, + 10, + 5, + 10, + 6, + 10, + 7, + 10, + 8, + 10, + 9, + 10, + 10, + 10, + 11, + 10, + 12, + 11, + 0, + 11, + 1, + 11, + 2, + 11, + 3, + 11, + 4, + 11, + 5, + 11, + 6, + 11, + 7, + 11, + 8, + 11, + 9, + 11, + 10, + 11, + 11, + 11, + 12, + 12, + 0, + 12, + 1, + 12, + 2, + 12, + 3, + 12, + 4, + 12, + 5, + 12, + 6, + 12, + 7, + 12, + 8, + 12, + 9, + 12, + 10, + 12, + 11, + 12, + 12, +}; + +const int32_t c_aaiHuffDemod11[196][2] = { + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 3, + 0, + 4, + 0, + 5, + 0, + 6, + 0, + 7, + 0, + 8, + 0, + 9, + 0, + 10, + 0, + 11, + 0, + 12, + 0, + 13, + 1, + 0, + 1, + 1, + 1, + 2, + 1, + 3, + 1, + 4, + 1, + 5, + 1, + 6, + 1, + 7, + 1, + 8, + 1, + 9, + 1, + 10, + 1, + 11, + 1, + 12, + 1, + 13, + 2, + 0, + 2, + 1, + 2, + 2, + 2, + 3, + 2, + 4, + 2, + 5, + 2, + 6, + 2, + 7, + 2, + 8, + 2, + 9, + 2, + 10, + 2, + 11, + 2, + 12, + 2, + 13, + 3, + 0, + 3, + 1, + 3, + 2, + 3, + 3, + 3, + 4, + 3, + 5, + 3, + 6, + 3, + 7, + 3, + 8, + 3, + 9, + 3, + 10, + 3, + 11, + 3, + 12, + 3, + 13, + 4, + 0, + 4, + 1, + 4, + 2, + 4, + 3, + 4, + 4, + 4, + 5, + 4, + 6, + 4, + 7, + 4, + 8, + 4, + 9, + 4, + 10, + 4, + 11, + 4, + 12, + 4, + 13, + 5, + 0, + 5, + 1, + 5, + 2, + 5, + 3, + 5, + 4, + 5, + 5, + 5, + 6, + 5, + 7, + 5, + 8, + 5, + 9, + 5, + 10, + 5, + 11, + 5, + 12, + 5, + 13, + 6, + 0, + 6, + 1, + 6, + 2, + 6, + 3, + 6, + 4, + 6, + 5, + 6, + 6, + 6, + 7, + 6, + 8, + 6, + 9, + 6, + 10, + 6, + 11, + 6, + 12, + 6, + 13, + 7, + 0, + 7, + 1, + 7, + 2, + 7, + 3, + 7, + 4, + 7, + 5, + 7, + 6, + 7, + 7, + 7, + 8, + 7, + 9, + 7, + 10, + 7, + 11, + 7, + 12, + 7, + 13, + 8, + 0, + 8, + 1, + 8, + 2, + 8, + 3, + 8, + 4, + 8, + 5, + 8, + 6, + 8, + 7, + 8, + 8, + 8, + 9, + 8, + 10, + 8, + 11, + 8, + 12, + 8, + 13, + 9, + 0, + 9, + 1, + 9, + 2, + 9, + 3, + 9, + 4, + 9, + 5, + 9, + 6, + 9, + 7, + 9, + 8, + 9, + 9, + 9, + 10, + 9, + 11, + 9, + 12, + 9, + 13, + 10, + 0, + 10, + 1, + 10, + 2, + 10, + 3, + 10, + 4, + 10, + 5, + 10, + 6, + 10, + 7, + 10, + 8, + 10, + 9, + 10, + 10, + 10, + 11, + 10, + 12, + 10, + 13, + 11, + 0, + 11, + 1, + 11, + 2, + 11, + 3, + 11, + 4, + 11, + 5, + 11, + 6, + 11, + 7, + 11, + 8, + 11, + 9, + 11, + 10, + 11, + 11, + 11, + 12, + 11, + 13, + 12, + 0, + 12, + 1, + 12, + 2, + 12, + 3, + 12, + 4, + 12, + 5, + 12, + 6, + 12, + 7, + 12, + 8, + 12, + 9, + 12, + 10, + 12, + 11, + 12, + 12, + 12, + 13, + 13, + 0, + 13, + 1, + 13, + 2, + 13, + 3, + 13, + 4, + 13, + 5, + 13, + 6, + 13, + 7, + 13, + 8, + 13, + 9, + 13, + 10, + 13, + 11, + 13, + 12, + 13, + 13, +}; + +const int32_t c_aaiHuffDemod12[289][2] = { + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 3, + 0, + 4, + 0, + 5, + 0, + 6, + 0, + 7, + 0, + 8, + 0, + 9, + 0, + 10, + 0, + 11, + 0, + 12, + 0, + 13, + 0, + 14, + 0, + 15, + 0, + 16, + 1, + 0, + 1, + 1, + 1, + 2, + 1, + 3, + 1, + 4, + 1, + 5, + 1, + 6, + 1, + 7, + 1, + 8, + 1, + 9, + 1, + 10, + 1, + 11, + 1, + 12, + 1, + 13, + 1, + 14, + 1, + 15, + 1, + 16, + 2, + 0, + 2, + 1, + 2, + 2, + 2, + 3, + 2, + 4, + 2, + 5, + 2, + 6, + 2, + 7, + 2, + 8, + 2, + 9, + 2, + 10, + 2, + 11, + 2, + 12, + 2, + 13, + 2, + 14, + 2, + 15, + 2, + 16, + 3, + 0, + 3, + 1, + 3, + 2, + 3, + 3, + 3, + 4, + 3, + 5, + 3, + 6, + 3, + 7, + 3, + 8, + 3, + 9, + 3, + 10, + 3, + 11, + 3, + 12, + 3, + 13, + 3, + 14, + 3, + 15, + 3, + 16, + 4, + 0, + 4, + 1, + 4, + 2, + 4, + 3, + 4, + 4, + 4, + 5, + 4, + 6, + 4, + 7, + 4, + 8, + 4, + 9, + 4, + 10, + 4, + 11, + 4, + 12, + 4, + 13, + 4, + 14, + 4, + 15, + 4, + 16, + 5, + 0, + 5, + 1, + 5, + 2, + 5, + 3, + 5, + 4, + 5, + 5, + 5, + 6, + 5, + 7, + 5, + 8, + 5, + 9, + 5, + 10, + 5, + 11, + 5, + 12, + 5, + 13, + 5, + 14, + 5, + 15, + 5, + 16, + 6, + 0, + 6, + 1, + 6, + 2, + 6, + 3, + 6, + 4, + 6, + 5, + 6, + 6, + 6, + 7, + 6, + 8, + 6, + 9, + 6, + 10, + 6, + 11, + 6, + 12, + 6, + 13, + 6, + 14, + 6, + 15, + 6, + 16, + 7, + 0, + 7, + 1, + 7, + 2, + 7, + 3, + 7, + 4, + 7, + 5, + 7, + 6, + 7, + 7, + 7, + 8, + 7, + 9, + 7, + 10, + 7, + 11, + 7, + 12, + 7, + 13, + 7, + 14, + 7, + 15, + 7, + 16, + 8, + 0, + 8, + 1, + 8, + 2, + 8, + 3, + 8, + 4, + 8, + 5, + 8, + 6, + 8, + 7, + 8, + 8, + 8, + 9, + 8, + 10, + 8, + 11, + 8, + 12, + 8, + 13, + 8, + 14, + 8, + 15, + 8, + 16, + 9, + 0, + 9, + 1, + 9, + 2, + 9, + 3, + 9, + 4, + 9, + 5, + 9, + 6, + 9, + 7, + 9, + 8, + 9, + 9, + 9, + 10, + 9, + 11, + 9, + 12, + 9, + 13, + 9, + 14, + 9, + 15, + 9, + 16, + 10, + 0, + 10, + 1, + 10, + 2, + 10, + 3, + 10, + 4, + 10, + 5, + 10, + 6, + 10, + 7, + 10, + 8, + 10, + 9, + 10, + 10, + 10, + 11, + 10, + 12, + 10, + 13, + 10, + 14, + 10, + 15, + 10, + 16, + 11, + 0, + 11, + 1, + 11, + 2, + 11, + 3, + 11, + 4, + 11, + 5, + 11, + 6, + 11, + 7, + 11, + 8, + 11, + 9, + 11, + 10, + 11, + 11, + 11, + 12, + 11, + 13, + 11, + 14, + 11, + 15, + 11, + 16, + 12, + 0, + 12, + 1, + 12, + 2, + 12, + 3, + 12, + 4, + 12, + 5, + 12, + 6, + 12, + 7, + 12, + 8, + 12, + 9, + 12, + 10, + 12, + 11, + 12, + 12, + 12, + 13, + 12, + 14, + 12, + 15, + 12, + 16, + 13, + 0, + 13, + 1, + 13, + 2, + 13, + 3, + 13, + 4, + 13, + 5, + 13, + 6, + 13, + 7, + 13, + 8, + 13, + 9, + 13, + 10, + 13, + 11, + 13, + 12, + 13, + 13, + 13, + 14, + 13, + 15, + 13, + 16, + 14, + 0, + 14, + 1, + 14, + 2, + 14, + 3, + 14, + 4, + 14, + 5, + 14, + 6, + 14, + 7, + 14, + 8, + 14, + 9, + 14, + 10, + 14, + 11, + 14, + 12, + 14, + 13, + 14, + 14, + 14, + 15, + 14, + 16, + 15, + 0, + 15, + 1, + 15, + 2, + 15, + 3, + 15, + 4, + 15, + 5, + 15, + 6, + 15, + 7, + 15, + 8, + 15, + 9, + 15, + 10, + 15, + 11, + 15, + 12, + 15, + 13, + 15, + 14, + 15, + 15, + 15, + 16, + 16, + 0, + 16, + 1, + 16, + 2, + 16, + 3, + 16, + 4, + 16, + 5, + 16, + 6, + 16, + 7, + 16, + 8, + 16, + 9, + 16, + 10, + 16, + 11, + 16, + 12, + 16, + 13, + 16, + 14, + 16, + 15, + 16, + 16, +}; + +const int32_t c_aaiHuffDemod13[324][2] = { + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 3, + 0, + 4, + 0, + 5, + 0, + 6, + 0, + 7, + 0, + 8, + 0, + 9, + 0, + 10, + 0, + 11, + 0, + 12, + 0, + 13, + 0, + 14, + 0, + 15, + 0, + 16, + 0, + 17, + 1, + 0, + 1, + 1, + 1, + 2, + 1, + 3, + 1, + 4, + 1, + 5, + 1, + 6, + 1, + 7, + 1, + 8, + 1, + 9, + 1, + 10, + 1, + 11, + 1, + 12, + 1, + 13, + 1, + 14, + 1, + 15, + 1, + 16, + 1, + 17, + 2, + 0, + 2, + 1, + 2, + 2, + 2, + 3, + 2, + 4, + 2, + 5, + 2, + 6, + 2, + 7, + 2, + 8, + 2, + 9, + 2, + 10, + 2, + 11, + 2, + 12, + 2, + 13, + 2, + 14, + 2, + 15, + 2, + 16, + 2, + 17, + 3, + 0, + 3, + 1, + 3, + 2, + 3, + 3, + 3, + 4, + 3, + 5, + 3, + 6, + 3, + 7, + 3, + 8, + 3, + 9, + 3, + 10, + 3, + 11, + 3, + 12, + 3, + 13, + 3, + 14, + 3, + 15, + 3, + 16, + 3, + 17, + 4, + 0, + 4, + 1, + 4, + 2, + 4, + 3, + 4, + 4, + 4, + 5, + 4, + 6, + 4, + 7, + 4, + 8, + 4, + 9, + 4, + 10, + 4, + 11, + 4, + 12, + 4, + 13, + 4, + 14, + 4, + 15, + 4, + 16, + 4, + 17, + 5, + 0, + 5, + 1, + 5, + 2, + 5, + 3, + 5, + 4, + 5, + 5, + 5, + 6, + 5, + 7, + 5, + 8, + 5, + 9, + 5, + 10, + 5, + 11, + 5, + 12, + 5, + 13, + 5, + 14, + 5, + 15, + 5, + 16, + 5, + 17, + 6, + 0, + 6, + 1, + 6, + 2, + 6, + 3, + 6, + 4, + 6, + 5, + 6, + 6, + 6, + 7, + 6, + 8, + 6, + 9, + 6, + 10, + 6, + 11, + 6, + 12, + 6, + 13, + 6, + 14, + 6, + 15, + 6, + 16, + 6, + 17, + 7, + 0, + 7, + 1, + 7, + 2, + 7, + 3, + 7, + 4, + 7, + 5, + 7, + 6, + 7, + 7, + 7, + 8, + 7, + 9, + 7, + 10, + 7, + 11, + 7, + 12, + 7, + 13, + 7, + 14, + 7, + 15, + 7, + 16, + 7, + 17, + 8, + 0, + 8, + 1, + 8, + 2, + 8, + 3, + 8, + 4, + 8, + 5, + 8, + 6, + 8, + 7, + 8, + 8, + 8, + 9, + 8, + 10, + 8, + 11, + 8, + 12, + 8, + 13, + 8, + 14, + 8, + 15, + 8, + 16, + 8, + 17, + 9, + 0, + 9, + 1, + 9, + 2, + 9, + 3, + 9, + 4, + 9, + 5, + 9, + 6, + 9, + 7, + 9, + 8, + 9, + 9, + 9, + 10, + 9, + 11, + 9, + 12, + 9, + 13, + 9, + 14, + 9, + 15, + 9, + 16, + 9, + 17, + 10, + 0, + 10, + 1, + 10, + 2, + 10, + 3, + 10, + 4, + 10, + 5, + 10, + 6, + 10, + 7, + 10, + 8, + 10, + 9, + 10, + 10, + 10, + 11, + 10, + 12, + 10, + 13, + 10, + 14, + 10, + 15, + 10, + 16, + 10, + 17, + 11, + 0, + 11, + 1, + 11, + 2, + 11, + 3, + 11, + 4, + 11, + 5, + 11, + 6, + 11, + 7, + 11, + 8, + 11, + 9, + 11, + 10, + 11, + 11, + 11, + 12, + 11, + 13, + 11, + 14, + 11, + 15, + 11, + 16, + 11, + 17, + 12, + 0, + 12, + 1, + 12, + 2, + 12, + 3, + 12, + 4, + 12, + 5, + 12, + 6, + 12, + 7, + 12, + 8, + 12, + 9, + 12, + 10, + 12, + 11, + 12, + 12, + 12, + 13, + 12, + 14, + 12, + 15, + 12, + 16, + 12, + 17, + 13, + 0, + 13, + 1, + 13, + 2, + 13, + 3, + 13, + 4, + 13, + 5, + 13, + 6, + 13, + 7, + 13, + 8, + 13, + 9, + 13, + 10, + 13, + 11, + 13, + 12, + 13, + 13, + 13, + 14, + 13, + 15, + 13, + 16, + 13, + 17, + 14, + 0, + 14, + 1, + 14, + 2, + 14, + 3, + 14, + 4, + 14, + 5, + 14, + 6, + 14, + 7, + 14, + 8, + 14, + 9, + 14, + 10, + 14, + 11, + 14, + 12, + 14, + 13, + 14, + 14, + 14, + 15, + 14, + 16, + 14, + 17, + 15, + 0, + 15, + 1, + 15, + 2, + 15, + 3, + 15, + 4, + 15, + 5, + 15, + 6, + 15, + 7, + 15, + 8, + 15, + 9, + 15, + 10, + 15, + 11, + 15, + 12, + 15, + 13, + 15, + 14, + 15, + 15, + 15, + 16, + 15, + 17, + 16, + 0, + 16, + 1, + 16, + 2, + 16, + 3, + 16, + 4, + 16, + 5, + 16, + 6, + 16, + 7, + 16, + 8, + 16, + 9, + 16, + 10, + 16, + 11, + 16, + 12, + 16, + 13, + 16, + 14, + 16, + 15, + 16, + 16, + 16, + 17, + 17, + 0, + 17, + 1, + 17, + 2, + 17, + 3, + 17, + 4, + 17, + 5, + 17, + 6, + 17, + 7, + 17, + 8, + 17, + 9, + 17, + 10, + 17, + 11, + 17, + 12, + 17, + 13, + 17, + 14, + 17, + 15, + 17, + 16, + 17, + 17, +}; + +const int32_t c_aaiHuffDemod14[400][2] = { + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 3, + 0, + 4, + 0, + 5, + 0, + 6, + 0, + 7, + 0, + 8, + 0, + 9, + 0, + 10, + 0, + 11, + 0, + 12, + 0, + 13, + 0, + 14, + 0, + 15, + 0, + 16, + 0, + 17, + 0, + 18, + 0, + 19, + 1, + 0, + 1, + 1, + 1, + 2, + 1, + 3, + 1, + 4, + 1, + 5, + 1, + 6, + 1, + 7, + 1, + 8, + 1, + 9, + 1, + 10, + 1, + 11, + 1, + 12, + 1, + 13, + 1, + 14, + 1, + 15, + 1, + 16, + 1, + 17, + 1, + 18, + 1, + 19, + 2, + 0, + 2, + 1, + 2, + 2, + 2, + 3, + 2, + 4, + 2, + 5, + 2, + 6, + 2, + 7, + 2, + 8, + 2, + 9, + 2, + 10, + 2, + 11, + 2, + 12, + 2, + 13, + 2, + 14, + 2, + 15, + 2, + 16, + 2, + 17, + 2, + 18, + 2, + 19, + 3, + 0, + 3, + 1, + 3, + 2, + 3, + 3, + 3, + 4, + 3, + 5, + 3, + 6, + 3, + 7, + 3, + 8, + 3, + 9, + 3, + 10, + 3, + 11, + 3, + 12, + 3, + 13, + 3, + 14, + 3, + 15, + 3, + 16, + 3, + 17, + 3, + 18, + 3, + 19, + 4, + 0, + 4, + 1, + 4, + 2, + 4, + 3, + 4, + 4, + 4, + 5, + 4, + 6, + 4, + 7, + 4, + 8, + 4, + 9, + 4, + 10, + 4, + 11, + 4, + 12, + 4, + 13, + 4, + 14, + 4, + 15, + 4, + 16, + 4, + 17, + 4, + 18, + 4, + 19, + 5, + 0, + 5, + 1, + 5, + 2, + 5, + 3, + 5, + 4, + 5, + 5, + 5, + 6, + 5, + 7, + 5, + 8, + 5, + 9, + 5, + 10, + 5, + 11, + 5, + 12, + 5, + 13, + 5, + 14, + 5, + 15, + 5, + 16, + 5, + 17, + 5, + 18, + 5, + 19, + 6, + 0, + 6, + 1, + 6, + 2, + 6, + 3, + 6, + 4, + 6, + 5, + 6, + 6, + 6, + 7, + 6, + 8, + 6, + 9, + 6, + 10, + 6, + 11, + 6, + 12, + 6, + 13, + 6, + 14, + 6, + 15, + 6, + 16, + 6, + 17, + 6, + 18, + 6, + 19, + 7, + 0, + 7, + 1, + 7, + 2, + 7, + 3, + 7, + 4, + 7, + 5, + 7, + 6, + 7, + 7, + 7, + 8, + 7, + 9, + 7, + 10, + 7, + 11, + 7, + 12, + 7, + 13, + 7, + 14, + 7, + 15, + 7, + 16, + 7, + 17, + 7, + 18, + 7, + 19, + 8, + 0, + 8, + 1, + 8, + 2, + 8, + 3, + 8, + 4, + 8, + 5, + 8, + 6, + 8, + 7, + 8, + 8, + 8, + 9, + 8, + 10, + 8, + 11, + 8, + 12, + 8, + 13, + 8, + 14, + 8, + 15, + 8, + 16, + 8, + 17, + 8, + 18, + 8, + 19, + 9, + 0, + 9, + 1, + 9, + 2, + 9, + 3, + 9, + 4, + 9, + 5, + 9, + 6, + 9, + 7, + 9, + 8, + 9, + 9, + 9, + 10, + 9, + 11, + 9, + 12, + 9, + 13, + 9, + 14, + 9, + 15, + 9, + 16, + 9, + 17, + 9, + 18, + 9, + 19, + 10, + 0, + 10, + 1, + 10, + 2, + 10, + 3, + 10, + 4, + 10, + 5, + 10, + 6, + 10, + 7, + 10, + 8, + 10, + 9, + 10, + 10, + 10, + 11, + 10, + 12, + 10, + 13, + 10, + 14, + 10, + 15, + 10, + 16, + 10, + 17, + 10, + 18, + 10, + 19, + 11, + 0, + 11, + 1, + 11, + 2, + 11, + 3, + 11, + 4, + 11, + 5, + 11, + 6, + 11, + 7, + 11, + 8, + 11, + 9, + 11, + 10, + 11, + 11, + 11, + 12, + 11, + 13, + 11, + 14, + 11, + 15, + 11, + 16, + 11, + 17, + 11, + 18, + 11, + 19, + 12, + 0, + 12, + 1, + 12, + 2, + 12, + 3, + 12, + 4, + 12, + 5, + 12, + 6, + 12, + 7, + 12, + 8, + 12, + 9, + 12, + 10, + 12, + 11, + 12, + 12, + 12, + 13, + 12, + 14, + 12, + 15, + 12, + 16, + 12, + 17, + 12, + 18, + 12, + 19, + 13, + 0, + 13, + 1, + 13, + 2, + 13, + 3, + 13, + 4, + 13, + 5, + 13, + 6, + 13, + 7, + 13, + 8, + 13, + 9, + 13, + 10, + 13, + 11, + 13, + 12, + 13, + 13, + 13, + 14, + 13, + 15, + 13, + 16, + 13, + 17, + 13, + 18, + 13, + 19, + 14, + 0, + 14, + 1, + 14, + 2, + 14, + 3, + 14, + 4, + 14, + 5, + 14, + 6, + 14, + 7, + 14, + 8, + 14, + 9, + 14, + 10, + 14, + 11, + 14, + 12, + 14, + 13, + 14, + 14, + 14, + 15, + 14, + 16, + 14, + 17, + 14, + 18, + 14, + 19, + 15, + 0, + 15, + 1, + 15, + 2, + 15, + 3, + 15, + 4, + 15, + 5, + 15, + 6, + 15, + 7, + 15, + 8, + 15, + 9, + 15, + 10, + 15, + 11, + 15, + 12, + 15, + 13, + 15, + 14, + 15, + 15, + 15, + 16, + 15, + 17, + 15, + 18, + 15, + 19, + 16, + 0, + 16, + 1, + 16, + 2, + 16, + 3, + 16, + 4, + 16, + 5, + 16, + 6, + 16, + 7, + 16, + 8, + 16, + 9, + 16, + 10, + 16, + 11, + 16, + 12, + 16, + 13, + 16, + 14, + 16, + 15, + 16, + 16, + 16, + 17, + 16, + 18, + 16, + 19, + 17, + 0, + 17, + 1, + 17, + 2, + 17, + 3, + 17, + 4, + 17, + 5, + 17, + 6, + 17, + 7, + 17, + 8, + 17, + 9, + 17, + 10, + 17, + 11, + 17, + 12, + 17, + 13, + 17, + 14, + 17, + 15, + 17, + 16, + 17, + 17, + 17, + 18, + 17, + 19, + 18, + 0, + 18, + 1, + 18, + 2, + 18, + 3, + 18, + 4, + 18, + 5, + 18, + 6, + 18, + 7, + 18, + 8, + 18, + 9, + 18, + 10, + 18, + 11, + 18, + 12, + 18, + 13, + 18, + 14, + 18, + 15, + 18, + 16, + 18, + 17, + 18, + 18, + 18, + 19, + 19, + 0, + 19, + 1, + 19, + 2, + 19, + 3, + 19, + 4, + 19, + 5, + 19, + 6, + 19, + 7, + 19, + 8, + 19, + 9, + 19, + 10, + 19, + 11, + 19, + 12, + 19, + 13, + 19, + 14, + 19, + 15, + 19, + 16, + 19, + 17, + 19, + 18, + 19, + 19, +}; + +const int32_t c_aaiHuffDemod15[576][2] = { + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 3, + 0, + 4, + 0, + 5, + 0, + 6, + 0, + 7, + 0, + 8, + 0, + 9, + 0, + 10, + 0, + 11, + 0, + 12, + 0, + 13, + 0, + 14, + 0, + 15, + 0, + 16, + 0, + 17, + 0, + 18, + 0, + 19, + 0, + 20, + 0, + 21, + 0, + 22, + 0, + 23, + 1, + 0, + 1, + 1, + 1, + 2, + 1, + 3, + 1, + 4, + 1, + 5, + 1, + 6, + 1, + 7, + 1, + 8, + 1, + 9, + 1, + 10, + 1, + 11, + 1, + 12, + 1, + 13, + 1, + 14, + 1, + 15, + 1, + 16, + 1, + 17, + 1, + 18, + 1, + 19, + 1, + 20, + 1, + 21, + 1, + 22, + 1, + 23, + 2, + 0, + 2, + 1, + 2, + 2, + 2, + 3, + 2, + 4, + 2, + 5, + 2, + 6, + 2, + 7, + 2, + 8, + 2, + 9, + 2, + 10, + 2, + 11, + 2, + 12, + 2, + 13, + 2, + 14, + 2, + 15, + 2, + 16, + 2, + 17, + 2, + 18, + 2, + 19, + 2, + 20, + 2, + 21, + 2, + 22, + 2, + 23, + 3, + 0, + 3, + 1, + 3, + 2, + 3, + 3, + 3, + 4, + 3, + 5, + 3, + 6, + 3, + 7, + 3, + 8, + 3, + 9, + 3, + 10, + 3, + 11, + 3, + 12, + 3, + 13, + 3, + 14, + 3, + 15, + 3, + 16, + 3, + 17, + 3, + 18, + 3, + 19, + 3, + 20, + 3, + 21, + 3, + 22, + 3, + 23, + 4, + 0, + 4, + 1, + 4, + 2, + 4, + 3, + 4, + 4, + 4, + 5, + 4, + 6, + 4, + 7, + 4, + 8, + 4, + 9, + 4, + 10, + 4, + 11, + 4, + 12, + 4, + 13, + 4, + 14, + 4, + 15, + 4, + 16, + 4, + 17, + 4, + 18, + 4, + 19, + 4, + 20, + 4, + 21, + 4, + 22, + 4, + 23, + 5, + 0, + 5, + 1, + 5, + 2, + 5, + 3, + 5, + 4, + 5, + 5, + 5, + 6, + 5, + 7, + 5, + 8, + 5, + 9, + 5, + 10, + 5, + 11, + 5, + 12, + 5, + 13, + 5, + 14, + 5, + 15, + 5, + 16, + 5, + 17, + 5, + 18, + 5, + 19, + 5, + 20, + 5, + 21, + 5, + 22, + 5, + 23, + 6, + 0, + 6, + 1, + 6, + 2, + 6, + 3, + 6, + 4, + 6, + 5, + 6, + 6, + 6, + 7, + 6, + 8, + 6, + 9, + 6, + 10, + 6, + 11, + 6, + 12, + 6, + 13, + 6, + 14, + 6, + 15, + 6, + 16, + 6, + 17, + 6, + 18, + 6, + 19, + 6, + 20, + 6, + 21, + 6, + 22, + 6, + 23, + 7, + 0, + 7, + 1, + 7, + 2, + 7, + 3, + 7, + 4, + 7, + 5, + 7, + 6, + 7, + 7, + 7, + 8, + 7, + 9, + 7, + 10, + 7, + 11, + 7, + 12, + 7, + 13, + 7, + 14, + 7, + 15, + 7, + 16, + 7, + 17, + 7, + 18, + 7, + 19, + 7, + 20, + 7, + 21, + 7, + 22, + 7, + 23, + 8, + 0, + 8, + 1, + 8, + 2, + 8, + 3, + 8, + 4, + 8, + 5, + 8, + 6, + 8, + 7, + 8, + 8, + 8, + 9, + 8, + 10, + 8, + 11, + 8, + 12, + 8, + 13, + 8, + 14, + 8, + 15, + 8, + 16, + 8, + 17, + 8, + 18, + 8, + 19, + 8, + 20, + 8, + 21, + 8, + 22, + 8, + 23, + 9, + 0, + 9, + 1, + 9, + 2, + 9, + 3, + 9, + 4, + 9, + 5, + 9, + 6, + 9, + 7, + 9, + 8, + 9, + 9, + 9, + 10, + 9, + 11, + 9, + 12, + 9, + 13, + 9, + 14, + 9, + 15, + 9, + 16, + 9, + 17, + 9, + 18, + 9, + 19, + 9, + 20, + 9, + 21, + 9, + 22, + 9, + 23, + 10, + 0, + 10, + 1, + 10, + 2, + 10, + 3, + 10, + 4, + 10, + 5, + 10, + 6, + 10, + 7, + 10, + 8, + 10, + 9, + 10, + 10, + 10, + 11, + 10, + 12, + 10, + 13, + 10, + 14, + 10, + 15, + 10, + 16, + 10, + 17, + 10, + 18, + 10, + 19, + 10, + 20, + 10, + 21, + 10, + 22, + 10, + 23, + 11, + 0, + 11, + 1, + 11, + 2, + 11, + 3, + 11, + 4, + 11, + 5, + 11, + 6, + 11, + 7, + 11, + 8, + 11, + 9, + 11, + 10, + 11, + 11, + 11, + 12, + 11, + 13, + 11, + 14, + 11, + 15, + 11, + 16, + 11, + 17, + 11, + 18, + 11, + 19, + 11, + 20, + 11, + 21, + 11, + 22, + 11, + 23, + 12, + 0, + 12, + 1, + 12, + 2, + 12, + 3, + 12, + 4, + 12, + 5, + 12, + 6, + 12, + 7, + 12, + 8, + 12, + 9, + 12, + 10, + 12, + 11, + 12, + 12, + 12, + 13, + 12, + 14, + 12, + 15, + 12, + 16, + 12, + 17, + 12, + 18, + 12, + 19, + 12, + 20, + 12, + 21, + 12, + 22, + 12, + 23, + 13, + 0, + 13, + 1, + 13, + 2, + 13, + 3, + 13, + 4, + 13, + 5, + 13, + 6, + 13, + 7, + 13, + 8, + 13, + 9, + 13, + 10, + 13, + 11, + 13, + 12, + 13, + 13, + 13, + 14, + 13, + 15, + 13, + 16, + 13, + 17, + 13, + 18, + 13, + 19, + 13, + 20, + 13, + 21, + 13, + 22, + 13, + 23, + 14, + 0, + 14, + 1, + 14, + 2, + 14, + 3, + 14, + 4, + 14, + 5, + 14, + 6, + 14, + 7, + 14, + 8, + 14, + 9, + 14, + 10, + 14, + 11, + 14, + 12, + 14, + 13, + 14, + 14, + 14, + 15, + 14, + 16, + 14, + 17, + 14, + 18, + 14, + 19, + 14, + 20, + 14, + 21, + 14, + 22, + 14, + 23, + 15, + 0, + 15, + 1, + 15, + 2, + 15, + 3, + 15, + 4, + 15, + 5, + 15, + 6, + 15, + 7, + 15, + 8, + 15, + 9, + 15, + 10, + 15, + 11, + 15, + 12, + 15, + 13, + 15, + 14, + 15, + 15, + 15, + 16, + 15, + 17, + 15, + 18, + 15, + 19, + 15, + 20, + 15, + 21, + 15, + 22, + 15, + 23, + 16, + 0, + 16, + 1, + 16, + 2, + 16, + 3, + 16, + 4, + 16, + 5, + 16, + 6, + 16, + 7, + 16, + 8, + 16, + 9, + 16, + 10, + 16, + 11, + 16, + 12, + 16, + 13, + 16, + 14, + 16, + 15, + 16, + 16, + 16, + 17, + 16, + 18, + 16, + 19, + 16, + 20, + 16, + 21, + 16, + 22, + 16, + 23, + 17, + 0, + 17, + 1, + 17, + 2, + 17, + 3, + 17, + 4, + 17, + 5, + 17, + 6, + 17, + 7, + 17, + 8, + 17, + 9, + 17, + 10, + 17, + 11, + 17, + 12, + 17, + 13, + 17, + 14, + 17, + 15, + 17, + 16, + 17, + 17, + 17, + 18, + 17, + 19, + 17, + 20, + 17, + 21, + 17, + 22, + 17, + 23, + 18, + 0, + 18, + 1, + 18, + 2, + 18, + 3, + 18, + 4, + 18, + 5, + 18, + 6, + 18, + 7, + 18, + 8, + 18, + 9, + 18, + 10, + 18, + 11, + 18, + 12, + 18, + 13, + 18, + 14, + 18, + 15, + 18, + 16, + 18, + 17, + 18, + 18, + 18, + 19, + 18, + 20, + 18, + 21, + 18, + 22, + 18, + 23, + 19, + 0, + 19, + 1, + 19, + 2, + 19, + 3, + 19, + 4, + 19, + 5, + 19, + 6, + 19, + 7, + 19, + 8, + 19, + 9, + 19, + 10, + 19, + 11, + 19, + 12, + 19, + 13, + 19, + 14, + 19, + 15, + 19, + 16, + 19, + 17, + 19, + 18, + 19, + 19, + 19, + 20, + 19, + 21, + 19, + 22, + 19, + 23, + 20, + 0, + 20, + 1, + 20, + 2, + 20, + 3, + 20, + 4, + 20, + 5, + 20, + 6, + 20, + 7, + 20, + 8, + 20, + 9, + 20, + 10, + 20, + 11, + 20, + 12, + 20, + 13, + 20, + 14, + 20, + 15, + 20, + 16, + 20, + 17, + 20, + 18, + 20, + 19, + 20, + 20, + 20, + 21, + 20, + 22, + 20, + 23, + 21, + 0, + 21, + 1, + 21, + 2, + 21, + 3, + 21, + 4, + 21, + 5, + 21, + 6, + 21, + 7, + 21, + 8, + 21, + 9, + 21, + 10, + 21, + 11, + 21, + 12, + 21, + 13, + 21, + 14, + 21, + 15, + 21, + 16, + 21, + 17, + 21, + 18, + 21, + 19, + 21, + 20, + 21, + 21, + 21, + 22, + 21, + 23, + 22, + 0, + 22, + 1, + 22, + 2, + 22, + 3, + 22, + 4, + 22, + 5, + 22, + 6, + 22, + 7, + 22, + 8, + 22, + 9, + 22, + 10, + 22, + 11, + 22, + 12, + 22, + 13, + 22, + 14, + 22, + 15, + 22, + 16, + 22, + 17, + 22, + 18, + 22, + 19, + 22, + 20, + 22, + 21, + 22, + 22, + 22, + 23, + 23, + 0, + 23, + 1, + 23, + 2, + 23, + 3, + 23, + 4, + 23, + 5, + 23, + 6, + 23, + 7, + 23, + 8, + 23, + 9, + 23, + 10, + 23, + 11, + 23, + 12, + 23, + 13, + 23, + 14, + 23, + 15, + 23, + 16, + 23, + 17, + 23, + 18, + 23, + 19, + 23, + 20, + 23, + 21, + 23, + 22, + 23, + 23, +}; + +const int32_t c_aaiHuffDemod16[729][2] = { + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 3, + 0, + 4, + 0, + 5, + 0, + 6, + 0, + 7, + 0, + 8, + 0, + 9, + 0, + 10, + 0, + 11, + 0, + 12, + 0, + 13, + 0, + 14, + 0, + 15, + 0, + 16, + 0, + 17, + 0, + 18, + 0, + 19, + 0, + 20, + 0, + 21, + 0, + 22, + 0, + 23, + 0, + 24, + 0, + 25, + 0, + 26, + 1, + 0, + 1, + 1, + 1, + 2, + 1, + 3, + 1, + 4, + 1, + 5, + 1, + 6, + 1, + 7, + 1, + 8, + 1, + 9, + 1, + 10, + 1, + 11, + 1, + 12, + 1, + 13, + 1, + 14, + 1, + 15, + 1, + 16, + 1, + 17, + 1, + 18, + 1, + 19, + 1, + 20, + 1, + 21, + 1, + 22, + 1, + 23, + 1, + 24, + 1, + 25, + 1, + 26, + 2, + 0, + 2, + 1, + 2, + 2, + 2, + 3, + 2, + 4, + 2, + 5, + 2, + 6, + 2, + 7, + 2, + 8, + 2, + 9, + 2, + 10, + 2, + 11, + 2, + 12, + 2, + 13, + 2, + 14, + 2, + 15, + 2, + 16, + 2, + 17, + 2, + 18, + 2, + 19, + 2, + 20, + 2, + 21, + 2, + 22, + 2, + 23, + 2, + 24, + 2, + 25, + 2, + 26, + 3, + 0, + 3, + 1, + 3, + 2, + 3, + 3, + 3, + 4, + 3, + 5, + 3, + 6, + 3, + 7, + 3, + 8, + 3, + 9, + 3, + 10, + 3, + 11, + 3, + 12, + 3, + 13, + 3, + 14, + 3, + 15, + 3, + 16, + 3, + 17, + 3, + 18, + 3, + 19, + 3, + 20, + 3, + 21, + 3, + 22, + 3, + 23, + 3, + 24, + 3, + 25, + 3, + 26, + 4, + 0, + 4, + 1, + 4, + 2, + 4, + 3, + 4, + 4, + 4, + 5, + 4, + 6, + 4, + 7, + 4, + 8, + 4, + 9, + 4, + 10, + 4, + 11, + 4, + 12, + 4, + 13, + 4, + 14, + 4, + 15, + 4, + 16, + 4, + 17, + 4, + 18, + 4, + 19, + 4, + 20, + 4, + 21, + 4, + 22, + 4, + 23, + 4, + 24, + 4, + 25, + 4, + 26, + 5, + 0, + 5, + 1, + 5, + 2, + 5, + 3, + 5, + 4, + 5, + 5, + 5, + 6, + 5, + 7, + 5, + 8, + 5, + 9, + 5, + 10, + 5, + 11, + 5, + 12, + 5, + 13, + 5, + 14, + 5, + 15, + 5, + 16, + 5, + 17, + 5, + 18, + 5, + 19, + 5, + 20, + 5, + 21, + 5, + 22, + 5, + 23, + 5, + 24, + 5, + 25, + 5, + 26, + 6, + 0, + 6, + 1, + 6, + 2, + 6, + 3, + 6, + 4, + 6, + 5, + 6, + 6, + 6, + 7, + 6, + 8, + 6, + 9, + 6, + 10, + 6, + 11, + 6, + 12, + 6, + 13, + 6, + 14, + 6, + 15, + 6, + 16, + 6, + 17, + 6, + 18, + 6, + 19, + 6, + 20, + 6, + 21, + 6, + 22, + 6, + 23, + 6, + 24, + 6, + 25, + 6, + 26, + 7, + 0, + 7, + 1, + 7, + 2, + 7, + 3, + 7, + 4, + 7, + 5, + 7, + 6, + 7, + 7, + 7, + 8, + 7, + 9, + 7, + 10, + 7, + 11, + 7, + 12, + 7, + 13, + 7, + 14, + 7, + 15, + 7, + 16, + 7, + 17, + 7, + 18, + 7, + 19, + 7, + 20, + 7, + 21, + 7, + 22, + 7, + 23, + 7, + 24, + 7, + 25, + 7, + 26, + 8, + 0, + 8, + 1, + 8, + 2, + 8, + 3, + 8, + 4, + 8, + 5, + 8, + 6, + 8, + 7, + 8, + 8, + 8, + 9, + 8, + 10, + 8, + 11, + 8, + 12, + 8, + 13, + 8, + 14, + 8, + 15, + 8, + 16, + 8, + 17, + 8, + 18, + 8, + 19, + 8, + 20, + 8, + 21, + 8, + 22, + 8, + 23, + 8, + 24, + 8, + 25, + 8, + 26, + 9, + 0, + 9, + 1, + 9, + 2, + 9, + 3, + 9, + 4, + 9, + 5, + 9, + 6, + 9, + 7, + 9, + 8, + 9, + 9, + 9, + 10, + 9, + 11, + 9, + 12, + 9, + 13, + 9, + 14, + 9, + 15, + 9, + 16, + 9, + 17, + 9, + 18, + 9, + 19, + 9, + 20, + 9, + 21, + 9, + 22, + 9, + 23, + 9, + 24, + 9, + 25, + 9, + 26, + 10, + 0, + 10, + 1, + 10, + 2, + 10, + 3, + 10, + 4, + 10, + 5, + 10, + 6, + 10, + 7, + 10, + 8, + 10, + 9, + 10, + 10, + 10, + 11, + 10, + 12, + 10, + 13, + 10, + 14, + 10, + 15, + 10, + 16, + 10, + 17, + 10, + 18, + 10, + 19, + 10, + 20, + 10, + 21, + 10, + 22, + 10, + 23, + 10, + 24, + 10, + 25, + 10, + 26, + 11, + 0, + 11, + 1, + 11, + 2, + 11, + 3, + 11, + 4, + 11, + 5, + 11, + 6, + 11, + 7, + 11, + 8, + 11, + 9, + 11, + 10, + 11, + 11, + 11, + 12, + 11, + 13, + 11, + 14, + 11, + 15, + 11, + 16, + 11, + 17, + 11, + 18, + 11, + 19, + 11, + 20, + 11, + 21, + 11, + 22, + 11, + 23, + 11, + 24, + 11, + 25, + 11, + 26, + 12, + 0, + 12, + 1, + 12, + 2, + 12, + 3, + 12, + 4, + 12, + 5, + 12, + 6, + 12, + 7, + 12, + 8, + 12, + 9, + 12, + 10, + 12, + 11, + 12, + 12, + 12, + 13, + 12, + 14, + 12, + 15, + 12, + 16, + 12, + 17, + 12, + 18, + 12, + 19, + 12, + 20, + 12, + 21, + 12, + 22, + 12, + 23, + 12, + 24, + 12, + 25, + 12, + 26, + 13, + 0, + 13, + 1, + 13, + 2, + 13, + 3, + 13, + 4, + 13, + 5, + 13, + 6, + 13, + 7, + 13, + 8, + 13, + 9, + 13, + 10, + 13, + 11, + 13, + 12, + 13, + 13, + 13, + 14, + 13, + 15, + 13, + 16, + 13, + 17, + 13, + 18, + 13, + 19, + 13, + 20, + 13, + 21, + 13, + 22, + 13, + 23, + 13, + 24, + 13, + 25, + 13, + 26, + 14, + 0, + 14, + 1, + 14, + 2, + 14, + 3, + 14, + 4, + 14, + 5, + 14, + 6, + 14, + 7, + 14, + 8, + 14, + 9, + 14, + 10, + 14, + 11, + 14, + 12, + 14, + 13, + 14, + 14, + 14, + 15, + 14, + 16, + 14, + 17, + 14, + 18, + 14, + 19, + 14, + 20, + 14, + 21, + 14, + 22, + 14, + 23, + 14, + 24, + 14, + 25, + 14, + 26, + 15, + 0, + 15, + 1, + 15, + 2, + 15, + 3, + 15, + 4, + 15, + 5, + 15, + 6, + 15, + 7, + 15, + 8, + 15, + 9, + 15, + 10, + 15, + 11, + 15, + 12, + 15, + 13, + 15, + 14, + 15, + 15, + 15, + 16, + 15, + 17, + 15, + 18, + 15, + 19, + 15, + 20, + 15, + 21, + 15, + 22, + 15, + 23, + 15, + 24, + 15, + 25, + 15, + 26, + 16, + 0, + 16, + 1, + 16, + 2, + 16, + 3, + 16, + 4, + 16, + 5, + 16, + 6, + 16, + 7, + 16, + 8, + 16, + 9, + 16, + 10, + 16, + 11, + 16, + 12, + 16, + 13, + 16, + 14, + 16, + 15, + 16, + 16, + 16, + 17, + 16, + 18, + 16, + 19, + 16, + 20, + 16, + 21, + 16, + 22, + 16, + 23, + 16, + 24, + 16, + 25, + 16, + 26, + 17, + 0, + 17, + 1, + 17, + 2, + 17, + 3, + 17, + 4, + 17, + 5, + 17, + 6, + 17, + 7, + 17, + 8, + 17, + 9, + 17, + 10, + 17, + 11, + 17, + 12, + 17, + 13, + 17, + 14, + 17, + 15, + 17, + 16, + 17, + 17, + 17, + 18, + 17, + 19, + 17, + 20, + 17, + 21, + 17, + 22, + 17, + 23, + 17, + 24, + 17, + 25, + 17, + 26, + 18, + 0, + 18, + 1, + 18, + 2, + 18, + 3, + 18, + 4, + 18, + 5, + 18, + 6, + 18, + 7, + 18, + 8, + 18, + 9, + 18, + 10, + 18, + 11, + 18, + 12, + 18, + 13, + 18, + 14, + 18, + 15, + 18, + 16, + 18, + 17, + 18, + 18, + 18, + 19, + 18, + 20, + 18, + 21, + 18, + 22, + 18, + 23, + 18, + 24, + 18, + 25, + 18, + 26, + 19, + 0, + 19, + 1, + 19, + 2, + 19, + 3, + 19, + 4, + 19, + 5, + 19, + 6, + 19, + 7, + 19, + 8, + 19, + 9, + 19, + 10, + 19, + 11, + 19, + 12, + 19, + 13, + 19, + 14, + 19, + 15, + 19, + 16, + 19, + 17, + 19, + 18, + 19, + 19, + 19, + 20, + 19, + 21, + 19, + 22, + 19, + 23, + 19, + 24, + 19, + 25, + 19, + 26, + 20, + 0, + 20, + 1, + 20, + 2, + 20, + 3, + 20, + 4, + 20, + 5, + 20, + 6, + 20, + 7, + 20, + 8, + 20, + 9, + 20, + 10, + 20, + 11, + 20, + 12, + 20, + 13, + 20, + 14, + 20, + 15, + 20, + 16, + 20, + 17, + 20, + 18, + 20, + 19, + 20, + 20, + 20, + 21, + 20, + 22, + 20, + 23, + 20, + 24, + 20, + 25, + 20, + 26, + 21, + 0, + 21, + 1, + 21, + 2, + 21, + 3, + 21, + 4, + 21, + 5, + 21, + 6, + 21, + 7, + 21, + 8, + 21, + 9, + 21, + 10, + 21, + 11, + 21, + 12, + 21, + 13, + 21, + 14, + 21, + 15, + 21, + 16, + 21, + 17, + 21, + 18, + 21, + 19, + 21, + 20, + 21, + 21, + 21, + 22, + 21, + 23, + 21, + 24, + 21, + 25, + 21, + 26, + 22, + 0, + 22, + 1, + 22, + 2, + 22, + 3, + 22, + 4, + 22, + 5, + 22, + 6, + 22, + 7, + 22, + 8, + 22, + 9, + 22, + 10, + 22, + 11, + 22, + 12, + 22, + 13, + 22, + 14, + 22, + 15, + 22, + 16, + 22, + 17, + 22, + 18, + 22, + 19, + 22, + 20, + 22, + 21, + 22, + 22, + 22, + 23, + 22, + 24, + 22, + 25, + 22, + 26, + 23, + 0, + 23, + 1, + 23, + 2, + 23, + 3, + 23, + 4, + 23, + 5, + 23, + 6, + 23, + 7, + 23, + 8, + 23, + 9, + 23, + 10, + 23, + 11, + 23, + 12, + 23, + 13, + 23, + 14, + 23, + 15, + 23, + 16, + 23, + 17, + 23, + 18, + 23, + 19, + 23, + 20, + 23, + 21, + 23, + 22, + 23, + 23, + 23, + 24, + 23, + 25, + 23, + 26, + 24, + 0, + 24, + 1, + 24, + 2, + 24, + 3, + 24, + 4, + 24, + 5, + 24, + 6, + 24, + 7, + 24, + 8, + 24, + 9, + 24, + 10, + 24, + 11, + 24, + 12, + 24, + 13, + 24, + 14, + 24, + 15, + 24, + 16, + 24, + 17, + 24, + 18, + 24, + 19, + 24, + 20, + 24, + 21, + 24, + 22, + 24, + 23, + 24, + 24, + 24, + 25, + 24, + 26, + 25, + 0, + 25, + 1, + 25, + 2, + 25, + 3, + 25, + 4, + 25, + 5, + 25, + 6, + 25, + 7, + 25, + 8, + 25, + 9, + 25, + 10, + 25, + 11, + 25, + 12, + 25, + 13, + 25, + 14, + 25, + 15, + 25, + 16, + 25, + 17, + 25, + 18, + 25, + 19, + 25, + 20, + 25, + 21, + 25, + 22, + 25, + 23, + 25, + 24, + 25, + 25, + 25, + 26, + 26, + 0, + 26, + 1, + 26, + 2, + 26, + 3, + 26, + 4, + 26, + 5, + 26, + 6, + 26, + 7, + 26, + 8, + 26, + 9, + 26, + 10, + 26, + 11, + 26, + 12, + 26, + 13, + 26, + 14, + 26, + 15, + 26, + 16, + 26, + 17, + 26, + 18, + 26, + 19, + 26, + 20, + 26, + 21, + 26, + 22, + 26, + 23, + 26, + 24, + 26, + 25, + 26, + 26, +}; + +const int32_t c_aaiHuffDemod17[729][2] = { + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 3, + 0, + 4, + 0, + 5, + 0, + 6, + 0, + 7, + 0, + 8, + 0, + 9, + 0, + 10, + 0, + 11, + 0, + 12, + 0, + 13, + 0, + 14, + 0, + 15, + 0, + 16, + 0, + 17, + 0, + 18, + 0, + 19, + 0, + 20, + 0, + 21, + 0, + 22, + 0, + 23, + 0, + 24, + 0, + 25, + 0, + 26, + 1, + 0, + 1, + 1, + 1, + 2, + 1, + 3, + 1, + 4, + 1, + 5, + 1, + 6, + 1, + 7, + 1, + 8, + 1, + 9, + 1, + 10, + 1, + 11, + 1, + 12, + 1, + 13, + 1, + 14, + 1, + 15, + 1, + 16, + 1, + 17, + 1, + 18, + 1, + 19, + 1, + 20, + 1, + 21, + 1, + 22, + 1, + 23, + 1, + 24, + 1, + 25, + 1, + 26, + 2, + 0, + 2, + 1, + 2, + 2, + 2, + 3, + 2, + 4, + 2, + 5, + 2, + 6, + 2, + 7, + 2, + 8, + 2, + 9, + 2, + 10, + 2, + 11, + 2, + 12, + 2, + 13, + 2, + 14, + 2, + 15, + 2, + 16, + 2, + 17, + 2, + 18, + 2, + 19, + 2, + 20, + 2, + 21, + 2, + 22, + 2, + 23, + 2, + 24, + 2, + 25, + 2, + 26, + 3, + 0, + 3, + 1, + 3, + 2, + 3, + 3, + 3, + 4, + 3, + 5, + 3, + 6, + 3, + 7, + 3, + 8, + 3, + 9, + 3, + 10, + 3, + 11, + 3, + 12, + 3, + 13, + 3, + 14, + 3, + 15, + 3, + 16, + 3, + 17, + 3, + 18, + 3, + 19, + 3, + 20, + 3, + 21, + 3, + 22, + 3, + 23, + 3, + 24, + 3, + 25, + 3, + 26, + 4, + 0, + 4, + 1, + 4, + 2, + 4, + 3, + 4, + 4, + 4, + 5, + 4, + 6, + 4, + 7, + 4, + 8, + 4, + 9, + 4, + 10, + 4, + 11, + 4, + 12, + 4, + 13, + 4, + 14, + 4, + 15, + 4, + 16, + 4, + 17, + 4, + 18, + 4, + 19, + 4, + 20, + 4, + 21, + 4, + 22, + 4, + 23, + 4, + 24, + 4, + 25, + 4, + 26, + 5, + 0, + 5, + 1, + 5, + 2, + 5, + 3, + 5, + 4, + 5, + 5, + 5, + 6, + 5, + 7, + 5, + 8, + 5, + 9, + 5, + 10, + 5, + 11, + 5, + 12, + 5, + 13, + 5, + 14, + 5, + 15, + 5, + 16, + 5, + 17, + 5, + 18, + 5, + 19, + 5, + 20, + 5, + 21, + 5, + 22, + 5, + 23, + 5, + 24, + 5, + 25, + 5, + 26, + 6, + 0, + 6, + 1, + 6, + 2, + 6, + 3, + 6, + 4, + 6, + 5, + 6, + 6, + 6, + 7, + 6, + 8, + 6, + 9, + 6, + 10, + 6, + 11, + 6, + 12, + 6, + 13, + 6, + 14, + 6, + 15, + 6, + 16, + 6, + 17, + 6, + 18, + 6, + 19, + 6, + 20, + 6, + 21, + 6, + 22, + 6, + 23, + 6, + 24, + 6, + 25, + 6, + 26, + 7, + 0, + 7, + 1, + 7, + 2, + 7, + 3, + 7, + 4, + 7, + 5, + 7, + 6, + 7, + 7, + 7, + 8, + 7, + 9, + 7, + 10, + 7, + 11, + 7, + 12, + 7, + 13, + 7, + 14, + 7, + 15, + 7, + 16, + 7, + 17, + 7, + 18, + 7, + 19, + 7, + 20, + 7, + 21, + 7, + 22, + 7, + 23, + 7, + 24, + 7, + 25, + 7, + 26, + 8, + 0, + 8, + 1, + 8, + 2, + 8, + 3, + 8, + 4, + 8, + 5, + 8, + 6, + 8, + 7, + 8, + 8, + 8, + 9, + 8, + 10, + 8, + 11, + 8, + 12, + 8, + 13, + 8, + 14, + 8, + 15, + 8, + 16, + 8, + 17, + 8, + 18, + 8, + 19, + 8, + 20, + 8, + 21, + 8, + 22, + 8, + 23, + 8, + 24, + 8, + 25, + 8, + 26, + 9, + 0, + 9, + 1, + 9, + 2, + 9, + 3, + 9, + 4, + 9, + 5, + 9, + 6, + 9, + 7, + 9, + 8, + 9, + 9, + 9, + 10, + 9, + 11, + 9, + 12, + 9, + 13, + 9, + 14, + 9, + 15, + 9, + 16, + 9, + 17, + 9, + 18, + 9, + 19, + 9, + 20, + 9, + 21, + 9, + 22, + 9, + 23, + 9, + 24, + 9, + 25, + 9, + 26, + 10, + 0, + 10, + 1, + 10, + 2, + 10, + 3, + 10, + 4, + 10, + 5, + 10, + 6, + 10, + 7, + 10, + 8, + 10, + 9, + 10, + 10, + 10, + 11, + 10, + 12, + 10, + 13, + 10, + 14, + 10, + 15, + 10, + 16, + 10, + 17, + 10, + 18, + 10, + 19, + 10, + 20, + 10, + 21, + 10, + 22, + 10, + 23, + 10, + 24, + 10, + 25, + 10, + 26, + 11, + 0, + 11, + 1, + 11, + 2, + 11, + 3, + 11, + 4, + 11, + 5, + 11, + 6, + 11, + 7, + 11, + 8, + 11, + 9, + 11, + 10, + 11, + 11, + 11, + 12, + 11, + 13, + 11, + 14, + 11, + 15, + 11, + 16, + 11, + 17, + 11, + 18, + 11, + 19, + 11, + 20, + 11, + 21, + 11, + 22, + 11, + 23, + 11, + 24, + 11, + 25, + 11, + 26, + 12, + 0, + 12, + 1, + 12, + 2, + 12, + 3, + 12, + 4, + 12, + 5, + 12, + 6, + 12, + 7, + 12, + 8, + 12, + 9, + 12, + 10, + 12, + 11, + 12, + 12, + 12, + 13, + 12, + 14, + 12, + 15, + 12, + 16, + 12, + 17, + 12, + 18, + 12, + 19, + 12, + 20, + 12, + 21, + 12, + 22, + 12, + 23, + 12, + 24, + 12, + 25, + 12, + 26, + 13, + 0, + 13, + 1, + 13, + 2, + 13, + 3, + 13, + 4, + 13, + 5, + 13, + 6, + 13, + 7, + 13, + 8, + 13, + 9, + 13, + 10, + 13, + 11, + 13, + 12, + 13, + 13, + 13, + 14, + 13, + 15, + 13, + 16, + 13, + 17, + 13, + 18, + 13, + 19, + 13, + 20, + 13, + 21, + 13, + 22, + 13, + 23, + 13, + 24, + 13, + 25, + 13, + 26, + 14, + 0, + 14, + 1, + 14, + 2, + 14, + 3, + 14, + 4, + 14, + 5, + 14, + 6, + 14, + 7, + 14, + 8, + 14, + 9, + 14, + 10, + 14, + 11, + 14, + 12, + 14, + 13, + 14, + 14, + 14, + 15, + 14, + 16, + 14, + 17, + 14, + 18, + 14, + 19, + 14, + 20, + 14, + 21, + 14, + 22, + 14, + 23, + 14, + 24, + 14, + 25, + 14, + 26, + 15, + 0, + 15, + 1, + 15, + 2, + 15, + 3, + 15, + 4, + 15, + 5, + 15, + 6, + 15, + 7, + 15, + 8, + 15, + 9, + 15, + 10, + 15, + 11, + 15, + 12, + 15, + 13, + 15, + 14, + 15, + 15, + 15, + 16, + 15, + 17, + 15, + 18, + 15, + 19, + 15, + 20, + 15, + 21, + 15, + 22, + 15, + 23, + 15, + 24, + 15, + 25, + 15, + 26, + 16, + 0, + 16, + 1, + 16, + 2, + 16, + 3, + 16, + 4, + 16, + 5, + 16, + 6, + 16, + 7, + 16, + 8, + 16, + 9, + 16, + 10, + 16, + 11, + 16, + 12, + 16, + 13, + 16, + 14, + 16, + 15, + 16, + 16, + 16, + 17, + 16, + 18, + 16, + 19, + 16, + 20, + 16, + 21, + 16, + 22, + 16, + 23, + 16, + 24, + 16, + 25, + 16, + 26, + 17, + 0, + 17, + 1, + 17, + 2, + 17, + 3, + 17, + 4, + 17, + 5, + 17, + 6, + 17, + 7, + 17, + 8, + 17, + 9, + 17, + 10, + 17, + 11, + 17, + 12, + 17, + 13, + 17, + 14, + 17, + 15, + 17, + 16, + 17, + 17, + 17, + 18, + 17, + 19, + 17, + 20, + 17, + 21, + 17, + 22, + 17, + 23, + 17, + 24, + 17, + 25, + 17, + 26, + 18, + 0, + 18, + 1, + 18, + 2, + 18, + 3, + 18, + 4, + 18, + 5, + 18, + 6, + 18, + 7, + 18, + 8, + 18, + 9, + 18, + 10, + 18, + 11, + 18, + 12, + 18, + 13, + 18, + 14, + 18, + 15, + 18, + 16, + 18, + 17, + 18, + 18, + 18, + 19, + 18, + 20, + 18, + 21, + 18, + 22, + 18, + 23, + 18, + 24, + 18, + 25, + 18, + 26, + 19, + 0, + 19, + 1, + 19, + 2, + 19, + 3, + 19, + 4, + 19, + 5, + 19, + 6, + 19, + 7, + 19, + 8, + 19, + 9, + 19, + 10, + 19, + 11, + 19, + 12, + 19, + 13, + 19, + 14, + 19, + 15, + 19, + 16, + 19, + 17, + 19, + 18, + 19, + 19, + 19, + 20, + 19, + 21, + 19, + 22, + 19, + 23, + 19, + 24, + 19, + 25, + 19, + 26, + 20, + 0, + 20, + 1, + 20, + 2, + 20, + 3, + 20, + 4, + 20, + 5, + 20, + 6, + 20, + 7, + 20, + 8, + 20, + 9, + 20, + 10, + 20, + 11, + 20, + 12, + 20, + 13, + 20, + 14, + 20, + 15, + 20, + 16, + 20, + 17, + 20, + 18, + 20, + 19, + 20, + 20, + 20, + 21, + 20, + 22, + 20, + 23, + 20, + 24, + 20, + 25, + 20, + 26, + 21, + 0, + 21, + 1, + 21, + 2, + 21, + 3, + 21, + 4, + 21, + 5, + 21, + 6, + 21, + 7, + 21, + 8, + 21, + 9, + 21, + 10, + 21, + 11, + 21, + 12, + 21, + 13, + 21, + 14, + 21, + 15, + 21, + 16, + 21, + 17, + 21, + 18, + 21, + 19, + 21, + 20, + 21, + 21, + 21, + 22, + 21, + 23, + 21, + 24, + 21, + 25, + 21, + 26, + 22, + 0, + 22, + 1, + 22, + 2, + 22, + 3, + 22, + 4, + 22, + 5, + 22, + 6, + 22, + 7, + 22, + 8, + 22, + 9, + 22, + 10, + 22, + 11, + 22, + 12, + 22, + 13, + 22, + 14, + 22, + 15, + 22, + 16, + 22, + 17, + 22, + 18, + 22, + 19, + 22, + 20, + 22, + 21, + 22, + 22, + 22, + 23, + 22, + 24, + 22, + 25, + 22, + 26, + 23, + 0, + 23, + 1, + 23, + 2, + 23, + 3, + 23, + 4, + 23, + 5, + 23, + 6, + 23, + 7, + 23, + 8, + 23, + 9, + 23, + 10, + 23, + 11, + 23, + 12, + 23, + 13, + 23, + 14, + 23, + 15, + 23, + 16, + 23, + 17, + 23, + 18, + 23, + 19, + 23, + 20, + 23, + 21, + 23, + 22, + 23, + 23, + 23, + 24, + 23, + 25, + 23, + 26, + 24, + 0, + 24, + 1, + 24, + 2, + 24, + 3, + 24, + 4, + 24, + 5, + 24, + 6, + 24, + 7, + 24, + 8, + 24, + 9, + 24, + 10, + 24, + 11, + 24, + 12, + 24, + 13, + 24, + 14, + 24, + 15, + 24, + 16, + 24, + 17, + 24, + 18, + 24, + 19, + 24, + 20, + 24, + 21, + 24, + 22, + 24, + 23, + 24, + 24, + 24, + 25, + 24, + 26, + 25, + 0, + 25, + 1, + 25, + 2, + 25, + 3, + 25, + 4, + 25, + 5, + 25, + 6, + 25, + 7, + 25, + 8, + 25, + 9, + 25, + 10, + 25, + 11, + 25, + 12, + 25, + 13, + 25, + 14, + 25, + 15, + 25, + 16, + 25, + 17, + 25, + 18, + 25, + 19, + 25, + 20, + 25, + 21, + 25, + 22, + 25, + 23, + 25, + 24, + 25, + 25, + 25, + 26, + 26, + 0, + 26, + 1, + 26, + 2, + 26, + 3, + 26, + 4, + 26, + 5, + 26, + 6, + 26, + 7, + 26, + 8, + 26, + 9, + 26, + 10, + 26, + 11, + 26, + 12, + 26, + 13, + 26, + 14, + 26, + 15, + 26, + 16, + 26, + 17, + 26, + 18, + 26, + 19, + 26, + 20, + 26, + 21, + 26, + 22, + 26, + 23, + 26, + 24, + 26, + 25, + 26, + 26, +}; + +const int32_t ( *c_apaiDemodTables[ALLOC_TABLE_SIZE] )[2] = { + NULL, + c_aaiHuffDemod1, + c_aaiHuffDemod2, + c_aaiHuffDemod3, + c_aaiHuffDemod4, + c_aaiHuffDemod5, + c_aaiHuffDemod6, + c_aaiHuffDemod7, + c_aaiHuffDemod8, + c_aaiHuffDemod9, + c_aaiHuffDemod10, + c_aaiHuffDemod11, + c_aaiHuffDemod12, + c_aaiHuffDemod13, + c_aaiHuffDemod14, + c_aaiHuffDemod15, + c_aaiHuffDemod16, + c_aaiHuffDemod17, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, +}; +#endif + +const int32_t c_aiLogAddTable[LOG_ADD_TABLE_LENGTH] = { + 0x40, + 0x40, + 0x3F, + 0x3F, + 0x3E, + 0x3E, + 0x3D, + 0x3D, + 0x3C, + 0x3C, + 0x3B, + 0x3B, + 0x3A, + 0x3A, + 0x39, + 0x39, + 0x38, + 0x38, + 0x37, + 0x37, + 0x37, + 0x36, + 0x36, + 0x35, + 0x35, + 0x34, + 0x34, + 0x33, + 0x33, + 0x33, + 0x32, + 0x32, + 0x31, + 0x31, + 0x31, + 0x30, + 0x30, + 0x2F, + 0x2F, + 0x2F, + 0x2E, + 0x2E, + 0x2D, + 0x2D, + 0x2D, + 0x2C, + 0x2C, + 0x2B, + 0x2B, + 0x2B, + 0x2A, + 0x2A, + 0x2A, + 0x29, + 0x29, + 0x29, + 0x28, + 0x28, + 0x27, + 0x27, + 0x27, + 0x26, + 0x26, + 0x26, + 0x25, + 0x25, + 0x25, + 0x24, + 0x24, + 0x24, + 0x23, + 0x23, + 0x23, + 0x23, + 0x22, + 0x22, + 0x22, + 0x21, + 0x21, + 0x21, + 0x20, + 0x20, + 0x20, + 0x20, + 0x1F, + 0x1F, + 0x1F, + 0x1E, + 0x1E, + 0x1E, + 0x1E, + 0x1D, + 0x1D, + 0x1D, + 0x1C, + 0x1C, + 0x1C, + 0x1C, + 0x1B, + 0x1B, + 0x1B, + 0x1B, + 0x1A, + 0x1A, + 0x1A, + 0x1A, + 0x19, + 0x19, + 0x19, + 0x19, + 0x18, + 0x18, + 0x18, + 0x18, + 0x18, + 0x17, + 0x17, + 0x17, + 0x17, + 0x16, + 0x16, + 0x16, + 0x16, + 0x16, + 0x15, + 0x15, + 0x15, + 0x15, + 0x15, + 0x14, + 0x14, + 0x14, + 0x14, + 0x14, + 0x13, + 0x13, + 0x13, + 0x13, + 0x13, + 0x13, + 0x12, + 0x12, + 0x12, + 0x12, + 0x12, + 0x11, + 0x11, + 0x11, + 0x11, + 0x11, + 0x11, + 0x10, + 0x10, + 0x10, + 0x10, + 0x10, + 0x10, + 0x0F, + 0x0F, + 0x0F, + 0x0F, + 0x0F, + 0x0F, + 0x0F, + 0x0E, + 0x0E, + 0x0E, + 0x0E, + 0x0E, + 0x0E, + 0x0E, + 0x0D, + 0x0D, + 0x0D, + 0x0D, + 0x0D, + 0x0D, + 0x0D, + 0x0D, + 0x0C, + 0x0C, + 0x0C, + 0x0C, + 0x0C, + 0x0C, + 0x0C, + 0x0C, + 0x0B, + 0x0B, + 0x0B, + 0x0B, + 0x0B, + 0x0B, + 0x0B, + 0x0B, + 0x0B, + 0x0A, + 0x0A, + 0x0A, + 0x0A, + 0x0A, + 0x0A, + 0x0A, + 0x0A, + 0x0A, + 0x0A, + 0x09, + 0x09, + 0x09, + 0x09, + 0x09, + 0x09, + 0x09, + 0x09, + 0x09, + 0x09, + 0x08, + 0x08, + 0x08, + 0x08, + 0x08, + 0x08, + 0x08, + 0x08, + 0x08, + 0x08, + 0x08, + 0x08, + 0x08, + 0x07, + 0x07, + 0x07, + 0x07, + 0x07, + 0x07, + 0x07, + 0x07, + 0x07, + 0x07, + 0x07, + 0x07, + 0x07, + 0x06, + 0x06, + 0x06, + 0x06, + 0x06, + 0x06, + 0x06, + 0x06, + 0x06, + 0x06, + 0x06, + 0x06, + 0x06, + 0x06, + 0x06, + 0x06, + 0x05, + 0x05, + 0x05, + 0x05, + 0x05, + 0x05, + 0x05, + 0x05, + 0x05, + 0x05, + 0x05, + 0x05, + 0x05, + 0x05, + 0x05, + 0x05, + 0x05, + 0x05, + 0x05, + 0x04, + 0x04, + 0x04, + 0x04, + 0x04, + 0x04, + 0x04, + 0x04, + 0x04, + 0x04, + 0x04, + 0x04, + 0x04, + 0x04, + 0x04, + 0x04, + 0x04, + 0x04, + 0x04, + 0x04, + 0x04, + 0x04, + 0x04, + 0x04, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x03, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x02, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x01, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, + 0x00, +}; + +const int32_t c_aiBandwidthAdjust48[MAX_BANDS_48] = { + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 64, + 64, + 64, + 64, + 64, + 101, + 101, + 128, + 165, + 165, + 180, + 213, +}; + +const int32_t c_aiAbsoluteThresh48[MAX_BANDS_48] = { + -1787, + -1787, + -1787, + -1787, + -1787, + -1787, + -1787, + -1787, + -1782, + -1761, + -1737, + -1679, + -1638, + -1613, + -1590, + -1568, + -1516, + -1459, + -1395, + -1289, + -671, + -409, + -401, +}; + + +#if PERCEPTUAL_MODEL_SLGAIN_SHIFT == 4 +const int32_t c_aiDefaultTheta48[MAX_BANDS_48] = { + 7, + 7, + 6, + 5, + 5, + 4, + 4, + 4, + 4, + 4, + 4, + 4, + 4, + 4, + 4, + 4, + 4, + 4, + 4, + 4, + 4, + 4, + 4, +}; +#elif PERCEPTUAL_MODEL_SLGAIN_SHIFT == 8 +const int32_t c_aiDefaultTheta48[MAX_BANDS_48] = { + 112, + 112, + 96, + 80, + 80, + 64, + 64, + 64, + 64, + 64, + 64, + 64, + 64, + 64, + 64, + 64, + 64, + 64, + 64, + 64, + 64, + 64, + 64, +}; +#endif + +const int32_t c_aaiSpreadFunction48[MAX_BANDS_48 * MAX_BANDS_48] = { + 0, + -1561, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -289, + -4, + -1234, + -2295, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -569, + -229, + -8, + -905, + -1705, + -2324, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -789, + -445, + -173, + -16, + -656, + -1271, + -1765, + -2172, + -2520, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -961, + -616, + -340, + -136, + -28, + -488, + -976, + -1382, + -1729, + -2032, + -2305, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -1088, + -743, + -465, + -257, + -148, + -31, + -371, + -769, + -1114, + -1417, + -1689, + -2054, + -2483, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -1198, + -852, + -574, + -364, + -209, + -148, + -42, + -300, + -635, + -936, + -1207, + -1572, + -2000, + -2376, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -1293, + -948, + -669, + -458, + -301, + -183, + -145, + -56, + -258, + -547, + -816, + -1179, + -1606, + -1982, + -2311, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -1375, + -1029, + -750, + -539, + -381, + -260, + -180, + -142, + -68, + -231, + -487, + -846, + -1272, + -1647, + -1976, + -2261, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -1444, + -1099, + -820, + -608, + -449, + -328, + -233, + -194, + -138, + -77, + -213, + -555, + -978, + -1352, + -1681, + -1966, + -2268, + -2552, + -2552, + -2552, + -2552, + -2552, + -2552, + -1501, + -1155, + -876, + -665, + -505, + -383, + -287, + -210, + -193, + -130, + -79, + -298, + -711, + -1083, + -1411, + -1696, + -1997, + -2288, + -2550, + -2552, + -2552, + -2552, + -2552, + -1567, + -1221, + -942, + -730, + -570, + -448, + -351, + -272, + -206, + -189, + -151, + -72, + -349, + -713, + -1039, + -1324, + -1625, + -1915, + -2177, + -2448, + -2552, + -2552, + -2552, + -1650, + -1304, + -1025, + -813, + -653, + -530, + -432, + -352, + -285, + -227, + -177, + -163, + -69, + -297, + -613, + -895, + -1195, + -1485, + -1746, + -2017, + -2238, + -2401, + -2545, + -1727, + -1381, + -1102, + -890, + -730, + -607, + -509, + -428, + -360, + -301, + -249, + -180, + -153, + -72, + -257, + -527, + -824, + -1112, + -1373, + -1643, + -1865, + -2028, + -2171, + -1798, + -1452, + -1173, + -960, + -800, + -677, + -579, + -498, + -430, + -370, + -317, + -246, + -192, + -145, + -76, + -224, + -505, + -790, + -1050, + -1320, + -1540, + -1703, + -1847, + -1860, + -1514, + -1234, + -1022, + -862, + -738, + -640, + -559, + -490, + -430, + -377, + -306, + -224, + -197, + -136, + -81, + -242, + -515, + -771, + -1040, + -1260, + -1422, + -1566, + -1923, + -1577, + -1297, + -1085, + -925, + -801, + -703, + -621, + -553, + -492, + -439, + -367, + -284, + -213, + -198, + -144, + -83, + -235, + -479, + -744, + -963, + -1125, + -1268, + -1986, + -1640, + -1360, + -1148, + -988, + -864, + -766, + -684, + -615, + -555, + -501, + -429, + -345, + -273, + -211, + -204, + -146, + -89, + -216, + -465, + -680, + -841, + -984, + -2043, + -1697, + -1417, + -1205, + -1044, + -921, + -822, + -741, + -672, + -611, + -557, + -485, + -401, + -328, + -264, + -211, + -205, + -140, + -93, + -227, + -430, + -588, + -729, + -2104, + -1758, + -1479, + -1266, + -1106, + -982, + -884, + -802, + -733, + -673, + -619, + -546, + -461, + -388, + -324, + -269, + -212, + -211, + -151, + -100, + -195, + -336, + -472, + -2163, + -1817, + -1537, + -1324, + -1164, + -1040, + -942, + -860, + -791, + -731, + -676, + -604, + -519, + -445, + -380, + -325, + -268, + -226, + -219, + -147, + -114, + -167, + -280, + -2203, + -1857, + -1577, + -1365, + -1205, + -1081, + -982, + -901, + -831, + -771, + -717, + -644, + -559, + -485, + -420, + -364, + -306, + -252, + -239, + -206, + -132, + -122, + -163, + -2224, + -1878, + -1598, + -1386, + -1225, + -1102, + -1003, + -921, + -852, + -792, + -737, + -665, + -580, + -505, + -441, + -385, + -326, + -271, + -222, + -224, + -176, + -121, + -114, +}; +#endif diff --git a/lib_rend/ivas_lcld_tables.h b/lib_rend/ivas_lcld_tables.h new file mode 100644 index 0000000000..b50edae637 --- /dev/null +++ b/lib_rend/ivas_lcld_tables.h @@ -0,0 +1,567 @@ +/****************************************************************************************************** + + (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository. All Rights Reserved. + + This software is protected by copyright law and by international treaties. + The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository retain full ownership rights in their respective contributions in + the software. This notice grants no license of any kind, including but not limited to patent + license, nor is any license granted by implication, estoppel or otherwise. + + Contributors are required to enter into the IVAS codec Public Collaboration agreement before making + contributions. + + This software is provided "AS IS", without any express or implied warranties. The software is in the + development stage. It is intended exclusively for experts who have experience with such software and + solely for the purpose of inspection. All implied warranties of non-infringement, merchantability + and fitness for a particular purpose are hereby disclaimed and excluded. + + Any dispute, controversy or claim arising under or in relation to providing this software shall be + submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in + accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and + the United Nations Convention on Contracts on the International Sales of Goods. + +*******************************************************************************************************/ +#ifndef _IVAS_TABLES_H_ +#define _IVAS_TABLES_H_ + +#ifdef __cplusplus +extern "C" +{ +#endif +#include +#include // For NULL +#include "options.h" + +#ifndef M_PI + +#define M_PI 3.14159265358979323846264338327950288f + +#endif + +#define CQMF_BLOCKS_PER_FRAME ( 16 ) +#define CQMF_MAX_BLOCKS_PER_FRAME ( 16 ) +#define CQMF_BANDS ( 60 ) + +#define MAX_BANDS ( 23 ) +#define MAX_BANDS_48 ( 23 ) + + extern const int32_t c_aiBandwidths48[MAX_BANDS_48]; // move this + + +#define ENV_MIN ( -64 ) +#define ENV_MAX ( 64 ) + +#define ENV0_BITS ( 7 ) + +#define ENV_DELTA_MIN ( -32 ) +#define ENV_DELTA_MAX ( 31 ) + +#define ENV_RECONSTRUCT_TABLE_SIZE ( 129 ) + +#define ENV_RECONSTRUCT_TABLE_CENTER ( 64 ) + +#define MIN_ALLOC ( 0 ) +#define MAX_ALLOC ( 31 ) + +#define ALLOC_OFFSET_SCALE ( 8 ) + +#define ALLOC_OFFSET_BITS ( 8 ) + +#define MIN_ALLOC_OFFSET ( -128 ) +#define MAX_ALLOC_OFFSET ( 127 ) +#ifdef ROM_TO_RAM +#define READ_LENGTH ( 4 ) +#endif + +#define ALLOC_TABLE_SIZE ( 32 ) + +#ifndef _PI_ +#define _PI_ ( 3.14159265358979f ) +#endif +#define PRED_MAX_VAL ( 12 ) +#define PRED_MIN_VAL ( -PRED_MAX_VAL ) +#define PRED_QUANT_FACTOR ( (float) PRED_MAX_VAL ) +#define PRED_BAND0_BITS ( 5 ) + +#define PHASE_MAX_VAL ( 12 ) +#define PHASE_MIN_VAL ( -PHASE_MAX_VAL ) +#define PHASE_QUANT_FACTOR ( (float) PHASE_MAX_VAL / _PI_ ) +#define PHASE_DIFF_DIM ( 2 ) +#define PHASE_BAND0_BITS ( 5 ) + +#define SIMPLE_PHASE_MAX_VAL ( 3 ) +#define SIMPLE_PHASE_MIN_VAL ( 0 ) +#define SIMPLE_PHASE_BITS ( 2 ) +#define SIMPLE_PHASE_QUANT_FACTOR ( 2.0f / _PI_ ) + +#define TON_QUOTA_ABS_THRESHOLD ( 8.0f ) +#define TON_QUOTA_INC_THRESHOLD ( 4.0f ) + +#define MAX_BANDS_48 ( 23 ) + + //#define USE_DEMOD_TABLES + +#ifndef HUFF_READ_SIZE +#define HUFF_READ_SIZE ( 4 ) +#endif + +#ifndef HUFF_DEC_TABLE_SIZE +#define HUFF_DEC_TABLE_SIZE ( 16 ) +#endif + + extern const float c_afRotRealImag[PRED_MAX_VAL - PRED_MIN_VAL + 1][2]; + extern const float c_afRotRealImagSimple[SIMPLE_PHASE_MAX_VAL + 1][2]; + extern const int32_t c_aiDefaultTheta48[MAX_BANDS_48]; + + extern const float c_afScaleFactor[ALLOC_TABLE_SIZE]; + + extern const float c_afInvScaleFactor[ALLOC_TABLE_SIZE]; + + extern const float c_afRMSEnvReconstructTable[ENV_RECONSTRUCT_TABLE_SIZE]; + + extern const int32_t c_aiQuantMaxValues[ALLOC_TABLE_SIZE]; + + extern const int32_t c_aiHuffmanDim[ALLOC_TABLE_SIZE]; + + extern const int32_t c_aiHuffmanMod[ALLOC_TABLE_SIZE]; + + extern const int32_t c_aiHuffmanSize[ALLOC_TABLE_SIZE]; + +#ifndef ROM_TO_RAM + extern const uint32_t c_aauiCQMFHuffEnc1[16][2]; + + + extern const uint32_t c_aauiCQMFHuffDec1[3][16]; + + + extern const uint32_t c_aauiCQMFHuffEnc2[16][2]; + + + extern const uint32_t c_aauiCQMFHuffDec2[3][16]; + + extern const uint32_t c_aauiCQMFHuffEnc3[25][2]; + + + extern const uint32_t c_aauiCQMFHuffDec3[10][16]; + + extern const uint32_t c_aauiCQMFHuffEnc4[36][2]; + + + extern const uint32_t c_aauiCQMFHuffDec4[5][16]; + + extern const uint32_t c_aauiCQMFHuffEnc5[36][2]; + + + extern const uint32_t c_aauiCQMFHuffDec5[10][16]; + + extern const uint32_t c_aauiCQMFHuffEnc6[49][2]; + + + extern const uint32_t c_aauiCQMFHuffDec6[7][16]; + + extern const uint32_t c_aauiCQMFHuffEnc7[64][2]; + + + extern const uint32_t c_aauiCQMFHuffDec7[25][16]; + + extern const uint32_t c_aauiCQMFHuffEnc8[81][2]; + + + extern const uint32_t c_aauiCQMFHuffDec8[16][16]; + + extern const uint32_t c_aauiCQMFHuffEnc9[100][2]; + + + extern const uint32_t c_aauiCQMFHuffDec9[22][16]; + + extern const uint32_t c_aauiCQMFHuffEnc10[169][2]; + + + extern const uint32_t c_aauiCQMFHuffDec10[45][16]; + + extern const uint32_t c_aauiCQMFHuffEnc11[196][2]; + + + extern const uint32_t c_aauiCQMFHuffDec11[50][16]; + + extern const uint32_t c_aauiCQMFHuffEnc12[289][2]; + + + extern const uint32_t c_aauiCQMFHuffDec12[76][16]; + + extern const uint32_t c_aauiCQMFHuffEnc13[324][2]; + + + extern const uint32_t c_aauiCQMFHuffDec13[89][16]; + + extern const uint32_t c_aauiCQMFHuffEnc14[400][2]; + + + extern const uint32_t c_aauiCQMFHuffDec14[53][16]; + + extern const uint32_t c_aauiCQMFHuffEnc15[576][2]; + + + extern const uint32_t c_aauiCQMFHuffDec15[73][16]; + + extern const uint32_t c_aauiCQMFHuffEnc16[729][2]; + + + extern const uint32_t c_aauiCQMFHuffDec16[85][16]; + + extern const uint32_t c_aauiCQMFHuffEnc17[729][2]; + + + extern const uint32_t c_aauiCQMFHuffDec17[93][16]; + + extern const uint32_t c_aauiCQMFHuffEnc18[28][2]; + + + extern const uint32_t c_aauiCQMFHuffDec18[6][16]; + + extern const uint32_t c_aauiCQMFHuffEnc19[29][2]; + + + extern const uint32_t c_aauiCQMFHuffDec19[6][16]; + + extern const uint32_t c_aauiCQMFHuffEnc20[32][2]; + + + extern const uint32_t c_aauiCQMFHuffDec20[6][16]; + + extern const uint32_t c_aauiCQMFHuffEnc21[37][2]; + + + extern const uint32_t c_aauiCQMFHuffDec21[7][16]; + + extern const uint32_t c_aauiCQMFHuffEnc22[39][2]; + + + extern const uint32_t c_aauiCQMFHuffDec22[9][16]; + + extern const uint32_t c_aauiCQMFHuffEnc23[46][2]; + + + extern const uint32_t c_aauiCQMFHuffDec23[12][16]; + + extern const uint32_t c_aauiCQMFHuffEnc24[55][2]; + + + extern const uint32_t c_aauiCQMFHuffDec24[17][16]; + + extern const uint32_t c_aauiCQMFHuffEnc25[65][2]; + + + extern const uint32_t c_aauiCQMFHuffDec25[19][16]; + + extern const uint32_t c_aauiCQMFHuffEnc26[77][2]; + + + extern const uint32_t c_aauiCQMFHuffDec26[26][16]; + + extern const uint32_t c_aauiCQMFHuffEnc27[91][2]; + + + extern const uint32_t c_aauiCQMFHuffDec27[28][16]; + + extern const uint32_t c_aauiCQMFHuffEnc28[109][2]; + + + extern const uint32_t c_aauiCQMFHuffDec28[30][16]; + + extern const uint32_t c_aauiCQMFHuffEnc29[129][2]; + + + extern const uint32_t c_aauiCQMFHuffDec29[34][16]; + + extern const uint32_t c_aauiCQMFHuffEnc30[153][2]; + + + extern const uint32_t c_aauiCQMFHuffDec30[39][16]; + + extern const uint32_t c_aauiCQMFHuffEnc31[181][2]; + + + extern const uint32_t c_aauiCQMFHuffDec31[43][16]; + + extern const uint32_t c_aauiCQMFHuffEnc33[16][2]; + + + extern const uint32_t c_aauiCQMFHuffDec33[2][16]; + + extern const uint32_t c_aauiCQMFHuffEnc34[16][2]; + + + extern const uint32_t c_aauiCQMFHuffDec34[2][16]; + + extern const uint32_t c_aauiCQMFHuffEnc35[25][2]; + + + extern const uint32_t c_aauiCQMFHuffDec35[9][16]; + + extern const uint32_t c_aauiCQMFHuffEnc36[36][2]; + + + extern const uint32_t c_aauiCQMFHuffDec36[7][16]; + + extern const uint32_t c_aauiCQMFHuffEnc37[36][2]; + + + extern const uint32_t c_aauiCQMFHuffDec37[4][16]; + + extern const uint32_t c_aauiCQMFHuffEnc38[49][2]; + + + extern const uint32_t c_aauiCQMFHuffDec38[22][16]; + + extern const uint32_t c_aauiCQMFHuffEnc39[64][2]; + + + extern const uint32_t c_aauiCQMFHuffDec39[12][16]; + + extern const uint32_t c_aauiCQMFHuffEnc40[81][2]; + + + extern const uint32_t c_aauiCQMFHuffDec40[36][16]; + + extern const uint32_t c_aauiCQMFHuffEnc41[100][2]; + + + extern const uint32_t c_aauiCQMFHuffDec41[16][16]; + + extern const uint32_t c_aauiCQMFHuffEnc42[169][2]; + + + extern const uint32_t c_aauiCQMFHuffDec42[28][16]; + + extern const uint32_t c_aauiCQMFHuffEnc43[196][2]; + + + extern const uint32_t c_aauiCQMFHuffDec43[32][16]; + + extern const uint32_t c_aauiCQMFHuffEnc44[289][2]; + + + extern const uint32_t c_aauiCQMFHuffDec44[27][16]; + + extern const uint32_t c_aauiCQMFHuffEnc45[324][2]; + + + extern const uint32_t c_aauiCQMFHuffDec45[50][16]; + + extern const uint32_t c_aauiCQMFHuffEnc46[400][2]; + + + extern const uint32_t c_aauiCQMFHuffDec46[61][16]; + + extern const uint32_t c_aauiCQMFHuffEnc47[576][2]; + + + extern const uint32_t c_aauiCQMFHuffDec47[87][16]; + + extern const uint32_t c_aauiCQMFHuffEnc48[729][2]; + + + extern const uint32_t c_aauiCQMFHuffDec48[110][16]; + + extern const uint32_t c_aauiCQMFHuffEnc49[729][2]; + + + extern const uint32_t c_aauiCQMFHuffDec49[113][16]; + + extern const uint32_t c_aauiCQMFHuffEnc50[28][2]; + + + extern const uint32_t c_aauiCQMFHuffDec50[6][16]; + + extern const uint32_t c_aauiCQMFHuffEnc51[29][2]; + + + extern const uint32_t c_aauiCQMFHuffDec51[6][16]; + + extern const uint32_t c_aauiCQMFHuffEnc52[32][2]; + + + extern const uint32_t c_aauiCQMFHuffDec52[7][16]; + + extern const uint32_t c_aauiCQMFHuffEnc53[37][2]; + + + extern const uint32_t c_aauiCQMFHuffDec53[9][16]; + + extern const uint32_t c_aauiCQMFHuffEnc54[39][2]; + + + extern const uint32_t c_aauiCQMFHuffDec54[9][16]; + + extern const uint32_t c_aauiCQMFHuffEnc55[46][2]; + + + extern const uint32_t c_aauiCQMFHuffDec55[10][16]; + + extern const uint32_t c_aauiCQMFHuffEnc56[55][2]; + + + extern const uint32_t c_aauiCQMFHuffDec56[12][16]; + + extern const uint32_t c_aauiCQMFHuffEnc57[65][2]; + + + extern const uint32_t c_aauiCQMFHuffDec57[14][16]; + + extern const uint32_t c_aauiCQMFHuffEnc58[77][2]; + + + extern const uint32_t c_aauiCQMFHuffDec58[17][16]; + + extern const uint32_t c_aauiCQMFHuffEnc59[91][2]; + + + extern const uint32_t c_aauiCQMFHuffDec59[20][16]; + + extern const uint32_t c_aauiCQMFHuffEnc60[109][2]; + + + extern const uint32_t c_aauiCQMFHuffDec60[24][16]; + + extern const uint32_t c_aauiCQMFHuffEnc61[129][2]; + + + extern const uint32_t c_aauiCQMFHuffDec61[33][16]; + + extern const uint32_t c_aauiCQMFHuffEnc62[153][2]; + + + extern const uint32_t c_aauiCQMFHuffDec62[41][16]; + + extern const uint32_t c_aauiCQMFHuffEnc63[181][2]; + + + extern const uint32_t c_aauiCQMFHuffDec63[39][16]; + + + extern const uint32_t ( *c_apauiHuffEncTabels[2 * ALLOC_TABLE_SIZE] )[2]; + + extern const uint32_t ( *c_apauiHuffDecTables[2 * ALLOC_TABLE_SIZE] )[HUFF_DEC_TABLE_SIZE]; +#else +extern const uint16_t c_aauiCQMFHuffEnc1[16][2]; +extern const uint16_t c_aauiCQMFHuffEnc2[16][2]; +extern const uint16_t c_aauiCQMFHuffEnc3[25][2]; +extern const uint16_t c_aauiCQMFHuffEnc4[36][2]; +extern const uint16_t c_aauiCQMFHuffEnc5[36][2]; +extern const uint16_t c_aauiCQMFHuffEnc6[49][2]; +extern const uint16_t c_aauiCQMFHuffEnc7[64][2]; +extern const uint16_t c_aauiCQMFHuffEnc8[81][2]; +extern const uint16_t c_aauiCQMFHuffEnc9[100][2]; +extern const uint16_t c_aauiCQMFHuffEnc10[169][2]; +extern const uint16_t c_aauiCQMFHuffEnc11[196][2]; +extern const uint16_t c_aauiCQMFHuffEnc12[289][2]; +extern const uint16_t c_aauiCQMFHuffEnc13[324][2]; +extern const uint16_t c_aauiCQMFHuffEnc14[400][2]; +extern const uint16_t c_aauiCQMFHuffEnc15[576][2]; +extern const uint16_t c_aauiCQMFHuffEnc16[729][2]; +extern const uint16_t c_aauiCQMFHuffEnc17[729][2]; +extern const uint16_t c_aauiCQMFHuffEnc18[28][2]; +extern const uint16_t c_aauiCQMFHuffEnc19[29][2]; +extern const uint16_t c_aauiCQMFHuffEnc20[32][2]; +extern const uint16_t c_aauiCQMFHuffEnc21[37][2]; +extern const uint16_t c_aauiCQMFHuffEnc22[39][2]; +extern const uint16_t c_aauiCQMFHuffEnc23[46][2]; +extern const uint16_t c_aauiCQMFHuffEnc24[55][2]; +extern const uint16_t c_aauiCQMFHuffEnc25[65][2]; +extern const uint16_t c_aauiCQMFHuffEnc26[77][2]; +extern const uint16_t c_aauiCQMFHuffEnc27[91][2]; +extern const uint16_t c_aauiCQMFHuffEnc28[109][2]; +extern const uint16_t c_aauiCQMFHuffEnc29[129][2]; +extern const uint16_t c_aauiCQMFHuffEnc30[153][2]; +extern const uint16_t c_aauiCQMFHuffEnc31[181][2]; +extern const uint16_t c_aauiCQMFHuffEnc33[16][2]; +extern const uint16_t c_aauiCQMFHuffEnc34[16][2]; +extern const uint16_t c_aauiCQMFHuffEnc35[25][2]; +extern const uint16_t c_aauiCQMFHuffEnc36[36][2]; +extern const uint16_t c_aauiCQMFHuffEnc37[36][2]; +extern const uint16_t c_aauiCQMFHuffEnc38[49][2]; +extern const uint16_t c_aauiCQMFHuffEnc39[64][2]; +extern const uint16_t c_aauiCQMFHuffEnc40[81][2]; +extern const uint16_t c_aauiCQMFHuffEnc41[100][2]; +extern const uint16_t c_aauiCQMFHuffEnc42[169][2]; +extern const uint16_t c_aauiCQMFHuffEnc43[196][2]; +extern const uint16_t c_aauiCQMFHuffEnc44[289][2]; +extern const uint16_t c_aauiCQMFHuffEnc45[324][2]; +extern const uint16_t c_aauiCQMFHuffEnc46[400][2]; +extern const uint16_t c_aauiCQMFHuffEnc47[576][2]; +extern const uint16_t c_aauiCQMFHuffEnc48[729][2]; +extern const uint16_t c_aauiCQMFHuffEnc49[729][2]; +extern const uint16_t c_aauiCQMFHuffEnc50[28][2]; +extern const uint16_t c_aauiCQMFHuffEnc51[29][2]; +extern const uint16_t c_aauiCQMFHuffEnc52[32][2]; +extern const uint16_t c_aauiCQMFHuffEnc53[37][2]; +extern const uint16_t c_aauiCQMFHuffEnc54[39][2]; +extern const uint16_t c_aauiCQMFHuffEnc55[46][2]; +extern const uint16_t c_aauiCQMFHuffEnc56[55][2]; +extern const uint16_t c_aauiCQMFHuffEnc57[65][2]; +extern const uint16_t c_aauiCQMFHuffEnc58[77][2]; +extern const uint16_t c_aauiCQMFHuffEnc59[91][2]; +extern const uint16_t c_aauiCQMFHuffEnc60[109][2]; +extern const uint16_t c_aauiCQMFHuffEnc61[129][2]; +extern const uint16_t c_aauiCQMFHuffEnc62[153][2]; +extern const uint16_t c_aauiCQMFHuffEnc63[181][2]; +extern const uint16_t ( *c_apauiHuffEncTabels[2 * ALLOC_TABLE_SIZE] )[2]; +extern const uint32_t num_row_aauiCQMFHuff[2 * ALLOC_TABLE_SIZE]; +#endif + +#ifdef USE_DEMOD_TABLES + extern const int32_t c_aaiHuffDemod1[16][2]; + + extern const int32_t c_aaiHuffDemod2[16][2]; + + extern const int32_t c_aaiHuffDemod3[25][2]; + + extern const int32_t c_aaiHuffDemod4[36][2]; + + extern const int32_t c_aaiHuffDemod5[36][2]; + + extern const int32_t c_aaiHuffDemod6[49][2]; + + extern const int32_t c_aaiHuffDemod7[64][2]; + + extern const int32_t c_aaiHuffDemod8[81][2]; + + extern const int32_t c_aaiHuffDemod9[100][2]; + + extern const int32_t c_aaiHuffDemod10[169][2]; + + extern const int32_t c_aaiHuffDemod11[196][2]; + + extern const int32_t c_aaiHuffDemod12[289][2]; + + extern const int32_t c_aaiHuffDemod13[324][2]; + + extern const int32_t c_aaiHuffDemod14[400][2]; + + extern const int32_t c_aaiHuffDemod15[576][2]; + + extern const int32_t c_aaiHuffDemod16[729][2]; + + extern const int32_t c_aaiHuffDemod17[729][2]; + + extern const int32_t ( *c_apaiDemodTables[ALLOC_TABLE_SIZE] )[2]; +#endif + + extern const uint32_t c_aaiRMSEnvHuffEnc[64][2]; + + extern const uint32_t c_aaiRMSEnvHuffDec[13][HUFF_DEC_TABLE_SIZE]; + +#ifdef __cplusplus +} +#endif + +#endif /* _TABLES_H_ */ diff --git a/lib_rend/ivas_lib_rend_internal.h b/lib_rend/ivas_lib_rend_internal.h deleted file mode 100644 index 8c0500c187..0000000000 --- a/lib_rend/ivas_lib_rend_internal.h +++ /dev/null @@ -1,250 +0,0 @@ -/****************************************************************************************************** - - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository. All Rights Reserved. - - This software is protected by copyright law and by international treaties. - The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository retain full ownership rights in their respective contributions in - the software. This notice grants no license of any kind, including but not limited to patent - license, nor is any license granted by implication, estoppel or otherwise. - - Contributors are required to enter into the IVAS codec Public Collaboration agreement before making - contributions. - - This software is provided "AS IS", without any express or implied warranties. The software is in the - development stage. It is intended exclusively for experts who have experience with such software and - solely for the purpose of inspection. All implied warranties of non-infringement, merchantability - and fitness for a particular purpose are hereby disclaimed and excluded. - - Any dispute, controversy or claim arising under or in relation to providing this software shall be - submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in - accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and - the United Nations Convention on Contracts on the International Sales of Goods. - -*******************************************************************************************************/ - -#include "ivas_error.h" -#include "lib_rend.h" -#include "ivas_stat_dec.h" - -#ifndef IVAS_LIB_REND_INTERNALS_H -#define IVAS_LIB_REND_INTERNALS_H - -typedef struct -{ - int8_t headRotEnabled; - IVAS_QUATERNION headPositions[RENDERER_HEAD_POSITIONS_PER_FRAME]; - float crossfade[L_FRAME48k / RENDERER_HEAD_POSITIONS_PER_FRAME]; -#ifdef SPLIT_REND_WITH_HEAD_ROT - IVAS_SPLIT_REND_ROT_AXIS sr_pose_pred_axis; -#endif -} IVAS_REND_HeadRotData; - -typedef struct -{ - int32_t binaural_latency_ns; - BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd; - TDREND_HRFILT_FiltSet_t *hHrtfTD; -} TDREND_WRAPPER; - -typedef struct -{ - int32_t binaural_latency_ns; -#ifdef SPLIT_REND_WITH_HEAD_ROT - CREND_HANDLE hCrend[MAX_HEAD_ROT_POSES]; -#else - CREND_HANDLE hCrend; -#endif - HRTFS_HANDLE hHrtfCrend; -} CREND_WRAPPER; - -#ifdef SPLIT_REND_WITH_HEAD_ROT -typedef struct -{ - int32_t binaural_latency_ns; - BINAURAL_RENDERER_HANDLE hCldfbRend; -} CLDFB_REND_WRAPPER; -#endif - -IVAS_REND_AudioConfigType getAudioConfigType( - const IVAS_REND_AudioConfig config ); - -ivas_error getAudioConfigNumChannels( - const IVAS_REND_AudioConfig config, - int16_t *numChannels ); - -AUDIO_CONFIG getIvasAudioConfigFromRendAudioConfig( - IVAS_REND_AudioConfig config ); - -#ifdef SPLIT_REND_WITH_HEAD_ROT -ivas_error ivas_rend_openMultiBinCrend( - CREND_WRAPPER *pCrend, - const IVAS_REND_AudioConfig inConfig, - const IVAS_REND_AudioConfig outConfig, - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, - const int32_t output_Fs ); -#endif - -ivas_error ivas_rend_openCrend( - CREND_WRAPPER *pCrend, - const IVAS_REND_AudioConfig inConfig, - const IVAS_REND_AudioConfig outConfig, - RENDER_CONFIG_DATA *hRendCfg, - const int32_t output_Fs -#ifdef SPLIT_REND_WITH_HEAD_ROT - , - const int16_t pos_idx -#endif -); - -#ifdef SPLIT_REND_WITH_HEAD_ROT -void ivas_rend_CldfbMultiBinRendProcess( - const BINAURAL_RENDERER_HANDLE hCldfbRend, - const IVAS_REND_HeadRotData *pHeadRotData, - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, - float Cldfb_In_Real[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - float Cldfb_In_Imag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - float Cldfb_Out_Real[][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : Binaural signals */ - float Cldfb_Out_Imag[][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - const int16_t low_res_pre_rend_rot ); - -ivas_error ivas_rend_openCldfb( - HANDLE_CLDFB_FILTER_BANK cldfbAna[MAX_INPUT_CHANNELS], - const IVAS_REND_AudioConfig inConfig, - const int32_t output_Fs ); -ivas_error ivas_rend_openCldfbRend( - CLDFB_REND_WRAPPER *pCldfbRend, - const IVAS_REND_AudioConfig inConfig, - const IVAS_REND_AudioConfig outConfig, - RENDER_CONFIG_DATA *hRendCfg, -#ifdef SPLIT_REND_WITH_HEAD_ROT - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, -#endif - const int32_t output_Fs ); - -void ivas_mat_mult_2by2_complex( float in_re1[2][2], - float in_im1[2][2], - float in_re2[2][2], - float in_im2[2][2], - float out_re2[2][2], - float out_im2[2][2] ); -void ivas_split_rend_bitstream_init( ivas_split_rend_bits_t *pBits, const int32_t buf_len_bytes, uint8_t *pbuf ); -void ivas_split_rend_huffman_dec_init_min_max_len( ivas_split_rend_huffman_cfg_t *p_huff_cfg ); -void ivas_split_rend_init_huff_cfg( BIN_HR_SPLIT_REND_HUFF_HANDLE pHuff_cfg ); -void set_fix_rotation_mat( float fix_pos_rot_mat[][BINAURAL_CHANNELS][BINAURAL_CHANNELS], - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData ); -void set_pose_types( IVAS_SPLIT_REND_POSE_TYPE pose_type[MAX_HEAD_ROT_POSES - 1], MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData ); -int16_t wrap_a( int16_t val, int16_t min_val, int16_t max_val ); -void ivas_SplitRenderer_getdiagdiff( - int16_t in_idx[BINAURAL_CHANNELS][BINAURAL_CHANNELS], - int16_t out_idx[BINAURAL_CHANNELS][BINAURAL_CHANNELS], - const int16_t sign, - const int16_t min_val, - const int16_t max_val ); -void ivas_split_rend_bitstream_write_int32( ivas_split_rend_bits_t *pBits, int32_t val, int32_t bits ); -int32_t ivas_split_rend_bitstream_read_int32( ivas_split_rend_bits_t *pBits, int32_t bits ); -IVAS_QUATERNION ivas_split_rend_get_sf_rot_data( - const IVAS_QUATERNION headPositions[RENDERER_HEAD_POSITIONS_PER_FRAME], - int16_t subframe_idx ); - -void ivas_rend_closeCldfbRend( CLDFB_REND_WRAPPER *pCldfbRend ); -int32_t ivas_get_lcld_bitrate( const int32_t SplitRendBitRate ); -#ifdef SPLIT_REND_LC3PLUS -#ifdef SPLIT_REND_TD_POSE_CORRECTION -int32_t ivas_get_max_td_pose_correction_bitrate( void ); -#endif -int32_t ivas_get_lc3plus_bitrate( const int32_t SplitRendBitRate -#ifdef SPLIT_REND_TD_POSE_CORRECTION - , - IVAS_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode -#endif -); -int8_t ivas_get_lc3plus_bitrate_id( const int32_t SplitRendBitRate ); -int32_t ivas_get_lc3plus_size_from_id( const int8_t SplitRendBitRateId -#ifdef SPLIT_REND_TD_POSE_CORRECTION - , - int16_t codec_mode -#endif -); -#endif -int32_t ivas_get_split_rend_md_target_brate( const int32_t SplitRendBitRate, const int16_t pcm_out ); -void ivas_split_rend_get_quant_params( - const int16_t num_md_bands, - int16_t pred_real_bands_yaw[IVAS_SPLIT_REND_NUM_QUANT_STRATS], - int16_t pred_imag_bands_yaw[IVAS_SPLIT_REND_NUM_QUANT_STRATS], - int16_t d_bands_yaw[IVAS_SPLIT_REND_NUM_QUANT_STRATS], - int16_t bands_pitch[IVAS_SPLIT_REND_NUM_QUANT_STRATS], - int16_t pred_real_bands_roll[IVAS_SPLIT_REND_NUM_QUANT_STRATS], - int16_t pred_imag_bands_roll[IVAS_SPLIT_REND_NUM_QUANT_STRATS], - int16_t *num_quant_strats, - int16_t *num_complex_bands ); -#endif - -ivas_error ivas_rend_initCrend( - CREND_WRAPPER *pCrend, - const IVAS_REND_AudioConfig inConfig, - const IVAS_REND_AudioConfig outConfig, - RENDER_CONFIG_DATA *hRendCfg, - const int32_t output_Fs ); - -ivas_error ivas_rend_closeCrend( - CREND_WRAPPER *pCrend -#ifdef SPLIT_REND_WITH_HEAD_ROT - , - int16_t pos_idx -#endif -); - -ivas_error ivas_rend_crendProcess( - const CREND_WRAPPER *pCrend, - const IVAS_REND_AudioConfig inConfig, - const IVAS_REND_AudioConfig outConfig, - float output[][L_FRAME48k], /* i/o: input/output audio channels */ - const int32_t output_Fs -#ifdef SPLIT_REND_WITH_HEAD_ROT - , - const int16_t pos_idx -#endif -); - -ivas_error ivas_rend_crendConvolver( - const CREND_WRAPPER *pCrend, - const IVAS_REND_AudioConfig inConfig, - const IVAS_REND_AudioConfig outConfig, - float pcm_in[][L_FRAME48k], - float pcm_out[][L_FRAME48k], - const int32_t output_Fs, - const int16_t i_ts -#ifdef SPLIT_REND_WITH_HEAD_ROT - , - const int16_t pos_idx -#endif -); - -ivas_error ivas_rend_TDObjRenderFrame( - const TDREND_WRAPPER *pTDRend, /* i : TD Renderer wrapper structure */ - const IVAS_REND_AudioConfig inConfig, /* i : Input audio configuration */ - const LSSETUP_CUSTOM_STRUCT *customLsInput, /* i : Input custom loudspeaker layout */ - const IVAS_REND_HeadRotData *headRotData, /* i : Input head positions */ - const IVAS_REND_AudioObjectPosition *currentPos, /* i : Object position */ - const int16_t output_frame, /* i : output frame length */ -#ifndef FIX_ITD - const int32_t output_Fs, /* i : output sampling rate */ -#endif - float output[][L_FRAME48k] /* i/o: SCE channels / Binaural synthesis */ -); - -ivas_error ivas_rend_TDObjRendOpen( - TDREND_WRAPPER *pTDRend, - const IVAS_REND_AudioConfig inConfig, - LSSETUP_CUSTOM_STRUCT *customLsInput, - const int32_t output_Fs ); - -#endif diff --git a/lib_rend/ivas_limiter.c b/lib_rend/ivas_limiter.c index 56dbb39b07..28c272bc0c 100644 --- a/lib_rend/ivas_limiter.c +++ b/lib_rend/ivas_limiter.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -29,14 +29,13 @@ the United Nations Convention on Contracts on the International Sales of Goods. *******************************************************************************************************/ -// VE2AT: keep in lib_rend or move to lib_dec ? -#include -#include -#include -#include "ivas_prot.h" +#include +#include "options.h" +#include #include "prot.h" -#include "wmops.h" +#include "ivas_prot_rend.h" +#include "wmc_auto.h" #include @@ -115,11 +114,14 @@ IVAS_LIMITER_HANDLE ivas_limiter_open( return NULL; } - hLimiter = count_malloc( sizeof( IVAS_LIMITER ) ); + if ( ( hLimiter = malloc( sizeof( IVAS_LIMITER ) ) ) == NULL ) + { + return NULL; + } hLimiter->max_num_channels = max_num_channels; hLimiter->num_channels = max_num_channels; - hLimiter->channel_ptrs = count_malloc( max_num_channels * sizeof( float * ) ); + hLimiter->channel_ptrs = malloc( max_num_channels * sizeof( float * ) ); hLimiter->sampling_rate = sampling_rate; hLimiter->gain = 1.f; hLimiter->release_heuristic = 0.f; @@ -153,8 +155,8 @@ void ivas_limiter_close( return; } - count_free( ( *phLimiter )->channel_ptrs ); - count_free( *phLimiter ); + free( ( *phLimiter )->channel_ptrs ); + free( *phLimiter ); *phLimiter = NULL; return; diff --git a/lib_rend/ivas_objectRenderer.c b/lib_rend/ivas_objectRenderer.c index e56577201c..59e2d1161a 100644 --- a/lib_rend/ivas_objectRenderer.c +++ b/lib_rend/ivas_objectRenderer.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -30,52 +30,48 @@ *******************************************************************************************************/ +#include "ivas_stat_rend.h" #include #include "options.h" #include "prot.h" +#include "ivas_prot_rend.h" +#ifdef SPLIT_REND_LC3PLUS #include "ivas_prot.h" +#endif #include -#include "wmops.h" #include "ivas_rom_com.h" -#include "lib_rend.h" -#include "ivas_lib_rend_internal.h" #ifdef DEBUGGING #include "debug.h" #endif +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local function prototypes *---------------------------------------------------------------------*/ -#ifdef FIX_ITD -static ivas_error TDREND_GetMix( BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, float output[][L_FRAME48k], const int16_t subframe_length, const int16_t subframe_idx ); -#else -static ivas_error TDREND_GetMix( BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, float output[][L_FRAME48k], const int16_t subframe_length, const int32_t output_Fs, const int16_t subframe_idx ); -#endif static void TDREND_Clear_Update_flags( BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd ); - -static void TDREND_Update_listener_orientation( BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, - const int16_t headRotEnabled, - const IVAS_QUATERNION *headPosition ); -static void TDREND_Update_object_positions( BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, - const int16_t numSources, - const int16_t lfe_idx, - const IVAS_FORMAT in_format, - const ISM_METADATA_HANDLE *hIsmMetaData, - float output[][L_FRAME48k] ); +static void angles_to_vec( const float radius, const float azimuth, const float elevation, float *vec ); /*---------------------------------------------------------------------* - * ivas_td_binaural_open() + * ivas_td_binaural_open_unwrap() * - * Open and initialize TD Object binaural renderer + * Call TD open/init function without st_ivas *---------------------------------------------------------------------*/ -ivas_error ivas_td_binaural_open( - Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +ivas_error ivas_td_binaural_open_unwrap( + TDREND_HRFILT_FiltSet_t **hHrtfTD, /* i/o: HR filter model (from file or NULL) */ + const int32_t output_Fs, /* i : Output sampling rate */ + const int16_t nchan_transport, /* i : Number of channels */ + const IVAS_FORMAT ivas_format, /* i : IVAS format (ISM/MC) */ + const AUDIO_CONFIG transport_config, /* i : Transport configuration */ + const float *directivity, /* i : Directivity pattern (used for ISM) */ + const IVAS_OUTPUT_SETUP hTransSetup, /* i : Loudspeaker layout */ + BINAURAL_TD_OBJECT_RENDERER_HANDLE *hBinRendererTd, /* o : TD renderer handle */ + int32_t *binaural_latency_ns /* i : Binauralization delay */ ) { - BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd; + BINAURAL_TD_OBJECT_RENDERER_HANDLE pBinRendTd; TDREND_PosType_t PosType; int16_t nS; int16_t SrcInd[MAX_NUM_TDREND_CHANNELS]; @@ -88,59 +84,61 @@ ivas_error ivas_td_binaural_open( error = IVAS_ERR_OK; - if ( ( hBinRendererTd = count_malloc( sizeof( BINAURAL_TD_OBJECT_RENDERER ) ) ) == NULL ) + if ( ( pBinRendTd = malloc( sizeof( BINAURAL_TD_OBJECT_RENDERER ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD renderer\n" ) ); } - if ( ( hBinRendererTd->TdRend_MixSpatSpec_p = count_malloc( sizeof( TDREND_MixSpatSpec_t ) ) ) == NULL ) + if ( ( pBinRendTd->TdRend_MixSpatSpec_p = malloc( sizeof( TDREND_MixSpatSpec_t ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD renderer\n" ) ); } - if ( ( hBinRendererTd->DirAtten_p = count_malloc( sizeof( TDREND_DirAtten_t ) ) ) == NULL ) + if ( ( pBinRendTd->DirAtten_p = malloc( sizeof( TDREND_DirAtten_t ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD renderer\n" ) ); } - if ( ( hBinRendererTd->Listener_p = count_malloc( sizeof( TDREND_MIX_Listener_t ) ) ) == NULL ) + if ( ( pBinRendTd->Listener_p = malloc( sizeof( TDREND_MIX_Listener_t ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD renderer\n" ) ); } - hBinRendererTd->NumOfSrcs = 0; - hBinRendererTd->MaxSrcInd = -1; + pBinRendTd->NumOfSrcs = 0; + pBinRendTd->MaxSrcInd = -1; /* Mixer spatial setup */ - hBinRendererTd->TdRend_MixSpatSpec_p->UseCommonDistAttenModel = TRUE; - hBinRendererTd->TdRend_MixSpatSpec_p->DistAttenModel = 0; /* 0=Turned off, else use TDREND_DIST_ATTEN_MODEL_INV_DIST_CLAMPED */ + pBinRendTd->TdRend_MixSpatSpec_p->UseCommonDistAttenModel = TRUE; + pBinRendTd->TdRend_MixSpatSpec_p->DistAttenModel = 0; /* 0=Turned off, else use TDREND_DIST_ATTEN_MODEL_INV_DIST_CLAMPED */ - TDREND_MIX_Init( hBinRendererTd, &st_ivas->hHrtfTD, hBinRendererTd->TdRend_MixSpatSpec_p, st_ivas->hDecoderConfig->output_Fs ); + if ( ( error = TDREND_MIX_Init( pBinRendTd, hHrtfTD, pBinRendTd->TdRend_MixSpatSpec_p, output_Fs ) ) != IVAS_ERR_OK ) + { + return error; + } /* Set the attenuation (or can set MixSpatSpec.DistAttenModel above) */ - TDREND_MIX_SetDistAttenModel( hBinRendererTd, TDREND_DIST_ATTEN_MODEL_INV_DIST_CLAMPED ); + if ( ( error = TDREND_MIX_SetDistAttenModel( pBinRendTd, TDREND_DIST_ATTEN_MODEL_INV_DIST_CLAMPED ) ) != IVAS_ERR_OK ) + { + return error; + } /* Add sources to module and mixer, headphones */ PosType = TDREND_POSTYPE_ABSOLUTE; /* or TDREND_POSTYPE_RELATIVE_TO_LISTENER */ - nchan_rend = st_ivas->nchan_transport; - if ( st_ivas->ivas_format == MC_FORMAT ) + nchan_rend = nchan_transport; + if ( ( ivas_format == MC_FORMAT ) && ( transport_config != AUDIO_CONFIG_LS_CUSTOM ) ) { nchan_rend--; /* Skip LFE channel -- added to the others */ } for ( nS = 0; nS < nchan_rend; nS++ ) { -#ifdef FIX_ITD - if ( ( error = TDREND_MIX_AddSrc( hBinRendererTd, &SrcInd[nS], PosType ) ) != IVAS_ERR_OK ) -#else - if ( ( error = TDREND_MIX_AddSrc( hBinRendererTd, &SrcInd[nS], PosType, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK ) -#endif + if ( ( error = TDREND_MIX_AddSrc( pBinRendTd, &SrcInd[nS], PosType ) ) != IVAS_ERR_OK ) { return error; } } - if ( st_ivas->ivas_format == MC_FORMAT ) + if ( ivas_format == MC_FORMAT ) { - switch ( st_ivas->transport_config ) + switch ( transport_config ) { case AUDIO_CONFIG_5_1: ls_azimuth = ls_azimuth_CICP6; @@ -163,22 +161,20 @@ ivas_error ivas_td_binaural_open( ls_elevation = ls_elevation_CICP19; break; case AUDIO_CONFIG_LS_CUSTOM: - ls_azimuth = st_ivas->hTransSetup.ls_azimuth; - ls_elevation = st_ivas->hTransSetup.ls_elevation; + ls_azimuth = hTransSetup.ls_azimuth; + ls_elevation = hTransSetup.ls_elevation; break; default: ls_azimuth = NULL; ls_elevation = NULL; } - DirAtten_p = hBinRendererTd->DirAtten_p; + DirAtten_p = pBinRendTd->DirAtten_p; for ( nS = 0; nS < nchan_rend; nS++ ) { /* Set source positions according to loudspeaker layout */ - Pos[0] = cosf( ls_elevation[nS] * PI_OVER_180 ) * cosf( ls_azimuth[nS] * PI_OVER_180 ); - Pos[1] = cosf( ls_elevation[nS] * PI_OVER_180 ) * sinf( ls_azimuth[nS] * PI_OVER_180 ); - Pos[2] = sinf( ls_elevation[nS] * PI_OVER_180 ); + angles_to_vec( 1.0f, ls_azimuth[nS], ls_elevation[nS], Pos ); Dir[0] = 1.0f; Dir[1] = 0.0f; Dir[2] = 0.0f; @@ -188,16 +184,36 @@ ivas_error ivas_td_binaural_open( DirAtten_p->ConeOuterAngle = 360.0f; DirAtten_p->ConeOuterGain = 1.0f; - TDREND_MIX_SRC_SetPos( hBinRendererTd, nS, Pos ); - TDREND_MIX_SRC_SetDir( hBinRendererTd, nS, Dir ); - TDREND_MIX_SRC_SetPlayState( hBinRendererTd, nS, TDREND_PLAYSTATUS_PLAYING ); - TDREND_MIX_SRC_SetDirAtten( hBinRendererTd, nS, DirAtten_p ); + TDREND_MIX_SRC_SetPos( pBinRendTd, nS, Pos ); + TDREND_MIX_SRC_SetDir( pBinRendTd, nS, Dir ); + TDREND_MIX_SRC_SetPlayState( pBinRendTd, nS, TDREND_PLAYSTATUS_PLAYING ); + TDREND_MIX_SRC_SetDirAtten( pBinRendTd, nS, DirAtten_p ); } } + if ( ivas_format == ISM_FORMAT ) + { + DirAtten_p = pBinRendTd->DirAtten_p; + if ( NULL == directivity ) + { + DirAtten_p->ConeInnerAngle = 360.0f; /* Front cone */ + DirAtten_p->ConeOuterAngle = 360.0f; /* Back cone */ + DirAtten_p->ConeOuterGain = 1.0f; /* Back attenuation */ + } + else + { + DirAtten_p->ConeInnerAngle = directivity[0]; + DirAtten_p->ConeOuterAngle = directivity[1]; + DirAtten_p->ConeOuterGain = directivity[2]; + } - st_ivas->hBinRendererTd = hBinRendererTd; + for ( nS = 0; nS < nchan_rend; nS++ ) + { + TDREND_MIX_SRC_SetDirAtten( pBinRendTd, nS, DirAtten_p ); + } + } - st_ivas->binaural_latency_ns = (int32_t) ( BINAURAL_TD_LATENCY_S * 1000000000.f ); + *hBinRendererTd = pBinRendTd; + *binaural_latency_ns = (int32_t) ( ( *hBinRendererTd )->HrFiltSet_p->latency_s * 1000000000.f ); return error; } @@ -218,79 +234,77 @@ void ivas_td_binaural_close( return; } - count_free( ( *hBinRendererTd )->TdRend_MixSpatSpec_p ); - count_free( ( *hBinRendererTd )->DirAtten_p ); + free( ( *hBinRendererTd )->TdRend_MixSpatSpec_p ); + free( ( *hBinRendererTd )->DirAtten_p ); TDREND_MIX_Dealloc( *hBinRendererTd ); - count_free( *hBinRendererTd ); + free( *hBinRendererTd ); *hBinRendererTd = NULL; return; } - /*---------------------------------------------------------------------* - * ObjRenderIVASFrame() + * ivas_td_binaural_renderer_unwrap() * - * Receives the current frames for the object streams, updates metadata - * and renders the current frame. + * Call ivas_td_binaural_renderer() without st_ivas. *---------------------------------------------------------------------*/ -void ObjRenderIVASFrame( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - float output[][L_FRAME48k], /* i/o: SCE channels / Binaural synthesis */ - const int16_t output_frame /* i : output frame length */ +ivas_error ivas_td_binaural_renderer_unwrap( + const REVERB_HANDLE hReverb, /* i : Reverberator handle */ + const AUDIO_CONFIG transport_config, /* i : Transport configuration */ + BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD binaural object renderer handle */ + const int16_t num_src, /* i : number of sources to render */ + const int16_t lfe_idx, /* i : LFE channel index */ + const IVAS_FORMAT ivas_format, /* i : IVAS format */ + ISM_METADATA_HANDLE *hIsmMetaData, /* i : ISM metadata handle */ + const int16_t Opt_Headrotation, /* i : Head rotation flag */ + const IVAS_QUATERNION *Quaternions, /* i : Head tracking data per subframe */ + const IVAS_VECTOR3 *Pos, /* i : Listener position data per subframe */ + float output[][L_FRAME48k], /* i/o: SCE channels / Binaural synthesis */ + const int16_t output_frame /* i : output frame length */ ) { int16_t subframe_length; int16_t subframe_idx; float reverb_signal[BINAURAL_CHANNELS][L_FRAME48k]; + ivas_error error; subframe_length = output_frame / MAX_PARAM_SPATIAL_SUBFRAMES; - if ( st_ivas->hRenderConfig != NULL ) /* Renderer Configuration not enabled in TD standalone renderer */ - { - - if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on && ( st_ivas->ini_frame == 0 ) ) - { - ivas_reverb_open( &st_ivas->hCrend->hReverb, st_ivas->transport_config, NULL, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ); - } - } /* Update object position(s) */ - TDREND_Update_object_positions( st_ivas->hBinRendererTd, st_ivas->nchan_transport, LFE_CHANNEL, st_ivas->ivas_format, st_ivas->hIsmMetaData, output ); + TDREND_Update_object_positions( hBinRendererTd, num_src, lfe_idx, ivas_format, hIsmMetaData, output ); for ( subframe_idx = 0; subframe_idx < MAX_PARAM_SPATIAL_SUBFRAMES; subframe_idx++ ) { /* Update the listener's location/orientation */ - TDREND_Update_listener_orientation( st_ivas->hBinRendererTd, - st_ivas->hDecoderConfig->Opt_Headrotation, - ( st_ivas->hHeadTrackData != NULL ) ? &st_ivas->hHeadTrackData->Quaternions[subframe_idx] : NULL ); + TDREND_Update_listener_orientation( hBinRendererTd, Opt_Headrotation, ( Quaternions != NULL ) ? &Quaternions[subframe_idx] : NULL, ( Pos != NULL ) ? &Pos[subframe_idx] : NULL ); - if ( ( st_ivas->hRenderConfig != NULL ) && ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on ) ) + if ( hReverb != NULL && hReverb->pConfig.roomAcoustics.late_reverb_on ) { - ivas_reverb_process( st_ivas->hCrend->hReverb, st_ivas->transport_config, 0, output, reverb_signal, subframe_idx ); + if ( ( error = ivas_reverb_process( hReverb, transport_config, 0, output, reverb_signal, subframe_idx ) ) != IVAS_ERR_OK ) + { + return error; + } } /* Render subframe */ -#ifdef FIX_ITD - TDREND_GetMix( st_ivas->hBinRendererTd, output, subframe_length, subframe_idx ); -#else - TDREND_GetMix( st_ivas->hBinRendererTd, output, subframe_length, st_ivas->hDecoderConfig->output_Fs, subframe_idx ); -#endif + if ( ( error = TDREND_GetMix( hBinRendererTd, output, subframe_length, subframe_idx ) ) != IVAS_ERR_OK ) + { + return error; + } } - if ( st_ivas->hRenderConfig != NULL ) /* Renderer Configuration not enabled in TD standalone renderer */ + + if ( hReverb != NULL && hReverb->pConfig.roomAcoustics.late_reverb_on ) { - if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on ) - { - /* add reverb to rendered signals */ - v_add( reverb_signal[0], output[0], output[0], output_frame ); - v_add( reverb_signal[1], output[1], output[1], output_frame ); - } + /* add reverb to rendered signals */ + v_add( reverb_signal[0], output[0], output[0], output_frame ); + v_add( reverb_signal[1], output[1], output[1], output_frame ); } - return; + return IVAS_ERR_OK; } @@ -299,14 +313,12 @@ void ObjRenderIVASFrame( * * Render one 5 ms subframe from the mixer *---------------------------------------------------------------------*/ -static ivas_error TDREND_GetMix( + +ivas_error TDREND_GetMix( BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ - float output[][L_FRAME48k], /* i/o: ISm object synth / rendered output in 0,1 */ + float output[][L_FRAME48k], /* i/o: ISM object synth / rendered output in 0,1 */ const int16_t subframe_length, /* i/o: subframe length */ -#ifndef FIX_ITD - const int32_t output_Fs, /* i : Output sampling rate */ -#endif - const int16_t subframe_idx /* i : Subframe index to 5 ms subframe */ + const int16_t subframe_idx /* i : Subframe index to 5 ms subframe */ ) { int16_t i; @@ -315,23 +327,19 @@ static ivas_error TDREND_GetMix( TDREND_SRC_REND_t *SrcRend_p; ivas_error error; float output_buf[2][L_SPATIAL_SUBFR_48k]; /* Temp buffer for left/right rendered signal */ -#ifdef FIX_ITD float hrf_left_delta[SFX_SPAT_BIN_MAX_FILTER_LENGTH]; float hrf_right_delta[SFX_SPAT_BIN_MAX_FILTER_LENGTH]; int16_t intp_count; -#endif error = IVAS_ERR_OK; /* Clear the output buffer to accumulate rendered sources */ set_f( output_buf[0], 0.0f, subframe_length ); set_f( output_buf[1], 0.0f, subframe_length ); -#ifdef FIX_ITD /* Clear interpolation buffers and counter */ set_f( hrf_left_delta, 0.0f, SFX_SPAT_BIN_MAX_FILTER_LENGTH ); set_f( hrf_right_delta, 0.0f, SFX_SPAT_BIN_MAX_FILTER_LENGTH ); intp_count = 0; -#endif /* Create the mix */ /* Loop through the source list and render each source */ @@ -344,26 +352,14 @@ static ivas_error TDREND_GetMix( /* Update rendering params if needed */ if ( hBinRendererTd->Listener_p->PoseUpdated || SrcSpatial_p->Updated ) { -#ifdef FIX_ITD TDREND_SRC_REND_UpdateFiltersFromSpatialParams( hBinRendererTd, SrcRend_p, SrcSpatial_p, Src_p->hrf_left_prev, Src_p->hrf_right_prev, hrf_left_delta, hrf_right_delta, &intp_count, &Src_p->filterlength, &Src_p->itd, &Src_p->Gain, Src_p, subframe_idx ); -#else - TDREND_SRC_REND_UpdateFiltersFromSpatialParams( hBinRendererTd, SrcRend_p, SrcSpatial_p, output_Fs ); -#endif } /* Render source if needed */ if ( ( SrcRend_p->InputAvailable == TRUE ) && ( SrcRend_p->PlayStatus == TDREND_PLAYSTATUS_PLAYING ) ) { -#ifdef FIX_ITD error = TDREND_REND_RenderSourceHRFilt( Src_p, hrf_left_delta, hrf_right_delta, intp_count, output_buf, subframe_length ); -#else -#ifdef TDREND_HRTF_TABLE_METHODS - error = TDREND_REND_RenderSourceHRFilt( Src_p, hBinRendererTd, output_buf, subframe_length, output_Fs ); -#else - error = TDREND_REND_RenderSourceHRFilt( Src_p, output_buf, subframe_length, output_Fs ); -#endif -#endif } } @@ -400,15 +396,16 @@ static void TDREND_Clear_Update_flags( return; } + /*---------------------------------------------------------------------* * TDREND_Update_object_positions() * * Update object position(s) *---------------------------------------------------------------------*/ -static void TDREND_Update_object_positions( +void TDREND_Update_object_positions( BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o : TD Renderer handle */ - const int16_t numSources, /* i : Number of sources to render */ + const int16_t num_src, /* i : number of sources to render */ const int16_t lfe_idx, /* i : Input LFE index */ const IVAS_FORMAT in_format, /* i : Format of input sources */ const ISM_METADATA_HANDLE *hIsmMetaData, /* i : Input metadata for ISM objects */ @@ -425,7 +422,7 @@ static void TDREND_Update_object_positions( /* For each source, write the frame data to the source object*/ c_indx = 0; - for ( nS = 0; nS < numSources; nS++ ) + for ( nS = 0; nS < num_src; nS++ ) { if ( !( in_format == MC_FORMAT && nS == lfe_idx ) ) /* Skip LFE for MC */ { @@ -439,13 +436,8 @@ static void TDREND_Update_object_positions( /* Update the source positions */ /* Source position and direction */ - Pos[0] = cosf( hIsmMetaData[nS]->elevation * PI_OVER_180 ) * cosf( hIsmMetaData[nS]->azimuth * PI_OVER_180 ); - Pos[1] = cosf( hIsmMetaData[nS]->elevation * PI_OVER_180 ) * sinf( hIsmMetaData[nS]->azimuth * PI_OVER_180 ); - Pos[2] = sinf( hIsmMetaData[nS]->elevation * PI_OVER_180 ); - Dir[0] = 1.0f; - Dir[1] = 0.0f; - Dir[2] = 0.0f; - + angles_to_vec( hIsmMetaData[nS]->radius, hIsmMetaData[nS]->azimuth, hIsmMetaData[nS]->elevation, Pos ); + angles_to_vec( 1.0f, hIsmMetaData[nS]->yaw, hIsmMetaData[nS]->pitch, Dir ); /* Source directivity info */ DirAtten_p->ConeInnerAngle = 360.0f; DirAtten_p->ConeOuterAngle = 360.0f; @@ -462,28 +454,24 @@ static void TDREND_Update_object_positions( return; } + /*---------------------------------------------------------------------* * TDREND_Update_listener_orientation() * * Update listener orientation (s) *---------------------------------------------------------------------*/ -static void TDREND_Update_listener_orientation( +void TDREND_Update_listener_orientation( BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD Renderer handle */ const int16_t headRotEnabled, /* i : Headrotation flag */ - const IVAS_QUATERNION *headPosition /* i : Head Position */ + const IVAS_QUATERNION *headPosition, /* i : Listener orientation */ + const IVAS_VECTOR3 *Pos /* i : Listener Position */ ) { - float Pos[3]; float FrontVec[3]; float UpVec[3]; float Rmat[3][3]; - - /* Update the listener's location/orientation */ - /* Listener at the origin */ - Pos[0] = 0.0f; - Pos[1] = 0.0f; - Pos[2] = 0.0f; + float Pos_p[3]; if ( headRotEnabled ) { @@ -497,6 +485,10 @@ static void TDREND_Update_listener_orientation( UpVec[0] = Rmat[2][0]; UpVec[1] = Rmat[2][1]; UpVec[2] = Rmat[2][2]; + /* Input position */ + Pos_p[0] = ( *Pos ).x; + Pos_p[1] = ( *Pos ).y; + Pos_p[2] = ( *Pos ).z; } else { @@ -508,201 +500,109 @@ static void TDREND_Update_listener_orientation( UpVec[0] = 0.0f; UpVec[1] = 0.0f; UpVec[2] = 1.0f; + /* Listener at the origin */ + Pos_p[0] = 0.0f; + Pos_p[1] = 0.0f; + Pos_p[2] = 0.0f; } /* Set the listener position and orientation:*/ - TDREND_MIX_LIST_SetPos( hBinRendererTd, Pos ); + TDREND_MIX_LIST_SetPos( hBinRendererTd, Pos_p ); TDREND_MIX_LIST_SetOrient( hBinRendererTd, FrontVec, UpVec ); return; } -ivas_error ivas_rend_TDObjRendOpen( +/*---------------------------------------------------------------------* + * ivas_td_binaural_open_ext() + * + * + *---------------------------------------------------------------------*/ + +ivas_error ivas_td_binaural_open_ext( TDREND_WRAPPER *pTDRend, IVAS_REND_AudioConfig inConfig, + RENDER_CONFIG_DATA *hRendCfg, /* i : Renderer configuration */ LSSETUP_CUSTOM_STRUCT *customLsInput, const int32_t outFs ) { - /* TODO tmu : Based on ivas_td_binaural_open() - could be harmonized / refactored - - review error handling - - review hHrtfTD init - */ - BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd; - TDREND_PosType_t PosType; - int16_t nS; - int16_t SrcInd[MAX_NUM_TDREND_CHANNELS]; - const float *ls_azimuth, *ls_elevation; - float Pos[3]; - float Dir[3]; - TDREND_DirAtten_t *DirAtten_p; - int16_t nchan_rend; + int16_t nchan_transport; + AUDIO_CONFIG transport_config; + IVAS_FORMAT ivas_format; + IVAS_OUTPUT_SETUP hTransSetup; ivas_error error; - - error = IVAS_ERR_OK; - - if ( ( hBinRendererTd = count_malloc( sizeof( BINAURAL_TD_OBJECT_RENDERER ) ) ) == NULL ) - { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD renderer\n" ) ); - } - if ( ( hBinRendererTd->TdRend_MixSpatSpec_p = count_malloc( sizeof( TDREND_MixSpatSpec_t ) ) ) == NULL ) - { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD renderer\n" ) ); - } - if ( ( hBinRendererTd->DirAtten_p = count_malloc( sizeof( TDREND_DirAtten_t ) ) ) == NULL ) - { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD renderer\n" ) ); - } - if ( ( hBinRendererTd->Listener_p = count_malloc( sizeof( TDREND_MIX_Listener_t ) ) ) == NULL ) - { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD renderer\n" ) ); - } + float *directivity = NULL; if ( inConfig != IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) { - getAudioConfigNumChannels( inConfig, &nchan_rend ); - if ( getAudioConfigType( inConfig ) == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) + if ( ( error = getAudioConfigNumChannels( inConfig, &nchan_transport ) ) != IVAS_ERR_OK ) { - nchan_rend--; /* Skip LFE channel -- added to the others */ + return error; } } else { - nchan_rend = customLsInput->num_spk; + nchan_transport = customLsInput->num_spk; } - hBinRendererTd->NumOfSrcs = 0; - hBinRendererTd->MaxSrcInd = -1; - - /* Mixer spatial setup */ - hBinRendererTd->TdRend_MixSpatSpec_p->UseCommonDistAttenModel = TRUE; - hBinRendererTd->TdRend_MixSpatSpec_p->DistAttenModel = 0; /* 0=Turned off, else use TDREND_DIST_ATTEN_MODEL_INV_DIST_CLAMPED */ - - TDREND_MIX_Init( hBinRendererTd, &pTDRend->hHrtfTD, hBinRendererTd->TdRend_MixSpatSpec_p, outFs ); - - /* Set the attenuation (or can set MixSpatSpec.DistAttenModel above) */ - TDREND_MIX_SetDistAttenModel( hBinRendererTd, TDREND_DIST_ATTEN_MODEL_INV_DIST_CLAMPED ); - - /* Add sources to module and mixer, headphones */ - PosType = TDREND_POSTYPE_ABSOLUTE; /* or TDREND_POSTYPE_RELATIVE_TO_LISTENER */ - - for ( nS = 0; nS < nchan_rend; nS++ ) - { -#ifdef FIX_ITD - if ( ( error = TDREND_MIX_AddSrc( hBinRendererTd, &SrcInd[nS], PosType ) ) != IVAS_ERR_OK ) -#else - if ( ( error = TDREND_MIX_AddSrc( hBinRendererTd, &SrcInd[nS], PosType, outFs ) ) != IVAS_ERR_OK ) -#endif - { - return error; - } - } + transport_config = getIvasAudioConfigFromRendAudioConfig( inConfig ); + ivas_format = ( getAudioConfigType( inConfig ) == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) ? MC_FORMAT : ISM_FORMAT; + hTransSetup.ls_azimuth = customLsInput->ls_azimuth; + hTransSetup.ls_elevation = customLsInput->ls_elevation; - if ( getAudioConfigType( inConfig ) == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) + if ( NULL != hRendCfg ) { - switch ( inConfig ) - { - case IVAS_REND_AUDIO_CONFIG_5_1: - ls_azimuth = ls_azimuth_CICP6; - ls_elevation = ls_elevation_CICP6; - break; - case IVAS_REND_AUDIO_CONFIG_7_1: - ls_azimuth = ls_azimuth_CICP12; - ls_elevation = ls_elevation_CICP12; - break; - case IVAS_REND_AUDIO_CONFIG_5_1_2: - ls_azimuth = ls_azimuth_CICP14; - ls_elevation = ls_elevation_CICP14; - break; - case IVAS_REND_AUDIO_CONFIG_5_1_4: - ls_azimuth = ls_azimuth_CICP16; - ls_elevation = ls_elevation_CICP16; - break; - case IVAS_REND_AUDIO_CONFIG_7_1_4: - ls_azimuth = ls_azimuth_CICP19; - ls_elevation = ls_elevation_CICP19; - break; - case IVAS_REND_AUDIO_CONFIG_LS_CUSTOM: - ls_azimuth = customLsInput->ls_azimuth; - ls_elevation = customLsInput->ls_elevation; - break; - default: - ls_azimuth = NULL; - ls_elevation = NULL; - } - - DirAtten_p = hBinRendererTd->DirAtten_p; - - for ( nS = 0; nS < nchan_rend; nS++ ) - { - /* Set source positions according to loudspeaker layout */ - Pos[0] = cosf( ls_elevation[nS] * PI_OVER_180 ) * cosf( ls_azimuth[nS] * PI_OVER_180 ); - Pos[1] = cosf( ls_elevation[nS] * PI_OVER_180 ) * sinf( ls_azimuth[nS] * PI_OVER_180 ); - Pos[2] = sinf( ls_elevation[nS] * PI_OVER_180 ); - Dir[0] = 1.0f; - Dir[1] = 0.0f; - Dir[2] = 0.0f; - - /* Source directivity info */ - DirAtten_p->ConeInnerAngle = 360.0f; - DirAtten_p->ConeOuterAngle = 360.0f; - DirAtten_p->ConeOuterGain = 1.0f; - - TDREND_MIX_SRC_SetPos( hBinRendererTd, nS, Pos ); - TDREND_MIX_SRC_SetDir( hBinRendererTd, nS, Dir ); - TDREND_MIX_SRC_SetPlayState( hBinRendererTd, nS, TDREND_PLAYSTATUS_PLAYING ); - TDREND_MIX_SRC_SetDirAtten( hBinRendererTd, nS, DirAtten_p ); - } + directivity = hRendCfg->directivity; } - pTDRend->hBinRendererTd = hBinRendererTd; - - pTDRend->binaural_latency_ns = (int32_t) ( BINAURAL_TD_LATENCY_S * 1000000000.f ); - - return IVAS_ERR_OK; + return ivas_td_binaural_open_unwrap( &pTDRend->hHrtfTD, outFs, nchan_transport, ivas_format, transport_config, directivity, hTransSetup, &pTDRend->hBinRendererTd, &pTDRend->binaural_latency_ns ); } + /*---------------------------------------------------------------------* - * ObjRenderIVASFrame() + * ivas_td_binaural_renderer_ext() * * Receives the current frames for the object streams, updates metadata * and renders the current frame. *---------------------------------------------------------------------*/ -/*! r: TD Renderer result code. */ -ivas_error ivas_rend_TDObjRenderFrame( +ivas_error ivas_td_binaural_renderer_ext( const TDREND_WRAPPER *pTDRend, /* i : TD Renderer wrapper structure */ const IVAS_REND_AudioConfig inConfig, /* i : Input audio configuration */ const LSSETUP_CUSTOM_STRUCT *customLsInput, /* i : Input custom loudspeaker layout */ const IVAS_REND_HeadRotData *headRotData, /* i : Input head positions */ const IVAS_REND_AudioObjectPosition *currentPos, /* i : Object position */ + const REVERB_HANDLE hReverb, /* i : Reverberator handle */ const int16_t output_frame, /* i : output frame length */ -#ifndef FIX_ITD - const int32_t output_Fs, /* i : output sampling rate */ -#endif - float output[][L_FRAME48k] /* i/o: SCE channels / Binaural synthesis */ + float output[][L_FRAME48k] /* i/o: SCE channels / Binaural synthesis */ ) { - int16_t subframe_length; - int16_t subframe_idx; + ISM_METADATA_FRAME hIsmMetaDataFrame; ISM_METADATA_HANDLE hIsmMetaData[1]; int16_t lfe_idx; int16_t num_src; - /* TODO tmu : pass down renderer config struct */ - // float reverb_signal[BINAURAL_CHANNELS][L_FRAME48k]; IVAS_FORMAT ivas_format; IVAS_REND_AudioConfigType inConfigType; + AUDIO_CONFIG transport_config; + ivas_error error; - wmops_sub_start( "ivas_rend_TDObjRenderFrame" ); + push_wmops( "ivas_td_binaural_renderer_ext" ); inConfigType = getAudioConfigType( inConfig ); lfe_idx = LFE_CHANNEL; + hIsmMetaData[0] = NULL; + if ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) { ivas_format = MC_FORMAT; + transport_config = getIvasAudioConfigFromRendAudioConfig( inConfig ); if ( inConfig != IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) { - getAudioConfigNumChannels( inConfig, &num_src ); + if ( ( error = getAudioConfigNumChannels( inConfig, &num_src ) ) != IVAS_ERR_OK ) + { + return error; + } } else { @@ -714,62 +614,23 @@ ivas_error ivas_rend_TDObjRenderFrame( { ivas_format = ISM_FORMAT; num_src = 1; - hIsmMetaData[0] = count_malloc( sizeof( ISM_METADATA_FRAME ) ); + transport_config = AUDIO_CONFIG_ISM1; + hIsmMetaData[0] = &hIsmMetaDataFrame; hIsmMetaData[0]->azimuth = currentPos->azimuth; hIsmMetaData[0]->elevation = currentPos->elevation; + hIsmMetaData[0]->yaw = currentPos->yaw; + hIsmMetaData[0]->pitch = currentPos->pitch; + hIsmMetaData[0]->radius = currentPos->radius; } - subframe_length = output_frame / MAX_PARAM_SPATIAL_SUBFRAMES; - - /* TODO tmu : pass down renderer config struct and decide what to do about ini_frame ? */ - // if ( hRenderConfig != NULL ) /* Renderer Configuration not enabled in TD standalone renderer */ - // { - // if ( hRenderConfig->roomAcoustics.late_reverb_on && ( st_ivas->ini_frame == 0 ) ) - // { - // ivas_reverb_open( &pTDRend->hCrend->hReverb, pTDRend->transport_config, NULL, pTDRend->hRenderConfig, pTDRend->hDecoderConfig->output_Fs ); - // } - // } - - /* Update object position(s) */ - TDREND_Update_object_positions( pTDRend->hBinRendererTd, num_src, lfe_idx, ivas_format, hIsmMetaData, output ); - - /* TODO tmu : needs a refactor / better approach */ - if ( ivas_format == ISM_FORMAT ) + if ( ( error = ivas_td_binaural_renderer_unwrap( hReverb, transport_config, pTDRend->hBinRendererTd, num_src, lfe_idx, ivas_format, hIsmMetaData, headRotData->headRotEnabled, + ( headRotData != NULL ) ? headRotData->headPositions : NULL, + ( headRotData != NULL ) ? headRotData->Pos : NULL, output, output_frame ) ) != IVAS_ERR_OK ) { - count_free( hIsmMetaData[0] ); + return error; } - for ( subframe_idx = 0; subframe_idx < MAX_PARAM_SPATIAL_SUBFRAMES; subframe_idx++ ) - { - /* Update the listener's location/orientation */ - TDREND_Update_listener_orientation( pTDRend->hBinRendererTd, headRotData->headRotEnabled, ( headRotData != NULL ) ? &headRotData->headPositions[subframe_idx] : NULL ); - - /* TODO tmu : pass down renderer config struct */ - // if ( ( hRenderConfig != NULL ) && ( hRenderConfig->roomAcoustics.late_reverb_on ) ) - // { - // ivas_reverb_process( hCrend->hReverb, transport_config, 0, output, reverb_signal, subframe_idx ); - // } - - /* Render subframe */ -#ifdef FIX_ITD - TDREND_GetMix( pTDRend->hBinRendererTd, output, subframe_length, subframe_idx ); -#else - TDREND_GetMix( pTDRend->hBinRendererTd, output, subframe_length, output_Fs, subframe_idx ); -#endif - } - - /* TODO tmu : pass down renderer config struct */ - // if ( pTDRend->hRenderConfig != NULL ) /* Renderer Configuration not enabled in TD standalone renderer */ - // { - // if ( pTDRend->hRenderConfig->roomAcoustics.late_reverb_on ) - // { - // /* add reverb to rendered signals */ - // v_add( reverb_signal[0], output[0], output[0], output_frame ); - // v_add( reverb_signal[1], output[1], output[1], output_frame ); - // } - // } - - wmops_sub_end(); + pop_wmops(); return IVAS_ERR_OK; } @@ -794,6 +655,8 @@ void ObjRenderIvasFrame_splitBinaural( MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData; BINAURAL_TD_OBJECT_RENDERER_HANDLE tmpTdRendHandle; + push_wmops( "ObjRenderIvasFrame_splitBinaural" ); + pMultiBinPoseData = &st_ivas->splitBinRend.splitrend.multiBinPoseData; /* If not yet allocated, open additional instances of TD renderer */ @@ -804,10 +667,15 @@ void ObjRenderIvasFrame_splitBinaural( continue; } - tmpTdRendHandle = st_ivas->hBinRendererTd; - ivas_td_binaural_open( st_ivas ); - st_ivas->splitBinRend.splitrend.hTdRendHandles[i] = st_ivas->hBinRendererTd; - st_ivas->hBinRendererTd = tmpTdRendHandle; + ivas_td_binaural_open_unwrap( &st_ivas->hHrtfTD, + st_ivas->hDecoderConfig->output_Fs, + st_ivas->nchan_transport, + st_ivas->ivas_format, + st_ivas->transport_config, + st_ivas->hRenderConfig->directivity, + st_ivas->hTransSetup, + &st_ivas->splitBinRend.splitrend.hTdRendHandles[i], + &st_ivas->binaural_latency_ns ); } /* Save current head positions */ @@ -854,13 +722,14 @@ void ObjRenderIvasFrame_splitBinaural( /* Render */ if ( pos_idx == 0 ) { - ObjRenderIVASFrame( st_ivas, tmpProcessing, output_frame ); + ivas_td_binaural_renderer( st_ivas, tmpProcessing, output_frame ); } else { + /* Tmp swap renderer handles for rendering call */ tmpTdRendHandle = st_ivas->hBinRendererTd; st_ivas->hBinRendererTd = st_ivas->splitBinRend.splitrend.hTdRendHandles[pos_idx - 1]; - ObjRenderIVASFrame( st_ivas, tmpProcessing, output_frame ); + ivas_td_binaural_renderer( st_ivas, tmpProcessing, output_frame ); st_ivas->hBinRendererTd = tmpTdRendHandle; } @@ -885,5 +754,28 @@ void ObjRenderIvasFrame_splitBinaural( { st_ivas->hHeadTrackData->Quaternions[i] = originalHeadRot[i]; } + + pop_wmops(); } #endif + + +/*---------------------------------------------------------------------* + * angles_to_vec() + * + * Convert azimuth and elevation angles to position/orientation vector + *---------------------------------------------------------------------*/ + +static void angles_to_vec( + const float radius, /* i : radius */ + const float azimuth, /* i : Azimuth angle */ + const float elevation, /* i : Elevation angle */ + float *vec /* o : Pos/Dir vector */ +) +{ + vec[0] = radius * cosf( elevation * PI_OVER_180 ) * cosf( azimuth * PI_OVER_180 ); + vec[1] = radius * cosf( elevation * PI_OVER_180 ) * sinf( azimuth * PI_OVER_180 ); + vec[2] = radius * sinf( elevation * PI_OVER_180 ); + + return; +} diff --git a/lib_rend/ivas_objectRenderer_hrFilt.c b/lib_rend/ivas_objectRenderer_hrFilt.c index 5269b580b0..97d0b68fb8 100644 --- a/lib_rend/ivas_objectRenderer_hrFilt.c +++ b/lib_rend/ivas_objectRenderer_hrFilt.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -35,11 +35,10 @@ #include "options.h" #include "prot.h" #include -#include "ivas_prot.h" +#include "ivas_prot_rend.h" #include "ivas_rom_rend.h" #include "ivas_cnst.h" -#include "ivas_rom_TdBinauralRenderer.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* @@ -52,289 +51,6 @@ static void GenerateFilter( const float elev, float azim, ModelParams_t *model, static void GenerateITD( const float elev, float azim, ModelParamsITD_t *model, ModelEval_t *modelEval ); static void SkipSmallest_ValueIndex( int16_t *use_inds, const ValueIndex_t *VI, const int16_t N, const int16_t n_smallest ); -#ifdef TDREND_HRTF_TABLE_METHODS -static float GreatCircleAngleDeg( float Az1, float El1, float Az2, float El2 ); -static void GetFilterFromAngle_M( TDREND_HRFILT_FiltSet_t *HrFiltSet_p, const float Elev, float Azim, SFX_SpatBin_Params_t *SfxSpatBinParams_p ); - -/*-------------------------------------------------------------------* - * TDREND_HRFILT_SetFiltSet() - * - * Load table format HR filter set from file. - --------------------------------------------------------------------*/ - -void TDREND_HRFILT_SetFiltSet( - TDREND_HRFILT_FiltSet_t *HrFiltSet_p, /* i/o: HR hilter set structure */ - FILE *f_hrtf /* i : File handle for HR filter parameters */ -) -{ - float Scaler_HrfGain; - int16_t n; - - int16_t num_to_read, num_bytes; - double temp; - int16_t temp_s; - double *buffer_p = NULL; - double *temp_p; - double *FiltSetIntLeft_p = NULL, *FiltSetIntRight_p = NULL; - double *FiltIntLeft0_p = NULL, *FiltIntLeft_p = NULL, *FiltIntRight0_p = NULL, *FiltIntRight_p = NULL; - double *LeftFilt_p = NULL, *RightFilt_p = NULL; - float *LeftFiltFlp_p = NULL, *RightFiltFlp_p = NULL; - - int32_t mem_size; - int16_t i; - -#ifdef TDREND_HRTF_TABLE_METHODS - int16_t count, m; -#endif - - /* The setting of Scaler_HrfGain varies among HR filter dataset */ - - Scaler_HrfGain = 1.0f; - - /* read the sampling rate */ - fread( &temp_s, sizeof( int16_t ), 1, f_hrtf ); - - switch ( temp_s ) - { - case 16: - HrFiltSet_p->SampleRate = 16000; - break; - case 32: - HrFiltSet_p->SampleRate = 32000; - break; - case 48: - HrFiltSet_p->SampleRate = 48000; - break; - default: -#ifdef DEBUGGING - IVAS_ERROR( IVAS_ERR_WRONG_PARAMS, "Error: HR filter file had an unsupported sampling rate (%d kHz).\n\n", temp_s ); -#endif - } - - num_bytes = sizeof( double ); - num_to_read = 1; - - /* read the filter length */ - fread( &temp, num_bytes, num_to_read, f_hrtf ); - HrFiltSet_p->FiltLength = (int16_t) temp; - - /* read the distance */ - fread( &temp, num_bytes, num_to_read, f_hrtf ); - HrFiltSet_p->Dist = (float) temp; - /* read the number of positions */ - fread( &temp, num_bytes, num_to_read, f_hrtf ); - HrFiltSet_p->NumPos = (int16_t) temp; - - if ( HrFiltSet_p->FilterMethod == TDREND_HRFILT_Method_Table_F ) - { - /* Number of elevation angles */ - fread( &temp, num_bytes, num_to_read, f_hrtf ); - HrFiltSet_p->NumElev = (int16_t) temp; - - /* Elevation angles */ - HrFiltSet_p->Elev_p = (float *) count_malloc( HrFiltSet_p->NumElev * sizeof( float ) ); - buffer_p = (double *) count_malloc( HrFiltSet_p->NumElev * sizeof( double ) ); - num_to_read = HrFiltSet_p->NumElev; - fread( (void *) buffer_p, num_bytes, num_to_read, f_hrtf ); - temp_p = buffer_p; - HrFiltSet_p->ElevIncr = (float) ( buffer_p[1] - buffer_p[0] ); - for ( n = 0; n < HrFiltSet_p->NumElev; n++ ) - { - HrFiltSet_p->Elev_p[n] = (float) *temp_p++; - if ( n > 0 && fabsf( ( HrFiltSet_p->Elev_p[n] - HrFiltSet_p->Elev_p[n - 1] - HrFiltSet_p->ElevIncr ) ) > 0.01 ) - { -#ifdef DEBUGGING - printf( "Error: HR Filter elevation values had irregular spacing.\n\n" ); -#endif - assert( 0 && "Error: HR Filter elevation values had irregular spacing." ); - } - } - count_free( buffer_p ); - - /* Number of azimuth values, one per elevation */ - HrFiltSet_p->NumAzim_p = (int16_t *) count_malloc( HrFiltSet_p->NumElev * sizeof( int16_t ) ); - buffer_p = (double *) count_malloc( HrFiltSet_p->NumElev * sizeof( double ) ); - fread( (void *) buffer_p, num_bytes, HrFiltSet_p->NumElev, f_hrtf ); - for ( n = 0; n < HrFiltSet_p->NumElev; n++ ) - { - HrFiltSet_p->NumAzim_p[n] = (int16_t) buffer_p[n]; - } - count_free( buffer_p ); - - /* Indices to the first azimuth value, one per elevation */ - HrFiltSet_p->AzimStartIdx_p = (int16_t *) count_malloc( HrFiltSet_p->NumElev * sizeof( int16_t ) ); - count = 0; - for ( n = 0; n < HrFiltSet_p->NumElev; n++ ) - { - HrFiltSet_p->AzimStartIdx_p[n] = count; - count += HrFiltSet_p->NumAzim_p[n]; - } - if ( count != HrFiltSet_p->NumPos ) - { -#ifdef DEBUGGING - printf( "Error: Inconsistent number of points in HR filter file.\n\n" ); -#endif - assert( 0 && "Error: Inconsistent number of points in HR filter file." ); - } - - /* Azimuth values, one set per elevation, i.e. one per measurement point */ - HrFiltSet_p->Azim_p = (float *) count_malloc( HrFiltSet_p->NumPos * sizeof( float ) ); - buffer_p = (double *) count_malloc( HrFiltSet_p->NumPos * sizeof( double ) ); - HrFiltSet_p->ElevFull_p = (float *) count_malloc( HrFiltSet_p->NumPos * sizeof( float ) ); - fread( (void *) buffer_p, num_bytes, HrFiltSet_p->NumPos, f_hrtf ); - i = 0; - for ( n = 0; n < HrFiltSet_p->NumElev; n++ ) - { - for ( m = 0; m < HrFiltSet_p->NumAzim_p[n]; m++ ) - { - HrFiltSet_p->Azim_p[i] = (float) buffer_p[i]; - HrFiltSet_p->ElevFull_p[i] = HrFiltSet_p->Elev_p[n]; - /* Range needs to be (-180, 180] */ - if ( HrFiltSet_p->Azim_p[i] > 180.0 ) - { - HrFiltSet_p->Azim_p[i] -= 360.0; - } - i++; - } - } - count_free( buffer_p ); - } - if ( HrFiltSet_p->FilterMethod == TDREND_HRFILT_Method_Table_S ) - { - /* Number of elevation angles */ - fread( &temp, num_bytes, num_to_read, f_hrtf ); - HrFiltSet_p->NumElev = (int16_t) temp; - - /* Elevation angles */ - HrFiltSet_p->Elev_p = (float *) count_malloc( HrFiltSet_p->NumElev * sizeof( float ) ); - buffer_p = (double *) count_malloc( HrFiltSet_p->NumElev * sizeof( double ) ); - num_to_read = HrFiltSet_p->NumElev; - fread( (void *) buffer_p, num_bytes, num_to_read, f_hrtf ); - temp_p = buffer_p; - for ( n = 0; n < HrFiltSet_p->NumElev; n++ ) - { - HrFiltSet_p->Elev_p[n] = (float) *temp_p++; - } - count_free( buffer_p ); - - /* Number of azimuth values, one per elevation */ - HrFiltSet_p->NumAzim_p = (int16_t *) count_malloc( HrFiltSet_p->NumElev * sizeof( int16_t ) ); - buffer_p = (double *) count_malloc( HrFiltSet_p->NumElev * sizeof( double ) ); - fread( (void *) buffer_p, num_bytes, HrFiltSet_p->NumElev, f_hrtf ); - for ( n = 0; n < HrFiltSet_p->NumElev; n++ ) - { - HrFiltSet_p->NumAzim_p[n] = (int16_t) buffer_p[n]; - } - count_free( buffer_p ); - - /* Indices to the first azimuth value, one per elevation */ - HrFiltSet_p->AzimStartIdx_p = (int16_t *) count_malloc( HrFiltSet_p->NumElev * sizeof( int16_t ) ); - count = 0; - for ( n = 0; n < HrFiltSet_p->NumElev; n++ ) - { - HrFiltSet_p->AzimStartIdx_p[n] = count; - count += HrFiltSet_p->NumAzim_p[n]; - } - if ( count != HrFiltSet_p->NumPos ) - { -#ifdef DEBUGGING - printf( "Inconsistent number of points in HR filter file.\n\n" ); -#endif - assert( 0 && "Inconsistent number of points in HR filter file." ); - } - - /* Azimuth values, one set per elevation, i.e. one per measurement point */ - HrFiltSet_p->Azim_p = (float *) count_malloc( HrFiltSet_p->NumPos * sizeof( float ) ); - buffer_p = (double *) count_malloc( HrFiltSet_p->NumPos * sizeof( double ) ); - HrFiltSet_p->ElevFull_p = (float *) count_malloc( HrFiltSet_p->NumPos * sizeof( float ) ); - fread( (void *) buffer_p, num_bytes, HrFiltSet_p->NumPos, f_hrtf ); - i = 0; - for ( n = 0; n < HrFiltSet_p->NumElev; n++ ) - { - for ( m = 0; m < HrFiltSet_p->NumAzim_p[n]; m++ ) - { - HrFiltSet_p->Azim_p[i] = (float) buffer_p[i]; - HrFiltSet_p->ElevFull_p[i] = HrFiltSet_p->Elev_p[n]; - /* Range needs to be (-180, 180] */ - if ( HrFiltSet_p->Azim_p[i] > 180.0 ) - { - HrFiltSet_p->Azim_p[i] -= 360.0; - } - i++; - } - } - count_free( buffer_p ); - } - - /* allocate memory to LeftFilt and RightFilt */ - mem_size = ( HrFiltSet_p->NumPos * HrFiltSet_p->FiltLength * sizeof( double ) ); - - FiltSetIntRight_p = (double *) count_malloc( mem_size ); - FiltSetIntLeft_p = (double *) count_malloc( mem_size ); - RightFilt_p = FiltSetIntRight_p; - LeftFilt_p = FiltSetIntLeft_p; - - /* read the HR filters */ - for ( i = 0; i < HrFiltSet_p->NumPos; i++ ) - { - /* read the left filter */ - fread( (void *) LeftFilt_p, num_bytes, HrFiltSet_p->FiltLength, f_hrtf ); - /* read the right filter */ - fread( (void *) RightFilt_p, num_bytes, HrFiltSet_p->FiltLength, f_hrtf ); - - LeftFilt_p += HrFiltSet_p->FiltLength; - RightFilt_p += HrFiltSet_p->FiltLength; - } - - /* Check that the whole file was read. */ - getc( f_hrtf ); - if ( !feof( f_hrtf ) ) - { -#ifdef DEBUGGING - printf( "Error: The HRTF filter file size was larger than expected.\n\n" ); -#endif - assert( 0 && "Error: The HRTF filter file size was larger than expected." ); - } - - /* IMPORTANT: We are now using reversed FIR filters as they */ - /* result in better SIMD (neon) optimization */ - /* Copy, and reverse the filter sets */ - - mem_size = ( HrFiltSet_p->NumPos * HrFiltSet_p->FiltLength * sizeof( float ) ); - RightFiltFlp_p = (float *) count_malloc( mem_size ); - LeftFiltFlp_p = (float *) count_malloc( mem_size ); - HrFiltSet_p->RightFiltSet_p = RightFiltFlp_p; - HrFiltSet_p->LeftFiltSet_p = LeftFiltFlp_p; - - FiltIntRight0_p = FiltSetIntRight_p + (int16_t) HrFiltSet_p->FiltLength - 1; - FiltIntLeft0_p = FiltSetIntLeft_p + (int16_t) HrFiltSet_p->FiltLength - 1; - - for ( i = 0; i < HrFiltSet_p->NumPos; i++ ) - { - /* Copy right filter */ - FiltIntRight_p = FiltIntRight0_p; - for ( n = 0; n < HrFiltSet_p->FiltLength; n++ ) - { - *RightFiltFlp_p++ = Scaler_HrfGain * (float) ( *FiltIntRight_p-- ); - } - FiltIntRight0_p += HrFiltSet_p->FiltLength; - - /* Copy left filter */ - FiltIntLeft_p = FiltIntLeft0_p; - for ( n = 0; n < HrFiltSet_p->FiltLength; n++ ) - { - *LeftFiltFlp_p++ = Scaler_HrfGain * (float) ( *FiltIntLeft_p-- ); - } - FiltIntLeft0_p += HrFiltSet_p->FiltLength; - } - - count_free( FiltSetIntLeft_p ); - count_free( FiltSetIntRight_p ); - - return; -} -#endif - /*-------------------------------------------------------------------* * TDREND_REND_RenderSourceHRFilt() @@ -343,56 +59,32 @@ void TDREND_HRFILT_SetFiltSet( --------------------------------------------------------------------*/ ivas_error TDREND_REND_RenderSourceHRFilt( - TDREND_SRC_t *Src_p, /* i/o: The source to be rendered */ -#ifdef FIX_ITD - const float *hrf_left_delta, /* i: Left filter interpolation delta */ - const float *hrf_right_delta, /* i: Right filter interpolation delta */ - const int16_t intp_count, /* i: Interpolation count */ -#else -#ifdef TDREND_HRTF_TABLE_METHODS - BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ -#endif -#endif - float output_buf[][L_SPATIAL_SUBFR_48k], /* o : Output buffer */ -#ifdef FIX_ITD - const int16_t subframe_length /* i : Subframe length in use */ -#else - const int16_t subframe_length, /* i : Subframe length in use */ - const int32_t output_Fs /* i : Output sample rate */ -#endif + TDREND_SRC_t *Src_p, /* i/o: The source to be rendered */ + const float *hrf_left_delta, /* i : Left filter interpolation delta */ + const float *hrf_right_delta, /* i : Right filter interpolation delta */ + const int16_t intp_count, /* i : Interpolation count */ + float output_buf[][L_SPATIAL_SUBFR_48k], /* o : Output buffer */ + const int16_t subframe_length /* i : Subframe length in use */ ) { -#ifndef FIX_ITD - TDREND_SRC_REND_t *SrcRend_p; - const float *InFrame_nIC_p; - int16_t NoOfUsedInputSamples, NoOfDeliveredOutputSamples; -#endif float LeftOutputFrame[L_SPATIAL_SUBFR_48k]; float RightOutputFrame[L_SPATIAL_SUBFR_48k]; +#ifndef FIX_379_GAININTP + float Gain; + + Gain = ( *Src_p->SrcRend_p->DirGain_p ) * ( *Src_p->SrcRend_p->DistGain_p ); +#endif -#ifdef FIX_ITD TDREND_Apply_ITD( Src_p->InputFrame_p, LeftOutputFrame, RightOutputFrame, &Src_p->previtd, Src_p->itd, Src_p->mem_itd, subframe_length ); - TDREND_firfilt( LeftOutputFrame, Src_p->hrf_left_prev, hrf_left_delta, intp_count, Src_p->mem_hrf_left, subframe_length, Src_p->filterlength ); - TDREND_firfilt( RightOutputFrame, Src_p->hrf_right_prev, hrf_right_delta, intp_count, Src_p->mem_hrf_right, subframe_length, Src_p->filterlength ); +#ifdef FIX_379_GAININTP + TDREND_firfilt( LeftOutputFrame, Src_p->hrf_left_prev, hrf_left_delta, intp_count, Src_p->mem_hrf_left, subframe_length, Src_p->filterlength, Src_p->Gain, Src_p->prevGain ); + TDREND_firfilt( RightOutputFrame, Src_p->hrf_right_prev, hrf_right_delta, intp_count, Src_p->mem_hrf_right, subframe_length, Src_p->filterlength, Src_p->Gain, Src_p->prevGain ); + Src_p->prevGain = Src_p->Gain; #else - - /* Input channel rendering loop */ - InFrame_nIC_p = Src_p->InputFrame_p; - SrcRend_p = Src_p->SrcRend_p; - - /* Gain not currently encoded/used */ - /* SrcGain = Mix_p->Gain * ( *SrcRend_p->SrcGain_p ); */ - /* SrcGain *= ( *SrcRend_p->DirGain_p ) * ( *SrcRend_p->DistGain_p ); */ - - TDREND_SFX_SpatBin_Execute_Main( SrcRend_p->SfxSpatBin_p, InFrame_nIC_p, subframe_length, LeftOutputFrame, RightOutputFrame, &NoOfUsedInputSamples, &NoOfDeliveredOutputSamples, output_Fs ); - -#ifdef TDREND_HRTF_TABLE_METHODS - if ( hBinRendererTd->HrFiltSet_p->FilterMethod != TDREND_HRFILT_Method_BSplineModel ) - { - SrcRend_p->SfxSpatBin_p->HrFilterInterpOn = 1; /* Turn on after first frame is rendered. */ - } -#endif + TDREND_firfilt( LeftOutputFrame, Src_p->hrf_left_prev, hrf_left_delta, intp_count, Src_p->mem_hrf_left, subframe_length, Src_p->filterlength, Gain ); + TDREND_firfilt( RightOutputFrame, Src_p->hrf_right_prev, hrf_right_delta, intp_count, Src_p->mem_hrf_right, subframe_length, Src_p->filterlength, Gain ); #endif + /* Copy to accumulative output frame */ v_add( LeftOutputFrame, output_buf[0], output_buf[0], subframe_length ); v_add( RightOutputFrame, output_buf[1], output_buf[1], subframe_length ); @@ -404,305 +96,6 @@ ivas_error TDREND_REND_RenderSourceHRFilt( } -#ifdef TDREND_HRTF_TABLE_METHODS -/*-------------------------------------------------------------------* - * GetFilterFromAngle_F() - * - * Obtain an HR filter corresponding to the input angle pair. - * This version is for FABIAN format. - --------------------------------------------------------------------*/ - -static void GetFilterFromAngle_F( - TDREND_HRFILT_FiltSet_t *HrFiltSet_p, /* i/o: HR filter set structure */ - const float Elev, /* i : Elevation, degrees */ - float Azim, /* i : Azimuth, degrees */ - SFX_SpatBin_Params_t *SfxSpatBinParams_p /* i/o: Currently used HR filter */ -) -{ - int16_t AzimInd, ElevInd, n; - int16_t ElevIndLo; - int16_t ElevIndHi; - int16_t flipped = 0; - float AzimMod; - float AzimLo, AzimHi; - uint32_t HrFiltInd; - int32_t CandidateIndices[100]; /* Stores the indices of the candidate points. */ - float CandidateAngles[100]; /* Stores the angular distance between the candidate and the test point. */ - int16_t c = 0; - int16_t test; - float CandidateAzim, CandidateElev, min; - - /* Note need to support azimuth range [-180,180] since this is what is returned by atan2f. AzimMod is on the */ - /* range (-180,180]. This should be faster than doing a full mod(360) etc. */ - if ( Azim == -180.0f ) - { - AzimMod = 180.0f; - } - else - { - AzimMod = Azim; - } - - /* Use the nearest filter point. Since the azimuth is not assumed to be the same for */ - /* different elevations, make a shortlist of rows to check, and a range azimuth to check. */ - ElevInd = (int16_t) roundf( ( Elev - HrFiltSet_p->Elev_p[0] ) / HrFiltSet_p->ElevIncr ); /* Regular elevation spacing */ - if ( ElevInd < 0 ) - { - ElevInd = 0; - } - else if ( ElevInd >= HrFiltSet_p->NumElev ) - { - ElevInd = HrFiltSet_p->NumElev - 1; - } - ElevIndLo = max( 0, ElevInd - 2 ); - ElevIndHi = min( HrFiltSet_p->NumElev - 1, ElevInd + 2 ); - - AzimLo = AzimMod - 15; - if ( AzimLo <= -180.0 ) - { - AzimLo += 360.0; - } - AzimHi = AzimMod + 15; - if ( AzimHi > 360.0 ) - { - AzimHi -= 360.0; - } - - if ( AzimHi < AzimLo ) - { - flipped = 1; - } - - /* Check each candidate elevation row, and each azimuth value in that row, to make a list of candidate points. */ - for ( ElevInd = ElevIndLo; ElevInd <= ElevIndHi; ElevInd++ ) - { - for ( AzimInd = HrFiltSet_p->AzimStartIdx_p[ElevInd]; - AzimInd < HrFiltSet_p->AzimStartIdx_p[ElevInd] + HrFiltSet_p->NumAzim_p[ElevInd]; - AzimInd++ ) - { - if ( flipped == 0 ) - { - test = HrFiltSet_p->Azim_p[AzimInd] >= AzimLo && HrFiltSet_p->Azim_p[AzimInd] <= AzimHi; - } - else - { - /* This is the case where the limits straddle the +/- 180 discontinuity */ - test = HrFiltSet_p->Azim_p[AzimInd] >= AzimLo || HrFiltSet_p->Azim_p[AzimInd] <= AzimHi; - } - if ( test ) - { - /* Azim value is within range, store it */ - CandidateIndices[c] = AzimInd; - c++; - } - } - } - - for ( n = 0; n < c; n++ ) - { - CandidateAzim = HrFiltSet_p->Azim_p[CandidateIndices[n]]; - CandidateElev = HrFiltSet_p->ElevFull_p[CandidateIndices[n]]; - CandidateAngles[n] = GreatCircleAngleDeg( AzimMod, Elev, CandidateAzim, CandidateElev ); - } - - /* Find the candidate with the minimum angle/distance */ - min = CandidateAngles[0]; - HrFiltInd = CandidateIndices[0]; - for ( n = 1; n < c; n++ ) - { - if ( CandidateAngles[n] < min ) - { - min = CandidateAngles[n]; - HrFiltInd = CandidateIndices[n]; - } - } - - HrFiltInd *= HrFiltSet_p->FiltLength; - - /* 3. No extracted ITD. */ - SfxSpatBinParams_p->Itd = 0; - - /* 4. Copy the filter over */ - for ( n = 0; n < HrFiltSet_p->FiltLength; n++ ) - { - SfxSpatBinParams_p->LeftFilter_p[n] = HrFiltSet_p->LeftFiltSet_p[HrFiltInd + n]; - SfxSpatBinParams_p->RightFilter_p[n] = HrFiltSet_p->RightFiltSet_p[HrFiltInd + n]; - } - - return; -} - - -/*-------------------------------------------------------------------* - * GetFilterFromAngle_S() - * - * Obtain an HR filter corresponding to the input angle pair. - * This version is for SADIE format. - --------------------------------------------------------------------*/ - -static void GetFilterFromAngle_S( - TDREND_HRFILT_FiltSet_t *HrFiltSet_p, /* i/o: HR filter set structure */ - const float Elev, /* i : Elevation, degrees */ - float Azim, /* i : Azimuth, degrees */ - SFX_SpatBin_Params_t *SfxSpatBinParams_p /* i/o: Currently used HR filter */ -) -{ - int16_t AzimInd, n; - int16_t ElevInd = -1; - int16_t ElevIndLo; - int16_t ElevIndHi; - int16_t flipped = 0; - float ElevDiff = 200.f; - float AzimMod, AzimLo, AzimHi; - uint32_t HrFiltInd; - int32_t CandidateIndices[400]; /* Stores the indices of the candidate points. */ - float CandidateAngles[400]; /* Stores the angular distance between the candidate and the test point. */ - int16_t c; - int16_t test; - float CandidateAzim, CandidateElev, min; - - /* Note need to support azimuth range [-180,180] since this is what is returned by atan2f. AzimMod is on the */ - /* range (-180,180]. This should be faster than doing a full mod(360) etc. */ - if ( Azim == -180.0f ) - { - AzimMod = 180.0f; - } - else - { - AzimMod = Azim; - } - - /* Use the nearest filter point. Since the azimuth is not assumed to be the same for */ - /* different elevations, make a shortlist of rows to check, and a range azimuth to check. */ - for ( c = 0; c < HrFiltSet_p->NumElev; c++ ) - { - if ( fabsf( Elev - HrFiltSet_p->Elev_p[c] ) < ElevDiff ) - { - ElevDiff = fabsf( Elev - HrFiltSet_p->Elev_p[c] ); - ElevInd = c; - } - } - - if ( ElevInd < 0 ) - { - ElevInd = 0; - } - else if ( ElevInd >= HrFiltSet_p->NumElev ) - { - ElevInd = HrFiltSet_p->NumElev - 1; - } - ElevIndLo = max( 0, ElevInd - 2 ); - ElevIndHi = min( HrFiltSet_p->NumElev - 1, ElevInd + 2 ); - - AzimLo = AzimMod - 15; - if ( AzimLo <= -180.0 ) - { - AzimLo += 360.0; - } - AzimHi = AzimMod + 15; - if ( AzimHi > 360.0 ) - { - AzimHi -= 360.0; - } - - if ( AzimHi < AzimLo ) - { - flipped = 1; - } - - /* Check each candidate elevation row, and each azimuth value in that row, to make a list of candidate points. */ - c = 0; - for ( ElevInd = ElevIndLo; ElevInd <= ElevIndHi; ElevInd++ ) - { - for ( AzimInd = HrFiltSet_p->AzimStartIdx_p[ElevInd]; - AzimInd < HrFiltSet_p->AzimStartIdx_p[ElevInd] + HrFiltSet_p->NumAzim_p[ElevInd]; - AzimInd++ ) - { - if ( flipped == 0 ) - { - test = HrFiltSet_p->Azim_p[AzimInd] >= AzimLo && HrFiltSet_p->Azim_p[AzimInd] <= AzimHi; - } - else - { - /* This is the case where the limits straddle the +/- 180 discontinuity */ - test = HrFiltSet_p->Azim_p[AzimInd] >= AzimLo || HrFiltSet_p->Azim_p[AzimInd] <= AzimHi; - } - if ( test ) - { - /* Azim value is within range, store it */ - CandidateIndices[c] = AzimInd; - c++; - } - } - } - - for ( n = 0; n < c; n++ ) - { - CandidateAzim = HrFiltSet_p->Azim_p[CandidateIndices[n]]; - CandidateElev = HrFiltSet_p->ElevFull_p[CandidateIndices[n]]; - CandidateAngles[n] = GreatCircleAngleDeg( AzimMod, Elev, CandidateAzim, CandidateElev ); - } - - /* Find the candidate with the minimum angle/distance */ - min = CandidateAngles[0]; - HrFiltInd = CandidateIndices[0]; - for ( n = 1; n < c; n++ ) - { - if ( CandidateAngles[n] < min ) - { - min = CandidateAngles[n]; - HrFiltInd = CandidateIndices[n]; - } - } - - HrFiltInd *= HrFiltSet_p->FiltLength; - - /* 3. No extracted ITD. */ - SfxSpatBinParams_p->Itd = 0; - - /* 4. Copy the filter over */ - for ( n = 0; n < HrFiltSet_p->FiltLength; n++ ) - { - SfxSpatBinParams_p->LeftFilter_p[n] = HrFiltSet_p->LeftFiltSet_p[HrFiltInd + n]; - SfxSpatBinParams_p->RightFilter_p[n] = HrFiltSet_p->RightFiltSet_p[HrFiltInd + n]; - } - - return; -} - - -/*-------------------------------------------------------------------* - * GetFilterFromAngle() - * - * Obtain an HR filter corresponding to the input angle pair. - * This version is a controller that switches between the available - * methods (table, model) according to HrFiltSet_p->FilterMethod - --------------------------------------------------------------------*/ - -void GetFilterFromAngle( - TDREND_HRFILT_FiltSet_t *HrFiltSet_p, /* i/o: HR filter set structure */ - const float Elev, /* i : Elevation, degrees */ - float Azim, /* i : Azimuth, degrees */ - SFX_SpatBin_Params_t *SfxSpatBinParams_p /* i/o: Currently used HR filter */ -) -{ - switch ( HrFiltSet_p->FilterMethod ) - { - case TDREND_HRFILT_Method_BSplineModel: - GetFilterFromAngle_M( HrFiltSet_p, Elev, Azim, SfxSpatBinParams_p ); - break; - case TDREND_HRFILT_Method_Table_F: - GetFilterFromAngle_F( HrFiltSet_p, Elev, Azim, SfxSpatBinParams_p ); - break; - case TDREND_HRFILT_Method_Table_S: - GetFilterFromAngle_S( HrFiltSet_p, Elev, Azim, SfxSpatBinParams_p ); - break; - } - - return; -} -#endif - /*-------------------------------------------------------------------* * GetFilterFromAngle() * @@ -710,59 +103,29 @@ void GetFilterFromAngle( * This version uses the HR filter model. --------------------------------------------------------------------*/ -#ifdef TDREND_HRTF_TABLE_METHODS -static void GetFilterFromAngle_M( -#else void GetFilterFromAngle( -#endif TDREND_HRFILT_FiltSet_t *HrFiltSet_p, /* i/o: HR filter set structure */ const float Elev, /* i : Elevation, degrees */ float Azim, /* i : Azimuth, degrees */ -#ifdef FIX_ITD - float *hrf_left, /* o : Left HR filter */ - float *hrf_right, /* o : Right HR filter */ - int16_t *itd /* o : ITD value */ -#else - SFX_SpatBin_Params_t *SfxSpatBinParams_p /* i/o: Currently used HR filter */ -#endif + float *hrf_left, /* o : Left HR filter */ + float *hrf_right, /* o : Right HR filter */ + int16_t *itd /* o : ITD value */ ) { -#ifndef FIX_ITD - int16_t count, ii; -#endif GenerateFilter( Elev, Azim, &HrFiltSet_p->ModelParams, &HrFiltSet_p->ModelEval ); -#ifdef FIX_ITD mvr2r( HrFiltSet_p->ModelEval.hrfModL, hrf_left, HrFiltSet_p->ModelParams.K ); mvr2r( HrFiltSet_p->ModelEval.hrfModR, hrf_right, HrFiltSet_p->ModelParams.K ); -#else - /* Renderer requires filter in reversed order: */ - count = 0; - for ( ii = ( HrFiltSet_p->ModelParams.K - 1 ); ii >= 0; ii-- ) - { - SfxSpatBinParams_p->LeftFilter_p[ii] = HrFiltSet_p->ModelEval.hrfModL[count]; - SfxSpatBinParams_p->RightFilter_p[ii] = HrFiltSet_p->ModelEval.hrfModR[count]; - count++; - } -#endif /* 4. Evaluate the ITD */ if ( HrFiltSet_p->ModelParams.UseItdModel ) { GenerateITD( Elev, Azim, &HrFiltSet_p->ModelParamsITD, &HrFiltSet_p->ModelEval ); -#ifdef FIX_ITD *itd = (int16_t) HrFiltSet_p->ModelEval.itdMod; -#else - SfxSpatBinParams_p->Itd = HrFiltSet_p->ModelEval.itdMod; -#endif } else { -#ifdef FIX_ITD *itd = 0; -#else - SfxSpatBinParams_p->Itd = 0; /* No extracted ITD */ -#endif } return; @@ -1127,13 +490,7 @@ void HRTF_model_precalc( ) { int16_t sec_length; - int16_t i, k, j; - float *pEL; - float *pER; - const float *pAlphaL; - const float *pAlphaR; - float tmp; - int16_t AlphaN; + int16_t i; sec_length = model->K / HRTF_MODEL_N_SECTIONS; @@ -1149,43 +506,6 @@ void HRTF_model_precalc( maximum_s( model->azimDim3, model->elevDim3, &model->azimDim3Max ); - if ( !model->modelROM ) - { - AlphaN = model->AlphaN; - - /* Precalculated energies for each section and each row of the alpha matrices */ - model->EL_dyn = (float *) count_malloc( HRTF_MODEL_N_SECTIONS * AlphaN * sizeof( float ) ); - model->ER_dyn = (float *) count_malloc( HRTF_MODEL_N_SECTIONS * AlphaN * sizeof( float ) ); - pEL = model->EL_dyn; - pER = model->ER_dyn; - for ( i = 0; i < HRTF_MODEL_N_SECTIONS; i++ ) - { - for ( j = 0; j < AlphaN; j++ ) /* rows of Alpha matrices */ - { - *pEL = 0.0f; - *pER = 0.0f; - - pAlphaL = &model->AlphaL[model->iSecFirst[i] * AlphaN + j]; - pAlphaR = &model->AlphaR[model->iSecFirst[i] * AlphaN + j]; - - for ( k = model->iSecFirst[i]; k < model->iSecLast[i]; k++ ) /* k within the sections */ - { - /* Energy calculation */ - tmp = *pAlphaL; - *pEL += tmp * tmp; - tmp = *pAlphaR; - *pER += tmp * tmp; - pAlphaL += AlphaN; - pAlphaR += AlphaN; - } - pEL++; - pER++; - } - } - model->EL = (const float *) model->EL_dyn; - model->ER = (const float *) model->ER_dyn; - } - return; } @@ -1204,65 +524,25 @@ void BSplineModelEvalDealloc( /* Allocated in LoadBSplineBinary() */ int16_t i; - if ( !model->modelROM ) + if ( model->modelROM ) { - count_free( model->elevKSeq_dyn ); - count_free( model->azim_start_idx_dyn ); - count_free( model->azimDim2_dyn ); - count_free( model->azimDim3_dyn ); - count_free( model->AlphaL_dyn ); - count_free( model->AlphaR_dyn ); - count_free( model->azimSegSamples_dyn ); - - count_free( model->azimShapeIdx_dyn ); - count_free( model->azimShapeSampFactor_dyn ); - count_free( model->elevBsShape_dyn ); - - count_free( model->EL_dyn ); - count_free( model->ER_dyn ); - - for ( i = 0; i < model->num_unique_azim_splines; i++ ) + free( (void *) model->azimBsShape ); /* void* cast needed to please both gcc and Visual studio compilers. Deallocating const float** should be fine and gcc agrees, but Visual studio complains. */ + for ( i = 0; i < model->elevDim3; i++ ) { - count_free( model->azimBsShape_dyn[i] ); + free( model->azimKSeq[i] ); + } + free( model->azimKSeq ); + if ( modelEval != NULL ) + { + free( modelEval->hrfModL ); + free( modelEval->hrfModR ); } - count_free( model->azimBsShape_dyn ); - } - count_free( (void *) model->azimBsShape ); /* void* cast needed to please both gcc and Visual studio compilers. Deallocating const float** should be fine and gcc agrees, but Visual studio complains. */ - for ( i = 0; i < model->elevDim3; i++ ) - { - count_free( model->azimKSeq[i] ); - } - count_free( model->azimKSeq ); - if ( modelEval != NULL ) - { - count_free( modelEval->hrfModL ); - count_free( modelEval->hrfModR ); } return; } -/*-------------------------------------------------------------------* - * BSplineModelEvalITDDealloc() - * - * Deallocates the ITD model. - --------------------------------------------------------------------*/ - -void BSplineModelEvalITDDealloc( - ModelParamsITD_t *model /* i : Model parameters */ -) -{ - count_free( model->elevKSeq_dyn ); - count_free( model->azimKSeq_dyn ); - count_free( model->W_dyn ); - count_free( model->azimBsShape_dyn ); - count_free( model->elevBsShape_dyn ); - - return; -} - - /*-------------------------------------------------------------------* * SkipSmallest_ValueIndex() * @@ -1341,27 +621,3 @@ static void SkipSmallest_ValueIndex( return; } - - -#ifdef TDREND_HRTF_TABLE_METHODS -/*-------------------------------------------------------------------* - * GreatCircleAngleDeg() - * - * Returns the great-circle angle between two (azimuth, elevation) - * pairs - --------------------------------------------------------------------*/ - -/*! r: Angle between the two points on the sphere, degrees */ -static float GreatCircleAngleDeg( - float Az1, /* i : Azimuth angle, degrees, point 1 */ - float El1, /* i : Elevation angle, degrees, point 1 */ - float Az2, /* i : Azimuth angle, degrees, point 2 */ - float El2 /* i : Elevation angle, degrees, point 2 */ -) -{ - return acosf( sinf( El1 * PI_OVER_180 ) * sinf( El2 * PI_OVER_180 ) + - cosf( El1 * PI_OVER_180 ) * cosf( El2 * PI_OVER_180 ) * - cosf( fabsf( Az1 - Az2 ) * PI_OVER_180 ) ) * - PI_OVER_180; -} -#endif diff --git a/lib_rend/ivas_objectRenderer_mix.c b/lib_rend/ivas_objectRenderer_mix.c index c8e75cfd04..509d22d320 100644 --- a/lib_rend/ivas_objectRenderer_mix.c +++ b/lib_rend/ivas_objectRenderer_mix.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,13 +33,30 @@ #include #include "options.h" #include "prot.h" -#include "ivas_prot.h" -#include "wmops.h" +#include "ivas_prot_rend.h" +#include "ivas_rom_TdBinauralRenderer.h" +#include "ivas_error.h" +#include "wmc_auto.h" #ifdef DEBUGGING #include "debug.h" #endif +/*-------------------------------------------------------------------* + * Local constants + *-------------------------------------------------------------------*/ + +#define RESAMPLE_FACTOR_16_48 ( 16.0f / 48.0f ) +#define RESAMPLE_FACTOR_32_48 ( 32.0f / 48.0f ) + + +/*------------------------------------------------------------------------- + * Local functions + *-------------------------------------------------------------------------*/ + +static ivas_error DefaultBSplineModel( TDREND_HRFILT_FiltSet_t *HrFiltSet_p, const int32_t output_Fs ); + + /*-------------------------------------------------------------------* * TDREND_MIX_LIST_SetPos() * @@ -122,7 +139,7 @@ void TDREND_MIX_Dealloc( /* Deallocate Listener and RendListener */ if ( hBinRendererTd->Listener_p != NULL ) { - count_free( hBinRendererTd->Listener_p ); + free( hBinRendererTd->Listener_p ); hBinRendererTd->Listener_p = NULL; } /* Dealloc HR filter set */ @@ -130,54 +147,33 @@ void TDREND_MIX_Dealloc( { if ( hBinRendererTd->HrFiltSet_p->FilterMethod == TDREND_HRFILT_Method_BSplineModel ) { - if ( hBinRendererTd->HrFiltSet_p->ModelParams.UseItdModel && !hBinRendererTd->HrFiltSet_p->ModelParams.modelROM ) - { - BSplineModelEvalITDDealloc( &hBinRendererTd->HrFiltSet_p->ModelParamsITD ); - } BSplineModelEvalDealloc( &hBinRendererTd->HrFiltSet_p->ModelParams, &hBinRendererTd->HrFiltSet_p->ModelEval ); } else { if ( hBinRendererTd->HrFiltSet_p->Elev_p != NULL ) { - count_free( hBinRendererTd->HrFiltSet_p->Elev_p ); + free( hBinRendererTd->HrFiltSet_p->Elev_p ); hBinRendererTd->HrFiltSet_p->Elev_p = NULL; } if ( hBinRendererTd->HrFiltSet_p->Azim_p != NULL ) { - count_free( hBinRendererTd->HrFiltSet_p->Azim_p ); + free( hBinRendererTd->HrFiltSet_p->Azim_p ); hBinRendererTd->HrFiltSet_p->Azim_p = NULL; } if ( hBinRendererTd->HrFiltSet_p->LeftFiltSet_p != NULL ) { - count_free( hBinRendererTd->HrFiltSet_p->LeftFiltSet_p ); + free( hBinRendererTd->HrFiltSet_p->LeftFiltSet_p ); hBinRendererTd->HrFiltSet_p->LeftFiltSet_p = NULL; } if ( hBinRendererTd->HrFiltSet_p->RightFiltSet_p != NULL ) { - count_free( hBinRendererTd->HrFiltSet_p->RightFiltSet_p ); + free( hBinRendererTd->HrFiltSet_p->RightFiltSet_p ); hBinRendererTd->HrFiltSet_p->RightFiltSet_p = NULL; } -#ifdef TDREND_HRTF_TABLE_METHODS - if ( hBinRendererTd->HrFiltSet_p->NumAzim_p != NULL ) - { - count_free( hBinRendererTd->HrFiltSet_p->NumAzim_p ); - hBinRendererTd->HrFiltSet_p->NumAzim_p = NULL; - } - if ( hBinRendererTd->HrFiltSet_p->AzimStartIdx_p != NULL ) - { - count_free( hBinRendererTd->HrFiltSet_p->AzimStartIdx_p ); - hBinRendererTd->HrFiltSet_p->AzimStartIdx_p = NULL; - } - if ( hBinRendererTd->HrFiltSet_p->ElevFull_p != NULL ) - { - count_free( hBinRendererTd->HrFiltSet_p->ElevFull_p ); - hBinRendererTd->HrFiltSet_p->ElevFull_p = NULL; - } -#endif } - count_free( hBinRendererTd->HrFiltSet_p ); + free( hBinRendererTd->HrFiltSet_p ); hBinRendererTd->HrFiltSet_p = NULL; } @@ -198,6 +194,7 @@ ivas_error TDREND_MIX_Init( const int32_t output_Fs /* i : Output sampling rate */ ) { + ivas_error error; hBinRendererTd->Gain = 1.0f; @@ -225,12 +222,15 @@ ivas_error TDREND_MIX_Init( /* Init HR filter set */ if ( *hHrtfTD == NULL ) { - if ( ( hBinRendererTd->HrFiltSet_p = (TDREND_HRFILT_FiltSet_t *) count_malloc( sizeof( TDREND_HRFILT_FiltSet_t ) ) ) == NULL ) + if ( ( hBinRendererTd->HrFiltSet_p = (TDREND_HRFILT_FiltSet_t *) malloc( sizeof( TDREND_HRFILT_FiltSet_t ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural TD renderer\n" ) ); } - DefaultBSplineModel( hBinRendererTd->HrFiltSet_p, output_Fs ); + if ( ( error = DefaultBSplineModel( hBinRendererTd->HrFiltSet_p, output_Fs ) ) != IVAS_ERR_OK ) + { + return error; + } *hHrtfTD = hBinRendererTd->HrFiltSet_p; } else @@ -290,12 +290,7 @@ ivas_error TDREND_MIX_SetDistAttenModel( ivas_error TDREND_MIX_AddSrc( BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ int16_t *SrcInd, /* o : Source index */ -#ifdef FIX_ITD - const TDREND_PosType_t PosType /* i : Position type (absolute/relative) */ -#else - const TDREND_PosType_t PosType, /* i : Position type (absolute/relative) */ - const int32_t output_Fs /* i : Output sampling rate */ -#endif + const TDREND_PosType_t PosType /* i : Position type (absolute/relative) */ ) { TDREND_SRC_t *Src_p; @@ -327,11 +322,7 @@ ivas_error TDREND_MIX_AddSrc( return error; } -#ifdef FIX_ITD TDREND_SRC_Init( Src_p, PosType ); -#else - TDREND_SRC_Init( Src_p, PosType, output_Fs ); -#endif /* Special OpenAL initialization due to a common distance attenuation model */ if ( hBinRendererTd->DistAttenModel != 0 ) @@ -346,3 +337,201 @@ ivas_error TDREND_MIX_AddSrc( return error; } + + +/*-------------------------------------------------------------------* + * BSplineModelEvalAlloc() + * + * Allocate the B Spline HR Filter model. + --------------------------------------------------------------------*/ + +static ivas_error BSplineModelEvalAlloc( + ModelParams_t *model, /* i : Model parameters */ + ModelEval_t *modelEval /* i/o: Model evaluation structure */ +) +{ + if ( ( modelEval->hrfModL = (float *) malloc( model->K * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural TD renderer\n" ) ); + } + + if ( ( modelEval->hrfModR = (float *) malloc( model->K * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural TD renderer\n" ) ); + } + + return IVAS_ERR_OK; +} + + +/*-------------------------------------------------------------------* + * DefaultBSplineModel() + * + * Init default HRTF model + --------------------------------------------------------------------*/ + +static ivas_error DefaultBSplineModel( + TDREND_HRFILT_FiltSet_t *HrFiltSet_p, /* o : Loaded HR filter set */ + const int32_t output_Fs /* i : Output sampling rate */ +) +{ + ModelParams_t *model; + ModelParamsITD_t *modelITD; + int16_t i, j; + ivas_error error; + + HrFiltSet_p->FilterMethod = TDREND_HRFILT_Method_BSplineModel; + model = &( HrFiltSet_p->ModelParams ); + modelITD = &( HrFiltSet_p->ModelParamsITD ); + + /* Set ROM flag for correct deallocation */ + model->modelROM = TRUE; + + /* int16_t parameters */ + model->UseItdModel = 1; + model->SplineDegree = 4; + model->elevDim2 = 20; + model->elevDim3 = 18; + model->AlphaN = 578; + model->num_unique_azim_splines = 1; + model->elevSegSamples = 3; + model->elevBsLen[0] = 4; + model->elevBsLen[1] = 7; + model->elevBsLen[2] = 10; + model->elevBsLen[3] = 7; + model->elevBsStart[0] = 0; + model->elevBsStart[1] = 4; + model->elevBsStart[2] = 11; + model->elevBsStart[3] = 21; + + model->azimDim2 = orange53_rom_azimDim2; + model->azimDim3 = orange53_rom_azimDim3; + model->azim_start_idx = orange53_rom_azim_start_idx; + model->azimSegSamples = orange53_rom_azimSegSamples; + model->azimShapeIdx = orange53_rom_azimShapeIdx; + model->azimShapeSampFactor = orange53_rom_azimShapeSampFactor; + + /* float parameters */ + model->elevKSeq = (const float *) orange53_rom_elevKSeq; + model->elevBsShape = (const float *) orange53_rom_elevBsShape; + + if ( ( model->azimBsShape = (const float **) malloc( model->num_unique_azim_splines * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural TD renderer\n" ) ); + } + + model->azimBsShape[0] = (const float *) orange53_rom_azimBsShape; + if ( ( model->azimKSeq = (float **) malloc( 18 * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural TD renderer\n" ) ); + } + if ( ( model->azimKSeq[0] = (float *) malloc( 2 * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural TD renderer\n" ) ); + } + if ( ( model->azimKSeq[17] = (float *) malloc( 2 * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural TD renderer\n" ) ); + } + model->azimKSeq[0][0] = 0.0f; + model->azimKSeq[17][0] = 0.0f; + model->azimKSeq[0][1] = 360.0f; + model->azimKSeq[17][1] = 360.0f; + + for ( i = 1; i < 17; i++ ) + { + if ( ( model->azimKSeq[i] = (float *) malloc( model->azimDim2[i] * sizeof( float * ) ) ) == NULL ) /* azimDim2[i] = 91, i=2..15 */ + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural TD renderer\n" ) ); + } + for ( j = 0; j < model->azimDim2[i]; j++ ) + { + model->azimKSeq[i][j] = (float) orange53_rom_azimSegSamples[0] * j; + } + } + + switch ( output_Fs ) + { + case 48000: + model->AlphaL = (const float *) orange53_rom_AlphaL48; + model->AlphaR = (const float *) orange53_rom_AlphaR48; + model->EL = (const float *) orange53_rom_EL48; + model->ER = (const float *) orange53_rom_ER48; + model->K = 128; + if ( HrFiltSet_p->ModelParams.UseItdModel ) + { + modelITD->resamp_factor = 1.0f; + } + break; + case 32000: + model->AlphaL = (const float *) orange53_rom_AlphaL32; + model->AlphaR = (const float *) orange53_rom_AlphaR32; + model->EL = (const float *) orange53_rom_EL32; + model->ER = (const float *) orange53_rom_ER32; + model->K = 86; + if ( HrFiltSet_p->ModelParams.UseItdModel ) + { + modelITD->resamp_factor = RESAMPLE_FACTOR_32_48; + } + break; + case 16000: + model->AlphaL = (const float *) orange53_rom_AlphaL16; + model->AlphaR = (const float *) orange53_rom_AlphaR16; + model->EL = (const float *) orange53_rom_EL16; + model->ER = (const float *) orange53_rom_ER16; + model->K = 43; + if ( HrFiltSet_p->ModelParams.UseItdModel ) + { + modelITD->resamp_factor = RESAMPLE_FACTOR_16_48; + } + break; + default: + break; + } + + modelITD->N = 4; + modelITD->elevDim2 = 20; + modelITD->elevDim3 = 18; + modelITD->azimDim2 = 41; + modelITD->azimDim3 = 41; + modelITD->elevSegSamples = 3; + modelITD->elevBsLen[0] = 4; + modelITD->elevBsLen[1] = 7; + modelITD->elevBsLen[2] = 10; + modelITD->elevBsLen[3] = 7; + modelITD->elevBsStart[0] = 0; + modelITD->elevBsStart[1] = 4; + modelITD->elevBsStart[2] = 11; + modelITD->elevBsStart[3] = 21; + + modelITD->elevKSeq = model->elevKSeq; + + modelITD->azimBsLen[0] = 11; + modelITD->azimBsLen[1] = 21; + modelITD->azimBsLen[2] = 31; + modelITD->azimBsLen[3] = 21; + modelITD->azimBsStart[0] = 0; + modelITD->azimBsStart[1] = 11; + modelITD->azimBsStart[2] = 32; + modelITD->azimBsStart[3] = 63; + + modelITD->azimSegSamples = 10; + + modelITD->azimKSeq = orange53_rom_ITD_azimKSeq; + modelITD->W = (const float *) orange53_rom_ITD_W; + modelITD->azimBsShape = (const float *) orange53_rom_ITD_azimBsShape; + modelITD->elevBsShape = (const float *) orange53_rom_ITD_elevBsShape; + + HRTF_model_precalc( model ); + + HrFiltSet_p->latency_s = orange53_rom_latency_s; + HrFiltSet_p->SampleRate = output_Fs; + HrFiltSet_p->FiltLength = HrFiltSet_p->ModelParams.K; + + if ( ( error = BSplineModelEvalAlloc( &HrFiltSet_p->ModelParams, &HrFiltSet_p->ModelEval ) ) != IVAS_ERR_OK ) + { + return error; + } + + return IVAS_ERR_OK; +} diff --git a/lib_rend/ivas_objectRenderer_sfx.c b/lib_rend/ivas_objectRenderer_sfx.c index a5f3b58e7a..af3231df61 100644 --- a/lib_rend/ivas_objectRenderer_sfx.c +++ b/lib_rend/ivas_objectRenderer_sfx.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,1431 +33,24 @@ #include #include "options.h" #include -#include "ivas_prot.h" +#include "ivas_prot_rend.h" #include "ivas_rom_rend.h" #include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*---------------------------------------------------------------------* * Local constants *---------------------------------------------------------------------*/ -#ifndef FIX_ITD -/* Sinc constants */ -#define SFX_SPAT_BIN_SINC_M 5 -#define SFX_SPAT_BIN_NUM_SUBSAMPLES_BITS 6 -#define SFX_SPAT_BIN_NUM_SUBSAMPLES ( 1 << SFX_SPAT_BIN_NUM_SUBSAMPLES_BITS ) -#endif /*---------------------------------------------------------------------* * Local function prototypes *---------------------------------------------------------------------*/ -#ifndef FIX_ITD -static void TDREND_SFX_SpatBin_SetParamsInitializeOn( SFX_SpatBin_t *SfxSpatBin_p, const SFX_SpatBin_Params_t *NewParam_p, const int32_t output_Fs ); -static void TDREND_SFX_SpatBin_SetParamsInitializeOff( SFX_SpatBin_t *SfxSpatBin_p, const SFX_SpatBin_Params_t *NewParam_p, const int32_t output_Fs ); -static void TDREND_SFX_SpatBin_SetParamsOn( SFX_SpatBin_t *SfxSpatBin_p, const SFX_SpatBin_Params_t *NewParam_p, const int32_t output_Fs ); -static void TDREND_SFX_SpatBin_SetParamsOff( SFX_SpatBin_t *const SfxSpatBin_p, const int32_t output_Fs ); -static void TDREND_SFX_SpatBin_Execute( SFX_SpatBin_t *SfxSpatBin_p, const float *InBuffer_p, -#ifdef DEBUGGING - const int16_t NoOfInputSamples, -#endif - const int16_t NoOfRequestedOutputSamples, - float *LeftOutBuffer_p, - float *RightOutBuffer_p, - int16_t *NoOfUsedInputSamples_p, - int16_t *NoOfDeliveredOutputSamples_p, - const int32_t output_Fs ); -static void TDREND_FirFilterRev( float *OutputFrame_p, float *FirFilterRev_p, const int16_t FirFilterLength, float *InputFrame_p, const int16_t NumOfSamples ); -#ifdef TDREND_HRTF_TABLE_METHODS -static void TDREND_FirFilterRevInterp( float *OutputFrame_p, float *FirFilterRev_p, const int16_t FirFilterLength, float *InputFrame_p, const int16_t NumOfSamples, float *FilterStored ); -#endif -static void TDREND_SFX_SpatBin_Clear( SFX_SpatBin_t *SfxSpatBin_p, const int32_t output_Fs ); -#else -static void sincResample( const float *input, float *output, const int16_t length_in, const int16_t length_out ); -#endif - -#ifndef FIX_ITD -/*-------------------------------------------------------------------* - * TDREND_SFX_SpatBin_Resampling() - * - * Resamples input data with a given resampling factor and returns the - * resampled data. - * - --------------------------------------------------------------------*/ - -static void TDREND_SFX_SpatBin_Resampling( - const float *const InputBuffer_p, /* i : The input buffer with audio samples. */ - const int16_t NoOfInputSamples, /* i : Length of input buffer */ - float *const ResampleOutBuffer_p, /* o : Resampled output */ - const int16_t NoOfResampledSamples, /* i : Length of resampled output */ - float *const OldBuffer_p, /* i/o: Samples from previous input buffer (in case of buffer surplus) */ - int16_t *const NoOfOldBufferSamples_p, /* i/o: Length of OldBuffer_p */ - const float Alpha, /* i : Resampling factor */ - float *const Tf_p /* i/o: Old fractional time value / updated time value 0.0 <= Tf < 1.0 */ -) -{ - int16_t i, k, n, n0; - float AlphaInv; - float T; - int16_t nt, snc0, SubsamplesSteps; - const float *SamplePointer_p, *SincPointer_p; - float Temp; - int16_t NoOfSamplesToCopy, MaximumIndInOldBuffer, Ind; - - T = *Tf_p; - - /* The inverse of the resampling factor */ - AlphaInv = 1 / Alpha; - - /* Check how many input samples we have */ - if ( NoOfInputSamples < 2 * SFX_SPAT_BIN_SINC_M ) - { - NoOfSamplesToCopy = NoOfInputSamples; - MaximumIndInOldBuffer = *NoOfOldBufferSamples_p - ( 2 * SFX_SPAT_BIN_SINC_M - NoOfInputSamples ); - } - else - { - NoOfSamplesToCopy = 2 * SFX_SPAT_BIN_SINC_M; - MaximumIndInOldBuffer = *NoOfOldBufferSamples_p; - } - - /* 1. Append min(2M,N_input) samples from input buffer to old buffer */ - for ( i = 0; i < NoOfSamplesToCopy; i++ ) - { - OldBuffer_p[*NoOfOldBufferSamples_p + i] = InputBuffer_p[i]; - } - - /* 2. Resampling */ - nt = 0; - n0 = SFX_SPAT_BIN_SINC_M - 1; - k = 0; - if ( Alpha <= 1.0 ) - { - /* 2.1 Resample (without scaling) old buffer */ - while ( nt <= MaximumIndInOldBuffer ) - { - /* Calculate the sinc-index for the center value of the sinc */ - snc0 = (int16_t) ( ( T + EPSILON - nt ) * SFX_SPAT_BIN_NUM_SUBSAMPLES + 0.5 ); - - /* The convolution of the sinc and the data */ - SamplePointer_p = &OldBuffer_p[n0 + nt - ( SFX_SPAT_BIN_SINC_M - 1 )]; - SincPointer_p = &SincTable[snc0 - SFX_SPAT_BIN_NUM_SUBSAMPLES * ( -( SFX_SPAT_BIN_SINC_M - 1 ) )]; - - Temp = *SamplePointer_p * *SincPointer_p; - for ( i = -( SFX_SPAT_BIN_SINC_M - 2 ); i <= 0; i++ ) - { - SamplePointer_p++; - SincPointer_p -= SFX_SPAT_BIN_NUM_SUBSAMPLES; - Temp = Temp + *SamplePointer_p * *SincPointer_p; - } - - SamplePointer_p++; - SincPointer_p = &SincTable[SFX_SPAT_BIN_NUM_SUBSAMPLES - snc0]; - Temp = Temp + *SamplePointer_p * *SincPointer_p; - for ( i = 2; i <= SFX_SPAT_BIN_SINC_M; i++ ) - { - SamplePointer_p++; - SincPointer_p += SFX_SPAT_BIN_NUM_SUBSAMPLES; - Temp = Temp + *SamplePointer_p * *SincPointer_p; - } - - ResampleOutBuffer_p[k] = Temp; - - /* Update the time index */ - T = T + Alpha; - /* Update the time index for the old buffer data */ - nt = (int16_t) ( T + EPSILON ); - /* Update the resampled buffer index */ - k++; - - /* Make sure we don't process too many samples. This check is needed for the cases */ - /* when all resampled samples are obtained from the old buffer. */ - if ( k >= NoOfResampledSamples ) - { - /* We have processed enough data. Jump out of the while-loop! */ - break; - } - } - - /* 2.2 Resample (without scaling) input buffer */ - n0 = ( SFX_SPAT_BIN_SINC_M - 1 ) - *NoOfOldBufferSamples_p; - for ( n = k; n < NoOfResampledSamples; n++ ) - { - /* Calculate the sinc-index for the center value of the sinc */ - snc0 = (int16_t) ( ( T + EPSILON - nt ) * SFX_SPAT_BIN_NUM_SUBSAMPLES + 0.5 ); - - /* The convolution of the sinc and the data */ - SamplePointer_p = &InputBuffer_p[n0 + nt - ( SFX_SPAT_BIN_SINC_M - 1 )]; - SincPointer_p = &SincTable[snc0 - SFX_SPAT_BIN_NUM_SUBSAMPLES * ( -( SFX_SPAT_BIN_SINC_M - 1 ) )]; - - Temp = *SamplePointer_p * *SincPointer_p; - for ( i = -( SFX_SPAT_BIN_SINC_M - 2 ); i <= 0; i++ ) - { - SamplePointer_p++; - SincPointer_p -= SFX_SPAT_BIN_NUM_SUBSAMPLES; - Temp = Temp + *SamplePointer_p * *SincPointer_p; - } - - SamplePointer_p++; - SincPointer_p = &SincTable[SFX_SPAT_BIN_NUM_SUBSAMPLES - snc0]; - Temp = Temp + *SamplePointer_p * *SincPointer_p; - for ( i = 2; i <= SFX_SPAT_BIN_SINC_M; i++ ) - { - SamplePointer_p++; - SincPointer_p += SFX_SPAT_BIN_NUM_SUBSAMPLES; - Temp = Temp + *SamplePointer_p * *SincPointer_p; - } - ResampleOutBuffer_p[n] = Temp; - - /* Update the time index */ - T = T + Alpha; - /* Update the time index for the input buffer data */ - nt = (int16_t) ( T + EPSILON ); - } - } - else - { - /* Calculate the constant step length in subsamples for the sinc */ - SubsamplesSteps = (int16_t) ( AlphaInv * SFX_SPAT_BIN_NUM_SUBSAMPLES ); - - /* 2.3 Resample (with scaling) old buffer */ - while ( nt <= MaximumIndInOldBuffer ) - { - /* Calculate the sinc-index for the center value of the sinc */ - snc0 = (int16_t) ( ( T + EPSILON - nt ) * SubsamplesSteps + 0.5f ); - - /* The convolution of the sinc and the data */ - - SamplePointer_p = &OldBuffer_p[n0 + nt - ( SFX_SPAT_BIN_SINC_M - 1 )]; - SincPointer_p = &SincTable[snc0 - SubsamplesSteps * ( -( SFX_SPAT_BIN_SINC_M - 1 ) )]; - - Temp = *SamplePointer_p * *SincPointer_p; - for ( i = -( SFX_SPAT_BIN_SINC_M - 2 ); i <= 0; i++ ) - { - SamplePointer_p++; - SincPointer_p -= SubsamplesSteps; - Temp = Temp + *SamplePointer_p * *SincPointer_p; - } - - SamplePointer_p++; - SincPointer_p = &SincTable[SubsamplesSteps - snc0]; - Temp = Temp + *SamplePointer_p * *SincPointer_p; - for ( i = 2; i <= SFX_SPAT_BIN_SINC_M; i++ ) - { - SamplePointer_p++; - SincPointer_p += SubsamplesSteps; - Temp = Temp + *SamplePointer_p * *SincPointer_p; - } - /* Multiply by the inverse of the resampling factor */ - Temp = Temp * AlphaInv; - ResampleOutBuffer_p[k] = Temp; - - /* Update the time index */ - T = T + Alpha; - /* Update the time index for the input buffer data */ - nt = (int16_t) ( T + EPSILON ); - /* Update the resampled buffer index */ - k++; - - /* Make sure we don't process too many samples. This check is needed for the cases */ - /* when all resampled samples are obtained from the old buffer. */ - if ( k >= NoOfResampledSamples ) - { - /* We have processed enough data. Jump out of the while-loop! */ - break; - } - } - - /* 2.4 Resample (with scaling) input buffer */ - n0 = ( SFX_SPAT_BIN_SINC_M - 1 ) - *NoOfOldBufferSamples_p; - for ( n = k; n < NoOfResampledSamples; n++ ) - { - /* Calculate the sinc-index for the center value of the sinc */ - snc0 = (int16_t) ( ( T + EPSILON - nt ) * SubsamplesSteps + 0.5 ); - - /* The convolution of the sinc and the data */ - - SamplePointer_p = &InputBuffer_p[n0 + nt - ( SFX_SPAT_BIN_SINC_M - 1 )]; - SincPointer_p = &SincTable[snc0 - SubsamplesSteps * ( -( SFX_SPAT_BIN_SINC_M - 1 ) )]; - - Temp = *SamplePointer_p * *SincPointer_p; - for ( i = -( SFX_SPAT_BIN_SINC_M - 2 ); i <= 0; i++ ) - { - SamplePointer_p++; - SincPointer_p -= SubsamplesSteps; - Temp = Temp + *SamplePointer_p * *SincPointer_p; - } - - SamplePointer_p++; - SincPointer_p = &SincTable[SubsamplesSteps - snc0]; - Temp = Temp + *SamplePointer_p * *SincPointer_p; - for ( i = 2; i <= SFX_SPAT_BIN_SINC_M; i++ ) - { - SamplePointer_p++; - SincPointer_p += SubsamplesSteps; - Temp = Temp + *SamplePointer_p * *SincPointer_p; - } - /* Multiply by the inverse of the resampling factor */ - Temp = Temp * AlphaInv; - ResampleOutBuffer_p[n] = Temp; - - /* Update the time index */ - T = T + Alpha; - /* Update the time index for the input buffer data */ - nt = (int16_t) ( T + EPSILON ); - } - } - - /* 3. Update old buffer */ - Ind = (int16_t) ( n0 + nt - ( SFX_SPAT_BIN_SINC_M - 1 ) ); - if ( Ind < 0 ) - { - /* Must save some samples from the old buffer */ - for ( i = 0; i < -Ind; i++ ) - { - OldBuffer_p[i] = OldBuffer_p[i + *NoOfOldBufferSamples_p + Ind]; - } - /* Copy the input samples */ - for ( i = 0; i < NoOfInputSamples; i++ ) - { - OldBuffer_p[i - Ind] = InputBuffer_p[i]; - } - *NoOfOldBufferSamples_p = NoOfInputSamples - Ind; - } - else - { - *NoOfOldBufferSamples_p = NoOfInputSamples - (int16_t) ( n0 + nt - ( SFX_SPAT_BIN_SINC_M - 1 ) ); - - SamplePointer_p = &InputBuffer_p[n0 + nt - ( SFX_SPAT_BIN_SINC_M - 1 )]; - for ( i = 0; i < *NoOfOldBufferSamples_p; i++ ) - { - OldBuffer_p[i] = *( SamplePointer_p + i ); - } - } - - /* 4. Update Tf_p */ - *Tf_p = T - nt; - /* Due to the EPSILON factor and rounding problems t_new may be a little negative, ~ -10^-7. This should in theory not be possible so we need to */ - /* make sure that Tf_p is greater than or equal to 0. This problem is not present for fix-code, though. */ - if ( *Tf_p < 0 ) - { - *Tf_p = 0; - } - - return; -} - - -/*-------------------------------------------------------------------* - * TDREND_SFX_SpatBin_SetParams() - * - * Updates the ITD increment, HR-filters increments - * and volumes increments that are used by SFX_SPAT_BIN_UpdateParams(). - * - --------------------------------------------------------------------*/ - -void TDREND_SFX_SpatBin_SetParams( - SFX_SpatBin_t *SfxSpatBin_p, /* i/o: Spatial parameters struct to be updated */ - const SFX_SpatBin_Params_t *NewParam_p, /* i : New parameters struct */ - const int32_t output_Fs /* i : Output sample rate */ -) -{ - if ( NewParam_p->Reset == TRUE ) - { - /* Calling TDREND_SFX_SpatBin_Clear will clear buffers and sets SfxSpatBin_p->InitializeParams = TRUE, which forces all */ - /* rendering parameters to be set directly without any transition period. */ - TDREND_SFX_SpatBin_Clear( SfxSpatBin_p, output_Fs ); - } - - if ( NewParam_p->TurnOn == TRUE ) - { - /* Turn on the effect if it is not already on. */ - if ( SfxSpatBin_p->InitializeParams == TRUE ) - { - TDREND_SFX_SpatBin_SetParamsInitializeOn( SfxSpatBin_p, NewParam_p, output_Fs ); - } - else - { - TDREND_SFX_SpatBin_SetParamsOn( SfxSpatBin_p, NewParam_p, output_Fs ); - } - - SfxSpatBin_p->OpMode = SFX_TRANSIENT; - } - else - { - /* Turn off the effect if it is not already off. */ - if ( SfxSpatBin_p->InitializeParams == TRUE ) - { - TDREND_SFX_SpatBin_SetParamsInitializeOff( SfxSpatBin_p, NewParam_p, output_Fs ); - } - else - { - /* Turn off the effect */ - - TDREND_SFX_SpatBin_SetParamsOff( SfxSpatBin_p, output_Fs ); - } - - SfxSpatBin_p->OpMode = SFX_OFF; - } - - return; -} - - -/*-------------------------------------------------------------------* - * TDREND_SFX_SpatBin_SetParamsInitializeOn() - * - * Initialize spatial parameters and turn the effect on - * - --------------------------------------------------------------------*/ - -static void TDREND_SFX_SpatBin_SetParamsInitializeOn( - SFX_SpatBin_t *SfxSpatBin_p, /* i/o: Spatial parameters struct */ - const SFX_SpatBin_Params_t *NewParam_p, /* i : New parameters struct */ - const int32_t output_Fs /* i : Output sample rate */ -) -{ - int16_t i; - float ItdAbs; - float *LeftFilter_p, *RightFilter_p, *LeftFilterIncr_p, *RightFilterIncr_p; - int16_t mem_size; - - SfxSpatBin_p->InitializeParams = FALSE; - /* The first parameter update */ - SfxSpatBin_p->FirstUpdate = TRUE; - SfxSpatBin_p->TargetTime = 0; - - SfxSpatBin_p->ItdIncrForResampling = 0.0; - - /* Copy the HR-filters */ - SfxSpatBin_p->FilterLength = NewParam_p->FilterLength; - - mem_size = (int16_t) SfxSpatBin_p->FilterLength * sizeof( float ); - LeftFilter_p = (float *) count_malloc( mem_size ); - RightFilter_p = (float *) count_malloc( mem_size ); - LeftFilterIncr_p = (float *) count_malloc( mem_size ); - RightFilterIncr_p = (float *) count_malloc( mem_size ); - - SfxSpatBin_p->LeftFilter_p = LeftFilter_p; - SfxSpatBin_p->RightFilter_p = RightFilter_p; - SfxSpatBin_p->LeftFilterIncr_p = LeftFilterIncr_p; - SfxSpatBin_p->RightFilterIncr_p = RightFilterIncr_p; - - for ( i = 0; i < SfxSpatBin_p->FilterLength; i++ ) - { - *LeftFilter_p++ = NewParam_p->LeftVolume * ( NewParam_p->LeftFilter_p[i] ); - *RightFilter_p++ = NewParam_p->RightVolume * ( NewParam_p->RightFilter_p[i] ); - - /* Set initial increments to 0 */ - *LeftFilterIncr_p++ = 0.0; - *RightFilterIncr_p++ = 0.0; - } - - SfxSpatBin_p->TotNoOfOutputSamples = 0; - - switch ( output_Fs ) - { - case 16000: - i = 0; - break; - case 32000: - i = 1; - break; - case 48000: - i = 2; - break; - } - - /* Initialize ITD */ - if ( NewParam_p->Itd > 0.0 ) - { - SfxSpatBin_p->NoOfLeftOldBufferSamples = SFX_SPAT_BIN_SINC_M - 1 + TDREND_MaxITD[i] - (int16_t) floor( NewParam_p->Itd ); - SfxSpatBin_p->Left_Tf = ( NewParam_p->Itd ) - floorf( NewParam_p->Itd ); - SfxSpatBin_p->NoOfRightOldBufferSamples = SFX_SPAT_BIN_SINC_M - 1 + TDREND_MaxITD[i]; - } - else - { - ItdAbs = -NewParam_p->Itd; - SfxSpatBin_p->NoOfLeftOldBufferSamples = SFX_SPAT_BIN_SINC_M - 1 + TDREND_MaxITD[i] + (int16_t) ceil( ItdAbs ); - SfxSpatBin_p->Left_Tf = ceilf( ItdAbs ) - ( ItdAbs ); - SfxSpatBin_p->NoOfRightOldBufferSamples = SFX_SPAT_BIN_SINC_M - 1 + TDREND_MaxITD[i]; - } - - return; -} - - -/*-------------------------------------------------------------------* - * TDREND_SFX_SpatBin_SetParamsInitializeOff() - * - * Initialize spatial parameters and turn the effect off - * - --------------------------------------------------------------------*/ - -static void TDREND_SFX_SpatBin_SetParamsInitializeOff( - SFX_SpatBin_t *SfxSpatBin_p, /* i/o: Spatial parameters struct */ - const SFX_SpatBin_Params_t *NewParam_p, /* i : New parameters struct */ - const int32_t output_Fs /* i : Output sample rate */ -) -{ - int16_t i; - float *LeftFilter_p, *RightFilter_p, *LeftFilterIncr_p, *RightFilterIncr_p; - int16_t mem_size; - - SfxSpatBin_p->InitializeParams = FALSE; - /* The first parameter update */ - SfxSpatBin_p->FirstUpdate = TRUE; - SfxSpatBin_p->TargetTime = 0; - SfxSpatBin_p->ItdIncrForResampling = 0.0; - - /* Set the HR-filters */ - SfxSpatBin_p->FilterLength = NewParam_p->FilterLength; - - mem_size = (int16_t) SfxSpatBin_p->FilterLength * sizeof( float ); - LeftFilter_p = (float *) count_malloc( mem_size ); - RightFilter_p = (float *) count_malloc( mem_size ); - LeftFilterIncr_p = (float *) count_malloc( mem_size ); - RightFilterIncr_p = (float *) count_malloc( mem_size ); - - SfxSpatBin_p->LeftFilter_p = LeftFilter_p; - SfxSpatBin_p->RightFilter_p = RightFilter_p; - SfxSpatBin_p->LeftFilterIncr_p = LeftFilterIncr_p; - SfxSpatBin_p->RightFilterIncr_p = RightFilterIncr_p; - - *LeftFilter_p++ = 0.5; - *RightFilter_p++ = 0.5; - /* Set initial increments to 0 */ - *LeftFilterIncr_p++ = 0.0; - *RightFilterIncr_p++ = 0.0; - - for ( i = 1; i < SfxSpatBin_p->FilterLength; i++ ) - { - *LeftFilter_p++ = 0.0; - *RightFilter_p++ = 0.0; - /* Set initial increments to 0 */ - *LeftFilterIncr_p++ = 0.0; - *RightFilterIncr_p++ = 0.0; - } - - SfxSpatBin_p->TotNoOfOutputSamples = 0; - - /* Initialize ITD to 0 */ - switch ( output_Fs ) - { - case 16000: - i = 0; - break; - case 32000: - i = 1; - break; - case 48000: - i = 2; - break; - } - SfxSpatBin_p->NoOfLeftOldBufferSamples = SFX_SPAT_BIN_SINC_M - 1 + TDREND_MaxITD[i]; - SfxSpatBin_p->NoOfRightOldBufferSamples = SFX_SPAT_BIN_SINC_M - 1 + TDREND_MaxITD[i]; - SfxSpatBin_p->Left_Tf = 0.0; - - return; -} - - -/*-------------------------------------------------------------------* - * void TDREND_SFX_SpatBin_SetParamsOn() - * - * Turn the effect on - * - --------------------------------------------------------------------*/ - -static void TDREND_SFX_SpatBin_SetParamsOn( - SFX_SpatBin_t *SfxSpatBin_p, /* i/o: Spatial parameters struct */ - const SFX_SpatBin_Params_t *NewParam_p, /* i : New parameters struct */ - const int32_t output_Fs /* i : Output sample rate */ -) -{ - int16_t i; - float *LeftFilterIncr_p, *RightFilterIncr_p; - float MaxITDIncr = TDREND_MaxITD_Incr[2]; - /* Set FirstUpdate to FALSE, which makes SFX_SPAT_BIN_UpdateParams to start */ - /* updating the parameters. */ - SfxSpatBin_p->FirstUpdate = FALSE; - - /* Update TargetTime */ - if ( SfxSpatBin_p->OpMode == SFX_OFF ) - { - /* Start turning on the effect */ - SfxSpatBin_p->TurningOnEffect = TRUE; - /* Stop turning off the effect */ - SfxSpatBin_p->TurningOffEffect = FALSE; - /* Use the transient time instead of the target time */ - SfxSpatBin_p->TargetTime = (int16_t) SfxSpatBin_p->MaxTargetTime; - } - else - { - if ( SfxSpatBin_p->TurningOnEffect == FALSE ) - { - /* The effect is already on. Use the target time. */ - SfxSpatBin_p->TargetTime = (int16_t) SfxSpatBin_p->TotNoOfOutputSamples; - } - else if ( SfxSpatBin_p->TotNoOfOutputSamples > SfxSpatBin_p->TargetTime ) - { - /* The effect has already been turned on or will be turned on now. */ - /* If SfxSpatBin_p->TargetTime > SfxSpatBin_p->TotNoOfOutputSamples then continue with SfxSpatBin_p->TargetTime. */ - SfxSpatBin_p->TargetTime = (int16_t) SfxSpatBin_p->TotNoOfOutputSamples; - SfxSpatBin_p->TurningOnEffect = FALSE; - } - } - - /* Restart the counting of output samples */ - SfxSpatBin_p->TotNoOfOutputSamples = 0; - - /* 1. Calculate the new ITD increment. Here the half ITD increment is calculated due to that */ - /* half of it should be applied on the left channel and half on the right channel. */ - /* However, since doppler is not supported anymore resampling is only applied to the left */ - /* channel so the division by 2 could now be removed. */ - if ( SfxSpatBin_p->TargetTime > 0 ) - { - SfxSpatBin_p->ItdIncrForResampling = ( NewParam_p->Itd - ( SfxSpatBin_p->NoOfRightOldBufferSamples - ( SfxSpatBin_p->NoOfLeftOldBufferSamples - SfxSpatBin_p->Left_Tf ) ) ) / SfxSpatBin_p->TargetTime / 2; - } - - switch ( output_Fs ) - { - case 16000: - MaxITDIncr = TDREND_MaxITD_Incr[0]; - break; - case 32000: - MaxITDIncr = TDREND_MaxITD_Incr[1]; - break; - case 48000: - MaxITDIncr = TDREND_MaxITD_Incr[2]; - break; - } - /* Check that ItdIncrForResampling is within limits */ - if ( SfxSpatBin_p->ItdIncrForResampling > MaxITDIncr ) - { -#ifdef DEBUGGING - printf( "ItdIncrForResampling too large: %f > %f\n", SfxSpatBin_p->ItdIncrForResampling, MaxITDIncr ); - printf( " ParamsOn : TargetTime = %5d\n", SfxSpatBin_p->TargetTime ); -#endif - SfxSpatBin_p->ItdIncrForResampling = MaxITDIncr; - } - else if ( SfxSpatBin_p->ItdIncrForResampling < ( -MaxITDIncr ) ) - { -#ifdef DEBUGGING - printf( "ItdIncrForResampling too small: %f < %f\n", SfxSpatBin_p->ItdIncrForResampling, ( -MaxITDIncr ) ); -#endif - SfxSpatBin_p->ItdIncrForResampling = ( -MaxITDIncr ); - } - - /* 2. Calculate the HR-filter increments. Includes the left and right volume. */ - LeftFilterIncr_p = SfxSpatBin_p->LeftFilterIncr_p; - RightFilterIncr_p = SfxSpatBin_p->RightFilterIncr_p; - - for ( i = 0; i < SfxSpatBin_p->FilterLength; i++ ) - { - *LeftFilterIncr_p++ = ( NewParam_p->LeftFilter_p[i] * NewParam_p->LeftVolume - SfxSpatBin_p->LeftFilter_p[i] ) / SfxSpatBin_p->TargetTime; - *RightFilterIncr_p++ = ( NewParam_p->RightFilter_p[i] * NewParam_p->RightVolume - SfxSpatBin_p->RightFilter_p[i] ) / SfxSpatBin_p->TargetTime; - } - - return; -} - - -/*-------------------------------------------------------------------* - * void TDREND_SFX_SpatBin_SetParamsOff() - * - * Turn the effect off - --------------------------------------------------------------------*/ - -static void TDREND_SFX_SpatBin_SetParamsOff( - SFX_SpatBin_t *const SfxSpatBin_p, /* i/o: Spatial parameters struct */ - const int32_t output_Fs /* i : Output sample rate */ -) -{ - int16_t i; - float *LeftFilterIncr_p, *RightFilterIncr_p; - - int16_t MaxITD = TDREND_MaxITD[2]; - float MaxITDIncr = TDREND_MaxITD_Incr[2]; - switch ( output_Fs ) - { - case 16000: - MaxITD = TDREND_MaxITD[0]; - MaxITDIncr = TDREND_MaxITD_Incr[0]; - break; - case 32000: - MaxITD = TDREND_MaxITD[1]; - MaxITDIncr = TDREND_MaxITD_Incr[1]; - break; - case 48000: - MaxITD = TDREND_MaxITD[2]; - MaxITDIncr = TDREND_MaxITD_Incr[2]; - break; - } - - if ( SfxSpatBin_p->OpMode == SFX_TRANSIENT ) - { - /* The number of samples after which the ITD and HR-filters should have been reset. */ - SfxSpatBin_p->TransientTime = (int16_t) SfxSpatBin_p->MaxTargetTime; - } - - /* Set FirstUpdate to FALSE, which makes SFX_SPAT_BIN_UpdateParams to start updating the parameters. */ - SfxSpatBin_p->FirstUpdate = FALSE; - - /* Update TargetTime */ - if ( SfxSpatBin_p->OpMode == SFX_TRANSIENT ) - { - /* Start turning off the effect */ - SfxSpatBin_p->TurningOffEffect = TRUE; - /* Stop turning on the effect */ - SfxSpatBin_p->TurningOnEffect = FALSE; - /* Use the transient time instead of the target time */ - SfxSpatBin_p->TargetTime = (int16_t) SfxSpatBin_p->MaxTargetTime; - } - else - { - if ( SfxSpatBin_p->TurningOffEffect == FALSE ) - { - /* The effect is already off. Use the target time. */ - SfxSpatBin_p->TargetTime = (int16_t) SfxSpatBin_p->TotNoOfOutputSamples; - } - else if ( SfxSpatBin_p->TotNoOfOutputSamples > SfxSpatBin_p->TargetTime ) - { - /* The effect has already been turned off or will be turned off now. */ - /* If SfxSpatBin_p->TargetTime > SfxSpatBin_p->TotNoOfOutputSamples then continue */ - /* with SfxSpatBin_p->TargetTime. */ - SfxSpatBin_p->TargetTime = (int16_t) SfxSpatBin_p->TotNoOfOutputSamples; - } - } - - /* Restart the counting of output samples */ - SfxSpatBin_p->TotNoOfOutputSamples = 0; - - /* 1. Calculate the new ITD increment. Here the half ITD increment is calculated due to that */ - /* half of it should be applied on the left channel and half on the right channel. */ - /* if (SfxSpatBin_p->TurnedOn == FALSE) */ - if ( SfxSpatBin_p->OpMode == SFX_OFF ) - { - /* The effect has already been turned off */ - SfxSpatBin_p->ItdIncrForResampling = ( 0.0f - ( SfxSpatBin_p->NoOfRightOldBufferSamples - - ( SfxSpatBin_p->NoOfLeftOldBufferSamples - SfxSpatBin_p->Left_Tf ) ) ) / - SfxSpatBin_p->TargetTime / 2.0f; - - /* Check that ItdIncrForResampling is within limits */ - if ( SfxSpatBin_p->ItdIncrForResampling > MaxITDIncr ) - { -#ifdef DEBUGGING - printf( "ItdIncrForResampling too large: %f > %f\n", SfxSpatBin_p->ItdIncrForResampling, MaxITDIncr ); - printf( " ParamsOff : TargetTime = %5d\n", SfxSpatBin_p->TargetTime ); -#endif - SfxSpatBin_p->ItdIncrForResampling = MaxITDIncr; - } - else if ( SfxSpatBin_p->ItdIncrForResampling < ( -MaxITDIncr ) ) - { -#ifdef DEBUGGING - printf( "ItdIncrForResampling too small: %f < %f\n", SfxSpatBin_p->ItdIncrForResampling, ( -MaxITDIncr ) ); -#endif - SfxSpatBin_p->ItdIncrForResampling = ( -MaxITDIncr ); - } - } - else /*if (SfxSpatBin_p->TurnedOn == TRUE && NewParam_p->TurnOn == FALSE) */ - { - /* The effect is about to be turned off */ - SfxSpatBin_p->ItdIncrForResampling = ( 0.0f - ( SfxSpatBin_p->NoOfRightOldBufferSamples - - ( SfxSpatBin_p->NoOfLeftOldBufferSamples - SfxSpatBin_p->Left_Tf ) ) ) / - SfxSpatBin_p->TransientTime / 2.0f; - /* Check that ItdIncrForResampling is within limits */ - if ( SfxSpatBin_p->ItdIncrForResampling > MaxITDIncr ) - { -#ifdef DEBUGGING - printf( "ItdIncrForResampling too large: %f > %f\n", SfxSpatBin_p->ItdIncrForResampling, MaxITDIncr ); - printf( " ParamsOff : TransientTime = %5d\n", SfxSpatBin_p->TransientTime ); -#endif - SfxSpatBin_p->ItdIncrForResampling = MaxITD; - } - else if ( SfxSpatBin_p->ItdIncrForResampling < ( -MaxITDIncr ) ) - { -#ifdef DEBUGGING - printf( "ItdIncrForResampling too small: %f < %f\n", SfxSpatBin_p->ItdIncrForResampling, ( -MaxITDIncr ) ); -#endif - SfxSpatBin_p->ItdIncrForResampling = ( -MaxITDIncr ); - } - - /* 2. Calculate the HR-filter increments. Includes the left and right volume. */ - LeftFilterIncr_p = SfxSpatBin_p->LeftFilterIncr_p; - RightFilterIncr_p = SfxSpatBin_p->RightFilterIncr_p; - - *LeftFilterIncr_p++ = ( 0.5f - SfxSpatBin_p->LeftFilter_p[0] ) / SfxSpatBin_p->TransientTime; - *RightFilterIncr_p++ = ( 0.5f - SfxSpatBin_p->RightFilter_p[0] ) / SfxSpatBin_p->TransientTime; - - for ( i = 1; i < SfxSpatBin_p->FilterLength; i++ ) - { - *LeftFilterIncr_p++ = ( 0.0f - SfxSpatBin_p->LeftFilter_p[i] ) / SfxSpatBin_p->TransientTime; - *RightFilterIncr_p++ = ( 0.0f - SfxSpatBin_p->RightFilter_p[i] ) / SfxSpatBin_p->TransientTime; - } - } - - return; -} - - -/*-------------------------------------------------------------------* - * TDREND_SFX_SpatBin_UpdateParams() - * - * Updates the ITD, HR-filters and volumes, - * which are to be used when processing the next data - * block. - * - --------------------------------------------------------------------*/ - -static void TDREND_SFX_SpatBin_UpdateParams( - SFX_SpatBin_t *SfxSpatBin_p, /* i/o: Spatial parameters struct */ - const int32_t NoOfOutputSamples /* i : Number of output samples */ -) -{ - int16_t i; - float *LeftFilter_p, *RightFilter_p, *LeftFilterIncr_p, *RightFilterIncr_p; - - LeftFilter_p = SfxSpatBin_p->LeftFilter_p; - RightFilter_p = SfxSpatBin_p->RightFilter_p; - LeftFilterIncr_p = SfxSpatBin_p->LeftFilterIncr_p; - RightFilterIncr_p = SfxSpatBin_p->RightFilterIncr_p; - - /* 1. Update the total number of output samples that has been rendered since the */ - /* last ARM update. This value is zeroed in the SetParams function. */ - SfxSpatBin_p->TotNoOfOutputSamples = SfxSpatBin_p->TotNoOfOutputSamples + NoOfOutputSamples; - if ( SfxSpatBin_p->TotNoOfOutputSamples > SfxSpatBin_p->MaxTargetTime ) - { - /* We need to limit TotNoOfOutputSamples in order to avoid wrap around as well */ - /* as when it is used in SetParams its maximum allowed value is MaxTargetTime. */ - SfxSpatBin_p->TotNoOfOutputSamples = SfxSpatBin_p->MaxTargetTime; - } - - /* No need to update if FirstUpdate is not true. All increments are zero. */ - if ( SfxSpatBin_p->FirstUpdate == FALSE ) - { - SfxSpatBin_p->TargetTime -= (int16_t) NoOfOutputSamples; - if ( SfxSpatBin_p->TargetTime < 0 ) - { - /* This is instead of using sub with saturation in order to */ - /* avoid wrap around. */ - SfxSpatBin_p->TargetTime = -1; - } - - if ( SfxSpatBin_p->TurningOffEffect == TRUE ) - { - SfxSpatBin_p->TransientTime -= (int16_t) NoOfOutputSamples; - if ( SfxSpatBin_p->TransientTime <= 0 ) - { - /* The effect has now been turned off */ - - SfxSpatBin_p->ItdIncrForResampling = 0.0; - - /* Set the default HR-filters */ - /* - SfxSpatBin_p->LeftFilter[0] = 0.5; - SfxSpatBin_p->RightFilter[0] = 0.5; - for (i = 1; i < SfxSpatBin_p->FilterLength; i++) - { - SfxSpatBin_p->LeftFilter[i] = 0.0; - SfxSpatBin_p->RightFilter[i] = 0.0; - }*/ - - *LeftFilter_p++ = 0.5; - *RightFilter_p++ = 0.5; - for ( i = 1; i < SfxSpatBin_p->FilterLength; i++ ) - { - *LeftFilter_p++ = 0.0; - *RightFilter_p++ = 0.0; - } - - /* Put HR-filter increments to zero */ - /* - for (i = 0; i < SfxSpatBin_p->FilterLength; i++) - { - SfxSpatBin_p->LeftFilterIncr[i] = 0.0; - SfxSpatBin_p->RightFilterIncr[i] = 0.0; - }*/ - - for ( i = 0; i < SfxSpatBin_p->FilterLength; i++ ) - { - *LeftFilterIncr_p++ = 0.0; - *RightFilterIncr_p++ = 0.0; - } - - /* The effect is now off */ - SfxSpatBin_p->TurningOffEffect = FALSE; - } - } - - /* 2. Check whether increments should continue to be updated. */ - if ( SfxSpatBin_p->TargetTime < 0 ) - { - /* Put ItdIncrForResampling to zero if TargetTime<0 */ - SfxSpatBin_p->ItdIncrForResampling = 0.0; - /* The effect has been turned on if it was being turned on */ - SfxSpatBin_p->TurningOnEffect = FALSE; - } - else - { - /* 3. Update the HR-filters. */ - /* Don't update if the effect is off. */ - if ( SfxSpatBin_p->OpMode == SFX_TRANSIENT || SfxSpatBin_p->TurningOffEffect == TRUE ) - { - /* - for (i = 0; i < SfxSpatBin_p->FilterLength; i++) - { - SfxSpatBin_p->LeftFilter[i] += SfxSpatBin_p->LeftFilterIncr[i] * NoOfOutputSamples; - SfxSpatBin_p->RightFilter[i] += SfxSpatBin_p->RightFilterIncr[i] * NoOfOutputSamples; - }*/ - - for ( i = 0; i < SfxSpatBin_p->FilterLength; i++ ) - { - *LeftFilter_p++ += ( *LeftFilterIncr_p++ ) * NoOfOutputSamples; - *RightFilter_p++ += ( *RightFilterIncr_p++ ) * NoOfOutputSamples; - } - } - } - } - - return; -} - - -/*-------------------------------------------------------------------* - * TDREND_SFX_SpatBin_Execute_Main() - * - * The main rendering function that is called from the Audio Mixer. - --------------------------------------------------------------------*/ - -void TDREND_SFX_SpatBin_Execute_Main( - SFX_SpatBin_t *SfxSpatBin_p, /* i/o: Spatial parameters struct */ - const float *InBuffer_p, /* i : Input buffer */ - const int16_t subframe_length, /* i : subframe length */ - float *LeftOutBuffer_p, /* o : Rendered left channel */ - float *RightOutBuffer_p, /* o : Rendered right channel */ - int16_t *NoOfUsedInputSamples_p, /* o : Number of input samples actually used */ - int16_t *NoOfDeliveredOutputSamples_p, /* o : Number of output samples actually rendered */ - const int32_t output_Fs /* i : Output sample rate */ -) -{ - int16_t i; - const float *InBufferPointer_p; - float *LeftOutBufferPointer_p, *RightOutBufferPointer_p; - int16_t TempNoOfRequestedOutputSamples, TempNoOfUsedInputSamples, TempNoOfDeliveredOutputSamples; - int16_t TempNoOfInputSamples; - int16_t NoOfBlocks; - - /* Make sure the blocks are not longer than 6 msec. */ - - NoOfBlocks = 1; - TempNoOfRequestedOutputSamples = subframe_length; - while ( TempNoOfRequestedOutputSamples > SfxSpatBin_p->MaxBlockLength ) - { - NoOfBlocks = NoOfBlocks << 1; - /* Shift with rounding */ - TempNoOfRequestedOutputSamples = ( TempNoOfRequestedOutputSamples >> 1 ) + ( TempNoOfRequestedOutputSamples & 1 ); - } - - /* Divide the output_frame into NoOfBlocks blocks. */ - InBufferPointer_p = InBuffer_p; - LeftOutBufferPointer_p = LeftOutBuffer_p; - RightOutBufferPointer_p = RightOutBuffer_p; - *NoOfUsedInputSamples_p = 0; - *NoOfDeliveredOutputSamples_p = 0; - TempNoOfInputSamples = subframe_length; - - for ( i = 0; i < NoOfBlocks; i++ ) - { - /* The effect is not being turned off or on. Normal rendering. */ - if ( SfxSpatBin_p->TargetTime < TempNoOfRequestedOutputSamples ) - { - /* Put ITD increment to zero. This prevents the ITD to become too large. */ - SfxSpatBin_p->ItdIncrForResampling = 0.0; - } - - TDREND_SFX_SpatBin_Execute( SfxSpatBin_p, InBufferPointer_p, -#ifdef DEBUGGING - TempNoOfInputSamples, -#endif - TempNoOfRequestedOutputSamples, LeftOutBufferPointer_p, RightOutBufferPointer_p, &TempNoOfUsedInputSamples, &TempNoOfDeliveredOutputSamples, output_Fs ); - - /* DSP update */ - TDREND_SFX_SpatBin_UpdateParams( SfxSpatBin_p, TempNoOfDeliveredOutputSamples ); - - /* Update the temp pointers */ - InBufferPointer_p += TempNoOfUsedInputSamples; - LeftOutBufferPointer_p += TempNoOfDeliveredOutputSamples; - RightOutBufferPointer_p += TempNoOfDeliveredOutputSamples; - - *NoOfDeliveredOutputSamples_p = *NoOfDeliveredOutputSamples_p + TempNoOfDeliveredOutputSamples; - if ( i == NoOfBlocks - 2 ) - { - /* The last block should produce the remaining number of samples */ - TempNoOfRequestedOutputSamples = subframe_length - *NoOfDeliveredOutputSamples_p; - } - *NoOfUsedInputSamples_p = *NoOfUsedInputSamples_p + TempNoOfUsedInputSamples; - TempNoOfInputSamples = TempNoOfInputSamples - TempNoOfUsedInputSamples; - } - - return; -} - - -/*-------------------------------------------------------------------* - * TDREND_SFX_SpatBin_Execute() - * - * Run renderer for one block - * - --------------------------------------------------------------------*/ - -static void TDREND_SFX_SpatBin_Execute( - SFX_SpatBin_t *SfxSpatBin_p, /* i/o: Spatial parameters struct */ - const float *InBuffer_p, /* i : Input buffer */ -#ifdef DEBUGGING - const int16_t NoOfInputSamples, /* i : Length of input buffer */ -#endif - const int16_t NoOfRequestedOutputSamples, /* i : Length of output */ - float *LeftOutBuffer_p, /* o : Rendered left channel */ - float *RightOutBuffer_p, /* o : Rendered right channel */ - int16_t *NoOfUsedInputSamples_p, /* o : Number of input samples actually used */ - int16_t *NoOfDeliveredOutputSamples_p, /* o : Number of output samples actually rendered */ - const int32_t output_Fs /* i : Output sample rate */ -) -{ - int16_t i = 0; - int16_t NoOfInputSamplesForLeft, NoOfInputSamplesForRight; - float TotalLeftFlp; - int16_t NoOfSamplesToCopy, Ind; - - /* 1. Calculate the resampling factors for the left channel. */ - TotalLeftFlp = 1.0f + 2.0f * SfxSpatBin_p->ItdIncrForResampling; - - /* 2. Calculate the number of input samples needed for the left and right channel. */ - NoOfInputSamplesForLeft = 2 * SFX_SPAT_BIN_SINC_M - SfxSpatBin_p->NoOfLeftOldBufferSamples + - (int16_t) ( SfxSpatBin_p->Left_Tf + TotalLeftFlp * ( NoOfRequestedOutputSamples - 1 ) ); - - switch ( output_Fs ) - { - case 16000: - i = 0; - break; - case 32000: - i = 1; - break; - case 48000: - i = 2; - break; - } - NoOfInputSamplesForRight = NoOfRequestedOutputSamples + SFX_SPAT_BIN_SINC_M - 1 + TDREND_MaxITD[i] - - SfxSpatBin_p->NoOfRightOldBufferSamples; - /* Set the number of used Input samples to the maximum. */ - if ( NoOfInputSamplesForLeft > NoOfInputSamplesForRight ) - { - *NoOfUsedInputSamples_p = NoOfInputSamplesForLeft; - } - else - { - *NoOfUsedInputSamples_p = NoOfInputSamplesForRight; - } - /* Set the number of used input samples to zero if it is negative. */ - if ( *NoOfUsedInputSamples_p < 0 ) - { -#ifdef DEBUGGING - printf( "2. *NoOfUsedInputSamples_p < 0\n" ); -#endif - *NoOfUsedInputSamples_p = 0; - } - -#ifdef DEBUGGING - /* The following should never happen */ - if ( *NoOfUsedInputSamples_p > NoOfInputSamples ) - { - printf( "2. *NoOfUsedInputSamples_p > NoInputSamples %d %d \n", *NoOfUsedInputSamples_p, NoOfInputSamples ); - } -#endif - - *NoOfDeliveredOutputSamples_p = NoOfRequestedOutputSamples; - - /* 3. Resample the left channel. */ - TDREND_SFX_SpatBin_Resampling( InBuffer_p, - *NoOfUsedInputSamples_p, - &( SfxSpatBin_p->ResampledBufferLeft[SfxSpatBin_p->FilterLength - 1] ), - *NoOfDeliveredOutputSamples_p, - SfxSpatBin_p->LeftOldBuffer, - &( SfxSpatBin_p->NoOfLeftOldBufferSamples ), - TotalLeftFlp, - &( SfxSpatBin_p->Left_Tf ) ); - - /* 4. Prepare the right input buffer for the HR-filtering. */ - NoOfSamplesToCopy = SfxSpatBin_p->NoOfRightOldBufferSamples - ( SFX_SPAT_BIN_SINC_M - 1 ); - if ( NoOfSamplesToCopy > *NoOfDeliveredOutputSamples_p ) - { - NoOfSamplesToCopy = *NoOfDeliveredOutputSamples_p; - } - - for ( i = 0; i < NoOfSamplesToCopy; i++ ) - { - SfxSpatBin_p->ResampledBufferRight[SfxSpatBin_p->FilterLength - 1 + i] = - SfxSpatBin_p->RightOldBuffer[( SFX_SPAT_BIN_SINC_M - 1 ) + i]; - } - - for ( i = NoOfSamplesToCopy; i < *NoOfDeliveredOutputSamples_p; i++ ) - { - SfxSpatBin_p->ResampledBufferRight[SfxSpatBin_p->FilterLength - 1 + i] = - InBuffer_p[i - SfxSpatBin_p->NoOfRightOldBufferSamples + ( SFX_SPAT_BIN_SINC_M - 1 )]; - } - - /* 5. HR-filtering on the left and right channel. */ -#ifdef TDREND_HRTF_TABLE_METHODS - if ( SfxSpatBin_p->HrFilterInterpOn ) - { - TDREND_FirFilterRevInterp( LeftOutBuffer_p, - SfxSpatBin_p->LeftFilter_p, - SfxSpatBin_p->FilterLength, - SfxSpatBin_p->ResampledBufferLeft, - *NoOfDeliveredOutputSamples_p, - SfxSpatBin_p->LeftFilterStored ); - TDREND_FirFilterRevInterp( RightOutBuffer_p, - SfxSpatBin_p->RightFilter_p, - SfxSpatBin_p->FilterLength, - SfxSpatBin_p->ResampledBufferRight, - *NoOfDeliveredOutputSamples_p, - SfxSpatBin_p->RightFilterStored ); - } - else - { - /* First time - filter without interpolation, and set filter to use as previous. */ - TDREND_FirFilterRev( LeftOutBuffer_p, - SfxSpatBin_p->LeftFilter_p, - SfxSpatBin_p->FilterLength, - SfxSpatBin_p->ResampledBufferLeft, - *NoOfDeliveredOutputSamples_p ); - TDREND_FirFilterRev( RightOutBuffer_p, - SfxSpatBin_p->RightFilter_p, - SfxSpatBin_p->FilterLength, - SfxSpatBin_p->ResampledBufferRight, - *NoOfDeliveredOutputSamples_p ); - for ( i = 0; i < SfxSpatBin_p->FilterLength; i++ ) - { - SfxSpatBin_p->LeftFilterStored[i] = SfxSpatBin_p->LeftFilter_p[i]; - SfxSpatBin_p->RightFilterStored[i] = SfxSpatBin_p->RightFilter_p[i]; - } - } -#else - TDREND_FirFilterRev( LeftOutBuffer_p, - SfxSpatBin_p->LeftFilter_p, - SfxSpatBin_p->FilterLength, - SfxSpatBin_p->ResampledBufferLeft, - *NoOfDeliveredOutputSamples_p ); - TDREND_FirFilterRev( RightOutBuffer_p, - SfxSpatBin_p->RightFilter_p, - SfxSpatBin_p->FilterLength, - SfxSpatBin_p->ResampledBufferRight, - *NoOfDeliveredOutputSamples_p ); -#endif - - /* Store the samples needed for next block */ - Ind = *NoOfDeliveredOutputSamples_p - SfxSpatBin_p->NoOfRightOldBufferSamples; - if ( Ind < 0 ) - { - /* Must store some samples from the OldBuffer */ - for ( i = Ind; i < 0; i++ ) - { - SfxSpatBin_p->RightOldBuffer[i - Ind] = SfxSpatBin_p->RightOldBuffer[i + SfxSpatBin_p->NoOfRightOldBufferSamples]; - } - - /* Store all samples in the InputBuffer that has been used by either channel */ - for ( i = 0; i < *NoOfUsedInputSamples_p; i++ ) - { - SfxSpatBin_p->RightOldBuffer[i - Ind] = InBuffer_p[i]; - } - } - else - { - /* Store samples from the InputBuffer */ - for ( i = Ind; i < *NoOfUsedInputSamples_p; i++ ) - { - SfxSpatBin_p->RightOldBuffer[i - Ind] = InBuffer_p[i]; - } - } - - /* Update number of old samples */ - SfxSpatBin_p->NoOfRightOldBufferSamples = *NoOfUsedInputSamples_p - Ind; - - return; -} - - -/*-------------------------------------------------------------------* - * TDREND_SFX_SpatBin_Initialize() - * - * Initializes the spatial parameters struct - * - --------------------------------------------------------------------*/ - -ivas_error TDREND_SFX_SpatBin_Initialize( - SFX_SpatBin_t *SfxSpatBin_p, /* i/o: Spatial parameters struct */ - const int32_t output_Fs /* i : Output sampling rate */ -) -{ - int16_t i; - - SfxSpatBin_p->OpMode = SFX_OFF; - SfxSpatBin_p->TurningOffEffect = FALSE; - SfxSpatBin_p->TurningOnEffect = FALSE; - /* Init during next SetParams-call */ - SfxSpatBin_p->InitializeParams = TRUE; -#ifdef FIX_I81 - SfxSpatBin_p->LeftFilter_p = NULL; - SfxSpatBin_p->LeftFilterIncr_p = NULL; - SfxSpatBin_p->RightFilter_p = NULL; - SfxSpatBin_p->RightFilterIncr_p = NULL; -#endif - - /* Init MaxTargetTime and MaxBlockLength */ - switch ( output_Fs ) - { - case 16000: - SfxSpatBin_p->MaxTargetTime = TDREND_SRC_REND_MaxTargetTimes[0]; - SfxSpatBin_p->MaxBlockLength = TDREND_SRC_REND_MaxBlockLengths[0]; - SfxSpatBin_p->LeftOldBuffer = count_malloc( ( SFX_SPAT_BIN_SINC_M * 4 + 2 * TDREND_MaxITD[0] ) * sizeof( float ) ); - SfxSpatBin_p->RightOldBuffer = count_malloc( ( SFX_SPAT_BIN_SINC_M * 4 + 2 * TDREND_MaxITD[0] ) * sizeof( float ) ); - /* Fill old buffers with zeros */ - for ( i = 0; i < SFX_SPAT_BIN_SINC_M * 4 + 2 * TDREND_MaxITD[0]; i++ ) - { - SfxSpatBin_p->LeftOldBuffer[i] = 0.0f; - SfxSpatBin_p->RightOldBuffer[i] = 0.0f; - } - break; - case 32000: - SfxSpatBin_p->MaxTargetTime = TDREND_SRC_REND_MaxTargetTimes[1]; - SfxSpatBin_p->MaxBlockLength = TDREND_SRC_REND_MaxBlockLengths[1]; - SfxSpatBin_p->LeftOldBuffer = count_malloc( ( SFX_SPAT_BIN_SINC_M * 4 + 2 * TDREND_MaxITD[1] ) * sizeof( float ) ); - SfxSpatBin_p->RightOldBuffer = count_malloc( ( SFX_SPAT_BIN_SINC_M * 4 + 2 * TDREND_MaxITD[1] ) * sizeof( float ) ); - /* Fill old buffers with zeros */ - for ( i = 0; i < SFX_SPAT_BIN_SINC_M * 4 + 2 * TDREND_MaxITD[1]; i++ ) - { - SfxSpatBin_p->LeftOldBuffer[i] = 0.0f; - SfxSpatBin_p->RightOldBuffer[i] = 0.0f; - } - break; - case 48000: - SfxSpatBin_p->MaxTargetTime = TDREND_SRC_REND_MaxTargetTimes[2]; - SfxSpatBin_p->MaxBlockLength = TDREND_SRC_REND_MaxBlockLengths[2]; - SfxSpatBin_p->LeftOldBuffer = count_malloc( ( SFX_SPAT_BIN_SINC_M * 4 + 2 * TDREND_MaxITD[2] ) * sizeof( float ) ); - SfxSpatBin_p->RightOldBuffer = count_malloc( ( SFX_SPAT_BIN_SINC_M * 4 + 2 * TDREND_MaxITD[2] ) * sizeof( float ) ); - /* Fill old buffers with zeros */ - for ( i = 0; i < SFX_SPAT_BIN_SINC_M * 4 + 2 * TDREND_MaxITD[2]; i++ ) - { - SfxSpatBin_p->LeftOldBuffer[i] = 0.0f; - SfxSpatBin_p->RightOldBuffer[i] = 0.0f; - } - break; -#ifdef DEBUGGING - default: - IVAS_ERROR( IVAS_ERR_WRONG_PARAMS, "Error: Unrecognised output_Fs in TDREND_SFX_SpatBin_Initialize()" ); -#endif - } - - /* Fill the beginning of the resampled buffers with zeros */ - for ( i = 0; i < SFX_SPAT_BIN_MAX_FILTER_LENGTH; i++ ) - { - SfxSpatBin_p->ResampledBufferLeft[i] = 0.0f; - SfxSpatBin_p->ResampledBufferRight[i] = 0.0f; - } - - return IVAS_ERR_OK; -} - - -/*-------------------------------------------------------------------* - * TDREND_SFX_SpatBin_Clear() - * - * Clear spatial parameters - * - --------------------------------------------------------------------*/ - -static void TDREND_SFX_SpatBin_Clear( - SFX_SpatBin_t *SfxSpatBin_p, /* i/o: Spatial parameters struct */ - const int32_t output_Fs /* i : Output sample rate */ -) -{ - int16_t i; - int16_t MaxITD = TDREND_MaxITD[2]; - - SfxSpatBin_p->OpMode = SFX_OFF; - SfxSpatBin_p->TurningOffEffect = FALSE; - SfxSpatBin_p->TurningOnEffect = FALSE; - - /* Init during next SetParams-call */ - SfxSpatBin_p->InitializeParams = TRUE; - - /* Fill old buffers with zeros */ - switch ( output_Fs ) - { - case 16000: - MaxITD = TDREND_MaxITD[0]; - break; - case 32000: - MaxITD = TDREND_MaxITD[1]; - break; - case 48000: - MaxITD = TDREND_MaxITD[2]; - break; - } - for ( i = 0; i < SFX_SPAT_BIN_SINC_M * 4 + 2 * MaxITD; i++ ) - { - SfxSpatBin_p->LeftOldBuffer[i] = 0.0f; - SfxSpatBin_p->RightOldBuffer[i] = 0.0f; - } - /* Fill the beginning of the resampled buffers with zeros */ - for ( i = 0; i < SFX_SPAT_BIN_MAX_FILTER_LENGTH; i++ ) - { - SfxSpatBin_p->ResampledBufferLeft[i] = 0.0f; - SfxSpatBin_p->ResampledBufferRight[i] = 0.0f; - } - - return; -} - - -/*-------------------------------------------------------------------* - * TDREND_FirFilterRev() - * - * FIR filtering function with reversed filter sequence. - * The FIR filter seqeunce is reversed, i.e. - * FirFilterRev(n) = FirFilter(N-1-n) for n=0:N-1 - * The first N-1 samples of the input buffer store the last N-1 - * samples from the previous input buffer. - * - --------------------------------------------------------------------*/ - -static void TDREND_FirFilterRev( - float *OutputFrame_p, /* o : Filtered samples */ - float *FirFilterRev_p, /* i/o: Reversed FIR filter */ - const int16_t FirFilterLength, /* i : Filter length */ - float *InputFrame_p, /* i : Input samples */ - const int16_t NumOfSamples /* i : Number of input samples */ -) -{ - /* In this function we assume that the last FirFilterLength-1 samples from */ - /* the previous InputBuffer starts this new InputBuffer. */ - int16_t n, k; - int16_t FirFilterLengthMinusOne; - float Acc; - float *InputBuffer_nk_p, *InputBuffer_n_p, *FirFilterRev_k_p, *OutputBuffer_n_p; - - FirFilterLengthMinusOne = FirFilterLength - 1; - - /* 1. Filter the input buffer. NOTE: Reversed filter sequence */ - InputBuffer_n_p = InputFrame_p; - OutputBuffer_n_p = OutputFrame_p; - - for ( n = NumOfSamples; n > 0; n-- ) - { - - Acc = 0.0f; - FirFilterRev_k_p = FirFilterRev_p; - InputBuffer_nk_p = InputBuffer_n_p; - - for ( k = FirFilterLength; k > 0; k-- ) - { - Acc += *( FirFilterRev_k_p++ ) * *( InputBuffer_nk_p++ ); - } - - InputBuffer_n_p++; - *( OutputBuffer_n_p++ ) = Acc; - } - - /* 2. Copy the last FirFilterLength-1 samples of the InputFrame to the beginning of the InputFrame */ - mvr2r( InputFrame_p + NumOfSamples, InputFrame_p, FirFilterLengthMinusOne ); - - return; -} - -#ifdef TDREND_HRTF_TABLE_METHODS -/*-------------------------------------------------------------------* - * TDREND_FirFilterRevInterp() - * - * FIR filtering function with reversed filter sequence. - * The FIR filter seqeunce is reversed, i.e. - * FirFilterRev(n) = FirFilter(N-1-n) for n=0:N-1 - * The first N-1 samples of the input buffer store the last N-1 - * samples from the previous input buffer. - * - --------------------------------------------------------------------*/ - -static void TDREND_FirFilterRevInterp( - float *OutputFrame_p, /* o : Filtered samples */ - float *FirFilterRev_p, /* i/o: Reversed FIR filter */ - const int16_t FirFilterLength, /* i : Filter length */ - float *InputFrame_p, /* i : Input samples */ - const int16_t NumOfSamples, /* i : Number of input samples */ - float *FilterStored /* i/o: Old filter memory for interpolation */ -) -{ - /* In this function we assume that the last FirFilterLength-1 samples from */ - /* the previous InputBuffer starts this new InputBuffer. */ - int16_t n, k; - int16_t FirFilterLengthMinusOne; - float Acc1; - float Acc2; - - float *InputBuffer_nk_p, *InputBuffer_n_p, *FirFilterRev_k_p, *OutputBuffer_n_p; - float interpFactor, interpComplement; - float *FilterStored_n_p; - float inv_NumOfSamples; - - FirFilterLengthMinusOne = FirFilterLength - 1; - inv_NumOfSamples = 1.0f / NumOfSamples; - - /* 1. Filter the input buffer */ - /* NOTE: Reversed filter sequence */ - InputBuffer_n_p = InputFrame_p; - OutputBuffer_n_p = OutputFrame_p; - - interpFactor = 1.0f; - interpComplement = 0.0f; - for ( n = NumOfSamples; n > 0; n-- ) - { - - Acc1 = 0.0f; - Acc2 = 0.0f; - FirFilterRev_k_p = FirFilterRev_p; - FilterStored_n_p = FilterStored; - InputBuffer_nk_p = InputBuffer_n_p; - - for ( k = FirFilterLength; k > 0; k-- ) - { - Acc1 += *( FirFilterRev_k_p++ ) * *( InputBuffer_nk_p ); - Acc2 += *( FilterStored_n_p++ ) * *( InputBuffer_nk_p++ ); - } - - InputBuffer_n_p++; - *( OutputBuffer_n_p++ ) = Acc1 * interpComplement + Acc2 * interpFactor; - interpFactor -= inv_NumOfSamples; - interpComplement += inv_NumOfSamples; - } - - /* Store the old filter for interpolation next time */ - for ( k = 0; k < FirFilterLength; k++ ) - { - FilterStored[k] = FirFilterRev_p[k]; - } - - /* 2. Copy the last FirFilterLength-1 samples of the InputFrame to */ - /* the beginning of the InputFrame */ - mvr2r( InputFrame_p + NumOfSamples, InputFrame_p, FirFilterLengthMinusOne ); +static void sincResample( const float *input, float *output, const int16_t length_in, const int16_t length_out ); - return; -} -#endif -#endif -#ifdef FIX_ITD /*---------------------------------------------------------------------* * TDREND_Apply_ITD() * @@ -1486,7 +79,7 @@ void TDREND_Apply_ITD( float *p_input; float *out_buf_A, *out_buf_B; - wmops_sub_start( "TDREND_Apply_ITD" ); + push_wmops( "TDREND_Apply_ITD" ); /* Prepare resampling buffer */ mvr2r( mem_itd, buffer, ITD_MEM_LEN ); /* Retrieve memory */ @@ -1559,7 +152,7 @@ void TDREND_Apply_ITD( mvr2r( pstart3, out_buf_B + transition_len, tlen3 ); *previtd = itd; - wmops_sub_end(); + pop_wmops(); return; } @@ -1589,6 +182,7 @@ static void sincResample( const float *p_sinc_forward; const float *p_sinc_backward; + /* Compute fractional time step */ t_step = (float) ( length_in ) / (float) ( length_out ); t_frac = 0; @@ -1641,7 +235,13 @@ void TDREND_firfilt( const int16_t intp_count, /* i : interpolation count */ float *mem, /* i/o: filter memory */ const int16_t subframe_length, /* i : Length of signal */ - const int16_t filterlength /* i : Filter length */ + const int16_t filterlength, /* i : Filter length */ +#ifdef FIX_379_GAININTP + const float Gain, /* i : Gain */ + const float prevGain /* i : Previous gain */ +#else + const float Gain /* i : Gain */ +#endif ) { float buffer[SFX_SPAT_BIN_MAX_FILTER_LENGTH - 1 + L_SUBFRAME5MS_48k]; @@ -1650,6 +250,13 @@ void TDREND_firfilt( float *p_filter; float tmp; int16_t i, j; +#ifdef FIX_379_GAININTP + float step, gain_tmp, gain_delta; + + gain_delta = ( Gain - prevGain ); + step = gain_delta / ( subframe_length ); + gain_tmp = prevGain; +#endif /* Handle memory */ p_signal = buffer + filterlength - 1; @@ -1667,7 +274,13 @@ void TDREND_firfilt( { tmp += ( *p_filter++ ) * ( *p_tmp-- ); } - signal[i] = tmp; +#ifdef FIX_379_GAININTP + /* Apply linear gain interpolation in case of abrupt gain changes */ + gain_tmp = gain_tmp + step; + signal[i] = tmp * gain_tmp; +#else + signal[i] = tmp * Gain; +#endif if ( i < intp_count ) { @@ -1677,5 +290,3 @@ void TDREND_firfilt( return; } - -#endif diff --git a/lib_rend/ivas_objectRenderer_sources.c b/lib_rend/ivas_objectRenderer_sources.c index fa645f1492..91253748b2 100644 --- a/lib_rend/ivas_objectRenderer_sources.c +++ b/lib_rend/ivas_objectRenderer_sources.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,31 +33,32 @@ #include #include "options.h" #include -#include "ivas_prot.h" #include "prot.h" -#include "wmops.h" +#include "ivas_prot_rend.h" +#include "wmc_auto.h" #ifdef DEBUGGING #include "debug.h" #endif + /*---------------------------------------------------------------------* * Local function prototypes *---------------------------------------------------------------------*/ static void TDREND_SRC_SPATIAL_Dealloc( TDREND_SRC_SPATIAL_t *SrcSpatial_p ); + static void TDREND_SRC_SPATIAL_Init( TDREND_SRC_SPATIAL_t *SrcSpatial_p, const TDREND_PosType_t PosType ); + static void TDREND_SRC_SPATIAL_SetDirAtten( TDREND_SRC_SPATIAL_t *SrcSpatial_p, const TDREND_DirAtten_t *DirAtten_p ); + static float TDREND_SRC_SPATIAL_GetDirGain( const TDREND_DirAtten_t *DirAtten_p, const float *Front_p, const float *RelPos_p ); + static float TDREND_SRC_SPATIAL_GetDistGain( const TDREND_DistAtten_t *DistAtten_p, const float Dist ); + static ivas_error TDREND_SRC_REND_Alloc( TDREND_SRC_REND_t **SrcRend_pp ); -#ifndef FIX_ITD -static void TDREND_SRC_REND_Dealloc( TDREND_SRC_REND_t *SrcRend_p ); -#endif -#ifdef FIX_ITD + static void TDREND_SRC_REND_Init( TDREND_SRC_REND_t *SrcRend_p ); -#else -static void TDREND_SRC_REND_Init( TDREND_SRC_REND_t *SrcRend_p, const int32_t output_Fs ); -#endif + /*-------------------------------------------------------------------* * TDREND_MIX_SRC_SetPos() @@ -95,7 +96,7 @@ ivas_error TDREND_MIX_SRC_SetPos( /*-------------------------------------------------------------------* * TDREND_MIX_SRC_SetDir() * - * Set source direciton + * Set source direction --------------------------------------------------------------------*/ ivas_error TDREND_MIX_SRC_SetDir( @@ -192,75 +193,16 @@ static ivas_error TDREND_SRC_REND_Alloc( *SrcRend_pp = NULL; /* Allocate the TDREND_SRC_REND_t variable */ - SrcRend_p = (TDREND_SRC_REND_t *) count_malloc( sizeof( TDREND_SRC_REND_t ) ); - if ( SrcRend_p == NULL ) + if ( ( SrcRend_p = (TDREND_SRC_REND_t *) malloc( sizeof( TDREND_SRC_REND_t ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "SrcRend_p allocation error\n" ) ); } -#ifndef FIX_ITD - /* Allocate the HR filtering structures */ - SrcRend_p->SfxSpatBin_p = (SFX_SpatBin_t *) count_malloc( SPAT_BIN_MAX_INPUT_CHANNELS * sizeof( SFX_SpatBin_t ) ); - if ( SrcRend_p->SfxSpatBin_p == NULL ) - { - return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "SrcRend_p->SfxSpatBin_p allocation error\n" ) ); - } -#endif + *SrcRend_pp = SrcRend_p; return IVAS_ERR_OK; } -#ifndef FIX_ITD -/*-------------------------------------------------------------------* - * TDREND_SRC_REND_Dealloc() - * - * Deallocate rendering aspects of source. - --------------------------------------------------------------------*/ - -static void TDREND_SRC_REND_Dealloc( - TDREND_SRC_REND_t *SrcRend_p /* i/o: Source object */ -) -{ - if ( SrcRend_p == NULL ) - { - return; - } - if ( SrcRend_p->SfxSpatBin_p->LeftOldBuffer != NULL ) - { - count_free( SrcRend_p->SfxSpatBin_p->LeftOldBuffer ); - } - if ( SrcRend_p->SfxSpatBin_p->RightOldBuffer != NULL ) - { - count_free( SrcRend_p->SfxSpatBin_p->RightOldBuffer ); - } - if ( SrcRend_p->SfxSpatBin_p->LeftFilter_p != NULL ) - { - count_free( SrcRend_p->SfxSpatBin_p->LeftFilter_p ); - } - if ( SrcRend_p->SfxSpatBin_p->LeftFilterIncr_p != NULL ) - { - count_free( SrcRend_p->SfxSpatBin_p->LeftFilterIncr_p ); - } - if ( SrcRend_p->SfxSpatBin_p->RightFilter_p != NULL ) - { - count_free( SrcRend_p->SfxSpatBin_p->RightFilter_p ); - } - if ( SrcRend_p->SfxSpatBin_p->RightFilterIncr_p != NULL ) - { - count_free( SrcRend_p->SfxSpatBin_p->RightFilterIncr_p ); - } - if ( SrcRend_p->SfxSpatBin_p != NULL ) - { - count_free( SrcRend_p->SfxSpatBin_p ); - } - - /* Free the SrcRend_p variable */ - count_free( SrcRend_p ); - SrcRend_p = NULL; - - return; -} -#endif /*-------------------------------------------------------------------* * TDREND_SRC_REND_Init() @@ -269,12 +211,7 @@ static void TDREND_SRC_REND_Dealloc( --------------------------------------------------------------------*/ static void TDREND_SRC_REND_Init( -#ifdef FIX_ITD TDREND_SRC_REND_t *SrcRend_p /* i/o: Source object */ -#else - TDREND_SRC_REND_t *SrcRend_p, /* i/o: Source object */ - const int32_t output_Fs /* i : Output sampling rate */ -#endif ) { int16_t nC; @@ -283,9 +220,6 @@ static void TDREND_SRC_REND_Init( SrcRend_p->InputAvailable = FALSE; SrcRend_p->PlayStatus = TDREND_PLAYSTATUS_INITIAL; -#ifdef TDREND_HRTF_TABLE_METHODS - SrcRend_p->SfxSpatBin_p->HrFilterInterpOn = 0; /* Disabled for first frame */ -#endif /* SrcGain */ for ( nC = 0; nC < SPAT_BIN_MAX_INPUT_CHANNELS; nC++ ) { @@ -302,13 +236,6 @@ static void TDREND_SRC_REND_Init( SrcRend_p->DistGain_p[nC] = 1.0f; } -#ifndef FIX_ITD - /* Init the SfxSpatBin structs. One per channel. Default is effect turned off. */ - for ( nC = 0; nC < SPAT_BIN_MAX_INPUT_CHANNELS; nC++ ) - { - TDREND_SFX_SpatBin_Initialize( SrcRend_p->SfxSpatBin_p + nC, output_Fs ); - } -#endif return; } @@ -324,62 +251,33 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ TDREND_SRC_REND_t *SrcRend_p, /* i/o: Source object */ TDREND_SRC_SPATIAL_t *SrcSpatial_p, /* i : Spatial aspects of source */ -#ifdef FIX_ITD - float *hrf_left_prev, /* o: Left filter */ - float *hrf_right_prev, /* o: Right filter */ - float *hrf_left_delta, /* o: Left filter interpolation delta */ - float *hrf_right_delta, /* o: Right filter interpolation delta */ - int16_t *intp_count, /* o: Interpolation count */ - int16_t *filterlength, /* o: Length of filters */ - int16_t *itd, /* o: ITD value */ - float *Gain, /* o: Gain value */ - TDREND_SRC_t *Src_p, /* i/o: Source pointer */ - const int16_t subframe_idx /* i : Subframe index to 5 ms subframe */ -#else - const int32_t output_Fs /* i : Output sampling rate */ -#endif + float *hrf_left_prev, /* o: Left filter */ + float *hrf_right_prev, /* o: Right filter */ + float *hrf_left_delta, /* o: Left filter interpolation delta */ + float *hrf_right_delta, /* o: Right filter interpolation delta */ + int16_t *intp_count, /* o: Interpolation count */ + int16_t *filterlength, /* o: Length of filters */ + int16_t *itd, /* o: ITD value */ + float *Gain, /* o: Gain value */ + TDREND_SRC_t *Src_p, /* i/o: Source pointer */ + const int16_t subframe_idx /* i : Subframe index to 5 ms subframe */ ) { TDREND_MIX_Listener_t *Listener_p; TDREND_HRFILT_FiltSet_t *HrFiltSet_p; -#ifndef FIX_ITD - SFX_SpatBin_t *SfxSpatBin_p; - SFX_SpatBin_Params_t SfxSpatBinParams; -#endif float ListRelPos[3], ListRelDist; -#ifndef FIX_ITD - float Gain; -#endif + float ListRelPosAbs[3]; /* Relative position, ignoring orientation of listener */ float Azim, Elev; -#ifndef FIX_ITD - int16_t mem_size; -#else float hrf_left[SFX_SPAT_BIN_MAX_FILTER_LENGTH]; float hrf_right[SFX_SPAT_BIN_MAX_FILTER_LENGTH]; float azim_delta; float elev_delta; -#endif /* Evaluate the HR filters from the source and listener positions and orientations */ Listener_p = hBinRendererTd->Listener_p; HrFiltSet_p = hBinRendererTd->HrFiltSet_p; -#ifdef FIX_ITD *filterlength = HrFiltSet_p->FiltLength; -#else - SfxSpatBinParams.LeftFilter_p = NULL; - SfxSpatBinParams.RightFilter_p = NULL; - - mem_size = (int16_t) ( HrFiltSet_p->FiltLength * sizeof( float ) ); - - SfxSpatBin_p = SrcRend_p->SfxSpatBin_p; - SfxSpatBinParams.TurnOn = TRUE; - SfxSpatBinParams.Reset = FALSE; - - SfxSpatBinParams.FilterLength = HrFiltSet_p->FiltLength; - SfxSpatBinParams.LeftFilter_p = (float *) count_malloc( mem_size ); - SfxSpatBinParams.RightFilter_p = (float *) count_malloc( mem_size ); -#endif /* 1. Map source pos to the coordinate system of the listener */ switch ( SrcSpatial_p->PosType ) @@ -390,14 +288,14 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( break; case TDREND_POSTYPE_ABSOLUTE: /* Absolute position */ - TDREND_SPATIAL_VecMapToNewCoordSystem( SrcSpatial_p->Pos_p, Listener_p->Pos, Listener_p->Front, Listener_p->Up, Listener_p->Right, ListRelPos ); + TDREND_SPATIAL_VecMapToNewCoordSystem( SrcSpatial_p->Pos_p, Listener_p->Pos, Listener_p->Front, Listener_p->Up, Listener_p->Right, ListRelPos, ListRelPosAbs ); break; default: /* Illegal position type */ #ifdef DEBUGGING printf( "Warning! TDREND_SRC_REND_UpdateFiltersFromSpatialParams: Invalid position type. Assuming absolute position!\n" ); #endif /* Assume absolute position */ - TDREND_SPATIAL_VecMapToNewCoordSystem( SrcSpatial_p->Pos_p, Listener_p->Pos, Listener_p->Front, Listener_p->Up, Listener_p->Right, ListRelPos ); + TDREND_SPATIAL_VecMapToNewCoordSystem( SrcSpatial_p->Pos_p, Listener_p->Pos, Listener_p->Front, Listener_p->Up, Listener_p->Right, ListRelPos, ListRelPosAbs ); break; } @@ -416,18 +314,14 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( Azim = -1.0f * _180_OVER_PI * (float) atan2f( ListRelPos[1], ListRelPos[0] ); } -#ifdef FIX_ITD GetFilterFromAngle( HrFiltSet_p, Elev, Azim, hrf_left, hrf_right, itd ); -#else - GetFilterFromAngle( HrFiltSet_p, Elev, Azim, &SfxSpatBinParams ); -#endif /* 6. Evaluate the directional and distance gains */ /* Directional gain */ *SrcRend_p->DirGain_p = 1.0f; if ( SrcSpatial_p->DirAttenEnabled ) { - *SrcRend_p->DirGain_p = TDREND_SRC_SPATIAL_GetDirGain( &SrcSpatial_p->DirAtten, SrcSpatial_p->Front_p, ListRelPos ); + *SrcRend_p->DirGain_p = TDREND_SRC_SPATIAL_GetDirGain( &SrcSpatial_p->DirAtten, SrcSpatial_p->Front_p, ListRelPosAbs ); } /* Distance gain */ @@ -449,7 +343,6 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( } /* Update total gains */ -#ifdef FIX_ITD *Gain = ( *SrcRend_p->SrcGain_p ) * ( *SrcRend_p->DirGain_p ) * ( *SrcRend_p->DistGain_p ) * hBinRendererTd->Gain; /* Delta for interpolation, in case the angular step exceeds MAX_ANGULAR_STEP */ @@ -477,27 +370,6 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( set_f( hrf_left_delta, 0.0f, *filterlength ); set_f( hrf_right_delta, 0.0f, *filterlength ); } -#else - Gain = ( *SrcRend_p->SrcGain_p ) * ( *SrcRend_p->DirGain_p ) * ( *SrcRend_p->DistGain_p ) * hBinRendererTd->Gain; - SfxSpatBinParams.LeftVolume = Gain; - SfxSpatBinParams.RightVolume = Gain; - - /* Reset source gain update flag (That update is now included in the total gain update) */ - SrcRend_p->SrcGainUpdated = FALSE; - - /* Update the rendering parameters of the SFX effect */ - TDREND_SFX_SpatBin_SetParams( SfxSpatBin_p, &SfxSpatBinParams, output_Fs ); - - if ( SfxSpatBinParams.LeftFilter_p != NULL ) - { - count_free( SfxSpatBinParams.LeftFilter_p ); - } - - if ( SfxSpatBinParams.RightFilter_p != NULL ) - { - count_free( SfxSpatBinParams.RightFilter_p ); - } -#endif return; } @@ -518,8 +390,7 @@ static ivas_error TDREND_SRC_SPATIAL_Alloc( *SrcSpatial_pp = NULL; /* Allocate the TDREND_SRC_t variable */ - SrcSpatial_p = (TDREND_SRC_SPATIAL_t *) count_malloc( sizeof( TDREND_SRC_SPATIAL_t ) ); - if ( SrcSpatial_p == NULL ) + if ( ( SrcSpatial_p = (TDREND_SRC_SPATIAL_t *) malloc( sizeof( TDREND_SRC_SPATIAL_t ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "TDREND_SRC_SPATIAL_t allocation error\n" ) ); } @@ -545,7 +416,7 @@ static void TDREND_SRC_SPATIAL_Dealloc( return; } /* Free the SrcSpatial_p variable */ - count_free( SrcSpatial_p ); + free( SrcSpatial_p ); SrcSpatial_p = NULL; return; @@ -589,7 +460,7 @@ static void TDREND_SRC_SPATIAL_Init( SrcSpatial_p->DistAttenEnabled = FALSE; SrcSpatial_p->DistAtten.DistAttenModel = TDREND_DIST_ATTEN_MODEL_INV_DIST_CLAMPED; SrcSpatial_p->DistAtten.RefDist = 1.0f; - SrcSpatial_p->DistAtten.MaxDist = 10.0f; + SrcSpatial_p->DistAtten.MaxDist = 15.75f; /* Maximum radius (2^ISM_RADIUS_NBITS-1)*0.25 */ SrcSpatial_p->DistAtten.RollOffFactor = 1.0f; return; @@ -730,8 +601,7 @@ ivas_error TDREND_SRC_Alloc( *Src_pp = NULL; /* Allocate the TDREND_SRC_t variable */ - Src_p = (TDREND_SRC_t *) count_malloc( sizeof( TDREND_SRC_t ) ); - if ( Src_p == NULL ) + if ( ( Src_p = (TDREND_SRC_t *) malloc( sizeof( TDREND_SRC_t ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, " TDREND_SRC_Alloc: Allocation error\n" ) ); } @@ -772,15 +642,11 @@ void TDREND_SRC_Dealloc( TDREND_SRC_SPATIAL_Dealloc( Src_p->SrcSpatial_p ); /* Delloc the TDREND_SRC_REND__t variable */ -#ifdef FIX_ITD - count_free( Src_p->SrcRend_p ); + free( Src_p->SrcRend_p ); Src_p->SrcRend_p = NULL; -#else - TDREND_SRC_REND_Dealloc( Src_p->SrcRend_p ); -#endif /* Free the Src_p variable */ - count_free( Src_p ); + free( Src_p ); Src_p = NULL; return; @@ -794,13 +660,8 @@ void TDREND_SRC_Dealloc( --------------------------------------------------------------------*/ void TDREND_SRC_Init( - TDREND_SRC_t *Src_p, /* i/o: Source to initialize */ -#ifdef FIX_ITD + TDREND_SRC_t *Src_p, /* i/o: Source to initialize */ const TDREND_PosType_t PosType /* i : Position type specifier */ -#else - const TDREND_PosType_t PosType, /* i : Position type specifier */ - const int32_t output_Fs /* i : Output sampling rate */ -#endif ) { /* Init the TDREND_SRC_Spatial_t variable */ @@ -810,13 +671,8 @@ void TDREND_SRC_Init( } /* Init the TDREND_SRC_REND_t variable */ -#ifdef FIX_ITD TDREND_SRC_REND_Init( Src_p->SrcRend_p ); -#else - TDREND_SRC_REND_Init( Src_p->SrcRend_p, output_Fs ); -#endif -#ifdef FIX_ITD /* Reset memory buffers */ Src_p->itd = 0; Src_p->previtd = 0; @@ -831,7 +687,8 @@ void TDREND_SRC_Init( Src_p->hrf_right_prev[0] = 1; Src_p->azim_prev = 0.0f; Src_p->elev_prev = 0.0f; - +#ifdef FIX_379_GAININTP + Src_p->prevGain = 1.0f; #endif return; diff --git a/lib_rend/ivas_objectRenderer_vec.c b/lib_rend/ivas_objectRenderer_vec.c index 11c5d31ea8..061b790e1b 100644 --- a/lib_rend/ivas_objectRenderer_vec.c +++ b/lib_rend/ivas_objectRenderer_vec.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,13 +33,14 @@ #include #include "options.h" #include -#include "ivas_prot.h" #include "prot.h" -#include "wmops.h" +#include "ivas_prot_rend.h" +#include "wmc_auto.h" #ifdef DEBUGGING #include "debug.h" #endif + /*-------------------------------------------------------------------* * TDREND_SPATIAL_VecInit() * @@ -110,20 +111,16 @@ void TDREND_SPATIAL_VecMapToNewCoordSystem( const float *DirVec_p, /* i : Direction vector */ const float *UpVec_p, /* i : Up vector */ const float *RightVec_p, /* i : Right vector */ - float *MappedVec_p /* o : Transformed vector */ + float *MappedVec_p, /* o : Transformed vector */ + float *LisRelPosAbs /* o : Transformed vector ignoring orientation */ ) { - float RelVec[3]; - - /* Evaluate Vec relative to the new origin given by TranslVec */ - v_sub( Vec_p, TranslVec_p, RelVec, 3 ); - + v_sub( Vec_p, TranslVec_p, LisRelPosAbs, 3 ); /* Evalute the relative Vec in the coordinates of the Orientation vectors, */ /* which form an orthonormal basis */ - MappedVec_p[0] = dotp( RelVec, DirVec_p, 3 ); - MappedVec_p[1] = dotp( RelVec, RightVec_p, 3 ); - MappedVec_p[2] = dotp( RelVec, UpVec_p, 3 ); - + MappedVec_p[0] = dotp( LisRelPosAbs, DirVec_p, 3 ); + MappedVec_p[1] = dotp( LisRelPosAbs, RightVec_p, 3 ); + MappedVec_p[2] = dotp( LisRelPosAbs, UpVec_p, 3 ); return; } diff --git a/lib_rend/ivas_orient_trk.c b/lib_rend/ivas_orient_trk.c index 4754062b56..63d863c4b6 100644 --- a/lib_rend/ivas_orient_trk.c +++ b/lib_rend/ivas_orient_trk.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -30,17 +30,18 @@ *******************************************************************************************************/ +#include "common_api_types.h" #include #include "options.h" -#include "prot.h" #include "ivas_prot.h" +#include "ivas_prot_rend.h" #include "ivas_cnst.h" #ifdef DEBUGGING #include "debug.h" #endif #include #include -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------------------------* @@ -49,52 +50,328 @@ #define MAX_TRACKED_ANGLE_AVG_ORIENT PI_OVER_2 #define MAX_TRACKED_ANGLE_REF_ORIENT EVS_PI - -/* TODO relate to frame rate - assumed here 50Hz, i.e. 20ms frame length */ -#define OTR_UPDATE_RATE ( 50.0f ) /* rate of the Process() calls [Hz]; 1x per IVAS frame */ +#define OTR_UPDATE_RATE (float) FRAMES_PER_SEC /* rate of the Process() calls [Hz]; 1x per IVAS frame */ /*------------------------------------------------------------------------------------------* * Local functions *------------------------------------------------------------------------------------------*/ -static float ClipAngle( - const float angle, - const float min_angle, - const float max_angle ) +/*------------------------------------------------------------------------------------------* + * IdentityQuaternion() + * + * + *------------------------------------------------------------------------------------------*/ + +static IVAS_QUATERNION IdentityQuaternion( + void ) { - float result = angle; + IVAS_QUATERNION q; - /* wrap angle modulo 2*pi into range of [-pi, pi> radians */ - /* 'while' assumed to use comparison to 0 */ - while ( result > EVS_PI ) - { - result -= PI2; - } - /* 'while' assumed to use comparison to 0 */ - while ( result <= -EVS_PI ) + q.w = 1.0f; + q.x = q.y = q.z = 0.0f; + + return q; +} + + +/*------------------------------------------------------------------------------------------* + * QuaternionProduct() + * + * Quaternion product + *------------------------------------------------------------------------------------------*/ + +static void QuaternionProduct( + const IVAS_QUATERNION q1, + const IVAS_QUATERNION q2, + IVAS_QUATERNION *const r ) +{ + IVAS_QUATERNION tmp; + tmp.w = q1.w * q2.w - q1.x * q2.x - q1.y * q2.y - q1.z * q2.z; + tmp.x = q1.w * q2.x + q1.x * q2.w + q1.y * q2.z - q1.z * q2.y; + tmp.y = q1.w * q2.y - q1.x * q2.z + q1.y * q2.w + q1.z * q2.x; + tmp.z = q1.w * q2.z + q1.x * q2.y - q1.y * q2.x + q1.z * q2.w; + + *r = tmp; + + return; +} + +/*------------------------------------------------------------------------------------------* + * QuaternionDotProduct() + * + * Quaternion dot product + *------------------------------------------------------------------------------------------*/ + +static float QuaternionDotProduct( + const IVAS_QUATERNION q1, + const IVAS_QUATERNION q2 ) +{ + return q1.x * q2.x + q1.y * q2.y + q1.z * q2.z + q1.w * q2.w; +} + + +/*------------------------------------------------------------------------------------------* + * QuaternionDivision() + * + * Divides a quaternion by a scalar + *------------------------------------------------------------------------------------------*/ + +static void QuaternionDivision( + const IVAS_QUATERNION q, + const float d, + IVAS_QUATERNION *const r ) +{ + r->w = q.w / d; + r->x = q.x / d; + r->y = q.y / d; + r->z = q.z / d; + + return; +} + + +/*------------------------------------------------------------------------------------------* + * QuaternionNormalize() + * + * Normalizes a quaternion + *------------------------------------------------------------------------------------------*/ + +static void QuaternionNormalize( + const IVAS_QUATERNION q, + IVAS_QUATERNION *const r ) +{ + QuaternionDivision( q, sqrtf( QuaternionDotProduct( q, q ) ), r ); + + return; +} + + +/*------------------------------------------------------------------------------------------* + * QuaternionSlerp() + * + * Computes a spherical linear interpolation between two quaternions + *------------------------------------------------------------------------------------------*/ + +static void QuaternionSlerp( + const IVAS_QUATERNION q1, + const IVAS_QUATERNION q2, + const float t, + IVAS_QUATERNION *const r ) +{ + float angle, denom, s, s2; + + s = QuaternionDotProduct( q1, q2 ); + + if ( fabsf( s ) >= 1.0f ) { - result += PI2; + *r = q2; + return; } - /* Next, clip angle into range */ - /* 'if' assumed to use comparison to 0 */ - if ( result < min_angle ) + angle = acosf( s ); + denom = sinf( angle ); + + s = sinf( ( 1 - t ) * angle ); + s2 = sinf( t * angle ); + r->x = ( q1.x * s + q2.x * s2 ) / denom; + r->y = ( q1.y * s + q2.y * s2 ) / denom; + r->z = ( q1.z * s + q2.z * s2 ) / denom; + r->w = ( q1.w * s + q2.w * s2 ) / denom; + + QuaternionNormalize( *r, r ); + + return; +} + + +/*------------------------------------------------------------------------------------------* + * QuaternionConjugate() + * + * Computes a quaternion conjugate + *------------------------------------------------------------------------------------------*/ + +static void QuaternionConjugate( + const IVAS_QUATERNION q, + IVAS_QUATERNION *const r ) +{ + r->w = q.w; + r->x = -q.x; + r->y = -q.y; + r->z = -q.z; + + return; +} + + +/*------------------------------------------------------------------------------------------* + * QuaternionAngle() + * + * Computes an angle between two quaternions + *------------------------------------------------------------------------------------------*/ + +static float QuaternionAngle( + const IVAS_QUATERNION q1, + const IVAS_QUATERNION q2 ) +{ + IVAS_QUATERNION q12; + float angle; + + QuaternionConjugate( q1, &q12 ); + QuaternionProduct( q12, q2, &q12 ); + angle = 2.0f * atan2f( sqrtf( q12.x * q12.x + q12.y * q12.y + q12.z * q12.z ), q12.w ); + + return angle; +} + + +/*------------------------------------------------------------------------------------------* + * QuaternionInverse() + * + * Computes an inverse quaternion + *------------------------------------------------------------------------------------------*/ + +static void QuaternionInverse( + const IVAS_QUATERNION q, + IVAS_QUATERNION *const r ) +{ + float dot_product; + + dot_product = QuaternionDotProduct( q, q ); + QuaternionConjugate( q, r ); + QuaternionDivision( *r, dot_product, r ); + + return; +} + + +/*------------------------------------------------------------------------------------------* + * VectorSubtract() + * + * Computes the difference of two vectors + *------------------------------------------------------------------------------------------*/ + +static IVAS_VECTOR3 VectorSubtract( + const IVAS_VECTOR3 p1, + const IVAS_VECTOR3 p2 ) +{ + IVAS_VECTOR3 result; + + result.x = p1.x - p2.x; + result.y = p1.y - p2.y; + result.z = p1.z - p2.z; + + return result; +} + + +/*------------------------------------------------------------------------------------------* + * VectorCrossProduct() + * + * Computes the cross product of two vectors + *------------------------------------------------------------------------------------------*/ + +static IVAS_VECTOR3 VectorCrossProduct( + const IVAS_VECTOR3 p1, + const IVAS_VECTOR3 p2 ) +{ + IVAS_VECTOR3 result; + result.x = p1.y * p2.z - p1.z * p2.y; + result.y = p1.z * p2.x - p1.x * p2.z; + result.z = p1.x * p2.y - p1.y * p2.x; + + return result; +} + + +/*------------------------------------------------------------------------------------------* + * VectorDotProduct( + * + * Computes the dot product of two vectors + *------------------------------------------------------------------------------------------*/ + +static float VectorDotProduct( + const IVAS_VECTOR3 p1, + const IVAS_VECTOR3 p2 ) +{ + return p1.x * p2.x + p1.y * p2.y + p1.z * p2.z; +} + + +/*------------------------------------------------------------------------------------------* + * VectorLength() + * + * Computes the length of a vector + *------------------------------------------------------------------------------------------*/ + +static float VectorLength( + const IVAS_VECTOR3 p ) +{ + return sqrtf( p.x * p.x + p.y * p.y + p.z * p.z ); +} + + +/*------------------------------------------------------------------------------------------* + * VectorNormalize() + * + * Normalizes a vector + *------------------------------------------------------------------------------------------*/ + +static IVAS_VECTOR3 VectorNormalize( + const IVAS_VECTOR3 p ) +{ + IVAS_VECTOR3 result; + + const float length = VectorLength( p ); + + result.x = p.x / length; + result.y = p.y / length; + result.z = p.z / length; + + return result; +} + + +/*------------------------------------------------------------------------------------------* + * VectorRotationToQuaternion() + * + * Computes a quaternion representing the rotation from vector p1 to vector p2 + *------------------------------------------------------------------------------------------*/ + +static void VectorRotationToQuaternion( + const IVAS_VECTOR3 p1, + const IVAS_VECTOR3 p2, + IVAS_QUATERNION *const r ) +{ + float dot_product; + IVAS_VECTOR3 cross_product, p1_normalized, p2_normalized; + + p1_normalized = VectorNormalize( p1 ); + p2_normalized = VectorNormalize( p2 ); + cross_product = VectorCrossProduct( p1_normalized, p2_normalized ); + dot_product = VectorDotProduct( p1_normalized, p2_normalized ); + + if ( dot_product < -0.999999 ) { - result = min_angle; + /* happens when the p1 vector is parallel to p2, but direction is flipped */ + r->w = 0.0f; + r->x = 0.0f; + r->y = 0.0f; + r->z = 1.0f; } else { - /* 'if' assumed to use comparison to 0 */ - if ( result > max_angle ) - { - result = max_angle; - } + /* all regular cases */ + r->x = cross_product.x; + r->y = cross_product.y; + r->z = cross_product.z; + r->w = 1.0f + dot_product; } - return result; -} + QuaternionNormalize( *r, r ); + return; +} /*-------------------------------------------------------------------* * ivas_orient_trk_Init() @@ -102,11 +379,18 @@ static float ClipAngle( * *-------------------------------------------------------------------*/ -void ivas_orient_trk_Init( - ivas_orient_trk_state_t *pOTR ) +ivas_error ivas_orient_trk_Init( + ivas_orient_trk_state_t *pOTR ) /* i/o : orientation tracker handle */ { - /* Track relative to a reference orientation */ - pOTR->trackingType = OTR_TRACKING_REF_ORIENT; + IVAS_QUATERNION identity; + + if ( pOTR == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + identity.w = 1.0f; + identity.x = identity.y = identity.z = 0.0f; /* configuration parameters */ pOTR->centerAdaptationRate = 1.0f / 30.0f; @@ -116,23 +400,15 @@ void ivas_orient_trk_Init( /* initial adaptivity filter coefficient, will be auto-adapted */ pOTR->alpha = sinf( PI2 * pOTR->offCenterAdaptationRate / OTR_UPDATE_RATE ); /* start adaptation at off-center rate = fastest rate */ - pOTR->absYaw = 0.0f; - pOTR->absPitch = 0.0f; - pOTR->absRoll = 0.0f; - - pOTR->absAvgYaw = 0.0f; - pOTR->absAvgPitch = 0.0f; - pOTR->absAvgRoll = 0.0f; + pOTR->trkRot = identity; + pOTR->absAvgRot = identity; + /* Use frontal and horiontal orientation as reference orientation, unless/until overridden */ + pOTR->refRot = identity; - /* Use frontal and horiontal orientation as reference orientation, - unless/until overridden by ivas_orient_trk_SetAbsoluteOrientation() */ - pOTR->refYaw = 0.0f; - pOTR->refPitch = 0.0f; - pOTR->refRoll = 0.0f; + /* set safe default tracking mode */ + pOTR->trackingType = OTR_TRACKING_NONE; - pOTR->trkYaw = 0.0f; - pOTR->trkPitch = 0.0f; - pOTR->trkRoll = 0.0f; + return IVAS_ERR_OK; } @@ -143,171 +419,256 @@ void ivas_orient_trk_Init( *-------------------------------------------------------------------*/ ivas_error ivas_orient_trk_SetTrackingType( - ivas_orient_trk_state_t *pOTR, - OTR_TRACKING_T trackingType ) + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + const OTR_TRACKING_T trackingType /* i/o: orientation tracking type */ +) { + if ( pOTR == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } pOTR->trackingType = trackingType; + return IVAS_ERR_OK; } - /*-------------------------------------------------------------------* - * ivas_orient_trk_SetAbsoluteOrientation() + * ivas_orient_trk_SetReferenceRotation() * * *-------------------------------------------------------------------*/ -ivas_error ivas_orient_trk_SetAbsoluteOrientation( - ivas_orient_trk_state_t *pOTR, - float yaw, - float pitch, - float roll ) +ivas_error ivas_orient_trk_SetReferenceRotation( + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + const IVAS_QUATERNION refRot /* i : reference rotation */ +) { - /* TODO implement condition checks */ - pOTR->absYaw = yaw; - pOTR->absPitch = pitch; - pOTR->absRoll = roll; + if ( pOTR == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + /* check for Euler angle signaling */ + if ( refRot.w == -3.0f ) + { + Euler2Quat( deg2rad( refRot.x ), deg2rad( refRot.y ), deg2rad( refRot.z ), &pOTR->refRot ); + } + else + { + pOTR->refRot = refRot; + } return IVAS_ERR_OK; } /*-------------------------------------------------------------------* - * ivas_orient_trk_Process() + * ivas_orient_trk_GetMainOrientation() * * *-------------------------------------------------------------------*/ -ivas_error ivas_orient_trk_Process( - ivas_orient_trk_state_t *pOTR ) +ivas_error ivas_orient_trk_GetMainOrientation( + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + IVAS_QUATERNION *pOrientation /* i/o: average/reference orientation */ +) { - float yaw; - float pitch; - float roll; - - if ( pOTR->trackingType == OTR_TRACKING_AVG_ORIENT ) + if ( pOTR == NULL || pOrientation == NULL ) { - float normalizedOrientation; - float relativeOrientationRate; - float rateRange; - float cutoffFrequency; - float alpha = pOTR->alpha; - - /* Copy absolute orientation as input to compute further on */ - yaw = pOTR->absYaw; - pitch = pOTR->absPitch; - roll = pOTR->absRoll; - - /* Compute average (low-pass filtered) absolute orientation */ - pOTR->absAvgYaw = ( 1.0f - alpha ) * pOTR->absAvgYaw + alpha * yaw; - pOTR->absAvgPitch = ( 1.0f - alpha ) * pOTR->absAvgPitch + alpha * pitch; - pOTR->absAvgRoll = ( 1.0f - alpha ) * pOTR->absAvgRoll + alpha * roll; - - /* Compute relative orientation = (absolute orientation) - (average absolute orientation) */ - yaw -= pOTR->absAvgYaw; - pitch -= pOTR->absAvgPitch; - roll -= pOTR->absAvgRoll; - - /* Clip tracked relative orientation to avoid wrap around */ - yaw = ClipAngle( yaw, -MAX_TRACKED_ANGLE_AVG_ORIENT, MAX_TRACKED_ANGLE_AVG_ORIENT ); - pitch = ClipAngle( pitch, -MAX_TRACKED_ANGLE_AVG_ORIENT, MAX_TRACKED_ANGLE_AVG_ORIENT ); - roll = ClipAngle( roll, -MAX_TRACKED_ANGLE_AVG_ORIENT, MAX_TRACKED_ANGLE_AVG_ORIENT ); - - /* Store relative orientation result as output */ - pOTR->trkYaw = yaw; - pOTR->trkPitch = pitch; - pOTR->trkRoll = roll; - - /* Reconstruct the mean absolute orientation, compensating for non-linear computation of relative orientation: - take absolute orientation and subtract the *clipped* mean relative orientation */ - pOTR->absAvgYaw = pOTR->absYaw - yaw; - pOTR->absAvgPitch = pOTR->absPitch - pitch; - pOTR->absAvgRoll = pOTR->absRoll - roll; - - /* Adapt LPF constant based on orientation excursion relative to current mean: - - low cutoff (slow adaptation) for small excursions (around center) - - high cutoff (fast adaptation) for large excursions (off-center) - */ - - normalizedOrientation = yaw * yaw; - normalizedOrientation += pitch * pitch; - normalizedOrientation += roll * roll; - - relativeOrientationRate = sqrtf( normalizedOrientation ) / pOTR->adaptationAngle; - /* 'if' assumed to perform comparison to 0 */ - if ( relativeOrientationRate > 1.0f ) - { - relativeOrientationRate = 1.0f; - } - - /* Compute range of the adaptation rate between center = lower rate and off-center = higher rate */ - rateRange = pOTR->offCenterAdaptationRate - pOTR->centerAdaptationRate; - /* 'if' assumed to perform comparison to 0 */ - if ( rateRange < 0.0f ) - { - rateRange = 0.0f; - } - - /* Compute adaptivity cutoff frequency: interpolate between minimum (center) and maximum (off-center) values */ - cutoffFrequency = pOTR->centerAdaptationRate + ( relativeOrientationRate * rateRange ); - - /* Compute filter coefficient corresponding to desired cutoff frequency */ - pOTR->alpha = sinf( 2.0f * EVS_PI * cutoffFrequency / OTR_UPDATE_RATE ); + return IVAS_ERR_UNEXPECTED_NULL_POINTER; } - else + switch ( pOTR->trackingType ) { - /* 'if' assumed to perform comparison to 0 */ - if ( pOTR->trackingType == OTR_TRACKING_REF_ORIENT ) - { - /* Reset average orientation */ - pOTR->absAvgYaw = pOTR->absYaw; - pOTR->absAvgPitch = pOTR->absPitch; - pOTR->absAvgRoll = pOTR->absRoll; + case OTR_TRACKING_NONE: + *pOrientation = IdentityQuaternion(); + break; + case OTR_TRACKING_REF_VEC: + case OTR_TRACKING_REF_VEC_LEV: + case OTR_TRACKING_REF_ORIENT: + *pOrientation = pOTR->refRot; + break; + case OTR_TRACKING_AVG_ORIENT: + *pOrientation = pOTR->absAvgRot; + break; + } - /* Reset adaptation filter - start adaptation at center rate */ - pOTR->alpha = sinf( 2.0f * EVS_PI * pOTR->centerAdaptationRate / OTR_UPDATE_RATE ); + return IVAS_ERR_OK; +} - /* Copy absolute orientation as input to compute further on */ - yaw = pOTR->absYaw; - pitch = pOTR->absPitch; - roll = pOTR->absRoll; - /* Compute relative orientation = (absolute orientation) - (reference orientation) */ - yaw -= pOTR->refYaw; - pitch -= pOTR->refPitch; - roll -= pOTR->refRoll; - - /* Clip computed relative orientation to avoid wrap around and store as output */ - pOTR->trkYaw = ClipAngle( yaw, -MAX_TRACKED_ANGLE_REF_ORIENT, MAX_TRACKED_ANGLE_REF_ORIENT ); - pOTR->trkPitch = ClipAngle( pitch, -MAX_TRACKED_ANGLE_REF_ORIENT, MAX_TRACKED_ANGLE_REF_ORIENT ); - pOTR->trkRoll = ClipAngle( roll, -MAX_TRACKED_ANGLE_REF_ORIENT, MAX_TRACKED_ANGLE_REF_ORIENT ); - } - - else - { - return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Non-supported orientation tracking adaptation type" ); - } +/*-------------------------------------------------------------------* + * ivas_orient_trk_GetTrackedRotation() + * + * + *-------------------------------------------------------------------*/ + +ivas_error ivas_orient_trk_GetTrackedRotation( + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + IVAS_QUATERNION *pRotation /* i/o: processed rotation */ +) +{ + if ( pOTR == NULL || pRotation == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; } + *pRotation = pOTR->trkRot; + return IVAS_ERR_OK; } /*-------------------------------------------------------------------* - * ivas_orient_trk_GetTrackedOrientation() + * ivas_orient_trk_SetReferenceVector() * * *-------------------------------------------------------------------*/ -ivas_error ivas_orient_trk_GetTrackedOrientation( - ivas_orient_trk_state_t *pOTR, - float *yaw, - float *pitch, - float *roll ) +ivas_error ivas_orient_trk_SetReferenceVector( + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + const IVAS_VECTOR3 listenerPos, /* i : Listener position */ + const IVAS_VECTOR3 refPos /* i : Reference position */ +) { - *yaw = pOTR->trkYaw; - *pitch = pOTR->trkPitch; - *roll = pOTR->trkRoll; + IVAS_VECTOR3 acousticFrontVector, ivasForwardVector; + IVAS_VECTOR3 listenerPosLevel, refPosLevel; + float acousticFrontVectorLength; + + if ( pOTR == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + switch ( pOTR->trackingType ) + { + case OTR_TRACKING_NONE: + case OTR_TRACKING_REF_ORIENT: + case OTR_TRACKING_AVG_ORIENT: + case OTR_TRACKING_REF_VEC: + acousticFrontVector = VectorSubtract( listenerPos, refPos ); + break; + case OTR_TRACKING_REF_VEC_LEV: + /* ignore the height difference between listener position and reference position */ + listenerPosLevel.z = refPosLevel.z = listenerPos.z; + listenerPosLevel.x = listenerPos.x; + listenerPosLevel.y = listenerPos.y; + refPosLevel.x = refPos.x; + refPosLevel.y = refPos.y; + acousticFrontVector = VectorSubtract( listenerPosLevel, refPosLevel ); + break; + default: + return IVAS_ERR_WRONG_PARAMS; + } + + acousticFrontVectorLength = VectorLength( acousticFrontVector ); + + /* if the length is zero, the user has entered insensible listener and reference positions */ + if ( acousticFrontVectorLength < 0.0001f ) + { + return IVAS_ERR_WRONG_PARAMS; + } + + ivasForwardVector.x = -1.0f; + ivasForwardVector.y = 0.0f; + ivasForwardVector.z = 0.0f; + VectorRotationToQuaternion( ivasForwardVector, acousticFrontVector, &pOTR->refRot ); return IVAS_ERR_OK; } + + +/*-------------------------------------------------------------------* + * ivas_orient_trk_Process() + * + * + *-------------------------------------------------------------------*/ + +ivas_error ivas_orient_trk_Process( + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + IVAS_QUATERNION absRot, /* i : absolute head rotation */ + float updateRate, /* i : rotation update rate [Hz] */ + IVAS_QUATERNION *pTrkRot /* o : tracked rotation */ +) +{ + float normalizedOrientation; + float relativeOrientationRate; + float rateRange; + float cutoffFrequency; + float alpha = pOTR->alpha; + float ang; + ivas_error result; + + if ( pOTR == NULL || pTrkRot == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + result = IVAS_ERR_OK; + + switch ( pOTR->trackingType ) + { + case OTR_TRACKING_NONE: + pOTR->trkRot = absRot; + break; + case OTR_TRACKING_REF_VEC: + case OTR_TRACKING_REF_VEC_LEV: + case OTR_TRACKING_REF_ORIENT: + /* Reset average orientation */ + pOTR->absAvgRot = absRot; + + /* Reset adaptation filter - start adaptation at center rate */ + pOTR->alpha = sinf( 2.0f * EVS_PI * pOTR->centerAdaptationRate / updateRate ); + + /* Compute relative orientation = (absolute orientation) - (reference orientation) */ + QuaternionInverse( pOTR->refRot, &pOTR->trkRot ); + QuaternionProduct( pOTR->trkRot, absRot, &pOTR->trkRot ); + break; + + case OTR_TRACKING_AVG_ORIENT: + /* Compute average (low-pass filtered) absolute orientation */ + QuaternionSlerp( pOTR->absAvgRot, absRot, alpha, &pOTR->absAvgRot ); + + /* Compute relative orientation = (absolute orientation) - (average absolute orientation) */ + QuaternionInverse( pOTR->absAvgRot, &pOTR->trkRot ); + QuaternionProduct( pOTR->trkRot, absRot, &pOTR->trkRot ); + + /* Adapt LPF constant based on orientation excursion relative to current mean: + - low cutoff (slow adaptation) for small excursions (around center) + - high cutoff (fast adaptation) for large excursions (off-center) + */ + ang = QuaternionAngle( absRot, pOTR->trkRot ); + normalizedOrientation = ang * ang; + + relativeOrientationRate = sqrtf( normalizedOrientation ) / pOTR->adaptationAngle; + /* 'if' assumed to perform comparison to 0 */ + if ( relativeOrientationRate > 1.0f ) + { + relativeOrientationRate = 1.0f; + } + + /* Compute range of the adaptation rate between center = lower rate and off-center = higher rate */ + rateRange = pOTR->offCenterAdaptationRate - pOTR->centerAdaptationRate; + /* 'if' assumed to perform comparison to 0 */ + if ( rateRange < 0.0f ) + { + rateRange = 0.0f; + } + + /* Compute adaptivity cutoff frequency: interpolate between minimum (center) and maximum (off-center) values */ + cutoffFrequency = pOTR->centerAdaptationRate + ( relativeOrientationRate * rateRange ); + + /* Compute filter coefficient corresponding to desired cutoff frequency */ + pOTR->alpha = sinf( 2.0f * EVS_PI * cutoffFrequency / updateRate ); + break; + default: + result = IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Non-supported orientation tracking adaptation type" ); + break; + } + + if ( result == IVAS_ERR_OK ) + { + *pTrkRot = pOTR->trkRot; + } + + return result; +} diff --git a/lib_rend/ivas_output_init.c b/lib_rend/ivas_output_init.c index 76d5a8d4b4..4802fcf388 100644 --- a/lib_rend/ivas_output_init.c +++ b/lib_rend/ivas_output_init.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -29,21 +29,18 @@ the United Nations Convention on Contracts on the International Sales of Goods. *******************************************************************************************************/ -// VE2AT: keep in lib_rend or move to lib_dec ? -#include + #include #include "options.h" #include "ivas_cnst.h" -#include "ivas_prot.h" #include "prot.h" -#include "ivas_stat_dec.h" -#include "ivas_rom_dec.h" +#include "ivas_prot_rend.h" #include "ivas_rom_com.h" #ifdef DEBUGGING #include "debug.h" #include #endif -#include "wmops.h" +#include "wmc_auto.h" /*-------------------------------------------------------------------------* * audioCfg2channels() @@ -252,414 +249,3 @@ void ivas_output_init( return; } - - -/*-------------------------------------------------------------------------* - * ivas_renderer_select() - * - * Select and configure IVAS renderer parameters - *-------------------------------------------------------------------------*/ - -void ivas_renderer_select( - Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ -) -{ - RENDERER_TYPE *renderer_type; - AUDIO_CONFIG *internal_config; - AUDIO_CONFIG output_config; - AUDIO_CONFIG transport_config; - - int16_t nchan_internal; - - renderer_type = &( st_ivas->renderer_type ); - internal_config = &( st_ivas->intern_config ); - output_config = st_ivas->hDecoderConfig->output_config; - transport_config = st_ivas->transport_config; - - /* disabled rendering by default */ - *renderer_type = RENDERER_DISABLE; - - /*-----------------------------------------------------------------* - * Binaural rendering configurations - *-----------------------------------------------------------------*/ - - if ( st_ivas->hDecoderConfig->Opt_Headrotation ) - { - st_ivas->hHeadTrackData->shd_rot_max_order = -1; - } - - if ( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM -#ifdef SPLIT_REND_WITH_HEAD_ROT - || output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB -#endif - ) - { - if ( st_ivas->ivas_format == ISM_FORMAT ) - { - if ( st_ivas->ism_mode == ISM_MODE_PARAM ) - { - if ( output_config == AUDIO_CONFIG_BINAURAL ) - { - *renderer_type = RENDERER_BINAURAL_PARAMETRIC; - } - else - { - *renderer_type = RENDERER_BINAURAL_PARAMETRIC_ROOM; - } - } - else /* ISM_MODE_DISC */ - { - if ( output_config == AUDIO_CONFIG_BINAURAL || st_ivas->hRenderConfig->roomAcoustics.use_brir == 0 ) - { -#ifdef DEBUGGING - if ( st_ivas->hDecoderConfig->force_rend == FORCE_CLDFB_RENDERER ) - { - *renderer_type = RENDERER_BINAURAL_FASTCONV; - *internal_config = AUDIO_CONFIG_HOA3; /* Render ISM to HOA3 before binauralization*/ - } - else - { - *renderer_type = RENDERER_BINAURAL_OBJECTS_TD; - *internal_config = AUDIO_CONFIG_BINAURAL; - } -#else - *renderer_type = RENDERER_BINAURAL_OBJECTS_TD; - *internal_config = AUDIO_CONFIG_BINAURAL; -#endif - } - else - { - *renderer_type = RENDERER_BINAURAL_MIXER_CONV_ROOM; -#if defined( DEBUGGING ) - if ( st_ivas->hRenderConfig->renderer_type_override == RENDER_TYPE_OVERRIDE_FASTCONV ) - { - *renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM; - } -#endif - *internal_config = AUDIO_CONFIG_7_1_4; - } - } - } - else if ( st_ivas->ivas_format == MASA_FORMAT || ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->nchan_transport <= 2 ) ) - { - *internal_config = output_config; - if ( output_config == AUDIO_CONFIG_BINAURAL -#ifdef SPLIT_REND_WITH_HEAD_ROT - || output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB -#endif - ) - { - *renderer_type = RENDERER_BINAURAL_PARAMETRIC; - } - else - { - *renderer_type = RENDERER_BINAURAL_PARAMETRIC_ROOM; - } - } - else if ( st_ivas->ivas_format == SBA_FORMAT ) - { - *internal_config = AUDIO_CONFIG_HOA3; - - if ( output_config == AUDIO_CONFIG_BINAURAL -#ifdef SPLIT_REND_WITH_HEAD_ROT - || output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB -#endif - ) - { - *renderer_type = RENDERER_BINAURAL_FASTCONV; - } - else - { - *renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM; - } - - if ( st_ivas->hDecoderConfig->Opt_Headrotation ) - { - - nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order ); - if ( nchan_internal == 2 ) - { - st_ivas->hHeadTrackData->shd_rot_max_order = 1; - } - else if ( nchan_internal == 4 || nchan_internal == 3 ) - { - st_ivas->hHeadTrackData->shd_rot_max_order = 0; - } - else if ( nchan_internal == 6 || nchan_internal == 5 ) - { - st_ivas->hHeadTrackData->shd_rot_max_order = 2; - } - else if ( nchan_internal == 8 || nchan_internal == 7 ) - { - st_ivas->hHeadTrackData->shd_rot_max_order = 3; - } - } - } - else if ( st_ivas->ivas_format == MC_FORMAT ) - { - if ( st_ivas->mc_mode == MC_MODE_MCMASA ) - { - *internal_config = output_config; - if ( output_config == AUDIO_CONFIG_BINAURAL ) - { - *renderer_type = RENDERER_BINAURAL_PARAMETRIC; - } - else - { - *renderer_type = RENDERER_BINAURAL_PARAMETRIC_ROOM; - } - } - else - { - *internal_config = transport_config; - if ( output_config == AUDIO_CONFIG_BINAURAL ) - { -#ifdef DEBUGGING - if ( ( ( ( st_ivas->transport_config == AUDIO_CONFIG_5_1 || st_ivas->transport_config == AUDIO_CONFIG_7_1 ) && st_ivas->hDecoderConfig->Opt_Headrotation ) || ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) ) && ( st_ivas->mc_mode == MC_MODE_MCT ) && !( st_ivas->hDecoderConfig->force_rend == FORCE_CLDFB_RENDERER ) ) -#else - if ( ( st_ivas->transport_config == AUDIO_CONFIG_5_1 || st_ivas->transport_config == AUDIO_CONFIG_7_1 ) && st_ivas->hDecoderConfig->Opt_Headrotation && ( st_ivas->mc_mode == MC_MODE_MCT ) ) -#endif - { - *renderer_type = RENDERER_BINAURAL_OBJECTS_TD; - } - else - { - if ( st_ivas->mc_mode == MC_MODE_MCT ) - { - *renderer_type = RENDERER_BINAURAL_MIXER_CONV; - } - else - { - *renderer_type = RENDERER_BINAURAL_FASTCONV; - } - -#ifdef DEBUGGING - if ( st_ivas->hRenderConfig->renderer_type_override == RENDER_TYPE_OVERRIDE_CREND ) - { - *renderer_type = RENDERER_BINAURAL_MIXER_CONV; - } - else if ( st_ivas->hRenderConfig->renderer_type_override == RENDER_TYPE_OVERRIDE_FASTCONV ) - { - *renderer_type = RENDERER_BINAURAL_FASTCONV; - } -#endif - if ( st_ivas->hDecoderConfig->Opt_Headrotation ) - { - /* force HOA3 domain for rotation*/ - *internal_config = AUDIO_CONFIG_HOA3; - } - } - } - else /* AUDIO_CONFIG_BINAURAL_ROOM */ - { - if ( st_ivas->mc_mode == MC_MODE_MCT ) - { - *renderer_type = RENDERER_BINAURAL_MIXER_CONV_ROOM; - } - else - { - *renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM; - } -#ifdef DEBUGGING - if ( st_ivas->hRenderConfig->renderer_type_override == RENDER_TYPE_OVERRIDE_CREND ) - { - *renderer_type = RENDERER_BINAURAL_MIXER_CONV_ROOM; - } - else if ( st_ivas->hRenderConfig->renderer_type_override == RENDER_TYPE_OVERRIDE_FASTCONV ) - { - *renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM; - } -#endif - } - } - } - } - - /*-----------------------------------------------------------------* - * Non-binaural rendering configurations - *-----------------------------------------------------------------*/ - - else if ( st_ivas->ivas_format == STEREO_FORMAT ) - { - if ( output_config != AUDIO_CONFIG_STEREO && output_config != AUDIO_CONFIG_MONO ) - { - *renderer_type = RENDERER_MC; - } - } - else if ( st_ivas->ivas_format == ISM_FORMAT ) - { - if ( st_ivas->ism_mode == ISM_MODE_PARAM ) - { - *renderer_type = RENDERER_PARAM_ISM; - if ( output_config == AUDIO_CONFIG_MONO ) - { - *renderer_type = RENDERER_MONO_DOWNMIX; - } - else if ( output_config == AUDIO_CONFIG_STEREO ) - { - *renderer_type = RENDERER_DISABLE; - } - else if ( output_config == AUDIO_CONFIG_FOA || output_config == AUDIO_CONFIG_HOA2 || output_config == AUDIO_CONFIG_HOA3 ) - { - *renderer_type = RENDERER_SBA_LINEAR_ENC; - *internal_config = AUDIO_CONFIG_7_1_4; - } - } - else /* ISM_MODE_DISC */ - { - *renderer_type = RENDERER_TD_PANNING; - if ( output_config == AUDIO_CONFIG_MONO ) - { - *renderer_type = RENDERER_MONO_DOWNMIX; - } - else if ( output_config == AUDIO_CONFIG_FOA || output_config == AUDIO_CONFIG_HOA2 || output_config == AUDIO_CONFIG_HOA3 ) - { - *renderer_type = RENDERER_SBA_LINEAR_ENC; - } - else if ( output_config == AUDIO_CONFIG_EXTERNAL ) - { - *renderer_type = RENDERER_DISABLE; - } - } - } - else if ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == SBA_FORMAT ) - { - *renderer_type = RENDERER_DIRAC; - - if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR && - ( output_config != AUDIO_CONFIG_5_1 && output_config != AUDIO_CONFIG_5_1_2 && output_config != AUDIO_CONFIG_5_1_4 && output_config != AUDIO_CONFIG_7_1 && output_config != AUDIO_CONFIG_7_1_4 && output_config != AUDIO_CONFIG_LS_CUSTOM ) ) - { - if ( output_config == AUDIO_CONFIG_HOA2 || output_config == AUDIO_CONFIG_FOA ) - { - *internal_config = output_config; - } - else if ( output_config == AUDIO_CONFIG_MONO || output_config == AUDIO_CONFIG_STEREO ) - { - *internal_config = AUDIO_CONFIG_FOA; - } - else - { - *internal_config = AUDIO_CONFIG_HOA3; - } - st_ivas->renderer_type = RENDERER_SBA_LINEAR_DEC; - } - else if ( ( st_ivas->ivas_format == MASA_FORMAT && output_config == AUDIO_CONFIG_MONO && st_ivas->nchan_transport == 1 ) || - ( st_ivas->ivas_format == SBA_FORMAT && output_config == AUDIO_CONFIG_STEREO && st_ivas->nchan_transport == 1 ) ) - { - *renderer_type = RENDERER_DISABLE; - } - else if ( ( st_ivas->ivas_format == MASA_FORMAT && output_config == AUDIO_CONFIG_MONO && st_ivas->hDecoderConfig->ivas_total_brate < MASA_STEREO_MIN_BITRATE && st_ivas->hDecoderConfig->ivas_total_brate > IVAS_SID_5k2 ) ) - { - *renderer_type = RENDERER_DISABLE; - } - else if ( st_ivas->ivas_format == MASA_FORMAT && output_config == AUDIO_CONFIG_STEREO ) - { - *renderer_type = RENDERER_STEREO_PARAMETRIC; - } - else if ( st_ivas->ivas_format == MASA_FORMAT && output_config == AUDIO_CONFIG_EXTERNAL ) - { - *renderer_type = RENDERER_DISABLE; - } - else if ( st_ivas->ivas_format == SBA_FORMAT ) - { - int16_t nchan_max; - - if ( ( output_config == AUDIO_CONFIG_MONO ) || ( output_config == AUDIO_CONFIG_STEREO ) ) - { - nchan_max = st_ivas->hDecoderConfig->nchan_out; - } - else if ( st_ivas->hOutSetup.ambisonics_order > 0 ) - { - nchan_max = ivas_sba_get_nchan( st_ivas->hOutSetup.ambisonics_order, st_ivas->sba_planar ); - } - else - { - nchan_max = ivas_sba_get_nchan( 3, st_ivas->sba_planar ); - } - - if ( st_ivas->nchan_transport >= nchan_max ) - { - *renderer_type = RENDERER_SBA_LINEAR_DEC; - } - } - } - else if ( st_ivas->ivas_format == MC_FORMAT ) - { - *internal_config = transport_config; - if ( st_ivas->mc_mode == MC_MODE_MCT && *internal_config != output_config ) - { - if ( output_config != AUDIO_CONFIG_FOA && output_config != AUDIO_CONFIG_HOA2 && output_config != AUDIO_CONFIG_HOA3 ) - { - *renderer_type = RENDERER_MC; - } - else - { - *renderer_type = RENDERER_SBA_LINEAR_ENC; - } - } - else if ( st_ivas->mc_mode == MC_MODE_PARAMMC ) - { - if ( output_config == AUDIO_CONFIG_FOA || output_config == AUDIO_CONFIG_HOA2 || output_config == AUDIO_CONFIG_HOA3 ) - { - *renderer_type = RENDERER_SBA_LINEAR_ENC; - } - else - { - *renderer_type = RENDERER_MC_PARAMMC; - } - } - else if ( st_ivas->mc_mode == MC_MODE_MCMASA ) - { - *internal_config = output_config; - /* No rendering for 1TC to Mono or Stereo and 2TC to Stereo */ - if ( output_config == AUDIO_CONFIG_MONO || output_config == AUDIO_CONFIG_STEREO ) - { - if ( st_ivas->nchan_transport == 1 ) - { - *renderer_type = RENDERER_DISABLE; - } - else if ( output_config == AUDIO_CONFIG_STEREO && st_ivas->nchan_transport == 2 && !st_ivas->hOutSetup.separateChannelEnabled ) - { - *renderer_type = RENDERER_DISABLE; - } - else - { - *renderer_type = RENDERER_MCMASA_MONO_STEREO; - } - } - else - { - *renderer_type = RENDERER_DIRAC; - if ( output_config == AUDIO_CONFIG_FOA || output_config == AUDIO_CONFIG_HOA2 || output_config == AUDIO_CONFIG_HOA3 ) - { - *renderer_type = RENDERER_SBA_LINEAR_ENC; - *internal_config = transport_config; - } - else if ( transport_config == AUDIO_CONFIG_5_1 && ( output_config == AUDIO_CONFIG_7_1 || output_config == AUDIO_CONFIG_5_1_4 ) ) - { - *internal_config = transport_config; - } - } - } - } - - return; -} - -#ifdef SPLIT_REND_WITH_HEAD_ROT -void ivas_set_split_rend_setup( IVAS_DEC_SPLIT_REND_WRAPPER *hSplitBinRend, IVAS_SPLIT_REND_CONFIG_DATA *hSplitBinConfig, HEAD_TRACK_DATA_HANDLE hHeadTrackData, IVAS_SPLIT_REND_BITS_HANDLE hSplitRendBits ) -{ - hSplitRendBits->bits_written = 0; - hSplitRendBits->bits_read = 0; - hSplitBinRend->hSplitRendBits = hSplitRendBits; - - hSplitBinRend->hMultiBinCldfbData = (IVAS_DEC_SPLIT_REND_MULTI_BIN_CLDFB_DATA_HANDLE) dynamic_malloc( sizeof( IVAS_DEC_SPLIT_REND_MULTI_BIN_CLDFB_DATA ) ); - - ivas_renderSplitGetMultiBinPoseData( - hSplitBinConfig, - &hSplitBinRend->splitrend.multiBinPoseData, - hHeadTrackData->sr_pose_pred_axis ); - - return; -} -#endif diff --git a/lib_rend/ivas_prot_rend.h b/lib_rend/ivas_prot_rend.h new file mode 100644 index 0000000000..f2f6dc3473 --- /dev/null +++ b/lib_rend/ivas_prot_rend.h @@ -0,0 +1,1225 @@ +/****************************************************************************************************** + + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository. All Rights Reserved. + + This software is protected by copyright law and by international treaties. + The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository retain full ownership rights in their respective contributions in + the software. This notice grants no license of any kind, including but not limited to patent + license, nor is any license granted by implication, estoppel or otherwise. + + Contributors are required to enter into the IVAS codec Public Collaboration agreement before making + contributions. + + This software is provided "AS IS", without any express or implied warranties. The software is in the + development stage. It is intended exclusively for experts who have experience with such software and + solely for the purpose of inspection. All implied warranties of non-infringement, merchantability + and fitness for a particular purpose are hereby disclaimed and excluded. + + Any dispute, controversy or claim arising under or in relation to providing this software shall be + submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in + accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and + the United Nations Convention on Contracts on the International Sales of Goods. + +*******************************************************************************************************/ + +#ifndef IVAS_PROT_REND_H +#define IVAS_PROT_REND_H + +#include +#include "options.h" +#include "ivas_error.h" +#include "lib_rend.h" +#include "ivas_stat_dec.h" // Note: needed until #156 is resolved + +/* clang-format off */ + +/*----------------------------------------------------------------------------------* + * General renderer declarations + *----------------------------------------------------------------------------------*/ + +IVAS_REND_AudioConfigType getAudioConfigType( + const IVAS_REND_AudioConfig config +); + +ivas_error getAudioConfigNumChannels( + const IVAS_REND_AudioConfig config, + int16_t *numChannels +); + +AUDIO_CONFIG getIvasAudioConfigFromRendAudioConfig( + IVAS_REND_AudioConfig rendConfig ); + +IVAS_REND_AudioConfig getRendAudioConfigFromIvasAudioConfig( + AUDIO_CONFIG config ); + + +/*----------------------------------------------------------------------------------* + * output setup prototypes + *----------------------------------------------------------------------------------*/ + +/*! r: number of output channels */ +int16_t audioCfg2channels( + const AUDIO_CONFIG output_config /* i : output audio configuration */ +); + +void ivas_output_init( + IVAS_OUTPUT_SETUP *hOutSetup, /* o : output setup structure */ + const AUDIO_CONFIG output_config /* i : output audio configuration */ +); + +/*----------------------------------------------------------------------------------* + * Limiter prototypes + *----------------------------------------------------------------------------------*/ + +/*! r: limiter struct handle */ +IVAS_LIMITER_HANDLE ivas_limiter_open( + const int16_t num_channels, /* i : number of I/O channels */ + const int32_t sampling_rate /* i : sampling rate for processing */ +); + +void ivas_limiter_close( + IVAS_LIMITER_HANDLE* phLimiter /* i/o: pointer to limiter handle, can be NULL */ +); + +void ivas_limiter_dec +( + IVAS_LIMITER_HANDLE hLimiter, /* i/o: limiter struct handle */ + float output[MAX_OUTPUT_CHANNELS][L_FRAME48k], /* i/o: input/output buffer */ + const int16_t num_channels, /* i : number of channels to be processed */ + const int16_t output_frame, /* i : number of samples per channel in the buffer */ + const int16_t BER_detect /* i : BER detect flag */ +); + +void limiter_process( + IVAS_LIMITER_HANDLE hLimiter, /* i/o: limiter struct handle */ + const int16_t output_frame, /* i : number of samples to be processed per channel in the I/O buffer */ + const float threshold, /* i : signal amplitude above which limiting starts to be applied */ + const int16_t BER_detect, /* i : BER detect flag */ + int16_t *strong_saturation_cnt /* i/o: counter of strong saturations (can be NULL) */ +); + + +/*----------------------------------------------------------------------------------* + * Amplitude Panning EFAP prototypes + *----------------------------------------------------------------------------------*/ + +ivas_error efap_init_data( + EFAP_HANDLE *hEFAPdata, /* i/o: handle for EFAP data structure that will be initialized */ + const float *speaker_node_azi_deg, /* i : vector of speaker node azimuths (positive left) */ + const float *speaker_node_ele_deg, /* i : vector of speaker node elevations (positive up) */ + const int16_t num_speaker_nodes, /* i : number of speaker nodes in the set */ + const int16_t efap_mode /* i : indicates whether EFAP or EFIP is used */ +); + +void efap_free_data( + EFAP_HANDLE *hEFAPdata /* i/o: EFAP handle to be freed */ +); + +void efap_determine_gains( + EFAP_HANDLE hEFAPdata, /* i : EFAP structure */ + float *gains, /* o : gain vector for speaker nodes for given direction */ + const float azi_deg, /* i : azimuth in degrees for panning direction (positive left) */ + const float ele_deg, /* i : elevation in degrees for panning direction (positive up) */ + const int16_t efap_mode /* i : indicates whether EFAP or EFIP is used */ +); + + +/*----------------------------------------------------------------------------------* + * SBA rendering + *----------------------------------------------------------------------------------*/ + +void ivas_sba_prototype_renderer( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder struct */ + float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : Input audio in CLDFB domain, real */ + float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : Input audio in CLDFB domain, imag */ + const int16_t firstSubframe, /* i : First subframe to map */ + const int16_t nSubframes /* i : Number of subframes to map */ +); + +ivas_error ivas_sba_get_hoa_dec_matrix( + const IVAS_OUTPUT_SETUP hOutSetup, /* i : target output setup */ + float **hoa_dec_mtx, /* o : ALLRAD decoder matrix */ + const int16_t ambisonics_order /* i : Ambisonics order */ +); + +void ivas_dirac_dec_binaural( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + float output_f[][L_FRAME48k], /* i/o: synthesized core-coder transport channels/DirAC output */ + const int16_t nchan_transport /* i : number of transport channels */ +); + +ivas_error ivas_dirac_dec_init_binaural_data( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + HRTFS_PARAMBIN_HANDLE hHrtfParambin /* i : HRTF structure for rendering */ +); + +void ivas_dirac_dec_close_binaural_data( + DIRAC_DEC_BIN_HANDLE *hBinaural /* i/o: decoder DirAC binaural data handle */ +); + +ivas_error ivas_dirac_dec_binaural_copy_hrtfs( + HRTFS_PARAMBIN_HANDLE *hHrtfParambin /* i/o: HRTF structure for rendering */ +); + + +/*----------------------------------------------------------------------------------* + * HRTF + *----------------------------------------------------------------------------------*/ + +ivas_error ivas_HRTF_binary_open( + TDREND_HRFILT_FiltSet_t **hHrtfTD /* i/o: TD renderer HRTF handle */ +); + +void ivas_HRTF_binary_close( + TDREND_HRFILT_FiltSet_t **hHrtfTD /* i/o: TD renderer HRTF handle */ +); + +ivas_error ivas_HRTF_fastconv_binary_open( + HRTFS_FASTCONV **hHrtfFastConv /* i/o: FASTCONV HRTF structure */ +); + +void ivas_HRTF_fastconv_binary_close( + HRTFS_FASTCONV **hHrtfFastConv /* i/o: FASTCONV HRTF structure */ +); + +ivas_error ivas_HRTF_parambin_binary_open( + HRTFS_PARAMBIN **hHrtfParambin /* i/o: Parametric binauralizer HRTF structure */ +); + +void ivas_HRTF_parambin_binary_close( + HRTFS_PARAMBIN **hHrtfParambin /* i/o: Parametric binauralizer HRTF structure */ +); + +ivas_error ivas_HRTF_CRend_binary_open( + HRTFS_CREND **hSetOfHRTF /* i/o: Set of HRTF handle */ +); + +void ivas_HRTF_CRend_binary_close( + HRTFS_CREND **hSetOfHRTF /* i/o: Set of HRTF handle */ +); + + +/*----------------------------------------------------------------------------------* + * TD object renderer + *----------------------------------------------------------------------------------*/ + +#ifdef SPLIT_REND_LC3PLUS +/* TODO(sgi): Rework interface */ +void ObjRenderIvasFrame_splitBinaural( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + float output[][L_FRAME48k], /* i/o: SCE channels / Binaural synthesis */ + const int16_t output_frame /* i : output frame length */ +); +#endif + +ivas_error ivas_td_binaural_renderer_unwrap( + const REVERB_HANDLE hReverb, /* i : Reverberator handle */ + const AUDIO_CONFIG transport_config, /* i : Transport configuration */ + BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD binaural object renderer handle */ + const int16_t num_src, /* i : number of sources to render */ + const int16_t lfe_idx, /* i : LFE channel index */ + const IVAS_FORMAT ivas_format, /* i : IVAS format */ + ISM_METADATA_HANDLE *hIsmMetaData, /* i : ISM metadata handle */ + const int16_t Opt_Headrotation, /* i : Head rotation flag */ + const IVAS_QUATERNION *Quaternions, /* i : Head tracking data per subframe */ + const IVAS_VECTOR3 *Pos, /* i : Listener position data per subframe */ + float output[][L_FRAME48k], /* i/o: SCE channels / Binaural synthesis */ + const int16_t output_frame /* i : output frame length */ +); + +ivas_error ivas_td_binaural_renderer_ext( + const TDREND_WRAPPER *pTDRend, /* i : TD Renderer wrapper structure */ + const IVAS_REND_AudioConfig inConfig, /* i : Input audio configuration */ + const LSSETUP_CUSTOM_STRUCT *customLsInput, /* i : Input custom loudspeaker layout */ + const IVAS_REND_HeadRotData *headRotData, /* i : Input head positions */ + const IVAS_REND_AudioObjectPosition *currentPos, /* i : Object position */ + const REVERB_HANDLE hReverb, /* i : Reverberator handle */ + const int16_t output_frame, /* i : output frame length */ + float output[][L_FRAME48k] /* i/o: SCE channels / Binaural synthesis */ +); + +ivas_error ivas_td_binaural_open_unwrap( + TDREND_HRFILT_FiltSet_t **hHrtfTD, /* i/o: HR filter model (from file or NULL) */ + const int32_t output_Fs, /* i : Output sampling rate */ + const int16_t nchan_transport, /* i : Number of channels */ + const IVAS_FORMAT ivas_format, /* i : IVAS format (ISM/MC) */ + const AUDIO_CONFIG transport_config, /* i : Transport configuration */ + const float *directivity, /* i : Directivity pattern (used for ISM) */ + const IVAS_OUTPUT_SETUP hTransSetup, /* i : Loudspeaker layout */ + BINAURAL_TD_OBJECT_RENDERER_HANDLE *hBinRendererTd, /* o : TD renderer handle */ + int32_t *binaural_latency_ns /* i : Binauralization delay */ +); + +ivas_error ivas_td_binaural_open_ext( + TDREND_WRAPPER *pTDRend, + const IVAS_REND_AudioConfig inConfig, + RENDER_CONFIG_DATA *hRendCfg, /* i : Renderer configuration */ + LSSETUP_CUSTOM_STRUCT *customLsInput, + const int32_t output_Fs +); + +void ivas_td_binaural_close( + BINAURAL_TD_OBJECT_RENDERER_HANDLE *hBinRendererTd /* i/o: TD binaural object renderer handle */ +); + + +ivas_error TDREND_GetMix( + BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ + float output[][L_FRAME48k], /* i/o: ISM object synth / rendered output in 0,1 */ + const int16_t subframe_length, /* i/o: subframe length */ + const int16_t subframe_idx /* i : Subframe index to 5 ms subframe */ +); + +void TDREND_Update_listener_orientation( + BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD Renderer handle */ + const int16_t headRotEnabled, /* i : Headrotation flag */ + const IVAS_QUATERNION *headPosition, /* i : Listener orientation */ + const IVAS_VECTOR3 *Pos /* i : Listener Position */ +); + +void TDREND_Update_object_positions( + BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o : TD Renderer handle */ + const int16_t num_src, /* i : number of sources to render */ + const int16_t lfe_idx, /* i : Input LFE index */ + const IVAS_FORMAT in_format, /* i : Format of input sources */ + const ISM_METADATA_HANDLE *hIsmMetaData, /* i : Input metadata for ISM objects */ + float output[][L_FRAME48k] /* i/o: SCE/MC channels */ +); + +void BSplineModelEvalDealloc( + ModelParams_t *model, /* i : Model parameters */ + ModelEval_t *modelEval /* i : Model evaluation structure */ +); + +/* ----- Object renderer - hrfilt ----- */ + +void GetFilterFromAngle( + TDREND_HRFILT_FiltSet_t *HrFiltSet_p, /* i/o: HR filter set structure */ + const float Elev, /* i : Elevation, degrees */ + float Azim, /* i : Azimuth, degrees */ + float *LeftFilter, /* o : Left HR filter */ + float *RightFilter, /* o : Right HR filter */ + int16_t *itd /* o : ITD value */ +); + +void HRTF_model_precalc( + ModelParams_t *model /* i/o: HRTF Model parameters */ +); + +ivas_error TDREND_REND_RenderSourceHRFilt( + TDREND_SRC_t *Src_p, /* i/o: The source to be rendered */ + const float *hrf_left_delta, /* i: Left filter interpolation delta */ + const float *hrf_right_delta, /* i: Right filter interpolation delta */ + const int16_t intp_count, /* i: Interpolation count */ + float output_buf[][L_SPATIAL_SUBFR_48k], /* o : Output buffer */ + const int16_t subframe_length /* i : Subframe length in use */ +); + +/* ----- Object renderer - sources ----- */ + +ivas_error TDREND_MIX_SRC_SetPos( + BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ + const int16_t SrcInd, /* i : Source index */ + const float *Vec_p /* i : Position vector */ +); + +ivas_error TDREND_MIX_SRC_SetDir( + BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ + const int16_t SrcInd, /* i : Source index */ + const float *Vec_p /* i : Direction vector */ +); + +ivas_error TDREND_MIX_SRC_SetDirAtten( + BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ + const int16_t SrcInd, /* i : Source index */ + const TDREND_DirAtten_t *DirAtten_p /* i : Directional attenuation specifier */ +); + +ivas_error TDREND_MIX_SRC_SetPlayState( + BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ + const int16_t SrcInd, /* i : Source index */ + const TDREND_PlayStatus_t PlayStatus /* i : Play state */ +); + +void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( + BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ + TDREND_SRC_REND_t *SrcRend_p, /* i/o: Source object */ + TDREND_SRC_SPATIAL_t *SrcSpatial_p, /* i : Spatial aspects of source */ + float *hrf_left_prev, /* o: Left filter */ + float *hrf_right_prev, /* o: Right filter */ + float *hrf_left_delta, /* o: Left filter interpolation delta */ + float *hrf_right_delta, /* o: Right filter interpolation delta */ + int16_t *intp_count, /* o: Interpolation count */ + int16_t *filterlength, /* o: Length of filters */ + int16_t *itd, /* o: ITD value */ + float *Gain, /* o: Gain value */ + TDREND_SRC_t *Src_p, + const int16_t subframe_idx /* i : Subframe index to 5 ms subframe */ +); + +ivas_error TDREND_SRC_Alloc( + TDREND_SRC_t **Src_pp /* i/o: Source */ +); + +void TDREND_SRC_Dealloc( + TDREND_SRC_t *Src_p /* i/o: Source to deallocate */ +); + +void TDREND_SRC_Init( + TDREND_SRC_t *Src_p, /* i/o: Source to initialize */ + const TDREND_PosType_t PosType /* i : Position type specifier */ +); + +/* ----- Object renderer - vec ----- */ + +void TDREND_SPATIAL_VecInit( + float *Pos_p, /* o : Output vector */ + const float PosX, /* i : X value */ + const float PosY, /* i : Y value */ + const float PosZ /* i : Z value */ +); + +/*! r: Euclidian norm value */ +float TDREND_SPATIAL_VecNorm( + const float *Vec_p /* i : Vector for norm calculation */ +); + +void TDREND_SPATIAL_VecNormalize( + const float *Vec_p, /* i : Input vector */ + float *VecNorm_p /* o : Output vector */ +); + +void TDREND_SPATIAL_VecMapToNewCoordSystem( + const float *Vec_p, /* i : Input vector */ + const float *TranslVec_p, /* i : Translation vector */ + const float *DirVec_p, /* i : Direction vector */ + const float *UpVec_p, /* i : Up vector */ + const float *RightVec_p, /* i : Right vector */ + float *MappedVec_p, /* o : Transformed vector */ + float *LisRelPosAbs /* o : Transformed vector ignoring orientation */ +); + +/*! r: Flag if the orientation has been updated */ +int16_t TDREND_SPATIAL_EvalOrthonormOrient( + float *FrontVecON_p, /* o : Normalized front vector */ + float *UpVecON_p, /* o : Normalized up vector */ + float *RightVecON_p, /* o : Normalized right vector */ + const float *FrontVec_p, /* i : Input front vector */ + const float *UpVec_p /* i : Input up vector */ +); + +/* ----- Object renderer - mix ----- */ + +ivas_error TDREND_MIX_AddSrc( + BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ + int16_t *SrcInd, /* o : Source index */ + const TDREND_PosType_t PosType /* i : Position type (absolute/relative) */ +); + +ivas_error TDREND_MIX_SetDistAttenModel( + BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ + const TDREND_DistAttenModel_t DistAttenModel /* i : Distance attenuation model */ +); + +void TDREND_MIX_LIST_SetPos( + BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ + const float *Pos_p /* i : Listener's position */ +); + +ivas_error TDREND_MIX_LIST_SetOrient( + BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ + const float *FrontVec_p, /* i : Listener's orientation front vector */ + const float *UpVec_p /* i : Listener's orientation up vector */ +); + +void TDREND_MIX_Dealloc( + BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd /* i/o: TD renderer handle */ +); + +ivas_error TDREND_MIX_Init( + BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */ + TDREND_HRFILT_FiltSet_t **hHrtfTD, /* i/o: HRTF data (initialized in case of NULL) */ + const TDREND_MixSpatSpec_t *MixSpatSpec_p, /* i : Mixer spatial specification */ + const int32_t output_Fs /* i : Output sampling rate */ +); + + /* ----- Object renderer - sfx ----- */ + +void TDREND_Apply_ITD( + float *input, /* i: Input SCE subframe to be time adjusted */ + float *out_left, /* o: Output left channels with ITD applied */ + float *out_right, /* o: Output right channels with ITD applied */ + int16_t *previtd, /*i/o: Previous ITD value */ + const int16_t itd, /* i: Current subframe ITD value */ + float *mem_itd, /*i/o: ITD buffer memory */ + const int16_t length /* i: Subframe length */ +); + +void TDREND_firfilt( + float *signal, /* i/o: Input signal / Filtered signal */ + float *filter, /* i/o: FIR filter */ + const float *filter_delta, /* i : FIR filter delta */ + const int16_t intp_count, /* i : interpolation count */ + float *mem, /* i/o: filter memory */ + const int16_t subframe_length, /* i : Length of signal */ + const int16_t filterlength, /* i : Filter length */ +#ifdef FIX_379_GAININTP + const float Gain, /* i : Gain */ + const float prevGain /* i : Previous gain */ +#else + const float Gain /* i : Gain */ +#endif +); + + +/*----------------------------------------------------------------------------------* + * Crend renderer + *----------------------------------------------------------------------------------*/ + +ivas_error ivas_rend_openCrend( + CREND_WRAPPER_HANDLE *pCrend, + const AUDIO_CONFIG inConfig, + const AUDIO_CONFIG outConfig, + RENDER_CONFIG_DATA *hRendCfg, + HRTFS_CREND_HANDLE hSetOfHRTF, + const int32_t output_Fs +#ifdef SPLIT_REND_WITH_HEAD_ROT + , + const int16_t num_poses +#endif +); + +void ivas_rend_closeCrend( + CREND_WRAPPER_HANDLE *pCrend +#ifdef SPLIT_REND_WITH_HEAD_ROT + , + const int16_t num_poses +#endif +); + +ivas_error ivas_rend_initCrendWrapper( + CREND_WRAPPER_HANDLE *pCrend +#ifdef SPLIT_REND_WITH_HEAD_ROT + , + const int16_t num_poses +#endif +); + +#ifdef SPLIT_REND_WITH_HEAD_ROT +ivas_error ivas_rend_openMultiBinCrend( + CREND_WRAPPER_HANDLE *pCrend, + const IVAS_REND_AudioConfig inConfig, + const IVAS_REND_AudioConfig outConfig, + MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, + const int32_t output_Fs ); +#endif + +#ifdef SPLIT_REND_WITH_HEAD_ROT +void ivas_rend_CldfbMultiBinRendProcess( + const BINAURAL_RENDERER_HANDLE hCldfbRend, + const IVAS_REND_HeadRotData *pHeadRotData, + MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, + float Cldfb_In_Real[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + float Cldfb_In_Imag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + float Cldfb_Out_Real[][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : Binaural signals */ + float Cldfb_Out_Imag[][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + const int16_t low_res_pre_rend_rot ); + +ivas_error ivas_rend_openCldfb( + HANDLE_CLDFB_FILTER_BANK cldfbAna[MAX_INPUT_CHANNELS], + const IVAS_REND_AudioConfig inConfig, + const int32_t output_Fs ); +ivas_error ivas_rend_openCldfbRend( + CLDFB_REND_WRAPPER *pCldfbRend, + const IVAS_REND_AudioConfig inConfig, + const IVAS_REND_AudioConfig outConfig, + RENDER_CONFIG_DATA *hRendCfg, +#ifdef SPLIT_REND_WITH_HEAD_ROT + MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, +#endif + const int32_t output_Fs ); + +void ivas_mat_mult_2by2_complex( float in_re1[2][2], + float in_im1[2][2], + float in_re2[2][2], + float in_im2[2][2], + float out_re2[2][2], + float out_im2[2][2] ); +void ivas_split_rend_bitstream_init( ivas_split_rend_bits_t *pBits, const int32_t buf_len_bytes, uint8_t *pbuf ); +void ivas_split_rend_huffman_dec_init_min_max_len( ivas_split_rend_huffman_cfg_t *p_huff_cfg ); +void ivas_split_rend_init_huff_cfg( BIN_HR_SPLIT_REND_HUFF_HANDLE pHuff_cfg ); +void set_fix_rotation_mat( float fix_pos_rot_mat[][BINAURAL_CHANNELS][BINAURAL_CHANNELS], + MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData ); +void set_pose_types( IVAS_SPLIT_REND_POSE_TYPE pose_type[MAX_HEAD_ROT_POSES - 1], MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData ); +int16_t wrap_a( int16_t val, int16_t min_val, int16_t max_val ); +void ivas_SplitRenderer_getdiagdiff( + int16_t in_idx[BINAURAL_CHANNELS][BINAURAL_CHANNELS], + int16_t out_idx[BINAURAL_CHANNELS][BINAURAL_CHANNELS], + const int16_t sign, + const int16_t min_val, + const int16_t max_val ); +void ivas_split_rend_bitstream_write_int32( ivas_split_rend_bits_t *pBits, int32_t val, int32_t bits ); +int32_t ivas_split_rend_bitstream_read_int32( ivas_split_rend_bits_t *pBits, int32_t bits ); +IVAS_QUATERNION ivas_split_rend_get_sf_rot_data( + const IVAS_QUATERNION headPositions[RENDERER_HEAD_POSITIONS_PER_FRAME], + int16_t subframe_idx ); + +void ivas_rend_closeCldfbRend( CLDFB_REND_WRAPPER *pCldfbRend ); +int32_t ivas_get_lcld_bitrate( const int32_t SplitRendBitRate ); +int32_t ivas_get_split_rend_md_target_brate( const int32_t SplitRendBitRate, const int16_t pcm_out ); +#ifdef SPLIT_REND_LC3PLUS +#ifdef SPLIT_REND_TD_POSE_CORRECTION +int32_t ivas_get_max_td_pose_correction_bitrate( void ); +#endif +int32_t ivas_get_lc3plus_bitrate( const int32_t SplitRendBitRate +#ifdef SPLIT_REND_TD_POSE_CORRECTION + , + IVAS_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode +#endif +); +int8_t ivas_get_lc3plus_bitrate_id( const int32_t SplitRendBitRate ); +int32_t ivas_get_lc3plus_size_from_id( const int8_t SplitRendBitRateId +#ifdef SPLIT_REND_TD_POSE_CORRECTION + , + int16_t codec_mode +#endif +); +#endif +void ivas_split_rend_get_quant_params( + const int16_t num_md_bands, + int16_t pred_real_bands_yaw[IVAS_SPLIT_REND_NUM_QUANT_STRATS], + int16_t pred_imag_bands_yaw[IVAS_SPLIT_REND_NUM_QUANT_STRATS], + int16_t d_bands_yaw[IVAS_SPLIT_REND_NUM_QUANT_STRATS], + int16_t bands_pitch[IVAS_SPLIT_REND_NUM_QUANT_STRATS], + int16_t pred_real_bands_roll[IVAS_SPLIT_REND_NUM_QUANT_STRATS], + int16_t pred_imag_bands_roll[IVAS_SPLIT_REND_NUM_QUANT_STRATS], + int16_t *num_quant_strats, + int16_t *num_complex_bands ); +#endif + +ivas_error ivas_rend_crendProcess( + const CREND_WRAPPER *pCrend, + const AUDIO_CONFIG inConfig, + const AUDIO_CONFIG outConfig, + DECODER_CONFIG_HANDLE hDecoderConfig, + HEAD_TRACK_DATA_HANDLE hHeadTrackData, + IVAS_OUTPUT_SETUP_HANDLE hIntSetup, + EFAP_HANDLE hEFAPdata, + float output[][L_FRAME48k], /* i/o: input/output audio channels */ + const int32_t output_Fs +#ifdef SPLIT_REND_WITH_HEAD_ROT + , + const int16_t pos_idx +#endif +); + + + + +ivas_error ivas_crend_init_from_rom( + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +); + +ivas_error ivas_crend_open( + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +); + +ivas_error ivas_crend_close( + Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */ +); + +ivas_error ivas_crend_process( + Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ + float output[][L_FRAME48k] /* i/o: input/output audio channels */ +); + +/*----------------------------------------------------------------------------------* + * Reverberator + *----------------------------------------------------------------------------------*/ + +ivas_error ivas_binaural_reverb_open( + REVERB_STRUCT_HANDLE *hReverbPr, /* i/o: binaural reverb handle */ + const int16_t numBins, /* i : number of CLDFB bins */ + const int16_t numCldfbSlotsPerFrame, /* i : number of CLDFB slots per frame */ + ivas_roomAcoustics_t *roomAcoustics, /* i/o: room acoustics parameters */ + const AUDIO_CONFIG output_config, /* i : output audio configuration */ + const int32_t sampling_rate, /* i : sampling rate */ + const RENDERER_TYPE renderer_type, /* i : renderer type */ + const HRTFS_FASTCONV_HANDLE hHrtfFastConv, /* i : FastConv HRTF handle */ + const HRTFS_PARAMBIN_HANDLE hHrtfParambin /* i : Parametric binauralizer HRTF handle */ +); + +void ivas_binaural_reverb_close( + REVERB_STRUCT_HANDLE *hReverb /* i/o: binaural reverb handle */ +); + +void ivas_binaural_reverb_processFrame( + REVERB_STRUCT_HANDLE hReverb, /* i/o: binaural reverb handle */ + const int16_t numInChannels, /* i : num input channels to be processed */ + float inReal[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : input CLDFB data real */ + float inImag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : input CLDFB data imag */ + float outReal[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : output CLDFB data real */ + float outImag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : output CLDFB data imag */ + const uint8_t offsetSamplesIO /* i : number of offset samples */ +); + +ivas_error ivas_reverb_open( + REVERB_HANDLE *hReverb, /* i/o: Reverberator handle */ + const AUDIO_CONFIG input_audio_config, /* i : reverb. input audio configuration */ + const HRTFS_HANDLE hHrtf, /* i : HRTF handle */ + RENDER_CONFIG_DATA *pConfig, /* i : Reverb configuration */ + const int32_t output_Fs /* i : output sampling rate */ +); + +void ivas_reverb_close( + REVERB_HANDLE *hReverb /* i/o: Reverberator handle */ +); + +ivas_error ivas_reverb_process( + const REVERB_HANDLE hReverb, /* i : Reverberator handle */ + const AUDIO_CONFIG input_audio_config, /* i : reverb. input audio configuration */ + const int16_t mix_signals, /* i : add reverb to output signal */ + float pcm_in[][L_FRAME48k], /* i : the PCM audio to apply reverb on */ + float pcm_out[][L_FRAME48k], /* o : the PCM audio with reverb applied */ + const int16_t i_ts /* i : subframe index */ +); + +void ivas_rev_delay_line_init( + ivas_rev_delay_line_t *pDelay, /* o : the delay line to initialize */ + float *memory_buffer, /* i : the memory buffer to use for the delay line */ + const uint16_t delay, /* i : the delay */ + const uint16_t maxdelay /* i : maximum delay to be supported */ +); + +/* !r: sample gotten out of delay line, and amplified by set gain */ +float ivas_rev_delay_line_get_sample( + ivas_rev_delay_line_t *pDelay /* i/o: the delay line */ +); + +void ivas_rev_delay_line_feed_sample( + ivas_rev_delay_line_t *pDelay, /* i : the delay line */ + float input /* i : the sample to feed */ +); + +void ivas_rev_delay_line_get_sample_blk( + ivas_rev_delay_line_t *pDelay, /* i : the delay line */ + const uint16_t blk_size, /* i : number of samples in the data block */ + float *output /* i/o: amples gotten out of delay line, and amplified by set gainin */ +); + +void ivas_rev_delay_line_feed_sample_blk( + ivas_rev_delay_line_t *pDelay, /* i/o: the delay line */ + const uint16_t blk_size, /* i : number of samples in the input data block */ + float *input /* i : the samples to feed */ +); + +void ivas_reverb_iir_filt_init( + ivas_rev_iir_filter_t *iirFilter, /* o : IIR filter */ + const uint16_t maxTaps /* i : maximum number of filter taps */ +); + +void ivas_reverb_iir_filt_set( + ivas_rev_iir_filter_t *iirFilter, /* i/o: IIR filter */ + uint16_t nr_taps, /* i : number of IIR filter taps */ + const float *coefA, /* i : A filter coefficients to set */ + const float *coefB /* i : the B filter coefficients to set */ +); + +void ivas_reverb_iir_filt_2taps_feed_blk( + ivas_rev_iir_filter_t *iirFilter, /* i/o: IIR filter */ + const uint16_t blk_size, /* i : size */ + const float *input, /* i : input buffer */ + float *output /* i : output buffer */ +); + +uint16_t int_log2( + uint32_t powerOf2 +); + +int16_t ivas_reverb_t2f_f2t_init( + ivas_reverb_t2f_f2t_t *t2f_f2t, + const int16_t fft_size, + const int16_t block_size +); + +void ivas_reverb_t2f_f2t_ClearHistory( + ivas_reverb_t2f_f2t_t *t2f_f2t +); + +void ivas_reverb_t2f_f2t_in( + ivas_reverb_t2f_f2t_t *t2f_f2t, + float *input_L, + float *input_R, float *buffer_L, + float *buffer_R +); + +void ivas_reverb_t2f_f2t_out( + ivas_reverb_t2f_f2t_t *t2f_f2t, + float *buffer_L, + float *buffer_R, + float *output_L, + float *output_R +); + +int16_t ivas_reverb_fft_filter_init( + ivas_reverb_fft_filter_t *fft_filter, + const int16_t fft_size +); + +void ivas_reverb_fft_filter_ComplexMul( + ivas_reverb_fft_filter_t *fft_filter, + float *buffer +); + +void ivas_reverb_fft_filter_CrossMix( + float *buffer0, + float *buffer1, + const int16_t fft_size +); + +void ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( + rv_fftwf_type_complex *spectrum, + float *fft_real, + const int16_t fft_size +); + +void ivas_reverb_define_window_fft( + float *pWindow, + const int16_t transitionStart, + const int16_t transitionLength, + const int16_t spectrumLength +); + +int16_t ivas_reverb_calc_color_filters( + const float *pTargetL, + const float *pTargetR, + const float *pWindow, + const int16_t fft_size, + const float delay, + rv_fftwf_type_complex *pBeqL, + rv_fftwf_type_complex *pBeqR +); + +int16_t ivas_reverb_calc_correl_filters( + const float *pTargetICC, + const float *pWindow, + const int16_t fft_size, + const float delay, + rv_fftwf_type_complex *pU, + rv_fftwf_type_complex *pV +); + +void ivas_reverb_calc_color_levels( + const int32_t output_Fs, + const int16_t freq_count, + const int16_t loop_count, + const float *pFc, + const float *pAcoustic_dsr, + const float *pHrtf_avg_pwr_L, + const float *pHrtf_avg_pwr_R, + const int16_t *pLoop_delays, + const float *pT60_filter_coeff, + float *pTarget_color_L, + float *pTarget_color_R +); + +void ivas_reverb_prepare_cldfb_params( + ivas_roomAcoustics_t *pInput_params, + const HRTFS_FASTCONV_HANDLE hHrtfFastConv, + const AUDIO_CONFIG input_audio_config, + const int16_t use_brir, + const int32_t output_Fs, + float *pOutput_t60, + float *pOutput_ene ); + +void ivas_reverb_interpolate_acoustic_data( + const int16_t input_table_size, + const float *pInput_fc, + const float *pInput_t60, + const float *pInput_dsrR, + const int16_t output_table_size, + const float *pOutput_fc, + float *pOutput_t60, + float *pOutput_dsr +); + +void ivas_reverb_get_hrtf_set_properties( + float **ppHrtf_set_L_re, + float **ppHrtf_set_L_im, + float **ppHrtf_set_R_re, + float **ppHrtf_set_R_im, + const AUDIO_CONFIG input_audio_config, + const int16_t hrtf_count, + const int16_t in_freq_count, + const int16_t out_freq_count, + float *pOut_avg_pwr_L, + float *pOut_avg_pwr_R, + float *pOut_i_a_coherence +); + + +/*---------------------------------------------------------------------------------* + * Rotation Prototypes + *-----------------------------------------------------------------------------------*/ + +ivas_error ivas_headTrack_open( + HEAD_TRACK_DATA_HANDLE *hHeadTrackData /* o : head track handle */ +); + +void ivas_headTrack_close( + HEAD_TRACK_DATA_HANDLE *hHeadTrackData /* i/o: head track handle */ +); + +void Euler2Quat( + const float yaw, /* i : yaw (x) */ + const float pitch, /* i : pitch (y) */ + const float roll, /* i : roll (z) */ + IVAS_QUATERNION *quat /* o : quaternion describing the rotation */ +); + +float deg2rad( float degrees ); + + + +void QuatToRotMat( + const IVAS_QUATERNION quat, /* i : quaternion describing the rotation */ + float Rmat[3][3] /* o : real-space rotation matrix for this rotation */ +); + +#ifdef SPLIT_REND_WITH_HEAD_ROT +void Quat2EulerDegree( + const IVAS_QUATERNION quat, /* i : quaternion describing the rotation */ + float *yaw, /* o : yaw */ + float *pitch, /* o : pitch */ + float *roll /* o : roll */ +); +#endif + +void rotateAziEle( + float azi_in, /* i : output elevation */ + float ele_in, /* i : input elevation */ + int16_t *azi, /* o : rotated azimuth */ + int16_t *ele, /* o : rotated elevation */ + float Rmat[3][3], /* i : real-space rotation matrix */ + const int16_t isPlanar /* i : is roation planar and elevation meaningless? */ +); + +void SHrotmatgen( + float SHrotmat[SBA_NHARM_HOA3][SBA_NHARM_HOA3], /* o : SHD rotation matrix */ + float Rmat[3][3], /* i : real-space rotation matrix */ + const int16_t order /* i : ambisonics order */ +); + +void rotateFrame_shd( + HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i : head track handle */ + float output[][L_FRAME48k], /* i/o: unrotated HOA3 signal buffer in TD */ + const int16_t subframe_len, /* i : subframe length per channel */ + const IVAS_OUTPUT_SETUP hTransSetup, /* i : format for rotation */ + const int16_t subframe_idx /* i : subframe index */ +); + +void rotateFrame_sd( + HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i : head track handle */ + float output[][L_FRAME48k], /* i/o: unrotated SD signal buffer in TD */ + const int16_t subframe_len, /* i : subframe length per channel */ + const IVAS_OUTPUT_SETUP hTransSetup, /* i : format for rotation */ + const EFAP_HANDLE hEFAPdata, /* i : EFAP structure */ + const int16_t subframe_idx /* i : subframe index */ +); + +void rotateFrame_shd_cldfb( + float Cldfb_RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: unrotated HOA3 signal buffer in cldfb domain real part */ + float Cldfb_ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: unrotated HOA3 signal buffer in cldfb domain imag part */ + float Rmat[3][3], /* i : real-space rotation matrix */ + const int16_t nInChannels, /* i : number of channels */ + const int16_t shd_rot_max_order /* i : split-order rotation method */ +); + +void rotateFrame_sd_cldfb( + HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i : head track handle */ + float Cldfb_RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: unrotated HOA3 signal buffer in cldfb domain real part */ + float Cldfb_ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: unrotated HOA3 signal buffer in cldfb domain imag part */ + const IVAS_OUTPUT_SETUP_HANDLE hOutputSetup, /* i : output format setup number of channels */ + const EFAP_HANDLE hEFAPdata, /* i : EFAP structure */ + const int16_t nb_band /* i : number of CLDFB bands to process */ +); + + +/*----------------------------------------------------------------------------------* + * Renderer configuration + *----------------------------------------------------------------------------------*/ + +ivas_error ivas_render_config_open( + RENDER_CONFIG_HANDLE *hRenderConfig /* i/o: Renderer config handle */ +); + +void ivas_render_config_close( + RENDER_CONFIG_HANDLE *hRenderConfig /* i/o: Renderer config handle */ +); + +ivas_error ivas_render_config_init_from_rom( + RENDER_CONFIG_HANDLE *hRenderConfig, /* i/o: Renderer config handle */ + const int16_t room_flag_on /* i : room effect on/off flag */ +); + + +/*----------------------------------------------------------------------------------* + * Orientation tracking + *----------------------------------------------------------------------------------*/ + +ivas_error ivas_orient_trk_Init( + ivas_orient_trk_state_t *pOTR /* i/o: orientation tracker handle */ +); + +ivas_error ivas_orient_trk_SetTrackingType( + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + const OTR_TRACKING_T trackingType /* i : orientation tracking type */ +); + +ivas_error ivas_orient_trk_SetReferenceRotation( + ivas_orient_trk_state_t *pOTR, /* i/o: orientatoin trakcer handle */ + const IVAS_QUATERNION refRot /* i : reference rotation */ +); + +ivas_error ivas_orient_trk_SetReferenceVector( + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + const IVAS_VECTOR3 listenerPos, /* i : Listener position */ + const IVAS_VECTOR3 refPos /* i : Reference position */ +); + +ivas_error ivas_orient_trk_GetMainOrientation( + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + IVAS_QUATERNION *pOrientation /* i/o: average/reference orientation */ +); + +ivas_error ivas_orient_trk_GetTrackedRotation( + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + IVAS_QUATERNION *pRotation /* i/o: processed rotation */ +); + +ivas_error ivas_orient_trk_Process( + ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */ + IVAS_QUATERNION absRot, /* i : absolute head rotation */ + float updateRate, /* i : rotation update rate [Hz] */ + IVAS_QUATERNION *pTrkRot /* o : tracked rotation */ +); + +#ifdef SPLIT_REND_WITH_HEAD_ROT + +/*----------------------------------------------------------------------------------* + * Split renderer prototypes + *----------------------------------------------------------------------------------*/ + +void ivas_set_split_rend_setup( + IVAS_DEC_SPLIT_REND_WRAPPER *hSplitBinRend, + IVAS_SPLIT_REND_CONFIG_DATA *hSplitBinConfig, + HEAD_TRACK_DATA_HANDLE hHeadTrackData, + IVAS_SPLIT_REND_BITS_HANDLE hSplitRendBits ); + +void ivas_init_split_rend_handles( + SPLIT_REND_WRAPPER *hSplitRendWrapper ); +void ivas_init_split_post_rend_handles( + SPLIT_POST_REND_WRAPPER *hSplitRendWrapper ); + +ivas_error ivas_split_renderer_open( SPLIT_REND_WRAPPER *hSplitBinRend, + const IVAS_SPLIT_REND_CONFIG_DATA *pSplitRendConfig, + const int32_t output_Fs, +#ifdef SPLIT_REND_LC3PLUS + const uint8_t useLc3plus, +#endif + const int16_t is_cldfb_in, + const int16_t is_pcm_out); + +void ivas_split_renderer_close( + SPLIT_REND_WRAPPER *hSplitBinRend); + +ivas_error ivas_splitBinLCLDEncOpen( + BIN_HR_SPLIT_LCLD_ENC_HANDLE *hSplitBinLCLDEnc, + int32_t iSampleRate, + int32_t iChannels, + int32_t iDataRate ); + +void ivas_splitBinLCLDEncClose( + BIN_HR_SPLIT_LCLD_ENC_HANDLE *hSplitBinLCLDEnc ); + +void ivas_splitBinLCLDEncProcess( + BIN_HR_SPLIT_LCLD_ENC_HANDLE hSplitBinLCLDEnc, + float Cldfb_In_Real[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + float Cldfb_In_Imag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + const int32_t available_bits, + ivas_split_rend_bits_t *pBits ); + +ivas_error ivas_splitBinLCLDDecOpen( + BIN_HR_SPLIT_LCLD_DEC_HANDLE *hSplitBinLCLDDec, + int32_t iSampleRate, + int32_t iChannels ); + +void ivas_splitBinLCLDDecClose( + BIN_HR_SPLIT_LCLD_DEC_HANDLE *hSplitBinLCLDDec ); + +void ivas_splitBinLCLDDecProcess( + BIN_HR_SPLIT_LCLD_DEC_HANDLE hSplitBinLCLDDec, + ivas_split_rend_bits_t *pBits, + float Cldfb_Out_Real[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + float Cldfb_Out_Imag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX] +#ifdef SPLIT_REND_PLC + , + const int16_t bfi +#endif +); + +ivas_error ivas_splitBinPreRendOpen( + BIN_HR_SPLIT_PRE_REND_HANDLE *hBinHrSplitPreRend, + MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData +#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG + , + const int32_t output_Fs +#endif +); + +ivas_error ivas_splitBinPostRendOpen( + BIN_HR_SPLIT_POST_REND_HANDLE *hBinHrSplitPostRend, + MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, + const int32_t output_Fs +#ifndef SPLIT_REND_LC3PLUS + ,const int16_t is_cldfb_in +#endif +); + + +void ivas_init_multi_bin_pose_data( + MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData ); +void ivas_renderSplitGetMultiBinPoseData( + const IVAS_SPLIT_REND_CONFIG_DATA *pSplit_rend_config, + MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, + const IVAS_SPLIT_REND_ROT_AXIS rot_axis); + +#ifdef SPLIT_REND_TD_POSE_CORRECTION +void ivas_renderSplitUpdateTdCorrectionPoseData( + const IVAS_SPLIT_REND_CONFIG_DATA *pSplit_rend_config, + MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, + const IVAS_SPLIT_REND_ROT_AXIS rot_axis); +#endif + + +ivas_error ivas_renderMultiBinToSplitBinaural( + SPLIT_REND_WRAPPER *hSplitBin, + const IVAS_QUATERNION headPositions[MAX_PARAM_SPATIAL_SUBFRAMES], + const int32_t SplitRendBitRate, + ivas_split_rend_bits_t *pBits, + float Cldfb_In_BinReal[][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + float Cldfb_In_BinImag[][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + const int16_t max_bands, + float out[][L_FRAME48k], + const int16_t low_res_pre_rend_rot, + const int16_t pcm_out +); + +void ivas_rend_CldfbSplitPreRendProcess( + const BIN_HR_SPLIT_PRE_REND_HANDLE hBinHrSplitPreRend, + const IVAS_QUATERNION headPositions[MAX_PARAM_SPATIAL_SUBFRAMES], + MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, + float Cldfb_In_BinReal[][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + float Cldfb_In_BinImag[][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + ivas_split_rend_bits_t *pBits, + const int32_t target_md_bits, + const int16_t low_res_pre_rend_rot); + +void ivas_rend_CldfbSplitPostRendProcess( + BIN_HR_SPLIT_POST_REND_HANDLE hBinHrSplitPostRend, + MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, + const IVAS_QUATERNION QuaternionsPost[MAX_PARAM_SPATIAL_SUBFRAMES], + float Cldfb_RealBuffer_Binaural[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + float Cldfb_ImagBuffer_Binaural[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + float output[][L_FRAME48k], + const int16_t is_cldfb_in ); + +void ivas_splitBinPreRendClose( + BIN_HR_SPLIT_PRE_REND_HANDLE *hBinHrSplitPreRend ); + +void ivas_splitBinPostRendClose( + BIN_HR_SPLIT_POST_REND_HANDLE *hBinHrSplitPostRend ); + +void ivas_splitBinPostRendMdDec( + ivas_split_rend_bits_t *pBits, + BIN_HR_SPLIT_POST_REND_HANDLE hBinHrSplitPostRend, + MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData +#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG + ,BIN_HR_SPLIT_PRE_REND_HANDLE hBinHrSplitPreRend +#endif +); + +#ifdef SPLIT_REND_TD_POSE_CORRECTION +void ivas_rend_TdSplitPostRendProcess( + ivas_split_rend_bits_t *pBits, + IVAS_QUATERNION headPosition[MAX_PARAM_SPATIAL_SUBFRAMES], + MULTI_BIN_REND_POSE_DATA *multiBinPoseData ); +#endif + + +#ifdef SPLIT_REND_PLC +ivas_error ivas_splitBinRendPLCOpen( + SPLIT_REND_PLC_HANDLE* phSplitRendPLC +); + +void ivas_splitBinRendPLCClose(SPLIT_REND_PLC_HANDLE* phSplitRendPLC); + +void ivas_splitBinRendPLCsaveState( + SPLIT_REND_PLC_HANDLE hSplitRendPLC, + float Cldfb_RealBuffer_Binaural[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + float Cldfb_ImagBuffer_Binaural[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + const int16_t num_chs ); + +void ivas_splitBinRendPLC_xf( + SPLIT_REND_PLC_HANDLE hSplitRendPLC, + float Cldfb_RealBuffer_Binaural[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + float Cldfb_ImagBuffer_Binaural[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + const int16_t num_chs ); + +void ivas_splitBinRendPLC( + SPLIT_REND_PLC_HANDLE hSplitRendPLC, + float Cldfb_RealBuffer_Binaural[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + float Cldfb_ImagBuffer_Binaural[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + const int16_t num_chs ); +#endif + +#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG +void ivas_log_cldfb2wav_data( + float Cldfb_In_Real[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + float Cldfb_In_Imag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + HANDLE_CLDFB_FILTER_BANK *cldfbSyn, + const int16_t num_chs, + const int16_t num_freq_bands, + const int32_t output_Fs, + const int16_t start_slot_idx, + const int16_t md_band_idx, + const char *filename ); +#endif + +void ivas_SplitRenderer_GetRotMd( + BIN_HR_SPLIT_PRE_REND_HANDLE hBinHrSplitPreRend, /* i/o: binaural renderer handle */ + MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, + float Cldfb_RealBuffer_Ref_Binaural[][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : Reference Binaural signals */ + float Cldfb_ImagBuffer_Ref_Binaural[][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : Reference Binaural signals */ + int16_t low_res); + +void ivas_SplitRenderer_PostRenderer( + BIN_HR_SPLIT_POST_REND_HANDLE hBinPostRenderer, /* i/o: binaural renderer handle */ + MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, + float Cldfb_RealBuffer_Ref_Binaural[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o : Reference/out Binaural signals */ + float Cldfb_ImagBuffer_Ref_Binaural[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o : Reference/out Binaural signals */ + const IVAS_QUATERNION Quaternions_act[MAX_PARAM_SPATIAL_SUBFRAMES]); + +#endif + +/* clang-format on */ + +#endif /* IVAS_PROT_REND_H */ diff --git a/lib_rend/ivas_render_config.c b/lib_rend/ivas_render_config.c index b3089e2ec5..1a623d3d25 100644 --- a/lib_rend/ivas_render_config.c +++ b/lib_rend/ivas_render_config.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,13 +33,21 @@ #include #include "options.h" #include "prot.h" -#include "ivas_prot.h" +#include "ivas_prot_rend.h" #include "ivas_rom_rend.h" #include "ivas_rom_TdBinauralRenderer.h" #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" + + +/*-----------------------------------------------------------------------* + * Local constants + *-----------------------------------------------------------------------*/ + +#define IVAS_REVERB_DEFAULT_PRE_DELAY 0.016f +#define IVAS_REVERB_DEFAULT_INPUT_DELAY 0.1f /*-----------------------------------------------------------------------* @@ -53,8 +61,7 @@ ivas_error ivas_render_config_open( ) { /* Allocate HR filter set for headphones configuration */ - *hRenderConfig = (RENDER_CONFIG_HANDLE) count_malloc( sizeof( RENDER_CONFIG_DATA ) ); - if ( *hRenderConfig == NULL ) + if ( ( *hRenderConfig = (RENDER_CONFIG_HANDLE) malloc( sizeof( RENDER_CONFIG_DATA ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for renderer configuration!" ); } @@ -78,7 +85,7 @@ void ivas_render_config_close( return; } - count_free( *hRenderConfig ); + free( *hRenderConfig ); *hRenderConfig = NULL; return; @@ -96,6 +103,7 @@ ivas_error ivas_render_config_init_from_rom( const int16_t room_flag_on /* i : room effect on/off flag */ ) { + if ( hRenderConfig == NULL || *hRenderConfig == NULL ) { return IVAS_ERROR( IVAS_ERR_UNEXPECTED_NULL_POINTER, "Unexpected null pointer while attempting to fill renderer configuration from ROM" ); @@ -104,7 +112,7 @@ ivas_error ivas_render_config_init_from_rom( #if ( defined DEBUGGING ) || ( defined SPLIT_REND_WITH_HEAD_ROT ) ( *hRenderConfig )->renderer_type_override = RENDER_TYPE_OVERRIDE_NONE; #endif - ( *hRenderConfig )->roomAcoustics.override = false; + ( *hRenderConfig )->roomAcoustics.override = FALSE; ( *hRenderConfig )->roomAcoustics.use_brir = room_flag_on; ( *hRenderConfig )->roomAcoustics.late_reverb_on = room_flag_on; ( *hRenderConfig )->roomAcoustics.nBands = IVAS_REVERB_DEFAULT_N_BANDS; @@ -118,6 +126,9 @@ ivas_error ivas_render_config_init_from_rom( mvr2r( ivas_reverb_default_RT60, ( *hRenderConfig )->roomAcoustics.pAcoustic_rt60, IVAS_REVERB_DEFAULT_N_BANDS ); mvr2r( ivas_reverb_default_DSR, ( *hRenderConfig )->roomAcoustics.pAcoustic_dsr, IVAS_REVERB_DEFAULT_N_BANDS ); + ( *hRenderConfig )->directivity[0] = 360.0f; /* Front cone */ + ( *hRenderConfig )->directivity[1] = 360.0f; /* Back cone */ + ( *hRenderConfig )->directivity[2] = 1.0f; /* Back attenuation */ #ifdef SPLIT_REND_WITH_HEAD_ROT ( *hRenderConfig )->split_rend_config.splitRendBitRate = SPLIT_REND_768k; ( *hRenderConfig )->split_rend_config.dof = 3; diff --git a/lib_rend/ivas_reverb.c b/lib_rend/ivas_reverb.c index 22265c03c1..65a7c60ed9 100644 --- a/lib_rend/ivas_reverb.c +++ b/lib_rend/ivas_reverb.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,7 +33,7 @@ #include #include "options.h" #include "prot.h" -#include "ivas_prot.h" +#include "ivas_prot_rend.h" #include "ivas_cnst.h" #ifdef DEBUGGING #include "debug.h" @@ -41,7 +41,20 @@ #include "math.h" #include "ivas_rom_rend.h" #include -#include "wmops.h" +#include "wmc_auto.h" + + +/* The reverberator structure implemented here is described in detail in: + * Vilkamo, J., Neugebauer, B., & Plogsties, J. (2012). Sparse frequency-domain reverberator. + * Journal of the Audio Engineering Society, 59(12), 936-943. */ + +/*------------------------------------------------------------------------- + * Local constants + *------------------------------------------------------------------------*/ + +#define BIN_REND_RANDOM_SEED 1 /* random seed for generating reverb decorrelators */ + +#define CLDFB_SLOTS_PER_SECOND 800 /* Used for initializing reverb */ /*------------------------------------------------------------------------------------------* @@ -117,6 +130,151 @@ typedef struct ivas_reverb_params_t static ivas_error calc_jot_t60_coeffs( float *pH_dB, const uint16_t nrFrequencies, float *pFrequencies, float *pCoeffA, float *pCoeffB, const float fNyquist ); +/*------------------------------------------------------------------------- + * binRend_rand() + * + * + *------------------------------------------------------------------------*/ + +static uint16_t binRend_rand( + REVERB_STRUCT_HANDLE hReverb /* i/o: binaural reverb handle */ +) +{ + hReverb->binRend_RandNext = hReverb->binRend_RandNext * 1103515245 + 12345; + + return (uint16_t) ( hReverb->binRend_RandNext / 65536 ) % 32768; +} + + +/*------------------------------------------------------------------------- + * ivas_binaural_reverb_setPreDelay() + * + * + *------------------------------------------------------------------------*/ + +static void ivas_binaural_reverb_setPreDelay( + REVERB_STRUCT_HANDLE hReverb, /* i/o: binaural reverb handle */ + const int16_t delaySamples /* i : reverb pre-delay in CLDFB slots */ +) +{ + if ( delaySamples < 1 ) + { + hReverb->preDelayBufferLength = 1; + + return; + } + + if ( delaySamples > REVERB_PREDELAY_MAX ) + { + hReverb->preDelayBufferLength = REVERB_PREDELAY_MAX; + + return; + } + + hReverb->preDelayBufferLength = delaySamples; + + return; +} + + +/*------------------------------------------------------------------------- + * ivas_binaural_reverb_setReverbTimes() + * + * + *------------------------------------------------------------------------*/ + +static void ivas_binaural_reverb_setReverbTimes( + REVERB_STRUCT_HANDLE hReverb, /* i/o: binaural reverb handle */ + const int32_t output_Fs, /* i : sampling_rate */ + const float *revTimes, /* i : reverberation times T60 for each CLDFB bin in seconds */ + const float *revEnes /* i : spectrum for reverberated sound at each CLDFB bin */ +) +{ + int16_t bin, ch, tap, sample; + float binCenterFreq, diffuseFieldICC, tmpVal, attenuationFactorPerSample; + float intendedEnergy, actualizedEnergy, energyBuildup, currentEnergy, attenuationFactorPerSampleSq; + + hReverb->binRend_RandNext = (uint16_t) BIN_REND_RANDOM_SEED; + hReverb->highestBinauralCoherenceBin = 0; + for ( bin = 0; bin < hReverb->numBins; bin++ ) + { + /* Determine the diffuse field binaural coherence */ + binCenterFreq = ( (float) bin + 0.5f ) / ( (float) hReverb->numBins ) * ( (float) output_Fs ) / 2.0f; + if ( bin == 0 ) + { + diffuseFieldICC = 1.0f; + } + else if ( binCenterFreq < 2700.0f ) + { + diffuseFieldICC = sinf( EVS_PI * binCenterFreq / 550.0f + 1e-20f ) / ( EVS_PI * binCenterFreq / 550.0f + 1e-20f ) * ( 1.0f - binCenterFreq / 2700.0f ); + hReverb->highestBinauralCoherenceBin = bin; + } + else + { + diffuseFieldICC = 0.0f; + } + + /* Mixing gains to generate a diffuse-binaural sound based on incoherent sound */ + tmpVal = ( 1.0f - sqrtf( 1.0f - powf( diffuseFieldICC, 2.0 ) ) ) / 2.0f; + if ( diffuseFieldICC > 0 ) + { + hReverb->binauralCoherenceCrossmixGains[bin] = sqrtf( fabsf( tmpVal ) ); + } + else + { + hReverb->binauralCoherenceCrossmixGains[bin] = -sqrtf( fabsf( tmpVal ) ); + } + hReverb->binauralCoherenceDirectGains[bin] = sqrtf( 1.0f - fabsf( tmpVal ) ); + + /* Determine attenuation factor that generates the appropriate energy decay according to reverberation time */ + attenuationFactorPerSample = powf( 10.0f, -3.0f * ( 1.0f / ( (float) CLDFB_SLOTS_PER_SECOND * revTimes[bin] ) ) ); + hReverb->loopAttenuationFactor[bin] = powf( attenuationFactorPerSample, hReverb->loopBufLength[bin] ); + attenuationFactorPerSampleSq = attenuationFactorPerSample * attenuationFactorPerSample; + + /* Design sparse decorrelation filters. The decorrelation filters, due to random procedures involved, + * may affect the spectrum of the output. The spectral effect is therefore monitored and compensated for. */ + intendedEnergy = 0.0f; + actualizedEnergy = 0.0f; + + for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) + { + energyBuildup = 0.0f; + currentEnergy = 1.0f; + tap = 0; + + for ( sample = 0; sample < hReverb->loopBufLength[bin]; sample++ ) + { + intendedEnergy += currentEnergy; + + /* The randomization at the energy build up affects where the sparse taps are located */ + energyBuildup += currentEnergy + 0.1f * ( (float) binRend_rand( hReverb ) / PCM16_TO_FLT_FAC - 0.5f ); + + if ( energyBuildup >= 1.0f ) /* A new filter tap is added at this condition */ + { + /* Four efficient phase operations: n*pi/2, n=0,1,2,3 */ + hReverb->tapPhaseShiftType[bin][ch][tap] = (int16_t) ( binRend_rand( hReverb ) % 4 ); + /* Set the tapPointer to point to the determined sample at the loop buffer */ + hReverb->tapPointersReal[bin][ch][tap] = &( hReverb->loopBufReal[bin][sample] ); + hReverb->tapPointersImag[bin][ch][tap] = &( hReverb->loopBufImag[bin][sample] ); + energyBuildup -= 1.0f; /* A tap is added, thus remove its energy from the buildup */ + tap++; + actualizedEnergy += 1.0f; + } + currentEnergy *= attenuationFactorPerSampleSq; + } + hReverb->taps[bin][ch] = tap; /* Number of taps determined at the above random procedure */ + } + + /* The decorrelator design and IIR attenuation rate affects the energy of reverb, which is compensated here */ + hReverb->reverbEqGains[bin] = sqrtf( revEnes[bin] ); /* Determined reverb spectrum */ + hReverb->reverbEqGains[bin] *= sqrtf( intendedEnergy / actualizedEnergy ); /* Correction of random effects at the decorrelator design */ + hReverb->reverbEqGains[bin] *= sqrtf( 0.5f * ( 1.0f - attenuationFactorPerSampleSq ) ); /* Correction of IIR decay rate */ + } + + return; +} + + /*-----------------------------------------------------------------------------------------* * Function compute_feedback_matrix() * @@ -517,34 +675,34 @@ static ivas_error calc_jot_t60_coeffs( *-----------------------------------------------------------------------------------------*/ static ivas_error initialize_reverb_filters( - REVERB_HANDLE pState ) + REVERB_HANDLE hReverb ) { ivas_error error; error = IVAS_ERR_OK; /* init correlation and coloration filters */ - if ( ( error = ivas_reverb_t2f_f2t_init( &pState->fft_filter_ols, pState->fft_size, pState->fft_subblock_size ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_reverb_t2f_f2t_init( &hReverb->fft_filter_ols, hReverb->fft_size, hReverb->fft_subblock_size ) ) != IVAS_ERR_OK ) { return error; } - if ( ( error = ivas_reverb_fft_filter_init( &pState->fft_filter_correl_0, pState->fft_size ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_reverb_fft_filter_init( &hReverb->fft_filter_correl_0, hReverb->fft_size ) ) != IVAS_ERR_OK ) { return error; } - if ( ( error = ivas_reverb_fft_filter_init( &pState->fft_filter_correl_1, pState->fft_size ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_reverb_fft_filter_init( &hReverb->fft_filter_correl_1, hReverb->fft_size ) ) != IVAS_ERR_OK ) { return error; } - if ( ( error = ivas_reverb_fft_filter_init( &pState->fft_filter_color_0, pState->fft_size ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_reverb_fft_filter_init( &hReverb->fft_filter_color_0, hReverb->fft_size ) ) != IVAS_ERR_OK ) { return error; } - if ( ( error = ivas_reverb_fft_filter_init( &pState->fft_filter_color_1, pState->fft_size ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_reverb_fft_filter_init( &hReverb->fft_filter_color_1, hReverb->fft_size ) ) != IVAS_ERR_OK ) { return error; } @@ -560,13 +718,13 @@ static ivas_error initialize_reverb_filters( *-----------------------------------------------------------------------------------------*/ static ivas_error set_t60_filter( - REVERB_HANDLE pState, + REVERB_HANDLE hReverb, const uint16_t branch, const uint16_t nr_taps, const float coefA[], const float coefB[] ) { - if ( branch >= pState->nr_of_branches ) + if ( branch >= hReverb->nr_of_branches ) { return IVAS_ERR_INTERNAL; } @@ -576,7 +734,7 @@ static ivas_error set_t60_filter( return IVAS_ERR_INTERNAL; } - ivas_reverb_iir_filt_set( &( pState->t60[branch] ), nr_taps, coefA, coefB ); + ivas_reverb_iir_filt_set( &( hReverb->t60[branch] ), nr_taps, coefA, coefB ); return IVAS_ERR_OK; } @@ -589,16 +747,16 @@ static ivas_error set_t60_filter( *-----------------------------------------------------------------------------------------*/ static ivas_error set_feedback_delay( - REVERB_HANDLE pState, + REVERB_HANDLE hReverb, const uint16_t branch, const int16_t fb_delay ) { - if ( branch >= pState->nr_of_branches ) + if ( branch >= hReverb->nr_of_branches ) { return IVAS_ERR_INTERNAL; } - pState->delay_line[branch].Delay = fb_delay; + hReverb->delay_line[branch].Delay = fb_delay; return IVAS_ERR_OK; } @@ -611,19 +769,19 @@ static ivas_error set_feedback_delay( *-----------------------------------------------------------------------------------------*/ static ivas_error set_feedback_gain( - REVERB_HANDLE pState, + REVERB_HANDLE hReverb, const uint16_t branch, const float *pGain ) { uint16_t gain_idx; - if ( branch >= pState->nr_of_branches ) + if ( branch >= hReverb->nr_of_branches ) { return IVAS_ERR_INTERNAL; } - for ( gain_idx = 0; gain_idx < pState->nr_of_branches; gain_idx++ ) + for ( gain_idx = 0; gain_idx < hReverb->nr_of_branches; gain_idx++ ) { - pState->gain_matrix[branch][gain_idx] = pGain[gain_idx]; + hReverb->gain_matrix[branch][gain_idx] = pGain[gain_idx]; } return IVAS_ERR_OK; @@ -637,7 +795,7 @@ static ivas_error set_feedback_gain( *-----------------------------------------------------------------------------------------*/ static ivas_error set_correl_fft_filter( - REVERB_HANDLE pState, + REVERB_HANDLE hReverb, const uint16_t channel, rv_fftwf_type_complex *pSpectrum ) { @@ -648,11 +806,11 @@ static ivas_error set_correl_fft_filter( if ( channel == 0 ) { - ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, pState->fft_filter_correl_0.fft_spectrum, pState->fft_filter_correl_0.fft_size ); + ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, hReverb->fft_filter_correl_0.fft_spectrum, hReverb->fft_filter_correl_0.fft_size ); } else { - ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, pState->fft_filter_correl_1.fft_spectrum, pState->fft_filter_correl_1.fft_size ); + ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, hReverb->fft_filter_correl_1.fft_spectrum, hReverb->fft_filter_correl_1.fft_size ); } return IVAS_ERR_OK; @@ -666,7 +824,7 @@ static ivas_error set_correl_fft_filter( *-----------------------------------------------------------------------------------------*/ static ivas_error set_color_fft_filter( - REVERB_HANDLE pState, + REVERB_HANDLE hReverb, const uint16_t channel, rv_fftwf_type_complex *pSpectrum ) { @@ -677,11 +835,11 @@ static ivas_error set_color_fft_filter( if ( channel == 0 ) { - ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, pState->fft_filter_color_0.fft_spectrum, pState->fft_filter_color_0.fft_size ); + ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, hReverb->fft_filter_color_0.fft_spectrum, hReverb->fft_filter_color_0.fft_size ); } else { - ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, pState->fft_filter_color_1.fft_spectrum, pState->fft_filter_color_1.fft_size ); + ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, hReverb->fft_filter_color_1.fft_spectrum, hReverb->fft_filter_color_1.fft_size ); } return IVAS_ERR_OK; @@ -695,7 +853,7 @@ static ivas_error set_color_fft_filter( *-----------------------------------------------------------------------------------------*/ static ivas_error set_mixer_level( - REVERB_HANDLE pState, + REVERB_HANDLE hReverb, const uint16_t channel, const float level[] ) { @@ -705,9 +863,9 @@ static ivas_error set_mixer_level( return IVAS_ERR_INTERNAL; } - for ( branch_idx = 0; branch_idx < pState->nr_of_branches; branch_idx++ ) + for ( branch_idx = 0; branch_idx < hReverb->nr_of_branches; branch_idx++ ) { - pState->mixer[channel][branch_idx] = level[branch_idx]; + hReverb->mixer[channel][branch_idx] = level[branch_idx]; } return IVAS_ERR_OK; @@ -721,7 +879,7 @@ static ivas_error set_mixer_level( *-----------------------------------------------------------------------------------------*/ static void clear_buffers( - REVERB_HANDLE pState ) + REVERB_HANDLE hReverb ) { int16_t branch_idx; ivas_rev_iir_filter_t *iirFilter; @@ -729,15 +887,15 @@ static void clear_buffers( for ( branch_idx = 0; branch_idx < IVAS_REV_MAX_NR_BRANCHES; branch_idx++ ) { - delay_line = &( pState->delay_line[branch_idx] ); + delay_line = &( hReverb->delay_line[branch_idx] ); set_f( delay_line->pBuffer, 0, delay_line->MaxDelay ); delay_line->BufferPos = 0; - iirFilter = &( pState->t60[branch_idx] ); + iirFilter = &( hReverb->t60[branch_idx] ); set_f( iirFilter->pBuffer, 0, iirFilter->MaxTaps ); } - ivas_reverb_t2f_f2t_ClearHistory( &pState->fft_filter_ols ); + ivas_reverb_t2f_f2t_ClearHistory( &hReverb->fft_filter_ols ); return; } @@ -750,31 +908,31 @@ static void clear_buffers( *-----------------------------------------------------------------------------------------*/ static void set_fft_and_datablock_sizes( - REVERB_HANDLE pState, + REVERB_HANDLE hReverb, const int16_t subframe_len ) { - pState->full_block_size = subframe_len; + hReverb->full_block_size = subframe_len; if ( subframe_len == L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES ) { - pState->fft_size = IVAS_REVERB_FFT_SIZE_48K; - pState->num_fft_subblocks = IVAS_REVERB_FFT_N_SUBBLOCKS_48K; + hReverb->fft_size = IVAS_REVERB_FFT_SIZE_48K; + hReverb->num_fft_subblocks = IVAS_REVERB_FFT_N_SUBBLOCKS_48K; } else if ( subframe_len == L_FRAME32k / MAX_PARAM_SPATIAL_SUBFRAMES ) { - pState->fft_size = IVAS_REVERB_FFT_SIZE_32K; - pState->num_fft_subblocks = IVAS_REVERB_FFT_N_SUBBLOCKS_32K; + hReverb->fft_size = IVAS_REVERB_FFT_SIZE_32K; + hReverb->num_fft_subblocks = IVAS_REVERB_FFT_N_SUBBLOCKS_32K; } else if ( subframe_len == L_FRAME16k / MAX_PARAM_SPATIAL_SUBFRAMES ) { - pState->fft_size = IVAS_REVERB_FFT_SIZE_16K; - pState->num_fft_subblocks = IVAS_REVERB_FFT_N_SUBBLOCKS_16K; + hReverb->fft_size = IVAS_REVERB_FFT_SIZE_16K; + hReverb->num_fft_subblocks = IVAS_REVERB_FFT_N_SUBBLOCKS_16K; } else { assert( 0 ); /* unsupported block size */ } - pState->fft_subblock_size = subframe_len / pState->num_fft_subblocks; + hReverb->fft_subblock_size = subframe_len / hReverb->num_fft_subblocks; return; } @@ -872,7 +1030,7 @@ static void set_reverb_acoustic_data( *-----------------------------------------------------------------------------------------*/ static ivas_error setup_FDN_branches( - REVERB_HANDLE pState, + REVERB_HANDLE hReverb, ivas_reverb_params_t *pParams ) { int16_t nr_coefs, branch_idx, channel_idx; @@ -883,12 +1041,12 @@ static ivas_error setup_FDN_branches( /* initialize feedback branches */ for ( branch_idx = 0; branch_idx < IVAS_REV_MAX_NR_BRANCHES; branch_idx++ ) { - ivas_rev_delay_line_init( &( pState->delay_line[branch_idx] ), pState->loop_delay_buffer[branch_idx], init_loop_delay[branch_idx], pParams->pLoop_delays[branch_idx] ); - ivas_reverb_iir_filt_init( &( pState->t60[branch_idx] ), IVAS_REV_MAX_IIR_FILTER_LENGTH ); - pState->mixer[0][branch_idx] = 0.0f; - pState->mixer[1][branch_idx] = 0.0f; + ivas_rev_delay_line_init( &( hReverb->delay_line[branch_idx] ), hReverb->loop_delay_buffer[branch_idx], init_loop_delay[branch_idx], pParams->pLoop_delays[branch_idx] ); + ivas_reverb_iir_filt_init( &( hReverb->t60[branch_idx] ), IVAS_REV_MAX_IIR_FILTER_LENGTH ); + hReverb->mixer[0][branch_idx] = 0.0f; + hReverb->mixer[1][branch_idx] = 0.0f; } - clear_buffers( pState ); + clear_buffers( hReverb ); nr_coefs = pParams->t60_filter_order + 1; if ( IVAS_REV_MAX_IIR_FILTER_LENGTH < nr_coefs ) @@ -902,17 +1060,17 @@ static ivas_error setup_FDN_branches( pCoef_a = &pParams->pT60_filter_coeff[2 * nr_coefs * branch_idx + nr_coefs]; pCoef_b = &pParams->pT60_filter_coeff[2 * nr_coefs * branch_idx]; - if ( ( error = set_t60_filter( pState, branch_idx, nr_coefs, pCoef_a, pCoef_b ) ) != IVAS_ERR_OK ) + if ( ( error = set_t60_filter( hReverb, branch_idx, nr_coefs, pCoef_a, pCoef_b ) ) != IVAS_ERR_OK ) { return error; } - if ( ( error = set_feedback_delay( pState, branch_idx, pParams->pLoop_delays[branch_idx] ) ) != IVAS_ERR_OK ) + if ( ( error = set_feedback_delay( hReverb, branch_idx, pParams->pLoop_delays[branch_idx] ) ) != IVAS_ERR_OK ) { return error; } - if ( ( error = set_feedback_gain( pState, branch_idx, &( pParams->pLoop_feedback_matrix[branch_idx * pParams->nr_loops] ) ) ) != IVAS_ERR_OK ) + if ( ( error = set_feedback_gain( hReverb, branch_idx, &( pParams->pLoop_feedback_matrix[branch_idx * pParams->nr_loops] ) ) ) != IVAS_ERR_OK ) { return error; } @@ -921,7 +1079,7 @@ static ivas_error setup_FDN_branches( for ( channel_idx = 0; channel_idx < pParams->nr_outputs; channel_idx++ ) { - if ( ( error = set_mixer_level( pState, channel_idx, &( pParams->pLoop_extract_matrix[channel_idx * pParams->nr_loops] ) ) ) != IVAS_ERR_OK ) + if ( ( error = set_mixer_level( hReverb, channel_idx, &( pParams->pLoop_extract_matrix[channel_idx * pParams->nr_loops] ) ) ) != IVAS_ERR_OK ) { return error; } @@ -965,7 +1123,7 @@ ivas_error ivas_reverb_open( nr_fc_input = hRenderConfig->roomAcoustics.nBands; /* Allocate main reverb. handle */ - if ( ( pState = (REVERB_HANDLE) count_malloc( sizeof( REVERB_DATA ) ) ) == NULL ) + if ( ( pState = (REVERB_HANDLE) malloc( sizeof( REVERB_DATA ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend Reverberator " ); } @@ -978,14 +1136,14 @@ ivas_error ivas_reverb_open( /* Allocate memory for feedback delay lines */ for ( loop_idx = 0; loop_idx < IVAS_REV_MAX_NR_BRANCHES; loop_idx++ ) { - if ( ( pState->loop_delay_buffer[loop_idx] = (float *) count_malloc( params.pLoop_delays[loop_idx] * sizeof( float ) ) ) == NULL ) + if ( ( pState->loop_delay_buffer[loop_idx] = (float *) malloc( params.pLoop_delays[loop_idx] * sizeof( float ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CREND Reverberator" ); } } /* Allocate memory for the pre-delay delay line */ - if ( ( pState->pPredelay_buffer = (float *) count_malloc( output_frame * sizeof( float ) ) ) == NULL ) + if ( ( pState->pPredelay_buffer = (float *) malloc( output_frame * sizeof( float ) ) ) == NULL ) { return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CREND Reverberator" ); } @@ -1017,6 +1175,15 @@ ivas_error ivas_reverb_open( /* set up reverb acoustic data on the basis of HRTF data and renderer config */ set_reverb_acoustic_data( ¶ms, input_audio_config, hHrtf, &hRenderConfig->roomAcoustics, subframe_len, nr_fc_input, nr_fc_fft_filter ); + /* set reverb acoustic configuration based on renderer config */ +#ifdef DEBUGGING + pState->pConfig.renderer_type_override = hRenderConfig->renderer_type_override; +#endif + pState->pConfig.roomAcoustics.override = hRenderConfig->roomAcoustics.override; + pState->pConfig.roomAcoustics.use_brir = hRenderConfig->roomAcoustics.use_brir; + pState->pConfig.roomAcoustics.late_reverb_on = hRenderConfig->roomAcoustics.late_reverb_on; + pState->pConfig.roomAcoustics.nBands = hRenderConfig->roomAcoustics.nBands; + /* set up input downmix */ pState->dmx_gain = calc_dmx_gain(); @@ -1120,15 +1287,15 @@ void ivas_reverb_close( { if ( hReverb->loop_delay_buffer[loop_idx] != NULL ) { - count_free( hReverb->loop_delay_buffer[loop_idx] ); + free( hReverb->loop_delay_buffer[loop_idx] ); hReverb->loop_delay_buffer[loop_idx] = NULL; } } - count_free( hReverb->pPredelay_buffer ); + free( hReverb->pPredelay_buffer ); hReverb->pPredelay_buffer = NULL; - count_free( hReverb ); + free( hReverb ); hReverb = NULL; } @@ -1143,27 +1310,27 @@ void ivas_reverb_close( *-----------------------------------------------------------------------------------------*/ static void post_fft_filter( - REVERB_HANDLE pState, + REVERB_HANDLE hReverb, float *p0, float *p1, float *pBuffer_0, float *pBuffer_1 ) { - if ( pState->do_corr_filter ) + if ( hReverb->do_corr_filter ) { - ivas_reverb_t2f_f2t_in( &pState->fft_filter_ols, p0, p1, pBuffer_0, pBuffer_1 ); - ivas_reverb_fft_filter_ComplexMul( &pState->fft_filter_correl_0, pBuffer_0 ); - ivas_reverb_fft_filter_ComplexMul( &pState->fft_filter_correl_1, pBuffer_1 ); - ivas_reverb_fft_filter_CrossMix( pBuffer_0, pBuffer_1, pState->fft_filter_correl_0.fft_size ); + ivas_reverb_t2f_f2t_in( &hReverb->fft_filter_ols, p0, p1, pBuffer_0, pBuffer_1 ); + ivas_reverb_fft_filter_ComplexMul( &hReverb->fft_filter_correl_0, pBuffer_0 ); + ivas_reverb_fft_filter_ComplexMul( &hReverb->fft_filter_correl_1, pBuffer_1 ); + ivas_reverb_fft_filter_CrossMix( pBuffer_0, pBuffer_1, hReverb->fft_filter_correl_0.fft_size ); } else { - ivas_reverb_t2f_f2t_in( &pState->fft_filter_ols, p0, p1, pBuffer_0, pBuffer_1 ); + ivas_reverb_t2f_f2t_in( &hReverb->fft_filter_ols, p0, p1, pBuffer_0, pBuffer_1 ); } - ivas_reverb_fft_filter_ComplexMul( &pState->fft_filter_color_0, pBuffer_0 ); - ivas_reverb_fft_filter_ComplexMul( &pState->fft_filter_color_1, pBuffer_1 ); - ivas_reverb_t2f_f2t_out( &pState->fft_filter_ols, pBuffer_0, pBuffer_1, p0, p1 ); + ivas_reverb_fft_filter_ComplexMul( &hReverb->fft_filter_color_0, pBuffer_0 ); + ivas_reverb_fft_filter_ComplexMul( &hReverb->fft_filter_color_1, pBuffer_1 ); + ivas_reverb_t2f_f2t_out( &hReverb->fft_filter_ols, pBuffer_0, pBuffer_1, p0, p1 ); return; } @@ -1176,14 +1343,14 @@ static void post_fft_filter( *-----------------------------------------------------------------------------------------*/ static void reverb_block( - REVERB_HANDLE pState, + REVERB_HANDLE hReverb, float *pInput, float *pOut0, float *pOut1 ) { - uint16_t nr_branches = pState->nr_of_branches; - uint16_t bsize = pState->full_block_size; + uint16_t nr_branches = hReverb->nr_of_branches; + uint16_t bsize = hReverb->full_block_size; uint16_t inner_bsize = INNER_BLK_SIZE; uint16_t i, j, k, ns, branch_idx, blk_idx, start_sample_idx; @@ -1215,12 +1382,12 @@ static void reverb_block( for ( i = 0; i < nr_branches; i++ ) { float *pOutput_i = &ppOutput[i][0]; - float mixer_0_i = pState->mixer[0][i]; - float mixer_1_i = pState->mixer[1][i]; + float mixer_0_i = hReverb->mixer[0][i]; + float mixer_1_i = hReverb->mixer[1][i]; /* output and feedback are same, get sample from delay line ... */ - ivas_rev_delay_line_get_sample_blk( &( pState->delay_line[i] ), inner_bsize, pTemp ); - ivas_reverb_iir_filt_2taps_feed_blk( &( pState->t60[i] ), inner_bsize, pTemp, ppOutput[i] ); + ivas_rev_delay_line_get_sample_blk( &( hReverb->delay_line[i] ), inner_bsize, pTemp ); + ivas_reverb_iir_filt_2taps_feed_blk( &( hReverb->t60[i] ), inner_bsize, pTemp, ppOutput[i] ); for ( ns = 0; ns < inner_bsize; ns++ ) { pO0[ns] += pOutput_i[ns] * mixer_0_i; /* mixer ch 0 */ @@ -1239,7 +1406,7 @@ static void reverb_block( for ( j = 0; j < nr_branches; j++ ) { - float gain_matrix_j_i = pState->gain_matrix[j][i]; + float gain_matrix_j_i = hReverb->gain_matrix[j][i]; float *pOutput = &ppOutput[j][0]; for ( ns = 0; ns < inner_bsize; ns++ ) { @@ -1247,15 +1414,15 @@ static void reverb_block( } } - ivas_rev_delay_line_feed_sample_blk( &( pState->delay_line[i] ), inner_bsize, pFeedback_input ); + ivas_rev_delay_line_feed_sample_blk( &( hReverb->delay_line[i] ), inner_bsize, pFeedback_input ); } } /* Applying FFT filter to each sub-frame */ - for ( blk_idx = 0; blk_idx < pState->num_fft_subblocks; blk_idx++ ) + for ( blk_idx = 0; blk_idx < hReverb->num_fft_subblocks; blk_idx++ ) { - start_sample_idx = blk_idx * pState->fft_subblock_size; - post_fft_filter( pState, pOut0 + start_sample_idx, pOut1 + start_sample_idx, pFFT_buf[0], pFFT_buf[1] ); + start_sample_idx = blk_idx * hReverb->fft_subblock_size; + post_fft_filter( hReverb, pOut0 + start_sample_idx, pOut1 + start_sample_idx, pFFT_buf[0], pFFT_buf[1] ); } return; @@ -1269,14 +1436,14 @@ static void reverb_block( *-----------------------------------------------------------------------------------------*/ static ivas_error downmix_input_block( - REVERB_HANDLE pState, + const REVERB_HANDLE hReverb, float pcm_in[][L_FRAME48k], const AUDIO_CONFIG input_audio_config, float *pPcm_out, const int16_t input_offset ) { int16_t i, s, nchan_transport; - float dmx_gain = pState->dmx_gain; + float dmx_gain = hReverb->dmx_gain; switch ( input_audio_config ) { @@ -1292,7 +1459,7 @@ static ivas_error downmix_input_block( case AUDIO_CONFIG_ISM4: { nchan_transport = audioCfg2channels( input_audio_config ); - for ( s = 0; s < pState->full_block_size; s++ ) + for ( s = 0; s < hReverb->full_block_size; s++ ) { float temp = pcm_in[0][input_offset + s]; for ( i = 1; i < nchan_transport; i++ ) @@ -1308,7 +1475,7 @@ static ivas_error downmix_input_block( case AUDIO_CONFIG_HOA2: case AUDIO_CONFIG_HOA3: { - for ( s = 0; s < pState->full_block_size; s++ ) + for ( s = 0; s < hReverb->full_block_size; s++ ) { pPcm_out[s] = dmx_gain * pcm_in[0][input_offset + s]; } @@ -1330,35 +1497,35 @@ static ivas_error downmix_input_block( *-----------------------------------------------------------------------------------------*/ static void predelay_block( - REVERB_HANDLE pState, + const REVERB_HANDLE hReverb, float *pInput, float *pOutput ) { uint16_t i, idx, n_samples, blk_size; - uint16_t max_blk_size = (uint16_t) pState->predelay_line.Delay; + uint16_t max_blk_size = (uint16_t) hReverb->predelay_line.Delay; if ( max_blk_size < 2 ) { if ( max_blk_size == 0 ) /* zero-length delay line: just copy the data from input to output */ { - for ( i = 0; i < pState->full_block_size; i++ ) + for ( i = 0; i < hReverb->full_block_size; i++ ) { pOutput[i] = pInput[i]; } } else /* 1-sample length delay line: feed the data sample-by-sample */ { - for ( i = 0; i < pState->full_block_size; i++ ) + for ( i = 0; i < hReverb->full_block_size; i++ ) { - pOutput[i] = ivas_rev_delay_line_get_sample( &( pState->predelay_line ) ); - ivas_rev_delay_line_feed_sample( &( pState->predelay_line ), pInput[i] ); + pOutput[i] = ivas_rev_delay_line_get_sample( &( hReverb->predelay_line ) ); + ivas_rev_delay_line_feed_sample( &( hReverb->predelay_line ), pInput[i] ); } } } else /* multiple-sample length delay line: use block processing */ { idx = 0; - n_samples = pState->full_block_size; + n_samples = hReverb->full_block_size; while ( n_samples > 0 ) { blk_size = n_samples; @@ -1366,8 +1533,8 @@ static void predelay_block( { blk_size = max_blk_size; } - ivas_rev_delay_line_get_sample_blk( &( pState->predelay_line ), blk_size, &pOutput[idx] ); - ivas_rev_delay_line_feed_sample_blk( &( pState->predelay_line ), blk_size, &pInput[idx] ); + ivas_rev_delay_line_get_sample_blk( &( hReverb->predelay_line ), blk_size, &pOutput[idx] ); + ivas_rev_delay_line_feed_sample_blk( &( hReverb->predelay_line ), blk_size, &pInput[idx] ); idx += blk_size; n_samples -= blk_size; } @@ -1384,7 +1551,7 @@ static void predelay_block( *-----------------------------------------------------------------------------------------*/ static void mix_output_block( - REVERB_HANDLE pState, + const REVERB_HANDLE hReverb, const float *pInL, const float *pInR, float *pOutL, @@ -1392,7 +1559,7 @@ static void mix_output_block( { uint16_t i; - for ( i = 0; i < pState->full_block_size; i++ ) + for ( i = 0; i < hReverb->full_block_size; i++ ) { pOutL[i] += pInL[i]; pOutR[i] += pInR[i]; @@ -1409,12 +1576,13 @@ static void mix_output_block( *-----------------------------------------------------------------------------------------*/ ivas_error ivas_reverb_process( - REVERB_HANDLE hReverb, /* i/o: reverb state */ + const REVERB_HANDLE hReverb, /* i : Reverberator handle */ const AUDIO_CONFIG input_audio_config, /* i : reverb. input audio configuration */ const int16_t mix_signals, /* i : add reverb to output signal */ float pcm_in[][L_FRAME48k], /* i : the PCM audio to apply reverb on */ float pcm_out[][L_FRAME48k], /* o : the PCM audio with reverb applied */ - const int16_t i_ts ) + const int16_t i_ts /* i : subframe index */ +) { float tmp0[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES], tmp1[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES], tmp2[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES]; ivas_error error; @@ -1440,3 +1608,349 @@ ivas_error ivas_reverb_process( return IVAS_ERR_OK; } + + +/*------------------------------------------------------------------------- + * ivas_binaural_reverb_processFrame() + * + * Compute the reverberation - room effect + *------------------------------------------------------------------------*/ + +void ivas_binaural_reverb_processFrame( + REVERB_STRUCT_HANDLE hReverb, /* i/o: binaural reverb handle */ + const int16_t numInChannels, /* i : num inputs to be processed */ + float inReal[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : input CLDFB data real, Comment: This change swaps two first dimensions as first dimension is not constant. */ + float inImag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : input CLDFB data imag */ + float outReal[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : output CLDFB data real */ + float outImag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : output CLDFB data imag */ + const uint8_t offsetSamplesIO /* i : number of offset samples */ +) +{ + /* Declare the required variables */ + int16_t idx, bin, ch, sample, invertSampleIndex, tapIdx, *phaseShiftTypePr; + float **tapRealPr, **tapImagPr; + + /* 1) Rotate the data in the loop buffer of the reverberator. + * Notice that the audio at the loop buffers is at time-inverted order + * for convolution purposes later on. */ + for ( bin = 0; bin < hReverb->numBins; bin++ ) + { + /* Move the data forwards by blockSize (i.e. by the frame size of 16 CLDFB slots) */ + mvr2r( hReverb->loopBufReal[bin], hReverb->loopBufReal[bin] + hReverb->blockSize, hReverb->loopBufLength[bin] ); + mvr2r( hReverb->loopBufImag[bin], hReverb->loopBufImag[bin] + hReverb->blockSize, hReverb->loopBufLength[bin] ); + + /* Add the data from the end of the loop to the beginning, with an attenuation factor + * according to RT60. This procedure generates an IIR decaying response. The response + * is decorrelated later on. */ + v_multc( hReverb->loopBufReal[bin] + hReverb->loopBufLength[bin], hReverb->loopAttenuationFactor[bin], hReverb->loopBufReal[bin], hReverb->blockSize ); + v_multc( hReverb->loopBufImag[bin] + hReverb->loopBufLength[bin], hReverb->loopAttenuationFactor[bin], hReverb->loopBufImag[bin], hReverb->blockSize ); + } + + /* 2) Apply the determined pre-delay to the input audio, and add the delayed audio to the loop. */ + idx = hReverb->preDelayBufferIndex; + for ( sample = 0; sample < hReverb->blockSize; sample++ ) + { + uint16_t sampleWithOffset; + sampleWithOffset = sample + offsetSamplesIO; + invertSampleIndex = hReverb->blockSize - sample - 1; + for ( bin = 0; bin < hReverb->numBins; bin++ ) + { + /* Add from pre-delay buffer a sample to the loop buffer, in a time-inverted order. + * Also apply the spectral gains determined for the reverberation */ + hReverb->loopBufReal[bin][invertSampleIndex] += hReverb->preDelayBufferReal[idx][bin] * hReverb->reverbEqGains[bin]; + hReverb->loopBufImag[bin][invertSampleIndex] += hReverb->preDelayBufferImag[idx][bin] * hReverb->reverbEqGains[bin]; + hReverb->preDelayBufferReal[idx][bin] = 0.0f; + hReverb->preDelayBufferImag[idx][bin] = 0.0f; + } + + /* Add every second input channel as is to the pre-delay buffer, and every second input channel with + * 90 degrees phase shift to reduce energy imbalances between coherent and incoherent sounds */ + for ( ch = 0; ch < numInChannels; ch++ ) + { + if ( ch % 2 ) + { + v_add( hReverb->preDelayBufferReal[idx], inReal[ch][sampleWithOffset], hReverb->preDelayBufferReal[idx], hReverb->numBins ); + v_add( hReverb->preDelayBufferImag[idx], inImag[ch][sampleWithOffset], hReverb->preDelayBufferImag[idx], hReverb->numBins ); + } + else + { + v_sub( hReverb->preDelayBufferReal[idx], inImag[ch][sampleWithOffset], hReverb->preDelayBufferReal[idx], hReverb->numBins ); + v_add( hReverb->preDelayBufferImag[idx], inReal[ch][sampleWithOffset], hReverb->preDelayBufferImag[idx], hReverb->numBins ); + } + } + idx = ( idx + 1 ) % hReverb->preDelayBufferLength; + } + hReverb->preDelayBufferIndex = idx; + + /* 3) Perform the filtering/decorrelating, using complex and sparse FIR filtering */ + for ( bin = 0; bin < hReverb->numBins; bin++ ) + { + for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) + { + /* These tap pointers have been determined to point to the loop buffer at sparse locations */ + tapRealPr = hReverb->tapPointersReal[bin][ch]; + tapImagPr = hReverb->tapPointersImag[bin][ch]; + phaseShiftTypePr = hReverb->tapPhaseShiftType[bin][ch]; + + /* Flush output */ + set_f( hReverb->outputBufferReal[bin][ch], 0.0f, hReverb->blockSize ); + set_f( hReverb->outputBufferImag[bin][ch], 0.0f, hReverb->blockSize ); + + /* Add from temporally decaying sparse tap locations the audio to the output. */ + for ( tapIdx = 0; tapIdx < hReverb->taps[bin][ch]; tapIdx++ ) + { + switch ( phaseShiftTypePr[tapIdx] ) + { + case 0: /* 0 degrees phase */ + v_add( hReverb->outputBufferReal[bin][ch], tapRealPr[tapIdx], hReverb->outputBufferReal[bin][ch], hReverb->blockSize ); + v_add( hReverb->outputBufferImag[bin][ch], tapImagPr[tapIdx], hReverb->outputBufferImag[bin][ch], hReverb->blockSize ); + break; + case 1: /* 90 degrees phase */ + v_sub( hReverb->outputBufferReal[bin][ch], tapImagPr[tapIdx], hReverb->outputBufferReal[bin][ch], hReverb->blockSize ); + v_add( hReverb->outputBufferImag[bin][ch], tapRealPr[tapIdx], hReverb->outputBufferImag[bin][ch], hReverb->blockSize ); + break; + case 2: /* 180 degrees phase */ + v_sub( hReverb->outputBufferReal[bin][ch], tapRealPr[tapIdx], hReverb->outputBufferReal[bin][ch], hReverb->blockSize ); + v_sub( hReverb->outputBufferImag[bin][ch], tapImagPr[tapIdx], hReverb->outputBufferImag[bin][ch], hReverb->blockSize ); + break; + default: /* 270 degrees phase */ + v_add( hReverb->outputBufferReal[bin][ch], tapImagPr[tapIdx], hReverb->outputBufferReal[bin][ch], hReverb->blockSize ); + v_sub( hReverb->outputBufferImag[bin][ch], tapRealPr[tapIdx], hReverb->outputBufferImag[bin][ch], hReverb->blockSize ); + break; + } + } + } + + /* Generate diffuse field binaural coherence by mixing the incoherent reverberated channels with pre-defined gains */ + if ( bin <= hReverb->highestBinauralCoherenceBin ) + { + if ( hReverb->useBinauralCoherence ) + { + for ( sample = 0; sample < hReverb->blockSize; sample++ ) + { + float leftRe, rightRe, leftIm, rightIm; + + leftRe = hReverb->binauralCoherenceDirectGains[bin] * hReverb->outputBufferReal[bin][0][sample] + hReverb->binauralCoherenceCrossmixGains[bin] * hReverb->outputBufferReal[bin][1][sample]; + rightRe = hReverb->binauralCoherenceDirectGains[bin] * hReverb->outputBufferReal[bin][1][sample] + hReverb->binauralCoherenceCrossmixGains[bin] * hReverb->outputBufferReal[bin][0][sample]; + leftIm = hReverb->binauralCoherenceDirectGains[bin] * hReverb->outputBufferImag[bin][0][sample] + hReverb->binauralCoherenceCrossmixGains[bin] * hReverb->outputBufferImag[bin][1][sample]; + rightIm = hReverb->binauralCoherenceDirectGains[bin] * hReverb->outputBufferImag[bin][1][sample] + hReverb->binauralCoherenceCrossmixGains[bin] * hReverb->outputBufferImag[bin][0][sample]; + + hReverb->outputBufferReal[bin][0][sample] = leftRe; + hReverb->outputBufferReal[bin][1][sample] = rightRe; + hReverb->outputBufferImag[bin][0][sample] = leftIm; + hReverb->outputBufferImag[bin][1][sample] = rightIm; + } + } + } + } + + /* 4) Write data to output */ + for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) + { + for ( sample = 0; sample < hReverb->blockSize; sample++ ) + { + uint16_t sampleWithOffset; + + sampleWithOffset = sample + offsetSamplesIO; + /* Audio was in the temporally inverted order for convolution, re-invert audio to output */ + invertSampleIndex = hReverb->blockSize - sample - 1; + + for ( bin = 0; bin < hReverb->numBins; bin++ ) + { + outReal[ch][sampleWithOffset][bin] = hReverb->outputBufferReal[bin][ch][invertSampleIndex]; + outImag[ch][sampleWithOffset][bin] = hReverb->outputBufferImag[bin][ch][invertSampleIndex]; + } + for ( ; bin < CLDFB_NO_CHANNELS_MAX; bin++ ) + { + outReal[ch][sampleWithOffset][bin] = 0.0f; + outImag[ch][sampleWithOffset][bin] = 0.0f; + } + } + } + + return; +} + + +/*------------------------------------------------------------------------- + * ivas_binaural_reverb_open() + * + * Allocate and initialize binaural room reverberator handle + *------------------------------------------------------------------------*/ + +ivas_error ivas_binaural_reverb_open( + REVERB_STRUCT_HANDLE *hReverbPr, /* i/o: binaural reverb handle */ + const int16_t numBins, /* i : number of CLDFB bins */ + const int16_t numCldfbSlotsPerFrame, /* i : number of CLDFB slots per frame */ + ivas_roomAcoustics_t *roomAcoustics, /* i/o: room acoustics parameters */ + const AUDIO_CONFIG output_config, /* i : output audio configuration */ + const int32_t sampling_rate, /* i : sampling rate */ + const RENDERER_TYPE renderer_type, /* i : renderer type */ + const HRTFS_FASTCONV_HANDLE hHrtfFastConv, /* i : FastConv HRTF handle */ + const HRTFS_PARAMBIN_HANDLE hHrtfParambin /* i : Parametric binauralizer HRTF handle */ +) +{ + int16_t bin, chIdx, k, len; + REVERB_STRUCT_HANDLE hReverb; + const float *revTimes; + float t60[CLDFB_NO_CHANNELS_MAX]; + float ene[CLDFB_NO_CHANNELS_MAX]; + + if ( ( *hReverbPr = (REVERB_STRUCT_HANDLE) malloc( sizeof( REVERB_STRUCT ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural Reverberator\n" ) ); + } + + hReverb = *hReverbPr; + + hReverb->useBinauralCoherence = 1; + hReverb->preDelayBufferLength = 1; + hReverb->preDelayBufferIndex = 0; + + hReverb->numBins = numBins; + hReverb->blockSize = numCldfbSlotsPerFrame; + + for ( k = 0; k < REVERB_PREDELAY_MAX + 1; k++ ) + { + set_f( hReverb->preDelayBufferReal[k], 0.0f, hReverb->numBins ); + set_f( hReverb->preDelayBufferImag[k], 0.0f, hReverb->numBins ); + } + + if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) + { + if ( !roomAcoustics->override ) + { + revTimes = hHrtfFastConv->fastconvReverberationTimes; + } + else + { + revTimes = t60; + } + } + else + { + revTimes = hHrtfParambin->parametricReverberationTimes; + } + + for ( bin = 0; bin < hReverb->numBins; bin++ ) + { + /* Loop Buffer */ + hReverb->loopBufLengthMax[bin] = (int16_t) ( 500 / ( 1 + bin ) + ( CLDFB_NO_CHANNELS_MAX - bin ) ); + + len = hReverb->loopBufLengthMax[bin] + hReverb->blockSize; + if ( ( hReverb->loopBufReal[bin] = (float *) malloc( len * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural Reverberator\n" ) ); + } + + if ( ( hReverb->loopBufImag[bin] = (float *) malloc( len * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural Reverberator\n" ) ); + } + + set_f( hReverb->loopBufReal[bin], 0.0f, len ); + set_f( hReverb->loopBufImag[bin], 0.0f, len ); + + /* Determine loop buffer length. The following formula is manually tuned to generate sufficiently long + * but not excessively long loops to generate reverberation. */ + /* Note: the resulted length is very sensitive to the precision of the constants below (e.g. 1.45 vs. 1.45f) */ + hReverb->loopBufLength[bin] = (int16_t) ( 1.45 * (int16_t) ( revTimes[bin] * 150.0 ) + 1 ); + hReverb->loopBufLength[bin] = min( hReverb->loopBufLength[bin], hReverb->loopBufLengthMax[bin] ); + + /* Sparse Filter Tap Locations */ + for ( chIdx = 0; chIdx < BINAURAL_CHANNELS; chIdx++ ) + { + len = hReverb->loopBufLength[bin]; + + if ( ( hReverb->tapPhaseShiftType[bin][chIdx] = (int16_t *) malloc( len * sizeof( int16_t ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural Reverberator\n" ) ); + } + set_s( hReverb->tapPhaseShiftType[bin][chIdx], 0, len ); + + if ( ( hReverb->tapPointersReal[bin][chIdx] = (float **) malloc( len * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural Reverberator\n" ) ); + } + + if ( ( hReverb->tapPointersImag[bin][chIdx] = (float **) malloc( len * sizeof( float * ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural Reverberator\n" ) ); + } + + len = hReverb->blockSize; + if ( ( hReverb->outputBufferReal[bin][chIdx] = (float *) malloc( len * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural Reverberator\n" ) ); + } + + if ( ( hReverb->outputBufferImag[bin][chIdx] = (float *) malloc( len * sizeof( float ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural Reverberator\n" ) ); + } + + set_f( hReverb->outputBufferReal[bin][chIdx], 0.0f, len ); + set_f( hReverb->outputBufferImag[bin][chIdx], 0.0f, len ); + } + } + + + if ( ( roomAcoustics ) && ( roomAcoustics->override ) ) + { + ivas_reverb_prepare_cldfb_params( roomAcoustics, hHrtfFastConv, output_config, roomAcoustics->use_brir, sampling_rate, t60, ene ); + ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, t60, ene ); + ivas_binaural_reverb_setPreDelay( hReverb, (int16_t) roundf( 48000.0f * roomAcoustics->acousticPreDelay / CLDFB_NO_CHANNELS_MAX ) ); + } + else + { + if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) + { + ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, hHrtfFastConv->fastconvReverberationTimes, hHrtfFastConv->fastconvReverberationEneCorrections ); + ivas_binaural_reverb_setPreDelay( hReverb, 10 ); + } + else + { + ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, hHrtfParambin->parametricReverberationTimes, hHrtfParambin->parametricReverberationEneCorrections ); + ivas_binaural_reverb_setPreDelay( hReverb, 10 ); + } + } + return IVAS_ERR_OK; +} + + +/*------------------------------------------------------------------------- + * ivas_binaural_reverb_close() + * + * Close binaural room reverberator handle + *------------------------------------------------------------------------*/ + +void ivas_binaural_reverb_close( + REVERB_STRUCT_HANDLE *hReverb /* i/o: binaural reverb handle */ +) +{ + int16_t bin, chIdx; + + if ( hReverb == NULL || *hReverb == NULL ) + { + return; + } + + for ( bin = 0; bin < ( *hReverb )->numBins; bin++ ) + { + for ( chIdx = 0; chIdx < BINAURAL_CHANNELS; chIdx++ ) + { + free( ( *hReverb )->tapPhaseShiftType[bin][chIdx] ); + free( ( *hReverb )->tapPointersReal[bin][chIdx] ); + free( ( *hReverb )->tapPointersImag[bin][chIdx] ); + free( ( *hReverb )->outputBufferReal[bin][chIdx] ); + free( ( *hReverb )->outputBufferImag[bin][chIdx] ); + } + free( ( *hReverb )->loopBufReal[bin] ); + free( ( *hReverb )->loopBufImag[bin] ); + } + + free( ( *hReverb ) ); + ( *hReverb ) = NULL; + + return; +} diff --git a/lib_rend/ivas_reverb_delay_line.c b/lib_rend/ivas_reverb_delay_line.c index 9ad1a03bf9..892a0d21c9 100644 --- a/lib_rend/ivas_reverb_delay_line.c +++ b/lib_rend/ivas_reverb_delay_line.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,11 +33,12 @@ #include #include "options.h" #include "ivas_prot.h" +#include "ivas_prot_rend.h" #include "prot.h" #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------------------------* diff --git a/lib_rend/ivas_reverb_fft_filter.c b/lib_rend/ivas_reverb_fft_filter.c index 7a304aaf7c..725f5e6bc1 100644 --- a/lib_rend/ivas_reverb_fft_filter.c +++ b/lib_rend/ivas_reverb_fft_filter.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -32,13 +32,13 @@ #include #include "options.h" -#include "ivas_prot.h" +#include "prot.h" +#include "ivas_prot_rend.h" #ifdef DEBUGGING #include "debug.h" #endif #include -#include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------------------------* @@ -46,6 +46,7 @@ *------------------------------------------------------------------------------------------*/ static void fft_wrapper_2ch( float *buffer_L, float *buffer_R, const int16_t fft_size ); + static void ifft_wrapper_2ch( float *buffer_L, float *buffer_R, const int16_t fft_size ); diff --git a/lib_rend/ivas_reverb_filter_design.c b/lib_rend/ivas_reverb_filter_design.c index 0654dbfa8a..3069d1248a 100644 --- a/lib_rend/ivas_reverb_filter_design.c +++ b/lib_rend/ivas_reverb_filter_design.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -32,15 +32,15 @@ #include #include "options.h" -#include "ivas_prot.h" +#include "prot.h" +#include "ivas_prot_rend.h" #ifdef DEBUGGING #include "debug.h" #endif #include #include #include -#include "prot.h" -#include "wmops.h" +#include "wmc_auto.h" /*------------------------------------------------------------------------------------------* diff --git a/lib_rend/ivas_reverb_iir_filter.c b/lib_rend/ivas_reverb_iir_filter.c index b633f8e82c..ce73c9d864 100644 --- a/lib_rend/ivas_reverb_iir_filter.c +++ b/lib_rend/ivas_reverb_iir_filter.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -32,13 +32,12 @@ #include #include "options.h" -#include "ivas_prot.h" #include "prot.h" +#include "ivas_prot_rend.h" #ifdef DEBUGGING #include "debug.h" #endif -#include -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------------------------* diff --git a/lib_rend/ivas_reverb_utils.c b/lib_rend/ivas_reverb_utils.c index 31a559bd2c..6ff101bec5 100644 --- a/lib_rend/ivas_reverb_utils.c +++ b/lib_rend/ivas_reverb_utils.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,14 +33,13 @@ #include #include "options.h" #include "prot.h" -#include "ivas_prot.h" -#include "ivas_rom_binauralRenderer.h" +#include "ivas_prot_rend.h" #include "ivas_rom_rend.h" #include #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------------------------* @@ -52,6 +51,8 @@ #define CLDFB_CONVOLVER_NTAPS_MAX ( 16 ) #define FFT_SPECTRUM_SIZE ( 1 + ( RV_FILTER_MAX_FFT_SIZE / 2 ) ) +#define N_INITIAL_IGNORED_FRAMES 4 +#define NUM_CLDFB_TAPES 7 /*-----------------------------------------------------------------------------------------* * Local function prototypes @@ -67,7 +68,7 @@ typedef struct cldfb_convolver_state float filter_states_im[BINAURAL_CONVBANDS][CLDFB_CONVOLVER_NTAPS_MAX]; } cldfb_convolver_state; -static void ivas_reverb_get_fastconv_hrtf_set_energies( const AUDIO_CONFIG input_audio_config, const int16_t use_brir, const int32_t sampling_rate, float *avg_pwr_left, float *avg_pwr_right ); +static void ivas_reverb_get_fastconv_hrtf_set_energies( const HRTFS_FASTCONV_HANDLE hHrtfFastConv, const AUDIO_CONFIG input_audio_config, const int16_t use_brir, const int32_t sampling_rate, float *avg_pwr_left, float *avg_pwr_right ); /*-----------------------------------------------------------------------------------------* @@ -78,6 +79,7 @@ static void ivas_reverb_get_fastconv_hrtf_set_energies( const AUDIO_CONFIG input void ivas_reverb_prepare_cldfb_params( ivas_roomAcoustics_t *pInput_params, + const HRTFS_FASTCONV_HANDLE hHrtfFastConv, const AUDIO_CONFIG input_audio_config, const int16_t use_brir, const int32_t output_Fs, @@ -112,7 +114,7 @@ void ivas_reverb_prepare_cldfb_params( pOutput_ene[idx] *= expf( exp_argument ); } - ivas_reverb_get_fastconv_hrtf_set_energies( input_audio_config, use_brir, output_Fs, avg_pwr_left, avg_pwr_right ); + ivas_reverb_get_fastconv_hrtf_set_energies( hHrtfFastConv, input_audio_config, use_brir, output_Fs, avg_pwr_left, avg_pwr_right ); for ( idx = 0; idx < CLDFB_NO_CHANNELS_MAX; idx++ ) { @@ -196,6 +198,7 @@ static void ivas_cldfb_convolver( *-----------------------------------------------------------------------------------------*/ static void get_IR_from_filter_taps( + const HRTFS_FASTCONV_HANDLE hHrtfFastConv, const int16_t hrtf_idx, const AUDIO_CONFIG input_audio_config, const int16_t use_brir, @@ -204,11 +207,7 @@ static void get_IR_from_filter_taps( float *pOut_l, float *pOut_r ) { - const int16_t n_initial_ignored_frames = 4; - const int16_t num_cldfb_taps = 7; - int16_t i, j, band_idx, block_idx, block_len, block_count, input_sample_idx, output_sample_idx, array_idx; - int16_t is_ambisonics; HANDLE_CLDFB_FILTER_BANK handle_cldfb_analysis, handle_cldfb_synthesis_l, handle_cldfb_synthesis_r; cldfb_convolver_state convolver_state; float real_buffer_in[CLDFB_NO_CHANNELS_MAX]; @@ -217,17 +216,8 @@ static void get_IR_from_filter_taps( float out_CLDFB_imag[BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX]; /* o : imag part of Binaural signals */ float dirac_pls[CLDFB_NO_CHANNELS_MAX + 1]; - if ( ( input_audio_config == AUDIO_CONFIG_FOA ) || ( input_audio_config == AUDIO_CONFIG_HOA2 ) || ( input_audio_config == AUDIO_CONFIG_HOA3 ) ) - { - is_ambisonics = true; - } - else - { - is_ambisonics = false; - } - block_len = (int16_t) ( sampling_rate * INV_CLDFB_BANDWIDTH ); - block_count = n_initial_ignored_frames + ( pulse_length / block_len ); + block_count = N_INITIAL_IGNORED_FRAMES + ( pulse_length / block_len ); set_f( dirac_pls, 0, block_len + 1 ); dirac_pls[0] = 1.0f; @@ -235,14 +225,14 @@ static void get_IR_from_filter_taps( output_sample_idx = 0; /* Assign CLDFB taps */ - if ( is_ambisonics ) + if ( input_audio_config == AUDIO_CONFIG_FOA || input_audio_config == AUDIO_CONFIG_HOA2 || input_audio_config == AUDIO_CONFIG_HOA3 ) { for ( band_idx = 0; band_idx < BINAURAL_CONVBANDS; band_idx++ ) { - convolver_state.filter_taps_left_re[band_idx] = leftHRIRReal_HOA3[band_idx][hrtf_idx]; - convolver_state.filter_taps_left_im[band_idx] = leftHRIRImag_HOA3[band_idx][hrtf_idx]; - convolver_state.filter_taps_right_re[band_idx] = rightHRIRReal_HOA3[band_idx][hrtf_idx]; - convolver_state.filter_taps_right_im[band_idx] = rightHRIRImag_HOA3[band_idx][hrtf_idx]; + convolver_state.filter_taps_left_re[band_idx] = hHrtfFastConv->leftHRIRReal_HOA3[band_idx][hrtf_idx]; + convolver_state.filter_taps_left_im[band_idx] = hHrtfFastConv->leftHRIRImag_HOA3[band_idx][hrtf_idx]; + convolver_state.filter_taps_right_re[band_idx] = hHrtfFastConv->rightHRIRReal_HOA3[band_idx][hrtf_idx]; + convolver_state.filter_taps_right_im[band_idx] = hHrtfFastConv->rightHRIRImag_HOA3[band_idx][hrtf_idx]; } } else @@ -273,20 +263,20 @@ static void get_IR_from_filter_taps( { for ( band_idx = 0; band_idx < BINAURAL_CONVBANDS; band_idx++ ) { - convolver_state.filter_taps_left_re[band_idx] = leftBRIRReal[band_idx][array_idx]; - convolver_state.filter_taps_left_im[band_idx] = leftBRIRImag[band_idx][array_idx]; - convolver_state.filter_taps_right_re[band_idx] = rightBRIRReal[band_idx][array_idx]; - convolver_state.filter_taps_right_im[band_idx] = rightBRIRImag[band_idx][array_idx]; + convolver_state.filter_taps_left_re[band_idx] = hHrtfFastConv->leftBRIRReal[band_idx][array_idx]; + convolver_state.filter_taps_left_im[band_idx] = hHrtfFastConv->leftBRIRImag[band_idx][array_idx]; + convolver_state.filter_taps_right_re[band_idx] = hHrtfFastConv->rightBRIRReal[band_idx][array_idx]; + convolver_state.filter_taps_right_im[band_idx] = hHrtfFastConv->rightBRIRImag[band_idx][array_idx]; } } else { for ( band_idx = 0; band_idx < BINAURAL_CONVBANDS; band_idx++ ) { - convolver_state.filter_taps_left_re[band_idx] = leftHRIRReal[band_idx][array_idx]; - convolver_state.filter_taps_left_im[band_idx] = leftHRIRImag[band_idx][array_idx]; - convolver_state.filter_taps_right_re[band_idx] = rightHRIRReal[band_idx][array_idx]; - convolver_state.filter_taps_right_im[band_idx] = rightHRIRImag[band_idx][array_idx]; + convolver_state.filter_taps_left_re[band_idx] = hHrtfFastConv->leftHRIRReal[band_idx][array_idx]; + convolver_state.filter_taps_left_im[band_idx] = hHrtfFastConv->leftHRIRImag[band_idx][array_idx]; + convolver_state.filter_taps_right_re[band_idx] = hHrtfFastConv->rightHRIRReal[band_idx][array_idx]; + convolver_state.filter_taps_right_im[band_idx] = hHrtfFastConv->rightHRIRImag[band_idx][array_idx]; } } } @@ -323,7 +313,7 @@ static void get_IR_from_filter_taps( } } - ivas_cldfb_convolver( &convolver_state, out_CLDFB_real, out_CLDFB_imag, real_buffer_in, imag_buffer_in, BINAURAL_CONVBANDS, num_cldfb_taps ); + ivas_cldfb_convolver( &convolver_state, out_CLDFB_real, out_CLDFB_imag, real_buffer_in, imag_buffer_in, BINAURAL_CONVBANDS, NUM_CLDFB_TAPES ); ppRealBuf[0] = out_CLDFB_real[0]; ppImagBuf[0] = out_CLDFB_imag[0]; @@ -338,7 +328,7 @@ static void get_IR_from_filter_taps( input_sample_idx = 1; } - if ( block_idx >= n_initial_ignored_frames ) + if ( block_idx >= N_INITIAL_IGNORED_FRAMES ) { output_sample_idx += block_len; } @@ -362,6 +352,7 @@ static void get_IR_from_filter_taps( static void ivas_reverb_get_cldfb_hrtf_set_properties( AUDIO_CONFIG input_audio_config, + const HRTFS_FASTCONV_HANDLE hHrtfFastConv, const int16_t use_brir, const int32_t sampling_rate, float *avg_pwr_left, @@ -405,7 +396,7 @@ static void ivas_reverb_get_cldfb_hrtf_set_properties( Loop over all the HRTFs available */ for ( hrtf_idx = 0; hrtf_idx < hrtf_count; hrtf_idx++ ) { - get_IR_from_filter_taps( hrtf_idx, input_audio_config, use_brir, sampling_rate, IR_length, current_HRTF_data_L, current_HRTF_data_R ); + get_IR_from_filter_taps( hHrtfFastConv, hrtf_idx, input_audio_config, use_brir, sampling_rate, IR_length, current_HRTF_data_L, current_HRTF_data_R ); /* Perform forward FFT on both L/R channels */ fft_rel( current_HRTF_data_L, (int16_t) fft_size, (int16_t) log2_fft_size ); @@ -454,6 +445,7 @@ static void ivas_reverb_get_cldfb_hrtf_set_properties( *-----------------------------------------------------------------------------------------*/ static void ivas_reverb_get_fastconv_hrtf_set_energies( + const HRTFS_FASTCONV_HANDLE hHrtfFastConv, const AUDIO_CONFIG input_audio_config, const int16_t use_brir, const int32_t sampling_rate, @@ -477,7 +469,7 @@ static void ivas_reverb_get_fastconv_hrtf_set_energies( output_fc[freq_idx] = (float) ( ( 2 * freq_idx + 1 ) * cldfb_freq_halfstep ); } - ivas_reverb_get_cldfb_hrtf_set_properties( input_audio_config, use_brir, sampling_rate, avg_pwr_left_fft, avg_pwr_right_fft ); + ivas_reverb_get_cldfb_hrtf_set_properties( input_audio_config, hHrtfFastConv, use_brir, sampling_rate, avg_pwr_left_fft, avg_pwr_right_fft ); ivas_reverb_interpolate_acoustic_data( FFT_SPECTRUM_SIZE, input_fc, avg_pwr_left_fft, avg_pwr_right_fft, CLDFB_NO_CHANNELS_MAX, output_fc, avg_pwr_left, avg_pwr_right ); diff --git a/lib_rend/ivas_rom_TdBinauralRenderer.c b/lib_rend/ivas_rom_TdBinauralRenderer.c index 34263ea8f3..4b56fb4883 100644 --- a/lib_rend/ivas_rom_TdBinauralRenderer.c +++ b/lib_rend/ivas_rom_TdBinauralRenderer.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,13 +39,15 @@ #endif #include "cnst.h" #include "ivas_cnst.h" -#include "wmops.h" +#include "wmc_auto.h" +#define WMC_TOOL_SKIP /*------------------------------------------------------------------------- * TD Binaural rendering related ROM tables *------------------------------------------------------------------------*/ /* TD renderer HRTF default model Orange53 */ +const float orange53_rom_latency_s = 0.000020834f; const int16_t orange53_rom_azimDim2[18] = { 1, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 1, }; @@ -12455,4 +12457,6 @@ const uint32_t orange53_rom_ITD_elevBsShape[28] = { 0x3ebda12f,0x3f12f685,0x3f2aaaab, }; +#undef WMC_TOOL_SKIP + /* clang-format on */ diff --git a/lib_rend/ivas_rom_TdBinauralRenderer.h b/lib_rend/ivas_rom_TdBinauralRenderer.h index 7aeff4f0ff..ccb5362c9a 100644 --- a/lib_rend/ivas_rom_TdBinauralRenderer.h +++ b/lib_rend/ivas_rom_TdBinauralRenderer.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -42,6 +42,7 @@ * TD Binaural rendering related ROM tables *------------------------------------------------------------------------*/ /* TD renderer HRTF default model Orange53 */ +extern const float orange53_rom_latency_s; extern const int16_t orange53_rom_azimDim2[18]; extern const int16_t orange53_rom_azimDim3[18]; extern const int16_t orange53_rom_azim_start_idx[18]; diff --git a/lib_rend/ivas_rom_binauralRenderer.c b/lib_rend/ivas_rom_binauralRenderer.c index bfd2da9fb4..9708bac83a 100644 --- a/lib_rend/ivas_rom_binauralRenderer.c +++ b/lib_rend/ivas_rom_binauralRenderer.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,10 +37,12 @@ #endif #include "cnst.h" #include "ivas_cnst.h" -#include "wmops.h" +#include "wmc_auto.h" /* clang-format off */ +#define WMC_TOOL_SKIP + /*------------------------------------------------------------------------- * Binaural rendering related ROM tables *------------------------------------------------------------------------*/ @@ -52,7 +54,7 @@ * Generated with Matlab version 9.3.0.713579 (R2017b) by MUXE6256 */ const float FASTCONV_HOA3_latency_s = 0.001979167f; -const float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][16][7]= +const float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS]= { { {-0.004181f, +0.093228f, +0.655506f, +0.048565f, -0.005834f, -0.005472f, -0.000066f}, @@ -956,7 +958,7 @@ const float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][16][7]= } }; -const float leftHRIRImag_HOA3[BINAURAL_CONVBANDS][16][7]= +const float leftHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS]= { { {-0.007849f, -0.189662f, +0.310868f, +0.002657f, -0.000617f, -0.002064f, +0.000079f}, @@ -1860,7 +1862,7 @@ const float leftHRIRImag_HOA3[BINAURAL_CONVBANDS][16][7]= } }; -const float rightHRIRReal_HOA3[BINAURAL_CONVBANDS][16][7]= +const float rightHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS]= { { {-0.004181f, +0.093228f, +0.655506f, +0.048565f, -0.005834f, -0.005472f, -0.000066f}, @@ -2764,7 +2766,7 @@ const float rightHRIRReal_HOA3[BINAURAL_CONVBANDS][16][7]= } }; -const float rightHRIRImag_HOA3[BINAURAL_CONVBANDS][16][7]= +const float rightHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS]= { { {-0.007849f, -0.189662f, +0.310868f, +0.002657f, -0.000617f, -0.002064f, +0.000079f}, @@ -3669,7 +3671,7 @@ const float rightHRIRImag_HOA3[BINAURAL_CONVBANDS][16][7]= }; const float FASTCONV_HRIR_latency_s = 0.000666667f; -const float leftHRIRReal[BINAURAL_CONVBANDS][15][7]= +const float leftHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]= { { {+0.331798f, +0.500334f, +0.042057f, -0.000623f, -0.000260f}, @@ -4523,7 +4525,7 @@ const float leftHRIRReal[BINAURAL_CONVBANDS][15][7]= } }; -const float leftHRIRImag[BINAURAL_CONVBANDS][15][7]= +const float leftHRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]= { { {-0.346479f, +0.553523f, -0.074098f, +0.001288f, +0.000309f}, @@ -5377,7 +5379,7 @@ const float leftHRIRImag[BINAURAL_CONVBANDS][15][7]= } }; -const float rightHRIRReal[BINAURAL_CONVBANDS][15][7]= +const float rightHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]= { { {+0.065097f, +0.755993f, -0.042308f, -0.016140f, -0.000353f}, @@ -6231,7 +6233,7 @@ const float rightHRIRReal[BINAURAL_CONVBANDS][15][7]= } }; -const float rightHRIRImag[BINAURAL_CONVBANDS][15][7]= +const float rightHRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]= { { {-0.179291f, +0.196331f, +0.055128f, -0.017382f, +0.000411f}, @@ -7617,7 +7619,7 @@ const float hrtfShCoeffsIm[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS]= /* Binaural rendering data set based on BRIRs */ /* Tables derived from Mozart IIS BRIRs.*/ const float FASTCONV_BRIR_latency_s = 0.000937500f; -const float leftBRIRReal[BINAURAL_CONVBANDS][15][BINAURAL_NTAPS_MAX]= +const float leftBRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS_MAX]= { { { @@ -16721,7 +16723,7 @@ const float leftBRIRReal[BINAURAL_CONVBANDS][15][BINAURAL_NTAPS_MAX]= } }; -const float leftBRIRImag[BINAURAL_CONVBANDS][15][BINAURAL_NTAPS_MAX]= +const float leftBRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS_MAX]= { { { @@ -25825,7 +25827,7 @@ const float leftBRIRImag[BINAURAL_CONVBANDS][15][BINAURAL_NTAPS_MAX]= } }; -const float rightBRIRReal[BINAURAL_CONVBANDS][15][BINAURAL_NTAPS_MAX]= +const float rightBRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS_MAX]= { { { @@ -34929,7 +34931,7 @@ const float rightBRIRReal[BINAURAL_CONVBANDS][15][BINAURAL_NTAPS_MAX]= } }; -const float rightBRIRImag[BINAURAL_CONVBANDS][15][BINAURAL_NTAPS_MAX]= +const float rightBRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS_MAX]= { { { @@ -44077,4 +44079,6 @@ const float parametricEarlyPartEneCorrection[CLDFB_NO_CHANNELS_MAX] = 0.016350f, 0.042709f, 0.077337f, 0.066238f, 0.042046f, 0.020017f, 0.007896f, 0.002947f, 0.000932f, 0.000152f }; +#undef WMC_TOOL_SKIP + /* clang-format on */ diff --git a/lib_rend/ivas_rom_binauralRenderer.h b/lib_rend/ivas_rom_binauralRenderer.h index c597847a0f..939f6ef78f 100644 --- a/lib_rend/ivas_rom_binauralRenderer.h +++ b/lib_rend/ivas_rom_binauralRenderer.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -44,15 +44,15 @@ /* Binaural rendering data set based on HRIRs */ extern const float FASTCONV_HRIR_latency_s; -extern float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][16][7]; -extern float leftHRIRImag_HOA3[BINAURAL_CONVBANDS][16][7]; -extern float rightHRIRReal_HOA3[BINAURAL_CONVBANDS][16][7]; -extern float rightHRIRImag_HOA3[BINAURAL_CONVBANDS][16][7]; +extern float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS]; +extern float leftHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS]; +extern float rightHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS]; +extern float rightHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS]; -extern float leftHRIRReal[BINAURAL_CONVBANDS][15][7]; -extern float leftHRIRImag[BINAURAL_CONVBANDS][15][7]; -extern float rightHRIRReal[BINAURAL_CONVBANDS][15][7]; -extern float rightHRIRImag[BINAURAL_CONVBANDS][15][7]; +extern float leftHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]; +extern float leftHRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]; +extern float rightHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]; +extern float rightHRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS]; extern float FASTCONV_HOA3_latency_s; extern float hrtfShCoeffsRe[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS]; @@ -61,10 +61,10 @@ extern float hrtfShCoeffsIm[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS]; /* Binaural rendering data set based on BRIRs */ extern const float FASTCONV_BRIR_latency_s; -extern float leftBRIRReal[BINAURAL_CONVBANDS][15][BINAURAL_NTAPS_MAX]; -extern float leftBRIRImag[BINAURAL_CONVBANDS][15][BINAURAL_NTAPS_MAX]; -extern float rightBRIRReal[BINAURAL_CONVBANDS][15][BINAURAL_NTAPS_MAX]; -extern float rightBRIRImag[BINAURAL_CONVBANDS][15][BINAURAL_NTAPS_MAX]; +extern float leftBRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS_MAX]; +extern float leftBRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS_MAX]; +extern float rightBRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS_MAX]; +extern float rightBRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS_MAX]; /* Reverberation parameters based on BRIRs for fastconv */ extern float fastconvReverberationTimes[CLDFB_NO_CHANNELS_MAX]; diff --git a/lib_rend/ivas_rom_binaural_crend_head.c b/lib_rend/ivas_rom_binaural_crend_head.c index ae08a9b4bd..50cf533592 100644 --- a/lib_rend/ivas_rom_binaural_crend_head.c +++ b/lib_rend/ivas_rom_binaural_crend_head.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,8 +37,8 @@ *------------------------------------------------------------------------*/ /* Binaural rendering data set based on HRIRs */ -/* Tables generated by the exe at "scripts/binauralRenderer_interface/generate_cren_ivas_tables*.* */ -/* Can be replaced by your own generated HRIR or BRIRI tables */ +/* Tables generated by scripts/binauralRenderer_interface/generate_cren_ivas_tables.c, see mixer_conv_sofa_to_rom_table_converter_readme.txt */ +/* Can be replaced by your own generated HRIR or BRIR tables */ @@ -47,10 +47,17 @@ #include "cnst.h" #include "ivas_cnst.h" +#define WMC_TOOL_SKIP -/********************** Sample Rate = 48000 **********************/ +/********************** CRendBin_Combined_HRIR **********************/ +#ifdef FIX_BINAURAL_DELAY_PRECISION +const float CRendBin_Combined_HRIR_latency_s = 0.000020834f; +#else +const float CRendBin_Combined_HRIR_latency_s = 0.000020833333110f; +#endif + +/* Sample Rate = 48000 */ -const float CRendBin_Combined_HRIR_latency_s_48kHz = 0.000020833333110f; const int16_t CRendBin_Combined_HRIR_max_num_iterations_48kHz = 1; const uint16_t CRendBin_Combined_HRIR_num_iterations_48kHz[15][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1} }; const uint16_t CRendBin_Combined_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS] = {0, 0}; @@ -305,9 +312,8 @@ const float CRendBin_Combined_HRIR_coeff_im_48kHz[15][BINAURAL_CHANNELS][240]={ const float *CRendBin_Combined_HRIR_coeff_diffuse_re_48kHz[BINAURAL_CHANNELS]={NULL,NULL}; const float *CRendBin_Combined_HRIR_coeff_diffuse_im_48kHz[BINAURAL_CHANNELS]={NULL,NULL}; -/********************** Sample Rate = 32000 **********************/ +/* Sample Rate = 32000 */ -const float CRendBin_Combined_HRIR_latency_s_32kHz = 0.000020833333110f; const int16_t CRendBin_Combined_HRIR_max_num_iterations_32kHz = 1; const uint16_t CRendBin_Combined_HRIR_num_iterations_32kHz[15][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1} }; const uint16_t CRendBin_Combined_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS] = {0, 0}; @@ -502,9 +508,8 @@ const float CRendBin_Combined_HRIR_coeff_im_32kHz[15][BINAURAL_CHANNELS][160]={ const float *CRendBin_Combined_HRIR_coeff_diffuse_re_32kHz[BINAURAL_CHANNELS]={NULL,NULL}; const float *CRendBin_Combined_HRIR_coeff_diffuse_im_32kHz[BINAURAL_CHANNELS]={NULL,NULL}; -/********************** Sample Rate = 16000 **********************/ +/* Sample Rate = 16000 */ -const float CRendBin_Combined_HRIR_latency_s_16kHz = 0.000020833333110f; const int16_t CRendBin_Combined_HRIR_max_num_iterations_16kHz = 1; const uint16_t CRendBin_Combined_HRIR_num_iterations_16kHz[15][BINAURAL_CHANNELS]={{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1} }; const uint16_t CRendBin_Combined_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS] = {0, 0}; @@ -639,9 +644,16 @@ const float CRendBin_Combined_HRIR_coeff_im_16kHz[15][BINAURAL_CHANNELS][80]={ const float *CRendBin_Combined_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS]={NULL,NULL}; const float *CRendBin_Combined_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]={NULL,NULL}; -/********************** Sample Rate = 48000 **********************/ +/********************** CRendBin_HOA3_HRIR **********************/ + +#ifdef FIX_BINAURAL_DELAY_PRECISION +const float CRendBin_HOA3_HRIR_latency_s = 0.001333334f; +#else +const float CRendBin_HOA3_HRIR_latency_s = 0.001333333319053f; +#endif + +/* Sample Rate = 48000 */ -const float CRendBin_HOA3_HRIR_latency_s_48kHz = 0.001333333319053f; const int16_t CRendBin_HOA3_HRIR_max_num_iterations_48kHz = 2; const uint16_t CRendBin_HOA3_HRIR_num_iterations_48kHz[16][BINAURAL_CHANNELS]={{2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2} }; const uint16_t CRendBin_HOA3_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS] = {0, 0}; @@ -1432,9 +1444,8 @@ const float CRendBin_HOA3_HRIR_coeff_im_48kHz[16][BINAURAL_CHANNELS][480]={ const float *CRendBin_HOA3_HRIR_coeff_diffuse_re_48kHz[BINAURAL_CHANNELS]={NULL,NULL}; const float *CRendBin_HOA3_HRIR_coeff_diffuse_im_48kHz[BINAURAL_CHANNELS]={NULL,NULL}; -/********************** Sample Rate = 32000 **********************/ +/* Sample Rate = 32000 */ -const float CRendBin_HOA3_HRIR_latency_s_32kHz = 0.001333333319053f; const int16_t CRendBin_HOA3_HRIR_max_num_iterations_32kHz = 2; const uint16_t CRendBin_HOA3_HRIR_num_iterations_32kHz[16][BINAURAL_CHANNELS]={{2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2} }; const uint16_t CRendBin_HOA3_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS] = {0, 0}; @@ -1769,9 +1780,8 @@ const float CRendBin_HOA3_HRIR_coeff_im_32kHz[16][BINAURAL_CHANNELS][320]={ const float *CRendBin_HOA3_HRIR_coeff_diffuse_re_32kHz[BINAURAL_CHANNELS]={NULL,NULL}; const float *CRendBin_HOA3_HRIR_coeff_diffuse_im_32kHz[BINAURAL_CHANNELS]={NULL,NULL}; -/********************** Sample Rate = 16000 **********************/ +/* Sample Rate = 16000 */ -const float CRendBin_HOA3_HRIR_latency_s_16kHz = 0.001333333319053f; const int16_t CRendBin_HOA3_HRIR_max_num_iterations_16kHz = 2; const uint16_t CRendBin_HOA3_HRIR_num_iterations_16kHz[16][BINAURAL_CHANNELS]={{2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 2} }; const uint16_t CRendBin_HOA3_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS] = {0, 0}; @@ -1978,9 +1988,16 @@ const float CRendBin_HOA3_HRIR_coeff_im_16kHz[16][BINAURAL_CHANNELS][160]={ const float *CRendBin_HOA3_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS]={NULL,NULL}; const float *CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]={NULL,NULL}; -/********************** Sample Rate = 48000 **********************/ +/********************** CRendBin_Combined_BRIR **********************/ + +#ifdef FIX_BINAURAL_DELAY_PRECISION +const float CRendBin_Combined_BRIR_latency_s = 0.000145834f; +#else +const float CRendBin_Combined_BRIR_latency_s = 0.000145833328133f; +#endif + +/* Sample Rate = 48000 */ -const float CRendBin_Combined_BRIR_latency_s_48kHz = 0.000145833328133f; const int16_t CRendBin_Combined_BRIR_max_num_iterations_48kHz = 22; const uint16_t CRendBin_Combined_BRIR_num_iterations_48kHz[15][BINAURAL_CHANNELS]={{22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22} }; const uint16_t CRendBin_Combined_BRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS] = {40, 40}; @@ -4015,9 +4032,8 @@ const float CRendBin_Combined_BRIR_coeff_diffuse_im_48kHz[BINAURAL_CHANNELS][288 0.008540f, 0.000569f, 0.002267f, -0.000988f, 0.001342f} }; -/********************** Sample Rate = 32000 **********************/ +/* Sample Rate = 32000 */ -const float CRendBin_Combined_BRIR_latency_s_32kHz = 0.000145833328133f; const int16_t CRendBin_Combined_BRIR_max_num_iterations_32kHz = 22; const uint16_t CRendBin_Combined_BRIR_num_iterations_32kHz[15][BINAURAL_CHANNELS]={{22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22}, {22, 22} }; const uint16_t CRendBin_Combined_BRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS] = {40, 40}; @@ -5976,9 +5992,8 @@ const float CRendBin_Combined_BRIR_coeff_diffuse_im_32kHz[BINAURAL_CHANNELS][287 -0.030519f, 0.027258f, -0.004872f, -0.024412f, -0.025958f, 0.005865f, -0.034537f, -0.048705f, 0.008013f, -0.011347f, -0.010463f, -0.010480f, 0.009340f, -0.029039f, 0.030517f, -0.017776f, 0.020717f, -0.014466f, -0.013902f, 0.000316f, 0.016725f, -0.023690f, -0.022640f, 0.012110f, -0.004311f, 0.033404f, -0.014684f, 0.019133f, 0.028780f, 0.013672f, -0.010535f, -0.004820f, -0.003049f, 0.023610f, -0.008334f, 0.015840f, 0.031862f, -0.026837f, -0.046802f, -0.018449f, 0.015820f, 0.019420f, -0.022107f, 0.036264f, -0.011732f, -0.013165f, -0.004432f, -0.004019f, -0.011290f, -0.029439f, -0.012475f, -0.030418f, -0.029136f, -0.018067f, 0.021415f, 0.005020f, -0.005215f, 0.001915f, 0.033137f, 0.031128f, 0.002152f, -0.014470f, 0.005893f, -0.003315f, 0.013612f, 0.004239f, -0.006009f, -0.013786f, -0.001289f, -0.002803f, -0.021865f, -0.005694f, 0.008246f, 0.022588f, -0.010185f, -0.000025f, 0.008581f, -0.012767f, -0.000458f, -0.000932f, 0.000324f, -0.006676f, 0.008426f, 0.000455f, 0.002150f, -0.001106f} }; -/********************** Sample Rate = 16000 **********************/ +/* Sample Rate = 16000 */ -const float CRendBin_Combined_BRIR_latency_s_16kHz = 0.000145833328133f; const int16_t CRendBin_Combined_BRIR_max_num_iterations_16kHz = 23; const uint16_t CRendBin_Combined_BRIR_num_iterations_16kHz[15][BINAURAL_CHANNELS]={{23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23}, {23, 23} }; const uint16_t CRendBin_Combined_BRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS] = {40, 40}; @@ -7301,3 +7316,4 @@ const float CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS][252 0.050578f, 0.012222f, 0.020049f, -0.020057f, -0.032135f, -0.002553f, -0.037541f, -0.023567f, -0.008392f, -0.012215f, 0.001644f, -0.001142f, 0.000540f, 0.001404f, -0.027979f, -0.022362f, -0.012091f, -0.022963f, 0.009075f, 0.010977f, -0.007069f, -0.000183f, -0.022228f, -0.001348f, 0.006548f, -0.003034f} }; +#undef WMC_TOOL_SKIP diff --git a/lib_rend/ivas_rom_binaural_crend_head.h b/lib_rend/ivas_rom_binaural_crend_head.h index af012e7fa6..64582a1672 100644 --- a/lib_rend/ivas_rom_binaural_crend_head.h +++ b/lib_rend/ivas_rom_binaural_crend_head.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,8 +37,8 @@ *------------------------------------------------------------------------*/ /* Binaural rendering data set based on HRIRs */ -/* Tables generated by the exe at "scripts/binauralRenderer_interface/generate_cren_ivas_tables*.* */ -/* Can be replaced by your own generated HRIR or BRIRI tables */ +/* Tables generated by scripts/binauralRenderer_interface/generate_cren_ivas_tables.c, see mixer_conv_sofa_to_rom_table_converter_readme.txt */ +/* Can be replaced by your own generated HRIR or BRIR tables */ @@ -50,9 +50,12 @@ #include "ivas_cnst.h" -/********************** Sample Rate = 48000 **********************/ +/********************** CRendBin_Combined_HRIR **********************/ + +extern float CRendBin_Combined_HRIR_latency_s; + +/* Sample Rate = 48000 */ -extern float CRendBin_Combined_HRIR_latency_s_48kHz; extern int16_t CRendBin_Combined_HRIR_max_num_iterations_48kHz; extern uint16_t CRendBin_Combined_HRIR_num_iterations_48kHz[15][BINAURAL_CHANNELS]; extern uint16_t CRendBin_Combined_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS]; @@ -65,9 +68,8 @@ extern float CRendBin_Combined_HRIR_coeff_im_48kHz[15][BINAURAL_CHANNELS][240]; extern float *CRendBin_Combined_HRIR_coeff_diffuse_re_48kHz[BINAURAL_CHANNELS]; extern float *CRendBin_Combined_HRIR_coeff_diffuse_im_48kHz[BINAURAL_CHANNELS]; -/********************** Sample Rate = 32000 **********************/ +/* Sample Rate = 32000 */ -extern float CRendBin_Combined_HRIR_latency_s_32kHz; extern int16_t CRendBin_Combined_HRIR_max_num_iterations_32kHz; extern uint16_t CRendBin_Combined_HRIR_num_iterations_32kHz[15][BINAURAL_CHANNELS]; extern uint16_t CRendBin_Combined_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS]; @@ -80,9 +82,8 @@ extern float CRendBin_Combined_HRIR_coeff_im_32kHz[15][BINAURAL_CHANNELS][160]; extern float *CRendBin_Combined_HRIR_coeff_diffuse_re_32kHz[BINAURAL_CHANNELS]; extern float *CRendBin_Combined_HRIR_coeff_diffuse_im_32kHz[BINAURAL_CHANNELS]; -/********************** Sample Rate = 16000 **********************/ +/* Sample Rate = 16000 */ -extern float CRendBin_Combined_HRIR_latency_s_16kHz; extern int16_t CRendBin_Combined_HRIR_max_num_iterations_16kHz; extern uint16_t CRendBin_Combined_HRIR_num_iterations_16kHz[15][BINAURAL_CHANNELS]; extern uint16_t CRendBin_Combined_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS]; @@ -95,9 +96,12 @@ extern float CRendBin_Combined_HRIR_coeff_im_16kHz[15][BINAURAL_CHANNELS][80]; extern float *CRendBin_Combined_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS]; extern float *CRendBin_Combined_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]; -/********************** Sample Rate = 48000 **********************/ +/********************** CRendBin_HOA3_HRIR **********************/ + +extern float CRendBin_HOA3_HRIR_latency_s; + +/* Sample Rate = 48000 */ -extern float CRendBin_HOA3_HRIR_latency_s_48kHz; extern int16_t CRendBin_HOA3_HRIR_max_num_iterations_48kHz; extern uint16_t CRendBin_HOA3_HRIR_num_iterations_48kHz[16][BINAURAL_CHANNELS]; extern uint16_t CRendBin_HOA3_HRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS]; @@ -110,9 +114,8 @@ extern float CRendBin_HOA3_HRIR_coeff_im_48kHz[16][BINAURAL_CHANNELS][480]; extern float *CRendBin_HOA3_HRIR_coeff_diffuse_re_48kHz[BINAURAL_CHANNELS]; extern float *CRendBin_HOA3_HRIR_coeff_diffuse_im_48kHz[BINAURAL_CHANNELS]; -/********************** Sample Rate = 32000 **********************/ +/* Sample Rate = 32000 */ -extern float CRendBin_HOA3_HRIR_latency_s_32kHz; extern int16_t CRendBin_HOA3_HRIR_max_num_iterations_32kHz; extern uint16_t CRendBin_HOA3_HRIR_num_iterations_32kHz[16][BINAURAL_CHANNELS]; extern uint16_t CRendBin_HOA3_HRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS]; @@ -125,9 +128,8 @@ extern float CRendBin_HOA3_HRIR_coeff_im_32kHz[16][BINAURAL_CHANNELS][320]; extern float *CRendBin_HOA3_HRIR_coeff_diffuse_re_32kHz[BINAURAL_CHANNELS]; extern float *CRendBin_HOA3_HRIR_coeff_diffuse_im_32kHz[BINAURAL_CHANNELS]; -/********************** Sample Rate = 16000 **********************/ +/* Sample Rate = 16000 */ -extern float CRendBin_HOA3_HRIR_latency_s_16kHz; extern int16_t CRendBin_HOA3_HRIR_max_num_iterations_16kHz; extern uint16_t CRendBin_HOA3_HRIR_num_iterations_16kHz[16][BINAURAL_CHANNELS]; extern uint16_t CRendBin_HOA3_HRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS]; @@ -140,9 +142,12 @@ extern float CRendBin_HOA3_HRIR_coeff_im_16kHz[16][BINAURAL_CHANNELS][160]; extern float *CRendBin_HOA3_HRIR_coeff_diffuse_re_16kHz[BINAURAL_CHANNELS]; extern float *CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS]; -/********************** Sample Rate = 48000 **********************/ +/********************** CRendBin_Combined_BRIR **********************/ + +extern float CRendBin_Combined_BRIR_latency_s; + +/* Sample Rate = 48000 */ -extern float CRendBin_Combined_BRIR_latency_s_48kHz; extern int16_t CRendBin_Combined_BRIR_max_num_iterations_48kHz; extern uint16_t CRendBin_Combined_BRIR_num_iterations_48kHz[15][BINAURAL_CHANNELS]; extern uint16_t CRendBin_Combined_BRIR_num_iterations_diffuse_48kHz[BINAURAL_CHANNELS]; @@ -155,9 +160,8 @@ extern float CRendBin_Combined_BRIR_coeff_im_48kHz[15][BINAURAL_CHANNELS][2955]; extern float CRendBin_Combined_BRIR_coeff_diffuse_re_48kHz[BINAURAL_CHANNELS][2885]; extern float CRendBin_Combined_BRIR_coeff_diffuse_im_48kHz[BINAURAL_CHANNELS][2885]; -/********************** Sample Rate = 32000 **********************/ +/* Sample Rate = 32000 */ -extern float CRendBin_Combined_BRIR_latency_s_32kHz; extern int16_t CRendBin_Combined_BRIR_max_num_iterations_32kHz; extern uint16_t CRendBin_Combined_BRIR_num_iterations_32kHz[15][BINAURAL_CHANNELS]; extern uint16_t CRendBin_Combined_BRIR_num_iterations_diffuse_32kHz[BINAURAL_CHANNELS]; @@ -170,9 +174,8 @@ extern float CRendBin_Combined_BRIR_coeff_im_32kHz[15][BINAURAL_CHANNELS][2819]; extern float CRendBin_Combined_BRIR_coeff_diffuse_re_32kHz[BINAURAL_CHANNELS][2870]; extern float CRendBin_Combined_BRIR_coeff_diffuse_im_32kHz[BINAURAL_CHANNELS][2870]; -/********************** Sample Rate = 16000 **********************/ +/* Sample Rate = 16000 */ -extern float CRendBin_Combined_BRIR_latency_s_16kHz; extern int16_t CRendBin_Combined_BRIR_max_num_iterations_16kHz; extern uint16_t CRendBin_Combined_BRIR_num_iterations_16kHz[15][BINAURAL_CHANNELS]; extern uint16_t CRendBin_Combined_BRIR_num_iterations_diffuse_16kHz[BINAURAL_CHANNELS]; diff --git a/lib_rend/ivas_rom_rend.c b/lib_rend/ivas_rom_rend.c index cf0c7c69a9..dd8ca99d80 100644 --- a/lib_rend/ivas_rom_rend.c +++ b/lib_rend/ivas_rom_rend.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -43,12 +43,6 @@ * FASTCONV and PARAMETRIC binaural renderer ROM tables *----------------------------------------------------------------------------------*/ -const float dmxmtx[BINAURAL_CHANNELS][11] = -{ - { 1.0f, 0.0f, 0.70709997f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f }, - { 0.0f, 1.0f, 0.70709997f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f }, -}; - /* * 0 = 30,0 * 1 = -30,0 @@ -72,33 +66,47 @@ const int16_t channelIndex_CICP14[7] = { 0, 1, 2, 5, 6, 9, 10 }; const int16_t channelIndex_CICP16[9] = { 0, 1, 2, 5, 6, 9, 10, 11, 12 }; const int16_t channelIndex_CICP19[11] = { 0, 1, 2, 3, 4, 7, 8, 9, 10, 13, 14 }; -/*----------------------------------------------------------------------------------* - * TD ISm binaural renderer ROM tables - *----------------------------------------------------------------------------------*/ - /* The maximum target times set to 100 msec. */ -const int16_t TDREND_SRC_REND_MaxTargetTimes[IVAS_NUM_SUPPORTED_FS] = -{ - 1600, 3200, 4800 /* Corresponds to 16kHz, 32kHz, 48kHz */ +const float surCohEne[MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS] = +{ + 3.0903f, 2.0053f, 1.0860f, 0.8072f, 0.7079f +}; + +const float spreadCohEne05[MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS] = +{ + 2.3988f, 1.7783f, 1.1220f, 1.1220f, 1.1220f +}; + +const float spreadCohEne1[MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS] = +{ + 1.5975f, 1.1220f, 1.1220f, 1.1220f, 1.1220f }; -/* The maximum lengths of the blocks internally in the effect. Corresponds to 6 msec. This means also that */ -/* if the length of the input block is just above 6 msec, the block will be divided into two 3 msec blocks. */ -const int16_t TDREND_SRC_REND_MaxBlockLengths[IVAS_NUM_SUPPORTED_FS] = +const float lowBitRateBinauralEQ[LOW_BIT_RATE_BINAURAL_EQ_BINS] = +{ + 0.979f, 0.893f, 0.762f, 0.615f, 0.52f, 0.48f, 0.477f, 0.477f, 0.48f, 0.501f, 0.546f, 0.602f, 0.652f, 0.664f, 0.652f, 0.639f, 0.635f +}; + +const float diffuseFieldCoherenceDifferenceX[BINAURAL_COHERENCE_DIFFERENCE_BINS] = { - 96, 192, 288 /* Corresponds to 16kHz, 32kHz, 48kHz */ + 0.047421f, 0.19773f, 0.22582f, 0.10637f, 0.0087111f, 0.012028f, 0.031972f, 0.019668f, 0.0079928f }; -const int16_t TDREND_MaxITD[IVAS_NUM_SUPPORTED_FS] = +const float diffuseFieldCoherenceDifferenceY[BINAURAL_COHERENCE_DIFFERENCE_BINS] = { - 111, 222, 333 /* Corresponds to 16kHz, 32kHz, 48kHz */ + -0.095628f, -0.30569f, -0.34427f, -0.15425f, -0.044628f, -0.057224f, -0.050835f, -0.035214f, -0.02215f }; -const float TDREND_MaxITD_Incr[IVAS_NUM_SUPPORTED_FS] = +const float diffuseFieldCoherenceDifferenceZ[BINAURAL_COHERENCE_DIFFERENCE_BINS] = { - 0.0925f, 0.1850f, 0.2775f /* Corresponds to 16kHz, 32kHz, 48kHz, e.g. ( ( 2 * MaxITD ) / ( 0.05 * 48000 ) ) */ + 0.048207f, 0.10796f, 0.11845f, 0.047886f, 0.035917f, 0.045196f, 0.018863f, 0.015547f, 0.014157f }; + +/*----------------------------------------------------------------------------------* + * TD ISM binaural renderer ROM tables + *----------------------------------------------------------------------------------*/ + const int16_t HRTF_MODEL_N_CPTS_VAR[HRTF_MODEL_N_SECTIONS] = { 13, 12, 11 @@ -333,25 +341,8 @@ const float ivas_reverb_default_DSR[IVAS_REVERB_DEFAULT_N_BANDS] = /* CICP1 - Mono */ const float ls_azimuth_CICP1[1] = { 0.0f }; const float ls_elevation_CICP1[1] = { 0.0f }; -const uint32_t ls_LFE_last_idx_CICP1[1] = { 0 }; - -/* CICP2 - Stereo */ -const uint32_t ls_LFE_last_idx_CICP2[2] = { 0, 1 }; - -/* CICP6 - 5.1 */ -const uint32_t ls_LFE_last_idx_CICP6[6] = { 0, 1, 2, 4, 5, 3 }; -/* CICP12 - 7.1 */ -const uint32_t ls_LFE_last_idx_CICP12[8] = { 0, 1, 2, 4, 5, 6, 7, 3 }; -/* CICP14 - 5.1.2 */ -const uint32_t ls_LFE_last_idx_CICP14[8] = { 0, 1, 2, 4, 5, 6, 7, 3 }; - -/* CICP16 - 5.1.4 */ -const uint32_t ls_LFE_last_idx_CICP16[10] = { 0, 1, 2, 4, 5, 6, 7, 8, 9, 3 }; - -/* CICP19 - 7.1.4 */ -const uint32_t ls_LFE_last_idx_CICP19[12] = { 0, 1, 2, 4, 5, 6, 7, 8, 9, 10, 11, 3 }; /*----------------------------------------------------------------------------------* * LS Renderer ROM tables @@ -365,14 +356,14 @@ const float ls_conversion_cicpX_mono[12][1] = {1.00000000f}, {1.00000000f}, {1.00000000f}, - {1.00000000f}, - {1.00000000f}, - {1.00000000f}, - {1.00000000f}, - {1.00000000f}, - {1.00000000f}, - {1.00000000f}, - {1.00000000f}, + {0.79999995f}, + {0.79999995f}, + {0.79999995f}, + {0.79999995f}, + {0.849999964f}, + {0.849999964f}, + {0.849999964f}, + {0.849999964f} }; const float ls_conversion_cicpX_stereo[12][2] = diff --git a/lib_rend/ivas_rom_rend.h b/lib_rend/ivas_rom_rend.h index 2ff892071b..ae1bb654e6 100644 --- a/lib_rend/ivas_rom_rend.h +++ b/lib_rend/ivas_rom_rend.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -45,23 +45,31 @@ * FASTCONV and PARAMETRIC binaural renderer ROM tables *----------------------------------------------------------------------------------*/ -extern const float dmxmtx[BINAURAL_CHANNELS][11]; - extern const int16_t channelIndex_CICP6[5]; extern const int16_t channelIndex_CICP12[7]; extern const int16_t channelIndex_CICP14[7]; extern const int16_t channelIndex_CICP16[9]; extern const int16_t channelIndex_CICP19[11]; +/* These are equalization values for spread and surround coherent sounds, approximating the spectrum + * for such sounds at anechoic multichannel listening. */ +extern const float surCohEne[MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS]; +extern const float spreadCohEne05[MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS]; +extern const float spreadCohEne1[MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS]; + +/* Values for low-bit-rate equalization */ +extern const float lowBitRateBinauralEQ[LOW_BIT_RATE_BINAURAL_EQ_BINS]; + +/* Diffuse field binaural coherence directional adjustment values */ +extern const float diffuseFieldCoherenceDifferenceX[BINAURAL_COHERENCE_DIFFERENCE_BINS]; +extern const float diffuseFieldCoherenceDifferenceY[BINAURAL_COHERENCE_DIFFERENCE_BINS]; +extern const float diffuseFieldCoherenceDifferenceZ[BINAURAL_COHERENCE_DIFFERENCE_BINS]; + + /*----------------------------------------------------------------------------------* * TD ISM Object renderer *----------------------------------------------------------------------------------*/ -extern const int16_t TDREND_SRC_REND_MaxTargetTimes[IVAS_NUM_SUPPORTED_FS]; -extern const int16_t TDREND_SRC_REND_MaxBlockLengths[IVAS_NUM_SUPPORTED_FS]; -extern const int16_t TDREND_MaxITD[IVAS_NUM_SUPPORTED_FS]; -extern const float TDREND_MaxITD_Incr[IVAS_NUM_SUPPORTED_FS]; - extern const int16_t HRTF_MODEL_N_CPTS_VAR[HRTF_MODEL_N_SECTIONS]; extern const float SincTable[321]; @@ -96,16 +104,9 @@ extern const float ivas_reverb_default_DSR[]; * Renderer SBA & MC enc/dec matrices *----------------------------------------------------------------------------------*/ -extern const float hoa_dec_mtx_CICP1[16]; extern const float ls_azimuth_CICP1[1]; extern const float ls_elevation_CICP1[1]; -extern const uint32_t ls_LFE_last_idx_CICP1[1]; -extern const uint32_t ls_LFE_last_idx_CICP2[2]; -extern const uint32_t ls_LFE_last_idx_CICP6[6]; -extern const uint32_t ls_LFE_last_idx_CICP12[8]; -extern const uint32_t ls_LFE_last_idx_CICP14[8]; -extern const uint32_t ls_LFE_last_idx_CICP16[10]; -extern const uint32_t ls_LFE_last_idx_CICP19[12]; + /*----------------------------------------------------------------------------------* * LS Configuration Converter ROM tables @@ -114,26 +115,6 @@ extern const uint32_t ls_LFE_last_idx_CICP19[12]; /* Downmix matrices */ extern const float ls_conversion_cicpX_mono[12][1]; extern const float ls_conversion_cicpX_stereo[12][2]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp12_cicp6[]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp14_cicp6[]; -#ifdef FIX_I54_LS_CONVERSION -extern const LS_CONVERSION_MATRIX ls_conversion_cicp14_cicp12[]; -#endif -extern const LS_CONVERSION_MATRIX ls_conversion_cicp16_cicp6[]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp16_cicp14[]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp19_cicp6[]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp19_cicp12[]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp19_cicp14[]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp19_cicp16[]; - -/* Upmix matrices */ -extern const LS_CONVERSION_MATRIX ls_conversion_cicp12_cicp14[]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp12_cicp16[]; -#ifdef FIX_I54_LS_CONVERSION -extern const LS_CONVERSION_MATRIX ls_conversion_cicp12_cicp19[]; -#endif -extern const LS_CONVERSION_MATRIX ls_conversion_cicp14_cicp19[]; -extern const LS_CONVERSION_MATRIX ls_conversion_cicp16_cicp19[]; /* Mapping table of input config : output config with corresponding matrix */ extern const LS_CONVERSION_MAPPING ls_conversion_mapping[]; diff --git a/lib_rend/ivas_rotation.c b/lib_rend/ivas_rotation.c index 606dfa7515..596dc8f918 100644 --- a/lib_rend/ivas_rotation.c +++ b/lib_rend/ivas_rotation.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -30,20 +30,18 @@ *******************************************************************************************************/ +#include "ivas_cnst.h" #include #include #include "options.h" #include #include "cnst.h" #include "prot.h" -#include "ivas_prot.h" -#include "ivas_cnst.h" -#include "ivas_rom_com.h" -#include "ivas_rom_dec.h" +#include "ivas_prot_rend.h" #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" /*-----------------------------------------------------------------------* @@ -57,9 +55,10 @@ ivas_error ivas_headTrack_open( ) { int16_t i; + ivas_error error; /* Allocate Head-Tracking handle */ - if ( ( *hHeadTrackData = (HEAD_TRACK_DATA_HANDLE) count_malloc( sizeof( HEAD_TRACK_DATA ) ) ) == NULL ) + if ( ( *hHeadTrackData = (HEAD_TRACK_DATA_HANDLE) malloc( sizeof( HEAD_TRACK_DATA ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for head-tracking memory\n" ) ); } @@ -69,6 +68,15 @@ ivas_error ivas_headTrack_open( ( *hHeadTrackData )->lrSwitchInterpVal = 0.0f; ( *hHeadTrackData )->lrSwitchedCurrent = 0; ( *hHeadTrackData )->lrSwitchedNext = 0; + if ( ( ( *hHeadTrackData )->OrientationTracker = (ivas_orient_trk_state_t *) malloc( sizeof( ivas_orient_trk_state_t ) ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Orientation tracking" ); + } + + if ( ( error = ivas_orient_trk_Init( ( *hHeadTrackData )->OrientationTracker ) ) != IVAS_ERR_OK ) + { + return error; + } /* Initialise Rmat_prev to I, Rmat will be computed later */ for ( i = 0; i < 3; i++ ) @@ -80,10 +88,43 @@ ivas_error ivas_headTrack_open( ( *hHeadTrackData )->sr_pose_pred_axis = DEFAULT_AXIS; #endif + set_zero( ( *hHeadTrackData )->chEneIIR[0], MASA_FREQUENCY_BANDS ); + set_zero( ( *hHeadTrackData )->chEneIIR[1], MASA_FREQUENCY_BANDS ); + set_zero( ( *hHeadTrackData )->procChEneIIR[0], MASA_FREQUENCY_BANDS ); + set_zero( ( *hHeadTrackData )->procChEneIIR[1], MASA_FREQUENCY_BANDS ); + return IVAS_ERR_OK; } +/*-----------------------------------------------------------------------* + * ivas_headTrack_close() + * + * Deallocate Head-Tracking handle + *-----------------------------------------------------------------------*/ + +void ivas_headTrack_close( + HEAD_TRACK_DATA_HANDLE *hHeadTrackData /* i/o: head track handle */ +) +{ + if ( hHeadTrackData == NULL || *hHeadTrackData == NULL ) + { + return; + } + + if ( ( *hHeadTrackData )->OrientationTracker != NULL ) + { + free( ( *hHeadTrackData )->OrientationTracker ); + ( *hHeadTrackData )->OrientationTracker = NULL; + } + + free( ( *hHeadTrackData ) ); + *hHeadTrackData = NULL; + + return; +} + + /*---------------------------------------------------------------------------------- * QuatToRotMat() * @@ -95,33 +136,10 @@ void QuatToRotMat( float Rmat[3][3] /* o : real-space rotation matrix for this rotation */ ) { - float s1, s2, s3, c1, c2, c3; -#ifdef DEBUGGING - /* PrintQuat( quat ); */ -#endif - - /* For debugging purposes we can also calculate the rotation matrix from - * Euler angles instead of quaternions. In this case, all the w values must - * be set to -3.0 in the trajectory file to signal switching to Euler angles. - * The x,y, and z components of the quaternion are then interpreted as - * yaw-pitch-roll. - */ - if ( quat.w != -3.0 ) - { - Rmat[0][0] = quat.w * quat.w + quat.x * quat.x - quat.y * quat.y - quat.z * quat.z; - Rmat[0][1] = 2.0f * ( quat.x * quat.y - quat.w * quat.z ); - Rmat[0][2] = 2.0f * ( quat.x * quat.z + quat.w * quat.y ); - - Rmat[1][0] = 2.0f * ( quat.x * quat.y + quat.w * quat.z ); - Rmat[1][1] = quat.w * quat.w - quat.x * quat.x + quat.y * quat.y - quat.z * quat.z; - Rmat[1][2] = 2.0f * ( quat.y * quat.z - quat.w * quat.x ); - - Rmat[2][0] = 2.0f * ( quat.x * quat.z - quat.w * quat.y ); - Rmat[2][1] = 2.0f * ( quat.y * quat.z + quat.w * quat.x ); - Rmat[2][2] = quat.w * quat.w - quat.x * quat.x - quat.y * quat.y + quat.z * quat.z; - } - else +#ifdef SPLIT_REND_WITH_HEAD_ROT + if ( quat.w == -3.0 ) { + float c1, c2, c3, s1, s2, s3; /* Euler angles in R_X(roll)*R_Y(pitch)*R_Z(yaw) convention * * yaw: rotate scene counter-clockwise in the horizontal plane @@ -149,6 +167,59 @@ void QuatToRotMat( Rmat[2][1] = c3 * s1 + c1 * s2 * s3; Rmat[2][2] = c1 * c2; } + else +#endif + { + Rmat[0][0] = quat.w * quat.w + quat.x * quat.x - quat.y * quat.y - quat.z * quat.z; + Rmat[0][1] = 2.0f * ( quat.x * quat.y - quat.w * quat.z ); + Rmat[0][2] = 2.0f * ( quat.x * quat.z + quat.w * quat.y ); + + Rmat[1][0] = 2.0f * ( quat.x * quat.y + quat.w * quat.z ); + Rmat[1][1] = quat.w * quat.w - quat.x * quat.x + quat.y * quat.y - quat.z * quat.z; + Rmat[1][2] = 2.0f * ( quat.y * quat.z - quat.w * quat.x ); + + Rmat[2][0] = 2.0f * ( quat.x * quat.z - quat.w * quat.y ); + Rmat[2][1] = 2.0f * ( quat.y * quat.z + quat.w * quat.x ); + Rmat[2][2] = quat.w * quat.w - quat.x * quat.x - quat.y * quat.y + quat.z * quat.z; + } + + return; +} + + +/*------------------------------------------------------------------------- + * Euler2Quat() + * + * Calculate corresponding Quaternion from Euler angles in radians + *------------------------------------------------------------------------*/ +void Euler2Quat( + const float yaw, /* i : yaw (x) */ + const float pitch, /* i : pitch (y) */ + const float roll, /* i : roll (z) */ + IVAS_QUATERNION *quat /* o : quaternion describing the rotation */ +) +{ + float cr = cosf( roll * 0.5f ); + float sr = sinf( roll * 0.5f ); + float cp = cosf( pitch * 0.5f ); +#ifdef EUALER2QUAT_FIX + float sp = sinf( pitch * 0.5f ); +#else + float sp = sinf( -pitch * 0.5f ); +#endif + float cy = cosf( yaw * 0.5f ); + float sy = sinf( yaw * 0.5f ); +#ifdef EUALER2QUAT_FIX + quat->w = cr * cp * cy + sr * sp * sy; + quat->x = sr * cp * cy - cr * sp * sy; + quat->y = sr * cp * sy + cr * sp * cy; + quat->z = cr * cp * sy - sr * sp * cy; +#else + quat->w = cr * cp * cy - sr * sp * sy; + quat->x = sr * cp * cy + cr * sp * sy; + quat->y = cr * sp * cy - sr * cp * sy; + quat->z = cr * cp * sy + sr * sp * cy; +#endif return; } @@ -169,8 +240,17 @@ void Quat2EulerDegree( { if ( quat.w != -3.0 ) { +#ifdef EUALER2QUAT_FIX + float p; +#endif *yaw = atan2f( 2 * ( quat.w * quat.x + quat.y * quat.z ), 1 - 2 * ( quat.x * quat.x + quat.y * quat.y ) ); +#ifdef EUALER2QUAT_FIX + p = 2 * ( quat.w * quat.y - quat.z * quat.x ); + p = max( -1.0f, min( 1.0f, p ) ); + *pitch = asinf( p ); +#else *pitch = asinf( 2 * ( quat.w * quat.y - quat.z * quat.x ) ); +#endif *roll = atan2f( 2 * ( quat.w * quat.z + quat.x * quat.y ), 1 - 2 * ( quat.y * quat.y + quat.z * quat.z ) ); *yaw *= _180_OVER_PI; *pitch *= _180_OVER_PI; @@ -194,41 +274,25 @@ void Quat2EulerDegree( #endif /*------------------------------------------------------------------------- - * Quat2Euler() + * deg2rad() * - * Quaternion handling: calculate corresponding Euler angles + * Converts degrees to normalized radians *------------------------------------------------------------------------*/ - -void Quat2Euler( - const IVAS_QUATERNION quat, /* i : quaternion describing the rotation */ - float *yaw, /* o : yaw */ - float *pitch, /* o : pitch */ - float *roll /* o : roll */ -) +float deg2rad( + float degrees ) { - if ( quat.w != -3.0 ) + while ( degrees >= 180.0f ) { - *yaw = atan2f( 2 * ( quat.w * quat.x + quat.y * quat.z ), 1 - 2 * ( quat.x * quat.x + quat.y * quat.y ) ); - *pitch = asinf( 2 * ( quat.w * quat.y - quat.z * quat.x ) ); - *roll = atan2f( 2 * ( quat.w * quat.z + quat.x * quat.y ), 1 - 2 * ( quat.y * quat.y + quat.z * quat.z ) ); + degrees = degrees - 360.0f; } - else + while ( degrees <= -180.0f ) { - /* Euler angles in R_X(roll)*R_Y(pitch)*R_Z(yaw) convention - * - * yaw: rotate scene counter-clockwise in the horizontal plane - * pitch: rotate scene in the median plane, increase elevation with positive values - * roll: rotate scene from the right ear to the top - */ - *yaw = quat.z; - *pitch = quat.y; - *roll = quat.x; + degrees = degrees + 360.0f; } - return; + return PI_OVER_180 * degrees; } - /*------------------------------------------------------------------------- * rotateAziEle() * @@ -275,51 +339,6 @@ void rotateAziEle( } -/*------------------------------------------------------------------------- - * rotateAziEle_DirAC() - * - * Apply rotation to DirAC DOAs - *------------------------------------------------------------------------*/ - -void rotateAziEle_DirAC( - int16_t *azi, /* i/o: array of azimuth values */ - int16_t *ele, /* i/o: array of elevation values */ - const int16_t band1, /* i : bands to work on (lower limit) */ - const int16_t band2, /* i : bands to work on (upper bound) */ - const float *p_Rmat /* i : pointer to real-space rotation matrix */ -) -{ - int16_t b; - float dv_0, dv_1, dv_2; - float dv_r_0, dv_r_1, dv_r_2; - float w; - - wmops_sub_start( "rotateAziEle_DirAC" ); - - for ( b = band1; b < band2; b++ ) - { - - /*Conversion spherical to cartesian coordinates*/ - w = cosf( ele[b] * PI_OVER_180 ); - dv_0 = w * cosf( azi[b] * PI_OVER_180 ); - dv_1 = w * sinf( azi[b] * PI_OVER_180 ); - dv_2 = sinf( ele[b] * PI_OVER_180 ); - - dv_r_0 = p_Rmat[0] * dv_0 + p_Rmat[1] * dv_1 + p_Rmat[2] * dv_2; - dv_r_1 = p_Rmat[3] * dv_0 + p_Rmat[4] * dv_1 + p_Rmat[5] * dv_2; - dv_r_2 = p_Rmat[6] * dv_0 + p_Rmat[7] * dv_1 + p_Rmat[8] * dv_2; - - /*Conversion spherical to cartesian coordinates*/ - azi[b] = (int16_t) ( atan2f( dv_r_1, dv_r_0 ) * _180_OVER_PI ); - ele[b] = (int16_t) ( atan2f( dv_r_2, sqrtf( dv_r_0 * dv_r_0 + dv_r_1 * dv_r_1 ) ) * _180_OVER_PI ); - } - - wmops_sub_end(); - - return; -} - - /*------------------------------------------------------------------------- * rotateFrame_shd() * @@ -450,7 +469,7 @@ void rotateFrame_sd( float output_tmp[MAX_CICP_CHANNELS][L_FRAME48k]; float cross_fade[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES]; - wmops_sub_start( "rotateFrame_sd" ); + push_wmops( "rotateFrame_sd" ); nchan = hTransSetup.nchan_out_woLFE + hTransSetup.num_lfe; index_lfe = hTransSetup.index_lfe[0]; @@ -552,7 +571,7 @@ void rotateFrame_sd( mvr2r( &output_tmp[ch_out][subframe_idx * subframe_len], &output[ch_out][subframe_idx * subframe_len], subframe_len ); } - wmops_sub_end(); + pop_wmops(); return; } @@ -678,7 +697,7 @@ void rotateFrame_sd_cldfb( int16_t nInChannels; int16_t isPlanar; - wmops_sub_start( "rotateFrame_sd_cldfb" ); + push_wmops( "rotateFrame_sd_cldfb" ); nInChannels = hOutputSetup->nchan_out_woLFE; isPlanar = 1; @@ -757,7 +776,7 @@ void rotateFrame_sd_cldfb( } } } - wmops_sub_end(); + pop_wmops(); return; } @@ -828,28 +847,33 @@ static float SHrot_v( float R_lm1[HEADROT_SHMAT_DIM][HEADROT_SHMAT_DIM] ) { - float d = 0.0f; - float p0 = 0.0f, p1 = 0.0f; + float result, d, p0, p1; if ( m == 0 ) { p0 = SHrot_p( 1, l, 1, n, SHrotmat, R_lm1 ); p1 = SHrot_p( -1, l, -1, n, SHrotmat, R_lm1 ); - return p0 + p1; + result = p0 + p1; } - - if ( m > 0 ) + else { - d = ( m == 1 ) ? 1.0f : 0.0f; - p0 = SHrot_p( 1, l, m - 1, n, SHrotmat, R_lm1 ); - p1 = SHrot_p( -1, l, -m + 1, n, SHrotmat, R_lm1 ); - return p0 * sqrtf( 1.0f + d ) - p1 * ( 1.0f - d ); + if ( m > 0 ) + { + d = ( m == 1 ) ? 1.0f : 0.0f; + p0 = SHrot_p( 1, l, m - 1, n, SHrotmat, R_lm1 ); + p1 = SHrot_p( -1, l, -m + 1, n, SHrotmat, R_lm1 ); + result = p0 * sqrtf( 1.0f + d ) - p1 * ( 1.0f - d ); + } + else + { + d = ( m == -1 ) ? 1.0f : 0.0f; + p0 = SHrot_p( 1, l, m + 1, n, SHrotmat, R_lm1 ); + p1 = SHrot_p( -1, l, -m - 1, n, SHrotmat, R_lm1 ); + result = p0 * ( 1.0f - d ) + p1 * sqrtf( 1.0f + d ); + } } - d = ( m == -1 ) ? 1.0f : 0.0f; - p0 = SHrot_p( 1, l, m + 1, n, SHrotmat, R_lm1 ); - p1 = SHrot_p( -1, l, -m - 1, n, SHrotmat, R_lm1 ); - return p0 * ( 1.0f - d ) + p1 * sqrtf( 1.0f + d ); + return result; } static float SHrot_w( @@ -859,23 +883,39 @@ static float SHrot_w( float SHrotmat[HEADROT_SHMAT_DIM][HEADROT_SHMAT_DIM], float R_lm1[HEADROT_SHMAT_DIM][HEADROT_SHMAT_DIM] ) { - float p0 = 0.0f; - float p1 = 0.0f; + float result, p0, p1; - assert( m != 0 ); - - if ( m > 0 ) + if ( m == 0 ) { - p0 = SHrot_p( 1, l, m + 1, n, SHrotmat, R_lm1 ); - p1 = SHrot_p( -1, l, -m - 1, n, SHrotmat, R_lm1 ); - return p0 + p1; + assert( 0 && "ERROR should not be called\n" ); + return 0.0f; + } + else + { + if ( m > 0 ) + { + p0 = SHrot_p( 1, l, m + 1, n, SHrotmat, R_lm1 ); + p1 = SHrot_p( -1, l, -m - 1, n, SHrotmat, R_lm1 ); + result = p0 + p1; + } + else + { + p0 = SHrot_p( 1, l, m - 1, n, SHrotmat, R_lm1 ); + p1 = SHrot_p( -1, l, -m + 1, n, SHrotmat, R_lm1 ); + result = p0 - p1; + } } - p0 = SHrot_p( 1, l, m - 1, n, SHrotmat, R_lm1 ); - p1 = SHrot_p( -1, l, -m + 1, n, SHrotmat, R_lm1 ); - return p0 - p1; + return result; } + +/*------------------------------------------------------------------------- + * rotateFrame_sd_cldfb() + * + * + *------------------------------------------------------------------------*/ + void SHrotmatgen( float SHrotmat[HEADROT_SHMAT_DIM][HEADROT_SHMAT_DIM], /* o : rotation matrix in SHD */ float Rmat[3][3], /* i : real-space rotation matrix */ diff --git a/lib_rend/ivas_sba_rendering.c b/lib_rend/ivas_sba_rendering.c old mode 100755 new mode 100644 index dc41fc1805..8fd10d83ba --- a/lib_rend/ivas_sba_rendering.c +++ b/lib_rend/ivas_sba_rendering.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -34,554 +34,14 @@ #include "options.h" #include "prot.h" #include "ivas_prot.h" +#include "ivas_prot_rend.h" #include "ivas_stat_dec.h" #include "ivas_cnst.h" #include #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" - - -/*-----------------------------------------------------------------------* - * Local function prototypes - *-----------------------------------------------------------------------*/ - - -#ifdef DEBUG_MODE_DIRAC -static void debug_mode_dirac( float output[MAX_OUTPUT_CHANNELS][L_FRAME48k], const int16_t nchan_transport, const int16_t output_frame ); -#endif - - -/*-------------------------------------------------------------------------* - * ivas_mc2sba() - * - * MC signals transformed into SBA in TD domain - *-------------------------------------------------------------------------*/ - -void ivas_mc2sba( - IVAS_OUTPUT_SETUP hIntSetup, /* i : Format of decoder output */ - float buffer_td[][L_FRAME48k], /* i/o: MC signals (on input) and the HOA3 (on output) */ - const int16_t output_frame, /* i : output frame length per channel */ - const int16_t sba_order, /* i : Ambisonic (SBA) order */ - const float gain_lfe /* i : gain for LFE, 0 = ignore LFE */ -) -{ - int16_t i, j, k; - int16_t idx_lfe, idx_in; - float buffer_tmp[16][L_FRAME48k]; - float gains[16]; - int16_t azimuth, elevation; - int16_t sba_num_chans; - - assert( ( sba_order <= 3 ) && "Only order up to 3 is supported!" ); - - /* Init*/ - sba_num_chans = ( sba_order + 1 ) * ( sba_order + 1 ); - for ( j = 0; j < sba_num_chans; j++ ) - { - set_zero( buffer_tmp[j], output_frame ); - } - - /* HOA encoding*/ - idx_lfe = 0; - idx_in = 0; - for ( i = 0; i < hIntSetup.nchan_out_woLFE + hIntSetup.num_lfe; i++ ) - { - if ( ( hIntSetup.num_lfe > 0 ) && ( i == hIntSetup.index_lfe[idx_lfe] ) ) - { - if ( gain_lfe > 0.f ) - { - /* Add LFE to omni W with gain*/ - for ( k = 0; k < output_frame; k++ ) - { - buffer_tmp[0][k] += gain_lfe * buffer_td[i][k]; - } - } - - if ( idx_lfe < ( hIntSetup.num_lfe - 1 ) ) - { - idx_lfe++; - } - } - else - { - azimuth = (int16_t) ( hIntSetup.ls_azimuth[idx_in] ); - elevation = (int16_t) ( hIntSetup.ls_elevation[idx_in] ); - idx_in++; - - /* get HOA response for direction (ACN/SN3D)*/ - ivas_dirac_dec_get_response( - azimuth, - elevation, - gains, - sba_order ); - - for ( j = 0; j < sba_num_chans; j++ ) - { - for ( k = 0; k < output_frame; k++ ) - { - buffer_tmp[j][k] += gains[j] * buffer_td[i][k]; - } - } - } - } - - for ( j = 0; j < sba_num_chans; j++ ) - { - mvr2r( buffer_tmp[j], buffer_td[j], output_frame ); - } - - return; -} - - -/*-------------------------------------------------------------------------* - * ivas_sba2MC_cldfb() - * - * SBA signals transformed into MC in CLDFB domain - *-------------------------------------------------------------------------*/ - -void ivas_sba2mc_cldfb( - IVAS_OUTPUT_SETUP hInSetup, /* i : Format of input layout */ - float RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: cldfb real part */ - float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: cldfb imag part */ - const int16_t nb_channels_out, /* i : nb of output channels */ - const int16_t nb_bands, /* i : nb of CLDFB bands to process */ - const float *hoa_dec_mtx /* i : HOA decoding mtx */ -) -{ - int16_t iBlock, iBand, n, m; - float realOut[16][MAX_PARAM_SPATIAL_SUBFRAMES * CLDFB_NO_CHANNELS_MAX], imagOut[16][MAX_PARAM_SPATIAL_SUBFRAMES * CLDFB_NO_CHANNELS_MAX]; - float g; - float *p_real, *p_imag, *p_realOut, *p_imagOut; - int16_t nb_channels_in; - - wmops_sub_start( "ivas_sba2mc_cldfb" ); - - nb_channels_in = hInSetup.nchan_out_woLFE; - assert( ( nb_channels_in == 16 ) && ( nb_channels_out == 11 ) && "ivas_sba2mc_cldfb; only HOA3 to CICP19 is for now supported!" ); - - for ( n = 0; n < nb_channels_out; n++ ) - { - set_zero( realOut[n], MAX_PARAM_SPATIAL_SUBFRAMES * nb_bands ); - set_zero( imagOut[n], MAX_PARAM_SPATIAL_SUBFRAMES * nb_bands ); - - for ( m = 0; m < nb_channels_in; m++ ) - { - g = hoa_dec_mtx[SBA_NHARM_HOA3 * n + m]; - p_realOut = realOut[n]; - p_imagOut = imagOut[n]; - for ( iBlock = 0; iBlock < MAX_PARAM_SPATIAL_SUBFRAMES; iBlock++ ) - { - p_real = RealBuffer[m][iBlock]; - p_imag = ImagBuffer[m][iBlock]; - for ( iBand = 0; iBand < nb_bands; iBand++ ) - { - *p_realOut = *p_realOut + g * *( p_real++ ); - *p_imagOut = *p_imagOut + g * *( p_imag++ ); - p_realOut++; - p_imagOut++; - } - } - } - } - - for ( n = 0; n < nb_channels_out; n++ ) - { - p_realOut = realOut[n]; - p_imagOut = imagOut[n]; - for ( iBlock = 0; iBlock < MAX_PARAM_SPATIAL_SUBFRAMES; iBlock++ ) - { - p_real = RealBuffer[n][iBlock]; - p_imag = ImagBuffer[n][iBlock]; - for ( iBand = 0; iBand < nb_bands; iBand++ ) - { - *( p_real++ ) = *p_realOut++; - *( p_imag++ ) = *p_imagOut++; - } - } - } - - wmops_sub_end(); - - return; -} - -/*-------------------------------------------------------------------* - * ivas_sba_remapTCs() - * - * Get TCs from Ambisonics signal in ACN - *-------------------------------------------------------------------*/ - -int16_t ivas_sba_remapTCs( - float sba_data[][L_FRAME48k], /* i/o: SBA signals */ - Decoder_Struct *st_ivas, /* i/o: decoder struct */ - const int16_t output_frame /* i : frame length */ -) -{ - int16_t nchan_remapped; - -#ifdef DEBUG_MODE_DIRAC - debug_mode_dirac( sba_data, st_ivas->nchan_transport, output_frame ); -#endif - - nchan_remapped = st_ivas->nchan_transport; - if ( ( st_ivas->sba_mode != SBA_MODE_SPAR && st_ivas->sba_planar && nchan_remapped >= 3 ) || - ( ( st_ivas->sba_mode == SBA_MODE_SPAR ) && nchan_remapped == 3 ) ) - { - - nchan_remapped++; - if ( st_ivas->sba_mode != SBA_MODE_SPAR ) - { - assert( ( ( st_ivas->nchan_transport == 3 ) || ( st_ivas->nchan_transport == 5 ) || ( st_ivas->nchan_transport == 7 ) ) && "Number of channels must be odd for SBA planar!" ); - } - - if ( nchan_remapped == 4 ) - { - /*For planar A-format channel 2 and 3 are identical -> Z=0*/ - mvr2r( sba_data[2], sba_data[3], output_frame ); - } - } - - if ( st_ivas->nchan_transport >= 3 ) - { - int16_t i = 0; - float temp; - - /*convert WYXZ downmix to WYZX*/ - for ( i = 0; i < output_frame; i++ ) - { - temp = sba_data[2][i]; - sba_data[2][i] = sba_data[3][i]; - sba_data[3][i] = temp; - if ( st_ivas->nchan_transport == 3 ) - { - sba_data[2][i] = 0; - } - } - } - - if ( st_ivas->sba_mode != SBA_MODE_SPAR ) - { - ivas_sba_zero_vert_comp( sba_data, st_ivas->sba_analysis_order, st_ivas->sba_planar, output_frame ); - } - - return ( nchan_remapped ); -} - - -/*-------------------------------------------------------------------------* - * ivas_ism2sba() - * - * ISM transformed into SBA in TD domain. - *-------------------------------------------------------------------------*/ - -void ivas_ism2sba( - float buffer_td[][L_FRAME48k], /* i/o: TD signal buffers */ - ISM_RENDERER_HANDLE hIsmRendererData, /* i/o: renderer data */ - const ISM_METADATA_HANDLE hIsmMetaData[], /* i : object metadata */ - const int16_t num_objects, /* i : number of objects */ - const int16_t output_frame, /* i : output frame length per channel */ - const int16_t sba_order /* i : Ambisonic (SBA) order */ -) -{ - int16_t i, j, k; - float buffer_tmp[16][L_FRAME48k]; - float gains[16]; - float g1, g2; - int16_t azimuth, elevation; - int16_t sba_num_chans; - - assert( ( sba_order <= 3 ) && "Only order up to 3 is supported!" ); - assert( hIsmRendererData != NULL && "hIsmRendererData not allocated!" ); - - /* Init*/ - sba_num_chans = ( sba_order + 1 ) * ( sba_order + 1 ); - for ( j = 0; j < sba_num_chans; j++ ) - { - set_zero( buffer_tmp[j], output_frame ); - } - - for ( i = 0; i < num_objects; i++ ) - { - azimuth = (int16_t) ( hIsmMetaData[i]->azimuth + 0.5f ); - elevation = (int16_t) ( hIsmMetaData[i]->elevation + 0.5f ); - - /*get HOA gets for direction (ACN/SN3D)*/ - ivas_dirac_dec_get_response( azimuth, elevation, gains, sba_order ); - - for ( j = 0; j < sba_num_chans; j++ ) - { - g2 = 0.f; - for ( k = 0; k < output_frame; k++ ) - { - g2 += 1.f / output_frame; - g1 = 1.0f - g2; - buffer_tmp[j][k] += ( g2 * gains[j] + g1 * hIsmRendererData->prev_gains[i][j] ) * buffer_td[i][k]; - } - hIsmRendererData->prev_gains[i][j] = gains[j]; - } - } - - for ( j = 0; j < sba_num_chans; j++ ) - { - mvr2r( buffer_tmp[j], buffer_td[j], output_frame ); - } - - return; -} - - -/*-------------------------------------------------------------------* - * ivas_sba_linear_renderer() - * - * Linear rendering for SBA format - *-------------------------------------------------------------------*/ - -ivas_error ivas_sba_linear_renderer( - float output_f[][L_FRAME48k], /* i/o: synthesized core-coder transport channels/DirAC output */ - const int16_t output_frame, /* i : output frame length per channel */ - const int16_t nchan_in, /* i : number of input ambisonics channels */ - const AUDIO_CONFIG output_config, /* i : output audio configuration */ - const IVAS_OUTPUT_SETUP output_setup, /* i : output format setup */ - const float hoa_dec_mtx[] /* i : HOA decoding mtx */ -) -{ - int16_t i; - float dmx_l; - int16_t nchan_hoa; - ivas_error error; - - error = IVAS_ERR_OK; - - /* Number of channels of HOA depends of transport format which is mixed order xH1V*/ - nchan_hoa = nchan_in; - - if ( nchan_in == 6 ) /*2H1V*/ - { - nchan_hoa = 9; - } - else if ( nchan_in == 8 ) /*3H1V*/ - { - nchan_hoa = 16; - } - - switch ( output_config ) - { - case AUDIO_CONFIG_MONO: - /* If stereo DMX, MONO = W = Cardioids L + R*/ - if ( nchan_in == 2 ) - { - for ( i = 0; i < output_frame; i++ ) - { - output_f[0][i] += output_f[1][i]; - } - } - /* else: do nothing, MONO = W*/ - break; - case AUDIO_CONFIG_STEREO: - assert( ( nchan_in >= 2 ) && "Number of input channels must be at least 2 (for W and Y)!\n" ); - - /* Compute L and R cardioids from SB format except if stereo DMX is transmitted already in this format*/ - if ( nchan_in > 2 ) - { - /*Build L/R cardioids*/ - for ( i = 0; i < output_frame; i++ ) - { - dmx_l = 0.5f * ( output_f[0][i] + output_f[1][i] ); /* cardioid_left = 0.5(W + Y) */ - output_f[1][i] = 0.5f * ( output_f[0][i] - output_f[1][i] ); /* cardioid_right = 0.5(W - Y) */ - output_f[0][i] = dmx_l; - } - } - break; - case AUDIO_CONFIG_5_1: - case AUDIO_CONFIG_7_1: - case AUDIO_CONFIG_5_1_2: - case AUDIO_CONFIG_5_1_4: - case AUDIO_CONFIG_7_1_4: - case AUDIO_CONFIG_LS_CUSTOM: - ivas_sba_mtx_mult( output_f, output_frame, nchan_hoa, output_setup, hoa_dec_mtx ); - break; - case AUDIO_CONFIG_FOA: /* Ambisonics output, order: 1 */ - case AUDIO_CONFIG_HOA2: /* Ambisonics output, order: 2 */ - case AUDIO_CONFIG_HOA3: /* Ambisonics output, order: 3 */ - for ( i = nchan_hoa; i < output_setup.nchan_out_woLFE; i++ ) - { - set_zero( output_f[i], output_frame ); - } - break; - default: - return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: illegal output configuration, Exiting.\n" ); - } - - return error; -} - - -/*-------------------------------------------------------------------* - * ivas_sba_mtx_mult() - * - * HOA decoding with LFE insertion - *-------------------------------------------------------------------*/ - -void ivas_sba_mtx_mult( - float output_f[][L_FRAME48k], /* i/o: synthesized core-coder transport channels/DirAC output */ - const int16_t output_frame, /* i : output frame length per channel */ - const int16_t nchan_in, /* i : Number of ambisonic channels */ - const IVAS_OUTPUT_SETUP output_setup, /* i : Output configuration */ - const float *mtx_hoa_decoder /* i : HOA decoding mtx */ -) -{ - int16_t i, k, ch_idx; - int16_t idx_lfe; - float input_f[16]; - const float *hoa_decoder; - - assert( ( nchan_in >= FOA_CHANNELS ) && "Number of input channels must be at least 4 (FOA)!\n" ); - - for ( i = 0; i < output_frame; i++ ) - { - /* init*/ - idx_lfe = 0; - hoa_decoder = &mtx_hoa_decoder[0]; - for ( k = 0; k < nchan_in; k++ ) - { - input_f[k] = output_f[k][i]; - } - - /* mtx mult with LFE insertion*/ - for ( ch_idx = 0; ch_idx < ( output_setup.nchan_out_woLFE + output_setup.num_lfe ); ch_idx++ ) - { - if ( ( output_setup.num_lfe > 0 ) && ( output_setup.index_lfe[idx_lfe] == ch_idx ) ) - { - /*LFE insertion*/ - output_f[ch_idx][i] = 0.f; - if ( idx_lfe < ( output_setup.num_lfe - 1 ) ) - { - idx_lfe++; - } - } - else - { - /*HOA decoding*/ - output_f[ch_idx][i] = input_f[0] * hoa_decoder[0]; - for ( k = 1; k < nchan_in; k++ ) - { - output_f[ch_idx][i] += input_f[k] * hoa_decoder[k]; - } - hoa_decoder += 16; - } - } - } - - return; -} - - -/*-------------------------------------------------------------------* - * ivas_sba_upmixer_renderer() - * - * SBA upmix & rendering - *-------------------------------------------------------------------*/ - -void ivas_sba_upmixer_renderer( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder struct */ - float output[][L_FRAME48k], /* i/o: transport/output audio channels */ - const int16_t output_frame /* i : output frame length */ -) -{ - int16_t i, nchan_internal; - float temp; - - wmops_sub_start( "ivas_sba_upmixer_renderer" ); - - nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order ); - - if ( st_ivas->nchan_transport >= 3 ) - { - /*convert WYZX downmix to WYXZ*/ - for ( i = 0; i < output_frame; i++ ) - { - temp = output[2][i]; - output[2][i] = output[3][i]; - output[3][i] = temp; - } - } - - /* Upmixer + Renderer */ - ivas_spar_dec_upmixer( st_ivas, output, nchan_internal, output_frame ); - - if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC ) - { - ivas_sba_linear_renderer( output, output_frame, st_ivas->hIntSetup.nchan_out_woLFE, st_ivas->hDecoderConfig->output_config, st_ivas->hOutSetup, st_ivas->hoa_dec_mtx ); - } - - wmops_sub_end(); - - return; -} - - -/*-------------------------------------------------------------------* - * ivas_sba_mix_matrix_determiner() - * - * Determine SBA mixing matrices - *-------------------------------------------------------------------*/ - -void ivas_sba_mix_matrix_determiner( - SPAR_DEC_HANDLE hSpar, /* i/o: SPAR decoder handle */ - float output[][L_FRAME48k], /* i/o: transport/output audio channels */ - const int16_t bfi, /* i : BFI flag */ - const int16_t nchan_remapped, /* i : num channels after remapping of TCs */ - const int16_t output_frame /* i : output frame length */ -) -{ - int16_t i, ch; - float temp; - int16_t num_bands_out, nchan_transport, nchan_out; - - /* Convert numeric range */ - for ( ch = 0; ch < nchan_remapped; ch++ ) - { - for ( i = 0; i < output_frame; i++ ) - { - temp = output[ch][i]; - temp = floorf( temp + 0.5f ); - - if ( temp > MAX16B_FLT ) - { - temp = MAX16B_FLT; - } - else if ( temp < ( -1.0f * PCM16_TO_FLT_FAC ) ) - { - temp = ( -1.0f * PCM16_TO_FLT_FAC ); - } - temp *= ( 1.0f / PCM16_TO_FLT_FAC ); - output[ch][i] = temp; - } - } - - /* AGC */ - nchan_transport = hSpar->hMdDec->spar_md_cfg.nchan_transport; - nchan_out = nchan_transport; - ivas_agc_dec_process( hSpar->hAgcDec, output, output, nchan_transport, output_frame ); - - /* Convert numeric range back */ - for ( ch = 0; ch < nchan_out; ch++ ) - { - for ( i = 0; i < output_frame; i++ ) - { - output[ch][i] = output[ch][i] * PCM16_TO_FLT_FAC; - } - } - - /* Mixing matrix determiner */ - num_bands_out = hSpar->hFbMixer->pFb->filterbank_num_bands; - ivas_spar_dec_gen_umx_mat( hSpar->hMdDec, nchan_transport, num_bands_out, bfi ); - - return; -} +#include "wmc_auto.h" /*-------------------------------------------------------------------* @@ -609,7 +69,7 @@ void ivas_sba_prototype_renderer( int16_t firstSlot, slotEnd, firstInCh, inChEnd, firstOutCh, outChEnd; int16_t sf_idx; - wmops_sub_start( "ivas_sba_prototype_renderer" ); + push_wmops( "ivas_sba_prototype_renderer" ); hSpar = st_ivas->hSpar; hDecoderConfig = st_ivas->hDecoderConfig; @@ -738,7 +198,7 @@ void ivas_sba_prototype_renderer( } } - wmops_sub_end(); + pop_wmops(); return; } diff --git a/lib_rend/ivas_splitRend_lcld_dec.c b/lib_rend/ivas_splitRend_lcld_dec.c index f8e62daaa2..641d642152 100644 --- a/lib_rend/ivas_splitRend_lcld_dec.c +++ b/lib_rend/ivas_splitRend_lcld_dec.c @@ -37,7 +37,7 @@ Nations Convention on Contracts on the International Sales of Goods. #include "cnst.h" #include "ivas_cnst.h" -#include "ivas_lib_rend_internal.h" +#include "ivas_prot_rend.h" #include "ivas_prot.h" #include "ivas_rom_binauralRenderer.h" #include "ivas_rom_com.h" @@ -52,7 +52,8 @@ Nations Convention on Contracts on the International Sales of Goods. #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" + #ifdef SPLIT_REND_WITH_HEAD_ROT ivas_error ivas_splitBinLCLDDecOpen( BIN_HR_SPLIT_LCLD_DEC_HANDLE *hSplitBinLCLDDec, @@ -62,7 +63,7 @@ ivas_splitBinLCLDDecOpen( BIN_HR_SPLIT_LCLD_DEC_HANDLE *hSplitBinLCLDDec, ivas_error error; BIN_HR_SPLIT_LCLD_DEC_HANDLE splitBinLCLDDec; error = IVAS_ERR_OK; - if ( ( splitBinLCLDDec = (BIN_HR_SPLIT_LCLD_DEC_HANDLE) count_malloc( + if ( ( splitBinLCLDDec = (BIN_HR_SPLIT_LCLD_DEC_HANDLE) malloc( sizeof( BIN_HR_SPLIT_LCLD_DEC ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, @@ -75,15 +76,15 @@ ivas_splitBinLCLDDecOpen( BIN_HR_SPLIT_LCLD_DEC_HANDLE *hSplitBinLCLDDec, splitBinLCLDDec->psCQMFDecoder = CreateCQMFDecoder( iSampleRate, iChannels ); splitBinLCLDDec->pppfDecCQMFReal = - (float ***) count_malloc( iChannels * sizeof( float ** ) ); + (float ***) malloc( iChannels * sizeof( float ** ) ); splitBinLCLDDec->pppfDecCQMFImag = - (float ***) count_malloc( iChannels * sizeof( float ** ) ); + (float ***) malloc( iChannels * sizeof( float ** ) ); for ( int32_t n = 0; n < splitBinLCLDDec->iChannels; n++ ) { splitBinLCLDDec->pppfDecCQMFReal[n] = - (float **) count_malloc( CLDFB_NO_COL_MAX * sizeof( float * ) ); + (float **) malloc( CLDFB_NO_COL_MAX * sizeof( float * ) ); splitBinLCLDDec->pppfDecCQMFImag[n] = - (float **) count_malloc( CLDFB_NO_COL_MAX * sizeof( float * ) ); + (float **) malloc( CLDFB_NO_COL_MAX * sizeof( float * ) ); } #ifdef CLDFB_DEBUG @@ -99,6 +100,9 @@ ivas_splitBinLCLDDecOpen( BIN_HR_SPLIT_LCLD_DEC_HANDLE *hSplitBinLCLDDec, fwrite( &iChannels, sizeof( int ), 1, splitBinLCLDDec->cldfbOut ); fwrite( &num_bands, sizeof( int ), 1, splitBinLCLDDec->cldfbOut ); #endif +#ifdef SPLIT_REND_PLC + ivas_splitBinRendPLCOpen( &splitBinLCLDDec->hSplitRendPLC ); +#endif *hSplitBinLCLDDec = splitBinLCLDDec; return error; @@ -115,11 +119,11 @@ void ivas_splitBinLCLDDecClose( BIN_HR_SPLIT_LCLD_DEC_HANDLE *hSplitBinLCLDDec ) for ( int32_t n = 0; n < ( *hSplitBinLCLDDec )->iChannels; n++ ) { - count_free( ( *hSplitBinLCLDDec )->pppfDecCQMFReal[n] ); - count_free( ( *hSplitBinLCLDDec )->pppfDecCQMFImag[n] ); + free( ( *hSplitBinLCLDDec )->pppfDecCQMFReal[n] ); + free( ( *hSplitBinLCLDDec )->pppfDecCQMFImag[n] ); } - count_free( ( *hSplitBinLCLDDec )->pppfDecCQMFReal ); - count_free( ( *hSplitBinLCLDDec )->pppfDecCQMFImag ); + free( ( *hSplitBinLCLDDec )->pppfDecCQMFReal ); + free( ( *hSplitBinLCLDDec )->pppfDecCQMFImag ); #ifdef CLDFB_DEBUG if ( ( *hSplitBinLCLDDec )->cldfbOut != NULL ) @@ -127,8 +131,11 @@ void ivas_splitBinLCLDDecClose( BIN_HR_SPLIT_LCLD_DEC_HANDLE *hSplitBinLCLDDec ) fclose( ( *hSplitBinLCLDDec )->cldfbOut ); } #endif +#ifdef SPLIT_REND_PLC + ivas_splitBinRendPLCClose( &( *hSplitBinLCLDDec )->hSplitRendPLC ); +#endif - count_free( *hSplitBinLCLDDec ); + free( *hSplitBinLCLDDec ); *hSplitBinLCLDDec = NULL; } return; @@ -138,8 +145,15 @@ void ivas_splitBinLCLDDecProcess( BIN_HR_SPLIT_LCLD_DEC_HANDLE hSplitBinLCLDDec, ivas_split_rend_bits_t *pBits, float Cldfb_Out_Real[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], - float Cldfb_Out_Imag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX] ) + float Cldfb_Out_Imag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX] +#ifdef SPLIT_REND_PLC + , + const int16_t bfi +#endif +) { + push_wmops( "ivas_splitBinLCLDDecProcess" ); + assert( hSplitBinLCLDDec != NULL ); assert( Cldfb_Out_Real != NULL ); assert( Cldfb_Out_Imag != NULL ); @@ -148,46 +162,66 @@ void ivas_splitBinLCLDDecProcess( #ifdef CLDFB_DEBUG printf( "Bytes read = %d\n", iBytesWritten ); #endif - - // Initialized with zeros....... :( - for ( int32_t n = 0; n < hSplitBinLCLDDec->iChannels; n++ ) +#ifdef SPLIT_REND_PLC + if ( !bfi ) { - for ( int32_t k = 0; k < CLDFB_NO_COL_MAX; k++ ) +#endif + // Initialized with zeros....... :( + for ( int32_t n = 0; n < hSplitBinLCLDDec->iChannels; n++ ) { - hSplitBinLCLDDec->pppfDecCQMFReal[n][k] = Cldfb_Out_Real[n][k]; - hSplitBinLCLDDec->pppfDecCQMFImag[n][k] = Cldfb_Out_Imag[n][k]; - set_f( hSplitBinLCLDDec->pppfDecCQMFReal[n][k], 0, CLDFB_NO_CHANNELS_MAX ); - set_f( hSplitBinLCLDDec->pppfDecCQMFImag[n][k], 0, CLDFB_NO_CHANNELS_MAX ); + for ( int32_t k = 0; k < CLDFB_NO_COL_MAX; k++ ) + { + hSplitBinLCLDDec->pppfDecCQMFReal[n][k] = Cldfb_Out_Real[n][k]; + hSplitBinLCLDDec->pppfDecCQMFImag[n][k] = Cldfb_Out_Imag[n][k]; + set_f( hSplitBinLCLDDec->pppfDecCQMFReal[n][k], 0, CLDFB_NO_CHANNELS_MAX ); + set_f( hSplitBinLCLDDec->pppfDecCQMFImag[n][k], 0, CLDFB_NO_CHANNELS_MAX ); + } } - } - DecodeFrame( hSplitBinLCLDDec->psCQMFDecoder, - pBits, - hSplitBinLCLDDec->pppfDecCQMFReal, - hSplitBinLCLDDec->pppfDecCQMFImag ); + DecodeFrame( hSplitBinLCLDDec->psCQMFDecoder, + pBits, + hSplitBinLCLDDec->pppfDecCQMFReal, + hSplitBinLCLDDec->pppfDecCQMFImag ); #ifdef CLDFB_DEBUG - printf( "Frame Decoded = %d\n", ++hSplitBinLCLDDec->numFrame ); - int writeByte = 0; - for ( int k = 0; k < CLDFB_NO_COL_MAX; k++ ) - { - for ( int b = 0; b < CLDFB_NO_CHANNELS_MAX; b++ ) + printf( "Frame Decoded = %d\n", ++hSplitBinLCLDDec->numFrame ); + int writeByte = 0; + for ( int k = 0; k < CLDFB_NO_COL_MAX; k++ ) { - for ( int n = 0; n < hSplitBinLCLDDec->iChannels; n++ ) + for ( int b = 0; b < CLDFB_NO_CHANNELS_MAX; b++ ) { - writeByte = fwrite( &hSplitBinLCLDDec->pppfDecCQMFReal[n][k][b], - sizeof( float ), 1, hSplitBinLCLDDec->cldfbOut ); - if ( writeByte != 1 ) - exit( -1 ); - writeByte = fwrite( &hSplitBinLCLDDec->pppfDecCQMFImag[n][k][b], - sizeof( float ), 1, hSplitBinLCLDDec->cldfbOut ); - if ( writeByte != 1 ) - exit( -1 ); + for ( int n = 0; n < hSplitBinLCLDDec->iChannels; n++ ) + { + writeByte = fwrite( &hSplitBinLCLDDec->pppfDecCQMFReal[n][k][b], + sizeof( float ), 1, hSplitBinLCLDDec->cldfbOut ); + if ( writeByte != 1 ) + exit( -1 ); + writeByte = fwrite( &hSplitBinLCLDDec->pppfDecCQMFImag[n][k][b], + sizeof( float ), 1, hSplitBinLCLDDec->cldfbOut ); + if ( writeByte != 1 ) + exit( -1 ); + } } } +#endif +#ifdef SPLIT_REND_PLC + if ( hSplitBinLCLDDec->hSplitRendPLC->prev_bfi != 0 ) + { + /* cross-fade recovered frame into good frame */ + ivas_splitBinRendPLC_xf( hSplitBinLCLDDec->hSplitRendPLC, Cldfb_Out_Real, Cldfb_Out_Imag, (int16_t) hSplitBinLCLDDec->iChannels ); + } + } + else + { + /* do PLC for lost split renderer frame */ + ivas_splitBinRendPLC( hSplitBinLCLDDec->hSplitRendPLC, Cldfb_Out_Real, Cldfb_Out_Imag, (int16_t) hSplitBinLCLDDec->iChannels ); } + /* save PLC state */ + ivas_splitBinRendPLCsaveState( hSplitBinLCLDDec->hSplitRendPLC, Cldfb_Out_Real, Cldfb_Out_Imag, (int16_t) hSplitBinLCLDDec->iChannels ); #endif + pop_wmops(); + return; } #endif diff --git a/lib_rend/ivas_splitRend_lcld_enc.c b/lib_rend/ivas_splitRend_lcld_enc.c index 81841b5fcc..1904f895b3 100644 --- a/lib_rend/ivas_splitRend_lcld_enc.c +++ b/lib_rend/ivas_splitRend_lcld_enc.c @@ -37,7 +37,7 @@ Nations Convention on Contracts on the International Sales of Goods. #include "cnst.h" #include "ivas_cnst.h" -#include "ivas_lib_rend_internal.h" +#include "ivas_prot_rend.h" #include "ivas_prot.h" #include "ivas_rom_binauralRenderer.h" #include "ivas_rom_com.h" @@ -52,7 +52,7 @@ Nations Convention on Contracts on the International Sales of Goods. #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" #ifdef SPLIT_REND_WITH_HEAD_ROT ivas_error @@ -64,7 +64,7 @@ ivas_splitBinLCLDEncOpen( BIN_HR_SPLIT_LCLD_ENC_HANDLE *hSplitBinLCLDEnc, ivas_error error; BIN_HR_SPLIT_LCLD_ENC_HANDLE splitBinLCLDEnc; error = IVAS_ERR_OK; - if ( ( splitBinLCLDEnc = (BIN_HR_SPLIT_LCLD_ENC_HANDLE) count_malloc( + if ( ( splitBinLCLDEnc = (BIN_HR_SPLIT_LCLD_ENC_HANDLE) malloc( sizeof( BIN_HR_SPLIT_LCLD_ENC ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, @@ -78,15 +78,15 @@ ivas_splitBinLCLDEncOpen( BIN_HR_SPLIT_LCLD_ENC_HANDLE *hSplitBinLCLDEnc, CreateCQMFEncoder( iSampleRate, iChannels, iDataRate, 1 ); splitBinLCLDEnc->pppfCQMFReal = - (float ***) count_malloc( iChannels * sizeof( float ** ) ); + (float ***) malloc( iChannels * sizeof( float ** ) ); splitBinLCLDEnc->pppfCQMFImag = - (float ***) count_malloc( iChannels * sizeof( float ** ) ); + (float ***) malloc( iChannels * sizeof( float ** ) ); for ( int32_t n = 0; n < splitBinLCLDEnc->iChannels; n++ ) { splitBinLCLDEnc->pppfCQMFReal[n] = - (float **) count_malloc( CLDFB_NO_COL_MAX * sizeof( float * ) ); + (float **) malloc( CLDFB_NO_COL_MAX * sizeof( float * ) ); splitBinLCLDEnc->pppfCQMFImag[n] = - (float **) count_malloc( CLDFB_NO_COL_MAX * sizeof( float * ) ); + (float **) malloc( CLDFB_NO_COL_MAX * sizeof( float * ) ); } #ifdef CLDFB_DEBUG @@ -115,11 +115,11 @@ void ivas_splitBinLCLDEncClose( BIN_HR_SPLIT_LCLD_ENC_HANDLE *hSplitBinLCLDEnc ) for ( int32_t n = 0; n < ( *hSplitBinLCLDEnc )->iChannels; n++ ) { - count_free( ( *hSplitBinLCLDEnc )->pppfCQMFReal[n] ); - count_free( ( *hSplitBinLCLDEnc )->pppfCQMFImag[n] ); + free( ( *hSplitBinLCLDEnc )->pppfCQMFReal[n] ); + free( ( *hSplitBinLCLDEnc )->pppfCQMFImag[n] ); } - count_free( ( *hSplitBinLCLDEnc )->pppfCQMFReal ); - count_free( ( *hSplitBinLCLDEnc )->pppfCQMFImag ); + free( ( *hSplitBinLCLDEnc )->pppfCQMFReal ); + free( ( *hSplitBinLCLDEnc )->pppfCQMFImag ); #ifdef CLDFB_DEBUG if ( ( *hSplitBinLCLDEnc )->cldfbIn != NULL ) @@ -128,7 +128,7 @@ void ivas_splitBinLCLDEncClose( BIN_HR_SPLIT_LCLD_ENC_HANDLE *hSplitBinLCLDEnc ) } #endif - count_free( *hSplitBinLCLDEnc ); + free( *hSplitBinLCLDEnc ); *hSplitBinLCLDEnc = NULL; } return; @@ -143,6 +143,8 @@ void ivas_splitBinLCLDEncProcess( { int32_t iBitsWritten; + push_wmops( "ivas_splitBinLCLDEncProcess" ); + assert( hSplitBinLCLDEnc != NULL ); assert( Cldfb_In_Real != NULL ); assert( Cldfb_In_Imag != NULL ); @@ -207,12 +209,15 @@ void ivas_splitBinLCLDEncProcess( EncodeFrame( hSplitBinLCLDEnc->psCQMFEncoder, hSplitBinLCLDEnc->pppfCQMFReal, hSplitBinLCLDEnc->pppfCQMFImag, &iBitsWritten, available_bits, pBits ); - assert( iBitsWritten <= available_bits ); + if ( iBitsWritten > available_bits ) + assert( iBitsWritten <= available_bits ); #ifdef CLDFB_DEBUG printf( "Bits written = %d\n", iBitsWritten ); #endif + pop_wmops(); + return; } #endif diff --git a/lib_rend/ivas_splitRendererPLC.c b/lib_rend/ivas_splitRendererPLC.c new file mode 100644 index 0000000000..eafc5617dd --- /dev/null +++ b/lib_rend/ivas_splitRendererPLC.c @@ -0,0 +1,492 @@ +/****************************************************************************************************** + + (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository. All Rights Reserved. + + This software is protected by copyright law and by international treaties. + The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository retain full ownership rights in their respective contributions in + the software. This notice grants no license of any kind, including but not limited to patent + license, nor is any license granted by implication, estoppel or otherwise. + + Contributors are required to enter into the IVAS codec Public Collaboration agreement before making + contributions. + + This software is provided "AS IS", without any express or implied warranties. The software is in the + development stage. It is intended exclusively for experts who have experience with such software and + solely for the purpose of inspection. All implied warranties of non-infringement, merchantability + and fitness for a particular purpose are hereby disclaimed and excluded. + + Any dispute, controversy or claim arising under or in relation to providing this software shall be + submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in + accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and + the United Nations Convention on Contracts on the International Sales of Goods. + +*******************************************************************************************************/ + +#include +#include "options.h" + +#include +#ifdef SPLIT_REND_PLC +#include +#include "ivas_prot.h" +#include "prot.h" +#include "cnst.h" +#include "ivas_cnst.h" +#include "ivas_rom_rend.h" +#include "ivas_rom_com.h" +#include "ivas_rom_dec.h" +#include "ivas_rom_binauralRenderer.h" +#include "lib_rend.h" +#include "ivas_prot_rend.h" +#ifdef DEBUGGING +#include "debug.h" +#endif +#include "wmc_auto.h" + +#define DO_PERTURB 1 +#define PH_PERT_ONLY 1 +#define START_VAL_AVG_LEN 2 +#define SR_PLC_FADE_START 10 // start fading at this number of bad frames in row +#define SR_PLC_MUTE 30 // Total mute at this number of bad frames in row +#define SR_PLC_FADE_DEGREE -3 // fading degree per frame in dB +#define SRHO_THRESH 2.f / 3.f * 0.1f +#define STH_THRESH 2.f / 3.f * PI2 / 12 + +static void adaptive_polar_ext_plc( + const float *prev_real, + const float *prev_imag, + float *rec_real, + float *rec_imag +#if CLDFB_PLC_XF > 0 + , + float xf_alp[CLDFB_PLC_XF], + float xf_bet[CLDFB_PLC_XF] +#endif +) +{ + float uth[CLDFB_NO_COL_MAX], uthu[CLDFB_NO_COL_MAX], urh[CLDFB_NO_COL_MAX]; + float ph_adj, ph_diff, ph_adj_t, quot, drho, srho, diff, dth, sth, fac_real, fac_imag; + float Ruu_real[2], Ruu_imag[2]; + float start_real, start_imag, abs_fac, abs_fac_powj, comp_fac, fac_powj_real, fac_powj_imag, temp, abs2inv; + float fac_ph_real, fac_ph_imag, rat_real, rat_imag, abs_temp; + int32_t k, j; + + // reset of accumulators + ph_adj = 0.0f; + drho = 0.0f; + srho = 0.0f; + dth = 0.0f; + sth = 0.0f; + + // calculate per-sample phase and magnitude evolution in preceding frame + for ( k = 0; k < CLDFB_NO_COL_MAX; k++ ) + { + urh[k] = sqrtf( prev_imag[k] * prev_imag[k] + prev_real[k] * prev_real[k] ); + if ( urh[k] < EPSILON ) + { + // zero encountered + break; + } + uth[k] = atan2f( prev_imag[k], prev_real[k] ); + + // phase unwrap + if ( k == 0 ) + { + uthu[0] = uth[0]; + } + else + { + // phase unwrap + ph_diff = uth[k] - uth[k - 1]; + uthu[k] = uth[k]; + if ( fabsf( ph_diff ) >= PI2 / 2 ) + { + ph_adj_t = ph_diff / PI2; + if ( fabsf( ph_adj_t - truncf( ph_adj_t ) ) == 0.5f ) + { + ph_adj_t = truncf( ph_adj_t ); + } + ph_adj = -PI2 * roundf( ph_adj_t ) + ph_adj; + } + uthu[k] += ph_adj; + // unwrapped phase in uthu + + // mean and stdev of per-sample magnitude ratios + quot = urh[k] / urh[k - 1]; + drho += quot; + srho += SQR( quot ); + // mean and stdev of per-sample phase differences + diff = uthu[k] - uthu[k - 1]; // the mean value calculation could be optimized + dth += diff; + sth += SQR( diff ); + } + } + if ( k == CLDFB_NO_COL_MAX ) + { + // mean and stdev of per-sample magnitude ratios + drho *= 1.0f / ( CLDFB_NO_COL_MAX - 1 ); + temp = srho - ( CLDFB_NO_COL_MAX - 1 ) * SQR( drho ); + if ( temp > 0 ) + { + srho = sqrtf( temp * ( 1.0f / ( CLDFB_NO_COL_MAX - 2 ) ) ); + } + else + { + srho = 0.0f; + } + // mean and stdev of per-sample phase differences + dth *= 1.0f / ( CLDFB_NO_COL_MAX - 1 ); + temp = sth - ( CLDFB_NO_COL_MAX - 1 ) * SQR( dth ); + if ( temp > 0 ) + { + sth = sqrtf( temp * ( 1.0f / ( CLDFB_NO_COL_MAX - 2 ) ) ); + } + else + { + sth = 0.0f; + } + // do phase extension only if the std deviations are small + if ( ( srho < SRHO_THRESH ) || ( sth < STH_THRESH ) ) + { + // calculate complex evolution factor + fac_ph_real = cosf( dth ); + fac_ph_imag = sinf( dth ); + fac_real = min( 1, drho ) * fac_ph_real; + fac_imag = min( 1, drho ) * fac_ph_imag; +#if START_VAL_AVG_LEN > 1 + // Calculate start value for evolution from last samples of previous frame + fac_powj_real = fac_real; + fac_powj_imag = fac_imag; + start_real = prev_real[CLDFB_NO_COL_MAX - 1]; + start_imag = prev_imag[CLDFB_NO_COL_MAX - 1]; + for ( j = 1; j < START_VAL_AVG_LEN; j++ ) + { + start_real += fac_powj_real * prev_real[CLDFB_NO_COL_MAX - j - 1] - fac_powj_imag * prev_imag[CLDFB_NO_COL_MAX - j - 1]; + start_imag += fac_powj_imag * prev_real[CLDFB_NO_COL_MAX - j - 1] + fac_powj_real * prev_imag[CLDFB_NO_COL_MAX - j - 1]; + temp = fac_powj_real * fac_real - fac_powj_imag * fac_imag; + fac_powj_imag = fac_powj_imag * fac_real + fac_powj_real * fac_imag; + fac_powj_real = temp; + } + start_real *= 1.0f / START_VAL_AVG_LEN; + start_imag *= 1.0f / START_VAL_AVG_LEN; +#else + // take last sample of previous frame as start value + start_real = prev_real[CLDFB_NO_COL_MAX - 1]; + start_imag = prev_imag[CLDFB_NO_COL_MAX - 1]; +#endif +#if DO_PERTURB != 0 + // make evolution less static: apply per samples differences as in preceding frame + rat_real = ( prev_real[1] * prev_real[0] + prev_imag[1] * prev_imag[0] ); + rat_imag = ( -prev_real[1] * prev_imag[0] + prev_imag[1] * prev_real[0] ); +#if PH_PERT_ONLY != 0 + // only phase perturbation + abs_temp = sqrtf( SQR( rat_real ) + SQR( rat_imag ) ); + abs2inv = min( 1, drho ) / max( EPSILON, abs_temp ); + rat_real *= abs2inv; + rat_imag *= abs2inv; +#else + // phase and magnitude perturbation + abs2inv = 1 / ( max( 1, drho ) * ( SQR( prev_real[0] ) + SQR( prev_imag[0] ) ) ); + rat_real *= abs2inv; + rat_imag *= abs2inv; +#endif + // apply complex evolution for first substitution sample + rec_real[0] = rat_real * start_real - rat_imag * start_imag; + rec_imag[0] = rat_imag * start_real + rat_real * start_imag; + for ( j = 2; j < CLDFB_NO_COL_MAX; j++ ) + { + // make evolution less static: apply per samples differences as in preceding frame + rat_real = ( prev_real[j] * prev_real[j - 1] + prev_imag[j] * prev_imag[j - 1] ); + rat_imag = ( -prev_real[j] * prev_imag[j - 1] + prev_imag[j] * prev_real[j - 1] ); +#if PH_PERT_ONLY != 0 + // only phase perturbation + abs_temp = sqrtf( SQR( rat_real ) + SQR( rat_imag ) ); + abs2inv = min( 1, drho ) / max( EPSILON, abs_temp ); +#else + // phase and magnitude perturbation + abs2inv = 1 / ( max( 1, drho ) * ( SQR( prev_real[j - 1] ) + SQR( prev_imag[j - 1] ) ) ); +#endif + rat_real *= abs2inv; + rat_imag *= abs2inv; + // apply complex evolution for further substitution samples + rec_real[j - 1] = rat_real * rec_real[j - 2] - rat_imag * rec_imag[j - 2]; + rec_imag[j - 1] = rat_imag * rec_real[j - 2] + rat_real * rec_imag[j - 2]; + } + // do the same for samples of crossfade region + for ( j = 1; j < CLDFB_PLC_XF + 2; j++ ) + { + rat_real = ( prev_real[j] * prev_real[j - 1] + prev_imag[j] * prev_imag[j - 1] ); + rat_imag = ( -prev_real[j] * prev_imag[j - 1] + prev_imag[j] * prev_real[j - 1] ); +#if PH_PERT_ONLY != 0 + abs_temp = sqrtf( SQR( rat_real ) + SQR( rat_imag ) ); + abs2inv = min( 1, drho ) / max( EPSILON, abs_temp ); +#else + abs2inv = 1 / ( max( 1, drho ) * ( SQR( prev_real[j - 1] ) + SQR( prev_imag[j - 1] ) ) ); +#endif + rat_real *= abs2inv; + rat_imag *= abs2inv; + rec_real[j + CLDFB_NO_COL_MAX - 2] = rat_real * rec_real[j + CLDFB_NO_COL_MAX - 3] - rat_imag * rec_imag[j + CLDFB_NO_COL_MAX - 3]; + rec_imag[j + CLDFB_NO_COL_MAX - 2] = rat_imag * rec_real[j + CLDFB_NO_COL_MAX - 3] + rat_real * rec_imag[j + CLDFB_NO_COL_MAX - 3]; + } +#else + rec_real[0] = fac_real * start_real - fac_imag * start_imag; + rec_imag[0] = fac_imag * start_real + fac_real * start_imag; + for ( j = 1; j < CLDFB_NO_COL_MAX + CLDFB_PLC_XF; j++ ) + { + rec_real[j] = fac_real * rec_real[j - 1] - fac_imag * rec_imag[j - 1]; + rec_imag[j] = fac_imag * rec_real[j - 1] + fac_real * rec_imag[j - 1]; + } +#endif +#if CLDFB_PLC_XF > 0 + // apply crossfade + for ( j = 0; j < CLDFB_PLC_XF; j++ ) + { + rec_real[CLDFB_NO_COL_MAX + j] *= xf_alp[j]; + rec_imag[CLDFB_NO_COL_MAX + j] *= xf_alp[j]; + xf_bet[j] = 1 - xf_alp[j]; + } +#endif + } + else + { + // do complex lpc combined with frame repetition + Ruu_real[0] = SQR( prev_real[0] ) + SQR( prev_imag[0] ); + Ruu_real[1] = 0; + Ruu_imag[1] = 0; + for ( j = 1; j < CLDFB_NO_COL_MAX; j++ ) + { + Ruu_real[0] += SQR( prev_real[j] ) + SQR( prev_imag[j] ); + Ruu_real[1] += prev_real[j] * prev_real[j - 1] + prev_imag[j] * prev_imag[j - 1]; + Ruu_imag[1] += prev_imag[j] * prev_real[j - 1] - prev_real[j] * prev_imag[j - 1]; + } + if ( Ruu_real[0] > EPSILON ) + { + // prediction coefficient + fac_real = Ruu_real[1] / Ruu_real[0]; + fac_imag = Ruu_imag[1] / Ruu_real[0]; + } + else + { + fac_real = 0; + fac_imag = 0; + } + // apply prediction using last sample of preceding frame as start value and combine with previous frame samples + fac_powj_real = fac_real; + fac_powj_imag = fac_imag; + abs_fac = sqrtf( SQR( fac_real ) + SQR( fac_imag ) ); + abs_fac_powj = abs_fac; + for ( j = 0; j < CLDFB_NO_COL_MAX; j++ ) + { + comp_fac = 1 - abs_fac_powj; + rec_real[j] = prev_real[CLDFB_NO_COL_MAX - 1] * fac_powj_real - prev_imag[CLDFB_NO_COL_MAX - 1] * fac_powj_imag + + prev_real[j] * comp_fac; + rec_imag[j] = prev_real[CLDFB_NO_COL_MAX - 1] * fac_powj_imag + prev_imag[CLDFB_NO_COL_MAX - 1] * fac_powj_real + + prev_imag[j] * comp_fac; + abs_fac_powj = abs_fac_powj * abs_fac; + temp = fac_powj_real * fac_real - fac_powj_imag * fac_imag; + fac_powj_imag = fac_powj_real * fac_imag + fac_powj_imag * fac_real; + fac_powj_real = temp; + } + // prepare XF to next frame using prediction + fac_powj_real = fac_real; + fac_powj_imag = fac_imag; + abs_fac_powj = abs_fac; +#if CLDFB_PLC_XF > 0 + for ( j = 0; j < CLDFB_PLC_XF; j++ ) + { + xf_bet[j] = 1 - abs_fac_powj; + rec_real[j + CLDFB_NO_COL_MAX] = rec_real[CLDFB_NO_COL_MAX - 1] * fac_powj_real - rec_imag[CLDFB_NO_COL_MAX - 1] * fac_powj_imag; + rec_imag[j + CLDFB_NO_COL_MAX] = rec_real[CLDFB_NO_COL_MAX - 1] * fac_powj_imag + rec_imag[CLDFB_NO_COL_MAX - 1] * fac_powj_real; + abs_fac_powj = abs_fac_powj * abs_fac; + temp = fac_powj_real * fac_real - fac_powj_imag * fac_imag; + fac_powj_imag = fac_powj_real * fac_imag + fac_powj_imag * fac_real; + fac_powj_real = temp; + } +#endif + } + } + else + { + for ( j = 0; j < CLDFB_NO_COL_MAX; j++ ) + { + rec_real[j] = prev_real[j]; + rec_imag[j] = prev_imag[j]; + } +#if CLDFB_PLC_XF > 0 + for ( j = 0; j < CLDFB_PLC_XF; j++ ) + { + xf_bet[j] = 1; + rec_real[j + CLDFB_NO_COL_MAX] = 0; + rec_imag[j + CLDFB_NO_COL_MAX] = 0; + } +#endif + } +} + +ivas_error ivas_splitBinRendPLCOpen( + SPLIT_REND_PLC_HANDLE *phSplitRendPLC ) +{ + ivas_error error; + SPLIT_REND_PLC_HANDLE hSplitRendPLC; + + error = IVAS_ERR_OK; + if ( ( hSplitRendPLC = (SPLIT_REND_PLC_HANDLE) malloc( sizeof( SPLIT_REND_PLC_STRUCT ) ) ) == NULL ) + { + return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for bin split renderer PLC Module \n" ) ); + } + hSplitRendPLC->prev_bfi = 0; + hSplitRendPLC->bf_count = 0; + set_zero( &hSplitRendPLC->CldfbPLC_state.Cldfb_Prev_BinReal[0][0][0], 2 * ( CLDFB_NO_COL_MAX + CLDFB_PLC_XF ) * CLDFB_NO_CHANNELS_MAX ); + set_zero( &hSplitRendPLC->CldfbPLC_state.Cldfb_Prev_BinImag[0][0][0], 2 * ( CLDFB_NO_COL_MAX + CLDFB_PLC_XF ) * CLDFB_NO_CHANNELS_MAX ); + *phSplitRendPLC = hSplitRendPLC; + + return error; +} + +void ivas_splitBinRendPLCClose( SPLIT_REND_PLC_HANDLE *phSplitRendPLC ) +{ + if ( ( *phSplitRendPLC ) != NULL ) + { + free( ( *phSplitRendPLC ) ); + ( *phSplitRendPLC ) = NULL; + } + return; +} + +void ivas_splitBinRendPLCsaveState( + SPLIT_REND_PLC_HANDLE hSplitRendPLC, + float Cldfb_RealBuffer_Binaural[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + float Cldfb_ImagBuffer_Binaural[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + const int16_t num_chs ) +{ + int32_t k, n; + /* Save Cldfb frame */ + for ( k = 0; k < CLDFB_NO_COL_MAX; k++ ) + { + for ( n = 0; n < num_chs; n++ ) + { + mvr2r( &Cldfb_RealBuffer_Binaural[n][k][0], &hSplitRendPLC->CldfbPLC_state.Cldfb_Prev_BinReal[n][k][0], CLDFB_NO_CHANNELS_MAX ); + mvr2r( &Cldfb_ImagBuffer_Binaural[n][k][0], &hSplitRendPLC->CldfbPLC_state.Cldfb_Prev_BinImag[n][k][0], CLDFB_NO_CHANNELS_MAX ); + } + } +} + +/* Cross-fade of preceding bad frame into good frame */ +void ivas_splitBinRendPLC_xf( + SPLIT_REND_PLC_HANDLE hSplitRendPLC, + float Cldfb_RealBuffer_Binaural[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + float Cldfb_ImagBuffer_Binaural[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + const int16_t num_chs ) +{ + int32_t n, i, k; + // Indicate that next transition will be from a good frame + hSplitRendPLC->prev_bfi = 0; + // Reset bf conter + hSplitRendPLC->bf_count = 0; + + { + // Do the cross fade + for ( n = 0; n < num_chs; n++ ) + { + for ( i = 0; i < CLDFB_NO_CHANNELS_MAX; i++ ) + { +#if CLDFB_PLC_XF > 0 + for ( k = 0; k < CLDFB_PLC_XF; k++ ) + { + Cldfb_RealBuffer_Binaural[n][k][i] = hSplitRendPLC->CldfbPLC_state.xf_bet[n][i][k] * Cldfb_RealBuffer_Binaural[n][k][i] + hSplitRendPLC->CldfbPLC_state.Cldfb_Prev_BinReal[n][k + CLDFB_NO_COL_MAX][i]; + Cldfb_ImagBuffer_Binaural[n][k][i] = hSplitRendPLC->CldfbPLC_state.xf_bet[n][i][k] * Cldfb_ImagBuffer_Binaural[n][k][i] + hSplitRendPLC->CldfbPLC_state.Cldfb_Prev_BinImag[n][k + CLDFB_NO_COL_MAX][i]; + } +#endif + } + } + } +} + +/* Conceal bad frame */ +void ivas_splitBinRendPLC( + SPLIT_REND_PLC_HANDLE hSplitRendPLC, + float Cldfb_RealBuffer_Binaural[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + float Cldfb_ImagBuffer_Binaural[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], + const int16_t num_chs ) +{ + int32_t i, n, k; + float fade_fac; + float prev_real[CLDFB_NO_COL_MAX], prev_imag[CLDFB_NO_COL_MAX], rec_real[CLDFB_NO_COL_MAX + CLDFB_PLC_XF], rec_imag[CLDFB_NO_COL_MAX + CLDFB_PLC_XF]; +#if CLDFB_PLC_XF > 0 + float xf_alp[CLDFB_PLC_XF]; +#endif + + // Indicate that next transition will be from a bad frame + hSplitRendPLC->prev_bfi = 1; + + { +#if CLDFB_PLC_XF > 0 + for ( i = 0; i < CLDFB_PLC_XF; i++ ) + { + xf_alp[i] = 1.0f - ( i + 1.0f ) / ( CLDFB_PLC_XF + 1.0f ); + } +#endif + // for k = 1 : size(x, 1) + // y(k, :) = adaptive_polar_ext_plc_vec(x(k, :), false); + // end + for ( n = 0; n < num_chs; n++ ) + { + for ( i = 0; i < CLDFB_NO_CHANNELS_MAX; i++ ) + { + for ( k = 0; k < CLDFB_NO_COL_MAX; k++ ) + { + prev_real[k] = hSplitRendPLC->CldfbPLC_state.Cldfb_Prev_BinReal[n][k][i]; + prev_imag[k] = hSplitRendPLC->CldfbPLC_state.Cldfb_Prev_BinImag[n][k][i]; + } + adaptive_polar_ext_plc( prev_real, prev_imag, rec_real, rec_imag +#if CLDFB_PLC_XF > 0 + , + xf_alp, hSplitRendPLC->CldfbPLC_state.xf_bet[n][i] +#endif + ); + for ( k = 0; k < CLDFB_NO_COL_MAX; k++ ) + { + Cldfb_RealBuffer_Binaural[n][k][i] = rec_real[k]; + hSplitRendPLC->CldfbPLC_state.Cldfb_Prev_BinReal[n][k][i] = rec_real[k]; + Cldfb_ImagBuffer_Binaural[n][k][i] = rec_imag[k]; + hSplitRendPLC->CldfbPLC_state.Cldfb_Prev_BinImag[n][k][i] = rec_imag[k]; + } +#if CLDFB_PLC_XF > 0 + for ( k = CLDFB_NO_COL_MAX; k < CLDFB_NO_COL_MAX + CLDFB_PLC_XF; k++ ) + { + hSplitRendPLC->CldfbPLC_state.Cldfb_Prev_BinReal[n][k][i] = rec_real[k]; + hSplitRendPLC->CldfbPLC_state.Cldfb_Prev_BinImag[n][k][i] = rec_imag[k]; + } +#endif + } + } + } + + // Check bf counter + if ( hSplitRendPLC->bf_count++ >= SR_PLC_FADE_START ) + { + if ( hSplitRendPLC->bf_count < SR_PLC_MUTE ) + { + fade_fac = powf( 10, ( hSplitRendPLC->bf_count - SR_PLC_FADE_START ) * SR_PLC_FADE_DEGREE / 20.0f ); + v_multc( &Cldfb_RealBuffer_Binaural[0][0][0], fade_fac, &Cldfb_RealBuffer_Binaural[0][0][0], (int16_t) ( (CLDFB_NO_COL_MAX) *num_chs * CLDFB_NO_CHANNELS_MAX ) ); + v_multc( &Cldfb_ImagBuffer_Binaural[0][0][0], fade_fac, &Cldfb_ImagBuffer_Binaural[0][0][0], (int16_t) ( (CLDFB_NO_COL_MAX) *num_chs * CLDFB_NO_CHANNELS_MAX ) ); + } + else + { + set_zero( &Cldfb_RealBuffer_Binaural[0][0][0], (int16_t) ( (CLDFB_NO_COL_MAX) *num_chs * CLDFB_NO_CHANNELS_MAX ) ); + set_zero( &Cldfb_ImagBuffer_Binaural[0][0][0], (int16_t) ( (CLDFB_NO_COL_MAX) *num_chs * CLDFB_NO_CHANNELS_MAX ) ); + hSplitRendPLC->bf_count = SR_PLC_MUTE; + } + } + return; +} + +#endif diff --git a/lib_rend/ivas_splitRendererPost.c b/lib_rend/ivas_splitRendererPost.c index 3bb9e0363d..2feb1fb461 100644 --- a/lib_rend/ivas_splitRendererPost.c +++ b/lib_rend/ivas_splitRendererPost.c @@ -45,11 +45,11 @@ #include "ivas_rom_dec.h" #include "ivas_rom_binauralRenderer.h" #include "lib_rend.h" -#include "ivas_lib_rend_internal.h" +#include "ivas_prot_rend.h" #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" #ifdef SPLIT_REND_WITH_HEAD_ROT ivas_error ivas_splitBinPostRendOpen( @@ -67,7 +67,7 @@ ivas_error ivas_splitBinPostRendOpen( int16_t ch; error = IVAS_ERR_OK; - if ( ( hBinRend = (BIN_HR_SPLIT_POST_REND_HANDLE) count_malloc( sizeof( BIN_HR_SPLIT_POST_REND ) ) ) == NULL ) + if ( ( hBinRend = (BIN_HR_SPLIT_POST_REND_HANDLE) malloc( sizeof( BIN_HR_SPLIT_POST_REND ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for bin split post renderer Module \n" ) ); } @@ -160,7 +160,7 @@ void ivas_splitBinPostRendClose( BIN_HR_SPLIT_POST_REND_HANDLE *hBinHrSplitPostR } #endif - count_free( ( *hBinHrSplitPostRend ) ); + free( ( *hBinHrSplitPostRend ) ); ( *hBinHrSplitPostRend ) = NULL; } return; @@ -545,8 +545,12 @@ static void ivas_splitBinPostRendMdHuffDec( void ivas_splitBinPostRendMdDec( ivas_split_rend_bits_t *pBits, BIN_HR_SPLIT_POST_REND_HANDLE hBinHrSplitPostRend, - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, - const int16_t num_md_bands ) + MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData +#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG + , + BIN_HR_SPLIT_PRE_REND_HANDLE hBinHrSplitPreRend +#endif +) { int16_t pos_idx, b, sf_idx, num_subframes, ch1; int16_t pred_real_bands_yaw[IVAS_SPLIT_REND_NUM_QUANT_STRATS], pred_real_bands_roll[IVAS_SPLIT_REND_NUM_QUANT_STRATS]; @@ -924,39 +928,6 @@ void ivas_splitBinPostRendMdDec( } #endif - if ( hBinHrSplitPostRend->low_Res ) - { - int16_t sf_idx2, res_ratio, ch2; - BIN_HR_SPLIT_REND_MD_HANDLE hMd2; - res_ratio = MAX_PARAM_SPATIAL_SUBFRAMES / num_subframes; - - for ( sf_idx = num_subframes - 1; sf_idx >= 0; sf_idx-- ) - { - for ( sf_idx2 = res_ratio - 1; sf_idx2 >= 0; sf_idx2-- ) - { - hBinHrSplitPostRend->QuaternionsPre[( sf_idx * res_ratio ) + sf_idx2] = hBinHrSplitPostRend->QuaternionsPre[sf_idx]; - for ( pos_idx = 0; pos_idx < pMultiBinPoseData->num_poses - 1; pos_idx++ ) - { - for ( b = 0; b < num_md_bands; b++ ) - { - hMd = &hBinHrSplitPostRend->rot_md[pos_idx][sf_idx][b]; - hMd2 = &hBinHrSplitPostRend->rot_md[pos_idx][( sf_idx * res_ratio ) + sf_idx2][b]; - for ( ch1 = 0; ch1 < BINAURAL_CHANNELS; ch1++ ) - { - for ( ch2 = 0; ch2 < BINAURAL_CHANNELS; ch2++ ) - { - hMd2->pred_mat_re[ch1][ch2] = hMd->pred_mat_re[ch1][ch2]; - hMd2->pred_mat_im[ch1][ch2] = hMd->pred_mat_im[ch1][ch2]; - } - } - hMd2->gd = hMd->gd; - hMd2->gd2 = hMd->gd2; - } - } - } - } - } - return; } @@ -968,6 +939,8 @@ void ivas_rend_TdSplitPostRendProcess( { const int32_t tmp_num_bits = 16; + push_wmops( "ivas_rend_TdSplitPostRendProcess" ); + multiBinPoseData->num_poses = ivas_split_rend_bitstream_read_int32( pBits, tmp_num_bits ); for ( int32_t sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; ++sf_idx ) @@ -985,6 +958,8 @@ void ivas_rend_TdSplitPostRendProcess( multiBinPoseData->relative_head_poses[pose][2] = ivas_split_rend_bitstream_read_int32( pBits, tmp_num_bits ) - 180; } } + + pop_wmops(); } #endif @@ -1141,7 +1116,7 @@ static void get_interpolation_vars( } static void interpolate_gain_matrix( - BIN_HR_SPLIT_REND_MD rot_md[][MAX_PARAM_SPATIAL_SUBFRAMES][MAX_SPLIT_REND_MD_BANDS], + BIN_HR_SPLIT_REND_MD rot_md[][MAX_SPLIT_MD_SUBFRAMES][MAX_SPLIT_REND_MD_BANDS], int16_t sf_idx, int16_t band_idx, int16_t ind[2], @@ -1184,7 +1159,7 @@ static void interpolate_gain_matrix( } static void interpolate_pred_matrix( - BIN_HR_SPLIT_REND_MD rot_md[][MAX_PARAM_SPATIAL_SUBFRAMES][MAX_SPLIT_REND_MD_BANDS], + BIN_HR_SPLIT_REND_MD rot_md[][MAX_SPLIT_MD_SUBFRAMES][MAX_SPLIT_REND_MD_BANDS], int16_t sf_idx, int16_t band_idx, int16_t ind[2], @@ -1289,7 +1264,7 @@ static void interpolate_pred_matrix( } static void interpolate_rend_md( - BIN_HR_SPLIT_REND_MD rot_md[][MAX_PARAM_SPATIAL_SUBFRAMES][MAX_SPLIT_REND_MD_BANDS], + BIN_HR_SPLIT_REND_MD rot_md[][MAX_SPLIT_MD_SUBFRAMES][MAX_SPLIT_REND_MD_BANDS], float mix_mat_re[][BINAURAL_CHANNELS], float mix_mat_im[][BINAURAL_CHANNELS], float *gd_int, @@ -1478,6 +1453,13 @@ void ivas_SplitRenderer_PostRenderer( int16_t pos_idx, b, brange[2], ch_idx1; int16_t num_md_bands, slot_idx, b2, sf_idx, index_slot, num_subframes, num_slots, sf_idx_md; float pred_out_re[BINAURAL_CHANNELS], pred_out_im[BINAURAL_CHANNELS], tmp_re, tmp_im, gd_int; +#ifdef SPLIT_REND_PLC +#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG + BIN_HR_SPLIT_REND_MD rot_md_act[MAX_HEAD_ROT_POSES][MAX_SPLIT_REND_MD_BANDS]; +#else + BIN_HR_SPLIT_REND_MD rot_md_act[1][MAX_SPLIT_REND_MD_BANDS]; +#endif +#endif #ifndef SPLIT_REND_ZERO_OUT_YAW_D float gd_cf, gd_cf_abs; #endif @@ -1495,7 +1477,7 @@ void ivas_SplitRenderer_PostRenderer( const int16_t *pBand_grouping = SplitRend_band_grouping; num_md_bands = MAX_SPLIT_REND_MD_BANDS; - wmops_sub_start( "ivas_SplitRenderer_PostRenderer" ); + push_wmops( "ivas_SplitRenderer_PostRenderer" ); num_subframes = MAX_PARAM_SPATIAL_SUBFRAMES; @@ -1527,16 +1509,24 @@ void ivas_SplitRenderer_PostRenderer( mix_mat_re[ch_idx1][ch_idx1] = 1.0f; } gd_int = 0.0f; - interpolate_rend_md( hBinPostRenderer->rot_md, mix_mat_re, mix_mat_im, &gd_int, sf_idx, b, interp_yaw_pose_idx, interp_pitch_pose_idx, interp_roll_pose_idx, interp_yaw_fact, interp_pitch_fact, interp_roll_fact ); + interpolate_rend_md( hBinPostRenderer->rot_md, mix_mat_re, mix_mat_im, &gd_int, sf_idx_md, b, interp_yaw_pose_idx, interp_pitch_pose_idx, interp_roll_pose_idx, interp_yaw_fact, interp_pitch_fact, interp_roll_fact ); for ( ch_idx1 = 0; ch_idx1 < BINAURAL_CHANNELS; ch_idx1++ ) { +#ifdef SPLIT_REND_PLC /*update the prediction matrix with interpolated matrix*/ + rot_md_act[pos_idx][b].pred_mat_re[ch_idx1][0] = mix_mat_re[ch_idx1][0]; + rot_md_act[pos_idx][b].pred_mat_re[ch_idx1][1] = mix_mat_re[ch_idx1][1]; + rot_md_act[pos_idx][b].pred_mat_im[ch_idx1][0] = mix_mat_im[ch_idx1][0]; + rot_md_act[pos_idx][b].pred_mat_im[ch_idx1][1] = mix_mat_im[ch_idx1][1]; + rot_md_act[pos_idx][b].gd = gd_int; +#else hBinPostRenderer->rot_md[pos_idx][sf_idx][b].pred_mat_re[ch_idx1][0] = mix_mat_re[ch_idx1][0]; hBinPostRenderer->rot_md[pos_idx][sf_idx][b].pred_mat_re[ch_idx1][1] = mix_mat_re[ch_idx1][1]; hBinPostRenderer->rot_md[pos_idx][sf_idx][b].pred_mat_im[ch_idx1][0] = mix_mat_im[ch_idx1][0]; hBinPostRenderer->rot_md[pos_idx][sf_idx][b].pred_mat_im[ch_idx1][1] = mix_mat_im[ch_idx1][1]; hBinPostRenderer->rot_md[pos_idx][sf_idx][b].gd = gd_int; +#endif } } @@ -1563,8 +1553,22 @@ void ivas_SplitRenderer_PostRenderer( { hBinPostRenderer->rot_md[pos_idx][sf_idx][b].gd = 0.0f; } + +#ifdef SPLIT_REND_PLC + for ( ch_idx1 = 0; ch_idx1 < BINAURAL_CHANNELS; ch_idx1++ ) + { + + /*update the prediction matrix with interpolated matrix*/ + rot_md_act[pos_idx][b].pred_mat_re[ch_idx1][0] = hBinPostRenderer->rot_md[pos_idx][sf_idx][b].pred_mat_re[ch_idx1][0]; + rot_md_act[pos_idx][b].pred_mat_re[ch_idx1][1] = hBinPostRenderer->rot_md[pos_idx][sf_idx][b].pred_mat_re[ch_idx1][1]; + rot_md_act[pos_idx][b].pred_mat_im[ch_idx1][0] = hBinPostRenderer->rot_md[pos_idx][sf_idx][b].pred_mat_im[ch_idx1][0]; + rot_md_act[pos_idx][b].pred_mat_im[ch_idx1][1] = hBinPostRenderer->rot_md[pos_idx][sf_idx][b].pred_mat_im[ch_idx1][1]; + rot_md_act[pos_idx][b].gd = hBinPostRenderer->rot_md[pos_idx][sf_idx][b].gd; + } +#endif } } + #endif #ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG @@ -1582,6 +1586,29 @@ void ivas_SplitRenderer_PostRenderer( { for ( ch_idx1 = 0; ch_idx1 < BINAURAL_CHANNELS; ch_idx1++ ) { +#ifdef SPLIT_REND_PLC + if ( hBinPostRenderer->cf_flag ) + { + pMix_mat_re_prev[ch_idx1] = hBinPostRenderer->mixer_mat_re[pos_idx][b][ch_idx1]; + pMix_mat_im_prev[ch_idx1] = hBinPostRenderer->mixer_mat_im[pos_idx][b][ch_idx1]; + mix_mat_re[ch_idx1][0] = fade * ( rot_md_act[pos_idx][b].pred_mat_re[ch_idx1][0] ) + + ( 1.0f - fade ) * pMix_mat_re_prev[ch_idx1][0]; + mix_mat_re[ch_idx1][1] = fade * ( rot_md_act[pos_idx][b].pred_mat_re[ch_idx1][1] ) + + ( 1.0f - fade ) * pMix_mat_re_prev[ch_idx1][1]; + + mix_mat_im[ch_idx1][0] = fade * ( rot_md_act[pos_idx][b].pred_mat_im[ch_idx1][0] ) + + ( 1.0f - fade ) * pMix_mat_im_prev[ch_idx1][0]; + mix_mat_im[ch_idx1][1] = fade * ( rot_md_act[pos_idx][b].pred_mat_im[ch_idx1][1] ) + + ( 1.0f - fade ) * pMix_mat_im_prev[ch_idx1][1]; + } + else + { + mix_mat_re[ch_idx1][0] = rot_md_act[pos_idx][b].pred_mat_re[ch_idx1][0]; + mix_mat_re[ch_idx1][1] = rot_md_act[pos_idx][b].pred_mat_re[ch_idx1][1]; + mix_mat_im[ch_idx1][0] = rot_md_act[pos_idx][b].pred_mat_im[ch_idx1][0]; + mix_mat_im[ch_idx1][1] = rot_md_act[pos_idx][b].pred_mat_im[ch_idx1][1]; + } +#else if ( hBinPostRenderer->cf_flag ) { pMix_mat_re_prev[ch_idx1] = hBinPostRenderer->mixer_mat_re[pos_idx][b][ch_idx1]; @@ -1603,9 +1630,21 @@ void ivas_SplitRenderer_PostRenderer( mix_mat_im[ch_idx1][0] = hBinPostRenderer->rot_md[pos_idx][sf_idx][b].pred_mat_im[ch_idx1][0]; mix_mat_im[ch_idx1][1] = hBinPostRenderer->rot_md[pos_idx][sf_idx][b].pred_mat_im[ch_idx1][1]; } +#endif } #ifndef SPLIT_REND_ZERO_OUT_YAW_D +#ifdef SPLIT_REND_PLC + if ( hBinPostRenderer->cf_flag ) + { + gd_cf = fade * rot_md_act[pos_idx][b].gd + + ( 1 - fade ) * hBinPostRenderer->gd_mem[pos_idx][b]; + } + else + { + gd_cf = rot_md_act[pos_idx][b].gd; + } +#else if ( hBinPostRenderer->cf_flag ) { gd_cf = fade * hBinPostRenderer->rot_md[pos_idx][sf_idx][b].gd + @@ -1615,6 +1654,7 @@ void ivas_SplitRenderer_PostRenderer( { gd_cf = hBinPostRenderer->rot_md[pos_idx][sf_idx][b].gd; } +#endif gd_cf_abs = (float) fabs( gd_cf ); #endif @@ -1679,6 +1719,19 @@ void ivas_SplitRenderer_PostRenderer( pos_idx = 0; #endif { +#ifdef SPLIT_REND_PLC + for ( b = 0; b < num_md_bands; b++ ) + { + for ( ch_idx1 = 0; ch_idx1 < BINAURAL_CHANNELS; ch_idx1++ ) + { + hBinPostRenderer->mixer_mat_re[pos_idx][b][ch_idx1][0] = rot_md_act[pos_idx][b].pred_mat_re[ch_idx1][0]; + hBinPostRenderer->mixer_mat_re[pos_idx][b][ch_idx1][1] = rot_md_act[pos_idx][b].pred_mat_re[ch_idx1][1]; + hBinPostRenderer->mixer_mat_im[pos_idx][b][ch_idx1][0] = rot_md_act[pos_idx][b].pred_mat_im[ch_idx1][0]; + hBinPostRenderer->mixer_mat_im[pos_idx][b][ch_idx1][1] = rot_md_act[pos_idx][b].pred_mat_im[ch_idx1][1]; + } + hBinPostRenderer->gd_mem[pos_idx][b] = rot_md_act[pos_idx][b].gd; + } +#else for ( b = 0; b < num_md_bands; b++ ) { for ( ch_idx1 = 0; ch_idx1 < BINAURAL_CHANNELS; ch_idx1++ ) @@ -1690,6 +1743,7 @@ void ivas_SplitRenderer_PostRenderer( } hBinPostRenderer->gd_mem[pos_idx][b] = hBinPostRenderer->rot_md[pos_idx][sf_idx][b].gd; } +#endif } hBinPostRenderer->cf_flag = 1; @@ -1730,7 +1784,7 @@ void ivas_SplitRenderer_PostRenderer( #endif } - wmops_sub_end(); + pop_wmops(); return; } @@ -1792,11 +1846,15 @@ void ivas_rend_CldfbSplitPostRendProcess( const int16_t is_cldfb_in ) { int16_t ch_idx, slot_idx, num_cldfb_bands; + + push_wmops( "ivas_rend_CldfbSplitPostRendProcess" ); + num_cldfb_bands = hBinHrSplitPostRend->cldfbSyn[0]->no_channels; if ( is_cldfb_in == 0 ) { ivas_rend_CldfbSplitPostRendProcessTdIn( hBinHrSplitPostRend, pMultiBinPoseData, QuaternionsPost, output ); + pop_wmops(); return; } @@ -1822,6 +1880,8 @@ void ivas_rend_CldfbSplitPostRendProcess( cldfbSynthesis( RealBuffer, ImagBuffer, &( output[ch_idx][0] ), num_cldfb_bands * CLDFB_NO_COL_MAX, hBinHrSplitPostRend->cldfbSyn[ch_idx] ); } + pop_wmops(); + return; } @@ -1833,6 +1893,9 @@ void ivas_init_split_post_rend_handles( SPLIT_POST_REND_WRAPPER *hSplitRendWrapp hSplitRendWrapper->hLc3plusDec = NULL; #endif ivas_init_multi_bin_pose_data( &hSplitRendWrapper->multiBinPoseData ); +#ifdef SPLIT_REND_PLC + hSplitRendWrapper->first_good_frame_received = 0; +#endif return; } #endif diff --git a/lib_rend/ivas_splitRendererPre.c b/lib_rend/ivas_splitRendererPre.c index 93c38f4b84..5e2eeb9b0e 100644 --- a/lib_rend/ivas_splitRendererPre.c +++ b/lib_rend/ivas_splitRendererPre.c @@ -45,14 +45,14 @@ #include "ivas_rom_dec.h" #include "ivas_rom_binauralRenderer.h" #include "lib_rend.h" -#include "ivas_lib_rend_internal.h" -#ifdef DEBUGGING -#include "debug.h" -#endif -#include "wmops.h" +#include "ivas_prot_rend.h" #ifdef SPLIT_REND_LC3PLUS #include "ivas_lc3plus_enc.h" #endif +#ifdef DEBUGGING +#include "debug.h" +#endif +#include "wmc_auto.h" #ifdef SPLIT_REND_WITH_HEAD_ROT @@ -1183,26 +1183,6 @@ static void ivas_SplitRenderer_quant_code( } /*get base2 bits and check if its within target. if yes then code with base2 to save complexity on post renderer*/ -#if 0 - if ( target_md_bits >= ( base2bits[q] + overhead_bits ) ) - { - ivas_split_rend_bitstream_write_int32( pBits, 0, 1 ); - ivas_split_rend_bitstream_write_int32( pBits, q, quant_strat_bits ); - ivas_SplitRenderer_code_md_base2( - hBinHrSplitPreRend, - pMultiBinPoseData, - num_subframes, - pred_real_bands_yaw[q], - pred_imag_bands_yaw[q], - d_bands_yaw[q], - bands_pitch[q], - pred_real_bands_roll[q], - pred_imag_bands_roll[q], - pBits ); - break; - } - else -#endif { start_bit = pBits->bits_written; ivas_split_rend_bitstream_write_int32( pBits, 1, 1 ); @@ -1346,7 +1326,7 @@ void ivas_SplitRenderer_GetRotMd( const int16_t *pBand_grouping = SplitRend_band_grouping; num_md_bands = MAX_SPLIT_REND_MD_BANDS; - wmops_sub_start( "ivas_SplitRenderer_GetRotMd" ); + push_wmops( "ivas_SplitRenderer_GetRotMd" ); num_poses = pMultiBinPoseData->num_poses; @@ -1448,7 +1428,7 @@ void ivas_SplitRenderer_GetRotMd( #endif } - wmops_sub_end(); + pop_wmops(); return; } @@ -1463,6 +1443,7 @@ void ivas_rend_CldfbSplitPreRendProcess( const int32_t target_md_bits, const int16_t low_res_pre_rend_rot ) { + push_wmops( "ivas_rend_CldfbSplitPreRendProcess" ); ivas_SplitRenderer_GetRotMd( hBinHrSplitPreRend, @@ -1479,6 +1460,8 @@ void ivas_rend_CldfbSplitPreRendProcess( low_res_pre_rend_rot, target_md_bits ); + pop_wmops(); + return; } @@ -1490,6 +1473,8 @@ void ivas_rend_TdSplitPreRendProcess( { const int32_t tmp_num_bits = 16; + push_wmops( "ivas_rend_TdSplitPreRendProcess" ); + /* write number of poses so that decoding side knows how many x/y/z triples to read */ ivas_split_rend_bitstream_write_int32( pBits, pMultiBinPoseData->num_poses, tmp_num_bits ); @@ -1527,6 +1512,8 @@ void ivas_rend_TdSplitPreRendProcess( ivas_split_rend_bitstream_write_int32( pBits, angle, tmp_num_bits ); } } + + pop_wmops(); } #endif @@ -1547,7 +1534,7 @@ ivas_error ivas_splitBinPreRendOpen( int16_t pos_idx, sf_idx, bandIdx; error = IVAS_ERR_OK; - if ( ( hBinRend = (BIN_HR_SPLIT_PRE_REND_HANDLE) count_malloc( sizeof( BIN_HR_SPLIT_PRE_REND ) ) ) == NULL ) + if ( ( hBinRend = (BIN_HR_SPLIT_PRE_REND_HANDLE) malloc( sizeof( BIN_HR_SPLIT_PRE_REND ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for bin split pre renderer Module \n" ) ); } @@ -1575,7 +1562,7 @@ ivas_error ivas_splitBinPreRendOpen( for ( pos_idx = 0; pos_idx < pMultiBinPoseData->num_poses - 1; pos_idx++ ) { - for ( sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ ) + for ( sf_idx = 0; sf_idx < MAX_SPLIT_MD_SUBFRAMES; sf_idx++ ) { for ( bandIdx = 0; bandIdx < MAX_SPLIT_REND_MD_BANDS; bandIdx++ ) { @@ -1610,7 +1597,7 @@ void ivas_splitBinPreRendClose( BIN_HR_SPLIT_PRE_REND_HANDLE *hBinHrSplitPreRend } } #endif - count_free( ( *hBinHrSplitPreRend ) ); + free( ( *hBinHrSplitPreRend ) ); ( *hBinHrSplitPreRend ) = NULL; } return; @@ -1654,7 +1641,7 @@ static ivas_error split_renderer_open_lc3plus( SPLIT_REND_WRAPPER *hSplitRendWra int32_t i, delayBufferLength; LC3PLUS_CONFIG config; - config.lc3plus_frame_duration_us = 10000; + config.lc3plus_frame_duration_us = 5000; config.ivas_frame_duration_us = 20000; config.samplerate = OutSampleRate; @@ -1693,7 +1680,7 @@ static ivas_error split_renderer_open_lc3plus( SPLIT_REND_WRAPPER *hSplitRendWra delayBufferLength = OutSampleRate / FRAMES_PER_SECOND + hSplitRendWrapper->lc3plusDelaySamples; for ( i = 0; i < hSplitRendWrapper->multiBinPoseData.num_poses * BINAURAL_CHANNELS; ++i ) { - hSplitRendWrapper->lc3plusDelayBuffers[i] = count_malloc( delayBufferLength * sizeof( float ) ); + hSplitRendWrapper->lc3plusDelayBuffers[i] = malloc( delayBufferLength * sizeof( float ) ); set_zero( hSplitRendWrapper->lc3plusDelayBuffers[i], delayBufferLength ); } @@ -1704,6 +1691,9 @@ static ivas_error split_renderer_open_lc3plus( SPLIT_REND_WRAPPER *hSplitRendWra ivas_error ivas_split_renderer_open( SPLIT_REND_WRAPPER *hSplitRendWrapper, const IVAS_SPLIT_REND_CONFIG_DATA *pSplitRendConfig, const int32_t OutSampleRate, +#ifdef SPLIT_REND_LC3PLUS + const uint8_t useLc3plus, +#endif const int16_t is_cldfb_in, const int16_t is_pcm_out ) { @@ -1721,7 +1711,7 @@ ivas_error ivas_split_renderer_open( SPLIT_REND_WRAPPER *hSplitRendWrapper, #endif is_cldfb_in == 0 ) { - if ( ( hSplitRendWrapper->hCldfbHandles = (CLDFB_HANDLES_WRAPPER_HANDLE) count_malloc( sizeof( CLDFB_HANDLES_WRAPPER ) ) ) == NULL ) + if ( ( hSplitRendWrapper->hCldfbHandles = (CLDFB_HANDLES_WRAPPER_HANDLE) malloc( sizeof( CLDFB_HANDLES_WRAPPER ) ) ) == NULL ) { return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CLDFB handles\n" ) ); } @@ -1762,7 +1752,7 @@ ivas_error ivas_split_renderer_open( SPLIT_REND_WRAPPER *hSplitRendWrapper, if ( is_pcm_out == 0 ) { #ifdef SPLIT_REND_LC3PLUS - if ( is_cldfb_in ) + if ( !useLc3plus ) { #endif error = ivas_splitBinLCLDEncOpen( &hSplitRendWrapper->hSplitBinLCLDEnc, OutSampleRate, 2, ivas_get_lcld_bitrate( pSplitRendConfig->splitRendBitRate ) ); @@ -1814,7 +1804,7 @@ void ivas_split_renderer_close( SPLIT_REND_WRAPPER *hSplitBinRend ) hSplitBinRend->hCldfbHandles->cldfbAna[ch] = NULL; } } - count_free( hSplitBinRend->hCldfbHandles ); + free( hSplitBinRend->hCldfbHandles ); hSplitBinRend->hCldfbHandles = NULL; } @@ -1828,7 +1818,7 @@ void ivas_split_renderer_close( SPLIT_REND_WRAPPER *hSplitBinRend ) { if ( hSplitBinRend->lc3plusDelayBuffers[i] != NULL ) { - count_free( hSplitBinRend->lc3plusDelayBuffers[i] ); + free( hSplitBinRend->lc3plusDelayBuffers[i] ); } } #endif @@ -1862,6 +1852,8 @@ static ivas_error ivas_renderMultiTDBinToSplitBinaural( int32_t i; #endif + push_wmops( "ivas_renderMultiTDBinToSplitBinaural" ); + error = IVAS_ERR_OK; #ifdef SPLIT_REND_TD_POSE_CORRECTION assert( hSplitBin->hCldfbHandles != NULL || hSplitBin->multiBinPoseData.poseCorrectionMode == IVAS_SPLIT_REND_POSE_CORRECTION_MODE_TD ); @@ -2042,6 +2034,9 @@ static ivas_error ivas_renderMultiTDBinToSplitBinaural( { ivas_split_rend_bitstream_write_int32( pBits, (int32_t) 0, 1 ); } + + pop_wmops(); + return error; } @@ -2061,6 +2056,8 @@ ivas_error ivas_renderMultiBinToSplitBinaural( int32_t bit_len, target_md_bits, actual_md_bits, available_bits; error = IVAS_ERR_OK; + push_wmops( "ivas_renderMultiBinToSplitBinaural" ); + set_fix_rotation_mat( hSplitBin->hBinHrSplitPreRend->fix_pos_rot_mat, &hSplitBin->multiBinPoseData ); set_pose_types( hSplitBin->hBinHrSplitPreRend->pose_type, &hSplitBin->multiBinPoseData ); @@ -2074,6 +2071,7 @@ ivas_error ivas_renderMultiBinToSplitBinaural( /*if CLDFB handles have been allocated then assume valid multi binaural input in out[][] buffer and perform CLDFB analysis*/ error = ivas_renderMultiTDBinToSplitBinaural( hSplitBin, headPositions, SplitRendBitRate, pBits, max_bands, out, low_res_pre_rend_rot, pcm_out ); + pop_wmops(); return error; } target_md_bits = ivas_get_split_rend_md_target_brate( SplitRendBitRate, pcm_out ) * L_FRAME48k / 48000; @@ -2110,6 +2108,9 @@ ivas_error ivas_renderMultiBinToSplitBinaural( { ivas_split_rend_bitstream_write_int32( pBits, (int32_t) 0, 1 ); } + + pop_wmops(); + return error; } #endif diff --git a/lib_rend/ivas_splitRenderer_utils.c b/lib_rend/ivas_splitRenderer_utils.c index 913f394927..6bca717d3c 100644 --- a/lib_rend/ivas_splitRenderer_utils.c +++ b/lib_rend/ivas_splitRenderer_utils.c @@ -42,11 +42,11 @@ #include "ivas_rom_dec.h" #include "ivas_rom_binauralRenderer.h" #include "lib_rend.h" -#include "ivas_lib_rend_internal.h" +#include "ivas_prot_rend.h" #ifdef DEBUGGING #include "debug.h" #endif -#include "wmops.h" +#include "wmc_auto.h" #ifdef SPLIT_REND_WITH_HEAD_ROT @@ -423,9 +423,10 @@ int32_t ivas_get_lcld_bitrate( const int32_t SplitRendBitRate ) } default: { - return -1; + break; } } + return -1; } #ifdef SPLIT_REND_LC3PLUS @@ -447,6 +448,12 @@ int32_t ivas_get_lc3plus_bitrate( const int32_t SplitRendBitRate, IVAS_SPLIT_REN } if ( poseCorrectionMode == IVAS_SPLIT_REND_POSE_CORRECTION_MODE_TD ) { +#ifdef SPLIT_REND_LC3PLUS_HBR_DBG + if ( SplitRendBitRate == -1 ) + { + return -1; + } +#endif return SplitRendBitRate - ivas_get_max_td_pose_correction_bitrate(); } @@ -464,6 +471,12 @@ int32_t ivas_get_lc3plus_bitrate( const int32_t SplitRendBitRate ) int8_t ivas_get_lc3plus_bitrate_id( const int32_t SplitRendBitRate ) { +#ifdef SPLIT_REND_LC3PLUS_HBR_DBG + if ( SplitRendBitRate == -1 ) + { + return 3; + } +#endif switch ( SplitRendBitRate ) { case SPLIT_REND_768k: @@ -480,9 +493,10 @@ int8_t ivas_get_lc3plus_bitrate_id( const int32_t SplitRendBitRate ) } default: { - return -1; + break; } } + return -1; } int32_t ivas_get_lc3plus_size_from_id( const int8_t SplitRendBitRateId #ifdef SPLIT_REND_TD_POSE_CORRECTION @@ -496,6 +510,13 @@ int32_t ivas_get_lc3plus_size_from_id( const int8_t SplitRendBitRateId IVAS_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode = codec_mode == 2 ? IVAS_SPLIT_REND_POSE_CORRECTION_MODE_TD : IVAS_SPLIT_REND_POSE_CORRECTION_MODE_CLDFB; #endif +#ifdef SPLIT_REND_LC3PLUS_HBR_DBG + if ( SplitRendBitRateId == 3 ) + { + return -1; + } +#endif + switch ( SplitRendBitRateId ) { case 2: @@ -754,32 +775,32 @@ void ivas_renderSplitUpdateTdCorrectionPoseData( assert( pMultiBinPoseData->num_poses <= MAX_HEAD_ROT_POSES ); pos_idx = 0; - /* yaw_lu */ + /* YAW_L_PITCH_U */ pMultiBinPoseData->relative_head_poses[pos_idx + 1][0] = yawOffset; pMultiBinPoseData->relative_head_poses[pos_idx + 1][1] = pitchOffset; pMultiBinPoseData->relative_head_poses[pos_idx + 1][2] = 0.0f; pos_idx++; - /* yaw_ld */ + /* YAW_L_PITCH_D */ pMultiBinPoseData->relative_head_poses[pos_idx + 1][0] = yawOffset; pMultiBinPoseData->relative_head_poses[pos_idx + 1][1] = -1.0f * pitchOffset; pMultiBinPoseData->relative_head_poses[pos_idx + 1][2] = 0.0f; pos_idx++; - /* yaw_ru */ + /* YAW_R_PITCH_U */ pMultiBinPoseData->relative_head_poses[pos_idx + 1][0] = -1.0f * yawOffset; pMultiBinPoseData->relative_head_poses[pos_idx + 1][1] = pitchOffset; pMultiBinPoseData->relative_head_poses[pos_idx + 1][2] = 0.0f; pos_idx++; - /* yaw_rd */ + /* YAW_R_PITCH_D */ pMultiBinPoseData->relative_head_poses[pos_idx + 1][0] = -1.0f * yawOffset; pMultiBinPoseData->relative_head_poses[pos_idx + 1][1] = -1.0f * pitchOffset; pMultiBinPoseData->relative_head_poses[pos_idx + 1][2] = 0.0f; pos_idx++; - /* pitch_u */ + /* PITCH_U */ pMultiBinPoseData->relative_head_poses[pos_idx + 1][0] = 0.0f; pMultiBinPoseData->relative_head_poses[pos_idx + 1][1] = pitchOffset; pMultiBinPoseData->relative_head_poses[pos_idx + 1][2] = 0.0f; pos_idx++; - /* pitch_d */ + /* PITCH_D */ pMultiBinPoseData->relative_head_poses[pos_idx + 1][0] = 0.0f; pMultiBinPoseData->relative_head_poses[pos_idx + 1][1] = -1.0f * pitchOffset; pMultiBinPoseData->relative_head_poses[pos_idx + 1][2] = 0.0f; @@ -792,40 +813,40 @@ void ivas_renderSplitUpdateTdCorrectionPoseData( else if ( pSplit_rend_config->dof == 3 && pSplit_rend_config->poseCorrectionMode == IVAS_SPLIT_REND_POSE_CORRECTION_MODE_TD ) { pMultiBinPoseData->num_poses = 7 + 1; - assert( pMultiBinPoseData->num_poses <= MAX_HEAD_ROT_POSES); + assert( pMultiBinPoseData->num_poses <= MAX_HEAD_ROT_POSES ); pos_idx = 0; - /* yaw_lu */ + /* YAW_L_PITCH_U */ pMultiBinPoseData->relative_head_poses[pos_idx + 1][0] = yawOffset; pMultiBinPoseData->relative_head_poses[pos_idx + 1][1] = pitchOffset; pMultiBinPoseData->relative_head_poses[pos_idx + 1][2] = 0.0f; pos_idx++; - /* yaw_ld */ + /* YAW_L_PITCH_D */ pMultiBinPoseData->relative_head_poses[pos_idx + 1][0] = yawOffset; pMultiBinPoseData->relative_head_poses[pos_idx + 1][1] = -1.0f * pitchOffset; pMultiBinPoseData->relative_head_poses[pos_idx + 1][2] = 0.0f; pos_idx++; - /* yaw_ru */ + /* YAW_R_PITCH_U */ pMultiBinPoseData->relative_head_poses[pos_idx + 1][0] = -1.0f * yawOffset; pMultiBinPoseData->relative_head_poses[pos_idx + 1][1] = pitchOffset; pMultiBinPoseData->relative_head_poses[pos_idx + 1][2] = 0.0f; pos_idx++; - /* yaw_rd */ + /* YAW_R_PITCH_D */ pMultiBinPoseData->relative_head_poses[pos_idx + 1][0] = -1.0f * yawOffset; pMultiBinPoseData->relative_head_poses[pos_idx + 1][1] = -1.0f * pitchOffset; pMultiBinPoseData->relative_head_poses[pos_idx + 1][2] = 0.0f; pos_idx++; - /* pitch_u */ + /* PITCH_U */ pMultiBinPoseData->relative_head_poses[pos_idx + 1][0] = 0.0f; pMultiBinPoseData->relative_head_poses[pos_idx + 1][1] = pitchOffset; pMultiBinPoseData->relative_head_poses[pos_idx + 1][2] = 0.0f; pos_idx++; - /* pitch_d */ + /* PITCH_D */ pMultiBinPoseData->relative_head_poses[pos_idx + 1][0] = 0.0f; pMultiBinPoseData->relative_head_poses[pos_idx + 1][1] = -1.0f * pitchOffset; pMultiBinPoseData->relative_head_poses[pos_idx + 1][2] = 0.0f; pos_idx++; - /* roll_c */ + /* ROLL_C */ pMultiBinPoseData->relative_head_poses[pos_idx + 1][0] = 0.0f; pMultiBinPoseData->relative_head_poses[pos_idx + 1][1] = 0.0f; pMultiBinPoseData->relative_head_poses[pos_idx + 1][2] = rollOffset; @@ -842,6 +863,7 @@ void ivas_init_multi_bin_pose_data( MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData { int16_t pos_idx; #ifdef SPLIT_REND_TD_POSE_CORRECTION + int16_t subframe_idx; int16_t subframe_len; float norm; #endif @@ -861,15 +883,17 @@ void ivas_init_multi_bin_pose_data( MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData subframe_len = L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES; norm = 1.f / ( subframe_len - 1 ); - set_zero( pMultiBinPoseData->gains_prev, MAX_HEAD_ROT_POSES ); - set_zero( pMultiBinPoseData->gains, MAX_HEAD_ROT_POSES ); - pMultiBinPoseData->gains_prev[0] = 1.f; - - for ( pos_idx = 0; pos_idx < 3; pos_idx++ ) + for ( subframe_idx = 0; subframe_idx < MAX_PARAM_SPATIAL_SUBFRAMES; subframe_idx++ ) { - pMultiBinPoseData->swap_flag_prev[pos_idx] = false; - pMultiBinPoseData->swap_flag[pos_idx] = false; + set_zero( pMultiBinPoseData->td_data[subframe_idx].gains, MAX_HEAD_ROT_POSES ); + pMultiBinPoseData->td_data[subframe_idx].gains[0] = 1.f; + + pMultiBinPoseData->td_data[subframe_idx].swap_default = false; + pMultiBinPoseData->td_data[subframe_idx].swap_yaw_l = false; + pMultiBinPoseData->td_data[subframe_idx].swap_yaw_r = false; + pMultiBinPoseData->td_data[subframe_idx].swap_roll = false; } + for ( pos_idx = 0; pos_idx < subframe_len; pos_idx++ ) { pMultiBinPoseData->xfade[pos_idx] = pos_idx * norm; diff --git a/lib_rend/ivas_stat_rend.h b/lib_rend/ivas_stat_rend.h index 204597b2f5..4b6018b608 100644 --- a/lib_rend/ivas_stat_rend.h +++ b/lib_rend/ivas_stat_rend.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -34,15 +34,983 @@ #define IVAS_STAT_REND_H #include +#include "options.h" #include "ivas_cnst.h" - +#include "ivas_stat_com.h" // note: needed for DIRAC_DEC_BIN_HANDLE until #156 is solved +#include "common_api_types.h" +#ifdef SPLIT_REND_WITH_HEAD_ROT +#include "stat_com.h" +#include "ivas_CQMFEncoder.h" +#include "ivas_CQMFDecoder.h" +#endif #ifdef SPLIT_REND_LC3PLUS #include "ivas_lc3plus_enc.h" -#include "ivas_lc3plus_common.h" #include "ivas_lc3plus_dec.h" #endif -#define MAX_SPEAKERS 12 /* Max number of speakers (including LFE) in a channel-based config */ +/*----------------------------------------------------------------------------------* + * Output configuration for renderer (e.g. DirAC, MASA, Binaural Renderer...) + *----------------------------------------------------------------------------------*/ + +typedef struct ivas_output_setup_structure +{ + AUDIO_CONFIG output_config; + int16_t nchan_out_woLFE; /* number of output audio channels without LFE */ + int16_t ambisonics_order; + int8_t is_loudspeaker_setup; + int8_t is_planar_setup; + int8_t is_binaural_setup; + + int16_t num_lfe; + int16_t index_lfe[1]; + const float *ls_azimuth; + const float *ls_elevation; + + uint8_t separateChannelEnabled; + int16_t separateChannelIndex; + +} IVAS_OUTPUT_SETUP, *IVAS_OUTPUT_SETUP_HANDLE; + + +/*----------------------------------------------------------------------------------* + * Binaural FastConv Rendering structure + *----------------------------------------------------------------------------------*/ + +/* Binaural reverberator structure */ +typedef struct ivas_binaural_reverb_struct +{ + float *loopBufReal[CLDFB_NO_CHANNELS_MAX]; + float *loopBufImag[CLDFB_NO_CHANNELS_MAX]; + float preDelayBufferReal[REVERB_PREDELAY_MAX + 1][CLDFB_NO_CHANNELS_MAX]; + float preDelayBufferImag[REVERB_PREDELAY_MAX + 1][CLDFB_NO_CHANNELS_MAX]; + float **tapPointersReal[CLDFB_NO_CHANNELS_MAX][BINAURAL_CHANNELS]; + float **tapPointersImag[CLDFB_NO_CHANNELS_MAX][BINAURAL_CHANNELS]; + + float binauralCoherenceCrossmixGains[CLDFB_NO_CHANNELS_MAX]; + float binauralCoherenceDirectGains[CLDFB_NO_CHANNELS_MAX]; + float reverbEqGains[CLDFB_NO_CHANNELS_MAX]; + float loopAttenuationFactor[CLDFB_NO_CHANNELS_MAX]; + + float *outputBufferReal[CLDFB_NO_CHANNELS_MAX][BINAURAL_CHANNELS]; + float *outputBufferImag[CLDFB_NO_CHANNELS_MAX][BINAURAL_CHANNELS]; + + int16_t numBins; + + int16_t useBinauralCoherence; + int16_t loopBufLength[CLDFB_NO_CHANNELS_MAX]; + int16_t loopBufLengthMax[CLDFB_NO_CHANNELS_MAX]; + int16_t preDelayBufferIndex; + int16_t preDelayBufferLength; + + int16_t taps[CLDFB_NO_CHANNELS_MAX][BINAURAL_CHANNELS]; + int16_t *tapPhaseShiftType[CLDFB_NO_CHANNELS_MAX][BINAURAL_CHANNELS]; + + int16_t blockSize; + uint32_t binRend_RandNext; + int16_t highestBinauralCoherenceBin; + + float dmxmtx[BINAURAL_CHANNELS][MAX_OUTPUT_CHANNELS]; + float foa_enc[MAX_OUTPUT_CHANNELS][FOA_CHANNELS]; + +} REVERB_STRUCT, *REVERB_STRUCT_HANDLE; + +/* Parametric binaural data structure */ +typedef struct ivas_dirac_dec_binaural_data_structure +{ + float ChEnePrev[BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX]; + float ChCrossRePrev[CLDFB_NO_CHANNELS_MAX]; + float ChCrossImPrev[CLDFB_NO_CHANNELS_MAX]; + float ChEne[BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX]; + float ChCrossRe[CLDFB_NO_CHANNELS_MAX]; + float ChCrossIm[CLDFB_NO_CHANNELS_MAX]; + float ChEneOutPrev[BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX]; + float ChCrossReOutPrev[CLDFB_NO_CHANNELS_MAX]; + float ChCrossImOutPrev[CLDFB_NO_CHANNELS_MAX]; + float ChEneOut[BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX]; + float ChCrossReOut[CLDFB_NO_CHANNELS_MAX]; + float ChCrossImOut[CLDFB_NO_CHANNELS_MAX]; + float processMtxRe[BINAURAL_CHANNELS][BINAURAL_CHANNELS + 1][CLDFB_NO_CHANNELS_MAX]; /* +1 refers to SeparateChannel */ + float processMtxIm[BINAURAL_CHANNELS][BINAURAL_CHANNELS + 1][CLDFB_NO_CHANNELS_MAX]; + float processMtxDecRe[BINAURAL_CHANNELS][BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX]; + float processMtxDecIm[BINAURAL_CHANNELS][BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX]; + float diffuseFieldCoherence[CLDFB_NO_CHANNELS_MAX]; + float diffuseFieldCoherenceX[BINAURAL_COHERENCE_DIFFERENCE_BINS]; + float diffuseFieldCoherenceY[BINAURAL_COHERENCE_DIFFERENCE_BINS]; + float diffuseFieldCoherenceZ[BINAURAL_COHERENCE_DIFFERENCE_BINS]; + float earlyPartEneCorrection[CLDFB_NO_CHANNELS_MAX]; + REVERB_STRUCT_HANDLE hReverb; + uint8_t renderStereoOutputInsteadOfBinaural; + float frameMeanDiffuseness[CLDFB_NO_CHANNELS_MAX]; + float processMtxRePrev[BINAURAL_CHANNELS][BINAURAL_CHANNELS + 1][CLDFB_NO_CHANNELS_MAX]; + float processMtxImPrev[BINAURAL_CHANNELS][BINAURAL_CHANNELS + 1][CLDFB_NO_CHANNELS_MAX]; + float processMtxDecRePrev[BINAURAL_CHANNELS][BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX]; + float processMtxDecImPrev[BINAURAL_CHANNELS][BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX]; + uint16_t useSubframeMode; /* 0 = process in 20 ms frames, 1 = process in 5 ms subframes */ + uint16_t useTdDecorr; + ivas_td_decorr_state_t *hTdDecorr; + float reqularizationFactor; + +} DIRAC_DEC_BIN_DATA, *DIRAC_DEC_BIN_HANDLE; + +typedef struct ivas_binaural_rendering_conv_module_struct +{ + float ***filterTapsLeftReal; + float ***filterTapsLeftImag; + float ***filterTapsRightReal; + float ***filterTapsRightImag; + +#ifdef SPLIT_REND_WITH_HEAD_ROT + float ****filterStatesLeftReal; + float ****filterStatesLeftImag; +#else + float ***filterStatesLeftReal; + float ***filterStatesLeftImag; +#endif + + int16_t numTapsArray[BINAURAL_CONVBANDS]; + int16_t numTaps; + +} BINRENDERER_CONV_MODULE, *BINRENDERER_CONV_MODULE_HANDLE; + +#ifdef SPLIT_REND_WITH_HEAD_ROT +/* binaural split rendering head rotation data structure */ +typedef struct ivas_binaural_head_rot_split_rendering_md_struct +{ + float pred_mat_re[BINAURAL_CHANNELS][BINAURAL_CHANNELS]; + float pred_mat_im[BINAURAL_CHANNELS][BINAURAL_CHANNELS]; + float gd; + float gd2; + int16_t pred_mat_re_idx[BINAURAL_CHANNELS][BINAURAL_CHANNELS]; + int16_t pred_mat_im_idx[BINAURAL_CHANNELS][BINAURAL_CHANNELS]; + int16_t gd_idx; + int16_t gd2_idx; +} BIN_HR_SPLIT_REND_MD, *BIN_HR_SPLIT_REND_MD_HANDLE; + +typedef struct ivas_split_rend_huffman_cfg_t +{ + const int32_t *codebook; + int16_t min_len; + int16_t max_len; + int16_t sym_len; +} ivas_split_rend_huffman_cfg_t; + +typedef struct ivas_binaural_head_rot_split_rendering_huff_struct +{ + ivas_split_rend_huffman_cfg_t pred; + int16_t pred_idx_trav[IVAS_SPLIT_REND_PRED_QUANT_PNTS]; + int16_t pred_base2_code_len; + ivas_split_rend_huffman_cfg_t gd; + int16_t gd_base2_code_len; + int16_t gd_idx_trav[IVAS_SPLIT_REND_D_QUANT_PNTS]; + ivas_split_rend_huffman_cfg_t p_gd; + int16_t p_gd_base2_code_len; + int16_t p_gd_idx_trav[IVAS_SPLIT_REND_D_QUANT_PNTS]; + ivas_split_rend_huffman_cfg_t p_gd_diff; + int16_t p_gd_diff_base2_code_len; + int16_t p_gd_diff_idx_trav[IVAS_SPLIT_REND_D_QUANT_PNTS]; +} BIN_HR_SPLIT_REND_HUFF, *BIN_HR_SPLIT_REND_HUFF_HANDLE; + +typedef struct ivas_binaural_head_rot_split_pre_rendering_struct +{ + BIN_HR_SPLIT_REND_MD rot_md[MAX_HEAD_ROT_POSES - 1][MAX_SPLIT_MD_SUBFRAMES][MAX_SPLIT_REND_MD_BANDS]; + float fix_pos_rot_mat[MAX_HEAD_ROT_POSES - 1][BINAURAL_CHANNELS][BINAURAL_CHANNELS]; + IVAS_SPLIT_REND_POSE_TYPE pose_type[MAX_HEAD_ROT_POSES - 1]; + BIN_HR_SPLIT_REND_HUFF huff_cfg; +#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG + HANDLE_CLDFB_FILTER_BANK cldfbSynRotBinDec[MAX_HEAD_ROT_POSES + 1][BINAURAL_CHANNELS]; +#endif +} BIN_HR_SPLIT_PRE_REND, *BIN_HR_SPLIT_PRE_REND_HANDLE; + +typedef struct ivas_binaural_head_rot_split_post_rendering_struct +{ + BIN_HR_SPLIT_REND_MD rot_md[MAX_HEAD_ROT_POSES][MAX_SPLIT_MD_SUBFRAMES][MAX_SPLIT_REND_MD_BANDS]; + IVAS_QUATERNION QuaternionsPre[MAX_PARAM_SPATIAL_SUBFRAMES]; + int16_t low_Res; + + float fix_pos_rot_mat[MAX_HEAD_ROT_POSES - 1][BINAURAL_CHANNELS][BINAURAL_CHANNELS]; + IVAS_SPLIT_REND_POSE_TYPE pose_type[MAX_HEAD_ROT_POSES - 1]; + BIN_HR_SPLIT_REND_HUFF huff_cfg; +#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG + float mixer_mat_re[MAX_HEAD_ROT_POSES][MAX_SPLIT_REND_MD_BANDS][BINAURAL_CHANNELS][BINAURAL_CHANNELS]; + float mixer_mat_im[MAX_HEAD_ROT_POSES][MAX_SPLIT_REND_MD_BANDS][BINAURAL_CHANNELS][BINAURAL_CHANNELS]; + float gd_mem[MAX_HEAD_ROT_POSES][MAX_SPLIT_REND_MD_BANDS]; +#else + float mixer_mat_re[1][MAX_SPLIT_REND_MD_BANDS][BINAURAL_CHANNELS][BINAURAL_CHANNELS]; + float mixer_mat_im[1][MAX_SPLIT_REND_MD_BANDS][BINAURAL_CHANNELS][BINAURAL_CHANNELS]; + float gd_mem[1][MAX_SPLIT_REND_MD_BANDS]; +#endif + int16_t cf_flag; + HANDLE_CLDFB_FILTER_BANK cldfbAna[BINAURAL_CHANNELS]; + HANDLE_CLDFB_FILTER_BANK cldfbSyn[BINAURAL_CHANNELS]; +#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG + HANDLE_CLDFB_FILTER_BANK cldfbSynReconsBinDec[MAX_HEAD_ROT_POSES][BINAURAL_CHANNELS]; +#endif +} BIN_HR_SPLIT_POST_REND, *BIN_HR_SPLIT_POST_REND_HANDLE; + +typedef struct ivas_binaural_head_rot_split_rendering_lcld_enc_struct +{ + void *pLcld_enc; + int32_t iChannels; + CQMFEncoder *psCQMFEncoder; + float ***pppfCQMFReal; + float ***pppfCQMFImag; +#ifdef CLDFB_DEBUG + FILE *cldfbIn; + int numFrame; +#endif +} BIN_HR_SPLIT_LCLD_ENC, *BIN_HR_SPLIT_LCLD_ENC_HANDLE; + +#ifdef SPLIT_REND_PLC +typedef struct +{ + float Cldfb_Prev_BinReal[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX + CLDFB_PLC_XF][CLDFB_NO_CHANNELS_MAX]; + float Cldfb_Prev_BinImag[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX + CLDFB_PLC_XF][CLDFB_NO_CHANNELS_MAX]; +#if CLDFB_PLC_XF > 0 + float xf_bet[2][CLDFB_NO_CHANNELS_MAX][CLDFB_PLC_XF]; +#endif +} CLDFB_PLC, *CLDFB_PLC_HANDLE; + +typedef struct +{ + CLDFB_PLC CldfbPLC_state; + int16_t prev_bfi; + int16_t bf_count; +} SPLIT_REND_PLC_STRUCT, *SPLIT_REND_PLC_HANDLE; +#endif + +typedef struct ivas_binaural_head_rot_split_rendering_lcld_dec_struct +{ + void *pLcld_dec; + int32_t iChannels; + CQMFDecoder *psCQMFDecoder; + float ***pppfDecCQMFReal; + float ***pppfDecCQMFImag; +#ifdef CLDFB_DEBUG + FILE *cldfbOut; + int numFrame; +#endif +#ifdef SPLIT_REND_PLC + SPLIT_REND_PLC_HANDLE hSplitRendPLC; +#endif +} BIN_HR_SPLIT_LCLD_DEC, *BIN_HR_SPLIT_LCLD_DEC_HANDLE; + +typedef struct +{ +#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG + HANDLE_CLDFB_FILTER_BANK cldfbAna[( 1 + MAX_HEAD_ROT_POSES ) * BINAURAL_CHANNELS]; +#else + HANDLE_CLDFB_FILTER_BANK cldfbAna[MAX_HEAD_ROT_POSES * BINAURAL_CHANNELS]; +#endif +} CLDFB_HANDLES_WRAPPER, *CLDFB_HANDLES_WRAPPER_HANDLE; + +#ifdef SPLIT_REND_WITH_HEAD_ROT +#ifdef SPLIT_REND_TD_POSE_CORRECTION +typedef struct +{ + bool swap_default; + bool swap_yaw_l; + bool swap_yaw_r; + bool swap_roll; + float gains[MAX_HEAD_ROT_POSES]; +} MULTI_BIN_REND_TD_POSE_CORRECTION_DATA; +#endif + +typedef struct +{ + int16_t num_poses; + float relative_head_poses[MAX_HEAD_ROT_POSES][3]; + int16_t dof; + int16_t hq_mode; + IVAS_SPLIT_REND_ROT_AXIS rot_axis; +#ifdef SPLIT_REND_TD_POSE_CORRECTION + IVAS_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode; + MULTI_BIN_REND_TD_POSE_CORRECTION_DATA td_data[MAX_PARAM_SPATIAL_SUBFRAMES]; + float xfade[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES]; +#endif +} MULTI_BIN_REND_POSE_DATA; +#endif + +#ifdef SPLIT_REND_LC3PLUS +/* Forward declaration of TD_OBJECT_RENDERER_HANDLE. + This avoids shifting the entire definition of TD Renderer structs above + this line, which could cause merge conflicts. + Can be cleaned up later. */ +typedef struct ivas_binaural_td_rendering_struct *TD_OBJECT_RENDERER_HANDLE; +#endif + +typedef struct +{ + MULTI_BIN_REND_POSE_DATA multiBinPoseData; + BIN_HR_SPLIT_PRE_REND_HANDLE hBinHrSplitPreRend; + BIN_HR_SPLIT_LCLD_ENC_HANDLE hSplitBinLCLDEnc; + CLDFB_HANDLES_WRAPPER_HANDLE hCldfbHandles; +#ifdef SPLIT_REND_LC3PLUS + IVAS_LC3PLUS_ENC_HANDLE hLc3plusEnc; + TD_OBJECT_RENDERER_HANDLE hTdRendHandles[MAX_HEAD_ROT_POSES - 1]; + float *lc3plusDelayBuffers[MAX_HEAD_ROT_POSES * BINAURAL_CHANNELS]; /* Used to time-align head pose correction metadata with LC3plus-coded reference audio */ + int32_t lc3plusDelaySamples; +#endif +} SPLIT_REND_WRAPPER; + +typedef struct +{ + MULTI_BIN_REND_POSE_DATA multiBinPoseData; + BIN_HR_SPLIT_POST_REND_HANDLE hBinHrSplitPostRend; + BIN_HR_SPLIT_LCLD_DEC_HANDLE hSplitBinLCLDDec; +#ifdef SPLIT_REND_PLC + int16_t first_good_frame_received; +#endif +#ifdef SPLIT_REND_LC3PLUS + IVAS_LC3PLUS_DEC_HANDLE hLc3plusDec; +#endif +} SPLIT_POST_REND_WRAPPER; +#endif + +/*----------------------------------------------------------------------------------* + * EFAP structures + *----------------------------------------------------------------------------------*/ + +typedef struct EFAP_VERTEX +{ + float azi; /* azimuth of the loudspeaker */ + float ele; /* elevation of the loudspeaker */ + float pos[3]; /* [x y z] cartesian coordinate vector */ + int16_t idx; /* integer, that corresponds to the first index for the LS in the 1D output */ + int16_t isNaN; /* used to indicate if the vertex is a virtual speaker */ + EFAP_VTX_DMX_TYPE dmxType; /* virtual speaker downmix type */ + +} EFAP_VERTEX; + +typedef struct EFAP_VERTEX_DATA +{ + EFAP_VERTEX *vertexArray; /* Array of vertices */ + int16_t numVtx; /* Number of vertices */ + int16_t *vtxOrder; /* Array that indicates the order of the vertex ranked by increasing azimuth */ + +} EFAP_VERTEX_DATA; + +typedef struct EFAP_POLYSET +{ + int16_t chan[EFAP_MAX_CHAN_NUM]; /* An array indicating the loudspeaker index of the polygon vertices */ + int16_t isNaN[EFAP_MAX_CHAN_NUM]; /* Indicates if one of the vertices isNaN */ + int16_t numChan; /* An integer between 0 and EFAP_MAX_CHAN_NUM corresponding to the number of vertices of the polygon */ + float polyAzi[EFAP_MAX_CHAN_NUM]; /* An array (same length as "chan"), with the azimuth of the channels */ + float polyEle[EFAP_MAX_CHAN_NUM]; /* An array (same length as "chan"), with the elevation of the channels */ + +} EFAP_POLYSET; + +typedef struct EFAP_LS_TRIANGLE +{ + int16_t LS[3]; /* Array indicating the loudspeaker index of the triangle vertices */ + +} EFAP_LS_TRIANGLE; + +typedef struct EFAP_POLYSET_DATA +{ + EFAP_POLYSET polysetArray[EFAP_MAX_POLY_SET]; /* Array of polygons */ + int16_t numPoly; /* Number of polygons */ + EFAP_LS_TRIANGLE triArray[EFAP_MAX_POLY_SET]; /* Array of triangles */ + int16_t numTri; /* Number of triangles */ + +} EFAP_POLYSET_DATA; + +typedef struct EFAP +{ + int16_t numSpk; /* Number of loudspeakers */ + float *aziSpk; /* Loudspeaker azimuths */ + float *eleSpk; /* Loudspeaker elevations */ + EFAP_VERTEX_DATA vtxData; /* Vertex Data, contains all the data concerning the vertex */ + EFAP_POLYSET_DATA polyData; /* Polygon data */ + float **dmTranspose; /* Downmix Matrix used for redistributing the energy of ghosts LS and its transpose */ + float *bufferLong; /* tmp buffer that will be given as a parameter for computing the gain; this is a 1D array of length numVtx */ + float *bufferShort; /* tmp buffer that will be given as a parameter for computing the gain; this is the result of downMixMatrix*bufferLong, length is numSpk */ + int16_t numTot; /* Total number of real + ghost loudspeakers, used later for freeing memory */ + +} EFAP, *EFAP_HANDLE; + +/*----------------------------------------------------------------------------------* + * Orientation tracking structure + *----------------------------------------------------------------------------------*/ + +typedef struct ivas_orient_trk_state_t +{ + OTR_TRACKING_T trackingType; + float centerAdaptationRate; + float offCenterAdaptationRate; + float adaptationAngle; + + float alpha; + IVAS_QUATERNION absAvgRot; /* average absolute orientation */ + IVAS_QUATERNION refRot; /* reference orientation */ + IVAS_QUATERNION trkRot; /* tracked rotation */ + +} ivas_orient_trk_state_t; + +/*----------------------------------------------------------------------------------* + * Head rotation data structure + *----------------------------------------------------------------------------------*/ + +typedef struct +{ + int8_t headRotEnabled; + IVAS_QUATERNION headPositions[RENDERER_HEAD_POSITIONS_PER_FRAME]; + IVAS_VECTOR3 Pos[RENDERER_HEAD_POSITIONS_PER_FRAME]; + float crossfade[L_FRAME48k / RENDERER_HEAD_POSITIONS_PER_FRAME]; +#ifdef SPLIT_REND_WITH_HEAD_ROT + IVAS_SPLIT_REND_ROT_AXIS sr_pose_pred_axis; +#endif + ivas_orient_trk_state_t *hOrientationTracker; + +} IVAS_REND_HeadRotData; + +typedef struct ivas_binaural_head_track_struct +{ + int16_t num_quaternions; + IVAS_QUATERNION Quaternions[MAX_PARAM_SPATIAL_SUBFRAMES]; + IVAS_VECTOR3 Pos[MAX_PARAM_SPATIAL_SUBFRAMES]; + float Rmat[3][3]; + float Rmat_prev[3][3]; + + uint8_t lrSwitchedNext; + uint8_t lrSwitchedCurrent; + float lrSwitchInterpVal; + + float chEneIIR[2][MASA_FREQUENCY_BANDS]; /* independent of the format. MASA bands are suitable for the task and readily available in ROM. */ + float procChEneIIR[2][MASA_FREQUENCY_BANDS]; + + int16_t shd_rot_max_order; + ivas_orient_trk_state_t *OrientationTracker; + +#ifdef SPLIT_REND_WITH_HEAD_ROT + IVAS_SPLIT_REND_ROT_AXIS sr_pose_pred_axis; +#endif +} HEAD_TRACK_DATA, *HEAD_TRACK_DATA_HANDLE; + +/*----------------------------------------------------------------------------------* + * Reverberator structure + *----------------------------------------------------------------------------------*/ +/* Reverberator structures */ + + +typedef struct ivas_roomAcoustics_t +{ + int16_t override; + int16_t use_brir; + int16_t late_reverb_on; + int16_t nBands; /* Number of frequency bands for which reverb properties are provided, integer, range [2..256] */ + float pFc_input[CLDFB_NO_CHANNELS_MAX]; /* Center frequencies for which following values are provided: */ + float pAcoustic_rt60[CLDFB_NO_CHANNELS_MAX]; /* - The room's T60 per center frequency */ + float pAcoustic_dsr[CLDFB_NO_CHANNELS_MAX]; /* - The room's Diffuse to Source Ratio per center frequency */ + float acousticPreDelay; /* Time elapsed between input signal and late reverberation start, float, range [0.001..10] */ + float inputPreDelay; /* Offset in seconds from where DSR is computed in the RIR (0 = at source), float, range [0.001..10] */ + +} ivas_roomAcoustics_t; + +typedef struct ivas_render_config_t +{ +#if ( defined DEBUGGING ) || ( defined SPLIT_REND_WITH_HEAD_ROT ) + ivas_renderTypeOverride renderer_type_override; +#endif + ivas_roomAcoustics_t roomAcoustics; + float directivity[3]; +#ifdef SPLIT_REND_WITH_HEAD_ROT + IVAS_SPLIT_REND_CONFIG_DATA split_rend_config; +#endif + +} RENDER_CONFIG_DATA, *RENDER_CONFIG_HANDLE; + +typedef struct ivas_rev_delay_line_t +{ + float *pBuffer; + uint16_t MaxDelay; + int16_t Delay; + uint16_t BufferPos; + float Gain; + +} ivas_rev_delay_line_t; + +typedef struct ivas_rev_iir_filter_t +{ + uint16_t MaxTaps; + uint16_t nr_taps; + uint16_t isFIR; + float Output; + float CoefA[IVAS_REV_MAX_IIR_FILTER_LENGTH]; + float CoefB[IVAS_REV_MAX_IIR_FILTER_LENGTH]; + float pBuffer[IVAS_REV_MAX_IIR_FILTER_LENGTH]; + +} ivas_rev_iir_filter_t; + + +typedef float rv_fftwf_type_complex[2]; /* complex type of fftwf library */ + +/* Convertion block for FFT filter: from time domain to frequency domain (with OLS) and back */ +typedef struct ivas_reverb_t2f_f2t_t +{ + int16_t fft_size; + int16_t log2_fft_size; + int16_t block_size; + int16_t hist_size; /* rv_fft_size - rv_block_size */ + float fft_history_L[RV_FILTER_MAX_HISTORY]; + float fft_history_R[RV_FILTER_MAX_HISTORY]; + +} ivas_reverb_t2f_f2t_t; + +/* FFT filter with its frequency response coefficients */ +typedef struct ivas_reverb_fft_filter_t +{ + int16_t fft_size; + float fft_spectrum[RV_FILTER_MAX_FFT_SIZE]; + +} ivas_reverb_fft_filter_t; + +typedef struct ivas_reverb_state_t +{ + RENDER_CONFIG_DATA pConfig; + + /* input downmixer: */ + float dmx_gain; /* downmix gain */ + + /* predelay: */ + ivas_rev_delay_line_t predelay_line; + float *pPredelay_buffer; + + /* jot reverberator: */ + uint16_t nr_of_branches; /* number of feedback loops */ + ivas_rev_delay_line_t delay_line[IVAS_REV_MAX_NR_BRANCHES]; /* feedback loop delays */ + float *loop_delay_buffer[IVAS_REV_MAX_NR_BRANCHES]; /* feedback loop delay sample buffers */ + ivas_rev_iir_filter_t t60[IVAS_REV_MAX_NR_BRANCHES]; /* feedback loop filters */ + float gain_matrix[IVAS_REV_MAX_NR_BRANCHES][IVAS_REV_MAX_NR_BRANCHES]; /* feedback matrix */ + float mixer[BINAURAL_CHANNELS][IVAS_REV_MAX_NR_BRANCHES]; /* output mixer matrix */ + + /* binauralization filters: */ + int16_t do_corr_filter; + ivas_reverb_t2f_f2t_t fft_filter_ols; + ivas_reverb_fft_filter_t fft_filter_correl_0; + ivas_reverb_fft_filter_t fft_filter_correl_1; + ivas_reverb_fft_filter_t fft_filter_color_0; + ivas_reverb_fft_filter_t fft_filter_color_1; + uint16_t fft_size; /* fft processing size */ + uint16_t fft_subblock_size; /* fft block processing size */ + uint16_t num_fft_subblocks; /* number of fft subblocks */ + uint16_t full_block_size; /* full block processing size */ + +} REVERB_DATA, *REVERB_HANDLE; + + +/*----------------------------------------------------------------------------------* + * TD ISM Object Renderer structure + *----------------------------------------------------------------------------------*/ + +typedef struct +{ + int16_t modelROM; /* Flag that indicates that the model resides in ROM (controls init/dealloc). */ + int16_t UseItdModel; /* Controls whether ITD model is used. */ + int16_t SplineDegree; /* Degree of the spline functions */ + int16_t K; /* Length of filter */ + int16_t elevDim2; + int16_t elevDim3; + int16_t AlphaN; /* Number of rows in Alpha matrices */ + int16_t num_unique_azim_splines; + int16_t elevSegSamples; + + int16_t elevBsLen[HRTF_MODEL_BSPLINE_NUM_COEFFS]; + int16_t elevBsStart[HRTF_MODEL_BSPLINE_NUM_COEFFS]; + const int16_t *azimDim2; + const int16_t *azimDim3; + const int16_t *azim_start_idx; + const int16_t *azimSegSamples; + const int16_t *azimShapeIdx; + const int16_t *azimShapeSampFactor; + + const float *elevKSeq; /* Array, N x elevDim2 x elevDim3 */ + const float *AlphaL; /* Array, size AlphaN x K */ + const float *AlphaR; /* Array, size AlphaN x K */ + const float *elevBsShape; + float **azimKSeq; /* Array, length azimDim3+1 */ + const float **azimBsShape; + + int16_t azimDim3Max; + int16_t iSecFirst[HRTF_MODEL_N_SECTIONS]; /* Indices for start of sections */ + int16_t iSecLast[HRTF_MODEL_N_SECTIONS]; /* Indices for end of sections */ + const float *EL; /* Array, size (AlphaN*HRTF_MODEL_N_SECTIONS) */ + const float *ER; /* Array, size (AlphaN*HRTF_MODEL_N_SECTIONS) */ + + /* Pointers for allocation of dynamic memory */ + float *AlphaL_dyn; + float *AlphaR_dyn; + float *EL_dyn; + float *ER_dyn; + float *elevBsShape_dyn; + float *elevKSeq_dyn; + int16_t *azimDim2_dyn; + int16_t *azimDim3_dyn; + int16_t *azim_start_idx_dyn; + int16_t *azimSegSamples_dyn; + int16_t *azimShapeIdx_dyn; + int16_t *azimShapeSampFactor_dyn; + float **azimBsShape_dyn; + +} ModelParams_t; + +typedef struct +{ + int16_t N; /* Polynomial degree */ + + int16_t elevDim2; + int16_t elevDim3; + const float *elevKSeq; /* Array, length elevDim3-2 */ + int16_t azimDim2; + int16_t azimDim3; + const float *azimKSeq; /* Array, length azimDim3-2 */ + const float *W; /* Array, size (elevDim3*azimDim3) x K */ + + int16_t azimBsLen[HRTF_MODEL_BSPLINE_NUM_COEFFS]; + int16_t azimBsStart[HRTF_MODEL_BSPLINE_NUM_COEFFS]; + const float *azimBsShape; + int16_t azimSegSamples; + + int16_t elevBsLen[HRTF_MODEL_BSPLINE_NUM_COEFFS]; + int16_t elevBsStart[HRTF_MODEL_BSPLINE_NUM_COEFFS]; + const float *elevBsShape; + int16_t elevSegSamples; + float resamp_factor; + + /* Pointers for allocation of dynamic memory */ + float *elevKSeq_dyn; + float *azimKSeq_dyn; + float *W_dyn; + float *azimBsShape_dyn; + float *elevBsShape_dyn; + +} ModelParamsITD_t; + +typedef struct +{ + float val; + int16_t i; + +} ValueIndex_t; + +/* Shared memory for use when evaluating BSpline HR filter model*/ +typedef struct +{ + float BM[HRTF_MODEL_BSPLINE_NUM_COEFFS_SQ]; + ValueIndex_t BMEnergiesL[HRTF_MODEL_BSPLINE_NUM_COEFFS_SQ]; + ValueIndex_t BMEnergiesR[HRTF_MODEL_BSPLINE_NUM_COEFFS_SQ]; + int16_t UseIndsL[HRTF_MODEL_BSPLINE_NUM_COEFFS_SQ]; + int16_t UseIndsR[HRTF_MODEL_BSPLINE_NUM_COEFFS_SQ]; + float *hrfModL; + float *hrfModR; + float elevBfVec[HRTF_MODEL_BSPLINE_NUM_COEFFS]; + float azimBfVec[HRTF_MODEL_BSPLINE_NUM_COEFFS][HRTF_MODEL_BSPLINE_NUM_COEFFS]; + float BM_ITD[HRTF_MODEL_BSPLINE_NUM_COEFFS_SQ]; + float elevBfVecITD[HRTF_MODEL_BSPLINE_NUM_COEFFS]; + float azimBfVecITD[HRTF_MODEL_BSPLINE_NUM_COEFFS]; + float itdMod; + +} ModelEval_t; + +/* Mixer listener */ +typedef struct +{ + int16_t PoseUpdated; + float Pos[3]; + float Front[3]; + float Up[3]; + float Right[3]; + + int16_t VelUpdated; + float Vel[3]; + +} TDREND_MIX_Listener_t; + +/* HR filter */ +typedef struct TDREND_HRFILT_FiltSet_struct +{ + int32_t SampleRate; /* Sample rate of the HR filter */ + int16_t NumPos; + int16_t NumElev; + float Dist; + float *ItdSet_p; + int16_t FiltLength; + float *Azim_p; + float *Elev_p; + float *ItdSetNominal_p; + float *LeftFiltSet_p; + float *RightFiltSet_p; + ModelParams_t ModelParams; + ModelEval_t ModelEval; + ModelParamsITD_t ModelParamsITD; + TDREND_HRFILT_Method_t FilterMethod; /* HR filtering method */ + float latency_s; + +} TDREND_HRFILT_FiltSet_t; + +/* Distance attenuation */ +typedef struct +{ + TDREND_DistAttenModel_t DistAttenModel; + float RefDist; + float MaxDist; + float RollOffFactor; + +} TDREND_DistAtten_t; + +/* Directional attenuation */ +typedef struct +{ + float ConeInnerAngle; + float ConeOuterAngle; + float ConeOuterGain; + +} TDREND_DirAtten_t; + +/* Mixer spatial specification */ +typedef struct +{ + int16_t UseCommonDistAttenModel; /* Common distance attenuation model flag */ + TDREND_DistAttenModel_t DistAttenModel; /* Distance attenuation model */ + +} TDREND_MixSpatSpec_t; + +typedef struct TDREND_SRC_REND_s +{ + int16_t InputAvailable; + TDREND_PlayStatus_t PlayStatus; + + /* Gains */ + int16_t SrcGainUpdated; + float SrcGain_p[SPAT_BIN_MAX_INPUT_CHANNELS]; + float SrcGainMin_p[SPAT_BIN_MAX_INPUT_CHANNELS]; + float SrcGainMax_p[SPAT_BIN_MAX_INPUT_CHANNELS]; + float DirGain_p[SPAT_BIN_MAX_INPUT_CHANNELS]; + float DistGain_p[SPAT_BIN_MAX_INPUT_CHANNELS]; +} TDREND_SRC_REND_t; + + +/* Source spatial parameters */ +typedef struct +{ + int16_t Updated; + TDREND_PosType_t PosType; + float Pos_p[3 * SPAT_BIN_MAX_INPUT_CHANNELS]; + float Front_p[3 * SPAT_BIN_MAX_INPUT_CHANNELS]; + int16_t DirAttenEnabled; + TDREND_DirAtten_t DirAtten; + int16_t DistAttenEnabled; + TDREND_DistAtten_t DistAtten; + +} TDREND_SRC_SPATIAL_t; + +typedef struct +{ + float *InputFrame_p; /* Input frame pointer */ + TDREND_SRC_SPATIAL_t *SrcSpatial_p; + TDREND_SRC_REND_t *SrcRend_p; + int16_t itd; + int16_t previtd; + int16_t filterlength; + float mem_itd[ITD_MEM_LEN]; + float hrf_left_prev[SFX_SPAT_BIN_MAX_FILTER_LENGTH]; /* Todo: Should we allocate these buffers with malloc() instead of the maximum length? */ + float hrf_right_prev[SFX_SPAT_BIN_MAX_FILTER_LENGTH]; + float azim_prev; + float elev_prev; + float mem_hrf_left[SFX_SPAT_BIN_MAX_FILTER_LENGTH - 1]; + float mem_hrf_right[SFX_SPAT_BIN_MAX_FILTER_LENGTH - 1]; + float Gain; +#ifdef FIX_379_GAININTP + float prevGain; +#endif +} TDREND_SRC_t; + +/* Top level TD binaural renderer handle */ +typedef struct ivas_binaural_td_rendering_struct +{ + TDREND_MixSpatSpec_t *TdRend_MixSpatSpec_p; + TDREND_DirAtten_t *DirAtten_p; + int16_t NumOfSrcs; + int16_t MaxSrcInd; + + TDREND_SRC_t *Sources[MAX_NUM_TDREND_CHANNELS]; + + float Gain; /* Mixer gain */ + TDREND_MIX_Listener_t *Listener_p; /* The virtual listener */ + TDREND_HRFILT_FiltSet_t *HrFiltSet_p; /* HR filter set */ + + int16_t UseCommonDistAttenModel; /* Use common dist atten model (TRUE/FALSE) */ + int16_t DistAttenEnabled; /* (TRUE/FALSE) */ + TDREND_DistAttenModel_t DistAttenModel; /* Common distance attenuation model */ + +} BINAURAL_TD_OBJECT_RENDERER, *BINAURAL_TD_OBJECT_RENDERER_HANDLE; + +typedef struct +{ + int32_t binaural_latency_ns; + BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd; + TDREND_HRFILT_FiltSet_t *hHrtfTD; + +} TDREND_WRAPPER, *TDREND_WRAPPER_HANDLE; + + +/*------------------------------------------------------------------------------------------* + * Crend structures + *------------------------------------------------------------------------------------------*/ + +typedef struct ivas_hrtfs_structure +{ + float *pOut_to_bin_re[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS]; + float *pOut_to_bin_im[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS]; + float *pOut_to_bin_diffuse_re[BINAURAL_CHANNELS]; + float *pOut_to_bin_diffuse_im[BINAURAL_CHANNELS]; + float latency_s; + uint16_t num_iterations[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS]; + uint16_t num_iterations_diffuse[BINAURAL_CHANNELS]; + uint16_t *pIndex_frequency_max[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS]; + uint16_t *pIndex_frequency_max_diffuse[BINAURAL_CHANNELS]; + uint16_t index_frequency_max_diffuse; + int16_t max_num_ir; + int16_t max_num_iterations; + float inv_diffuse_weight[MAX_INTERN_CHANNELS]; /* inverse diffuse weights array, access one inverse weight by pInvDiffuseWeight[channel] */ + float gain_lfe; + +} HRTFS_DATA, *HRTFS_HANDLE; + + +/* Main Crend structure */ +typedef struct ivas_crend_state_t +{ + float *freq_buffer_re[MAX_INTERN_CHANNELS]; + float *freq_buffer_im[MAX_INTERN_CHANNELS]; + float *freq_buffer_re_diffuse; + float *freq_buffer_im_diffuse; + float *prev_out_buffer[BINAURAL_CHANNELS]; + float *lfe_delay_line; + float m_fYaw; + float m_fPitch; + float m_fRoll; + ivas_orient_trk_state_t *hTrack; + REVERB_HANDLE hReverb; + int16_t delay_line_rw_index; + int16_t diffuse_delay_line_rw_index; + +} CREND_DATA, *CREND_HANDLE; + +/* Main Crend wrapper structure */ +typedef struct ivas_binaural_crend_wrapper_struct +{ + int32_t binaural_latency_ns; +#ifdef SPLIT_REND_WITH_HEAD_ROT + CREND_HANDLE hCrend[MAX_HEAD_ROT_POSES]; +#else + CREND_HANDLE hCrend; +#endif + HRTFS_HANDLE hHrtfCrend; + +} CREND_WRAPPER, *CREND_WRAPPER_HANDLE; + +#ifdef SPLIT_REND_WITH_HEAD_ROT +/* Fastconv binaural data structure */ +typedef struct ivas_binaural_rendering_struct +{ + /* Common variables for all modules */ + IVAS_OUTPUT_SETUP_HANDLE hInputSetup; /* pointer to input spatial format for binaural renderer*/ + EFAP_HANDLE hEFAPdata; /* EFAP structure*/ + float *hoa_dec_mtx; /* pointer to HOA decoder mtx */ + int8_t rotInCldfb; /* Flag to enable rotation within bin Renderer in CLDFB*/ + int16_t max_band; /* band upto which rendering is performed */ + int16_t conv_band; /* band upto which convolution in cldfb domain is performed */ + int16_t timeSlots; /* number of time slots of binaural renderer */ + int16_t nInChannels; /* number input channels */ + int8_t render_lfe; /* Flag to render LFE in binaural rendering*/ + IVAS_FORMAT ivas_format; /* format; corresponds to st_ivas->ivas_format, unless the signal gets transormed to a different domain for rendering */ + + /* Convolution module structure */ + BINRENDERER_CONV_MODULE_HANDLE hBinRenConvModule; + + /* Variables related to reverberator module */ + float earlyPartEneCorrection[CLDFB_NO_CHANNELS_MAX]; + REVERB_STRUCT_HANDLE hReverb; + +#ifdef SPLIT_REND_WITH_HEAD_ROT + int16_t numPoses; +#endif +} BINAURAL_RENDERER, *BINAURAL_RENDERER_HANDLE; +#endif + +/*------------------------------------------------------------------------------------------* + * HRTF structures - htrfs from binary files + *------------------------------------------------------------------------------------------*/ + +typedef struct ivas_hrtfs_crend_structure +{ + HRTFS_DATA *hHRTF_hrir_combined; + HRTFS_DATA *hHRTF_hrir_hoa3; + HRTFS_DATA *hHRTF_brir_combined; + +} HRTFS_CREND, *HRTFS_CREND_HANDLE; + + +/* Fastconv binaural data structure */ + +typedef struct ivas_hrtfs_fastconv_struct +{ + float FASTCONV_HRIR_latency_s; + float leftHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][7]; + float leftHRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][7]; + float rightHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][7]; + float rightHRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][7]; + + float FASTCONV_HOA3_latency_s; + float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][7]; + float leftHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][7]; + float rightHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][7]; + float rightHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][7]; + + float FASTCONV_BRIR_latency_s; + float leftBRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS_MAX]; + float leftBRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS_MAX]; + float rightBRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS_MAX]; + float rightBRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS_MAX]; + + float fastconvReverberationTimes[CLDFB_NO_CHANNELS_MAX]; + float fastconvReverberationEneCorrections[CLDFB_NO_CHANNELS_MAX]; + +} HRTFS_FASTCONV, *HRTFS_FASTCONV_HANDLE; + + +typedef struct ivas_hrtfs_parambin_struct +{ + float hrtfShCoeffsRe[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS]; + float hrtfShCoeffsIm[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS]; + + float parametricReverberationTimes[CLDFB_NO_CHANNELS_MAX]; + float parametricReverberationEneCorrections[CLDFB_NO_CHANNELS_MAX]; + float parametricEarlyPartEneCorrection[CLDFB_NO_CHANNELS_MAX]; + +} HRTFS_PARAMBIN, *HRTFS_PARAMBIN_HANDLE; + + +/*----------------------------------------------------------------------------------* + * Limiter structure + *----------------------------------------------------------------------------------*/ + +typedef struct +{ + int16_t max_num_channels; + int16_t num_channels; + float **channel_ptrs; + int32_t sampling_rate; + float gain; + float release_heuristic; + float attack_constant; + int16_t strong_saturation_count; +#ifdef DEBUGGING + int32_t cnt_frames_limited; /* counter of frames in which the limiter is applied */ +#endif + +} IVAS_LIMITER, *IVAS_LIMITER_HANDLE; + /*----------------------------------------------------------------------------------* * Loudspeaker Configuration Conversion structure @@ -97,6 +1065,20 @@ typedef struct ivas_LS_setup_custom } LSSETUP_CUSTOM_STRUCT, *LSSETUP_CUSTOM_HANDLE; + +#ifdef SPLIT_REND_WITH_HEAD_ROT +/*----------------------------------------------------------------------------------* + * CLDFB renderer wrapper + *----------------------------------------------------------------------------------*/ + +typedef struct +{ + int32_t binaural_latency_ns; + BINAURAL_RENDERER_HANDLE hCldfbRend; + HRTFS_FASTCONV_HANDLE hHrtfFastConv; +} CLDFB_REND_WRAPPER; +#endif + /* Channel types in a channel-based config */ typedef enum { diff --git a/lib_rend/lc3plus_codec/README.md b/lib_rend/lc3plus_codec/README.md index 380086c9e7..4dc05171ab 100644 --- a/lib_rend/lc3plus_codec/README.md +++ b/lib_rend/lc3plus_codec/README.md @@ -2,5 +2,5 @@ 1. Download the V1.4.1 version of the LC3plus source code from ETSI: https://www.etsi.org/deliver/etsi_ts/103600_103699/103634/01.04.01_60/ts_103634v010401p0.zip 2. Unzip it into this folder. After unzipping, the path to the `Readme.txt` of the LC3plus sources must be: `lib_rend/lc3plus_codec/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/Readme.txt` -3. Apply the `lc3plus-patch.diff` reverse, for example by using the command `git apply --ignore-whitespace --reverse lc3plus-patch.diff` - +3. Apply the `lc3plus.patch`, for example by using the command `git apply --ignore-whitespace lc3plus.patch` +4. Remove files `ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft.c` `ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/codec_exe.c` diff --git a/lib_rend/lc3plus_codec/get_lc3plus.sh b/lib_rend/lc3plus_codec/get_lc3plus.sh index ddaa2571ea..ab578850cc 100755 --- a/lib_rend/lc3plus_codec/get_lc3plus.sh +++ b/lib_rend/lc3plus_codec/get_lc3plus.sh @@ -3,4 +3,5 @@ curl -o ./lc3plus_sources.zip https://www.etsi.org/deliver/etsi_ts/103600_103699/103634/01.04.01_60/ts_103634v010401p0.zip unzip lc3plus_sources.zip -d . rm -f lc3plus_sources.zip -git apply --ignore-whitespace --reverse lc3plus-patch.diff +git apply --ignore-whitespace lc3plus.patch +rm ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft.c ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/codec_exe.c diff --git a/lib_rend/lc3plus_codec/lc3plus-patch.diff b/lib_rend/lc3plus_codec/lc3plus-patch.diff deleted file mode 100644 index dea78ca39d..0000000000 --- a/lib_rend/lc3plus_codec/lc3plus-patch.diff +++ /dev/null @@ -1,88 +0,0 @@ -diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/defines.h ref/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/defines.h ---- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/defines.h 2023-03-16 21:53:49 -+++ ref/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/defines.h 2023-02-28 20:25:37 -@@ -24,13 +24,13 @@ - typedef uint32_t LC3_UINT32; - - /* Release defines */ --// #define ENABLE_2_5MS_MODE -+#define ENABLE_2_5MS_MODE - #define ENABLE_5MS_MODE - #define ENABLE_10_MS_MODE - #define ENABLE_ADVANCED_PLC_FL - #define ENABLE_ADVANCED_PLC_FL_DEFAULT - #define ENABLE_BW_CONTROLLER --//#define ENABLE_HR_MODE_FL -+#define ENABLE_HR_MODE_FL - #define ENABLE_PADDING - #define ENABLE_RFRAME_FL - #define ENABLE_PLC -diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iis_fft.c ref/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iis_fft.c ---- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iis_fft.c 2023-03-16 21:36:30 -+++ ref/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iis_fft.c 2023-02-28 20:25:37 -@@ -10,12 +10,12 @@ - - #include - #include -+#include "iis_fft.h" - #include - #include - #include --#include -+#include "../structs.h" - --#include "iis_fft.h" - /**************************************************************************************************/ - - /* AFFT uses two fft implementations -@@ -24,6 +24,9 @@ - fast lengths, check the fft_n function. - */ - -+#include -+#include "cfft.h" -+#include "iisfft.h" - - #define FFT_COMPLEX 1 - #define FFT_REAL 2 -diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iis_fft.h ref/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iis_fft.h ---- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iis_fft.h 2023-03-16 21:37:28 -+++ ref/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iis_fft.h 2023-02-28 20:25:37 -@@ -12,7 +12,6 @@ - #define IIS_FFT_H - - #include "../structs.h" --#include "../defines.h" - #include "cfft.h" - - #ifdef __cplusplus -diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iisfft.h ref/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iisfft.h ---- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iisfft.h 2023-03-16 21:43:14 -+++ ref/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iisfft.h 2023-02-28 20:25:37 -@@ -11,7 +11,6 @@ - #ifndef IISFFT_H - #define IISFFT_H - --#include "../defines.h" - - #ifndef M_PIl - #define M_PIl 3.1415926535897932384626433832795029L /* pi */ -diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/setup_enc_lc3.c ref/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/setup_enc_lc3.c ---- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/setup_enc_lc3.c 2023-03-16 21:29:31 -+++ ref/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/setup_enc_lc3.c 2023-02-28 20:25:37 -@@ -220,7 +220,6 @@ - - if (encoder->hrmode) - { --#ifdef ENABLE_HR_MODE_FL - switch (encoder->frame_dms) - { - case 25: -@@ -244,7 +243,6 @@ - default: - return LC3PLUS_HRMODE_ERROR; - } --#endif - } - else - { diff --git a/lib_rend/lc3plus_codec/lc3plus.patch b/lib_rend/lc3plus_codec/lc3plus.patch new file mode 100644 index 0000000000..3f135e29c8 --- /dev/null +++ b/lib_rend/lc3plus_codec/lc3plus.patch @@ -0,0 +1,2090 @@ +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/al_fec_fl.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/al_fec_fl.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/al_fec_fl.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/al_fec_fl.c 2023-05-08 12:14:37 +@@ -1010,8 +1010,8 @@ + LC3_UINT8 blacklist[FEC_N_MODES]; + LC3_INT32 rop; + +- rop = 0; + void (*syndr_calc[3])(LC3_UINT8 *, LC3_UINT8 *, LC3_INT32); ++ rop = 0; + + /* initialization */ + blacklist[0] = 0; +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/ari_codec.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/ari_codec.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/ari_codec.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/ari_codec.c 2023-05-08 12:14:37 +@@ -620,7 +620,7 @@ + + if (st.pc_c_bp_side != 0) + { +- nbits_side = total_bits - 8 * (st.pc_b_left) + 8 * (st.pc_bytes - bp_side) - (8 - LC3_LOG2(mask_side)); ++ nbits_side = total_bits - 8 * (st.pc_b_left) + 8 * (st.pc_bytes - bp_side) - (8 - LC3_LOGTWO(mask_side)); + } + } + +@@ -891,7 +891,7 @@ + { + LC3_INT bits = 0, mask = 0, val = 0, over1 = 0, high = 0, over2 = 0, c = 0, b = 0; + +- bits = 24 - floor(LC3_LOG2(st->range)); ++ bits = 24 - floor(LC3_LOGTWO(st->range)); + mask = ((LC3_INT)pow(2, 24) - 1) >> bits; + val = st->low + mask; + over1 = val >> 24; +@@ -1078,8 +1078,8 @@ + } + + /* Residual bits */ +- nbits_side = total_bits - (8 * (*(st.bp_side) + 1) + 8 - LC3_LOG2(*(st.mask_side))); +- nbits_ari = (st.bp + 1) * 8 + 25 - floor(LC3_LOG2(st.range)); ++ nbits_side = total_bits - (8 * (*(st.bp_side) + 1) + 8 - LC3_LOGTWO(*(st.mask_side))); ++ nbits_ari = (st.bp + 1) * 8 + 25 - floor(LC3_LOGTWO(st.range)); + + if (st.cache >= 0) { + nbits_ari = nbits_ari + 8; +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/codec_exe.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/codec_exe.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/codec_exe.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/codec_exe.c 1970-01-01 01:00:00 +@@ -1,1149 +0,0 @@ +-/****************************************************************************** +-* ETSI TS 103 634 V1.4.1 * +-* Low Complexity Communication Codec Plus (LC3plus) * +-* * +-* Copyright licence is solely granted through ETSI Intellectual Property * +-* Rights Policy, 3rd April 2019. No patent licence is granted by implication, * +-* estoppel or otherwise. * +-******************************************************************************/ +- +- +- +-#include "functions.h" +-#include "lc3.h" +-#include "tinywavein_c.h" +-#include "tinywaveout_c.h" +- +-#include +-#include +-#include +-#include +-#include +- +-/* struct to hold command line arguments */ +-typedef struct +-{ +- char *inputFilename; +- char *outputFilename; +- int bitrate; +- char* bitrate_file; +- int encoder_only; +- int decoder_only; +- int bipsOut; +- int formatG192; +- char *configFilenameG192; +- float frame_ms; +- int hide_counter; +- int verbose; +- int plcMeth; +- char *epf; +- int epmode; +- char *epmode_file; +- char *edf; +- int ept; +- int hrmode; +- int dc; +- char *bandwidth; +- char *channel_coder_vars_file; +- int32_t startFrame; +- int32_t stopFrame; +- int32_t lfe[LC3PLUS_MAX_CHANNELS]; +- int32_t lfeChanCnt; +-} Arguments; +- +-/* local helper functions */ +-static void parseCmdl(int ac, char **av, Arguments *arg); +-static FILE *open_bitstream_reader(const char *file, uint32_t *samplerate, int *bitrate, short *channels, +- uint32_t *signal_len, float *frame_ms, int *epmode, int *hrmode, int g192, +- const char *file_cfg); +-static FILE *open_bitstream_writer(const char *file, uint32_t samplerate, int bitrate, short channels, +- uint32_t signal_len, float frame_ms, int epmode, int32_t hrmode, int g192, const char *file_cfg +-); +-static void write_bitstream_frame(FILE *bitstream_file, uint8_t *bytes, int size, int g192); +-static int read_bitstream_frame(FILE *bitstream_file, uint8_t *bytes, int size, int g192, int *bfi_ext); +-static FILE * fopen_with_ext(const char *file, const char *ext, const char *mode); +-static void cleanup(void); +-static int16_t loopy_read16(FILE *f); +-static int64_t loopy_read64(FILE *f); +-static void exit_if(int condition, const char *message); +-static void scale_24_to_16(const int32_t *in, int16_t *out, int n); +- +-static void deinterleave(int32_t *in, int32_t **out, int n, int channels); +- +-static void interleave_short(int16_t** in, int16_t* out, int32_t n, int32_t channels); +-static void interleave_int (int32_t** in, int32_t* out, int32_t n, int32_t channels); +- +-/* needed by cleanup function */ +-static WAVEFILEIN * input_wav; +-static WAVEFILEOUT *output_wav; +-static FILE * output_bitstream; +-static FILE * input_bitstream; +-static FILE * error_pattern_file; +-static FILE * error_detection_file; +-static FILE * bitrate_switching_file; +-static FILE * epmode_switching_file; +-static FILE *bandwidth_switching_file; +-static FILE *channel_decoder_debug_file_bfi; +-static FILE *channel_decoder_debug_file_epmr; +-static FILE *channel_decoder_debug_file_error_report; +- +-#include "license.h" /* provides LICENSE string */ +- +-static const char *const USAGE_MESSAGE = +-/* Lines must not be longer than this! --------------------------------------->| */ +- "Usage: LC3plus [OPTIONS] INPUT OUTPUT BITRATE\n" +- "\n" +- " INPUT and OUTPUT are wav files, unless another mode is selected in OPTIONS.\n" +- " BITRATE is specified in bits per second. Alternatively a switching file can\n" +- " be provided.\n" +- "\nGeneral options:\n" +- " -E Encode mode. INPUT is a wav file, OUTPUT is a binary file.\n" +- " -D Decode mode. INPUT is a binary file, OUTPUT is a wav file.\n" +- " In decode mode the BITRATE parameter is ignored.\n" +- " -bps NUM Output bits per sample. NUM must be 16 (default) or 24.\n" +- " -swf FILE Use a bitrate switching file instead of fixed bitrate.\n" +- " -dc NUM 0: Don't use delay compensation\n" +- " 1: Compensate delay in decoder (default)\n" +- " 2: Split delay equally between encoder and decoder\n" +- " -frame_ms NUM Frame length in ms. NUM must be 10 (default), 5 or 2.5.\n" +- " -bandwidth NUM|FILE Select audio bandwidth limitation via value in Hz or switching file.\n" +- " NUM can be any integer value describing the bandwidth; max NUM=20000 Hz\n" +- " -q Disable frame counter printout\n" +- " -v Verbose switching commands\n" +- " -y StartFrame: frame number where encoding/decoding shall start\n" +- " -z StopFrame: frame number where encoding/decoding shall stop\n" +- "\nFormat options:\n" +- " -formatG192 Activate G192 bitstream format. A filename.cfg will be used to\n" +- " store/load decoder info.\n" +- " -cfgG192 FILE Specify a configuration file for G192 bitstream format.\n" +- "\nPLC options:\n" +- " -epf FILE Enable packet loss simulation using error pattern from FILE.\n" +- " -ept Use together with -E -epf FILE to signal lost frames within\n" +- " the LC3plus bitstream.\n" +- " -edf FILE Write error detection pattern to FILE.\n" +- "\nChannel coder options:\n" +- " -epmode NUM|FILE Error protection mode. NUM must be one of the following:\n" +- " 0: Error protection disabled\n" +- " 1: Minimum error protection, detection only\n" +- " 2: Moderate error protection\n" +- " 3: Strong error protection\n" +- " 4: Maximum error protection\n" +- " -ep_dbg FILE Save variables bfi, epmr and error report to binary files\n" +- " FILE.bfi, FILE.epmr and FILE.error_report\n" +- "\nLow-frequency effects options:\n" +- " -lfe NUM[,NUM[,NUM]...] Set lfe flags for all audio channels of the input waveform\n" +- " NUM is interpreted as follows:\n" +- " 0: normal channel\n" +- " 1: low frequeny enhancement channel\n" +- " All channels are treated as normal, if this parameter is omitted.\n" +- "\nHigh resolution mode options:\n" +- " -hrmode Enable high resolution mode.\n" +- ; +- +-static const char *const MISSING_ARGUMENT_MESSAGE = "Not enough parameters! Use -h to show help."; +- +-static const char* ERROR_MESSAGE[] = { +- "", /* LC3PLUS_OK */ +- "Function call failed!", /* LC3PLUS_ERROR */ +- "Frame failed to decode and was concealed!", /* LC3PLUS_DECODE_ERROR */ +- "Pointer argument is null!", /* LC3PLUS_NULL_ERROR */ +- "Invalid sampling rate!", /* LC3PLUS_SAMPLERATE_ERROR */ +- "Invalid number of channels!", /* LC3PLUS_CHANNELS_ERROR */ +- "Invalid bitrate!", /* LC3PLUS_BITRATE_ERROR */ +- "Invalid number of bytes!", /* LC3PLUS_NUMBYTES_ERROR */ +- "Invalid ep mode!", /* LC3PLUS_EPMODE_ERROR */ +- "Invalid frame ms value!", /* LC3PLUS_FRAMEMS_ERROR */ +- "Unaligned pointer!", /* LC3PLUS_ALIGN_ERROR */ +- "96 kHz sampling rate cannot be used without -hrmode option!", /* LC3PLUS_HRMODE_ERROR */ +- "Bitrate has not been set!", /* LC3PLUS_BITRATE_UNSET_ERROR */ +- "Function can't be called after bitrate was set!", /* LC3PLUS_BITRATE_SET_ERROR */ +- "High resolution mode and bandwidth switching are exclusive!", /* LC3PLUS_HRMODE_BW_ERROR */ +- "Invalid PLC method!", /* LC3PLUS_PLCMODE_ERROR */ +- "Invalid EPMR value!", /* LC3PLUS_EPMR_ERROR */ +- "Incorrect padding!", /* LC3PLUS_PADDING_ERROR */ +- "Incorrect frame size during decoding!", /* FRAMESIZE_ERROR */ +- "LFE support not available!", /* LC3PLUS_LFE_MODE_NOT_SUPPORTED */ +- "Generic Warning", /* LC3PLUS_WARNING */ +- "Invalid bandwidth frequency!" /* LC3PLUS_BW_WARNING */ +-}; +- +- +-int main(int ac, char **av) +-{ +- Arguments arg; +- uint32_t nSamples = 0, nSamplesRead = 0, nSamplesFile = 0xffffffff, sampleRate = 0; +- short nChannels = 0, bipsIn = 0; +- int nBytes = 0, real_bitrate = 0, frame = 1, delay = 0; +- int encoder_size = 0, decoder_size = 0; +- int scratch_size = 0; +- int bfi_ext = 0; +- LC3PLUS_Enc * encoder = NULL; +- LC3PLUS_Dec * decoder = NULL; +- void * scratch = NULL; +- LC3PLUS_Error err = LC3PLUS_OK; +- int32_t sample_buf[LC3PLUS_MAX_CHANNELS * LC3PLUS_MAX_SAMPLES]; +- int32_t buf_24[LC3PLUS_MAX_CHANNELS * LC3PLUS_MAX_SAMPLES]; +- int16_t buf_16[LC3PLUS_MAX_CHANNELS * LC3PLUS_MAX_SAMPLES]; +- uint8_t bytes[LC3PLUS_MAX_BYTES]; +- int dc2_extra_frame = 0; +- +- int32_t sample_buf_int[LC3PLUS_MAX_CHANNELS * LC3PLUS_MAX_SAMPLES] = {0}; +- int16_t* sample_buf_short = (int16_t*)(void*)sample_buf_int; +- int i; +- +- /* Parse Command-line */ +- printf(LICENSE, LC3PLUS_VERSION >> 16, (LC3PLUS_VERSION >> 8) & 255, LC3PLUS_VERSION & 255); +- parseCmdl(ac, av, &arg); +- +- /* exit handler to clean up resources */ +- atexit(cleanup); +- +-#ifdef Cortex_A9 +- coresup_init(); +-#endif +- +- if (!arg.decoder_only) +- { +- /* Open Input Wav File */ +- input_wav = OpenWav(arg.inputFilename, &sampleRate, &nChannels, &nSamplesFile, &bipsIn); +- exit_if(!input_wav, "Error opening wav file!"); +- exit_if(bipsIn != 16 && bipsIn != 24, "Only 16 or 24bits per sample are supported!"); +- +- /* Check if LFE flag was set for each channel */ +- if (arg.lfeChanCnt != 0 && arg.lfeChanCnt != nChannels) +- { +- fprintf(stderr, "%" PRIu32 " channel(s) with -lfe configured, but waveform consists of %i channel(s)\n", arg.lfeChanCnt, nChannels); +- exit_if(1, "Inadequate LFE channel config given!"); +- } +- +- /* Setup Encoder */ +- encoder_size = lc3plus_enc_get_size(sampleRate, nChannels); +- +- encoder = malloc(encoder_size); +- +- err = lc3plus_enc_init(encoder, sampleRate, nChannels, arg.hrmode, arg.lfe); +- +- exit_if(err, ERROR_MESSAGE[err]); +- +- err = lc3plus_enc_set_frame_dms(encoder, (int) (arg.frame_ms * 10)); +- exit_if(err, ERROR_MESSAGE[err]); +- +- +- err = lc3plus_enc_set_ep_mode(encoder, (LC3PLUS_EpMode)arg.epmode); +- exit_if(err, ERROR_MESSAGE[err]); +- +- +- +- err = lc3plus_enc_set_bitrate(encoder, arg.bitrate); +- exit_if(err, ERROR_MESSAGE[err]); +- +- delay = arg.dc ? lc3plus_enc_get_delay(encoder) / arg.dc : 0; +- nSamples = lc3plus_enc_get_input_samples(encoder); +- real_bitrate = lc3plus_enc_get_real_bitrate(encoder); +- +- if (arg.bandwidth && atoi(arg.bandwidth) == 0) +- { +- bandwidth_switching_file = fopen(arg.bandwidth, "rb"); +- exit_if(bandwidth_switching_file == NULL, "Error opening bandwidth switching file!"); +- puts("Using bandwidth switching file!"); +- } +- } +- else /* !arg->decoder_only */ +- { +- /* Open Input Bitstream File */ +- input_bitstream = +- open_bitstream_reader(arg.inputFilename, &sampleRate, &arg.bitrate, &nChannels, &nSamplesFile, +- &arg.frame_ms, &arg.epmode, &arg.hrmode, arg.formatG192, arg.configFilenameG192); +- exit_if(!input_bitstream, "Error opening bitstream file!"); +- } +- +- if (!arg.encoder_only) { +- /* Setup Decoder */ +- decoder_size = lc3plus_dec_get_size(sampleRate, nChannels); +- decoder = malloc(decoder_size); +- err = lc3plus_dec_init(decoder, sampleRate, nChannels, (LC3PLUS_PlcMode)arg.plcMeth, arg.hrmode); +- exit_if(err, ERROR_MESSAGE[err]); +- +- +- err = lc3plus_dec_set_frame_dms(decoder, (int) (arg.frame_ms * 10)); +- exit_if(err, ERROR_MESSAGE[err]); +- +- +- err = lc3plus_dec_set_ep_enabled(decoder, arg.epmode != 0); +- exit_if(err, ERROR_MESSAGE[err]); +- +- delay = arg.dc ? lc3plus_dec_get_delay(decoder) / arg.dc : 0; +- nSamples = lc3plus_dec_get_output_samples(decoder); +- +- /* Open Output Wav File */ +- output_wav = CreateWav(arg.outputFilename, sampleRate, nChannels, arg.bipsOut); +- exit_if(!output_wav, "Error creating wav file!"); +- } +- else /* !arg->encoder_only */ +- { +- /* Open Output Bitstream File */ +- output_bitstream = open_bitstream_writer(arg.outputFilename, sampleRate, +- arg.bitrate +- , nChannels, nSamplesFile, +- arg.frame_ms, arg.epmode, arg.hrmode, arg.formatG192, arg.configFilenameG192 +- ); +- exit_if(!output_bitstream, "Error creating bitstream file!"); +- } +- +- /* open auxillary files */ +- if (arg.epf) +- { +- error_pattern_file = fopen(arg.epf, "rb"); +- exit_if(!error_pattern_file, "Error opening error pattern file!"); +- } +- if (arg.bitrate_file) +- { +- bitrate_switching_file = fopen(arg.bitrate_file, "rb"); +- exit_if(!bitrate_switching_file, "Error opening bitrate switching file!"); +- } +- if (arg.epmode_file) +- { +- epmode_switching_file = fopen(arg.epmode_file, "rb"); +- exit_if(epmode_switching_file == NULL, "Error opening epmode switching file!"); +- } +- if (arg.edf) +- { +- error_detection_file = fopen(arg.edf, "wb"); +- exit_if(!error_detection_file, "Error creating error detection file!"); +- } +- if (arg.channel_coder_vars_file) +- { +- channel_decoder_debug_file_bfi = fopen_with_ext(arg.channel_coder_vars_file, ".bfi", "wb"); +- channel_decoder_debug_file_epmr = fopen_with_ext(arg.channel_coder_vars_file, ".epmr", "wb"); +- channel_decoder_debug_file_error_report = fopen_with_ext(arg.channel_coder_vars_file, ".error_report", "wb"); +- exit_if(!channel_decoder_debug_file_bfi || !channel_decoder_debug_file_epmr || +- !channel_decoder_debug_file_error_report, +- "Error creating channel decoder debug files!"); +- } +- +- scratch_size = MAX(lc3plus_dec_get_scratch_size(decoder), lc3plus_enc_get_scratch_size(encoder)); +- scratch = malloc(scratch_size); +- exit_if(!scratch, "Failed to allocate scratch memory!"); +- +- /* Print out info */ +- printf("Encoder size: %i\n", encoder_size); +- printf("Decoder size: %i\n", decoder_size); +- printf("Sample rate: %i\n", sampleRate); +- printf("Channels: %i\n", nChannels); +- printf("Signal length: %u\n", nSamplesFile); +- printf("Frame length: %i\n", nSamples); +- printf("Output format: %i bits\n", arg.bipsOut); +- printf("Target bitrate: %i\n", arg.bitrate); +- if (!arg.decoder_only) { +- printf("Real bitrate: %i\n\n", real_bitrate); +- } +- printf("Bandwidth cutoff: %s\n", arg.bandwidth ? arg.bandwidth : "-"); +- printf("High resolution mode: %s\n\n", arg.hrmode ? "on" : "off"); +- printf("PLC mode: %i\n", arg.plcMeth); +- +- /* delay compensation */ +- if (arg.dc == 2 && !arg.decoder_only) +- { +- ReadWavInt(input_wav, sample_buf, nChannels * delay, &nSamplesRead); +- } +- +- /* Encoder + Decoder loop */ +- while (1) +- { +- if (!arg.decoder_only) +- { +- /* Encoder */ +- int32_t *input24[] = {buf_24, buf_24 + nSamples}; +- +- /* read bitrate switching file and set new bitrate */ +- if (bitrate_switching_file) +- { +- int32_t new_bitrate = (int32_t)(loopy_read64(bitrate_switching_file)); +- if (arg.verbose && encoder->bitrate != new_bitrate * nChannels) +- { +- printf("Switching rate from %d to %d\n", encoder->bitrate, new_bitrate * nChannels); +- } +- err = lc3plus_enc_set_bitrate(encoder, new_bitrate * nChannels); +- exit_if(err, ERROR_MESSAGE[err]); +- } +- /* read epmode switching file and set error protection */ +- if (epmode_switching_file) +- { +- /* gen_rate_profile tool can only write values starting from 100 */ +- int16_t epmode = (int16_t)(loopy_read64(epmode_switching_file) / 100); +- assert(epmode > 0 && epmode < 5); /* epmode 0 not allowed when switching */ +- if (arg.verbose && encoder->epmode != epmode) +- { +- printf("Switching epmode from %d to %d\n", encoder->epmode, epmode); +- } +- err = lc3plus_enc_set_ep_mode(encoder, (LC3PLUS_EpMode)epmode); +- exit_if(err, ERROR_MESSAGE[err]); +- } +- /* read bandwidth switching file and set bandwidth */ +- if (arg.bandwidth || bandwidth_switching_file) +- { +- int32_t bw = +- bandwidth_switching_file ? (int32_t)loopy_read64(bandwidth_switching_file) : atoi(arg.bandwidth); +- int32_t bw_old = encoder->bandwidth; +- err = lc3plus_enc_set_bandwidth(encoder, bw); +- if (arg.verbose && bw_old != bw && err == LC3PLUS_OK) +- { +- printf("Switching bandwidth from %i to %i\n", bw_old, bw); +- } +- exit_if(err, ERROR_MESSAGE[err]); +- } +- +- /* read audio data */ +- ReadWavInt(input_wav, sample_buf, nSamples * nChannels, &nSamplesRead); +- /* zero out rest of last frame */ +- memset(sample_buf + nSamplesRead, 0, (nSamples * nChannels - nSamplesRead) * sizeof(sample_buf[0])); +- if (frame < arg.startFrame) +- goto while_end; +- +- if (arg.dc != 2) +- { +- if (nSamplesRead == 0) +- { +- break; +- } +- } +- else +- { +- if (nSamplesRead != (nSamples * nChannels)) { +- int32_t padded_samples = ((nSamples * nChannels) - nSamplesRead) / nChannels; +- int32_t delay_samples = lc3plus_enc_get_delay(encoder) / 2; +- +- if (padded_samples >= delay_samples) +- { +- if (dc2_extra_frame == 1) +- { +- break; +- } +- dc2_extra_frame = 1; +- } +- } +- } +- +- if (arg.ept && loopy_read16(error_pattern_file)) +- { +- nBytes = -1; /* tell encoder packet is lost and trigger PLC */ +- } +- +- /* deinterleave channels */ +- deinterleave(sample_buf, input24, nSamples, nChannels); +- +- /* encode */ +- +- if (bipsIn == 24) { +- err = lc3plus_enc24(encoder, input24, bytes, &nBytes +- , scratch +- ); +- } else { +- int16_t* input16[LC3PLUS_MAX_CHANNELS]; +- +- for (i = 0; i < nChannels; i++) { +- input16[i] = buf_16 + i * nSamples; +- } +- +- scale_24_to_16(buf_24, buf_16, nSamples * nChannels); +- err = lc3plus_enc16(encoder, input16, bytes, &nBytes +- , scratch +- ); +- } +- +- exit_if(err, ERROR_MESSAGE[err]); +- } +- else /* !arg.decoder_only */ +- { +- /* Read bitstream */ +- nBytes = read_bitstream_frame(input_bitstream, bytes, sizeof(bytes), arg.formatG192, &bfi_ext); +- if (nBytes < 0) +- { +- break; +- } +- } +- +- if (!arg.encoder_only) +- { +- /* Decoder */ +- /* read error pattern */ +- if (error_pattern_file && loopy_read16(error_pattern_file)) +- { +- nBytes = 0; /* tell decoder packet is lost and needs to be concealed */ +- } +- +- int16_t* output16[LC3PLUS_MAX_CHANNELS]; +- int32_t* output24[LC3PLUS_MAX_CHANNELS]; +- +- for (i = 0; i < nChannels; i++) +- { +- output16[i] = buf_16 + i * nSamples; +- output24[i] = buf_24 + i * nSamples; +- } +- +- /* Run Decoder */ +- if (arg.bipsOut == 24) { +- err = lc3plus_dec24(decoder, bytes, nBytes, output24, +- scratch, +- bfi_ext); +- } else { +- +- err = lc3plus_dec16(decoder, bytes, nBytes, output16, +- scratch, +- bfi_ext); +- } +- exit_if(err && err != LC3PLUS_DECODE_ERROR, ERROR_MESSAGE[err]); +- +- /* write error detection to file */ +- if (error_detection_file != NULL) +- { +- int16_t tmp = (err == LC3PLUS_DECODE_ERROR); +- fwrite(&tmp, 2, 1, error_detection_file); +- } +- +- /* write bfi, empr and error report to files */ +- if (arg.channel_coder_vars_file) +- { +- int16_t tmp = (err == LC3PLUS_DECODE_ERROR) ? 1 : LC3PLUS_OK; +- fwrite(&tmp, 2, 1, channel_decoder_debug_file_bfi); +- tmp = lc3plus_dec_get_ep_mode_request(decoder); +- fwrite(&tmp, 2, 1, channel_decoder_debug_file_epmr); +- tmp = lc3plus_dec_get_error_report(decoder); +- fwrite(&tmp, 2, 1, channel_decoder_debug_file_error_report); +- } +- +- uint32_t out_samples = MIN((uint32_t)nSamples - delay, nSamplesFile); +- +- switch (arg.bipsOut) +- { +- case 16: +- interleave_short(output16, sample_buf_short, nSamples, nChannels); +- WriteWavShort(output_wav, sample_buf_short + delay * nChannels, out_samples * nChannels); +- break; +- case 24: +- interleave_int (output24, sample_buf_int , nSamples, nChannels); +- WriteWavLong (output_wav, sample_buf_int + delay * nChannels, out_samples * nChannels); +- break; +- } +- +- nSamplesFile -= out_samples; +- +- delay = 0; +- } +- else /* !arg.encoder_only */ +- { +- write_bitstream_frame(output_bitstream, bytes, nBytes, arg.formatG192); +- } +- +- while_end: +- if (!arg.hide_counter) +- { +- if ((frame >= arg.startFrame && frame <= arg.stopFrame && arg.stopFrame != 0) || (arg.stopFrame == 0 && arg.startFrame == 0)) +- { +- printf("\rProcessing frame %i", frame); +- fflush(stdout); +- } +- } +- frame++; +- +- if (frame > arg.stopFrame && arg.stopFrame != 0) +- { +- break; +- } +- +- } +- +- if (!arg.encoder_only && nSamplesFile > 0 && nSamplesFile <= (uint32_t)nSamples) +- { +- memset(sample_buf, 0, (nSamplesFile * nChannels) * sizeof(sample_buf[0])); +- WriteWavLong(output_wav, sample_buf, nSamplesFile * nChannels); +- } +- +- puts("\nProcessing done!"); +- if (output_wav) +- { +- printf("%i samples clipped!\n", (int) output_wav->clipCount); +- } +- +- lc3plus_enc_free_memory(encoder); +- lc3plus_dec_free_memory(decoder); +- +- free(encoder); +- free(decoder); +- free(scratch); +- +- return 0; +-} +- +-/* open file with extra extension */ +-static FILE *fopen_with_ext(const char *file, const char *ext, const char *mode) +-{ +- FILE *f = NULL; +- char *tmp = malloc(strlen(file) + strlen(ext) + 1); +- sprintf(tmp, "%s%s", file, ext); +- f = fopen(tmp, mode); +- free(tmp); +- return f; +-} +- +-/* close file ignoring NULL pointer */ +-static void safe_fclose(FILE* f) +-{ +- if (f != NULL) +- fclose(f); +-} +- +-/* ensure clean exit so valgrind & co. don't complain */ +-void cleanup(void) +-{ +- CloseWavIn(input_wav); +- CloseWav(output_wav); +- safe_fclose(output_bitstream); +- safe_fclose(input_bitstream); +- safe_fclose(error_pattern_file); +- safe_fclose(error_detection_file); +- safe_fclose(bitrate_switching_file); +- safe_fclose(epmode_switching_file); +- safe_fclose(bandwidth_switching_file); +- safe_fclose(channel_decoder_debug_file_bfi); +- safe_fclose(channel_decoder_debug_file_epmr); +- safe_fclose(channel_decoder_debug_file_error_report); +-} +- +-static void parseCmdl(int ac, char** av, Arguments* arg) +-{ +- int pos = 1; +- memset(arg, 0, sizeof(*arg)); +- arg->bipsOut = 16; +- arg->frame_ms = 10; +- arg->dc = 1; +-#ifdef ENABLE_HR_MODE_FL_FLAG +- arg->hrmode = 0; +-#endif +- +- +- arg->plcMeth = LC3PLUS_PLC_ADVANCED; +- exit_if(ac <= 1, USAGE_MESSAGE); +- +- /* parse options in any order */ +- for (; pos < ac && av[pos][0] == '-'; pos++) +- { +- if (!strcmp(av[pos], "-h")) +- { +- puts(USAGE_MESSAGE); +- exit(0); +- } +- if (!strcmp(av[pos], "-q")) +- { +- arg->hide_counter = 1; +- } +- if (!strcmp(av[pos], "-v")) +- { +- arg->verbose = 1; +- } +- if (!strcmp(av[pos], "-y") && pos + 1 < ac) +- { +- arg->startFrame = atoi(av[++pos]); +- printf("Start Frame: %d!\n", arg->startFrame); +- continue; +- } +- if (!strcmp(av[pos], "-z") && pos + 1 < ac) +- { +- arg->stopFrame = atoi(av[++pos]); +- printf("Stop Frame: %d!\n", arg->stopFrame); +- continue; +- } +- if (!strcmp(av[pos], "-E")) +- { +- arg->encoder_only = 1; +- puts("Using only encoder!"); +- } +- if (!strcmp(av[pos], "-D")) +- { +- arg->decoder_only = 1; +- puts("Using only decoder!"); +- } +- if (!strcmp(av[pos], "-formatG192")) +- { +- arg->formatG192 = 1; +- puts("Reading/writing bitstream in G192 format!"); +- } +- if (!strcmp(av[pos], "-cfgG192") && pos + 1 < ac) +- { +- arg->configFilenameG192 = av[++pos]; +- puts("Using user defined configuration file for G192 bitstream format!"); +- } +- /* error pattern */ +- if (!strcmp(av[pos], "-epf") && pos + 1 < ac) +- { +- arg->epf = av[++pos]; +- puts("Using error pattern file for frame loss simulation!"); +- } +- /* trigger PLC with special decoder modes */ +- if (!strcmp(av[pos], "-ept")) +- { +- arg->ept = 1; +- puts("Simulating frame loss by writing reserved values into the LC3plus bitstream!"); +- } +- /* Bits per sample */ +- if (!strcmp(av[pos], "-bps") && pos + 1 < ac) +- { +- arg->bipsOut = atoi(av[++pos]); +- exit_if(arg->bipsOut != 16 && arg->bipsOut != 24, +- "Only 16, or 24 bits per sample are supported!"); +- } +- /* delay compensation */ +- if (!strcmp(av[pos], "-dc") && pos + 1 < ac) +- { +- arg->dc = atoi(av[++pos]); +- exit_if(arg->dc < 0 || arg->dc > 2, "dc musst be 0, 1 or 2!"); +- } +- /* select bandwidth */ +- if (!strcmp(av[pos], "-bandwidth") && pos + 1 < ac) +- { +- arg->bandwidth = av[++pos]; +- } +- /* frame length in ms */ +- if (!strcmp(av[pos], "-frame_ms") && pos + 1 < ac) +- { +- arg->frame_ms = (float)atof(av[++pos]); +- } +- +- /* lfe mode */ +- if (lc3_enc_supported_lfe()) +- { +- if (!strcmp(av[pos], "-lfe")) +- { +- char *lfe_string = av[++pos]; +- char *some_pointer; +- char lfeChans[LC3PLUS_MAX_CHANNELS] = {0}; +- int lfeChansCnt = 0; +- int i; +- some_pointer = strtok (lfe_string,","); +- +-#ifdef DEBUG +-/* Allow old-style usage of -lfe flag for ETSI vs Trunk tests */ +- if ((strstr(some_pointer, ".wav") != NULL) || (strstr(some_pointer, ".bin") != NULL)) { +- for (i = 0; i < LC3PLUS_MAX_CHANNELS; i ++) +- { +- arg->lfe[i] = 1; +- } +- +- pos--; +- continue; +- } +-#endif +- +- while (some_pointer != NULL) { +- if (arg->lfeChanCnt >= LC3PLUS_MAX_CHANNELS) +- { +- fprintf(stderr, "at least %" PRId32 "channels with -lfe configured, but only %i channels are supported\n", arg->lfeChanCnt+1, LC3PLUS_MAX_CHANNELS); +- exit_if(1, "More LFE parameters given than supported channels exist!"); +- } +- arg->lfe[arg->lfeChanCnt] = atoi(some_pointer); +- +- if (arg->lfe[arg->lfeChanCnt]) lfeChans[lfeChansCnt++] = arg->lfeChanCnt; +- +- some_pointer = strtok (NULL, ","); +- arg->lfeChanCnt++; +- } +- +- for (i = 0; i < lfeChansCnt; i ++) +- { +- printf("Enabling LFE mode for channel %i\n", lfeChans[i]); +- } +- +- continue; +- } +- } +- +- /* Error protection mode */ +- if (!strcmp(av[pos], "-epmode") && pos + 1 < ac) +- { +- arg->epmode = atoi(av[++pos]); +- exit_if((unsigned)arg->epmode > 5, "EP mode must be in range [0-5]"); +- if (arg->epmode == 0 && strcmp(av[pos], "0")) +- { +- arg->epmode = 1; +- arg->epmode_file = av[pos]; +- puts("Using epmode switching file!"); +- } +- else +- { +- printf("Error protection %sabled (%i). ", arg->epmode ? "en" : "dis", arg->epmode); +- } +- } +- /* Error detection pattern */ +- if (!strcmp(av[pos], "-edf") && pos + 1 < ac) +- { +- arg->edf = av[++pos]; +- puts("Writing error detection file!"); +- } +- +- /* error pattern */ +- if (!strcmp(av[pos], "-ep_dbg") && pos + 1 < ac) +- { +- arg->channel_coder_vars_file = av[++pos]; +- puts("Saving channel decoder debug information to files!"); +- } +- if (!strcmp(av[pos], "-hrmode")) { +- arg->hrmode = 1; +- } +- +- /* Bitrate switching file */ +- if (!strcmp(av[pos], "-swf") && pos + 1 < ac) { +- arg->bitrate_file = av[++pos]; +- puts("Using bitrate switching file!"); +- } +- +- /* Error detection pattern */ +- if (!strcmp(av[pos], "-edf") && pos + 1 < ac) { +- arg->edf = av[++pos]; +- puts("Writing error detection file!"); +- } +- } +- +- exit_if(arg->encoder_only && arg->decoder_only, "Encoder and decoder modes are exclusive!"); +- exit_if(arg->ept && (!arg->epf || !arg->encoder_only), "Use -ept only with -E -epf FILE!"); +- exit_if(pos + 1 >= ac, MISSING_ARGUMENT_MESSAGE); +- +- arg->inputFilename = av[pos++]; +- arg->outputFilename = av[pos++]; +- +- /* Bitrate */ +- if (!arg->decoder_only) +- { +- exit_if(pos >= ac, MISSING_ARGUMENT_MESSAGE); +- arg->bitrate = atoi(av[pos]); +- if (arg->bitrate == 0) { +- arg->bitrate = 64000; /* dummy value */ +-#ifdef ENABLE_HR_MODE_FL_FLAG +- if (arg->hrmode){ +- arg->bitrate = 150000 * (10/arg->frame_ms); +- } +-#endif +- arg->bitrate_file = av[pos]; +- puts("Using bitrate switching file!"); +- } +- } +- putchar('\n'); +-} +- +-/* check condition and if it fails, exit with error message */ +-static void exit_if(int condition, const char *message) +-{ +- if (condition) +- { +- puts(message); +- if (condition < LC3PLUS_WARNING) +- { +- exit(1); +- } +- } +-} +- +-/* open file with .cfg suffix if file_cfg is null */ +-static FILE *fopen_cfg(const char *file, const char *file_cfg, const char *mode) +-{ +- return file_cfg ? fopen(file_cfg, mode) : fopen_with_ext(file, ".cfg", mode); +-} +- +-static FILE *open_bitstream_writer(const char *file, uint32_t samplerate, int bitrate, short channels, +- uint32_t signal_len, float frame_ms, int epmode, int32_t hrmode, int g192, const char *file_cfg +-) +-{ +- FILE *f = fopen(file, "wb"); +- FILE *f_use = f; +- FILE *f_cfg = NULL; +- +- if (g192) +- { +- f_cfg = fopen_cfg(file, file_cfg, "wb"); +- exit_if(f_cfg == NULL, "Error opening G192 configuration-file!"); +- f_use = f_cfg; +- } +- +- if (f_use) +- { +- uint16_t header[10] = {0xcc1c, sizeof(header), samplerate / 100, +- bitrate / 100, channels, (uint16_t)(frame_ms * 100), +- epmode > 0 ? 1 : 0, signal_len, signal_len >> 16, hrmode}; +- fwrite(&header, sizeof(header), 1, f_use); +- } +- +- safe_fclose(f_cfg); +- return f; +-} +- +-static FILE *open_bitstream_reader(const char *file, unsigned int *samplerate, int *bitrate, short *channels, +- uint32_t *signal_len, float *frame_ms, int *epmode, int *hrmode, int g192, +- const char *file_cfg) +-{ +- FILE *f = fopen(file, "rb"); +- FILE *f_use = f; +- FILE *f_cfg = NULL; +- +- if (g192) +- { +- f_cfg = fopen_cfg(file, file_cfg, "rb"); +- exit_if(f_cfg == NULL, "Error opening G192 configuration-file!"); +- f_use = f_cfg; +- } +- +- if (f_use) +- { +- uint16_t header[10] = {0}; +- fread(header, sizeof(header), 1, f_use); +- +- if (header[0] != 0xcc1c) +- { +- /* Old style bitstream header */ +- *samplerate = header[0] * 100; +- *bitrate = header[1] * 100; +- *channels = header[2]; +- fseek(f_use, 6, SEEK_SET); +- } +- else +- { +- assert(header[1] >= 18); +- *samplerate = header[2] * 100; +- *bitrate = header[3] * 100; +- *channels = header[4]; +- *frame_ms = (float)(header[5] / 100.0); +- *epmode = header[6]; +- *signal_len = (uint32_t)header[7] | ((uint32_t)header[8] << 16); +- *hrmode = header[1] > 18 ? header[9] : 0; +- fseek(f_use, header[1], SEEK_SET); +- } +- } +- +- safe_fclose(f_cfg); +- return f; +-} +- +-static void write_bitstream_frame_G192(FILE* bitstream_file, uint8_t* bytes, int size) +-{ +- int i = 0; +- int currentByte = 0; +- int bitNumber = 0, syncWord = 0; +- uint16_t nbits = size * 8; /* G192 expects number of bits */ +- int16_t bit = 0; +- +- /* Write good/bad frame info -> encoder writes only good frames */ +- syncWord = G192_GOOD_FRAME; +- fwrite(&syncWord, sizeof(int16_t), 1, bitstream_file); +- +- /* Write length info */ +- fwrite(&nbits, sizeof(nbits), 1, bitstream_file); +- +- for (i = 0; i < size; i++) +- { +- currentByte = bytes[i]; +- +- /* Start with LSB */ +- for (bitNumber = 1; bitNumber < 9; bitNumber++) +- { +- bit = (currentByte & (1 << (bitNumber - 1))) != 0; +- bit = bit ? G192_ONE : G192_ZERO; +-#ifdef OLD_G192_FORMAT_FL +- fwrite(&bit, sizeof(int16_t), 1, bitstream_file); +-#else +- fwrite(&bit, sizeof(bit), 1, bitstream_file); +-#endif +- } +- } +-} +- +-static void write_bitstream_frame(FILE *bitstream_file, uint8_t *bytes, int size, int g192) +-{ +- if (g192) +- { +- write_bitstream_frame_G192(bitstream_file, bytes, size); +- } +- else +- { +- int i = 0; +- uint16_t nbytes = size; +- fwrite(&nbytes, sizeof(nbytes), 1, bitstream_file); +- for (i = 0; i < size; i++) +- { +- putc(bytes[i], bitstream_file); +- } +- } +-} +- +-static int read_bitstream_frame_G192(FILE *bitstream_file, int size, uint8_t *bytes, int *bfi_ext) +-{ +- int i = 0, j = 0, read = 0; +- uint16_t nbits = 0; +- int16_t currentBit = 0, frameIndicator = 0, nbytes = 0; +- +- /* Read frame indicator info -> good/bad/redundancy frame */ +- read = (int)fread(&frameIndicator, sizeof(frameIndicator), 1, bitstream_file); +- if (read != 1) +- { +- return -1; +- } +- +- /* Read length info */ +- read = (int)fread(&nbits, sizeof(nbits), 1, bitstream_file); +- +- nbytes = nbits / 8; +- +- exit_if(frameIndicator != G192_GOOD_FRAME && frameIndicator != G192_BAD_FRAME && +- frameIndicator != G192_REDUNDANCY_FRAME, +- "Wrong G192 format detected in bitstream file! The sync word could not be recognized!"); +- +- for (i = 0; i < nbytes && i < size; i++) +- { +- int byte = 0; +- for (j = 0; j < 8; j++) +- { +- read = (int)fread(¤tBit, sizeof(currentBit), 1, bitstream_file); +- if (currentBit == G192_ONE) +- { +- byte |= 1UL << j; +- } +- } +- bytes[i] = (uint8_t)byte; +- } +- if (frameIndicator == G192_GOOD_FRAME) +- { +- *bfi_ext = 0; +- } +- else if (frameIndicator == G192_BAD_FRAME) +- { +- nbytes = 0; +- *bfi_ext = 1; +- } +- else if (frameIndicator == G192_REDUNDANCY_FRAME) +- { +- *bfi_ext = 3; +- } +- +- return nbytes; +-} +- +-static int read_bitstream_frame(FILE *bitstream_file, uint8_t *bytes, int size, int g192, int *bfi_ext) +-{ +- if (g192) +- { +- return read_bitstream_frame_G192(bitstream_file, size, bytes, bfi_ext); +- } +- else +- { +- int i = 0; +- uint16_t nbytes = 0; +- if (fread(&nbytes, sizeof(nbytes), 1, bitstream_file) != 1) +- { +- return -1; /* End of file reached */ +- } +- for (i = 0; i < nbytes && i < size; i++) +- { +- bytes[i] = getc(bitstream_file); +- } +- return nbytes; +- } +-} +- +-/* read value from file and rewind if end is reached */ +-static int16_t loopy_read16(FILE *f) +-{ +- int16_t tmp = 0; +-#ifdef READ_G192FER +- static int16_t format_start_check = -1; +-#endif +- if (fread(&tmp, sizeof(tmp), 1, f) != 1) +- { +- fseek(f, 0, SEEK_SET); +- fread(&tmp, sizeof(tmp), 1, f); +- } +- +-#ifdef READ_G192FER +- if (format_start_check < 0) +- { +- format_start_check = tmp; /*save first 16 bit FER value */ +- } +- +- if (format_start_check >= 0 && format_start_check <= 1) +- { +- if (tmp != 0 && tmp != 1) +- { +- printf("\n Warning !!! assumed [0, 1] strange FER file values %d %d \n ", format_start_check, tmp); +- fflush(stdout); +- } +- } +- +- if (format_start_check == G192_BAD_FRAME || format_start_check == G192_GOOD_FRAME) +- { +- +- +- if ((tmp != G192_BAD_FRAME && tmp != G192_GOOD_FRAME)) +- { +- printf("\n Warning !!! assumed g.192 [0x6b21, 0x6b20,] , strange FER file values %d %d \n ", +- format_start_check, tmp); +- fflush(stdout); +- } +- else +- { +- tmp = (G192_GOOD_FRAME - tmp); /* convert g192 synch word to 1 and 0 , note PC byte order assumed */ +- } +- } +- assert(tmp == 1 || tmp == 0); +-#endif +- +- return tmp; +-} +- +-static int64_t loopy_read64(FILE *f) +-{ +- int64_t tmp = 0; +- if (fread(&tmp, sizeof(tmp), 1, f) != 1) +- { +- fseek(f, 0, SEEK_SET); +- fread(&tmp, sizeof(tmp), 1, f); +- } +- return tmp; +-} +- +-static void scale_24_to_16(const int32_t *in, int16_t *out, int n) +-{ +- int i; +- for (i = 0; i < n; i++) +- { +- out[i] = in[i]; +- } +-} +- +- +-static void deinterleave(int32_t *in, int32_t **out, int n, int channels) +-{ +- int ch, i; +- for (ch = 0; ch < channels; ch++) +- { +- for (i = 0; i < n; i++) +- { +- out[ch][i] = in[i * channels + ch]; +- } +- } +-} +- +-static void interleave_short(int16_t** in, int16_t* out, int32_t n, int32_t channels) +-{ +- int32_t ch, i; +- for (ch = 0; ch < channels; ch++) { +- for (i = 0; i < n; i++) { +- out[i * channels + ch] = in[ch][i]; +- } +- } +-} +- +-static void interleave_int(int32_t** in, int32_t* out, int32_t n, int32_t channels) +-{ +- int32_t ch, i; +- for (ch = 0; ch < channels; ch++) { +- for (i = 0; i < n; i++) { +- out[i * channels + ch] = in[ch][i]; +- } +- } +-} +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/dct4.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/dct4.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/dct4.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/dct4.c 2023-05-08 12:14:37 +@@ -27,11 +27,11 @@ + + void dct2_apply(Dct2* dct, const LC3_FLOAT* input, LC3_FLOAT* output) + { +- assert(input != output); + Complex tmp1[MAX_LEN]; + Complex tmp2[MAX_LEN]; + int i = 0; + const int len = dct->length; ++ assert(input != output); + + for (i = 0; i < len / 2; i++) { + tmp1[i] = cmplx(input[i * 2], 0); +@@ -49,8 +49,8 @@ + + void dct4_init(Dct4* dct, int length) + { +- assert(length <= MAX_LEN); + int i = 0; ++ assert(length <= MAX_LEN); + dct->length = length; + dct->twid1 = calloc(sizeof(*dct->twid1), length / 2); + dct->twid2 = calloc(sizeof(*dct->twid2), length / 2); +@@ -73,12 +73,12 @@ + + void dct4_apply(Dct4* dct, const LC3_FLOAT* input, LC3_FLOAT* output) + { +- assert(input != output); + Complex tmp2[MAX_LEN / 2]; + int i = 0; + Complex* tmp1 = (Complex*)output; + const int len = dct->length; + const LC3_FLOAT norm = (LC3_FLOAT)1.0 / LC3_SQRT((LC3_FLOAT)(len >> 1)); ++ assert(input != output); + + for (i = 0; i < len / 2; i++) { + tmp1[i] = cmul(cmplx(input[i * 2], input[len - i * 2 - 1]), dct->twid1[i]); +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/dec_entropy.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/dec_entropy.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/dec_entropy.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/dec_entropy.c 2023-05-08 12:14:37 +@@ -53,7 +53,7 @@ + LC3_INT nbbytes = nbbits >> 3; + LC3_INT lastnz; + LC3_INT bw_cutoff_idx; +- LC3_INT nbits = ceil(LC3_LOG2(L_spec / 2)); ++ LC3_INT nbits = ceil(LC3_LOGTWO(L_spec / 2)); + + if (nbits > nbbits) + { +@@ -173,7 +173,7 @@ + } + + /* Last non-zero tuple */ +- read_uint_fl(ceil(LC3_LOG2(N / 2)), ptr, &mask_side_local, &bp_side_local, lastnz); ++ read_uint_fl(ceil(LC3_LOGTWO(N / 2)), ptr, &mask_side_local, &bp_side_local, lastnz); + *lastnz = (*lastnz + 1) * 2; + + if (*lastnz > N) { +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/dec_lc3_fl.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/dec_lc3_fl.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/dec_lc3_fl.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/dec_lc3_fl.c 2023-05-08 12:14:37 +@@ -53,8 +53,8 @@ + + if (decoder->rframe == 1 && zero_frame == 0 && bfi != 1) + { +- bfi = 2; + LC3_INT32 max_bw_stopband = BW_cutoff_bin_all[bw_cutoff_idx]; ++ bfi = 2; + switch (decoder->frame_dms) + { + # ifdef ENABLE_025_DMS_MODE +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/defines.h mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/defines.h +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/defines.h 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/defines.h 2023-05-08 12:14:37 +@@ -24,13 +24,13 @@ + typedef uint32_t LC3_UINT32; + + /* Release defines */ +-#define ENABLE_2_5MS_MODE ++// #define ENABLE_2_5MS_MODE + #define ENABLE_5MS_MODE + #define ENABLE_10_MS_MODE + #define ENABLE_ADVANCED_PLC_FL + #define ENABLE_ADVANCED_PLC_FL_DEFAULT + #define ENABLE_BW_CONTROLLER +-#define ENABLE_HR_MODE_FL ++//#define ENABLE_HR_MODE_FL + #define ENABLE_PADDING + #define ENABLE_RFRAME_FL + #define ENABLE_PLC +@@ -49,8 +49,8 @@ + /* Precision Defines */ + #define LC3_FABS(x) (fabsf(x)) + #define LC3_POW(x, y) (powf(x, y)) +-#define LC3_LOG10(x) (log10f(x)) +-#define LC3_LOG2(x) (log2f(x)) ++#define LC3_LOGTEN(x) (log10f(x)) ++#define LC3_LOGTWO(x) (log2f(x)) + # define LC3_COS(x) (cos(x)) + # define LC3_SIN(x) (sin(x)) + #define LC3_SQRT(x) (sqrtf(x)) +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/detect_cutoff_warped.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/detect_cutoff_warped.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/detect_cutoff_warped.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/detect_cutoff_warped.c 2023-05-08 12:14:37 +@@ -68,7 +68,7 @@ + dist = bw_dist[counter]; + + for (i = stop; i >= stop - dist; i--) { +- e_diff = 10.0 * LC3_LOG10(d2[i - dist + 1] + FLT_EPSILON) - 10.0 * LC3_LOG10(d2[i + 1] + FLT_EPSILON); ++ e_diff = 10.0 * LC3_LOGTEN(d2[i - dist + 1] + FLT_EPSILON) - 10.0 * LC3_LOGTEN(d2[i + 1] + FLT_EPSILON); + + if (e_diff > thr) { + brickwall = 1; +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/enc_entropy.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/enc_entropy.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/enc_entropy.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/enc_entropy.c 2023-05-08 12:14:37 +@@ -33,11 +33,11 @@ + + /* Last non zero touple */ + if (bfi_ext == 1) { +- write_uint_backward_fl(ptr, bp_side, mask_side, lastnzTrigger[fs_idx], ceil(LC3_LOG2(N >> 1))); ++ write_uint_backward_fl(ptr, bp_side, mask_side, lastnzTrigger[fs_idx], ceil(LC3_LOGTWO(N >> 1))); + } + else + { +- write_uint_backward_fl(ptr, bp_side, mask_side, lastnz / 2 - 1, ceil(LC3_LOG2(N / 2))); ++ write_uint_backward_fl(ptr, bp_side, mask_side, lastnz / 2 - 1, ceil(LC3_LOGTWO(N / 2))); + } + + /* LSB mode bit */ +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/estimate_global_gain.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/estimate_global_gain.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/estimate_global_gain.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/estimate_global_gain.c 2023-05-08 12:14:37 +@@ -60,8 +60,8 @@ + } else { + g_min = x_max / (32767 - 0.375); + } +- /* Prevent positive rounding errors from LC3_LOG10 function */ +- ind_min = 28.0 * LC3_LOG10(g_min); ++ /* Prevent positive rounding errors from LC3_LOGTEN function */ ++ ind_min = 28.0 * LC3_LOGTEN(g_min); + + ind_min = ceil(ind_min + LC3_FABS(ind_min) * LC3_EPS); + +@@ -76,7 +76,7 @@ + tmp += x[i + 1] * x[i + 1]; + tmp += x[i + 2] * x[i + 2]; + tmp += x[i + 3] * x[i + 3]; +- en[j] = (28.0 / 20.0) * (7 + 10.0 * LC3_LOG10(tmp + reg_val)); ++ en[j] = (28.0 / 20.0) * (7 + 10.0 * LC3_LOGTEN(tmp + reg_val)); + j++; + } + +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/cfft.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/cfft.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/cfft.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/cfft.c 2023-05-08 12:14:37 +@@ -8,7 +8,6 @@ + ******************************************************************************/ + + +- + #include "cfft.h" + #include "iisfft.h" /* for M_PIl */ + #include /* for abs() */ +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iis_fft.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iis_fft.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iis_fft.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iis_fft.c 2023-05-08 12:14:37 +@@ -10,12 +10,12 @@ + + #include + #include +-#include "iis_fft.h" + #include + #include + #include +-#include "../structs.h" ++#include + ++#include "iis_fft.h" + /**************************************************************************************************/ + + /* AFFT uses two fft implementations +@@ -24,9 +24,6 @@ + fast lengths, check the fft_n function. + */ + +-#include +-#include "cfft.h" +-#include "iisfft.h" + + #define FFT_COMPLEX 1 + #define FFT_REAL 2 +@@ -122,12 +119,13 @@ + + IIS_FFT_ERROR LC3_IIS_FFT_Apply_CFFT(HANDLE_IIS_FFT handle, const Complex* input, Complex* output) + { ++ LC3_FLOAT* dummy; + if (!handle) + return IIS_FFT_INTERNAL_ERROR; + + /* check for inplace operation */ + memmove(output, input, sizeof(*input) * handle->len); +- LC3_FLOAT* dummy = (LC3_FLOAT*)output; ++ dummy = (LC3_FLOAT*)output; + if (handle->cfft.len > 0) { + LC3_cfft_apply(&handle->cfft, dummy, dummy + 1, 2); + } else { +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iis_fft.h mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iis_fft.h +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iis_fft.h 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iis_fft.h 2023-05-08 12:14:37 +@@ -12,6 +12,7 @@ + #define IIS_FFT_H + + #include "../structs.h" ++#include "../defines.h" + #include "cfft.h" + + #ifdef __cplusplus +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iisfft.h mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iisfft.h +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iisfft.h 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/iisfft.h 2023-05-08 12:14:37 +@@ -11,6 +11,7 @@ + #ifndef IISFFT_H + #define IISFFT_H + ++#include "../defines.h" + + #ifndef M_PIl + #define M_PIl 3.1415926535897932384626433832795029L /* pi */ +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft.c 1970-01-01 01:00:00 +@@ -1,99 +0,0 @@ +-/****************************************************************************** +-* ETSI TS 103 634 V1.4.1 * +-* Low Complexity Communication Codec Plus (LC3plus) * +-* * +-* Copyright licence is solely granted through ETSI Intellectual Property * +-* Rights Policy, 3rd April 2019. No patent licence is granted by implication, * +-* estoppel or otherwise. * +-******************************************************************************/ +- +- +-#include "functions.h" +-#include "fft/iis_fft.c" +-#include "fft/iisfft.c" +-#include "fft/cfft.c" +- +-void fft_init(Fft* fft, int length) +-{ +- assert(length % 2 == 0); +- HANDLE_IIS_FFT handle = NULL; +- IIS_FFT_ERROR error = 0; +- +- fft->length = length; +- +- error = LC3_IIS_CFFT_Create(&handle, length, IIS_FFT_FWD); +- +- assert(error == IIS_FFT_NO_ERROR); +- fft->handle = handle; +-} +- +-void fft_free(Fft* fft) +-{ +- IIS_FFT_ERROR error = 0; +- +- if (fft) { +- error = LC3_IIS_CFFT_Destroy((HANDLE_IIS_FFT *) &fft->handle); +- +- assert(error == IIS_FFT_NO_ERROR); +- memset(fft, 0, sizeof(*fft)); +- } +-} +- +-void real_fft_free(Fft* fft) +-{ +- IIS_FFT_ERROR error = 0; +- +- if (fft) { +- error = LC3_IIS_RFFT_Destroy((HANDLE_IIS_FFT *) &fft->handle); +- +- assert(error == IIS_FFT_NO_ERROR); +- memset(fft, 0, sizeof(*fft)); +- } +-} +- +-void real_fft_init(Fft* fft, LC3_INT32 length, HANDLE_IIS_FFT *handle) +-{ +- assert(length % 4 == 0); /* due to current limitation of core complex FFTs*/ +- IIS_FFT_ERROR error = IIS_FFT_NO_ERROR; +- +- fft->length = length; +- +- error = LC3_IIS_RFFT_Create(handle, length, IIS_FFT_FWD); +- assert(error == IIS_FFT_NO_ERROR); +- fft->handle = *handle; +-} +- +- +-void real_ifft_init(Fft* fft, LC3_INT32 length, HANDLE_IIS_FFT *handle) +-{ +- assert(length % 4 == 0); /* due to current limitation of core complex FFTs*/ +- IIS_FFT_ERROR error = IIS_FFT_NO_ERROR; +- +- fft->length = length; +- +- error = LC3_IIS_RFFT_Create(handle, length, IIS_FFT_BWD); +- +- assert(error == IIS_FFT_NO_ERROR); +- fft->handle = *handle; +-} +- +-void fft_apply(Fft* fft, const Complex* input, Complex* output) +-{ +- IIS_FFT_ERROR error = 0; +- error = LC3_IIS_FFT_Apply_CFFT(fft->handle, input, output); +- +- assert(error == IIS_FFT_NO_ERROR); +-} +- +- +-void real_fft_apply(Fft* fft, const LC3_FLOAT* input, LC3_FLOAT* output) +-{ +- IIS_FFT_ERROR error = IIS_FFT_NO_ERROR; +- +- UNUSED(error); +- +- error = LC3_IIS_FFT_Apply_RFFT(fft->handle, input, output); +- +- assert(error == IIS_FFT_NO_ERROR); +-} +- +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/lc3.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/lc3.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/lc3.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/lc3.c 2023-05-08 12:14:37 +@@ -48,8 +48,9 @@ + case 44100: return 1; + case 48000: return 1; + case 96000: return 1; +- default: return 0; ++ default: break; + } ++ return 0; + } + + static int lc3plus_plc_mode_supported(LC3PLUS_PlcMode plc_mode) +@@ -58,8 +59,9 @@ + { + case LC3PLUS_PLC_ADVANCED: /* fallthru */ + return 1; +- default: return 0; ++ default: break; + } ++ return 0; + } + + static int lc3plus_frame_size_supported(float frame_ms) +@@ -69,8 +71,9 @@ + case 25: /* fallthru */ + case 50: /* fallthru */ + case 100: return 1; +- default: return 0; ++ default: break; + } ++ return 0; + } + + static int null_in_list(void **list, int n) +@@ -97,13 +100,14 @@ + /* encoder functions *********************************************************/ + LC3PLUS_Error lc3plus_enc_init(LC3PLUS_Enc *encoder, int samplerate, int channels, int hrmode, int32_t lfe_channel_array[]) + { ++ int ch = 0; ++ + RETURN_IF(encoder == NULL, LC3PLUS_NULL_ERROR); + RETURN_IF((uintptr_t)encoder % 4 != 0, LC3PLUS_ALIGN_ERROR); + RETURN_IF(!lc3plus_samplerate_supported(samplerate), LC3PLUS_SAMPLERATE_ERROR); + RETURN_IF(!lc3plus_channels_supported(channels), LC3PLUS_CHANNELS_ERROR); + RETURN_IF(samplerate==96000 && hrmode == 0, LC3PLUS_HRMODE_ERROR); + +- int ch = 0; + for (ch = 0; ch < channels; ch++) + { + RETURN_IF(!lc3_enc_supported_lfe() && lfe_channel_array[ch], LC3PLUS_LFE_MODE_NOT_SUPPORTED); +@@ -142,6 +146,7 @@ + int lc3plus_enc_get_real_bitrate(const LC3PLUS_Enc *encoder) + { + int ch = 0, totalBytes = 0; ++ int bitrate; + RETURN_IF(encoder == NULL, 0); + RETURN_IF(!encoder->lc3_br_set, LC3PLUS_BITRATE_UNSET_ERROR); + +@@ -150,7 +155,7 @@ + totalBytes += encoder->channel_setup[ch]->targetBytes; + } + +- int bitrate = (totalBytes * 80000.0 + encoder->frame_dms - 1) / encoder->frame_dms; ++ bitrate = (totalBytes * 80000.0 + encoder->frame_dms - 1) / encoder->frame_dms; + + if (encoder->fs_in == 44100) + { +@@ -191,11 +196,13 @@ + + LC3PLUS_Error lc3plus_enc_set_bandwidth(LC3PLUS_Enc *encoder, int bandwidth) + { ++ LC3_INT effective_fs; ++ + RETURN_IF(encoder == NULL, LC3PLUS_NULL_ERROR); + #ifdef ENABLE_HR_MODE_FL_FLAG + RETURN_IF(encoder->hrmode == 1, LC3PLUS_HRMODE_BW_ERROR); + #endif +- LC3_INT effective_fs = encoder->fs_in; ++ effective_fs = encoder->fs_in; + if (encoder->bandwidth != bandwidth) { + if (encoder->fs_in > 40000) { + effective_fs = 40000; +@@ -338,9 +345,9 @@ + + LC3PLUS_Error lc3plus_free_encoder_structs(LC3PLUS_Enc* encoder) + { ++ int ch = 0; + RETURN_IF(!encoder, LC3PLUS_NULL_ERROR); + +- int ch = 0; + for (ch = 0; ch < encoder->channels; ch++) { + mdct_free(&encoder->channel_setup[ch]->mdctStruct); + dct2_free(&encoder->channel_setup[ch]->dct2StructSNS); +@@ -351,9 +358,9 @@ + + LC3PLUS_Error lc3plus_free_decoder_structs(LC3PLUS_Dec* decoder) + { ++ int ch = 0; + RETURN_IF(!decoder, LC3PLUS_NULL_ERROR); + +- int ch = 0; + for (ch = 0; ch < decoder->channels; ch++) { + dct4_free(&decoder->channel_setup[ch]->dct4structImdct); + real_fft_free(&decoder->channel_setup[ch]->PlcAdvSetup->PlcPhEcuSetup.PhEcu_Fft); +@@ -378,11 +385,14 @@ + + LC3PLUS_Error lc3plus_enc_set_ep_mode(LC3PLUS_Enc *encoder, LC3PLUS_EpMode epmode) + { ++ LC3PLUS_EpMode oldEpmode; ++ LC3PLUS_Error error; ++ + RETURN_IF(encoder == NULL, LC3PLUS_NULL_ERROR); + RETURN_IF((unsigned)epmode > LC3PLUS_EP_HIGH, LC3PLUS_EPMODE_ERROR); +- LC3PLUS_EpMode oldEpmode = encoder->epmode; ++ oldEpmode = encoder->epmode; + encoder->epmode = epmode; +- LC3PLUS_Error error = encoder->lc3_br_set ? update_enc_bitrate(encoder, encoder->bitrate) : LC3PLUS_OK; ++ error = encoder->lc3_br_set ? update_enc_bitrate(encoder, encoder->bitrate) : LC3PLUS_OK; + if (error != LC3PLUS_OK) + { + encoder->epmode = oldEpmode; // preserve old epmode in case of failure +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/lc3plus_fft.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/lc3plus_fft.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/lc3plus_fft.c 1970-01-01 01:00:00 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/lc3plus_fft.c 2023-05-08 12:35:06 +@@ -0,0 +1,98 @@ ++/****************************************************************************** ++* ETSI TS 103 634 V1.4.1 * ++* Low Complexity Communication Codec Plus (LC3plus) * ++* * ++* Copyright licence is solely granted through ETSI Intellectual Property * ++* Rights Policy, 3rd April 2019. No patent licence is granted by implication, * ++* estoppel or otherwise. * ++******************************************************************************/ ++ ++ ++#include "functions.h" ++#include "fft/iis_fft.c" ++#include "fft/iisfft.c" ++#include "fft/cfft.c" ++ ++void fft_init(Fft* fft, int length) ++{ ++ HANDLE_IIS_FFT handle = NULL; ++ IIS_FFT_ERROR error = 0; ++ assert(length % 2 == 0); ++ ++ fft->length = length; ++ ++ error = LC3_IIS_CFFT_Create(&handle, length, IIS_FFT_FWD); ++ ++ assert(error == IIS_FFT_NO_ERROR); ++ fft->handle = handle; ++} ++ ++void fft_free(Fft* fft) ++{ ++ IIS_FFT_ERROR error = 0; ++ ++ if (fft) { ++ error = LC3_IIS_CFFT_Destroy((HANDLE_IIS_FFT *) &fft->handle); ++ ++ assert(error == IIS_FFT_NO_ERROR); ++ memset(fft, 0, sizeof(*fft)); ++ } ++} ++ ++void real_fft_free(Fft* fft) ++{ ++ IIS_FFT_ERROR error = 0; ++ ++ if (fft) { ++ error = LC3_IIS_RFFT_Destroy((HANDLE_IIS_FFT *) &fft->handle); ++ ++ assert(error == IIS_FFT_NO_ERROR); ++ memset(fft, 0, sizeof(*fft)); ++ } ++} ++ ++void real_fft_init(Fft* fft, LC3_INT32 length, HANDLE_IIS_FFT *handle) ++{ ++ IIS_FFT_ERROR error = IIS_FFT_NO_ERROR; ++ assert(length % 4 == 0); /* due to current limitation of core complex FFTs*/ ++ ++ fft->length = length; ++ ++ error = LC3_IIS_RFFT_Create(handle, length, IIS_FFT_FWD); ++ assert(error == IIS_FFT_NO_ERROR); ++ fft->handle = *handle; ++} ++ ++ ++void real_ifft_init(Fft* fft, LC3_INT32 length, HANDLE_IIS_FFT *handle) ++{ ++ IIS_FFT_ERROR error = IIS_FFT_NO_ERROR; ++ assert(length % 4 == 0); /* due to current limitation of core complex FFTs*/ ++ ++ fft->length = length; ++ ++ error = LC3_IIS_RFFT_Create(handle, length, IIS_FFT_BWD); ++ ++ assert(error == IIS_FFT_NO_ERROR); ++ fft->handle = *handle; ++} ++ ++void fft_apply(Fft* fft, const Complex* input, Complex* output) ++{ ++ IIS_FFT_ERROR error = 0; ++ error = LC3_IIS_FFT_Apply_CFFT(fft->handle, input, output); ++ ++ assert(error == IIS_FFT_NO_ERROR); ++} ++ ++ ++void real_fft_apply(Fft* fft, const LC3_FLOAT* input, LC3_FLOAT* output) ++{ ++ IIS_FFT_ERROR error = IIS_FFT_NO_ERROR; ++ ++ UNUSED(error); ++ ++ error = LC3_IIS_FFT_Apply_RFFT(fft->handle, input, output); ++ ++ assert(error == IIS_FFT_NO_ERROR); ++} +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/mdct.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/mdct.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/mdct.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/mdct.c 2023-05-08 12:14:37 +@@ -104,6 +104,7 @@ + { + LC3_FLOAT tmp[MAX_LEN * 2] = {0}; + LC3_INT i = 0; ++ LC3_INT hlen; + + move_float(tmp, mdct->mem, mdct->mem_length); + move_float(tmp + mdct->mem_length, input, mdct->length); +@@ -112,7 +113,7 @@ + + mult_vec(tmp, mdct->window, mdct->length * 2); + +- LC3_INT hlen = mdct->length / 2; ++ hlen = mdct->length / 2; + for (i = 0; i < hlen; i++) { + output[i] = -tmp[hlen * 3 - i - 1] - tmp[hlen * 3 + i]; + output[hlen + i] = tmp[i] - tmp[hlen * 2 - i - 1]; +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/near_nyquist_detector.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/near_nyquist_detector.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/near_nyquist_detector.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/near_nyquist_detector.c 2023-05-08 12:35:16 +@@ -14,9 +14,9 @@ + const LC3_INT bands_number, const LC3_FLOAT* ener) + { + *near_nyquist_flag = 0; +- ++ + if (fs_idx < 4) +- { ++ { + LC3_INT i = 0; + LC3_FLOAT ener_low = FLT_EPSILON, ener_high = 0; + +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/plc_main.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/plc_main.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/plc_main.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/plc_main.c 2023-05-08 12:14:37 +@@ -56,6 +56,8 @@ + { + case 2: + { ++ LC3_FLOAT pitch_fl_c; ++ + assert(decoder->fs_idx == floor(decoder->fs / 10000)); + // phaseECU supports only 10ms framing + assert(PlcSetup->nbLostCmpt != 0 || decoder->frame_dms == 100); +@@ -69,7 +71,7 @@ + } + + /* call phaseEcu */ +- LC3_FLOAT pitch_fl_c = (LC3_FLOAT)ltpf_pitch_int + (LC3_FLOAT)ltpf_pitch_fr / 4.0; /* use non-rounded pitch indeces */ ++ pitch_fl_c = (LC3_FLOAT)ltpf_pitch_int + (LC3_FLOAT)ltpf_pitch_fr / 4.0; /* use non-rounded pitch indeces */ + + + if (prev_bfi_plc2 == 0) +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/plc_phecu_spec_ana.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/plc_phecu_spec_ana.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/plc_phecu_spec_ana.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/plc_phecu_spec_ana.c 2023-05-08 12:14:37 +@@ -135,13 +135,13 @@ + + if (max_xfp_abs >= 0.5) + { +- PLC2_Q_flt = (LC3_FLOAT)LC3_FLOOR(LC3_LOG2(32768 / 2 / 2 / max_xfp_abs)); ++ PLC2_Q_flt = (LC3_FLOAT)LC3_FLOOR(LC3_LOGTWO(32768 / 2 / 2 / max_xfp_abs)); + Q_scale_flt = LC3_POW(2.0, PLC2_Q_flt) / fx_fft_scale / fft_fs_scale; /* basop way using xfp scale */ + + /* C-Float additional safety limit/verification of the integer xfp based scaling using the available C-float Xabs max value inp_high as well */ + { + LC3_FLOAT tmp_scale; +- tmp_scale = LC3_POW(2.0, LC3_FLOOR(LC3_LOG2(32768 / 2 / 2 / inp_high))); ++ tmp_scale = LC3_POW(2.0, LC3_FLOOR(LC3_LOGTWO(32768 / 2 / 2 / inp_high))); + if (Q_scale_flt > tmp_scale) { + Q_scale_flt = tmp_scale; + } +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/plc_phecu_subst_spec.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/plc_phecu_subst_spec.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/plc_phecu_subst_spec.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/plc_phecu_subst_spec.c 2023-05-08 12:14:37 +@@ -30,6 +30,7 @@ + LC3_INT32 segmentLen, e; + LC3_FLOAT Xph; + LC3_FLOAT seed_local; ++ LC3_INT32 binCounter, subInd; + + UNUSED(corr_phase_dbg); + UNUSED(X_i_new_re_dbg); +@@ -49,8 +50,8 @@ + + + // EVOLVE PHASE ----------------- +- LC3_INT32 binCounter = 1; +- LC3_INT32 subInd = 0; ++ binCounter = 1; ++ subInd = 0; + + one_peak_flag_mask = -1; + if (n_plocs < 3 && n_plocs > 0) { +@@ -219,9 +220,10 @@ + } + + static LC3_INT32 own_rand(LC3_INT32 seed) { +- assert(seed <= 32767 && seed >= -32768); +- LC3_INT32 retSeed = (13849 + (seed + 32768) * 31821) & 65535; +- retSeed -= 32768; ++ LC3_INT32 retSeed; ++ assert(seed <= 32767 && seed >= -32768); ++ retSeed = (13849 + (seed + 32768) * 31821) & 65535; ++ retSeed -= 32768; + assert(retSeed <= 32767 && retSeed >= -32768); + return retSeed; + } +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/plc_phecu_tba_per_band_gain.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/plc_phecu_tba_per_band_gain.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/plc_phecu_tba_per_band_gain.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/plc_phecu_tba_per_band_gain.c 2023-05-08 12:35:16 +@@ -6,13 +6,13 @@ + * Rights Policy, 3rd April 2019. No patent licence is granted by implication, * + * estoppel or otherwise. * + ******************************************************************************/ +- + ++ + #include "defines.h" + #include "functions.h" + + +-void plc_phEcu_tba_per_band_gain(LC3_INT32 n_grp, LC3_FLOAT *gr_pow_left, LC3_FLOAT *gr_pow_right, LC3_FLOAT *trans, LC3_FLOAT *grp_pow_change) ++void plc_phEcu_tba_per_band_gain(LC3_INT32 n_grp, LC3_FLOAT *gr_pow_left, LC3_FLOAT *gr_pow_right, LC3_FLOAT *trans, LC3_FLOAT *grp_pow_change) + { + LC3_INT32 i; + +@@ -34,10 +34,10 @@ + trans[i] = 1.0; /* 0/0 no transient , no power change */ + } + } +- grp_pow_change[i] = (LC3_FLOAT) 10.0 * LC3_LOG10(trans[i]); ++ grp_pow_change[i] = (LC3_FLOAT) 10.0 * LC3_LOGTEN(trans[i]); + + } + +- return; ++ return; + } + +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/plc_phecu_trans_burst_ana_sub.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/plc_phecu_trans_burst_ana_sub.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/plc_phecu_trans_burst_ana_sub.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/plc_phecu_trans_burst_ana_sub.c 2023-05-08 12:35:16 +@@ -6,16 +6,16 @@ + * Rights Policy, 3rd April 2019. No patent licence is granted by implication, * + * estoppel or otherwise. * + ******************************************************************************/ +- + ++ + #include "defines.h" + #include "functions.h" + + +-void plc_phEcu_trans_burst_ana_sub(LC3_INT32 fs_idx, LC3_INT32 burst_len, LC3_INT32 n_grp, LC3_FLOAT *oold_spect_shape, +- LC3_FLOAT *oold_EwPtr, LC3_FLOAT *old_spect_shape, ++void plc_phEcu_trans_burst_ana_sub(LC3_INT32 fs_idx, LC3_INT32 burst_len, LC3_INT32 n_grp, LC3_FLOAT *oold_spect_shape, ++ LC3_FLOAT *oold_EwPtr, LC3_FLOAT *old_spect_shape, + LC3_FLOAT *old_EwPtr, LC3_FLOAT *stPhECU_beta_mute, +- LC3_FLOAT *stPhECU_mag_chg_1st, LC3_FLOAT *stPhECU_Xavg, LC3_FLOAT *alpha, LC3_FLOAT *beta, LC3_FLOAT *mag_chg, LC3_INT32 *tr_dec_dbg, LC3_FLOAT *gpc_dbg) ++ LC3_FLOAT *stPhECU_mag_chg_1st, LC3_FLOAT *stPhECU_Xavg, LC3_FLOAT *alpha, LC3_FLOAT *beta, LC3_FLOAT *mag_chg, LC3_INT32 *tr_dec_dbg, LC3_FLOAT *gpc_dbg) + { + LC3_FLOAT gr_pow_left[MAX_LGW]; + LC3_FLOAT gr_pow_right[MAX_LGW]; +@@ -27,7 +27,7 @@ + + LC3_INT32 attDegreeFrames; + LC3_FLOAT thresh_dbg; +- ++ + UNUSED(tr_dec_dbg); + UNUSED(gpc_dbg); + +@@ -39,7 +39,7 @@ + + } + +- ++ + plc_phEcu_tba_trans_dect_gains(burst_len, n_grp, grp_pow_change, stPhECU_beta_mute, stPhECU_mag_chg_1st, alpha, beta, mag_chg, ph_dith, tr_dec, att_val, &attDegreeFrames, &thresh_dbg); + + return; +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/resamp12k8.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/resamp12k8.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/resamp12k8.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/resamp12k8.c 2023-05-08 12:14:37 +@@ -17,6 +17,8 @@ + + LC3_INT len_12k8 = 0, N12k8 = 0, i = 0, k = 0; + LC3_FLOAT mac = 0, buf_out[120 + MAX_LEN] = {0}, bufdown[128] = {0}, buf[120 + MAX_LEN] = {0}; ++ LC3_INT32 index_int, index_frac, resamp_upfac, resamp_delay, resamp_off_int, resamp_off_frac; ++ LC3_FLOAT u_11, u_21, u_1, u_2; + + const LC3_FLOAT *filter; + const LC3_FLOAT *filt_input, *filt_coeff; +@@ -49,12 +51,12 @@ + + /* Upsampling & Low-pass Filtering & Downsampling */ + +- LC3_INT32 index_int = 1; +- LC3_INT32 index_frac = 0; +- LC3_INT32 resamp_upfac = resamp_params[fs_idx][0]; +- LC3_INT32 resamp_delay = resamp_params[fs_idx][1]; +- LC3_INT32 resamp_off_int = resamp_params[fs_idx][2]; +- LC3_INT32 resamp_off_frac = resamp_params[fs_idx][3]; ++ index_int = 1; ++ index_frac = 0; ++ resamp_upfac = resamp_params[fs_idx][0]; ++ resamp_delay = resamp_params[fs_idx][1]; ++ resamp_off_int = resamp_params[fs_idx][2]; ++ resamp_off_frac = resamp_params[fs_idx][3]; + + k = 0; + for (i = 0; i < N12k8; i++) { +@@ -78,9 +80,8 @@ + + + /* 50Hz High-Pass */ +- LC3_FLOAT u_11 = mem_50[0]; +- LC3_FLOAT u_21 = mem_50[1]; +- LC3_FLOAT u_1, u_2; ++ u_11 = mem_50[0]; ++ u_21 = mem_50[1]; + + for (i = 0; i < len_12k8; i++) { + LC3_FLOAT y1 = (highpass50_filt_b[0] * bufdown[i] + u_11); +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/setup_dec_lc3.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/setup_dec_lc3.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/setup_dec_lc3.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/setup_dec_lc3.c 2023-05-08 12:14:37 +@@ -32,6 +32,7 @@ + LC3_FLOAT *sine_table1_phecu, *sine_table2_phecu; + HANDLE_IIS_FFT handle_fft_phaseecu; + HANDLE_IIS_FFT handle_ifft_phaseecu; ++ LC3_FLOAT *q_old_res; + + for (ch = 0; ch < channels; ch++) { + DecSetup* setup = balloc(decoder, &size, sizeof(DecSetup)); +@@ -56,7 +57,7 @@ + sine_table1_phecu = balloc(decoder, &size, sizeof(LC3_FLOAT) * (((CODEC_FS(samplerate) * 16) / 1000) / 2 + 1)); + sine_table2_phecu = balloc(decoder, &size, sizeof(LC3_FLOAT) * (((CODEC_FS(samplerate) * 16) / 1000) / 2 + 1)); + +- LC3_FLOAT *q_old_res = balloc(decoder, &size, sizeof(LC3_FLOAT) * frame_len); ++ q_old_res = balloc(decoder, &size, sizeof(LC3_FLOAT) * frame_len); + + if (decoder) { + decoder->channel_setup[ch] = setup; +@@ -346,6 +347,7 @@ + LC3PLUS_Error update_dec_bitrate(LC3PLUS_Dec* decoder, int ch, int nBytes) + { + int totalBits = 0, bitsTmp = 0, channel_bytes = 0, maxBytes = 0, minBytes = 0; ++ DecSetup* setup; + + if (decoder->hrmode) + { +@@ -375,7 +377,7 @@ + + channel_bytes = nBytes; + +- DecSetup* setup = decoder->channel_setup[ch]; ++ setup = decoder->channel_setup[ch]; + + if (channel_bytes < minBytes || channel_bytes > maxBytes) + { +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/setup_enc_lc3.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/setup_enc_lc3.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/setup_enc_lc3.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/setup_enc_lc3.c 2023-05-08 12:14:37 +@@ -33,6 +33,7 @@ + , int32_t lfe_channel_array[] + ) + { ++ int ch = 0; + memset(encoder, 0, lc3plus_enc_get_size(samplerate, channels)); + alloc_encoder(encoder, channels); + +@@ -56,7 +57,6 @@ + encoder->r12k8_mem_in_len = 2 * 8 * encoder->fs / 12800; + encoder->r12k8_mem_out_len = 24; + +- int ch = 0; + for (ch = 0; ch < encoder->channels; ch++) + { + encoder->channel_setup[ch]->lfe = lfe_channel_array[ch] != 0; +@@ -220,6 +220,7 @@ + + if (encoder->hrmode) + { ++#ifdef ENABLE_HR_MODE_FL + switch (encoder->frame_dms) + { + case 25: +@@ -243,6 +244,7 @@ + default: + return LC3PLUS_HRMODE_ERROR; + } ++#endif + } + else + { +@@ -368,7 +370,7 @@ + setup->total_bits = setup->targetBytes << 3; + setup->targetBitsInit = setup->total_bits - encoder->envelope_bits - encoder->global_gain_bits - + encoder->noise_fac_bits - encoder->BW_cutoff_bits - +- ceil(LC3_LOG2(encoder->frame_length / 2)) - 2 - 1; ++ ceil(LC3_LOGTWO(encoder->frame_length / 2)) - 2 - 1; + + if (setup->total_bits > 1280) { + setup->targetBitsInit = setup->targetBitsInit - 1; +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/sns_compute_scf.c mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/sns_compute_scf.c +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/sns_compute_scf.c 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/sns_compute_scf.c 2023-05-08 12:14:37 +@@ -109,7 +109,7 @@ + + /* Log-domain */ + for (i = 0; i < 64; i++) { +- xl[i] = LC3_LOG2(x[i]) / 2.0; ++ xl[i] = LC3_LOGTWO(x[i]) / 2.0; + } + + /* Downsampling */ +diff -Naur ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/tinywavein_c.h mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/tinywavein_c.h +--- ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/tinywavein_c.h 2023-02-28 20:25:37 ++++ mod/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/tinywavein_c.h 2023-05-08 12:14:37 +@@ -17,6 +17,7 @@ + #include + #include + ++ + #if defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64) || defined(__arm__) || \ + defined(__aarch64__) + #define __TWI_LE /* _T_iny _W_ave _I_n _L_ittle _E_ndian */ diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c index 4cce2d8add..765d1ddc76 100644 --- a/lib_rend/lib_rend.c +++ b/lib_rend/lib_rend.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -31,24 +31,22 @@ *******************************************************************************************************/ #include "options.h" -#include "ivas_cnst.h" #include "lib_rend.h" +#include "prot.h" #include "ivas_prot.h" +#include "ivas_prot_rend.h" +#include "ivas_cnst.h" #include "ivas_rom_com.h" -#include "ivas_rom_dec.h" #include "ivas_rom_rend.h" -#include "ivas_lib_rend_internal.h" -#include "prot.h" -#include "wmops.h" - #include #include #include -#include -#include -#include +#include "wmc_auto.h" + -// #define ROTATE_CREND_IN_CLDFB_DOMAIN +/*-------------------------------------------------------------------* + * Local constants + *-------------------------------------------------------------------*/ /* Maximum buffer length (per channel) in samples. * Keep this separate from L_FRAME48k in case we want to support different size later */ @@ -57,7 +55,14 @@ /* Maximum buffer length (total) in samples. */ #ifdef SPLIT_REND_WITH_HEAD_ROT +#ifdef REND_STATIC_MEM_OPT +#define MAX_BUFFER_LENGTH ( MAX_BUFFER_LENGTH_PER_CHANNEL * MAX_INPUT_CHANNELS ) +#define MAX_CLDFB_BUFFER_LENGTH ( MAX_CLDFB_BUFFER_LENGTH_PER_CHANNEL * MAX_INPUT_CHANNELS ) +#define MAX_BIN_BUFFER_LENGTH ( MAX_BUFFER_LENGTH_PER_CHANNEL * BINAURAL_CHANNELS ) +#else #define MAX_BUFFER_LENGTH ( MAX_CLDFB_BUFFER_LENGTH_PER_CHANNEL * MAX_INPUT_CHANNELS ) +#endif + #else #define MAX_BUFFER_LENGTH ( MAX_BUFFER_LENGTH_PER_CHANNEL * MAX_INPUT_CHANNELS ) #endif @@ -66,6 +71,10 @@ #define BINAURAL_RENDERING_FRAME_SIZE_MS 20 +/*-------------------------------------------------------------------* + * Local types + *-------------------------------------------------------------------*/ + typedef float pan_vector[MAX_OUTPUT_CHANNELS]; typedef float pan_matrix[MAX_INPUT_CHANNELS][MAX_OUTPUT_CHANNELS]; typedef float rotation_gains[MAX_INPUT_CHANNELS][MAX_INPUT_CHANNELS]; @@ -96,9 +105,13 @@ typedef struct #ifdef SPLIT_REND_WITH_HEAD_ROT const RENDER_CONFIG_HANDLE *hhRendererConfig; #endif +#ifdef SPLIT_REND_PLC + const int16_t *pSplitRendBFI; +#endif #ifdef SPLIT_REND_LC3PLUS const SPLIT_REND_WRAPPER *pSplitRendWrapper; #endif + /* TODO @Philips : would this be a better place to store the render config data? * bearing in mind we could have multiple inputs to the renderer, we might neeed to accomodate * multiple rendering configurations unless one global one can be used. If this is not relevant, @@ -112,7 +125,9 @@ typedef struct IVAS_REND_AudioConfig inConfig; IVAS_REND_InputId id; IVAS_REND_AudioBuffer inputBuffer; +#ifndef REND_STATIC_MEM_OPT float bufferData[MAX_BUFFER_LENGTH]; +#endif float gain; /* Linear, not in dB */ rendering_context ctx; int32_t numNewSamplesPerChannel; /* Used to keep track how much new audio was fed before rendering current frame */ @@ -124,13 +139,27 @@ typedef struct IVAS_REND_AudioObjectPosition currentPos; IVAS_REND_AudioObjectPosition previousPos; TDREND_WRAPPER tdRendWrapper; - CREND_WRAPPER crendWrapper; + CREND_WRAPPER_HANDLE crendWrapper; + REVERB_HANDLE hReverb; rotation_matrix rot_mat_prev; #ifdef SPLIT_REND_LC3PLUS TDREND_WRAPPER splitTdRendWrappers[MAX_HEAD_ROT_POSES - 1]; /* Additional TD Rend instances used for split rendering */ #endif +#ifdef REND_STATIC_MEM_OPT + float *bufferData; +#endif } input_ism; +typedef struct +{ + int16_t numLfeChannels; + bool pan_lfe; + float lfeInputGain; + float lfeOutputAzimuth; + float lfeOutputElevation; + IVAS_REND_LfePanMtx lfePanMtx; +} lfe_routing; + typedef struct { input_base base; @@ -142,25 +171,33 @@ typedef struct LSSETUP_CUSTOM_STRUCT customLsInput; EFAP_WRAPPER efapInWrapper; TDREND_WRAPPER tdRendWrapper; - CREND_WRAPPER crendWrapper; + CREND_WRAPPER_HANDLE crendWrapper; + REVERB_HANDLE hReverb; rotation_gains rot_gains_prev; - IVAS_REND_LfeRouting lfeRouting; + lfe_routing lfeRouting; +#ifdef REND_STATIC_MEM_OPT + float *bufferData; +#endif } input_mc; typedef struct { input_base base; pan_matrix hoaDecMtx; - CREND_WRAPPER crendWrapper; #ifdef SPLIT_REND_WITH_HEAD_ROT CLDFB_REND_WRAPPER cldfbRendWrapper; SPLIT_REND_WRAPPER splitRendWrapper; #endif + CREND_WRAPPER_HANDLE crendWrapper; #ifdef SPLIT_REND_WITH_HEAD_ROT rotation_gains rot_gains_prev[MAX_HEAD_ROT_POSES]; #else rotation_gains rot_gains_prev; #endif + +#ifdef REND_STATIC_MEM_OPT + float *bufferData; +#endif } input_sba; #ifdef SPLIT_REND_WITH_HEAD_ROT @@ -168,59 +205,34 @@ typedef struct { input_base base; SPLIT_POST_REND_WRAPPER splitPostRendWrapper; +#ifdef REND_STATIC_MEM_OPT + float *bufferData; +#endif } input_split_post_rend; #endif #ifdef SPLIT_REND_TD_POSE_CORRECTION typedef enum { - P1DOF_DEFAULT = 0, - P1DOF_YAW_L, - P1DOF_YAW_R, -} split_post_rend_multisignal_pose_names_1dof; -typedef struct -{ - int16_t yaw_l_idx; - int16_t yaw_r_idx; - float *poses[3][BINAURAL_CHANNELS]; -} split_post_rend_multisignal_poses_1dof; - -typedef enum -{ - P2DOF_DEFAULT = 0, - P2DOF_YAW_LU, - P2DOF_YAW_LD, - P2DOF_YAW_RU, - P2DOF_YAW_RD, - P2DOF_PITCH_U, - P2DOF_PITCH_D, - P2DOF_YAW_L, /* virtual */ - P2DOF_YAW_R, /* virtual */ -} split_post_rend_multisignal_pose_names_2dof; -typedef struct -{ - int16_t pose_idx[MAX_HEAD_ROT_POSES - 2]; - float *poses[MAX_HEAD_ROT_POSES - 1][BINAURAL_CHANNELS]; -} split_post_rend_multisignal_poses_2dof; + MSPC_POSE_DEFAULT = 0, + MSPC_POSE_YAW_L, + MSPC_POSE_YAW_R, + MSPC_POSE_PITCH_U, + MSPC_POSE_PITCH_D, + MSPC_POSE_ROLL_C, + MSPC_POSE_YAW_L_PITCH_U, + MSPC_POSE_YAW_L_PITCH_D, + MSPC_POSE_YAW_R_PITCH_U, + MSPC_POSE_YAW_R_PITCH_D, + MSPC_POSE_NUM_POSES +} split_mspc_pose; -typedef enum -{ - P3DOF_DEFAULT = 0, - P3DOF_YAW_LU, - P3DOF_YAW_LD, - P3DOF_YAW_RU, - P3DOF_YAW_RD, - P3DOF_PITCH_U, - P3DOF_PITCH_D, - P3DOF_ROLL_C, - P3DOF_YAW_L, /* virtual */ - P3DOF_YAW_R, /* virtual */ -} split_post_rend_multisignal_pose_names_3dof; typedef struct { - int16_t pose_idx[MAX_HEAD_ROT_POSES]; - float *poses[MAX_HEAD_ROT_POSES][BINAURAL_CHANNELS]; -} split_post_rend_multisignal_poses_3dof; + /* TODO tmu : clean up */ + int16_t pose_idx[MAX_HEAD_ROT_POSES + 2]; + float *poses[MAX_HEAD_ROT_POSES + 2][BINAURAL_CHANNELS]; +} split_mspc_pose_data; #endif /* Due to API of some rendering methods, the renderer has to use the decoder struct. @@ -233,6 +245,9 @@ typedef struct DecoderDummy *decDummy; MASA_METADATA_FRAME masaMetadata; bool metadataHasBeenFed; +#ifdef REND_STATIC_MEM_OPT + float *bufferData; +#endif } input_masa; struct IVAS_REND @@ -263,10 +278,42 @@ struct IVAS_REND #endif IVAS_REND_HeadRotData headRotData; +#ifdef SPLIT_REND_PLC + int16_t splitRendBFI; +#endif int8_t rendererConfigEnabled; RENDER_CONFIG_DATA *hRendererConfig; /* Renderer config pointer */ }; + +/*-------------------------------------------------------------------* + * Local functions + *-------------------------------------------------------------------*/ + +#ifdef REND_STATIC_MEM_OPT +static ivas_error allocateInputBaseBufferData( float **data, const int16_t data_size ) +{ + *data = (float *) malloc( data_size * sizeof( float ) ); + if ( *data == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for input base buffer data" ); + } + + return IVAS_ERR_OK; +} + +static void freeInputBaseBufferData( float **data ) +{ + if ( *data != NULL ) + { + free( *data ); + *data = NULL; + } + + return; +} +#endif + static IVAS_QUATERNION quaternionInit( void ) { @@ -278,8 +325,8 @@ static IVAS_QUATERNION quaternionInit( static float *getSmplPtr( IVAS_REND_AudioBuffer buffer, - uint32_t chnlIdx, - uint32_t smplIdx ) + const uint32_t chnlIdx, + const uint32_t smplIdx ) { return buffer.data + chnlIdx * buffer.config.numSamplesPerChannel + smplIdx; } @@ -429,8 +476,6 @@ static void accumulate2dArrayToBuffer( * limitRendererOutput() * * In-place saturation control for multichannel buffers with adaptive release time - * - * *-------------------------------------------------------------------*/ /*! r: number of clipped output samples */ @@ -478,7 +523,14 @@ static int32_t limitRendererOutput( return numClipping; } -static AUDIO_CONFIG rendAudioConfigToIvasAudioConfig( // VE2AT: similar is defined again at line 397, why? + +/*-------------------------------------------------------------------* + * getIvasAudioConfigFromRendAudioConfig() + * + * + *-------------------------------------------------------------------*/ + +AUDIO_CONFIG getIvasAudioConfigFromRendAudioConfig( IVAS_REND_AudioConfig rendConfig ) { switch ( rendConfig ) @@ -514,6 +566,8 @@ static AUDIO_CONFIG rendAudioConfigToIvasAudioConfig( // VE2AT: similar is defin #ifdef SPLIT_REND_WITH_HEAD_ROT case IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB: return AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB; + case IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_PCM: + return AUDIO_CONFIG_BINAURAL_SPLIT_PCM; #endif case IVAS_REND_AUDIO_CONFIG_MASA1: return AUDIO_CONFIG_MASA1; @@ -526,6 +580,59 @@ static AUDIO_CONFIG rendAudioConfigToIvasAudioConfig( // VE2AT: similar is defin return AUDIO_CONFIG_INVALID; } +/*-------------------------------------------------------------------* + * getRendAudioConfigFromIvasAudioConfig() + * + * + *-------------------------------------------------------------------*/ + +IVAS_REND_AudioConfig getRendAudioConfigFromIvasAudioConfig( + AUDIO_CONFIG config ) +{ + switch ( config ) + { + case AUDIO_CONFIG_MONO: + return IVAS_REND_AUDIO_CONFIG_MONO; + case AUDIO_CONFIG_STEREO: + return IVAS_REND_AUDIO_CONFIG_STEREO; + case AUDIO_CONFIG_BINAURAL: + return IVAS_REND_AUDIO_CONFIG_BINAURAL; + case AUDIO_CONFIG_BINAURAL_ROOM: + return IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM; +#ifdef SPLIT_REND_WITH_HEAD_ROT + case AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB: + return IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB; + case AUDIO_CONFIG_BINAURAL_SPLIT_PCM: + return IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_PCM; +#endif + case AUDIO_CONFIG_5_1: + return IVAS_REND_AUDIO_CONFIG_5_1; + case AUDIO_CONFIG_7_1: + return IVAS_REND_AUDIO_CONFIG_7_1; + case AUDIO_CONFIG_5_1_2: + return IVAS_REND_AUDIO_CONFIG_5_1_2; + case AUDIO_CONFIG_5_1_4: + return IVAS_REND_AUDIO_CONFIG_5_1_4; + case AUDIO_CONFIG_7_1_4: + return IVAS_REND_AUDIO_CONFIG_7_1_4; + case AUDIO_CONFIG_FOA: + return IVAS_REND_AUDIO_CONFIG_FOA; + case AUDIO_CONFIG_HOA2: + return IVAS_REND_AUDIO_CONFIG_HOA2; + case AUDIO_CONFIG_HOA3: + return IVAS_REND_AUDIO_CONFIG_HOA3; + default: + break; + } + return IVAS_REND_AUDIO_CONFIG_UNKNOWN; +} + +/*-------------------------------------------------------------------* + * validateOutputAudioConfig() + * + * + *-------------------------------------------------------------------*/ + static ivas_error validateOutputAudioConfig( IVAS_REND_AudioConfig outConfig ) { @@ -556,13 +663,27 @@ static ivas_error validateOutputAudioConfig( return IVAS_ERR_INVALID_OUTPUT_FORMAT; } + +/*-------------------------------------------------------------------* + * getAudioConfigType() + * + * + *-------------------------------------------------------------------*/ + IVAS_REND_AudioConfigType getAudioConfigType( IVAS_REND_AudioConfig config ) { /* By definition, config type is the second byte (from LSB) of IVAS_REND_AudioConfig enum. */ - return ( config & 0xFF00 ) >> 8; // VE2AT: MSVC returns warning C4244: 'return': conversion from 'int' to 'IVAS_REND_InputId', possible loss of data + return ( config & 0xFF00 ) >> 8; } + +/*-------------------------------------------------------------------* + * validateOutputSampleRate() + * + * + *-------------------------------------------------------------------*/ + static ivas_error validateOutputSampleRate( const int32_t sampleRate, const IVAS_REND_AudioConfig outConfig ) @@ -586,6 +707,13 @@ static ivas_error validateOutputSampleRate( return IVAS_ERR_INVALID_SAMPLING_RATE; } + +/*-------------------------------------------------------------------* + * getAudioConfigNumChannels() + * + * + *-------------------------------------------------------------------*/ + ivas_error getAudioConfigNumChannels( const IVAS_REND_AudioConfig config, int16_t *numChannels ) @@ -636,45 +764,10 @@ ivas_error getAudioConfigNumChannels( return IVAS_ERR_OK; } -AUDIO_CONFIG getIvasAudioConfigFromRendAudioConfig( - IVAS_REND_AudioConfig config ) -{ - switch ( config ) - { - case IVAS_REND_AUDIO_CONFIG_MONO: - return AUDIO_CONFIG_MONO; - case IVAS_REND_AUDIO_CONFIG_STEREO: - return AUDIO_CONFIG_STEREO; - case IVAS_REND_AUDIO_CONFIG_BINAURAL: - return AUDIO_CONFIG_BINAURAL; - case IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM: - return AUDIO_CONFIG_BINAURAL_ROOM; -#ifdef SPLIT_REND_WITH_HEAD_ROT - case IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB: - return AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB; -#endif - case IVAS_REND_AUDIO_CONFIG_5_1: - return AUDIO_CONFIG_5_1; - case IVAS_REND_AUDIO_CONFIG_7_1: - return AUDIO_CONFIG_7_1; - case IVAS_REND_AUDIO_CONFIG_5_1_2: - return AUDIO_CONFIG_5_1_2; - case IVAS_REND_AUDIO_CONFIG_5_1_4: - return AUDIO_CONFIG_5_1_4; - case IVAS_REND_AUDIO_CONFIG_7_1_4: - return AUDIO_CONFIG_7_1_4; - case IVAS_REND_AUDIO_CONFIG_FOA: - return AUDIO_CONFIG_FOA; - case IVAS_REND_AUDIO_CONFIG_HOA2: - return AUDIO_CONFIG_HOA2; - case IVAS_REND_AUDIO_CONFIG_HOA3: - return AUDIO_CONFIG_HOA3; - default: - break; - } - return AUDIO_CONFIG_INVALID; -} +/*-------------------------------------------------------------------* + * Local functions + *-------------------------------------------------------------------*/ static ivas_error initLimiter( IVAS_LIMITER_HANDLE *phLimiter, @@ -695,10 +788,9 @@ static ivas_error initLimiter( ivas_limiter_close( phLimiter ); } - *phLimiter = ivas_limiter_open( (int16_t) numChannels, sampleRate ); - if ( *phLimiter == NULL ) + if ( ( *phLimiter = ivas_limiter_open( numChannels, sampleRate ) ) == NULL ) { - return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Failed to open limiter" ); + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Failed to open limiter handle" ); } return IVAS_ERR_OK; @@ -813,6 +905,26 @@ static ivas_error getAmbisonicsOrder( return IVAS_ERR_OK; } +static int16_t getNumLfeChannels( + input_mc *inputMc ) +{ + switch ( inputMc->base.inConfig ) + { + case IVAS_REND_AUDIO_CONFIG_5_1: + case IVAS_REND_AUDIO_CONFIG_7_1: + case IVAS_REND_AUDIO_CONFIG_5_1_2: + case IVAS_REND_AUDIO_CONFIG_5_1_4: + case IVAS_REND_AUDIO_CONFIG_7_1_4: + return 1; + case IVAS_REND_AUDIO_CONFIG_LS_CUSTOM: + return inputMc->customLsInput.num_lfe; + default: + break; + } + + return 0; +} + static ivas_error getNumNonLfeChannelsInSpeakerLayout( IVAS_REND_AudioConfig config, int16_t *numNonLfeChannels ) @@ -944,14 +1056,17 @@ static ivas_error initEfap( { return error; } + if ( ( error = getSpeakerElevations( pEfapWrapper->speakerConfig, &elevations ) ) != IVAS_ERR_OK ) { return error; } + if ( ( error = getNumNonLfeChannelsInSpeakerLayout( pEfapWrapper->speakerConfig, &numNonLfeChannels ) ) != IVAS_ERR_OK ) { return error; } + if ( ( error = efap_init_data( &pEfapWrapper->hEfap, azimuths, elevations, numNonLfeChannels, EFAP_MODE_EFAP ) ) != IVAS_ERR_OK ) { return error; @@ -1023,11 +1138,12 @@ static ivas_error getEfapGains( return IVAS_ERR_OK; } -static void initHeadRotation( +static ivas_error initHeadRotation( IVAS_REND_HANDLE hIvasRend ) { int16_t i, crossfade_len; float tmp; + ivas_error error; /* Head rotation is enabled by default */ hIvasRend->headRotData.headRotEnabled = 1; @@ -1049,6 +1165,27 @@ static void initHeadRotation( hIvasRend->headRotData.sr_pose_pred_axis = DEFAULT_AXIS; #endif + if ( ( hIvasRend->headRotData.hOrientationTracker = (ivas_orient_trk_state_t *) malloc( sizeof( ivas_orient_trk_state_t ) ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Orientation tracking" ); + } + + if ( ( error = ivas_orient_trk_Init( hIvasRend->headRotData.hOrientationTracker ) ) != IVAS_ERR_OK ) + { + return error; + } + + return IVAS_ERR_OK; +} + +static void closeHeadRotation( + IVAS_REND_HANDLE hIvasRend ) +{ + if ( ( hIvasRend != NULL ) && ( hIvasRend->headRotData.hOrientationTracker != NULL ) ) + { + free( hIvasRend->headRotData.hOrientationTracker ); + } + return; } @@ -1086,7 +1223,13 @@ static void initRendInputBase( input_base *inputBase, const IVAS_REND_AudioConfig inConfig, const IVAS_REND_InputId id, - const rendering_context rendCtx ) + const rendering_context rendCtx +#ifdef REND_STATIC_MEM_OPT + , + float *dataBuf, + const int16_t dataBufSize +#endif +) { inputBase->inConfig = inConfig; inputBase->id = id; @@ -1096,10 +1239,17 @@ static void initRendInputBase( inputBase->inputBuffer.config.numSamplesPerChannel = 0; inputBase->inputBuffer.config.numChannels = 0; +#ifndef REND_STATIC_MEM_OPT inputBase->inputBuffer.data = inputBase->bufferData; set_zero( inputBase->bufferData, MAX_BUFFER_LENGTH ); - +#else + inputBase->inputBuffer.data = dataBuf; + if ( inputBase->inputBuffer.data != NULL ) + { + set_zero( inputBase->inputBuffer.data, dataBufSize ); + } +#endif return; } @@ -1110,6 +1260,9 @@ static IVAS_REND_AudioObjectPosition defaultObjectPosition( pos.azimuth = 0.0f; pos.elevation = 0.0f; + pos.radius = 1.0f; + pos.yaw = 0.0f; + pos.pitch = 0.0f; return pos; } @@ -1130,6 +1283,9 @@ static rendering_context getRendCtx( #ifdef SPLIT_REND_WITH_HEAD_ROT ctx.hhRendererConfig = &hIvasRend->hRendererConfig; #endif +#ifdef SPLIT_REND_PLC + ctx.pSplitRendBFI = &hIvasRend->splitRendBFI; +#endif #ifdef SPLIT_REND_LC3PLUS ctx.pSplitRendWrapper = &hIvasRend->splitRendWrapper; #endif @@ -1169,6 +1325,21 @@ static CREND_WRAPPER defaultCrendWrapper( return w; } +static bool isIoConfigPairSupported( + IVAS_REND_AudioConfig inConfig, + IVAS_REND_AudioConfig outConfig ) +{ + /* Rendering mono or stereo to binaural is not supported */ + if ( ( inConfig == IVAS_REND_AUDIO_CONFIG_MONO || inConfig == IVAS_REND_AUDIO_CONFIG_STEREO ) && + getAudioConfigType( outConfig ) == IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL ) + { + return false; + } + + /* If not returned so far, config pair is supported */ + return true; +} + static ivas_error setRendInputActiveIsm( void *input, const IVAS_REND_AudioConfig inConfig, @@ -1187,11 +1358,28 @@ static ivas_error setRendInputActiveIsm( rendCtx = inputIsm->base.ctx; outConfig = *rendCtx.pOutConfig; - initRendInputBase( &inputIsm->base, inConfig, id, rendCtx ); + if ( !isIoConfigPairSupported( inConfig, outConfig ) ) + { + return IVAS_ERR_IO_CONFIG_PAIR_NOT_SUPPORTED; + } + +#ifdef REND_STATIC_MEM_OPT + if ( ( error = allocateInputBaseBufferData( &inputIsm->bufferData, MAX_BUFFER_LENGTH ) ) != IVAS_ERR_OK ) + { + return error; + } +#endif + initRendInputBase( &inputIsm->base, inConfig, id, rendCtx +#ifdef REND_STATIC_MEM_OPT + , + inputIsm->bufferData, MAX_BUFFER_LENGTH +#endif + ); inputIsm->currentPos = defaultObjectPosition(); inputIsm->previousPos = defaultObjectPosition(); - inputIsm->crendWrapper = defaultCrendWrapper(); + inputIsm->crendWrapper = NULL; + inputIsm->hReverb = NULL; inputIsm->tdRendWrapper = defaultTdRendWrapper(); initRotMatrix( inputIsm->rot_mat_prev ); #ifdef SPLIT_REND_LC3PLUS @@ -1208,24 +1396,38 @@ static ivas_error setRendInputActiveIsm( #endif ) { - error = ivas_rend_TDObjRendOpen( &inputIsm->tdRendWrapper, inConfig, NULL, *rendCtx.pOutSampleRate ); + if ( ( error = ivas_td_binaural_open_ext( &inputIsm->tdRendWrapper, inConfig, hRendCfg, NULL, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK ) + { + return error; + } } else if ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) { - error = ivas_rend_openCrend( &inputIsm->crendWrapper, - IVAS_REND_AUDIO_CONFIG_7_1_4, - outConfig, - hRendCfg, - *rendCtx.pOutSampleRate + if ( hRendCfg != NULL && hRendCfg->roomAcoustics.use_brir == 0 && hRendCfg->roomAcoustics.late_reverb_on ) + { + if ( ( error = ivas_td_binaural_open_ext( &inputIsm->tdRendWrapper, inConfig, hRendCfg, NULL, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK ) + { + return error; + } + + if ( ( error = ivas_reverb_open( &( inputIsm->hReverb ), getIvasAudioConfigFromRendAudioConfig( outConfig ), NULL, hRendCfg, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK ) + { + return error; + } + } + else + { + if ( ( error = ivas_rend_openCrend( &inputIsm->crendWrapper, AUDIO_CONFIG_7_1_4, getIvasAudioConfigFromRendAudioConfig( outConfig ), hRendCfg, + NULL, *rendCtx.pOutSampleRate #ifdef SPLIT_REND_WITH_HEAD_ROT - , - 0 + , + 1 #endif - ); - } - if ( error != IVAS_ERR_OK ) - { - return error; + ) ) != IVAS_ERR_OK ) + { + return error; + } + } } return IVAS_ERR_OK; @@ -1241,20 +1443,27 @@ static void clearInputIsm( rendCtx = inputIsm->base.ctx; - initRendInputBase( &inputIsm->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx ); +#ifdef REND_STATIC_MEM_OPT + freeInputBaseBufferData( &inputIsm->base.inputBuffer.data ); +#endif + initRendInputBase( &inputIsm->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx +#ifdef REND_STATIC_MEM_OPT + , + NULL, 0 +#endif + ); /* Free input's internal handles */ + + ivas_rend_closeCrend( &inputIsm->crendWrapper #ifdef SPLIT_REND_WITH_HEAD_ROT - if ( inputIsm->crendWrapper.hCrend[0] != NULL ) - { - ivas_rend_closeCrend( &inputIsm->crendWrapper, 0 ); - } -#else - if ( inputIsm->crendWrapper.hCrend != NULL ) - { - ivas_rend_closeCrend( &inputIsm->crendWrapper ); - } + , + 1 #endif + ); + + ivas_reverb_close( &inputIsm->hReverb ); + if ( inputIsm->tdRendWrapper.hBinRendererTd != NULL ) { ivas_td_binaural_close( &inputIsm->tdRendWrapper.hBinRendererTd ); @@ -1267,6 +1476,8 @@ static void clearInputIsm( inputIsm->splitTdRendWrappers[i].hHrtfTD = NULL; } #endif + + return; } static void copyLsConversionMatrixToPanMatrix( @@ -1316,6 +1527,8 @@ static void fillIdentityPanMatrix( { panMatrix[i][i] = 1.0f; } + + return; } static ivas_error initMcPanGainsWithIdentMatrix( @@ -1333,15 +1546,14 @@ static ivas_error initMcPanGainsWithConversionMapping( AUDIO_CONFIG ivasConfigIn, ivasConfigOut; int16_t i; - ivasConfigIn = rendAudioConfigToIvasAudioConfig( inputMc->base.inConfig ); - ivasConfigOut = rendAudioConfigToIvasAudioConfig( outConfig ); + ivasConfigIn = getIvasAudioConfigFromRendAudioConfig( inputMc->base.inConfig ); + ivasConfigOut = getIvasAudioConfigFromRendAudioConfig( outConfig ); /* Find conversion mapping for current I/O config pair. * Stay with default panning matrix if conversion_matrix is NULL */ for ( i = 0; i < LS_SETUP_CONVERSION_NUM_MAPPINGS; ++i ) { - if ( ls_conversion_mapping[i].input_config == ivasConfigIn && - ls_conversion_mapping[i].output_config == ivasConfigOut ) + if ( ls_conversion_mapping[i].input_config == ivasConfigIn && ls_conversion_mapping[i].output_config == ivasConfigOut ) { /* Mapping found with valid matrix - copy */ if ( ls_conversion_mapping[i].conversion_matrix != NULL ) @@ -1361,7 +1573,9 @@ static ivas_error initMcPanGainsWithConversionMapping( return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Missing multichannel conversion mapping" ); } -static ivas_error initMcPanGainsWithEfap( input_mc *inputMc, IVAS_REND_AudioConfig outConfig ) +static ivas_error initMcPanGainsWithEfap( + input_mc *inputMc, + const IVAS_REND_AudioConfig outConfig ) { int16_t i; int16_t numNonLfeInChannels; @@ -1375,10 +1589,12 @@ static ivas_error initMcPanGainsWithEfap( input_mc *inputMc, IVAS_REND_AudioConf { return error; } + if ( ( error = getSpeakerAzimuths( inputMc->base.inConfig, &spkAzi ) ) != IVAS_ERR_OK ) { return error; } + if ( ( error = getSpeakerElevations( inputMc->base.inConfig, &spkEle ) ) != IVAS_ERR_OK ) { return error; @@ -1459,6 +1675,9 @@ static ivas_error initMcPanGainsWithMonoOut( { int16_t i; int16_t numInChannels; + int16_t readIdx; + int16_t writeIdx; + bool skipSideSpeakers; ivas_error error; if ( ( error = getRendInputNumChannels( inputMc, &numInChannels ) ) != IVAS_ERR_OK ) @@ -1466,13 +1685,42 @@ static ivas_error initMcPanGainsWithMonoOut( return error; } - for ( i = 0; i < numInChannels; ++i ) + if ( inputMc->base.inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) { - /* It's OK to also set gain 1 for LFE input channels here. - * Correct LFE handling will be applied within updateMcPanGains() */ - inputMc->panGains[i][0] = 1.f; + for ( i = 0; i < numInChannels; ++i ) + { + /* It's OK to also set gain 1 for LFE input channels here. + * Correct LFE handling will be applied within updateMcPanGains() */ + inputMc->panGains[i][0] = 1.f; + } } - + else if ( inputMc->base.inConfig == IVAS_REND_AUDIO_CONFIG_STEREO ) + { + /* Special case for STEREO to MONO: Passive downmix (L+R)/2 */ + inputMc->panGains[0][0] = 0.5; + inputMc->panGains[1][0] = 0.5; + } + else + { + /* ls_conversion_cicpX_stereo contains gains for side speakers. + * These should be skipped with 5.1+X inputs. */ + skipSideSpeakers = false; + if ( inputMc->base.inConfig == IVAS_REND_AUDIO_CONFIG_5_1_2 || inputMc->base.inConfig == IVAS_REND_AUDIO_CONFIG_5_1_4 ) + { + skipSideSpeakers = true; + } + for ( readIdx = 0, writeIdx = 0; writeIdx < numInChannels; ++readIdx, ++writeIdx ) + { + if ( skipSideSpeakers && readIdx == 4 ) + { + /* Skip gains for side speakers in lookup table */ + readIdx += 2; + } + + inputMc->panGains[writeIdx][0] = ls_conversion_cicpX_mono[readIdx][0]; + } + } + return IVAS_ERR_OK; } @@ -1506,6 +1754,7 @@ static ivas_error initMcPanGainsWithStereoLookup( { return error; } + for ( readIdx = 0, writeIdx = 0; writeIdx < numInChannels; ++readIdx, ++writeIdx ) { if ( skipSideSpeakers && readIdx == 4 ) @@ -1524,10 +1773,10 @@ static ivas_error initMcPanGainsWithStereoLookup( /* Returns 1 (true) if configs A and B are equal, otherwise returns 0 (false). * If both configs are custom LS layouts, layout details are compared to determine equality. */ static bool configsAreEqual( - IVAS_REND_AudioConfig configA, - LSSETUP_CUSTOM_STRUCT customLsA, - IVAS_REND_AudioConfig configB, - LSSETUP_CUSTOM_STRUCT customLsB ) + const IVAS_REND_AudioConfig configA, + const LSSETUP_CUSTOM_STRUCT customLsA, + const IVAS_REND_AudioConfig configB, + const LSSETUP_CUSTOM_STRUCT customLsB ) { int16_t i; @@ -1538,14 +1787,17 @@ static bool configsAreEqual( { return false; } + if ( customLsA.num_lfe != customLsB.num_lfe ) { return false; } + if ( customLsA.is_planar_setup != customLsB.is_planar_setup ) { return false; } + for ( i = 0; i < customLsA.num_spk; ++i ) { /* Compare to nearest degree (hence the int cast) */ @@ -1570,6 +1822,95 @@ static bool configsAreEqual( return configA == configB; } +static ivas_error updateLfePanGainsForMcOut( + input_mc *inputMc, + const IVAS_REND_AudioConfig outConfig ) +{ + int16_t i, numLfeIn, numOutChannels; + ivas_error error; + error = IVAS_ERR_OK; + + /* If panning is not required, simply return */ + if ( !inputMc->lfeRouting.pan_lfe ) + { + return error; + } + + numLfeIn = getNumLfeChannels( inputMc ); + + if ( outConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) + { + numOutChannels = inputMc->base.ctx.pCustomLsOut->num_spk + inputMc->base.ctx.pCustomLsOut->num_lfe; + } + else + { + if ( ( error = getAudioConfigNumChannels( outConfig, &numOutChannels ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + for ( i = 0; i < numLfeIn; i++ ) + { + /* panning gains */ + if ( ( error = getEfapGains( *inputMc->base.ctx.pEfapOutWrapper, + inputMc->lfeRouting.lfeOutputAzimuth, + inputMc->lfeRouting.lfeOutputElevation, + inputMc->lfeRouting.lfePanMtx[i] ) ) != IVAS_ERR_OK ) + { + return error; + } + + /* linear input gain */ + v_multc( inputMc->lfeRouting.lfePanMtx[i], + inputMc->lfeRouting.lfeInputGain, + inputMc->lfeRouting.lfePanMtx[i], + numOutChannels ); + } + + return error; +} + +static ivas_error updateLfePanGainsForAmbiOut( + input_mc *inputMc, + const IVAS_REND_AudioConfig outConfig ) +{ + int16_t i; + int16_t numLfeIn, outAmbiOrder; + ivas_error error; + error = IVAS_ERR_OK; + + /* If panning is not required, simply return */ + if ( !inputMc->lfeRouting.pan_lfe ) + { + return error; + } + + if ( ( error = getAmbisonicsOrder( outConfig, &outAmbiOrder ) ) != IVAS_ERR_OK ) + { + return error; + } + + numLfeIn = getNumLfeChannels( inputMc ); + + for ( i = 0; i < numLfeIn; i++ ) + { + /* panning gains */ + ivas_dirac_dec_get_response( (int16_t) inputMc->lfeRouting.lfeOutputAzimuth, + (int16_t) inputMc->lfeRouting.lfeOutputElevation, + inputMc->lfeRouting.lfePanMtx[i], + outAmbiOrder ); + + /* linear input gain */ + v_multc( inputMc->lfeRouting.lfePanMtx[i], + inputMc->lfeRouting.lfeInputGain, + inputMc->lfeRouting.lfePanMtx[i], + IVAS_MAX_OUTPUT_CHANNELS ); + } + + return error; +} + static ivas_error updateMcPanGainsForMcOut( input_mc *inputMc, const IVAS_REND_AudioConfig outConfig ) @@ -1579,13 +1920,13 @@ static ivas_error updateMcPanGainsForMcOut( /* "if" conditions below realize the following mapping: If in == out, use identity matrix, otherwise follow the table: - +-----------+----------+---------------+-----------+--------------------+ - | in\out | MONO | STEREO | custom LS | other | - +-----------+----------+---------------+-----------+--------------------+ - | MONO | mono out | EFAP | EFAP | EFAP | - | custom LS | mono out | EFAP | EFAP | EFAP | - | other | mono out | stereo lookup | EFAP | conversion mapping | - +-----------+----------+---------------+-----------+--------------------+ + +-----------+-------------+---------------+-----------+--------------------+ + | in\out | MONO | STEREO | custom LS | other | + +-----------+-------------+---------------+-----------+--------------------+ + | MONO | mono out | EFAP | EFAP | EFAP | + | custom LS | mono out | EFAP | EFAP | EFAP | + | other | mono lookup | stereo lookup | EFAP | conversion mapping | + +-----------+-------------+---------------+-----------+--------------------+ */ if ( configsAreEqual( inputMc->base.inConfig, inputMc->customLsInput, outConfig, *inputMc->base.ctx.pCustomLsOut ) ) @@ -1611,6 +1952,15 @@ static ivas_error updateMcPanGainsForMcOut( error = initMcPanGainsWithConversionMapping( inputMc, outConfig ); } + /* check for errors from above block */ + if ( error != IVAS_ERR_OK ) + { + return error; + } + + /* update LFE panning */ + error = updateLfePanGainsForMcOut( inputMc, outConfig ); + return error; } @@ -1634,10 +1984,12 @@ static ivas_error updateMcPanGainsForAmbiOut( { return error; } + if ( ( error = getSpeakerAzimuths( inputMc->base.inConfig, &spkAzi ) ) != IVAS_ERR_OK ) { return error; } + if ( ( error = getSpeakerElevations( inputMc->base.inConfig, &spkEle ) ) != IVAS_ERR_OK ) { return error; @@ -1673,6 +2025,12 @@ static ivas_error updateMcPanGainsForAmbiOut( } } + /* update LFE panning */ + if ( ( error = updateLfePanGainsForAmbiOut( inputMc, outConfig ) ) != IVAS_ERR_OK ) + { + return error; + } + return IVAS_ERR_OK; } @@ -1722,39 +2080,18 @@ static ivas_error updateMcPanGains( { for ( i = 0; i < inputMc->customLsInput.num_lfe; ++i ) { - mvr2r( inputMc->lfeRouting.lfeOutputGains[i], inputMc->panGains[inputMc->customLsInput.lfe_idx[i]], IVAS_MAX_OUTPUT_CHANNELS ); + mvr2r( inputMc->lfeRouting.lfePanMtx[i], inputMc->panGains[inputMc->customLsInput.lfe_idx[i]], IVAS_MAX_OUTPUT_CHANNELS ); } } else { /* For code simplicity, always copy LFE gains. If config has no LFE, gains will be zero anyway. */ - mvr2r( inputMc->lfeRouting.lfeOutputGains[0], inputMc->panGains[LFE_CHANNEL], IVAS_MAX_OUTPUT_CHANNELS ); + mvr2r( inputMc->lfeRouting.lfePanMtx[0], inputMc->panGains[LFE_CHANNEL], IVAS_MAX_OUTPUT_CHANNELS ); } return IVAS_ERR_OK; } -#ifndef FIX_ITD -#ifndef FIX_I81 -/* Fixes initialization issues in TD renderer. Fix to be merged with branch. - See issue: https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec/-/issues/81 */ -static void tmpFixBuggyTdBinRendInit( BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd ) -{ - int16_t i, j; - - for ( i = 0; i < hBinRendererTd->NumOfSrcs; ++i ) - { - for ( j = 0; j < SPAT_BIN_MAX_INPUT_CHANNELS; ++j ) - { - hBinRendererTd->Sources[i]->SrcRend_p->SfxSpatBin_p[j].LeftFilter_p = NULL; - hBinRendererTd->Sources[i]->SrcRend_p->SfxSpatBin_p[j].LeftFilterIncr_p = NULL; - hBinRendererTd->Sources[i]->SrcRend_p->SfxSpatBin_p[j].RightFilter_p = NULL; - hBinRendererTd->Sources[i]->SrcRend_p->SfxSpatBin_p[j].RightFilterIncr_p = NULL; - } - } -} -#endif -#endif static ivas_error initMcBinauralRendering( input_mc *inputMc, @@ -1771,17 +2108,21 @@ static ivas_error initMcBinauralRendering( ivas_td_binaural_close( &inputMc->tdRendWrapper.hBinRendererTd ); inputMc->tdRendWrapper.hHrtfTD = NULL; } + + + ivas_rend_closeCrend( &inputMc->crendWrapper #ifdef SPLIT_REND_WITH_HEAD_ROT - if ( inputMc->crendWrapper.hCrend[0] != NULL ) - { - ivas_rend_closeCrend( &inputMc->crendWrapper, 0 ); - } -#else - if ( inputMc->crendWrapper.hCrend != NULL ) + , + 1 +#endif + ); + + ivas_reverb_close( &inputMc->hReverb ); + + if ( inputMc->efapInWrapper.hEfap != NULL ) { - ivas_rend_closeCrend( &inputMc->crendWrapper ); + efap_free_data( &inputMc->efapInWrapper.hEfap ); } -#endif outSampleRate = *inputMc->base.ctx.pOutSampleRate; @@ -1803,26 +2144,26 @@ static ivas_error initMcBinauralRendering( // if ( initTDRend ) { - if ( ( error = ivas_rend_TDObjRendOpen( &inputMc->tdRendWrapper, inConfig, &inputMc->customLsInput, outSampleRate ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_td_binaural_open_ext( &inputMc->tdRendWrapper, inConfig, hRendCfg, &inputMc->customLsInput, outSampleRate ) ) != IVAS_ERR_OK ) { return error; } -#ifndef FIX_ITD -#ifndef FIX_I81 - tmpFixBuggyTdBinRendInit( inputMc->tdRendWrapper.hBinRendererTd ); -#endif -#endif + + if ( hRendCfg != NULL && hRendCfg->roomAcoustics.use_brir == 0 && hRendCfg->roomAcoustics.late_reverb_on ) + { + if ( ( error = ivas_reverb_open( &( inputMc->hReverb ), getIvasAudioConfigFromRendAudioConfig( outConfig ), NULL, hRendCfg, outSampleRate ) ) != IVAS_ERR_OK ) + { + return error; + } + } } { - if ( ( error = ivas_rend_openCrend( &inputMc->crendWrapper, - ( inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) ? IVAS_REND_AUDIO_CONFIG_7_1_4 : inConfig, - outConfig, - hRendCfg, - outSampleRate + if ( ( error = ivas_rend_openCrend( &inputMc->crendWrapper, ( inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) ? AUDIO_CONFIG_7_1_4 : getIvasAudioConfigFromRendAudioConfig( inConfig ), getIvasAudioConfigFromRendAudioConfig( outConfig ), hRendCfg, + NULL, outSampleRate #ifdef SPLIT_REND_WITH_HEAD_ROT , - 0 + 1 #endif ) ) != IVAS_ERR_OK ) { @@ -1830,25 +2171,37 @@ static ivas_error initMcBinauralRendering( } } - return error; + /* Initialise the EFAP handle for rotation on input layout */ + if ( inConfig != IVAS_REND_AUDIO_CONFIG_LS_CUSTOM && inputMc->base.ctx.pHeadRotData->headRotEnabled ) + { + if ( ( error = initEfap( &inputMc->efapInWrapper, inConfig, NULL ) ) != IVAS_ERR_OK ) + { + return error; + } + } + + return IVAS_ERR_OK; } -static IVAS_REND_LfeRouting defaultLfeRouting( - IVAS_REND_AudioConfig inConfig, - LSSETUP_CUSTOM_STRUCT customLsIn, - IVAS_REND_AudioConfig outConfig, - LSSETUP_CUSTOM_STRUCT customLsOut ) +static lfe_routing defaultLfeRouting( + const IVAS_REND_AudioConfig inConfig, + const LSSETUP_CUSTOM_STRUCT customLsIn, + const IVAS_REND_AudioConfig outConfig, + const LSSETUP_CUSTOM_STRUCT customLsOut ) { - int32_t i; - IVAS_REND_LfeRouting routing; + int16_t i; + lfe_routing routing; /* Set all output gains to zero, then route each input LFE consecutively to the next available output LFE. */ for ( i = 0; i < IVAS_MAX_INPUT_LFE_CHANNELS; ++i ) { - set_zero( routing.lfeOutputGains[i], IVAS_MAX_OUTPUT_CHANNELS ); + set_zero( routing.lfePanMtx[i], IVAS_MAX_OUTPUT_CHANNELS ); } + routing.pan_lfe = false; + routing.lfeInputGain = 1.0f; + switch ( inConfig ) { case IVAS_REND_AUDIO_CONFIG_5_1: @@ -1872,12 +2225,12 @@ static IVAS_REND_LfeRouting defaultLfeRouting( case IVAS_REND_AUDIO_CONFIG_5_1_4: case IVAS_REND_AUDIO_CONFIG_7_1: case IVAS_REND_AUDIO_CONFIG_7_1_4: - routing.lfeOutputGains[0][LFE_CHANNEL] = 1.0f; + routing.lfePanMtx[0][LFE_CHANNEL] = 1.0f; break; case IVAS_REND_AUDIO_CONFIG_LS_CUSTOM: for ( i = 0; i < routing.numLfeChannels && i < customLsOut.num_lfe; ++i ) { - routing.lfeOutputGains[i][customLsOut.lfe_idx[i]] = 1.0f; + routing.lfePanMtx[i][customLsOut.lfe_idx[i]] = 1.0f; } break; default: @@ -1903,11 +2256,28 @@ static ivas_error setRendInputActiveMc( rendCtx = inputMc->base.ctx; outConfig = *rendCtx.pOutConfig; - initRendInputBase( &inputMc->base, inConfig, id, rendCtx ); + if ( !isIoConfigPairSupported( inConfig, outConfig ) ) + { + return IVAS_ERR_IO_CONFIG_PAIR_NOT_SUPPORTED; + } + +#ifdef REND_STATIC_MEM_OPT + if ( ( error = allocateInputBaseBufferData( &inputMc->bufferData, MAX_BUFFER_LENGTH ) ) != IVAS_ERR_OK ) + { + return error; + } +#endif + initRendInputBase( &inputMc->base, inConfig, id, rendCtx +#ifdef REND_STATIC_MEM_OPT + , + inputMc->bufferData, MAX_BUFFER_LENGTH +#endif + ); setZeroPanMatrix( inputMc->panGains ); inputMc->customLsInput = defaultCustomLs(); inputMc->tdRendWrapper = defaultTdRendWrapper(); - inputMc->crendWrapper = defaultCrendWrapper(); + inputMc->crendWrapper = NULL; + inputMc->hReverb = NULL; initRotGains( inputMc->rot_gains_prev ); inputMc->lfeRouting = defaultLfeRouting( inConfig, inputMc->customLsInput, outConfig, *inputMc->base.ctx.pCustomLsOut ); @@ -1934,24 +2304,31 @@ static void clearInputMc( rendCtx = inputMc->base.ctx; - initRendInputBase( &inputMc->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx ); +#ifdef REND_STATIC_MEM_OPT + freeInputBaseBufferData( &inputMc->bufferData ); +#endif + initRendInputBase( &inputMc->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx +#ifdef REND_STATIC_MEM_OPT + , + NULL, 0 +#endif + ); /* Free input's internal handles */ if ( inputMc->efapInWrapper.hEfap != NULL ) { efap_free_data( &inputMc->efapInWrapper.hEfap ); } + + ivas_rend_closeCrend( &inputMc->crendWrapper #ifdef SPLIT_REND_WITH_HEAD_ROT - if ( inputMc->crendWrapper.hCrend[0] != NULL ) - { - ivas_rend_closeCrend( &inputMc->crendWrapper, 0 ); - } -#else - if ( inputMc->crendWrapper.hCrend != NULL ) - { - ivas_rend_closeCrend( &inputMc->crendWrapper ); - } + , + 1 #endif + ); + + ivas_reverb_close( &inputMc->hReverb ); + if ( inputMc->tdRendWrapper.hBinRendererTd != NULL ) { ivas_td_binaural_close( &inputMc->tdRendWrapper.hBinRendererTd ); @@ -1988,7 +2365,7 @@ static ivas_error initSbaPanGainsForMcOut( case IVAS_REND_AUDIO_CONFIG_MONO: hOutSetup.ls_azimuth = ls_azimuth_CICP1; hOutSetup.ls_elevation = ls_elevation_CICP1; - ivas_output_init( &hOutSetup, rendAudioConfigToIvasAudioConfig( outConfig ) ); + ivas_output_init( &hOutSetup, getIvasAudioConfigFromRendAudioConfig( outConfig ) ); break; case IVAS_REND_AUDIO_CONFIG_STEREO: case IVAS_REND_AUDIO_CONFIG_5_1: @@ -1996,7 +2373,7 @@ static ivas_error initSbaPanGainsForMcOut( case IVAS_REND_AUDIO_CONFIG_5_1_2: case IVAS_REND_AUDIO_CONFIG_5_1_4: case IVAS_REND_AUDIO_CONFIG_7_1_4: - ivas_output_init( &hOutSetup, rendAudioConfigToIvasAudioConfig( outConfig ) ); + ivas_output_init( &hOutSetup, getIvasAudioConfigFromRendAudioConfig( outConfig ) ); break; case IVAS_REND_AUDIO_CONFIG_LS_CUSTOM: ivas_ls_custom_setup( &hOutSetup, outSetupCustom ); @@ -2026,7 +2403,7 @@ static ivas_error initSbaPanGainsForMcOut( } } - count_free( tmpDecMtx ); + free( tmpDecMtx ); return IVAS_ERR_OK; } @@ -2125,45 +2502,53 @@ updateSbaPanGains( case IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_PCM: { int16_t is_cldfb_in; - assert( inConfig == IVAS_REND_AUDIO_CONFIG_HOA3 && ( *rendCtx.pOutSampleRate == 48000 ) && "split binaural mode is currently supported with HOA3 input and 48k sampling rate only" ); + is_cldfb_in = 1; ivas_renderSplitGetMultiBinPoseData( &rendCtx.hhRendererConfig[0]->split_rend_config, &inputSba->splitRendWrapper.multiBinPoseData, rendCtx.pHeadRotData->sr_pose_pred_axis ); -#ifdef SPLIT_REND_WITH_HEAD_ROT /* TODO: redundant nested switch */ - if ( hRendCfg->renderer_type_override != RENDER_TYPE_OVERRIDE_FASTCONV ) +#if defined DEBUGGING && defined SPLIT_REND_WITH_HEAD_ROT /* TODO: redundant nested switch SPLIT_REND_WITH_HEAD_ROT */ + if ( hRendCfg->renderer_type_override == RENDER_TYPE_OVERRIDE_FASTCONV ) { - error = ivas_rend_openMultiBinCrend( &inputSba->crendWrapper, inConfig, outConfig, - &inputSba->splitRendWrapper.multiBinPoseData, - *rendCtx.pOutSampleRate ); + assert( inConfig == IVAS_REND_AUDIO_CONFIG_HOA3 && ( *rendCtx.pOutSampleRate == 48000 ) && "split binaural fast conv mode is currently supported with HOA3 input and 48k sampling rate only" ); + error = ivas_rend_openCldfbRend( &inputSba->cldfbRendWrapper, inConfig, outConfig, hRendCfg, + &inputSba->splitRendWrapper.multiBinPoseData, + *rendCtx.pOutSampleRate ); if ( error != IVAS_ERR_OK ) { return error; } - is_cldfb_in = 0; + is_cldfb_in = 1; } + else #endif { - error = ivas_rend_openCldfbRend( &inputSba->cldfbRendWrapper, inConfig, outConfig, hRendCfg, - &inputSba->splitRendWrapper.multiBinPoseData, - *rendCtx.pOutSampleRate ); + assert( ( *rendCtx.pOutSampleRate == 48000 ) && "split binaural crend mode is currently supported with 48k sampling rate only" ); + error = ivas_rend_openMultiBinCrend( &inputSba->crendWrapper, inConfig, outConfig, + &inputSba->splitRendWrapper.multiBinPoseData, + *rendCtx.pOutSampleRate ); if ( error != IVAS_ERR_OK ) { return error; } - is_cldfb_in = 1; + is_cldfb_in = 0; } + error = ivas_split_renderer_open( &inputSba->splitRendWrapper, &inputSba->base.ctx.hhRendererConfig[0]->split_rend_config, - *rendCtx.pOutSampleRate, is_cldfb_in, ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 ); + *rendCtx.pOutSampleRate, +#ifdef SPLIT_REND_LC3PLUS + 0, +#endif + is_cldfb_in, ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 ); break; } #endif case IVAS_REND_AUDIO_CONFIG_BINAURAL: -#ifdef SPLIT_REND_WITH_HEAD_ROT +#if defined DEBUGGING && defined SPLIT_REND_WITH_HEAD_ROT if ( hRendCfg->renderer_type_override == RENDER_TYPE_OVERRIDE_FASTCONV ) { @@ -2178,10 +2563,15 @@ updateSbaPanGains( else #endif { - error = ivas_rend_openCrend( &inputSba->crendWrapper, inConfig, outConfig, hRendCfg, *rendCtx.pOutSampleRate + error = ivas_rend_openCrend( &inputSba->crendWrapper, + getIvasAudioConfigFromRendAudioConfig( inConfig ), + getIvasAudioConfigFromRendAudioConfig( outConfig ), + hRendCfg, + NULL, + *rendCtx.pOutSampleRate #ifdef SPLIT_REND_WITH_HEAD_ROT , - 0 + 1 #endif ); } @@ -2191,10 +2581,16 @@ updateSbaPanGains( { return error; } - error = ivas_rend_openCrend( &inputSba->crendWrapper, IVAS_REND_AUDIO_CONFIG_7_1_4, outConfig, hRendCfg, *rendCtx.pOutSampleRate + + error = ivas_rend_openCrend( &inputSba->crendWrapper, + AUDIO_CONFIG_7_1_4, + getIvasAudioConfigFromRendAudioConfig( outConfig ), + hRendCfg, + NULL, + *rendCtx.pOutSampleRate #ifdef SPLIT_REND_WITH_HEAD_ROT , - 0 + 1 #endif ); break; @@ -2230,7 +2626,18 @@ static ivas_error setRendInputActiveSplitPostRend( rendCtx = inputSplitPostRend->base.ctx; outConfig = *rendCtx.pOutConfig; - initRendInputBase( &inputSplitPostRend->base, inConfig, id, rendCtx ); +#ifdef REND_STATIC_MEM_OPT + if ( ( error = allocateInputBaseBufferData( &inputSplitPostRend->bufferData, MAX_BIN_BUFFER_LENGTH ) ) != IVAS_ERR_OK ) + { + return error; + } +#endif + initRendInputBase( &inputSplitPostRend->base, inConfig, id, rendCtx +#ifdef REND_STATIC_MEM_OPT + , + inputSplitPostRend->bufferData, MAX_BIN_BUFFER_LENGTH +#endif + ); if ( ( error = updateSplitPostRendPanGains( inputSplitPostRend, outConfig, hRendCfg ) ) != IVAS_ERR_OK ) { @@ -2259,15 +2666,32 @@ static ivas_error setRendInputActiveSba( rendCtx = inputSba->base.ctx; outConfig = *rendCtx.pOutConfig; - initRendInputBase( &inputSba->base, inConfig, id, rendCtx ); + if ( !isIoConfigPairSupported( inConfig, outConfig ) ) + { + return IVAS_ERR_IO_CONFIG_PAIR_NOT_SUPPORTED; + } + +#ifdef REND_STATIC_MEM_OPT + if ( ( error = allocateInputBaseBufferData( &inputSba->bufferData, MAX_CLDFB_BUFFER_LENGTH ) ) != IVAS_ERR_OK ) + { + return error; + } +#endif + initRendInputBase( &inputSba->base, inConfig, id, rendCtx +#ifdef REND_STATIC_MEM_OPT + , + inputSba->bufferData, MAX_CLDFB_BUFFER_LENGTH +#endif + ); setZeroPanMatrix( inputSba->hoaDecMtx ); - inputSba->crendWrapper = defaultCrendWrapper(); #ifdef SPLIT_REND_WITH_HEAD_ROT + inputSba->crendWrapper = NULL; for ( pos_idx = 0; pos_idx < MAX_HEAD_ROT_POSES; pos_idx++ ) { initRotGains( inputSba->rot_gains_prev[pos_idx] ); } #else + inputSba->crendWrapper = NULL; initRotGains( inputSba->rot_gains_prev ); #endif @@ -2283,10 +2707,19 @@ static ivas_error setRendInputActiveSba( static void clearInputSplitRend( input_split_post_rend *inputSplitRend ) { - // rendering_context rendCtx; + rendering_context rendCtx; - // rendCtx = inputSplitRend->base.ctx; + rendCtx = inputSplitRend->base.ctx; +#ifdef REND_STATIC_MEM_OPT + freeInputBaseBufferData( &inputSplitRend->bufferData ); +#endif + initRendInputBase( &inputSplitRend->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx +#ifdef REND_STATIC_MEM_OPT + , + NULL, 0 +#endif + ); if ( inputSplitRend->splitPostRendWrapper.hBinHrSplitPostRend != NULL ) { ivas_splitBinPostRendClose( &inputSplitRend->splitPostRendWrapper.hBinHrSplitPostRend ); @@ -2310,41 +2743,37 @@ static void clearInputSba( input_sba *inputSba ) { rendering_context rendCtx; -#ifdef SPLIT_REND_WITH_HEAD_ROT - int16_t pos_idx; -#endif rendCtx = inputSba->base.ctx; - initRendInputBase( &inputSba->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx ); +#ifdef REND_STATIC_MEM_OPT + freeInputBaseBufferData( &inputSba->bufferData ); +#endif + initRendInputBase( &inputSba->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx +#ifdef REND_STATIC_MEM_OPT + , + NULL, 0 +#endif + ); /* Free input's internal handles */ #ifdef SPLIT_REND_WITH_HEAD_ROT - for ( pos_idx = 0; pos_idx < MAX_HEAD_ROT_POSES; pos_idx++ ) - { - if ( inputSba->crendWrapper.hCrend[pos_idx] != NULL ) - { - ivas_rend_closeCrend( &inputSba->crendWrapper, pos_idx ); - } - } -#else - if ( inputSba->crendWrapper.hCrend != NULL ) - { - ivas_rend_closeCrend( &inputSba->crendWrapper ); - } -#endif -#ifdef SPLIT_REND_WITH_HEAD_ROT + ivas_rend_closeCrend( &inputSba->crendWrapper, inputSba->splitRendWrapper.multiBinPoseData.num_poses ); + if ( inputSba->cldfbRendWrapper.hCldfbRend != NULL ) { ivas_rend_closeCldfbRend( &inputSba->cldfbRendWrapper ); } ivas_split_renderer_close( &inputSba->splitRendWrapper ); +#else + ivas_rend_closeCrend( &inputSba->crendWrapper ); #endif - return; } -static ivas_error initMasaDummyDecForMcOut( input_masa *inputMasa, IVAS_REND_AudioConfig outConfig ) +static ivas_error initMasaDummyDecForMcOut( + input_masa *inputMasa, + const IVAS_REND_AudioConfig outConfig ) { ivas_error error; int16_t numCldfbAnalyses; @@ -2354,7 +2783,7 @@ static ivas_error initMasaDummyDecForMcOut( input_masa *inputMasa, IVAS_REND_Aud DecoderDummy *decDummy; decDummy = inputMasa->decDummy; - output_config = rendAudioConfigToIvasAudioConfig( outConfig ); + output_config = getIvasAudioConfigFromRendAudioConfig( outConfig ); decDummy->hDecoderConfig->output_config = output_config; decDummy->hDecoderConfig->ivas_total_brate = IVAS_512k; /* Todo Nokia: This is preventing initialization of 2TC as 1TC, should be fixed properly in ivas_dirac_dec_config() */ @@ -2384,14 +2813,14 @@ static ivas_error initMasaDummyDecForMcOut( input_masa *inputMasa, IVAS_REND_Aud { return error; } + decDummy->hDirAC->dirac_bs_md_write_idx = 0; if ( decDummy->renderer_type == RENDERER_STEREO_PARAMETRIC ) { - if ( ( error = ivas_dirac_dec_init_binaural_data( decDummy ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_dirac_dec_init_binaural_data( decDummy, NULL ) ) != IVAS_ERR_OK ) { return error; } - decDummy->hDiracDecBin->useSubframeMode = 0; /* Todo Nokia: This will disappear in later work but needs to be this now. */ } numCldfbAnalyses = decDummy->nchan_transport; @@ -2424,7 +2853,9 @@ static ivas_error initMasaDummyDecForMcOut( input_masa *inputMasa, IVAS_REND_Aud return IVAS_ERR_OK; } -static ivas_error initMasaDummyDecForSbaOut( input_masa *inputMasa, IVAS_REND_AudioConfig outConfig ) +static ivas_error initMasaDummyDecForSbaOut( + input_masa *inputMasa, + const IVAS_REND_AudioConfig outConfig ) { ivas_error error; int16_t numCldfbAnalyses; @@ -2435,7 +2866,7 @@ static ivas_error initMasaDummyDecForSbaOut( input_masa *inputMasa, IVAS_REND_Au decDummy = inputMasa->decDummy; - output_config = rendAudioConfigToIvasAudioConfig( outConfig ); + output_config = getIvasAudioConfigFromRendAudioConfig( outConfig ); decDummy->hDecoderConfig->output_config = output_config; decDummy->hDecoderConfig->ivas_total_brate = IVAS_512k; /* Todo Nokia: This is preventing initialization of 2TC as 1TC, should be fixed properly in ivas_dirac_dec_config() */ @@ -2459,6 +2890,7 @@ static ivas_error initMasaDummyDecForSbaOut( input_masa *inputMasa, IVAS_REND_Au { return error; } + decDummy->hDirAC->dirac_bs_md_write_idx = 0; numCldfbAnalyses = decDummy->nchan_transport; numCldfbSyntheses = decDummy->hDecoderConfig->nchan_out; @@ -2490,7 +2922,9 @@ static ivas_error initMasaDummyDecForSbaOut( input_masa *inputMasa, IVAS_REND_Au return IVAS_ERR_OK; } -static ivas_error initMasaDummyDecForBinauralOut( input_masa *inputMasa, IVAS_REND_AudioConfig outConfig ) +static ivas_error initMasaDummyDecForBinauralOut( + input_masa *inputMasa, + const IVAS_REND_AudioConfig outConfig ) { ivas_error error; @@ -2500,7 +2934,7 @@ static ivas_error initMasaDummyDecForBinauralOut( input_masa *inputMasa, IVAS_RE decDummy = inputMasa->decDummy; - output_config = rendAudioConfigToIvasAudioConfig( outConfig ); + output_config = getIvasAudioConfigFromRendAudioConfig( outConfig ); decDummy->hDecoderConfig->output_config = output_config; output_config = decDummy->hDecoderConfig->output_config; @@ -2524,20 +2958,23 @@ static ivas_error initMasaDummyDecForBinauralOut( input_masa *inputMasa, IVAS_RE } decDummy->ivas_format = MASA_FORMAT; decDummy->transport_config = AUDIO_CONFIG_INVALID; -#ifdef DEBUGGING - decDummy->hDecoderConfig->forceSubframeBinauralization = 0; -#endif if ( ( error = ivas_dirac_dec_open( decDummy ) ) != IVAS_ERR_OK ) { return error; } - if ( ( error = ivas_dirac_dec_init_binaural_data( decDummy ) ) != IVAS_ERR_OK ) + decDummy->hDirAC->dirac_bs_md_write_idx = 0; + + if ( ( error = ivas_dirac_dec_binaural_copy_hrtfs( &decDummy->hHrtfParambin ) ) != IVAS_ERR_OK ) + { + return error; + } + + if ( ( error = ivas_dirac_dec_init_binaural_data( decDummy, decDummy->hHrtfParambin ) ) != IVAS_ERR_OK ) { return error; } - decDummy->hDiracDecBin->useSubframeMode = 0; /* Todo Nokia: This will disappear in later work but needs to be this now. */ for ( i = 0; i < BINAURAL_CHANNELS; i++ ) { @@ -2559,7 +2996,9 @@ static ivas_error initMasaDummyDecForBinauralOut( input_masa *inputMasa, IVAS_RE return IVAS_ERR_OK; } -static ivas_error updateMasaDummyDec( input_masa *inputMasa, IVAS_REND_AudioConfig outConfig ) +static ivas_error updateMasaDummyDec( + input_masa *inputMasa, + const IVAS_REND_AudioConfig outConfig ) { ivas_error error; @@ -2577,16 +3016,15 @@ static ivas_error updateMasaDummyDec( input_masa *inputMasa, IVAS_REND_AudioConf default: return IVAS_ERR_INVALID_OUTPUT_FORMAT; } - /* Check error here to keep switch statement more compact */ - if ( error != IVAS_ERR_OK ) - { - return error; - } - return IVAS_ERR_OK; + return error; } -static DecoderDummy *initDecoderDummy( int32_t sampleRate, int16_t numTransChannels, IVAS_REND_AudioConfig outConfig, const uint8_t enableRenderConfig ) +static DecoderDummy *initDecoderDummy( + const int32_t sampleRate, + const int16_t numTransChannels, + const IVAS_REND_AudioConfig outConfig, + const uint8_t enableRenderConfig ) { ivas_error error; int16_t i; @@ -2599,10 +3037,10 @@ static DecoderDummy *initDecoderDummy( int32_t sampleRate, int16_t numTransChann assert( error == IVAS_ERR_OK ); } - decDummy = count_malloc( sizeof( DecoderDummy ) ); - decDummy->hDecoderConfig = count_malloc( sizeof( DECODER_CONFIG ) ); + decDummy = malloc( sizeof( DecoderDummy ) ); + decDummy->hDecoderConfig = malloc( sizeof( DECODER_CONFIG ) ); decDummy->hDecoderConfig->output_Fs = sampleRate; - decDummy->hDecoderConfig->nchan_out = (int16_t) numOutChannels; + decDummy->hDecoderConfig->nchan_out = numOutChannels; decDummy->hDecoderConfig->Opt_Headrotation = 0; decDummy->hBinRenderer = NULL; @@ -2612,20 +3050,20 @@ static DecoderDummy *initDecoderDummy( int32_t sampleRate, int16_t numTransChann ivas_init_split_rend_handles( &decDummy->splitBinRend.splitrend ); #endif decDummy->hEFAPdata = NULL; - decDummy->hHrtf = NULL; + decDummy->hCrendWrapper = NULL; decDummy->hHrtfTD = NULL; decDummy->hSpar = NULL; decDummy->hoa_dec_mtx = NULL; - decDummy->hVBAPdata = NULL; + decDummy->hVBAPdata = NULL; // note: not used at the moment decDummy->hMasa = NULL; decDummy->hDiracDecBin = NULL; decDummy->hQMetaData = NULL; - decDummy->hDecoderConfig->output_config = rendAudioConfigToIvasAudioConfig( outConfig ); + decDummy->hDecoderConfig->output_config = getIvasAudioConfigFromRendAudioConfig( outConfig ); decDummy->nchan_transport = numTransChannels; if ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM || outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) { - decDummy->hHeadTrackData = count_malloc( sizeof( HEAD_TRACK_DATA ) ); + decDummy->hHeadTrackData = malloc( sizeof( HEAD_TRACK_DATA ) ); /* Initialise Rmat_prev to I, Rmat will be computed later */ for ( i = 0; i < 3; i++ ) { @@ -2637,6 +3075,8 @@ static DecoderDummy *initDecoderDummy( int32_t sampleRate, int16_t numTransChann decDummy->hHeadTrackData->lrSwitchInterpVal = 0.0f; decDummy->hHeadTrackData->lrSwitchedCurrent = 0; decDummy->hHeadTrackData->lrSwitchedNext = 0; + decDummy->hHeadTrackData->OrientationTracker = (ivas_orient_trk_state_t *) malloc( sizeof( ivas_orient_trk_state_t ) ); + ivas_orient_trk_Init( decDummy->hHeadTrackData->OrientationTracker ); } else { @@ -2676,13 +3116,29 @@ static ivas_error setRendInputActiveMasa( outConfig = *rendCtx.pOutConfig; (void) hRendCfg; /* Suppress warning */ - initRendInputBase( &inputMasa->base, inConfig, id, rendCtx ); + if ( !isIoConfigPairSupported( inConfig, outConfig ) ) + { + return IVAS_ERR_IO_CONFIG_PAIR_NOT_SUPPORTED; + } + +#ifdef REND_STATIC_MEM_OPT + if ( ( error = allocateInputBaseBufferData( &inputMasa->bufferData, MAX_BUFFER_LENGTH ) ) != IVAS_ERR_OK ) + { + return error; + } +#endif + initRendInputBase( &inputMasa->base, inConfig, id, rendCtx +#ifdef REND_STATIC_MEM_OPT + , + inputMasa->bufferData, MAX_BUFFER_LENGTH +#endif + ); if ( ( error = getAudioConfigNumChannels( inConfig, &numInChannels ) ) != IVAS_ERR_OK ) { return error; } - inputMasa->decDummy = initDecoderDummy( *rendCtx.pOutSampleRate, (int16_t) numInChannels, outConfig, 0 ); + inputMasa->decDummy = initDecoderDummy( *rendCtx.pOutSampleRate, numInChannels, outConfig, 0 ); inputMasa->metadataHasBeenFed = false; if ( ( error = updateMasaDummyDec( inputMasa, outConfig ) ) != IVAS_ERR_OK ) @@ -2693,7 +3149,8 @@ static ivas_error setRendInputActiveMasa( return IVAS_ERR_OK; } -static void freeDecoderDummy( DecoderDummy **ppDecDummy ) +static void freeDecoderDummy( + DecoderDummy **ppDecDummy ) { int16_t i; DecoderDummy *pDecDummy; @@ -2706,11 +3163,16 @@ static void freeDecoderDummy( DecoderDummy **ppDecDummy ) if ( pDecDummy->hDecoderConfig != NULL ) { - count_free( pDecDummy->hDecoderConfig ); + free( pDecDummy->hDecoderConfig ); } + if ( pDecDummy->hHeadTrackData != NULL ) { - count_free( pDecDummy->hHeadTrackData ); + if ( pDecDummy->hHeadTrackData->OrientationTracker != NULL ) + { + free( pDecDummy->hHeadTrackData->OrientationTracker ); + } + free( pDecDummy->hHeadTrackData ); } ivas_render_config_close( &pDecDummy->hRenderConfig ); @@ -2720,7 +3182,6 @@ static void freeDecoderDummy( DecoderDummy **ppDecDummy ) if ( pDecDummy->cldfbAnaDec[i] != NULL ) { deleteCldfb( &( pDecDummy->cldfbAnaDec[i] ) ); - pDecDummy->cldfbAnaDec[i] = NULL; } } @@ -2729,16 +3190,11 @@ static void freeDecoderDummy( DecoderDummy **ppDecDummy ) if ( pDecDummy->cldfbSynDec[i] != NULL ) { deleteCldfb( &( pDecDummy->cldfbSynDec[i] ) ); - pDecDummy->cldfbSynDec[i] = NULL; } } /* DirAC handle */ - if ( pDecDummy->hDirAC != NULL ) - { - ivas_dirac_dec_close( pDecDummy->hDirAC ); - pDecDummy->hDirAC = NULL; - } + ivas_dirac_dec_close( &( pDecDummy->hDirAC ) ); /* Qmetadata handle */ ivas_qmetadata_close( &pDecDummy->hQMetaData ); @@ -2749,29 +3205,42 @@ static void freeDecoderDummy( DecoderDummy **ppDecDummy ) /* HOA decoder matrix */ if ( pDecDummy->hoa_dec_mtx != NULL ) { - count_free( pDecDummy->hoa_dec_mtx ); + free( pDecDummy->hoa_dec_mtx ); pDecDummy->hoa_dec_mtx = NULL; } /* Parametric binaural renderer handle */ ivas_dirac_dec_close_binaural_data( &pDecDummy->hDiracDecBin ); - count_free( pDecDummy ); + free( pDecDummy ); pDecDummy = NULL; + + return; } -static void clearInputMasa( input_masa *inputMasa ) +static void clearInputMasa( + input_masa *inputMasa ) { rendering_context rendCtx; rendCtx = inputMasa->base.ctx; - initRendInputBase( &inputMasa->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx ); +#ifdef REND_STATIC_MEM_OPT + freeInputBaseBufferData( &inputMasa->bufferData ); +#endif + initRendInputBase( &inputMasa->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx +#ifdef REND_STATIC_MEM_OPT + , + NULL, 0 +#endif + ); freeDecoderDummy( &inputMasa->decDummy ); + + return; } #ifdef SPLIT_REND_LC3PLUS -static ivas_error initSplitRend( SPLIT_REND_WRAPPER *pSplitRendWrapper, IVAS_REND_AudioBuffer *pSplitRendEncBuffer, const IVAS_SPLIT_REND_CONFIG_DATA *pSplit_rend_config, IVAS_REND_HeadRotData headRotData, const int32_t outputSampleRate, const IVAS_REND_AudioConfig outConfig ) +static ivas_error initSplitRend( SPLIT_REND_WRAPPER *pSplitRendWrapper, IVAS_REND_AudioBuffer *pSplitRendEncBuffer, const IVAS_SPLIT_REND_CONFIG_DATA *pSplit_rend_config, IVAS_REND_HeadRotData headRotData, const int32_t outputSampleRate, const uint8_t useLc3plus, const IVAS_REND_AudioConfig outConfig ) { ivas_error error; IVAS_REND_AudioBufferConfig bufConfig; @@ -2791,7 +3260,7 @@ static ivas_error initSplitRend( SPLIT_REND_WRAPPER *pSplitRendWrapper, IVAS_REN error = ivas_split_renderer_open( pSplitRendWrapper, pSplit_rend_config, - outputSampleRate, 0, 0 ); + outputSampleRate, useLc3plus, 0, 0 ); if ( error != IVAS_ERR_OK ) { return error; @@ -2801,7 +3270,7 @@ static ivas_error initSplitRend( SPLIT_REND_WRAPPER *pSplitRendWrapper, IVAS_REN bufConfig.numChannels = BINAURAL_CHANNELS * MAX_HEAD_ROT_POSES; bufConfig.is_cldfb = 0; pSplitRendEncBuffer->config = bufConfig; - pSplitRendEncBuffer->data = count_malloc( bufConfig.numChannels * bufConfig.numSamplesPerChannel * sizeof( float ) ); + pSplitRendEncBuffer->data = malloc( bufConfig.numChannels * bufConfig.numSamplesPerChannel * sizeof( float ) ); if ( pSplitRendEncBuffer->data == NULL ) { return IVAS_ERR_FAILED_ALLOC; @@ -2834,28 +3303,24 @@ ivas_error IVAS_REND_Open( IVAS_REND_HANDLE hIvasRend; ivas_error error; int16_t numOutChannels; -#ifdef SPLIT_REND_WITH_HEAD_ROT - int16_t pos_idx; -#endif - - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ + /* Validate function arguments */ if ( phIvasRend == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; } + if ( ( error = validateOutputAudioConfig( outConfig ) ) != IVAS_ERR_OK ) { return error; } + if ( ( error = validateOutputSampleRate( outputSampleRate, outConfig ) ) != IVAS_ERR_OK ) { return error; } - *phIvasRend = (IVAS_REND_HANDLE) count_malloc( sizeof( struct IVAS_REND ) ); + *phIvasRend = (IVAS_REND_HANDLE) malloc( sizeof( struct IVAS_REND ) ); if ( *phIvasRend == NULL ) { return IVAS_ERR_FAILED_ALLOC; @@ -2877,27 +3342,35 @@ ivas_error IVAS_REND_Open( { return error; } - initLimiter( &hIvasRend->hLimiter, numOutChannels, outputSampleRate ); + + if ( ( error = initLimiter( &hIvasRend->hLimiter, numOutChannels, outputSampleRate ) ) != IVAS_ERR_OK ) + { + return error; + } /* Initialize headrotation data */ - initHeadRotation( hIvasRend ); + if ( ( error = initHeadRotation( hIvasRend ) ) != IVAS_ERR_OK ) + { + return error; + } /* Initialize EFAP */ - initEfap( &hIvasRend->efapOutWrapper, outConfig, &hIvasRend->customLsOut ); + if ( ( error = initEfap( &hIvasRend->efapOutWrapper, outConfig, &hIvasRend->customLsOut ) ) != IVAS_ERR_OK ) + { + return error; + } /* Initialize inputs */ for ( i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i ) { - initRendInputBase( &hIvasRend->inputsIsm[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend ) ); -#ifdef SPLIT_REND_WITH_HEAD_ROT - /* why not use defaultCrendWrapper() ??*/ - for ( pos_idx = 0; pos_idx < MAX_HEAD_ROT_POSES; pos_idx++ ) - { - hIvasRend->inputsIsm[i].crendWrapper.hCrend[pos_idx] = NULL; - } -#else - hIvasRend->inputsIsm[i].crendWrapper.hCrend = NULL; + initRendInputBase( &hIvasRend->inputsIsm[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend ) +#ifdef REND_STATIC_MEM_OPT + , + NULL, 0 #endif + ); + hIvasRend->inputsIsm[i].crendWrapper = NULL; + hIvasRend->inputsIsm[i].hReverb = NULL; hIvasRend->inputsIsm[i].tdRendWrapper.hBinRendererTd = NULL; #ifdef SPLIT_REND_LC3PLUS for ( j = 0; j < (int16_t) ( sizeof( hIvasRend->inputsIsm[i].splitTdRendWrappers ) / sizeof( *hIvasRend->inputsIsm[i].splitTdRendWrappers ) ); ++j ) @@ -2905,46 +3378,61 @@ ivas_error IVAS_REND_Open( hIvasRend->inputsIsm[i].splitTdRendWrappers[j].hBinRendererTd = NULL; hIvasRend->inputsIsm[i].splitTdRendWrappers[j].hHrtfTD = NULL; } +#endif +#ifdef REND_STATIC_MEM_OPT + hIvasRend->inputsIsm[i].bufferData = NULL; #endif } + for ( i = 0; i < RENDERER_MAX_MC_INPUTS; ++i ) { - initRendInputBase( &hIvasRend->inputsMc[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend ) ); - hIvasRend->inputsMc[i].efapInWrapper.hEfap = NULL; -#ifdef SPLIT_REND_WITH_HEAD_ROT - for ( pos_idx = 0; pos_idx < MAX_HEAD_ROT_POSES; pos_idx++ ) - { - hIvasRend->inputsMc[i].crendWrapper.hCrend[pos_idx] = NULL; - } -#else - hIvasRend->inputsMc[i].crendWrapper.hCrend = NULL; + initRendInputBase( &hIvasRend->inputsMc[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend ) +#ifdef REND_STATIC_MEM_OPT + , + NULL, 0 #endif + ); + hIvasRend->inputsMc[i].efapInWrapper.hEfap = NULL; + hIvasRend->inputsMc[i].crendWrapper = NULL; + hIvasRend->inputsMc[i].hReverb = NULL; hIvasRend->inputsMc[i].tdRendWrapper.hBinRendererTd = NULL; +#ifdef REND_STATIC_MEM_OPT + hIvasRend->inputsMc[i].bufferData = NULL; +#endif } + for ( i = 0; i < RENDERER_MAX_SBA_INPUTS; ++i ) { - initRendInputBase( &hIvasRend->inputsSba[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend ) ); -#ifdef SPLIT_REND_WITH_HEAD_ROT - for ( pos_idx = 0; pos_idx < MAX_HEAD_ROT_POSES; pos_idx++ ) - { - hIvasRend->inputsSba[i].crendWrapper.hCrend[pos_idx] = NULL; - } -#else - hIvasRend->inputsSba[i].crendWrapper.hCrend = NULL; + initRendInputBase( &hIvasRend->inputsSba[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend ) +#ifdef REND_STATIC_MEM_OPT + , + NULL, 0 #endif + ); + hIvasRend->inputsSba[i].crendWrapper = NULL; #ifdef SPLIT_REND_WITH_HEAD_ROT hIvasRend->inputsSba[i].cldfbRendWrapper.hCldfbRend = NULL; + hIvasRend->inputsSba[i].cldfbRendWrapper.hHrtfFastConv = NULL; ivas_init_split_rend_handles( &hIvasRend->inputsSba[i].splitRendWrapper ); +#endif +#ifdef REND_STATIC_MEM_OPT + hIvasRend->inputsSba[i].bufferData = NULL; #endif } + for ( i = 0; i < RENDERER_MAX_MASA_INPUTS; ++i ) { - initRendInputBase( &hIvasRend->inputsMasa[i].base, - IVAS_REND_AUDIO_CONFIG_UNKNOWN, - 0, - getRendCtx( hIvasRend ) ); + initRendInputBase( &hIvasRend->inputsMasa[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend ) +#ifdef REND_STATIC_MEM_OPT + , + NULL, 0 +#endif + ); hIvasRend->inputsMasa[i].decDummy = NULL; hIvasRend->inputsMasa[i].metadataHasBeenFed = false; +#ifdef REND_STATIC_MEM_OPT + hIvasRend->inputsMasa[i].bufferData = NULL; +#endif } #ifdef SPLIT_REND_WITH_HEAD_ROT for ( i = 0; i < RENDERER_MAX_BIN_INPUTS; ++i ) @@ -2952,8 +3440,19 @@ ivas_error IVAS_REND_Open( initRendInputBase( &hIvasRend->inputsSplitPost[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, - getRendCtx( hIvasRend ) ); + getRendCtx( hIvasRend ) +#ifdef REND_STATIC_MEM_OPT + , + NULL, 0 +#endif + ); ivas_init_split_post_rend_handles( &hIvasRend->inputsSplitPost[i].splitPostRendWrapper ); +#ifdef SPLIT_REND_PLC + hIvasRend->splitRendBFI = 0; +#endif +#ifdef REND_STATIC_MEM_OPT + hIvasRend->inputsSplitPost[i].bufferData = NULL; +#endif } #endif @@ -2997,11 +3496,13 @@ static ivas_error validateCustomLsLayout( { return IVAS_ERR_INVALID_CUSTOM_LS_LAYOUT; } + /* There must be at least one speaker or LFE in the layout */ if ( layout.num_spk + layout.num_lfe <= 0 ) { return IVAS_ERR_INVALID_CUSTOM_LS_LAYOUT; } + /* LFE indices must be positive */ for ( i = 0; i < layout.num_lfe; ++i ) { @@ -3023,19 +3524,18 @@ ivas_error IVAS_REND_ConfigureCustomOutputLoudspeakerLayout( input_mc *inputMc; input_sba *inputSba; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; } + if ( hIvasRend->outputConfig != IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) { /* Specifying details of custom speaker layout only makes sense if output config is set to custom speaker layout */ return IVAS_ERR_INVALID_OUTPUT_FORMAT; } + if ( ( error = validateCustomLsLayout( layout ) ) != IVAS_ERR_OK ) { return error; @@ -3048,10 +3548,17 @@ ivas_error IVAS_REND_ConfigureCustomOutputLoudspeakerLayout( { return error; } - initLimiter( &hIvasRend->hLimiter, numOutChannels, hIvasRend->sampleRateOut ); + + if ( ( error = initLimiter( &hIvasRend->hLimiter, numOutChannels, hIvasRend->sampleRateOut ) ) != IVAS_ERR_OK ) + { + return error; + } /* Re-initialize EFAP - output layout has changed or has been fully defined for the first time */ - initEfap( &hIvasRend->efapOutWrapper, hIvasRend->outputConfig, &hIvasRend->customLsOut ); + if ( ( error = initEfap( &hIvasRend->efapOutWrapper, hIvasRend->outputConfig, &hIvasRend->customLsOut ) ) != IVAS_ERR_OK ) + { + return error; + } /* Re-initialize panning gains for each active MC input, This includes re-initializing * LFE handling for the new output layout, which means custom LFE handling is overwritten, @@ -3077,11 +3584,13 @@ ivas_error IVAS_REND_ConfigureCustomOutputLoudspeakerLayout( for ( i = 0; i < RENDERER_MAX_SBA_INPUTS; ++i ) { inputSba = &hIvasRend->inputsSba[i]; + if ( inputSba->base.inConfig == IVAS_REND_AUDIO_CONFIG_UNKNOWN ) { /* Input inactive, skip. */ continue; } + if ( ( error = updateSbaPanGains( inputSba, hIvasRend->outputConfig, hIvasRend->hRendererConfig ) ) != IVAS_ERR_OK ) { return error; @@ -3097,10 +3606,7 @@ ivas_error IVAS_REND_NumOutChannels( { ivas_error error; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL || numOutChannels == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -3111,16 +3617,14 @@ ivas_error IVAS_REND_NumOutChannels( { case IVAS_REND_AUDIO_CONFIG_LS_CUSTOM: *numOutChannels = hIvasRend->customLsOut.num_spk + hIvasRend->customLsOut.num_lfe; - error = IVAS_ERR_OK; break; default: - error = getAudioConfigNumChannels( hIvasRend->outputConfig, numOutChannels ); + if ( ( error = getAudioConfigNumChannels( hIvasRend->outputConfig, numOutChannels ) ) != IVAS_ERR_OK ) + { + return error; + } break; } - if ( error != IVAS_ERR_OK ) - { - return error; - } return IVAS_ERR_OK; } @@ -3132,7 +3636,7 @@ static IVAS_REND_InputId makeInputId( /* Put config type in second byte (from LSB), put index + 1 in first byte * * Index is incremented here so that a valid ID can never be 0. */ - return (IVAS_REND_InputId) ( ( getAudioConfigType( config ) << 8 ) | ( inputIndex + 1 ) ); + return (IVAS_REND_InputId) ( ( ( (uint32_t) getAudioConfigType( config ) ) << 8 ) | ( inputIndex + 1 ) ); } static ivas_error getInputById( @@ -3284,8 +3788,8 @@ static ivas_error getConstInputById( static ivas_error findFreeInputSlot( const void *inputs, - int32_t inputStructSize, - int32_t maxInputs, + const int32_t inputStructSize, + const int32_t maxInputs, int32_t *inputIndex ) { /* Using a void pointer and a separately provided size is a hack for this function @@ -3323,10 +3827,30 @@ static ivas_error findFreeInputSlot( return IVAS_ERR_OK; } +#ifdef SPLIT_REND_LC3PLUS +static void closeSplitRend( SPLIT_REND_WRAPPER *pSplitRendWrapper, IVAS_REND_AudioBuffer *pSplitRendEncBuffer ) +{ + ivas_split_renderer_close( pSplitRendWrapper ); + if ( pSplitRendEncBuffer->data != NULL ) + { + free( pSplitRendEncBuffer->data ); + } + pSplitRendEncBuffer->config.numChannels = 0; + pSplitRendEncBuffer->config.numSamplesPerChannel = 0; +} +#endif + +/*-------------------------------------------------------------------* + * IVAS_REND_AddInput() + * + * + *-------------------------------------------------------------------*/ + ivas_error IVAS_REND_AddInput( - IVAS_REND_HANDLE hIvasRend, - IVAS_REND_AudioConfig inConfig, - IVAS_REND_InputId *inputId ) + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_REND_AudioConfig inConfig, /* i : audio config for a new input */ + IVAS_REND_InputId *inputId /* o : ID of the new input */ +) { ivas_error error; int32_t maxNumInputsOfType; @@ -3335,10 +3859,7 @@ ivas_error IVAS_REND_AddInput( ivas_error ( *activateInput )( void *, IVAS_REND_AudioConfig, IVAS_REND_InputId, RENDER_CONFIG_DATA * ); int32_t inputIndex; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL || inputId == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -3351,6 +3872,18 @@ ivas_error IVAS_REND_AddInput( inputsArray = hIvasRend->inputsIsm; inputStructSize = sizeof( *hIvasRend->inputsIsm ); activateInput = setRendInputActiveIsm; +#ifdef SPLIT_REND_LC3PLUS + if ( hIvasRend->outputConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB ) + { + /* Hack to override default split rendering codec from Dolby CLDFB to LC3plus. + This will not be necessary once the split rendering codec becomes selectable by the lib user. */ + closeSplitRend( &hIvasRend->splitRendWrapper, &hIvasRend->splitRendEncBuffer ); + if ( ( error = initSplitRend( &hIvasRend->splitRendWrapper, &hIvasRend->splitRendEncBuffer, &hIvasRend->hRendererConfig->split_rend_config, hIvasRend->headRotData, hIvasRend->sampleRateOut, 1, hIvasRend->outputConfig ) ) != IVAS_ERR_OK ) + { + return error; + } + } +#endif break; case IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED: maxNumInputsOfType = RENDERER_MAX_MC_INPUTS; @@ -3398,30 +3931,39 @@ ivas_error IVAS_REND_AddInput( return IVAS_ERR_OK; } + +/*-------------------------------------------------------------------* + * IVAS_REND_ConfigureCustomInputLoudspeakerLayout() + * + * + * Note: this will reset any custom LFE routing set for the input + *-------------------------------------------------------------------*/ + ivas_error IVAS_REND_ConfigureCustomInputLoudspeakerLayout( - IVAS_REND_HANDLE hIvasRend, - const IVAS_REND_InputId inputId, - const IVAS_CUSTOM_LS_DATA layout ) + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_REND_InputId inputId, /* i : ID of the input */ + const IVAS_CUSTOM_LS_DATA layout /* i : custom loudspeaker layout for input */ +) { input_mc *inputMc; ivas_error error; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; } + if ( ( error = validateCustomLsLayout( layout ) ) != IVAS_ERR_OK ) { return error; } + if ( ( error = getInputById( hIvasRend, inputId, (void **) &inputMc ) ) != IVAS_ERR_OK ) { return error; } + if ( inputMc->base.inConfig != IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) { /* Specifying details of custom speaker layout only makes sense if input config is set to custom speaker layout */ @@ -3435,7 +3977,10 @@ ivas_error IVAS_REND_ConfigureCustomInputLoudspeakerLayout( inputMc->lfeRouting = defaultLfeRouting( inputMc->base.inConfig, inputMc->customLsInput, hIvasRend->outputConfig, *inputMc->base.ctx.pCustomLsOut ); - initEfap( &inputMc->efapInWrapper, inputMc->base.inConfig, &inputMc->customLsInput ); + if ( ( error = initEfap( &inputMc->efapInWrapper, inputMc->base.inConfig, &inputMc->customLsInput ) ) != IVAS_ERR_OK ) + { + return error; + } if ( hIvasRend->outputConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL || hIvasRend->outputConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) { @@ -3444,6 +3989,7 @@ ivas_error IVAS_REND_ConfigureCustomInputLoudspeakerLayout( return error; } } + if ( ( error = updateMcPanGains( inputMc, hIvasRend->outputConfig ) ) != IVAS_ERR_OK ) { return error; @@ -3452,23 +3998,28 @@ ivas_error IVAS_REND_ConfigureCustomInputLoudspeakerLayout( return IVAS_ERR_OK; } + +/*-------------------------------------------------------------------* + * IVAS_REND_SetInputGain() + * + * + *-------------------------------------------------------------------*/ + ivas_error IVAS_REND_SetInputGain( - IVAS_REND_HANDLE hIvasRend, - const IVAS_REND_InputId inputId, - const float gain /* linear gain, not in dB */ + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_REND_InputId inputId, /* i : ID of the input */ + const float gain /* i : linear gain (not in dB) */ ) { input_base *inputBase; ivas_error error; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; } + if ( ( error = getInputById( hIvasRend, inputId, (void **) &inputBase ) ) != IVAS_ERR_OK ) { return error; @@ -3479,47 +4030,86 @@ ivas_error IVAS_REND_SetInputGain( return IVAS_ERR_OK; } -static int32_t getNumLfeChannels( - input_mc *inputMc ) + +/*-------------------------------------------------------------------* + * IVAS_REND_SetInputLfeMtx() + * + * + *-------------------------------------------------------------------*/ + +ivas_error IVAS_REND_SetInputLfeMtx( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_REND_InputId inputId, /* i : ID of the input */ + const IVAS_REND_LfePanMtx *lfePanMtx /* i : LFE panning matrix */ +) { - switch ( inputMc->base.inConfig ) + int16_t i; + input_base *pInputBase; + input_mc *pInputMc; + ivas_error error; + + /* Validate function arguments */ + if ( hIvasRend == NULL ) { - case IVAS_REND_AUDIO_CONFIG_5_1: - case IVAS_REND_AUDIO_CONFIG_7_1: - case IVAS_REND_AUDIO_CONFIG_5_1_2: - case IVAS_REND_AUDIO_CONFIG_5_1_4: - case IVAS_REND_AUDIO_CONFIG_7_1_4: - return 1; - case IVAS_REND_AUDIO_CONFIG_LS_CUSTOM: - return inputMc->customLsInput.num_lfe; - default: - break; + return IVAS_ERR_UNEXPECTED_NULL_POINTER; } - return 0; + if ( ( error = getInputById( hIvasRend, inputId, (void **) &pInputBase ) ) != IVAS_ERR_OK ) + { + return error; + } + + if ( getAudioConfigType( pInputBase->inConfig ) != IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) + { + /* Custom LFE panning matrix only makes sense with channel-based input */ + return IVAS_ERR_INVALID_INPUT_FORMAT; + } + pInputMc = (input_mc *) pInputBase; + + /* copy LFE panning matrix */ + for ( i = 0; i < IVAS_MAX_INPUT_LFE_CHANNELS; i++ ) + { + mvr2r( ( *lfePanMtx )[i], pInputMc->lfeRouting.lfePanMtx[i], IVAS_MAX_OUTPUT_CHANNELS ); + } + + if ( ( error = updateMcPanGains( pInputMc, hIvasRend->outputConfig ) ) != IVAS_ERR_OK ) + { + return error; + } + + return IVAS_ERR_OK; } -ivas_error IVAS_REND_SetInputLfeRouting( - IVAS_REND_HANDLE hIvasRend, - const IVAS_REND_InputId inputId, - const IVAS_REND_LfeRouting lfeRouting ) + +/*-------------------------------------------------------------------* + * IVAS_REND_SetInputLfePos() + * + * + *-------------------------------------------------------------------*/ + +ivas_error IVAS_REND_SetInputLfePos( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_REND_InputId inputId, /* i : ID of the input */ + const float inputGain, /* i : Input gain to be applied to the LFE channel(s) */ + const float outputAzimuth, /* i : Output azimuth position */ + const float outputElevation /* i : Output elevation position */ +) { input_base *pInputBase; input_mc *pInputMc; ivas_error error; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; } + if ( ( error = getInputById( hIvasRend, inputId, (void **) &pInputBase ) ) != IVAS_ERR_OK ) { return error; } + if ( getAudioConfigType( pInputBase->inConfig ) != IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) { /* Custom LFE routing only makes sense with channel-based input */ @@ -3527,12 +4117,11 @@ ivas_error IVAS_REND_SetInputLfeRouting( } pInputMc = (input_mc *) pInputBase; - if ( getNumLfeChannels( pInputMc ) != lfeRouting.numLfeChannels ) - { - return IVAS_ERR_WRONG_NUM_CHANNELS; - } + pInputMc->lfeRouting.pan_lfe = true; + pInputMc->lfeRouting.lfeInputGain = inputGain; + pInputMc->lfeRouting.lfeOutputAzimuth = outputAzimuth; + pInputMc->lfeRouting.lfeOutputElevation = outputElevation; - pInputMc->lfeRouting = lfeRouting; if ( ( error = updateMcPanGains( pInputMc, hIvasRend->outputConfig ) ) != IVAS_ERR_OK ) { return error; @@ -3541,21 +4130,27 @@ ivas_error IVAS_REND_SetInputLfeRouting( return IVAS_ERR_OK; } + +/*-------------------------------------------------------------------* + * IVAS_REND_RemoveInput() + * + * + *-------------------------------------------------------------------*/ + ivas_error IVAS_REND_RemoveInput( - IVAS_REND_HANDLE hIvasRend, - const IVAS_REND_InputId inputId ) + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_REND_InputId inputId /* i : ID of the input */ +) { ivas_error error; input_base *inputBase; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; } + if ( ( error = getInputById( hIvasRend, inputId, (void **) &inputBase ) ) != IVAS_ERR_OK ) { return error; @@ -3587,18 +4182,23 @@ ivas_error IVAS_REND_RemoveInput( return IVAS_ERR_OK; } + +/*-------------------------------------------------------------------* + * IVAS_REND_GetInputNumChannels() + * + * + *-------------------------------------------------------------------*/ + ivas_error IVAS_REND_GetInputNumChannels( - IVAS_REND_CONST_HANDLE hIvasRend, - const IVAS_REND_InputId inputId, - int16_t *numChannels ) + IVAS_REND_CONST_HANDLE hIvasRend, /* i : Renderer handle */ + const IVAS_REND_InputId inputId, /* i : ID of the input */ + int16_t *numChannels /* o : number of channels of the input */ +) { ivas_error error; const input_base *pInput; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL || numChannels == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -3608,6 +4208,7 @@ ivas_error IVAS_REND_GetInputNumChannels( { return error; } + if ( ( error = getRendInputNumChannels( pInput, numChannels ) ) != IVAS_ERR_OK ) { return error; @@ -3616,6 +4217,13 @@ ivas_error IVAS_REND_GetInputNumChannels( return IVAS_ERR_OK; } + +/*-------------------------------------------------------------------* + * IVAS_REND_GetDelay() + * + * + *-------------------------------------------------------------------*/ + ivas_error IVAS_REND_GetDelay( IVAS_REND_CONST_HANDLE hIvasRend, /* i : Renderer state */ int16_t *nSamples, /* o : Renderer delay in samples */ @@ -3627,11 +4235,9 @@ ivas_error IVAS_REND_GetDelay( */ int16_t i; int32_t latency_ns; + int32_t max_latency_ns; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL || nSamples == NULL || timeScale == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -3639,15 +4245,16 @@ ivas_error IVAS_REND_GetDelay( *timeScale = hIvasRend->sampleRateOut; *nSamples = 0; + max_latency_ns = 0; /* Compute the maximum delay across all inputs */ for ( i = 0; i < RENDERER_MAX_ISM_INPUTS; i++ ) { if ( hIvasRend->inputsIsm[i].base.inConfig != IVAS_REND_AUDIO_CONFIG_UNKNOWN ) { - 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 ); - *nSamples = max( *nSamples, NS2SA( *timeScale, latency_ns ) ); + max_latency_ns = max( max_latency_ns, latency_ns ); } } @@ -3655,9 +4262,9 @@ ivas_error IVAS_REND_GetDelay( { if ( hIvasRend->inputsMc[i].base.inConfig != IVAS_REND_AUDIO_CONFIG_UNKNOWN ) { - 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 ); - *nSamples = max( *nSamples, NS2SA( *timeScale, latency_ns ) ); + max_latency_ns = max( max_latency_ns, latency_ns ); } } @@ -3668,32 +4275,29 @@ ivas_error IVAS_REND_GetDelay( #ifdef SPLIT_REND_WITH_HEAD_ROT if ( hIvasRend->inputsSba[i].splitRendWrapper.hBinHrSplitPreRend != NULL ) { -#ifdef SPLIT_REND_WITH_HEAD_ROT - if ( hIvasRend->hRendererConfig->renderer_type_override != RENDER_TYPE_OVERRIDE_FASTCONV ) +#if ( defined DEBUGGING ) || ( defined SPLIT_REND_WITH_HEAD_ROT ) + if ( hIvasRend->hRendererConfig->renderer_type_override == RENDER_TYPE_OVERRIDE_FASTCONV ) { - latency_ns = hIvasRend->inputsSba[i].crendWrapper.binaural_latency_ns; + latency_ns = hIvasRend->inputsSba[i].cldfbRendWrapper.binaural_latency_ns; } else #endif { - latency_ns = hIvasRend->inputsSba[i].cldfbRendWrapper.binaural_latency_ns; + latency_ns = ( hIvasRend->inputsSba[i].crendWrapper != NULL ) ? hIvasRend->inputsSba[i].crendWrapper->binaural_latency_ns : 0; } - *nSamples = max( *nSamples, NS2SA( *timeScale, latency_ns ) ); + max_latency_ns = max( max_latency_ns, latency_ns ); } else if ( hIvasRend->inputsSba[i].cldfbRendWrapper.hCldfbRend != NULL ) { latency_ns = hIvasRend->inputsSba[i].cldfbRendWrapper.binaural_latency_ns; latency_ns += IVAS_FB_DEC_DELAY_NS; - *nSamples = max( *nSamples, NS2SA( *timeScale, latency_ns ) ); + max_latency_ns = max( max_latency_ns, latency_ns ); } else #endif { - latency_ns = hIvasRend->inputsSba[i].crendWrapper.binaural_latency_ns; -#ifdef ROTATE_CREND_IN_CLDFB_DOMAIN - latency_ns += IVAS_FB_DEC_DELAY_NS; -#endif - *nSamples = max( *nSamples, NS2SA( *timeScale, latency_ns ) ); + latency_ns = ( hIvasRend->inputsSba[i].crendWrapper != NULL ) ? hIvasRend->inputsSba[i].crendWrapper->binaural_latency_ns : 0; + max_latency_ns = max( max_latency_ns, latency_ns ); } } } @@ -3702,22 +4306,19 @@ ivas_error IVAS_REND_GetDelay( { if ( hIvasRend->inputsSplitPost[i].base.inConfig != IVAS_REND_AUDIO_CONFIG_UNKNOWN ) { -#ifndef SPLIT_REND_LC3PLUS - latency_ns = IVAS_FB_DEC_DELAY_NS; - *nSamples = max( *nSamples, NS2SA( *timeScale, latency_ns ) ); -#endif - #ifdef SPLIT_REND_LC3PLUS if ( hIvasRend->inputsSplitPost[i].splitPostRendWrapper.hLc3plusDec != NULL ) { int32_t lc3plusDelaySamples; IVAS_LC3PLUS_DEC_GetDelay( hIvasRend->inputsSplitPost[i].splitPostRendWrapper.hLc3plusDec, &lc3plusDelaySamples ); - *nSamples += lc3plusDelaySamples; + max_latency_ns = max( max_latency_ns, roundf( lc3plusDelaySamples * 1000000000.f / *timeScale ) ); } else { +#endif latency_ns = IVAS_FB_DEC_DELAY_NS; - *nSamples = max( *nSamples, NS2SA( *timeScale, latency_ns ) ); + max_latency_ns = max( max_latency_ns, latency_ns ); +#ifdef SPLIT_REND_LC3PLUS } #endif } @@ -3728,18 +4329,27 @@ ivas_error IVAS_REND_GetDelay( { if ( hIvasRend->inputsMasa[i].base.inConfig != IVAS_REND_AUDIO_CONFIG_UNKNOWN ) { - latency_ns = NS2SA( hIvasRend->sampleRateOut, (int32_t) ( (float) IVAS_FB_DEC_DELAY_NS + 0.5f ) ); - *nSamples = max( *nSamples, NS2SA( *timeScale, latency_ns ) ); + latency_ns = (int32_t) ( (float) IVAS_FB_DEC_DELAY_NS + 0.5f ); + max_latency_ns = max( max_latency_ns, latency_ns ); } } + *nSamples = (int16_t) roundf( (float) max_latency_ns * *timeScale / 1000000000.f ); return IVAS_ERR_OK; } + +/*-------------------------------------------------------------------* + * IVAS_REND_FeedInputAudio() + * + * + *-------------------------------------------------------------------*/ + ivas_error IVAS_REND_FeedInputAudio( - IVAS_REND_HANDLE hIvasRend, - const IVAS_REND_InputId inputId, - const IVAS_REND_ReadOnlyAudioBuffer inputAudio ) + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_REND_InputId inputId, /* i : ID of the input */ + const IVAS_REND_ReadOnlyAudioBuffer inputAudio /* i : buffer with input audio */ +) { ivas_error error; input_base *inputBase; @@ -3747,10 +4357,7 @@ ivas_error IVAS_REND_FeedInputAudio( #ifdef SPLIT_REND_WITH_HEAD_ROT int16_t cldfb2tdSampleFact; #endif - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL || inputAudio.data == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -3758,8 +4365,6 @@ ivas_error IVAS_REND_FeedInputAudio( #ifdef SPLIT_REND_WITH_HEAD_ROT cldfb2tdSampleFact = ( inputAudio.config.is_cldfb ) ? 2 : 1; -#endif -#ifdef SPLIT_REND_WITH_HEAD_ROT if ( inputAudio.config.numSamplesPerChannel <= 0 || ( MAX_BUFFER_LENGTH_PER_CHANNEL < inputAudio.config.numSamplesPerChannel && inputAudio.config.is_cldfb == 0 ) || ( ( MAX_BUFFER_LENGTH_PER_CHANNEL * cldfb2tdSampleFact ) < inputAudio.config.numSamplesPerChannel && inputAudio.config.is_cldfb == 1 ) ) #else @@ -3768,6 +4373,7 @@ ivas_error IVAS_REND_FeedInputAudio( { return IVAS_ERR_INVALID_BUFFER_SIZE; } + if ( inputAudio.config.numChannels <= 0 || MAX_INPUT_CHANNELS < inputAudio.config.numChannels ) { return IVAS_ERR_WRONG_NUM_CHANNELS; @@ -3788,10 +4394,12 @@ ivas_error IVAS_REND_FeedInputAudio( { return error; } + if ( ( error = getRendInputNumChannels( inputBase, &numInputChannels ) ) != IVAS_ERR_OK ) { return error; } + if ( numInputChannels != inputAudio.config.numChannels ) { return IVAS_ERR_WRONG_NUM_CHANNELS; @@ -3806,27 +4414,34 @@ ivas_error IVAS_REND_FeedInputAudio( return IVAS_ERR_OK; } + +/*-------------------------------------------------------------------* + * IVAS_REND_FeedInputObjectMetadata() + * + * + *-------------------------------------------------------------------*/ + ivas_error IVAS_REND_FeedInputObjectMetadata( - IVAS_REND_HANDLE hIvasRend, - const IVAS_REND_InputId inputId, - const IVAS_REND_AudioObjectPosition objectPosition ) + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_REND_InputId inputId, /* i : ID of the input */ + const IVAS_REND_AudioObjectPosition objectPosition /* i : object position struct */ +) { input_base *inputBase; input_ism *inputIsm; ivas_error error; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; } + if ( ( error = getInputById( hIvasRend, inputId, (void **) &inputBase ) ) != IVAS_ERR_OK ) { return error; } + if ( inputBase->inConfig != IVAS_REND_AUDIO_CONFIG_OBJECT ) { /* Object metadata should only be fed for object inputs */ @@ -3840,27 +4455,34 @@ ivas_error IVAS_REND_FeedInputObjectMetadata( return IVAS_ERR_OK; } -ivas_error IVAS_REND_FeedInputMasaMetadata( - IVAS_REND_HANDLE hIvasRend, - const IVAS_REND_InputId inputId, - IVAS_MASA_METADATA_HANDLE masaMetadata ) -{ - ivas_error error; + +/*-------------------------------------------------------------------* + * IVAS_REND_FeedInputMasaMetadata() + * + * + *-------------------------------------------------------------------*/ + +ivas_error IVAS_REND_FeedInputMasaMetadata( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_REND_InputId inputId, /* i : ID of the input */ + IVAS_MASA_METADATA_HANDLE masaMetadata /* i : MASA metadata frame */ +) +{ + ivas_error error; input_base *inputBase; input_masa *inputMasa; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; } + if ( ( error = getInputById( hIvasRend, inputId, (void **) &inputBase ) ) != IVAS_ERR_OK ) { return error; } + if ( getAudioConfigType( inputBase->inConfig ) != IVAS_REND_AUDIO_CONFIG_TYPE_MASA ) { /* MASA metadata should only be fed for MASA inputs */ @@ -3874,34 +4496,52 @@ ivas_error IVAS_REND_FeedInputMasaMetadata( return IVAS_ERR_OK; } -ivas_error IVAS_REND_InitConfig( IVAS_REND_HANDLE st, - bool rendererConfigEnabled ) + +/*-------------------------------------------------------------------* + * IVAS_REND_InitConfig() + * + * + *-------------------------------------------------------------------*/ + +ivas_error IVAS_REND_InitConfig( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_REND_AudioConfig outAudioConfig /* i : output audioConfig */ +) { ivas_error error; + bool rendererConfigEnabled; + + rendererConfigEnabled = ( getAudioConfigType( outAudioConfig ) == IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL ); if ( rendererConfigEnabled ) { - st->rendererConfigEnabled = 1; + hIvasRend->rendererConfigEnabled = 1; } else { - st->rendererConfigEnabled = 0; + hIvasRend->rendererConfigEnabled = 0; } - if ( ( error = ivas_render_config_open( &( st->hRendererConfig ) ) ) != IVAS_ERR_OK ) + if ( rendererConfigEnabled ) { - return error; + if ( ( error = ivas_render_config_open( &( hIvasRend->hRendererConfig ) ) ) != IVAS_ERR_OK ) + { + return error; + } + if ( ( error = ivas_render_config_init_from_rom( &hIvasRend->hRendererConfig, outAudioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) ) != IVAS_ERR_OK ) + { + return error; + } } - - if ( ivas_render_config_init_from_rom( &st->hRendererConfig, st->rendererConfigEnabled ) != IVAS_ERR_OK ) + else { - return IVAS_ERR_INTERNAL_FATAL; + hIvasRend->hRendererConfig = NULL; } #ifdef SPLIT_REND_LC3PLUS /* ToDo: The entire contents of this function should be part of IVAS_REND_Open - otherwise renderer handle is partly uninitialized after opening */ /* Initialize split rendering */ - if ( ( error = initSplitRend( &st->splitRendWrapper, &st->splitRendEncBuffer, &st->hRendererConfig->split_rend_config, st->headRotData, st->sampleRateOut, st->outputConfig ) ) != IVAS_ERR_OK ) + if ( ( error = initSplitRend( &hIvasRend->splitRendWrapper, &hIvasRend->splitRendEncBuffer, &hIvasRend->hRendererConfig->split_rend_config, hIvasRend->headRotData, hIvasRend->sampleRateOut, 0, hIvasRend->outputConfig ) ) != IVAS_ERR_OK ) { return error; } @@ -3928,18 +4568,11 @@ static int16_t is_SplitRend_BitRate( const int32_t splitRendBitRate ) } #endif -#ifdef SPLIT_REND_LC3PLUS -static void closeSplitRend( SPLIT_REND_WRAPPER *pSplitRendWrapper, IVAS_REND_AudioBuffer *pSplitRendEncBuffer ) -{ - ivas_split_renderer_close( pSplitRendWrapper ); - if ( pSplitRendEncBuffer->data != NULL ) - { - count_free( pSplitRendEncBuffer->data ); - } - pSplitRendEncBuffer->config.numChannels = 0; - pSplitRendEncBuffer->config.numSamplesPerChannel = 0; -} -#endif +/*-------------------------------------------------------------------* + * IVAS_REND_GetRenderConfig() + * + * + *-------------------------------------------------------------------*/ int16_t IVAS_REND_GetRenderConfig( IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS decoder handle */ @@ -3993,6 +4626,12 @@ int16_t IVAS_REND_GetRenderConfig( } +/*-------------------------------------------------------------------* + * IVAS_REND_FeedRenderConfig() + * + * + *-------------------------------------------------------------------*/ + int16_t IVAS_REND_FeedRenderConfig( IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS decoder handle */ const IVAS_RENDER_CONFIG_DATA renderConfig /* i : Render configuration struct */ @@ -4009,6 +4648,7 @@ int16_t IVAS_REND_FeedRenderConfig( } hRenderConfig = hIvasRend->hRendererConfig; + mvr2r( renderConfig.directivity, hRenderConfig->directivity, 3 ); #if ( defined DEBUGGING ) || ( defined SPLIT_REND_WITH_HEAD_ROT ) hRenderConfig->renderer_type_override = RENDER_TYPE_OVERRIDE_NONE; if ( renderConfig.renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV ) @@ -4043,7 +4683,7 @@ int16_t IVAS_REND_FeedRenderConfig( #ifdef SPLIT_REND_LC3PLUS /* Must re-initialize split rendering config which depends on renderer config */ closeSplitRend( &hIvasRend->splitRendWrapper, &hIvasRend->splitRendEncBuffer ); - if ( ( error = initSplitRend( &hIvasRend->splitRendWrapper, &hIvasRend->splitRendEncBuffer, &hIvasRend->hRendererConfig->split_rend_config, hIvasRend->headRotData, hIvasRend->sampleRateOut, hIvasRend->outputConfig ) ) != IVAS_ERR_OK ) + if ( ( error = initSplitRend( &hIvasRend->splitRendWrapper, &hIvasRend->splitRendEncBuffer, &hIvasRend->hRendererConfig->split_rend_config, hIvasRend->headRotData, hIvasRend->sampleRateOut, 0, hIvasRend->outputConfig ) ) != IVAS_ERR_OK ) { return error; } @@ -4052,9 +4692,17 @@ int16_t IVAS_REND_FeedRenderConfig( return IVAS_ERR_OK; } + +/*-------------------------------------------------------------------* + * IVAS_REND_SetHeadRotation() + * + * + *-------------------------------------------------------------------*/ + ivas_error IVAS_REND_SetHeadRotation( - IVAS_REND_HANDLE hIvasRend, - const IVAS_QUATERNION headRot[RENDERER_HEAD_POSITIONS_PER_FRAME] + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_QUATERNION headRot[RENDERER_HEAD_POSITIONS_PER_FRAME], /* i : head orientations for next rendering call */ + const IVAS_VECTOR3 Pos[RENDERER_HEAD_POSITIONS_PER_FRAME] /* i : listener positions for next rendering call */ #ifdef SPLIT_REND_WITH_HEAD_ROT , IVAS_SPLIT_REND_ROT_AXIS rot_axis @@ -4062,19 +4710,18 @@ ivas_error IVAS_REND_SetHeadRotation( ) { int16_t i; + IVAS_QUATERNION rotQuat; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; } + if ( getAudioConfigType( hIvasRend->outputConfig ) != IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL ) { /* Head rotation can be set only with binaural output */ - return IVAS_ERR_METADATA_NOT_EXPECTED; + return IVAS_ERR_INVALID_OUTPUT_FORMAT; } if ( headRot == NULL ) @@ -4105,7 +4752,34 @@ ivas_error IVAS_REND_SetHeadRotation( hIvasRend->headRotData.headRotEnabled = 1; for ( i = 0; i < RENDERER_HEAD_POSITIONS_PER_FRAME; ++i ) { - hIvasRend->headRotData.headPositions[i] = headRot[i]; + /* check for Euler angle signaling */ + if ( headRot[i].w == -3.0f ) + { +#ifdef SPLIT_REND_WITH_HEAD_ROT + if ( ( hIvasRend->outputConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB ) || + ( hIvasRend->outputConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) || + ( hIvasRend->inputsSplitPost[0].base.inConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB ) || + ( hIvasRend->inputsSplitPost[0].base.inConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ) + { +#ifndef EUALER2QUAT_FIX + rotQuat = headRot[i]; /* TODO: temp change until Euler2Quat() is fixed*/ +#else + Euler2Quat( deg2rad( headRot[i].x ), deg2rad( headRot[i].y ), deg2rad( headRot[i].z ), &rotQuat ); +#endif + } + else +#endif + { + Euler2Quat( deg2rad( headRot[i].x ), deg2rad( headRot[i].y ), deg2rad( headRot[i].z ), &rotQuat ); + } + } + else + { + rotQuat = headRot[i]; + } + + ivas_orient_trk_Process( hIvasRend->headRotData.hOrientationTracker, rotQuat, FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES, &hIvasRend->headRotData.headPositions[i] ); + hIvasRend->headRotData.Pos[i] = Pos[i]; } } @@ -4116,6 +4790,172 @@ ivas_error IVAS_REND_SetHeadRotation( return IVAS_ERR_OK; } +#ifdef SPLIT_REND_PLC +ivas_error IVAS_REND_SetSplitRendBFI( + IVAS_REND_HANDLE hIvasRend, + const int16_t bfi ) +{ + hIvasRend->splitRendBFI = bfi; + return IVAS_ERR_OK; +} +#endif + +/*-------------------------------------------------------------------* + * IVAS_REND_SetOrientationTrackingMode() + * + * + *-------------------------------------------------------------------*/ + +ivas_error IVAS_REND_SetOrientationTrackingMode( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const uint8_t otrMode /* i : Orientation tracking mode */ +) +{ + OTR_TRACKING_T mode; + ivas_error error; + + if ( hIvasRend == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + switch ( otrMode ) + { + case IVAS_ORIENT_TRK_AVG: + mode = OTR_TRACKING_AVG_ORIENT; + break; + case IVAS_ORIENT_TRK_REF: + mode = OTR_TRACKING_REF_ORIENT; + break; + case IVAS_ORIENT_TRK_REF_VEC: + mode = OTR_TRACKING_REF_VEC; + break; + case IVAS_ORIENT_TRK_REF_VEC_LEV: + mode = OTR_TRACKING_REF_VEC_LEV; + break; + case IVAS_ORIENT_TRK_NONE: + default: + mode = OTR_TRACKING_NONE; + break; + } + + if ( ( error = ivas_orient_trk_SetTrackingType( hIvasRend->headRotData.hOrientationTracker, mode ) ) != IVAS_ERR_OK ) + { + return error; + } + + return IVAS_ERR_OK; +} + + +/*-------------------------------------------------------------------* + * IVAS_REND_SetReferenceRotation() + * + * + *-------------------------------------------------------------------*/ + +ivas_error IVAS_REND_SetReferenceRotation( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_QUATERNION refRot /* i : Reference rotation */ +) +{ + ivas_error error; + + /* Validate function arguments */ + if ( hIvasRend == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + if ( ( error = ivas_orient_trk_SetReferenceRotation( hIvasRend->headRotData.hOrientationTracker, refRot ) ) != IVAS_ERR_OK ) + { + return error; + } + + return IVAS_ERR_OK; +} + + +/*-------------------------------------------------------------------* + * IVAS_REND_GetMainOrientation() + * + * + *-------------------------------------------------------------------*/ + +ivas_error IVAS_REND_GetMainOrientation( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + IVAS_QUATERNION *pOrientation /* i/o: Quaternion pointer for main orientation */ +) +{ + ivas_error error; + + if ( hIvasRend == NULL || pOrientation == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + if ( ( error = ivas_orient_trk_GetMainOrientation( hIvasRend->headRotData.hOrientationTracker, pOrientation ) ) != IVAS_ERR_OK ) + { + return error; + } + + return IVAS_ERR_OK; +} + + +/*-------------------------------------------------------------------* + * IVAS_REND_GetTrackedRotation() + * + * + *-------------------------------------------------------------------*/ + +ivas_error IVAS_REND_GetTrackedRotation( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + IVAS_QUATERNION *pRotation /* i/o: Quaternion pointer processed rotation */ +) +{ + ivas_error error; + + if ( hIvasRend == NULL || pRotation == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + if ( ( error = ivas_orient_trk_GetTrackedRotation( hIvasRend->headRotData.hOrientationTracker, pRotation ) ) != IVAS_ERR_OK ) + { + return error; + } + + return IVAS_ERR_OK; +} + + +/*---------------------------------------------------------------------* + * IVAS_REND_SetReferenceVector( ) + * + * Sets a reference vector spanning from listenerPos to refPos. Only + * available in OTR_TRACKING_REF_VEC and OTR_TRACKING_REF_VEC_LEV modes. + *---------------------------------------------------------------------*/ + +ivas_error IVAS_REND_SetReferenceVector( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_VECTOR3 listenerPos, /* i : Listener position */ + const IVAS_VECTOR3 refPos /* i : Reference position */ +) +{ + if ( hIvasRend == NULL || hIvasRend->headRotData.hOrientationTracker == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + return ivas_orient_trk_SetReferenceVector( hIvasRend->headRotData.hOrientationTracker, listenerPos, refPos ); +} + + +/*-------------------------------------------------------------------* + * Local functions + *-------------------------------------------------------------------*/ + /* Take one channel from input buffer and copy it to each channel in output buffer, with different gain applied per output channel. This function takes 2 gain vectors - one for the beginning and one @@ -4185,6 +5025,8 @@ static void renderBufferChannelLerp( } } } + + return; } /* Take one channel from input buffer and copy it to each channel @@ -4222,24 +5064,31 @@ static ivas_error rotateFrameMc( rotation_matrix Rmat; rotation_gains gains; float tmp_gains[MAX_INPUT_CHANNELS]; + ivas_error error; - wmops_sub_start( "rotateFrameMc" ); + push_wmops( "rotateFrameMc" ); if ( inConfig != IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) { - getAudioConfigNumChannels( inConfig, &nchan ); + if ( ( error = getAudioConfigNumChannels( inConfig, &nchan ) ) != IVAS_ERR_OK ) + { + return error; + } } else { nchan = inCustomLs.num_spk + inCustomLs.num_lfe; } - getMcConfigValues( inConfig, inCustomLs, &ls_azimuth, &ls_elevation, &lfe_idx, &is_planar_setup ); + if ( ( error = getMcConfigValues( inConfig, inCustomLs, &ls_azimuth, &ls_elevation, &lfe_idx, &is_planar_setup ) ) != IVAS_ERR_OK ) + { + return error; + } /* initialize gains to passthrough */ for ( ch_in = 0; ch_in < nchan; ch_in++ ) { - set_zero( gains[ch_in], (int16_t) nchan ); + set_zero( gains[ch_in], nchan ); gains[ch_in][ch_in] = 1.f; } @@ -4305,100 +5154,14 @@ static ivas_error rotateFrameMc( /* move gains to gains_prev */ for ( i = 0; i < nchan; i++ ) { - mvr2r( gains[i], gains_prev[i], (int16_t) nchan ); - } - } - - wmops_sub_end(); - - return IVAS_ERR_OK; -} - -#ifdef ROTATE_CREND_IN_CLDFB_DOMAIN -static HANDLE_CLDFB_FILTER_BANK rotateFrameSbacldfb_cldfbAna[16]; -static HANDLE_CLDFB_FILTER_BANK rotateFrameSbacldfb_cldfbSyn[16]; -static ivas_error rotateFrameSbacldfb( - IVAS_REND_AudioBuffer inAudio, /* i : Input Audio buffer */ - IVAS_REND_AudioConfig inConfig, /* i : Input Audio config */ - const IVAS_REND_HeadRotData *headRotData, /* i : Head rotation data */ - rotation_gains gains_prev, /* i/o: Previous frame rotation gains */ - IVAS_REND_AudioBuffer outAudio /* o : Output Audio buffer */ -) -{ - float tmpCrendBuffer[16][960]; - int16_t ch_idx, slot_idx, num_cldfb_bands, num_chs; - float Cldfb_RealBuffer_Binaural[16][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX]; - float Cldfb_ImagBuffer_Binaural[16][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX]; - float Rmat_local[3][3]; - - num_chs = outAudio.config.numChannels; - if ( frame == 0 ) - { - for ( int16_t ch = 0; ch < num_chs; ch++ ) - { - openCldfb( &( rotateFrameSbacldfb_cldfbAna[ch] ), CLDFB_ANALYSIS, 48000, CLDFB_PROTOTYPE_5_00MS ); - openCldfb( &( rotateFrameSbacldfb_cldfbSyn[ch] ), CLDFB_SYNTHESIS, 48000, CLDFB_PROTOTYPE_5_00MS ); - } - } - - num_cldfb_bands = CLDFB_NO_CHANNELS_MAX; - - copyBufferTo2dArray( inAudio, tmpCrendBuffer ); - - for ( int16_t sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ ) - { - /* Implement CLDFB analysis */ - for ( ch_idx = 0; ch_idx < num_chs; ch_idx++ ) - { - for ( slot_idx = 0; slot_idx < MAX_PARAM_SPATIAL_SUBFRAMES; slot_idx++ ) - { - int16_t idx = sf * MAX_PARAM_SPATIAL_SUBFRAMES + slot_idx; - cldfbAnalysis_ts( &( tmpCrendBuffer[ch_idx][num_cldfb_bands * idx] ), - Cldfb_RealBuffer_Binaural[ch_idx][slot_idx], - Cldfb_ImagBuffer_Binaural[ch_idx][slot_idx], - num_cldfb_bands, - rotateFrameSbacldfb_cldfbAna[ch_idx] ); - } - } - - QuatToRotMat( headRotData->headPositions[sf], Rmat_local ); - rotateFrame_shd_cldfb( Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Rmat_local, num_chs, 3 ); - - /* Implement CLDFB synthesis */ - for ( ch_idx = 0; ch_idx < num_chs; ch_idx++ ) - { - float *RealBuffer[CLDFB_NO_COL_MAX]; - float *ImagBuffer[CLDFB_NO_COL_MAX]; - int16_t idx = sf * num_cldfb_bands * MAX_PARAM_SPATIAL_SUBFRAMES; - - for ( slot_idx = 0; slot_idx < MAX_PARAM_SPATIAL_SUBFRAMES; slot_idx++ ) - { - RealBuffer[slot_idx] = Cldfb_RealBuffer_Binaural[ch_idx][slot_idx]; - ImagBuffer[slot_idx] = Cldfb_ImagBuffer_Binaural[ch_idx][slot_idx]; - } - - cldfbSynthesis( RealBuffer, ImagBuffer, &( tmpCrendBuffer[ch_idx][idx] ), num_cldfb_bands * MAX_PARAM_SPATIAL_SUBFRAMES, rotateFrameSbacldfb_cldfbSyn[ch_idx] ); + mvr2r( gains[i], gains_prev[i], nchan ); } } - - { - int16_t smplIdx, chnlIdx; - float *writePtr; - - writePtr = outAudio.data; - for ( chnlIdx = 0; chnlIdx < outAudio.config.numChannels; ++chnlIdx ) - { - for ( smplIdx = 0; smplIdx < outAudio.config.numSamplesPerChannel; ++smplIdx ) - { - *writePtr++ = tmpCrendBuffer[chnlIdx][smplIdx]; - } - } - } + pop_wmops(); return IVAS_ERR_OK; } -#endif static ivas_error rotateFrameSba( IVAS_REND_AudioBuffer inAudio, /* i : Input Audio buffer */ @@ -4412,14 +5175,26 @@ static ivas_error rotateFrameSba( int16_t m1, m2; int16_t shd_rot_max_order; int16_t subframe_idx, subframe_len; +#ifdef SBA_CREND_ROT_OPT + float *writePtr; +#else float *readPtr, *writePtr; +#endif rotation_matrix Rmat; float tmpRot[2 * HEADROT_ORDER + 1]; rotation_gains gains; + ivas_error error; +#ifdef SBA_CREND_ROT_OPT + int16_t idx; + float val, cf, oneminuscf; +#endif - wmops_sub_start( "rotateFrameSba" ); + push_wmops( "rotateFrameSba" ); - getAmbisonicsOrder( inConfig, &shd_rot_max_order ); + if ( ( error = getAmbisonicsOrder( inConfig, &shd_rot_max_order ) ) != IVAS_ERR_OK ) + { + return error; + } /* subframe loop */ subframe_len = inAudio.config.numSamplesPerChannel / RENDERER_HEAD_POSITIONS_PER_FRAME; @@ -4439,6 +5214,11 @@ static ivas_error rotateFrameSba( for ( i = 0; i < subframe_len; i++ ) { +#ifdef SBA_CREND_ROT_OPT + idx = subframe_idx * subframe_len + i; + cf = headRotData->crossfade[i]; + oneminuscf = 1 - cf; +#endif /* As the rotation matrix becomes block diagonal in a SH basis, we can*/ /* apply each angular-momentum block individually to save complexity. */ @@ -4454,13 +5234,18 @@ static ivas_error rotateFrameSba( for ( m = m1; m < m2; m++ ) { +#ifdef SBA_CREND_ROT_OPT + val = inAudio.data[m * inAudio.config.numSamplesPerChannel + idx]; + /* crossfade with previous rotation gains */ + tmpRot[n - m1] += ( cf * gains[n][m] * val + oneminuscf * gains_prev[n][m] * val ); +#else readPtr = getSmplPtr( inAudio, m, subframe_idx * subframe_len + i ); /* crossfade with previous rotation gains */ tmpRot[n - m1] += headRotData->crossfade[i] * gains[n][m] * ( *readPtr ) + ( 1 - headRotData->crossfade[i] ) * gains_prev[n][m] * ( *readPtr ); +#endif } } -#ifdef FIX_376_SBA_ROTATE /* write back the result */ for ( n = m1; n < m2; n++ ) { @@ -4469,18 +5254,7 @@ static ivas_error rotateFrameSba( } m1 = m2; m2 += 2 * ( l + 1 ) + 1; -#endif - } -#ifndef FIX_376_SBA_ROTATE - /* write back the result */ - for ( n = m1; n < m2; n++ ) - { - writePtr = getSmplPtr( outAudio, n, subframe_idx * subframe_len + i ); - ( *writePtr ) = tmpRot[n - m1]; } - m1 = m2; - m2 += 2 * ( l + 1 ) + 1; -#endif } /*unoptimized code for reference (full matrix multiplication)*/ @@ -4505,7 +5279,7 @@ static ivas_error rotateFrameSba( } } - wmops_sub_end(); + pop_wmops(); return IVAS_ERR_OK; } @@ -4517,28 +5291,26 @@ static ivas_error renderIsmToBinaural( float tmpTDRendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k]; ivas_error error; - wmops_sub_start( "renderIsmToBinaural" ); + push_wmops( "renderIsmToBinaural" ); copyBufferTo2dArray( ismInput->base.inputBuffer, tmpTDRendBuffer ); /* TODO tmu : missing: interpolation between positions, 5ms rendering */ - if ( ( error = ivas_rend_TDObjRenderFrame( &ismInput->tdRendWrapper, - ismInput->base.inConfig, - NULL, - ismInput->base.ctx.pHeadRotData, - &ismInput->currentPos, - outAudio.config.numSamplesPerChannel, -#ifndef FIX_ITD - *ismInput->base.ctx.pOutSampleRate, -#endif - tmpTDRendBuffer ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_td_binaural_renderer_ext( &ismInput->tdRendWrapper, + ismInput->base.inConfig, + NULL, + ismInput->base.ctx.pHeadRotData, + &ismInput->currentPos, + ismInput->hReverb, + outAudio.config.numSamplesPerChannel, + tmpTDRendBuffer ) ) != IVAS_ERR_OK ) { return error; } accumulate2dArrayToBuffer( tmpTDRendBuffer, &outAudio ); - wmops_sub_end(); + pop_wmops(); return IVAS_ERR_OK; } @@ -4552,7 +5324,7 @@ static ivas_error renderIsmToBinauralRoom( int16_t subframe_idx, subframe_len; int16_t tmp; rotation_matrix Rmat; - float tmpCrendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k]; + float tmpRendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k]; IVAS_QUATERNION quat; ivas_error error; pan_vector currentPanGains; @@ -4561,88 +5333,120 @@ static ivas_error renderIsmToBinauralRoom( IVAS_REND_AudioObjectPosition rotatedPos; const IVAS_REND_HeadRotData *headRotData; - wmops_sub_start( "renderIsmToBinauralRoom" ); + push_wmops( "renderIsmToBinauralRoom" ); headRotData = ismInput->base.ctx.pHeadRotData; rotatedPos = defaultObjectPosition(); - if ( headRotData->headRotEnabled ) + if ( ismInput->hReverb != NULL && ismInput->hReverb->pConfig.roomAcoustics.use_brir == 0 && ismInput->hReverb->pConfig.roomAcoustics.late_reverb_on == 1 && headRotData->headRotEnabled ) { - subframe_len = ismInput->base.inputBuffer.config.numSamplesPerChannel / RENDERER_HEAD_POSITIONS_PER_FRAME; - // for ( subframe_idx = 0; subframe_idx < RENDERER_HEAD_POSITIONS_PER_FRAME; subframe_idx++ ) - for ( subframe_idx = 0; subframe_idx < 1; subframe_idx++ ) - { - quat.w = headRotData->headPositions[subframe_idx].w; - quat.x = headRotData->headPositions[subframe_idx].x; - quat.y = headRotData->headPositions[subframe_idx].y; - quat.z = headRotData->headPositions[subframe_idx].z; + copyBufferTo2dArray( ismInput->base.inputBuffer, tmpRendBuffer ); - QuatToRotMat( quat, Rmat ); + /* TODO tmu : missing: interpolation between positions, 5ms rendering */ + if ( ( error = ivas_td_binaural_renderer_ext( &ismInput->tdRendWrapper, + ismInput->base.inConfig, + NULL, + ismInput->base.ctx.pHeadRotData, + &ismInput->currentPos, + ismInput->hReverb, + outAudio.config.numSamplesPerChannel, + tmpRendBuffer ) ) != IVAS_ERR_OK ) + { + return error; } - (void) subframe_len; // avoid warning - } - - /* TODO tmu : missing: interpolation between positions, 5ms rendering */ - /* TODO(sgi): Possible optimization: less processing needed if position didn't change */ - /* TODO tmu2sgi: needs a lot of cleanup, we could also add rot_gains_prev to ismInput and use that */ - /* previous position gains */ - if ( headRotData->headRotEnabled ) - { - rotateAziEle( ismInput->previousPos.azimuth, ismInput->previousPos.elevation, &azi_rot, &ele_rot, ismInput->rot_mat_prev, 0 ); - rotatedPos.azimuth = (float) azi_rot; - rotatedPos.elevation = (float) ele_rot; + accumulate2dArrayToBuffer( tmpRendBuffer, &outAudio ); } - if ( ( error = getEfapGains( *ismInput->base.ctx.pEfapOutWrapper, - ( headRotData->headRotEnabled ) ? rotatedPos.azimuth : ismInput->previousPos.azimuth, - ( headRotData->headRotEnabled ) ? rotatedPos.elevation : ismInput->previousPos.elevation, - previousPanGains ) ) != IVAS_ERR_OK ) + else { - return error; - } - /* current position gains */ - if ( headRotData->headRotEnabled ) - { - rotateAziEle( ismInput->currentPos.azimuth, ismInput->currentPos.elevation, &azi_rot, &ele_rot, Rmat, 0 ); - rotatedPos.azimuth = (float) azi_rot; - rotatedPos.elevation = (float) ele_rot; - } - if ( ( error = getEfapGains( *ismInput->base.ctx.pEfapOutWrapper, - ( headRotData->headRotEnabled ) ? rotatedPos.azimuth : ismInput->currentPos.azimuth, - ( headRotData->headRotEnabled ) ? rotatedPos.elevation : ismInput->currentPos.elevation, - currentPanGains ) ) != IVAS_ERR_OK ) - { - return error; - } + if ( headRotData->headRotEnabled ) + { + subframe_len = ismInput->base.inputBuffer.config.numSamplesPerChannel / RENDERER_HEAD_POSITIONS_PER_FRAME; + // for ( subframe_idx = 0; subframe_idx < RENDERER_HEAD_POSITIONS_PER_FRAME; subframe_idx++ ) + for ( subframe_idx = 0; subframe_idx < 1; subframe_idx++ ) + { + quat.w = headRotData->headPositions[subframe_idx].w; + quat.x = headRotData->headPositions[subframe_idx].x; + quat.y = headRotData->headPositions[subframe_idx].y; + quat.z = headRotData->headPositions[subframe_idx].z; - for ( i = 0; i < 3; i++ ) - { - mvr2r( Rmat[i], ismInput->rot_mat_prev[i], 3 ); - } + QuatToRotMat( quat, Rmat ); + } + (void) subframe_len; // avoid warning + } - /* intermediate rendering to 7_1_4 */ - tmpMcBuffer = ismInput->base.inputBuffer; - getAudioConfigNumChannels( IVAS_REND_AUDIO_CONFIG_7_1_4, &tmp ); - tmpMcBuffer.config.numChannels = tmp; - tmpMcBuffer.data = count_malloc( tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels * sizeof( float ) ); - set_zero( tmpMcBuffer.data, tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels ); + /* TODO tmu : missing: interpolation between positions, 5ms rendering */ + /* TODO(sgi): Possible optimization: less processing needed if position didn't change */ + /* TODO tmu2sgi: needs a lot of cleanup, we could also add rot_gains_prev to ismInput and use that */ + /* previous position gains */ + if ( headRotData->headRotEnabled ) + { + rotateAziEle( ismInput->previousPos.azimuth, ismInput->previousPos.elevation, &azi_rot, &ele_rot, ismInput->rot_mat_prev, 0 ); + rotatedPos.azimuth = (float) azi_rot; + rotatedPos.elevation = (float) ele_rot; + } - renderBufferChannelLerp( ismInput->base.inputBuffer, 0, currentPanGains, previousPanGains, tmpMcBuffer ); + if ( ( error = getEfapGains( *ismInput->base.ctx.pEfapOutWrapper, + ( headRotData->headRotEnabled ) ? rotatedPos.azimuth : ismInput->previousPos.azimuth, + ( headRotData->headRotEnabled ) ? rotatedPos.elevation : ismInput->previousPos.elevation, + previousPanGains ) ) != IVAS_ERR_OK ) + { + return error; + } - copyBufferTo2dArray( tmpMcBuffer, tmpCrendBuffer ); + /* current position gains */ + if ( headRotData->headRotEnabled ) + { + rotateAziEle( ismInput->currentPos.azimuth, ismInput->currentPos.elevation, &azi_rot, &ele_rot, Rmat, 0 ); + rotatedPos.azimuth = (float) azi_rot; + rotatedPos.elevation = (float) ele_rot; + } + + if ( ( error = getEfapGains( *ismInput->base.ctx.pEfapOutWrapper, + ( headRotData->headRotEnabled ) ? rotatedPos.azimuth : ismInput->currentPos.azimuth, + ( headRotData->headRotEnabled ) ? rotatedPos.elevation : ismInput->currentPos.elevation, + currentPanGains ) ) != IVAS_ERR_OK ) + { + return error; + } + + for ( i = 0; i < 3; i++ ) + { + mvr2r( Rmat[i], ismInput->rot_mat_prev[i], 3 ); + } + + /* intermediate rendering to 7_1_4 */ + tmpMcBuffer = ismInput->base.inputBuffer; + + if ( ( error = getAudioConfigNumChannels( IVAS_REND_AUDIO_CONFIG_7_1_4, &tmp ) ) != IVAS_ERR_OK ) + { + return error; + } + + tmpMcBuffer.config.numChannels = tmp; + tmpMcBuffer.data = malloc( tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels * sizeof( float ) ); + set_zero( tmpMcBuffer.data, tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels ); + + renderBufferChannelLerp( ismInput->base.inputBuffer, 0, currentPanGains, previousPanGains, tmpMcBuffer ); - ivas_rend_crendProcess( &ismInput->crendWrapper, IVAS_REND_AUDIO_CONFIG_7_1_4, IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM, tmpCrendBuffer, *ismInput->base.ctx.pOutSampleRate + copyBufferTo2dArray( tmpMcBuffer, tmpRendBuffer ); + + if ( ( error = ivas_rend_crendProcess( ismInput->crendWrapper, AUDIO_CONFIG_7_1_4, AUDIO_CONFIG_BINAURAL_ROOM, + NULL, NULL, NULL, NULL, tmpRendBuffer, *ismInput->base.ctx.pOutSampleRate #ifdef SPLIT_REND_WITH_HEAD_ROT - , - 0 + , + 0 #endif - ); - - accumulate2dArrayToBuffer( tmpCrendBuffer, &outAudio ); + ) ) != IVAS_ERR_OK ) + { + return error; + } - count_free( tmpMcBuffer.data ); + accumulate2dArrayToBuffer( tmpRendBuffer, &outAudio ); - wmops_sub_end(); + free( tmpMcBuffer.data ); + } + pop_wmops(); return IVAS_ERR_OK; } @@ -4655,23 +5459,49 @@ static ivas_error renderIsmToMc( pan_vector previousPanGains; ivas_error error; - wmops_sub_start( "renderIsmToMc" ); + push_wmops( "renderIsmToMc" ); /* TODO(sgi): Possible optimization: less processing needed if position didn't change */ - if ( ( error = getEfapGains( *ismInput->base.ctx.pEfapOutWrapper, ismInput->currentPos.azimuth, ismInput->currentPos.elevation, currentPanGains ) ) != IVAS_ERR_OK ) + if ( *ismInput->base.ctx.pOutConfig == IVAS_REND_AUDIO_CONFIG_STEREO ) { - return error; + set_zero( currentPanGains, 16 ); + ivas_ism_get_stereo_gains( ismInput->currentPos.azimuth, + ismInput->currentPos.elevation, + ¤tPanGains[0], + ¤tPanGains[1] ); + + set_zero( previousPanGains, 16 ); + ivas_ism_get_stereo_gains( ismInput->previousPos.azimuth, + ismInput->previousPos.elevation, + &previousPanGains[0], + &previousPanGains[1] ); } - if ( ( error = getEfapGains( *ismInput->base.ctx.pEfapOutWrapper, ismInput->previousPos.azimuth, ismInput->previousPos.elevation, previousPanGains ) ) != IVAS_ERR_OK ) + else { - return error; + // TODO tmu review when #215 is resolved + if ( ( error = getEfapGains( *ismInput->base.ctx.pEfapOutWrapper, + (int16_t) floorf( ismInput->currentPos.azimuth + 0.5f ), + (int16_t) floorf( ismInput->currentPos.elevation + 0.5f ), + currentPanGains ) ) != IVAS_ERR_OK ) + { + return error; + } + + // TODO tmu review when #215 is resolved + if ( ( error = getEfapGains( *ismInput->base.ctx.pEfapOutWrapper, + (int16_t) floorf( ismInput->previousPos.azimuth + 0.5f ), + (int16_t) floorf( ismInput->previousPos.elevation + 0.5f ), + previousPanGains ) ) != IVAS_ERR_OK ) + { + return error; + } } /* Assume num channels in audio buffer to be 1. * This should have been validated in IVAS_REND_FeedInputAudio() */ renderBufferChannelLerp( ismInput->base.inputBuffer, 0, currentPanGains, previousPanGains, outAudio ); - wmops_sub_end(); + pop_wmops(); return IVAS_ERR_OK; } @@ -4688,18 +5518,23 @@ static ivas_error renderIsmToSba( ivas_error error; error = IVAS_ERR_OK; - wmops_sub_start( "renderIsmToSba" ); + push_wmops( "renderIsmToSba" ); if ( ( error = getAudioConfigNumChannels( outConfig, &numOutChannels ) ) != IVAS_ERR_OK ) { return error; } + if ( ( error = getAmbisonicsOrder( outConfig, &ambiOrderOut ) ) != IVAS_ERR_OK ) { return error; } - ivas_dirac_dec_get_response( (int16_t) ismInput->previousPos.azimuth, (int16_t) ismInput->previousPos.elevation, previousPanGains, ambiOrderOut ); + // TODO tmu review when #215 is resolved + ivas_dirac_dec_get_response( (int16_t) floorf( ismInput->previousPos.azimuth + 0.5f ), + (int16_t) floorf( ismInput->previousPos.elevation + 0.5f ), + previousPanGains, + ambiOrderOut ); if ( ( ismInput->currentPos.azimuth == ismInput->previousPos.azimuth ) && ( ismInput->currentPos.elevation == ismInput->previousPos.elevation ) ) @@ -4708,14 +5543,18 @@ static ivas_error renderIsmToSba( } else { - ivas_dirac_dec_get_response( (int16_t) ismInput->currentPos.azimuth, (int16_t) ismInput->currentPos.elevation, currentPanGains, ambiOrderOut ); + // TODO tmu review when #215 is resolved + ivas_dirac_dec_get_response( (int16_t) floorf( ismInput->currentPos.azimuth + 0.5f ), + (int16_t) floorf( ismInput->currentPos.elevation + 0.5f ), + currentPanGains, + ambiOrderOut ); } /* Assume num channels in audio buffer to be 1. * This should have been validated in IVAS_REND_FeedInputAudio() */ renderBufferChannelLerp( ismInput->base.inputBuffer, 0, currentPanGains, previousPanGains, outAudio ); - wmops_sub_end(); + pop_wmops(); return error; } @@ -4734,6 +5573,9 @@ static ivas_error renderIsmToSplitBinaural( IVAS_QUATERNION originalHeadRot[MAX_PARAM_SPATIAL_SUBFRAMES]; float tmpBinaural[MAX_HEAD_ROT_POSES * BINAURAL_CHANNELS][L_FRAME48k]; int16_t output_frame = ismInput->base.inputBuffer.config.numSamplesPerChannel; + IVAS_REND_HeadRotData modifiedHeadRotData; + + push_wmops( "renderIsmToSplitBinaural" ); pSplitRendWrapper = ismInput->base.ctx.pSplitRendWrapper; pMultiBinPoseData = &pSplitRendWrapper->multiBinPoseData; @@ -4750,7 +5592,7 @@ static ivas_error renderIsmToSplitBinaural( ismInput->splitTdRendWrappers[i].hHrtfTD = NULL; /* Open TD renderer wrapper */ - if ( ( error = ivas_rend_TDObjRendOpen( &ismInput->splitTdRendWrappers[i], ismInput->base.inConfig, NULL, *ismInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_td_binaural_open_ext( &ismInput->splitTdRendWrappers[i], ismInput->base.inConfig, *ismInput->base.ctx.hhRendererConfig, NULL, *ismInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK ) { return error; } @@ -4768,7 +5610,7 @@ static ivas_error renderIsmToSplitBinaural( /* Copy input audio to a processing buffer. */ copyBufferTo2dArray( ismInput->base.inputBuffer, tmpProcessing ); - IVAS_REND_HeadRotData modifiedHeadRotData = *ismInput->base.ctx.pHeadRotData; + modifiedHeadRotData = *ismInput->base.ctx.pHeadRotData; for ( pos_idx = 0; pos_idx < pMultiBinPoseData->num_poses; pos_idx++ ) { /* Update head positions */ @@ -4779,9 +5621,9 @@ static ivas_error renderIsmToSplitBinaural( if ( originalHeadRot[i].w == -3.0f ) { modifiedHeadRotData.headPositions[i].w = -3.0f; - modifiedHeadRotData.headPositions[i].x = originalHeadRot[i].x + pMultiBinPoseData->relative_head_poses[pos_idx][0]; - modifiedHeadRotData.headPositions[i].y = originalHeadRot[i].y + pMultiBinPoseData->relative_head_poses[pos_idx][1]; - modifiedHeadRotData.headPositions[i].z = originalHeadRot[i].z + pMultiBinPoseData->relative_head_poses[pos_idx][2]; + modifiedHeadRotData.headPositions[i].x = originalHeadRot[i].x + pMultiBinPoseData->relative_head_poses[pos_idx - 1][0]; + modifiedHeadRotData.headPositions[i].y = originalHeadRot[i].y + pMultiBinPoseData->relative_head_poses[pos_idx - 1][1]; + modifiedHeadRotData.headPositions[i].z = originalHeadRot[i].z + pMultiBinPoseData->relative_head_poses[pos_idx - 1][2]; } else { @@ -4790,9 +5632,9 @@ static ivas_error renderIsmToSplitBinaural( &modifiedHeadRotData.headPositions[i].z, &modifiedHeadRotData.headPositions[i].y, &modifiedHeadRotData.headPositions[i].x ); - modifiedHeadRotData.headPositions[i].x += pMultiBinPoseData->relative_head_poses[pos_idx][0]; - modifiedHeadRotData.headPositions[i].y += pMultiBinPoseData->relative_head_poses[pos_idx][1]; - modifiedHeadRotData.headPositions[i].z += pMultiBinPoseData->relative_head_poses[pos_idx][2]; + modifiedHeadRotData.headPositions[i].x += pMultiBinPoseData->relative_head_poses[pos_idx - 1][0]; + modifiedHeadRotData.headPositions[i].y += pMultiBinPoseData->relative_head_poses[pos_idx - 1][1]; + modifiedHeadRotData.headPositions[i].z += pMultiBinPoseData->relative_head_poses[pos_idx - 1][2]; } } } @@ -4800,13 +5642,14 @@ static ivas_error renderIsmToSplitBinaural( /* Render */ if ( pos_idx == 0 ) { - error = ivas_rend_TDObjRenderFrame( &ismInput->tdRendWrapper, - ismInput->base.inConfig, - NULL, - ismInput->base.ctx.pHeadRotData, - &ismInput->currentPos, - output_frame, - tmpProcessing ); + error = ivas_td_binaural_renderer_ext( &ismInput->tdRendWrapper, + ismInput->base.inConfig, + NULL, + ismInput->base.ctx.pHeadRotData, + &ismInput->currentPos, + NULL, + output_frame, + tmpProcessing ); if ( error != IVAS_ERR_OK ) { return error; @@ -4814,13 +5657,14 @@ static ivas_error renderIsmToSplitBinaural( } else { - error = ivas_rend_TDObjRenderFrame( &ismInput->splitTdRendWrappers[pos_idx - 1], - ismInput->base.inConfig, - NULL, - &modifiedHeadRotData, - &ismInput->currentPos, - output_frame, - tmpProcessing ); + error = ivas_td_binaural_renderer_ext( &ismInput->splitTdRendWrappers[pos_idx - 1], + ismInput->base.inConfig, + NULL, + &modifiedHeadRotData, + &ismInput->currentPos, + NULL, + output_frame, + tmpProcessing ); if ( error != IVAS_ERR_OK ) { return error; @@ -4839,6 +5683,8 @@ static ivas_error renderIsmToSplitBinaural( accumulate2dArrayToBuffer( tmpBinaural, &outAudio ); /* Encoding to split rendering bitstream done at a higher level */ + pop_wmops(); + return IVAS_ERR_OK; } #endif @@ -4863,7 +5709,6 @@ static ivas_error renderInputIsm( /* Apply input gain to new audio */ v_multc( inAudio.data, ismInput->base.gain, inAudio.data, inAudio.config.numSamplesPerChannel * inAudio.config.numChannels ); - switch ( getAudioConfigType( outConfig ) ) { case IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED: @@ -4918,6 +5763,7 @@ static ivas_error renderActiveInputsIsm( /* Skip inactive inputs */ continue; } + if ( ( error = renderInputIsm( pCurrentInput, hIvasRend->outputConfig, outAudio ) ) != IVAS_ERR_OK ) { return error; @@ -4938,7 +5784,7 @@ static ivas_error renderLfeToBinaural( assert( ( outAudio.config.numChannels == 2 ) && "Must be binaural output" ); - wmops_sub_start( "renderLfeToBinaural" ); + push_wmops( "renderLfeToBinaural" ); gain = GAIN_LFE; @@ -4971,7 +5817,7 @@ static ivas_error renderLfeToBinaural( *writePtr++ += gain * ( *readPtr++ ); } - wmops_sub_end(); + pop_wmops(); return IVAS_ERR_OK; } @@ -4984,30 +5830,20 @@ static ivas_error renderMcToBinaural( int8_t headRotEnabled; float tmpRendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k]; IVAS_REND_AudioConfig inConfig; - ivas_error error; IVAS_REND_AudioBuffer tmpRotBuffer; - wmops_sub_start( "renderMcToBinaural" ); + push_wmops( "renderMcToBinaural" ); headRotEnabled = mcInput->base.ctx.pHeadRotData->headRotEnabled; inConfig = mcInput->base.inConfig; - if ( ( inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) || - ( headRotEnabled && ( inConfig == IVAS_REND_AUDIO_CONFIG_5_1 || inConfig == IVAS_REND_AUDIO_CONFIG_7_1 ) ) ) + if ( ( inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) || ( headRotEnabled && ( inConfig == IVAS_REND_AUDIO_CONFIG_5_1 || inConfig == IVAS_REND_AUDIO_CONFIG_7_1 ) ) ) { copyBufferTo2dArray( mcInput->base.inputBuffer, tmpRendBuffer ); - if ( ( error = ivas_rend_TDObjRenderFrame( &mcInput->tdRendWrapper, - mcInput->base.inConfig, - &mcInput->customLsInput, - mcInput->base.ctx.pHeadRotData, - NULL, - mcInput->base.inputBuffer.config.numSamplesPerChannel, -#ifndef FIX_ITD - *mcInput->base.ctx.pOutSampleRate, -#endif - tmpRendBuffer ) ) != IVAS_ERR_OK ) + if ( ( error = ivas_td_binaural_renderer_ext( &mcInput->tdRendWrapper, mcInput->base.inConfig, &mcInput->customLsInput, mcInput->base.ctx.pHeadRotData, NULL, + mcInput->hReverb, mcInput->base.inputBuffer.config.numSamplesPerChannel, tmpRendBuffer ) ) != IVAS_ERR_OK ) { return error; } @@ -5018,19 +5854,17 @@ static ivas_error renderMcToBinaural( if ( headRotEnabled ) { tmpRotBuffer = mcInput->base.inputBuffer; - tmpRotBuffer.data = count_malloc( tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels * sizeof( float ) ); + tmpRotBuffer.data = malloc( tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels * sizeof( float ) ); set_zero( tmpRotBuffer.data, tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels ); - rotateFrameMc( mcInput->base.inputBuffer, - mcInput->base.inConfig, - mcInput->customLsInput, - mcInput->base.ctx.pHeadRotData, - mcInput->rot_gains_prev, - mcInput->efapInWrapper.hEfap, - tmpRotBuffer ); + if ( ( error = rotateFrameMc( mcInput->base.inputBuffer, mcInput->base.inConfig, mcInput->customLsInput, mcInput->base.ctx.pHeadRotData, + mcInput->rot_gains_prev, mcInput->efapInWrapper.hEfap, tmpRotBuffer ) ) != IVAS_ERR_OK ) + { + return error; + } copyBufferTo2dArray( tmpRotBuffer, tmpRendBuffer ); - count_free( tmpRotBuffer.data ); + free( tmpRotBuffer.data ); } else { @@ -5038,7 +5872,8 @@ static ivas_error renderMcToBinaural( } /* call CREND */ - if ( ( error = ivas_rend_crendProcess( &mcInput->crendWrapper, mcInput->base.inConfig, outConfig, tmpRendBuffer, *mcInput->base.ctx.pOutSampleRate + if ( ( error = ivas_rend_crendProcess( mcInput->crendWrapper, getIvasAudioConfigFromRendAudioConfig( mcInput->base.inConfig ), getIvasAudioConfigFromRendAudioConfig( outConfig ), + NULL, NULL, NULL, NULL, tmpRendBuffer, *mcInput->base.ctx.pOutSampleRate #ifdef SPLIT_REND_WITH_HEAD_ROT , 0 @@ -5052,9 +5887,12 @@ static ivas_error renderMcToBinaural( accumulate2dArrayToBuffer( tmpRendBuffer, &outAudio ); /* TODO tmu : needs delay compensation */ - renderLfeToBinaural( mcInput, outAudio ); + if ( ( error = renderLfeToBinaural( mcInput, outAudio ) ) != IVAS_ERR_OK ) + { + return error; + } - wmops_sub_end(); + pop_wmops(); return IVAS_ERR_OK; } @@ -5064,54 +5902,72 @@ static ivas_error renderMcToBinauralRoom( const IVAS_REND_AudioConfig outConfig, IVAS_REND_AudioBuffer outAudio ) { - float tmpCrendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k]; - + int8_t headRotEnabled; + float tmpRendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k]; + IVAS_REND_AudioConfig inConfig; ivas_error error; IVAS_REND_AudioBuffer tmpRotBuffer; - wmops_sub_start( "renderMcToBinauralRoom" ); + push_wmops( "renderMcToBinauralRoom" ); - /* apply rotation */ - if ( mcInput->base.ctx.pHeadRotData->headRotEnabled ) - { - tmpRotBuffer = mcInput->base.inputBuffer; - tmpRotBuffer.data = count_malloc( tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels * sizeof( float ) ); - set_zero( tmpRotBuffer.data, tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels ); + headRotEnabled = mcInput->base.ctx.pHeadRotData->headRotEnabled; + inConfig = mcInput->base.inConfig; - rotateFrameMc( mcInput->base.inputBuffer, - mcInput->base.inConfig, - mcInput->customLsInput, - mcInput->base.ctx.pHeadRotData, - mcInput->rot_gains_prev, - mcInput->efapInWrapper.hEfap, - tmpRotBuffer ); + if ( ( mcInput->hReverb != NULL && mcInput->hReverb->pConfig.roomAcoustics.use_brir == 0 && mcInput->hReverb->pConfig.roomAcoustics.late_reverb_on == 1 ) && ( ( inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) || ( headRotEnabled && ( inConfig == IVAS_REND_AUDIO_CONFIG_5_1 || inConfig == IVAS_REND_AUDIO_CONFIG_7_1 ) ) ) ) + { + copyBufferTo2dArray( mcInput->base.inputBuffer, tmpRendBuffer ); - copyBufferTo2dArray( tmpRotBuffer, tmpCrendBuffer ); - count_free( tmpRotBuffer.data ); + if ( ( error = ivas_td_binaural_renderer_ext( &mcInput->tdRendWrapper, mcInput->base.inConfig, &mcInput->customLsInput, mcInput->base.ctx.pHeadRotData, + NULL, mcInput->hReverb, mcInput->base.inputBuffer.config.numSamplesPerChannel, tmpRendBuffer ) ) != IVAS_ERR_OK ) + { + return error; + } } else { - copyBufferTo2dArray( mcInput->base.inputBuffer, tmpCrendBuffer ); - } + /* apply rotation */ + if ( headRotEnabled ) + { + tmpRotBuffer = mcInput->base.inputBuffer; + tmpRotBuffer.data = malloc( tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels * sizeof( float ) ); + set_zero( tmpRotBuffer.data, tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels ); - /* call CREND */ - if ( ( error = ivas_rend_crendProcess( &mcInput->crendWrapper, mcInput->base.inConfig, outConfig, tmpCrendBuffer, *mcInput->base.ctx.pOutSampleRate + if ( ( error = rotateFrameMc( mcInput->base.inputBuffer, mcInput->base.inConfig, mcInput->customLsInput, mcInput->base.ctx.pHeadRotData, + mcInput->rot_gains_prev, mcInput->efapInWrapper.hEfap, tmpRotBuffer ) ) != IVAS_ERR_OK ) + { + return error; + } + + copyBufferTo2dArray( tmpRotBuffer, tmpRendBuffer ); + free( tmpRotBuffer.data ); + } + else + { + copyBufferTo2dArray( mcInput->base.inputBuffer, tmpRendBuffer ); + } + + /* call CREND */ + if ( ( error = ivas_rend_crendProcess( mcInput->crendWrapper, getIvasAudioConfigFromRendAudioConfig( mcInput->base.inConfig ), getIvasAudioConfigFromRendAudioConfig( outConfig ), + NULL, NULL, NULL, NULL, tmpRendBuffer, *mcInput->base.ctx.pOutSampleRate #ifdef SPLIT_REND_WITH_HEAD_ROT - , - 0 + , + 0 #endif - ) ) != IVAS_ERR_OK ) - { - return error; + ) ) != IVAS_ERR_OK ) + { + return error; + } } - accumulate2dArrayToBuffer( tmpCrendBuffer, &outAudio ); - + accumulate2dArrayToBuffer( tmpRendBuffer, &outAudio ); /* TODO tmu : needs delay compensation */ - renderLfeToBinaural( mcInput, outAudio ); + if ( ( error = renderLfeToBinaural( mcInput, outAudio ) ) != IVAS_ERR_OK ) + { + return error; + } - wmops_sub_end(); + pop_wmops(); return IVAS_ERR_OK; } @@ -5130,7 +5986,7 @@ static ivas_error renderMcCustomLsToBinauralRoom( IVAS_REND_AudioBuffer tmpMcBuffer; IVAS_REND_AudioBuffer *tmpBufPtr; - wmops_sub_start( "renderMcCustomLsToBinauralRoom" ); + push_wmops( "renderMcCustomLsToBinauralRoom" ); tmpRotBuffer = outAudio; /* avoid compilation warning */ @@ -5140,23 +5996,25 @@ static ivas_error renderMcCustomLsToBinauralRoom( if ( headRotEnabled ) { tmpRotBuffer = mcInput->base.inputBuffer; - tmpRotBuffer.data = count_malloc( tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels * sizeof( float ) ); + tmpRotBuffer.data = malloc( tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels * sizeof( float ) ); set_zero( tmpRotBuffer.data, tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels ); - rotateFrameMc( mcInput->base.inputBuffer, - mcInput->base.inConfig, - mcInput->customLsInput, - mcInput->base.ctx.pHeadRotData, - mcInput->rot_gains_prev, - mcInput->efapInWrapper.hEfap, - tmpRotBuffer ); + if ( ( error = rotateFrameMc( mcInput->base.inputBuffer, mcInput->base.inConfig, mcInput->customLsInput, mcInput->base.ctx.pHeadRotData, mcInput->rot_gains_prev, mcInput->efapInWrapper.hEfap, tmpRotBuffer ) ) != IVAS_ERR_OK ) + { + return error; + } } /* intermediate conversion to 7_1_4 */ tmpMcBuffer = mcInput->base.inputBuffer; - getAudioConfigNumChannels( IVAS_REND_AUDIO_CONFIG_7_1_4, &tmp ); - tmpMcBuffer.config.numChannels = (int16_t) tmp; - tmpMcBuffer.data = count_malloc( tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels * sizeof( float ) ); + + if ( ( error = getAudioConfigNumChannels( IVAS_REND_AUDIO_CONFIG_7_1_4, &tmp ) ) != IVAS_ERR_OK ) + { + return error; + } + + tmpMcBuffer.config.numChannels = tmp; + tmpMcBuffer.data = malloc( tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels * sizeof( float ) ); set_zero( tmpMcBuffer.data, tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels ); tmpBufPtr = ( headRotEnabled ) ? &tmpRotBuffer : &mcInput->base.inputBuffer; @@ -5167,7 +6025,8 @@ static ivas_error renderMcCustomLsToBinauralRoom( copyBufferTo2dArray( tmpMcBuffer, tmpCrendBuffer ); /* call CREND */ - if ( ( error = ivas_rend_crendProcess( &mcInput->crendWrapper, IVAS_REND_AUDIO_CONFIG_7_1_4, outConfig, tmpCrendBuffer, *mcInput->base.ctx.pOutSampleRate + if ( ( error = ivas_rend_crendProcess( mcInput->crendWrapper, AUDIO_CONFIG_7_1_4, getIvasAudioConfigFromRendAudioConfig( outConfig ), NULL, NULL, NULL, NULL, + tmpCrendBuffer, *mcInput->base.ctx.pOutSampleRate #ifdef SPLIT_REND_WITH_HEAD_ROT , 0 @@ -5180,27 +6039,30 @@ static ivas_error renderMcCustomLsToBinauralRoom( accumulate2dArrayToBuffer( tmpCrendBuffer, &outAudio ); /* TODO tmu : needs delay compensation */ - renderLfeToBinaural( mcInput, outAudio ); + if ( ( error = renderLfeToBinaural( mcInput, outAudio ) ) != IVAS_ERR_OK ) + { + return error; + } if ( headRotEnabled ) { - count_free( tmpRotBuffer.data ); + free( tmpRotBuffer.data ); } - count_free( tmpMcBuffer.data ); + free( tmpMcBuffer.data ); - wmops_sub_end(); + pop_wmops(); return IVAS_ERR_OK; } -static ivas_error renderMcToMc( +static void renderMcToMc( const input_mc *mcInput, IVAS_REND_AudioBuffer outAudio ) { int16_t i; IVAS_REND_AudioBuffer inAudio; - wmops_sub_start( "renderMcToMc" ); + push_wmops( "renderMcToMc" ); inAudio = mcInput->base.inputBuffer; @@ -5209,19 +6071,19 @@ static ivas_error renderMcToMc( renderBufferChannel( inAudio, i, mcInput->panGains[i], outAudio ); } - wmops_sub_end(); + pop_wmops(); - return IVAS_ERR_OK; + return; } -static ivas_error renderMcToSba( +static void renderMcToSba( const input_mc *mcInput, IVAS_REND_AudioBuffer outAudio ) { int16_t i; IVAS_REND_AudioBuffer inAudio; - wmops_sub_start( "renderMcToSba" ); + push_wmops( "renderMcToSba" ); inAudio = mcInput->base.inputBuffer; @@ -5230,9 +6092,9 @@ static ivas_error renderMcToSba( renderBufferChannel( inAudio, i, mcInput->panGains[i], outAudio ); } - wmops_sub_end(); + pop_wmops(); - return IVAS_ERR_OK; + return; } static ivas_error renderInputMc( @@ -5243,6 +6105,8 @@ static ivas_error renderInputMc( ivas_error error; IVAS_REND_AudioBuffer inAudio; + error = IVAS_ERR_OK; + inAudio = mcInput->base.inputBuffer; if ( mcInput->base.numNewSamplesPerChannel != outAudio.config.numSamplesPerChannel ) @@ -5261,10 +6125,10 @@ static ivas_error renderInputMc( switch ( getAudioConfigType( outConfig ) ) { case IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED: - error = renderMcToMc( mcInput, outAudio ); + renderMcToMc( mcInput, outAudio ); break; case IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS: - error = renderMcToSba( mcInput, outAudio ); + renderMcToSba( mcInput, outAudio ); break; case IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL: switch ( outConfig ) @@ -5289,13 +6153,8 @@ static ivas_error renderInputMc( default: return IVAS_ERR_INVALID_OUTPUT_FORMAT; } - /* Check error here to keep switch statement more compact */ - if ( error != IVAS_ERR_OK ) - { - return error; - } - return IVAS_ERR_OK; + return error; } static ivas_error renderActiveInputsMc( @@ -5313,6 +6172,7 @@ static ivas_error renderActiveInputsMc( /* Skip inactive inputs */ continue; } + if ( ( error = renderInputMc( pCurrentInput, hIvasRend->outputConfig, outAudio ) ) != IVAS_ERR_OK ) { return error; @@ -5322,14 +6182,14 @@ static ivas_error renderActiveInputsMc( return IVAS_ERR_OK; } -static ivas_error renderSbaToMc( +static void renderSbaToMc( const input_sba *sbaInput, IVAS_REND_AudioBuffer outAudio ) { int16_t i; IVAS_REND_AudioBuffer inAudio; - wmops_sub_start( "renderSbaToMc" ); + push_wmops( "renderSbaToMc" ); inAudio = sbaInput->base.inputBuffer; @@ -5338,19 +6198,19 @@ static ivas_error renderSbaToMc( renderBufferChannel( inAudio, i, sbaInput->hoaDecMtx[i], outAudio ); } - wmops_sub_end(); + pop_wmops(); - return IVAS_ERR_OK; + return; } -static ivas_error renderSbaToSba( +static void renderSbaToSba( const input_sba *sbaInput, IVAS_REND_AudioBuffer outAudio ) { int16_t i; IVAS_REND_AudioBuffer inAudio; - wmops_sub_start( "renderSbaToSba" ); + push_wmops( "renderSbaToSba" ); inAudio = sbaInput->base.inputBuffer; @@ -5359,15 +6219,17 @@ static ivas_error renderSbaToSba( renderBufferChannel( inAudio, i, sbaInput->hoaDecMtx[i], outAudio ); } - wmops_sub_end(); + pop_wmops(); - return IVAS_ERR_OK; + return; } #ifdef SPLIT_REND_LC3PLUS #ifdef SPLIT_REND_TD_POSE_CORRECTION static float tangent_pan( float azi, float OFFSET ) { + float A, g; + while ( azi > 180 ) { azi -= 360; @@ -5376,212 +6238,65 @@ static float tangent_pan( float azi, float OFFSET ) { azi += 360; } - float A = tanf( azi * PI_OVER_180 ) / tanf( OFFSET * PI_OVER_180 ); - float g = ( A + 1 ) / 2; + A = tanf( azi * PI_OVER_180 ) / tanf( OFFSET * PI_OVER_180 ); + g = ( A + 1 ) / 2; return g; } -static ivas_error interpolate_1dof( - const split_post_rend_multisignal_poses_1dof *spp_1dof, - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, - const float pose_diff[3], - float outBuffer[BINAURAL_CHANNELS][L_FRAME48k], - int16_t subframe_idx, - int16_t subframe_len ) +static float wrap_angle( + const float a /* i : angle in degrees to wrap */ +) { - int16_t i; - int16_t smpl_idx, smpl_loc; - float fade_in, fade_out; - float tmp_ch0, tmp_ch1; - float g; - float yaw_offset, yaw_diff; - float yaw_offset_hlf; - - if ( NULL == spp_1dof || NULL == pMultiBinPoseData ) + float tmp; + tmp = fmodf( a + 180, 360 ); + if ( tmp < 0 ) { - return IVAS_ERR_UNEXPECTED_NULL_POINTER; + tmp += 360; } + return tmp - 180; +} + +/* TODO : copied from ivas_efap.c - move to common location */ +static int16_t in_tri( + float A[2], /* i : Coordinate of one apex of the triangle */ + float B[2], /* i : Coordinate of one apex of the triangle */ + float C[2], /* i : Coordinate of one apex of the triangle */ + float P_minus_A[2] /* i : Value of (P - A) */ +) +{ + float tmpDot1[2], tmpDot2[2]; + float matInv[2][2]; + float invFactor; + float S[2]; + float thresh = 1e-6f; - yaw_diff = pose_diff[0]; - yaw_offset = fabsf( pMultiBinPoseData->relative_head_poses[spp_1dof->yaw_l_idx][0] ); - yaw_offset_hlf = yaw_offset / 2; + /* + Not a Valid Triangle : Colinear edges + In the matlab implementation, the rcond() function is used + Since it's very complex to implement this in C + I'll just compute the determinant and if it's equal to 0, that means the two vectors are colinear + */ - /* update state */ - mvr2r( pMultiBinPoseData->gains, pMultiBinPoseData->gains_prev, MAX_HEAD_ROT_POSES ); - set_zero( pMultiBinPoseData->gains, MAX_HEAD_ROT_POSES ); - for ( i = 0; i < 3; ++i ) + v_sub( B, A, tmpDot1, 2 ); + v_sub( C, A, tmpDot2, 2 ); + + /* Verification of the non-colinearity */ + invFactor = tmpDot1[0] * tmpDot2[1] - tmpDot1[1] * tmpDot2[0]; + + if ( fabsf( invFactor ) < thresh ) { - pMultiBinPoseData->swap_flag_prev[i] = pMultiBinPoseData->swap_flag[i]; - pMultiBinPoseData->swap_flag[i] = false; + return 0; } - /* select signals to form the tangent panning pair - swap channels to approximate large yaw offsets */ - if ( yaw_diff >= 0.f ) - { - if ( yaw_diff <= yaw_offset ) - { - /* front left */ - g = tangent_pan( yaw_diff - yaw_offset_hlf, yaw_offset_hlf ); - pMultiBinPoseData->gains[P1DOF_DEFAULT] = g; - pMultiBinPoseData->gains[P1DOF_YAW_L] = 1 - g; - } - else if ( yaw_diff > yaw_offset && yaw_diff < ( 180.f - yaw_offset ) ) - { - /* left */ - g = tangent_pan( yaw_diff - 90.f, 90.f - yaw_offset ); + invFactor = 1.f / invFactor; + matInv[0][0] = tmpDot2[1] * invFactor; + matInv[0][1] = -tmpDot2[0] * invFactor; + matInv[1][0] = -tmpDot1[1] * invFactor; + matInv[1][1] = tmpDot1[0] * invFactor; - pMultiBinPoseData->gains[P1DOF_YAW_L] = 1 - g; - pMultiBinPoseData->swap_flag[2] = true; - pMultiBinPoseData->gains[P1DOF_YAW_R] = g; - } - else if ( yaw_diff >= ( 180.f - yaw_offset ) && yaw_diff <= 180.f ) - { - /* rear left */ - g = tangent_pan( yaw_diff - 180.f + yaw_offset_hlf, yaw_offset_hlf ); - - pMultiBinPoseData->swap_flag[1] = true; - pMultiBinPoseData->gains[P1DOF_DEFAULT] = g; - pMultiBinPoseData->swap_flag[2] = true; - pMultiBinPoseData->gains[P1DOF_YAW_R] = 1 - g; - } - else - { - return IVAS_ERR_INTERNAL_FATAL; - } - } - else /* yaw_diff < 0.f */ - { - if ( yaw_diff >= -yaw_offset ) - { - /* front right */ - g = tangent_pan( -yaw_diff - yaw_offset_hlf, yaw_offset_hlf ); - pMultiBinPoseData->gains[P1DOF_YAW_R] = g; - pMultiBinPoseData->gains[P1DOF_DEFAULT] = 1 - g; - } - else if ( yaw_diff < -yaw_offset && yaw_diff > -( 180.f - yaw_offset ) ) - { - /* right */ - g = tangent_pan( -yaw_diff - 90.f, 90.f - yaw_offset ); - pMultiBinPoseData->swap_flag[0] = true; - pMultiBinPoseData->gains[P1DOF_YAW_R] = 1 - g; - pMultiBinPoseData->gains[P1DOF_YAW_L] = g; - } - else if ( yaw_diff <= -( 180.f - yaw_offset ) && yaw_diff >= -180.f ) - { - /* rear right */ - g = tangent_pan( -yaw_diff - 180.f + yaw_offset_hlf, yaw_offset_hlf ); - - pMultiBinPoseData->swap_flag[0] = true; - pMultiBinPoseData->gains[P1DOF_YAW_L] = 1 - g; - pMultiBinPoseData->swap_flag[1] = true; - pMultiBinPoseData->gains[P1DOF_DEFAULT] = g; - } - else - { - return IVAS_ERR_INTERNAL_FATAL; - } - } - - for ( smpl_idx = 0; smpl_idx < subframe_len; ++smpl_idx ) - { - smpl_loc = subframe_idx * subframe_len + smpl_idx; - fade_in = pMultiBinPoseData->xfade[smpl_idx]; - fade_out = 1 - fade_in; - - for ( i = 0; i < 3; ++i ) - { - /* fade in new gains */ - if ( ( pMultiBinPoseData->swap_flag[0] && ( i == P1DOF_YAW_L ) ) || - ( pMultiBinPoseData->swap_flag[1] && ( i == P1DOF_DEFAULT ) ) || - ( pMultiBinPoseData->swap_flag[2] && ( i == P1DOF_YAW_R ) ) ) - { - tmp_ch0 = fade_in * pMultiBinPoseData->gains[i] * spp_1dof->poses[i][1][smpl_loc]; - tmp_ch1 = fade_in * pMultiBinPoseData->gains[i] * spp_1dof->poses[i][0][smpl_loc]; - } - else - { - tmp_ch0 = fade_in * pMultiBinPoseData->gains[i] * spp_1dof->poses[i][0][smpl_loc]; - tmp_ch1 = fade_in * pMultiBinPoseData->gains[i] * spp_1dof->poses[i][1][smpl_loc]; - } - outBuffer[0][smpl_loc] += tmp_ch0; - outBuffer[1][smpl_loc] += tmp_ch1; - - /* fade out old gains */ - if ( ( pMultiBinPoseData->swap_flag_prev[0] && ( i == P1DOF_YAW_L ) ) || - ( pMultiBinPoseData->swap_flag_prev[1] && ( i == P1DOF_DEFAULT ) ) || - ( pMultiBinPoseData->swap_flag_prev[2] && ( i == P1DOF_YAW_R ) ) ) - { - tmp_ch0 = fade_out * pMultiBinPoseData->gains_prev[i] * spp_1dof->poses[i][1][smpl_loc]; - tmp_ch1 = fade_out * pMultiBinPoseData->gains_prev[i] * spp_1dof->poses[i][0][smpl_loc]; - } - else - { - tmp_ch0 = fade_out * pMultiBinPoseData->gains_prev[i] * spp_1dof->poses[i][0][smpl_loc]; - tmp_ch1 = fade_out * pMultiBinPoseData->gains_prev[i] * spp_1dof->poses[i][1][smpl_loc]; - } - outBuffer[0][smpl_loc] += tmp_ch0; - outBuffer[1][smpl_loc] += tmp_ch1; - } - } - - return IVAS_ERR_OK; -} - -static float wrap_angle( - const float a /* i : angle in degrees to wrap */ -) -{ - float tmp; - tmp = fmodf( a + 180, 360 ); - if ( tmp < 0 ) - { - tmp += 360; - } - return tmp - 180; -} - -/* TODO : copied from ivas_efap.c - move to common location */ -static int16_t in_tri( - float A[2], /* i : Coordinate of one apex of the triangle */ - float B[2], /* i : Coordinate of one apex of the triangle */ - float C[2], /* i : Coordinate of one apex of the triangle */ - float P_minus_A[2] /* i : Value of (P - A) */ -) -{ - float tmpDot1[2], tmpDot2[2]; - float matInv[2][2]; - float invFactor; - float S[2]; - float thresh = 1e-6f; - - /* - Not a Valid Triangle : Colinear edges - In the matlab implementation, the rcond() function is used - Since it's very complex to implement this in C - I'll just compute the determinant and if it's equal to 0, that means the two vectors are colinear - */ - - v_sub( B, A, tmpDot1, 2 ); - v_sub( C, A, tmpDot2, 2 ); - - /* Verification of the non-colinearity */ - invFactor = tmpDot1[0] * tmpDot2[1] - tmpDot1[1] * tmpDot2[0]; - - if ( fabsf( invFactor ) < thresh ) - { - return 0; - } - - invFactor = 1.f / invFactor; - matInv[0][0] = tmpDot2[1] * invFactor; - matInv[0][1] = -tmpDot2[0] * invFactor; - matInv[1][0] = -tmpDot1[1] * invFactor; - matInv[1][1] = tmpDot1[0] * invFactor; - - /* Computing S = matInv*(P-A) */ - S[0] = ( matInv[0][0] * P_minus_A[0] ) + ( matInv[0][1] * P_minus_A[1] ); - S[1] = ( matInv[1][0] * P_minus_A[0] ) + ( matInv[1][1] * P_minus_A[1] ); + /* Computing S = matInv*(P-A) */ + S[0] = ( matInv[0][0] * P_minus_A[0] ) + ( matInv[0][1] * P_minus_A[1] ); + S[1] = ( matInv[1][0] * P_minus_A[0] ) + ( matInv[1][1] * P_minus_A[1] ); /* Checking if we are in the triangle; For the theory, check Christian Borss article, section 3.2 */ if ( S[0] < -thresh || S[1] < -thresh || S[0] + S[1] > 1 + thresh ) @@ -5676,159 +6391,118 @@ static void get_poly_gains( return; } - -static ivas_error interpolate_2dof( - const split_post_rend_multisignal_poses_2dof *spp_2dof, - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, - const float pose_diff[3], - float outBuffer[BINAURAL_CHANNELS][L_FRAME48k], - int16_t subframe_idx, - int16_t subframe_len ) +static void split_mspc_getPoseDiff( + const IVAS_QUATERNION headpose_current, + const IVAS_QUATERNION headpose_bitstream, + float *pose_diff ) { - int16_t i, ch; - int16_t smpl_idx, smpl_loc; - int16_t poly_gain_map[4]; - float fade_in, fade_out; - float tmp_ch0, tmp_ch1; - float yaw_diff, pitch_diff; - float yaw_offset, pitch_offset; - float poly_gain_norm; - float poly_yaw[4]; - float poly_pitch[4]; - float poly_gains[4]; + IVAS_QUATERNION headpose_current_euler; + IVAS_QUATERNION headpose_bitstream_euler; - if ( NULL == spp_2dof || NULL == pMultiBinPoseData ) + /* current head pose */ + headpose_current_euler.w = -3.0f; + if ( headpose_current.w != -3.0f ) { - return IVAS_ERR_UNEXPECTED_NULL_POINTER; + Quat2EulerDegree( headpose_current, /* TODO tmu : needs a bugfix for ordering */ + &headpose_current_euler.z, + &headpose_current_euler.y, + &headpose_current_euler.x ); + } + else + { + headpose_current_euler.x = headpose_current.x; + headpose_current_euler.y = headpose_current.y; + headpose_current_euler.z = headpose_current.z; } - yaw_diff = pose_diff[0]; - pitch_diff = pose_diff[1]; + /* bitstream head pose */ + headpose_bitstream_euler.w = -3.0f; + if ( headpose_bitstream.w != -3.0f ) + { + Quat2EulerDegree( headpose_bitstream, /* TODO tmu : needs a bugfix for ordering */ + &headpose_bitstream_euler.z, + &headpose_bitstream_euler.y, + &headpose_bitstream_euler.x ); + } + else + { + headpose_bitstream_euler.x = headpose_bitstream.x; + headpose_bitstream_euler.y = headpose_bitstream.y; + headpose_bitstream_euler.z = headpose_bitstream.z; + } - yaw_offset = fabsf( pMultiBinPoseData->relative_head_poses[spp_2dof->pose_idx[0]][0] ); - pitch_offset = fabsf( pMultiBinPoseData->relative_head_poses[spp_2dof->pose_idx[2]][1] ); + /* compute pose diff */ + pose_diff[0] = headpose_current_euler.x - headpose_bitstream_euler.x; + pose_diff[1] = headpose_current_euler.y - headpose_bitstream_euler.y; + pose_diff[2] = headpose_current_euler.z - headpose_bitstream_euler.z; - /* clamp pitch */ - if ( fabsf( pitch_diff ) > pitch_offset ) + pose_diff[0] = wrap_angle( pose_diff[0] ); + pose_diff[1] = wrap_angle( pose_diff[1] ); + pose_diff[2] = wrap_angle( pose_diff[2] ); + + return; +} + +static ivas_error split_mspc_get0DofGains( + split_mspc_pose_data *spp, + MULTI_BIN_REND_TD_POSE_CORRECTION_DATA *td_data ) +{ + td_data->gains[spp->pose_idx[MSPC_POSE_DEFAULT]] = 1.f; + + return IVAS_ERR_OK; +} + +static ivas_error split_mspc_get1DofGains( + float yaw_diff, + float yaw_offset, + split_mspc_pose_data *spp, + MULTI_BIN_REND_TD_POSE_CORRECTION_DATA *td_data ) +{ + float g; + float yaw_offset_hlf; + + if ( fabsf( yaw_diff ) > 180.f ) { - pitch_diff = copysignf( pitch_offset, pitch_diff ); + return IVAS_ERR_INTERNAL_FATAL; } - /* update state */ - mvr2r( pMultiBinPoseData->gains, pMultiBinPoseData->gains_prev, MAX_HEAD_ROT_POSES ); - set_zero( pMultiBinPoseData->gains, MAX_HEAD_ROT_POSES ); - for ( i = 0; i < 3; ++i ) + if ( yaw_diff == 0 ) { - pMultiBinPoseData->swap_flag_prev[i] = pMultiBinPoseData->swap_flag[i]; - pMultiBinPoseData->swap_flag[i] = false; + return split_mspc_get0DofGains( spp, td_data ); } - /* select signals to form the EFAP polygon vertices + yaw_offset_hlf = yaw_offset / 2.f; + + /* select signals to form the tangent panning pair swap channels to approximate large yaw offsets */ if ( yaw_diff >= 0.f ) { if ( yaw_diff <= yaw_offset ) { /* front left */ - poly_gain_map[0] = P2DOF_DEFAULT; - poly_yaw[0] = 0.f; - poly_pitch[0] = 0.f; - - poly_gain_map[1] = P2DOF_YAW_L; - poly_yaw[1] = yaw_offset; - poly_pitch[1] = 0.f; - - if ( pitch_diff >= 0.f ) - { - poly_gain_map[2] = P2DOF_PITCH_U; - poly_yaw[2] = 0.f; - poly_pitch[2] = pitch_offset; - - poly_gain_map[3] = P2DOF_YAW_LU; - poly_yaw[3] = yaw_offset; - poly_pitch[3] = pitch_offset; - } - else - { - poly_gain_map[2] = P2DOF_PITCH_D; - poly_yaw[2] = 0.f; - poly_pitch[2] = -pitch_offset; + g = tangent_pan( yaw_diff - yaw_offset_hlf, yaw_offset_hlf ); - poly_gain_map[3] = P2DOF_YAW_LD; - poly_yaw[3] = yaw_offset; - poly_pitch[3] = -pitch_offset; - } + td_data->gains[spp->pose_idx[MSPC_POSE_YAW_L]] = g; + td_data->gains[spp->pose_idx[MSPC_POSE_DEFAULT]] = 1 - g; } else if ( yaw_diff > yaw_offset && yaw_diff < ( 180.f - yaw_offset ) ) { /* left */ - poly_gain_map[0] = P2DOF_YAW_L; - poly_yaw[0] = yaw_offset; - poly_pitch[0] = 0.f; - - pMultiBinPoseData->swap_flag[2] = true; - poly_gain_map[1] = P2DOF_YAW_R; - poly_yaw[1] = 180.f - yaw_offset; - poly_pitch[1] = 0.f; - - if ( pitch_diff >= 0.f ) - { - poly_gain_map[2] = P2DOF_YAW_LU; - poly_yaw[2] = yaw_offset; - poly_pitch[2] = pitch_offset; - - poly_gain_map[3] = P2DOF_YAW_RU; - poly_yaw[3] = 180.f - yaw_offset; - poly_pitch[3] = pitch_offset; - } - else - { - poly_gain_map[2] = P2DOF_YAW_LD; - poly_yaw[2] = yaw_offset; - poly_pitch[2] = -pitch_offset; + g = tangent_pan( yaw_diff - 90.f, 90.f - yaw_offset ); - poly_gain_map[3] = P2DOF_YAW_RD; - poly_yaw[3] = 180.f - yaw_offset; - poly_pitch[3] = -pitch_offset; - } + td_data->swap_yaw_r = true; + td_data->gains[spp->pose_idx[MSPC_POSE_YAW_R]] = g; + td_data->gains[spp->pose_idx[MSPC_POSE_YAW_L]] = 1 - g; } else if ( yaw_diff >= ( 180.f - yaw_offset ) && yaw_diff <= 180.f ) { /* rear left */ - pMultiBinPoseData->swap_flag[2] = true; - poly_gain_map[0] = P2DOF_YAW_R; - poly_yaw[0] = 180.f - yaw_offset; - poly_pitch[0] = 0.f; - - pMultiBinPoseData->swap_flag[1] = true; - poly_gain_map[1] = P2DOF_DEFAULT; - poly_yaw[1] = 180.f; - poly_pitch[1] = 0.f; - - if ( pitch_diff >= 0.f ) - { - poly_gain_map[2] = P2DOF_YAW_RU; - poly_yaw[2] = 180.f - yaw_offset; - poly_pitch[2] = pitch_offset; - - poly_gain_map[3] = P2DOF_PITCH_U; - poly_yaw[3] = 180.f; - poly_pitch[3] = pitch_offset; - } - else - { - poly_gain_map[2] = P2DOF_YAW_RD; - poly_yaw[2] = 180.f - yaw_offset; - poly_pitch[2] = -pitch_offset; + g = tangent_pan( yaw_diff - 180.f + yaw_offset_hlf, yaw_offset_hlf ); - poly_gain_map[3] = P2DOF_PITCH_D; - poly_yaw[3] = 180.f; - poly_pitch[3] = -pitch_offset; - } - } - else - { - return IVAS_ERR_INTERNAL_FATAL; + td_data->swap_default = true; + td_data->gains[spp->pose_idx[MSPC_POSE_DEFAULT]] = g; + td_data->swap_yaw_r = true; + td_data->gains[spp->pose_idx[MSPC_POSE_YAW_R]] = 1 - g; } } else /* yaw_diff < 0.f */ @@ -5836,809 +6510,607 @@ static ivas_error interpolate_2dof( if ( yaw_diff >= -yaw_offset ) { /* front right */ - poly_gain_map[0] = P2DOF_DEFAULT; - poly_yaw[0] = 0.f; - poly_pitch[0] = 0.f; - - poly_gain_map[1] = P2DOF_YAW_R; - poly_yaw[1] = -yaw_offset; - poly_pitch[1] = 0.f; - - if ( pitch_diff >= 0.f ) - { - poly_gain_map[2] = P2DOF_PITCH_U; - poly_yaw[2] = 0.f; - poly_pitch[2] = pitch_offset; - - poly_gain_map[3] = P2DOF_YAW_RU; - poly_yaw[3] = -yaw_offset; - poly_pitch[3] = pitch_offset; - } - else - { - poly_gain_map[2] = P2DOF_PITCH_D; - poly_yaw[2] = 0.f; - poly_pitch[2] = -pitch_offset; + g = tangent_pan( -yaw_diff - yaw_offset_hlf, yaw_offset_hlf ); - poly_gain_map[3] = P2DOF_YAW_RD; - poly_yaw[3] = -yaw_offset; - poly_pitch[3] = -pitch_offset; - } + td_data->gains[spp->pose_idx[MSPC_POSE_YAW_R]] = g; + td_data->gains[spp->pose_idx[MSPC_POSE_DEFAULT]] = 1 - g; } else if ( yaw_diff < -yaw_offset && yaw_diff > -( 180.f - yaw_offset ) ) { /* right */ - poly_gain_map[0] = P2DOF_YAW_R; - poly_yaw[0] = -yaw_offset; - poly_pitch[0] = 0.f; - - pMultiBinPoseData->swap_flag[0] = true; - poly_gain_map[1] = P2DOF_YAW_L; - poly_yaw[1] = -( 180.f - yaw_offset ); - poly_pitch[1] = 0.f; - - if ( pitch_diff >= 0 ) - { - poly_gain_map[2] = P2DOF_YAW_RU; - poly_yaw[2] = -yaw_offset; - poly_pitch[2] = pitch_offset; - - poly_gain_map[3] = P2DOF_YAW_LU; - poly_yaw[3] = -( 180.f - yaw_offset ); - poly_pitch[3] = pitch_offset; - } - else - { - poly_gain_map[2] = P2DOF_YAW_RD; - poly_yaw[2] = -yaw_offset; - poly_pitch[2] = -pitch_offset; + g = tangent_pan( -yaw_diff - 90.f, 90.f - yaw_offset ); - poly_gain_map[3] = P2DOF_YAW_LD; - poly_yaw[3] = -( 180.f - yaw_offset ); - poly_pitch[3] = -pitch_offset; - } + td_data->swap_yaw_l = true; + td_data->gains[spp->pose_idx[MSPC_POSE_YAW_L]] = g; + td_data->gains[spp->pose_idx[MSPC_POSE_YAW_R]] = 1 - g; } else if ( yaw_diff <= -( 180.f - yaw_offset ) && yaw_diff >= -180.f ) { /* rear right */ - pMultiBinPoseData->swap_flag[0] = true; - poly_gain_map[0] = P2DOF_YAW_L; - poly_yaw[0] = -( 180.f - yaw_offset ); - poly_pitch[0] = 0.f; - - pMultiBinPoseData->swap_flag[1] = true; - poly_gain_map[1] = P2DOF_DEFAULT; - poly_yaw[1] = 180.f; - poly_pitch[1] = 0.f; - - if ( pitch_diff >= 0 ) - { - poly_gain_map[2] = P2DOF_YAW_LU; - poly_yaw[2] = -( 180.f - yaw_offset ); - poly_pitch[2] = pitch_offset; - - poly_gain_map[3] = P2DOF_PITCH_U; - poly_yaw[3] = -180.f; - poly_pitch[3] = pitch_offset; - } - else - { - poly_gain_map[2] = P2DOF_YAW_LD; - poly_yaw[2] = -( 180.f - yaw_offset ); - poly_pitch[2] = -pitch_offset; - - poly_gain_map[3] = P2DOF_PITCH_D; - poly_yaw[3] = -180.f; - poly_pitch[3] = -pitch_offset; - } - } - else - { - return IVAS_ERR_INTERNAL_FATAL; - } - } - - /* EFAP panning */ - set_zero( poly_gains, 4 ); - get_poly_gains( yaw_diff, pitch_diff, poly_yaw, poly_pitch, 4, poly_gains ); - for ( i = 0; i < 4; i++ ) - { - if ( fabsf( poly_gains[i] ) < 1e-6 ) - { - poly_gains[i] = 0.f; - } - } - - /* normalise and update gains in struct */ - poly_gain_norm = 1.f / sum_f( poly_gains, 4 ); - for ( i = 0; i < 4; i++ ) - { - ch = poly_gain_map[i]; - - /* distribute gains if virtual */ - if ( ch == P2DOF_YAW_L ) - { - pMultiBinPoseData->gains[P2DOF_YAW_LU] += 0.5 * poly_gains[i] * poly_gain_norm; - pMultiBinPoseData->gains[P2DOF_YAW_LD] += 0.5 * poly_gains[i] * poly_gain_norm; - } - else if ( ch == P2DOF_YAW_R ) - { - pMultiBinPoseData->gains[P2DOF_YAW_RU] += 0.5 * poly_gains[i] * poly_gain_norm; - pMultiBinPoseData->gains[P2DOF_YAW_RD] += 0.5 * poly_gains[i] * poly_gain_norm; - } - else - { - pMultiBinPoseData->gains[ch] += poly_gains[i] * poly_gain_norm; - } - } - - /* apply gains with xfading */ - for ( smpl_idx = 0; smpl_idx < subframe_len; ++smpl_idx ) - { - smpl_loc = subframe_idx * subframe_len + smpl_idx; - fade_in = pMultiBinPoseData->xfade[smpl_idx]; - fade_out = 1.f - fade_in; - - for ( i = 0; i < MAX_HEAD_ROT_POSES - 1; ++i ) - { - /* fade in new gains */ - if ( ( pMultiBinPoseData->swap_flag[0] && ( i == P2DOF_YAW_LU || i == P2DOF_YAW_LD ) ) || - ( pMultiBinPoseData->swap_flag[1] && ( i == P2DOF_DEFAULT || i == P2DOF_PITCH_U || i == P2DOF_PITCH_D ) ) || - ( pMultiBinPoseData->swap_flag[2] && ( i == P2DOF_YAW_RU || i == P2DOF_YAW_RD ) ) ) - { - tmp_ch0 = fade_in * pMultiBinPoseData->gains[i] * spp_2dof->poses[i][1][smpl_loc]; - tmp_ch1 = fade_in * pMultiBinPoseData->gains[i] * spp_2dof->poses[i][0][smpl_loc]; - } - else - { - tmp_ch0 = fade_in * pMultiBinPoseData->gains[i] * spp_2dof->poses[i][0][smpl_loc]; - tmp_ch1 = fade_in * pMultiBinPoseData->gains[i] * spp_2dof->poses[i][1][smpl_loc]; - } - outBuffer[0][smpl_loc] += tmp_ch0; - outBuffer[1][smpl_loc] += tmp_ch1; - - /* fade out old gains */ - if ( ( pMultiBinPoseData->swap_flag_prev[0] && ( i == P2DOF_YAW_LU || i == P2DOF_YAW_LD ) ) || - ( pMultiBinPoseData->swap_flag_prev[1] && ( i == P2DOF_DEFAULT || i == P2DOF_PITCH_U || i == P2DOF_PITCH_D ) ) || - ( pMultiBinPoseData->swap_flag_prev[2] && ( i == P2DOF_YAW_RU || i == P2DOF_YAW_RD ) ) ) - { - tmp_ch0 = fade_out * pMultiBinPoseData->gains_prev[i] * spp_2dof->poses[i][1][smpl_loc]; - tmp_ch1 = fade_out * pMultiBinPoseData->gains_prev[i] * spp_2dof->poses[i][0][smpl_loc]; - } - else - { - tmp_ch0 = fade_out * pMultiBinPoseData->gains_prev[i] * spp_2dof->poses[i][0][smpl_loc]; - tmp_ch1 = fade_out * pMultiBinPoseData->gains_prev[i] * spp_2dof->poses[i][1][smpl_loc]; - } - outBuffer[0][smpl_loc] += tmp_ch0; - outBuffer[1][smpl_loc] += tmp_ch1; - } - } - - return IVAS_ERR_OK; -} - -static ivas_error interpolate_3dof( - const split_post_rend_multisignal_poses_3dof *spp_3dof, - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, - const float pose_diff[3], - float outBuffer[BINAURAL_CHANNELS][L_FRAME48k], - int16_t subframe_idx, - int16_t subframe_len ) -{ - int16_t i, ch; - int16_t smpl_idx, smpl_loc; - int16_t poly_gain_map[4]; - float fade_in, fade_out; - float tmp_ch0, tmp_ch1; - float yaw_diff, pitch_diff, roll_diff; - float yaw_offset, pitch_offset, roll_offset; - float poly_gain_norm; - float poly_yaw[4]; - float poly_pitch[4]; - float poly_gains[4]; - - if ( NULL == spp_3dof || NULL == pMultiBinPoseData ) - { - return IVAS_ERR_UNEXPECTED_NULL_POINTER; - } - - yaw_diff = pose_diff[0]; - pitch_diff = pose_diff[1]; - roll_diff = pose_diff[2]; - - yaw_offset = fabsf( pMultiBinPoseData->relative_head_poses[spp_3dof->pose_idx[0]][0] ); - pitch_offset = fabsf( pMultiBinPoseData->relative_head_poses[spp_3dof->pose_idx[2]][1] ); - roll_offset = fabsf( pMultiBinPoseData->relative_head_poses[spp_3dof->pose_idx[6]][2] ); - - /* clamp pitch */ - if ( fabsf( pitch_diff ) > pitch_offset ) - { - pitch_diff = copysignf( pitch_offset, pitch_diff ); - } - - /* clamp roll */ - if ( fabsf( roll_diff ) > roll_offset ) - { - roll_diff = copysignf( roll_offset, roll_diff ); - } - - /* update state */ - mvr2r( pMultiBinPoseData->gains, pMultiBinPoseData->gains_prev, MAX_HEAD_ROT_POSES ); - set_zero( pMultiBinPoseData->gains, MAX_HEAD_ROT_POSES ); - for ( i = 0; i < 4; ++i ) - { - pMultiBinPoseData->swap_flag_prev[i] = pMultiBinPoseData->swap_flag[i]; - pMultiBinPoseData->swap_flag[i] = false; - } - - /* roll compensation */ - if ( roll_diff > 0.f ) - { - pMultiBinPoseData->gains[P3DOF_ROLL_C] = roll_diff / roll_offset; - } - else if ( roll_diff < 0.f ) - { - pMultiBinPoseData->swap_flag[3] = true; - pMultiBinPoseData->gains[P3DOF_ROLL_C] = -roll_diff / roll_offset; - } - - /* select signals to form the EFAP polygon vertices - swap channels to approximate large yaw offsets */ - if ( yaw_diff >= 0.f ) - { - if ( yaw_diff <= yaw_offset ) - { - /* front left */ - poly_gain_map[0] = P3DOF_DEFAULT; - poly_yaw[0] = 0.f; - poly_pitch[0] = 0.f; - - poly_gain_map[1] = P3DOF_YAW_L; - poly_yaw[1] = yaw_offset; - poly_pitch[1] = 0.f; - - if ( pitch_diff >= 0.f ) - { - poly_gain_map[2] = P3DOF_PITCH_U; - poly_yaw[2] = 0.f; - poly_pitch[2] = pitch_offset; - - poly_gain_map[3] = P3DOF_YAW_LU; - poly_yaw[3] = yaw_offset; - poly_pitch[3] = pitch_offset; - } - else - { - poly_gain_map[2] = P3DOF_PITCH_D; - poly_yaw[2] = 0.f; - poly_pitch[2] = -pitch_offset; + g = tangent_pan( -yaw_diff - 180.f + yaw_offset_hlf, yaw_offset_hlf ); - poly_gain_map[3] = P3DOF_YAW_LD; - poly_yaw[3] = yaw_offset; - poly_pitch[3] = -pitch_offset; - } + td_data->swap_default = true; + td_data->gains[spp->pose_idx[MSPC_POSE_DEFAULT]] = g; + td_data->swap_yaw_l = true; + td_data->gains[spp->pose_idx[MSPC_POSE_YAW_L]] = 1 - g; } - else if ( yaw_diff > yaw_offset && yaw_diff < ( 180.f - yaw_offset ) ) - { - /* left */ - poly_gain_map[0] = P3DOF_YAW_L; - poly_yaw[0] = yaw_offset; - poly_pitch[0] = 0.f; + } - pMultiBinPoseData->swap_flag[2] = true; - poly_gain_map[1] = P3DOF_YAW_R; - poly_yaw[1] = 180.f - yaw_offset; - poly_pitch[1] = 0.f; + return IVAS_ERR_OK; +} - if ( pitch_diff >= 0.f ) - { - poly_gain_map[2] = P3DOF_YAW_LU; - poly_yaw[2] = yaw_offset; - poly_pitch[2] = pitch_offset; +static ivas_error split_mspc_get2DofGains( + float yaw_diff, + float pitch_diff, + float yaw_offset, + float pitch_offset, + split_mspc_pose_data *spp, + MULTI_BIN_REND_TD_POSE_CORRECTION_DATA *td_data ) +{ + int16_t i, nvtx; + float a, c; + float abs_yaw_diff; + float tri_azi[3], tri_ele[3]; + float tri_gains[3]; + split_mspc_pose tri_ch_map[3]; - poly_gain_map[3] = P3DOF_YAW_RU; - poly_yaw[3] = 180.f - yaw_offset; - poly_pitch[3] = pitch_offset; - } - else - { - poly_gain_map[2] = P3DOF_YAW_LD; - poly_yaw[2] = yaw_offset; - poly_pitch[2] = -pitch_offset; + abs_yaw_diff = fabsf( yaw_diff ); + if ( abs_yaw_diff > 180.f ) + { + return IVAS_ERR_INTERNAL_FATAL; + } - poly_gain_map[3] = P3DOF_YAW_RD; - poly_yaw[3] = 180.f - yaw_offset; - poly_pitch[3] = -pitch_offset; - } - } - else if ( yaw_diff >= ( 180.f - yaw_offset ) && yaw_diff <= 180.f ) - { - /* rear left */ - pMultiBinPoseData->swap_flag[2] = true; - poly_gain_map[0] = P3DOF_YAW_R; - poly_yaw[0] = 180.f - yaw_offset; - poly_pitch[0] = 0.f; + /* clamp pitch */ + if ( fabsf( pitch_diff ) > pitch_offset ) + { + pitch_diff = copysignf( pitch_offset, pitch_diff ); + } - pMultiBinPoseData->swap_flag[1] = true; - poly_gain_map[1] = P3DOF_DEFAULT; - poly_yaw[1] = 180.f; - poly_pitch[1] = 0.f; + /* determine triangles for gain computation */ + nvtx = 0; + if ( abs_yaw_diff <= yaw_offset ) + { + /* front */ + /* vertex 1 */ + tri_azi[nvtx] = 0.f; + tri_ele[nvtx] = 0.f; + tri_ch_map[nvtx] = MSPC_POSE_DEFAULT; + nvtx++; - if ( pitch_diff >= 0.f ) - { - poly_gain_map[2] = P3DOF_YAW_RU; - poly_yaw[2] = 180.f - yaw_offset; - poly_pitch[2] = pitch_offset; + /* vertices 2 and 3 */ + if ( pitch_diff >= 0.f && pitch_diff > abs_yaw_diff ) + { + tri_azi[nvtx] = 0.f; + tri_ele[nvtx] = pitch_offset; + tri_ch_map[nvtx] = MSPC_POSE_PITCH_U; + nvtx++; - poly_gain_map[3] = P3DOF_PITCH_U; - poly_yaw[3] = 180.f; - poly_pitch[3] = pitch_offset; - } - else - { - poly_gain_map[2] = P3DOF_YAW_RD; - poly_yaw[2] = 180.f - yaw_offset; - poly_pitch[2] = -pitch_offset; + tri_azi[nvtx] = copysignf( yaw_offset, yaw_diff ); + tri_ele[nvtx] = pitch_offset; + tri_ch_map[nvtx] = ( yaw_diff >= 0.f ) ? MSPC_POSE_YAW_L_PITCH_U : MSPC_POSE_YAW_R_PITCH_U; + nvtx++; + } + else if ( pitch_diff < 0.f && pitch_diff < -abs_yaw_diff ) + { + tri_azi[nvtx] = 0.f; + tri_ele[nvtx] = -pitch_offset; + tri_ch_map[nvtx] = MSPC_POSE_PITCH_D; + nvtx++; - poly_gain_map[3] = P3DOF_PITCH_D; - poly_yaw[3] = 180.f; - poly_pitch[3] = -pitch_offset; - } + tri_azi[nvtx] = copysignf( yaw_offset, yaw_diff ); + tri_ele[nvtx] = -pitch_offset; + tri_ch_map[nvtx] = ( yaw_diff >= 0.f ) ? MSPC_POSE_YAW_L_PITCH_D : MSPC_POSE_YAW_R_PITCH_D; + nvtx++; } else { - return IVAS_ERR_INTERNAL_FATAL; + tri_azi[nvtx] = copysignf( yaw_offset, yaw_diff ); + tri_ele[nvtx] = pitch_offset; + tri_ch_map[nvtx] = ( yaw_diff >= 0.f ) ? MSPC_POSE_YAW_L_PITCH_U : MSPC_POSE_YAW_R_PITCH_U; + nvtx++; + + tri_azi[nvtx] = copysignf( yaw_offset, yaw_diff ); + tri_ele[nvtx] = -pitch_offset; + tri_ch_map[nvtx] = ( yaw_diff >= 0.f ) ? MSPC_POSE_YAW_L_PITCH_D : MSPC_POSE_YAW_R_PITCH_D; + nvtx++; } } - else /* yaw_diff < 0.f */ + else if ( abs_yaw_diff > yaw_offset && abs_yaw_diff < 180.f - yaw_offset ) { - if ( yaw_diff >= -yaw_offset ) + /* side */ + /* set swap flags */ + if ( yaw_diff >= 0.f ) { - /* front right */ - poly_gain_map[0] = P3DOF_DEFAULT; - poly_yaw[0] = 0.f; - poly_pitch[0] = 0.f; + td_data->swap_yaw_r = true; + } + else + { + td_data->swap_yaw_l = true; + } - poly_gain_map[1] = P3DOF_YAW_R; - poly_yaw[1] = -yaw_offset; - poly_pitch[1] = 0.f; + /* line equation for deterministic triangulation */ + a = pitch_offset / ( 90.f - yaw_offset ); + c = -90.f * a; - if ( pitch_diff >= 0.f ) - { - poly_gain_map[2] = P3DOF_PITCH_U; - poly_yaw[2] = 0.f; - poly_pitch[2] = pitch_offset; + if ( pitch_diff >= ( a * abs_yaw_diff + c ) ) + { + tri_azi[nvtx] = copysignf( yaw_offset, yaw_diff ); + tri_ele[nvtx] = pitch_offset; + tri_ch_map[nvtx] = ( yaw_diff >= 0.f ) ? MSPC_POSE_YAW_L_PITCH_U : MSPC_POSE_YAW_R_PITCH_U; + nvtx++; - poly_gain_map[3] = P3DOF_YAW_RU; - poly_yaw[3] = -yaw_offset; - poly_pitch[3] = pitch_offset; - } - else - { - poly_gain_map[2] = P3DOF_PITCH_D; - poly_yaw[2] = 0.f; - poly_pitch[2] = -pitch_offset; + tri_azi[nvtx] = copysignf( yaw_offset, yaw_diff ); + tri_ele[nvtx] = -pitch_offset; + tri_ch_map[nvtx] = ( yaw_diff >= 0.f ) ? MSPC_POSE_YAW_L_PITCH_D : MSPC_POSE_YAW_R_PITCH_D; + nvtx++; - poly_gain_map[3] = P3DOF_YAW_RD; - poly_yaw[3] = -yaw_offset; - poly_pitch[3] = -pitch_offset; - } + tri_azi[nvtx] = copysignf( 180.f - yaw_offset, yaw_diff ); + tri_ele[nvtx] = pitch_offset; + tri_ch_map[nvtx] = ( yaw_diff >= 0.f ) ? MSPC_POSE_YAW_R_PITCH_U : MSPC_POSE_YAW_L_PITCH_U; + nvtx++; } - else if ( yaw_diff < -yaw_offset && yaw_diff > -( 180.f - yaw_offset ) ) + else /* other side of line */ { - /* right */ - poly_gain_map[0] = P3DOF_YAW_R; - poly_yaw[0] = -yaw_offset; - poly_pitch[0] = 0.f; - - pMultiBinPoseData->swap_flag[0] = true; - poly_gain_map[1] = P3DOF_YAW_L; - poly_yaw[1] = -( 180.f - yaw_offset ); - poly_pitch[1] = 0.f; + tri_azi[nvtx] = copysignf( 180.f - yaw_offset, yaw_diff ); + tri_ele[nvtx] = pitch_offset; + tri_ch_map[nvtx] = ( yaw_diff >= 0.f ) ? MSPC_POSE_YAW_R_PITCH_U : MSPC_POSE_YAW_L_PITCH_U; + nvtx++; - if ( pitch_diff >= 0 ) - { - poly_gain_map[2] = P3DOF_YAW_RU; - poly_yaw[2] = -yaw_offset; - poly_pitch[2] = pitch_offset; - - poly_gain_map[3] = P3DOF_YAW_LU; - poly_yaw[3] = -( 180.f - yaw_offset ); - poly_pitch[3] = pitch_offset; - } - else - { - poly_gain_map[2] = P3DOF_YAW_RD; - poly_yaw[2] = -yaw_offset; - poly_pitch[2] = -pitch_offset; + tri_azi[nvtx] = copysignf( 180.f - yaw_offset, yaw_diff ); + tri_ele[nvtx] = -pitch_offset; + tri_ch_map[nvtx] = ( yaw_diff >= 0.f ) ? MSPC_POSE_YAW_R_PITCH_D : MSPC_POSE_YAW_L_PITCH_D; + nvtx++; - poly_gain_map[3] = P3DOF_YAW_LD; - poly_yaw[3] = -( 180.f - yaw_offset ); - poly_pitch[3] = -pitch_offset; - } + tri_azi[nvtx] = copysignf( yaw_offset, yaw_diff ); + tri_ele[nvtx] = -pitch_offset; + tri_ch_map[nvtx] = ( yaw_diff >= 0.f ) ? MSPC_POSE_YAW_L_PITCH_D : MSPC_POSE_YAW_R_PITCH_D; + nvtx++; } - else if ( yaw_diff <= -( 180.f - yaw_offset ) && yaw_diff >= -180.f ) + } + else if ( abs_yaw_diff >= ( 180.f - yaw_offset ) && abs_yaw_diff <= 180.f ) + { + /* rear */ + /* set swap flags */ + td_data->swap_default = true; + if ( yaw_diff >= 0.f ) { - /* rear right */ - pMultiBinPoseData->swap_flag[0] = true; - poly_gain_map[0] = P3DOF_YAW_L; - poly_yaw[0] = -( 180.f - yaw_offset ); - poly_pitch[0] = 0.f; + td_data->swap_yaw_r = true; + } + else + { + td_data->swap_yaw_l = true; + } - pMultiBinPoseData->swap_flag[1] = true; - poly_gain_map[1] = P3DOF_DEFAULT; - poly_yaw[1] = 180.f; - poly_pitch[1] = 0.f; + /* vertex 1 */ + tri_azi[nvtx] = copysignf( 180.f, yaw_diff ); + tri_ele[nvtx] = 0.f; + tri_ch_map[nvtx] = MSPC_POSE_DEFAULT; + nvtx++; - if ( pitch_diff >= 0 ) - { - poly_gain_map[2] = P3DOF_YAW_LU; - poly_yaw[2] = -( 180.f - yaw_offset ); - poly_pitch[2] = pitch_offset; + /* vertices 2 and 3 */ + if ( pitch_diff >= 0.f && pitch_diff > ( 180.f - abs_yaw_diff ) ) + { + tri_azi[nvtx] = copysignf( 180.f, yaw_diff ); + tri_ele[nvtx] = pitch_offset; + tri_ch_map[nvtx] = MSPC_POSE_PITCH_U; + nvtx++; - poly_gain_map[3] = P3DOF_PITCH_U; - poly_yaw[3] = -180.f; - poly_pitch[3] = pitch_offset; - } - else - { - poly_gain_map[2] = P3DOF_YAW_LD; - poly_yaw[2] = -( 180.f - yaw_offset ); - poly_pitch[2] = -pitch_offset; - poly_gain_map[3] = P3DOF_PITCH_D; - poly_yaw[3] = -180.f; - poly_pitch[3] = -pitch_offset; - } + tri_azi[nvtx] = copysignf( 180.f - yaw_offset, yaw_diff ); + tri_ele[nvtx] = pitch_offset; + tri_ch_map[nvtx] = ( yaw_diff >= 0.f ) ? MSPC_POSE_YAW_R_PITCH_U : MSPC_POSE_YAW_L_PITCH_U; + nvtx++; + } + else if ( pitch_diff < 0.f && pitch_diff < -( 180.f - abs_yaw_diff ) ) + { + tri_azi[nvtx] = copysignf( 180.f, yaw_diff ); + tri_ele[nvtx] = -pitch_offset; + tri_ch_map[nvtx] = MSPC_POSE_PITCH_D; + nvtx++; + + tri_azi[nvtx] = copysignf( 180.f - yaw_offset, yaw_diff ); + tri_ele[nvtx] = -pitch_offset; + tri_ch_map[nvtx] = ( yaw_diff >= 0.f ) ? MSPC_POSE_YAW_R_PITCH_D : MSPC_POSE_YAW_L_PITCH_D; + nvtx++; } else { - return IVAS_ERR_INTERNAL_FATAL; + tri_azi[nvtx] = copysignf( 180.f - yaw_offset, yaw_diff ); + tri_ele[nvtx] = pitch_offset; + tri_ch_map[nvtx] = ( yaw_diff >= 0.f ) ? MSPC_POSE_YAW_R_PITCH_U : MSPC_POSE_YAW_L_PITCH_U; + nvtx++; + + tri_azi[nvtx] = copysignf( 180.f - yaw_offset, yaw_diff ); + tri_ele[nvtx] = -pitch_offset; + tri_ch_map[nvtx] = ( yaw_diff >= 0.f ) ? MSPC_POSE_YAW_R_PITCH_D : MSPC_POSE_YAW_L_PITCH_D; + nvtx++; } } /* EFAP panning */ - set_zero( poly_gains, 4 ); - get_poly_gains( yaw_diff, pitch_diff, poly_yaw, poly_pitch, 4, poly_gains ); - for ( i = 0; i < 4; i++ ) + set_zero( tri_gains, 3 ); + get_poly_gains( yaw_diff, pitch_diff, tri_azi, tri_ele, 3, tri_gains ); + for ( i = 0; i < 3; ++i ) { - if ( fabsf( poly_gains[i] ) < 1e-6 ) + if ( fabsf( tri_gains[i] ) < 1e-6f ) { - poly_gains[i] = 0.f; + tri_gains[i] = 0.f; } } - /* normalise and update gains in struct */ - poly_gain_norm = 1.f / sum_f( poly_gains, 4 ); - for ( i = 0; i < 4; i++ ) - { - ch = poly_gain_map[i]; +#ifdef DEBUGGING + assert( sum_f( tri_gains, nvtx ) <= 1.f && "Sum of gains > 1" ); +#endif - /* distribute gains if virtual */ - if ( ch == P3DOF_YAW_L ) - { - pMultiBinPoseData->gains[P3DOF_YAW_LU] += 0.5 * poly_gains[i] * poly_gain_norm; - pMultiBinPoseData->gains[P3DOF_YAW_LD] += 0.5 * poly_gains[i] * poly_gain_norm; - } - else if ( ch == P3DOF_YAW_R ) - { - pMultiBinPoseData->gains[P3DOF_YAW_RU] += 0.5 * poly_gains[i] * poly_gain_norm; - pMultiBinPoseData->gains[P3DOF_YAW_RD] += 0.5 * poly_gains[i] * poly_gain_norm; - } - else - { - pMultiBinPoseData->gains[ch] += poly_gains[i] * poly_gain_norm; - } + for ( i = 0; i < 3; ++i ) + { + td_data->gains[spp->pose_idx[tri_ch_map[i]]] = tri_gains[i]; } - poly_gain_norm = sum_f( pMultiBinPoseData->gains, MAX_HEAD_ROT_POSES - 1 ) * ( 1.f - pMultiBinPoseData->gains[MAX_HEAD_ROT_POSES - 1] ); - v_multc( pMultiBinPoseData->gains, poly_gain_norm, pMultiBinPoseData->gains, MAX_HEAD_ROT_POSES - 1 ); + return IVAS_ERR_OK; +} + +static ivas_error split_mspc_get3DofGains( + float yaw_diff, + float pitch_diff, + float roll_diff, + float yaw_offset, + float pitch_offset, + float roll_offset, + split_mspc_pose_data *spp, + MULTI_BIN_REND_TD_POSE_CORRECTION_DATA *td_data ) +{ + ivas_error error; - /* apply gains with xfading */ - for ( smpl_idx = 0; smpl_idx < subframe_len; ++smpl_idx ) + /* same gain computation as for 2DOF */ + error = split_mspc_get2DofGains( yaw_diff, + pitch_diff, + yaw_offset, + pitch_offset, + spp, + td_data ); + if ( error != IVAS_ERR_OK ) { - smpl_loc = subframe_idx * subframe_len + smpl_idx; - fade_in = pMultiBinPoseData->xfade[smpl_idx]; - fade_out = 1.f - fade_in; + return error; + } - for ( i = 0; i < MAX_HEAD_ROT_POSES; ++i ) - { - /* fade in new gains */ - if ( ( pMultiBinPoseData->swap_flag[0] && ( i == P3DOF_YAW_LU || i == P3DOF_YAW_LD ) ) || - ( pMultiBinPoseData->swap_flag[1] && ( i == P3DOF_DEFAULT || i == P3DOF_PITCH_U || i == P3DOF_PITCH_D ) ) || - ( pMultiBinPoseData->swap_flag[2] && ( i == P3DOF_YAW_RU || i == P3DOF_YAW_RD ) ) || - ( pMultiBinPoseData->swap_flag[3] && ( i == P3DOF_ROLL_C ) ) ) - { - tmp_ch0 = fade_in * pMultiBinPoseData->gains[i] * spp_3dof->poses[i][1][smpl_loc]; - tmp_ch1 = fade_in * pMultiBinPoseData->gains[i] * spp_3dof->poses[i][0][smpl_loc]; - } - else - { - tmp_ch0 = fade_in * pMultiBinPoseData->gains[i] * spp_3dof->poses[i][0][smpl_loc]; - tmp_ch1 = fade_in * pMultiBinPoseData->gains[i] * spp_3dof->poses[i][1][smpl_loc]; - } - outBuffer[0][smpl_loc] += tmp_ch0; - outBuffer[1][smpl_loc] += tmp_ch1; - - /* fade out old gains */ - if ( ( pMultiBinPoseData->swap_flag_prev[0] && ( i == P3DOF_YAW_LU || i == P3DOF_YAW_LD ) ) || - ( pMultiBinPoseData->swap_flag_prev[1] && ( i == P3DOF_DEFAULT || i == P3DOF_PITCH_U || i == P3DOF_PITCH_D ) ) || - ( pMultiBinPoseData->swap_flag_prev[2] && ( i == P3DOF_YAW_RU || i == P3DOF_YAW_RD ) ) || - ( pMultiBinPoseData->swap_flag_prev[3] && ( i == P3DOF_ROLL_C ) ) ) - { - tmp_ch0 = fade_out * pMultiBinPoseData->gains_prev[i] * spp_3dof->poses[i][1][smpl_loc]; - tmp_ch1 = fade_out * pMultiBinPoseData->gains_prev[i] * spp_3dof->poses[i][0][smpl_loc]; - } - else - { - tmp_ch0 = fade_out * pMultiBinPoseData->gains_prev[i] * spp_3dof->poses[i][0][smpl_loc]; - tmp_ch1 = fade_out * pMultiBinPoseData->gains_prev[i] * spp_3dof->poses[i][1][smpl_loc]; - } - outBuffer[0][smpl_loc] += tmp_ch0; - outBuffer[1][smpl_loc] += tmp_ch1; - } + /* set roll gains additionally */ + if ( roll_diff == 0.f ) /* TODO tmu : add a threshold? */ + { + return IVAS_ERR_OK; + } + else if ( roll_diff < 0.f ) + { + td_data->swap_roll = true; + td_data->gains[spp->pose_idx[MSPC_POSE_ROLL_C]] = -roll_diff / roll_offset; + } + else + { + td_data->gains[spp->pose_idx[MSPC_POSE_ROLL_C]] = roll_diff / roll_offset; } return IVAS_ERR_OK; } -static ivas_error ivas_rend_TdSplitPostRendPoseCorrectionProcess( - float inOutBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k], - const IVAS_QUATERNION headpose_current[MAX_PARAM_SPATIAL_SUBFRAMES], - const IVAS_QUATERNION main_headpose_bitstream[MAX_PARAM_SPATIAL_SUBFRAMES], - MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData ) +static ivas_error split_mspc_getPoseGains( + const float pose_diff[3], + split_mspc_pose_data *spp, + MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, + int16_t subframe_idx ) { + int16_t prev_subframe_idx; + float yaw_offset, pitch_offset, roll_offset; ivas_error error; - float outBinBuffer[BINAURAL_CHANNELS][L_FRAME48k]; - float pose_diff[3]; - int16_t pos_idx; - int16_t yaw, pitch, roll; - IVAS_QUATERNION headpose_current_euler, main_headpose_bitstream_euler; - split_post_rend_multisignal_poses_1dof spp_1dof; - split_post_rend_multisignal_poses_2dof spp_2dof; - split_post_rend_multisignal_poses_3dof spp_3dof; - - set_zero( outBinBuffer[0], L_FRAME48k ); - set_zero( outBinBuffer[1], L_FRAME48k ); + error = IVAS_ERR_OK; - if ( NULL == pMultiBinPoseData ) + prev_subframe_idx = subframe_idx - 1; + if ( -1 == prev_subframe_idx ) { - return IVAS_ERR_UNEXPECTED_NULL_POINTER; + prev_subframe_idx = MAX_PARAM_SPATIAL_SUBFRAMES - 1; } - if ( pMultiBinPoseData->num_poses == 1 ) - { - /* 0dof */ - /* pass-through, required signals already in inOutBuffer */ - return IVAS_ERR_OK; + /* update state */ + set_zero( pMultiBinPoseData->td_data[subframe_idx].gains, MAX_HEAD_ROT_POSES ); + pMultiBinPoseData->td_data[subframe_idx].swap_default = false; + pMultiBinPoseData->td_data[subframe_idx].swap_yaw_l = false; + pMultiBinPoseData->td_data[subframe_idx].swap_yaw_r = false; + pMultiBinPoseData->td_data[subframe_idx].swap_roll = false; + + /* TODO tmu : replace with better solution */ + yaw_offset = fabsf( pMultiBinPoseData->relative_head_poses[1][0] ); + pitch_offset = fabsf( pMultiBinPoseData->relative_head_poses[3][1] ); + roll_offset = fabsf( pMultiBinPoseData->relative_head_poses[6][2] ); + + switch ( pMultiBinPoseData->num_poses ) + { + case SPLIT_REND_MSPC_NPOSES_0DOF: + error = split_mspc_get0DofGains( spp, + &pMultiBinPoseData->td_data[subframe_idx] ); + break; + case SPLIT_REND_MSPC_NPOSES_1DOF: + error = split_mspc_get1DofGains( pose_diff[0], + yaw_offset, + spp, + &pMultiBinPoseData->td_data[subframe_idx] ); + break; + case SPLIT_REND_MSPC_NPOSES_2DOF: + error = split_mspc_get2DofGains( pose_diff[0], + pose_diff[1], + yaw_offset, + pitch_offset, + spp, + &pMultiBinPoseData->td_data[subframe_idx] ); + break; + case SPLIT_REND_MSPC_NPOSES_3DOF: + error = split_mspc_get3DofGains( pose_diff[0], + pose_diff[1], + pose_diff[2], + yaw_offset, + pitch_offset, + roll_offset, + spp, + &pMultiBinPoseData->td_data[subframe_idx] ); + break; + default: + /* unknown configuration */ + return IVAS_ERR_INTERNAL_FATAL; } - if ( pMultiBinPoseData->num_poses == 3 ) + + return error; +} + +static ivas_error split_mspc_getMultiStreamGains( + float inOutBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k], + const IVAS_QUATERNION headpose_current, + const IVAS_QUATERNION headpose_bitstream, + split_mspc_pose_data *spp, + MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, + int16_t subframe_idx ) +{ + int16_t pose_idx; + float yaw, pitch, roll; + float pose_diff[3]; + split_mspc_pose pose; + + if ( NULL == pMultiBinPoseData ) { - /* 1dof */ - /* the first two channels contain the main binaural signal, rendered for main_headpose_bitstream */ - spp_1dof.poses[P1DOF_DEFAULT][0] = inOutBuffer[0]; - spp_1dof.poses[P1DOF_DEFAULT][1] = inOutBuffer[1]; - for ( pos_idx = 0; pos_idx < pMultiBinPoseData->num_poses - 1; pos_idx++ ) - { - yaw = pMultiBinPoseData->relative_head_poses[pos_idx][0]; - pitch = pMultiBinPoseData->relative_head_poses[pos_idx][1]; - roll = pMultiBinPoseData->relative_head_poses[pos_idx][2]; - assert( roll == 0 ); - if ( pitch == 0 && yaw < 0 ) - { - spp_1dof.poses[P1DOF_YAW_L][0] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS]; - spp_1dof.poses[P1DOF_YAW_L][1] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS + 1]; - spp_1dof.yaw_l_idx = pos_idx; - } - else if ( pitch == 0 && yaw > 0 ) - { - spp_1dof.poses[P1DOF_YAW_R][0] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS]; - spp_1dof.poses[P1DOF_YAW_R][1] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS + 1]; - spp_1dof.yaw_r_idx = pos_idx; - } - else - { - return IVAS_ERR_NOT_IMPLEMENTED; - } - } + return IVAS_ERR_UNEXPECTED_NULL_POINTER; } - else if ( pMultiBinPoseData->num_poses == 7 ) + + /* TODO tmu : cleanup */ + set_s( spp->pose_idx, -1, MAX_HEAD_ROT_POSES + 2 ); + + /* MSPC_POSE_DEAULT is always the first stream */ + pose = MSPC_POSE_DEFAULT; + spp->poses[pose][0] = inOutBuffer[0]; + spp->poses[pose][1] = inOutBuffer[1]; + spp->pose_idx[pose] = 0; + + for ( pose_idx = 0; pose_idx < pMultiBinPoseData->num_poses - 1; pose_idx++ ) { - /* 2dof */ - /* the first two channels contain the main binaural signal, rendered for main_headpose_bitstream */ - spp_2dof.poses[P2DOF_DEFAULT][0] = inOutBuffer[0]; - spp_2dof.poses[P2DOF_DEFAULT][1] = inOutBuffer[1]; - for ( pos_idx = 0; pos_idx < pMultiBinPoseData->num_poses - 1; pos_idx++ ) - { - yaw = pMultiBinPoseData->relative_head_poses[pos_idx][0]; - pitch = pMultiBinPoseData->relative_head_poses[pos_idx][1]; - roll = pMultiBinPoseData->relative_head_poses[pos_idx][2]; + yaw = pMultiBinPoseData->relative_head_poses[pose_idx][0]; + pitch = pMultiBinPoseData->relative_head_poses[pose_idx][1]; + roll = pMultiBinPoseData->relative_head_poses[pose_idx][2]; - assert( roll == 0 ); + if ( roll == 0 ) + { if ( pitch > 0 && yaw > 0 ) { - spp_2dof.poses[P2DOF_YAW_LU][0] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS]; - spp_2dof.poses[P2DOF_YAW_LU][1] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS + 1]; - spp_2dof.pose_idx[0] = pos_idx; + pose = MSPC_POSE_YAW_L_PITCH_U; } else if ( pitch < 0 && yaw > 0 ) { - spp_2dof.poses[P2DOF_YAW_LD][0] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS]; - spp_2dof.poses[P2DOF_YAW_LD][1] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS + 1]; - spp_2dof.pose_idx[1] = pos_idx; + pose = MSPC_POSE_YAW_L_PITCH_D; } else if ( pitch > 0 && yaw < 0 ) { - spp_2dof.poses[P2DOF_YAW_RU][0] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS]; - spp_2dof.poses[P2DOF_YAW_RU][1] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS + 1]; - spp_2dof.pose_idx[2] = pos_idx; + pose = MSPC_POSE_YAW_R_PITCH_U; } else if ( pitch < 0 && yaw < 0 ) { - spp_2dof.poses[P2DOF_YAW_RD][0] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS]; - spp_2dof.poses[P2DOF_YAW_RD][1] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS + 1]; - spp_2dof.pose_idx[3] = pos_idx; + pose = MSPC_POSE_YAW_R_PITCH_D; } else if ( pitch > 0 && yaw == 0 ) { - spp_2dof.poses[P2DOF_PITCH_U][0] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS]; - spp_2dof.poses[P2DOF_PITCH_U][1] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS + 1]; - spp_2dof.pose_idx[4] = pos_idx; + pose = MSPC_POSE_PITCH_U; } else if ( pitch < 0 && yaw == 0 ) { - spp_2dof.poses[P2DOF_PITCH_D][0] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS]; - spp_2dof.poses[P2DOF_PITCH_D][1] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS + 1]; - spp_2dof.pose_idx[5] = pos_idx; + pose = MSPC_POSE_PITCH_D; } - else + else if ( pitch == 0 && yaw > 0 ) + { + pose = MSPC_POSE_YAW_L; + } + else if ( pitch == 0 && yaw < 0 ) { - return IVAS_ERR_NOT_IMPLEMENTED; + pose = MSPC_POSE_YAW_R; } } + else + { + assert( roll == 90 ); + pose = MSPC_POSE_ROLL_C; + } + + spp->poses[pose][0] = inOutBuffer[( pose_idx + 1 ) * BINAURAL_CHANNELS]; + spp->poses[pose][1] = inOutBuffer[( pose_idx + 1 ) * BINAURAL_CHANNELS + 1]; + spp->pose_idx[pose] = ( pose_idx + 1 ); + } + + /* get pose difference */ + split_mspc_getPoseDiff( headpose_current, headpose_bitstream, pose_diff ); + + /* select poses for interpolation and compute necessary gains */ + split_mspc_getPoseGains( pose_diff, spp, pMultiBinPoseData, subframe_idx ); + + return IVAS_ERR_OK; +} + +static int16_t split_mspc_checkPoseSwap( + const split_mspc_pose pose, + const MULTI_BIN_REND_TD_POSE_CORRECTION_DATA *td_data ) +{ + if ( ( td_data->swap_default && ( pose == MSPC_POSE_DEFAULT ) ) || + ( td_data->swap_yaw_l && ( pose == MSPC_POSE_YAW_L || pose == MSPC_POSE_YAW_L_PITCH_D || pose == MSPC_POSE_YAW_L_PITCH_U ) ) || + ( td_data->swap_yaw_r && ( pose == MSPC_POSE_YAW_R || pose == MSPC_POSE_YAW_R_PITCH_D || pose == MSPC_POSE_YAW_R_PITCH_U ) ) || + ( td_data->swap_roll && ( pose == MSPC_POSE_ROLL_C ) ) ) + { + return 1; + } + else + { + return 0; + } +} + +static ivas_error split_mspc_poseCorrProcess( + float inOutBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k], + split_mspc_pose_data *spp, + MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, + int16_t subframe_idx, + int16_t subframe_len ) +{ + int16_t subframe_smp_idx, frame_smp_idx; + int16_t prev_subframe_idx; + int16_t mapped_pose_idx; + float fade_in, fade_out; + float tmp_ch0, tmp_ch1; + float outBinBuffer[BINAURAL_CHANNELS][L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES]; + split_mspc_pose pose; + MULTI_BIN_REND_TD_POSE_CORRECTION_DATA *td_data_new, *td_data_old; + + set_zero( outBinBuffer[0], subframe_len ); + set_zero( outBinBuffer[1], subframe_len ); + + prev_subframe_idx = subframe_idx - 1; + if ( -1 == prev_subframe_idx ) + { + prev_subframe_idx = MAX_PARAM_SPATIAL_SUBFRAMES - 1; } - else if ( pMultiBinPoseData->num_poses == 8 ) + + td_data_new = &pMultiBinPoseData->td_data[subframe_idx]; + td_data_old = &pMultiBinPoseData->td_data[prev_subframe_idx]; + + /* sample loop */ + frame_smp_idx = subframe_idx * subframe_len; + for ( subframe_smp_idx = 0; subframe_smp_idx < subframe_len; ++subframe_smp_idx, ++frame_smp_idx ) { - /* 3dof */ - /* the first two channels contain the main binaural signal, rendered for main_headpose_bitstream */ - spp_3dof.poses[P3DOF_DEFAULT][0] = inOutBuffer[0]; - spp_3dof.poses[P3DOF_DEFAULT][1] = inOutBuffer[1]; - for ( pos_idx = 0; pos_idx < pMultiBinPoseData->num_poses - 1; pos_idx++ ) + fade_in = pMultiBinPoseData->xfade[subframe_smp_idx]; + fade_out = 1 - fade_in; + + for ( pose = MSPC_POSE_DEFAULT; pose < MSPC_POSE_NUM_POSES; ++pose ) { - yaw = pMultiBinPoseData->relative_head_poses[pos_idx][0]; - pitch = pMultiBinPoseData->relative_head_poses[pos_idx][1]; - roll = pMultiBinPoseData->relative_head_poses[pos_idx][2]; + mapped_pose_idx = spp->pose_idx[pose]; + if ( mapped_pose_idx == -1 ) + { + continue; + } - if ( roll == 0 ) + if ( ( td_data_new->gains[mapped_pose_idx] == td_data_old->gains[mapped_pose_idx] ) && ( ( fabsf( td_data_new->gains[mapped_pose_idx] ) > EPSILON ) && ( fabs( td_data_old->gains[mapped_pose_idx] ) > EPSILON ) ) ) { - if ( pitch > 0 && yaw > 0 ) - { - spp_3dof.poses[P3DOF_YAW_LU][0] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS]; - spp_3dof.poses[P3DOF_YAW_LU][1] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS + 1]; - spp_3dof.pose_idx[0] = pos_idx; - } - else if ( pitch < 0 && yaw > 0 ) + /* no fading necessary */ + if ( split_mspc_checkPoseSwap( pose, td_data_new ) ) { - spp_3dof.poses[P3DOF_YAW_LD][0] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS]; - spp_3dof.poses[P3DOF_YAW_LD][1] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS + 1]; - spp_3dof.pose_idx[1] = pos_idx; + tmp_ch0 = spp->poses[pose][1][frame_smp_idx]; + tmp_ch1 = spp->poses[pose][0][frame_smp_idx]; } - else if ( pitch > 0 && yaw < 0 ) + else { - spp_3dof.poses[P3DOF_YAW_RU][0] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS]; - spp_3dof.poses[P3DOF_YAW_RU][1] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS + 1]; - spp_3dof.pose_idx[2] = pos_idx; + tmp_ch0 = spp->poses[pose][0][frame_smp_idx]; + tmp_ch1 = spp->poses[pose][1][frame_smp_idx]; } - else if ( pitch < 0 && yaw < 0 ) + /* accumulate to output */ + outBinBuffer[0][subframe_smp_idx] += td_data_new->gains[mapped_pose_idx] * tmp_ch0; + outBinBuffer[1][subframe_smp_idx] += td_data_new->gains[mapped_pose_idx] * tmp_ch1; + } + else if ( ( fabsf( td_data_new->gains[mapped_pose_idx] ) > EPSILON ) || ( fabsf( td_data_old->gains[mapped_pose_idx] ) > EPSILON ) ) + { + /* fade in new gains */ + if ( split_mspc_checkPoseSwap( pose, td_data_new ) ) { - spp_3dof.poses[P3DOF_YAW_RD][0] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS]; - spp_3dof.poses[P3DOF_YAW_RD][1] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS + 1]; - spp_3dof.pose_idx[3] = pos_idx; + tmp_ch0 = spp->poses[pose][1][frame_smp_idx]; + tmp_ch1 = spp->poses[pose][0][frame_smp_idx]; } - else if ( pitch > 0 && yaw == 0 ) + else { - spp_3dof.poses[P3DOF_PITCH_U][0] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS]; - spp_3dof.poses[P3DOF_PITCH_U][1] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS + 1]; - spp_3dof.pose_idx[4] = pos_idx; + tmp_ch0 = spp->poses[pose][0][frame_smp_idx]; + tmp_ch1 = spp->poses[pose][1][frame_smp_idx]; } - else if ( pitch < 0 && yaw == 0 ) + /* accumulate to output */ + outBinBuffer[0][subframe_smp_idx] += fade_in * td_data_new->gains[mapped_pose_idx] * tmp_ch0; + outBinBuffer[1][subframe_smp_idx] += fade_in * td_data_new->gains[mapped_pose_idx] * tmp_ch1; + + /* fade out old gains */ + if ( split_mspc_checkPoseSwap( pose, td_data_old ) ) { - spp_3dof.poses[P3DOF_PITCH_D][0] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS]; - spp_3dof.poses[P3DOF_PITCH_D][1] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS + 1]; - spp_3dof.pose_idx[5] = pos_idx; + tmp_ch0 = spp->poses[pose][1][frame_smp_idx]; + tmp_ch1 = spp->poses[pose][0][frame_smp_idx]; } else { - return IVAS_ERR_NOT_IMPLEMENTED; + tmp_ch0 = spp->poses[pose][0][frame_smp_idx]; + tmp_ch1 = spp->poses[pose][1][frame_smp_idx]; } - } - else - { - assert( roll == 90 ); - spp_3dof.poses[P3DOF_ROLL_C][0] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS]; - spp_3dof.poses[P3DOF_ROLL_C][1] = inOutBuffer[( pos_idx + 1 ) * BINAURAL_CHANNELS + 1]; - spp_3dof.pose_idx[6] = pos_idx; + /* accumulate to output */ + outBinBuffer[0][subframe_smp_idx] += fade_out * td_data_old->gains[mapped_pose_idx] * tmp_ch0; + outBinBuffer[1][subframe_smp_idx] += fade_out * td_data_old->gains[mapped_pose_idx] * tmp_ch1; } } } - else - { - return IVAS_ERR_NOT_IMPLEMENTED; - } - int16_t subframe_idx; - int16_t subframe_len; - subframe_len = L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES; + mvr2r( outBinBuffer[0], &inOutBuffer[0][subframe_idx * subframe_len], subframe_len ); + mvr2r( outBinBuffer[1], &inOutBuffer[1][subframe_idx * subframe_len], subframe_len ); + + return IVAS_ERR_OK; +} + +static void split_mspc_multiStreamGainsToDecSelection( + MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, + split_mspc_pose_data spp[MAX_PARAM_SPATIAL_SUBFRAMES], + int16_t *sfSelectiveDecMtx[MAX_PARAM_SPATIAL_SUBFRAMES] ) +{ + bool use_prev, use_new; + int16_t prev_subframe_idx, subframe_idx; + int16_t mapped_pose_idx, ch_idx, dec_idx; + split_mspc_pose pose; + MULTI_BIN_REND_TD_POSE_CORRECTION_DATA *td_data_new, *td_data_old; for ( subframe_idx = 0; subframe_idx < MAX_PARAM_SPATIAL_SUBFRAMES; ++subframe_idx ) { - /* current head pose */ - headpose_current_euler.w = -3.0f; - if ( headpose_current[subframe_idx].w != -3.0f ) - { - Quat2EulerDegree( headpose_current[subframe_idx], /* TODO tmu : needs a bugfix for ordering */ - &headpose_current_euler.z, - &headpose_current_euler.y, - &headpose_current_euler.x ); - } - else - { - headpose_current_euler.x = headpose_current[subframe_idx].x; - headpose_current_euler.y = headpose_current[subframe_idx].y; - headpose_current_euler.z = headpose_current[subframe_idx].z; - } - - /* bitstream head pose */ - main_headpose_bitstream_euler.w = -3.0f; - if ( main_headpose_bitstream[subframe_idx].w != -3.0f ) - { - Quat2EulerDegree( main_headpose_bitstream[subframe_idx], /* TODO tmu : needs a bugfix for ordering */ - &main_headpose_bitstream_euler.z, - &main_headpose_bitstream_euler.y, - &main_headpose_bitstream_euler.x ); - } - else + prev_subframe_idx = subframe_idx - 1; + if ( -1 == prev_subframe_idx ) { - main_headpose_bitstream_euler.x = main_headpose_bitstream[subframe_idx].x; - main_headpose_bitstream_euler.y = main_headpose_bitstream[subframe_idx].y; - main_headpose_bitstream_euler.z = main_headpose_bitstream[subframe_idx].z; + prev_subframe_idx = MAX_PARAM_SPATIAL_SUBFRAMES - 1; } - /* compute pose diff */ - pose_diff[0] = headpose_current_euler.x - main_headpose_bitstream_euler.x; - pose_diff[1] = headpose_current_euler.y - main_headpose_bitstream_euler.y; - pose_diff[2] = headpose_current_euler.z - main_headpose_bitstream_euler.z; + td_data_new = &pMultiBinPoseData->td_data[subframe_idx]; + td_data_old = &pMultiBinPoseData->td_data[prev_subframe_idx]; - pose_diff[0] = wrap_angle( pose_diff[0] ); - pose_diff[1] = wrap_angle( pose_diff[1] ); - pose_diff[2] = wrap_angle( pose_diff[2] ); + set_s( sfSelectiveDecMtx[subframe_idx], 0, pMultiBinPoseData->num_poses * BINAURAL_CHANNELS ); - switch ( pMultiBinPoseData->num_poses ) - { - case 3: - error = interpolate_1dof( &spp_1dof, pMultiBinPoseData, pose_diff, outBinBuffer, subframe_idx, subframe_len ); - break; - case 7: - error = interpolate_2dof( &spp_2dof, pMultiBinPoseData, pose_diff, outBinBuffer, subframe_idx, subframe_len ); - break; - case 8: - error = interpolate_3dof( &spp_3dof, pMultiBinPoseData, pose_diff, outBinBuffer, subframe_idx, subframe_len ); - break; - default: - error = IVAS_ERR_NOT_IMPLEMENTED; - break; - } - if ( IVAS_ERR_OK != error ) + for ( pose = MSPC_POSE_DEFAULT; pose < MSPC_POSE_NUM_POSES; ++pose ) { - return error; + mapped_pose_idx = spp[subframe_idx].pose_idx[pose]; + if ( mapped_pose_idx == -1 ) + { + continue; + } + use_new = ( fabsf( td_data_new->gains[mapped_pose_idx] ) > EPSILON ); + use_prev = ( fabsf( td_data_old->gains[mapped_pose_idx] ) > EPSILON ); + + for ( ch_idx = 0; ch_idx < BINAURAL_CHANNELS; ++ch_idx ) + { + dec_idx = BINAURAL_CHANNELS * mapped_pose_idx + ch_idx; + + if ( use_new || ( !use_new && use_prev ) ) + { + sfSelectiveDecMtx[subframe_idx][dec_idx] = 1; + } + } } } - - mvr2r( outBinBuffer[0], inOutBuffer[0], L_FRAME48k ); - mvr2r( outBinBuffer[1], inOutBuffer[1], L_FRAME48k ); - return error; } #endif /*SPLIT_REND_TD_POSE_CORRECTION*/ #endif /*SPLIT_REND_LC3PLUS*/ @@ -6658,6 +7130,8 @@ static ivas_error splitBinLc3plusDecode( float *channel_ptrs[MAX_HEAD_ROT_POSES * 2]; int32_t lc3plusBitrateId, lc3plusBitstreamSize; + push_wmops( "splitBinLc3plusDecode" ); + assert( hSplitBin->hLc3plusDec != NULL ); /* Find next byte boundary */ @@ -6673,6 +7147,12 @@ static ivas_error splitBinLc3plusDecode( codec_mode #endif ); +#ifdef SPLIT_REND_LC3PLUS_HBR_DBG + if ( lc3plusBitstreamSize == -1 ) + { + lc3plusBitstreamSize = hSplitBin->hLc3plusDec->num_decs * SPLIT_REND_LC3PLUS_HBR_DBG / FRAMES_PER_SECOND / 8; + } +#endif for ( int16_t i = 0; i < BINAURAL_CHANNELS * hSplitBin->multiBinPoseData.num_poses; ++i ) { @@ -6686,6 +7166,8 @@ static ivas_error splitBinLc3plusDecode( return error; } + pop_wmops(); + return IVAS_ERR_OK; } #endif @@ -6694,7 +7176,12 @@ static ivas_error splitBinLc3plusDecode( static ivas_error renderSplitBinauralWithPostRot( input_split_post_rend *splitBinInput, IVAS_REND_AudioBuffer outAudio, - IVAS_REND_BitstreamBuffer *hBits ) + IVAS_REND_BitstreamBuffer *hBits +#ifdef SPLIT_REND_PLC + , + const int16_t SplitRendBFI +#endif /* SPLIT_REND_PLC */ +) { float Cldfb_RealBuffer_Binaural[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; float Cldfb_ImagBuffer_Binaural[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; @@ -6705,14 +7192,16 @@ static ivas_error renderSplitBinauralWithPostRot( float tmpCrendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k]; const IVAS_REND_HeadRotData *pHeadRotData; SPLIT_POST_REND_WRAPPER *hSplitBin; +#ifdef SPLIT_REND_TD_POSE_CORRECTION + IVAS_QUATERNION mainBitstreamHeadPosition[MAX_PARAM_SPATIAL_SUBFRAMES]; +#endif /* SPLIT_REND_TD_POSE_CORRECTION */ #ifdef SPLIT_REND_LC3PLUS int8_t isPostRendInputCldfb; isPostRendInputCldfb = 0; -#endif -#ifdef SPLIT_REND_TD_POSE_CORRECTION - IVAS_QUATERNION mainBitstreamHeadPosition[MAX_PARAM_SPATIAL_SUBFRAMES]; -#endif +#endif /* SPLIT_REND_LC3PLUS */ + + push_wmops( "renderSplitBinauralWithPostRot" ); error = IVAS_ERR_OK; @@ -6732,125 +7221,228 @@ static ivas_error renderSplitBinauralWithPostRot( else if ( bits.codec == 1 /*LC3plus */ && splitBinInput->splitPostRendWrapper.hLc3plusDec == NULL ) { LC3PLUS_CONFIG config; - config.lc3plus_frame_duration_us = 10000; + config.lc3plus_frame_duration_us = 5000; config.ivas_frame_duration_us = 20000; config.channels = BINAURAL_CHANNELS; config.samplerate = *splitBinInput->base.ctx.pOutSampleRate; - IVAS_LC3PLUS_DEC_Open( config, &splitBinInput->splitPostRendWrapper.hLc3plusDec ); - } + IVAS_LC3PLUS_DEC_Open( config, +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING + 0 /* caching disabled */, #endif + &splitBinInput->splitPostRendWrapper.hLc3plusDec ); + } +#endif /* SPLIT_REND_LC3PLUS */ for ( sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ ) { QuaternionsPost[sf_idx] = ivas_split_rend_get_sf_rot_data( pHeadRotData->headPositions, sf_idx ); } -#ifdef SPLIT_REND_TD_POSE_CORRECTION - if ( bits.codec == 2 ) +#ifdef SPLIT_REND_PLC + if ( !SplitRendBFI ) { - ivas_rend_TdSplitPostRendProcess( - &bits, - mainBitstreamHeadPosition, - &hSplitBin->multiBinPoseData ); - - if ( splitBinInput->splitPostRendWrapper.hLc3plusDec == NULL ) - { - LC3PLUS_CONFIG config; - config.lc3plus_frame_duration_us = 10000; - config.ivas_frame_duration_us = 20000; - config.channels = hSplitBin->multiBinPoseData.num_poses * BINAURAL_CHANNELS; - config.samplerate = *splitBinInput->base.ctx.pOutSampleRate; - - IVAS_LC3PLUS_DEC_Open( config, &splitBinInput->splitPostRendWrapper.hLc3plusDec ); - } + hSplitBin->first_good_frame_received = 1; } - else +#endif /* SPLIT_REND_PLC */ + +#ifdef SPLIT_REND_PLC + if ( hSplitBin->first_good_frame_received == 1 ) { -#endif - ivas_splitBinPostRendMdDec( - &bits, - hSplitBin->hBinHrSplitPostRend, - &hSplitBin->multiBinPoseData, -#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG - hSplitBin->hBinHrSplitPreRend, -#endif - MAX_SPLIT_REND_MD_BANDS ); +#endif /* SPLIT_REND_PLC */ + #ifdef SPLIT_REND_TD_POSE_CORRECTION - } -#endif + int16_t subframe_idx; + int16_t **sfSelectiveDecMtx; + split_mspc_pose_data spp[MAX_PARAM_SPATIAL_SUBFRAMES]; - if ( splitBinInput->base.inConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB ) - { -#ifdef SPLIT_REND_LC3PLUS - if ( bits.codec == 0 ) + if ( bits.codec == 2 ) { -#endif - ivas_splitBinLCLDDecProcess( - hSplitBin->hSplitBinLCLDDec, + ivas_rend_TdSplitPostRendProcess( &bits, - Cldfb_RealBuffer_Binaural, - Cldfb_ImagBuffer_Binaural ); -#ifdef SPLIT_REND_LC3PLUS - isPostRendInputCldfb = 1; + mainBitstreamHeadPosition, + &hSplitBin->multiBinPoseData ); + + if ( splitBinInput->splitPostRendWrapper.hLc3plusDec == NULL ) + { + LC3PLUS_CONFIG config; + config.lc3plus_frame_duration_us = 5000; + config.ivas_frame_duration_us = 20000; + config.channels = hSplitBin->multiBinPoseData.num_poses * BINAURAL_CHANNELS; + config.samplerate = *splitBinInput->base.ctx.pOutSampleRate; + + IVAS_LC3PLUS_DEC_Open( config, +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING + 1 /* caching enabled */, +#endif + &splitBinInput->splitPostRendWrapper.hLc3plusDec ); + } } else { - error = splitBinLc3plusDecode( hSplitBin, &bits, tmpCrendBuffer -#ifdef SPLIT_REND_TD_POSE_CORRECTION - , - bits.codec -#endif - ); - if ( error != IVAS_ERR_OK ) +#endif /* SPLIT_REND_TD_POSE_CORRECTION */ + + +#ifdef SPLIT_REND_PLC + if ( !SplitRendBFI ) /* ToDo: this is always true */ +#endif /* SPLIT_REND_PLC */ { - return error; + ivas_splitBinPostRendMdDec( + &bits, + hSplitBin->hBinHrSplitPostRend, + &hSplitBin->multiBinPoseData +#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG + , + hSplitBin->hBinHrSplitPreRend +#endif /* SPLIT_REND_WITH_HEAD_ROT_DEBUG */ + ); } + +#ifdef SPLIT_REND_TD_POSE_CORRECTION } +#endif /* SPLIT_REND_TD_POSE_CORRECTION */ + + if ( splitBinInput->base.inConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB ) + { +#ifdef SPLIT_REND_LC3PLUS + if ( bits.codec == 0 ) + { +#endif /* SPLIT_REND_LC3PLUS */ + ivas_splitBinLCLDDecProcess( + hSplitBin->hSplitBinLCLDDec, + &bits, + Cldfb_RealBuffer_Binaural, + Cldfb_ImagBuffer_Binaural +#ifdef SPLIT_REND_PLC + , + SplitRendBFI +#endif /* SPLIT_REND_PLC */ + ); +#ifdef SPLIT_REND_LC3PLUS + isPostRendInputCldfb = 1; + } + else + { +#ifdef SPLIT_REND_TD_POSE_CORRECTION + /* TODO tmu : cleanup error checks */ + if ( bits.codec == 2 ) + { + + error = IVAS_LC3PLUS_DEC_AllocateSubframeDecodingMatrix( &sfSelectiveDecMtx, hSplitBin->multiBinPoseData.num_poses * BINAURAL_CHANNELS ); + if ( error != IVAS_ERR_OK ) + { + return error; + } + + for ( subframe_idx = 0; subframe_idx < MAX_PARAM_SPATIAL_SUBFRAMES; ++subframe_idx ) + { + error = split_mspc_getMultiStreamGains( tmpCrendBuffer, + pHeadRotData->headPositions[subframe_idx], + mainBitstreamHeadPosition[subframe_idx], + &spp[subframe_idx], + &hSplitBin->multiBinPoseData, + subframe_idx ); + if ( error != IVAS_ERR_OK ) + { + return error; + } + } + + /* convert gain matrix to selection matrix */ + split_mspc_multiStreamGainsToDecSelection( &hSplitBin->multiBinPoseData, spp, sfSelectiveDecMtx ); + + error = IVAS_LC3PLUS_DEC_SetSelectiveDecodingMatrix( hSplitBin->hLc3plusDec, sfSelectiveDecMtx ); + IVAS_LC3PLUS_DEC_FreeSubframeDecodingMatrix( sfSelectiveDecMtx ); + if ( error != IVAS_ERR_OK ) + { + return error; + } + } #endif - } - else - { - copyBufferTo2dArray( splitBinInput->base.inputBuffer, tmpCrendBuffer ); - } + error = splitBinLc3plusDecode( hSplitBin, &bits, tmpCrendBuffer #ifdef SPLIT_REND_TD_POSE_CORRECTION - if ( bits.codec == 2 ) - { - error = ivas_rend_TdSplitPostRendPoseCorrectionProcess( - tmpCrendBuffer, - pHeadRotData->headPositions, - mainBitstreamHeadPosition, - &hSplitBin->multiBinPoseData ); - if ( error != IVAS_ERR_OK ) + , + bits.codec +#endif /* SPLIT_REND_TD_POSE_CORRECTION */ + ); + if ( error != IVAS_ERR_OK ) + { + return error; + } +#ifdef SPLIT_REND_TD_POSE_CORRECTION + if ( bits.codec == 2 ) + { + /* TODO tmu : support for smoothing flag from decoder */ + for ( subframe_idx = 0; subframe_idx < MAX_PARAM_SPATIAL_SUBFRAMES; ++subframe_idx ) + { + error = split_mspc_poseCorrProcess( tmpCrendBuffer, + &spp[subframe_idx], + &hSplitBin->multiBinPoseData, + subframe_idx, + (int16_t) L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES ); + if ( error != IVAS_ERR_OK ) + { + return error; + } + } + } +#endif + } +#endif + } + else { - return error; + copyBufferTo2dArray( splitBinInput->base.inputBuffer, tmpCrendBuffer ); } - } - else - { -#endif - ivas_rend_CldfbSplitPostRendProcess( - hSplitBin->hBinHrSplitPostRend, - &hSplitBin->multiBinPoseData, - QuaternionsPost, - Cldfb_RealBuffer_Binaural, - Cldfb_ImagBuffer_Binaural, - tmpCrendBuffer, + +#ifdef SPLIT_REND_TD_POSE_CORRECTION + if ( bits.codec != 2 ) + { +#endif /* SPLIT_REND_TD_POSE_CORRECTION */ + ivas_rend_CldfbSplitPostRendProcess( + hSplitBin->hBinHrSplitPostRend, + &hSplitBin->multiBinPoseData, + QuaternionsPost, + Cldfb_RealBuffer_Binaural, + Cldfb_ImagBuffer_Binaural, + tmpCrendBuffer, #ifdef SPLIT_REND_LC3PLUS - isPostRendInputCldfb ); -#else + isPostRendInputCldfb ); +#else /* SPLIT_REND_LC3PLUS */ ( splitBinInput->base.inConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB ) ? 1 : 0 ); -#endif +#endif /* SPLIT_REND_LC3PLUS */ #ifdef SPLIT_REND_TD_POSE_CORRECTION + } +#endif /* SPLIT_REND_TD_POSE_CORRECTION */ + +#ifdef SPLIT_REND_PLC + } + else + { + if ( splitBinInput->base.inConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB ) + { + int16_t ch_idx; + for ( ch_idx = 0; ch_idx < BINAURAL_CHANNELS; ch_idx++ ) + { + set_zero( tmpCrendBuffer[ch_idx], outAudio.config.numSamplesPerChannel ); + } + } + else + { + copyBufferTo2dArray( splitBinInput->base.inputBuffer, tmpCrendBuffer ); + } } #endif convertInternalBitsBuffToBitsBuffer( hBits, bits ); accumulate2dArrayToBuffer( tmpCrendBuffer, &outAudio ); + pop_wmops(); + return error; } + #endif #ifdef SPLIT_REND_WITH_HEAD_ROT #ifdef SPLIT_REND_WITH_HEAD_ROT @@ -6867,7 +7459,7 @@ static ivas_error renderSbaToMultiBinaural( IVAS_REND_AudioBuffer tmpRotBuffer; MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData; - wmops_sub_start( "renderSbaToMultiBinaural" ); + push_wmops( "renderSbaToMultiBinaural" ); HeadRotDataLocal = *sbaInput->base.ctx.pHeadRotData; for ( i = 1; i < RENDERER_HEAD_POSITIONS_PER_FRAME; i++ ) @@ -6876,7 +7468,7 @@ static ivas_error renderSbaToMultiBinaural( } tmpRotBuffer = sbaInput->base.inputBuffer; - tmpRotBuffer.data = count_malloc( tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels * sizeof( float ) ); + tmpRotBuffer.data = malloc( tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels * sizeof( float ) ); pMultiBinPoseData = &sbaInput->splitRendWrapper.multiBinPoseData; for ( pos_idx = 0; pos_idx < pMultiBinPoseData->num_poses; pos_idx++ ) @@ -6907,9 +7499,10 @@ static ivas_error renderSbaToMultiBinaural( copyBufferTo2dArray( tmpRotBuffer, tmpCrendBuffer ); - assert( sbaInput->crendWrapper.hCrend[0]->hReverb == NULL ); + assert( sbaInput->crendWrapper->hCrend[0]->hReverb == NULL ); /* call CREND */ - if ( ( error = ivas_rend_crendProcess( &sbaInput->crendWrapper, sbaInput->base.inConfig, outConfig, tmpCrendBuffer, *sbaInput->base.ctx.pOutSampleRate + if ( ( error = ivas_rend_crendProcess( sbaInput->crendWrapper, getIvasAudioConfigFromRendAudioConfig( sbaInput->base.inConfig ), getIvasAudioConfigFromRendAudioConfig( outConfig ), + NULL, NULL, NULL, NULL, tmpCrendBuffer, *sbaInput->base.ctx.pOutSampleRate #ifdef SPLIT_REND_WITH_HEAD_ROT , pos_idx @@ -6930,9 +7523,9 @@ static ivas_error renderSbaToMultiBinaural( mvr2r( tmpCrendBuffer[i], out[pos_idx * BINAURAL_CHANNELS + i], tmpRotBuffer.config.numSamplesPerChannel ); } } - count_free( tmpRotBuffer.data ); + free( tmpRotBuffer.data ); - wmops_sub_end(); + pop_wmops(); return IVAS_ERR_OK; } @@ -6948,8 +7541,6 @@ static ivas_error renderSbaToSplitBinaural( { float tmpCrendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k]; ivas_error error; - float Cldfb_RealBuffer[MAX_OUTPUT_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; - float Cldfb_ImagBuffer[MAX_OUTPUT_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; #ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG float Cldfb_RealBuffer_Binaural[MAX_HEAD_ROT_POSES + 1][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; float Cldfb_ImagBuffer_Binaural[MAX_HEAD_ROT_POSES + 1][BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; @@ -6963,7 +7554,7 @@ static ivas_error renderSbaToSplitBinaural( low_res_pre_rend_rot = 1; //( *sbaInput->base.ctx.pSplitRendBitRate == SPLIT_REND_768k ) ? 0 : 1; - wmops_sub_start( "renderSbaToSplitBinaural" ); + push_wmops( "renderSbaToSplitBinaural" ); error = IVAS_ERR_OK; @@ -6972,22 +7563,12 @@ static ivas_error renderSbaToSplitBinaural( &sbaInput->splitRendWrapper.multiBinPoseData, sbaInput->base.ctx.pHeadRotData->sr_pose_pred_axis ); -#ifdef SPLIT_REND_WITH_HEAD_ROT - if ( sbaInput->base.ctx.hhRendererConfig[0]->renderer_type_override != RENDER_TYPE_OVERRIDE_FASTCONV ) - { - renderSbaToMultiBinaural( - sbaInput, - outConfig, - tmpCrendBuffer ); - max_band = (int16_t) ( ( BINAURAL_MAXBANDS * ( *sbaInput->base.ctx.pOutSampleRate ) ) / 48000 ); - if ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) - { - accumulate2dArrayToBuffer( tmpCrendBuffer, &outAudio ); - } - } - else -#endif +#if ( defined DEBUGGING ) || ( defined SPLIT_REND_WITH_HEAD_ROT ) + if ( sbaInput->base.ctx.hhRendererConfig[0]->renderer_type_override == RENDER_TYPE_OVERRIDE_FASTCONV ) { + float Cldfb_RealBuffer[MAX_OUTPUT_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; + float Cldfb_ImagBuffer[MAX_OUTPUT_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; + copyBufferToCLDFBarray( sbaInput->base.inputBuffer, Cldfb_RealBuffer, Cldfb_ImagBuffer ); ivas_rend_CldfbMultiBinRendProcess( @@ -7001,6 +7582,19 @@ static ivas_error renderSbaToSplitBinaural( low_res_pre_rend_rot ); max_band = sbaInput->cldfbRendWrapper.hCldfbRend->max_band; } + else +#endif + { + renderSbaToMultiBinaural( + sbaInput, + outConfig, + tmpCrendBuffer ); + max_band = (int16_t) ( ( BINAURAL_MAXBANDS * ( *sbaInput->base.ctx.pOutSampleRate ) ) / 48000 ); + if ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) + { + accumulate2dArrayToBuffer( tmpCrendBuffer, &outAudio ); + } + } /*SPLIT pre rendering MD and CLDFB coding*/ convertBitsBufferToInternalBitsBuff( *hBits, &bits ); @@ -7018,7 +7612,7 @@ static ivas_error renderSbaToSplitBinaural( convertInternalBitsBuffToBitsBuffer( hBits, bits ); - wmops_sub_end(); + pop_wmops(); return error; } @@ -7034,9 +7628,9 @@ static ivas_error renderSbaToBinaural( ivas_error error; IVAS_REND_AudioBuffer tmpRotBuffer; - wmops_sub_start( "renderSbaToBinaural" ); + push_wmops( "renderSbaToBinaural" ); -#ifdef SPLIT_REND_WITH_HEAD_ROT +#if defined DEBUGGING && defined SPLIT_REND_WITH_HEAD_ROT if ( sbaInput->base.ctx.hhRendererConfig[0]->renderer_type_override == RENDER_TYPE_OVERRIDE_FASTCONV ) { float Cldfb_RealBuffer[MAX_OUTPUT_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]; @@ -7059,47 +7653,30 @@ static ivas_error renderSbaToBinaural( accumulateCLDFBArrayToBuffer( Cldfb_RealBuffer_Binaural[0], Cldfb_ImagBuffer_Binaural[0], &outAudio ); } else - #endif { - /* apply rotation */ - if ( sbaInput->base.ctx.pHeadRotData->headRotEnabled ) - { - tmpRotBuffer = sbaInput->base.inputBuffer; - tmpRotBuffer.data = count_malloc( tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels * sizeof( float ) ); - /* copy input for in-place rotation */ - mvr2r( sbaInput->base.inputBuffer.data, tmpRotBuffer.data, - tmpRotBuffer.config.numChannels * tmpRotBuffer.config.numSamplesPerChannel ); - -#ifdef ROTATE_CREND_IN_CLDFB_DOMAIN - rotateFrameSbacldfb( sbaInput->base.inputBuffer, - sbaInput->base.inConfig, - sbaInput->base.ctx.pHeadRotData, - sbaInput->rot_gains_prev[0], - tmpRotBuffer ); -#else - rotateFrameSba( sbaInput->base.inputBuffer, - sbaInput->base.inConfig, - sbaInput->base.ctx.pHeadRotData, + tmpRotBuffer = sbaInput->base.inputBuffer; + tmpRotBuffer.data = malloc( tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels * sizeof( float ) ); + + /* copy input for in-place rotation */ + mvr2r( sbaInput->base.inputBuffer.data, tmpRotBuffer.data, tmpRotBuffer.config.numChannels * tmpRotBuffer.config.numSamplesPerChannel ); + + if ( ( error = rotateFrameSba( sbaInput->base.inputBuffer, sbaInput->base.inConfig, sbaInput->base.ctx.pHeadRotData, #ifdef SPLIT_REND_WITH_HEAD_ROT - sbaInput->rot_gains_prev[0], + sbaInput->rot_gains_prev[0], #else - sbaInput->rot_gains_prev, -#endif - tmpRotBuffer ); + sbaInput->rot_gains_prev, #endif - - - copyBufferTo2dArray( tmpRotBuffer, tmpCrendBuffer ); - count_free( tmpRotBuffer.data ); - } - else + tmpRotBuffer ) ) != IVAS_ERR_OK ) { - copyBufferTo2dArray( sbaInput->base.inputBuffer, tmpCrendBuffer ); + return error; } + copyBufferTo2dArray( tmpRotBuffer, tmpCrendBuffer ); + free( tmpRotBuffer.data ); /* call CREND */ - if ( ( error = ivas_rend_crendProcess( &sbaInput->crendWrapper, sbaInput->base.inConfig, outConfig, tmpCrendBuffer, *sbaInput->base.ctx.pOutSampleRate + if ( ( error = ivas_rend_crendProcess( sbaInput->crendWrapper, getIvasAudioConfigFromRendAudioConfig( sbaInput->base.inConfig ), getIvasAudioConfigFromRendAudioConfig( outConfig ), + NULL, NULL, NULL, NULL, tmpCrendBuffer, *sbaInput->base.ctx.pOutSampleRate #ifdef SPLIT_REND_WITH_HEAD_ROT , 0 @@ -7108,11 +7685,10 @@ static ivas_error renderSbaToBinaural( { return error; } - accumulate2dArrayToBuffer( tmpCrendBuffer, &outAudio ); } - wmops_sub_end(); + pop_wmops(); return IVAS_ERR_OK; } @@ -7126,7 +7702,6 @@ static ivas_error renderSbaToBinauralRoom( int16_t i; int16_t tmp; float tmpCrendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k]; - ivas_error error; IVAS_REND_AudioBuffer tmpRotBuffer; IVAS_REND_AudioBuffer tmpMcBuffer; @@ -7134,7 +7709,7 @@ static ivas_error renderSbaToBinauralRoom( tmpRotBuffer = outAudio; /* avoid compilation warning */ - wmops_sub_start( "renderSbaToBinauralRoom" ); + push_wmops( "renderSbaToBinauralRoom" ); headRotEnabled = sbaInput->base.ctx.pHeadRotData->headRotEnabled; @@ -7142,24 +7717,33 @@ static ivas_error renderSbaToBinauralRoom( if ( headRotEnabled ) { tmpRotBuffer = sbaInput->base.inputBuffer; - tmpRotBuffer.data = count_malloc( tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels * sizeof( float ) ); + tmpRotBuffer.data = malloc( tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels * sizeof( float ) ); + /* copy input for in-place rotation */ mvr2r( sbaInput->base.inputBuffer.data, tmpRotBuffer.data, tmpRotBuffer.config.numChannels * tmpRotBuffer.config.numSamplesPerChannel ); - rotateFrameSba( sbaInput->base.inputBuffer, sbaInput->base.inConfig, sbaInput->base.ctx.pHeadRotData, + if ( ( error = rotateFrameSba( sbaInput->base.inputBuffer, sbaInput->base.inConfig, sbaInput->base.ctx.pHeadRotData, #ifdef SPLIT_REND_WITH_HEAD_ROT - sbaInput->rot_gains_prev[0], + sbaInput->rot_gains_prev[0], #else - sbaInput->rot_gains_prev, + sbaInput->rot_gains_prev, #endif - tmpRotBuffer ); + tmpRotBuffer ) ) != IVAS_ERR_OK ) + { + return error; + } } /* intermediate rendering to 7_1_4 */ tmpMcBuffer = sbaInput->base.inputBuffer; - getAudioConfigNumChannels( IVAS_REND_AUDIO_CONFIG_7_1_4, &tmp ); - tmpMcBuffer.config.numChannels = (int16_t) tmp; - tmpMcBuffer.data = count_malloc( tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels * sizeof( float ) ); + + if ( ( error = getAudioConfigNumChannels( IVAS_REND_AUDIO_CONFIG_7_1_4, &tmp ) ) != IVAS_ERR_OK ) + { + return error; + } + + tmpMcBuffer.config.numChannels = tmp; + tmpMcBuffer.data = malloc( tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels * sizeof( float ) ); set_zero( tmpMcBuffer.data, tmpMcBuffer.config.numChannels * tmpMcBuffer.config.numSamplesPerChannel ); tmpBufPtr = ( headRotEnabled ) ? &tmpRotBuffer : &sbaInput->base.inputBuffer; @@ -7171,7 +7755,8 @@ static ivas_error renderSbaToBinauralRoom( copyBufferTo2dArray( tmpMcBuffer, tmpCrendBuffer ); /* call CREND */ - if ( ( error = ivas_rend_crendProcess( &sbaInput->crendWrapper, IVAS_REND_AUDIO_CONFIG_7_1_4, outConfig, tmpCrendBuffer, *sbaInput->base.ctx.pOutSampleRate + if ( ( error = ivas_rend_crendProcess( sbaInput->crendWrapper, AUDIO_CONFIG_7_1_4, getIvasAudioConfigFromRendAudioConfig( outConfig ), + NULL, NULL, NULL, NULL, tmpCrendBuffer, *sbaInput->base.ctx.pOutSampleRate #ifdef SPLIT_REND_WITH_HEAD_ROT , 0 @@ -7185,11 +7770,11 @@ static ivas_error renderSbaToBinauralRoom( if ( headRotEnabled ) { - count_free( tmpRotBuffer.data ); + free( tmpRotBuffer.data ); } - count_free( tmpMcBuffer.data ); + free( tmpMcBuffer.data ); - wmops_sub_end(); + pop_wmops(); return IVAS_ERR_OK; } @@ -7198,7 +7783,12 @@ static ivas_error renderInputSplitBin( input_split_post_rend *splitBinInput, const IVAS_REND_AudioConfig outConfig, IVAS_REND_AudioBuffer outAudio, - IVAS_REND_BitstreamBuffer *hBits ) + IVAS_REND_BitstreamBuffer *hBits +#ifdef SPLIT_REND_PLC + , + const int16_t SplitRendBFI +#endif +) { ivas_error error; IVAS_REND_AudioBuffer inAudio; @@ -7221,7 +7811,12 @@ static ivas_error renderInputSplitBin( { case IVAS_REND_AUDIO_CONFIG_BINAURAL: error = renderSplitBinauralWithPostRot( splitBinInput, outAudio, - hBits ); + hBits +#ifdef SPLIT_REND_PLC + , + SplitRendBFI +#endif + ); break; default: return IVAS_ERR_INVALID_OUTPUT_FORMAT; @@ -7243,6 +7838,8 @@ static ivas_error renderInputSba( ivas_error error; IVAS_REND_AudioBuffer inAudio; + error = IVAS_ERR_OK; + inAudio = sbaInput->base.inputBuffer; if ( sbaInput->base.numNewSamplesPerChannel != outAudio.config.numSamplesPerChannel ) @@ -7261,10 +7858,10 @@ static ivas_error renderInputSba( switch ( getAudioConfigType( outConfig ) ) { case IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED: - error = renderSbaToMc( sbaInput, outAudio ); + renderSbaToMc( sbaInput, outAudio ); break; case IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS: - error = renderSbaToSba( sbaInput, outAudio ); + renderSbaToSba( sbaInput, outAudio ); break; case IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL: switch ( outConfig ) @@ -7293,13 +7890,8 @@ static ivas_error renderInputSba( default: return IVAS_ERR_INVALID_OUTPUT_FORMAT; } - /* Check error here to keep switch statement more compact */ - if ( error != IVAS_ERR_OK ) - { - return error; - } - return IVAS_ERR_OK; + return error; } #ifdef SPLIT_REND_WITH_HEAD_ROT @@ -7320,7 +7912,12 @@ static ivas_error renderActiveInputsSplitBin( continue; } - if ( ( error = renderInputSplitBin( pCurrentInput, hIvasRend->outputConfig, outAudio, hBits ) ) != IVAS_ERR_OK ) + if ( ( error = renderInputSplitBin( pCurrentInput, hIvasRend->outputConfig, outAudio, hBits +#ifdef SPLIT_REND_PLC + , + hIvasRend->splitRendBFI +#endif + ) ) != IVAS_ERR_OK ) { return error; } @@ -7364,39 +7961,50 @@ static ivas_error renderActiveInputsSba( return IVAS_ERR_OK; } -static void copyMasaMetadataToDiracRenderer( MASA_METADATA_FRAME *meta, DIRAC_DEC_HANDLE hDirAC ) +static void copyMasaMetadataToDiracRenderer( + MASA_METADATA_FRAME *meta, + DIRAC_DEC_HANDLE hDirAC ) { int16_t band, sf, bin; + int16_t meta_write_index; hDirAC->numSimultaneousDirections = meta->descriptive_meta.numberOfDirections + 1; for ( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ ) { + meta_write_index = ( hDirAC->dirac_bs_md_write_idx + sf ) % hDirAC->dirac_md_buffer_length; + for ( band = 0; band < MASA_MAXIMUM_CODING_SUBBANDS; band++ ) { for ( bin = MASA_band_grouping_24[band]; bin < MASA_band_grouping_24[band + 1]; bin++ ) { - hDirAC->azimuth[sf][bin] = (int16_t) meta->directional_meta[0].azimuth[sf][band]; - hDirAC->elevation[sf][bin] = (int16_t) meta->directional_meta[0].elevation[sf][band]; - hDirAC->energy_ratio1[sf][bin] = meta->directional_meta[0].energy_ratio[sf][band]; - hDirAC->diffuseness_vector[sf][bin] = 1.0f - meta->directional_meta[0].energy_ratio[sf][band]; - hDirAC->spreadCoherence[sf][bin] = meta->directional_meta[0].spread_coherence[sf][band]; - hDirAC->surroundingCoherence[sf][bin] = meta->common_meta.surround_coherence[sf][band]; + hDirAC->azimuth[meta_write_index][bin] = (int16_t) meta->directional_meta[0].azimuth[sf][band]; + hDirAC->elevation[meta_write_index][bin] = (int16_t) meta->directional_meta[0].elevation[sf][band]; + hDirAC->energy_ratio1[meta_write_index][bin] = meta->directional_meta[0].energy_ratio[sf][band]; + hDirAC->diffuseness_vector[meta_write_index][bin] = 1.0f - meta->directional_meta[0].energy_ratio[sf][band]; + hDirAC->spreadCoherence[meta_write_index][bin] = meta->directional_meta[0].spread_coherence[sf][band]; + hDirAC->surroundingCoherence[meta_write_index][bin] = meta->common_meta.surround_coherence[sf][band]; if ( hDirAC->numSimultaneousDirections == 2 ) { - hDirAC->azimuth2[sf][bin] = (int16_t) meta->directional_meta[1].azimuth[sf][band]; - hDirAC->elevation2[sf][bin] = (int16_t) meta->directional_meta[1].elevation[sf][band]; - hDirAC->energy_ratio2[sf][bin] = meta->directional_meta[1].energy_ratio[sf][band]; - hDirAC->diffuseness_vector[sf][bin] -= meta->directional_meta[1].energy_ratio[sf][band]; - hDirAC->spreadCoherence2[sf][bin] = meta->directional_meta[1].spread_coherence[sf][band]; + hDirAC->azimuth2[meta_write_index][bin] = (int16_t) meta->directional_meta[1].azimuth[sf][band]; + hDirAC->elevation2[meta_write_index][bin] = (int16_t) meta->directional_meta[1].elevation[sf][band]; + hDirAC->energy_ratio2[meta_write_index][bin] = meta->directional_meta[1].energy_ratio[sf][band]; + hDirAC->diffuseness_vector[meta_write_index][bin] -= meta->directional_meta[1].energy_ratio[sf][band]; + hDirAC->spreadCoherence2[meta_write_index][bin] = meta->directional_meta[1].spread_coherence[sf][band]; } } } } + + hDirAC->dirac_bs_md_write_idx = ( hDirAC->dirac_bs_md_write_idx + MAX_PARAM_SPATIAL_SUBFRAMES ) % hDirAC->dirac_md_buffer_length; + + return; } -static ivas_error renderMasaToMc( input_masa *masaInput, IVAS_REND_AudioBuffer outAudio ) +static void renderMasaToMc( + input_masa *masaInput, + IVAS_REND_AudioBuffer outAudio ) { float tmpBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k]; @@ -7415,10 +8023,12 @@ static ivas_error renderMasaToMc( input_masa *masaInput, IVAS_REND_AudioBuffer o accumulate2dArrayToBuffer( tmpBuffer, &outAudio ); - return IVAS_ERR_OK; + return; } -static ivas_error renderMasaToSba( input_masa *masaInput, IVAS_REND_AudioBuffer outAudio ) +static void renderMasaToSba( + input_masa *masaInput, + IVAS_REND_AudioBuffer outAudio ) { float tmpBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k]; @@ -7429,10 +8039,12 @@ static ivas_error renderMasaToSba( input_masa *masaInput, IVAS_REND_AudioBuffer accumulate2dArrayToBuffer( tmpBuffer, &outAudio ); - return IVAS_ERR_OK; + return; } -static ivas_error renderMasaToBinaural( input_masa *masaInput, IVAS_REND_AudioBuffer outAudio ) +static void renderMasaToBinaural( + input_masa *masaInput, + IVAS_REND_AudioBuffer outAudio ) { float tmpBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k]; @@ -7443,15 +8055,14 @@ static ivas_error renderMasaToBinaural( input_masa *masaInput, IVAS_REND_AudioBu accumulate2dArrayToBuffer( tmpBuffer, &outAudio ); - return IVAS_ERR_OK; + return; } static ivas_error renderInputMasa( input_masa *masaInput, - IVAS_REND_AudioConfig outConfig, + const IVAS_REND_AudioConfig outConfig, IVAS_REND_AudioBuffer outAudio ) { - ivas_error error; IVAS_REND_AudioBuffer inAudio; if ( !masaInput->metadataHasBeenFed ) @@ -7477,21 +8088,21 @@ static ivas_error renderInputMasa( switch ( getAudioConfigType( outConfig ) ) { case IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED: - error = renderMasaToMc( masaInput, outAudio ); + renderMasaToMc( masaInput, outAudio ); break; case IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS: - error = renderMasaToSba( masaInput, outAudio ); + renderMasaToSba( masaInput, outAudio ); break; case IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL: switch ( outConfig ) { case IVAS_REND_AUDIO_CONFIG_BINAURAL: - error = renderMasaToBinaural( masaInput, outAudio ); + renderMasaToBinaural( masaInput, outAudio ); break; /* ToDo */ // case IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB: // case IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM: - // error = renderMasaToBinauralRoom( masaInput, outConfig, outAudio ); + // renderMasaToBinauralRoom( masaInput, outConfig, outAudio ); // break; default: return IVAS_ERR_INVALID_OUTPUT_FORMAT; @@ -7500,11 +8111,6 @@ static ivas_error renderInputMasa( default: return IVAS_ERR_INVALID_OUTPUT_FORMAT; } - /* Check error here to keep switch statement more compact */ - if ( error != IVAS_ERR_OK ) - { - return error; - } return IVAS_ERR_OK; } @@ -7513,7 +8119,7 @@ static ivas_error renderActiveInputsMasa( IVAS_REND_HANDLE hIvasRend, IVAS_REND_AudioBuffer outAudio ) { - int32_t i; + int16_t i; input_masa *pCurrentInput; ivas_error error; @@ -7524,9 +8130,8 @@ static ivas_error renderActiveInputsMasa( /* Skip inactive inputs */ continue; } - if ( ( error = renderInputMasa( pCurrentInput, - hIvasRend->outputConfig, - outAudio ) ) != IVAS_ERR_OK ) + + if ( ( error = renderInputMasa( pCurrentInput, hIvasRend->outputConfig, outAudio ) ) != IVAS_ERR_OK ) { return error; } @@ -7535,9 +8140,16 @@ static ivas_error renderActiveInputsMasa( return IVAS_ERR_OK; } + +/*-------------------------------------------------------------------* + * IVAS_REND_GetSamples() + * + * + *-------------------------------------------------------------------*/ + ivas_error IVAS_REND_GetSamples( - IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ - IVAS_REND_AudioBuffer outAudio /* i/o: buffer for output audio */ + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + IVAS_REND_AudioBuffer outAudio /* i/o: buffer for output audio */ #ifdef SPLIT_REND_WITH_HEAD_ROT , IVAS_REND_BitstreamBuffer *hBits /*i/o: buffer for input/output bitstream. Needed in split rendering mode*/ @@ -7550,10 +8162,7 @@ ivas_error IVAS_REND_GetSamples( int16_t cldfb2tdSampleFact; #endif - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( hIvasRend == NULL || outAudio.data == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -7570,11 +8179,11 @@ ivas_error IVAS_REND_GetSamples( { return IVAS_ERR_INVALID_BUFFER_SIZE; } + if ( outAudio.config.numChannels <= 0 || MAX_OUTPUT_CHANNELS < outAudio.config.numChannels ) { return IVAS_ERR_WRONG_NUM_CHANNELS; } - #ifdef SPLIT_REND_WITH_HEAD_ROT if ( getAudioConfigType( hIvasRend->outputConfig ) == IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL && ( outAudio.config.numSamplesPerChannel * 1000 / cldfb2tdSampleFact ) != BINAURAL_RENDERING_FRAME_SIZE_MS * hIvasRend->sampleRateOut ) @@ -7586,10 +8195,12 @@ ivas_error IVAS_REND_GetSamples( /* Binaural rendering requires specific frame size */ return IVAS_ERR_INVALID_BUFFER_SIZE; } + if ( ( error = IVAS_REND_NumOutChannels( hIvasRend, &numOutChannels ) ) != IVAS_ERR_OK ) { return error; } + if ( numOutChannels != outAudio.config.numChannels ) { return IVAS_ERR_WRONG_NUM_CHANNELS; @@ -7610,10 +8221,12 @@ ivas_error IVAS_REND_GetSamples( { return error; } + if ( ( error = renderActiveInputsMc( hIvasRend, outAudio ) ) != IVAS_ERR_OK ) { return error; } + if ( ( error = renderActiveInputsSba( hIvasRend, outAudio #ifdef SPLIT_REND_WITH_HEAD_ROT , @@ -7623,6 +8236,7 @@ ivas_error IVAS_REND_GetSamples( { return error; } + if ( ( error = renderActiveInputsMasa( hIvasRend, outAudio ) ) != IVAS_ERR_OK ) { return error; @@ -7652,7 +8266,9 @@ ivas_error IVAS_REND_GetSamples( #endif #ifdef SPLIT_REND_LC3PLUS - if ( hIvasRend->outputConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB ) + if ( hIvasRend->outputConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_CLDFB + /* The condition below is a temp fix for differences in procesing paths between split rendering of SBA and ISM. Should be unified */ + && hIvasRend->inputsIsm[0].base.inConfig != IVAS_REND_AUDIO_CONFIG_UNKNOWN ) { /* TODO: doesn't work for multiple SBA inputs, needs to be updated like the ISM path for TD */ ivas_split_rend_bits_t bits; @@ -7686,16 +8302,21 @@ ivas_error IVAS_REND_GetSamples( return IVAS_ERR_OK; } + +/*-------------------------------------------------------------------* + * IVAS_REND_Close() + * + * + *-------------------------------------------------------------------*/ + void IVAS_REND_Close( - IVAS_REND_HANDLE *phIvasRend ) + IVAS_REND_HANDLE *phIvasRend /* i/o: Pointer to renderer handle */ +) { uint16_t i; IVAS_REND_HANDLE hIvasRend; - /*-----------------------------------------------------------------* - * Validate function arguments - *-----------------------------------------------------------------*/ - + /* Validate function arguments */ if ( phIvasRend == NULL || *phIvasRend == NULL ) { return; @@ -7740,13 +8361,21 @@ void IVAS_REND_Close( closeSplitRend( &hIvasRend->splitRendWrapper, &hIvasRend->splitRendEncBuffer ); #endif - count_free( hIvasRend ); + closeHeadRotation( hIvasRend ); + + free( hIvasRend ); *phIvasRend = NULL; return; } #ifdef DEBUGGING +/*-------------------------------------------------------------------* + * IVAS_REND_GetNoCLipping() + * + * + *-------------------------------------------------------------------*/ + int32_t IVAS_REND_GetNoCLipping( IVAS_REND_CONST_HANDLE hIvasRend ) { diff --git a/lib_rend/lib_rend.h b/lib_rend/lib_rend.h index f7a077b087..3b27f0fd39 100644 --- a/lib_rend/lib_rend.h +++ b/lib_rend/lib_rend.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,13 +33,8 @@ #ifndef LIB_REND_H #define LIB_REND_H -#include -#include -#include - -#include "options.h" #include "common_api_types.h" -#include "ivas_error.h" +#include #define RENDERER_MAX_ISM_INPUTS 4 @@ -50,7 +45,8 @@ #define RENDERER_MAX_BIN_INPUTS 1 #endif -#define RENDERER_HEAD_POSITIONS_PER_FRAME 4 + +typedef float IVAS_REND_LfePanMtx[IVAS_MAX_INPUT_LFE_CHANNELS][IVAS_MAX_OUTPUT_CHANNELS]; typedef struct { @@ -88,12 +84,6 @@ typedef struct const float *data; } IVAS_REND_ReadOnlyAudioBuffer; -typedef struct -{ - float azimuth; - float elevation; -} IVAS_REND_AudioObjectPosition; - typedef struct IVAS_REND *IVAS_REND_HANDLE; typedef struct IVAS_REND const *IVAS_REND_CONST_HANDLE; @@ -158,11 +148,6 @@ typedef enum typedef uint16_t IVAS_REND_InputId; -typedef struct -{ - int16_t numLfeChannels; - float lfeOutputGains[IVAS_MAX_INPUT_LFE_CHANNELS][IVAS_MAX_OUTPUT_CHANNELS]; -} IVAS_REND_LfeRouting; /* clang-format off */ /*----------------------------------------------------------------------------------* @@ -193,7 +178,7 @@ ivas_error IVAS_REND_SetCustomHrtf( /* Functions to be called before/during rendering */ ivas_error IVAS_REND_NumOutChannels( - IVAS_REND_CONST_HANDLE hIvasRend, /* i : Renderer handle */ + IVAS_REND_CONST_HANDLE hIvasRend, /* i : Renderer handle */ int16_t *numOutChannels /* o : number of output channels */ ); @@ -216,10 +201,18 @@ ivas_error IVAS_REND_SetInputGain( const float gain /* i : linear gain (not in dB) */ ); -ivas_error IVAS_REND_SetInputLfeRouting( +ivas_error IVAS_REND_SetInputLfeMtx( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_REND_InputId inputId, /* i : ID of the input */ + const IVAS_REND_LfePanMtx *lfePanMtx /* i : LFE panning matrix */ +); + +ivas_error IVAS_REND_SetInputLfePos( IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ const IVAS_REND_InputId inputId, /* i : ID of the input */ - const IVAS_REND_LfeRouting lfeRouting /* i : custom LFE routing struct */ + const float inputGain, /* i : Input gain to be applied to the LFE channel(s) */ + const float outputAzimuth, /* i : Output azimuth position */ + const float outputElevation /* i : Output elevation position */ ); ivas_error IVAS_REND_RemoveInput( @@ -260,29 +253,62 @@ ivas_error IVAS_REND_FeedInputMasaMetadata( ); ivas_error IVAS_REND_InitConfig( - IVAS_REND_HANDLE st, /* i/o: Renderer handle */ - bool rendererConfigEnabled /* i : flag indicating if a renderer configuration file was supplied */ + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_REND_AudioConfig outAudioConfig /* i : output audioConfig */ ); int16_t IVAS_REND_GetRenderConfig( - IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS decoder handle */ - const IVAS_RENDER_CONFIG_HANDLE hRCout /* o : Render configuration handle */ + IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS decoder handle */ + const IVAS_RENDER_CONFIG_HANDLE hRCout /* o : Render configuration handle */ ); int16_t IVAS_REND_FeedRenderConfig( - IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS decoder handle */ - const IVAS_RENDER_CONFIG_DATA renderConfig /* i : Render configuration struct */ + IVAS_REND_HANDLE hIvasRend, /* i/o: IVAS decoder handle */ + const IVAS_RENDER_CONFIG_DATA renderConfig /* i : Render configuration struct */ ); ivas_error IVAS_REND_SetHeadRotation( IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ - const IVAS_QUATERNION headRot[RENDERER_HEAD_POSITIONS_PER_FRAME] /* i : head positions for next rendering call */ + const IVAS_QUATERNION headRot[RENDERER_HEAD_POSITIONS_PER_FRAME], /* i : head orientations for next rendering call */ + const IVAS_VECTOR3 Pos[RENDERER_HEAD_POSITIONS_PER_FRAME] /* i : listener positions for next rendering call */ #ifdef SPLIT_REND_WITH_HEAD_ROT , IVAS_SPLIT_REND_ROT_AXIS rot_axis #endif ); +ivas_error IVAS_REND_SetOrientationTrackingMode( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const uint8_t otrMode /* i : Orientation tracking mode */ +); + +ivas_error IVAS_REND_SetReferenceRotation( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_QUATERNION refRot /* i : Reference rotation */ +); + +ivas_error IVAS_REND_GetMainOrientation( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + IVAS_QUATERNION *pOrientation /* i/o: Quaternion pointer for main orientation */ +); + +ivas_error IVAS_REND_GetTrackedRotation( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + IVAS_QUATERNION *pRotation /* i/o: Quaternion pointer for processed rotation */ +); + +ivas_error IVAS_REND_SetReferenceVector( + IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ + const IVAS_VECTOR3 listenerPos, /* i : Listener position */ + const IVAS_VECTOR3 refPos /* i : Reference position */ +); + +#ifdef SPLIT_REND_PLC +ivas_error IVAS_REND_SetSplitRendBFI( + IVAS_REND_HANDLE hIvasRend, + const int16_t bfi); +#endif + ivas_error IVAS_REND_GetSamples( IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */ IVAS_REND_AudioBuffer outAudio /* i/o: buffer for output audio */ diff --git a/lib_util/audio_file_reader.c b/lib_util/audio_file_reader.c index d2c38cbb17..4f6bd0c34d 100644 --- a/lib_util/audio_file_reader.c +++ b/lib_util/audio_file_reader.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -34,12 +34,13 @@ #include "tinywavein_c.h" #include #include -#include "wmops.h" +#include "wmc_auto.h" struct AudioFileReader { FILE *rawFile; WAVEFILEIN *wavFile; + uint32_t samplingRate; int16_t numChannels; }; @@ -54,14 +55,12 @@ static int8_t AudioFileReader_open_raw( static int8_t AudioFileReader_open_wav( AudioFileReader *self, - const char *fileName, - int32_t *sampleRate ) + const char *fileName ) { - uint32_t sampleRate_, samplesInFile; + uint32_t samplesInFile; int16_t bps; - self->wavFile = OpenWav( fileName, &sampleRate_, &self->numChannels, &samplesInFile, &bps ); - *sampleRate = sampleRate_; + self->wavFile = OpenWav( fileName, &self->samplingRate, &self->numChannels, &samplesInFile, &bps ); if ( !self->wavFile ) { @@ -76,8 +75,7 @@ static int8_t AudioFileReader_open_wav( /*! r: AudioFileReader handle */ ivas_error AudioFileReader_open( AudioFileReader **audioReader, /* o : AudioFileReader handle */ - const char *fileName, /* i : path to wav/raw pcm file */ - int32_t *sampleRate /* o : sample rate of wav file, unused with pcm */ + const char *fileName /* i : path to wav/raw pcm file */ ) { AudioFileReader *self; @@ -100,11 +98,12 @@ ivas_error AudioFileReader_open( return IVAS_ERR_FAILED_FILE_OPEN; } self = calloc( sizeof( AudioFileReader ), 1 ); + self->samplingRate = 0; self->numChannels = 0; if ( fileNameLen > wavSuffixLen && strncmp( fileName + fileNameLen - wavSuffixLen, wavSuffix, wavSuffixLen ) == 0 ) { - retCode = AudioFileReader_open_wav( self, fileName, sampleRate ); + retCode = AudioFileReader_open_wav( self, fileName ); } else { @@ -180,15 +179,53 @@ ivas_error AudioFileReader_read( return error; } -/*! r: number of channels of the opened file */ -int16_t AudioFileReader_getNumChannels( - AudioFileReader *self /* i/o: AudioFileReader handle */ -) +ivas_error AudioFileReader_getSamplingRate( + AudioFileReader *self, + int32_t *samplingRate ) { - if ( self != NULL ) + if ( self == NULL || samplingRate == NULL ) { - return self->numChannels; + return IVAS_ERR_UNEXPECTED_NULL_POINTER; } - return 0; + if ( self->rawFile ) + { + return IVAS_ERR_SAMPLING_RATE_UNKNOWN; + } + else if ( self->wavFile ) + { + *samplingRate = self->samplingRate; + } + else + { + return IVAS_ERR_NO_FILE_OPEN; + } + + return IVAS_ERR_OK; +} + + +ivas_error AudioFileReader_getNumChannels( + AudioFileReader *self, + int16_t *numChannels ) +{ + if ( self == NULL || numChannels == NULL ) + { + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + } + + if ( self->rawFile ) + { + return IVAS_ERR_NUM_CHANNELS_UNKNOWN; + } + else if ( self->wavFile ) + { + *numChannels = self->numChannels; + } + else + { + return IVAS_ERR_NO_FILE_OPEN; + } + + return IVAS_ERR_OK; } diff --git a/lib_util/audio_file_reader.h b/lib_util/audio_file_reader.h index 0fc9b1f4a1..0fd4da5ac7 100644 --- a/lib_util/audio_file_reader.h +++ b/lib_util/audio_file_reader.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,8 +33,7 @@ #ifndef IVAS_AUDIO_FILE_READER_H #define IVAS_AUDIO_FILE_READER_H -#include -#include "ivas_error.h" +#include "common_api_types.h" struct AudioFileReader; typedef struct AudioFileReader AudioFileReader; @@ -43,11 +42,9 @@ typedef struct AudioFileReader AudioFileReader; ivas_error AudioFileReader_open( AudioFileReader **audioReader, /* o : AudioFileReader handle */ - const char *fileName, /* i : path to wav/raw pcm file */ - int32_t *sampleRate /* o : sample rate of wav file, unused with pcm */ + const char *fileName /* i : path to wav/raw pcm file */ ); -/*! r: number of read samples */ ivas_error AudioFileReader_read( AudioFileReader *self, /* i/o: AudioFileReader handle */ int16_t *samples, /* o : samples read from the opened file */ @@ -55,9 +52,16 @@ ivas_error AudioFileReader_read( int16_t *numSamplesRead /* i : number of samples actualy read */ ); -/*! r: number of channels of the opened file */ -int16_t AudioFileReader_getNumChannels( - AudioFileReader *self /* i/o: AudioFileReader handle */ +/*! r: ivas error - in particular, IVAS_ERR_SAMPLING_RATE_UNKNOWN if the opened file has no sampling rate metadata */ +ivas_error AudioFileReader_getSamplingRate( + AudioFileReader *self, /* i/o: AudioFileReader handle */ + int32_t* samplingRate /* o : sampling rate of opened audio file */ +); + +/*! r: ivas error - in particular, IVAS_ERR_NUM_CHANNELS_UNKNOWN if the opened file has no metadata specifying number of channels */ +ivas_error AudioFileReader_getNumChannels( + AudioFileReader *self, /* i/o: AudioFileReader handle */ + int16_t * numChannels /* o : number fo channels in opened audio file */ ); void AudioFileReader_close( diff --git a/lib_util/audio_file_writer.c b/lib_util/audio_file_writer.c index af9c6ee0e6..81084dbd95 100644 --- a/lib_util/audio_file_writer.c +++ b/lib_util/audio_file_writer.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -34,7 +34,7 @@ #include "tinywaveout_c.h" #include #include -#include "wmops.h" +#include "wmc_auto.h" struct AudioFileWriter { @@ -98,7 +98,7 @@ ivas_error AudioFileWriter_open( int8_t retCode; - if ( fileNameLen > wavSuffixLen && strncmp( fileName + fileNameLen - wavSuffixLen, wavSuffix, wavSuffixLen ) == 0 ) + if ( ( fileNameLen > wavSuffixLen ) && ( strncmp( fileName + fileNameLen - wavSuffixLen, wavSuffix, wavSuffixLen ) == 0 ) ) { retCode = AudioFileWriter_open_wav( self, fileName, sampleRate, numChannels ); } diff --git a/lib_util/audio_file_writer.h b/lib_util/audio_file_writer.h index cd7d2ce5d2..b5157ffde4 100644 --- a/lib_util/audio_file_writer.h +++ b/lib_util/audio_file_writer.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,8 +33,7 @@ #ifndef IVAS_AUDIO_FILE_WRITER_H #define IVAS_AUDIO_FILE_WRITER_H -#include -#include "ivas_error.h" +#include "common_api_types.h" struct AudioFileWriter; typedef struct AudioFileWriter AudioFileWriter; diff --git a/lib_util/bitstream_reader.c b/lib_util/bitstream_reader.c index caa8b52c59..999332e863 100644 --- a/lib_util/bitstream_reader.c +++ b/lib_util/bitstream_reader.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_util/bitstream_reader.h b/lib_util/bitstream_reader.h index 2b750566eb..2accbbd242 100644 --- a/lib_util/bitstream_reader.h +++ b/lib_util/bitstream_reader.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,9 +33,7 @@ #ifndef BITSTREAM_READER_H #define BITSTREAM_READER_H -#include "options.h" -#include "ivas_error.h" -#include +#include "common_api_types.h" /*-----------------------------------------------------------------------* diff --git a/lib_util/bitstream_writer.c b/lib_util/bitstream_writer.c index c133ceba25..7862ff1977 100644 --- a/lib_util/bitstream_writer.c +++ b/lib_util/bitstream_writer.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,7 +33,6 @@ #include "bitstream_writer.h" #include "g192.h" #include "mime_io.h" -#include "ivas_error.h" #include "ivas_error_utils.h" #include #include diff --git a/lib_util/bitstream_writer.h b/lib_util/bitstream_writer.h index 9a8acc8106..a855f347d2 100644 --- a/lib_util/bitstream_writer.h +++ b/lib_util/bitstream_writer.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,8 +33,7 @@ #ifndef BITSTREAM_WRITER_H #define BITSTREAM_WRITER_H -#include -#include "ivas_error.h" +#include "common_api_types.h" /*-----------------------------------------------------------------------* diff --git a/lib_util/cmdl_tools.c b/lib_util/cmdl_tools.c index ceaeb95c0b..b0b7e906cc 100644 --- a/lib_util/cmdl_tools.c +++ b/lib_util/cmdl_tools.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -31,6 +31,7 @@ *******************************************************************************************************/ #include "cmdl_tools.h" +#include /*---------------------------------------------------------------------* * to_upper() @@ -62,7 +63,7 @@ char *to_upper( char *str ) * Check if a string contains only digits. *---------------------------------------------------------------------*/ -bool is_digits_only( char *str ) +bool is_digits_only( const char *str ) { int16_t i; @@ -86,23 +87,141 @@ bool is_digits_only( char *str ) * Check if a string is a number. *---------------------------------------------------------------------*/ -bool is_number( char *str ) +bool is_number( const char *str ) { + bool decimal_separator_found; int16_t i; + int16_t numeric_len; + decimal_separator_found = false; i = 0; + numeric_len = 0; + + /* Check for null string or sign character */ + if ( str[i] == '\0' ) + { + return false; + } + else if ( str[i] == '+' || str[i] == '-' ) + { + i++; + } + + /* Ensure rest of string is numeric and only one decimal separator is present */ while ( str[i] != 0 ) { -#if 1 /* TODO tmu : remove once branch is updated with recent main */ - if ( ( str[i] < '0' || str[i] > '9' ) && str[i] != '.' && str[i] != '-' && str[i] != '\n' && str[i] != '\r' && str[i] != '+' ) -#else - if ( ( str[i] < '0' || str[i] > '9' ) && str[i] != '.' && str[i] != '-' && str[i] != '\n' && str[i] != '\r' ) -#endif + if ( str[i] < '0' || str[i] > '9' ) { - return false; + if ( str[i] == '.' ) + { + if ( decimal_separator_found ) + { + return false; + } + else + { + decimal_separator_found = true; + } + } + else if ( str[i] != '\r' && str[i] != '\n' ) + { + return false; + } + } + else + { + numeric_len++; } i++; } + if ( numeric_len == 0 ) + { + return false; + } + return true; } + + +/*---------------------------------------------------------------------* + * convert_backslash() + * + * + *---------------------------------------------------------------------*/ + +void convert_backslash( + char *str ) +{ + int16_t i, len; + + /* check that all backslashes are correct on the given platform */ + len = (int16_t) strlen( str ); + + for ( i = 0; i < len; i++ ) + { +#ifdef _WIN32 + if ( str[i] == '/' ) + { + str[i] = '\\'; + } +#else + if ( str[i] == '\\' ) + { + str[i] = '/'; + } +#endif + } + + return; +} + +/*---------------------------------------------------------------------* + * remove_cr() + * + * + *---------------------------------------------------------------------*/ + +void remove_cr( + char *str ) +{ + char *pos; + + /* remove all \r characters from the string */ + pos = strchr( str, '\r' ); + while ( pos != NULL ) + { + strcpy( pos, pos + 1 ); + pos = strchr( pos, '\r' ); + } + + return; +} + + +/*---------------------------------------------------------------------* + * clearString() + * + * + *---------------------------------------------------------------------*/ + +void clearString( + char *str ) +{ + str[0] = '\0'; + + return; +} + + +/*---------------------------------------------------------------------* + * isEmptyString() + * + * + *---------------------------------------------------------------------*/ + +bool isEmptyString( + const char *str ) +{ + return str[0] == '\0'; +} diff --git a/lib_util/cmdl_tools.h b/lib_util/cmdl_tools.h index 829ec985b0..b160473002 100644 --- a/lib_util/cmdl_tools.h +++ b/lib_util/cmdl_tools.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -36,11 +36,18 @@ #include #include -bool is_digits_only( char *str ); +bool is_digits_only( const char *str ); -bool is_number( char *str ); +bool is_number( const char *str ); char *to_upper( char *str ); +void convert_backslash( char *str ); + +void remove_cr( char *str ); + +void clearString( char *str ); + +bool isEmptyString( const char *str ); #endif /* CMDL_TOOLS_H */ diff --git a/lib_util/cmdln_parser.c b/lib_util/cmdln_parser.c index 1904f880be..200b8c86e9 100644 --- a/lib_util/cmdln_parser.c +++ b/lib_util/cmdln_parser.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -31,7 +31,6 @@ *******************************************************************************************************/ #include "cmdln_parser.h" - #include #include #include @@ -48,7 +47,9 @@ typedef struct int8_t hasBeenParsed; } Option; -static int16_t validateNoDuplicateIds( const OptionProps *props, int32_t numOpts ) +static int16_t validateNoDuplicateIds( + const OptionProps *props, + int32_t numOpts ) { for ( int32_t i = 0; i < numOpts; ++i ) { @@ -65,7 +66,8 @@ static int16_t validateNoDuplicateIds( const OptionProps *props, int32_t numOpts return 0; } -static int16_t validateOptionProps( OptionProps props ) +static int16_t validateOptionProps( + OptionProps props ) { /* Check required properties */ if ( props.match == NULL ) @@ -85,7 +87,10 @@ static int16_t validateOptionProps( OptionProps props ) } /* Validate given OptionProps and use them to initialize array of Options */ -static int16_t initOpts( const OptionProps *options, int32_t numOpts, Option *opts ) +static int16_t initOpts( + const OptionProps *options, + const int32_t numOpts, + Option *opts ) { for ( int32_t i = 0; i < numOpts; ++i ) { @@ -111,7 +116,8 @@ static int16_t initOpts( const OptionProps *options, int32_t numOpts, Option *op return 0; } -static int8_t stringLooksLikeOption( const char *str ) +static int8_t stringLooksLikeOption( + const char *str ) { if ( str[0] == '-' ) { @@ -121,7 +127,8 @@ static int8_t stringLooksLikeOption( const char *str ) return 0; } -static const char *stringToOptionName( const char *str ) +static const char *stringToOptionName( + const char *str ) { while ( *str == '-' ) { @@ -131,7 +138,9 @@ static const char *stringToOptionName( const char *str ) return str; } -static int8_t optionMatchesString( Option opt, const char *str ) +static int8_t optionMatchesString( + Option opt, + const char *str ) { if ( !stringLooksLikeOption( str ) ) { @@ -148,12 +157,13 @@ static int8_t optionMatchesString( Option opt, const char *str ) return 0; } -static int16_t parseOpts( int32_t argc, - char **argv, - Option *opts, - int32_t numOpts, - void *pOutputStruct, - CmdLnParser_FnPtr_ParseOption parseOption ) +static int16_t parseOpts( + int32_t argc, + char **argv, + Option *opts, + const int32_t numOpts, + void *pOutputStruct, + CmdLnParser_FnPtr_ParseOption parseOption ) { Option *currOpt = NULL; int32_t currOptIdx = 1; @@ -234,7 +244,8 @@ static int16_t parseOpts( int32_t argc, return 0; } -static const char *getBasename( const char *path ) +static const char *getBasename( + const char *path ) { /* Find last forward slash in path */ const char *namePtr = strrchr( path, '/' ); @@ -254,12 +265,14 @@ static const char *getBasename( const char *path ) return path; } -static int32_t totalOptionNameLength( const OptionProps opt ) +static int32_t totalOptionNameLength( + const OptionProps opt ) { return strlen( opt.match ) + strlen( opt.matchShort ); } -static void printWhitespace( int32_t n ) +static void printWhitespace( + const int32_t n ) { for ( int32_t i = 0; i < n; ++i ) { @@ -267,7 +280,9 @@ static void printWhitespace( int32_t n ) } } -static void printOptDescriptionAligned( const char *descPtr, int32_t descriptionColumnIdx ) +static void printOptDescriptionAligned( + const char *descPtr, + int32_t descriptionColumnIdx ) { if ( descPtr == NULL ) { @@ -290,12 +305,14 @@ static void printOptDescriptionAligned( const char *descPtr, int32_t description } ++descPtr; } + + return; } static void printUsage( const char *argv0, const OptionProps *optionProps, - int32_t numOptions ) + const int32_t numOptions ) { fprintf( stderr, "\n" ); fprintf( stderr, "Usage: %s [options]\n", getBasename( argv0 ) ); @@ -326,14 +343,17 @@ static void printUsage( printWhitespace( maxOptNameLength - optNameLength + preDescriptionWhitespace ); printOptDescriptionAligned( opt.description, maxOptNameLength + preDescriptionWhitespace + leftColumnAdditionalChars ); } + + return; } -int16_t CmdLnParser_parseArgs( int32_t argc, - char **argv, - const OptionProps *optionProps, - int32_t numOptions, - void *pOutputStruct, - CmdLnParser_FnPtr_ParseOption parseOption ) +int16_t CmdLnParser_parseArgs( + int32_t argc, + char **argv, + const OptionProps *optionProps, + const int32_t numOptions, + void *pOutputStruct, + CmdLnParser_FnPtr_ParseOption parseOption ) { assert( numOptions <= MAX_SUPPORTED_OPTS ); @@ -357,9 +377,12 @@ fail: return -1; } -void CmdLnParser_printUsage( char *executableName, - const CmdLnParser_Option *options, - int32_t numOptions ) +void CmdLnParser_printUsage( + char *executableName, + const CmdLnParser_Option *options, + const int32_t numOptions ) { printUsage( executableName, options, numOptions ); + + return; } diff --git a/lib_util/cmdln_parser.h b/lib_util/cmdln_parser.h index 8fecc70d9e..b8c8370eb4 100644 --- a/lib_util/cmdln_parser.h +++ b/lib_util/cmdln_parser.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,11 +33,9 @@ #ifndef CMDLN_PARSER_H #define CMDLN_PARSER_H -#include +#include "common_api_types.h" #include -#include "options.h" - typedef struct { int32_t id; @@ -47,21 +45,10 @@ typedef struct } CmdLnParser_Option; /* Function for parsing option values into an output struct, to be implemented by the user */ -typedef void ( *CmdLnParser_FnPtr_ParseOption )( int32_t optionId, /* i : option ID of matched option */ - char **optionValues, /* i : array of string values following the matched option in argv */ - int16_t numOptionValues, /* i : number of string values following the matched option in argv */ - void *pOutputStruct /* o : struct to store parsed values */ -); +typedef void ( *CmdLnParser_FnPtr_ParseOption )( int32_t optionId, char **optionValues, int16_t numOptionValues, void *pOutputStruct ); -int16_t CmdLnParser_parseArgs( int32_t argc, - char **argv, - const CmdLnParser_Option *options, - int32_t numOptions, - void *pOutputStruct, - CmdLnParser_FnPtr_ParseOption parseOption ); +int16_t CmdLnParser_parseArgs( int32_t argc, char **argv, const CmdLnParser_Option *options, const int32_t numOptions, void *pOutputStruct, CmdLnParser_FnPtr_ParseOption parseOption ); -void CmdLnParser_printUsage( char *executableName, - const CmdLnParser_Option *options, - int32_t numOptions ); +void CmdLnParser_printUsage( char *executableName, const CmdLnParser_Option *options, const int32_t numOptions ); #endif /* CMDLN_PARSER_H */ diff --git a/lib_util/evs_rtp_payload.c b/lib_util/evs_rtp_payload.c index 67dcaa6f36..d67aebd4c0 100644 --- a/lib_util/evs_rtp_payload.c +++ b/lib_util/evs_rtp_payload.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -141,36 +141,6 @@ static void evsHeaderFullPayload_parseToc( uint8_t toc, bool *isAMRWB_IOmode, bo } } -bool evsPayload_getFrameTypeFromSize( int16_t frameSizeBits, bool *isAMRWB_IOmode, uint16_t *frameTypeIndex ) -{ - int16_t i; - int32_t rate; - rate = frameSizeBits * 50; - if ( rate == 0 ) - { - assert( 0 ); /* VOIP_G192_RTP should not transmit empty frames */ - return false; /* no information available */ - } - for ( i = 0; i <= 9; ++i ) - { - if ( rate == AMRWB_IOmode2rate[i] ) - { - *isAMRWB_IOmode = true; - *frameTypeIndex = i; - return true; - } - } - for ( i = 0; i <= 12; ++i ) - { - if ( rate == PRIMARYmode2rate[i] ) - { - *isAMRWB_IOmode = false; - *frameTypeIndex = i; - return true; - } - } - return false; -} bool evsHeaderFullPayload_unpackFrame( char *payload, uint16_t payloadSizeBytes, uint16_t frameIndex, bool *isAMRWB_IOmode, bool *frameFollowing, uint16_t *frameTypeIndex, bool *qBit, unsigned char **frame, uint16_t *frameSizeInBits ) { diff --git a/lib_util/evs_rtp_payload.h b/lib_util/evs_rtp_payload.h index 55073a7fa5..dac5fb0e35 100644 --- a/lib_util/evs_rtp_payload.h +++ b/lib_util/evs_rtp_payload.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -160,7 +160,6 @@ extern "C" bool evsPayload_unpackFrame( bool hf_only, char *payload, uint16_t payloadSizeBytes, uint16_t frameIndex, bool *isAMRWB_IOmode, bool *frameFollowing, uint16_t *frameTypeIndex, bool *qBit, unsigned char **framePtr, uint16_t *frameSizeBits ); - bool evsPayload_getFrameTypeFromSize( int16_t frameSizeBits, bool *isAMRWB_IOmode, uint16_t *frameTypeIndex ); bool evsHeaderFullPayload_unpackFrame( char *payload, uint16_t payloadSizeBytes, uint16_t frameIndex, bool *isAMRWB_IOmode, bool *frameFollowing, uint16_t *frameTypeIndex, bool *qBit, unsigned char **frame, uint16_t *frameSizeBits ); diff --git a/lib_util/g192.c b/lib_util/g192.c index 6f708690a0..04ba16c369 100644 --- a/lib_util/g192.c +++ b/lib_util/g192.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -35,10 +35,7 @@ ====================================================================================*/ #include "g192.h" -#include "common_api_types.h" #include -#include -#include #include #include #ifndef _WIN32 diff --git a/lib_util/g192.h b/lib_util/g192.h index c96b5bf756..2dfd34b9e5 100644 --- a/lib_util/g192.h +++ b/lib_util/g192.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -37,8 +37,9 @@ #ifndef G192_H #define G192_H G192_H +#include "common_api_types.h" #include -#include + /*-----------------------------------------------------------------------* * Enums diff --git a/lib_util/head_rotation_file_reader.c b/lib_util/head_rotation_file_reader.c index cd1dd7bcf3..0283c29233 100644 --- a/lib_util/head_rotation_file_reader.c +++ b/lib_util/head_rotation_file_reader.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -31,7 +31,6 @@ *******************************************************************************************************/ #include "head_rotation_file_reader.h" -#include #include #include #include @@ -94,33 +93,41 @@ ivas_error HeadRotationFileReader_open( ivas_error HeadRotationFileReading( HeadRotFileReader *headRotReader, /* i/o: HeadRotFileReader handle */ - IVAS_QUATERNION *Quaternions, /* o : head-tracking data */ - const int32_t frame_dec /* i : decoded frame number */ + IVAS_QUATERNION *pQuaternion, /* o : head-tracking data */ + IVAS_VECTOR3 *pPos /* o : listener position */ ) { - uint16_t i; float w, x, y, z; + float posx, posy, posz; + int32_t read_values; - for ( i = 0; i < IVAS_MAX_PARAM_SPATIAL_SUBFRAMES; i++ ) + posx = 0.0f; + posy = 0.0f; + posz = 0.0f; + + read_values = fscanf( headRotReader->trajFile, "%f,%f,%f,%f,%f,%f,%f", &w, &x, &y, &z, &posx, &posy, &posz ); + if ( ( read_values != 4 ) && ( read_values != 7 ) ) /* Allow either orientation (4) or orientation+position (4+3) */ { - if ( 4 != fscanf( headRotReader->trajFile, "%f,%f,%f,%f", &w, &x, &y, &z ) ) + if ( feof( headRotReader->trajFile ) ) { - if ( feof( headRotReader->trajFile ) ) - { - rewind( headRotReader->trajFile ); - headRotReader->fileRewind = true; - return HeadRotationFileReading( headRotReader, Quaternions, frame_dec ); - } - return IVAS_ERR_FAILED_FILE_PARSE; + rewind( headRotReader->trajFile ); + headRotReader->fileRewind = true; + return HeadRotationFileReading( headRotReader, pQuaternion, pPos ); } + return IVAS_ERR_FAILED_FILE_PARSE; + } + ( headRotReader->frameCounter )++; - ( headRotReader->frameCounter )++; - - Quaternions[i].w = w; - Quaternions[i].x = x; - Quaternions[i].y = y; - Quaternions[i].z = z; + pQuaternion->w = w; + pQuaternion->x = x; + pQuaternion->y = y; + pQuaternion->z = z; + if ( pPos != NULL ) + { + pPos->x = posx; + pPos->y = posy; + pPos->z = posz; } return IVAS_ERR_OK; diff --git a/lib_util/head_rotation_file_reader.h b/lib_util/head_rotation_file_reader.h index 6664908b00..52b97ae1c3 100644 --- a/lib_util/head_rotation_file_reader.h +++ b/lib_util/head_rotation_file_reader.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -34,7 +34,6 @@ #define IVAS_HR_FILE_READER_H #include "common_api_types.h" -#include "ivas_error.h" #define IVAS_MAX_PARAM_SPATIAL_SUBFRAMES 4 @@ -60,8 +59,8 @@ ivas_error HeadRotationFileReader_open( ivas_error HeadRotationFileReading( HeadRotFileReader *headRotReader, /* i/o: HeadRotFileReader handle */ - IVAS_QUATERNION *Quaternions, /* o : head-tracking data */ - const int32_t frame_dec /* i : decoded frame number */ + IVAS_QUATERNION *pQuaternion, /* o : head-tracking data */ + IVAS_VECTOR3 *pPos /* o : listener position */ ); /*-----------------------------------------------------------------------* diff --git a/lib_util/hrtf_file_reader.c b/lib_util/hrtf_file_reader.c index 92b0058436..377e10bb5d 100644 --- a/lib_util/hrtf_file_reader.c +++ b/lib_util/hrtf_file_reader.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -31,18 +31,31 @@ *******************************************************************************************************/ #include "hrtf_file_reader.h" -#include #include #include "prot.h" -#include "ivas_prot.h" +#include "ivas_prot_rend.h" +/*---------------------------------------------------------------------* + * Local structures + *---------------------------------------------------------------------*/ + struct hrtfFileReader { FILE *file; char *file_path; }; +typedef struct ivas_hrtfs_file_header_t +{ + char identifier[8]; + int32_t file_size; + int16_t nb_hrtf; + int32_t max_data_size; + +} ivas_hrtfs_file_header_t; + + /*---------------------------------------------------------------------* * Local constants *---------------------------------------------------------------------*/ @@ -50,6 +63,12 @@ struct hrtfFileReader #define RESAMPLE_FACTOR_16_48 ( 16.0f / 48.0f ) #define RESAMPLE_FACTOR_32_48 ( 32.0f / 48.0f ) +/*---------------------------------------------------------------------* + * Local function declarations + *---------------------------------------------------------------------*/ + +static void HRTF_energy_sections_precalc( ModelParams_t *model ); + /*---------------------------------------------------------------------* * hrtfFileReader_open() * @@ -111,6 +130,111 @@ void hrtfFileReader_close( } +/*-------------------------------------------------------------------* + * read_and_check_hrtf_binary_file_header() + * + * Check the HRTF file header read from binary file + --------------------------------------------------------------------*/ + +static ivas_error read_and_check_hrtf_binary_file_header( + ivas_hrtfs_file_header_t *hrtf_file_header, + FILE *f_hrtf ) +{ + int32_t file_size; + + /* [Declaration of the binary file] */ + /* File Identifier (8 bytes) */ + /* Size of file in bytes (4 bytes) */ + /* Number of HRTF (2 bytes) */ + /* Max length of HRTF data (4 bytes) */ + + fseek( f_hrtf, 0, SEEK_END ); + file_size = ftell( f_hrtf ); + fseek( f_hrtf, 0, SEEK_SET ); + + if ( file_size < (int32_t) sizeof( ivas_hrtfs_file_header_t ) ) + { + return IVAS_ERROR( IVAS_ERR_END_OF_FILE, "HRTF binary file not compliant (size of file header)" ); + } + + fread( &( hrtf_file_header->identifier ), 8, 1, f_hrtf ); + if ( strncmp( hrtf_file_header->identifier, "IVASHRTF", 8 ) != 0 ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Header of HRTF binary file not compliant (identifier)" ); + } + + fread( &( hrtf_file_header->file_size ), 4, 1, f_hrtf ); + if ( hrtf_file_header->file_size != file_size ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Header of HRTF binary file not compliant (file size)" ); + } + + fread( &( hrtf_file_header->nb_hrtf ), 2, 1, f_hrtf ); + fread( &( hrtf_file_header->max_data_size ), 4, 1, f_hrtf ); + + return IVAS_ERR_OK; +} + + +/*-------------------------------------------------------------------* + * check_hrtf_binary_header() + * + * Check the HRTF section header - read from binary file + --------------------------------------------------------------------*/ + +static ivas_error check_hrtf_binary_header( + ivas_hrtfs_header_t *hrtf_header ) +{ + /* Check the renderer type */ + if ( ( hrtf_header->rend_type != RENDERER_BINAURAL_MIXER_CONV ) && ( hrtf_header->rend_type != RENDERER_BINAURAL_MIXER_CONV_ROOM ) && + ( hrtf_header->rend_type != RENDERER_BINAURAL_FASTCONV ) && ( hrtf_header->rend_type != RENDERER_BINAURAL_FASTCONV_ROOM ) && + ( hrtf_header->rend_type != RENDERER_BINAURAL_PARAMETRIC ) && ( hrtf_header->rend_type != RENDERER_BINAURAL_PARAMETRIC_ROOM ) && + ( hrtf_header->rend_type != RENDERER_BINAURAL_OBJECTS_TD ) ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Header of HRTF binary file not compliant (renderer type)" ); + } + + /* Check the output format of the decoder */ + if ( ( hrtf_header->input_cfg != BINAURAL_INPUT_AUDIO_CONFIG_COMBINED ) && ( hrtf_header->input_cfg != BINAURAL_INPUT_AUDIO_CONFIG_HOA ) && ( hrtf_header->input_cfg != BINAURAL_INPUT_AUDIO_CONFIG_UNDEFINED ) ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Header of HRTF binary file not compliant (input audio configuration)" ); + } + + /* Check the sampling frequency */ + if ( ( hrtf_header->frequency != 48000 ) && ( hrtf_header->frequency != 32000 ) && ( hrtf_header->frequency != 16000 ) ) + { + return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Header of HRTF binary file not compliant (sampling frequency)" ); + } + + return IVAS_ERR_OK; +} + + +/*-------------------------------------------------------------------* + * read_hrtf_binary_header() + * + * Read the HRTF header from binary file + --------------------------------------------------------------------*/ + +static ivas_error read_hrtf_binary_header( + ivas_hrtfs_header_t *hrtf_header, + FILE *f_hrtf ) +{ + /* HRTF Header */ + /* Renderer type (4 bytes) : See "RENDERER_TYPE" */ + /* Input configuration (4 bytes) : See "BINAURAL_INPUT_AUDIO_CONFIG" */ + /* Sampling Frequency (4 bytes) */ + /* Raw data size (4 bytes) */ + + if ( ( fread( &( hrtf_header->rend_type ), sizeof( int32_t ), 1, f_hrtf ) == 1 ) && ( fread( &( hrtf_header->input_cfg ), sizeof( int32_t ), 1, f_hrtf ) == 1 ) && ( fread( &( hrtf_header->frequency ), sizeof( int32_t ), 1, f_hrtf ) == 1 ) && ( fread( &( hrtf_header->data_size ), sizeof( int32_t ), 1, f_hrtf ) == 1 ) ) + { + return IVAS_ERR_OK; + } + + return IVAS_ERR_END_OF_FILE; +} + + /*-------------------------------------------------------------------* * LoadBSplineBinaryITD() * @@ -126,16 +250,16 @@ static void LoadBSplineBinaryITD( fread( &modelITD->N, sizeof( int16_t ), 1, f_hrtf ); fread( &modelITD->elevDim2, sizeof( int16_t ), 1, f_hrtf ); fread( &modelITD->elevDim3, sizeof( int16_t ), 1, f_hrtf ); - modelITD->elevKSeq_dyn = (float *) count_malloc( ( modelITD->elevDim3 - 2 ) * sizeof( float ) ); + modelITD->elevKSeq_dyn = (float *) malloc( ( modelITD->elevDim3 - 2 ) * sizeof( float ) ); fread( modelITD->elevKSeq_dyn, sizeof( float ), modelITD->elevDim3 - 2, f_hrtf ); fread( &modelITD->azimDim2, sizeof( int16_t ), 1, f_hrtf ); fread( &modelITD->azimDim3, sizeof( int16_t ), 1, f_hrtf ); - modelITD->azimKSeq_dyn = (float *) count_malloc( ( ( modelITD->azimDim3 + 1 ) / 2 - 2 ) * sizeof( float ) ); /* basis functions are flipped around 180 deg, number of basis functions above/below is (N+1)/2 */ + modelITD->azimKSeq_dyn = (float *) malloc( ( ( modelITD->azimDim3 + 1 ) / 2 - 2 ) * sizeof( float ) ); /* basis functions are flipped around 180 deg, number of basis functions above/below is (N+1)/2 */ fread( modelITD->azimKSeq_dyn, sizeof( float ), ( modelITD->azimDim3 + 1 ) / 2 - 2, f_hrtf ); fread( &tmp, sizeof( int16_t ), 1, f_hrtf ); - modelITD->W_dyn = (float *) count_malloc( tmp * sizeof( float ) ); + modelITD->W_dyn = (float *) malloc( tmp * sizeof( float ) ); fread( modelITD->W_dyn, sizeof( float ), tmp, f_hrtf ); /* azimuth */ @@ -144,7 +268,7 @@ static void LoadBSplineBinaryITD( fread( &tmp, sizeof( int16_t ), 1, f_hrtf ); - modelITD->azimBsShape_dyn = (float *) count_malloc( tmp * sizeof( float ) ); + modelITD->azimBsShape_dyn = (float *) malloc( tmp * sizeof( float ) ); fread( modelITD->azimBsShape_dyn, sizeof( float ), tmp, f_hrtf ); fread( &modelITD->azimSegSamples, sizeof( int16_t ), 1, f_hrtf ); @@ -155,7 +279,7 @@ static void LoadBSplineBinaryITD( fread( &tmp, sizeof( int16_t ), 1, f_hrtf ); - modelITD->elevBsShape_dyn = (float *) count_malloc( tmp * sizeof( float ) ); + modelITD->elevBsShape_dyn = (float *) malloc( tmp * sizeof( float ) ); fread( modelITD->elevBsShape_dyn, sizeof( float ), tmp, f_hrtf ); fread( &modelITD->elevSegSamples, sizeof( int16_t ), 1, f_hrtf ); @@ -184,6 +308,8 @@ static ivas_error LoadBSplineBinary( ModelParams_t *model; int16_t i, tmp; + fread( &HrFiltSet_p->latency_s, sizeof( float ), 1, f_hrtf ); + model = &( HrFiltSet_p->ModelParams ); /* Set ROM flag for correct deallocation */ @@ -224,51 +350,51 @@ static ivas_error LoadBSplineBinary( fread( &model->elevDim2, sizeof( int16_t ), 1, f_hrtf ); fread( &model->elevDim3, sizeof( int16_t ), 1, f_hrtf ); - model->elevKSeq_dyn = (float *) count_malloc( ( model->elevDim3 - 2 ) * sizeof( float ) ); + model->elevKSeq_dyn = (float *) malloc( ( model->elevDim3 - 2 ) * sizeof( float ) ); fread( model->elevKSeq_dyn, sizeof( float ), model->elevDim3 - 2, f_hrtf ); - model->azimDim2_dyn = (int16_t *) count_malloc( model->elevDim3 * sizeof( int16_t ) ); - model->azimDim3_dyn = (int16_t *) count_malloc( model->elevDim3 * sizeof( int16_t ) ); - model->azim_start_idx_dyn = (int16_t *) count_malloc( model->elevDim3 * sizeof( int16_t ) ); - model->azimKSeq = (float **) count_malloc( model->elevDim3 * sizeof( float * ) ); + model->azimDim2_dyn = (int16_t *) malloc( model->elevDim3 * sizeof( int16_t ) ); + model->azimDim3_dyn = (int16_t *) malloc( model->elevDim3 * sizeof( int16_t ) ); + model->azim_start_idx_dyn = (int16_t *) malloc( model->elevDim3 * sizeof( int16_t ) ); + model->azimKSeq = (float **) malloc( model->elevDim3 * sizeof( float * ) ); for ( i = 0; i < model->elevDim3; i++ ) { fread( &model->azimDim2_dyn[i], sizeof( int16_t ), 1, f_hrtf ); fread( &model->azimDim3_dyn[i], sizeof( int16_t ), 1, f_hrtf ); fread( &model->azim_start_idx_dyn[i], sizeof( int16_t ), 1, f_hrtf ); - model->azimKSeq[i] = (float *) count_malloc( ( model->azimDim3_dyn[i] + 1 ) * sizeof( float ) ); + model->azimKSeq[i] = (float *) malloc( ( model->azimDim3_dyn[i] + 1 ) * sizeof( float ) ); fread( model->azimKSeq[i], sizeof( float ), ( model->azimDim3_dyn[i] + 1 ), f_hrtf ); } fread( &model->AlphaN, sizeof( int16_t ), 1, f_hrtf ); - model->AlphaL_dyn = (float *) count_malloc( model->AlphaN * model->K * sizeof( float ) ); + model->AlphaL_dyn = (float *) malloc( model->AlphaN * model->K * sizeof( float ) ); fread( model->AlphaL_dyn, sizeof( float ), model->AlphaN * model->K, f_hrtf ); - model->AlphaR_dyn = (float *) count_malloc( model->AlphaN * model->K * sizeof( float ) ); + model->AlphaR_dyn = (float *) malloc( model->AlphaN * model->K * sizeof( float ) ); fread( model->AlphaR_dyn, sizeof( float ), model->AlphaN * model->K, f_hrtf ); /* azimuth */ fread( &model->num_unique_azim_splines, sizeof( int16_t ), 1, f_hrtf ); - model->azimBsShape = (const float **) count_malloc( model->num_unique_azim_splines * sizeof( float * ) ); - model->azimBsShape_dyn = (float **) count_malloc( model->num_unique_azim_splines * sizeof( float * ) ); - model->azimSegSamples_dyn = (int16_t *) count_malloc( model->num_unique_azim_splines * sizeof( int16_t ) ); + model->azimBsShape = (const float **) malloc( model->num_unique_azim_splines * sizeof( float * ) ); + model->azimBsShape_dyn = (float **) malloc( model->num_unique_azim_splines * sizeof( float * ) ); + model->azimSegSamples_dyn = (int16_t *) malloc( model->num_unique_azim_splines * sizeof( int16_t ) ); for ( i = 0; i < model->num_unique_azim_splines; i++ ) { fread( &tmp, sizeof( int16_t ), 1, f_hrtf ); - model->azimBsShape_dyn[i] = (float *) count_malloc( tmp * sizeof( float ) ); + model->azimBsShape_dyn[i] = (float *) malloc( tmp * sizeof( float ) ); fread( model->azimBsShape_dyn[i], sizeof( float ), tmp, f_hrtf ); fread( &model->azimSegSamples_dyn[i], sizeof( int16_t ), 1, f_hrtf ); } - model->azimShapeIdx_dyn = (int16_t *) count_malloc( model->elevDim3 * sizeof( int16_t ) ); + model->azimShapeIdx_dyn = (int16_t *) malloc( model->elevDim3 * sizeof( int16_t ) ); fread( model->azimShapeIdx_dyn, sizeof( int16_t ), model->elevDim3, f_hrtf ); - model->azimShapeSampFactor_dyn = (int16_t *) count_malloc( model->elevDim3 * sizeof( int16_t ) ); + model->azimShapeSampFactor_dyn = (int16_t *) malloc( model->elevDim3 * sizeof( int16_t ) ); fread( model->azimShapeSampFactor_dyn, sizeof( int16_t ), model->elevDim3, f_hrtf ); /* elevation */ fread( model->elevBsLen, sizeof( int16_t ), HRTF_MODEL_BSPLINE_NUM_COEFFS, f_hrtf ); fread( model->elevBsStart, sizeof( int16_t ), HRTF_MODEL_BSPLINE_NUM_COEFFS, f_hrtf ); fread( &tmp, sizeof( int16_t ), 1, f_hrtf ); - model->elevBsShape_dyn = (float *) count_malloc( tmp * sizeof( float ) ); + model->elevBsShape_dyn = (float *) malloc( tmp * sizeof( float ) ); fread( model->elevBsShape_dyn, sizeof( float ), tmp, f_hrtf ); fread( &model->elevSegSamples, sizeof( int16_t ), 1, f_hrtf ); @@ -293,9 +419,11 @@ static ivas_error LoadBSplineBinary( } HRTF_model_precalc( model ); + HRTF_energy_sections_precalc( model ); HrFiltSet_p->FiltLength = HrFiltSet_p->ModelParams.K; - BSplineModelEvalAlloc( &HrFiltSet_p->ModelParams, &HrFiltSet_p->ModelEval ); + HrFiltSet_p->ModelEval.hrfModL = (float *) malloc( model->K * sizeof( float ) ); + HrFiltSet_p->ModelEval.hrfModR = (float *) malloc( model->K * sizeof( float ) ); if ( HrFiltSet_p->ModelParams.UseItdModel ) { @@ -319,39 +447,84 @@ static ivas_error TDREND_MIX_LoadHRTF( { int16_t tmp; ivas_error error; + bool is_tdrend; + ivas_error header_check_result; + ivas_hrtfs_file_header_t hrtfs_file_header; + int16_t hrtf_id; + ivas_hrtfs_header_t hrtf_header; + int32_t hrtf_data_size_max; + char *hrtf_data; error = IVAS_ERR_OK; - if ( fread( &tmp, sizeof( int16_t ), 1, f_hrtf ) == 0 ) + + if ( ( header_check_result = read_and_check_hrtf_binary_file_header( &hrtfs_file_header, f_hrtf ) ) != IVAS_ERR_OK ) { - return IVAS_ERROR( IVAS_ERR_FAILED_FILE_READ, "Error in HRTF file reading" ); + return header_check_result; } - HrFiltSet_p->FilterMethod = (TDREND_HRFILT_Method_t) tmp; + is_tdrend = FALSE; + hrtf_data_size_max = hrtfs_file_header.max_data_size; + + /* Allocate the memory */ -#ifdef TDREND_HRTF_TABLE_METHODS - switch ( HrFiltSet_p->FilterMethod ) + if ( hrtf_data_size_max == 0 ) { - case TDREND_HRFILT_Method_BSplineModel: - error = LoadBSplineBinary( HrFiltSet_p, f_hrtf ); - break; - case TDREND_HRFILT_Method_Table_F: - case TDREND_HRFILT_Method_Table_S: - TDREND_HRFILT_SetFiltSet( HrFiltSet_p, f_hrtf ); - break; - default: - error = IVAS_ERROR( IVAS_ERR_INVALID_HRTF, "The HR filter set file is not a supported type." ); + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (hrtf_data_size_max)" ); } -#else - if ( HrFiltSet_p->FilterMethod != TDREND_HRFILT_Method_BSplineModel ) + + hrtf_data = (char *) malloc( hrtf_data_size_max ); + if ( hrtf_data == NULL ) { - error = IVAS_ERROR( IVAS_ERR_INVALID_HRTF, "The HR filter set file is not a supported type." ); + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" ); + } + + for ( hrtf_id = 0; ( hrtf_id < hrtfs_file_header.nb_hrtf ) && ( !is_tdrend ); hrtf_id++ ) + { + if ( read_hrtf_binary_header( &hrtf_header, f_hrtf ) != IVAS_ERR_OK ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_FILE_READ, "HRTF binary file not compliant (number of HRTF)" ); + } + + if ( ( header_check_result = check_hrtf_binary_header( &hrtf_header ) ) != IVAS_ERR_OK ) + { + return header_check_result; + } + + is_tdrend = ( hrtf_header.rend_type == RENDERER_BINAURAL_OBJECTS_TD ); + if ( !is_tdrend ) + { + if ( fread( hrtf_data, 1, hrtf_header.data_size, f_hrtf ) != hrtf_header.data_size ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_FILE_READ, "Error in HRTF file reading" ); + } + } + } + + free( hrtf_data ); + + if ( is_tdrend ) + { + if ( fread( &tmp, 1, sizeof( int16_t ), f_hrtf ) == 0 ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_FILE_READ, "Error in HRTF file reading" ); + } + + HrFiltSet_p->FilterMethod = (TDREND_HRFILT_Method_t) tmp; + + if ( HrFiltSet_p->FilterMethod != TDREND_HRFILT_Method_BSplineModel ) + { + error = IVAS_ERROR( IVAS_ERR_INVALID_HRTF, "The HR filter set file is not a supported type." ); + } + else + { + error = LoadBSplineBinary( HrFiltSet_p, f_hrtf ); + } } else { - error = LoadBSplineBinary( HrFiltSet_p, f_hrtf ); + return IVAS_ERROR( IVAS_ERR_INVALID_HRTF, "HR filter not found in binary file." ); } -#endif return error; } @@ -370,7 +543,1063 @@ ivas_error load_HRTF_binary( { ivas_error error; + fseek( hrtfReader->file, 0, SEEK_SET ); + error = TDREND_MIX_LoadHRTF( hrtfReader->file, hHrtf ); return error; } + +/*---------------------------------------------------------------------* + * HRTF_energy_sections_precalc() + * + * Calculate energies of each section and store in model->EL/model->ER + *---------------------------------------------------------------------*/ + +static void HRTF_energy_sections_precalc( + ModelParams_t *model /* i/o: HRTF model parameters */ +) +{ + int16_t i, k, j; + float *pEL; + float *pER; + const float *pAlphaL; + const float *pAlphaR; + float tmp; + int16_t AlphaN; + + if ( !model->modelROM ) + { + AlphaN = model->AlphaN; + + /* Precalculated energies for each section and each row of the alpha matrices */ + model->EL_dyn = (float *) malloc( HRTF_MODEL_N_SECTIONS * AlphaN * sizeof( float ) ); + model->ER_dyn = (float *) malloc( HRTF_MODEL_N_SECTIONS * AlphaN * sizeof( float ) ); + pEL = model->EL_dyn; + pER = model->ER_dyn; + for ( i = 0; i < HRTF_MODEL_N_SECTIONS; i++ ) + { + for ( j = 0; j < AlphaN; j++ ) /* rows of Alpha matrices */ + { + *pEL = 0.0f; + *pER = 0.0f; + + pAlphaL = &model->AlphaL[model->iSecFirst[i] * AlphaN + j]; + pAlphaR = &model->AlphaR[model->iSecFirst[i] * AlphaN + j]; + + for ( k = model->iSecFirst[i]; k < model->iSecLast[i]; k++ ) /* k within the sections */ + { + /* Energy calculation */ + tmp = *pAlphaL; + *pEL += tmp * tmp; + tmp = *pAlphaR; + *pER += tmp * tmp; + pAlphaL += AlphaN; + pAlphaR += AlphaN; + } + pEL++; + pER++; + } + } + model->EL = (const float *) model->EL_dyn; + model->ER = (const float *) model->ER_dyn; + } + + return; +} + + +/*---------------------------------------------------------------------* + * dealloc_HRTF_binary() + * + * Deallocated memory allocated by load_HRTF_binary + *---------------------------------------------------------------------*/ + +ivas_error dealloc_HRTF_binary( + IVAS_DEC_HRTF_HANDLE hHrtf /* i/o: HRTF handle */ +) +{ + int16_t i; + ivas_error error; + error = IVAS_ERR_OK; + + if ( hHrtf == NULL ) + { + return error; + } + + if ( !hHrtf->ModelParams.modelROM ) + { + if ( hHrtf->ModelParams.UseItdModel ) + { + free( hHrtf->ModelParamsITD.elevKSeq_dyn ); + free( hHrtf->ModelParamsITD.azimKSeq_dyn ); + free( hHrtf->ModelParamsITD.W_dyn ); + free( hHrtf->ModelParamsITD.azimBsShape_dyn ); + free( hHrtf->ModelParamsITD.elevBsShape_dyn ); + } + free( hHrtf->ModelParams.elevKSeq_dyn ); + free( hHrtf->ModelParams.azim_start_idx_dyn ); + free( hHrtf->ModelParams.azimDim2_dyn ); + free( hHrtf->ModelParams.azimDim3_dyn ); + free( hHrtf->ModelParams.AlphaL_dyn ); + free( hHrtf->ModelParams.AlphaR_dyn ); + free( hHrtf->ModelParams.azimSegSamples_dyn ); + + free( hHrtf->ModelParams.azimShapeIdx_dyn ); + free( hHrtf->ModelParams.azimShapeSampFactor_dyn ); + free( hHrtf->ModelParams.elevBsShape_dyn ); + + for ( i = 0; i < hHrtf->ModelParams.num_unique_azim_splines; i++ ) + { + free( hHrtf->ModelParams.azimBsShape_dyn[i] ); + free( &hHrtf->ModelParams.azimBsShape_dyn[i] ); + } + + free( (void *) hHrtf->ModelParams.azimBsShape ); /* void* cast needed to please both gcc and Visual studio compilers. Deallocating const float** should be fine and gcc agrees, but Visual studio complains. */ + for ( i = 0; i < hHrtf->ModelParams.elevDim3; i++ ) + { + free( hHrtf->ModelParams.azimKSeq[i] ); + } + free( hHrtf->ModelParams.azimKSeq ); + + free( hHrtf->ModelParams.EL_dyn ); + free( hHrtf->ModelParams.ER_dyn ); + + free( hHrtf->ModelEval.hrfModL ); + free( hHrtf->ModelEval.hrfModR ); + } + + return error; +} + + +/*------------------------------------------------------------------------- + * ivas_hrtf_init() + * + * Initialize hHRTF handle + *------------------------------------------------------------------------*/ + +static ivas_error ivas_hrtf_init( + HRTFS_DATA *hHRTF /* i/o: HRTF handle */ +) +{ + int16_t i, j; + + if ( hHRTF == NULL ) + { + return IVAS_ERR_WRONG_PARAMS; + } + + hHRTF->latency_s = 0; + hHRTF->max_num_ir = 0; + hHRTF->max_num_iterations = 0; + hHRTF->index_frequency_max_diffuse = 0; + + for ( i = 0; i < MAX_INTERN_CHANNELS; i++ ) + { + hHRTF->inv_diffuse_weight[i] = 0; + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + hHRTF->num_iterations[i][j] = 0; + hHRTF->pIndex_frequency_max[i][j] = NULL; + hHRTF->pOut_to_bin_re[i][j] = NULL; + hHRTF->pOut_to_bin_im[i][j] = NULL; + } + } + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + hHRTF->num_iterations_diffuse[j] = 0; + hHRTF->pIndex_frequency_max_diffuse[j] = NULL; + hHRTF->pOut_to_bin_diffuse_re[j] = NULL; + hHRTF->pOut_to_bin_diffuse_im[j] = NULL; + } + + return IVAS_ERR_OK; +} + + +/*---------------------------------------------------------------------* + * create_HRTF_from_rawdata() + * + * Create HRTF from the raw data (to the HRTF CRend handle) + *---------------------------------------------------------------------*/ + +static ivas_error create_HRTF_from_rawdata( + HRTFS_HANDLE *hHRTF, /* i/o: HRTF CRend handle */ + char *hrtf_data /* i: pointer to binary file */ +) +{ + int16_t i, j, k; + int16_t max_num_iterations_diffuse; + uint16_t max_total_num_fsamp_per_iteration, max_total_num_fsamp_per_iteration_diff; + uint32_t mem_size; + char *hrtf_data_rptr; + float *pOut_to_bin_wptr; + + if ( *hHRTF == NULL ) + { + if ( ( ( *hHRTF ) = (HRTFS_HANDLE) malloc( sizeof( HRTFS_DATA ) ) ) == NULL ) + { + return IVAS_ERROR( IVAS_ERR_UNEXPECTED_NULL_POINTER, "Can not allocate memory for HRTF binary data\n" ); + } + + ivas_hrtf_init( *hHRTF ); + } + else + { + return IVAS_ERR_INTERNAL; + } + + hrtf_data_rptr = hrtf_data; + + /* latency_s */ + ( *hHRTF )->latency_s = *( (float *) ( hrtf_data_rptr ) ); + hrtf_data_rptr += sizeof( float ); + + /* max_num_ir */ + ( *hHRTF )->max_num_ir = *( (uint16_t *) ( hrtf_data_rptr ) ); + hrtf_data_rptr += sizeof( uint16_t ); + + /* BINAURAL_CHANNELS */ + if ( BINAURAL_CHANNELS != *( (int16_t *) ( hrtf_data_rptr ) ) ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file format not compliant (BINAURAL_CHANNELS)" ); + } + hrtf_data_rptr += sizeof( uint16_t ); + + /* max_num_iterations */ + ( *hHRTF )->max_num_iterations = *( (int16_t *) ( hrtf_data_rptr ) ); + hrtf_data_rptr += sizeof( int16_t ); + + /* num_iterations */ + for ( i = 0; i < ( *hHRTF )->max_num_ir; i++ ) + { + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + ( *hHRTF )->num_iterations[i][j] = *( (uint16_t *) ( hrtf_data_rptr ) ); + hrtf_data_rptr += sizeof( uint16_t ); + } + } + + /* pIndex_frequency_max */ + for ( i = 0; i < ( *hHRTF )->max_num_ir; i++ ) + { + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + mem_size = ( *hHRTF )->max_num_iterations * sizeof( uint16_t ); + ( *hHRTF )->pIndex_frequency_max[i][j] = (uint16_t *) malloc( mem_size ); + if ( ( *hHRTF )->pIndex_frequency_max[i][j] == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for pIndex_frequency_max" ); + } + memcpy( ( *hHRTF )->pIndex_frequency_max[i][j], hrtf_data_rptr, mem_size ); + hrtf_data_rptr += mem_size; + } + } + + /* max_num_iterations_diffuse */ + max_num_iterations_diffuse = *( (int16_t *) ( hrtf_data_rptr ) ); + hrtf_data_rptr += sizeof( int16_t ); + + if ( max_num_iterations_diffuse != 0 ) + { + /* num_iterations_diffuse */ + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + ( *hHRTF )->num_iterations_diffuse[j] = *( (uint16_t *) ( hrtf_data_rptr ) ); + hrtf_data_rptr += sizeof( uint16_t ); + } + + /* pIndex_frequency_max_diffuse (the size depends on num_iterations_diffuse) */ + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + mem_size = ( *hHRTF )->num_iterations_diffuse[j] * sizeof( uint16_t ); + ( *hHRTF )->pIndex_frequency_max_diffuse[j] = (uint16_t *) malloc( mem_size ); + if ( ( *hHRTF )->pIndex_frequency_max_diffuse[j] == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for pIndex_frequency_max_diffuse" ); + } + memcpy( ( *hHRTF )->pIndex_frequency_max_diffuse[j], hrtf_data_rptr, mem_size ); + hrtf_data_rptr += mem_size; + } + } + + /* index_frequency_max_diffuse */ + ( *hHRTF )->index_frequency_max_diffuse = *( (uint16_t *) ( hrtf_data_rptr ) ); + hrtf_data_rptr += sizeof( uint16_t ); + + /* inv_diffuse_weight */ + for ( i = 0; i < ( *hHRTF )->max_num_ir; i++ ) + { + ( *hHRTF )->inv_diffuse_weight[i] = *( (float *) ( hrtf_data_rptr ) ); + hrtf_data_rptr += sizeof( float ); + } + + /* max_total_num_fsamp_per_iteration */ + max_total_num_fsamp_per_iteration = *( (uint16_t *) ( hrtf_data_rptr ) ); + hrtf_data_rptr += sizeof( uint16_t ); + + /* coeff_re (the size depends on pIndex_frequency_max) */ + for ( i = 0; i < ( *hHRTF )->max_num_ir; i++ ) + { + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + mem_size = max_total_num_fsamp_per_iteration * sizeof( float ); + ( *hHRTF )->pOut_to_bin_re[i][j] = (float *) malloc( mem_size ); + if ( ( *hHRTF )->pOut_to_bin_re[i][j] == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for Out_to_bin_re" ); + } + memset( ( *hHRTF )->pOut_to_bin_re[i][j], 0x00, mem_size ); + + pOut_to_bin_wptr = ( *hHRTF )->pOut_to_bin_re[i][j]; + for ( k = 0; k < ( *hHRTF )->num_iterations[i][j]; k++ ) + { + mem_size = ( *hHRTF )->pIndex_frequency_max[i][j][k] * sizeof( float ); + memcpy( pOut_to_bin_wptr, hrtf_data_rptr, mem_size ); + hrtf_data_rptr += mem_size; + pOut_to_bin_wptr += ( *hHRTF )->pIndex_frequency_max[i][j][k]; + } + } + } + + /* coeff_im (the size depends on pIndex_frequency_max) */ + for ( i = 0; i < ( *hHRTF )->max_num_ir; i++ ) + { + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + mem_size = max_total_num_fsamp_per_iteration * sizeof( float ); + ( *hHRTF )->pOut_to_bin_im[i][j] = (float *) malloc( mem_size ); + if ( ( *hHRTF )->pOut_to_bin_im[i][j] == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for Out_to_bin_im" ); + } + memset( ( *hHRTF )->pOut_to_bin_im[i][j], 0x00, mem_size ); + + pOut_to_bin_wptr = ( *hHRTF )->pOut_to_bin_im[i][j]; + for ( k = 0; k < ( *hHRTF )->num_iterations[i][j]; k++ ) + { + mem_size = ( *hHRTF )->pIndex_frequency_max[i][j][k] * sizeof( float ); + memcpy( pOut_to_bin_wptr, hrtf_data_rptr, mem_size ); + hrtf_data_rptr += mem_size; + pOut_to_bin_wptr += ( *hHRTF )->pIndex_frequency_max[i][j][k]; + } + } + } + + /* max_total_num_fsamp_per_iteration_diff */ + max_total_num_fsamp_per_iteration_diff = *( (uint16_t *) ( hrtf_data_rptr ) ); + hrtf_data_rptr += sizeof( uint16_t ); + + if ( max_total_num_fsamp_per_iteration_diff != 0 ) + { + /* coeff_diffuse_re : The size depends on pIndex_frequency_max_diffuse */ + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + mem_size = max_total_num_fsamp_per_iteration_diff * sizeof( float ); + ( *hHRTF )->pOut_to_bin_diffuse_re[j] = (float *) malloc( mem_size ); + if ( ( *hHRTF )->pOut_to_bin_diffuse_re[j] == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for pOut_to_bin_diffuse_re" ); + } + memset( ( *hHRTF )->pOut_to_bin_diffuse_re[j], 0x00, mem_size ); + + pOut_to_bin_wptr = ( *hHRTF )->pOut_to_bin_diffuse_re[j]; + for ( k = 0; k < ( *hHRTF )->num_iterations_diffuse[j]; k++ ) + { + mem_size = ( *hHRTF )->pIndex_frequency_max_diffuse[j][k] * sizeof( float ); + memcpy( pOut_to_bin_wptr, hrtf_data_rptr, mem_size ); + hrtf_data_rptr += mem_size; + pOut_to_bin_wptr += ( *hHRTF )->pIndex_frequency_max_diffuse[j][k]; + } + } + + /* coeff_diffuse_im : The size depends on pIndex_frequency_max_diffuse */ + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + mem_size = max_total_num_fsamp_per_iteration_diff * sizeof( float ); + ( *hHRTF )->pOut_to_bin_diffuse_im[j] = (float *) malloc( mem_size ); + if ( ( *hHRTF )->pOut_to_bin_diffuse_im[j] == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for pOut_to_bin_diffuse_im" ); + } + memset( ( *hHRTF )->pOut_to_bin_diffuse_im[j], 0x00, mem_size ); + + pOut_to_bin_wptr = ( *hHRTF )->pOut_to_bin_diffuse_im[j]; + for ( k = 0; k < ( *hHRTF )->num_iterations_diffuse[j]; k++ ) + { + mem_size = ( *hHRTF )->pIndex_frequency_max_diffuse[j][k] * sizeof( float ); + memcpy( pOut_to_bin_wptr, hrtf_data_rptr, mem_size ); + hrtf_data_rptr += mem_size; + pOut_to_bin_wptr += ( *hHRTF )->pIndex_frequency_max_diffuse[j][k]; + } + } + } + + return IVAS_ERR_OK; +} + +static ivas_error init_fastconv_HRTF_handle( + HRTFS_FASTCONV *hHrtf /* i/o: HRTF FastConv handle */ +) +{ + int16_t i, j; + + if ( hHrtf == NULL ) + { + return IVAS_ERR_WRONG_PARAMS; + } + + hHrtf->FASTCONV_HRIR_latency_s = 0; + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < HRTF_LS_CHANNELS; j++ ) + { + set_zero( hHrtf->leftHRIRReal[i][j], BINAURAL_NTAPS ); + set_zero( hHrtf->leftHRIRImag[i][j], BINAURAL_NTAPS ); + set_zero( hHrtf->rightHRIRReal[i][j], BINAURAL_NTAPS ); + set_zero( hHrtf->rightHRIRImag[i][j], BINAURAL_NTAPS ); + } + } + + hHrtf->FASTCONV_HOA3_latency_s = 0; + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < HRTF_SH_CHANNELS; j++ ) + { + set_zero( hHrtf->leftHRIRReal_HOA3[i][j], BINAURAL_NTAPS ); + set_zero( hHrtf->leftHRIRImag_HOA3[i][j], BINAURAL_NTAPS ); + set_zero( hHrtf->rightHRIRReal_HOA3[i][j], BINAURAL_NTAPS ); + set_zero( hHrtf->rightHRIRImag_HOA3[i][j], BINAURAL_NTAPS ); + } + } + + hHrtf->FASTCONV_BRIR_latency_s = 0; + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < HRTF_LS_CHANNELS; j++ ) + { + set_zero( hHrtf->leftBRIRReal[i][j], BINAURAL_NTAPS_MAX ); + set_zero( hHrtf->leftBRIRImag[i][j], BINAURAL_NTAPS_MAX ); + set_zero( hHrtf->rightBRIRReal[i][j], BINAURAL_NTAPS_MAX ); + set_zero( hHrtf->rightBRIRImag[i][j], BINAURAL_NTAPS_MAX ); + } + } + + set_zero( hHrtf->fastconvReverberationTimes, CLDFB_NO_CHANNELS_MAX ); + set_zero( hHrtf->fastconvReverberationEneCorrections, CLDFB_NO_CHANNELS_MAX ); + + return IVAS_ERR_OK; +} + + +static ivas_error create_fastconv_HRTF_from_rawdata( + HRTFS_FASTCONV_HANDLE *hHRTF, /* i/o: HRTF FastConv handle */ + char *hrtf_data, /* i : pointer to binary file */ + RENDERER_TYPE rend_type, /* i : Renderer type */ + BINAURAL_INPUT_AUDIO_CONFIG input_cfg /* i : Input binaural config */ +) +{ + int16_t i, j; + char *hrtf_data_rptr; + + // if ( hHRTF == NULL ) + // { + // if ( ( ( *hHRTF ) = (HRTFS_FASTCONV_HANDLE) malloc( sizeof( HRTFS_FASTCONV ) ) ) == NULL ) + // { + // return IVAS_ERROR( IVAS_ERR_UNEXPECTED_NULL_POINTER, "Can not allocate memory for Fastconv HRTF binary\n" ); + // } + + // init_fastconv_HRTF_handle( *hHRTF ); + // } + // else + // { + // return IVAS_ERR_INTERNAL; + // } + + hrtf_data_rptr = hrtf_data; + + /* BINAURAL_CONVBANDS */ + if ( BINAURAL_CONVBANDS != *( (uint16_t *) ( hrtf_data_rptr ) ) ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_CONVBANDS)" ); + } + hrtf_data_rptr += sizeof( uint16_t ); + + /* HRIR */ + if ( rend_type == RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED ) + { + ( *hHRTF )->FASTCONV_HRIR_latency_s = *( (float *) ( hrtf_data_rptr ) ); + hrtf_data_rptr += sizeof( float ); + + if ( HRTF_LS_CHANNELS != *( (uint16_t *) ( hrtf_data_rptr ) ) ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (HRTF_LS_CHANNELS)" ); + } + hrtf_data_rptr += sizeof( uint16_t ); + + if ( BINAURAL_NTAPS != *( (uint16_t *) ( hrtf_data_rptr ) ) ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_NTAPS)" ); + } + hrtf_data_rptr += sizeof( uint16_t ); + + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < HRTF_LS_CHANNELS; j++ ) + { + memcpy( ( *hHRTF )->leftHRIRReal[i][j], hrtf_data_rptr, BINAURAL_NTAPS * sizeof( float ) ); + hrtf_data_rptr += BINAURAL_NTAPS * sizeof( float ); + } + } + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < HRTF_LS_CHANNELS; j++ ) + { + memcpy( ( *hHRTF )->leftHRIRImag[i][j], hrtf_data_rptr, BINAURAL_NTAPS * sizeof( float ) ); + hrtf_data_rptr += BINAURAL_NTAPS * sizeof( float ); + } + } + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < HRTF_LS_CHANNELS; j++ ) + { + memcpy( ( *hHRTF )->rightHRIRReal[i][j], hrtf_data_rptr, BINAURAL_NTAPS * sizeof( float ) ); + hrtf_data_rptr += BINAURAL_NTAPS * sizeof( float ); + } + } + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < HRTF_LS_CHANNELS; j++ ) + { + memcpy( ( *hHRTF )->rightHRIRImag[i][j], hrtf_data_rptr, BINAURAL_NTAPS * sizeof( float ) ); + hrtf_data_rptr += BINAURAL_NTAPS * sizeof( float ); + } + } + } + if ( rend_type == RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA ) + { + /* HRIR_HOA3 */ + ( *hHRTF )->FASTCONV_HOA3_latency_s = *( (float *) ( hrtf_data_rptr ) ); + hrtf_data_rptr += sizeof( float ); + + if ( HRTF_SH_CHANNELS != *( (uint16_t *) ( hrtf_data_rptr ) ) ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (HRTF_SH_CHANNELS)" ); + } + hrtf_data_rptr += sizeof( uint16_t ); + + if ( BINAURAL_NTAPS != *( (uint16_t *) ( hrtf_data_rptr ) ) ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_NTAPS)" ); + } + hrtf_data_rptr += sizeof( uint16_t ); + + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < HRTF_SH_CHANNELS; j++ ) + { + memcpy( ( *hHRTF )->leftHRIRReal_HOA3[i][j], hrtf_data_rptr, BINAURAL_NTAPS * sizeof( float ) ); + hrtf_data_rptr += BINAURAL_NTAPS * sizeof( float ); + } + } + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < HRTF_SH_CHANNELS; j++ ) + { + memcpy( ( *hHRTF )->leftHRIRImag_HOA3[i][j], hrtf_data_rptr, BINAURAL_NTAPS * sizeof( float ) ); + hrtf_data_rptr += BINAURAL_NTAPS * sizeof( float ); + } + } + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < HRTF_SH_CHANNELS; j++ ) + { + memcpy( ( *hHRTF )->rightHRIRReal_HOA3[i][j], hrtf_data_rptr, BINAURAL_NTAPS * sizeof( float ) ); + hrtf_data_rptr += BINAURAL_NTAPS * sizeof( float ); + } + } + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < HRTF_SH_CHANNELS; j++ ) + { + memcpy( ( *hHRTF )->rightHRIRImag_HOA3[i][j], hrtf_data_rptr, BINAURAL_NTAPS * sizeof( float ) ); + hrtf_data_rptr += BINAURAL_NTAPS * sizeof( float ); + } + } + } + /* BRIR */ + if ( rend_type == RENDERER_BINAURAL_FASTCONV_ROOM && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED ) + { + ( *hHRTF )->FASTCONV_BRIR_latency_s = *( (float *) ( hrtf_data_rptr ) ); + hrtf_data_rptr += sizeof( float ); + + if ( HRTF_LS_CHANNELS != *( (uint16_t *) ( hrtf_data_rptr ) ) ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (HRTF_LS_CHANNELS)" ); + } + hrtf_data_rptr += sizeof( uint16_t ); + + if ( BINAURAL_NTAPS_MAX != *( (uint16_t *) ( hrtf_data_rptr ) ) ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_NTAPS)" ); + } + hrtf_data_rptr += sizeof( uint16_t ); + + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < HRTF_LS_CHANNELS; j++ ) + { + memcpy( ( *hHRTF )->leftBRIRReal[i][j], hrtf_data_rptr, BINAURAL_NTAPS_MAX * sizeof( float ) ); + hrtf_data_rptr += BINAURAL_NTAPS_MAX * sizeof( float ); + } + } + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < HRTF_LS_CHANNELS; j++ ) + { + memcpy( ( *hHRTF )->leftBRIRImag[i][j], hrtf_data_rptr, BINAURAL_NTAPS_MAX * sizeof( float ) ); + hrtf_data_rptr += BINAURAL_NTAPS_MAX * sizeof( float ); + } + } + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < HRTF_LS_CHANNELS; j++ ) + { + memcpy( ( *hHRTF )->rightBRIRReal[i][j], hrtf_data_rptr, BINAURAL_NTAPS_MAX * sizeof( float ) ); + hrtf_data_rptr += BINAURAL_NTAPS_MAX * sizeof( float ); + } + } + for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) + { + for ( j = 0; j < HRTF_LS_CHANNELS; j++ ) + { + memcpy( ( *hHRTF )->rightBRIRImag[i][j], hrtf_data_rptr, BINAURAL_NTAPS_MAX * sizeof( float ) ); + hrtf_data_rptr += BINAURAL_NTAPS_MAX * sizeof( float ); + } + } + + /* Reverb Parameters */ + if ( CLDFB_NO_CHANNELS_MAX != *( (uint16_t *) ( hrtf_data_rptr ) ) ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (CLDFB_NO_CHANNELS_MAX)" ); + } + hrtf_data_rptr += sizeof( uint16_t ); + + memcpy( ( *hHRTF )->fastconvReverberationTimes, hrtf_data_rptr, CLDFB_NO_CHANNELS_MAX * sizeof( float ) ); + hrtf_data_rptr += CLDFB_NO_CHANNELS_MAX * sizeof( float ); + + memcpy( ( *hHRTF )->fastconvReverberationEneCorrections, hrtf_data_rptr, CLDFB_NO_CHANNELS_MAX * sizeof( float ) ); + hrtf_data_rptr += CLDFB_NO_CHANNELS_MAX * sizeof( float ); + } + + return IVAS_ERR_OK; +} + + +/*---------------------------------------------------------------------* + * load_fastconv_HRTF_from_binary() + * + * Load FastConv HRTF binary data into the handle + *---------------------------------------------------------------------*/ + +ivas_error load_fastconv_HRTF_from_binary( + IVAS_DEC_HRTF_FASTCONV_HANDLE hHrtfFastConv, /* i/o: FastConv HRTF handle */ + const hrtfFileReader *hrtfReader /* i : pointer to hrtfFileReader handle */ +) +{ + FILE *f_hrtf; + int32_t hrtf_data_size_max; + char *hrtf_data; + ivas_hrtfs_header_t hrtf_header; + ivas_error header_check_result; + ivas_hrtfs_file_header_t hrtfs_file_header; + int16_t hrtf_id; + + f_hrtf = hrtfReader->file; + + if ( ( header_check_result = read_and_check_hrtf_binary_file_header( &hrtfs_file_header, f_hrtf ) ) != IVAS_ERR_OK ) + { + return header_check_result; + } + + hrtf_data_size_max = hrtfs_file_header.max_data_size; + + /* Allocate the memory */ + + if ( hrtf_data_size_max == 0 ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (hrtf_data_size_max)" ); + } + + hrtf_data = (char *) malloc( hrtf_data_size_max ); + if ( hrtf_data == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" ); + } + + /* Read & load */ + + memset( hHrtfFastConv, 0x00, sizeof( HRTFS_FASTCONV ) ); + + for ( hrtf_id = 0; hrtf_id < hrtfs_file_header.nb_hrtf; hrtf_id++ ) + { + if ( read_hrtf_binary_header( &hrtf_header, f_hrtf ) != IVAS_ERR_OK ) + { + free( hrtf_data ); + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "HRTF binary file not compliant (number of HRTF)" ); + } + + if ( ( hrtf_header.frequency == 48000 ) && + ( ( hrtf_header.rend_type == RENDERER_BINAURAL_FASTCONV ) || ( hrtf_header.rend_type == RENDERER_BINAURAL_FASTCONV_ROOM ) ) ) + { + if ( fread( hrtf_data, 1, hrtf_header.data_size, f_hrtf ) != hrtf_header.data_size ) + { + free( hrtf_data ); + return IVAS_ERROR( IVAS_ERR_FAILED_FILE_READ, "Error in HRTF file reading" ); + } + + /* Create the HRTF reading the raw data from the binary file */ + if ( ( create_fastconv_HRTF_from_rawdata( &hHrtfFastConv, hrtf_data, hrtf_header.rend_type, hrtf_header.input_cfg ) ) != IVAS_ERR_OK ) + { + free( hrtf_data ); + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Could not create HRTF from binary file" ); + } + } + else + { + fseek( f_hrtf, hrtf_header.data_size, SEEK_CUR ); + } + } + free( hrtf_data ); + + return IVAS_ERR_OK; +} + + +/*---------------------------------------------------------------------* + * create_parambin_HRTF_from_rawdata() + * + * + *---------------------------------------------------------------------*/ + +static ivas_error create_parambin_HRTF_from_rawdata( + HRTFS_PARAMBIN_HANDLE *hHRTF, /* i/o: Parametric binauralizer HRTF handle */ + char *hrtf_data /* i : pointer to binary file */ +) +{ + int16_t i, j; + char *hrtf_data_rptr; + uint32_t data_size_tmp; + + hrtf_data_rptr = hrtf_data; + + /* HRTF_SH_CHANNELS */ + if ( HRTF_SH_CHANNELS != *( (uint16_t *) ( hrtf_data_rptr ) ) ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (HRTF_SH_CHANNELS)" ); + } + hrtf_data_rptr += sizeof( uint16_t ); + + /* HRTF_NUM_BINS */ + if ( HRTF_NUM_BINS != *( (uint16_t *) ( hrtf_data_rptr ) ) ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (HRTF_NUM_BINS)" ); + } + hrtf_data_rptr += sizeof( uint16_t ); + + /* HRTF */ + data_size_tmp = HRTF_NUM_BINS * sizeof( float ); + for ( i = 0; i < BINAURAL_CHANNELS; i++ ) + { + for ( j = 0; j < HRTF_SH_CHANNELS; j++ ) + { + memcpy( ( *hHRTF )->hrtfShCoeffsRe[i][j], hrtf_data_rptr, data_size_tmp ); + hrtf_data_rptr += data_size_tmp; + } + } + for ( i = 0; i < BINAURAL_CHANNELS; i++ ) + { + for ( j = 0; j < HRTF_SH_CHANNELS; j++ ) + { + memcpy( ( *hHRTF )->hrtfShCoeffsIm[i][j], hrtf_data_rptr, data_size_tmp ); + hrtf_data_rptr += data_size_tmp; + } + } + + /* Reverb Parameters */ + if ( CLDFB_NO_CHANNELS_MAX != *( (uint16_t *) ( hrtf_data_rptr ) ) ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (CLDFB_NO_CHANNELS_MAX)" ); + } + hrtf_data_rptr += sizeof( uint16_t ); + + memcpy( ( *hHRTF )->parametricReverberationTimes, hrtf_data_rptr, CLDFB_NO_CHANNELS_MAX * sizeof( float ) ); + hrtf_data_rptr += CLDFB_NO_CHANNELS_MAX * sizeof( float ); + + memcpy( ( *hHRTF )->parametricReverberationEneCorrections, hrtf_data_rptr, CLDFB_NO_CHANNELS_MAX * sizeof( float ) ); + hrtf_data_rptr += CLDFB_NO_CHANNELS_MAX * sizeof( float ); + + memcpy( ( *hHRTF )->parametricEarlyPartEneCorrection, hrtf_data_rptr, CLDFB_NO_CHANNELS_MAX * sizeof( float ) ); + hrtf_data_rptr += CLDFB_NO_CHANNELS_MAX * sizeof( float ); + + return IVAS_ERR_OK; +} + + +/*---------------------------------------------------------------------* + * load_parambin_HRTF_from_binary() + * + * Load parametric binauralizer HRTF binary data into the handle + *---------------------------------------------------------------------*/ + +ivas_error load_parambin_HRTF_from_binary( + IVAS_DEC_HRTF_PARAMBIN_HANDLE hHrtfParamBin, /* i/o: Parametric binauralizer HRTF handle */ + const hrtfFileReader *hrtfReader /* i : pointer to hrtfFileReader handle */ +) +{ + FILE *f_hrtf; + int32_t hrtf_data_size_max; + char *hrtf_data; + ivas_hrtfs_header_t hrtf_header; + ivas_error header_check_result; + ivas_hrtfs_file_header_t hrtfs_file_header; + int16_t hrtf_id; + + f_hrtf = hrtfReader->file; + + if ( ( header_check_result = read_and_check_hrtf_binary_file_header( &hrtfs_file_header, f_hrtf ) ) != IVAS_ERR_OK ) + { + return header_check_result; + } + + hrtf_data_size_max = hrtfs_file_header.max_data_size; + + /* Allocate the memory */ + + if ( hrtf_data_size_max == 0 ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (hrtf_data_size_max)" ); + } + + hrtf_data = (char *) malloc( hrtf_data_size_max ); + if ( hrtf_data == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" ); + } + + /* Read & load */ + memset( hHrtfParamBin, 0x00, sizeof( HRTFS_PARAMBIN ) ); + + for ( hrtf_id = 0; hrtf_id < hrtfs_file_header.nb_hrtf; hrtf_id++ ) + { + if ( read_hrtf_binary_header( &hrtf_header, f_hrtf ) != IVAS_ERR_OK ) + { + free( hrtf_data ); + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "HRTF binary file not compliant (number of HRTF)" ); + } + + if ( hrtf_header.rend_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) /* Parametric binauralizer data is represented as single entity */ + { + if ( fread( hrtf_data, 1, hrtf_header.data_size, f_hrtf ) != hrtf_header.data_size ) + { + free( hrtf_data ); + return IVAS_ERROR( IVAS_ERR_FAILED_FILE_READ, "Error in HRTF file reading" ); + } + + /* Create the HRTF reading the raw data from the binary file */ + if ( ( create_parambin_HRTF_from_rawdata( &hHrtfParamBin, hrtf_data ) ) != IVAS_ERR_OK ) + { + free( hrtf_data ); + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Could not create HRTF from binary file" ); + } + } + else + { + fseek( f_hrtf, hrtf_header.data_size, SEEK_CUR ); + } + } + free( hrtf_data ); + + return IVAS_ERR_OK; +} + + +/*---------------------------------------------------------------------* + * create_SetOfHRTF_from_binary() + * + * Create the HRTF data set from the binary file + *---------------------------------------------------------------------*/ + +ivas_error create_SetOfHRTF_from_binary( + IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF, /* i/o: HRTF CRend handle */ + const hrtfFileReader *hrtfReader, /* i : pointer to hrtfFileReader handle */ + int32_t output_Fs ) /* i : Output sampling frequency */ +{ + FILE *f_hrtf; + int32_t hrtf_data_size_max; + char *hrtf_data; + ivas_hrtfs_header_t hrtf_header; + HRTFS_DATA **hHRTF; + ivas_error header_check_result; + ivas_hrtfs_file_header_t hrtfs_file_header; + int16_t hrtf_id; + + f_hrtf = hrtfReader->file; + + if ( ( header_check_result = read_and_check_hrtf_binary_file_header( &hrtfs_file_header, f_hrtf ) ) != IVAS_ERR_OK ) + { + return header_check_result; + } + + hrtf_data_size_max = hrtfs_file_header.max_data_size; + + /* Allocate the memory */ + + if ( hrtf_data_size_max == 0 ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (hrtf_data_size_max)" ); + } + + hrtf_data = (char *) malloc( hrtf_data_size_max ); + if ( hrtf_data == NULL ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" ); + } + + /* Read & load */ + + memset( hSetOfHRTF, 0x00, sizeof( HRTFS_CREND ) ); + + for ( hrtf_id = 0; hrtf_id < hrtfs_file_header.nb_hrtf; hrtf_id++ ) + { + if ( read_hrtf_binary_header( &hrtf_header, f_hrtf ) != IVAS_ERR_OK ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "HRTF binary file not compliant (number of HRTF)" ); + } + + hHRTF = NULL; + if ( hrtf_header.frequency == output_Fs ) + { + if ( hrtf_header.rend_type == RENDERER_BINAURAL_MIXER_CONV ) + { + if ( hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED ) + { + hHRTF = &( ( *hSetOfHRTF ).hHRTF_hrir_combined ); + } + else if ( hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA ) + { + hHRTF = &( ( *hSetOfHRTF ).hHRTF_hrir_hoa3 ); + } + } + else if ( hrtf_header.rend_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) + { + if ( hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED ) + { + hHRTF = &( ( *hSetOfHRTF ).hHRTF_brir_combined ); + } + } + } + + if ( fread( hrtf_data, 1, hrtf_header.data_size, f_hrtf ) != hrtf_header.data_size ) + { + return IVAS_ERROR( IVAS_ERR_FAILED_FILE_READ, "Error in HRTF file reading" ); + } + + if ( hHRTF != NULL ) + { + /* Create the HRTF reading the raw data from the binary file */ + if ( ( create_HRTF_from_rawdata( hHRTF, hrtf_data ) ) != IVAS_ERR_OK ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Could not create HRTF from binary file" ); + } + } + } + + free( hrtf_data ); + + if ( ( ( *hSetOfHRTF ).hHRTF_hrir_combined == NULL ) || ( ( *hSetOfHRTF ).hHRTF_brir_combined == NULL ) || ( ( *hSetOfHRTF ).hHRTF_hrir_hoa3 == NULL ) ) + { + destroy_SetOfHRTF( hSetOfHRTF ); + return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Could not create all the HRTF from binary file" ); + } + + return IVAS_ERR_OK; +} + + +/*---------------------------------------------------------------------* + * destroy_HRTF() + * + * Destroy the HRTF CRend handle + *---------------------------------------------------------------------*/ + +static ivas_error destroy_HRTF( + HRTFS_HANDLE *hHRTF /* i/o: HRTF CRend handle */ +) +{ + uint16_t i, j; + + if ( *hHRTF != NULL && hHRTF != NULL ) + { + for ( i = 0; i < MAX_INTERN_CHANNELS; i++ ) + { + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + if ( ( *hHRTF )->pIndex_frequency_max[i][j] != NULL ) + { + free( ( *hHRTF )->pIndex_frequency_max[i][j] ); + } + if ( ( *hHRTF )->pOut_to_bin_re[i][j] != NULL ) + { + free( ( *hHRTF )->pOut_to_bin_re[i][j] ); + } + if ( ( *hHRTF )->pOut_to_bin_im[i][j] != NULL ) + { + free( ( *hHRTF )->pOut_to_bin_im[i][j] ); + } + } + } + for ( j = 0; j < BINAURAL_CHANNELS; j++ ) + { + if ( ( *hHRTF )->pIndex_frequency_max_diffuse[j] != NULL ) + { + free( ( *hHRTF )->pIndex_frequency_max_diffuse[j] ); + } + if ( ( *hHRTF )->pOut_to_bin_diffuse_re[j] != NULL ) + { + free( ( *hHRTF )->pOut_to_bin_diffuse_re[j] ); + } + if ( ( *hHRTF )->pOut_to_bin_diffuse_im[j] != NULL ) + { + free( ( *hHRTF )->pOut_to_bin_diffuse_im[j] ); + } + } + + free( *hHRTF ); + *hHRTF = NULL; + } + + return IVAS_ERR_OK; +} + +/*---------------------------------------------------------------------* + * destroy_SetOfHRTF() + * + * Destroy the HRTF data set. + *---------------------------------------------------------------------*/ + +ivas_error destroy_SetOfHRTF( + HRTFS_CREND_HANDLE hSetOfHRTF /* i/o: Set of HRTF CRend handle */ +) +{ + if ( hSetOfHRTF != NULL ) + { + destroy_HRTF( &( hSetOfHRTF->hHRTF_hrir_combined ) ); + destroy_HRTF( &( hSetOfHRTF->hHRTF_hrir_hoa3 ) ); + destroy_HRTF( &( hSetOfHRTF->hHRTF_brir_combined ) ); + } + + return IVAS_ERR_OK; +} diff --git a/lib_util/hrtf_file_reader.h b/lib_util/hrtf_file_reader.h index ed3d572d56..2b59c3150b 100644 --- a/lib_util/hrtf_file_reader.h +++ b/lib_util/hrtf_file_reader.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,13 +33,20 @@ #ifndef IVAS_HRTF_FILE_READER_H #define IVAS_HRTF_FILE_READER_H -#include #include "common_api_types.h" -#include "ivas_error.h" typedef struct hrtfFileReader hrtfFileReader; +typedef struct ivas_hrtfs_header_t +{ + int32_t rend_type; + int32_t input_cfg; + int32_t frequency; + uint32_t data_size; + +} ivas_hrtfs_header_t; + /*---------------------------------------------------------------------* * hrtfFileReader_open() * @@ -72,4 +79,62 @@ ivas_error load_HRTF_binary( const hrtfFileReader *hrtfReader /* i/o: pointer to hrtfFileReader handle */ ); +/*---------------------------------------------------------------------* + * create_SetOfHRTF_from_binary() + * + * Create the HRTF data set from the binary file + *---------------------------------------------------------------------*/ + +ivas_error create_SetOfHRTF_from_binary( + IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF, /* i/o: Set of HRTF CRend handle */ + const hrtfFileReader *hrtfReader, /* i: pointer to hrtfFileReader handle */ + int32_t output_Fs /* i: Output sampling frequency */ +); + + +/*---------------------------------------------------------------------* + * destroy_SetOfHRTF() + * + * Destroy the HRTF data set. + *---------------------------------------------------------------------*/ + +ivas_error destroy_SetOfHRTF( + IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF /* i/o: Set of HRTF CRend handle */ +); + + +/*---------------------------------------------------------------------* + * load_fastconv_HRTF_from_binary() + * + * Load FastConv HRTF binary data into the handle + *---------------------------------------------------------------------*/ + +ivas_error load_fastconv_HRTF_from_binary( + IVAS_DEC_HRTF_FASTCONV_HANDLE hHrtfFastConv, /* i/o: FastConv HRTF handle */ + const hrtfFileReader *hrtfReader /* i : pointer to hrtfFileReader handle */ +); + + +/*---------------------------------------------------------------------* + * load_parambin_HRTF_from_binary() + * + * Load parametric binauralizer HRTF binary data into the handle + *---------------------------------------------------------------------*/ + +ivas_error load_parambin_HRTF_from_binary( + IVAS_DEC_HRTF_PARAMBIN_HANDLE hHrtfParambin, /* i/o: Parambin HRTF handle */ + const hrtfFileReader *hrtfReader /* i : pointer to hrtfFileReader handle */ +); + + +/*---------------------------------------------------------------------* + * dealloc_HRTF_binary() + * + * Deallocated memory allocated by load_HRTF_binary + *---------------------------------------------------------------------*/ + +ivas_error dealloc_HRTF_binary( + IVAS_DEC_HRTF_HANDLE hHrtf /* i/o: HRTF handle */ +); + #endif /* IVAS_HRTF_FILE_READER_H */ diff --git a/lib_util/ism_file_reader.c b/lib_util/ism_file_reader.c index b511b30499..fa449512e4 100644 --- a/lib_util/ism_file_reader.c +++ b/lib_util/ism_file_reader.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -32,13 +32,13 @@ #include "ism_file_reader.h" #include "cmdl_tools.h" -#include #include #include #define META_LINE_LENGTH 200 /* max number of characters at one line of metadata input/output file */ -#define NUM_ISM_METADATA_PER_LINE 5 /* Number of ISM metadata per line in a metadata file */ +#define NUM_ISM_METADATA_PER_LINE 7 /* Number of ISM metadata per line in a metadata file */ +#define NUM_MIN_ISM_METADATA 2 /* Minimum number of metadata parameters (azimuth and elevation) */ struct IsmFileReader @@ -55,7 +55,7 @@ struct IsmFileReader *---------------------------------------------------------------------*/ IsmFileReader *IsmFileReader_open( - const char *filePath /* i : path to ism metadata file */ + const char *filePath /* i : path to ISM metadata file */ ) { IsmFileReader *self; @@ -91,15 +91,22 @@ IsmFileReader *IsmFileReader_open( /*! r: error code */ ivas_error IsmFileReader_readNextFrame( IsmFileReader *self, /* i/o: IsmFileReader handle */ - IVAS_ISM_METADATA *ismMetadata /* o ISM : metadata read from the opened file */ + IVAS_ISM_METADATA *ismMetadata /* o : ISM metadata read from the opened file */ ) { char char_buff[META_LINE_LENGTH]; float meta_prm[NUM_ISM_METADATA_PER_LINE]; + const float meta_prm_default[NUM_ISM_METADATA_PER_LINE] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f }; char *char_ptr; int16_t i; FILE *file; + /* Set default metadata parameters */ + for ( i = 0; i < NUM_ISM_METADATA_PER_LINE; i++ ) + { + meta_prm[i] = meta_prm_default[i]; + } + if ( ismMetadata == NULL || self->file == NULL ) { return IVAS_ERR_UNEXPECTED_NULL_POINTER; @@ -128,24 +135,21 @@ ivas_error IsmFileReader_readNextFrame( meta_prm[i++] = (float) atof( char_ptr ); } - - if ( i != NUM_ISM_METADATA_PER_LINE ) + /* Verify the number of metadata values. */ + if ( i < NUM_MIN_ISM_METADATA || char_ptr != NULL ) { - /* Not enough values provided in one line */ + /* Invalid number of metadata parameters (2-7 supported) */ return IVAS_ERR_ISM_FILE_READER_INVALID_METADATA_FORMAT; } - if ( char_ptr != NULL ) - { - /* Too many values provided in one line */ - return IVAS_ERR_ISM_FILE_READER_INVALID_METADATA_FORMAT; - } ismMetadata->azimuth = meta_prm[0]; ismMetadata->elevation = meta_prm[1]; ismMetadata->radius = meta_prm[2]; ismMetadata->spread = meta_prm[3]; ismMetadata->gainFactor = meta_prm[4]; + ismMetadata->yaw = meta_prm[5]; + ismMetadata->pitch = meta_prm[6]; /* verify whether the read metadata values are in an expected range */ if ( ismMetadata->azimuth > 180 || ismMetadata->azimuth < -180 ) @@ -158,7 +162,7 @@ ivas_error IsmFileReader_readNextFrame( return IVAS_ERR_ISM_INVALID_METADATA_VALUE; } - if ( ismMetadata->radius < 0 ) // Ivas_fmToDo: to be reviewed + if ( ismMetadata->radius < 0 ) /* Negative radius not supported. Max quantized radius = (2^ISM_RADIUS_NBITS-1)*0.25 = 15.75 */ { return IVAS_ERR_ISM_INVALID_METADATA_VALUE; } @@ -172,6 +176,15 @@ ivas_error IsmFileReader_readNextFrame( { return IVAS_ERR_ISM_INVALID_METADATA_VALUE; } + if ( ismMetadata->yaw > 180 || ismMetadata->yaw < -180 ) + { + return IVAS_ERR_ISM_INVALID_METADATA_VALUE; + } + + if ( ismMetadata->pitch > 90 || ismMetadata->pitch < -90 ) + { + return IVAS_ERR_ISM_INVALID_METADATA_VALUE; + } return IVAS_ERR_OK; } diff --git a/lib_util/ism_file_reader.h b/lib_util/ism_file_reader.h index d618621d32..8ddb67704e 100644 --- a/lib_util/ism_file_reader.h +++ b/lib_util/ism_file_reader.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,9 +33,7 @@ #ifndef IVAS_ISM_FILE_READER_H #define IVAS_ISM_FILE_READER_H -#include #include "common_api_types.h" -#include "ivas_error.h" /* clang-format off */ diff --git a/lib_util/ism_file_writer.c b/lib_util/ism_file_writer.c index ac90e7b1eb..b29386282b 100644 --- a/lib_util/ism_file_writer.c +++ b/lib_util/ism_file_writer.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -31,13 +31,11 @@ *******************************************************************************************************/ #include "ism_file_writer.h" -#include #include #include -#define META_LINE_LENGTH 200 /* max number of characters at one line of metadata input/output file */ -#define NUM_ISM_METADATA_PER_LINE 5 /* Number of ISM metadata per line in a metadata file */ +#define META_LINE_LENGTH 200 /* max number of characters at one line of metadata input/output file */ struct IsmFileWriter @@ -55,7 +53,7 @@ struct IsmFileWriter /*! r: error code */ ivas_error IsmFileWriter_open( const char *filePathWav, /* i : path to output file */ - const int16_t obj_num, /* i : ISm number */ + const int16_t obj_num, /* i : number of ISM channels */ IsmFileWriter **ismWriter /* o : IsmFileWriter handle */ ) { @@ -64,7 +62,7 @@ ivas_error IsmFileWriter_open( FILE *file; strncpy( metadata_filename_loc, filePathWav, sizeof( metadata_filename_loc ) - 1 ); - sprintf( ext_meta, ".%d.csv", obj_num ); + snprintf( ext_meta, sizeof( ext_meta ), ".%d.csv", obj_num ); const int32_t maxNumCharactersToAppend = (int32_t) sizeof( metadata_filename_loc ) - strlen( metadata_filename_loc ) - 1; strncat( metadata_filename_loc, ext_meta, maxNumCharactersToAppend ); @@ -116,7 +114,10 @@ ivas_error IsmFileWriter_writeFrame( file = ismWriter->file; /* IVAS_fmToDo: work in progress; currently position_azimuth, position_elevation, position_radius, spread, gain_factor */ - sprintf( char_buff, "%+07.2f,%+06.2f,%05.2f,%06.2f,%04.2f\n", ismMetadata.azimuth, ismMetadata.elevation, ismMetadata.radius, ismMetadata.spread, ismMetadata.gainFactor ); +#ifdef FIX_293_EXT_RENDERER_CLI + sprintf( char_buff, "%+07.2f,%+06.2f,%05.2f,%06.2f,%04.2f,%+07.2f,%+06.2f\n", ismMetadata.azimuth, ismMetadata.elevation, ismMetadata.radius, ismMetadata.spread, ismMetadata.gainFactor, ismMetadata.yaw, ismMetadata.pitch ); +#endif + snprintf( char_buff, sizeof( char_buff ), "%+07.2f,%+06.2f,%05.2f,%06.2f,%04.2f,%+07.2f,%+06.2f\n", ismMetadata.azimuth, ismMetadata.elevation, ismMetadata.radius, ismMetadata.spread, ismMetadata.gainFactor, ismMetadata.yaw, ismMetadata.pitch ); if ( file ) { diff --git a/lib_util/ism_file_writer.h b/lib_util/ism_file_writer.h index 1624eddd1a..d9f731e87e 100644 --- a/lib_util/ism_file_writer.h +++ b/lib_util/ism_file_writer.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,9 +33,7 @@ #ifndef IVAS_ISM_FILE_WRITER_H #define IVAS_ISM_FILE_WRITER_H -#include #include "common_api_types.h" -#include "ivas_error.h" typedef struct IsmFileWriter IsmFileWriter; @@ -45,7 +43,7 @@ typedef struct IsmFileWriter IsmFileWriter; /*! r: error code */ ivas_error IsmFileWriter_open( const char *filePathWav, /* i : path to output file */ - const int16_t obj_num, /* i : ISm number */ + const int16_t obj_num, /* i : number of ISM channels */ IsmFileWriter **ismWriter /* o : IsmFileReader handle */ ); diff --git a/lib_util/jbm_file_reader.c b/lib_util/jbm_file_reader.c index 7360f0ced6..1be5c22365 100644 --- a/lib_util/jbm_file_reader.c +++ b/lib_util/jbm_file_reader.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -32,7 +32,6 @@ #include "jbm_file_reader.h" #include "cmdl_tools.h" -#include #include #include diff --git a/lib_util/jbm_file_reader.h b/lib_util/jbm_file_reader.h index dca0a6c135..64d2d17e45 100644 --- a/lib_util/jbm_file_reader.h +++ b/lib_util/jbm_file_reader.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,9 +33,7 @@ #ifndef IVAS_JBM_FILE_READER_H #define IVAS_JBM_FILE_READER_H -#include #include "common_api_types.h" -#include "ivas_error.h" /* clang-format off */ diff --git a/lib_util/jbm_file_writer.c b/lib_util/jbm_file_writer.c index bf34c51872..584a22bc7f 100644 --- a/lib_util/jbm_file_writer.c +++ b/lib_util/jbm_file_writer.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -31,7 +31,6 @@ *******************************************************************************************************/ #include "jbm_file_writer.h" -#include #include #include @@ -78,7 +77,7 @@ ivas_error JbmOffsetFileWriter_open( return IVAS_ERR_FAILED_FILE_OPEN; } - self = calloc( sizeof( JbmTraceFileWriter ), 1 ); + self = calloc( sizeof( JbmOffsetFileWriter ), 1 ); self->file = file; self->file_path = calloc( sizeof( char ), strlen( jbmOffsetFilename ) + 1 ); strcpy( self->file_path, jbmOffsetFilename ); @@ -191,9 +190,6 @@ ivas_error JbmTraceFileWriter_open( JbmTraceFileWriter *self; FILE *file; -#ifdef SUPPORT_JBM_TRACEFILE -#endif - if ( strlen( jbmTraceFilename ) < 1 ) { return IVAS_ERR_FAILED_FILE_OPEN; @@ -227,8 +223,8 @@ ivas_error JbmTraceFileWriter_open( /*! r: error code */ ivas_error JbmTraceFileWriter_writeFrame( - const IVAS_JBM_TRACE_DATA *JbmTraceData, /* i : JBM trace data */ - JbmTraceFileWriter *jbmTraceWriter /* o : JbmTraceFileWriter handle */ + const IVAS_JBM_TRACE_DATA *data, /* i : JBM trace data */ + JbmTraceFileWriter *jbmTraceWriter /* o : JbmTraceFileWriter handle */ ) { FILE *file; @@ -242,21 +238,23 @@ ivas_error JbmTraceFileWriter_writeFrame( if ( file ) { + /* the first sample of the decoded/concealed frame will be played after the samples in the ring buffer */ + double playTime = data->systemTimestamp_ms + data->extBufferedSamples * 1000.0 / data->output_Fs; /* rtpSeqNo;rtpTs;rcvTime;playTime;active\n */ - if ( JbmTraceData->dataUnit_flag ) + if ( data->dataUnit_flag ) { - if ( JbmTraceData->partial_frame_flag == 1 ) + if ( data->partial_frame == 1 ) { - fprintf( file, "%d;%d;%d;%f;%d;%d\n", -1, -1, -1, JbmTraceData->playTime, JbmTraceData->lastDecodedWasActive, JbmTraceData->partialCopyOffset ); + fprintf( file, "%d;%d;%d;%f;%d;%d\n", -1, -1, -1, playTime, data->lastDecodedWasActive, data->partialCopyOffset ); } else { - fprintf( file, "%u;%u;%u;%f;%d\n", JbmTraceData->sequenceNumber, JbmTraceData->timeStamp, JbmTraceData->rcvTime, JbmTraceData->playTime, JbmTraceData->lastDecodedWasActive ); + fprintf( file, "%u;%u;%u;%f;%d\n", data->sequenceNumber, data->timeStamp, data->rcvTime, playTime, data->lastDecodedWasActive ); } } else { - fprintf( file, "%d;%d;%d;%f;%d\n", -1, -1, -1, JbmTraceData->playTime, JbmTraceData->lastDecodedWasActive ); + fprintf( file, "%d;%d;%d;%f;%d\n", -1, -1, -1, playTime, data->lastDecodedWasActive ); } } else diff --git a/lib_util/jbm_file_writer.h b/lib_util/jbm_file_writer.h index 5cfab08f61..c82c38e0f9 100644 --- a/lib_util/jbm_file_writer.h +++ b/lib_util/jbm_file_writer.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,9 +33,7 @@ #ifndef IVAS_JBM_FILE_WRITER_H #define IVAS_JBM_FILE_WRITER_H -#include #include "common_api_types.h" -#include "ivas_error.h" /* clang-format off */ diff --git a/lib_util/ls_custom_file_reader.c b/lib_util/ls_custom_file_reader.c index 58d78de068..9b39fab486 100644 --- a/lib_util/ls_custom_file_reader.c +++ b/lib_util/ls_custom_file_reader.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -32,7 +32,6 @@ #include "ls_custom_file_reader.h" #include -#include #include #include "ivas_prot.h" #include "prot.h" @@ -53,7 +52,7 @@ struct LsCustomFileReader ivas_error CustomLsReader_open( const char *LsFilePath, /* i : LS custom layout file name */ - LsCustomFileReader **hLsCustomReader /* o : HeadRotFileReader handle */ + LsCustomFileReader **hLsCustomReader /* o : LsCustomFileReader handle */ ) { LsCustomFileReader *self; @@ -90,7 +89,7 @@ ivas_error CustomLsReader_open( *-----------------------------------------------------------------------*/ void CustomLsReader_close( - LsCustomFileReader **hLsCustomReader /* i/o: HeadRotFileReader handle */ + LsCustomFileReader **hLsCustomReader /* i/o: LsCustomFileReader handle */ ) { if ( hLsCustomReader == NULL || *hLsCustomReader == NULL ) @@ -229,7 +228,7 @@ static void CustomLoudspeakerLayout_print_info( *-------------------------------------------------------------------------*/ LS_CUSTOM_FILEREADER_ERROR CustomLsFileReading( - LsCustomFileReader *hLsCustomReader, /* i/o: HeadRotFileReader handle */ + LsCustomFileReader *hLsCustomReader, /* i/o: LsCustomFileReader handle */ IVAS_CUSTOM_LS_DATA *hLsCustomData /* o : Custom loudspeaker setup data */ ) { @@ -269,7 +268,7 @@ LS_CUSTOM_FILEREADER_ERROR CustomLsFileReading( tok++; } - if ( *tok == '\0' ) + if ( *tok == '\0' ) // replace by isEmptyString() { continue; } diff --git a/lib_util/ls_custom_file_reader.h b/lib_util/ls_custom_file_reader.h index e35c06ea88..df7fe6bde7 100644 --- a/lib_util/ls_custom_file_reader.h +++ b/lib_util/ls_custom_file_reader.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,9 +33,7 @@ #ifndef IVAS_LS_CUSTOM_FILE_READER_H #define IVAS_LS_CUSTOM_FILE_READER_H -#include #include "common_api_types.h" -#include "ivas_error.h" typedef struct LsCustomFileReader LsCustomFileReader; @@ -66,7 +64,7 @@ typedef enum _LS_CUSTOM_FILEREADER_ERROR ivas_error CustomLsReader_open( const char *LsFilePath, /* i : LS custom layout file name */ - LsCustomFileReader **hLsCustomReader /* o : HeadRotFileReader handle */ + LsCustomFileReader **hLsCustomReader /* o : LsCustomFileReader handle */ ); /*-----------------------------------------------------------------------* @@ -76,7 +74,7 @@ ivas_error CustomLsReader_open( *-----------------------------------------------------------------------*/ void CustomLsReader_close( - LsCustomFileReader **hLsCustomReader /* i/o: HeadRotFileReader handle */ + LsCustomFileReader **hLsCustomReader /* i/o: LsCustomFileReader handle */ ); /*-------------------------------------------------------------------------* @@ -86,7 +84,7 @@ void CustomLsReader_close( *-------------------------------------------------------------------------*/ LS_CUSTOM_FILEREADER_ERROR CustomLsFileReading( - LsCustomFileReader *hLsCustomReader, /* i/o: HeadRotFileReader handle */ + LsCustomFileReader *hLsCustomReader, /* i/o: LsCustomFileReader handle */ IVAS_CUSTOM_LS_DATA *hLsCustomData /* o : Custom loudspeaker setup data */ ); diff --git a/lib_util/masa_file_reader.c b/lib_util/masa_file_reader.c index 918d613d37..19f12182f3 100644 --- a/lib_util/masa_file_reader.c +++ b/lib_util/masa_file_reader.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -32,7 +32,7 @@ #include "masa_file_reader.h" #include "ivas_prot.h" -#include +#include "ivas_stat_com.h" #include #include diff --git a/lib_util/masa_file_reader.h b/lib_util/masa_file_reader.h index 898303c99e..5f3f2fec2a 100644 --- a/lib_util/masa_file_reader.h +++ b/lib_util/masa_file_reader.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,9 +33,7 @@ #ifndef IVAS_MASA_FILE_READER_H #define IVAS_MASA_FILE_READER_H -#include #include "common_api_types.h" -#include "ivas_error.h" struct MasaFileReader; diff --git a/lib_util/masa_file_writer.c b/lib_util/masa_file_writer.c index e8f9a09c68..e7f3aca0b6 100644 --- a/lib_util/masa_file_writer.c +++ b/lib_util/masa_file_writer.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -32,25 +32,34 @@ #include "masa_file_writer.h" #include "ivas_stat_com.h" +#include "ivas_stat_dec.h" #include "ivas_cnst.h" #include -#include #include #include +typedef struct masaMetaDelayStorage +{ + MASA_DECRIPTIVE_META descriptiveMeta; + uint16_t directionIndex[MASA_MAXIMUM_DIRECTIONS][DELAY_MASA_PARAM_DEC_SFR][MASA_FREQUENCY_BANDS]; + uint8_t directToTotalRatio[MASA_MAXIMUM_DIRECTIONS][DELAY_MASA_PARAM_DEC_SFR][MASA_FREQUENCY_BANDS]; + uint8_t spreadCoherence[MASA_MAXIMUM_DIRECTIONS][DELAY_MASA_PARAM_DEC_SFR][MASA_FREQUENCY_BANDS]; + uint8_t surroundCoherence[DELAY_MASA_PARAM_DEC_SFR][MASA_FREQUENCY_BANDS]; + uint8_t diffuseToTotalRatio[DELAY_MASA_PARAM_DEC_SFR][MASA_FREQUENCY_BANDS]; + +} MASA_META_DELAY_STORAGE; struct MasaFileWriter { FILE *file; char *file_path; + MASA_META_DELAY_STORAGE *delayStorage; }; /*-----------------------------------------------------------------------* * Local constants *-----------------------------------------------------------------------*/ -#define SPH_IDX_FRONT ( MASA_NO_POINTS_EQUATOR / 2 ) /* Spherical index corresponding to front direction for setting as default value */ - /*-----------------------------------------------------------------------* * Local functions @@ -66,7 +75,7 @@ static void getExtMasaMetadataFileName( /* sizeof( ext_meta ) accounts for terminating NULL, don't subtract extra 1 */ const int32_t maxNameLenWithoutExt = sizeof( metadata_filename[0] ) - sizeof( ext_meta ); strncpy( metadata_filename[0], outputWavFilename, maxNameLenWithoutExt ); - sprintf( ext_meta, ".met" ); + snprintf( ext_meta, sizeof( ext_meta ), ".met" ); /* strlen( metadata_filename[0] ) doesn't account for terminating NULL, subtract extra 1 */ const int32_t maxNumCharactersToAppend = (int32_t) ( sizeof( metadata_filename[0] ) - strlen( metadata_filename[0] ) - 1 ); @@ -75,16 +84,73 @@ static void getExtMasaMetadataFileName( return; } +static void delayMasaMetadata( + MASA_DECODER_EXT_OUT_META_HANDLE extOutMeta, /* i/o : New input metadata which is inplace replaced with delayed metadata frame */ + MASA_META_DELAY_STORAGE *delayStorage /* i/o : Storage for 10 ms of metadata and related descriptive metadata */ +) +{ + int16_t dir, sf, band; + uint8_t currentNumberOfDirections; + + /* Move meta to delay and output. Always use two directions as the metadata is prepared to contain zero energy second direction + * if there is 1dir meta. */ + for ( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES - DELAY_MASA_PARAM_DEC_SFR; sf++ ) + { + for ( band = 0; band < MASA_FREQUENCY_BANDS; band++ ) + { + uint16_t temp_u16; + uint8_t temp_u8; + for ( dir = 0; dir < MASA_MAXIMUM_DIRECTIONS; dir++ ) + { + temp_u16 = delayStorage->directionIndex[dir][sf][band]; + delayStorage->directionIndex[dir][sf][band] = extOutMeta->directionIndex[dir][sf + DELAY_MASA_PARAM_DEC_SFR][band]; + extOutMeta->directionIndex[dir][sf + DELAY_MASA_PARAM_DEC_SFR][band] = extOutMeta->directionIndex[dir][sf][band]; + extOutMeta->directionIndex[dir][sf][band] = temp_u16; + + temp_u8 = delayStorage->directToTotalRatio[dir][sf][band]; + delayStorage->directToTotalRatio[dir][sf][band] = extOutMeta->directToTotalRatio[dir][sf + DELAY_MASA_PARAM_DEC_SFR][band]; + extOutMeta->directToTotalRatio[dir][sf + DELAY_MASA_PARAM_DEC_SFR][band] = extOutMeta->directToTotalRatio[dir][sf][band]; + extOutMeta->directToTotalRatio[dir][sf][band] = temp_u8; + + temp_u8 = delayStorage->spreadCoherence[dir][sf][band]; + delayStorage->spreadCoherence[dir][sf][band] = extOutMeta->spreadCoherence[dir][sf + DELAY_MASA_PARAM_DEC_SFR][band]; + extOutMeta->spreadCoherence[dir][sf + DELAY_MASA_PARAM_DEC_SFR][band] = extOutMeta->spreadCoherence[dir][sf][band]; + extOutMeta->spreadCoherence[dir][sf][band] = temp_u8; + } + + temp_u8 = delayStorage->surroundCoherence[sf][band]; + delayStorage->surroundCoherence[sf][band] = extOutMeta->surroundCoherence[sf + DELAY_MASA_PARAM_DEC_SFR][band]; + extOutMeta->surroundCoherence[sf + DELAY_MASA_PARAM_DEC_SFR][band] = extOutMeta->surroundCoherence[sf][band]; + extOutMeta->surroundCoherence[sf][band] = temp_u8; + + temp_u8 = delayStorage->diffuseToTotalRatio[sf][band]; + delayStorage->diffuseToTotalRatio[sf][band] = extOutMeta->diffuseToTotalRatio[sf + DELAY_MASA_PARAM_DEC_SFR][band]; + extOutMeta->diffuseToTotalRatio[sf + DELAY_MASA_PARAM_DEC_SFR][band] = extOutMeta->diffuseToTotalRatio[sf][band]; + extOutMeta->diffuseToTotalRatio[sf][band] = temp_u8; + } + } + + /* Finalize descriptive meta by using new frame except for number of directions which is the larger of the two */ + currentNumberOfDirections = extOutMeta->descriptiveMeta.numberOfDirections; + if ( delayStorage->descriptiveMeta.numberOfDirections > extOutMeta->descriptiveMeta.numberOfDirections ) + { + extOutMeta->descriptiveMeta.numberOfDirections = delayStorage->descriptiveMeta.numberOfDirections; + } + delayStorage->descriptiveMeta.numberOfDirections = currentNumberOfDirections; + + return; +} /*---------------------------------------------------------------------* - * MasaFileWriter_writeFrame() + * MasaFileWriter_open() * * *---------------------------------------------------------------------*/ ivas_error MasaFileWriter_open( - const char *outputWavFilename, /* i : name of the output audio file */ - MasaFileWriter **masaWriter /* o : MasaFileWriter handle */ + const char *outputWavFilename, /* i : name of the output audio file */ + const bool delayCompensationEnabled, /* i : is delay compensation enabled */ + MasaFileWriter **masaWriter /* o : MasaFileWriter handle */ ) { MasaFileWriter *self; @@ -110,6 +176,11 @@ ivas_error MasaFileWriter_open( self->file_path = calloc( sizeof( char ), strlen( filePath ) + 1 ); strcpy( self->file_path, filePath ); + if ( !delayCompensationEnabled ) + { + self->delayStorage = calloc( sizeof( MASA_META_DELAY_STORAGE ), 1 ); + } + *masaWriter = self; return IVAS_ERR_OK; @@ -123,8 +194,8 @@ ivas_error MasaFileWriter_open( *---------------------------------------------------------------------*/ ivas_error MasaFileWriter_writeFrame( - MasaFileWriter *self, /* i/o: MasaFileWriter handle */ - IVAS_MASA_QMETADATA_HANDLE hMasaQMetadata /* i/o: MASA qMetadata handle to be written */ + MasaFileWriter *self, /* i/o: MasaFileWriter handle */ + MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta /* i/o: MASA ext out meta handle to be written */ ) { if ( self == NULL ) @@ -132,59 +203,43 @@ ivas_error MasaFileWriter_writeFrame( return IVAS_ERR_UNEXPECTED_NULL_POINTER; } - const uint8_t ivasmasaFormatDescriptor[8] = { 0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 }; /* "IVASMASA" */ uint16_t descMetaTemp = 0; - int16_t i, sf, b_old, b_new, dir; - uint16_t writeTempIndex[MASA_FREQUENCY_BANDS]; + int16_t i, sf, dir, numDirections; uint8_t writeTempOther[MASA_FREQUENCY_BANDS]; - MASA_DECRIPTIVE_META descMeta; - int16_t *bandMap; - uint8_t numCodingBands; - uint8_t numDirections; - int16_t nchan_transport; - - numDirections = (uint8_t) hMasaQMetadata->no_directions; - numCodingBands = hMasaQMetadata->numCodingBands; - bandMap = hMasaQMetadata->bandMap; - nchan_transport = hMasaQMetadata->nchan_transport; - - /* Construct descriptive meta */ - for ( i = 0; i < 8; i++ ) + + /* If delay storage has been reserved, then we are in the normal mode for the decoder + * (i.e., no delay compensation for PCM) which means that metadata should be delayed + * by two subframes (10 ms). Descriptive metadata is a combined result. */ + if ( self->delayStorage ) { - descMeta.formatDescriptor[i] = ivasmasaFormatDescriptor[i]; - descMeta.numberOfDirections = numDirections - 1; - descMeta.numberOfChannels = (uint8_t) ( nchan_transport - 1 ); - /* Following correspond to "unknown" values until transmission is implemented */ - descMeta.sourceFormat = 0x0u; - descMeta.transportDefinition = 0x0u; - descMeta.channelAngle = 0x0u; - descMeta.channelDistance = 0x0u; - descMeta.channelLayout = 0x0u; + delayMasaMetadata( hMasaExtOutMeta, self->delayStorage ); } - if ( fwrite( &( descMeta.formatDescriptor ), sizeof( uint8_t ), 8, self->file ) != 8 ) + numDirections = hMasaExtOutMeta->descriptiveMeta.numberOfDirections + 1; + + if ( fwrite( &( hMasaExtOutMeta->descriptiveMeta.formatDescriptor ), sizeof( uint8_t ), 8, self->file ) != 8 ) { return IVAS_ERR_FAILED_FILE_WRITE; } - descMetaTemp += descMeta.numberOfDirections << 15u; - descMetaTemp += descMeta.numberOfChannels << 14u; - descMetaTemp += descMeta.sourceFormat << 12u; - if ( descMeta.sourceFormat == 0x0 || descMeta.sourceFormat == 0x1 ) + descMetaTemp += hMasaExtOutMeta->descriptiveMeta.numberOfDirections << 15u; + descMetaTemp += hMasaExtOutMeta->descriptiveMeta.numberOfChannels << 14u; + descMetaTemp += hMasaExtOutMeta->descriptiveMeta.sourceFormat << 12u; + if ( hMasaExtOutMeta->descriptiveMeta.sourceFormat == 0x0 || hMasaExtOutMeta->descriptiveMeta.sourceFormat == 0x1 ) { - descMetaTemp += descMeta.transportDefinition << 9u; - descMetaTemp += descMeta.channelAngle << 6u; - descMetaTemp += descMeta.channelDistance; + descMetaTemp += hMasaExtOutMeta->descriptiveMeta.transportDefinition << 9u; + descMetaTemp += hMasaExtOutMeta->descriptiveMeta.channelAngle << 6u; + descMetaTemp += hMasaExtOutMeta->descriptiveMeta.channelDistance; } - else if ( descMeta.sourceFormat == 0x2 ) + else if ( hMasaExtOutMeta->descriptiveMeta.sourceFormat == 0x2 ) { - descMetaTemp += descMeta.channelLayout << 9u; + descMetaTemp += hMasaExtOutMeta->descriptiveMeta.channelLayout << 9u; /* 9 LSB remain at zero */ } - else if ( descMeta.sourceFormat == 0x3 ) + else if ( hMasaExtOutMeta->descriptiveMeta.sourceFormat == 0x3 ) { - descMetaTemp += descMeta.transportDefinition << 9u; - descMetaTemp += descMeta.channelAngle << 6u; + descMetaTemp += hMasaExtOutMeta->descriptiveMeta.transportDefinition << 9u; + descMetaTemp += hMasaExtOutMeta->descriptiveMeta.channelAngle << 6u; /* 6 LSB remain at zero */ } @@ -198,61 +253,19 @@ ivas_error MasaFileWriter_writeFrame( for ( dir = 0; dir < numDirections; dir++ ) { /* Spherical index */ - for ( i = 0; i < MASA_FREQUENCY_BANDS; i++ ) - { - writeTempIndex[i] = SPH_IDX_FRONT; - } - - for ( b_old = 0; b_old < numCodingBands; b_old++ ) - { - for ( b_new = bandMap[b_old]; b_new < bandMap[b_old + 1]; b_new++ ) - { - writeTempIndex[b_new] = hMasaQMetadata->q_direction[dir].band_data[b_old].spherical_index[sf]; - } - } - - if ( fwrite( writeTempIndex, sizeof( uint16_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS ) + if ( fwrite( hMasaExtOutMeta->directionIndex[dir][sf], sizeof( uint16_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS ) { return IVAS_ERR_FAILED_FILE_WRITE; } /* Direct-to-total ratio */ - for ( i = 0; i < MASA_FREQUENCY_BANDS; i++ ) - { - writeTempOther[i] = 0; - } - - for ( b_old = 0; b_old < numCodingBands; b_old++ ) - { - for ( b_new = bandMap[b_old]; b_new < bandMap[b_old + 1]; b_new++ ) - { - writeTempOther[b_new] = (uint8_t) floorf( hMasaQMetadata->q_direction[dir].band_data[b_old].energy_ratio[sf] * UINT8_MAX ); - } - } - - if ( fwrite( writeTempOther, sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS ) + if ( fwrite( hMasaExtOutMeta->directToTotalRatio[dir][sf], sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS ) { return IVAS_ERR_FAILED_FILE_WRITE; } /* Spread coherence */ - for ( i = 0; i < MASA_FREQUENCY_BANDS; i++ ) - { - writeTempOther[i] = 0; - } - - if ( hMasaQMetadata->q_direction[dir].coherence_band_data != NULL ) - { - for ( b_old = 0; b_old < numCodingBands; b_old++ ) - { - for ( b_new = bandMap[b_old]; b_new < bandMap[b_old + 1]; b_new++ ) - { - writeTempOther[b_new] = hMasaQMetadata->q_direction[dir].coherence_band_data[b_old].spread_coherence[sf]; - } - } - } - - if ( fwrite( writeTempOther, sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS ) + if ( fwrite( hMasaExtOutMeta->spreadCoherence[dir][sf], sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS ) { return IVAS_ERR_FAILED_FILE_WRITE; } @@ -260,55 +273,22 @@ ivas_error MasaFileWriter_writeFrame( /* Common spatial meta */ /* Diffuse-to-total ratio = 1 - sum(direct-to-total ratios) */ - for ( b_new = 0; b_new < MASA_FREQUENCY_BANDS; b_new++ ) - { - writeTempOther[b_new] = UINT8_MAX; - } - - for ( b_old = 0; b_old < numCodingBands; b_old++ ) - { - for ( b_new = bandMap[b_old]; b_new < bandMap[b_old + 1]; b_new++ ) - { - writeTempOther[b_new] = UINT8_MAX; - for ( dir = 0; dir < numDirections; dir++ ) - { - writeTempOther[b_new] -= (uint8_t) floorf( hMasaQMetadata->q_direction[dir].band_data[b_old].energy_ratio[sf] * UINT8_MAX ); - } - } - } - - if ( fwrite( writeTempOther, sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS ) + if ( fwrite( hMasaExtOutMeta->diffuseToTotalRatio[sf], sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS ) { return IVAS_ERR_FAILED_FILE_WRITE; } /* Surround coherence */ - for ( i = 0; i < MASA_FREQUENCY_BANDS; i++ ) - { - writeTempOther[i] = 0; - } - - if ( hMasaQMetadata->surcoh_band_data != NULL ) - { - for ( b_old = 0; b_old < numCodingBands; b_old++ ) - { - for ( b_new = bandMap[b_old]; b_new < bandMap[b_old + 1]; b_new++ ) - { - writeTempOther[b_new] = hMasaQMetadata->surcoh_band_data[b_old].surround_coherence[sf]; - } - } - } - - if ( fwrite( writeTempOther, sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS ) + if ( fwrite( hMasaExtOutMeta->surroundCoherence[sf], sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS ) { return IVAS_ERR_FAILED_FILE_WRITE; } /* Remainder-to-total ratio */ /* This is zero after codec */ - for ( b_new = 0; b_new < MASA_FREQUENCY_BANDS; b_new++ ) + for ( i = 0; i < MASA_FREQUENCY_BANDS; i++ ) { - writeTempOther[b_new] = 0u; + writeTempOther[i] = 0u; } if ( fwrite( writeTempOther, sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS ) @@ -338,6 +318,7 @@ void MasaFileWriter_close( fclose( ( *selfPtr )->file ); free( ( *selfPtr )->file_path ); + free( ( *selfPtr )->delayStorage ); free( *selfPtr ); *selfPtr = NULL; diff --git a/lib_util/masa_file_writer.h b/lib_util/masa_file_writer.h index ce4ed2e238..62aa8c6b48 100644 --- a/lib_util/masa_file_writer.h +++ b/lib_util/masa_file_writer.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -34,21 +34,23 @@ #define IVAS_MASA_FILE_WRITER_H #include +#include "options.h" +#include #include "common_api_types.h" -#include "ivas_error.h" struct MasaFileWriter; typedef struct MasaFileWriter MasaFileWriter; ivas_error MasaFileWriter_open( - const char *outputWavFilename, /* i : name of the output audio file */ - MasaFileWriter **masaWriter /* o : MasaFileWriter handle */ + const char *outputWavFilename, /* i : name of the output audio file */ + const bool delayCompensationEnabled, /* i : is delay compensation enabled */ + MasaFileWriter **masaWriter /* o : MasaFileWriter handle */ ); ivas_error MasaFileWriter_writeFrame( - MasaFileWriter *self, /* i/o: MasaFileWriter handle */ - IVAS_MASA_QMETADATA_HANDLE hMasaQMetadata /* i/o: MASA qMetadata handle to be written */ + MasaFileWriter *self, /* i/o: MasaFileWriter handle */ + MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta /* i/o: MASA ext out meta handle to be written */ ); void MasaFileWriter_close( diff --git a/lib_util/mime_io.c b/lib_util/mime_io.c index 36cd61adbb..b5c257bb49 100644 --- a/lib_util/mime_io.c +++ b/lib_util/mime_io.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -30,7 +30,6 @@ *******************************************************************************************************/ -#include "options.h" #include "mime_io.h" #include "mime.h" #include "prot.h" diff --git a/lib_util/mime_io.h b/lib_util/mime_io.h index 770b4dd5e4..91b9160529 100644 --- a/lib_util/mime_io.h +++ b/lib_util/mime_io.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c index b208b7aae4..de8f69292f 100644 --- a/lib_util/render_config_reader.c +++ b/lib_util/render_config_reader.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -33,12 +33,11 @@ #include "render_config_reader.h" #include #include -#include #include #include #include "cmdl_tools.h" #include "prot.h" -#include "ivas_cnst.h" + /*------------------------------------------------------------------------------------------* * PreProc Macros @@ -90,17 +89,17 @@ static int16_t read_bool( if ( sscanf( pLine, "%s", (char *) &value ) != 1 ) { - return true; + return TRUE; } if ( strcmp( value, "TRUE" ) == 0 ) { - *pTarget = true; - return false; + *pTarget = TRUE; + return FALSE; } if ( strcmp( value, "FALSE" ) == 0 ) { - *pTarget = false; - return false; + *pTarget = FALSE; + return FALSE; } return true; @@ -418,7 +417,7 @@ ivas_error RenderConfigReader_read( pValue = (char *) calloc( strlen( pParams ), sizeof( char ) ); while ( sscanf( pParams + params_idx, "%64[^=]=%[^;];", item, pValue ) == 2 ) { - hRenderConfig->room_acoustics.override = true; + hRenderConfig->room_acoustics.override = TRUE; params_idx += (int32_t) ( strlen( item ) + strlen( pValue ) + 2 ); #ifdef DEBUGGING fprintf( stderr, " PARAM: %s -> %s\n", item, pValue ); @@ -582,6 +581,13 @@ ivas_error RenderConfigReader_read( errorHandler( pValue, ERROR_VALUE_INVALID ); } } + else if ( strcmp( item, "DIRECTIVITY" ) == 0 ) + { + if ( read_vector( pValue, 3, hRenderConfig->directivity ) ) + { + errorHandler( item, ERROR_VALUE_INVALID ); + } + } #ifdef DEBUGGING else { diff --git a/lib_util/render_config_reader.h b/lib_util/render_config_reader.h index 1130b43b8c..c2afb92e8b 100644 --- a/lib_util/render_config_reader.h +++ b/lib_util/render_config_reader.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -34,7 +34,6 @@ #define RENDER_CONFIG_READER_H #include "common_api_types.h" -#include "ivas_error.h" typedef struct RenderConfigReader RenderConfigReader; diff --git a/lib_util/rtpdump.c b/lib_util/rtpdump.c index 79a4e43ede..262f114a13 100644 --- a/lib_util/rtpdump.c +++ b/lib_util/rtpdump.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_util/rtpdump.h b/lib_util/rtpdump.h index 3b5cb6b64b..46300c0e9a 100644 --- a/lib_util/rtpdump.h +++ b/lib_util/rtpdump.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_util/split_rend_bfi_file_reader.c b/lib_util/split_rend_bfi_file_reader.c new file mode 100644 index 0000000000..2c1fe4e3b8 --- /dev/null +++ b/lib_util/split_rend_bfi_file_reader.c @@ -0,0 +1,161 @@ +/****************************************************************************************************** + + (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository. All Rights Reserved. + + This software is protected by copyright law and by international treaties. + The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository retain full ownership rights in their respective contributions in + the software. This notice grants no license of any kind, including but not limited to patent + license, nor is any license granted by implication, estoppel or otherwise. + + Contributors are required to enter into the IVAS codec Public Collaboration agreement before making + contributions. + + This software is provided "AS IS", without any express or implied warranties. The software is in the + development stage. It is intended exclusively for experts who have experience with such software and + solely for the purpose of inspection. All implied warranties of non-infringement, merchantability + and fitness for a particular purpose are hereby disclaimed and excluded. + + Any dispute, controversy or claim arising under or in relation to providing this software shall be + submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in + accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and + the United Nations Convention on Contracts on the International Sales of Goods. + +*******************************************************************************************************/ + +#include "split_rend_bfi_file_reader.h" +#include +#include +#include +#include +#include "prot.h" + +struct SplitRendBFIFileReader +{ + FILE *bfiFile; + int32_t frameCounter; + char *file_path; + bool fileRewind; + bool txtfile; +}; + + +/*-----------------------------------------------------------------------* + * SplitRendBFIFileReader_open() + * + * Allocate and initialize Split Renderer Frameloss file reader + *-----------------------------------------------------------------------*/ + +ivas_error SplitRendBFIFileReader_open( + char *bfiFilePath, /* i : frame loss file name */ + SplitRendBFIFileReader **SplitRendBFIReader /* o : SplitRendBFIFileReader handle */ +) +{ + SplitRendBFIFileReader *self; + FILE *bfiFile; + bool txtfile; + + /* Open bfi file */ + if ( strlen( bfiFilePath ) < 1 ) + { + return IVAS_ERR_FAILED_FILE_OPEN; + } + + bfiFile = fopen( bfiFilePath, "r" ); + + if ( !bfiFile ) + { + return IVAS_ERR_FAILED_FILE_OPEN; + } + + txtfile = ( strcmp( bfiFilePath + strlen( bfiFilePath ) - 4, ".txt" ) ? false : true ); + + self = calloc( sizeof( SplitRendBFIFileReader ), 1 ); + self->bfiFile = bfiFile; + self->frameCounter = 0; + self->file_path = calloc( sizeof( char ), strlen( bfiFilePath ) + 1 ); + strcpy( self->file_path, bfiFilePath ); + self->fileRewind = false; + self->txtfile = txtfile; + + *SplitRendBFIReader = self; + + return IVAS_ERR_OK; +} + + +/*-----------------------------------------------------------------------* + * SplitRendBFIFileReading() + * + * Read values from the bfi file + *-----------------------------------------------------------------------*/ + +ivas_error SplitRendBFIFileReading( + SplitRendBFIFileReader *SplitRendBFIReader, /* i/o: SplitRendBFIFileReader handle */ + int16_t *bfi ) +{ + if ( SplitRendBFIReader->txtfile ? 1 != fscanf( SplitRendBFIReader->bfiFile, "%hd", bfi ) : 1 != fread( bfi, sizeof( *bfi ), 1, SplitRendBFIReader->bfiFile ) ) + { + if ( feof( SplitRendBFIReader->bfiFile ) ) + { + rewind( SplitRendBFIReader->bfiFile ); + SplitRendBFIReader->fileRewind = true; + return SplitRendBFIFileReading( SplitRendBFIReader, bfi ); + } + return IVAS_ERR_FAILED_FILE_PARSE; + } + + ( SplitRendBFIReader->frameCounter )++; + + return IVAS_ERR_OK; +} + + +/*-----------------------------------------------------------------------* + * SplitRendBFIationFileReader_close() + * + * Deallocates memory for the Head-Tracking reader + *-----------------------------------------------------------------------*/ + +void SplitRendBFIFileReader_close( + SplitRendBFIFileReader **SplitRendBFIReader /* i/o: SplitRendBFIFileReader handle */ +) +{ + if ( SplitRendBFIReader == NULL || *SplitRendBFIReader == NULL ) + { + return; + } + + fclose( ( *SplitRendBFIReader )->bfiFile ); + free( ( *SplitRendBFIReader )->file_path ); + free( *SplitRendBFIReader ); + *SplitRendBFIReader = NULL; + + return; +} + + +/*-----------------------------------------------------------------------* + * SplitRendBFIFileReader_getFilePath() + * + * + *-----------------------------------------------------------------------*/ + +const char *SplitRendBFIFileReader_getFilePath( + SplitRendBFIFileReader *SplitRendBFIReader /* i/o: SplitRendBFIFileReader handle */ +) +{ + if ( SplitRendBFIReader == NULL ) + { + return NULL; + } + + return SplitRendBFIReader->file_path; +} diff --git a/scripts/ivas_pytests/tests/unit_tests/crend/ivas_crend_unit_test.h b/lib_util/split_rend_bfi_file_reader.h similarity index 72% rename from scripts/ivas_pytests/tests/unit_tests/crend/ivas_crend_unit_test.h rename to lib_util/split_rend_bfi_file_reader.h index c26134aba1..97df1c7fbb 100644 --- a/scripts/ivas_pytests/tests/unit_tests/crend/ivas_crend_unit_test.h +++ b/lib_util/split_rend_bfi_file_reader.h @@ -30,28 +30,31 @@ *******************************************************************************************************/ -/**************************************************************************** -* File description - -* This source file contains definitions specific to IVAS common renderer -****************************************************************************/ +#ifndef IVAS_SR_BFI_FILE_READER_H +#define IVAS_SR_BFI_FILE_READER_H -#ifndef IVAS_CREND_UNIT_TEST_H -#define IVAS_CREND_UNIT_TEST_H +#include "common_api_types.h" +#include "ivas_error.h" -#include "stdio.h" -#include "stdlib.h" -#include "string.h" -#include -#include "ivas_stat_dec.h" -#include "ivas_result_t.h" +typedef struct SplitRendBFIFileReader SplitRendBFIFileReader; -/* Tables */ +ivas_error SplitRendBFIFileReader_open( + char *trajFilePath, /* i : head rotation trajectory file name */ + SplitRendBFIFileReader **SplitRendBFIReader /* o : SplitRendBFIFileReader handle */ +); -extern float ivas_mixer_510_to_510_tc_gain[]; -extern float ivas_mixer_710_to_710_tc_gain[]; -extern float ivas_mixer_510_LFE_to_BIN_tc_gain[]; -extern float ivas_mixer_710_LFE_to_BIN_tc_gain[]; +ivas_error SplitRendBFIFileReading( + SplitRendBFIFileReader *SplitRendBFIReader, /* i/o: SplitRendBFIFileReader handle */ + int16_t *bfi ); +void SplitRendBFIFileReader_close( + SplitRendBFIFileReader **SplitRendBFIReader /* i/o: SplitRendBFIFileReader handle */ +); -#endif /* IVAS_CREND_UNIT_TEST_H */ +const char *SplitRendBFIFileReader_getFilePath( + SplitRendBFIFileReader *SplitRendBFIReader /* i/o: SplitRendBFIFileReader handle */ +); + + +#endif /* IVAS_SR_BFI_FILE_READER_H */ diff --git a/lib_util/split_render_file_read_write.c b/lib_util/split_render_file_read_write.c index 21dc8175f5..57633337a9 100644 --- a/lib_util/split_render_file_read_write.c +++ b/lib_util/split_render_file_read_write.c @@ -68,7 +68,7 @@ ivas_error split_rend_reader_open( SplitFileReadWrite **hhSplitRendFileReadWrite char header[SPLIT_RENDERER_FRAME_HEADER_LEN] = "MAIN_SPLITH"; char header_read[SPLIT_RENDERER_FRAME_HEADER_LEN]; - hSplitRendFileReadWrite = (SplitFileReadWrite *) count_malloc( sizeof( SplitFileReadWrite ) ); + hSplitRendFileReadWrite = (SplitFileReadWrite *) malloc( sizeof( SplitFileReadWrite ) ); hSplitRendFileReadWrite->file = fopen( filename, "rb" ); if ( hSplitRendFileReadWrite->file == NULL ) { @@ -108,7 +108,7 @@ ivas_error split_rend_writer_open( SplitFileReadWrite **hhSplitRendFileReadWrite size_t header_len, h; char header[SPLIT_RENDERER_FRAME_HEADER_LEN] = "MAIN_SPLITH"; - hSplitRendFileReadWrite = (SplitFileReadWrite *) count_malloc( sizeof( SplitFileReadWrite ) ); + hSplitRendFileReadWrite = (SplitFileReadWrite *) malloc( sizeof( SplitFileReadWrite ) ); hSplitRendFileReadWrite->file = fopen( filename, "wb" ); if ( hSplitRendFileReadWrite->file == NULL ) { @@ -142,7 +142,7 @@ ivas_error split_rend_reader_writer_close( SplitFileReadWrite **hhSplitRendFileR fclose( ( *hhSplitRendFileReadWrite )->file ); ( *hhSplitRendFileReadWrite )->file = NULL; } - count_free( *hhSplitRendFileReadWrite ); + free( *hhSplitRendFileReadWrite ); *hhSplitRendFileReadWrite = NULL; } return IVAS_ERR_OK; @@ -214,13 +214,8 @@ ivas_error split_rend_read_bits_from_file( SplitFileReadWrite *hSplitRendFileRea { char header[SPLIT_RENDERER_FRAME_HEADER_LEN] = "SPLIT_FRAME"; char header_read[SPLIT_RENDERER_FRAME_HEADER_LEN]; -#ifdef SPLIT_REND_LC3PLUS - int32_t header_len, i, num_bytes, bit_len; -#else - size_t header_len, i, num_bytes, bit_len; -#endif + int32_t header_len, i, num_bytes, bit_len = 0; - bit_len = 0; if ( hSplitRendFileReadWrite == NULL ) { return IVAS_ERR_FAILED_FILE_READ; @@ -266,6 +261,12 @@ ivas_error split_rend_read_bits_from_file( SplitFileReadWrite *hSplitRendFileRea { return IVAS_ERR_FAILED_FILE_READ; } +#ifdef SPLIT_REND_CLDFB_HUFF_SAN_FIX + for ( i = 0; i < SPLIT_REND_ADDITIONAL_BYTES_TO_READ; i++ ) + { + bits[num_bytes + i] = 0; + } +#endif *bits_read = 0; *bits_written = bit_len; diff --git a/lib_util/tinywavein_c.h b/lib_util/tinywavein_c.h index 1f826a0301..2d9a218934 100644 --- a/lib_util/tinywavein_c.h +++ b/lib_util/tinywavein_c.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_util/tinywaveout_c.h b/lib_util/tinywaveout_c.h index 39cde0d338..d0531eb665 100644 --- a/lib_util/tinywaveout_c.h +++ b/lib_util/tinywaveout_c.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/lib_util/vector3_pair_file_reader.c b/lib_util/vector3_pair_file_reader.c new file mode 100644 index 0000000000..9e03358b91 --- /dev/null +++ b/lib_util/vector3_pair_file_reader.c @@ -0,0 +1,163 @@ +/****************************************************************************************************** + + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository. All Rights Reserved. + + This software is protected by copyright law and by international treaties. + The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository retain full ownership rights in their respective contributions in + the software. This notice grants no license of any kind, including but not limited to patent + license, nor is any license granted by implication, estoppel or otherwise. + + Contributors are required to enter into the IVAS codec Public Collaboration agreement before making + contributions. + + This software is provided "AS IS", without any express or implied warranties. The software is in the + development stage. It is intended exclusively for experts who have experience with such software and + solely for the purpose of inspection. All implied warranties of non-infringement, merchantability + and fitness for a particular purpose are hereby disclaimed and excluded. + + Any dispute, controversy or claim arising under or in relation to providing this software shall be + submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in + accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and + the United Nations Convention on Contracts on the International Sales of Goods. + +*******************************************************************************************************/ + +#include "vector3_pair_file_reader.h" +#include +#include +#include +#include +#include "prot.h" +#include "options.h" /* only included to get access to the feature-defines */ + + +struct Vector3PairFileReader +{ + FILE *trajFile; + char *file_path; +}; + +/*-----------------------------------------------------------------------* + * Vector3PairFileReader_open() + * + * Allocate and initialize reader + *-----------------------------------------------------------------------*/ + +ivas_error Vector3PairFileReader_open( + const char *trajFilePath, /* i : trajectory file name */ + Vector3PairFileReader **vector3PairReader /* o : Vector3PairFileReader handle */ +) +{ + Vector3PairFileReader *self; + FILE *trajFile; + + /* Open trajectory file */ + if ( strlen( trajFilePath ) < 1 ) + { + return IVAS_ERR_FAILED_FILE_OPEN; + } + + trajFile = fopen( trajFilePath, "r" ); + + if ( !trajFile ) + { + return IVAS_ERR_FAILED_FILE_OPEN; + } + + self = calloc( sizeof( Vector3PairFileReader ), 1 ); + self->trajFile = trajFile; + self->file_path = calloc( sizeof( char ), strlen( trajFilePath ) + 1 ); + strcpy( self->file_path, trajFilePath ); + + *vector3PairReader = self; + + return IVAS_ERR_OK; +} + + +/*-----------------------------------------------------------------------* + * Vector3PairFileReader_read() + * + * Read one line of values from the trajectory file + *-----------------------------------------------------------------------*/ + +ivas_error Vector3PairFileReader_read( + Vector3PairFileReader *vector3PairReader, /* i/o: Vector3PairFileReader handle */ + IVAS_VECTOR3 *pFirst, /* o : first x,y,z position in the line */ + IVAS_VECTOR3 *pSecond /* o : second x,y,z position in the line */ +) +{ + float x1, y1, z1, x2, y2, z2; + + if ( vector3PairReader == NULL || pFirst == NULL || pSecond == NULL ) + return IVAS_ERR_UNEXPECTED_NULL_POINTER; + + if ( 6 != fscanf( vector3PairReader->trajFile, "%f,%f,%f,%f,%f,%f", &x1, &y1, &z1, &x2, &y2, &z2 ) ) + { + if ( feof( vector3PairReader->trajFile ) ) + { + rewind( vector3PairReader->trajFile ); + return Vector3PairFileReader_read( vector3PairReader, pFirst, pSecond ); + } + return IVAS_ERR_FAILED_FILE_PARSE; + } + + pFirst->x = x1; + pFirst->y = y1; + pFirst->z = z1; + pSecond->x = x2; + pSecond->y = y2; + pSecond->z = z2; + + return IVAS_ERR_OK; +} + +/*-----------------------------------------------------------------------* + * Vector3PairFileReader_close() + * + * Deallocates memory for the Head-Tracking reader + *-----------------------------------------------------------------------*/ + +void Vector3PairFileReader_close( + Vector3PairFileReader **reader /* i/o: Vector3PairFileReader handle */ +) +{ + if ( reader == NULL || *reader == NULL ) + { + return; + } + + fclose( ( *reader )->trajFile ); + free( ( *reader )->file_path ); + free( *reader ); + *reader = NULL; + + return; +} + + +/*-----------------------------------------------------------------------* + * Vector3PairFileReader_getFilePath() + * + * + *-----------------------------------------------------------------------*/ + +const char *Vector3PairFileReader_getFilePath( + Vector3PairFileReader *reader /* i/o: Vector3PairFileReader handle */ +) +{ + if ( reader == NULL ) + { + return NULL; + } + + return reader->file_path; +} diff --git a/scripts/ivas_pytests/tests/unit_tests/crend/ivas_prox_mix.h b/lib_util/vector3_pair_file_reader.h similarity index 60% rename from scripts/ivas_pytests/tests/unit_tests/crend/ivas_prox_mix.h rename to lib_util/vector3_pair_file_reader.h index 8aa4b57130..4ab687848c 100644 --- a/scripts/ivas_pytests/tests/unit_tests/crend/ivas_prox_mix.h +++ b/lib_util/vector3_pair_file_reader.h @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -30,42 +30,58 @@ *******************************************************************************************************/ +#ifndef IVAS_V3PAIR_FILE_READER_H +#define IVAS_V3PAIR_FILE_READER_H -#ifndef IVAS_PROX_MIX_H -#define IVAS_PROX_MIX_H - -/**************************************************************************** -* File description - -* This header file contains declarations which are common between IVAS -* spatial decoding tools -****************************************************************************/ - -/*------------------------------------------------------------------------------------------* -* include header files -*------------------------------------------------------------------------------------------*/ -#include "stdio.h" -#include "stdlib.h" -#include "string.h" -#include "ivas_stat_dec.h" -#include "ivas_result_t.h" - -/*------------------------------------------------------------------------------------------* -* PreProcessor -*------------------------------------------------------------------------------------------*/ - -/*------------------------------------------------------------------------------------------* - * Global variables - *------------------------------------------------------------------------------------------*/ -#define LOC_BITSTREAM_DELIMITER ( 128 ) -#define MAX_BITSTREAM_LEN ( 128 ) -#define POWER_FACT ( 1.2f ) -#define POWER_SMOOTH_HI ( 0.8f ) -#define POWER_SMOOTH_LO ( 0.95f ) - -/*------------------------------------------------------------------------------------------* - * function declarations - *------------------------------------------------------------------------------------------*/ -ivas_result_t get_users_locations( uint8_t *bitstream, int32_t len, int16_t *userLoc ); -ivas_result_t get_prox_downmix_mixer( int16_t userID, float *pMixer, int16_t *userLoc, int32_t nChan, float ppPcm_in[][L_FRAME48k], int32_t frame_len, float *powvec ); - -#endif +#include "common_api_types.h" +#include "ivas_error.h" +#include "options.h" /* only included to get access to the feature-defines */ + + +typedef struct Vector3PairFileReader Vector3PairFileReader; + +/*-----------------------------------------------------------------------* + * Vector3PairFileReader_open() + * + * Allocate and initialize Head-Tracking handle + *-----------------------------------------------------------------------*/ + +ivas_error Vector3PairFileReader_open( + const char *trajFilePath, /* i : trajectory file name */ + Vector3PairFileReader **vector3PairReader /* o : Vector3PairFileReader handle */ +); + +/*-----------------------------------------------------------------------* + * Vector3PairFileReader_read() + * + * Read one line of values from the trajectory file + *-----------------------------------------------------------------------*/ + +ivas_error Vector3PairFileReader_read( + Vector3PairFileReader *vector3PairReader, /* i/o: Vector3PairFileReader handle */ + IVAS_VECTOR3 *pFirst, /* o : first x,y,z position in the line */ + IVAS_VECTOR3 *pSecond /* o : second x,y,z position in the line */ +); + +/*-----------------------------------------------------------------------* + * Vector3PairFileReader_close() + * + * Deallocates memory for the handle + *-----------------------------------------------------------------------*/ + +void Vector3PairFileReader_close( + Vector3PairFileReader **vector3PairReader /* i/o: Vector3PairFileReader handle */ +); + +/*-----------------------------------------------------------------------* + * Vector3PairFileReader_getFilePath() + * + * + *-----------------------------------------------------------------------*/ + +const char *Vector3PairFileReader_getFilePath( + Vector3PairFileReader *vector3PairReader /* i/o: Vector3PairFileReader handle */ +); + + +#endif /* IVAS_V3PAIR_FILE_READER_H */ diff --git a/readme.txt b/readme.txt index 86e223b32c..c566c78ea2 100644 --- a/readme.txt +++ b/readme.txt @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -160,8 +160,13 @@ R : Bitrate in bps, *VBR mode (average bitrate), for AMR-WB IO modes R = (6600, 8850, 12650, 14250, 15850, 18250, 19850, 23050, 23850) - for IVAS stereo & ISm R =(13200, 16400, 24400, 32000, 48000, 64000, 80000, - 96000, 128000, 160000, 192000, 256000) + for IVAS stereo R = (13200, 16400, 24400, 32000, 48000, 64000, 80000, + 96000, 128000, 160000, 192000, 256000) + for IVAS ISM R = 13200 for 1 ISM, 16400 for 1 ISM and 2 ISM, + (24400, 32000, 48000, 64000, 80000, 96000, 128000) + for 2 ISM, 3 ISM and 4 ISM also 160000, 192000, 256000 + for 3 ISM and 4 ISM also 384000 + for 4 ISM also 512000 for IVAS SBA, MASA, MC R=(13200, 16400, 24400, 32000, 48000, 64000, 80000, 96000, 128000, 160000, 192000, 256000, 384000, 512000) Alternatively, R can be a bitrate switching file which consists of R values @@ -176,16 +181,16 @@ Options: EVS mono is default, for IVAS choose one of the following: -stereo, -ism, -sba, -masa, -mc -stereo [Mode] : Stereo format, default is unified stereo optional for Mode: 1: DFT Stereo, 2: TD Stereo, 3: MDCT Stereo --ism Channels Files : ISm format - where Channels specifies the number of ISms (1-4) +-ism Channels Files : ISM format + where Channels specifies the number of ISMs (1-4) and Files specify input files containing metadata, one file per object (use NULL for no input metadata) -sba +/-Order : Scene Based Audio input format (Ambisonics ACN/SN3D), where Order specifies the Ambisionics order (1-3), where positive (+) means full 3D and negative (-) only 2D/planar components to be coded --masa Ch File : MASA format - where Ch specifies the number of input/transport channels (1 or 2): - and File specifies input file containing parametric metadata +-masa Channels File : MASA format + where Channels specifies the number of input/transport channels (1 or 2): + and File specifies input file containing parametric MASA metadata -mc InputConf : Multi-channel format where InputConf specifies the channel configuration: 5_1, 7_1, 5_1_2, 5_1_4, 7_1_4 Loudspeaker positions are assumed to have azimuth and elevation as per @@ -195,8 +200,7 @@ EVS mono is default, for IVAS choose one of the following: -stereo, -ism, -sba, where 0 = adaptive, 3-100 = fixed in number of frames, default is deactivated -dtx : Activate DTX mode with a SID update rate of 8 frames - Note: DTX is currently supported in EVS, stereo, 1 ISm, - SBA (up to 128kbps) and MASA (up to 128kbps) + Note: DTX is supported in EVS, stereo, ISM, SBA up to 80kbps and MASA up to 128kbps -rf p o : Activate channel-aware mode for WB and SWB signal at 13.2kbps, where FEC indicator, p: LO or HI, and FEC offset, o: 2, 3, 5, or 7 in number of frames. Alternatively p and o can be replaced by a rf configuration file with each line @@ -251,22 +255,26 @@ Options: Format files, the magic word in the mime file is used to determine which of the two supported formats is in use. default bitstream file format is G.192 --T File : Head rotation specified by external trajectory File -hrtf File : HRTF filter File used in ISm format and BINAURAL output configuration --force_subframe_bin : Forces parametric binauralizer code to use 5 ms time resolution even when - output time resolution is larger. +-T File : Head rotation specified by external trajectory File +-otr tracking_type : Head orientation tracking type: 'none', 'ref', 'avg', 'ref_vec' + or 'ref_vec_lev' (only for binaural rendering) +-rf File : Reference rotation specified by external trajectory file + works only in combination with '-otr ref' mode +-rvf File : Reference vector specified by external trajectory file + works only in combination with '-otr ref_vec' and 'ref_vec_lev' modes +-render_config File : Renderer configuration option File +-no_diegetic_pan : panning mono non-diegetic sound to stereo -1<= pan <=1, + left or l or 1->left, right or r or -1->right, center or c or 0->middle +-q : Quiet mode, no frame counter + default is deactivated -FEC X : Insert frame erasures, X = 0-10 is the percentage of erased frames, or X may be the name of binary file or file with G192 headers indicating GOOD FRAME or BAD FRAME containing FEC pattern (short values of 0 (good) or 1 (bad)) default is OFF, if this option is not used -force R : Force specific binaural rendering mode, R = (TDREND, CLDFBREND), --otr tracking_type : head orientation tracking type: 'ref' or 'avg' (only for binaural rendering) --render_config File : Renderer configuration option File --no_diegetic_pan : panning mono no dietic sound to stereo -1<= pan <=1, - left or l or 1->left, right or r or -1->right, center or c or 0->middle --q : Quiet mode, no frame counter - default is deactivated + MULTICHANNEL LOUDSPEAKER INPUT / OUTPUT CONFIGURATIONS @@ -294,6 +302,7 @@ The output channel ordering is 0, 1, ... N-1. The third row contains an index "L specifying the output channel to which the LFE input will be routed if present. If the third row is omitted, the LFE input is downmixed to all channels with a factor of 1/N. Position is not considered for the LFE channel. +An example custom loudspeaker layout file is available: ls_setup_16ch_8+4+4.txt @@ -308,55 +317,56 @@ points or complete coverage. Documentation on the self_test.py can be found as a part of scripts/README.md. -Note: Running the self_test.py requires the input vectors in the folder scripts/testv. The -audio files could unfortunately not be shared, and they need to be replaced in order to -run the self_test.py. To complement the test vector set, please replace the empty *.pcm-files -in the self_test folder with 16 bit PCM files following the specification below. - -stv1ISM48s.pcm - 1 channel (1 audio object), 48000 Hz, 1440000 samples -stv2ISM48s.pcm - 2 channels (discrete audio objects), 48000 Hz, 1440000 samples per channel -stv2OA32c.pcm - 9 channels (2nd order Ambisonics ACN/SN3D), 32000 Hz -stv2OA48c.pcm - 9 channels (2nd order Ambisonics ACN/SN3D), 48000 Hz -stv3ISM48s.pcm - 3 channels (discrete audio objects), 48000 Hz, 1440000 samples per channel -stv3OA32c.pcm - 16 channels (3rd order Ambisonics ACN/SN3D), 32000 Hz, 288939 samples per channel -stv3OA48c.pcm - 16 channels (3rd order Ambisonics ACN/SN3D), 48000 Hz, 433408 samples per channel -stv4ISM48s.pcm - 4 channel (discrete audio objects), 48000 Hz, 1440000 samples per channel -stv8c.pcm - 1 channel, 8000 Hz, clean speech/audio -stv8n.pcm - 1 channel, 8000 Hz, noisy speech -stv16c.pcm - 1 channel, 16000 Hz, 610307 samples, clean speech -stv16n.pcm - 1 channel, 16000 Hz, 257024 samples, noisy speech -stv32c.pcm - 1 channel, 32000 Hz, 1220613 samples, clean speech/audio -stv32n.pcm - 1 channel, 32000 Hz, 514048 samples, noisy speech -stv48c.pcm - 1 channel, 48000 Hz, 1830919 samples, clean speech/audio -stv51MC48c.pcm - 6 channels (5.1 1..6 where 4th channel is LFE), 3231233 samples per channel, 48000 Hz, movie excerpt -stv512MC48c.pcm - 8 channels (5.1+2 1..8 where 4th channel is LFE), 144000 samples per channel, 48000 Hz, movie excerpt -stv714MC48c.pcm - 12 channels (7.1+4 1..12 where 4th channel is LFE), 144000 samples per channel, 48000 Hz, movie excerpt -stvFOA16c.pcm - 4 channels (1st order Ambisonics ACN/SN3D), 16000 Hz, -stvFOA32c.pcm - 4 channels (1st order Ambisonics ACN/SN3D), 32000 Hz, 288939 samples per channel -stvFOA48c.pcm - 4 channels (1st order Ambisonics ACN/SN3D), 48000 Hz, 433408 samples per channel -stvST16c.pcm - 2 channels, 16000 Hz, 329601 samples per channel, clean speech/audio -stvST16n.pcm - 2 channels, 16000 Hz, 310401 samples per channel, noisy speech -stvST32c.pcm - 2 channels, 32000 Hz, 659200 samples per channel, clean speech/audio -stvST32n.pcm - 2 channels, 32000 Hz, 620800 samples per channel, noisy speech -stvST48c.pcm - 2 channels, 48000 Hz, 988800 samples per channel, clean speech/audio -stvST48n.pcm - 2 channels, 48000 Hz, 931200 samples per channel, noisy speech -stv_IVASMASA_1dir1TC.pcm - 1 channel (1 MASA transport channel), 48000 Hz, 48000 Hz, 144000 samples -stv_IVASMASA_1dir1TC_DTX.pcm - 1 channel (1 MASA transport channel), 48000 Hz, 48000 Hz, 963840 samples -stv_IVASMASA_1dir2TC.pcm - 2 channels (2 MASA transport channel), 48000 Hz, 48000 Hz, 288000 samples per channel -stv_IVASMASA_1dir2TC_DTX.pcm - 2 channels (2 MASA transport channel), 48000 Hz, 48000 Hz, 963840 samples per channel -stv_IVASMASA_2dir1TC.pcm - 1 channel (1 MASA transport channel), 48000 Hz, 48000 Hz, 288000 -stv_IVASMASA_2dir2TC.pcm - 2 channels (2 MASA transport channel), 48000 Hz, 48000 Hz, 144000 samples per channel +Note: Running the self_test.py requires the input vectors in the folder scripts/testv. + +stv1ISM48s.wav - 1 channel (1 audio object), 48000 Hz, 1440000 samples +stv2ISM48s.wav - 2 channels (discrete audio objects), 48000 Hz, 1440000 samples per channel +stv2OA32c.wav - 9 channels (2nd order Ambisonics ACN/SN3D), 32000 Hz +stv2OA48c.wav - 9 channels (2nd order Ambisonics ACN/SN3D), 48000 Hz +stv3ISM48s.wav - 3 channels (discrete audio objects), 48000 Hz, 1440000 samples per channel +stv3OA32c.wav - 16 channels (3rd order Ambisonics ACN/SN3D), 32000 Hz, 288939 samples per channel +stv3OA48c.wav - 16 channels (3rd order Ambisonics ACN/SN3D), 48000 Hz, 433408 samples per channel +stv4ISM48s.wav - 4 channel (discrete audio objects), 48000 Hz, 1440000 samples per channel +stv4ISM48n.wav - 4 channel (discrete audio objects), 48000 Hz, noisy speech +stv8c.wav - 1 channel, 8000 Hz, clean speech/audio +stv8n.wav - 1 channel, 8000 Hz, noisy speech +stv16c.wav - 1 channel, 16000 Hz, 610307 samples, clean speech +stv16n.wav - 1 channel, 16000 Hz, 257024 samples, noisy speech +stv32c.wav - 1 channel, 32000 Hz, 1220613 samples, clean speech/audio +stv32n.wav - 1 channel, 32000 Hz, 514048 samples, noisy speech +stv48c.wav - 1 channel, 48000 Hz, 960000 samples, clean speech/audio +stv48n.wav - 1 channel, 48000 Hz, 931200 samples, noisy clean speech +stv51MC48c.wav - 6 channels (5.1 1..6 where 4th channel is LFE), 960000 samples per channel, 48000 Hz +stv512MC48c.wav - 8 channels (5.1+2 1..8 where 4th channel is LFE), 144000 samples per channel, 48000 Hz +stv514MC48c.wav - 10 channels (7.1+2 1..10 where 4th channel is LFE), 144000 samples per channel, 48000 Hz +stv71MC48c.wav - 8 channels (7.1 1..8 where 4th channel is LFE), 144000 samples per channel, 48000 Hz +stv714MC48c.wav - 12 channels (7.1+4 1..12 where 4th channel is LFE), 144000 samples per channel, 48000 Hz +stvFOA16c.wav - 4 channels (1st order Ambisonics ACN/SN3D), 16000 Hz, +stvFOA32c.wav - 4 channels (1st order Ambisonics ACN/SN3D), 32000 Hz, 288939 samples per channel +stvFOA48c.wav - 4 channels (1st order Ambisonics ACN/SN3D), 48000 Hz, 433408 samples per channel +stvST16c.wav - 2 channels, 16000 Hz, 329601 samples per channel, clean speech/audio +stvST16n.wav - 2 channels, 16000 Hz, 310401 samples per channel, noisy speech +stvST32c.wav - 2 channels, 32000 Hz, 659200 samples per channel, clean speech/audio +stvST32n.wav - 2 channels, 32000 Hz, 620800 samples per channel, noisy speech +stvST48c.wav - 2 channels, 48000 Hz, 988800 samples per channel, clean speech/audio +stvST48n.wav - 2 channels, 48000 Hz, 931200 samples per channel, noisy speech +stv1MASA1TC48c.wav - 1 channel (1 MASA transport channel), 48000 Hz, 48000 Hz, 144000 samples +stv1MASA1TC48n.wav - 1 channel (1 MASA transport channel), 48000 Hz, 48000 Hz, 963840 samples +stv1MASA2TC48c.wav - 2 channels (2 MASA transport channel), 48000 Hz, 48000 Hz, 288000 samples per channel +stv1MASA2TC48n.wav - 2 channels (2 MASA transport channel), 48000 Hz, 48000 Hz, 963840 samples per channel +stv2MASA1TC48c.wav - 1 channel (1 MASA transport channel), 48000 Hz, 48000 Hz, 288000 +stv2MASA2TC48c.wav - 2 channels (2 MASA transport channel), 48000 Hz, 48000 Hz, 144000 samples per channel For the MASA operation modes, in addition the following metadata files are required: -stv_IVASMASA_1dir1TC.met -stv_IVASMASA_1dir1TC_DTX.met -stv_IVASMASA_1dir2TC.met -stv_IVASMASA_1dir2TC_DTX.met -stv_IVASMASA_2dir1TC.met -stv_IVASMASA_2dir2TC.met +stv1MASA1TC48c.met +stv1MASA1TC48n.met +stv1MASA2TC48c.met +stv1MASA2TC48n.met +stv2MASA1TC48c.met +stv2MASA2TC48c.met It is strongly recommended to align these files to the corresponding PCM audio files. The MASA metadata files can be generated with the @@ -374,23 +384,37 @@ stvISM4.csv These are comma separated files (csv) which indicate the per object position in the format: -frame index, azimuth, elevation, distance (unit circle), spread, gain +frame azimuth, elevation, distance (unit circle), spread, gain with the following meaning: | Parameter | format, value range | meaning ----------------------------------------------------------------------- -| frame index | int, [0, INT_MAX] | associated IVAS frame ----------------------------------------------------------------------- +----------------------------------------------------------------------------------- | azimuth | float, [-180,180[ | azimuth; positive indicates left ----------------------------------------------------------------------- +----------------------------------------------------------------------------------- | elevation | float, [-90,90] | elevation; positive indicates up ----------------------------------------------------------------------- -| distance | float, tbd | default: 0 ----------------------------------------------------------------------- -| spread | float, [0,360] | spread in angles from 0 ... 360ø ----------------------------------------------------------------------- -| gain | float, [0,1] | gain ----------------------------------------------------------------------- +----------------------------------------------------------------------------------- +| distance | float, tbd | distance; default: 1 +----------------------------------------------------------------------------------- +| spread | float, [0,360] | spread in angles from 0...360 deg; default: 0 +----------------------------------------------------------------------------------- +| gain | float, [0,1] | gain; default: 1 +----------------------------------------------------------------------------------- + + +For the Head rotation operation modes, external trajectory files are available: + +headrot.csv +headrot_case00_3000_q.csv +headrot_case01_3000_q.csv +headrot_case02_3000_q.csv +headrot_case03_3000_q.csv + + +For the Renderer configuration option operation modes, external configuration files are available: + +rend_config_hospital_patientroom.cfg +config_recreation.cfg +config_renderer.cfg ADDITIONAL SCRIPTS diff --git a/scripts/IvasBuildAndRun.py b/scripts/IvasBuildAndRun.py index 9053d55291..554c216b18 100755 --- a/scripts/IvasBuildAndRun.py +++ b/scripts/IvasBuildAndRun.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/IvasBuildAndRunChecks.py b/scripts/IvasBuildAndRunChecks.py index 0b2a2932c0..f32ade7773 100755 --- a/scripts/IvasBuildAndRunChecks.py +++ b/scripts/IvasBuildAndRunChecks.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/README.md b/scripts/README.md index 57084e1bdf..fec54ffeac 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -1,6 +1,6 @@ Find all rows which are constant (sum of abs diff is zero). The >0 is -% to limit the reordering to constant values only. -[~,indx] = sort(sum(abs(diff(mem,[],2)),2)>0); -mem = mem(indx,:); -names = names(indx); - -bar(mem',1,'stacked') -legend(names,'location','eastoutside','interpreter','none') -xlabel('frame') -ylabel('memory size') \ No newline at end of file diff --git a/scripts/mem_analysis.py b/scripts/mem_analysis.py new file mode 100644 index 0000000000..fa2030c033 --- /dev/null +++ b/scripts/mem_analysis.py @@ -0,0 +1,110 @@ +#!/usr/bin/env python3 + +import os +import argparse +import csv +import sys +import struct +import numpy as np +import pandas as pd +import matplotlib.pyplot as plt + +# set matplotlib in interactive mode (plots figure and return control) +# plt.ion() +# plt.close('all') + +parser = argparse.ArgumentParser(description='Analyze memory output file') +parser.add_argument('input',type=str,help='Memory analysis file (e.g. mem_analysis.csv)') +args = parser.parse_args() +fileIn = args.input + +# read input .csv file +df = pd.read_csv(fileIn, header=None, names=['action_type', 'frame', 'name', 'line_no', 'mem_size']) +Nframes = max(df['frame']) + +# merge identical memory blocks -> create new column 'count' +df = df.groupby(df.columns.tolist(),as_index=False).size() +df = df.rename(columns={'size': 'count'}) + +# remove column 'action_type' +df.drop(columns = ['action_type']) + +# merge records with the same signature but different frame number -> create list of frames (sort in ascending order) +df = df.groupby(['name', 'line_no', 'mem_size', 'count'],as_index=False).agg({'frame': list}) +df['frame'] = df['frame'].apply(np.sort) +df['list_len'] = df['frame'].apply(len) # auxiliary column -> length of the list + +# merge records with the same name and frame but different line number -> sum memory sizes and counts +df = df.groupby(['name', 'list_len'],as_index=False).agg({'line_no': list, 'mem_size': sum, 'count':sum, 'frame':'first'}) + +# sort by memory size (put inter-frame memory blocks to the bottom) +select_inter = (df['list_len'] == 2) & (df.apply(lambda row : row['frame'][-1] - row['frame'][0], axis = 1) >= Nframes) +df_inter = df[select_inter] +df_inter = df_inter.sort_values(by=['mem_size'], ascending=False) +df_intra = df[~select_inter] +df_intra = df_intra.sort_values(by=['list_len'], ascending=True) + +# plot inter-frame memory blocks in horizontal bar graph (use .broken_barh method) +fig, ax = plt.subplots() +colors = iter(plt.cm.rainbow(np.linspace(0, 1, len(df.index)))) +y_ticks = [] +y_tick_labels = [] +y_low = 1 +for index, row in df_inter.iterrows(): + l = f"{row['name']} on lines: {row['line_no']}, total memory size: {row['count']}x{row['mem_size']}" + fms = row['frame'].reshape((-1,2)) # convert frame numbers to two-column format + fms[:,1] -= fms[:,0] # second column should now represent the duration of the segment + fmsT = fms.T + fms_list = list(zip(fmsT[0], fmsT[1])) + c = next(colors) + ax.broken_barh(xranges=fms_list, yrange=(y_low, row['count']), label=l, color=c) + y_ticks.append(y_low + 0.5 * row['count']) + y_tick_labels.append(row['name']) + y_low += row['count'] + 0.5 + print(l + f", {row['count'] * fms.shape[0]/Nframes:.3f} mallocs per frame") + +# plot intra-frame memory blocks in horizontal bar graph (use .broken_barh method) +df_intra = df_intra.groupby(['name'],as_index=False).agg({'list_len': list, 'line_no': list, 'mem_size': list, 'count': list, 'frame': list}) +for index, row in df_intra.iterrows(): + # repeat for all grouped memory records in the row + for j in range(len(row['list_len'])): + l = f"{row['name']} on lines: {row['line_no'][j]}, total memory size: {row['count'][j]}x{row['mem_size'][j]}" + fms = row['frame'][j].astype(float).reshape((-1,2)) # convert frame numbers to two-column format + fms[:,1] -= fms[:,0] # second column should now represent the duration of the segment + idx_zero = fms[:,1] == 0 # find zero-length segments -> these are intra-frame memory blocks + fms[idx_zero, 0] += 0.1 + fms[idx_zero, 1] = 0.8 + fmsT = fms.T + fms_list = list(zip(fmsT[0], fmsT[1])) + c = next(colors) + ax.broken_barh(xranges=fms_list, yrange=(y_low, row['count'][j]), label=l, color=c, alpha=0.6) + print(l + f", {row['count'][j] * fms.shape[0]/Nframes:.3f} mallocs per frame") + y_ticks.append(y_low + 0.5 * max(row['count'])) + y_tick_labels.append(row['name']) + y_low += max(row['count']) + 0.5 + +ax.set_yticks(y_ticks) +ax.set_yticklabels(y_tick_labels) +ax.set_ylabel('Memory size') +ax.set_xlabel('Frame') +ax.set_title('Memory analysis') + +# shrink current axis's height by 20% on the bottom to fit the legend +box = ax.get_position() +ax.set_position([box.x0, box.y0 + box.height * 0.2, box.width, box.height * 0.8]) + +# insert the legend below the graph +ax.legend(loc="upper left", bbox_to_anchor=(0, -0.1), ncol=2, borderaxespad=0, fontsize='small') + +# magnify to "almost" fullscreen size (select the alternative for your backend) +fig = plt.gcf() +fig.set_size_inches(15, 9) # we need to set the size manually, otherwise savefig will save the figure in the default size +mng = plt.get_current_fig_manager() +mng.full_screen_toggle() +# mng.frame.Maximize(True) +# mng.window.showMaximized() +# mng.window.state('zoomed') + +# show and save the figure (use block=True to wait until Figure is closed manually) +plt.savefig(os.path.splitext(args.input)[0] + '.png', dpi=100, bbox_inches='tight') +plt.show(block=True) diff --git a/scripts/parse_options_h.sh b/scripts/parse_options_h.sh index 452e87f9b8..0c90faefc0 100755 --- a/scripts/parse_options_h.sh +++ b/scripts/parse_options_h.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +# (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, # Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., # Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, # Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/parse_selftest_summary.py b/scripts/parse_selftest_summary.py index 17ac7678f4..56b36a20c4 100755 --- a/scripts/parse_selftest_summary.py +++ b/scripts/parse_selftest_summary.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/plot_meta_data.py b/scripts/plot_meta_data.py index 62727f46db..f104337e01 100755 --- a/scripts/plot_meta_data.py +++ b/scripts/plot_meta_data.py @@ -2,7 +2,7 @@ __license__ = \ """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/prepare_instrumentation.sh b/scripts/prepare_instrumentation.sh index d9fab685ea..67a249ccce 100755 --- a/scripts/prepare_instrumentation.sh +++ b/scripts/prepare_instrumentation.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +# (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, # Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., # Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, # Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -30,13 +30,9 @@ # the United Nations Convention on Contracts on the International Sales of Goods. # -emulator="" system=`uname -s` if [[ ($system == "Linux") && (`uname -a` =~ (microsoft|Microsoft|wsl|WSL) ) ]]; then - system="WSL" -fi -if [[ ($system == "Linux") || ($system == "Darwin") ]]; then - emulator="wine" + system="Linux" fi coan_exists () { @@ -69,6 +65,7 @@ mkdir $targetdir cp -R ../lib_* $targetdir cp -R ../apps $targetdir cp -R ../Makefile $targetdir +cp -R ../CMakeLists.txt $targetdir # TODO(sgi): Remove once Make is also supported with LC3plus cp -R ../Workspace_msvc $targetdir # back up #ifdef-list @@ -88,26 +85,34 @@ if [ $? -ne 0 ]; then exit -1 fi -# strip switches, to remove the macros +# strip switches, to remove the macros (turn on extended globing to allow !(pattern*) matching) +shopt -s extglob if coan_exists; then - coan source --replace --no-transients -E -K --file $ifdef_list $targetdir/lib_{com,dec,enc,rend,util,debug}/*.[hc] + # remove WMOPS and MEM_COUNT_DETAILS from the list to preserve the options in the instrumented code + sed -i "/-DWMOPS/d" $ifdef_list + sed -i "/-UMEM_COUNT_DETAILS/d" $ifdef_list + + coan source --replace --no-transients -E -K --file $ifdef_list $targetdir/lib_{com,dec,enc,rend,util,debug}/!(wmc_auto*).[hc] coan source --replace --no-transients -E -K --file $ifdef_list $targetdir/apps/*.[hc] else ./strip_defines_cppp.sh $targetdir $ifdef_list fi +shopt -u extglob # patch code before wmc_tool: replace hexadecimal unsigned long constants (0x...UL) by regular integer constant + cast to unsigned long find $targetdir -name "*.[ch]" -exec sed -i.bak -e "s/\(0x[0-9a-fA-F]*\)UL/\(\(unsigned long\)\1\)/" \{\} \; -# run wmc_tool using wine -${emulator} ./wmc_tool.exe $targetdir/lib_enc/*.c /ic /op > /dev/null -${emulator} ./wmc_tool.exe $targetdir/lib_com/*.c /ic /op > /dev/null -${emulator} ./wmc_tool.exe $targetdir/lib_dec/*.c /ic /op > /dev/null -${emulator} ./wmc_tool.exe $targetdir/lib_rend/*.c /ic /op > /dev/null +# TODO(sgi): Update LC3plus paths +lc3plus_main_dir="lib_rend/lc3plus_codec/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/*.c" +lc3plus_fft_dir="lib_rend/lc3plus_codec/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point/fft/*.c" + +# run wmc_tool +"tools/$system/wmc_tool" -m "$targetdir/apps/encoder.c" "$targetdir/lib_enc/*.c" "$targetdir/lib_com/*.c" >> /dev/null +"tools/$system/wmc_tool" -m "$targetdir/apps/decoder.c" "$targetdir/lib_dec/*.c" "$targetdir/lib_rend/*.c" "$targetdir/$lc3plus_main_dir" "$targetdir/$lc3plus_fft_dir" >> /dev/null # automatically enable #define WMOPS in options.h -sed -i.bak -e "s/\/\*\s*\(#define\s*WMOPS\)\s*\*\//\1/g" $targetdir/lib_com/options.h -sed -i.bak -e "s/\/\/\s*\(#define\s*WMOPS\)/\1/g" $targetdir/lib_com/options.h +sed -i.bak -e "s/\/\*[[:space:]]*\(#define[[:space:]]*WMOPS\)[[:space:]]*\*\//\1/g" $targetdir/lib_com/options.h +sed -i.bak -e "s/\/\/[[:space:]]*\(#define[[:space:]]*WMOPS\)/\1/g" $targetdir/lib_com/options.h # return to start dir cd "$currdir" diff --git a/scripts/prepare_mem_dryrun.py b/scripts/prepare_mem_dryrun.py new file mode 100755 index 0000000000..b83018e468 --- /dev/null +++ b/scripts/prepare_mem_dryrun.py @@ -0,0 +1,29 @@ +#!/usr/bin/env python3 + +import re, os, fnmatch + +sub = ['free','malloc','calloc'] +dirs = ['./lib_com','./lib_enc','./lib_dec','./lib_rend'] +suffix = '*.c' + +skip = 0 + +for d in dirs: + print(d) + for path, ds, files in os.walk(d): + for filename in fnmatch.filter(files, suffix): + fileIn = os.path.join(path, filename) + with open(fileIn, 'r') as f_in: + lines = f_in.readlines() + with open(fileIn, 'w') as f_out: + for line in lines: + if re.search(r'#define\W+WMC_TOOL_SKIP', line): + skip = 1 + elif re.search(r'#undef\W+WMC_TOOL_SKIP', line): + skip = 0 + else: + if not skip: + for s in sub: + line = re.sub(r'\b%s\b' % (s), '%s' % (s+'_'), line) + f_out.write(line) + diff --git a/scripts/pyaudio3dtools/__init__.py b/scripts/pyaudio3dtools/__init__.py index fa204bae82..9870fb6620 100644 --- a/scripts/pyaudio3dtools/__init__.py +++ b/scripts/pyaudio3dtools/__init__.py @@ -1,5 +1,5 @@ """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/pyaudio3dtools/audio3dtools.py b/scripts/pyaudio3dtools/audio3dtools.py index c2b1ff46d1..e6c03d7b73 100755 --- a/scripts/pyaudio3dtools/audio3dtools.py +++ b/scripts/pyaudio3dtools/audio3dtools.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -194,6 +194,10 @@ def main(): handlers=[console_handler], ) logger.info("Audio3DTools") + logger.info( + "Attention: you are using an older version of the pyaudio3dtools scripts (not including ISM-> binaural reference renderer or loudness tool)" + ) + logger.info("For the newest version see branch python_scripts_updates") if args.list is True or args.long is True: logger.info("===Supported spatial audio formats===") diff --git a/scripts/pyaudio3dtools/audioarray.py b/scripts/pyaudio3dtools/audioarray.py index 917cdf59c6..87fc50b463 100644 --- a/scripts/pyaudio3dtools/audioarray.py +++ b/scripts/pyaudio3dtools/audioarray.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -221,7 +221,7 @@ def cut(x: np.ndarray, limits: Tuple[int, int]) -> np.ndarray: return y -def compare(ref: np.ndarray, test: np.ndarray, fs: int) -> dict: +def compare(ref: np.ndarray, test: np.ndarray, fs: int, per_frame: bool=True) -> dict: """Compare two audio arrays Parameters @@ -246,12 +246,17 @@ def compare(ref: np.ndarray, test: np.ndarray, fs: int) -> dict: "max_abs_diff": 0, "max_abs_diff_pos_sample": 0, "max_abs_diff_pos_channel": 0, - "max_abs_diff_pos_frame": 0, "nsamples_diff": 0, "nsamples_diff_percentage": 0.0, - "nframes_diff": 0, - "nframes_diff_percentage": 0.0, + "first_diff_pos_sample": -1, + "first_diff_pos_channel": -1, + "first_diff_pos_frame": -1 } + if per_frame: + result["max_abs_diff_pos_frame"] = 0 + result["nframes_diff"] = 0 + result["nframes_diff_percentage"] = 0.0 + if max_diff != 0: if diff.ndim == 1: nsamples_total = diff.shape @@ -264,25 +269,40 @@ def compare(ref: np.ndarray, test: np.ndarray, fs: int) -> dict: max_diff_pos[0][0] // framesize, max_diff_pos[1][0], ] + + first_diff_pos = np.nonzero(diff) + first_diff_pos = [ + first_diff_pos[0][0], + first_diff_pos[0][0] // framesize, + first_diff_pos[1][0], + ] + nsamples_diff = np.nonzero(diff)[0].size nsamples_diff_percentage = nsamples_diff / (nsamples_total * nchannels) * 100.0 nframes = nsamples_total // framesize nframes_diff = 0 - for fr in range(nframes): - diff_fr = diff[fr * framesize : ((fr + 1) * framesize), :] - nframes_diff += 1 if diff_fr.nonzero()[0].size > 0 else 0 - nframes_diff_percentage = nframes_diff / nframes * 100.0 + result = { "bitexact": False, "max_abs_diff": max_diff, "max_abs_diff_pos_sample": max_diff_pos[0], "max_abs_diff_pos_channel": max_diff_pos[2], - "max_abs_diff_pos_frame": max_diff_pos[1], "nsamples_diff": nsamples_diff, "nsamples_diff_percentage": nsamples_diff_percentage, - "nframes_diff": nframes_diff, - "nframes_diff_percentage": nframes_diff_percentage, + "first_diff_pos_sample": first_diff_pos[0], + "first_diff_pos_channel": first_diff_pos[2], + "first_diff_pos_frame": first_diff_pos[1], } + + if per_frame: + for fr in range(nframes): + diff_fr = diff[fr * framesize : ((fr + 1) * framesize), :] + nframes_diff += 1 if diff_fr.nonzero()[0].size > 0 else 0 + nframes_diff_percentage = nframes_diff / nframes * 100.0 + result["max_abs_diff_pos_frame"] = max_diff_pos[1] + result["nframes_diff"] = nframes_diff + result["nframes_diff_percentage"] = nframes_diff_percentage + return result diff --git a/scripts/pyaudio3dtools/audiofile.py b/scripts/pyaudio3dtools/audiofile.py index b03b472ae9..77be42285f 100644 --- a/scripts/pyaudio3dtools/audiofile.py +++ b/scripts/pyaudio3dtools/audiofile.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -109,7 +109,7 @@ def writefile(filename: str, x: np.ndarray, fs: int = 48000) -> None: filename: str Output file path (.pcm or .wav) x: np array - Numpy 2D array of dimension: number of channels x number of samples + Numpy 2D array of dimension: number of samples x number of channels fs: Optional[int] Output sampling rate, required for .pcm input file, otherwise default = 48000 (Hz) @@ -764,3 +764,46 @@ def get_wav_file_info(filename: str) -> dict: "ext_param_size": ext_param_size, "ext_param": ext_param, } + + +if __name__ == "__main__": + import argparse + + parser = argparse.ArgumentParser(description="Tool for basic operations on audio files") + subparsers = parser.add_subparsers() + + def pre_trim_wrapper(pre_trim_args): + if pre_trim_args.input_file.endswith(".wav"): + input_file_properties = get_wav_file_info(pre_trim_args.input_file) + else: + print("Delay currently only supported with WAV file input") + exit(-1) + + x, _ = readfile(pre_trim_args.input_file, fs=input_file_properties["fs"], nchannels=input_file_properties["channels"]) + trim = int(pre_trim_args.amount_in_ms * input_file_properties["fs"] / 1000) + x = x[trim:] + writefile(pre_trim_args.output_file, x, fs=input_file_properties["fs"]) + + + parser_delay = subparsers.add_parser("pre-trim", help="Trim a given amount of content from the beginning of the file") + parser_delay.add_argument("amount_in_ms", type=float, help="Trim amount milliseconds.") + parser_delay.add_argument("input_file") + parser_delay.add_argument("output_file") + parser_delay.set_defaults(func=pre_trim_wrapper) + + def convert_wrapper(convert_args): + if not convert_args.input_file.endswith(".wav"): + print("Convert currently only supported with WAV file input") + exit(-1) + + convertfile(convert_args.input_file, convert_args.output_file) + + parser_convert = subparsers.add_parser( + "convert", help="Convert file format (output file extension determines output format)" + ) + parser_convert.add_argument("input_file") + parser_convert.add_argument("output_file") + parser_convert.set_defaults(func=convert_wrapper) + + args = parser.parse_args() + args.func(args) diff --git a/scripts/pyaudio3dtools/binauralrenderer.py b/scripts/pyaudio3dtools/binauralrenderer.py index d5004c06f3..2567b433db 100644 --- a/scripts/pyaudio3dtools/binauralrenderer.py +++ b/scripts/pyaudio3dtools/binauralrenderer.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/pyaudio3dtools/constants.py b/scripts/pyaudio3dtools/constants.py index b9523fc4ae..92fd5a709e 100644 --- a/scripts/pyaudio3dtools/constants.py +++ b/scripts/pyaudio3dtools/constants.py @@ -37,14 +37,14 @@ IVAS_CICPX_TO_MONO = np.array( 1, 1, 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, + 0.79999995, + 0.79999995, + 0.79999995, + 0.79999995, + 0.849999964, + 0.849999964, + 0.849999964, + 0.849999964, ] ] ).T diff --git a/scripts/pyaudio3dtools/hoadecoder.py b/scripts/pyaudio3dtools/hoadecoder.py index b774c0a9ec..c37ceb3bdc 100644 --- a/scripts/pyaudio3dtools/hoadecoder.py +++ b/scripts/pyaudio3dtools/hoadecoder.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -65,10 +65,9 @@ def get_hoa_mtx( mtx_hoa_dec[1, 0] = 0.5 mtx_hoa_dec[1, 1] = -0.5 elif spkrlayout.isloudspeaker: - # TODO getRSH in IVAS casts to int16_t , decide on final behaviour for scripts Y_td = getRSH( - T_DESIGN_11_AZI.astype(np.int16), - T_DESIGN_11_ELE.astype(np.int16), + T_DESIGN_11_AZI, + T_DESIGN_11_ELE, ambi_order, norm="ortho", ) diff --git a/scripts/pyaudio3dtools/masarenderer.py b/scripts/pyaudio3dtools/masarenderer.py index 4ae7a9da3b..ff9a3612a4 100644 --- a/scripts/pyaudio3dtools/masarenderer.py +++ b/scripts/pyaudio3dtools/masarenderer.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/pyaudio3dtools/quaternions/__init__.py b/scripts/pyaudio3dtools/quaternions/__init__.py index ccd22bb925..8f1f04c369 100644 --- a/scripts/pyaudio3dtools/quaternions/__init__.py +++ b/scripts/pyaudio3dtools/quaternions/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/pyaudio3dtools/quaternions/functions.py b/scripts/pyaudio3dtools/quaternions/functions.py index a36c6cd026..6b30ccb5ee 100644 --- a/scripts/pyaudio3dtools/quaternions/functions.py +++ b/scripts/pyaudio3dtools/quaternions/functions.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/pyaudio3dtools/rotation.py b/scripts/pyaudio3dtools/rotation.py index 09f90a9ccf..cbd76aef3f 100644 --- a/scripts/pyaudio3dtools/rotation.py +++ b/scripts/pyaudio3dtools/rotation.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -331,9 +331,7 @@ def rotateMC(x: np.ndarray, trajectory: str, layout: spatialaudioformat) -> np.n rotateAziEle(a, e, Quat2RotMat(q)) for a, e in zip(layout.ls_azi, layout.ls_ele) ] - ).astype( - np.int16 - ) # TODO tmu for alignment with IVAS + ) R = panner.pan(rotated_pos[:, 0], rotated_pos[:, 1]) R[:, layout.lfe_index] = np.zeros([layout.nchannels, 1]) R[layout.lfe_index, layout.lfe_index] = 1 diff --git a/scripts/pyaudio3dtools/spatialaudioconvert.py b/scripts/pyaudio3dtools/spatialaudioconvert.py index 1ed144943f..0040f28ace 100644 --- a/scripts/pyaudio3dtools/spatialaudioconvert.py +++ b/scripts/pyaudio3dtools/spatialaudioconvert.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -337,7 +337,10 @@ def convert_mc( ) -> np.ndarray: """Convert a multichannel signal to the requested output format""" # MC -> LS - if out_spfmt.isloudspeaker: + if in_spfmt.name == "STEREO" and out_spfmt.name == "MONO": + MC2LS = np.vstack([[0.5], [0.5]]) + return in_sig @ MC2LS + elif out_spfmt.isloudspeaker: try: MC2LS = IVAS_MC_CONVERSION[in_spfmt.name][out_spfmt.name] except KeyError: @@ -372,8 +375,7 @@ def convert_mc( # SH response for loudspeaker positions MC2HOA = np.hstack( [ - # TODO getRSH in IVAS casts to int16_t , decide on final behaviour for scripts - hoadecoder.getRSH([int(a)], [int(e)], out_spfmt.ambi_order) + hoadecoder.getRSH([a], [e], out_spfmt.ambi_order) for a, e in zip(in_spfmt.ls_azi, in_spfmt.ls_ele) ] ).T @@ -442,10 +444,7 @@ def convert_ism( gains = gains[:, np.newaxis] # ISM -> HOA elif out_spfmt.ambi_order > 0: - # TODO getRSH in IVAS casts to int16_t , decide on final behaviour for scripts - gains = hoadecoder.getRSH( - [int(pos[0])], [int(pos[1])], out_spfmt.ambi_order - ) + gains = hoadecoder.getRSH([pos[0]], [pos[1]], out_spfmt.ambi_order) else: raise NotImplementedError( f"{in_spfmt.name} -> {out_spfmt.name}: format conversion not implemented" diff --git a/scripts/pyaudio3dtools/spatialaudioformat.py b/scripts/pyaudio3dtools/spatialaudioformat.py index 40f08800c4..524e4d61f5 100644 --- a/scripts/pyaudio3dtools/spatialaudioformat.py +++ b/scripts/pyaudio3dtools/spatialaudioformat.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/pyaudio3dtools/spatialmetadata.py b/scripts/pyaudio3dtools/spatialmetadata.py index fa89595b70..3cf1338d4f 100644 --- a/scripts/pyaudio3dtools/spatialmetadata.py +++ b/scripts/pyaudio3dtools/spatialmetadata.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/pyivastest/IvasBaseClass.py b/scripts/pyivastest/IvasBaseClass.py index 570e32d3fc..4c7a1a6736 100644 --- a/scripts/pyivastest/IvasBaseClass.py +++ b/scripts/pyivastest/IvasBaseClass.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/pyivastest/IvasModeAnalyzer.py b/scripts/pyivastest/IvasModeAnalyzer.py index 678af1906a..94e2646684 100644 --- a/scripts/pyivastest/IvasModeAnalyzer.py +++ b/scripts/pyivastest/IvasModeAnalyzer.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -46,51 +46,67 @@ INSTRUMENTED_RESULTS = { "WMOPS": { "keyword": "total", "number_format": "{:.5g}", - "position": 3, + "position": 2, "max_or_add": "add", "keyword_suffix": False, "strip_suffix": False, "encdec": 2, }, - "SRAM": { - "keyword": "Static RAM size", + "RAM": { + "keyword": "Maximum RAM (stack + heap) size:", "number_format": "{:.0f}", - "position": 4, + "position": 0, "max_or_add": "add", - "keyword_suffix": True, - "strip_suffix": True, + "keyword_suffix": False, + "strip_suffix": False, + "encdec": 2, + }, + "HEAP": { + "keyword": "Maximum inter-frame heap size:", + "number_format": "{:.0f}", + "position": 0, + "max_or_add": "add", + "keyword_suffix": False, + "strip_suffix": False, + "encdec": 2, + }, + "HEAP_INTRA": { + "keyword": "Maximum intra-frame heap size:", + "number_format": "{:.0f}", + "position": 0, + "max_or_add": "add", + "keyword_suffix": False, + "strip_suffix": False, "encdec": 2, }, - "DRAM": { - "keyword": "Stack size", + "STACK": { + "keyword": "Maximum stack size:", "number_format": "{:.0f}", - "position": 3, + "position": 0, "max_or_add": "max", - "keyword_suffix": True, - "strip_suffix": True, + "keyword_suffix": False, + "strip_suffix": False, "encdec": 2, }, "PROM": { - "keyword": "PROM size", + "keyword": "Program ROM size", "number_format": "{:.0f}", - "position": 3, + "position": 0, "max_or_add": "add", "keyword_suffix": True, "strip_suffix": True, "encdec": 4, }, - "TABLES": { - "keyword": "Table ROM size", + "TROM": { + "keyword": "Table ROM (const data) size", "number_format": "{:.0f}", - "position": 4, + "position": 0, "max_or_add": "add", "keyword_suffix": True, "strip_suffix": True, "encdec": 4, }, } - - HTML_DOCTYPE = """""" HTML_META = ( @@ -254,32 +270,44 @@ class IvasModeAnalyzer(IvasModeCollector): @staticmethod def get_log_value_from_file( - filename: str, keyword: str, position: int, strip_suffix=0 + filename: str, keywords: list, position: int, strip_suffix=0 ): """ Parameters ---------- - filename : + filename : log filename - keyword : + keywords : list of keywords to be searched in the log file (must be present on a single line) - position : + position : index to the list of extracted values strip_suffix : (Default value = 0) Returns ------- + + First value extracted from the line in the log file containing all keywords """ - loglines = [] + + if type(keywords) != list: + keywords = [keywords] + if os.path.exists(filename): fp = open(filename) loglines = fp.readlines() - return IvasModeAnalyzer.get_log_value( - loglines, keyword, position, strip_suffix=strip_suffix - ) + fp.close() + matching_lines = [line for line in loglines if all(keyword in line for keyword in keywords)] + + for line in matching_lines: + all_values_on_line = [float(s) for s in line.split() if re.match(r'^[0-9\.]*$', s)] + if all_values_on_line: + return all_values_on_line[position] + + return -1.0 + def sort_log_modes(self): list_to_sort = [] @@ -363,9 +391,9 @@ class IvasModeAnalyzer(IvasModeCollector): result_table = [["conf", "com"]] else: if max_or_add == "add": - result_table = [["conf", "enc", "dec", "com", "total"]] + result_table = [["conf", "enc", "dec", "com", "rend", "total"]] if max_or_add == "max": - result_table = [["conf", "enc", "dec", "com", "max"]] + result_table = [["conf", "enc", "dec", "com", "rend", "max"]] sorted_modes = self.sort_log_modes() @@ -389,7 +417,7 @@ class IvasModeAnalyzer(IvasModeCollector): enc_value, self.get_log_value_from_file( enc_log_name, - " ".join([keyword, "\(encoder\)"]), + [keyword, "lib_enc"], position, strip_suffix=strip_suffix, ), @@ -411,7 +439,7 @@ class IvasModeAnalyzer(IvasModeCollector): com_value, self.get_log_value_from_file( enc_log_name, - " ".join([keyword, "\(common\)"]), + [keyword, "lib_com"], position, strip_suffix=strip_suffix, ), @@ -427,15 +455,17 @@ class IvasModeAnalyzer(IvasModeCollector): for oc in self.selected_logs[mode]["oc_list"]: formatted_name_oc = formatted_name + " to " + oc dec_value = -1 + rend_value = -1 for item in self.selected_logs[mode]["items"]: if oc in self.selected_logs[mode]["items"][item]["dec"]: dec_log_name = self.get_dec_log_file_name(item, mode, oc) + # get dec if keyword_suffix == 1: dec_value = max( dec_value, self.get_log_value_from_file( dec_log_name, - " ".join([keyword, "\(decoder\)"]), + [keyword, "lib_dec"], position, strip_suffix=strip_suffix, ), @@ -450,6 +480,27 @@ class IvasModeAnalyzer(IvasModeCollector): strip_suffix=strip_suffix, ), ) + # get rend + if keyword_suffix == 1: + rend_value = max( + rend_value, + self.get_log_value_from_file( + dec_log_name, + [keyword, "lib_rend"], + position, + strip_suffix=strip_suffix, + ), + ) + else: + rend_value = max( + rend_value, + self.get_log_value_from_file( + dec_log_name, + keyword, + position, + strip_suffix=strip_suffix, + ), + ) if encdec == 2: if max_or_add == "add": total = number_format.format( @@ -475,13 +526,13 @@ class IvasModeAnalyzer(IvasModeCollector): elif encdec == 4: if max_or_add == "add": total = number_format.format( - float(enc_value) + float(dec_value) + float(com_value) + float(enc_value) + float(dec_value) + float(com_value) + float(rend_value) ) elif max_or_add == "max": total = number_format.format( max( float(enc_value) + float(com_value), - float(dec_value) + float(com_value), + float(dec_value) + float(com_value) + float(rend_value), ) ) result_line = [ @@ -489,6 +540,7 @@ class IvasModeAnalyzer(IvasModeCollector): number_format.format(enc_value), number_format.format(float(dec_value)), number_format.format(com_value), + number_format.format(rend_value), total, ] result_table.append(result_line) @@ -885,6 +937,10 @@ class IvasModeAnalyzer(IvasModeCollector): ------- """ + + if not os.path.exists(os.path.dirname(csv_file_name)): + os.makedirs(os.path.dirname(csv_file_name)) + with open(csv_file_name + ".csv", "w", newline="\n") as f: header = result_table.pop(0) # write header @@ -902,6 +958,7 @@ class IvasModeAnalyzer(IvasModeCollector): IvasModeAnalyzer.write_csv_file(filename, table) def all_instrumented_to_csv(self, basefilename, encdec=-1): + basefilename = os.path.abspath(basefilename) for value in INSTRUMENTED_RESULTS: table = self.get_instrumented_value(value, encdec=encdec) IvasModeAnalyzer.write_csv_file("".join([basefilename, "_", value]), table) diff --git a/scripts/pyivastest/IvasModeCollector.py b/scripts/pyivastest/IvasModeCollector.py index ab466d0b9d..2a9361a078 100644 --- a/scripts/pyivastest/IvasModeCollector.py +++ b/scripts/pyivastest/IvasModeCollector.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/pyivastest/IvasModeRunner.py b/scripts/pyivastest/IvasModeRunner.py index 1c91c3f39f..114991c374 100644 --- a/scripts/pyivastest/IvasModeRunner.py +++ b/scripts/pyivastest/IvasModeRunner.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -829,7 +829,7 @@ class IvasModeRunner(IvasModeCollector.IvasModeCollector): enc_log = open(enc_log_name, "a") enc_log.write(" ".join(proc_cmd)) proc_result = subprocess.run( - proc_cmd, capture_output=True, text=True + proc_cmd, capture_output=True, text=True, encoding="utf8" ) enc_log.write(proc_result.stderr) enc_log.write(proc_result.stdout) @@ -840,9 +840,10 @@ class IvasModeRunner(IvasModeCollector.IvasModeCollector): suffix, enc_file_name ) ) + self.logger.error(proc_result.stderr) raise RuntimeError( - "Processing step {} for {} failed!".format( - suffix, enc_file_name + "Processing step {} for {} failed!\n{}".format( + suffix, enc_file_name, proc_result.stderr ) ) bs_in_file = bs_out_file @@ -925,11 +926,11 @@ class IvasModeRunner(IvasModeCollector.IvasModeCollector): ) if isinstance(dec_options, dict): if "dec_options" in dec_options: - dec_options["dec_options"].append(addl_dec_options) + dec_options["dec_options"].extend(addl_dec_options) else: dec_options["dec_options"] = addl_dec_options else: - dec_options.append(addl_dec_options) + dec_options.extend(addl_dec_options) dec_config = { "ivas_format": mode, "config": config, diff --git a/scripts/pyivastest/IvasScriptsCommon.py b/scripts/pyivastest/IvasScriptsCommon.py index 46e6a2f4a8..681e6b1b7f 100644 --- a/scripts/pyivastest/IvasScriptsCommon.py +++ b/scripts/pyivastest/IvasScriptsCommon.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -546,7 +546,10 @@ def runner_setup(runner, args): if "fer_file" in args.keys() or "ber_file" in args.keys(): # assert that the eid-xor tool is there - eid_xor_path = os.path.join(runner.config["utilPath"], "eid-xor") + bin_ext="" + if platform.system() == "Windows": + bin_ext=".exe" + eid_xor_path = os.path.join(runner.config["utilPath"], "".join(["eid-xor", bin_ext])) if not os.path.isfile(eid_xor_path): raise FileNotFoundError(f"Could not find {eid_xor_path} (needed for error pattern insertion)") @@ -628,7 +631,8 @@ def runner_setup(runner, args): if args["item_list"]: runner.set_global_item_list(args["item_list"]) if args["metadata_files"]: - runner.set_global_metadata_file_list(args["metadata_files"]) + metadata_files = [os.path.abspath(f) for f in args["metadata_files"]] + runner.set_global_metadata_file_list(metadata_files) if args["decoder_only"]: runner.run_encoder = False if args["info"]: diff --git a/scripts/pyivastest/IvasSvnBuilder.py b/scripts/pyivastest/IvasSvnBuilder.py index f12e714286..0d7cc9c847 100644 --- a/scripts/pyivastest/IvasSvnBuilder.py +++ b/scripts/pyivastest/IvasSvnBuilder.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -275,7 +275,7 @@ class IvasBuilder(IvasBaseClass): build_log.write(" ".join(instrument_cmd)) build_log.write("\n") build_result = subprocess.run( - instrument_cmd, capture_output=True, text=True + instrument_cmd, capture_output=True, text=True, check=True ) build_log.write(build_result.stderr) build_log.write(build_result.stdout) diff --git a/scripts/pyivastest/__init__.py b/scripts/pyivastest/__init__.py index 4196e89439..f5c84b66c8 100644 --- a/scripts/pyivastest/__init__.py +++ b/scripts/pyivastest/__init__.py @@ -1,5 +1,5 @@ """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/pyivastest/constants.py b/scripts/pyivastest/constants.py index 89ab93b727..f42796376a 100644 --- a/scripts/pyivastest/constants.py +++ b/scripts/pyivastest/constants.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/pyivastest/ivas_svn.py b/scripts/pyivastest/ivas_svn.py index b5061515c4..58e321e67c 100644 --- a/scripts/pyivastest/ivas_svn.py +++ b/scripts/pyivastest/ivas_svn.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/pyprocessing/__init__.py b/scripts/pyprocessing/__init__.py index 1db673e951..5e7b5aa892 100644 --- a/scripts/pyprocessing/__init__.py +++ b/scripts/pyprocessing/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/pyprocessing/evs.py b/scripts/pyprocessing/evs.py index 3c7f8e1918..6de86f2a27 100644 --- a/scripts/pyprocessing/evs.py +++ b/scripts/pyprocessing/evs.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/pyprocessing/ivas.py b/scripts/pyprocessing/ivas.py index 3533e7a0bc..0f182fd1fb 100644 --- a/scripts/pyprocessing/ivas.py +++ b/scripts/pyprocessing/ivas.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/pyprocessing/prepost_processing.py b/scripts/pyprocessing/prepost_processing.py index a2c014b6a9..3ea7411cea 100644 --- a/scripts/pyprocessing/prepost_processing.py +++ b/scripts/pyprocessing/prepost_processing.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/pyprocessing/processing.py b/scripts/pyprocessing/processing.py index ec7deb66f4..a0533b2b4e 100644 --- a/scripts/pyprocessing/processing.py +++ b/scripts/pyprocessing/processing.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/pyprocessing/processing_configs.py b/scripts/pyprocessing/processing_configs.py index d7619230dd..255f183c6d 100644 --- a/scripts/pyprocessing/processing_configs.py +++ b/scripts/pyprocessing/processing_configs.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/pyprocessing/utils.py b/scripts/pyprocessing/utils.py index 6132792cc0..e62840fd13 100644 --- a/scripts/pyprocessing/utils.py +++ b/scripts/pyprocessing/utils.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/runIvasCodec.py b/scripts/runIvasCodec.py index 4ec1da90b9..070fb8e4f0 100755 --- a/scripts/runIvasCodec.py +++ b/scripts/runIvasCodec.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/self_test.py b/scripts/self_test.py index 05c6944ddd..d7118832db 100755 --- a/scripts/self_test.py +++ b/scripts/self_test.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -63,7 +63,7 @@ MODES = { "5_1_4": "5_1_4", "7_1_4": "7_1_4", }, - "-ISM": {"1": "ISM1", "2": "ISM2", "3": "ISM3", "4": "ISM4"}, + "-ISM": {"1": "ISM1", "2": "ISM2", "3": "ISM3", "4": "ISM4", "+4": "ISM+4"}, "-SBA": { "-3": "HOA3", "3": "HOA3", @@ -992,10 +992,6 @@ class SelfTest(IvasScriptsCommon.IvasScript): suffix = "nws" proc_cmd[0] = os.path.join(TOOLS_DIR, proc_cmd[0]) - if suffix == "nws" and TOOLS_DIR == TOOLS_DIR_LINUX: - # use wine - proc_cmd[0] = os.path.join(TOOLS_DIR_WIN, "networkSimulator_g192.exe") - proc_cmd = ["wine"] + proc_cmd proc_cmd = [ "{in_file}" if x == in_file else self.test_for_file(x) for x in proc_cmd diff --git a/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c b/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c index 54c065a0ca..fd8e4b612a 100644 --- a/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c +++ b/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c @@ -37,10 +37,9 @@ the United Nations Convention on Contracts on the International Sales of Goods. #include "ivas_lc3plus_dec.h" #include "ivas_error_utils.h" - #define MAX_SAMPLES_PER_CHANNEL 960 -static int encodeAndDecodeOneStereoFrame(LC3PLUS_CONFIG config) +static int encodeAndDecodeOneStereoFrame( LC3PLUS_CONFIG config ) { ivas_error err; uint32_t bps = 128000; @@ -49,104 +48,110 @@ static int encodeAndDecodeOneStereoFrame(LC3PLUS_CONFIG config) IVAS_LC3PLUS_ENC_HANDLE encHandle; err = IVAS_LC3PLUS_ENC_Open( config, bps, &encHandle ); - if(IVAS_ERR_OK != err) + if ( IVAS_ERR_OK != err ) { return err; } - err = IVAS_LC3PLUS_ENC_GetDelay(encHandle, &encDelay); - if(IVAS_ERR_OK != err) + err = IVAS_LC3PLUS_ENC_GetDelay( encHandle, &encDelay ); + if ( IVAS_ERR_OK != err ) { return err; } - if(encDelay == -1 || encDelay == 0) + if ( encDelay == -1 || encDelay == 0 ) { return IVAS_ERROR( IVAS_ERR_INTERNAL, "encDelay is zero or uninitialized\n" ); } /* encode one frame */ - int16_t numSamplesPerChannels = config.samplerate/(1000000/config.ivas_frame_duration_us); - float* pcm_in[2]; - float pcm_in_ch1[MAX_SAMPLES_PER_CHANNEL*sizeof(float)]; - memset(pcm_in_ch1, 0, numSamplesPerChannels*sizeof(float)); - float pcm_in_ch2[MAX_SAMPLES_PER_CHANNEL*sizeof(float)]; - memset(pcm_in_ch2, 0, numSamplesPerChannels*sizeof(float)); + int16_t numSamplesPerChannels = config.samplerate / ( 1000000 / config.ivas_frame_duration_us ); + float *pcm_in[2]; + float pcm_in_ch1[MAX_SAMPLES_PER_CHANNEL * sizeof( float )]; + memset( pcm_in_ch1, 0, numSamplesPerChannels * sizeof( float ) ); + float pcm_in_ch2[MAX_SAMPLES_PER_CHANNEL * sizeof( float )]; + memset( pcm_in_ch2, 0, numSamplesPerChannels * sizeof( float ) ); pcm_in[0] = pcm_in_ch1; pcm_in[1] = pcm_in_ch2; int32_t bitstreamSizePerIvasFrame = 0; err = IVAS_LC3PLUS_ENC_GetOutputBitstreamSize( encHandle, &bitstreamSizePerIvasFrame ); - if(IVAS_ERR_OK != err) return err; + if ( IVAS_ERR_OK != err ) + return err; - uint8_t* bitstream_out = malloc(bitstreamSizePerIvasFrame); - memset(bitstream_out, 0, bitstreamSizePerIvasFrame); + uint8_t *bitstream_out = malloc( bitstreamSizePerIvasFrame ); + memset( bitstream_out, 0, bitstreamSizePerIvasFrame ); err = IVAS_LC3PLUS_ENC_Encode( encHandle, pcm_in, bitstream_out ); - if(IVAS_ERR_OK != err) return err; + if ( IVAS_ERR_OK != err ) + return err; IVAS_LC3PLUS_ENC_Close( &encHandle ); /* decode one frame */ IVAS_LC3PLUS_DEC_HANDLE decHandle; - err = IVAS_LC3PLUS_DEC_Open( config, &decHandle ); - if(IVAS_ERR_OK != err) + err = IVAS_LC3PLUS_DEC_Open( config, +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING + 1 /*caching enabled*/, +#endif + &decHandle ); + if ( IVAS_ERR_OK != err ) { return err; } - err = IVAS_LC3PLUS_DEC_GetDelay(decHandle, &decDelay); - if(IVAS_ERR_OK != err) + err = IVAS_LC3PLUS_DEC_GetDelay( decHandle, &decDelay ); + if ( IVAS_ERR_OK != err ) { return err; } - if(decDelay == -1 || decDelay == 0) + if ( decDelay == -1 || decDelay == 0 ) { return IVAS_ERROR( IVAS_ERR_INTERNAL, "decDelay is zero or uninitialized\n" ); } uint8_t *bitstream_in = bitstream_out; - float* pcm_out[2]; - float pcm_out_ch1[MAX_SAMPLES_PER_CHANNEL*sizeof(float)]; - memset(pcm_out_ch1, 0, numSamplesPerChannels*sizeof(float)); - float pcm_out_ch2[MAX_SAMPLES_PER_CHANNEL*sizeof(float)]; - memset(pcm_out_ch2, 0, numSamplesPerChannels*sizeof(float)); + float *pcm_out[2]; + float pcm_out_ch1[MAX_SAMPLES_PER_CHANNEL * sizeof( float )]; + memset( pcm_out_ch1, 0, numSamplesPerChannels * sizeof( float ) ); + float pcm_out_ch2[MAX_SAMPLES_PER_CHANNEL * sizeof( float )]; + memset( pcm_out_ch2, 0, numSamplesPerChannels * sizeof( float ) ); pcm_out[0] = pcm_out_ch1; pcm_out[1] = pcm_out_ch2; err = IVAS_LC3PLUS_DEC_Conceal( decHandle, pcm_out ); - if(IVAS_ERR_OK != err) + if ( IVAS_ERR_OK != err ) { return err; } err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstreamSizePerIvasFrame, pcm_out ); - if(IVAS_ERR_OK != err) + if ( IVAS_ERR_OK != err ) { return err; } err = IVAS_LC3PLUS_DEC_Conceal( decHandle, pcm_out ); - if(IVAS_ERR_OK != err) + if ( IVAS_ERR_OK != err ) { return err; } IVAS_LC3PLUS_DEC_Close( &decHandle ); - free(bitstream_out); + free( bitstream_out ); return 0; } -static int openCloseEncoder(void) +static int openCloseEncoder( void ) { ivas_error err; - LC3PLUS_CONFIG config = {.lc3plus_frame_duration_us = 10*1000, .ivas_frame_duration_us = 20000, .channels = 1, .samplerate = 48000}; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 10 * 1000, .ivas_frame_duration_us = 20000, .channels = 1, .samplerate = 48000 }; uint32_t bps = 128000; IVAS_LC3PLUS_ENC_HANDLE encHandle; err = IVAS_LC3PLUS_ENC_Open( config, bps, &encHandle ); - if(IVAS_ERR_OK != err) + if ( IVAS_ERR_OK != err ) { return err; } @@ -155,10 +160,10 @@ static int openCloseEncoder(void) return 0; } -static int tryOpenEncoderWithInvalidBitrate(void) +static int tryOpenEncoderWithInvalidBitrate( void ) { ivas_error err; - LC3PLUS_CONFIG config = {.lc3plus_frame_duration_us = 10*1000, .ivas_frame_duration_us = 20000, .channels = 1, .samplerate = 48000}; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 10 * 1000, .ivas_frame_duration_us = 20000, .channels = 1, .samplerate = 48000 }; /* lc3plus max bitrate is 320000 per channel */ uint32_t invalid_high_bps = 700000; uint32_t invalid_low_bps = 8; @@ -166,54 +171,54 @@ static int tryOpenEncoderWithInvalidBitrate(void) IVAS_LC3PLUS_ENC_HANDLE encHandle; err = IVAS_LC3PLUS_ENC_Open( config, invalid_high_bps, &encHandle ); /* setting an invalid bitrate should trigger an error - which is what we expect */ - if(IVAS_ERR_LC3PLUS_INVALID_BITRATE != err) + if ( IVAS_ERR_LC3PLUS_INVALID_BITRATE != err ) { return 1; } err = IVAS_LC3PLUS_ENC_Open( config, invalid_low_bps, &encHandle ); /* setting an invalid bitrate should trigger an error - which is what we expect */ - if(IVAS_ERR_LC3PLUS_INVALID_BITRATE != err) + if ( IVAS_ERR_LC3PLUS_INVALID_BITRATE != err ) { return 1; } return 0; } -static int tryOpenEncoderWithInvalidFrameDuration(void) +static int tryOpenEncoderWithInvalidFrameDuration( void ) { ivas_error err; - LC3PLUS_CONFIG config = {.lc3plus_frame_duration_us = 10*1000, .ivas_frame_duration_us = 20000, .channels = 1, .samplerate = 48000}; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 10 * 1000, .ivas_frame_duration_us = 20000, .channels = 1, .samplerate = 48000 }; config.lc3plus_frame_duration_us = 1234; /*unsupported frame duration*/ uint32_t bps = 320000; IVAS_LC3PLUS_ENC_HANDLE encHandle; err = IVAS_LC3PLUS_ENC_Open( config, bps, &encHandle ); /* setting an invalid fame duration should trigger an error - which is what we expect */ - if(IVAS_ERR_OK == err) + if ( IVAS_ERR_OK == err ) { return 1; } return 0; } -static int tryOpenEncoderWithInvalidSampleRate(void) +static int tryOpenEncoderWithInvalidSampleRate( void ) { ivas_error err; - LC3PLUS_CONFIG config = {.lc3plus_frame_duration_us = 10*1000, .ivas_frame_duration_us = 20000, .channels = 1, .samplerate = 48000}; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 10 * 1000, .ivas_frame_duration_us = 20000, .channels = 1, .samplerate = 48000 }; config.samplerate = 1234; /*unsupported sample rate */ uint32_t bps = 320000; IVAS_LC3PLUS_ENC_HANDLE encHandle; err = IVAS_LC3PLUS_ENC_Open( config, bps, &encHandle ); /* setting an invalid sample rate should trigger an error - which is what we expect */ - if(IVAS_ERR_OK == err) + if ( IVAS_ERR_OK == err ) { return 1; } return 0; } -static int tryCallEncoderApiWithInvalidParams(void) +static int tryCallEncoderApiWithInvalidParams( void ) { IVAS_LC3PLUS_ENC_HANDLE invalidEncHandle = NULL; int32_t *invalidBsSize = NULL; @@ -223,30 +228,26 @@ static int tryCallEncoderApiWithInvalidParams(void) float **invalidPcm_in = NULL; void *invalidBitstream_out = NULL; - float* pcm_in[1]; - float pcm_in_ch1[MAX_SAMPLES_PER_CHANNEL*sizeof(float)]; - memset(pcm_in_ch1, 0, MAX_SAMPLES_PER_CHANNEL*sizeof(float)); + float *pcm_in[1]; + float pcm_in_ch1[MAX_SAMPLES_PER_CHANNEL * sizeof( float )]; + memset( pcm_in_ch1, 0, MAX_SAMPLES_PER_CHANNEL * sizeof( float ) ); pcm_in[0] = pcm_in_ch1; uint8_t bitstream_out[1200]; - if(IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_GetDelay(invalidEncHandle, invalidDelayInSamples) - || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_GetDelay(invalidEncHandle, &delayInSamples)) + if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_GetDelay( invalidEncHandle, invalidDelayInSamples ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_GetDelay( invalidEncHandle, &delayInSamples ) ) { return 1; } - if(IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_GetOutputBitstreamSize(invalidEncHandle, invalidBsSize) - || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_GetOutputBitstreamSize(invalidEncHandle, &bsSize)) + if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_GetOutputBitstreamSize( invalidEncHandle, invalidBsSize ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_GetOutputBitstreamSize( invalidEncHandle, &bsSize ) ) { return 1; } - IVAS_LC3PLUS_ENC_Close(&invalidEncHandle); - if(IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_Encode(invalidEncHandle, invalidPcm_in, invalidBitstream_out) ) + IVAS_LC3PLUS_ENC_Close( &invalidEncHandle ); + if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_Encode( invalidEncHandle, invalidPcm_in, invalidBitstream_out ) ) { return 1; } - if(IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_Encode(invalidEncHandle, pcm_in, invalidBitstream_out) - || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_Encode(invalidEncHandle, invalidPcm_in, bitstream_out) - || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_Encode(invalidEncHandle, pcm_in, bitstream_out)) + if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_Encode( invalidEncHandle, pcm_in, invalidBitstream_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_Encode( invalidEncHandle, invalidPcm_in, bitstream_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_ENC_Encode( invalidEncHandle, pcm_in, bitstream_out ) ) { return 1; } @@ -254,7 +255,7 @@ static int tryCallEncoderApiWithInvalidParams(void) } -static int tryCallDecoderApiWithInvalidParams(void) +static int tryCallDecoderApiWithInvalidParams( void ) { IVAS_LC3PLUS_DEC_HANDLE invalidDecHandle = NULL; @@ -265,45 +266,61 @@ static int tryCallDecoderApiWithInvalidParams(void) int32_t invalidBitstream_in_size = 0; int32_t bitstream_in_size = 100; - float* pcm_out[1]; - float pcm_out_ch1[MAX_SAMPLES_PER_CHANNEL*sizeof(float)]; - memset(pcm_out_ch1, 0, MAX_SAMPLES_PER_CHANNEL*sizeof(float)); + float *pcm_out[1]; + float pcm_out_ch1[MAX_SAMPLES_PER_CHANNEL * sizeof( float )]; + memset( pcm_out_ch1, 0, MAX_SAMPLES_PER_CHANNEL * sizeof( float ) ); pcm_out[0] = pcm_out_ch1; uint8_t bitstream_in[1200]; - if(IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_GetDelay(invalidDecHandle, invalidDelayInSamples) - || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_GetDelay(invalidDecHandle, &delayInSamples) ) + if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_GetDelay( invalidDecHandle, invalidDelayInSamples ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_GetDelay( invalidDecHandle, &delayInSamples ) ) { return 1; } - IVAS_LC3PLUS_DEC_Close(&invalidDecHandle); - if( IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Decode(invalidDecHandle, invalidBitstream_in, invalidBitstream_in_size, invalidPcm_out) - || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Decode(invalidDecHandle, invalidBitstream_in, invalidBitstream_in_size, pcm_out) - || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Decode(invalidDecHandle, invalidBitstream_in, bitstream_in_size, invalidPcm_out) - || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Decode(invalidDecHandle, invalidBitstream_in, bitstream_in_size, pcm_out) - || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Decode(invalidDecHandle, bitstream_in, invalidBitstream_in_size, invalidPcm_out) - || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Decode(invalidDecHandle, bitstream_in, invalidBitstream_in_size, pcm_out) - || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Decode(invalidDecHandle, bitstream_in, bitstream_in_size, pcm_out)) + IVAS_LC3PLUS_DEC_Close( &invalidDecHandle ); + if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Decode( invalidDecHandle, invalidBitstream_in, invalidBitstream_in_size, invalidPcm_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Decode( invalidDecHandle, invalidBitstream_in, invalidBitstream_in_size, pcm_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Decode( invalidDecHandle, invalidBitstream_in, bitstream_in_size, invalidPcm_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Decode( invalidDecHandle, invalidBitstream_in, bitstream_in_size, pcm_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Decode( invalidDecHandle, bitstream_in, invalidBitstream_in_size, invalidPcm_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Decode( invalidDecHandle, bitstream_in, invalidBitstream_in_size, pcm_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Decode( invalidDecHandle, bitstream_in, bitstream_in_size, pcm_out ) ) { return 1; } - if( IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Conceal(invalidDecHandle, invalidPcm_out) - || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Conceal(invalidDecHandle, pcm_out)) + if ( IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Conceal( invalidDecHandle, invalidPcm_out ) || IVAS_ERR_UNEXPECTED_NULL_POINTER != IVAS_LC3PLUS_DEC_Conceal( invalidDecHandle, pcm_out ) ) { return 1; } return 0; } -static int openCloseDecoder(void) +static int openCloseDecoderWithCaching( void ) +{ + ivas_error err; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 10 * 1000, .ivas_frame_duration_us = 20000, .channels = 1, .samplerate = 48000 }; + + IVAS_LC3PLUS_DEC_HANDLE decHandle; + err = IVAS_LC3PLUS_DEC_Open( config, +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING + 1 /*caching enabled*/, +#endif + &decHandle ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + IVAS_LC3PLUS_DEC_Close( &decHandle ); + return 0; +} + +static int openCloseDecoderWithoutCaching( void ) { ivas_error err; - LC3PLUS_CONFIG config = {.lc3plus_frame_duration_us = 10*1000, .ivas_frame_duration_us = 20000, .channels = 1, .samplerate = 48000}; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 10 * 1000, .ivas_frame_duration_us = 20000, .channels = 1, .samplerate = 48000 }; IVAS_LC3PLUS_DEC_HANDLE decHandle; - err = IVAS_LC3PLUS_DEC_Open( config, &decHandle ); - if(IVAS_ERR_OK != err) + err = IVAS_LC3PLUS_DEC_Open( config, +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING + 1 /*caching enabled*/, +#endif + &decHandle ); + if ( IVAS_ERR_OK != err ) { return err; } @@ -313,231 +330,301 @@ static int openCloseDecoder(void) } -static int tryOpenDecoderWithInvalidFrameDuration(void) + + +static int tryOpenDecoderWithInvalidFrameDuration( void ) { ivas_error err; - LC3PLUS_CONFIG config = {.lc3plus_frame_duration_us = 10*1000, .ivas_frame_duration_us = 20000, .channels = 1, .samplerate = 48000}; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 10 * 1000, .ivas_frame_duration_us = 20000, .channels = 1, .samplerate = 48000 }; config.lc3plus_frame_duration_us = 1234; /*unsupported frame duration*/ IVAS_LC3PLUS_DEC_HANDLE decHandle; - err = IVAS_LC3PLUS_DEC_Open( config, &decHandle ); + err = IVAS_LC3PLUS_DEC_Open( config, +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING + 1 /*caching enabled*/, +#endif + &decHandle ); /* setting an invalid fame duration should trigger an error - which is what we expect */ - if(IVAS_ERR_OK == err) + if ( IVAS_ERR_OK == err ) { return 1; } return 0; } -static int tryOpenDecoderWithInvalidSampleRate(void) +static int tryOpenDecoderWithInvalidSampleRate( void ) { ivas_error err; - LC3PLUS_CONFIG config = {.lc3plus_frame_duration_us = 10*1000, .ivas_frame_duration_us = 20000, .channels = 1, .samplerate = 48000}; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 10 * 1000, .ivas_frame_duration_us = 20000, .channels = 1, .samplerate = 48000 }; config.samplerate = 1234; /*unsupported sample rate*/ IVAS_LC3PLUS_DEC_HANDLE decHandle; - err = IVAS_LC3PLUS_DEC_Open( config, &decHandle ); + err = IVAS_LC3PLUS_DEC_Open( config, +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING + 1 /*caching enabled*/, +#endif + &decHandle ); /* setting an invalid sample rate should trigger an error - which is what we expect */ - if(IVAS_ERR_OK == err) + if ( IVAS_ERR_OK == err ) { return 1; } return 0; } -static int encodeOneFrame(void) +static int encodeOneFrame( void ) { ivas_error err; - LC3PLUS_CONFIG config = {.lc3plus_frame_duration_us = 10*1000, .ivas_frame_duration_us = 20000, .channels = 1, .samplerate = 48000}; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 10 * 1000, .ivas_frame_duration_us = 20000, .channels = 1, .samplerate = 48000 }; uint32_t bps = 128000; IVAS_LC3PLUS_ENC_HANDLE encHandle; err = IVAS_LC3PLUS_ENC_Open( config, bps, &encHandle ); - if(IVAS_ERR_OK != err) return err; + if ( IVAS_ERR_OK != err ) + return err; - int16_t numSamplesPerChannels = config.samplerate/(1000000/config.ivas_frame_duration_us); + int16_t numSamplesPerChannels = config.samplerate / ( 1000000 / config.ivas_frame_duration_us ); - float* pcm[1]; - float pcm_ch1[MAX_SAMPLES_PER_CHANNEL*sizeof(float)]; - memset(pcm_ch1, 0, numSamplesPerChannels*sizeof(float)); + float *pcm[1]; + float pcm_ch1[MAX_SAMPLES_PER_CHANNEL * sizeof( float )]; + memset( pcm_ch1, 0, numSamplesPerChannels * sizeof( float ) ); pcm[0] = pcm_ch1; int32_t bitstreamSizePerIvasFrame = 0; err = IVAS_LC3PLUS_ENC_GetOutputBitstreamSize( encHandle, &bitstreamSizePerIvasFrame ); - if(IVAS_ERR_OK != err) return err; - uint8_t* bitstream_out = malloc(bitstreamSizePerIvasFrame); - memset(bitstream_out, 0, bitstreamSizePerIvasFrame); + if ( IVAS_ERR_OK != err ) + return err; + uint8_t *bitstream_out = malloc( bitstreamSizePerIvasFrame ); + memset( bitstream_out, 0, bitstreamSizePerIvasFrame ); err = IVAS_LC3PLUS_ENC_Encode( encHandle, pcm, bitstream_out ); - if(IVAS_ERR_OK != err) return err; + if ( IVAS_ERR_OK != err ) + return err; IVAS_LC3PLUS_ENC_Close( &encHandle ); - free(bitstream_out); + free( bitstream_out ); return 0; } -static int encodeAndDecodeOneMonoFrame(void) +static int encodeAndDecodeOneMonoFrame( void ) { ivas_error err; - LC3PLUS_CONFIG config = {.lc3plus_frame_duration_us = 10*1000, .ivas_frame_duration_us = 20000, .channels = 1, .samplerate = 48000}; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 10 * 1000, .ivas_frame_duration_us = 20000, .channels = 1, .samplerate = 48000 }; uint32_t bps = 128000; IVAS_LC3PLUS_ENC_HANDLE encHandle; err = IVAS_LC3PLUS_ENC_Open( config, bps, &encHandle ); - if(IVAS_ERR_OK != err) + if ( IVAS_ERR_OK != err ) { return err; } /* encode one frame */ - int16_t numSamplesPerChannels = config.samplerate/(1000000/config.ivas_frame_duration_us); - float* pcm_in[1]; - float pcm_in_ch1[MAX_SAMPLES_PER_CHANNEL*sizeof(float)]; - memset(pcm_in_ch1, 0, numSamplesPerChannels*sizeof(float)); + int16_t numSamplesPerChannels = config.samplerate / ( 1000000 / config.ivas_frame_duration_us ); + float *pcm_in[1]; + float pcm_in_ch1[MAX_SAMPLES_PER_CHANNEL * sizeof( float )]; + memset( pcm_in_ch1, 0, numSamplesPerChannels * sizeof( float ) ); pcm_in[0] = pcm_in_ch1; int32_t bitstreamSizePerIvasFrame = 0; err = IVAS_LC3PLUS_ENC_GetOutputBitstreamSize( encHandle, &bitstreamSizePerIvasFrame ); - if(IVAS_ERR_OK != err) return err; + if ( IVAS_ERR_OK != err ) + return err; - uint8_t* bitstream_out = malloc(bitstreamSizePerIvasFrame); - memset(bitstream_out, 0, bitstreamSizePerIvasFrame); + uint8_t *bitstream_out = malloc( bitstreamSizePerIvasFrame ); + memset( bitstream_out, 0, bitstreamSizePerIvasFrame ); err = IVAS_LC3PLUS_ENC_Encode( encHandle, pcm_in, bitstream_out ); - if(IVAS_ERR_OK != err) return err; + if ( IVAS_ERR_OK != err ) + return err; IVAS_LC3PLUS_ENC_Close( &encHandle ); /* decode one frame */ IVAS_LC3PLUS_DEC_HANDLE decHandle; - err = IVAS_LC3PLUS_DEC_Open( config, &decHandle ); - if(IVAS_ERR_OK != err) + err = IVAS_LC3PLUS_DEC_Open( config, +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING + 1 /*caching enabled*/, +#endif + &decHandle ); + if ( IVAS_ERR_OK != err ) { return err; } uint8_t *bitstream_in = bitstream_out; - float* pcm_out[1]; - float pcm_out_ch1[MAX_SAMPLES_PER_CHANNEL*sizeof(float)]; - memset(pcm_out_ch1, 0, numSamplesPerChannels*sizeof(float)); + float *pcm_out[1]; + float pcm_out_ch1[MAX_SAMPLES_PER_CHANNEL * sizeof( float )]; + memset( pcm_out_ch1, 0, numSamplesPerChannels * sizeof( float ) ); pcm_out[0] = pcm_out_ch1; err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstreamSizePerIvasFrame, pcm_out ); - if(IVAS_ERR_OK != err) + if ( IVAS_ERR_OK != err ) { return err; } err = IVAS_LC3PLUS_DEC_Conceal( decHandle, pcm_out ); - if(IVAS_ERR_OK != err) + if ( IVAS_ERR_OK != err ) { return err; } IVAS_LC3PLUS_DEC_Close( &decHandle ); - free(bitstream_out); + free( bitstream_out ); return 0; } -static int encodeAndDecodeOneStereoFrameIvas20msLc3plus10ms_48kHz(void) +static int encodeAndDecodeOneStereoFrameIvas20msLc3plus10ms_48kHz( void ) { - LC3PLUS_CONFIG config = {.lc3plus_frame_duration_us = 10*1000, .ivas_frame_duration_us = 20*1000, .channels = 2, .samplerate = 48000}; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 10 * 1000, .ivas_frame_duration_us = 20 * 1000, .channels = 2, .samplerate = 48000 }; return encodeAndDecodeOneStereoFrame( config ); } -static int encodeAndDecodeOneStereoFrameIvas20msLc3plus10ms_32kHz(void) +static int encodeAndDecodeOneStereoFrameIvas20msLc3plus10ms_32kHz( void ) { - LC3PLUS_CONFIG config = {.lc3plus_frame_duration_us = 10*1000, .ivas_frame_duration_us = 20*1000, .channels = 2, .samplerate = 32000}; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 10 * 1000, .ivas_frame_duration_us = 20 * 1000, .channels = 2, .samplerate = 32000 }; return encodeAndDecodeOneStereoFrame( config ); } -static int encodeAndDecodeOneStereoFrameIvas20msLc3plus10ms_16kHz(void) +static int encodeAndDecodeOneStereoFrameIvas20msLc3plus10ms_16kHz( void ) { - LC3PLUS_CONFIG config = {.lc3plus_frame_duration_us = 10*1000, .ivas_frame_duration_us = 20*1000, .channels = 2, .samplerate = 16000}; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 10 * 1000, .ivas_frame_duration_us = 20 * 1000, .channels = 2, .samplerate = 16000 }; return encodeAndDecodeOneStereoFrame( config ); } -static int encodeAndDecodeOneStereoFrameIvas5msLc3plus5ms_48kHz(void) +static int encodeAndDecodeOneStereoFrameIvas5msLc3plus5ms_48kHz( void ) { - LC3PLUS_CONFIG config = {.lc3plus_frame_duration_us = 5*1000, .ivas_frame_duration_us = 5*1000, .channels = 2, .samplerate = 48000}; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 5 * 1000, .ivas_frame_duration_us = 5 * 1000, .channels = 2, .samplerate = 48000 }; return encodeAndDecodeOneStereoFrame( config ); } -static int encodeAndDecodeOneMonoFrameIvas20msLc3plus10ms_48kHz(void) +static int encodeAndDecodeOneMonoFrameIvas20msLc3plus10ms_48kHz( void ) { - LC3PLUS_CONFIG config = {.lc3plus_frame_duration_us = 10*1000, .ivas_frame_duration_us = 20*1000, .channels = 1, .samplerate = 48000}; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 10 * 1000, .ivas_frame_duration_us = 20 * 1000, .channels = 1, .samplerate = 48000 }; return encodeAndDecodeOneStereoFrame( config ); } -static int encodeAndDecodeOneMonoFrameIvas5msLc3plus5ms_48kHz(void) +static int encodeAndDecodeOneMonoFrameIvas5msLc3plus5ms_48kHz( void ) { - LC3PLUS_CONFIG config = {.lc3plus_frame_duration_us = 5*1000, .ivas_frame_duration_us = 5*1000, .channels = 1, .samplerate = 48000}; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 5 * 1000, .ivas_frame_duration_us = 5 * 1000, .channels = 1, .samplerate = 48000 }; return encodeAndDecodeOneStereoFrame( config ); } -static int encodeAndDecodeOneStereoFrameIvas20msLc3plus2_5ms_48kHz(void) +static int encodeAndDecodeOneStereoFrameIvas20msLc3plus2_5ms_48kHz( void ) { - LC3PLUS_CONFIG config = {.lc3plus_frame_duration_us = 2.5*1000, .ivas_frame_duration_us = 20*1000, .channels = 2, .samplerate = 48000}; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 2.5 * 1000, .ivas_frame_duration_us = 20 * 1000, .channels = 2, .samplerate = 48000 }; return encodeAndDecodeOneStereoFrame( config ); } +#include "ivas_lc3plus_unit_test_selective_decoding.c" + + int main( int argc, char *argv[] ) { int ret = 0; ret = openCloseEncoder(); - if(ret != 0) + if ( ret != 0 ) return ret; ret = tryOpenEncoderWithInvalidBitrate(); - if(ret != 0) + if ( ret != 0 ) return ret; ret = tryOpenEncoderWithInvalidFrameDuration(); - if(ret != 0) + if ( ret != 0 ) return ret; ret = tryOpenEncoderWithInvalidSampleRate(); - if(ret != 0) + if ( ret != 0 ) return ret; ret = tryCallEncoderApiWithInvalidParams(); - if(ret != 0) + if ( ret != 0 ) return ret; - ret = openCloseDecoder(); - if(ret != 0) + ret = openCloseDecoderWithCaching(); + if ( ret != 0 ) + return ret; + ret = openCloseDecoderWithoutCaching(); + if ( ret != 0 ) return ret; ret = tryOpenDecoderWithInvalidFrameDuration(); - if(ret != 0) + if ( ret != 0 ) return ret; ret = tryOpenDecoderWithInvalidSampleRate(); - if(ret != 0) + if ( ret != 0 ) return ret; ret = tryCallDecoderApiWithInvalidParams(); - if(ret != 0) + if ( ret != 0 ) return ret; ret = encodeOneFrame(); - if(ret != 0) + if ( ret != 0 ) return ret; ret = encodeAndDecodeOneMonoFrame(); - if(ret != 0) + if ( ret != 0 ) return ret; ret = encodeAndDecodeOneStereoFrameIvas20msLc3plus10ms_48kHz(); - if(ret != 0) + if ( ret != 0 ) return ret; ret = encodeAndDecodeOneStereoFrameIvas20msLc3plus10ms_32kHz(); - if(ret != 0) + if ( ret != 0 ) return ret; ret = encodeAndDecodeOneStereoFrameIvas20msLc3plus10ms_16kHz(); - if(ret != 0) + if ( ret != 0 ) return ret; ret = encodeAndDecodeOneStereoFrameIvas5msLc3plus5ms_48kHz(); - if(ret != 0) + if ( ret != 0 ) return ret; ret = encodeAndDecodeOneMonoFrameIvas20msLc3plus10ms_48kHz(); - if(ret != 0) + if ( ret != 0 ) return ret; ret = encodeAndDecodeOneMonoFrameIvas5msLc3plus5ms_48kHz(); - if(ret != 0) + if ( ret != 0 ) return ret; ret = encodeAndDecodeOneStereoFrameIvas20msLc3plus2_5ms_48kHz(); + if ( ret != 0 ) + return ret; + ret = selectiveDecIvas20msLc3plus5ms_48kHz_scenario_decode_all_subframes(); + if ( ret != 0 ) + return ret; + ret = selectiveDecIvas20msLc3plus5ms_48kHz_scenario_dont_decode_last_2_subframes(); + if ( ret != 0 ) + return ret; + ret = selectiveDecIvas20msLc3plus5ms_48kHz_scenario_dont_decode_last_3_subframes(); + if ( ret != 0 ) + return ret; + ret = selectiveDecIvas20msLc3plus5ms_48kHz_scenario_skip_first_subframe(); + if ( ret != 0 ) + return ret; + ret = selectiveDecIvas20msLc3plus5ms_48kHz_scenario_decode_cache(); + if ( ret != 0 ) + return ret; + ret = selectiveDecIvas20msLc3plus5ms_48kHz_scenario_per_subframe_switches_skip_first(); + if ( ret != 0 ) + return ret; + ret = selectiveDecIvas20msLc3plus5ms_48kHz_scenario_per_subframe_switches_dec_first(); + if ( ret != 0 ) + return ret; + ret = selectiveDecIvas20msLc3plus5ms_48kHz_scenario_per_subframe_bundle_switches_dec_first(); + if ( ret != 0 ) + return ret; + ret = selectiveDecIvas20msLc3plus5ms_48kHz_scenario_per_subframe_bundle_switches_skip_first(); + if ( ret != 0 ) + return ret; + ret = selectiveDecIvas20msLc3plus5ms_48kHz_scenario_get_active_dont_cache(); + if ( ret != 0 ) + return ret; +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING + ret = selectiveDecIvas20msLc3plus5ms_48kHz_scenario_per_subframe_switches_dec_first_no_caching(); + if ( ret != 0 ) + return ret; +#endif +#if 0 + ret = selectiveDecIvas5msLc3plus5ms_48kHz_scenario_decode_all_subframes(); + if(ret != 0) + return ret; + ret = selectiveDecIvas5msLc3plus5ms_48kHz_scenario_dont_decode_last_subframes(); + if(ret != 0) + return ret; +#endif return ret; } diff --git a/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test_selective_decoding.c b/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test_selective_decoding.c new file mode 100644 index 0000000000..3d8b6f1b0d --- /dev/null +++ b/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test_selective_decoding.c @@ -0,0 +1,1954 @@ +/****************************************************************************************************** + +(C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., +Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, +Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other +contributors to this repository. All Rights Reserved. + +This software is protected by copyright law and by international treaties. +The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, +Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., +Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, +Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other +contributors to this repository retain full ownership rights in their respective contributions in +the software. This notice grants no license of any kind, including but not limited to patent +license, nor is any license granted by implication, estoppel or otherwise. + +Contributors are required to enter into the IVAS codec Public Collaboration agreement before making +contributions. + +This software is provided "AS IS", without any express or implied warranties. The software is in the +development stage. It is intended exclusively for experts who have experience with such software and +solely for the purpose of inspection. All implied warranties of non-infringement, merchantability +and fitness for a particular purpose are hereby disclaimed and excluded. + +Any dispute, controversy or claim arising under or in relation to providing this software shall be +submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in +accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and +the United Nations Convention on Contracts on the International Sales of Goods. + +*******************************************************************************************************/ + +#include +#include +#include "ivas_lc3plus_enc.h" +#include "ivas_lc3plus_common.h" +#include "ivas_lc3plus_dec.h" +#include "ivas_error_utils.h" + +#define MAX_SAMPLES_PER_CHANNEL 960 + +/* included by ivas_lc3plus_unit_test.c */ + +typedef int ( *ScenarioFnPtr )( const LC3PLUS_CONFIG config, + IVAS_LC3PLUS_DEC_HANDLE dec, + uint8_t *bitstream_in, + int32_t bitstream_in_size, + float **pcm_out ); + +static int encodeAndDecodeOne6chFrameFixture( LC3PLUS_CONFIG config, const int16_t enableCaching, const int32_t bps, ScenarioFnPtr scenarioFn ) +{ + ivas_error err; + int32_t encDelay = -1; + int32_t decDelay = -1; + + IVAS_LC3PLUS_ENC_HANDLE encHandle; + err = IVAS_LC3PLUS_ENC_Open( config, bps, &encHandle ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + err = IVAS_LC3PLUS_ENC_GetDelay( encHandle, &encDelay ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + if ( encDelay == -1 || encDelay == 0 ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL, "encDelay is zero or uninitialized\n" ); + } + + /* encode one frame */ + int16_t numSamplesPerChannels = config.samplerate / ( 1000000 / config.ivas_frame_duration_us ); + float *pcm_in[6]; + float pcm_in_ch1[MAX_SAMPLES_PER_CHANNEL * sizeof( float )]; + memset( pcm_in_ch1, 0, numSamplesPerChannels * sizeof( float ) ); + float pcm_in_ch2[MAX_SAMPLES_PER_CHANNEL * sizeof( float )]; + memset( pcm_in_ch2, 0, numSamplesPerChannels * sizeof( float ) ); + float pcm_in_ch3[MAX_SAMPLES_PER_CHANNEL * sizeof( float )]; + memset( pcm_in_ch3, 0, numSamplesPerChannels * sizeof( float ) ); + float pcm_in_ch4[MAX_SAMPLES_PER_CHANNEL * sizeof( float )]; + memset( pcm_in_ch4, 0, numSamplesPerChannels * sizeof( float ) ); + float pcm_in_ch5[MAX_SAMPLES_PER_CHANNEL * sizeof( float )]; + memset( pcm_in_ch5, 0, numSamplesPerChannels * sizeof( float ) ); + float pcm_in_ch6[MAX_SAMPLES_PER_CHANNEL * sizeof( float )]; + memset( pcm_in_ch6, 0, numSamplesPerChannels * sizeof( float ) ); + pcm_in[0] = pcm_in_ch1; + pcm_in[1] = pcm_in_ch2; + pcm_in[2] = pcm_in_ch3; + pcm_in[3] = pcm_in_ch4; + pcm_in[4] = pcm_in_ch5; + pcm_in[5] = pcm_in_ch6; + + int32_t bitstreamSizePerIvasFrame = 0; + err = IVAS_LC3PLUS_ENC_GetOutputBitstreamSize( encHandle, &bitstreamSizePerIvasFrame ); + if ( IVAS_ERR_OK != err ) + return err; + + uint8_t *bitstream_out = malloc( bitstreamSizePerIvasFrame ); + memset( bitstream_out, 0, bitstreamSizePerIvasFrame ); + + err = IVAS_LC3PLUS_ENC_Encode( encHandle, pcm_in, bitstream_out ); + if ( IVAS_ERR_OK != err ) + return err; + IVAS_LC3PLUS_ENC_Close( &encHandle ); + + /* decode one frame */ + IVAS_LC3PLUS_DEC_HANDLE decHandle; + err = IVAS_LC3PLUS_DEC_Open( config, +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING + enableCaching, +#endif + &decHandle ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + err = IVAS_LC3PLUS_DEC_GetDelay( decHandle, &decDelay ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + if ( decDelay == -1 || decDelay == 0 ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL, "decDelay is zero or uninitialized\n" ); + } + + uint8_t *bitstream_in = bitstream_out; + + float *pcm_out[6]; + float pcm_out_ch1[MAX_SAMPLES_PER_CHANNEL * sizeof( float )]; + memset( pcm_out_ch1, 0, numSamplesPerChannels * sizeof( float ) ); + float pcm_out_ch2[MAX_SAMPLES_PER_CHANNEL * sizeof( float )]; + memset( pcm_out_ch2, 0, numSamplesPerChannels * sizeof( float ) ); + float pcm_out_ch3[MAX_SAMPLES_PER_CHANNEL * sizeof( float )]; + memset( pcm_out_ch3, 0, numSamplesPerChannels * sizeof( float ) ); + float pcm_out_ch4[MAX_SAMPLES_PER_CHANNEL * sizeof( float )]; + memset( pcm_out_ch4, 0, numSamplesPerChannels * sizeof( float ) ); + float pcm_out_ch5[MAX_SAMPLES_PER_CHANNEL * sizeof( float )]; + memset( pcm_out_ch5, 0, numSamplesPerChannels * sizeof( float ) ); + float pcm_out_ch6[MAX_SAMPLES_PER_CHANNEL * sizeof( float )]; + memset( pcm_out_ch6, 0, numSamplesPerChannels * sizeof( float ) ); + pcm_out[0] = pcm_out_ch1; + pcm_out[1] = pcm_out_ch2; + pcm_out[2] = pcm_out_ch3; + pcm_out[3] = pcm_out_ch4; + pcm_out[4] = pcm_out_ch5; + pcm_out[5] = pcm_out_ch6; + + err = IVAS_LC3PLUS_DEC_Conceal( decHandle, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstreamSizePerIvasFrame, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + if ( NULL != scenarioFn ) + { + err = ( *scenarioFn )( config, decHandle, bitstream_in, bitstreamSizePerIvasFrame, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + } + + err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstreamSizePerIvasFrame, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + err = IVAS_LC3PLUS_DEC_Conceal( decHandle, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + IVAS_LC3PLUS_DEC_Close( &decHandle ); + free( bitstream_out ); + + return 0; +} + +/* + * in: [dec, dec, dec, dec] + * expected out: [dec_and_use, dec_and_use, dec_and_use, dec_and_use] + */ +static int scenario_decode_all_subframes( const LC3PLUS_CONFIG config, + IVAS_LC3PLUS_DEC_HANDLE decHandle, /* i: decoder handle */ + uint8_t *bitstream_in, /* i: pointer to input bitstream */ + int32_t bitstream_in_size, /* i: size of bitstream_in */ + float **pcm_out /* o: decoded samples */ ) +{ + ivas_error err; + const int16_t decode = 1; + // const int16_t skipDecoding = 0; + uint32_t iDec = 0; + int iLc3plusFrame = 0; + int lc3framesPerIvasFrame; + int16_t **selective_decoding_matrix; + err = IVAS_LC3PLUS_DEC_AllocateSubframeDecodingMatrix( &selective_decoding_matrix, config.channels ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* Set selective decoding scenario */ + for ( int16_t iSubframeIdx = 0; iSubframeIdx < MAX_PARAM_SPATIAL_SUBFRAMES; iSubframeIdx++ ) + { + for ( int16_t decIdx = 0; decIdx < config.channels; decIdx++ ) + { + selective_decoding_matrix[iSubframeIdx][decIdx] = decode; + } + } + + /* Apply selective decoding scenario */ + err = IVAS_LC3PLUS_DEC_SetSelectiveDecodingMatrix( decHandle, selective_decoding_matrix ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder actions */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + assert( decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame == 0 ); + if(NULL != decHandle->bitstream_caches) + { + assert( 0 == decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + } + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + + err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstream_in_size, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct post decoding state */ + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 0 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 == decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + } + + IVAS_LC3PLUS_DEC_FreeSubframeDecodingMatrix( selective_decoding_matrix ); + return IVAS_ERR_OK; +} + + +/* + * in: [dec, dec, skip, skip] + * expected out: [dec_and_use, dec_and_use, skip, cache] + */ +static int scenario_dont_decode_last_2_subframes( + const LC3PLUS_CONFIG config, + IVAS_LC3PLUS_DEC_HANDLE decHandle, /* i: decoder handle */ + uint8_t *bitstream_in, /* i: pointer to input bitstream */ + int32_t bitstream_in_size, /* i: size of bitstream_in */ + float **pcm_out /* o: decoded samples */ ) +{ + ivas_error err; + const int16_t decode = 1; + const int16_t skipDecoding = 0; + uint32_t iDec = 0; + int iLc3plusFrame = 0; + int lc3framesPerIvasFrame; + int16_t **selective_decoding_matrix; + err = IVAS_LC3PLUS_DEC_AllocateSubframeDecodingMatrix( &selective_decoding_matrix, config.channels ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* Set selective decoding scenario */ + for ( int16_t iSubframeIdx = 0; iSubframeIdx < MAX_PARAM_SPATIAL_SUBFRAMES; iSubframeIdx++ ) + { + for ( int16_t decIdx = 0; decIdx < config.channels; decIdx++ ) + { + assert( MAX_PARAM_SPATIAL_SUBFRAMES == 4 ); + if ( iSubframeIdx == MAX_PARAM_SPATIAL_SUBFRAMES - 1 || iSubframeIdx == MAX_PARAM_SPATIAL_SUBFRAMES - 2 ) /*only valid for MAX_PARAM_SPATIAL_SUBFRAMES == 4 */ + { + /* skip the last two subframes */ + selective_decoding_matrix[iSubframeIdx][decIdx] = skipDecoding; + } + else + { + /* decode the previous ones */ + selective_decoding_matrix[iSubframeIdx][decIdx] = decode; + } + } + } + + /* Apply selective decoding scenario */ + err = IVAS_LC3PLUS_DEC_SetSelectiveDecodingMatrix( decHandle, selective_decoding_matrix ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder actions */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + if(NULL != decHandle->bitstream_caches) + { + assert( 0 == decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + } + if ( iLc3plusFrame == lc3framesPerIvasFrame - 1 ) + { + /* last subframe is expected to be cached */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_CACHE ); + } + else if ( iLc3plusFrame == lc3framesPerIvasFrame - 2 ) + { + /* subframe before the last one is expected to be skipped, since only the last one is required to flush the decoder after a pause */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_SKIP ); + } + else + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + } + + err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstream_in_size, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder caching */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 1 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 != decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + /* default action after decoding should be DEC_ACTION_DECODE_AND_USE again */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + + IVAS_LC3PLUS_DEC_FreeSubframeDecodingMatrix( selective_decoding_matrix ); + return IVAS_ERR_OK; +} + +/* + * in: [dec, skip, skip, skip] + * expected out: [dec_and_use, skip, skip, cache] + */ +static int scenario_dont_decode_last_3_subframes( + const LC3PLUS_CONFIG config, + IVAS_LC3PLUS_DEC_HANDLE decHandle, /* i: decoder handle */ + uint8_t *bitstream_in, /* i: pointer to input bitstream */ + int32_t bitstream_in_size, /* i: size of bitstream_in */ + float **pcm_out /* o: decoded samples */ ) +{ + ivas_error err; + const int16_t decode = 1; + const int16_t skipDecoding = 0; + uint32_t iDec = 0; + int iLc3plusFrame = 0; + int lc3framesPerIvasFrame; + int16_t **selective_decoding_matrix; + err = IVAS_LC3PLUS_DEC_AllocateSubframeDecodingMatrix( &selective_decoding_matrix, config.channels ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* Set selective decoding scenario */ + for ( int16_t iSubframeIdx = 0; iSubframeIdx < MAX_PARAM_SPATIAL_SUBFRAMES; iSubframeIdx++ ) + { + for ( int16_t decIdx = 0; decIdx < config.channels; decIdx++ ) + { + assert( MAX_PARAM_SPATIAL_SUBFRAMES == 4 ); + if ( iSubframeIdx == MAX_PARAM_SPATIAL_SUBFRAMES - 1 || iSubframeIdx == MAX_PARAM_SPATIAL_SUBFRAMES - 2 || iSubframeIdx == MAX_PARAM_SPATIAL_SUBFRAMES - 3 ) /*only valid for MAX_PARAM_SPATIAL_SUBFRAMES == 4 */ + { + /* skip the last three subframes */ + selective_decoding_matrix[iSubframeIdx][decIdx] = skipDecoding; + } + else + { + /* decode the previous ones */ + selective_decoding_matrix[iSubframeIdx][decIdx] = decode; + } + } + } + + /* Apply selective decoding scenario */ + err = IVAS_LC3PLUS_DEC_SetSelectiveDecodingMatrix( decHandle, selective_decoding_matrix ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder actions */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 0 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 == decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + if ( iLc3plusFrame == lc3framesPerIvasFrame - 1 ) + { + /* last subframe is expected to be cached */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_CACHE ); + } + else if ( iLc3plusFrame == lc3framesPerIvasFrame - 2 ) + { + /* subframes before the last one is expected to be skipped, since only the last one is required to flush the decoder after a pause */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_SKIP ); + } + else if ( iLc3plusFrame == lc3framesPerIvasFrame - 3 ) + { + /* subframes before the last one is expected to be skipped, since only the last one is required to flush the decoder after a pause */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_SKIP ); + } + else + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + } + + err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstream_in_size, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder caching */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 1 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 != decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + /* default action after decoding should be DEC_ACTION_DECODE_AND_USE again */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + + IVAS_LC3PLUS_DEC_FreeSubframeDecodingMatrix( selective_decoding_matrix ); + return IVAS_ERR_OK; +} + + +/* + * in: [skip, dec, dec, dec] + * expected out: [dec_and_drop, dec_and_use, dec_and_use, dec_and_use] + */ +static int scenario_skip_first_subframe( + const LC3PLUS_CONFIG config, + IVAS_LC3PLUS_DEC_HANDLE decHandle, /* i: decoder handle */ + uint8_t *bitstream_in, /* i: pointer to input bitstream */ + int32_t bitstream_in_size, /* i: size of bitstream_in */ + float **pcm_out /* o: decoded samples */ ) +{ + ivas_error err; + const int16_t decode = 1; + const int16_t skipDecoding = 0; + uint32_t iDec = 0; + int iLc3plusFrame = 0; + int lc3framesPerIvasFrame; + int16_t **selective_decoding_matrix; + err = IVAS_LC3PLUS_DEC_AllocateSubframeDecodingMatrix( &selective_decoding_matrix, config.channels ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* Set selective decoding scenario */ + for ( int16_t iSubframeIdx = 0; iSubframeIdx < MAX_PARAM_SPATIAL_SUBFRAMES; iSubframeIdx++ ) + { + for ( int16_t decIdx = 0; decIdx < config.channels; decIdx++ ) + { + if ( iSubframeIdx == 0 ) + { + /* skip the first subframe */ + selective_decoding_matrix[iSubframeIdx][decIdx] = skipDecoding; + } + else + { + /* decode the following subframes */ + selective_decoding_matrix[iSubframeIdx][decIdx] = decode; + } + } + } + + /* Apply selective decoding scenario */ + err = IVAS_LC3PLUS_DEC_SetSelectiveDecodingMatrix( decHandle, selective_decoding_matrix ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder actions */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 == decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + + if ( iLc3plusFrame == 0 ) + { + /* first subframe is expected to be decoded and dropped */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_DROP ); + } + else + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + } + + err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstream_in_size, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder caching */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 0 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 == decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + /* default action after decoding should be DEC_ACTION_DECODE_AND_USE again */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + + IVAS_LC3PLUS_DEC_FreeSubframeDecodingMatrix( selective_decoding_matrix ); + return IVAS_ERR_OK; +} + +/* + * Step1: + * in: [dec, dec, skip, skip] + * expected out: [dec_and_use, dec_and_use, skip, cache] + * + * Step2: + * in: [dec, dec, dec, dec] + * expected out: [dec_cache & dec_and_use, dec_and_use, dec_and_use, dec_and_use] + */ +static int scenario_decode_cache( + const LC3PLUS_CONFIG config, + IVAS_LC3PLUS_DEC_HANDLE decHandle, /* i: decoder handle */ + uint8_t *bitstream_in, /* i: pointer to input bitstream */ + int32_t bitstream_in_size, /* i: size of bitstream_in */ + float **pcm_out /* o: decoded samples */ ) +{ + ivas_error err; + const int16_t decode = 1; + const int16_t skipDecoding = 0; + uint32_t iDec = 0; + int iLc3plusFrame = 0; + int lc3framesPerIvasFrame; + int16_t **selective_decoding_matrix; + err = IVAS_LC3PLUS_DEC_AllocateSubframeDecodingMatrix( &selective_decoding_matrix, config.channels ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* Set selective decoding scenario */ + for ( int16_t iSubframeIdx = 0; iSubframeIdx < MAX_PARAM_SPATIAL_SUBFRAMES; iSubframeIdx++ ) + { + for ( int16_t decIdx = 0; decIdx < config.channels; decIdx++ ) + { + assert( MAX_PARAM_SPATIAL_SUBFRAMES == 4 ); + if ( iSubframeIdx == MAX_PARAM_SPATIAL_SUBFRAMES - 1 || iSubframeIdx == MAX_PARAM_SPATIAL_SUBFRAMES - 2 ) /*only valid for MAX_PARAM_SPATIAL_SUBFRAMES == 4 */ + { + /* skip the last two subframes */ + selective_decoding_matrix[iSubframeIdx][decIdx] = skipDecoding; + } + else + { + /* decode the previous ones */ + selective_decoding_matrix[iSubframeIdx][decIdx] = decode; + } + } + } + + /* Apply selective decoding scenario */ + err = IVAS_LC3PLUS_DEC_SetSelectiveDecodingMatrix( decHandle, selective_decoding_matrix ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder actions */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 0 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 == decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + + if ( iLc3plusFrame == lc3framesPerIvasFrame - 1 ) + { + /* last subframe is expected to be cached */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_CACHE ); + } + else if ( iLc3plusFrame == lc3framesPerIvasFrame - 2 ) + { + /* subframe before the last one is expected to be skipped, since only the last one is required to flush the decoder after a pause */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_SKIP ); + } + else + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + } + + err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstream_in_size, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder caching */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 1 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 != decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + /* default action after decoding should be DEC_ACTION_DECODE_AND_USE again */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + + /* Step 2, ensure that the cache is used */ + for ( int16_t iSubframeIdx = 0; iSubframeIdx < MAX_PARAM_SPATIAL_SUBFRAMES; iSubframeIdx++ ) + { + for ( int16_t decIdx = 0; decIdx < config.channels; decIdx++ ) + { + /* decode all */ + selective_decoding_matrix[iSubframeIdx][decIdx] = decode; + } + } + /* Apply selective decoding scenario */ + err = IVAS_LC3PLUS_DEC_SetSelectiveDecodingMatrix( decHandle, selective_decoding_matrix ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + /* verify correct decoder actions */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 1 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 1 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 != decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstream_in_size, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + /* verify correct post-decoding state */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 0 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 == decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + /* default action after decoding should be DEC_ACTION_DECODE_AND_USE again */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + + IVAS_LC3PLUS_DEC_FreeSubframeDecodingMatrix( selective_decoding_matrix ); + return IVAS_ERR_OK; +} + +/* + * Step1: + * in: [skip, skip, dec, dec] + * expected out: [skip, dec_and_drop, dec_and_use, dec_and_use] + * + * Step2: + * in: [dec, dec, dec, dec] + * expected out: [no_cache & dec_and_use, dec_and_use, dec_and_use, dec_and_use] + */ +static int scenario_get_active_dont_cache( + const LC3PLUS_CONFIG config, + IVAS_LC3PLUS_DEC_HANDLE decHandle, /* i: decoder handle */ + uint8_t *bitstream_in, /* i: pointer to input bitstream */ + int32_t bitstream_in_size, /* i: size of bitstream_in */ + float **pcm_out /* o: decoded samples */ ) +{ + ivas_error err; + const int16_t decode = 1; + const int16_t skipDecoding = 0; + uint32_t iDec = 0; + int iLc3plusFrame = 0; + int lc3framesPerIvasFrame; + int16_t **selective_decoding_matrix; + err = IVAS_LC3PLUS_DEC_AllocateSubframeDecodingMatrix( &selective_decoding_matrix, config.channels ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* Set selective decoding scenario */ + for ( int16_t iSubframeIdx = 0; iSubframeIdx < MAX_PARAM_SPATIAL_SUBFRAMES; iSubframeIdx++ ) + { + for ( int16_t decIdx = 0; decIdx < config.channels; decIdx++ ) + { + assert( MAX_PARAM_SPATIAL_SUBFRAMES == 4 ); + if ( iSubframeIdx == MAX_PARAM_SPATIAL_SUBFRAMES - 1 || iSubframeIdx == MAX_PARAM_SPATIAL_SUBFRAMES - 2 ) /*only valid for MAX_PARAM_SPATIAL_SUBFRAMES == 4 */ + { + /* skip the last two subframes */ + selective_decoding_matrix[iSubframeIdx][decIdx] = decode; + } + else + { + /* decode the previous ones */ + selective_decoding_matrix[iSubframeIdx][decIdx] = skipDecoding; + } + } + } + + /* Apply selective decoding scenario */ + err = IVAS_LC3PLUS_DEC_SetSelectiveDecodingMatrix( decHandle, selective_decoding_matrix ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder actions + * * expected out: [skip, dec_and_drop, dec_and_use, dec_and_use] */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 0 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 == decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + if ( iLc3plusFrame == lc3framesPerIvasFrame - 1 ) + { + /* last subframe is expected to be cached */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + else if ( iLc3plusFrame == lc3framesPerIvasFrame - 2 ) + { + /* subframe before the last one is expected to be skipped, since only the last one is required to flush the decoder after a pause */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + else if ( iLc3plusFrame == lc3framesPerIvasFrame - 3 ) + { + /* subframe before the last one is expected to be skipped, since only the last one is required to flush the decoder after a pause */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_DROP ); + } + else + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_SKIP ); + } + } + } + + err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstream_in_size, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder caching */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 0 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 == decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + /* default action after decoding should be DEC_ACTION_DECODE_AND_USE again */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + + /* Step 2, ensure that there is no cache */ + for ( int16_t iSubframeIdx = 0; iSubframeIdx < MAX_PARAM_SPATIAL_SUBFRAMES; iSubframeIdx++ ) + { + for ( int16_t decIdx = 0; decIdx < config.channels; decIdx++ ) + { + /* decode all [dec, dec, dec, dec]*/ + selective_decoding_matrix[iSubframeIdx][decIdx] = decode; + } + } + /* Apply selective decoding scenario */ + err = IVAS_LC3PLUS_DEC_SetSelectiveDecodingMatrix( decHandle, selective_decoding_matrix ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + /* verify correct decoder actions + * expected out: [no_cache & dec_and_use, dec_and_use, dec_and_use, dec_and_use]*/ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 0 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 == decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstream_in_size, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + /* verify correct post-decoding state */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 0 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 == decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + /* default action after decoding should be DEC_ACTION_DECODE_AND_USE again */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + + IVAS_LC3PLUS_DEC_FreeSubframeDecodingMatrix( selective_decoding_matrix ); + return IVAS_ERR_OK; +} + + +/* + * Step1: + * in: [dec, dec, skip, skip] + * expected out: [dec_and_use, dec_and_use, skip, cache] + * + * Step2: + * in: [skip, dec, skip, dec] + * expected out: [drop_cache & dec_and_drop, dec_and_use, dec_and_drop, dec_and_use] + * */ +static int scenario_per_subframe_switches_skip_first( + const LC3PLUS_CONFIG config, + IVAS_LC3PLUS_DEC_HANDLE decHandle, /* i: decoder handle */ + uint8_t *bitstream_in, /* i: pointer to input bitstream */ + int32_t bitstream_in_size, /* i: size of bitstream_in */ + float **pcm_out /* o: decoded samples */ ) +{ + ivas_error err; + const int16_t decode = 1; + const int16_t skipDecoding = 0; + uint32_t iDec = 0; + int iLc3plusFrame = 0; + int lc3framesPerIvasFrame; + int16_t **selective_decoding_matrix; + err = IVAS_LC3PLUS_DEC_AllocateSubframeDecodingMatrix( &selective_decoding_matrix, config.channels ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* Set selective decoding scenario */ + for ( int16_t iSubframeIdx = 0; iSubframeIdx < MAX_PARAM_SPATIAL_SUBFRAMES; iSubframeIdx++ ) + { + for ( int16_t decIdx = 0; decIdx < config.channels; decIdx++ ) + { + assert( MAX_PARAM_SPATIAL_SUBFRAMES == 4 ); + if ( iSubframeIdx == MAX_PARAM_SPATIAL_SUBFRAMES - 1 || iSubframeIdx == MAX_PARAM_SPATIAL_SUBFRAMES - 2 ) /*only valid for MAX_PARAM_SPATIAL_SUBFRAMES == 4 */ + { + /* skip the last two subframes */ + selective_decoding_matrix[iSubframeIdx][decIdx] = skipDecoding; + } + else + { + /* decode the previous ones */ + selective_decoding_matrix[iSubframeIdx][decIdx] = decode; + } + } + } + + /* Apply selective decoding scenario */ + err = IVAS_LC3PLUS_DEC_SetSelectiveDecodingMatrix( decHandle, selective_decoding_matrix ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder actions */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 0 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 == decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + if ( iLc3plusFrame == lc3framesPerIvasFrame - 1 ) + { + /* last subframe is expected to be cached */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_CACHE ); + } + else if ( iLc3plusFrame == lc3framesPerIvasFrame - 2 ) + { + /* subframe before the last one is expected to be skipped, since only the last one is required to flush the decoder after a pause */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_SKIP ); + } + else + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + } + + err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstream_in_size, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder caching */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 1 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 != decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + /* default action after decoding should be DEC_ACTION_DECODE_AND_USE again */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + + /* Step 2 + * in: [skip, dec, skip, dec] + * */ + for ( int16_t iSubframeIdx = 0; iSubframeIdx < MAX_PARAM_SPATIAL_SUBFRAMES; iSubframeIdx++ ) + { + for ( int16_t decIdx = 0; decIdx < config.channels; decIdx++ ) + { + if(iSubframeIdx == 0 || iSubframeIdx == 2) + { + selective_decoding_matrix[iSubframeIdx][decIdx] = skipDecoding; + } + else if(iSubframeIdx == 1 || iSubframeIdx == 3) + { + selective_decoding_matrix[iSubframeIdx][decIdx] = decode; + } + else + { + printf("unsupported iSubframeIdx count"); + return 1; + } + + } + } + /* Apply selective decoding scenario */ + err = IVAS_LC3PLUS_DEC_SetSelectiveDecodingMatrix( decHandle, selective_decoding_matrix ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder actions + * expected out: [drop_cache & dec_and_drop, dec_and_use, dec_and_drop, dec_and_use] + * */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 1 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 != decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + if ( iLc3plusFrame == 1 || iLc3plusFrame == 3) + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + else if ( iLc3plusFrame == 0 || iLc3plusFrame == 2) + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_DROP ); + } + else + { + assert(0); + } + } + } + err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstream_in_size, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + /* verify correct post-decoding state */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 0 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 == decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + /* default action after decoding should be DEC_ACTION_DECODE_AND_USE again */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + + IVAS_LC3PLUS_DEC_FreeSubframeDecodingMatrix( selective_decoding_matrix ); + return IVAS_ERR_OK; +} + +/* + * Step1: + * in: [dec, dec, skip, skip] + * expected out: [dec_and_use, dec_and_use, skip, cache] + * + * Step2: + * in: [dec, skip, dec, skip] + * expected out: [dec_cache & dec_and_use, dec_and_drop, dec_and_use, cache] + * */ +static int scenario_per_subframe_switches_dec_first( + const LC3PLUS_CONFIG config, + IVAS_LC3PLUS_DEC_HANDLE decHandle, /* i: decoder handle */ + uint8_t *bitstream_in, /* i: pointer to input bitstream */ + int32_t bitstream_in_size, /* i: size of bitstream_in */ + float **pcm_out /* o: decoded samples */ ) +{ + ivas_error err; + const int16_t decode = 1; + const int16_t skipDecoding = 0; + uint32_t iDec = 0; + int iLc3plusFrame = 0; + int lc3framesPerIvasFrame; + int16_t **selective_decoding_matrix; + err = IVAS_LC3PLUS_DEC_AllocateSubframeDecodingMatrix( &selective_decoding_matrix, config.channels ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* Set selective decoding scenario */ + for ( int16_t iSubframeIdx = 0; iSubframeIdx < MAX_PARAM_SPATIAL_SUBFRAMES; iSubframeIdx++ ) + { + for ( int16_t decIdx = 0; decIdx < config.channels; decIdx++ ) + { + assert( MAX_PARAM_SPATIAL_SUBFRAMES == 4 ); + if ( iSubframeIdx == MAX_PARAM_SPATIAL_SUBFRAMES - 1 || iSubframeIdx == MAX_PARAM_SPATIAL_SUBFRAMES - 2 ) /*only valid for MAX_PARAM_SPATIAL_SUBFRAMES == 4 */ + { + /* skip the last two subframes */ + selective_decoding_matrix[iSubframeIdx][decIdx] = skipDecoding; + } + else + { + /* decode the previous ones */ + selective_decoding_matrix[iSubframeIdx][decIdx] = decode; + } + } + } + + /* Apply selective decoding scenario */ + err = IVAS_LC3PLUS_DEC_SetSelectiveDecodingMatrix( decHandle, selective_decoding_matrix ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder actions */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 0 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 == decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + if ( iLc3plusFrame == lc3framesPerIvasFrame - 1 ) + { + /* last subframe is expected to be cached */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_CACHE ); + } + else if ( iLc3plusFrame == lc3framesPerIvasFrame - 2 ) + { + /* subframe before the last one is expected to be skipped, since only the last one is required to flush the decoder after a pause */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_SKIP ); + } + else + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + } + + err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstream_in_size, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder caching */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 1 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 != decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + /* default action after decoding should be DEC_ACTION_DECODE_AND_USE again */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + + /* Step 2 + * in: [dec, skip, dec, skip] + * */ + for ( int16_t iSubframeIdx = 0; iSubframeIdx < MAX_PARAM_SPATIAL_SUBFRAMES; iSubframeIdx++ ) + { + for ( int16_t decIdx = 0; decIdx < config.channels; decIdx++ ) + { + if(iSubframeIdx == 0 || iSubframeIdx == 2) + { + selective_decoding_matrix[iSubframeIdx][decIdx] = decode; + } + else if(iSubframeIdx == 1 || iSubframeIdx == 3) + { + selective_decoding_matrix[iSubframeIdx][decIdx] = skipDecoding; + } + else + { + printf("unsupported iSubframeIdx count"); + return 1; + } + + } + } + /* Apply selective decoding scenario */ + err = IVAS_LC3PLUS_DEC_SetSelectiveDecodingMatrix( decHandle, selective_decoding_matrix ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder actions + * expected out: [dec_cache & dec_and_use, dec_and_drop, dec_and_use, cache] + * */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 1 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 1 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 != decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + if ( iLc3plusFrame == 0 ) + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + else if ( iLc3plusFrame == 1 ) + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_DROP ); + } + else if ( iLc3plusFrame == 2 ) + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + else if ( iLc3plusFrame == 3) + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_CACHE ); + } + else + { + assert(0); + } + } + } + err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstream_in_size, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + /* verify correct post-decoding state */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 1 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 != decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + /* default action after decoding should be DEC_ACTION_DECODE_AND_USE again */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + + IVAS_LC3PLUS_DEC_FreeSubframeDecodingMatrix( selective_decoding_matrix ); + return IVAS_ERR_OK; +} + +/* + * Step1: + * in: [dec, dec, skip, skip] + * expected out: [dec_and_use, dec_and_use, skip, skip] + * + * Step2: + * in: [dec, skip, dec, skip] + * expected out: [drop_cache & dec_and_use, skip, dec_and_use, skip] + * */ +static int scenario_per_subframe_switches_dec_first_no_caching( + const LC3PLUS_CONFIG config, + IVAS_LC3PLUS_DEC_HANDLE decHandle, /* i: decoder handle */ + uint8_t *bitstream_in, /* i: pointer to input bitstream */ + int32_t bitstream_in_size, /* i: size of bitstream_in */ + float **pcm_out /* o: decoded samples */ ) +{ + ivas_error err; + const int16_t decode = 1; + const int16_t skipDecoding = 0; + uint32_t iDec = 0; + int iLc3plusFrame = 0; + int lc3framesPerIvasFrame; + int16_t **selective_decoding_matrix; + err = IVAS_LC3PLUS_DEC_AllocateSubframeDecodingMatrix( &selective_decoding_matrix, config.channels ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* Set selective decoding scenario */ + for ( int16_t iSubframeIdx = 0; iSubframeIdx < MAX_PARAM_SPATIAL_SUBFRAMES; iSubframeIdx++ ) + { + for ( int16_t decIdx = 0; decIdx < config.channels; decIdx++ ) + { + assert( MAX_PARAM_SPATIAL_SUBFRAMES == 4 ); + if ( iSubframeIdx == MAX_PARAM_SPATIAL_SUBFRAMES - 1 || iSubframeIdx == MAX_PARAM_SPATIAL_SUBFRAMES - 2 ) /*only valid for MAX_PARAM_SPATIAL_SUBFRAMES == 4 */ + { + /* skip the last two subframes */ + selective_decoding_matrix[iSubframeIdx][decIdx] = skipDecoding; + } + else + { + /* decode the previous ones */ + selective_decoding_matrix[iSubframeIdx][decIdx] = decode; + } + } + } + + /* Apply selective decoding scenario */ + err = IVAS_LC3PLUS_DEC_SetSelectiveDecodingMatrix( decHandle, selective_decoding_matrix ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder actions */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 0 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( NULL == decHandle->bitstream_caches ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + if ( iLc3plusFrame == lc3framesPerIvasFrame - 1 ) + { + /* last subframe is expected to be cached */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_SKIP ); + } + else if ( iLc3plusFrame == lc3framesPerIvasFrame - 2 ) + { + /* subframe before the last one is expected to be skipped, since only the last one is required to flush the decoder after a pause */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_SKIP ); + } + else + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + } + + err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstream_in_size, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder caching */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 1 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( NULL == decHandle->bitstream_caches ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + /* default action after decoding should be DEC_ACTION_DECODE_AND_USE again */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + + /* Step 2 + * in: [dec, skip, dec, skip] + * */ + for ( int16_t iSubframeIdx = 0; iSubframeIdx < MAX_PARAM_SPATIAL_SUBFRAMES; iSubframeIdx++ ) + { + for ( int16_t decIdx = 0; decIdx < config.channels; decIdx++ ) + { + if(iSubframeIdx == 0 || iSubframeIdx == 2) + { + selective_decoding_matrix[iSubframeIdx][decIdx] = decode; + } + else if(iSubframeIdx == 1 || iSubframeIdx == 3) + { + selective_decoding_matrix[iSubframeIdx][decIdx] = skipDecoding; + } + else + { + printf("unsupported iSubframeIdx count"); + return 1; + } + + } + } + /* Apply selective decoding scenario */ + err = IVAS_LC3PLUS_DEC_SetSelectiveDecodingMatrix( decHandle, selective_decoding_matrix ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder actions + * expected out: [drop_cache & dec_and_use, skip, dec_and_use, skip] + * */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 1 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( NULL == decHandle->bitstream_caches ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + if ( iLc3plusFrame == 0 ) + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + else if ( iLc3plusFrame == 1 ) + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_SKIP ); + } + else if ( iLc3plusFrame == 2 ) + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + else if ( iLc3plusFrame == 3) + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_SKIP ); + } + else + { + assert(0); + } + } + } + err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstream_in_size, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + /* verify correct post-decoding state */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 1 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( NULL == decHandle->bitstream_caches ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + /* default action after decoding should be DEC_ACTION_DECODE_AND_USE again */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + + IVAS_LC3PLUS_DEC_FreeSubframeDecodingMatrix( selective_decoding_matrix ); + return IVAS_ERR_OK; +} + + +/* + * Step1: + * in: [dec, dec, skip, skip] + * expected out: [dec_and_use, dec_and_use, skip, cache] + * + * Step2: + * in: [dec, skip, skip, dec] + * expected out: [dec_cache & dec_and_use, skip, dec_and_drop, dec_and_use] + * */ +static int scenario_per_subframe_bundle_switches_dec_first( + const LC3PLUS_CONFIG config, + IVAS_LC3PLUS_DEC_HANDLE decHandle, /* i: decoder handle */ + uint8_t *bitstream_in, /* i: pointer to input bitstream */ + int32_t bitstream_in_size, /* i: size of bitstream_in */ + float **pcm_out /* o: decoded samples */ ) +{ + ivas_error err; + const int16_t decode = 1; + const int16_t skipDecoding = 0; + uint32_t iDec = 0; + int iLc3plusFrame = 0; + int lc3framesPerIvasFrame; + int16_t **selective_decoding_matrix; + err = IVAS_LC3PLUS_DEC_AllocateSubframeDecodingMatrix( &selective_decoding_matrix, config.channels ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* Set selective decoding scenario */ + for ( int16_t iSubframeIdx = 0; iSubframeIdx < MAX_PARAM_SPATIAL_SUBFRAMES; iSubframeIdx++ ) + { + for ( int16_t decIdx = 0; decIdx < config.channels; decIdx++ ) + { + assert( MAX_PARAM_SPATIAL_SUBFRAMES == 4 ); + if ( iSubframeIdx == MAX_PARAM_SPATIAL_SUBFRAMES - 1 || iSubframeIdx == MAX_PARAM_SPATIAL_SUBFRAMES - 2 ) /*only valid for MAX_PARAM_SPATIAL_SUBFRAMES == 4 */ + { + /* skip the last two subframes */ + selective_decoding_matrix[iSubframeIdx][decIdx] = skipDecoding; + } + else + { + /* decode the previous ones */ + selective_decoding_matrix[iSubframeIdx][decIdx] = decode; + } + } + } + + /* Apply selective decoding scenario */ + err = IVAS_LC3PLUS_DEC_SetSelectiveDecodingMatrix( decHandle, selective_decoding_matrix ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder actions */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 0 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 == decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + if ( iLc3plusFrame == lc3framesPerIvasFrame - 1 ) + { + /* last subframe is expected to be cached */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_CACHE ); + } + else if ( iLc3plusFrame == lc3framesPerIvasFrame - 2 ) + { + /* subframe before the last one is expected to be skipped, since only the last one is required to flush the decoder after a pause */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_SKIP ); + } + else + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + } + + err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstream_in_size, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder caching */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 1 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 != decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + /* default action after decoding should be DEC_ACTION_DECODE_AND_USE again */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + + /* Step 2 + * in: [dec, skip, skip, dec] + * */ + for ( int16_t iSubframeIdx = 0; iSubframeIdx < MAX_PARAM_SPATIAL_SUBFRAMES; iSubframeIdx++ ) + { + for ( int16_t decIdx = 0; decIdx < config.channels; decIdx++ ) + { + if(iSubframeIdx == 0 || iSubframeIdx == 3) + { + selective_decoding_matrix[iSubframeIdx][decIdx] = decode; + } + else if(iSubframeIdx == 1 || iSubframeIdx == 2) + { + selective_decoding_matrix[iSubframeIdx][decIdx] = skipDecoding; + } + else + { + printf("unsupported iSubframeIdx count"); + return 1; + } + + } + } + /* Apply selective decoding scenario */ + err = IVAS_LC3PLUS_DEC_SetSelectiveDecodingMatrix( decHandle, selective_decoding_matrix ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder actions + * expected out: [dec_cache & dec_and_use, skip, dec_and_drop, dec_and_use] + * */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 1 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 1 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 != decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + if ( iLc3plusFrame == 0 ) + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + else if ( iLc3plusFrame == 1 ) + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_SKIP ); + } + else if ( iLc3plusFrame == 2 ) + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_DROP ); + } + else if ( iLc3plusFrame == 3) + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + else + { + assert(0); + } + } + } + err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstream_in_size, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + /* verify correct post-decoding state */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 0 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 == decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + /* default action after decoding should be DEC_ACTION_DECODE_AND_USE again */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + + IVAS_LC3PLUS_DEC_FreeSubframeDecodingMatrix( selective_decoding_matrix ); + return IVAS_ERR_OK; +} + +/* + * Step1: + * in: [dec, dec, skip, skip] + * expected out: [dec_and_use, dec_and_use, skip, cache] + * + * Step2: + * in: [skip, dec, dec, skip] + * expected out: [drop_cache & dec_and_drop, dec_and_use, dec_and_use, cache] + * */ +static int scenario_per_subframe_bundle_switches_skip_first( + const LC3PLUS_CONFIG config, + IVAS_LC3PLUS_DEC_HANDLE decHandle, /* i: decoder handle */ + uint8_t *bitstream_in, /* i: pointer to input bitstream */ + int32_t bitstream_in_size, /* i: size of bitstream_in */ + float **pcm_out /* o: decoded samples */ ) +{ + ivas_error err; + const int16_t decode = 1; + const int16_t skipDecoding = 0; + uint32_t iDec = 0; + int iLc3plusFrame = 0; + int lc3framesPerIvasFrame; + int16_t **selective_decoding_matrix; + err = IVAS_LC3PLUS_DEC_AllocateSubframeDecodingMatrix( &selective_decoding_matrix, config.channels ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* Set selective decoding scenario */ + for ( int16_t iSubframeIdx = 0; iSubframeIdx < MAX_PARAM_SPATIAL_SUBFRAMES; iSubframeIdx++ ) + { + for ( int16_t decIdx = 0; decIdx < config.channels; decIdx++ ) + { + assert( MAX_PARAM_SPATIAL_SUBFRAMES == 4 ); + if ( iSubframeIdx == MAX_PARAM_SPATIAL_SUBFRAMES - 1 || iSubframeIdx == MAX_PARAM_SPATIAL_SUBFRAMES - 2 ) /*only valid for MAX_PARAM_SPATIAL_SUBFRAMES == 4 */ + { + /* skip the last two subframes */ + selective_decoding_matrix[iSubframeIdx][decIdx] = skipDecoding; + } + else + { + /* decode the previous ones */ + selective_decoding_matrix[iSubframeIdx][decIdx] = decode; + } + } + } + + /* Apply selective decoding scenario */ + err = IVAS_LC3PLUS_DEC_SetSelectiveDecodingMatrix( decHandle, selective_decoding_matrix ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder actions */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 0 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 == decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + if ( iLc3plusFrame == lc3framesPerIvasFrame - 1 ) + { + /* last subframe is expected to be cached */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_CACHE ); + } + else if ( iLc3plusFrame == lc3framesPerIvasFrame - 2 ) + { + /* subframe before the last one is expected to be skipped, since only the last one is required to flush the decoder after a pause */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_SKIP ); + } + else + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + } + + err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstream_in_size, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder caching */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 1 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 != decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + /* default action after decoding should be DEC_ACTION_DECODE_AND_USE again */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + + /* Step 2 + * in: [skip, dec, dec, skip] + * */ + for ( int16_t iSubframeIdx = 0; iSubframeIdx < MAX_PARAM_SPATIAL_SUBFRAMES; iSubframeIdx++ ) + { + for ( int16_t decIdx = 0; decIdx < config.channels; decIdx++ ) + { + if(iSubframeIdx == 1 || iSubframeIdx == 2) + { + selective_decoding_matrix[iSubframeIdx][decIdx] = decode; + } + else if(iSubframeIdx == 0 || iSubframeIdx == 3) + { + selective_decoding_matrix[iSubframeIdx][decIdx] = skipDecoding; + } + else + { + printf("unsupported iSubframeIdx count"); + return 1; + } + + } + } + /* Apply selective decoding scenario */ + err = IVAS_LC3PLUS_DEC_SetSelectiveDecodingMatrix( decHandle, selective_decoding_matrix ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + + /* verify correct decoder actions + * expected out: [drop_cache & dec_and_drop, dec_and_use, dec_and_use, cache] + * */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 1 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 != decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + if ( iLc3plusFrame == 0 ) + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_DROP ); + } + else if ( iLc3plusFrame == 1 ) + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + else if ( iLc3plusFrame == 2 ) + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + else if ( iLc3plusFrame == 3) + { + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_CACHE ); + } + else + { + assert(0); + } + } + } + err = IVAS_LC3PLUS_DEC_Decode( decHandle, bitstream_in, bitstream_in_size, pcm_out ); + if ( IVAS_ERR_OK != err ) + { + return err; + } + /* verify correct post-decoding state */ + lc3framesPerIvasFrame = decHandle->config.ivas_frame_duration_us / decHandle->config.lc3plus_frame_duration_us; + for ( iDec = 0; iDec < decHandle->num_decs; iDec++ ) + { + assert( 1 == decHandle->selective_decoding_states[iDec]->has_skipped_a_frame ); + assert( 0 == decHandle->selective_decoding_states[iDec]->shall_decode_cached_frame ); + assert( 0 != decHandle->bitstream_caches[iDec]->bitstream_cache_size ); + for ( iLc3plusFrame = 0; iLc3plusFrame < lc3framesPerIvasFrame; iLc3plusFrame++ ) + { + /* default action after decoding should be DEC_ACTION_DECODE_AND_USE again */ + assert( decHandle->selective_decoding_states[iDec]->frame_actions[iLc3plusFrame] == DEC_ACTION_DECODE_AND_USE ); + } + } + + IVAS_LC3PLUS_DEC_FreeSubframeDecodingMatrix( selective_decoding_matrix ); + return IVAS_ERR_OK; +} + + +static int selectiveDecIvas20msLc3plus5ms_48kHz_scenario_decode_all_subframes( void ) +{ + int err; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 5 * 1000, .ivas_frame_duration_us = 20 * 1000, .channels = 6, .samplerate = 48000 }; + const int16_t enableCaching = 1; + err = encodeAndDecodeOne6chFrameFixture( config, enableCaching, 768000, &scenario_decode_all_subframes ); + if ( 0 != err ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL, "test failed\n" ); + } + return err; +} + +static int selectiveDecIvas20msLc3plus5ms_48kHz_scenario_dont_decode_last_2_subframes( void ) +{ + int err = 0; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 5 * 1000, .ivas_frame_duration_us = 20 * 1000, .channels = 6, .samplerate = 48000 }; + const int16_t enableCaching = 1; + err = encodeAndDecodeOne6chFrameFixture( config, enableCaching, 768000, &scenario_dont_decode_last_2_subframes ); + if ( 0 != err ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL, "test failed\n" ); + } + return err; +} + +static int selectiveDecIvas20msLc3plus5ms_48kHz_scenario_dont_decode_last_3_subframes( void ) +{ + int err = 0; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 5 * 1000, .ivas_frame_duration_us = 20 * 1000, .channels = 6, .samplerate = 48000 }; + const int16_t enableCaching = 1; + err = encodeAndDecodeOne6chFrameFixture( config, enableCaching, 768000, &scenario_dont_decode_last_3_subframes ); + if ( 0 != err ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL, "test failed\n" ); + } + return err; +} + +static int selectiveDecIvas20msLc3plus5ms_48kHz_scenario_skip_first_subframe( void ) +{ + int err = 0; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 5 * 1000, .ivas_frame_duration_us = 20 * 1000, .channels = 6, .samplerate = 48000 }; + const int16_t enableCaching = 1; + err = encodeAndDecodeOne6chFrameFixture( config, enableCaching, 768000, &scenario_skip_first_subframe ); + if ( 0 != err ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL, "test failed\n" ); + } + return err; +} + +static int selectiveDecIvas20msLc3plus5ms_48kHz_scenario_decode_cache( void ) +{ + int err = 0; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 5 * 1000, .ivas_frame_duration_us = 20 * 1000, .channels = 6, .samplerate = 48000 }; + const int16_t enableCaching = 1; + err = encodeAndDecodeOne6chFrameFixture( config, enableCaching, 768000, &scenario_decode_cache ); + if ( 0 != err ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL, "test failed\n" ); + } + return err; +} + +static int selectiveDecIvas20msLc3plus5ms_48kHz_scenario_per_subframe_switches_skip_first( void ) +{ + int err = 0; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 5 * 1000, .ivas_frame_duration_us = 20 * 1000, .channels = 6, .samplerate = 48000 }; + const int16_t enableCaching = 1; + err = encodeAndDecodeOne6chFrameFixture( config, enableCaching, 768000, &scenario_per_subframe_switches_skip_first ); + if ( 0 != err ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL, "test failed\n" ); + } + return err; +} + +static int selectiveDecIvas20msLc3plus5ms_48kHz_scenario_per_subframe_switches_dec_first( void ) +{ + int err = 0; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 5 * 1000, .ivas_frame_duration_us = 20 * 1000, .channels = 6, .samplerate = 48000 }; + const int16_t enableCaching = 1; + err = encodeAndDecodeOne6chFrameFixture( config, enableCaching, 768000, &scenario_per_subframe_switches_dec_first ); + if ( 0 != err ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL, "test failed\n" ); + } + return err; +} + +static int selectiveDecIvas20msLc3plus5ms_48kHz_scenario_per_subframe_bundle_switches_dec_first( void ) +{ + int err = 0; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 5 * 1000, .ivas_frame_duration_us = 20 * 1000, .channels = 6, .samplerate = 48000 }; + const int16_t enableCaching = 1; + err = encodeAndDecodeOne6chFrameFixture( config, enableCaching, 768000, &scenario_per_subframe_bundle_switches_dec_first ); + if ( 0 != err ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL, "test failed\n" ); + } + return err; +} + +static int selectiveDecIvas20msLc3plus5ms_48kHz_scenario_per_subframe_bundle_switches_skip_first( void ) +{ + int err = 0; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 5 * 1000, .ivas_frame_duration_us = 20 * 1000, .channels = 6, .samplerate = 48000 }; + const int16_t enableCaching = 1; + err = encodeAndDecodeOne6chFrameFixture( config, enableCaching, 768000, &scenario_per_subframe_bundle_switches_skip_first ); + if ( 0 != err ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL, "test failed\n" ); + } + return err; +} + +static int selectiveDecIvas20msLc3plus5ms_48kHz_scenario_per_subframe_switches_dec_first_no_caching( void ) +{ + int err = 0; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 5 * 1000, .ivas_frame_duration_us = 20 * 1000, .channels = 6, .samplerate = 48000 }; + const int16_t enableCaching = 0; + err = encodeAndDecodeOne6chFrameFixture( config, enableCaching, 768000, &scenario_per_subframe_switches_dec_first_no_caching ); + if ( 0 != err ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL, "test failed\n" ); + } + return err; +} + + +static int selectiveDecIvas20msLc3plus5ms_48kHz_scenario_get_active_dont_cache( void ) +{ + int err = 0; + LC3PLUS_CONFIG config = { .lc3plus_frame_duration_us = 5 * 1000, .ivas_frame_duration_us = 20 * 1000, .channels = 6, .samplerate = 48000 }; + const int16_t enableCaching = 1; + err = encodeAndDecodeOne6chFrameFixture( config, enableCaching, 768000, &scenario_get_active_dont_cache ); + if ( 0 != err ) + { + return IVAS_ERROR( IVAS_ERR_INTERNAL, "test failed\n" ); + } + return err; +} + + + + + + diff --git a/scripts/strip_defines_cppp.sh b/scripts/strip_defines_cppp.sh index 8563cad368..a03614b248 100755 --- a/scripts/strip_defines_cppp.sh +++ b/scripts/strip_defines_cppp.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +# (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, # Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., # Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, # Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/scripts/switchPaths/sw_mctech_5fr.bin b/scripts/switchPaths/sw_mctech_5fr.bin new file mode 100644 index 0000000000..8b21888757 --- /dev/null +++ b/scripts/switchPaths/sw_mctech_5fr.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22d4d72283254c3a0bd7d290182a11d2909c0c0d8ee5424e55e288b34ea5ed45 +size 60000 diff --git a/scripts/td_object_renderer/hrtf_data/Orange_53/hrfilter_model_v002_16kHz.bin b/scripts/td_object_renderer/hrtf_data/Orange_53/hrfilter_model_v002_16kHz.bin index 17691616db..dd4d32cdcb 100644 --- a/scripts/td_object_renderer/hrtf_data/Orange_53/hrfilter_model_v002_16kHz.bin +++ b/scripts/td_object_renderer/hrtf_data/Orange_53/hrfilter_model_v002_16kHz.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0950686593146f4d7c7b622d2e52afdc10cc63481824d516ee88f7e2996f0de4 -size 204970 +oid sha256:1fdfc45a9bd54697b85cec44906c6cf2ac76b58440911472ec14ef743c6bcb52 +size 204974 diff --git a/scripts/td_object_renderer/hrtf_data/Orange_53/hrfilter_model_v002_32kHz.bin b/scripts/td_object_renderer/hrtf_data/Orange_53/hrfilter_model_v002_32kHz.bin index f6cf12bf4f..63ed4ac7fa 100644 --- a/scripts/td_object_renderer/hrtf_data/Orange_53/hrfilter_model_v002_32kHz.bin +++ b/scripts/td_object_renderer/hrtf_data/Orange_53/hrfilter_model_v002_32kHz.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1467d78861387e370ba916a93730961dd2d4abf1eff133740f9b7fafb89b32c4 -size 403802 +oid sha256:8b81a9aa52f64f86fe3abdd50a3c65b6a1ce632db32a30606b7b8bb17f2c3d36 +size 403806 diff --git a/scripts/td_object_renderer/hrtf_data/Orange_53/hrfilter_model_v002_48kHz.bin b/scripts/td_object_renderer/hrtf_data/Orange_53/hrfilter_model_v002_48kHz.bin index 8eeacfc0de..dceb314b87 100644 --- a/scripts/td_object_renderer/hrtf_data/Orange_53/hrfilter_model_v002_48kHz.bin +++ b/scripts/td_object_renderer/hrtf_data/Orange_53/hrfilter_model_v002_48kHz.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1740802509d5c3076a259b113ffc832e5585da9bc0fdbe851b89d524ccba374e -size 598010 +oid sha256:ac395980e37d1e38f602b7223c401b1c6711912d1a5db71ee668584c30c521b1 +size 598014 diff --git a/scripts/td_object_renderer/metadata/create_metadata_v3.m b/scripts/td_object_renderer/metadata/create_metadata_v3.m deleted file mode 100644 index 3bdd398fde..0000000000 --- a/scripts/td_object_renderer/metadata/create_metadata_v3.m +++ /dev/null @@ -1,433 +0,0 @@ -% -% (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, -% Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., -% Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, -% Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other -% contributors to this repository. All Rights Reserved. -% -% This software is protected by copyright law and by international treaties. -% The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, -% Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., -% Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, -% Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other -% contributors to this repository retain full ownership rights in their respective contributions in -% the software. This notice grants no license of any kind, including but not limited to patent -% license, nor is any license granted by implication, estoppel or otherwise. -% -% Contributors are required to enter into the IVAS codec Public Collaboration agreement before making -% contributions. -% -% This software is provided "AS IS", without any express or implied warranties. The software is in the -% development stage. It is intended exclusively for experts who have experience with such software and -% solely for the purpose of inspection. All implied warranties of non-infringement, merchantability -% and fitness for a particular purpose are hereby disclaimed and excluded. -% -% Any dispute, controversy or claim arising under or in relation to providing this software shall be -% submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in -% accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and -% the United Nations Convention on Contracts on the International Sales of Goods. -% - -% Sources are at stationary positions, but their orientations rotate. Since -% a source directivity is defined, we should hear a modulated volume -% (louder when the source is pointed at the listener). -% Listener is stationary -% Source orientation cone defined (not changing). - -clear;clc;close all; -fclose('all'); - -numFrames = 1000; -reverbNumCombFilters = -1; % Disabled -reverbRoomPreset = -1; % Disabled - -%fileNamePattern = 'm1'; % azimuth moves back and forth, elev fixed=0 -%fileNamePattern = 'm2'; % azimuth moves back and forth, elev fixed=+30 -%fileNamePattern = 'm3'; % azimuth moves back and forth, elev fixed=+45 -%fileNamePattern = 'm4'; % object moves in a circle at z=-1 (in front of the listener), shifted upward to make sure that the elevation is always above the listener. Both az & el changing. -%fileNamePattern = 'm5'; % elev=0, azimuth constantly increasing, so moving in a circle in the horizontal plane, listener at the center. -%fileNamePattern = 'x1'; % A synthetic test, loudspeaker position 0 -%fileNamePattern = 'x2'; % A synthetic test, loudspeaker position 30 -%fileNamePattern = 'x3'; % A synthetic test, loudspeaker position 90 -%fileNamePattern = 'x4'; % A synthetic test, loudspeaker position 135 - - -% fileNamePatterns = ["m1"; % azimuth moves back and forth, elev fixed=0 -% "m2"; % azimuth moves back and forth, elev fixed=+30 -% "m3"; % azimuth moves back and forth, elev fixed=+45 -% "m4"; % object moves in a circle at z=-1 (in front of the listener), shifted upward to make sure that the elevation is always above the listener. Both az & el changing. -% "m5"; % elev=0, azimuth constantly increasing, so moving in a circle in the horizontal plane, listener at the center. -% "x1"; % A synthetic test, loudspeaker position 0 -% "x2"; % A synthetic test, loudspeaker position 30 -% "x3"; % A synthetic test, loudspeaker position 90 -% "x4";]; % A synthetic test, loudspeaker position 135 - -fileNamePatterns = ["t01"; % - "t02"; % - "t03"; % - "t04"; % - "t05"; % - "t06"; % - "t07"; % - "t08"; % - "t09"; % - "t10"; % - "t11"; % - %"test_drums"; - %"wmops"; - "wmops2"; - %"azminus20"; - %"azplus20"; - "spiral"; - "circle_minus_30"; - "gainchange" - ]; % - -%fileNamePatterns = ["spiral"]; % - -%fileNamePatterns = ["m5";]; - -for i = 1:length(fileNamePatterns) - - fileNamePattern = fileNamePatterns(i); - disp(fileNamePattern) - - switch fileNamePattern - case "t11" - numObjects = 2; - case "t06" - numObjects = 3; - case {"t05", "wmops", "wmops2", "spiral"} - numObjects = 4; - otherwise - numObjects = 1; - end - - switch fileNamePattern - case "t01" - xr = 11.164; - case "t02" - xr = 12.442; - case "t03" - xr = 9.089; - case "t04" - xr = 8.000; - case "t05" - xr = 17.267; - case "t06" - xr = 8.000; - case "t07" - xr = 7.192; - case "t08" - xr = 7.192; - case "t09" - xr = 7.192; - case "t10" - xr = 9.08; - case "t11" - xr = 8.000; - case "test_drums" - xr = 17.267; - case {"wmops","wmops2"} - xr = 7.192; - case "azminus20" - xr = 12.442; - case "azplus20" - xr = 12.442; - case "spiral" - xr = 7.192; - case "circle_minus_30" - xr = 9.08; - case "gainchange" - xr = 1; - end - - % File names and handles - fileIDs_txt = zeros(1,numObjects); - for iObj = 1:numObjects - fileIDs_txt(iObj) = fopen(sprintf( 'csv\\%s_ch%d.csv',fileNamePattern,iObj),'wt'); - end - - % This setup has x-y plane as horizontal, with z vertical. Angles are - % measured from the x axis, with positive angles to the right/clockwise. - radii_source = [1, 1, 1, 1]; - thetas_position_source = [0]; - delta_theta_source_position = 1; - - % To do: Probably need to impose a range on these, or at least simplify - % when a cone becomes a sphere. CAMix defaults these to 360, 360, 1.0. - cone_angle_1 = 360; - cone_angle_2 = 360; - rear_level = 1.0; - - %delta_theta = 0.020 * 30; - %theta_store = zeros([1,numFrames]); - - time = 0; - time_store = zeros([1,numFrames]); - azim_store = zeros([numObjects,numFrames]); - elev_store = zeros([numObjects,numFrames]); - - % Data for each frame - for iFrame = 1:numFrames - % Calculate for frame ------------------------------------------------- - listenerPosition = [0,0,0]; - % Front, up vectors: Looking in x direction with up in z direction - listenerOrientation = [1,0,0,0,0,1]; - - sourcePositions = zeros(3,numObjects); - sourceDirections = zeros(3,numObjects); - sourceDirectivity = zeros(3,numObjects); - - for ob = 1:numObjects - %% - gain = 1.0; % Default gain setting - switch fileNamePattern - %% Stationary objects - case 't01' % 15 degrees left, zero elevation - x = 1.0 * radii_source(ob) * cosd(-15); - y = 1.0 * radii_source(ob) * sind(-15); - z = 0; - case 't02' % 30 degrees right, zero elevation - x = 1.0 * radii_source(ob) * cosd(30); - y = 1.0 * radii_source(ob) * sind(30); - z = 0; - case 't03' % 45 degrees right, zero elevation - x = 1.0 * radii_source(ob) * cosd(45); - y = 1.0 * radii_source(ob) * sind(45); - z = 0; - case 't04' - azim = 30; elev = 20; - x = 1.0 * radii_source(ob) * cosd(elev) * cosd(-azim); - y = 1.0 * radii_source(ob) * cosd(elev) * sind(-azim); - z = 1.0 * radii_source(ob) * sind(elev); - case 't05' - switch ob - case 1 - az=-60; - case 2 - az=-20; - case 3 - az=20; - case 4 - az=60; - end - x = 1.0 * cosd(az); - y = 1.0 * sind(az); - z = 0; - case 't06' - switch ob - case 1 - az=-50; - case 2 - az=-20; - case 3 - az=30; - end - x = 1.0 * cosd(az); - y = 1.0 * sind(az); - z = 0; - %% Part 2 - Moving objects - case 't07' % Horizontal circle. - x = 1.0 * radii_source(ob) * cosd(360/xr*time); - y = 1.0 * radii_source(ob) * sind(360/xr*time); - z = 0; - case 't08' - % Azimuth = 0 (straight ahead) - % Note that this should keep the object at distance radii_source(ob). - elevmax = 30; - y = 0; - z = sind(elevmax) * radii_source(ob) * cosd(360/xr*time); - alpha = asind(z/radii_source(ob)); - x = 1 * radii_source(ob) * cosd(alpha); - case 't09' - % Vertically oriented circle at fixed x position in - % front of listener. - % Note that this should keep the object at distance radii_source(ob). - x = 1 * radii_source(ob) * cosd(-30); - y = sind(30) * radii_source(ob) * sind(360/xr*time); - z = sind(30) * radii_source(ob) * cosd(360/xr*time); - case 't10' - % Horizontal circle at 20 elevation - alphaelev=20; - x = 1.0 * radii_source(ob) * cosd(alphaelev) * cosd(360/xr*time); - y = 1.0 * radii_source(ob) * cosd(alphaelev) * sind(360/xr*time); - z = 1.0 * radii_source(ob) * sind(alphaelev); - case 't11' - % Cross talk, 1 talker stationary, one talker follows - % circular trajectory - switch ob - case 1 - az = -50; - case 2 - az = -20 + 360/xr*time; - end - x = radii_source(ob) * cosd(az); - y = radii_source(ob) * sind(az); - z = 0; - case 'test_drums' - % Test case with drum channel only from case 5. - az=-60; - x = 1.0 * cosd(az); - y = 1.0 * sind(az); - z = 0; - case 'wmops' - switch ob - case 1 - az = 0 - 360/xr*time; - case 2 - az = 90 - 360/xr*time; - case 3 - az = 180 - 360/xr*time; - case 4 - az = 270 - 360/xr*time; - end - x = 1.0 * radii_source(ob) * cosd(az); - y = 1.0 * radii_source(ob) * sind(az); - z = 0; - case 'wmops2' - switch ob - case 1 - rot = 0 - 360/xr*time; - case 2 - rot = 90 - 360/xr*time; - case 3 - rot = 180 - 360/xr*time; - case 4 - rot = 270 - 360/xr*time; - end - x = 1 * radii_source(ob) * cosd(-30); - y = sind(30) * radii_source(ob) * sind(rot); - z = sind(30) * radii_source(ob) * cosd(rot); - case 'azminus20' - x = 1.0 * radii_source(ob) * cosd(-20); - y = 1.0 * radii_source(ob) * sind(-20); - z = 0; - case 'azplus20' - x = 1.0 * radii_source(ob) * cosd(20); - y = 1.0 * radii_source(ob) * sind(20); - z = 0; - case 'spiral' - switch ob - case 1 - rot = 360/xr*time; - case 2 - rot = 360/xr*time - 90; - case 3 - rot = 360/xr*time - 180; - case 4 - rot = 360/xr*time - 270; - end - x = (0.5*rot) * radii_source(ob) * cosd(rot); - y = sind(0.5*rot) * radii_source(ob) * sind(rot); - z = radii_source(ob) * cosd(0.5*rot); - case 'circle_minus_30' - % Horizontal circle at 20 elevation - alphaelev=-30; - x = 1.0 * radii_source(ob) * cosd(alphaelev) * cosd(360/xr*time); - y = 1.0 * radii_source(ob) * cosd(alphaelev) * sind(360/xr*time); - z = 1.0 * radii_source(ob) * sind(alphaelev); - case 'gainchange' - x = 1.0 * radii_source(ob) * cosd(-15); - y = 1.0 * radii_source(ob) * sind(-15); - z = 0; - gain = abs(sind(360/xr*time)); - otherwise - error("Bad file pattern.") - end - - %% - sourcePositions(:,ob) = [x;y;z]; - - % Pointing direction of the source. Since the sources are conical, - % there is no orientation, only a central axis. - dirx = 0.0; - diry = 0.0; - dirz = 1.0; - sourceDirections(:,ob) = [dirx;diry;dirz]; - sourceDirectivity(:,ob) = [cone_angle_1, cone_angle_2, rear_level]; - end - - % Storage for final plotting ------------------------------------------ - theta_store(iFrame) = thetas_position_source(1); - - for ob = 1:numObjects - - % ----------------------------------------------------------------- - % Write data for frame, text - % Write values to file for current object - fileID_txt = fileIDs_txt(ob); - - x = sourcePositions(1,ob); - y = sourcePositions(2,ob); - z = sourcePositions(3,ob); - horiz = sqrt(x^2 + y^2); - r = sqrt(x^2 + y^2 + z^2); - azim = atan2d(y, x); % NB Azimuth is positive left - elev = atan2d(z, horiz); - - azim_store(ob,iFrame) = azim; - elev_store(ob,iFrame) = elev; - - %fprintf(fileID_txt,'%04d,', iFrame-1); - fprintf(fileID_txt,'%+07.2f,', azim); - fprintf(fileID_txt,'%+06.2f,', elev); - fprintf(fileID_txt,'%05.2f,', r); - fprintf(fileID_txt,'%06.2f,', 0.0); % Spread. - fprintf(fileID_txt,'%04.2f', gain); % Gain. No comma at end of line. - - fprintf(fileID_txt,'\n'); - % ----------------------------------------------------------------- - end - time_store(iFrame) = time; - time = time + 0.02; % 20ms - end - - % Save for ambisonics - azim_store = -azim_store; - if ~exist("../ambisonics_rendering/scenes/", 'dir') - mkdir("../ambisonics_rendering/scenes/") - end - save(sprintf("../ambisonics_rendering/scenes/%s.mat",fileNamePattern),'azim_store','elev_store'); - azim_store = -azim_store; - - fig = figure; - subplot(2,1,1) - plot(time_store,azim_store) - ylim([-180,180]) - xlabel("Time, s",'fontsize',18) - ylabel("Azimuth, degrees",'fontsize',18) - xlim([0 xr]) - subplot(2,1,2) - plot(time_store,elev_store) - ylim([-90,90]) - xlabel("Time, s",'fontsize',18) - ylabel("Elevation, degrees",'fontsize',18) - xlim([0 xr]) - switch fileNamePattern - case 't05' - legend('Drums','Guitar','Bass','Vocal'); - case 't06' - legend('Female 1','Male','Female 2'); - case 't11' - legend('Female','Male'); - case 'wmops2' - legend('Object 1', 'Object 2', 'Object 3', 'Object 4'); - end - %print(sprintf("%s.pdf",fileNamePattern),'-dpdf','-bestfit') - print(sprintf("%s.png",fileNamePattern),'-dpng') - close(fig) - - for fid = fileIDs_txt - fclose(fid); - end -end -%copyfile("test_metadata_3.met","..\\..\\..\\Workspace_msvc\\test_metadata.met",'f') - -% figure; -% plot(wrapTo360(theta_store)) -% ylabel("Theta") -% xlabel("Frame no.") - -% figure; -% plot(x_store, -z_store,'x') diff --git a/scripts/td_object_renderer/metadata/csv/t01_ch1.csv b/scripts/td_object_renderer/metadata/csv/t01_ch1.csv deleted file mode 100644 index d639a92ffb..0000000000 --- a/scripts/td_object_renderer/metadata/csv/t01_ch1.csv +++ /dev/null @@ -1,1000 +0,0 @@ --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 --015.00,+00.00,01.00,000.00,1.00 diff --git a/scripts/td_object_renderer/metadata/csv/t02_ch1.csv b/scripts/td_object_renderer/metadata/csv/t02_ch1.csv deleted file mode 100644 index 82a50f1b3e..0000000000 --- a/scripts/td_object_renderer/metadata/csv/t02_ch1.csv +++ /dev/null @@ -1,1000 +0,0 @@ -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 diff --git a/scripts/td_object_renderer/metadata/csv/t03_ch1.csv b/scripts/td_object_renderer/metadata/csv/t03_ch1.csv deleted file mode 100644 index 7bdb46bd65..0000000000 --- a/scripts/td_object_renderer/metadata/csv/t03_ch1.csv +++ /dev/null @@ -1,1000 +0,0 @@ -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 -+045.00,+00.00,01.00,000.00,1.00 diff --git a/scripts/td_object_renderer/metadata/csv/t04_ch1.csv b/scripts/td_object_renderer/metadata/csv/t04_ch1.csv deleted file mode 100644 index 4f78a0c32f..0000000000 --- a/scripts/td_object_renderer/metadata/csv/t04_ch1.csv +++ /dev/null @@ -1,1000 +0,0 @@ --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 --030.00,+20.00,01.00,000.00,1.00 diff --git a/scripts/td_object_renderer/metadata/csv/t05_ch1.csv b/scripts/td_object_renderer/metadata/csv/t05_ch1.csv deleted file mode 100644 index 4c841ef6d6..0000000000 --- a/scripts/td_object_renderer/metadata/csv/t05_ch1.csv +++ /dev/null @@ -1,1000 +0,0 @@ --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 --060.00,+00.00,01.00,000.00,1.00 diff --git a/scripts/td_object_renderer/metadata/csv/t05_ch2.csv b/scripts/td_object_renderer/metadata/csv/t05_ch2.csv deleted file mode 100644 index f64e78d8c2..0000000000 --- a/scripts/td_object_renderer/metadata/csv/t05_ch2.csv +++ /dev/null @@ -1,1000 +0,0 @@ --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 diff --git a/scripts/td_object_renderer/metadata/csv/t05_ch3.csv b/scripts/td_object_renderer/metadata/csv/t05_ch3.csv deleted file mode 100644 index 0ca1953e37..0000000000 --- a/scripts/td_object_renderer/metadata/csv/t05_ch3.csv +++ /dev/null @@ -1,1000 +0,0 @@ -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 -+020.00,+00.00,01.00,000.00,1.00 diff --git a/scripts/td_object_renderer/metadata/csv/t05_ch4.csv b/scripts/td_object_renderer/metadata/csv/t05_ch4.csv deleted file mode 100644 index 89201e59a4..0000000000 --- a/scripts/td_object_renderer/metadata/csv/t05_ch4.csv +++ /dev/null @@ -1,1000 +0,0 @@ -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 -+060.00,+00.00,01.00,000.00,1.00 diff --git a/scripts/td_object_renderer/metadata/csv/t06_ch1.csv b/scripts/td_object_renderer/metadata/csv/t06_ch1.csv deleted file mode 100644 index 846e212989..0000000000 --- a/scripts/td_object_renderer/metadata/csv/t06_ch1.csv +++ /dev/null @@ -1,1000 +0,0 @@ --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 diff --git a/scripts/td_object_renderer/metadata/csv/t06_ch2.csv b/scripts/td_object_renderer/metadata/csv/t06_ch2.csv deleted file mode 100644 index f64e78d8c2..0000000000 --- a/scripts/td_object_renderer/metadata/csv/t06_ch2.csv +++ /dev/null @@ -1,1000 +0,0 @@ --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 diff --git a/scripts/td_object_renderer/metadata/csv/t06_ch3.csv b/scripts/td_object_renderer/metadata/csv/t06_ch3.csv deleted file mode 100644 index 82a50f1b3e..0000000000 --- a/scripts/td_object_renderer/metadata/csv/t06_ch3.csv +++ /dev/null @@ -1,1000 +0,0 @@ -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 -+030.00,+00.00,01.00,000.00,1.00 diff --git a/scripts/td_object_renderer/metadata/csv/t07_ch1.csv b/scripts/td_object_renderer/metadata/csv/t07_ch1.csv deleted file mode 100644 index c73471b79a..0000000000 --- a/scripts/td_object_renderer/metadata/csv/t07_ch1.csv +++ /dev/null @@ -1,1000 +0,0 @@ -+000.00,+00.00,01.00,000.00,1.00 -+001.00,+00.00,01.00,000.00,1.00 -+002.00,+00.00,01.00,000.00,1.00 -+003.00,+00.00,01.00,000.00,1.00 -+004.00,+00.00,01.00,000.00,1.00 -+005.01,+00.00,01.00,000.00,1.00 -+006.01,+00.00,01.00,000.00,1.00 -+007.01,+00.00,01.00,000.00,1.00 -+008.01,+00.00,01.00,000.00,1.00 -+009.01,+00.00,01.00,000.00,1.00 -+010.01,+00.00,01.00,000.00,1.00 -+011.01,+00.00,01.00,000.00,1.00 -+012.01,+00.00,01.00,000.00,1.00 -+013.01,+00.00,01.00,000.00,1.00 -+014.02,+00.00,01.00,000.00,1.00 -+015.02,+00.00,01.00,000.00,1.00 -+016.02,+00.00,01.00,000.00,1.00 -+017.02,+00.00,01.00,000.00,1.00 -+018.02,+00.00,01.00,000.00,1.00 -+019.02,+00.00,01.00,000.00,1.00 -+020.02,+00.00,01.00,000.00,1.00 -+021.02,+00.00,01.00,000.00,1.00 -+022.02,+00.00,01.00,000.00,1.00 -+023.03,+00.00,01.00,000.00,1.00 -+024.03,+00.00,01.00,000.00,1.00 -+025.03,+00.00,01.00,000.00,1.00 -+026.03,+00.00,01.00,000.00,1.00 -+027.03,+00.00,01.00,000.00,1.00 -+028.03,+00.00,01.00,000.00,1.00 -+029.03,+00.00,01.00,000.00,1.00 -+030.03,+00.00,01.00,000.00,1.00 -+031.03,+00.00,01.00,000.00,1.00 -+032.04,+00.00,01.00,000.00,1.00 -+033.04,+00.00,01.00,000.00,1.00 -+034.04,+00.00,01.00,000.00,1.00 -+035.04,+00.00,01.00,000.00,1.00 -+036.04,+00.00,01.00,000.00,1.00 -+037.04,+00.00,01.00,000.00,1.00 -+038.04,+00.00,01.00,000.00,1.00 -+039.04,+00.00,01.00,000.00,1.00 -+040.04,+00.00,01.00,000.00,1.00 -+041.05,+00.00,01.00,000.00,1.00 -+042.05,+00.00,01.00,000.00,1.00 -+043.05,+00.00,01.00,000.00,1.00 -+044.05,+00.00,01.00,000.00,1.00 -+045.05,+00.00,01.00,000.00,1.00 -+046.05,+00.00,01.00,000.00,1.00 -+047.05,+00.00,01.00,000.00,1.00 -+048.05,+00.00,01.00,000.00,1.00 -+049.05,+00.00,01.00,000.00,1.00 -+050.06,+00.00,01.00,000.00,1.00 -+051.06,+00.00,01.00,000.00,1.00 -+052.06,+00.00,01.00,000.00,1.00 -+053.06,+00.00,01.00,000.00,1.00 -+054.06,+00.00,01.00,000.00,1.00 -+055.06,+00.00,01.00,000.00,1.00 -+056.06,+00.00,01.00,000.00,1.00 -+057.06,+00.00,01.00,000.00,1.00 -+058.06,+00.00,01.00,000.00,1.00 -+059.07,+00.00,01.00,000.00,1.00 -+060.07,+00.00,01.00,000.00,1.00 -+061.07,+00.00,01.00,000.00,1.00 -+062.07,+00.00,01.00,000.00,1.00 -+063.07,+00.00,01.00,000.00,1.00 -+064.07,+00.00,01.00,000.00,1.00 -+065.07,+00.00,01.00,000.00,1.00 -+066.07,+00.00,01.00,000.00,1.00 -+067.07,+00.00,01.00,000.00,1.00 -+068.08,+00.00,01.00,000.00,1.00 -+069.08,+00.00,01.00,000.00,1.00 -+070.08,+00.00,01.00,000.00,1.00 -+071.08,+00.00,01.00,000.00,1.00 -+072.08,+00.00,01.00,000.00,1.00 -+073.08,+00.00,01.00,000.00,1.00 -+074.08,+00.00,01.00,000.00,1.00 -+075.08,+00.00,01.00,000.00,1.00 -+076.08,+00.00,01.00,000.00,1.00 -+077.09,+00.00,01.00,000.00,1.00 -+078.09,+00.00,01.00,000.00,1.00 -+079.09,+00.00,01.00,000.00,1.00 -+080.09,+00.00,01.00,000.00,1.00 -+081.09,+00.00,01.00,000.00,1.00 -+082.09,+00.00,01.00,000.00,1.00 -+083.09,+00.00,01.00,000.00,1.00 -+084.09,+00.00,01.00,000.00,1.00 -+085.09,+00.00,01.00,000.00,1.00 -+086.10,+00.00,01.00,000.00,1.00 -+087.10,+00.00,01.00,000.00,1.00 -+088.10,+00.00,01.00,000.00,1.00 -+089.10,+00.00,01.00,000.00,1.00 -+090.10,+00.00,01.00,000.00,1.00 -+091.10,+00.00,01.00,000.00,1.00 -+092.10,+00.00,01.00,000.00,1.00 -+093.10,+00.00,01.00,000.00,1.00 -+094.10,+00.00,01.00,000.00,1.00 -+095.11,+00.00,01.00,000.00,1.00 -+096.11,+00.00,01.00,000.00,1.00 -+097.11,+00.00,01.00,000.00,1.00 -+098.11,+00.00,01.00,000.00,1.00 -+099.11,+00.00,01.00,000.00,1.00 -+100.11,+00.00,01.00,000.00,1.00 -+101.11,+00.00,01.00,000.00,1.00 -+102.11,+00.00,01.00,000.00,1.00 -+103.11,+00.00,01.00,000.00,1.00 -+104.12,+00.00,01.00,000.00,1.00 -+105.12,+00.00,01.00,000.00,1.00 -+106.12,+00.00,01.00,000.00,1.00 -+107.12,+00.00,01.00,000.00,1.00 -+108.12,+00.00,01.00,000.00,1.00 -+109.12,+00.00,01.00,000.00,1.00 -+110.12,+00.00,01.00,000.00,1.00 -+111.12,+00.00,01.00,000.00,1.00 -+112.12,+00.00,01.00,000.00,1.00 -+113.13,+00.00,01.00,000.00,1.00 -+114.13,+00.00,01.00,000.00,1.00 -+115.13,+00.00,01.00,000.00,1.00 -+116.13,+00.00,01.00,000.00,1.00 -+117.13,+00.00,01.00,000.00,1.00 -+118.13,+00.00,01.00,000.00,1.00 -+119.13,+00.00,01.00,000.00,1.00 -+120.13,+00.00,01.00,000.00,1.00 -+121.13,+00.00,01.00,000.00,1.00 -+122.14,+00.00,01.00,000.00,1.00 -+123.14,+00.00,01.00,000.00,1.00 -+124.14,+00.00,01.00,000.00,1.00 -+125.14,+00.00,01.00,000.00,1.00 -+126.14,+00.00,01.00,000.00,1.00 -+127.14,+00.00,01.00,000.00,1.00 -+128.14,+00.00,01.00,000.00,1.00 -+129.14,+00.00,01.00,000.00,1.00 -+130.14,+00.00,01.00,000.00,1.00 -+131.15,+00.00,01.00,000.00,1.00 -+132.15,+00.00,01.00,000.00,1.00 -+133.15,+00.00,01.00,000.00,1.00 -+134.15,+00.00,01.00,000.00,1.00 -+135.15,+00.00,01.00,000.00,1.00 -+136.15,+00.00,01.00,000.00,1.00 -+137.15,+00.00,01.00,000.00,1.00 -+138.15,+00.00,01.00,000.00,1.00 -+139.15,+00.00,01.00,000.00,1.00 -+140.16,+00.00,01.00,000.00,1.00 -+141.16,+00.00,01.00,000.00,1.00 -+142.16,+00.00,01.00,000.00,1.00 -+143.16,+00.00,01.00,000.00,1.00 -+144.16,+00.00,01.00,000.00,1.00 -+145.16,+00.00,01.00,000.00,1.00 -+146.16,+00.00,01.00,000.00,1.00 -+147.16,+00.00,01.00,000.00,1.00 -+148.16,+00.00,01.00,000.00,1.00 -+149.17,+00.00,01.00,000.00,1.00 -+150.17,+00.00,01.00,000.00,1.00 -+151.17,+00.00,01.00,000.00,1.00 -+152.17,+00.00,01.00,000.00,1.00 -+153.17,+00.00,01.00,000.00,1.00 -+154.17,+00.00,01.00,000.00,1.00 -+155.17,+00.00,01.00,000.00,1.00 -+156.17,+00.00,01.00,000.00,1.00 -+157.17,+00.00,01.00,000.00,1.00 -+158.18,+00.00,01.00,000.00,1.00 -+159.18,+00.00,01.00,000.00,1.00 -+160.18,+00.00,01.00,000.00,1.00 -+161.18,+00.00,01.00,000.00,1.00 -+162.18,+00.00,01.00,000.00,1.00 -+163.18,+00.00,01.00,000.00,1.00 -+164.18,+00.00,01.00,000.00,1.00 -+165.18,+00.00,01.00,000.00,1.00 -+166.18,+00.00,01.00,000.00,1.00 -+167.19,+00.00,01.00,000.00,1.00 -+168.19,+00.00,01.00,000.00,1.00 -+169.19,+00.00,01.00,000.00,1.00 -+170.19,+00.00,01.00,000.00,1.00 -+171.19,+00.00,01.00,000.00,1.00 -+172.19,+00.00,01.00,000.00,1.00 -+173.19,+00.00,01.00,000.00,1.00 -+174.19,+00.00,01.00,000.00,1.00 -+175.19,+00.00,01.00,000.00,1.00 -+176.20,+00.00,01.00,000.00,1.00 -+177.20,+00.00,01.00,000.00,1.00 -+178.20,+00.00,01.00,000.00,1.00 -+179.20,+00.00,01.00,000.00,1.00 --179.80,+00.00,01.00,000.00,1.00 --178.80,+00.00,01.00,000.00,1.00 --177.80,+00.00,01.00,000.00,1.00 --176.80,+00.00,01.00,000.00,1.00 --175.80,+00.00,01.00,000.00,1.00 --174.79,+00.00,01.00,000.00,1.00 --173.79,+00.00,01.00,000.00,1.00 --172.79,+00.00,01.00,000.00,1.00 --171.79,+00.00,01.00,000.00,1.00 --170.79,+00.00,01.00,000.00,1.00 --169.79,+00.00,01.00,000.00,1.00 --168.79,+00.00,01.00,000.00,1.00 --167.79,+00.00,01.00,000.00,1.00 --166.79,+00.00,01.00,000.00,1.00 --165.78,+00.00,01.00,000.00,1.00 --164.78,+00.00,01.00,000.00,1.00 --163.78,+00.00,01.00,000.00,1.00 --162.78,+00.00,01.00,000.00,1.00 --161.78,+00.00,01.00,000.00,1.00 --160.78,+00.00,01.00,000.00,1.00 --159.78,+00.00,01.00,000.00,1.00 --158.78,+00.00,01.00,000.00,1.00 --157.78,+00.00,01.00,000.00,1.00 --156.77,+00.00,01.00,000.00,1.00 --155.77,+00.00,01.00,000.00,1.00 --154.77,+00.00,01.00,000.00,1.00 --153.77,+00.00,01.00,000.00,1.00 --152.77,+00.00,01.00,000.00,1.00 --151.77,+00.00,01.00,000.00,1.00 --150.77,+00.00,01.00,000.00,1.00 --149.77,+00.00,01.00,000.00,1.00 --148.77,+00.00,01.00,000.00,1.00 --147.76,+00.00,01.00,000.00,1.00 --146.76,+00.00,01.00,000.00,1.00 --145.76,+00.00,01.00,000.00,1.00 --144.76,+00.00,01.00,000.00,1.00 --143.76,+00.00,01.00,000.00,1.00 --142.76,+00.00,01.00,000.00,1.00 --141.76,+00.00,01.00,000.00,1.00 --140.76,+00.00,01.00,000.00,1.00 --139.76,+00.00,01.00,000.00,1.00 --138.75,+00.00,01.00,000.00,1.00 --137.75,+00.00,01.00,000.00,1.00 --136.75,+00.00,01.00,000.00,1.00 --135.75,+00.00,01.00,000.00,1.00 --134.75,+00.00,01.00,000.00,1.00 --133.75,+00.00,01.00,000.00,1.00 --132.75,+00.00,01.00,000.00,1.00 --131.75,+00.00,01.00,000.00,1.00 --130.75,+00.00,01.00,000.00,1.00 --129.74,+00.00,01.00,000.00,1.00 --128.74,+00.00,01.00,000.00,1.00 --127.74,+00.00,01.00,000.00,1.00 --126.74,+00.00,01.00,000.00,1.00 --125.74,+00.00,01.00,000.00,1.00 --124.74,+00.00,01.00,000.00,1.00 --123.74,+00.00,01.00,000.00,1.00 --122.74,+00.00,01.00,000.00,1.00 --121.74,+00.00,01.00,000.00,1.00 --120.73,+00.00,01.00,000.00,1.00 --119.73,+00.00,01.00,000.00,1.00 --118.73,+00.00,01.00,000.00,1.00 --117.73,+00.00,01.00,000.00,1.00 --116.73,+00.00,01.00,000.00,1.00 --115.73,+00.00,01.00,000.00,1.00 --114.73,+00.00,01.00,000.00,1.00 --113.73,+00.00,01.00,000.00,1.00 --112.73,+00.00,01.00,000.00,1.00 --111.72,+00.00,01.00,000.00,1.00 --110.72,+00.00,01.00,000.00,1.00 --109.72,+00.00,01.00,000.00,1.00 --108.72,+00.00,01.00,000.00,1.00 --107.72,+00.00,01.00,000.00,1.00 --106.72,+00.00,01.00,000.00,1.00 --105.72,+00.00,01.00,000.00,1.00 --104.72,+00.00,01.00,000.00,1.00 --103.72,+00.00,01.00,000.00,1.00 --102.71,+00.00,01.00,000.00,1.00 --101.71,+00.00,01.00,000.00,1.00 --100.71,+00.00,01.00,000.00,1.00 --099.71,+00.00,01.00,000.00,1.00 --098.71,+00.00,01.00,000.00,1.00 --097.71,+00.00,01.00,000.00,1.00 --096.71,+00.00,01.00,000.00,1.00 --095.71,+00.00,01.00,000.00,1.00 --094.71,+00.00,01.00,000.00,1.00 --093.70,+00.00,01.00,000.00,1.00 --092.70,+00.00,01.00,000.00,1.00 --091.70,+00.00,01.00,000.00,1.00 --090.70,+00.00,01.00,000.00,1.00 --089.70,+00.00,01.00,000.00,1.00 --088.70,+00.00,01.00,000.00,1.00 --087.70,+00.00,01.00,000.00,1.00 --086.70,+00.00,01.00,000.00,1.00 --085.70,+00.00,01.00,000.00,1.00 --084.69,+00.00,01.00,000.00,1.00 --083.69,+00.00,01.00,000.00,1.00 --082.69,+00.00,01.00,000.00,1.00 --081.69,+00.00,01.00,000.00,1.00 --080.69,+00.00,01.00,000.00,1.00 --079.69,+00.00,01.00,000.00,1.00 --078.69,+00.00,01.00,000.00,1.00 --077.69,+00.00,01.00,000.00,1.00 --076.69,+00.00,01.00,000.00,1.00 --075.68,+00.00,01.00,000.00,1.00 --074.68,+00.00,01.00,000.00,1.00 --073.68,+00.00,01.00,000.00,1.00 --072.68,+00.00,01.00,000.00,1.00 --071.68,+00.00,01.00,000.00,1.00 --070.68,+00.00,01.00,000.00,1.00 --069.68,+00.00,01.00,000.00,1.00 --068.68,+00.00,01.00,000.00,1.00 --067.68,+00.00,01.00,000.00,1.00 --066.67,+00.00,01.00,000.00,1.00 --065.67,+00.00,01.00,000.00,1.00 --064.67,+00.00,01.00,000.00,1.00 --063.67,+00.00,01.00,000.00,1.00 --062.67,+00.00,01.00,000.00,1.00 --061.67,+00.00,01.00,000.00,1.00 --060.67,+00.00,01.00,000.00,1.00 --059.67,+00.00,01.00,000.00,1.00 --058.67,+00.00,01.00,000.00,1.00 --057.66,+00.00,01.00,000.00,1.00 --056.66,+00.00,01.00,000.00,1.00 --055.66,+00.00,01.00,000.00,1.00 --054.66,+00.00,01.00,000.00,1.00 --053.66,+00.00,01.00,000.00,1.00 --052.66,+00.00,01.00,000.00,1.00 --051.66,+00.00,01.00,000.00,1.00 --050.66,+00.00,01.00,000.00,1.00 --049.66,+00.00,01.00,000.00,1.00 --048.65,+00.00,01.00,000.00,1.00 --047.65,+00.00,01.00,000.00,1.00 --046.65,+00.00,01.00,000.00,1.00 --045.65,+00.00,01.00,000.00,1.00 --044.65,+00.00,01.00,000.00,1.00 --043.65,+00.00,01.00,000.00,1.00 --042.65,+00.00,01.00,000.00,1.00 --041.65,+00.00,01.00,000.00,1.00 --040.65,+00.00,01.00,000.00,1.00 --039.64,+00.00,01.00,000.00,1.00 --038.64,+00.00,01.00,000.00,1.00 --037.64,+00.00,01.00,000.00,1.00 --036.64,+00.00,01.00,000.00,1.00 --035.64,+00.00,01.00,000.00,1.00 --034.64,+00.00,01.00,000.00,1.00 --033.64,+00.00,01.00,000.00,1.00 --032.64,+00.00,01.00,000.00,1.00 --031.64,+00.00,01.00,000.00,1.00 --030.63,+00.00,01.00,000.00,1.00 --029.63,+00.00,01.00,000.00,1.00 --028.63,+00.00,01.00,000.00,1.00 --027.63,+00.00,01.00,000.00,1.00 --026.63,+00.00,01.00,000.00,1.00 --025.63,+00.00,01.00,000.00,1.00 --024.63,+00.00,01.00,000.00,1.00 --023.63,+00.00,01.00,000.00,1.00 --022.63,+00.00,01.00,000.00,1.00 --021.62,+00.00,01.00,000.00,1.00 --020.62,+00.00,01.00,000.00,1.00 --019.62,+00.00,01.00,000.00,1.00 --018.62,+00.00,01.00,000.00,1.00 --017.62,+00.00,01.00,000.00,1.00 --016.62,+00.00,01.00,000.00,1.00 --015.62,+00.00,01.00,000.00,1.00 --014.62,+00.00,01.00,000.00,1.00 --013.62,+00.00,01.00,000.00,1.00 --012.61,+00.00,01.00,000.00,1.00 --011.61,+00.00,01.00,000.00,1.00 --010.61,+00.00,01.00,000.00,1.00 --009.61,+00.00,01.00,000.00,1.00 --008.61,+00.00,01.00,000.00,1.00 --007.61,+00.00,01.00,000.00,1.00 --006.61,+00.00,01.00,000.00,1.00 --005.61,+00.00,01.00,000.00,1.00 --004.61,+00.00,01.00,000.00,1.00 --003.60,+00.00,01.00,000.00,1.00 --002.60,+00.00,01.00,000.00,1.00 --001.60,+00.00,01.00,000.00,1.00 --000.60,+00.00,01.00,000.00,1.00 -+000.40,+00.00,01.00,000.00,1.00 -+001.40,+00.00,01.00,000.00,1.00 -+002.40,+00.00,01.00,000.00,1.00 -+003.40,+00.00,01.00,000.00,1.00 -+004.40,+00.00,01.00,000.00,1.00 -+005.41,+00.00,01.00,000.00,1.00 -+006.41,+00.00,01.00,000.00,1.00 -+007.41,+00.00,01.00,000.00,1.00 -+008.41,+00.00,01.00,000.00,1.00 -+009.41,+00.00,01.00,000.00,1.00 -+010.41,+00.00,01.00,000.00,1.00 -+011.41,+00.00,01.00,000.00,1.00 -+012.41,+00.00,01.00,000.00,1.00 -+013.41,+00.00,01.00,000.00,1.00 -+014.42,+00.00,01.00,000.00,1.00 -+015.42,+00.00,01.00,000.00,1.00 -+016.42,+00.00,01.00,000.00,1.00 -+017.42,+00.00,01.00,000.00,1.00 -+018.42,+00.00,01.00,000.00,1.00 -+019.42,+00.00,01.00,000.00,1.00 -+020.42,+00.00,01.00,000.00,1.00 -+021.42,+00.00,01.00,000.00,1.00 -+022.42,+00.00,01.00,000.00,1.00 -+023.43,+00.00,01.00,000.00,1.00 -+024.43,+00.00,01.00,000.00,1.00 -+025.43,+00.00,01.00,000.00,1.00 -+026.43,+00.00,01.00,000.00,1.00 -+027.43,+00.00,01.00,000.00,1.00 -+028.43,+00.00,01.00,000.00,1.00 -+029.43,+00.00,01.00,000.00,1.00 -+030.43,+00.00,01.00,000.00,1.00 -+031.43,+00.00,01.00,000.00,1.00 -+032.44,+00.00,01.00,000.00,1.00 -+033.44,+00.00,01.00,000.00,1.00 -+034.44,+00.00,01.00,000.00,1.00 -+035.44,+00.00,01.00,000.00,1.00 -+036.44,+00.00,01.00,000.00,1.00 -+037.44,+00.00,01.00,000.00,1.00 -+038.44,+00.00,01.00,000.00,1.00 -+039.44,+00.00,01.00,000.00,1.00 -+040.44,+00.00,01.00,000.00,1.00 -+041.45,+00.00,01.00,000.00,1.00 -+042.45,+00.00,01.00,000.00,1.00 -+043.45,+00.00,01.00,000.00,1.00 -+044.45,+00.00,01.00,000.00,1.00 -+045.45,+00.00,01.00,000.00,1.00 -+046.45,+00.00,01.00,000.00,1.00 -+047.45,+00.00,01.00,000.00,1.00 -+048.45,+00.00,01.00,000.00,1.00 -+049.45,+00.00,01.00,000.00,1.00 -+050.46,+00.00,01.00,000.00,1.00 -+051.46,+00.00,01.00,000.00,1.00 -+052.46,+00.00,01.00,000.00,1.00 -+053.46,+00.00,01.00,000.00,1.00 -+054.46,+00.00,01.00,000.00,1.00 -+055.46,+00.00,01.00,000.00,1.00 -+056.46,+00.00,01.00,000.00,1.00 -+057.46,+00.00,01.00,000.00,1.00 -+058.46,+00.00,01.00,000.00,1.00 -+059.47,+00.00,01.00,000.00,1.00 -+060.47,+00.00,01.00,000.00,1.00 -+061.47,+00.00,01.00,000.00,1.00 -+062.47,+00.00,01.00,000.00,1.00 -+063.47,+00.00,01.00,000.00,1.00 -+064.47,+00.00,01.00,000.00,1.00 -+065.47,+00.00,01.00,000.00,1.00 -+066.47,+00.00,01.00,000.00,1.00 -+067.47,+00.00,01.00,000.00,1.00 -+068.48,+00.00,01.00,000.00,1.00 -+069.48,+00.00,01.00,000.00,1.00 -+070.48,+00.00,01.00,000.00,1.00 -+071.48,+00.00,01.00,000.00,1.00 -+072.48,+00.00,01.00,000.00,1.00 -+073.48,+00.00,01.00,000.00,1.00 -+074.48,+00.00,01.00,000.00,1.00 -+075.48,+00.00,01.00,000.00,1.00 -+076.48,+00.00,01.00,000.00,1.00 -+077.49,+00.00,01.00,000.00,1.00 -+078.49,+00.00,01.00,000.00,1.00 -+079.49,+00.00,01.00,000.00,1.00 -+080.49,+00.00,01.00,000.00,1.00 -+081.49,+00.00,01.00,000.00,1.00 -+082.49,+00.00,01.00,000.00,1.00 -+083.49,+00.00,01.00,000.00,1.00 -+084.49,+00.00,01.00,000.00,1.00 -+085.49,+00.00,01.00,000.00,1.00 -+086.50,+00.00,01.00,000.00,1.00 -+087.50,+00.00,01.00,000.00,1.00 -+088.50,+00.00,01.00,000.00,1.00 -+089.50,+00.00,01.00,000.00,1.00 -+090.50,+00.00,01.00,000.00,1.00 -+091.50,+00.00,01.00,000.00,1.00 -+092.50,+00.00,01.00,000.00,1.00 -+093.50,+00.00,01.00,000.00,1.00 -+094.51,+00.00,01.00,000.00,1.00 -+095.51,+00.00,01.00,000.00,1.00 -+096.51,+00.00,01.00,000.00,1.00 -+097.51,+00.00,01.00,000.00,1.00 -+098.51,+00.00,01.00,000.00,1.00 -+099.51,+00.00,01.00,000.00,1.00 -+100.51,+00.00,01.00,000.00,1.00 -+101.51,+00.00,01.00,000.00,1.00 -+102.51,+00.00,01.00,000.00,1.00 -+103.52,+00.00,01.00,000.00,1.00 -+104.52,+00.00,01.00,000.00,1.00 -+105.52,+00.00,01.00,000.00,1.00 -+106.52,+00.00,01.00,000.00,1.00 -+107.52,+00.00,01.00,000.00,1.00 -+108.52,+00.00,01.00,000.00,1.00 -+109.52,+00.00,01.00,000.00,1.00 -+110.52,+00.00,01.00,000.00,1.00 -+111.52,+00.00,01.00,000.00,1.00 -+112.53,+00.00,01.00,000.00,1.00 -+113.53,+00.00,01.00,000.00,1.00 -+114.53,+00.00,01.00,000.00,1.00 -+115.53,+00.00,01.00,000.00,1.00 -+116.53,+00.00,01.00,000.00,1.00 -+117.53,+00.00,01.00,000.00,1.00 -+118.53,+00.00,01.00,000.00,1.00 -+119.53,+00.00,01.00,000.00,1.00 -+120.53,+00.00,01.00,000.00,1.00 -+121.54,+00.00,01.00,000.00,1.00 -+122.54,+00.00,01.00,000.00,1.00 -+123.54,+00.00,01.00,000.00,1.00 -+124.54,+00.00,01.00,000.00,1.00 -+125.54,+00.00,01.00,000.00,1.00 -+126.54,+00.00,01.00,000.00,1.00 -+127.54,+00.00,01.00,000.00,1.00 -+128.54,+00.00,01.00,000.00,1.00 -+129.54,+00.00,01.00,000.00,1.00 -+130.55,+00.00,01.00,000.00,1.00 -+131.55,+00.00,01.00,000.00,1.00 -+132.55,+00.00,01.00,000.00,1.00 -+133.55,+00.00,01.00,000.00,1.00 -+134.55,+00.00,01.00,000.00,1.00 -+135.55,+00.00,01.00,000.00,1.00 -+136.55,+00.00,01.00,000.00,1.00 -+137.55,+00.00,01.00,000.00,1.00 -+138.55,+00.00,01.00,000.00,1.00 -+139.56,+00.00,01.00,000.00,1.00 -+140.56,+00.00,01.00,000.00,1.00 -+141.56,+00.00,01.00,000.00,1.00 -+142.56,+00.00,01.00,000.00,1.00 -+143.56,+00.00,01.00,000.00,1.00 -+144.56,+00.00,01.00,000.00,1.00 -+145.56,+00.00,01.00,000.00,1.00 -+146.56,+00.00,01.00,000.00,1.00 -+147.56,+00.00,01.00,000.00,1.00 -+148.57,+00.00,01.00,000.00,1.00 -+149.57,+00.00,01.00,000.00,1.00 -+150.57,+00.00,01.00,000.00,1.00 -+151.57,+00.00,01.00,000.00,1.00 -+152.57,+00.00,01.00,000.00,1.00 -+153.57,+00.00,01.00,000.00,1.00 -+154.57,+00.00,01.00,000.00,1.00 -+155.57,+00.00,01.00,000.00,1.00 -+156.57,+00.00,01.00,000.00,1.00 -+157.58,+00.00,01.00,000.00,1.00 -+158.58,+00.00,01.00,000.00,1.00 -+159.58,+00.00,01.00,000.00,1.00 -+160.58,+00.00,01.00,000.00,1.00 -+161.58,+00.00,01.00,000.00,1.00 -+162.58,+00.00,01.00,000.00,1.00 -+163.58,+00.00,01.00,000.00,1.00 -+164.58,+00.00,01.00,000.00,1.00 -+165.58,+00.00,01.00,000.00,1.00 -+166.59,+00.00,01.00,000.00,1.00 -+167.59,+00.00,01.00,000.00,1.00 -+168.59,+00.00,01.00,000.00,1.00 -+169.59,+00.00,01.00,000.00,1.00 -+170.59,+00.00,01.00,000.00,1.00 -+171.59,+00.00,01.00,000.00,1.00 -+172.59,+00.00,01.00,000.00,1.00 -+173.59,+00.00,01.00,000.00,1.00 -+174.59,+00.00,01.00,000.00,1.00 -+175.60,+00.00,01.00,000.00,1.00 -+176.60,+00.00,01.00,000.00,1.00 -+177.60,+00.00,01.00,000.00,1.00 -+178.60,+00.00,01.00,000.00,1.00 -+179.60,+00.00,01.00,000.00,1.00 --179.40,+00.00,01.00,000.00,1.00 --178.40,+00.00,01.00,000.00,1.00 --177.40,+00.00,01.00,000.00,1.00 --176.40,+00.00,01.00,000.00,1.00 --175.39,+00.00,01.00,000.00,1.00 --174.39,+00.00,01.00,000.00,1.00 --173.39,+00.00,01.00,000.00,1.00 --172.39,+00.00,01.00,000.00,1.00 --171.39,+00.00,01.00,000.00,1.00 --170.39,+00.00,01.00,000.00,1.00 --169.39,+00.00,01.00,000.00,1.00 --168.39,+00.00,01.00,000.00,1.00 --167.39,+00.00,01.00,000.00,1.00 --166.38,+00.00,01.00,000.00,1.00 --165.38,+00.00,01.00,000.00,1.00 --164.38,+00.00,01.00,000.00,1.00 --163.38,+00.00,01.00,000.00,1.00 --162.38,+00.00,01.00,000.00,1.00 --161.38,+00.00,01.00,000.00,1.00 --160.38,+00.00,01.00,000.00,1.00 --159.38,+00.00,01.00,000.00,1.00 --158.38,+00.00,01.00,000.00,1.00 --157.37,+00.00,01.00,000.00,1.00 --156.37,+00.00,01.00,000.00,1.00 --155.37,+00.00,01.00,000.00,1.00 --154.37,+00.00,01.00,000.00,1.00 --153.37,+00.00,01.00,000.00,1.00 --152.37,+00.00,01.00,000.00,1.00 --151.37,+00.00,01.00,000.00,1.00 --150.37,+00.00,01.00,000.00,1.00 --149.37,+00.00,01.00,000.00,1.00 --148.36,+00.00,01.00,000.00,1.00 --147.36,+00.00,01.00,000.00,1.00 --146.36,+00.00,01.00,000.00,1.00 --145.36,+00.00,01.00,000.00,1.00 --144.36,+00.00,01.00,000.00,1.00 --143.36,+00.00,01.00,000.00,1.00 --142.36,+00.00,01.00,000.00,1.00 --141.36,+00.00,01.00,000.00,1.00 --140.36,+00.00,01.00,000.00,1.00 --139.35,+00.00,01.00,000.00,1.00 --138.35,+00.00,01.00,000.00,1.00 --137.35,+00.00,01.00,000.00,1.00 --136.35,+00.00,01.00,000.00,1.00 --135.35,+00.00,01.00,000.00,1.00 --134.35,+00.00,01.00,000.00,1.00 --133.35,+00.00,01.00,000.00,1.00 --132.35,+00.00,01.00,000.00,1.00 --131.35,+00.00,01.00,000.00,1.00 --130.34,+00.00,01.00,000.00,1.00 --129.34,+00.00,01.00,000.00,1.00 --128.34,+00.00,01.00,000.00,1.00 --127.34,+00.00,01.00,000.00,1.00 --126.34,+00.00,01.00,000.00,1.00 --125.34,+00.00,01.00,000.00,1.00 --124.34,+00.00,01.00,000.00,1.00 --123.34,+00.00,01.00,000.00,1.00 --122.34,+00.00,01.00,000.00,1.00 --121.33,+00.00,01.00,000.00,1.00 --120.33,+00.00,01.00,000.00,1.00 --119.33,+00.00,01.00,000.00,1.00 --118.33,+00.00,01.00,000.00,1.00 --117.33,+00.00,01.00,000.00,1.00 --116.33,+00.00,01.00,000.00,1.00 --115.33,+00.00,01.00,000.00,1.00 --114.33,+00.00,01.00,000.00,1.00 --113.33,+00.00,01.00,000.00,1.00 --112.32,+00.00,01.00,000.00,1.00 --111.32,+00.00,01.00,000.00,1.00 --110.32,+00.00,01.00,000.00,1.00 --109.32,+00.00,01.00,000.00,1.00 --108.32,+00.00,01.00,000.00,1.00 --107.32,+00.00,01.00,000.00,1.00 --106.32,+00.00,01.00,000.00,1.00 --105.32,+00.00,01.00,000.00,1.00 --104.32,+00.00,01.00,000.00,1.00 --103.31,+00.00,01.00,000.00,1.00 --102.31,+00.00,01.00,000.00,1.00 --101.31,+00.00,01.00,000.00,1.00 --100.31,+00.00,01.00,000.00,1.00 --099.31,+00.00,01.00,000.00,1.00 --098.31,+00.00,01.00,000.00,1.00 --097.31,+00.00,01.00,000.00,1.00 --096.31,+00.00,01.00,000.00,1.00 --095.31,+00.00,01.00,000.00,1.00 --094.30,+00.00,01.00,000.00,1.00 --093.30,+00.00,01.00,000.00,1.00 --092.30,+00.00,01.00,000.00,1.00 --091.30,+00.00,01.00,000.00,1.00 --090.30,+00.00,01.00,000.00,1.00 --089.30,+00.00,01.00,000.00,1.00 --088.30,+00.00,01.00,000.00,1.00 --087.30,+00.00,01.00,000.00,1.00 --086.30,+00.00,01.00,000.00,1.00 --085.29,+00.00,01.00,000.00,1.00 --084.29,+00.00,01.00,000.00,1.00 --083.29,+00.00,01.00,000.00,1.00 --082.29,+00.00,01.00,000.00,1.00 --081.29,+00.00,01.00,000.00,1.00 --080.29,+00.00,01.00,000.00,1.00 --079.29,+00.00,01.00,000.00,1.00 --078.29,+00.00,01.00,000.00,1.00 --077.29,+00.00,01.00,000.00,1.00 --076.28,+00.00,01.00,000.00,1.00 --075.28,+00.00,01.00,000.00,1.00 --074.28,+00.00,01.00,000.00,1.00 --073.28,+00.00,01.00,000.00,1.00 --072.28,+00.00,01.00,000.00,1.00 --071.28,+00.00,01.00,000.00,1.00 --070.28,+00.00,01.00,000.00,1.00 --069.28,+00.00,01.00,000.00,1.00 --068.28,+00.00,01.00,000.00,1.00 --067.27,+00.00,01.00,000.00,1.00 --066.27,+00.00,01.00,000.00,1.00 --065.27,+00.00,01.00,000.00,1.00 --064.27,+00.00,01.00,000.00,1.00 --063.27,+00.00,01.00,000.00,1.00 --062.27,+00.00,01.00,000.00,1.00 --061.27,+00.00,01.00,000.00,1.00 --060.27,+00.00,01.00,000.00,1.00 --059.27,+00.00,01.00,000.00,1.00 --058.26,+00.00,01.00,000.00,1.00 --057.26,+00.00,01.00,000.00,1.00 --056.26,+00.00,01.00,000.00,1.00 --055.26,+00.00,01.00,000.00,1.00 --054.26,+00.00,01.00,000.00,1.00 --053.26,+00.00,01.00,000.00,1.00 --052.26,+00.00,01.00,000.00,1.00 --051.26,+00.00,01.00,000.00,1.00 --050.26,+00.00,01.00,000.00,1.00 --049.25,+00.00,01.00,000.00,1.00 --048.25,+00.00,01.00,000.00,1.00 --047.25,+00.00,01.00,000.00,1.00 --046.25,+00.00,01.00,000.00,1.00 --045.25,+00.00,01.00,000.00,1.00 --044.25,+00.00,01.00,000.00,1.00 --043.25,+00.00,01.00,000.00,1.00 --042.25,+00.00,01.00,000.00,1.00 --041.25,+00.00,01.00,000.00,1.00 --040.24,+00.00,01.00,000.00,1.00 --039.24,+00.00,01.00,000.00,1.00 --038.24,+00.00,01.00,000.00,1.00 --037.24,+00.00,01.00,000.00,1.00 --036.24,+00.00,01.00,000.00,1.00 --035.24,+00.00,01.00,000.00,1.00 --034.24,+00.00,01.00,000.00,1.00 --033.24,+00.00,01.00,000.00,1.00 --032.24,+00.00,01.00,000.00,1.00 --031.23,+00.00,01.00,000.00,1.00 --030.23,+00.00,01.00,000.00,1.00 --029.23,+00.00,01.00,000.00,1.00 --028.23,+00.00,01.00,000.00,1.00 --027.23,+00.00,01.00,000.00,1.00 --026.23,+00.00,01.00,000.00,1.00 --025.23,+00.00,01.00,000.00,1.00 --024.23,+00.00,01.00,000.00,1.00 --023.23,+00.00,01.00,000.00,1.00 --022.22,+00.00,01.00,000.00,1.00 --021.22,+00.00,01.00,000.00,1.00 --020.22,+00.00,01.00,000.00,1.00 --019.22,+00.00,01.00,000.00,1.00 --018.22,+00.00,01.00,000.00,1.00 --017.22,+00.00,01.00,000.00,1.00 --016.22,+00.00,01.00,000.00,1.00 --015.22,+00.00,01.00,000.00,1.00 --014.22,+00.00,01.00,000.00,1.00 --013.21,+00.00,01.00,000.00,1.00 --012.21,+00.00,01.00,000.00,1.00 --011.21,+00.00,01.00,000.00,1.00 --010.21,+00.00,01.00,000.00,1.00 --009.21,+00.00,01.00,000.00,1.00 --008.21,+00.00,01.00,000.00,1.00 --007.21,+00.00,01.00,000.00,1.00 --006.21,+00.00,01.00,000.00,1.00 --005.21,+00.00,01.00,000.00,1.00 --004.20,+00.00,01.00,000.00,1.00 --003.20,+00.00,01.00,000.00,1.00 --002.20,+00.00,01.00,000.00,1.00 --001.20,+00.00,01.00,000.00,1.00 --000.20,+00.00,01.00,000.00,1.00 -+000.80,+00.00,01.00,000.00,1.00 -+001.80,+00.00,01.00,000.00,1.00 -+002.80,+00.00,01.00,000.00,1.00 -+003.80,+00.00,01.00,000.00,1.00 -+004.81,+00.00,01.00,000.00,1.00 -+005.81,+00.00,01.00,000.00,1.00 -+006.81,+00.00,01.00,000.00,1.00 -+007.81,+00.00,01.00,000.00,1.00 -+008.81,+00.00,01.00,000.00,1.00 -+009.81,+00.00,01.00,000.00,1.00 -+010.81,+00.00,01.00,000.00,1.00 -+011.81,+00.00,01.00,000.00,1.00 -+012.81,+00.00,01.00,000.00,1.00 -+013.82,+00.00,01.00,000.00,1.00 -+014.82,+00.00,01.00,000.00,1.00 -+015.82,+00.00,01.00,000.00,1.00 -+016.82,+00.00,01.00,000.00,1.00 -+017.82,+00.00,01.00,000.00,1.00 -+018.82,+00.00,01.00,000.00,1.00 -+019.82,+00.00,01.00,000.00,1.00 -+020.82,+00.00,01.00,000.00,1.00 -+021.82,+00.00,01.00,000.00,1.00 -+022.83,+00.00,01.00,000.00,1.00 -+023.83,+00.00,01.00,000.00,1.00 -+024.83,+00.00,01.00,000.00,1.00 -+025.83,+00.00,01.00,000.00,1.00 -+026.83,+00.00,01.00,000.00,1.00 -+027.83,+00.00,01.00,000.00,1.00 -+028.83,+00.00,01.00,000.00,1.00 -+029.83,+00.00,01.00,000.00,1.00 -+030.83,+00.00,01.00,000.00,1.00 -+031.84,+00.00,01.00,000.00,1.00 -+032.84,+00.00,01.00,000.00,1.00 -+033.84,+00.00,01.00,000.00,1.00 -+034.84,+00.00,01.00,000.00,1.00 -+035.84,+00.00,01.00,000.00,1.00 -+036.84,+00.00,01.00,000.00,1.00 -+037.84,+00.00,01.00,000.00,1.00 -+038.84,+00.00,01.00,000.00,1.00 -+039.84,+00.00,01.00,000.00,1.00 -+040.85,+00.00,01.00,000.00,1.00 -+041.85,+00.00,01.00,000.00,1.00 -+042.85,+00.00,01.00,000.00,1.00 -+043.85,+00.00,01.00,000.00,1.00 -+044.85,+00.00,01.00,000.00,1.00 -+045.85,+00.00,01.00,000.00,1.00 -+046.85,+00.00,01.00,000.00,1.00 -+047.85,+00.00,01.00,000.00,1.00 -+048.85,+00.00,01.00,000.00,1.00 -+049.86,+00.00,01.00,000.00,1.00 -+050.86,+00.00,01.00,000.00,1.00 -+051.86,+00.00,01.00,000.00,1.00 -+052.86,+00.00,01.00,000.00,1.00 -+053.86,+00.00,01.00,000.00,1.00 -+054.86,+00.00,01.00,000.00,1.00 -+055.86,+00.00,01.00,000.00,1.00 -+056.86,+00.00,01.00,000.00,1.00 -+057.86,+00.00,01.00,000.00,1.00 -+058.87,+00.00,01.00,000.00,1.00 -+059.87,+00.00,01.00,000.00,1.00 -+060.87,+00.00,01.00,000.00,1.00 -+061.87,+00.00,01.00,000.00,1.00 -+062.87,+00.00,01.00,000.00,1.00 -+063.87,+00.00,01.00,000.00,1.00 -+064.87,+00.00,01.00,000.00,1.00 -+065.87,+00.00,01.00,000.00,1.00 -+066.87,+00.00,01.00,000.00,1.00 -+067.88,+00.00,01.00,000.00,1.00 -+068.88,+00.00,01.00,000.00,1.00 -+069.88,+00.00,01.00,000.00,1.00 -+070.88,+00.00,01.00,000.00,1.00 -+071.88,+00.00,01.00,000.00,1.00 -+072.88,+00.00,01.00,000.00,1.00 -+073.88,+00.00,01.00,000.00,1.00 -+074.88,+00.00,01.00,000.00,1.00 -+075.88,+00.00,01.00,000.00,1.00 -+076.89,+00.00,01.00,000.00,1.00 -+077.89,+00.00,01.00,000.00,1.00 -+078.89,+00.00,01.00,000.00,1.00 -+079.89,+00.00,01.00,000.00,1.00 -+080.89,+00.00,01.00,000.00,1.00 -+081.89,+00.00,01.00,000.00,1.00 -+082.89,+00.00,01.00,000.00,1.00 -+083.89,+00.00,01.00,000.00,1.00 -+084.89,+00.00,01.00,000.00,1.00 -+085.90,+00.00,01.00,000.00,1.00 -+086.90,+00.00,01.00,000.00,1.00 -+087.90,+00.00,01.00,000.00,1.00 -+088.90,+00.00,01.00,000.00,1.00 -+089.90,+00.00,01.00,000.00,1.00 -+090.90,+00.00,01.00,000.00,1.00 -+091.90,+00.00,01.00,000.00,1.00 -+092.90,+00.00,01.00,000.00,1.00 -+093.90,+00.00,01.00,000.00,1.00 -+094.91,+00.00,01.00,000.00,1.00 -+095.91,+00.00,01.00,000.00,1.00 -+096.91,+00.00,01.00,000.00,1.00 -+097.91,+00.00,01.00,000.00,1.00 -+098.91,+00.00,01.00,000.00,1.00 -+099.91,+00.00,01.00,000.00,1.00 -+100.91,+00.00,01.00,000.00,1.00 -+101.91,+00.00,01.00,000.00,1.00 -+102.91,+00.00,01.00,000.00,1.00 -+103.92,+00.00,01.00,000.00,1.00 -+104.92,+00.00,01.00,000.00,1.00 -+105.92,+00.00,01.00,000.00,1.00 -+106.92,+00.00,01.00,000.00,1.00 -+107.92,+00.00,01.00,000.00,1.00 -+108.92,+00.00,01.00,000.00,1.00 -+109.92,+00.00,01.00,000.00,1.00 -+110.92,+00.00,01.00,000.00,1.00 -+111.92,+00.00,01.00,000.00,1.00 -+112.93,+00.00,01.00,000.00,1.00 -+113.93,+00.00,01.00,000.00,1.00 -+114.93,+00.00,01.00,000.00,1.00 -+115.93,+00.00,01.00,000.00,1.00 -+116.93,+00.00,01.00,000.00,1.00 -+117.93,+00.00,01.00,000.00,1.00 -+118.93,+00.00,01.00,000.00,1.00 -+119.93,+00.00,01.00,000.00,1.00 -+120.93,+00.00,01.00,000.00,1.00 -+121.94,+00.00,01.00,000.00,1.00 -+122.94,+00.00,01.00,000.00,1.00 -+123.94,+00.00,01.00,000.00,1.00 -+124.94,+00.00,01.00,000.00,1.00 -+125.94,+00.00,01.00,000.00,1.00 -+126.94,+00.00,01.00,000.00,1.00 -+127.94,+00.00,01.00,000.00,1.00 -+128.94,+00.00,01.00,000.00,1.00 -+129.94,+00.00,01.00,000.00,1.00 -+130.95,+00.00,01.00,000.00,1.00 -+131.95,+00.00,01.00,000.00,1.00 -+132.95,+00.00,01.00,000.00,1.00 -+133.95,+00.00,01.00,000.00,1.00 -+134.95,+00.00,01.00,000.00,1.00 -+135.95,+00.00,01.00,000.00,1.00 -+136.95,+00.00,01.00,000.00,1.00 -+137.95,+00.00,01.00,000.00,1.00 -+138.95,+00.00,01.00,000.00,1.00 -+139.96,+00.00,01.00,000.00,1.00 -+140.96,+00.00,01.00,000.00,1.00 -+141.96,+00.00,01.00,000.00,1.00 -+142.96,+00.00,01.00,000.00,1.00 -+143.96,+00.00,01.00,000.00,1.00 -+144.96,+00.00,01.00,000.00,1.00 -+145.96,+00.00,01.00,000.00,1.00 -+146.96,+00.00,01.00,000.00,1.00 -+147.96,+00.00,01.00,000.00,1.00 -+148.97,+00.00,01.00,000.00,1.00 -+149.97,+00.00,01.00,000.00,1.00 -+150.97,+00.00,01.00,000.00,1.00 -+151.97,+00.00,01.00,000.00,1.00 -+152.97,+00.00,01.00,000.00,1.00 -+153.97,+00.00,01.00,000.00,1.00 -+154.97,+00.00,01.00,000.00,1.00 -+155.97,+00.00,01.00,000.00,1.00 -+156.97,+00.00,01.00,000.00,1.00 -+157.98,+00.00,01.00,000.00,1.00 -+158.98,+00.00,01.00,000.00,1.00 -+159.98,+00.00,01.00,000.00,1.00 -+160.98,+00.00,01.00,000.00,1.00 -+161.98,+00.00,01.00,000.00,1.00 -+162.98,+00.00,01.00,000.00,1.00 -+163.98,+00.00,01.00,000.00,1.00 -+164.98,+00.00,01.00,000.00,1.00 -+165.98,+00.00,01.00,000.00,1.00 -+166.99,+00.00,01.00,000.00,1.00 -+167.99,+00.00,01.00,000.00,1.00 -+168.99,+00.00,01.00,000.00,1.00 -+169.99,+00.00,01.00,000.00,1.00 -+170.99,+00.00,01.00,000.00,1.00 -+171.99,+00.00,01.00,000.00,1.00 -+172.99,+00.00,01.00,000.00,1.00 -+173.99,+00.00,01.00,000.00,1.00 -+174.99,+00.00,01.00,000.00,1.00 -+176.00,+00.00,01.00,000.00,1.00 -+177.00,+00.00,01.00,000.00,1.00 -+178.00,+00.00,01.00,000.00,1.00 -+179.00,+00.00,01.00,000.00,1.00 -+180.00,+00.00,01.00,000.00,1.00 --179.00,+00.00,01.00,000.00,1.00 --178.00,+00.00,01.00,000.00,1.00 --177.00,+00.00,01.00,000.00,1.00 --176.00,+00.00,01.00,000.00,1.00 --174.99,+00.00,01.00,000.00,1.00 --173.99,+00.00,01.00,000.00,1.00 --172.99,+00.00,01.00,000.00,1.00 --171.99,+00.00,01.00,000.00,1.00 --170.99,+00.00,01.00,000.00,1.00 --169.99,+00.00,01.00,000.00,1.00 --168.99,+00.00,01.00,000.00,1.00 --167.99,+00.00,01.00,000.00,1.00 --166.99,+00.00,01.00,000.00,1.00 --165.98,+00.00,01.00,000.00,1.00 --164.98,+00.00,01.00,000.00,1.00 --163.98,+00.00,01.00,000.00,1.00 --162.98,+00.00,01.00,000.00,1.00 --161.98,+00.00,01.00,000.00,1.00 --160.98,+00.00,01.00,000.00,1.00 --159.98,+00.00,01.00,000.00,1.00 --158.98,+00.00,01.00,000.00,1.00 --157.98,+00.00,01.00,000.00,1.00 --156.97,+00.00,01.00,000.00,1.00 --155.97,+00.00,01.00,000.00,1.00 --154.97,+00.00,01.00,000.00,1.00 --153.97,+00.00,01.00,000.00,1.00 --152.97,+00.00,01.00,000.00,1.00 --151.97,+00.00,01.00,000.00,1.00 --150.97,+00.00,01.00,000.00,1.00 --149.97,+00.00,01.00,000.00,1.00 --148.97,+00.00,01.00,000.00,1.00 --147.96,+00.00,01.00,000.00,1.00 --146.96,+00.00,01.00,000.00,1.00 --145.96,+00.00,01.00,000.00,1.00 --144.96,+00.00,01.00,000.00,1.00 --143.96,+00.00,01.00,000.00,1.00 --142.96,+00.00,01.00,000.00,1.00 --141.96,+00.00,01.00,000.00,1.00 --140.96,+00.00,01.00,000.00,1.00 --139.96,+00.00,01.00,000.00,1.00 --138.95,+00.00,01.00,000.00,1.00 --137.95,+00.00,01.00,000.00,1.00 --136.95,+00.00,01.00,000.00,1.00 --135.95,+00.00,01.00,000.00,1.00 --134.95,+00.00,01.00,000.00,1.00 --133.95,+00.00,01.00,000.00,1.00 --132.95,+00.00,01.00,000.00,1.00 --131.95,+00.00,01.00,000.00,1.00 --130.95,+00.00,01.00,000.00,1.00 --129.94,+00.00,01.00,000.00,1.00 --128.94,+00.00,01.00,000.00,1.00 --127.94,+00.00,01.00,000.00,1.00 --126.94,+00.00,01.00,000.00,1.00 --125.94,+00.00,01.00,000.00,1.00 --124.94,+00.00,01.00,000.00,1.00 --123.94,+00.00,01.00,000.00,1.00 --122.94,+00.00,01.00,000.00,1.00 --121.94,+00.00,01.00,000.00,1.00 --120.93,+00.00,01.00,000.00,1.00 --119.93,+00.00,01.00,000.00,1.00 --118.93,+00.00,01.00,000.00,1.00 --117.93,+00.00,01.00,000.00,1.00 --116.93,+00.00,01.00,000.00,1.00 --115.93,+00.00,01.00,000.00,1.00 --114.93,+00.00,01.00,000.00,1.00 --113.93,+00.00,01.00,000.00,1.00 --112.93,+00.00,01.00,000.00,1.00 --111.92,+00.00,01.00,000.00,1.00 --110.92,+00.00,01.00,000.00,1.00 --109.92,+00.00,01.00,000.00,1.00 --108.92,+00.00,01.00,000.00,1.00 --107.92,+00.00,01.00,000.00,1.00 --106.92,+00.00,01.00,000.00,1.00 --105.92,+00.00,01.00,000.00,1.00 --104.92,+00.00,01.00,000.00,1.00 --103.92,+00.00,01.00,000.00,1.00 --102.91,+00.00,01.00,000.00,1.00 --101.91,+00.00,01.00,000.00,1.00 --100.91,+00.00,01.00,000.00,1.00 --099.91,+00.00,01.00,000.00,1.00 --098.91,+00.00,01.00,000.00,1.00 --097.91,+00.00,01.00,000.00,1.00 --096.91,+00.00,01.00,000.00,1.00 --095.91,+00.00,01.00,000.00,1.00 --094.91,+00.00,01.00,000.00,1.00 --093.90,+00.00,01.00,000.00,1.00 --092.90,+00.00,01.00,000.00,1.00 --091.90,+00.00,01.00,000.00,1.00 --090.90,+00.00,01.00,000.00,1.00 --089.90,+00.00,01.00,000.00,1.00 --088.90,+00.00,01.00,000.00,1.00 --087.90,+00.00,01.00,000.00,1.00 --086.90,+00.00,01.00,000.00,1.00 --085.90,+00.00,01.00,000.00,1.00 --084.89,+00.00,01.00,000.00,1.00 --083.89,+00.00,01.00,000.00,1.00 --082.89,+00.00,01.00,000.00,1.00 --081.89,+00.00,01.00,000.00,1.00 --080.89,+00.00,01.00,000.00,1.00 --079.89,+00.00,01.00,000.00,1.00 diff --git a/scripts/td_object_renderer/metadata/csv/t08_ch1.csv b/scripts/td_object_renderer/metadata/csv/t08_ch1.csv deleted file mode 100644 index 2eaf94bbc4..0000000000 --- a/scripts/td_object_renderer/metadata/csv/t08_ch1.csv +++ /dev/null @@ -1,1000 +0,0 @@ -+000.00,+30.00,01.00,000.00,1.00 -+000.00,+29.99,01.00,000.00,1.00 -+000.00,+29.98,01.00,000.00,1.00 -+000.00,+29.95,01.00,000.00,1.00 -+000.00,+29.92,01.00,000.00,1.00 -+000.00,+29.87,01.00,000.00,1.00 -+000.00,+29.82,01.00,000.00,1.00 -+000.00,+29.75,01.00,000.00,1.00 -+000.00,+29.68,01.00,000.00,1.00 -+000.00,+29.59,01.00,000.00,1.00 -+000.00,+29.50,01.00,000.00,1.00 -+000.00,+29.39,01.00,000.00,1.00 -+000.00,+29.28,01.00,000.00,1.00 -+000.00,+29.15,01.00,000.00,1.00 -+000.00,+29.02,01.00,000.00,1.00 -+000.00,+28.88,01.00,000.00,1.00 -+000.00,+28.72,01.00,000.00,1.00 -+000.00,+28.56,01.00,000.00,1.00 -+000.00,+28.39,01.00,000.00,1.00 -+000.00,+28.21,01.00,000.00,1.00 -+000.00,+28.02,01.00,000.00,1.00 -+000.00,+27.82,01.00,000.00,1.00 -+000.00,+27.61,01.00,000.00,1.00 -+000.00,+27.40,01.00,000.00,1.00 -+000.00,+27.17,01.00,000.00,1.00 -+000.00,+26.94,01.00,000.00,1.00 -+000.00,+26.70,01.00,000.00,1.00 -+000.00,+26.45,01.00,000.00,1.00 -+000.00,+26.19,01.00,000.00,1.00 -+000.00,+25.92,01.00,000.00,1.00 -+000.00,+25.65,01.00,000.00,1.00 -+000.00,+25.37,01.00,000.00,1.00 -+000.00,+25.08,01.00,000.00,1.00 -+000.00,+24.78,01.00,000.00,1.00 -+000.00,+24.48,01.00,000.00,1.00 -+000.00,+24.17,01.00,000.00,1.00 -+000.00,+23.85,01.00,000.00,1.00 -+000.00,+23.52,01.00,000.00,1.00 -+000.00,+23.19,01.00,000.00,1.00 -+000.00,+22.85,01.00,000.00,1.00 -+000.00,+22.51,01.00,000.00,1.00 -+000.00,+22.15,01.00,000.00,1.00 -+000.00,+21.80,01.00,000.00,1.00 -+000.00,+21.43,01.00,000.00,1.00 -+000.00,+21.06,01.00,000.00,1.00 -+000.00,+20.69,01.00,000.00,1.00 -+000.00,+20.30,01.00,000.00,1.00 -+000.00,+19.92,01.00,000.00,1.00 -+000.00,+19.53,01.00,000.00,1.00 -+000.00,+19.13,01.00,000.00,1.00 -+000.00,+18.72,01.00,000.00,1.00 -+000.00,+18.32,01.00,000.00,1.00 -+000.00,+17.90,01.00,000.00,1.00 -+000.00,+17.49,01.00,000.00,1.00 -+000.00,+17.07,01.00,000.00,1.00 -+000.00,+16.64,01.00,000.00,1.00 -+000.00,+16.21,01.00,000.00,1.00 -+000.00,+15.77,01.00,000.00,1.00 -+000.00,+15.34,01.00,000.00,1.00 -+000.00,+14.89,01.00,000.00,1.00 -+000.00,+14.45,01.00,000.00,1.00 -+000.00,+14.00,01.00,000.00,1.00 -+000.00,+13.54,01.00,000.00,1.00 -+000.00,+13.09,01.00,000.00,1.00 -+000.00,+12.63,01.00,000.00,1.00 -+000.00,+12.17,01.00,000.00,1.00 -+000.00,+11.70,01.00,000.00,1.00 -+000.00,+11.23,01.00,000.00,1.00 -+000.00,+10.76,01.00,000.00,1.00 -+000.00,+10.29,01.00,000.00,1.00 -+000.00,+09.81,01.00,000.00,1.00 -+000.00,+09.33,01.00,000.00,1.00 -+000.00,+08.85,01.00,000.00,1.00 -+000.00,+08.37,01.00,000.00,1.00 -+000.00,+07.88,01.00,000.00,1.00 -+000.00,+07.39,01.00,000.00,1.00 -+000.00,+06.91,01.00,000.00,1.00 -+000.00,+06.42,01.00,000.00,1.00 -+000.00,+05.92,01.00,000.00,1.00 -+000.00,+05.43,01.00,000.00,1.00 -+000.00,+04.94,01.00,000.00,1.00 -+000.00,+04.44,01.00,000.00,1.00 -+000.00,+03.94,01.00,000.00,1.00 -+000.00,+03.45,01.00,000.00,1.00 -+000.00,+02.95,01.00,000.00,1.00 -+000.00,+02.45,01.00,000.00,1.00 -+000.00,+01.95,01.00,000.00,1.00 -+000.00,+01.45,01.00,000.00,1.00 -+000.00,+00.95,01.00,000.00,1.00 -+000.00,+00.45,01.00,000.00,1.00 -+000.00,-00.05,01.00,000.00,1.00 -+000.00,-00.55,01.00,000.00,1.00 -+000.00,-01.05,01.00,000.00,1.00 -+000.00,-01.55,01.00,000.00,1.00 -+000.00,-02.05,01.00,000.00,1.00 -+000.00,-02.55,01.00,000.00,1.00 -+000.00,-03.05,01.00,000.00,1.00 -+000.00,-03.55,01.00,000.00,1.00 -+000.00,-04.04,01.00,000.00,1.00 -+000.00,-04.54,01.00,000.00,1.00 -+000.00,-05.04,01.00,000.00,1.00 -+000.00,-05.53,01.00,000.00,1.00 -+000.00,-06.02,01.00,000.00,1.00 -+000.00,-06.51,01.00,000.00,1.00 -+000.00,-07.00,01.00,000.00,1.00 -+000.00,-07.49,01.00,000.00,1.00 -+000.00,-07.98,01.00,000.00,1.00 -+000.00,-08.46,01.00,000.00,1.00 -+000.00,-08.95,01.00,000.00,1.00 -+000.00,-09.43,01.00,000.00,1.00 -+000.00,-09.90,01.00,000.00,1.00 -+000.00,-10.38,01.00,000.00,1.00 -+000.00,-10.85,01.00,000.00,1.00 -+000.00,-11.33,01.00,000.00,1.00 -+000.00,-11.79,01.00,000.00,1.00 -+000.00,-12.26,01.00,000.00,1.00 -+000.00,-12.72,01.00,000.00,1.00 -+000.00,-13.18,01.00,000.00,1.00 -+000.00,-13.64,01.00,000.00,1.00 -+000.00,-14.09,01.00,000.00,1.00 -+000.00,-14.54,01.00,000.00,1.00 -+000.00,-14.98,01.00,000.00,1.00 -+000.00,-15.42,01.00,000.00,1.00 -+000.00,-15.86,01.00,000.00,1.00 -+000.00,-16.30,01.00,000.00,1.00 -+000.00,-16.73,01.00,000.00,1.00 -+000.00,-17.15,01.00,000.00,1.00 -+000.00,-17.57,01.00,000.00,1.00 -+000.00,-17.99,01.00,000.00,1.00 -+000.00,-18.40,01.00,000.00,1.00 -+000.00,-18.81,01.00,000.00,1.00 -+000.00,-19.21,01.00,000.00,1.00 -+000.00,-19.60,01.00,000.00,1.00 -+000.00,-20.00,01.00,000.00,1.00 -+000.00,-20.38,01.00,000.00,1.00 -+000.00,-20.76,01.00,000.00,1.00 -+000.00,-21.14,01.00,000.00,1.00 -+000.00,-21.51,01.00,000.00,1.00 -+000.00,-21.87,01.00,000.00,1.00 -+000.00,-22.22,01.00,000.00,1.00 -+000.00,-22.58,01.00,000.00,1.00 -+000.00,-22.92,01.00,000.00,1.00 -+000.00,-23.26,01.00,000.00,1.00 -+000.00,-23.59,01.00,000.00,1.00 -+000.00,-23.91,01.00,000.00,1.00 -+000.00,-24.23,01.00,000.00,1.00 -+000.00,-24.54,01.00,000.00,1.00 -+000.00,-24.84,01.00,000.00,1.00 -+000.00,-25.14,01.00,000.00,1.00 -+000.00,-25.42,01.00,000.00,1.00 -+000.00,-25.71,01.00,000.00,1.00 -+000.00,-25.98,01.00,000.00,1.00 -+000.00,-26.24,01.00,000.00,1.00 -+000.00,-26.50,01.00,000.00,1.00 -+000.00,-26.75,01.00,000.00,1.00 -+000.00,-26.99,01.00,000.00,1.00 -+000.00,-27.22,01.00,000.00,1.00 -+000.00,-27.44,01.00,000.00,1.00 -+000.00,-27.66,01.00,000.00,1.00 -+000.00,-27.86,01.00,000.00,1.00 -+000.00,-28.06,01.00,000.00,1.00 -+000.00,-28.25,01.00,000.00,1.00 -+000.00,-28.43,01.00,000.00,1.00 -+000.00,-28.59,01.00,000.00,1.00 -+000.00,-28.76,01.00,000.00,1.00 -+000.00,-28.91,01.00,000.00,1.00 -+000.00,-29.05,01.00,000.00,1.00 -+000.00,-29.18,01.00,000.00,1.00 -+000.00,-29.30,01.00,000.00,1.00 -+000.00,-29.41,01.00,000.00,1.00 -+000.00,-29.52,01.00,000.00,1.00 -+000.00,-29.61,01.00,000.00,1.00 -+000.00,-29.69,01.00,000.00,1.00 -+000.00,-29.77,01.00,000.00,1.00 -+000.00,-29.83,01.00,000.00,1.00 -+000.00,-29.88,01.00,000.00,1.00 -+000.00,-29.93,01.00,000.00,1.00 -+000.00,-29.96,01.00,000.00,1.00 -+000.00,-29.98,01.00,000.00,1.00 -+000.00,-30.00,01.00,000.00,1.00 -+000.00,-30.00,01.00,000.00,1.00 -+000.00,-29.99,01.00,000.00,1.00 -+000.00,-29.98,01.00,000.00,1.00 -+000.00,-29.95,01.00,000.00,1.00 -+000.00,-29.91,01.00,000.00,1.00 -+000.00,-29.86,01.00,000.00,1.00 -+000.00,-29.81,01.00,000.00,1.00 -+000.00,-29.74,01.00,000.00,1.00 -+000.00,-29.66,01.00,000.00,1.00 -+000.00,-29.57,01.00,000.00,1.00 -+000.00,-29.48,01.00,000.00,1.00 -+000.00,-29.37,01.00,000.00,1.00 -+000.00,-29.25,01.00,000.00,1.00 -+000.00,-29.13,01.00,000.00,1.00 -+000.00,-28.99,01.00,000.00,1.00 -+000.00,-28.85,01.00,000.00,1.00 -+000.00,-28.69,01.00,000.00,1.00 -+000.00,-28.53,01.00,000.00,1.00 -+000.00,-28.35,01.00,000.00,1.00 -+000.00,-28.17,01.00,000.00,1.00 -+000.00,-27.98,01.00,000.00,1.00 -+000.00,-27.78,01.00,000.00,1.00 -+000.00,-27.57,01.00,000.00,1.00 -+000.00,-27.35,01.00,000.00,1.00 -+000.00,-27.13,01.00,000.00,1.00 -+000.00,-26.89,01.00,000.00,1.00 -+000.00,-26.65,01.00,000.00,1.00 -+000.00,-26.40,01.00,000.00,1.00 -+000.00,-26.14,01.00,000.00,1.00 -+000.00,-25.87,01.00,000.00,1.00 -+000.00,-25.59,01.00,000.00,1.00 -+000.00,-25.31,01.00,000.00,1.00 -+000.00,-25.02,01.00,000.00,1.00 -+000.00,-24.72,01.00,000.00,1.00 -+000.00,-24.42,01.00,000.00,1.00 -+000.00,-24.10,01.00,000.00,1.00 -+000.00,-23.78,01.00,000.00,1.00 -+000.00,-23.46,01.00,000.00,1.00 -+000.00,-23.12,01.00,000.00,1.00 -+000.00,-22.78,01.00,000.00,1.00 -+000.00,-22.44,01.00,000.00,1.00 -+000.00,-22.08,01.00,000.00,1.00 -+000.00,-21.72,01.00,000.00,1.00 -+000.00,-21.36,01.00,000.00,1.00 -+000.00,-20.99,01.00,000.00,1.00 -+000.00,-20.61,01.00,000.00,1.00 -+000.00,-20.23,01.00,000.00,1.00 -+000.00,-19.84,01.00,000.00,1.00 -+000.00,-19.45,01.00,000.00,1.00 -+000.00,-19.05,01.00,000.00,1.00 -+000.00,-18.64,01.00,000.00,1.00 -+000.00,-18.23,01.00,000.00,1.00 -+000.00,-17.82,01.00,000.00,1.00 -+000.00,-17.40,01.00,000.00,1.00 -+000.00,-16.98,01.00,000.00,1.00 -+000.00,-16.55,01.00,000.00,1.00 -+000.00,-16.12,01.00,000.00,1.00 -+000.00,-15.69,01.00,000.00,1.00 -+000.00,-15.25,01.00,000.00,1.00 -+000.00,-14.80,01.00,000.00,1.00 -+000.00,-14.36,01.00,000.00,1.00 -+000.00,-13.91,01.00,000.00,1.00 -+000.00,-13.45,01.00,000.00,1.00 -+000.00,-13.00,01.00,000.00,1.00 -+000.00,-12.54,01.00,000.00,1.00 -+000.00,-12.07,01.00,000.00,1.00 -+000.00,-11.61,01.00,000.00,1.00 -+000.00,-11.14,01.00,000.00,1.00 -+000.00,-10.67,01.00,000.00,1.00 -+000.00,-10.19,01.00,000.00,1.00 -+000.00,-09.71,01.00,000.00,1.00 -+000.00,-09.23,01.00,000.00,1.00 -+000.00,-08.75,01.00,000.00,1.00 -+000.00,-08.27,01.00,000.00,1.00 -+000.00,-07.78,01.00,000.00,1.00 -+000.00,-07.30,01.00,000.00,1.00 -+000.00,-06.81,01.00,000.00,1.00 -+000.00,-06.32,01.00,000.00,1.00 -+000.00,-05.83,01.00,000.00,1.00 -+000.00,-05.33,01.00,000.00,1.00 -+000.00,-04.84,01.00,000.00,1.00 -+000.00,-04.34,01.00,000.00,1.00 -+000.00,-03.85,01.00,000.00,1.00 -+000.00,-03.35,01.00,000.00,1.00 -+000.00,-02.85,01.00,000.00,1.00 -+000.00,-02.35,01.00,000.00,1.00 -+000.00,-01.85,01.00,000.00,1.00 -+000.00,-01.35,01.00,000.00,1.00 -+000.00,-00.85,01.00,000.00,1.00 -+000.00,-00.35,01.00,000.00,1.00 -+000.00,+00.15,01.00,000.00,1.00 -+000.00,+00.65,01.00,000.00,1.00 -+000.00,+01.15,01.00,000.00,1.00 -+000.00,+01.65,01.00,000.00,1.00 -+000.00,+02.15,01.00,000.00,1.00 -+000.00,+02.65,01.00,000.00,1.00 -+000.00,+03.15,01.00,000.00,1.00 -+000.00,+03.65,01.00,000.00,1.00 -+000.00,+04.14,01.00,000.00,1.00 -+000.00,+04.64,01.00,000.00,1.00 -+000.00,+05.13,01.00,000.00,1.00 -+000.00,+05.63,01.00,000.00,1.00 -+000.00,+06.12,01.00,000.00,1.00 -+000.00,+06.61,01.00,000.00,1.00 -+000.00,+07.10,01.00,000.00,1.00 -+000.00,+07.59,01.00,000.00,1.00 -+000.00,+08.08,01.00,000.00,1.00 -+000.00,+08.56,01.00,000.00,1.00 -+000.00,+09.04,01.00,000.00,1.00 -+000.00,+09.52,01.00,000.00,1.00 -+000.00,+10.00,01.00,000.00,1.00 -+000.00,+10.48,01.00,000.00,1.00 -+000.00,+10.95,01.00,000.00,1.00 -+000.00,+11.42,01.00,000.00,1.00 -+000.00,+11.89,01.00,000.00,1.00 -+000.00,+12.35,01.00,000.00,1.00 -+000.00,+12.81,01.00,000.00,1.00 -+000.00,+13.27,01.00,000.00,1.00 -+000.00,+13.73,01.00,000.00,1.00 -+000.00,+14.18,01.00,000.00,1.00 -+000.00,+14.63,01.00,000.00,1.00 -+000.00,+15.07,01.00,000.00,1.00 -+000.00,+15.51,01.00,000.00,1.00 -+000.00,+15.95,01.00,000.00,1.00 -+000.00,+16.38,01.00,000.00,1.00 -+000.00,+16.81,01.00,000.00,1.00 -+000.00,+17.23,01.00,000.00,1.00 -+000.00,+17.65,01.00,000.00,1.00 -+000.00,+18.07,01.00,000.00,1.00 -+000.00,+18.48,01.00,000.00,1.00 -+000.00,+18.89,01.00,000.00,1.00 -+000.00,+19.29,01.00,000.00,1.00 -+000.00,+19.68,01.00,000.00,1.00 -+000.00,+20.07,01.00,000.00,1.00 -+000.00,+20.46,01.00,000.00,1.00 -+000.00,+20.84,01.00,000.00,1.00 -+000.00,+21.21,01.00,000.00,1.00 -+000.00,+21.58,01.00,000.00,1.00 -+000.00,+21.94,01.00,000.00,1.00 -+000.00,+22.30,01.00,000.00,1.00 -+000.00,+22.64,01.00,000.00,1.00 -+000.00,+22.99,01.00,000.00,1.00 -+000.00,+23.32,01.00,000.00,1.00 -+000.00,+23.65,01.00,000.00,1.00 -+000.00,+23.98,01.00,000.00,1.00 -+000.00,+24.29,01.00,000.00,1.00 -+000.00,+24.60,01.00,000.00,1.00 -+000.00,+24.90,01.00,000.00,1.00 -+000.00,+25.20,01.00,000.00,1.00 -+000.00,+25.48,01.00,000.00,1.00 -+000.00,+25.76,01.00,000.00,1.00 -+000.00,+26.03,01.00,000.00,1.00 -+000.00,+26.29,01.00,000.00,1.00 -+000.00,+26.55,01.00,000.00,1.00 -+000.00,+26.80,01.00,000.00,1.00 -+000.00,+27.03,01.00,000.00,1.00 -+000.00,+27.26,01.00,000.00,1.00 -+000.00,+27.49,01.00,000.00,1.00 -+000.00,+27.70,01.00,000.00,1.00 -+000.00,+27.90,01.00,000.00,1.00 -+000.00,+28.10,01.00,000.00,1.00 -+000.00,+28.28,01.00,000.00,1.00 -+000.00,+28.46,01.00,000.00,1.00 -+000.00,+28.63,01.00,000.00,1.00 -+000.00,+28.79,01.00,000.00,1.00 -+000.00,+28.94,01.00,000.00,1.00 -+000.00,+29.07,01.00,000.00,1.00 -+000.00,+29.20,01.00,000.00,1.00 -+000.00,+29.33,01.00,000.00,1.00 -+000.00,+29.44,01.00,000.00,1.00 -+000.00,+29.54,01.00,000.00,1.00 -+000.00,+29.63,01.00,000.00,1.00 -+000.00,+29.71,01.00,000.00,1.00 -+000.00,+29.78,01.00,000.00,1.00 -+000.00,+29.84,01.00,000.00,1.00 -+000.00,+29.89,01.00,000.00,1.00 -+000.00,+29.93,01.00,000.00,1.00 -+000.00,+29.97,01.00,000.00,1.00 -+000.00,+29.99,01.00,000.00,1.00 -+000.00,+30.00,01.00,000.00,1.00 -+000.00,+30.00,01.00,000.00,1.00 -+000.00,+29.99,01.00,000.00,1.00 -+000.00,+29.97,01.00,000.00,1.00 -+000.00,+29.94,01.00,000.00,1.00 -+000.00,+29.90,01.00,000.00,1.00 -+000.00,+29.85,01.00,000.00,1.00 -+000.00,+29.79,01.00,000.00,1.00 -+000.00,+29.72,01.00,000.00,1.00 -+000.00,+29.64,01.00,000.00,1.00 -+000.00,+29.56,01.00,000.00,1.00 -+000.00,+29.46,01.00,000.00,1.00 -+000.00,+29.35,01.00,000.00,1.00 -+000.00,+29.23,01.00,000.00,1.00 -+000.00,+29.10,01.00,000.00,1.00 -+000.00,+28.96,01.00,000.00,1.00 -+000.00,+28.82,01.00,000.00,1.00 -+000.00,+28.66,01.00,000.00,1.00 -+000.00,+28.49,01.00,000.00,1.00 -+000.00,+28.32,01.00,000.00,1.00 -+000.00,+28.13,01.00,000.00,1.00 -+000.00,+27.94,01.00,000.00,1.00 -+000.00,+27.74,01.00,000.00,1.00 -+000.00,+27.53,01.00,000.00,1.00 -+000.00,+27.31,01.00,000.00,1.00 -+000.00,+27.08,01.00,000.00,1.00 -+000.00,+26.84,01.00,000.00,1.00 -+000.00,+26.60,01.00,000.00,1.00 -+000.00,+26.35,01.00,000.00,1.00 -+000.00,+26.08,01.00,000.00,1.00 -+000.00,+25.81,01.00,000.00,1.00 -+000.00,+25.54,01.00,000.00,1.00 -+000.00,+25.25,01.00,000.00,1.00 -+000.00,+24.96,01.00,000.00,1.00 -+000.00,+24.66,01.00,000.00,1.00 -+000.00,+24.35,01.00,000.00,1.00 -+000.00,+24.04,01.00,000.00,1.00 -+000.00,+23.72,01.00,000.00,1.00 -+000.00,+23.39,01.00,000.00,1.00 -+000.00,+23.06,01.00,000.00,1.00 -+000.00,+22.71,01.00,000.00,1.00 -+000.00,+22.37,01.00,000.00,1.00 -+000.00,+22.01,01.00,000.00,1.00 -+000.00,+21.65,01.00,000.00,1.00 -+000.00,+21.28,01.00,000.00,1.00 -+000.00,+20.91,01.00,000.00,1.00 -+000.00,+20.53,01.00,000.00,1.00 -+000.00,+20.15,01.00,000.00,1.00 -+000.00,+19.76,01.00,000.00,1.00 -+000.00,+19.37,01.00,000.00,1.00 -+000.00,+18.97,01.00,000.00,1.00 -+000.00,+18.56,01.00,000.00,1.00 -+000.00,+18.15,01.00,000.00,1.00 -+000.00,+17.74,01.00,000.00,1.00 -+000.00,+17.32,01.00,000.00,1.00 -+000.00,+16.90,01.00,000.00,1.00 -+000.00,+16.47,01.00,000.00,1.00 -+000.00,+16.04,01.00,000.00,1.00 -+000.00,+15.60,01.00,000.00,1.00 -+000.00,+15.16,01.00,000.00,1.00 -+000.00,+14.72,01.00,000.00,1.00 -+000.00,+14.27,01.00,000.00,1.00 -+000.00,+13.82,01.00,000.00,1.00 -+000.00,+13.36,01.00,000.00,1.00 -+000.00,+12.90,01.00,000.00,1.00 -+000.00,+12.44,01.00,000.00,1.00 -+000.00,+11.98,01.00,000.00,1.00 -+000.00,+11.51,01.00,000.00,1.00 -+000.00,+11.04,01.00,000.00,1.00 -+000.00,+10.57,01.00,000.00,1.00 -+000.00,+10.10,01.00,000.00,1.00 -+000.00,+09.62,01.00,000.00,1.00 -+000.00,+09.14,01.00,000.00,1.00 -+000.00,+08.66,01.00,000.00,1.00 -+000.00,+08.17,01.00,000.00,1.00 -+000.00,+07.69,01.00,000.00,1.00 -+000.00,+07.20,01.00,000.00,1.00 -+000.00,+06.71,01.00,000.00,1.00 -+000.00,+06.22,01.00,000.00,1.00 -+000.00,+05.73,01.00,000.00,1.00 -+000.00,+05.23,01.00,000.00,1.00 -+000.00,+04.74,01.00,000.00,1.00 -+000.00,+04.24,01.00,000.00,1.00 -+000.00,+03.75,01.00,000.00,1.00 -+000.00,+03.25,01.00,000.00,1.00 -+000.00,+02.75,01.00,000.00,1.00 -+000.00,+02.25,01.00,000.00,1.00 -+000.00,+01.75,01.00,000.00,1.00 -+000.00,+01.25,01.00,000.00,1.00 -+000.00,+00.75,01.00,000.00,1.00 -+000.00,+00.25,01.00,000.00,1.00 -+000.00,-00.25,01.00,000.00,1.00 -+000.00,-00.75,01.00,000.00,1.00 -+000.00,-01.25,01.00,000.00,1.00 -+000.00,-01.75,01.00,000.00,1.00 -+000.00,-02.25,01.00,000.00,1.00 -+000.00,-02.75,01.00,000.00,1.00 -+000.00,-03.25,01.00,000.00,1.00 -+000.00,-03.75,01.00,000.00,1.00 -+000.00,-04.24,01.00,000.00,1.00 -+000.00,-04.74,01.00,000.00,1.00 -+000.00,-05.23,01.00,000.00,1.00 -+000.00,-05.73,01.00,000.00,1.00 -+000.00,-06.22,01.00,000.00,1.00 -+000.00,-06.71,01.00,000.00,1.00 -+000.00,-07.20,01.00,000.00,1.00 -+000.00,-07.69,01.00,000.00,1.00 -+000.00,-08.17,01.00,000.00,1.00 -+000.00,-08.66,01.00,000.00,1.00 -+000.00,-09.14,01.00,000.00,1.00 -+000.00,-09.62,01.00,000.00,1.00 -+000.00,-10.10,01.00,000.00,1.00 -+000.00,-10.57,01.00,000.00,1.00 -+000.00,-11.04,01.00,000.00,1.00 -+000.00,-11.51,01.00,000.00,1.00 -+000.00,-11.98,01.00,000.00,1.00 -+000.00,-12.44,01.00,000.00,1.00 -+000.00,-12.90,01.00,000.00,1.00 -+000.00,-13.36,01.00,000.00,1.00 -+000.00,-13.82,01.00,000.00,1.00 -+000.00,-14.27,01.00,000.00,1.00 -+000.00,-14.72,01.00,000.00,1.00 -+000.00,-15.16,01.00,000.00,1.00 -+000.00,-15.60,01.00,000.00,1.00 -+000.00,-16.04,01.00,000.00,1.00 -+000.00,-16.47,01.00,000.00,1.00 -+000.00,-16.90,01.00,000.00,1.00 -+000.00,-17.32,01.00,000.00,1.00 -+000.00,-17.74,01.00,000.00,1.00 -+000.00,-18.15,01.00,000.00,1.00 -+000.00,-18.56,01.00,000.00,1.00 -+000.00,-18.97,01.00,000.00,1.00 -+000.00,-19.37,01.00,000.00,1.00 -+000.00,-19.76,01.00,000.00,1.00 -+000.00,-20.15,01.00,000.00,1.00 -+000.00,-20.53,01.00,000.00,1.00 -+000.00,-20.91,01.00,000.00,1.00 -+000.00,-21.28,01.00,000.00,1.00 -+000.00,-21.65,01.00,000.00,1.00 -+000.00,-22.01,01.00,000.00,1.00 -+000.00,-22.37,01.00,000.00,1.00 -+000.00,-22.71,01.00,000.00,1.00 -+000.00,-23.06,01.00,000.00,1.00 -+000.00,-23.39,01.00,000.00,1.00 -+000.00,-23.72,01.00,000.00,1.00 -+000.00,-24.04,01.00,000.00,1.00 -+000.00,-24.35,01.00,000.00,1.00 -+000.00,-24.66,01.00,000.00,1.00 -+000.00,-24.96,01.00,000.00,1.00 -+000.00,-25.25,01.00,000.00,1.00 -+000.00,-25.54,01.00,000.00,1.00 -+000.00,-25.81,01.00,000.00,1.00 -+000.00,-26.08,01.00,000.00,1.00 -+000.00,-26.35,01.00,000.00,1.00 -+000.00,-26.60,01.00,000.00,1.00 -+000.00,-26.84,01.00,000.00,1.00 -+000.00,-27.08,01.00,000.00,1.00 -+000.00,-27.31,01.00,000.00,1.00 -+000.00,-27.53,01.00,000.00,1.00 -+000.00,-27.74,01.00,000.00,1.00 -+000.00,-27.94,01.00,000.00,1.00 -+000.00,-28.13,01.00,000.00,1.00 -+000.00,-28.32,01.00,000.00,1.00 -+000.00,-28.49,01.00,000.00,1.00 -+000.00,-28.66,01.00,000.00,1.00 -+000.00,-28.82,01.00,000.00,1.00 -+000.00,-28.96,01.00,000.00,1.00 -+000.00,-29.10,01.00,000.00,1.00 -+000.00,-29.23,01.00,000.00,1.00 -+000.00,-29.35,01.00,000.00,1.00 -+000.00,-29.46,01.00,000.00,1.00 -+000.00,-29.56,01.00,000.00,1.00 -+000.00,-29.64,01.00,000.00,1.00 -+000.00,-29.72,01.00,000.00,1.00 -+000.00,-29.79,01.00,000.00,1.00 -+000.00,-29.85,01.00,000.00,1.00 -+000.00,-29.90,01.00,000.00,1.00 -+000.00,-29.94,01.00,000.00,1.00 -+000.00,-29.97,01.00,000.00,1.00 -+000.00,-29.99,01.00,000.00,1.00 -+000.00,-30.00,01.00,000.00,1.00 -+000.00,-30.00,01.00,000.00,1.00 -+000.00,-29.99,01.00,000.00,1.00 -+000.00,-29.97,01.00,000.00,1.00 -+000.00,-29.93,01.00,000.00,1.00 -+000.00,-29.89,01.00,000.00,1.00 -+000.00,-29.84,01.00,000.00,1.00 -+000.00,-29.78,01.00,000.00,1.00 -+000.00,-29.71,01.00,000.00,1.00 -+000.00,-29.63,01.00,000.00,1.00 -+000.00,-29.54,01.00,000.00,1.00 -+000.00,-29.44,01.00,000.00,1.00 -+000.00,-29.33,01.00,000.00,1.00 -+000.00,-29.20,01.00,000.00,1.00 -+000.00,-29.07,01.00,000.00,1.00 -+000.00,-28.94,01.00,000.00,1.00 -+000.00,-28.79,01.00,000.00,1.00 -+000.00,-28.63,01.00,000.00,1.00 -+000.00,-28.46,01.00,000.00,1.00 -+000.00,-28.28,01.00,000.00,1.00 -+000.00,-28.10,01.00,000.00,1.00 -+000.00,-27.90,01.00,000.00,1.00 -+000.00,-27.70,01.00,000.00,1.00 -+000.00,-27.49,01.00,000.00,1.00 -+000.00,-27.26,01.00,000.00,1.00 -+000.00,-27.03,01.00,000.00,1.00 -+000.00,-26.80,01.00,000.00,1.00 -+000.00,-26.55,01.00,000.00,1.00 -+000.00,-26.29,01.00,000.00,1.00 -+000.00,-26.03,01.00,000.00,1.00 -+000.00,-25.76,01.00,000.00,1.00 -+000.00,-25.48,01.00,000.00,1.00 -+000.00,-25.20,01.00,000.00,1.00 -+000.00,-24.90,01.00,000.00,1.00 -+000.00,-24.60,01.00,000.00,1.00 -+000.00,-24.29,01.00,000.00,1.00 -+000.00,-23.98,01.00,000.00,1.00 -+000.00,-23.65,01.00,000.00,1.00 -+000.00,-23.32,01.00,000.00,1.00 -+000.00,-22.99,01.00,000.00,1.00 -+000.00,-22.64,01.00,000.00,1.00 -+000.00,-22.30,01.00,000.00,1.00 -+000.00,-21.94,01.00,000.00,1.00 -+000.00,-21.58,01.00,000.00,1.00 -+000.00,-21.21,01.00,000.00,1.00 -+000.00,-20.84,01.00,000.00,1.00 -+000.00,-20.46,01.00,000.00,1.00 -+000.00,-20.07,01.00,000.00,1.00 -+000.00,-19.68,01.00,000.00,1.00 -+000.00,-19.29,01.00,000.00,1.00 -+000.00,-18.89,01.00,000.00,1.00 -+000.00,-18.48,01.00,000.00,1.00 -+000.00,-18.07,01.00,000.00,1.00 -+000.00,-17.65,01.00,000.00,1.00 -+000.00,-17.23,01.00,000.00,1.00 -+000.00,-16.81,01.00,000.00,1.00 -+000.00,-16.38,01.00,000.00,1.00 -+000.00,-15.95,01.00,000.00,1.00 -+000.00,-15.51,01.00,000.00,1.00 -+000.00,-15.07,01.00,000.00,1.00 -+000.00,-14.63,01.00,000.00,1.00 -+000.00,-14.18,01.00,000.00,1.00 -+000.00,-13.73,01.00,000.00,1.00 -+000.00,-13.27,01.00,000.00,1.00 -+000.00,-12.81,01.00,000.00,1.00 -+000.00,-12.35,01.00,000.00,1.00 -+000.00,-11.89,01.00,000.00,1.00 -+000.00,-11.42,01.00,000.00,1.00 -+000.00,-10.95,01.00,000.00,1.00 -+000.00,-10.48,01.00,000.00,1.00 -+000.00,-10.00,01.00,000.00,1.00 -+000.00,-09.52,01.00,000.00,1.00 -+000.00,-09.04,01.00,000.00,1.00 -+000.00,-08.56,01.00,000.00,1.00 -+000.00,-08.08,01.00,000.00,1.00 -+000.00,-07.59,01.00,000.00,1.00 -+000.00,-07.10,01.00,000.00,1.00 -+000.00,-06.61,01.00,000.00,1.00 -+000.00,-06.12,01.00,000.00,1.00 -+000.00,-05.63,01.00,000.00,1.00 -+000.00,-05.13,01.00,000.00,1.00 -+000.00,-04.64,01.00,000.00,1.00 -+000.00,-04.14,01.00,000.00,1.00 -+000.00,-03.65,01.00,000.00,1.00 -+000.00,-03.15,01.00,000.00,1.00 -+000.00,-02.65,01.00,000.00,1.00 -+000.00,-02.15,01.00,000.00,1.00 -+000.00,-01.65,01.00,000.00,1.00 -+000.00,-01.15,01.00,000.00,1.00 -+000.00,-00.65,01.00,000.00,1.00 -+000.00,-00.15,01.00,000.00,1.00 -+000.00,+00.35,01.00,000.00,1.00 -+000.00,+00.85,01.00,000.00,1.00 -+000.00,+01.35,01.00,000.00,1.00 -+000.00,+01.85,01.00,000.00,1.00 -+000.00,+02.35,01.00,000.00,1.00 -+000.00,+02.85,01.00,000.00,1.00 -+000.00,+03.35,01.00,000.00,1.00 -+000.00,+03.85,01.00,000.00,1.00 -+000.00,+04.34,01.00,000.00,1.00 -+000.00,+04.84,01.00,000.00,1.00 -+000.00,+05.33,01.00,000.00,1.00 -+000.00,+05.83,01.00,000.00,1.00 -+000.00,+06.32,01.00,000.00,1.00 -+000.00,+06.81,01.00,000.00,1.00 -+000.00,+07.30,01.00,000.00,1.00 -+000.00,+07.78,01.00,000.00,1.00 -+000.00,+08.27,01.00,000.00,1.00 -+000.00,+08.75,01.00,000.00,1.00 -+000.00,+09.23,01.00,000.00,1.00 -+000.00,+09.71,01.00,000.00,1.00 -+000.00,+10.19,01.00,000.00,1.00 -+000.00,+10.67,01.00,000.00,1.00 -+000.00,+11.14,01.00,000.00,1.00 -+000.00,+11.61,01.00,000.00,1.00 -+000.00,+12.07,01.00,000.00,1.00 -+000.00,+12.54,01.00,000.00,1.00 -+000.00,+13.00,01.00,000.00,1.00 -+000.00,+13.45,01.00,000.00,1.00 -+000.00,+13.91,01.00,000.00,1.00 -+000.00,+14.36,01.00,000.00,1.00 -+000.00,+14.80,01.00,000.00,1.00 -+000.00,+15.25,01.00,000.00,1.00 -+000.00,+15.69,01.00,000.00,1.00 -+000.00,+16.12,01.00,000.00,1.00 -+000.00,+16.55,01.00,000.00,1.00 -+000.00,+16.98,01.00,000.00,1.00 -+000.00,+17.40,01.00,000.00,1.00 -+000.00,+17.82,01.00,000.00,1.00 -+000.00,+18.23,01.00,000.00,1.00 -+000.00,+18.64,01.00,000.00,1.00 -+000.00,+19.05,01.00,000.00,1.00 -+000.00,+19.45,01.00,000.00,1.00 -+000.00,+19.84,01.00,000.00,1.00 -+000.00,+20.23,01.00,000.00,1.00 -+000.00,+20.61,01.00,000.00,1.00 -+000.00,+20.99,01.00,000.00,1.00 -+000.00,+21.36,01.00,000.00,1.00 -+000.00,+21.72,01.00,000.00,1.00 -+000.00,+22.08,01.00,000.00,1.00 -+000.00,+22.44,01.00,000.00,1.00 -+000.00,+22.78,01.00,000.00,1.00 -+000.00,+23.12,01.00,000.00,1.00 -+000.00,+23.46,01.00,000.00,1.00 -+000.00,+23.78,01.00,000.00,1.00 -+000.00,+24.10,01.00,000.00,1.00 -+000.00,+24.42,01.00,000.00,1.00 -+000.00,+24.72,01.00,000.00,1.00 -+000.00,+25.02,01.00,000.00,1.00 -+000.00,+25.31,01.00,000.00,1.00 -+000.00,+25.59,01.00,000.00,1.00 -+000.00,+25.87,01.00,000.00,1.00 -+000.00,+26.14,01.00,000.00,1.00 -+000.00,+26.40,01.00,000.00,1.00 -+000.00,+26.65,01.00,000.00,1.00 -+000.00,+26.89,01.00,000.00,1.00 -+000.00,+27.13,01.00,000.00,1.00 -+000.00,+27.35,01.00,000.00,1.00 -+000.00,+27.57,01.00,000.00,1.00 -+000.00,+27.78,01.00,000.00,1.00 -+000.00,+27.98,01.00,000.00,1.00 -+000.00,+28.17,01.00,000.00,1.00 -+000.00,+28.35,01.00,000.00,1.00 -+000.00,+28.53,01.00,000.00,1.00 -+000.00,+28.69,01.00,000.00,1.00 -+000.00,+28.85,01.00,000.00,1.00 -+000.00,+28.99,01.00,000.00,1.00 -+000.00,+29.13,01.00,000.00,1.00 -+000.00,+29.25,01.00,000.00,1.00 -+000.00,+29.37,01.00,000.00,1.00 -+000.00,+29.48,01.00,000.00,1.00 -+000.00,+29.57,01.00,000.00,1.00 -+000.00,+29.66,01.00,000.00,1.00 -+000.00,+29.74,01.00,000.00,1.00 -+000.00,+29.81,01.00,000.00,1.00 -+000.00,+29.86,01.00,000.00,1.00 -+000.00,+29.91,01.00,000.00,1.00 -+000.00,+29.95,01.00,000.00,1.00 -+000.00,+29.98,01.00,000.00,1.00 -+000.00,+29.99,01.00,000.00,1.00 -+000.00,+30.00,01.00,000.00,1.00 -+000.00,+30.00,01.00,000.00,1.00 -+000.00,+29.98,01.00,000.00,1.00 -+000.00,+29.96,01.00,000.00,1.00 -+000.00,+29.93,01.00,000.00,1.00 -+000.00,+29.88,01.00,000.00,1.00 -+000.00,+29.83,01.00,000.00,1.00 -+000.00,+29.77,01.00,000.00,1.00 -+000.00,+29.69,01.00,000.00,1.00 -+000.00,+29.61,01.00,000.00,1.00 -+000.00,+29.52,01.00,000.00,1.00 -+000.00,+29.41,01.00,000.00,1.00 -+000.00,+29.30,01.00,000.00,1.00 -+000.00,+29.18,01.00,000.00,1.00 -+000.00,+29.05,01.00,000.00,1.00 -+000.00,+28.91,01.00,000.00,1.00 -+000.00,+28.76,01.00,000.00,1.00 -+000.00,+28.59,01.00,000.00,1.00 -+000.00,+28.43,01.00,000.00,1.00 -+000.00,+28.25,01.00,000.00,1.00 -+000.00,+28.06,01.00,000.00,1.00 -+000.00,+27.86,01.00,000.00,1.00 -+000.00,+27.66,01.00,000.00,1.00 -+000.00,+27.44,01.00,000.00,1.00 -+000.00,+27.22,01.00,000.00,1.00 -+000.00,+26.99,01.00,000.00,1.00 -+000.00,+26.75,01.00,000.00,1.00 -+000.00,+26.50,01.00,000.00,1.00 -+000.00,+26.24,01.00,000.00,1.00 -+000.00,+25.98,01.00,000.00,1.00 -+000.00,+25.71,01.00,000.00,1.00 -+000.00,+25.42,01.00,000.00,1.00 -+000.00,+25.14,01.00,000.00,1.00 -+000.00,+24.84,01.00,000.00,1.00 -+000.00,+24.54,01.00,000.00,1.00 -+000.00,+24.23,01.00,000.00,1.00 -+000.00,+23.91,01.00,000.00,1.00 -+000.00,+23.59,01.00,000.00,1.00 -+000.00,+23.26,01.00,000.00,1.00 -+000.00,+22.92,01.00,000.00,1.00 -+000.00,+22.58,01.00,000.00,1.00 -+000.00,+22.22,01.00,000.00,1.00 -+000.00,+21.87,01.00,000.00,1.00 -+000.00,+21.51,01.00,000.00,1.00 -+000.00,+21.14,01.00,000.00,1.00 -+000.00,+20.76,01.00,000.00,1.00 -+000.00,+20.38,01.00,000.00,1.00 -+000.00,+20.00,01.00,000.00,1.00 -+000.00,+19.60,01.00,000.00,1.00 -+000.00,+19.21,01.00,000.00,1.00 -+000.00,+18.81,01.00,000.00,1.00 -+000.00,+18.40,01.00,000.00,1.00 -+000.00,+17.99,01.00,000.00,1.00 -+000.00,+17.57,01.00,000.00,1.00 -+000.00,+17.15,01.00,000.00,1.00 -+000.00,+16.73,01.00,000.00,1.00 -+000.00,+16.30,01.00,000.00,1.00 -+000.00,+15.86,01.00,000.00,1.00 -+000.00,+15.42,01.00,000.00,1.00 -+000.00,+14.98,01.00,000.00,1.00 -+000.00,+14.54,01.00,000.00,1.00 -+000.00,+14.09,01.00,000.00,1.00 -+000.00,+13.64,01.00,000.00,1.00 -+000.00,+13.18,01.00,000.00,1.00 -+000.00,+12.72,01.00,000.00,1.00 -+000.00,+12.26,01.00,000.00,1.00 -+000.00,+11.79,01.00,000.00,1.00 -+000.00,+11.33,01.00,000.00,1.00 -+000.00,+10.85,01.00,000.00,1.00 -+000.00,+10.38,01.00,000.00,1.00 -+000.00,+09.90,01.00,000.00,1.00 -+000.00,+09.43,01.00,000.00,1.00 -+000.00,+08.95,01.00,000.00,1.00 -+000.00,+08.46,01.00,000.00,1.00 -+000.00,+07.98,01.00,000.00,1.00 -+000.00,+07.49,01.00,000.00,1.00 -+000.00,+07.00,01.00,000.00,1.00 -+000.00,+06.51,01.00,000.00,1.00 -+000.00,+06.02,01.00,000.00,1.00 -+000.00,+05.53,01.00,000.00,1.00 -+000.00,+05.04,01.00,000.00,1.00 -+000.00,+04.54,01.00,000.00,1.00 -+000.00,+04.04,01.00,000.00,1.00 -+000.00,+03.55,01.00,000.00,1.00 -+000.00,+03.05,01.00,000.00,1.00 -+000.00,+02.55,01.00,000.00,1.00 -+000.00,+02.05,01.00,000.00,1.00 -+000.00,+01.55,01.00,000.00,1.00 -+000.00,+01.05,01.00,000.00,1.00 -+000.00,+00.55,01.00,000.00,1.00 -+000.00,+00.05,01.00,000.00,1.00 -+000.00,-00.45,01.00,000.00,1.00 -+000.00,-00.95,01.00,000.00,1.00 -+000.00,-01.45,01.00,000.00,1.00 -+000.00,-01.95,01.00,000.00,1.00 -+000.00,-02.45,01.00,000.00,1.00 -+000.00,-02.95,01.00,000.00,1.00 -+000.00,-03.45,01.00,000.00,1.00 -+000.00,-03.94,01.00,000.00,1.00 -+000.00,-04.44,01.00,000.00,1.00 -+000.00,-04.94,01.00,000.00,1.00 -+000.00,-05.43,01.00,000.00,1.00 -+000.00,-05.92,01.00,000.00,1.00 -+000.00,-06.42,01.00,000.00,1.00 -+000.00,-06.91,01.00,000.00,1.00 -+000.00,-07.39,01.00,000.00,1.00 -+000.00,-07.88,01.00,000.00,1.00 -+000.00,-08.37,01.00,000.00,1.00 -+000.00,-08.85,01.00,000.00,1.00 -+000.00,-09.33,01.00,000.00,1.00 -+000.00,-09.81,01.00,000.00,1.00 -+000.00,-10.29,01.00,000.00,1.00 -+000.00,-10.76,01.00,000.00,1.00 -+000.00,-11.23,01.00,000.00,1.00 -+000.00,-11.70,01.00,000.00,1.00 -+000.00,-12.17,01.00,000.00,1.00 -+000.00,-12.63,01.00,000.00,1.00 -+000.00,-13.09,01.00,000.00,1.00 -+000.00,-13.54,01.00,000.00,1.00 -+000.00,-14.00,01.00,000.00,1.00 -+000.00,-14.45,01.00,000.00,1.00 -+000.00,-14.89,01.00,000.00,1.00 -+000.00,-15.34,01.00,000.00,1.00 -+000.00,-15.77,01.00,000.00,1.00 -+000.00,-16.21,01.00,000.00,1.00 -+000.00,-16.64,01.00,000.00,1.00 -+000.00,-17.07,01.00,000.00,1.00 -+000.00,-17.49,01.00,000.00,1.00 -+000.00,-17.90,01.00,000.00,1.00 -+000.00,-18.32,01.00,000.00,1.00 -+000.00,-18.72,01.00,000.00,1.00 -+000.00,-19.13,01.00,000.00,1.00 -+000.00,-19.53,01.00,000.00,1.00 -+000.00,-19.92,01.00,000.00,1.00 -+000.00,-20.30,01.00,000.00,1.00 -+000.00,-20.69,01.00,000.00,1.00 -+000.00,-21.06,01.00,000.00,1.00 -+000.00,-21.43,01.00,000.00,1.00 -+000.00,-21.80,01.00,000.00,1.00 -+000.00,-22.15,01.00,000.00,1.00 -+000.00,-22.51,01.00,000.00,1.00 -+000.00,-22.85,01.00,000.00,1.00 -+000.00,-23.19,01.00,000.00,1.00 -+000.00,-23.52,01.00,000.00,1.00 -+000.00,-23.85,01.00,000.00,1.00 -+000.00,-24.17,01.00,000.00,1.00 -+000.00,-24.48,01.00,000.00,1.00 -+000.00,-24.78,01.00,000.00,1.00 -+000.00,-25.08,01.00,000.00,1.00 -+000.00,-25.37,01.00,000.00,1.00 -+000.00,-25.65,01.00,000.00,1.00 -+000.00,-25.92,01.00,000.00,1.00 -+000.00,-26.19,01.00,000.00,1.00 -+000.00,-26.45,01.00,000.00,1.00 -+000.00,-26.70,01.00,000.00,1.00 -+000.00,-26.94,01.00,000.00,1.00 -+000.00,-27.17,01.00,000.00,1.00 -+000.00,-27.40,01.00,000.00,1.00 -+000.00,-27.61,01.00,000.00,1.00 -+000.00,-27.82,01.00,000.00,1.00 -+000.00,-28.02,01.00,000.00,1.00 -+000.00,-28.21,01.00,000.00,1.00 -+000.00,-28.39,01.00,000.00,1.00 -+000.00,-28.56,01.00,000.00,1.00 -+000.00,-28.72,01.00,000.00,1.00 -+000.00,-28.88,01.00,000.00,1.00 -+000.00,-29.02,01.00,000.00,1.00 -+000.00,-29.15,01.00,000.00,1.00 -+000.00,-29.28,01.00,000.00,1.00 -+000.00,-29.39,01.00,000.00,1.00 -+000.00,-29.50,01.00,000.00,1.00 -+000.00,-29.59,01.00,000.00,1.00 -+000.00,-29.68,01.00,000.00,1.00 -+000.00,-29.75,01.00,000.00,1.00 -+000.00,-29.82,01.00,000.00,1.00 -+000.00,-29.87,01.00,000.00,1.00 -+000.00,-29.92,01.00,000.00,1.00 -+000.00,-29.95,01.00,000.00,1.00 -+000.00,-29.98,01.00,000.00,1.00 -+000.00,-29.99,01.00,000.00,1.00 -+000.00,-30.00,01.00,000.00,1.00 -+000.00,-29.99,01.00,000.00,1.00 -+000.00,-29.98,01.00,000.00,1.00 -+000.00,-29.95,01.00,000.00,1.00 -+000.00,-29.92,01.00,000.00,1.00 -+000.00,-29.87,01.00,000.00,1.00 -+000.00,-29.82,01.00,000.00,1.00 -+000.00,-29.75,01.00,000.00,1.00 -+000.00,-29.68,01.00,000.00,1.00 -+000.00,-29.59,01.00,000.00,1.00 -+000.00,-29.50,01.00,000.00,1.00 -+000.00,-29.39,01.00,000.00,1.00 -+000.00,-29.28,01.00,000.00,1.00 -+000.00,-29.15,01.00,000.00,1.00 -+000.00,-29.02,01.00,000.00,1.00 -+000.00,-28.88,01.00,000.00,1.00 -+000.00,-28.72,01.00,000.00,1.00 -+000.00,-28.56,01.00,000.00,1.00 -+000.00,-28.39,01.00,000.00,1.00 -+000.00,-28.21,01.00,000.00,1.00 -+000.00,-28.02,01.00,000.00,1.00 -+000.00,-27.82,01.00,000.00,1.00 -+000.00,-27.61,01.00,000.00,1.00 -+000.00,-27.40,01.00,000.00,1.00 -+000.00,-27.17,01.00,000.00,1.00 -+000.00,-26.94,01.00,000.00,1.00 -+000.00,-26.70,01.00,000.00,1.00 -+000.00,-26.45,01.00,000.00,1.00 -+000.00,-26.19,01.00,000.00,1.00 -+000.00,-25.92,01.00,000.00,1.00 -+000.00,-25.65,01.00,000.00,1.00 -+000.00,-25.37,01.00,000.00,1.00 -+000.00,-25.08,01.00,000.00,1.00 -+000.00,-24.78,01.00,000.00,1.00 -+000.00,-24.48,01.00,000.00,1.00 -+000.00,-24.17,01.00,000.00,1.00 -+000.00,-23.85,01.00,000.00,1.00 -+000.00,-23.52,01.00,000.00,1.00 -+000.00,-23.19,01.00,000.00,1.00 -+000.00,-22.85,01.00,000.00,1.00 -+000.00,-22.51,01.00,000.00,1.00 -+000.00,-22.15,01.00,000.00,1.00 -+000.00,-21.80,01.00,000.00,1.00 -+000.00,-21.43,01.00,000.00,1.00 -+000.00,-21.06,01.00,000.00,1.00 -+000.00,-20.69,01.00,000.00,1.00 -+000.00,-20.30,01.00,000.00,1.00 -+000.00,-19.92,01.00,000.00,1.00 -+000.00,-19.53,01.00,000.00,1.00 -+000.00,-19.13,01.00,000.00,1.00 -+000.00,-18.72,01.00,000.00,1.00 -+000.00,-18.32,01.00,000.00,1.00 -+000.00,-17.90,01.00,000.00,1.00 -+000.00,-17.49,01.00,000.00,1.00 -+000.00,-17.07,01.00,000.00,1.00 -+000.00,-16.64,01.00,000.00,1.00 -+000.00,-16.21,01.00,000.00,1.00 -+000.00,-15.77,01.00,000.00,1.00 -+000.00,-15.34,01.00,000.00,1.00 -+000.00,-14.89,01.00,000.00,1.00 -+000.00,-14.45,01.00,000.00,1.00 -+000.00,-14.00,01.00,000.00,1.00 -+000.00,-13.54,01.00,000.00,1.00 -+000.00,-13.09,01.00,000.00,1.00 -+000.00,-12.63,01.00,000.00,1.00 -+000.00,-12.17,01.00,000.00,1.00 -+000.00,-11.70,01.00,000.00,1.00 -+000.00,-11.23,01.00,000.00,1.00 -+000.00,-10.76,01.00,000.00,1.00 -+000.00,-10.29,01.00,000.00,1.00 -+000.00,-09.81,01.00,000.00,1.00 -+000.00,-09.33,01.00,000.00,1.00 -+000.00,-08.85,01.00,000.00,1.00 -+000.00,-08.37,01.00,000.00,1.00 -+000.00,-07.88,01.00,000.00,1.00 -+000.00,-07.39,01.00,000.00,1.00 -+000.00,-06.91,01.00,000.00,1.00 -+000.00,-06.42,01.00,000.00,1.00 -+000.00,-05.92,01.00,000.00,1.00 -+000.00,-05.43,01.00,000.00,1.00 -+000.00,-04.94,01.00,000.00,1.00 -+000.00,-04.44,01.00,000.00,1.00 -+000.00,-03.94,01.00,000.00,1.00 -+000.00,-03.45,01.00,000.00,1.00 -+000.00,-02.95,01.00,000.00,1.00 -+000.00,-02.45,01.00,000.00,1.00 -+000.00,-01.95,01.00,000.00,1.00 -+000.00,-01.45,01.00,000.00,1.00 -+000.00,-00.95,01.00,000.00,1.00 -+000.00,-00.45,01.00,000.00,1.00 -+000.00,+00.05,01.00,000.00,1.00 -+000.00,+00.55,01.00,000.00,1.00 -+000.00,+01.05,01.00,000.00,1.00 -+000.00,+01.55,01.00,000.00,1.00 -+000.00,+02.05,01.00,000.00,1.00 -+000.00,+02.55,01.00,000.00,1.00 -+000.00,+03.05,01.00,000.00,1.00 -+000.00,+03.55,01.00,000.00,1.00 -+000.00,+04.04,01.00,000.00,1.00 -+000.00,+04.54,01.00,000.00,1.00 -+000.00,+05.04,01.00,000.00,1.00 diff --git a/scripts/td_object_renderer/metadata/csv/t09_ch1.csv b/scripts/td_object_renderer/metadata/csv/t09_ch1.csv deleted file mode 100644 index 803c0f92c9..0000000000 --- a/scripts/td_object_renderer/metadata/csv/t09_ch1.csv +++ /dev/null @@ -1,1000 +0,0 @@ -+000.00,+30.00,01.00,000.00,1.00 -+000.58,+29.99,01.00,000.00,1.00 -+001.16,+29.98,01.00,000.00,1.00 -+001.73,+29.95,01.00,000.00,1.00 -+002.31,+29.92,01.00,000.00,1.00 -+002.88,+29.87,01.00,000.00,1.00 -+003.46,+29.82,01.00,000.00,1.00 -+004.03,+29.75,01.00,000.00,1.00 -+004.60,+29.68,01.00,000.00,1.00 -+005.17,+29.59,01.00,000.00,1.00 -+005.73,+29.50,01.00,000.00,1.00 -+006.29,+29.39,01.00,000.00,1.00 -+006.85,+29.28,01.00,000.00,1.00 -+007.41,+29.15,01.00,000.00,1.00 -+007.96,+29.02,01.00,000.00,1.00 -+008.51,+28.88,01.00,000.00,1.00 -+009.05,+28.72,01.00,000.00,1.00 -+009.59,+28.56,01.00,000.00,1.00 -+010.13,+28.39,01.00,000.00,1.00 -+010.66,+28.21,01.00,000.00,1.00 -+011.18,+28.02,01.00,000.00,1.00 -+011.70,+27.82,01.00,000.00,1.00 -+012.22,+27.61,01.00,000.00,1.00 -+012.73,+27.40,01.00,000.00,1.00 -+013.23,+27.17,01.00,000.00,1.00 -+013.73,+26.94,01.00,000.00,1.00 -+014.22,+26.70,01.00,000.00,1.00 -+014.70,+26.45,01.00,000.00,1.00 -+015.18,+26.19,01.00,000.00,1.00 -+015.65,+25.92,01.00,000.00,1.00 -+016.12,+25.65,01.00,000.00,1.00 -+016.58,+25.37,01.00,000.00,1.00 -+017.03,+25.08,01.00,000.00,1.00 -+017.47,+24.78,01.00,000.00,1.00 -+017.91,+24.48,01.00,000.00,1.00 -+018.34,+24.17,01.00,000.00,1.00 -+018.76,+23.85,01.00,000.00,1.00 -+019.18,+23.52,01.00,000.00,1.00 -+019.58,+23.19,01.00,000.00,1.00 -+019.99,+22.85,01.00,000.00,1.00 -+020.38,+22.51,01.00,000.00,1.00 -+020.76,+22.15,01.00,000.00,1.00 -+021.14,+21.80,01.00,000.00,1.00 -+021.51,+21.43,01.00,000.00,1.00 -+021.87,+21.06,01.00,000.00,1.00 -+022.23,+20.69,01.00,000.00,1.00 -+022.57,+20.30,01.00,000.00,1.00 -+022.91,+19.92,01.00,000.00,1.00 -+023.24,+19.53,01.00,000.00,1.00 -+023.56,+19.13,01.00,000.00,1.00 -+023.88,+18.72,01.00,000.00,1.00 -+024.18,+18.32,01.00,000.00,1.00 -+024.48,+17.90,01.00,000.00,1.00 -+024.77,+17.49,01.00,000.00,1.00 -+025.05,+17.07,01.00,000.00,1.00 -+025.33,+16.64,01.00,000.00,1.00 -+025.59,+16.21,01.00,000.00,1.00 -+025.85,+15.77,01.00,000.00,1.00 -+026.10,+15.34,01.00,000.00,1.00 -+026.35,+14.89,01.00,000.00,1.00 -+026.58,+14.45,01.00,000.00,1.00 -+026.81,+14.00,01.00,000.00,1.00 -+027.03,+13.54,01.00,000.00,1.00 -+027.24,+13.09,01.00,000.00,1.00 -+027.44,+12.63,01.00,000.00,1.00 -+027.63,+12.17,01.00,000.00,1.00 -+027.82,+11.70,01.00,000.00,1.00 -+028.00,+11.23,01.00,000.00,1.00 -+028.17,+10.76,01.00,000.00,1.00 -+028.34,+10.29,01.00,000.00,1.00 -+028.49,+09.81,01.00,000.00,1.00 -+028.64,+09.33,01.00,000.00,1.00 -+028.78,+08.85,01.00,000.00,1.00 -+028.91,+08.37,01.00,000.00,1.00 -+029.04,+07.88,01.00,000.00,1.00 -+029.16,+07.39,01.00,000.00,1.00 -+029.27,+06.91,01.00,000.00,1.00 -+029.37,+06.42,01.00,000.00,1.00 -+029.46,+05.92,01.00,000.00,1.00 -+029.55,+05.43,01.00,000.00,1.00 -+029.63,+04.94,01.00,000.00,1.00 -+029.70,+04.44,01.00,000.00,1.00 -+029.76,+03.94,01.00,000.00,1.00 -+029.82,+03.45,01.00,000.00,1.00 -+029.87,+02.95,01.00,000.00,1.00 -+029.91,+02.45,01.00,000.00,1.00 -+029.94,+01.95,01.00,000.00,1.00 -+029.97,+01.45,01.00,000.00,1.00 -+029.99,+00.95,01.00,000.00,1.00 -+030.00,+00.45,01.00,000.00,1.00 -+030.00,-00.05,01.00,000.00,1.00 -+030.00,-00.55,01.00,000.00,1.00 -+029.98,-01.05,01.00,000.00,1.00 -+029.96,-01.55,01.00,000.00,1.00 -+029.94,-02.05,01.00,000.00,1.00 -+029.90,-02.55,01.00,000.00,1.00 -+029.86,-03.05,01.00,000.00,1.00 -+029.81,-03.55,01.00,000.00,1.00 -+029.75,-04.04,01.00,000.00,1.00 -+029.69,-04.54,01.00,000.00,1.00 -+029.61,-05.04,01.00,000.00,1.00 -+029.53,-05.53,01.00,000.00,1.00 -+029.44,-06.02,01.00,000.00,1.00 -+029.35,-06.51,01.00,000.00,1.00 -+029.25,-07.00,01.00,000.00,1.00 -+029.13,-07.49,01.00,000.00,1.00 -+029.02,-07.98,01.00,000.00,1.00 -+028.89,-08.46,01.00,000.00,1.00 -+028.75,-08.95,01.00,000.00,1.00 -+028.61,-09.43,01.00,000.00,1.00 -+028.46,-09.90,01.00,000.00,1.00 -+028.30,-10.38,01.00,000.00,1.00 -+028.14,-10.85,01.00,000.00,1.00 -+027.97,-11.33,01.00,000.00,1.00 -+027.79,-11.79,01.00,000.00,1.00 -+027.60,-12.26,01.00,000.00,1.00 -+027.40,-12.72,01.00,000.00,1.00 -+027.20,-13.18,01.00,000.00,1.00 -+026.98,-13.64,01.00,000.00,1.00 -+026.76,-14.09,01.00,000.00,1.00 -+026.53,-14.54,01.00,000.00,1.00 -+026.30,-14.98,01.00,000.00,1.00 -+026.05,-15.42,01.00,000.00,1.00 -+025.80,-15.86,01.00,000.00,1.00 -+025.54,-16.30,01.00,000.00,1.00 -+025.27,-16.73,01.00,000.00,1.00 -+025.00,-17.15,01.00,000.00,1.00 -+024.71,-17.57,01.00,000.00,1.00 -+024.42,-17.99,01.00,000.00,1.00 -+024.12,-18.40,01.00,000.00,1.00 -+023.81,-18.81,01.00,000.00,1.00 -+023.50,-19.21,01.00,000.00,1.00 -+023.17,-19.60,01.00,000.00,1.00 -+022.84,-20.00,01.00,000.00,1.00 -+022.50,-20.38,01.00,000.00,1.00 -+022.16,-20.76,01.00,000.00,1.00 -+021.80,-21.14,01.00,000.00,1.00 -+021.44,-21.51,01.00,000.00,1.00 -+021.07,-21.87,01.00,000.00,1.00 -+020.69,-22.22,01.00,000.00,1.00 -+020.30,-22.58,01.00,000.00,1.00 -+019.91,-22.92,01.00,000.00,1.00 -+019.50,-23.26,01.00,000.00,1.00 -+019.09,-23.59,01.00,000.00,1.00 -+018.68,-23.91,01.00,000.00,1.00 -+018.25,-24.23,01.00,000.00,1.00 -+017.82,-24.54,01.00,000.00,1.00 -+017.38,-24.84,01.00,000.00,1.00 -+016.94,-25.14,01.00,000.00,1.00 -+016.48,-25.42,01.00,000.00,1.00 -+016.03,-25.71,01.00,000.00,1.00 -+015.56,-25.98,01.00,000.00,1.00 -+015.09,-26.24,01.00,000.00,1.00 -+014.61,-26.50,01.00,000.00,1.00 -+014.12,-26.75,01.00,000.00,1.00 -+013.63,-26.99,01.00,000.00,1.00 -+013.13,-27.22,01.00,000.00,1.00 -+012.62,-27.44,01.00,000.00,1.00 -+012.11,-27.66,01.00,000.00,1.00 -+011.60,-27.86,01.00,000.00,1.00 -+011.08,-28.06,01.00,000.00,1.00 -+010.55,-28.25,01.00,000.00,1.00 -+010.02,-28.43,01.00,000.00,1.00 -+009.48,-28.59,01.00,000.00,1.00 -+008.94,-28.76,01.00,000.00,1.00 -+008.40,-28.91,01.00,000.00,1.00 -+007.85,-29.05,01.00,000.00,1.00 -+007.30,-29.18,01.00,000.00,1.00 -+006.74,-29.30,01.00,000.00,1.00 -+006.18,-29.41,01.00,000.00,1.00 -+005.62,-29.52,01.00,000.00,1.00 -+005.05,-29.61,01.00,000.00,1.00 -+004.49,-29.69,01.00,000.00,1.00 -+003.92,-29.77,01.00,000.00,1.00 -+003.34,-29.83,01.00,000.00,1.00 -+002.77,-29.88,01.00,000.00,1.00 -+002.19,-29.93,01.00,000.00,1.00 -+001.62,-29.96,01.00,000.00,1.00 -+001.04,-29.98,01.00,000.00,1.00 -+000.46,-30.00,01.00,000.00,1.00 --000.12,-30.00,01.00,000.00,1.00 --000.69,-29.99,01.00,000.00,1.00 --001.27,-29.98,01.00,000.00,1.00 --001.85,-29.95,01.00,000.00,1.00 --002.42,-29.91,01.00,000.00,1.00 --003.00,-29.86,01.00,000.00,1.00 --003.57,-29.81,01.00,000.00,1.00 --004.14,-29.74,01.00,000.00,1.00 --004.71,-29.66,01.00,000.00,1.00 --005.28,-29.57,01.00,000.00,1.00 --005.84,-29.48,01.00,000.00,1.00 --006.41,-29.37,01.00,000.00,1.00 --006.96,-29.25,01.00,000.00,1.00 --007.52,-29.13,01.00,000.00,1.00 --008.07,-28.99,01.00,000.00,1.00 --008.62,-28.85,01.00,000.00,1.00 --009.16,-28.69,01.00,000.00,1.00 --009.70,-28.53,01.00,000.00,1.00 --010.23,-28.35,01.00,000.00,1.00 --010.76,-28.17,01.00,000.00,1.00 --011.29,-27.98,01.00,000.00,1.00 --011.81,-27.78,01.00,000.00,1.00 --012.32,-27.57,01.00,000.00,1.00 --012.83,-27.35,01.00,000.00,1.00 --013.33,-27.13,01.00,000.00,1.00 --013.82,-26.89,01.00,000.00,1.00 --014.31,-26.65,01.00,000.00,1.00 --014.80,-26.40,01.00,000.00,1.00 --015.28,-26.14,01.00,000.00,1.00 --015.75,-25.87,01.00,000.00,1.00 --016.21,-25.59,01.00,000.00,1.00 --016.67,-25.31,01.00,000.00,1.00 --017.12,-25.02,01.00,000.00,1.00 --017.56,-24.72,01.00,000.00,1.00 --018.00,-24.42,01.00,000.00,1.00 --018.42,-24.10,01.00,000.00,1.00 --018.85,-23.78,01.00,000.00,1.00 --019.26,-23.46,01.00,000.00,1.00 --019.67,-23.12,01.00,000.00,1.00 --020.06,-22.78,01.00,000.00,1.00 --020.46,-22.44,01.00,000.00,1.00 --020.84,-22.08,01.00,000.00,1.00 --021.21,-21.72,01.00,000.00,1.00 --021.58,-21.36,01.00,000.00,1.00 --021.94,-20.99,01.00,000.00,1.00 --022.29,-20.61,01.00,000.00,1.00 --022.64,-20.23,01.00,000.00,1.00 --022.98,-19.84,01.00,000.00,1.00 --023.30,-19.45,01.00,000.00,1.00 --023.63,-19.05,01.00,000.00,1.00 --023.94,-18.64,01.00,000.00,1.00 --024.24,-18.23,01.00,000.00,1.00 --024.54,-17.82,01.00,000.00,1.00 --024.83,-17.40,01.00,000.00,1.00 --025.11,-16.98,01.00,000.00,1.00 --025.38,-16.55,01.00,000.00,1.00 --025.65,-16.12,01.00,000.00,1.00 --025.90,-15.69,01.00,000.00,1.00 --026.15,-15.25,01.00,000.00,1.00 --026.39,-14.80,01.00,000.00,1.00 --026.63,-14.36,01.00,000.00,1.00 --026.85,-13.91,01.00,000.00,1.00 --027.07,-13.45,01.00,000.00,1.00 --027.28,-13.00,01.00,000.00,1.00 --027.48,-12.54,01.00,000.00,1.00 --027.67,-12.07,01.00,000.00,1.00 --027.86,-11.61,01.00,000.00,1.00 --028.04,-11.14,01.00,000.00,1.00 --028.21,-10.67,01.00,000.00,1.00 --028.37,-10.19,01.00,000.00,1.00 --028.52,-09.71,01.00,000.00,1.00 --028.67,-09.23,01.00,000.00,1.00 --028.81,-08.75,01.00,000.00,1.00 --028.94,-08.27,01.00,000.00,1.00 --029.06,-07.78,01.00,000.00,1.00 --029.18,-07.30,01.00,000.00,1.00 --029.29,-06.81,01.00,000.00,1.00 --029.39,-06.32,01.00,000.00,1.00 --029.48,-05.83,01.00,000.00,1.00 --029.57,-05.33,01.00,000.00,1.00 --029.64,-04.84,01.00,000.00,1.00 --029.71,-04.34,01.00,000.00,1.00 --029.78,-03.85,01.00,000.00,1.00 --029.83,-03.35,01.00,000.00,1.00 --029.88,-02.85,01.00,000.00,1.00 --029.92,-02.35,01.00,000.00,1.00 --029.95,-01.85,01.00,000.00,1.00 --029.97,-01.35,01.00,000.00,1.00 --029.99,-00.85,01.00,000.00,1.00 --030.00,-00.35,01.00,000.00,1.00 --030.00,+00.15,01.00,000.00,1.00 --029.99,+00.65,01.00,000.00,1.00 --029.98,+01.15,01.00,000.00,1.00 --029.96,+01.65,01.00,000.00,1.00 --029.93,+02.15,01.00,000.00,1.00 --029.89,+02.65,01.00,000.00,1.00 --029.85,+03.15,01.00,000.00,1.00 --029.80,+03.65,01.00,000.00,1.00 --029.74,+04.14,01.00,000.00,1.00 --029.67,+04.64,01.00,000.00,1.00 --029.60,+05.13,01.00,000.00,1.00 --029.52,+05.63,01.00,000.00,1.00 --029.43,+06.12,01.00,000.00,1.00 --029.33,+06.61,01.00,000.00,1.00 --029.22,+07.10,01.00,000.00,1.00 --029.11,+07.59,01.00,000.00,1.00 --028.99,+08.08,01.00,000.00,1.00 --028.86,+08.56,01.00,000.00,1.00 --028.73,+09.04,01.00,000.00,1.00 --028.58,+09.52,01.00,000.00,1.00 --028.43,+10.00,01.00,000.00,1.00 --028.27,+10.48,01.00,000.00,1.00 --028.11,+10.95,01.00,000.00,1.00 --027.93,+11.42,01.00,000.00,1.00 --027.75,+11.89,01.00,000.00,1.00 --027.56,+12.35,01.00,000.00,1.00 --027.36,+12.81,01.00,000.00,1.00 --027.15,+13.27,01.00,000.00,1.00 --026.94,+13.73,01.00,000.00,1.00 --026.72,+14.18,01.00,000.00,1.00 --026.49,+14.63,01.00,000.00,1.00 --026.25,+15.07,01.00,000.00,1.00 --026.00,+15.51,01.00,000.00,1.00 --025.75,+15.95,01.00,000.00,1.00 --025.49,+16.38,01.00,000.00,1.00 --025.22,+16.81,01.00,000.00,1.00 --024.94,+17.23,01.00,000.00,1.00 --024.66,+17.65,01.00,000.00,1.00 --024.36,+18.07,01.00,000.00,1.00 --024.06,+18.48,01.00,000.00,1.00 --023.75,+18.89,01.00,000.00,1.00 --023.43,+19.29,01.00,000.00,1.00 --023.11,+19.68,01.00,000.00,1.00 --022.77,+20.07,01.00,000.00,1.00 --022.43,+20.46,01.00,000.00,1.00 --022.08,+20.84,01.00,000.00,1.00 --021.73,+21.21,01.00,000.00,1.00 --021.36,+21.58,01.00,000.00,1.00 --020.99,+21.94,01.00,000.00,1.00 --020.61,+22.30,01.00,000.00,1.00 --020.22,+22.64,01.00,000.00,1.00 --019.83,+22.99,01.00,000.00,1.00 --019.42,+23.32,01.00,000.00,1.00 --019.01,+23.65,01.00,000.00,1.00 --018.59,+23.98,01.00,000.00,1.00 --018.17,+24.29,01.00,000.00,1.00 --017.74,+24.60,01.00,000.00,1.00 --017.29,+24.90,01.00,000.00,1.00 --016.85,+25.20,01.00,000.00,1.00 --016.39,+25.48,01.00,000.00,1.00 --015.93,+25.76,01.00,000.00,1.00 --015.46,+26.03,01.00,000.00,1.00 --014.99,+26.29,01.00,000.00,1.00 --014.51,+26.55,01.00,000.00,1.00 --014.02,+26.80,01.00,000.00,1.00 --013.53,+27.03,01.00,000.00,1.00 --013.03,+27.26,01.00,000.00,1.00 --012.52,+27.49,01.00,000.00,1.00 --012.01,+27.70,01.00,000.00,1.00 --011.49,+27.90,01.00,000.00,1.00 --010.97,+28.10,01.00,000.00,1.00 --010.45,+28.28,01.00,000.00,1.00 --009.91,+28.46,01.00,000.00,1.00 --009.38,+28.63,01.00,000.00,1.00 --008.83,+28.79,01.00,000.00,1.00 --008.29,+28.94,01.00,000.00,1.00 --007.74,+29.07,01.00,000.00,1.00 --007.19,+29.20,01.00,000.00,1.00 --006.63,+29.33,01.00,000.00,1.00 --006.07,+29.44,01.00,000.00,1.00 --005.51,+29.54,01.00,000.00,1.00 --004.94,+29.63,01.00,000.00,1.00 --004.37,+29.71,01.00,000.00,1.00 --003.80,+29.78,01.00,000.00,1.00 --003.23,+29.84,01.00,000.00,1.00 --002.65,+29.89,01.00,000.00,1.00 --002.08,+29.93,01.00,000.00,1.00 --001.50,+29.97,01.00,000.00,1.00 --000.92,+29.99,01.00,000.00,1.00 --000.35,+30.00,01.00,000.00,1.00 -+000.23,+30.00,01.00,000.00,1.00 -+000.81,+29.99,01.00,000.00,1.00 -+001.39,+29.97,01.00,000.00,1.00 -+001.96,+29.94,01.00,000.00,1.00 -+002.54,+29.90,01.00,000.00,1.00 -+003.11,+29.85,01.00,000.00,1.00 -+003.69,+29.79,01.00,000.00,1.00 -+004.26,+29.72,01.00,000.00,1.00 -+004.83,+29.64,01.00,000.00,1.00 -+005.39,+29.56,01.00,000.00,1.00 -+005.96,+29.46,01.00,000.00,1.00 -+006.52,+29.35,01.00,000.00,1.00 -+007.07,+29.23,01.00,000.00,1.00 -+007.63,+29.10,01.00,000.00,1.00 -+008.18,+28.96,01.00,000.00,1.00 -+008.73,+28.82,01.00,000.00,1.00 -+009.27,+28.66,01.00,000.00,1.00 -+009.81,+28.49,01.00,000.00,1.00 -+010.34,+28.32,01.00,000.00,1.00 -+010.87,+28.13,01.00,000.00,1.00 -+011.39,+27.94,01.00,000.00,1.00 -+011.91,+27.74,01.00,000.00,1.00 -+012.42,+27.53,01.00,000.00,1.00 -+012.93,+27.31,01.00,000.00,1.00 -+013.43,+27.08,01.00,000.00,1.00 -+013.92,+26.84,01.00,000.00,1.00 -+014.41,+26.60,01.00,000.00,1.00 -+014.89,+26.35,01.00,000.00,1.00 -+015.37,+26.08,01.00,000.00,1.00 -+015.84,+25.81,01.00,000.00,1.00 -+016.30,+25.54,01.00,000.00,1.00 -+016.76,+25.25,01.00,000.00,1.00 -+017.21,+24.96,01.00,000.00,1.00 -+017.65,+24.66,01.00,000.00,1.00 -+018.08,+24.35,01.00,000.00,1.00 -+018.51,+24.04,01.00,000.00,1.00 -+018.93,+23.72,01.00,000.00,1.00 -+019.34,+23.39,01.00,000.00,1.00 -+019.75,+23.06,01.00,000.00,1.00 -+020.14,+22.71,01.00,000.00,1.00 -+020.53,+22.37,01.00,000.00,1.00 -+020.91,+22.01,01.00,000.00,1.00 -+021.29,+21.65,01.00,000.00,1.00 -+021.66,+21.28,01.00,000.00,1.00 -+022.01,+20.91,01.00,000.00,1.00 -+022.36,+20.53,01.00,000.00,1.00 -+022.71,+20.15,01.00,000.00,1.00 -+023.04,+19.76,01.00,000.00,1.00 -+023.37,+19.37,01.00,000.00,1.00 -+023.69,+18.97,01.00,000.00,1.00 -+024.00,+18.56,01.00,000.00,1.00 -+024.30,+18.15,01.00,000.00,1.00 -+024.60,+17.74,01.00,000.00,1.00 -+024.88,+17.32,01.00,000.00,1.00 -+025.16,+16.90,01.00,000.00,1.00 -+025.44,+16.47,01.00,000.00,1.00 -+025.70,+16.04,01.00,000.00,1.00 -+025.95,+15.60,01.00,000.00,1.00 -+026.20,+15.16,01.00,000.00,1.00 -+026.44,+14.72,01.00,000.00,1.00 -+026.67,+14.27,01.00,000.00,1.00 -+026.90,+13.82,01.00,000.00,1.00 -+027.11,+13.36,01.00,000.00,1.00 -+027.32,+12.90,01.00,000.00,1.00 -+027.52,+12.44,01.00,000.00,1.00 -+027.71,+11.98,01.00,000.00,1.00 -+027.89,+11.51,01.00,000.00,1.00 -+028.07,+11.04,01.00,000.00,1.00 -+028.24,+10.57,01.00,000.00,1.00 -+028.40,+10.10,01.00,000.00,1.00 -+028.55,+09.62,01.00,000.00,1.00 -+028.70,+09.14,01.00,000.00,1.00 -+028.84,+08.66,01.00,000.00,1.00 -+028.97,+08.17,01.00,000.00,1.00 -+029.09,+07.69,01.00,000.00,1.00 -+029.20,+07.20,01.00,000.00,1.00 -+029.31,+06.71,01.00,000.00,1.00 -+029.41,+06.22,01.00,000.00,1.00 -+029.50,+05.73,01.00,000.00,1.00 -+029.58,+05.23,01.00,000.00,1.00 -+029.66,+04.74,01.00,000.00,1.00 -+029.73,+04.24,01.00,000.00,1.00 -+029.79,+03.75,01.00,000.00,1.00 -+029.84,+03.25,01.00,000.00,1.00 -+029.89,+02.75,01.00,000.00,1.00 -+029.92,+02.25,01.00,000.00,1.00 -+029.95,+01.75,01.00,000.00,1.00 -+029.98,+01.25,01.00,000.00,1.00 -+029.99,+00.75,01.00,000.00,1.00 -+030.00,+00.25,01.00,000.00,1.00 -+030.00,-00.25,01.00,000.00,1.00 -+029.99,-00.75,01.00,000.00,1.00 -+029.98,-01.25,01.00,000.00,1.00 -+029.95,-01.75,01.00,000.00,1.00 -+029.92,-02.25,01.00,000.00,1.00 -+029.89,-02.75,01.00,000.00,1.00 -+029.84,-03.25,01.00,000.00,1.00 -+029.79,-03.75,01.00,000.00,1.00 -+029.73,-04.24,01.00,000.00,1.00 -+029.66,-04.74,01.00,000.00,1.00 -+029.58,-05.23,01.00,000.00,1.00 -+029.50,-05.73,01.00,000.00,1.00 -+029.41,-06.22,01.00,000.00,1.00 -+029.31,-06.71,01.00,000.00,1.00 -+029.20,-07.20,01.00,000.00,1.00 -+029.09,-07.69,01.00,000.00,1.00 -+028.97,-08.17,01.00,000.00,1.00 -+028.84,-08.66,01.00,000.00,1.00 -+028.70,-09.14,01.00,000.00,1.00 -+028.55,-09.62,01.00,000.00,1.00 -+028.40,-10.10,01.00,000.00,1.00 -+028.24,-10.57,01.00,000.00,1.00 -+028.07,-11.04,01.00,000.00,1.00 -+027.89,-11.51,01.00,000.00,1.00 -+027.71,-11.98,01.00,000.00,1.00 -+027.52,-12.44,01.00,000.00,1.00 -+027.32,-12.90,01.00,000.00,1.00 -+027.11,-13.36,01.00,000.00,1.00 -+026.90,-13.82,01.00,000.00,1.00 -+026.67,-14.27,01.00,000.00,1.00 -+026.44,-14.72,01.00,000.00,1.00 -+026.20,-15.16,01.00,000.00,1.00 -+025.95,-15.60,01.00,000.00,1.00 -+025.70,-16.04,01.00,000.00,1.00 -+025.44,-16.47,01.00,000.00,1.00 -+025.16,-16.90,01.00,000.00,1.00 -+024.88,-17.32,01.00,000.00,1.00 -+024.60,-17.74,01.00,000.00,1.00 -+024.30,-18.15,01.00,000.00,1.00 -+024.00,-18.56,01.00,000.00,1.00 -+023.69,-18.97,01.00,000.00,1.00 -+023.37,-19.37,01.00,000.00,1.00 -+023.04,-19.76,01.00,000.00,1.00 -+022.71,-20.15,01.00,000.00,1.00 -+022.36,-20.53,01.00,000.00,1.00 -+022.01,-20.91,01.00,000.00,1.00 -+021.66,-21.28,01.00,000.00,1.00 -+021.29,-21.65,01.00,000.00,1.00 -+020.91,-22.01,01.00,000.00,1.00 -+020.53,-22.37,01.00,000.00,1.00 -+020.14,-22.71,01.00,000.00,1.00 -+019.75,-23.06,01.00,000.00,1.00 -+019.34,-23.39,01.00,000.00,1.00 -+018.93,-23.72,01.00,000.00,1.00 -+018.51,-24.04,01.00,000.00,1.00 -+018.08,-24.35,01.00,000.00,1.00 -+017.65,-24.66,01.00,000.00,1.00 -+017.21,-24.96,01.00,000.00,1.00 -+016.76,-25.25,01.00,000.00,1.00 -+016.30,-25.54,01.00,000.00,1.00 -+015.84,-25.81,01.00,000.00,1.00 -+015.37,-26.08,01.00,000.00,1.00 -+014.89,-26.35,01.00,000.00,1.00 -+014.41,-26.60,01.00,000.00,1.00 -+013.92,-26.84,01.00,000.00,1.00 -+013.43,-27.08,01.00,000.00,1.00 -+012.93,-27.31,01.00,000.00,1.00 -+012.42,-27.53,01.00,000.00,1.00 -+011.91,-27.74,01.00,000.00,1.00 -+011.39,-27.94,01.00,000.00,1.00 -+010.87,-28.13,01.00,000.00,1.00 -+010.34,-28.32,01.00,000.00,1.00 -+009.81,-28.49,01.00,000.00,1.00 -+009.27,-28.66,01.00,000.00,1.00 -+008.73,-28.82,01.00,000.00,1.00 -+008.18,-28.96,01.00,000.00,1.00 -+007.63,-29.10,01.00,000.00,1.00 -+007.07,-29.23,01.00,000.00,1.00 -+006.52,-29.35,01.00,000.00,1.00 -+005.96,-29.46,01.00,000.00,1.00 -+005.39,-29.56,01.00,000.00,1.00 -+004.83,-29.64,01.00,000.00,1.00 -+004.26,-29.72,01.00,000.00,1.00 -+003.69,-29.79,01.00,000.00,1.00 -+003.11,-29.85,01.00,000.00,1.00 -+002.54,-29.90,01.00,000.00,1.00 -+001.96,-29.94,01.00,000.00,1.00 -+001.39,-29.97,01.00,000.00,1.00 -+000.81,-29.99,01.00,000.00,1.00 -+000.23,-30.00,01.00,000.00,1.00 --000.35,-30.00,01.00,000.00,1.00 --000.92,-29.99,01.00,000.00,1.00 --001.50,-29.97,01.00,000.00,1.00 --002.08,-29.93,01.00,000.00,1.00 --002.65,-29.89,01.00,000.00,1.00 --003.23,-29.84,01.00,000.00,1.00 --003.80,-29.78,01.00,000.00,1.00 --004.37,-29.71,01.00,000.00,1.00 --004.94,-29.63,01.00,000.00,1.00 --005.51,-29.54,01.00,000.00,1.00 --006.07,-29.44,01.00,000.00,1.00 --006.63,-29.33,01.00,000.00,1.00 --007.19,-29.20,01.00,000.00,1.00 --007.74,-29.07,01.00,000.00,1.00 --008.29,-28.94,01.00,000.00,1.00 --008.83,-28.79,01.00,000.00,1.00 --009.38,-28.63,01.00,000.00,1.00 --009.91,-28.46,01.00,000.00,1.00 --010.45,-28.28,01.00,000.00,1.00 --010.97,-28.10,01.00,000.00,1.00 --011.49,-27.90,01.00,000.00,1.00 --012.01,-27.70,01.00,000.00,1.00 --012.52,-27.49,01.00,000.00,1.00 --013.03,-27.26,01.00,000.00,1.00 --013.53,-27.03,01.00,000.00,1.00 --014.02,-26.80,01.00,000.00,1.00 --014.51,-26.55,01.00,000.00,1.00 --014.99,-26.29,01.00,000.00,1.00 --015.46,-26.03,01.00,000.00,1.00 --015.93,-25.76,01.00,000.00,1.00 --016.39,-25.48,01.00,000.00,1.00 --016.85,-25.20,01.00,000.00,1.00 --017.29,-24.90,01.00,000.00,1.00 --017.74,-24.60,01.00,000.00,1.00 --018.17,-24.29,01.00,000.00,1.00 --018.59,-23.98,01.00,000.00,1.00 --019.01,-23.65,01.00,000.00,1.00 --019.42,-23.32,01.00,000.00,1.00 --019.83,-22.99,01.00,000.00,1.00 --020.22,-22.64,01.00,000.00,1.00 --020.61,-22.30,01.00,000.00,1.00 --020.99,-21.94,01.00,000.00,1.00 --021.36,-21.58,01.00,000.00,1.00 --021.73,-21.21,01.00,000.00,1.00 --022.08,-20.84,01.00,000.00,1.00 --022.43,-20.46,01.00,000.00,1.00 --022.77,-20.07,01.00,000.00,1.00 --023.11,-19.68,01.00,000.00,1.00 --023.43,-19.29,01.00,000.00,1.00 --023.75,-18.89,01.00,000.00,1.00 --024.06,-18.48,01.00,000.00,1.00 --024.36,-18.07,01.00,000.00,1.00 --024.66,-17.65,01.00,000.00,1.00 --024.94,-17.23,01.00,000.00,1.00 --025.22,-16.81,01.00,000.00,1.00 --025.49,-16.38,01.00,000.00,1.00 --025.75,-15.95,01.00,000.00,1.00 --026.00,-15.51,01.00,000.00,1.00 --026.25,-15.07,01.00,000.00,1.00 --026.49,-14.63,01.00,000.00,1.00 --026.72,-14.18,01.00,000.00,1.00 --026.94,-13.73,01.00,000.00,1.00 --027.15,-13.27,01.00,000.00,1.00 --027.36,-12.81,01.00,000.00,1.00 --027.56,-12.35,01.00,000.00,1.00 --027.75,-11.89,01.00,000.00,1.00 --027.93,-11.42,01.00,000.00,1.00 --028.11,-10.95,01.00,000.00,1.00 --028.27,-10.48,01.00,000.00,1.00 --028.43,-10.00,01.00,000.00,1.00 --028.58,-09.52,01.00,000.00,1.00 --028.73,-09.04,01.00,000.00,1.00 --028.86,-08.56,01.00,000.00,1.00 --028.99,-08.08,01.00,000.00,1.00 --029.11,-07.59,01.00,000.00,1.00 --029.22,-07.10,01.00,000.00,1.00 --029.33,-06.61,01.00,000.00,1.00 --029.43,-06.12,01.00,000.00,1.00 --029.52,-05.63,01.00,000.00,1.00 --029.60,-05.13,01.00,000.00,1.00 --029.67,-04.64,01.00,000.00,1.00 --029.74,-04.14,01.00,000.00,1.00 --029.80,-03.65,01.00,000.00,1.00 --029.85,-03.15,01.00,000.00,1.00 --029.89,-02.65,01.00,000.00,1.00 --029.93,-02.15,01.00,000.00,1.00 --029.96,-01.65,01.00,000.00,1.00 --029.98,-01.15,01.00,000.00,1.00 --029.99,-00.65,01.00,000.00,1.00 --030.00,-00.15,01.00,000.00,1.00 --030.00,+00.35,01.00,000.00,1.00 --029.99,+00.85,01.00,000.00,1.00 --029.97,+01.35,01.00,000.00,1.00 --029.95,+01.85,01.00,000.00,1.00 --029.92,+02.35,01.00,000.00,1.00 --029.88,+02.85,01.00,000.00,1.00 --029.83,+03.35,01.00,000.00,1.00 --029.78,+03.85,01.00,000.00,1.00 --029.71,+04.34,01.00,000.00,1.00 --029.64,+04.84,01.00,000.00,1.00 --029.57,+05.33,01.00,000.00,1.00 --029.48,+05.83,01.00,000.00,1.00 --029.39,+06.32,01.00,000.00,1.00 --029.29,+06.81,01.00,000.00,1.00 --029.18,+07.30,01.00,000.00,1.00 --029.06,+07.78,01.00,000.00,1.00 --028.94,+08.27,01.00,000.00,1.00 --028.81,+08.75,01.00,000.00,1.00 --028.67,+09.23,01.00,000.00,1.00 --028.52,+09.71,01.00,000.00,1.00 --028.37,+10.19,01.00,000.00,1.00 --028.21,+10.67,01.00,000.00,1.00 --028.04,+11.14,01.00,000.00,1.00 --027.86,+11.61,01.00,000.00,1.00 --027.67,+12.07,01.00,000.00,1.00 --027.48,+12.54,01.00,000.00,1.00 --027.28,+13.00,01.00,000.00,1.00 --027.07,+13.45,01.00,000.00,1.00 --026.85,+13.91,01.00,000.00,1.00 --026.63,+14.36,01.00,000.00,1.00 --026.39,+14.80,01.00,000.00,1.00 --026.15,+15.25,01.00,000.00,1.00 --025.90,+15.69,01.00,000.00,1.00 --025.65,+16.12,01.00,000.00,1.00 --025.38,+16.55,01.00,000.00,1.00 --025.11,+16.98,01.00,000.00,1.00 --024.83,+17.40,01.00,000.00,1.00 --024.54,+17.82,01.00,000.00,1.00 --024.24,+18.23,01.00,000.00,1.00 --023.94,+18.64,01.00,000.00,1.00 --023.63,+19.05,01.00,000.00,1.00 --023.30,+19.45,01.00,000.00,1.00 --022.98,+19.84,01.00,000.00,1.00 --022.64,+20.23,01.00,000.00,1.00 --022.29,+20.61,01.00,000.00,1.00 --021.94,+20.99,01.00,000.00,1.00 --021.58,+21.36,01.00,000.00,1.00 --021.21,+21.72,01.00,000.00,1.00 --020.84,+22.08,01.00,000.00,1.00 --020.46,+22.44,01.00,000.00,1.00 --020.06,+22.78,01.00,000.00,1.00 --019.67,+23.12,01.00,000.00,1.00 --019.26,+23.46,01.00,000.00,1.00 --018.85,+23.78,01.00,000.00,1.00 --018.42,+24.10,01.00,000.00,1.00 --018.00,+24.42,01.00,000.00,1.00 --017.56,+24.72,01.00,000.00,1.00 --017.12,+25.02,01.00,000.00,1.00 --016.67,+25.31,01.00,000.00,1.00 --016.21,+25.59,01.00,000.00,1.00 --015.75,+25.87,01.00,000.00,1.00 --015.28,+26.14,01.00,000.00,1.00 --014.80,+26.40,01.00,000.00,1.00 --014.31,+26.65,01.00,000.00,1.00 --013.82,+26.89,01.00,000.00,1.00 --013.33,+27.13,01.00,000.00,1.00 --012.83,+27.35,01.00,000.00,1.00 --012.32,+27.57,01.00,000.00,1.00 --011.81,+27.78,01.00,000.00,1.00 --011.29,+27.98,01.00,000.00,1.00 --010.76,+28.17,01.00,000.00,1.00 --010.23,+28.35,01.00,000.00,1.00 --009.70,+28.53,01.00,000.00,1.00 --009.16,+28.69,01.00,000.00,1.00 --008.62,+28.85,01.00,000.00,1.00 --008.07,+28.99,01.00,000.00,1.00 --007.52,+29.13,01.00,000.00,1.00 --006.96,+29.25,01.00,000.00,1.00 --006.41,+29.37,01.00,000.00,1.00 --005.84,+29.48,01.00,000.00,1.00 --005.28,+29.57,01.00,000.00,1.00 --004.71,+29.66,01.00,000.00,1.00 --004.14,+29.74,01.00,000.00,1.00 --003.57,+29.81,01.00,000.00,1.00 --003.00,+29.86,01.00,000.00,1.00 --002.42,+29.91,01.00,000.00,1.00 --001.85,+29.95,01.00,000.00,1.00 --001.27,+29.98,01.00,000.00,1.00 --000.69,+29.99,01.00,000.00,1.00 --000.12,+30.00,01.00,000.00,1.00 -+000.46,+30.00,01.00,000.00,1.00 -+001.04,+29.98,01.00,000.00,1.00 -+001.62,+29.96,01.00,000.00,1.00 -+002.19,+29.93,01.00,000.00,1.00 -+002.77,+29.88,01.00,000.00,1.00 -+003.34,+29.83,01.00,000.00,1.00 -+003.92,+29.77,01.00,000.00,1.00 -+004.49,+29.69,01.00,000.00,1.00 -+005.05,+29.61,01.00,000.00,1.00 -+005.62,+29.52,01.00,000.00,1.00 -+006.18,+29.41,01.00,000.00,1.00 -+006.74,+29.30,01.00,000.00,1.00 -+007.30,+29.18,01.00,000.00,1.00 -+007.85,+29.05,01.00,000.00,1.00 -+008.40,+28.91,01.00,000.00,1.00 -+008.94,+28.76,01.00,000.00,1.00 -+009.48,+28.59,01.00,000.00,1.00 -+010.02,+28.43,01.00,000.00,1.00 -+010.55,+28.25,01.00,000.00,1.00 -+011.08,+28.06,01.00,000.00,1.00 -+011.60,+27.86,01.00,000.00,1.00 -+012.11,+27.66,01.00,000.00,1.00 -+012.62,+27.44,01.00,000.00,1.00 -+013.13,+27.22,01.00,000.00,1.00 -+013.63,+26.99,01.00,000.00,1.00 -+014.12,+26.75,01.00,000.00,1.00 -+014.61,+26.50,01.00,000.00,1.00 -+015.09,+26.24,01.00,000.00,1.00 -+015.56,+25.98,01.00,000.00,1.00 -+016.03,+25.71,01.00,000.00,1.00 -+016.48,+25.42,01.00,000.00,1.00 -+016.94,+25.14,01.00,000.00,1.00 -+017.38,+24.84,01.00,000.00,1.00 -+017.82,+24.54,01.00,000.00,1.00 -+018.25,+24.23,01.00,000.00,1.00 -+018.68,+23.91,01.00,000.00,1.00 -+019.09,+23.59,01.00,000.00,1.00 -+019.50,+23.26,01.00,000.00,1.00 -+019.91,+22.92,01.00,000.00,1.00 -+020.30,+22.58,01.00,000.00,1.00 -+020.69,+22.22,01.00,000.00,1.00 -+021.07,+21.87,01.00,000.00,1.00 -+021.44,+21.51,01.00,000.00,1.00 -+021.80,+21.14,01.00,000.00,1.00 -+022.16,+20.76,01.00,000.00,1.00 -+022.50,+20.38,01.00,000.00,1.00 -+022.84,+20.00,01.00,000.00,1.00 -+023.17,+19.60,01.00,000.00,1.00 -+023.50,+19.21,01.00,000.00,1.00 -+023.81,+18.81,01.00,000.00,1.00 -+024.12,+18.40,01.00,000.00,1.00 -+024.42,+17.99,01.00,000.00,1.00 -+024.71,+17.57,01.00,000.00,1.00 -+025.00,+17.15,01.00,000.00,1.00 -+025.27,+16.73,01.00,000.00,1.00 -+025.54,+16.30,01.00,000.00,1.00 -+025.80,+15.86,01.00,000.00,1.00 -+026.05,+15.42,01.00,000.00,1.00 -+026.30,+14.98,01.00,000.00,1.00 -+026.53,+14.54,01.00,000.00,1.00 -+026.76,+14.09,01.00,000.00,1.00 -+026.98,+13.64,01.00,000.00,1.00 -+027.20,+13.18,01.00,000.00,1.00 -+027.40,+12.72,01.00,000.00,1.00 -+027.60,+12.26,01.00,000.00,1.00 -+027.79,+11.79,01.00,000.00,1.00 -+027.97,+11.33,01.00,000.00,1.00 -+028.14,+10.85,01.00,000.00,1.00 -+028.30,+10.38,01.00,000.00,1.00 -+028.46,+09.90,01.00,000.00,1.00 -+028.61,+09.43,01.00,000.00,1.00 -+028.75,+08.95,01.00,000.00,1.00 -+028.89,+08.46,01.00,000.00,1.00 -+029.02,+07.98,01.00,000.00,1.00 -+029.13,+07.49,01.00,000.00,1.00 -+029.25,+07.00,01.00,000.00,1.00 -+029.35,+06.51,01.00,000.00,1.00 -+029.44,+06.02,01.00,000.00,1.00 -+029.53,+05.53,01.00,000.00,1.00 -+029.61,+05.04,01.00,000.00,1.00 -+029.69,+04.54,01.00,000.00,1.00 -+029.75,+04.04,01.00,000.00,1.00 -+029.81,+03.55,01.00,000.00,1.00 -+029.86,+03.05,01.00,000.00,1.00 -+029.90,+02.55,01.00,000.00,1.00 -+029.94,+02.05,01.00,000.00,1.00 -+029.96,+01.55,01.00,000.00,1.00 -+029.98,+01.05,01.00,000.00,1.00 -+030.00,+00.55,01.00,000.00,1.00 -+030.00,+00.05,01.00,000.00,1.00 -+030.00,-00.45,01.00,000.00,1.00 -+029.99,-00.95,01.00,000.00,1.00 -+029.97,-01.45,01.00,000.00,1.00 -+029.94,-01.95,01.00,000.00,1.00 -+029.91,-02.45,01.00,000.00,1.00 -+029.87,-02.95,01.00,000.00,1.00 -+029.82,-03.45,01.00,000.00,1.00 -+029.76,-03.94,01.00,000.00,1.00 -+029.70,-04.44,01.00,000.00,1.00 -+029.63,-04.94,01.00,000.00,1.00 -+029.55,-05.43,01.00,000.00,1.00 -+029.46,-05.92,01.00,000.00,1.00 -+029.37,-06.42,01.00,000.00,1.00 -+029.27,-06.91,01.00,000.00,1.00 -+029.16,-07.39,01.00,000.00,1.00 -+029.04,-07.88,01.00,000.00,1.00 -+028.91,-08.37,01.00,000.00,1.00 -+028.78,-08.85,01.00,000.00,1.00 -+028.64,-09.33,01.00,000.00,1.00 -+028.49,-09.81,01.00,000.00,1.00 -+028.34,-10.29,01.00,000.00,1.00 -+028.17,-10.76,01.00,000.00,1.00 -+028.00,-11.23,01.00,000.00,1.00 -+027.82,-11.70,01.00,000.00,1.00 -+027.63,-12.17,01.00,000.00,1.00 -+027.44,-12.63,01.00,000.00,1.00 -+027.24,-13.09,01.00,000.00,1.00 -+027.03,-13.54,01.00,000.00,1.00 -+026.81,-14.00,01.00,000.00,1.00 -+026.58,-14.45,01.00,000.00,1.00 -+026.35,-14.89,01.00,000.00,1.00 -+026.10,-15.34,01.00,000.00,1.00 -+025.85,-15.77,01.00,000.00,1.00 -+025.59,-16.21,01.00,000.00,1.00 -+025.33,-16.64,01.00,000.00,1.00 -+025.05,-17.07,01.00,000.00,1.00 -+024.77,-17.49,01.00,000.00,1.00 -+024.48,-17.90,01.00,000.00,1.00 -+024.18,-18.32,01.00,000.00,1.00 -+023.88,-18.72,01.00,000.00,1.00 -+023.56,-19.13,01.00,000.00,1.00 -+023.24,-19.53,01.00,000.00,1.00 -+022.91,-19.92,01.00,000.00,1.00 -+022.57,-20.30,01.00,000.00,1.00 -+022.23,-20.69,01.00,000.00,1.00 -+021.87,-21.06,01.00,000.00,1.00 -+021.51,-21.43,01.00,000.00,1.00 -+021.14,-21.80,01.00,000.00,1.00 -+020.76,-22.15,01.00,000.00,1.00 -+020.38,-22.51,01.00,000.00,1.00 -+019.99,-22.85,01.00,000.00,1.00 -+019.58,-23.19,01.00,000.00,1.00 -+019.18,-23.52,01.00,000.00,1.00 -+018.76,-23.85,01.00,000.00,1.00 -+018.34,-24.17,01.00,000.00,1.00 -+017.91,-24.48,01.00,000.00,1.00 -+017.47,-24.78,01.00,000.00,1.00 -+017.03,-25.08,01.00,000.00,1.00 -+016.58,-25.37,01.00,000.00,1.00 -+016.12,-25.65,01.00,000.00,1.00 -+015.65,-25.92,01.00,000.00,1.00 -+015.18,-26.19,01.00,000.00,1.00 -+014.70,-26.45,01.00,000.00,1.00 -+014.22,-26.70,01.00,000.00,1.00 -+013.73,-26.94,01.00,000.00,1.00 -+013.23,-27.17,01.00,000.00,1.00 -+012.73,-27.40,01.00,000.00,1.00 -+012.22,-27.61,01.00,000.00,1.00 -+011.70,-27.82,01.00,000.00,1.00 -+011.18,-28.02,01.00,000.00,1.00 -+010.66,-28.21,01.00,000.00,1.00 -+010.13,-28.39,01.00,000.00,1.00 -+009.59,-28.56,01.00,000.00,1.00 -+009.05,-28.72,01.00,000.00,1.00 -+008.51,-28.88,01.00,000.00,1.00 -+007.96,-29.02,01.00,000.00,1.00 -+007.41,-29.15,01.00,000.00,1.00 -+006.85,-29.28,01.00,000.00,1.00 -+006.29,-29.39,01.00,000.00,1.00 -+005.73,-29.50,01.00,000.00,1.00 -+005.17,-29.59,01.00,000.00,1.00 -+004.60,-29.68,01.00,000.00,1.00 -+004.03,-29.75,01.00,000.00,1.00 -+003.46,-29.82,01.00,000.00,1.00 -+002.88,-29.87,01.00,000.00,1.00 -+002.31,-29.92,01.00,000.00,1.00 -+001.73,-29.95,01.00,000.00,1.00 -+001.16,-29.98,01.00,000.00,1.00 -+000.58,-29.99,01.00,000.00,1.00 -+000.00,-30.00,01.00,000.00,1.00 --000.58,-29.99,01.00,000.00,1.00 --001.16,-29.98,01.00,000.00,1.00 --001.73,-29.95,01.00,000.00,1.00 --002.31,-29.92,01.00,000.00,1.00 --002.88,-29.87,01.00,000.00,1.00 --003.46,-29.82,01.00,000.00,1.00 --004.03,-29.75,01.00,000.00,1.00 --004.60,-29.68,01.00,000.00,1.00 --005.17,-29.59,01.00,000.00,1.00 --005.73,-29.50,01.00,000.00,1.00 --006.29,-29.39,01.00,000.00,1.00 --006.85,-29.28,01.00,000.00,1.00 --007.41,-29.15,01.00,000.00,1.00 --007.96,-29.02,01.00,000.00,1.00 --008.51,-28.88,01.00,000.00,1.00 --009.05,-28.72,01.00,000.00,1.00 --009.59,-28.56,01.00,000.00,1.00 --010.13,-28.39,01.00,000.00,1.00 --010.66,-28.21,01.00,000.00,1.00 --011.18,-28.02,01.00,000.00,1.00 --011.70,-27.82,01.00,000.00,1.00 --012.22,-27.61,01.00,000.00,1.00 --012.73,-27.40,01.00,000.00,1.00 --013.23,-27.17,01.00,000.00,1.00 --013.73,-26.94,01.00,000.00,1.00 --014.22,-26.70,01.00,000.00,1.00 --014.70,-26.45,01.00,000.00,1.00 --015.18,-26.19,01.00,000.00,1.00 --015.65,-25.92,01.00,000.00,1.00 --016.12,-25.65,01.00,000.00,1.00 --016.58,-25.37,01.00,000.00,1.00 --017.03,-25.08,01.00,000.00,1.00 --017.47,-24.78,01.00,000.00,1.00 --017.91,-24.48,01.00,000.00,1.00 --018.34,-24.17,01.00,000.00,1.00 --018.76,-23.85,01.00,000.00,1.00 --019.18,-23.52,01.00,000.00,1.00 --019.58,-23.19,01.00,000.00,1.00 --019.99,-22.85,01.00,000.00,1.00 --020.38,-22.51,01.00,000.00,1.00 --020.76,-22.15,01.00,000.00,1.00 --021.14,-21.80,01.00,000.00,1.00 --021.51,-21.43,01.00,000.00,1.00 --021.87,-21.06,01.00,000.00,1.00 --022.23,-20.69,01.00,000.00,1.00 --022.57,-20.30,01.00,000.00,1.00 --022.91,-19.92,01.00,000.00,1.00 --023.24,-19.53,01.00,000.00,1.00 --023.56,-19.13,01.00,000.00,1.00 --023.88,-18.72,01.00,000.00,1.00 --024.18,-18.32,01.00,000.00,1.00 --024.48,-17.90,01.00,000.00,1.00 --024.77,-17.49,01.00,000.00,1.00 --025.05,-17.07,01.00,000.00,1.00 --025.33,-16.64,01.00,000.00,1.00 --025.59,-16.21,01.00,000.00,1.00 --025.85,-15.77,01.00,000.00,1.00 --026.10,-15.34,01.00,000.00,1.00 --026.35,-14.89,01.00,000.00,1.00 --026.58,-14.45,01.00,000.00,1.00 --026.81,-14.00,01.00,000.00,1.00 --027.03,-13.54,01.00,000.00,1.00 --027.24,-13.09,01.00,000.00,1.00 --027.44,-12.63,01.00,000.00,1.00 --027.63,-12.17,01.00,000.00,1.00 --027.82,-11.70,01.00,000.00,1.00 --028.00,-11.23,01.00,000.00,1.00 --028.17,-10.76,01.00,000.00,1.00 --028.34,-10.29,01.00,000.00,1.00 --028.49,-09.81,01.00,000.00,1.00 --028.64,-09.33,01.00,000.00,1.00 --028.78,-08.85,01.00,000.00,1.00 --028.91,-08.37,01.00,000.00,1.00 --029.04,-07.88,01.00,000.00,1.00 --029.16,-07.39,01.00,000.00,1.00 --029.27,-06.91,01.00,000.00,1.00 --029.37,-06.42,01.00,000.00,1.00 --029.46,-05.92,01.00,000.00,1.00 --029.55,-05.43,01.00,000.00,1.00 --029.63,-04.94,01.00,000.00,1.00 --029.70,-04.44,01.00,000.00,1.00 --029.76,-03.94,01.00,000.00,1.00 --029.82,-03.45,01.00,000.00,1.00 --029.87,-02.95,01.00,000.00,1.00 --029.91,-02.45,01.00,000.00,1.00 --029.94,-01.95,01.00,000.00,1.00 --029.97,-01.45,01.00,000.00,1.00 --029.99,-00.95,01.00,000.00,1.00 --030.00,-00.45,01.00,000.00,1.00 --030.00,+00.05,01.00,000.00,1.00 --030.00,+00.55,01.00,000.00,1.00 --029.98,+01.05,01.00,000.00,1.00 --029.96,+01.55,01.00,000.00,1.00 --029.94,+02.05,01.00,000.00,1.00 --029.90,+02.55,01.00,000.00,1.00 --029.86,+03.05,01.00,000.00,1.00 --029.81,+03.55,01.00,000.00,1.00 --029.75,+04.04,01.00,000.00,1.00 --029.69,+04.54,01.00,000.00,1.00 --029.61,+05.04,01.00,000.00,1.00 diff --git a/scripts/td_object_renderer/metadata/csv/t10_ch1.csv b/scripts/td_object_renderer/metadata/csv/t10_ch1.csv deleted file mode 100644 index 34205471ca..0000000000 --- a/scripts/td_object_renderer/metadata/csv/t10_ch1.csv +++ /dev/null @@ -1,1000 +0,0 @@ -+000.00,+20.00,01.00,000.00,1.00 -+000.79,+20.00,01.00,000.00,1.00 -+001.59,+20.00,01.00,000.00,1.00 -+002.38,+20.00,01.00,000.00,1.00 -+003.17,+20.00,01.00,000.00,1.00 -+003.96,+20.00,01.00,000.00,1.00 -+004.76,+20.00,01.00,000.00,1.00 -+005.55,+20.00,01.00,000.00,1.00 -+006.34,+20.00,01.00,000.00,1.00 -+007.14,+20.00,01.00,000.00,1.00 -+007.93,+20.00,01.00,000.00,1.00 -+008.72,+20.00,01.00,000.00,1.00 -+009.52,+20.00,01.00,000.00,1.00 -+010.31,+20.00,01.00,000.00,1.00 -+011.10,+20.00,01.00,000.00,1.00 -+011.89,+20.00,01.00,000.00,1.00 -+012.69,+20.00,01.00,000.00,1.00 -+013.48,+20.00,01.00,000.00,1.00 -+014.27,+20.00,01.00,000.00,1.00 -+015.07,+20.00,01.00,000.00,1.00 -+015.86,+20.00,01.00,000.00,1.00 -+016.65,+20.00,01.00,000.00,1.00 -+017.44,+20.00,01.00,000.00,1.00 -+018.24,+20.00,01.00,000.00,1.00 -+019.03,+20.00,01.00,000.00,1.00 -+019.82,+20.00,01.00,000.00,1.00 -+020.62,+20.00,01.00,000.00,1.00 -+021.41,+20.00,01.00,000.00,1.00 -+022.20,+20.00,01.00,000.00,1.00 -+023.00,+20.00,01.00,000.00,1.00 -+023.79,+20.00,01.00,000.00,1.00 -+024.58,+20.00,01.00,000.00,1.00 -+025.37,+20.00,01.00,000.00,1.00 -+026.17,+20.00,01.00,000.00,1.00 -+026.96,+20.00,01.00,000.00,1.00 -+027.75,+20.00,01.00,000.00,1.00 -+028.55,+20.00,01.00,000.00,1.00 -+029.34,+20.00,01.00,000.00,1.00 -+030.13,+20.00,01.00,000.00,1.00 -+030.93,+20.00,01.00,000.00,1.00 -+031.72,+20.00,01.00,000.00,1.00 -+032.51,+20.00,01.00,000.00,1.00 -+033.30,+20.00,01.00,000.00,1.00 -+034.10,+20.00,01.00,000.00,1.00 -+034.89,+20.00,01.00,000.00,1.00 -+035.68,+20.00,01.00,000.00,1.00 -+036.48,+20.00,01.00,000.00,1.00 -+037.27,+20.00,01.00,000.00,1.00 -+038.06,+20.00,01.00,000.00,1.00 -+038.85,+20.00,01.00,000.00,1.00 -+039.65,+20.00,01.00,000.00,1.00 -+040.44,+20.00,01.00,000.00,1.00 -+041.23,+20.00,01.00,000.00,1.00 -+042.03,+20.00,01.00,000.00,1.00 -+042.82,+20.00,01.00,000.00,1.00 -+043.61,+20.00,01.00,000.00,1.00 -+044.41,+20.00,01.00,000.00,1.00 -+045.20,+20.00,01.00,000.00,1.00 -+045.99,+20.00,01.00,000.00,1.00 -+046.78,+20.00,01.00,000.00,1.00 -+047.58,+20.00,01.00,000.00,1.00 -+048.37,+20.00,01.00,000.00,1.00 -+049.16,+20.00,01.00,000.00,1.00 -+049.96,+20.00,01.00,000.00,1.00 -+050.75,+20.00,01.00,000.00,1.00 -+051.54,+20.00,01.00,000.00,1.00 -+052.33,+20.00,01.00,000.00,1.00 -+053.13,+20.00,01.00,000.00,1.00 -+053.92,+20.00,01.00,000.00,1.00 -+054.71,+20.00,01.00,000.00,1.00 -+055.51,+20.00,01.00,000.00,1.00 -+056.30,+20.00,01.00,000.00,1.00 -+057.09,+20.00,01.00,000.00,1.00 -+057.89,+20.00,01.00,000.00,1.00 -+058.68,+20.00,01.00,000.00,1.00 -+059.47,+20.00,01.00,000.00,1.00 -+060.26,+20.00,01.00,000.00,1.00 -+061.06,+20.00,01.00,000.00,1.00 -+061.85,+20.00,01.00,000.00,1.00 -+062.64,+20.00,01.00,000.00,1.00 -+063.44,+20.00,01.00,000.00,1.00 -+064.23,+20.00,01.00,000.00,1.00 -+065.02,+20.00,01.00,000.00,1.00 -+065.81,+20.00,01.00,000.00,1.00 -+066.61,+20.00,01.00,000.00,1.00 -+067.40,+20.00,01.00,000.00,1.00 -+068.19,+20.00,01.00,000.00,1.00 -+068.99,+20.00,01.00,000.00,1.00 -+069.78,+20.00,01.00,000.00,1.00 -+070.57,+20.00,01.00,000.00,1.00 -+071.37,+20.00,01.00,000.00,1.00 -+072.16,+20.00,01.00,000.00,1.00 -+072.95,+20.00,01.00,000.00,1.00 -+073.74,+20.00,01.00,000.00,1.00 -+074.54,+20.00,01.00,000.00,1.00 -+075.33,+20.00,01.00,000.00,1.00 -+076.12,+20.00,01.00,000.00,1.00 -+076.92,+20.00,01.00,000.00,1.00 -+077.71,+20.00,01.00,000.00,1.00 -+078.50,+20.00,01.00,000.00,1.00 -+079.30,+20.00,01.00,000.00,1.00 -+080.09,+20.00,01.00,000.00,1.00 -+080.88,+20.00,01.00,000.00,1.00 -+081.67,+20.00,01.00,000.00,1.00 -+082.47,+20.00,01.00,000.00,1.00 -+083.26,+20.00,01.00,000.00,1.00 -+084.05,+20.00,01.00,000.00,1.00 -+084.85,+20.00,01.00,000.00,1.00 -+085.64,+20.00,01.00,000.00,1.00 -+086.43,+20.00,01.00,000.00,1.00 -+087.22,+20.00,01.00,000.00,1.00 -+088.02,+20.00,01.00,000.00,1.00 -+088.81,+20.00,01.00,000.00,1.00 -+089.60,+20.00,01.00,000.00,1.00 -+090.40,+20.00,01.00,000.00,1.00 -+091.19,+20.00,01.00,000.00,1.00 -+091.98,+20.00,01.00,000.00,1.00 -+092.78,+20.00,01.00,000.00,1.00 -+093.57,+20.00,01.00,000.00,1.00 -+094.36,+20.00,01.00,000.00,1.00 -+095.15,+20.00,01.00,000.00,1.00 -+095.95,+20.00,01.00,000.00,1.00 -+096.74,+20.00,01.00,000.00,1.00 -+097.53,+20.00,01.00,000.00,1.00 -+098.33,+20.00,01.00,000.00,1.00 -+099.12,+20.00,01.00,000.00,1.00 -+099.91,+20.00,01.00,000.00,1.00 -+100.70,+20.00,01.00,000.00,1.00 -+101.50,+20.00,01.00,000.00,1.00 -+102.29,+20.00,01.00,000.00,1.00 -+103.08,+20.00,01.00,000.00,1.00 -+103.88,+20.00,01.00,000.00,1.00 -+104.67,+20.00,01.00,000.00,1.00 -+105.46,+20.00,01.00,000.00,1.00 -+106.26,+20.00,01.00,000.00,1.00 -+107.05,+20.00,01.00,000.00,1.00 -+107.84,+20.00,01.00,000.00,1.00 -+108.63,+20.00,01.00,000.00,1.00 -+109.43,+20.00,01.00,000.00,1.00 -+110.22,+20.00,01.00,000.00,1.00 -+111.01,+20.00,01.00,000.00,1.00 -+111.81,+20.00,01.00,000.00,1.00 -+112.60,+20.00,01.00,000.00,1.00 -+113.39,+20.00,01.00,000.00,1.00 -+114.19,+20.00,01.00,000.00,1.00 -+114.98,+20.00,01.00,000.00,1.00 -+115.77,+20.00,01.00,000.00,1.00 -+116.56,+20.00,01.00,000.00,1.00 -+117.36,+20.00,01.00,000.00,1.00 -+118.15,+20.00,01.00,000.00,1.00 -+118.94,+20.00,01.00,000.00,1.00 -+119.74,+20.00,01.00,000.00,1.00 -+120.53,+20.00,01.00,000.00,1.00 -+121.32,+20.00,01.00,000.00,1.00 -+122.11,+20.00,01.00,000.00,1.00 -+122.91,+20.00,01.00,000.00,1.00 -+123.70,+20.00,01.00,000.00,1.00 -+124.49,+20.00,01.00,000.00,1.00 -+125.29,+20.00,01.00,000.00,1.00 -+126.08,+20.00,01.00,000.00,1.00 -+126.87,+20.00,01.00,000.00,1.00 -+127.67,+20.00,01.00,000.00,1.00 -+128.46,+20.00,01.00,000.00,1.00 -+129.25,+20.00,01.00,000.00,1.00 -+130.04,+20.00,01.00,000.00,1.00 -+130.84,+20.00,01.00,000.00,1.00 -+131.63,+20.00,01.00,000.00,1.00 -+132.42,+20.00,01.00,000.00,1.00 -+133.22,+20.00,01.00,000.00,1.00 -+134.01,+20.00,01.00,000.00,1.00 -+134.80,+20.00,01.00,000.00,1.00 -+135.59,+20.00,01.00,000.00,1.00 -+136.39,+20.00,01.00,000.00,1.00 -+137.18,+20.00,01.00,000.00,1.00 -+137.97,+20.00,01.00,000.00,1.00 -+138.77,+20.00,01.00,000.00,1.00 -+139.56,+20.00,01.00,000.00,1.00 -+140.35,+20.00,01.00,000.00,1.00 -+141.15,+20.00,01.00,000.00,1.00 -+141.94,+20.00,01.00,000.00,1.00 -+142.73,+20.00,01.00,000.00,1.00 -+143.52,+20.00,01.00,000.00,1.00 -+144.32,+20.00,01.00,000.00,1.00 -+145.11,+20.00,01.00,000.00,1.00 -+145.90,+20.00,01.00,000.00,1.00 -+146.70,+20.00,01.00,000.00,1.00 -+147.49,+20.00,01.00,000.00,1.00 -+148.28,+20.00,01.00,000.00,1.00 -+149.07,+20.00,01.00,000.00,1.00 -+149.87,+20.00,01.00,000.00,1.00 -+150.66,+20.00,01.00,000.00,1.00 -+151.45,+20.00,01.00,000.00,1.00 -+152.25,+20.00,01.00,000.00,1.00 -+153.04,+20.00,01.00,000.00,1.00 -+153.83,+20.00,01.00,000.00,1.00 -+154.63,+20.00,01.00,000.00,1.00 -+155.42,+20.00,01.00,000.00,1.00 -+156.21,+20.00,01.00,000.00,1.00 -+157.00,+20.00,01.00,000.00,1.00 -+157.80,+20.00,01.00,000.00,1.00 -+158.59,+20.00,01.00,000.00,1.00 -+159.38,+20.00,01.00,000.00,1.00 -+160.18,+20.00,01.00,000.00,1.00 -+160.97,+20.00,01.00,000.00,1.00 -+161.76,+20.00,01.00,000.00,1.00 -+162.56,+20.00,01.00,000.00,1.00 -+163.35,+20.00,01.00,000.00,1.00 -+164.14,+20.00,01.00,000.00,1.00 -+164.93,+20.00,01.00,000.00,1.00 -+165.73,+20.00,01.00,000.00,1.00 -+166.52,+20.00,01.00,000.00,1.00 -+167.31,+20.00,01.00,000.00,1.00 -+168.11,+20.00,01.00,000.00,1.00 -+168.90,+20.00,01.00,000.00,1.00 -+169.69,+20.00,01.00,000.00,1.00 -+170.48,+20.00,01.00,000.00,1.00 -+171.28,+20.00,01.00,000.00,1.00 -+172.07,+20.00,01.00,000.00,1.00 -+172.86,+20.00,01.00,000.00,1.00 -+173.66,+20.00,01.00,000.00,1.00 -+174.45,+20.00,01.00,000.00,1.00 -+175.24,+20.00,01.00,000.00,1.00 -+176.04,+20.00,01.00,000.00,1.00 -+176.83,+20.00,01.00,000.00,1.00 -+177.62,+20.00,01.00,000.00,1.00 -+178.41,+20.00,01.00,000.00,1.00 -+179.21,+20.00,01.00,000.00,1.00 -+180.00,+20.00,01.00,000.00,1.00 --179.21,+20.00,01.00,000.00,1.00 --178.41,+20.00,01.00,000.00,1.00 --177.62,+20.00,01.00,000.00,1.00 --176.83,+20.00,01.00,000.00,1.00 --176.04,+20.00,01.00,000.00,1.00 --175.24,+20.00,01.00,000.00,1.00 --174.45,+20.00,01.00,000.00,1.00 --173.66,+20.00,01.00,000.00,1.00 --172.86,+20.00,01.00,000.00,1.00 --172.07,+20.00,01.00,000.00,1.00 --171.28,+20.00,01.00,000.00,1.00 --170.48,+20.00,01.00,000.00,1.00 --169.69,+20.00,01.00,000.00,1.00 --168.90,+20.00,01.00,000.00,1.00 --168.11,+20.00,01.00,000.00,1.00 --167.31,+20.00,01.00,000.00,1.00 --166.52,+20.00,01.00,000.00,1.00 --165.73,+20.00,01.00,000.00,1.00 --164.93,+20.00,01.00,000.00,1.00 --164.14,+20.00,01.00,000.00,1.00 --163.35,+20.00,01.00,000.00,1.00 --162.56,+20.00,01.00,000.00,1.00 --161.76,+20.00,01.00,000.00,1.00 --160.97,+20.00,01.00,000.00,1.00 --160.18,+20.00,01.00,000.00,1.00 --159.38,+20.00,01.00,000.00,1.00 --158.59,+20.00,01.00,000.00,1.00 --157.80,+20.00,01.00,000.00,1.00 --157.00,+20.00,01.00,000.00,1.00 --156.21,+20.00,01.00,000.00,1.00 --155.42,+20.00,01.00,000.00,1.00 --154.63,+20.00,01.00,000.00,1.00 --153.83,+20.00,01.00,000.00,1.00 --153.04,+20.00,01.00,000.00,1.00 --152.25,+20.00,01.00,000.00,1.00 --151.45,+20.00,01.00,000.00,1.00 --150.66,+20.00,01.00,000.00,1.00 --149.87,+20.00,01.00,000.00,1.00 --149.07,+20.00,01.00,000.00,1.00 --148.28,+20.00,01.00,000.00,1.00 --147.49,+20.00,01.00,000.00,1.00 --146.70,+20.00,01.00,000.00,1.00 --145.90,+20.00,01.00,000.00,1.00 --145.11,+20.00,01.00,000.00,1.00 --144.32,+20.00,01.00,000.00,1.00 --143.52,+20.00,01.00,000.00,1.00 --142.73,+20.00,01.00,000.00,1.00 --141.94,+20.00,01.00,000.00,1.00 --141.15,+20.00,01.00,000.00,1.00 --140.35,+20.00,01.00,000.00,1.00 --139.56,+20.00,01.00,000.00,1.00 --138.77,+20.00,01.00,000.00,1.00 --137.97,+20.00,01.00,000.00,1.00 --137.18,+20.00,01.00,000.00,1.00 --136.39,+20.00,01.00,000.00,1.00 --135.59,+20.00,01.00,000.00,1.00 --134.80,+20.00,01.00,000.00,1.00 --134.01,+20.00,01.00,000.00,1.00 --133.22,+20.00,01.00,000.00,1.00 --132.42,+20.00,01.00,000.00,1.00 --131.63,+20.00,01.00,000.00,1.00 --130.84,+20.00,01.00,000.00,1.00 --130.04,+20.00,01.00,000.00,1.00 --129.25,+20.00,01.00,000.00,1.00 --128.46,+20.00,01.00,000.00,1.00 --127.67,+20.00,01.00,000.00,1.00 --126.87,+20.00,01.00,000.00,1.00 --126.08,+20.00,01.00,000.00,1.00 --125.29,+20.00,01.00,000.00,1.00 --124.49,+20.00,01.00,000.00,1.00 --123.70,+20.00,01.00,000.00,1.00 --122.91,+20.00,01.00,000.00,1.00 --122.11,+20.00,01.00,000.00,1.00 --121.32,+20.00,01.00,000.00,1.00 --120.53,+20.00,01.00,000.00,1.00 --119.74,+20.00,01.00,000.00,1.00 --118.94,+20.00,01.00,000.00,1.00 --118.15,+20.00,01.00,000.00,1.00 --117.36,+20.00,01.00,000.00,1.00 --116.56,+20.00,01.00,000.00,1.00 --115.77,+20.00,01.00,000.00,1.00 --114.98,+20.00,01.00,000.00,1.00 --114.19,+20.00,01.00,000.00,1.00 --113.39,+20.00,01.00,000.00,1.00 --112.60,+20.00,01.00,000.00,1.00 --111.81,+20.00,01.00,000.00,1.00 --111.01,+20.00,01.00,000.00,1.00 --110.22,+20.00,01.00,000.00,1.00 --109.43,+20.00,01.00,000.00,1.00 --108.63,+20.00,01.00,000.00,1.00 --107.84,+20.00,01.00,000.00,1.00 --107.05,+20.00,01.00,000.00,1.00 --106.26,+20.00,01.00,000.00,1.00 --105.46,+20.00,01.00,000.00,1.00 --104.67,+20.00,01.00,000.00,1.00 --103.88,+20.00,01.00,000.00,1.00 --103.08,+20.00,01.00,000.00,1.00 --102.29,+20.00,01.00,000.00,1.00 --101.50,+20.00,01.00,000.00,1.00 --100.70,+20.00,01.00,000.00,1.00 --099.91,+20.00,01.00,000.00,1.00 --099.12,+20.00,01.00,000.00,1.00 --098.33,+20.00,01.00,000.00,1.00 --097.53,+20.00,01.00,000.00,1.00 --096.74,+20.00,01.00,000.00,1.00 --095.95,+20.00,01.00,000.00,1.00 --095.15,+20.00,01.00,000.00,1.00 --094.36,+20.00,01.00,000.00,1.00 --093.57,+20.00,01.00,000.00,1.00 --092.78,+20.00,01.00,000.00,1.00 --091.98,+20.00,01.00,000.00,1.00 --091.19,+20.00,01.00,000.00,1.00 --090.40,+20.00,01.00,000.00,1.00 --089.60,+20.00,01.00,000.00,1.00 --088.81,+20.00,01.00,000.00,1.00 --088.02,+20.00,01.00,000.00,1.00 --087.22,+20.00,01.00,000.00,1.00 --086.43,+20.00,01.00,000.00,1.00 --085.64,+20.00,01.00,000.00,1.00 --084.85,+20.00,01.00,000.00,1.00 --084.05,+20.00,01.00,000.00,1.00 --083.26,+20.00,01.00,000.00,1.00 --082.47,+20.00,01.00,000.00,1.00 --081.67,+20.00,01.00,000.00,1.00 --080.88,+20.00,01.00,000.00,1.00 --080.09,+20.00,01.00,000.00,1.00 --079.30,+20.00,01.00,000.00,1.00 --078.50,+20.00,01.00,000.00,1.00 --077.71,+20.00,01.00,000.00,1.00 --076.92,+20.00,01.00,000.00,1.00 --076.12,+20.00,01.00,000.00,1.00 --075.33,+20.00,01.00,000.00,1.00 --074.54,+20.00,01.00,000.00,1.00 --073.74,+20.00,01.00,000.00,1.00 --072.95,+20.00,01.00,000.00,1.00 --072.16,+20.00,01.00,000.00,1.00 --071.37,+20.00,01.00,000.00,1.00 --070.57,+20.00,01.00,000.00,1.00 --069.78,+20.00,01.00,000.00,1.00 --068.99,+20.00,01.00,000.00,1.00 --068.19,+20.00,01.00,000.00,1.00 --067.40,+20.00,01.00,000.00,1.00 --066.61,+20.00,01.00,000.00,1.00 --065.81,+20.00,01.00,000.00,1.00 --065.02,+20.00,01.00,000.00,1.00 --064.23,+20.00,01.00,000.00,1.00 --063.44,+20.00,01.00,000.00,1.00 --062.64,+20.00,01.00,000.00,1.00 --061.85,+20.00,01.00,000.00,1.00 --061.06,+20.00,01.00,000.00,1.00 --060.26,+20.00,01.00,000.00,1.00 --059.47,+20.00,01.00,000.00,1.00 --058.68,+20.00,01.00,000.00,1.00 --057.89,+20.00,01.00,000.00,1.00 --057.09,+20.00,01.00,000.00,1.00 --056.30,+20.00,01.00,000.00,1.00 --055.51,+20.00,01.00,000.00,1.00 --054.71,+20.00,01.00,000.00,1.00 --053.92,+20.00,01.00,000.00,1.00 --053.13,+20.00,01.00,000.00,1.00 --052.33,+20.00,01.00,000.00,1.00 --051.54,+20.00,01.00,000.00,1.00 --050.75,+20.00,01.00,000.00,1.00 --049.96,+20.00,01.00,000.00,1.00 --049.16,+20.00,01.00,000.00,1.00 --048.37,+20.00,01.00,000.00,1.00 --047.58,+20.00,01.00,000.00,1.00 --046.78,+20.00,01.00,000.00,1.00 --045.99,+20.00,01.00,000.00,1.00 --045.20,+20.00,01.00,000.00,1.00 --044.41,+20.00,01.00,000.00,1.00 --043.61,+20.00,01.00,000.00,1.00 --042.82,+20.00,01.00,000.00,1.00 --042.03,+20.00,01.00,000.00,1.00 --041.23,+20.00,01.00,000.00,1.00 --040.44,+20.00,01.00,000.00,1.00 --039.65,+20.00,01.00,000.00,1.00 --038.85,+20.00,01.00,000.00,1.00 --038.06,+20.00,01.00,000.00,1.00 --037.27,+20.00,01.00,000.00,1.00 --036.48,+20.00,01.00,000.00,1.00 --035.68,+20.00,01.00,000.00,1.00 --034.89,+20.00,01.00,000.00,1.00 --034.10,+20.00,01.00,000.00,1.00 --033.30,+20.00,01.00,000.00,1.00 --032.51,+20.00,01.00,000.00,1.00 --031.72,+20.00,01.00,000.00,1.00 --030.93,+20.00,01.00,000.00,1.00 --030.13,+20.00,01.00,000.00,1.00 --029.34,+20.00,01.00,000.00,1.00 --028.55,+20.00,01.00,000.00,1.00 --027.75,+20.00,01.00,000.00,1.00 --026.96,+20.00,01.00,000.00,1.00 --026.17,+20.00,01.00,000.00,1.00 --025.37,+20.00,01.00,000.00,1.00 --024.58,+20.00,01.00,000.00,1.00 --023.79,+20.00,01.00,000.00,1.00 --023.00,+20.00,01.00,000.00,1.00 --022.20,+20.00,01.00,000.00,1.00 --021.41,+20.00,01.00,000.00,1.00 --020.62,+20.00,01.00,000.00,1.00 --019.82,+20.00,01.00,000.00,1.00 --019.03,+20.00,01.00,000.00,1.00 --018.24,+20.00,01.00,000.00,1.00 --017.44,+20.00,01.00,000.00,1.00 --016.65,+20.00,01.00,000.00,1.00 --015.86,+20.00,01.00,000.00,1.00 --015.07,+20.00,01.00,000.00,1.00 --014.27,+20.00,01.00,000.00,1.00 --013.48,+20.00,01.00,000.00,1.00 --012.69,+20.00,01.00,000.00,1.00 --011.89,+20.00,01.00,000.00,1.00 --011.10,+20.00,01.00,000.00,1.00 --010.31,+20.00,01.00,000.00,1.00 --009.52,+20.00,01.00,000.00,1.00 --008.72,+20.00,01.00,000.00,1.00 --007.93,+20.00,01.00,000.00,1.00 --007.14,+20.00,01.00,000.00,1.00 --006.34,+20.00,01.00,000.00,1.00 --005.55,+20.00,01.00,000.00,1.00 --004.76,+20.00,01.00,000.00,1.00 --003.96,+20.00,01.00,000.00,1.00 --003.17,+20.00,01.00,000.00,1.00 --002.38,+20.00,01.00,000.00,1.00 --001.59,+20.00,01.00,000.00,1.00 --000.79,+20.00,01.00,000.00,1.00 --000.00,+20.00,01.00,000.00,1.00 -+000.79,+20.00,01.00,000.00,1.00 -+001.59,+20.00,01.00,000.00,1.00 -+002.38,+20.00,01.00,000.00,1.00 -+003.17,+20.00,01.00,000.00,1.00 -+003.96,+20.00,01.00,000.00,1.00 -+004.76,+20.00,01.00,000.00,1.00 -+005.55,+20.00,01.00,000.00,1.00 -+006.34,+20.00,01.00,000.00,1.00 -+007.14,+20.00,01.00,000.00,1.00 -+007.93,+20.00,01.00,000.00,1.00 -+008.72,+20.00,01.00,000.00,1.00 -+009.52,+20.00,01.00,000.00,1.00 -+010.31,+20.00,01.00,000.00,1.00 -+011.10,+20.00,01.00,000.00,1.00 -+011.89,+20.00,01.00,000.00,1.00 -+012.69,+20.00,01.00,000.00,1.00 -+013.48,+20.00,01.00,000.00,1.00 -+014.27,+20.00,01.00,000.00,1.00 -+015.07,+20.00,01.00,000.00,1.00 -+015.86,+20.00,01.00,000.00,1.00 -+016.65,+20.00,01.00,000.00,1.00 -+017.44,+20.00,01.00,000.00,1.00 -+018.24,+20.00,01.00,000.00,1.00 -+019.03,+20.00,01.00,000.00,1.00 -+019.82,+20.00,01.00,000.00,1.00 -+020.62,+20.00,01.00,000.00,1.00 -+021.41,+20.00,01.00,000.00,1.00 -+022.20,+20.00,01.00,000.00,1.00 -+023.00,+20.00,01.00,000.00,1.00 -+023.79,+20.00,01.00,000.00,1.00 -+024.58,+20.00,01.00,000.00,1.00 -+025.37,+20.00,01.00,000.00,1.00 -+026.17,+20.00,01.00,000.00,1.00 -+026.96,+20.00,01.00,000.00,1.00 -+027.75,+20.00,01.00,000.00,1.00 -+028.55,+20.00,01.00,000.00,1.00 -+029.34,+20.00,01.00,000.00,1.00 -+030.13,+20.00,01.00,000.00,1.00 -+030.93,+20.00,01.00,000.00,1.00 -+031.72,+20.00,01.00,000.00,1.00 -+032.51,+20.00,01.00,000.00,1.00 -+033.30,+20.00,01.00,000.00,1.00 -+034.10,+20.00,01.00,000.00,1.00 -+034.89,+20.00,01.00,000.00,1.00 -+035.68,+20.00,01.00,000.00,1.00 -+036.48,+20.00,01.00,000.00,1.00 -+037.27,+20.00,01.00,000.00,1.00 -+038.06,+20.00,01.00,000.00,1.00 -+038.85,+20.00,01.00,000.00,1.00 -+039.65,+20.00,01.00,000.00,1.00 -+040.44,+20.00,01.00,000.00,1.00 -+041.23,+20.00,01.00,000.00,1.00 -+042.03,+20.00,01.00,000.00,1.00 -+042.82,+20.00,01.00,000.00,1.00 -+043.61,+20.00,01.00,000.00,1.00 -+044.41,+20.00,01.00,000.00,1.00 -+045.20,+20.00,01.00,000.00,1.00 -+045.99,+20.00,01.00,000.00,1.00 -+046.78,+20.00,01.00,000.00,1.00 -+047.58,+20.00,01.00,000.00,1.00 -+048.37,+20.00,01.00,000.00,1.00 -+049.16,+20.00,01.00,000.00,1.00 -+049.96,+20.00,01.00,000.00,1.00 -+050.75,+20.00,01.00,000.00,1.00 -+051.54,+20.00,01.00,000.00,1.00 -+052.33,+20.00,01.00,000.00,1.00 -+053.13,+20.00,01.00,000.00,1.00 -+053.92,+20.00,01.00,000.00,1.00 -+054.71,+20.00,01.00,000.00,1.00 -+055.51,+20.00,01.00,000.00,1.00 -+056.30,+20.00,01.00,000.00,1.00 -+057.09,+20.00,01.00,000.00,1.00 -+057.89,+20.00,01.00,000.00,1.00 -+058.68,+20.00,01.00,000.00,1.00 -+059.47,+20.00,01.00,000.00,1.00 -+060.26,+20.00,01.00,000.00,1.00 -+061.06,+20.00,01.00,000.00,1.00 -+061.85,+20.00,01.00,000.00,1.00 -+062.64,+20.00,01.00,000.00,1.00 -+063.44,+20.00,01.00,000.00,1.00 -+064.23,+20.00,01.00,000.00,1.00 -+065.02,+20.00,01.00,000.00,1.00 -+065.81,+20.00,01.00,000.00,1.00 -+066.61,+20.00,01.00,000.00,1.00 -+067.40,+20.00,01.00,000.00,1.00 -+068.19,+20.00,01.00,000.00,1.00 -+068.99,+20.00,01.00,000.00,1.00 -+069.78,+20.00,01.00,000.00,1.00 -+070.57,+20.00,01.00,000.00,1.00 -+071.37,+20.00,01.00,000.00,1.00 -+072.16,+20.00,01.00,000.00,1.00 -+072.95,+20.00,01.00,000.00,1.00 -+073.74,+20.00,01.00,000.00,1.00 -+074.54,+20.00,01.00,000.00,1.00 -+075.33,+20.00,01.00,000.00,1.00 -+076.12,+20.00,01.00,000.00,1.00 -+076.92,+20.00,01.00,000.00,1.00 -+077.71,+20.00,01.00,000.00,1.00 -+078.50,+20.00,01.00,000.00,1.00 -+079.30,+20.00,01.00,000.00,1.00 -+080.09,+20.00,01.00,000.00,1.00 -+080.88,+20.00,01.00,000.00,1.00 -+081.67,+20.00,01.00,000.00,1.00 -+082.47,+20.00,01.00,000.00,1.00 -+083.26,+20.00,01.00,000.00,1.00 -+084.05,+20.00,01.00,000.00,1.00 -+084.85,+20.00,01.00,000.00,1.00 -+085.64,+20.00,01.00,000.00,1.00 -+086.43,+20.00,01.00,000.00,1.00 -+087.22,+20.00,01.00,000.00,1.00 -+088.02,+20.00,01.00,000.00,1.00 -+088.81,+20.00,01.00,000.00,1.00 -+089.60,+20.00,01.00,000.00,1.00 -+090.40,+20.00,01.00,000.00,1.00 -+091.19,+20.00,01.00,000.00,1.00 -+091.98,+20.00,01.00,000.00,1.00 -+092.78,+20.00,01.00,000.00,1.00 -+093.57,+20.00,01.00,000.00,1.00 -+094.36,+20.00,01.00,000.00,1.00 -+095.15,+20.00,01.00,000.00,1.00 -+095.95,+20.00,01.00,000.00,1.00 -+096.74,+20.00,01.00,000.00,1.00 -+097.53,+20.00,01.00,000.00,1.00 -+098.33,+20.00,01.00,000.00,1.00 -+099.12,+20.00,01.00,000.00,1.00 -+099.91,+20.00,01.00,000.00,1.00 -+100.70,+20.00,01.00,000.00,1.00 -+101.50,+20.00,01.00,000.00,1.00 -+102.29,+20.00,01.00,000.00,1.00 -+103.08,+20.00,01.00,000.00,1.00 -+103.88,+20.00,01.00,000.00,1.00 -+104.67,+20.00,01.00,000.00,1.00 -+105.46,+20.00,01.00,000.00,1.00 -+106.26,+20.00,01.00,000.00,1.00 -+107.05,+20.00,01.00,000.00,1.00 -+107.84,+20.00,01.00,000.00,1.00 -+108.63,+20.00,01.00,000.00,1.00 -+109.43,+20.00,01.00,000.00,1.00 -+110.22,+20.00,01.00,000.00,1.00 -+111.01,+20.00,01.00,000.00,1.00 -+111.81,+20.00,01.00,000.00,1.00 -+112.60,+20.00,01.00,000.00,1.00 -+113.39,+20.00,01.00,000.00,1.00 -+114.19,+20.00,01.00,000.00,1.00 -+114.98,+20.00,01.00,000.00,1.00 -+115.77,+20.00,01.00,000.00,1.00 -+116.56,+20.00,01.00,000.00,1.00 -+117.36,+20.00,01.00,000.00,1.00 -+118.15,+20.00,01.00,000.00,1.00 -+118.94,+20.00,01.00,000.00,1.00 -+119.74,+20.00,01.00,000.00,1.00 -+120.53,+20.00,01.00,000.00,1.00 -+121.32,+20.00,01.00,000.00,1.00 -+122.11,+20.00,01.00,000.00,1.00 -+122.91,+20.00,01.00,000.00,1.00 -+123.70,+20.00,01.00,000.00,1.00 -+124.49,+20.00,01.00,000.00,1.00 -+125.29,+20.00,01.00,000.00,1.00 -+126.08,+20.00,01.00,000.00,1.00 -+126.87,+20.00,01.00,000.00,1.00 -+127.67,+20.00,01.00,000.00,1.00 -+128.46,+20.00,01.00,000.00,1.00 -+129.25,+20.00,01.00,000.00,1.00 -+130.04,+20.00,01.00,000.00,1.00 -+130.84,+20.00,01.00,000.00,1.00 -+131.63,+20.00,01.00,000.00,1.00 -+132.42,+20.00,01.00,000.00,1.00 -+133.22,+20.00,01.00,000.00,1.00 -+134.01,+20.00,01.00,000.00,1.00 -+134.80,+20.00,01.00,000.00,1.00 -+135.59,+20.00,01.00,000.00,1.00 -+136.39,+20.00,01.00,000.00,1.00 -+137.18,+20.00,01.00,000.00,1.00 -+137.97,+20.00,01.00,000.00,1.00 -+138.77,+20.00,01.00,000.00,1.00 -+139.56,+20.00,01.00,000.00,1.00 -+140.35,+20.00,01.00,000.00,1.00 -+141.15,+20.00,01.00,000.00,1.00 -+141.94,+20.00,01.00,000.00,1.00 -+142.73,+20.00,01.00,000.00,1.00 -+143.52,+20.00,01.00,000.00,1.00 -+144.32,+20.00,01.00,000.00,1.00 -+145.11,+20.00,01.00,000.00,1.00 -+145.90,+20.00,01.00,000.00,1.00 -+146.70,+20.00,01.00,000.00,1.00 -+147.49,+20.00,01.00,000.00,1.00 -+148.28,+20.00,01.00,000.00,1.00 -+149.07,+20.00,01.00,000.00,1.00 -+149.87,+20.00,01.00,000.00,1.00 -+150.66,+20.00,01.00,000.00,1.00 -+151.45,+20.00,01.00,000.00,1.00 -+152.25,+20.00,01.00,000.00,1.00 -+153.04,+20.00,01.00,000.00,1.00 -+153.83,+20.00,01.00,000.00,1.00 -+154.63,+20.00,01.00,000.00,1.00 -+155.42,+20.00,01.00,000.00,1.00 -+156.21,+20.00,01.00,000.00,1.00 -+157.00,+20.00,01.00,000.00,1.00 -+157.80,+20.00,01.00,000.00,1.00 -+158.59,+20.00,01.00,000.00,1.00 -+159.38,+20.00,01.00,000.00,1.00 -+160.18,+20.00,01.00,000.00,1.00 -+160.97,+20.00,01.00,000.00,1.00 -+161.76,+20.00,01.00,000.00,1.00 -+162.56,+20.00,01.00,000.00,1.00 -+163.35,+20.00,01.00,000.00,1.00 -+164.14,+20.00,01.00,000.00,1.00 -+164.93,+20.00,01.00,000.00,1.00 -+165.73,+20.00,01.00,000.00,1.00 -+166.52,+20.00,01.00,000.00,1.00 -+167.31,+20.00,01.00,000.00,1.00 -+168.11,+20.00,01.00,000.00,1.00 -+168.90,+20.00,01.00,000.00,1.00 -+169.69,+20.00,01.00,000.00,1.00 -+170.48,+20.00,01.00,000.00,1.00 -+171.28,+20.00,01.00,000.00,1.00 -+172.07,+20.00,01.00,000.00,1.00 -+172.86,+20.00,01.00,000.00,1.00 -+173.66,+20.00,01.00,000.00,1.00 -+174.45,+20.00,01.00,000.00,1.00 -+175.24,+20.00,01.00,000.00,1.00 -+176.04,+20.00,01.00,000.00,1.00 -+176.83,+20.00,01.00,000.00,1.00 -+177.62,+20.00,01.00,000.00,1.00 -+178.41,+20.00,01.00,000.00,1.00 -+179.21,+20.00,01.00,000.00,1.00 -+180.00,+20.00,01.00,000.00,1.00 --179.21,+20.00,01.00,000.00,1.00 --178.41,+20.00,01.00,000.00,1.00 --177.62,+20.00,01.00,000.00,1.00 --176.83,+20.00,01.00,000.00,1.00 --176.04,+20.00,01.00,000.00,1.00 --175.24,+20.00,01.00,000.00,1.00 --174.45,+20.00,01.00,000.00,1.00 --173.66,+20.00,01.00,000.00,1.00 --172.86,+20.00,01.00,000.00,1.00 --172.07,+20.00,01.00,000.00,1.00 --171.28,+20.00,01.00,000.00,1.00 --170.48,+20.00,01.00,000.00,1.00 --169.69,+20.00,01.00,000.00,1.00 --168.90,+20.00,01.00,000.00,1.00 --168.11,+20.00,01.00,000.00,1.00 --167.31,+20.00,01.00,000.00,1.00 --166.52,+20.00,01.00,000.00,1.00 --165.73,+20.00,01.00,000.00,1.00 --164.93,+20.00,01.00,000.00,1.00 --164.14,+20.00,01.00,000.00,1.00 --163.35,+20.00,01.00,000.00,1.00 --162.56,+20.00,01.00,000.00,1.00 --161.76,+20.00,01.00,000.00,1.00 --160.97,+20.00,01.00,000.00,1.00 --160.18,+20.00,01.00,000.00,1.00 --159.38,+20.00,01.00,000.00,1.00 --158.59,+20.00,01.00,000.00,1.00 --157.80,+20.00,01.00,000.00,1.00 --157.00,+20.00,01.00,000.00,1.00 --156.21,+20.00,01.00,000.00,1.00 --155.42,+20.00,01.00,000.00,1.00 --154.63,+20.00,01.00,000.00,1.00 --153.83,+20.00,01.00,000.00,1.00 --153.04,+20.00,01.00,000.00,1.00 --152.25,+20.00,01.00,000.00,1.00 --151.45,+20.00,01.00,000.00,1.00 --150.66,+20.00,01.00,000.00,1.00 --149.87,+20.00,01.00,000.00,1.00 --149.07,+20.00,01.00,000.00,1.00 --148.28,+20.00,01.00,000.00,1.00 --147.49,+20.00,01.00,000.00,1.00 --146.70,+20.00,01.00,000.00,1.00 --145.90,+20.00,01.00,000.00,1.00 --145.11,+20.00,01.00,000.00,1.00 --144.32,+20.00,01.00,000.00,1.00 --143.52,+20.00,01.00,000.00,1.00 --142.73,+20.00,01.00,000.00,1.00 --141.94,+20.00,01.00,000.00,1.00 --141.15,+20.00,01.00,000.00,1.00 --140.35,+20.00,01.00,000.00,1.00 --139.56,+20.00,01.00,000.00,1.00 --138.77,+20.00,01.00,000.00,1.00 --137.97,+20.00,01.00,000.00,1.00 --137.18,+20.00,01.00,000.00,1.00 --136.39,+20.00,01.00,000.00,1.00 --135.59,+20.00,01.00,000.00,1.00 --134.80,+20.00,01.00,000.00,1.00 --134.01,+20.00,01.00,000.00,1.00 --133.22,+20.00,01.00,000.00,1.00 --132.42,+20.00,01.00,000.00,1.00 --131.63,+20.00,01.00,000.00,1.00 --130.84,+20.00,01.00,000.00,1.00 --130.04,+20.00,01.00,000.00,1.00 --129.25,+20.00,01.00,000.00,1.00 --128.46,+20.00,01.00,000.00,1.00 --127.67,+20.00,01.00,000.00,1.00 --126.87,+20.00,01.00,000.00,1.00 --126.08,+20.00,01.00,000.00,1.00 --125.29,+20.00,01.00,000.00,1.00 --124.49,+20.00,01.00,000.00,1.00 --123.70,+20.00,01.00,000.00,1.00 --122.91,+20.00,01.00,000.00,1.00 --122.11,+20.00,01.00,000.00,1.00 --121.32,+20.00,01.00,000.00,1.00 --120.53,+20.00,01.00,000.00,1.00 --119.74,+20.00,01.00,000.00,1.00 --118.94,+20.00,01.00,000.00,1.00 --118.15,+20.00,01.00,000.00,1.00 --117.36,+20.00,01.00,000.00,1.00 --116.56,+20.00,01.00,000.00,1.00 --115.77,+20.00,01.00,000.00,1.00 --114.98,+20.00,01.00,000.00,1.00 --114.19,+20.00,01.00,000.00,1.00 --113.39,+20.00,01.00,000.00,1.00 --112.60,+20.00,01.00,000.00,1.00 --111.81,+20.00,01.00,000.00,1.00 --111.01,+20.00,01.00,000.00,1.00 --110.22,+20.00,01.00,000.00,1.00 --109.43,+20.00,01.00,000.00,1.00 --108.63,+20.00,01.00,000.00,1.00 --107.84,+20.00,01.00,000.00,1.00 --107.05,+20.00,01.00,000.00,1.00 --106.26,+20.00,01.00,000.00,1.00 --105.46,+20.00,01.00,000.00,1.00 --104.67,+20.00,01.00,000.00,1.00 --103.88,+20.00,01.00,000.00,1.00 --103.08,+20.00,01.00,000.00,1.00 --102.29,+20.00,01.00,000.00,1.00 --101.50,+20.00,01.00,000.00,1.00 --100.70,+20.00,01.00,000.00,1.00 --099.91,+20.00,01.00,000.00,1.00 --099.12,+20.00,01.00,000.00,1.00 --098.33,+20.00,01.00,000.00,1.00 --097.53,+20.00,01.00,000.00,1.00 --096.74,+20.00,01.00,000.00,1.00 --095.95,+20.00,01.00,000.00,1.00 --095.15,+20.00,01.00,000.00,1.00 --094.36,+20.00,01.00,000.00,1.00 --093.57,+20.00,01.00,000.00,1.00 --092.78,+20.00,01.00,000.00,1.00 --091.98,+20.00,01.00,000.00,1.00 --091.19,+20.00,01.00,000.00,1.00 --090.40,+20.00,01.00,000.00,1.00 --089.60,+20.00,01.00,000.00,1.00 --088.81,+20.00,01.00,000.00,1.00 --088.02,+20.00,01.00,000.00,1.00 --087.22,+20.00,01.00,000.00,1.00 --086.43,+20.00,01.00,000.00,1.00 --085.64,+20.00,01.00,000.00,1.00 --084.85,+20.00,01.00,000.00,1.00 --084.05,+20.00,01.00,000.00,1.00 --083.26,+20.00,01.00,000.00,1.00 --082.47,+20.00,01.00,000.00,1.00 --081.67,+20.00,01.00,000.00,1.00 --080.88,+20.00,01.00,000.00,1.00 --080.09,+20.00,01.00,000.00,1.00 --079.30,+20.00,01.00,000.00,1.00 --078.50,+20.00,01.00,000.00,1.00 --077.71,+20.00,01.00,000.00,1.00 --076.92,+20.00,01.00,000.00,1.00 --076.12,+20.00,01.00,000.00,1.00 --075.33,+20.00,01.00,000.00,1.00 --074.54,+20.00,01.00,000.00,1.00 --073.74,+20.00,01.00,000.00,1.00 --072.95,+20.00,01.00,000.00,1.00 --072.16,+20.00,01.00,000.00,1.00 --071.37,+20.00,01.00,000.00,1.00 --070.57,+20.00,01.00,000.00,1.00 --069.78,+20.00,01.00,000.00,1.00 --068.99,+20.00,01.00,000.00,1.00 --068.19,+20.00,01.00,000.00,1.00 --067.40,+20.00,01.00,000.00,1.00 --066.61,+20.00,01.00,000.00,1.00 --065.81,+20.00,01.00,000.00,1.00 --065.02,+20.00,01.00,000.00,1.00 --064.23,+20.00,01.00,000.00,1.00 --063.44,+20.00,01.00,000.00,1.00 --062.64,+20.00,01.00,000.00,1.00 --061.85,+20.00,01.00,000.00,1.00 --061.06,+20.00,01.00,000.00,1.00 --060.26,+20.00,01.00,000.00,1.00 --059.47,+20.00,01.00,000.00,1.00 --058.68,+20.00,01.00,000.00,1.00 --057.89,+20.00,01.00,000.00,1.00 --057.09,+20.00,01.00,000.00,1.00 --056.30,+20.00,01.00,000.00,1.00 --055.51,+20.00,01.00,000.00,1.00 --054.71,+20.00,01.00,000.00,1.00 --053.92,+20.00,01.00,000.00,1.00 --053.13,+20.00,01.00,000.00,1.00 --052.33,+20.00,01.00,000.00,1.00 --051.54,+20.00,01.00,000.00,1.00 --050.75,+20.00,01.00,000.00,1.00 --049.96,+20.00,01.00,000.00,1.00 --049.16,+20.00,01.00,000.00,1.00 --048.37,+20.00,01.00,000.00,1.00 --047.58,+20.00,01.00,000.00,1.00 --046.78,+20.00,01.00,000.00,1.00 --045.99,+20.00,01.00,000.00,1.00 --045.20,+20.00,01.00,000.00,1.00 --044.41,+20.00,01.00,000.00,1.00 --043.61,+20.00,01.00,000.00,1.00 --042.82,+20.00,01.00,000.00,1.00 --042.03,+20.00,01.00,000.00,1.00 --041.23,+20.00,01.00,000.00,1.00 --040.44,+20.00,01.00,000.00,1.00 --039.65,+20.00,01.00,000.00,1.00 --038.85,+20.00,01.00,000.00,1.00 --038.06,+20.00,01.00,000.00,1.00 --037.27,+20.00,01.00,000.00,1.00 --036.48,+20.00,01.00,000.00,1.00 --035.68,+20.00,01.00,000.00,1.00 --034.89,+20.00,01.00,000.00,1.00 --034.10,+20.00,01.00,000.00,1.00 --033.30,+20.00,01.00,000.00,1.00 --032.51,+20.00,01.00,000.00,1.00 --031.72,+20.00,01.00,000.00,1.00 --030.93,+20.00,01.00,000.00,1.00 --030.13,+20.00,01.00,000.00,1.00 --029.34,+20.00,01.00,000.00,1.00 --028.55,+20.00,01.00,000.00,1.00 --027.75,+20.00,01.00,000.00,1.00 --026.96,+20.00,01.00,000.00,1.00 --026.17,+20.00,01.00,000.00,1.00 --025.37,+20.00,01.00,000.00,1.00 --024.58,+20.00,01.00,000.00,1.00 --023.79,+20.00,01.00,000.00,1.00 --023.00,+20.00,01.00,000.00,1.00 --022.20,+20.00,01.00,000.00,1.00 --021.41,+20.00,01.00,000.00,1.00 --020.62,+20.00,01.00,000.00,1.00 --019.82,+20.00,01.00,000.00,1.00 --019.03,+20.00,01.00,000.00,1.00 --018.24,+20.00,01.00,000.00,1.00 --017.44,+20.00,01.00,000.00,1.00 --016.65,+20.00,01.00,000.00,1.00 --015.86,+20.00,01.00,000.00,1.00 --015.07,+20.00,01.00,000.00,1.00 --014.27,+20.00,01.00,000.00,1.00 --013.48,+20.00,01.00,000.00,1.00 --012.69,+20.00,01.00,000.00,1.00 --011.89,+20.00,01.00,000.00,1.00 --011.10,+20.00,01.00,000.00,1.00 --010.31,+20.00,01.00,000.00,1.00 --009.52,+20.00,01.00,000.00,1.00 --008.72,+20.00,01.00,000.00,1.00 --007.93,+20.00,01.00,000.00,1.00 --007.14,+20.00,01.00,000.00,1.00 --006.34,+20.00,01.00,000.00,1.00 --005.55,+20.00,01.00,000.00,1.00 --004.76,+20.00,01.00,000.00,1.00 --003.96,+20.00,01.00,000.00,1.00 --003.17,+20.00,01.00,000.00,1.00 --002.38,+20.00,01.00,000.00,1.00 --001.59,+20.00,01.00,000.00,1.00 --000.79,+20.00,01.00,000.00,1.00 --000.00,+20.00,01.00,000.00,1.00 -+000.79,+20.00,01.00,000.00,1.00 -+001.59,+20.00,01.00,000.00,1.00 -+002.38,+20.00,01.00,000.00,1.00 -+003.17,+20.00,01.00,000.00,1.00 -+003.96,+20.00,01.00,000.00,1.00 -+004.76,+20.00,01.00,000.00,1.00 -+005.55,+20.00,01.00,000.00,1.00 -+006.34,+20.00,01.00,000.00,1.00 -+007.14,+20.00,01.00,000.00,1.00 -+007.93,+20.00,01.00,000.00,1.00 -+008.72,+20.00,01.00,000.00,1.00 -+009.52,+20.00,01.00,000.00,1.00 -+010.31,+20.00,01.00,000.00,1.00 -+011.10,+20.00,01.00,000.00,1.00 -+011.89,+20.00,01.00,000.00,1.00 -+012.69,+20.00,01.00,000.00,1.00 -+013.48,+20.00,01.00,000.00,1.00 -+014.27,+20.00,01.00,000.00,1.00 -+015.07,+20.00,01.00,000.00,1.00 -+015.86,+20.00,01.00,000.00,1.00 -+016.65,+20.00,01.00,000.00,1.00 -+017.44,+20.00,01.00,000.00,1.00 -+018.24,+20.00,01.00,000.00,1.00 -+019.03,+20.00,01.00,000.00,1.00 -+019.82,+20.00,01.00,000.00,1.00 -+020.62,+20.00,01.00,000.00,1.00 -+021.41,+20.00,01.00,000.00,1.00 -+022.20,+20.00,01.00,000.00,1.00 -+023.00,+20.00,01.00,000.00,1.00 -+023.79,+20.00,01.00,000.00,1.00 -+024.58,+20.00,01.00,000.00,1.00 -+025.37,+20.00,01.00,000.00,1.00 -+026.17,+20.00,01.00,000.00,1.00 -+026.96,+20.00,01.00,000.00,1.00 -+027.75,+20.00,01.00,000.00,1.00 -+028.55,+20.00,01.00,000.00,1.00 -+029.34,+20.00,01.00,000.00,1.00 -+030.13,+20.00,01.00,000.00,1.00 -+030.93,+20.00,01.00,000.00,1.00 -+031.72,+20.00,01.00,000.00,1.00 -+032.51,+20.00,01.00,000.00,1.00 -+033.30,+20.00,01.00,000.00,1.00 -+034.10,+20.00,01.00,000.00,1.00 -+034.89,+20.00,01.00,000.00,1.00 -+035.68,+20.00,01.00,000.00,1.00 -+036.48,+20.00,01.00,000.00,1.00 -+037.27,+20.00,01.00,000.00,1.00 -+038.06,+20.00,01.00,000.00,1.00 -+038.85,+20.00,01.00,000.00,1.00 -+039.65,+20.00,01.00,000.00,1.00 -+040.44,+20.00,01.00,000.00,1.00 -+041.23,+20.00,01.00,000.00,1.00 -+042.03,+20.00,01.00,000.00,1.00 -+042.82,+20.00,01.00,000.00,1.00 -+043.61,+20.00,01.00,000.00,1.00 -+044.41,+20.00,01.00,000.00,1.00 -+045.20,+20.00,01.00,000.00,1.00 -+045.99,+20.00,01.00,000.00,1.00 -+046.78,+20.00,01.00,000.00,1.00 -+047.58,+20.00,01.00,000.00,1.00 -+048.37,+20.00,01.00,000.00,1.00 -+049.16,+20.00,01.00,000.00,1.00 -+049.96,+20.00,01.00,000.00,1.00 -+050.75,+20.00,01.00,000.00,1.00 -+051.54,+20.00,01.00,000.00,1.00 -+052.33,+20.00,01.00,000.00,1.00 -+053.13,+20.00,01.00,000.00,1.00 -+053.92,+20.00,01.00,000.00,1.00 -+054.71,+20.00,01.00,000.00,1.00 -+055.51,+20.00,01.00,000.00,1.00 -+056.30,+20.00,01.00,000.00,1.00 -+057.09,+20.00,01.00,000.00,1.00 -+057.89,+20.00,01.00,000.00,1.00 -+058.68,+20.00,01.00,000.00,1.00 -+059.47,+20.00,01.00,000.00,1.00 -+060.26,+20.00,01.00,000.00,1.00 -+061.06,+20.00,01.00,000.00,1.00 -+061.85,+20.00,01.00,000.00,1.00 -+062.64,+20.00,01.00,000.00,1.00 -+063.44,+20.00,01.00,000.00,1.00 -+064.23,+20.00,01.00,000.00,1.00 -+065.02,+20.00,01.00,000.00,1.00 -+065.81,+20.00,01.00,000.00,1.00 -+066.61,+20.00,01.00,000.00,1.00 -+067.40,+20.00,01.00,000.00,1.00 -+068.19,+20.00,01.00,000.00,1.00 -+068.99,+20.00,01.00,000.00,1.00 -+069.78,+20.00,01.00,000.00,1.00 -+070.57,+20.00,01.00,000.00,1.00 -+071.37,+20.00,01.00,000.00,1.00 -+072.16,+20.00,01.00,000.00,1.00 diff --git a/scripts/td_object_renderer/metadata/csv/t11_ch1.csv b/scripts/td_object_renderer/metadata/csv/t11_ch1.csv deleted file mode 100644 index 846e212989..0000000000 --- a/scripts/td_object_renderer/metadata/csv/t11_ch1.csv +++ /dev/null @@ -1,1000 +0,0 @@ --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 --050.00,+00.00,01.00,000.00,1.00 diff --git a/scripts/td_object_renderer/metadata/csv/t11_ch2.csv b/scripts/td_object_renderer/metadata/csv/t11_ch2.csv deleted file mode 100644 index 59fc7ed029..0000000000 --- a/scripts/td_object_renderer/metadata/csv/t11_ch2.csv +++ /dev/null @@ -1,1000 +0,0 @@ --020.00,+00.00,01.00,000.00,1.00 --019.10,+00.00,01.00,000.00,1.00 --018.20,+00.00,01.00,000.00,1.00 --017.30,+00.00,01.00,000.00,1.00 --016.40,+00.00,01.00,000.00,1.00 --015.50,+00.00,01.00,000.00,1.00 --014.60,+00.00,01.00,000.00,1.00 --013.70,+00.00,01.00,000.00,1.00 --012.80,+00.00,01.00,000.00,1.00 --011.90,+00.00,01.00,000.00,1.00 --011.00,+00.00,01.00,000.00,1.00 --010.10,+00.00,01.00,000.00,1.00 --009.20,+00.00,01.00,000.00,1.00 --008.30,+00.00,01.00,000.00,1.00 --007.40,+00.00,01.00,000.00,1.00 --006.50,+00.00,01.00,000.00,1.00 --005.60,+00.00,01.00,000.00,1.00 --004.70,+00.00,01.00,000.00,1.00 --003.80,+00.00,01.00,000.00,1.00 --002.90,+00.00,01.00,000.00,1.00 --002.00,+00.00,01.00,000.00,1.00 --001.10,+00.00,01.00,000.00,1.00 --000.20,+00.00,01.00,000.00,1.00 -+000.70,+00.00,01.00,000.00,1.00 -+001.60,+00.00,01.00,000.00,1.00 -+002.50,+00.00,01.00,000.00,1.00 -+003.40,+00.00,01.00,000.00,1.00 -+004.30,+00.00,01.00,000.00,1.00 -+005.20,+00.00,01.00,000.00,1.00 -+006.10,+00.00,01.00,000.00,1.00 -+007.00,+00.00,01.00,000.00,1.00 -+007.90,+00.00,01.00,000.00,1.00 -+008.80,+00.00,01.00,000.00,1.00 -+009.70,+00.00,01.00,000.00,1.00 -+010.60,+00.00,01.00,000.00,1.00 -+011.50,+00.00,01.00,000.00,1.00 -+012.40,+00.00,01.00,000.00,1.00 -+013.30,+00.00,01.00,000.00,1.00 -+014.20,+00.00,01.00,000.00,1.00 -+015.10,+00.00,01.00,000.00,1.00 -+016.00,+00.00,01.00,000.00,1.00 -+016.90,+00.00,01.00,000.00,1.00 -+017.80,+00.00,01.00,000.00,1.00 -+018.70,+00.00,01.00,000.00,1.00 -+019.60,+00.00,01.00,000.00,1.00 -+020.50,+00.00,01.00,000.00,1.00 -+021.40,+00.00,01.00,000.00,1.00 -+022.30,+00.00,01.00,000.00,1.00 -+023.20,+00.00,01.00,000.00,1.00 -+024.10,+00.00,01.00,000.00,1.00 -+025.00,+00.00,01.00,000.00,1.00 -+025.90,+00.00,01.00,000.00,1.00 -+026.80,+00.00,01.00,000.00,1.00 -+027.70,+00.00,01.00,000.00,1.00 -+028.60,+00.00,01.00,000.00,1.00 -+029.50,+00.00,01.00,000.00,1.00 -+030.40,+00.00,01.00,000.00,1.00 -+031.30,+00.00,01.00,000.00,1.00 -+032.20,+00.00,01.00,000.00,1.00 -+033.10,+00.00,01.00,000.00,1.00 -+034.00,+00.00,01.00,000.00,1.00 -+034.90,+00.00,01.00,000.00,1.00 -+035.80,+00.00,01.00,000.00,1.00 -+036.70,+00.00,01.00,000.00,1.00 -+037.60,+00.00,01.00,000.00,1.00 -+038.50,+00.00,01.00,000.00,1.00 -+039.40,+00.00,01.00,000.00,1.00 -+040.30,+00.00,01.00,000.00,1.00 -+041.20,+00.00,01.00,000.00,1.00 -+042.10,+00.00,01.00,000.00,1.00 -+043.00,+00.00,01.00,000.00,1.00 -+043.90,+00.00,01.00,000.00,1.00 -+044.80,+00.00,01.00,000.00,1.00 -+045.70,+00.00,01.00,000.00,1.00 -+046.60,+00.00,01.00,000.00,1.00 -+047.50,+00.00,01.00,000.00,1.00 -+048.40,+00.00,01.00,000.00,1.00 -+049.30,+00.00,01.00,000.00,1.00 -+050.20,+00.00,01.00,000.00,1.00 -+051.10,+00.00,01.00,000.00,1.00 -+052.00,+00.00,01.00,000.00,1.00 -+052.90,+00.00,01.00,000.00,1.00 -+053.80,+00.00,01.00,000.00,1.00 -+054.70,+00.00,01.00,000.00,1.00 -+055.60,+00.00,01.00,000.00,1.00 -+056.50,+00.00,01.00,000.00,1.00 -+057.40,+00.00,01.00,000.00,1.00 -+058.30,+00.00,01.00,000.00,1.00 -+059.20,+00.00,01.00,000.00,1.00 -+060.10,+00.00,01.00,000.00,1.00 -+061.00,+00.00,01.00,000.00,1.00 -+061.90,+00.00,01.00,000.00,1.00 -+062.80,+00.00,01.00,000.00,1.00 -+063.70,+00.00,01.00,000.00,1.00 -+064.60,+00.00,01.00,000.00,1.00 -+065.50,+00.00,01.00,000.00,1.00 -+066.40,+00.00,01.00,000.00,1.00 -+067.30,+00.00,01.00,000.00,1.00 -+068.20,+00.00,01.00,000.00,1.00 -+069.10,+00.00,01.00,000.00,1.00 -+070.00,+00.00,01.00,000.00,1.00 -+070.90,+00.00,01.00,000.00,1.00 -+071.80,+00.00,01.00,000.00,1.00 -+072.70,+00.00,01.00,000.00,1.00 -+073.60,+00.00,01.00,000.00,1.00 -+074.50,+00.00,01.00,000.00,1.00 -+075.40,+00.00,01.00,000.00,1.00 -+076.30,+00.00,01.00,000.00,1.00 -+077.20,+00.00,01.00,000.00,1.00 -+078.10,+00.00,01.00,000.00,1.00 -+079.00,+00.00,01.00,000.00,1.00 -+079.90,+00.00,01.00,000.00,1.00 -+080.80,+00.00,01.00,000.00,1.00 -+081.70,+00.00,01.00,000.00,1.00 -+082.60,+00.00,01.00,000.00,1.00 -+083.50,+00.00,01.00,000.00,1.00 -+084.40,+00.00,01.00,000.00,1.00 -+085.30,+00.00,01.00,000.00,1.00 -+086.20,+00.00,01.00,000.00,1.00 -+087.10,+00.00,01.00,000.00,1.00 -+088.00,+00.00,01.00,000.00,1.00 -+088.90,+00.00,01.00,000.00,1.00 -+089.80,+00.00,01.00,000.00,1.00 -+090.70,+00.00,01.00,000.00,1.00 -+091.60,+00.00,01.00,000.00,1.00 -+092.50,+00.00,01.00,000.00,1.00 -+093.40,+00.00,01.00,000.00,1.00 -+094.30,+00.00,01.00,000.00,1.00 -+095.20,+00.00,01.00,000.00,1.00 -+096.10,+00.00,01.00,000.00,1.00 -+097.00,+00.00,01.00,000.00,1.00 -+097.90,+00.00,01.00,000.00,1.00 -+098.80,+00.00,01.00,000.00,1.00 -+099.70,+00.00,01.00,000.00,1.00 -+100.60,+00.00,01.00,000.00,1.00 -+101.50,+00.00,01.00,000.00,1.00 -+102.40,+00.00,01.00,000.00,1.00 -+103.30,+00.00,01.00,000.00,1.00 -+104.20,+00.00,01.00,000.00,1.00 -+105.10,+00.00,01.00,000.00,1.00 -+106.00,+00.00,01.00,000.00,1.00 -+106.90,+00.00,01.00,000.00,1.00 -+107.80,+00.00,01.00,000.00,1.00 -+108.70,+00.00,01.00,000.00,1.00 -+109.60,+00.00,01.00,000.00,1.00 -+110.50,+00.00,01.00,000.00,1.00 -+111.40,+00.00,01.00,000.00,1.00 -+112.30,+00.00,01.00,000.00,1.00 -+113.20,+00.00,01.00,000.00,1.00 -+114.10,+00.00,01.00,000.00,1.00 -+115.00,+00.00,01.00,000.00,1.00 -+115.90,+00.00,01.00,000.00,1.00 -+116.80,+00.00,01.00,000.00,1.00 -+117.70,+00.00,01.00,000.00,1.00 -+118.60,+00.00,01.00,000.00,1.00 -+119.50,+00.00,01.00,000.00,1.00 -+120.40,+00.00,01.00,000.00,1.00 -+121.30,+00.00,01.00,000.00,1.00 -+122.20,+00.00,01.00,000.00,1.00 -+123.10,+00.00,01.00,000.00,1.00 -+124.00,+00.00,01.00,000.00,1.00 -+124.90,+00.00,01.00,000.00,1.00 -+125.80,+00.00,01.00,000.00,1.00 -+126.70,+00.00,01.00,000.00,1.00 -+127.60,+00.00,01.00,000.00,1.00 -+128.50,+00.00,01.00,000.00,1.00 -+129.40,+00.00,01.00,000.00,1.00 -+130.30,+00.00,01.00,000.00,1.00 -+131.20,+00.00,01.00,000.00,1.00 -+132.10,+00.00,01.00,000.00,1.00 -+133.00,+00.00,01.00,000.00,1.00 -+133.90,+00.00,01.00,000.00,1.00 -+134.80,+00.00,01.00,000.00,1.00 -+135.70,+00.00,01.00,000.00,1.00 -+136.60,+00.00,01.00,000.00,1.00 -+137.50,+00.00,01.00,000.00,1.00 -+138.40,+00.00,01.00,000.00,1.00 -+139.30,+00.00,01.00,000.00,1.00 -+140.20,+00.00,01.00,000.00,1.00 -+141.10,+00.00,01.00,000.00,1.00 -+142.00,+00.00,01.00,000.00,1.00 -+142.90,+00.00,01.00,000.00,1.00 -+143.80,+00.00,01.00,000.00,1.00 -+144.70,+00.00,01.00,000.00,1.00 -+145.60,+00.00,01.00,000.00,1.00 -+146.50,+00.00,01.00,000.00,1.00 -+147.40,+00.00,01.00,000.00,1.00 -+148.30,+00.00,01.00,000.00,1.00 -+149.20,+00.00,01.00,000.00,1.00 -+150.10,+00.00,01.00,000.00,1.00 -+151.00,+00.00,01.00,000.00,1.00 -+151.90,+00.00,01.00,000.00,1.00 -+152.80,+00.00,01.00,000.00,1.00 -+153.70,+00.00,01.00,000.00,1.00 -+154.60,+00.00,01.00,000.00,1.00 -+155.50,+00.00,01.00,000.00,1.00 -+156.40,+00.00,01.00,000.00,1.00 -+157.30,+00.00,01.00,000.00,1.00 -+158.20,+00.00,01.00,000.00,1.00 -+159.10,+00.00,01.00,000.00,1.00 -+160.00,+00.00,01.00,000.00,1.00 -+160.90,+00.00,01.00,000.00,1.00 -+161.80,+00.00,01.00,000.00,1.00 -+162.70,+00.00,01.00,000.00,1.00 -+163.60,+00.00,01.00,000.00,1.00 -+164.50,+00.00,01.00,000.00,1.00 -+165.40,+00.00,01.00,000.00,1.00 -+166.30,+00.00,01.00,000.00,1.00 -+167.20,+00.00,01.00,000.00,1.00 -+168.10,+00.00,01.00,000.00,1.00 -+169.00,+00.00,01.00,000.00,1.00 -+169.90,+00.00,01.00,000.00,1.00 -+170.80,+00.00,01.00,000.00,1.00 -+171.70,+00.00,01.00,000.00,1.00 -+172.60,+00.00,01.00,000.00,1.00 -+173.50,+00.00,01.00,000.00,1.00 -+174.40,+00.00,01.00,000.00,1.00 -+175.30,+00.00,01.00,000.00,1.00 -+176.20,+00.00,01.00,000.00,1.00 -+177.10,+00.00,01.00,000.00,1.00 -+178.00,+00.00,01.00,000.00,1.00 -+178.90,+00.00,01.00,000.00,1.00 -+179.80,+00.00,01.00,000.00,1.00 --179.30,+00.00,01.00,000.00,1.00 --178.40,+00.00,01.00,000.00,1.00 --177.50,+00.00,01.00,000.00,1.00 --176.60,+00.00,01.00,000.00,1.00 --175.70,+00.00,01.00,000.00,1.00 --174.80,+00.00,01.00,000.00,1.00 --173.90,+00.00,01.00,000.00,1.00 --173.00,+00.00,01.00,000.00,1.00 --172.10,+00.00,01.00,000.00,1.00 --171.20,+00.00,01.00,000.00,1.00 --170.30,+00.00,01.00,000.00,1.00 --169.40,+00.00,01.00,000.00,1.00 --168.50,+00.00,01.00,000.00,1.00 --167.60,+00.00,01.00,000.00,1.00 --166.70,+00.00,01.00,000.00,1.00 --165.80,+00.00,01.00,000.00,1.00 --164.90,+00.00,01.00,000.00,1.00 --164.00,+00.00,01.00,000.00,1.00 --163.10,+00.00,01.00,000.00,1.00 --162.20,+00.00,01.00,000.00,1.00 --161.30,+00.00,01.00,000.00,1.00 --160.40,+00.00,01.00,000.00,1.00 --159.50,+00.00,01.00,000.00,1.00 --158.60,+00.00,01.00,000.00,1.00 --157.70,+00.00,01.00,000.00,1.00 --156.80,+00.00,01.00,000.00,1.00 --155.90,+00.00,01.00,000.00,1.00 --155.00,+00.00,01.00,000.00,1.00 --154.10,+00.00,01.00,000.00,1.00 --153.20,+00.00,01.00,000.00,1.00 --152.30,+00.00,01.00,000.00,1.00 --151.40,+00.00,01.00,000.00,1.00 --150.50,+00.00,01.00,000.00,1.00 --149.60,+00.00,01.00,000.00,1.00 --148.70,+00.00,01.00,000.00,1.00 --147.80,+00.00,01.00,000.00,1.00 --146.90,+00.00,01.00,000.00,1.00 --146.00,+00.00,01.00,000.00,1.00 --145.10,+00.00,01.00,000.00,1.00 --144.20,+00.00,01.00,000.00,1.00 --143.30,+00.00,01.00,000.00,1.00 --142.40,+00.00,01.00,000.00,1.00 --141.50,+00.00,01.00,000.00,1.00 --140.60,+00.00,01.00,000.00,1.00 --139.70,+00.00,01.00,000.00,1.00 --138.80,+00.00,01.00,000.00,1.00 --137.90,+00.00,01.00,000.00,1.00 --137.00,+00.00,01.00,000.00,1.00 --136.10,+00.00,01.00,000.00,1.00 --135.20,+00.00,01.00,000.00,1.00 --134.30,+00.00,01.00,000.00,1.00 --133.40,+00.00,01.00,000.00,1.00 --132.50,+00.00,01.00,000.00,1.00 --131.60,+00.00,01.00,000.00,1.00 --130.70,+00.00,01.00,000.00,1.00 --129.80,+00.00,01.00,000.00,1.00 --128.90,+00.00,01.00,000.00,1.00 --128.00,+00.00,01.00,000.00,1.00 --127.10,+00.00,01.00,000.00,1.00 --126.20,+00.00,01.00,000.00,1.00 --125.30,+00.00,01.00,000.00,1.00 --124.40,+00.00,01.00,000.00,1.00 --123.50,+00.00,01.00,000.00,1.00 --122.60,+00.00,01.00,000.00,1.00 --121.70,+00.00,01.00,000.00,1.00 --120.80,+00.00,01.00,000.00,1.00 --119.90,+00.00,01.00,000.00,1.00 --119.00,+00.00,01.00,000.00,1.00 --118.10,+00.00,01.00,000.00,1.00 --117.20,+00.00,01.00,000.00,1.00 --116.30,+00.00,01.00,000.00,1.00 --115.40,+00.00,01.00,000.00,1.00 --114.50,+00.00,01.00,000.00,1.00 --113.60,+00.00,01.00,000.00,1.00 --112.70,+00.00,01.00,000.00,1.00 --111.80,+00.00,01.00,000.00,1.00 --110.90,+00.00,01.00,000.00,1.00 --110.00,+00.00,01.00,000.00,1.00 --109.10,+00.00,01.00,000.00,1.00 --108.20,+00.00,01.00,000.00,1.00 --107.30,+00.00,01.00,000.00,1.00 --106.40,+00.00,01.00,000.00,1.00 --105.50,+00.00,01.00,000.00,1.00 --104.60,+00.00,01.00,000.00,1.00 --103.70,+00.00,01.00,000.00,1.00 --102.80,+00.00,01.00,000.00,1.00 --101.90,+00.00,01.00,000.00,1.00 --101.00,+00.00,01.00,000.00,1.00 --100.10,+00.00,01.00,000.00,1.00 --099.20,+00.00,01.00,000.00,1.00 --098.30,+00.00,01.00,000.00,1.00 --097.40,+00.00,01.00,000.00,1.00 --096.50,+00.00,01.00,000.00,1.00 --095.60,+00.00,01.00,000.00,1.00 --094.70,+00.00,01.00,000.00,1.00 --093.80,+00.00,01.00,000.00,1.00 --092.90,+00.00,01.00,000.00,1.00 --092.00,+00.00,01.00,000.00,1.00 --091.10,+00.00,01.00,000.00,1.00 --090.20,+00.00,01.00,000.00,1.00 --089.30,+00.00,01.00,000.00,1.00 --088.40,+00.00,01.00,000.00,1.00 --087.50,+00.00,01.00,000.00,1.00 --086.60,+00.00,01.00,000.00,1.00 --085.70,+00.00,01.00,000.00,1.00 --084.80,+00.00,01.00,000.00,1.00 --083.90,+00.00,01.00,000.00,1.00 --083.00,+00.00,01.00,000.00,1.00 --082.10,+00.00,01.00,000.00,1.00 --081.20,+00.00,01.00,000.00,1.00 --080.30,+00.00,01.00,000.00,1.00 --079.40,+00.00,01.00,000.00,1.00 --078.50,+00.00,01.00,000.00,1.00 --077.60,+00.00,01.00,000.00,1.00 --076.70,+00.00,01.00,000.00,1.00 --075.80,+00.00,01.00,000.00,1.00 --074.90,+00.00,01.00,000.00,1.00 --074.00,+00.00,01.00,000.00,1.00 --073.10,+00.00,01.00,000.00,1.00 --072.20,+00.00,01.00,000.00,1.00 --071.30,+00.00,01.00,000.00,1.00 --070.40,+00.00,01.00,000.00,1.00 --069.50,+00.00,01.00,000.00,1.00 --068.60,+00.00,01.00,000.00,1.00 --067.70,+00.00,01.00,000.00,1.00 --066.80,+00.00,01.00,000.00,1.00 --065.90,+00.00,01.00,000.00,1.00 --065.00,+00.00,01.00,000.00,1.00 --064.10,+00.00,01.00,000.00,1.00 --063.20,+00.00,01.00,000.00,1.00 --062.30,+00.00,01.00,000.00,1.00 --061.40,+00.00,01.00,000.00,1.00 --060.50,+00.00,01.00,000.00,1.00 --059.60,+00.00,01.00,000.00,1.00 --058.70,+00.00,01.00,000.00,1.00 --057.80,+00.00,01.00,000.00,1.00 --056.90,+00.00,01.00,000.00,1.00 --056.00,+00.00,01.00,000.00,1.00 --055.10,+00.00,01.00,000.00,1.00 --054.20,+00.00,01.00,000.00,1.00 --053.30,+00.00,01.00,000.00,1.00 --052.40,+00.00,01.00,000.00,1.00 --051.50,+00.00,01.00,000.00,1.00 --050.60,+00.00,01.00,000.00,1.00 --049.70,+00.00,01.00,000.00,1.00 --048.80,+00.00,01.00,000.00,1.00 --047.90,+00.00,01.00,000.00,1.00 --047.00,+00.00,01.00,000.00,1.00 --046.10,+00.00,01.00,000.00,1.00 --045.20,+00.00,01.00,000.00,1.00 --044.30,+00.00,01.00,000.00,1.00 --043.40,+00.00,01.00,000.00,1.00 --042.50,+00.00,01.00,000.00,1.00 --041.60,+00.00,01.00,000.00,1.00 --040.70,+00.00,01.00,000.00,1.00 --039.80,+00.00,01.00,000.00,1.00 --038.90,+00.00,01.00,000.00,1.00 --038.00,+00.00,01.00,000.00,1.00 --037.10,+00.00,01.00,000.00,1.00 --036.20,+00.00,01.00,000.00,1.00 --035.30,+00.00,01.00,000.00,1.00 --034.40,+00.00,01.00,000.00,1.00 --033.50,+00.00,01.00,000.00,1.00 --032.60,+00.00,01.00,000.00,1.00 --031.70,+00.00,01.00,000.00,1.00 --030.80,+00.00,01.00,000.00,1.00 --029.90,+00.00,01.00,000.00,1.00 --029.00,+00.00,01.00,000.00,1.00 --028.10,+00.00,01.00,000.00,1.00 --027.20,+00.00,01.00,000.00,1.00 --026.30,+00.00,01.00,000.00,1.00 --025.40,+00.00,01.00,000.00,1.00 --024.50,+00.00,01.00,000.00,1.00 --023.60,+00.00,01.00,000.00,1.00 --022.70,+00.00,01.00,000.00,1.00 --021.80,+00.00,01.00,000.00,1.00 --020.90,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --019.10,+00.00,01.00,000.00,1.00 --018.20,+00.00,01.00,000.00,1.00 --017.30,+00.00,01.00,000.00,1.00 --016.40,+00.00,01.00,000.00,1.00 --015.50,+00.00,01.00,000.00,1.00 --014.60,+00.00,01.00,000.00,1.00 --013.70,+00.00,01.00,000.00,1.00 --012.80,+00.00,01.00,000.00,1.00 --011.90,+00.00,01.00,000.00,1.00 --011.00,+00.00,01.00,000.00,1.00 --010.10,+00.00,01.00,000.00,1.00 --009.20,+00.00,01.00,000.00,1.00 --008.30,+00.00,01.00,000.00,1.00 --007.40,+00.00,01.00,000.00,1.00 --006.50,+00.00,01.00,000.00,1.00 --005.60,+00.00,01.00,000.00,1.00 --004.70,+00.00,01.00,000.00,1.00 --003.80,+00.00,01.00,000.00,1.00 --002.90,+00.00,01.00,000.00,1.00 --002.00,+00.00,01.00,000.00,1.00 --001.10,+00.00,01.00,000.00,1.00 --000.20,+00.00,01.00,000.00,1.00 -+000.70,+00.00,01.00,000.00,1.00 -+001.60,+00.00,01.00,000.00,1.00 -+002.50,+00.00,01.00,000.00,1.00 -+003.40,+00.00,01.00,000.00,1.00 -+004.30,+00.00,01.00,000.00,1.00 -+005.20,+00.00,01.00,000.00,1.00 -+006.10,+00.00,01.00,000.00,1.00 -+007.00,+00.00,01.00,000.00,1.00 -+007.90,+00.00,01.00,000.00,1.00 -+008.80,+00.00,01.00,000.00,1.00 -+009.70,+00.00,01.00,000.00,1.00 -+010.60,+00.00,01.00,000.00,1.00 -+011.50,+00.00,01.00,000.00,1.00 -+012.40,+00.00,01.00,000.00,1.00 -+013.30,+00.00,01.00,000.00,1.00 -+014.20,+00.00,01.00,000.00,1.00 -+015.10,+00.00,01.00,000.00,1.00 -+016.00,+00.00,01.00,000.00,1.00 -+016.90,+00.00,01.00,000.00,1.00 -+017.80,+00.00,01.00,000.00,1.00 -+018.70,+00.00,01.00,000.00,1.00 -+019.60,+00.00,01.00,000.00,1.00 -+020.50,+00.00,01.00,000.00,1.00 -+021.40,+00.00,01.00,000.00,1.00 -+022.30,+00.00,01.00,000.00,1.00 -+023.20,+00.00,01.00,000.00,1.00 -+024.10,+00.00,01.00,000.00,1.00 -+025.00,+00.00,01.00,000.00,1.00 -+025.90,+00.00,01.00,000.00,1.00 -+026.80,+00.00,01.00,000.00,1.00 -+027.70,+00.00,01.00,000.00,1.00 -+028.60,+00.00,01.00,000.00,1.00 -+029.50,+00.00,01.00,000.00,1.00 -+030.40,+00.00,01.00,000.00,1.00 -+031.30,+00.00,01.00,000.00,1.00 -+032.20,+00.00,01.00,000.00,1.00 -+033.10,+00.00,01.00,000.00,1.00 -+034.00,+00.00,01.00,000.00,1.00 -+034.90,+00.00,01.00,000.00,1.00 -+035.80,+00.00,01.00,000.00,1.00 -+036.70,+00.00,01.00,000.00,1.00 -+037.60,+00.00,01.00,000.00,1.00 -+038.50,+00.00,01.00,000.00,1.00 -+039.40,+00.00,01.00,000.00,1.00 -+040.30,+00.00,01.00,000.00,1.00 -+041.20,+00.00,01.00,000.00,1.00 -+042.10,+00.00,01.00,000.00,1.00 -+043.00,+00.00,01.00,000.00,1.00 -+043.90,+00.00,01.00,000.00,1.00 -+044.80,+00.00,01.00,000.00,1.00 -+045.70,+00.00,01.00,000.00,1.00 -+046.60,+00.00,01.00,000.00,1.00 -+047.50,+00.00,01.00,000.00,1.00 -+048.40,+00.00,01.00,000.00,1.00 -+049.30,+00.00,01.00,000.00,1.00 -+050.20,+00.00,01.00,000.00,1.00 -+051.10,+00.00,01.00,000.00,1.00 -+052.00,+00.00,01.00,000.00,1.00 -+052.90,+00.00,01.00,000.00,1.00 -+053.80,+00.00,01.00,000.00,1.00 -+054.70,+00.00,01.00,000.00,1.00 -+055.60,+00.00,01.00,000.00,1.00 -+056.50,+00.00,01.00,000.00,1.00 -+057.40,+00.00,01.00,000.00,1.00 -+058.30,+00.00,01.00,000.00,1.00 -+059.20,+00.00,01.00,000.00,1.00 -+060.10,+00.00,01.00,000.00,1.00 -+061.00,+00.00,01.00,000.00,1.00 -+061.90,+00.00,01.00,000.00,1.00 -+062.80,+00.00,01.00,000.00,1.00 -+063.70,+00.00,01.00,000.00,1.00 -+064.60,+00.00,01.00,000.00,1.00 -+065.50,+00.00,01.00,000.00,1.00 -+066.40,+00.00,01.00,000.00,1.00 -+067.30,+00.00,01.00,000.00,1.00 -+068.20,+00.00,01.00,000.00,1.00 -+069.10,+00.00,01.00,000.00,1.00 -+070.00,+00.00,01.00,000.00,1.00 -+070.90,+00.00,01.00,000.00,1.00 -+071.80,+00.00,01.00,000.00,1.00 -+072.70,+00.00,01.00,000.00,1.00 -+073.60,+00.00,01.00,000.00,1.00 -+074.50,+00.00,01.00,000.00,1.00 -+075.40,+00.00,01.00,000.00,1.00 -+076.30,+00.00,01.00,000.00,1.00 -+077.20,+00.00,01.00,000.00,1.00 -+078.10,+00.00,01.00,000.00,1.00 -+079.00,+00.00,01.00,000.00,1.00 -+079.90,+00.00,01.00,000.00,1.00 -+080.80,+00.00,01.00,000.00,1.00 -+081.70,+00.00,01.00,000.00,1.00 -+082.60,+00.00,01.00,000.00,1.00 -+083.50,+00.00,01.00,000.00,1.00 -+084.40,+00.00,01.00,000.00,1.00 -+085.30,+00.00,01.00,000.00,1.00 -+086.20,+00.00,01.00,000.00,1.00 -+087.10,+00.00,01.00,000.00,1.00 -+088.00,+00.00,01.00,000.00,1.00 -+088.90,+00.00,01.00,000.00,1.00 -+089.80,+00.00,01.00,000.00,1.00 -+090.70,+00.00,01.00,000.00,1.00 -+091.60,+00.00,01.00,000.00,1.00 -+092.50,+00.00,01.00,000.00,1.00 -+093.40,+00.00,01.00,000.00,1.00 -+094.30,+00.00,01.00,000.00,1.00 -+095.20,+00.00,01.00,000.00,1.00 -+096.10,+00.00,01.00,000.00,1.00 -+097.00,+00.00,01.00,000.00,1.00 -+097.90,+00.00,01.00,000.00,1.00 -+098.80,+00.00,01.00,000.00,1.00 -+099.70,+00.00,01.00,000.00,1.00 -+100.60,+00.00,01.00,000.00,1.00 -+101.50,+00.00,01.00,000.00,1.00 -+102.40,+00.00,01.00,000.00,1.00 -+103.30,+00.00,01.00,000.00,1.00 -+104.20,+00.00,01.00,000.00,1.00 -+105.10,+00.00,01.00,000.00,1.00 -+106.00,+00.00,01.00,000.00,1.00 -+106.90,+00.00,01.00,000.00,1.00 -+107.80,+00.00,01.00,000.00,1.00 -+108.70,+00.00,01.00,000.00,1.00 -+109.60,+00.00,01.00,000.00,1.00 -+110.50,+00.00,01.00,000.00,1.00 -+111.40,+00.00,01.00,000.00,1.00 -+112.30,+00.00,01.00,000.00,1.00 -+113.20,+00.00,01.00,000.00,1.00 -+114.10,+00.00,01.00,000.00,1.00 -+115.00,+00.00,01.00,000.00,1.00 -+115.90,+00.00,01.00,000.00,1.00 -+116.80,+00.00,01.00,000.00,1.00 -+117.70,+00.00,01.00,000.00,1.00 -+118.60,+00.00,01.00,000.00,1.00 -+119.50,+00.00,01.00,000.00,1.00 -+120.40,+00.00,01.00,000.00,1.00 -+121.30,+00.00,01.00,000.00,1.00 -+122.20,+00.00,01.00,000.00,1.00 -+123.10,+00.00,01.00,000.00,1.00 -+124.00,+00.00,01.00,000.00,1.00 -+124.90,+00.00,01.00,000.00,1.00 -+125.80,+00.00,01.00,000.00,1.00 -+126.70,+00.00,01.00,000.00,1.00 -+127.60,+00.00,01.00,000.00,1.00 -+128.50,+00.00,01.00,000.00,1.00 -+129.40,+00.00,01.00,000.00,1.00 -+130.30,+00.00,01.00,000.00,1.00 -+131.20,+00.00,01.00,000.00,1.00 -+132.10,+00.00,01.00,000.00,1.00 -+133.00,+00.00,01.00,000.00,1.00 -+133.90,+00.00,01.00,000.00,1.00 -+134.80,+00.00,01.00,000.00,1.00 -+135.70,+00.00,01.00,000.00,1.00 -+136.60,+00.00,01.00,000.00,1.00 -+137.50,+00.00,01.00,000.00,1.00 -+138.40,+00.00,01.00,000.00,1.00 -+139.30,+00.00,01.00,000.00,1.00 -+140.20,+00.00,01.00,000.00,1.00 -+141.10,+00.00,01.00,000.00,1.00 -+142.00,+00.00,01.00,000.00,1.00 -+142.90,+00.00,01.00,000.00,1.00 -+143.80,+00.00,01.00,000.00,1.00 -+144.70,+00.00,01.00,000.00,1.00 -+145.60,+00.00,01.00,000.00,1.00 -+146.50,+00.00,01.00,000.00,1.00 -+147.40,+00.00,01.00,000.00,1.00 -+148.30,+00.00,01.00,000.00,1.00 -+149.20,+00.00,01.00,000.00,1.00 -+150.10,+00.00,01.00,000.00,1.00 -+151.00,+00.00,01.00,000.00,1.00 -+151.90,+00.00,01.00,000.00,1.00 -+152.80,+00.00,01.00,000.00,1.00 -+153.70,+00.00,01.00,000.00,1.00 -+154.60,+00.00,01.00,000.00,1.00 -+155.50,+00.00,01.00,000.00,1.00 -+156.40,+00.00,01.00,000.00,1.00 -+157.30,+00.00,01.00,000.00,1.00 -+158.20,+00.00,01.00,000.00,1.00 -+159.10,+00.00,01.00,000.00,1.00 -+160.00,+00.00,01.00,000.00,1.00 -+160.90,+00.00,01.00,000.00,1.00 -+161.80,+00.00,01.00,000.00,1.00 -+162.70,+00.00,01.00,000.00,1.00 -+163.60,+00.00,01.00,000.00,1.00 -+164.50,+00.00,01.00,000.00,1.00 -+165.40,+00.00,01.00,000.00,1.00 -+166.30,+00.00,01.00,000.00,1.00 -+167.20,+00.00,01.00,000.00,1.00 -+168.10,+00.00,01.00,000.00,1.00 -+169.00,+00.00,01.00,000.00,1.00 -+169.90,+00.00,01.00,000.00,1.00 -+170.80,+00.00,01.00,000.00,1.00 -+171.70,+00.00,01.00,000.00,1.00 -+172.60,+00.00,01.00,000.00,1.00 -+173.50,+00.00,01.00,000.00,1.00 -+174.40,+00.00,01.00,000.00,1.00 -+175.30,+00.00,01.00,000.00,1.00 -+176.20,+00.00,01.00,000.00,1.00 -+177.10,+00.00,01.00,000.00,1.00 -+178.00,+00.00,01.00,000.00,1.00 -+178.90,+00.00,01.00,000.00,1.00 -+179.80,+00.00,01.00,000.00,1.00 --179.30,+00.00,01.00,000.00,1.00 --178.40,+00.00,01.00,000.00,1.00 --177.50,+00.00,01.00,000.00,1.00 --176.60,+00.00,01.00,000.00,1.00 --175.70,+00.00,01.00,000.00,1.00 --174.80,+00.00,01.00,000.00,1.00 --173.90,+00.00,01.00,000.00,1.00 --173.00,+00.00,01.00,000.00,1.00 --172.10,+00.00,01.00,000.00,1.00 --171.20,+00.00,01.00,000.00,1.00 --170.30,+00.00,01.00,000.00,1.00 --169.40,+00.00,01.00,000.00,1.00 --168.50,+00.00,01.00,000.00,1.00 --167.60,+00.00,01.00,000.00,1.00 --166.70,+00.00,01.00,000.00,1.00 --165.80,+00.00,01.00,000.00,1.00 --164.90,+00.00,01.00,000.00,1.00 --164.00,+00.00,01.00,000.00,1.00 --163.10,+00.00,01.00,000.00,1.00 --162.20,+00.00,01.00,000.00,1.00 --161.30,+00.00,01.00,000.00,1.00 --160.40,+00.00,01.00,000.00,1.00 --159.50,+00.00,01.00,000.00,1.00 --158.60,+00.00,01.00,000.00,1.00 --157.70,+00.00,01.00,000.00,1.00 --156.80,+00.00,01.00,000.00,1.00 --155.90,+00.00,01.00,000.00,1.00 --155.00,+00.00,01.00,000.00,1.00 --154.10,+00.00,01.00,000.00,1.00 --153.20,+00.00,01.00,000.00,1.00 --152.30,+00.00,01.00,000.00,1.00 --151.40,+00.00,01.00,000.00,1.00 --150.50,+00.00,01.00,000.00,1.00 --149.60,+00.00,01.00,000.00,1.00 --148.70,+00.00,01.00,000.00,1.00 --147.80,+00.00,01.00,000.00,1.00 --146.90,+00.00,01.00,000.00,1.00 --146.00,+00.00,01.00,000.00,1.00 --145.10,+00.00,01.00,000.00,1.00 --144.20,+00.00,01.00,000.00,1.00 --143.30,+00.00,01.00,000.00,1.00 --142.40,+00.00,01.00,000.00,1.00 --141.50,+00.00,01.00,000.00,1.00 --140.60,+00.00,01.00,000.00,1.00 --139.70,+00.00,01.00,000.00,1.00 --138.80,+00.00,01.00,000.00,1.00 --137.90,+00.00,01.00,000.00,1.00 --137.00,+00.00,01.00,000.00,1.00 --136.10,+00.00,01.00,000.00,1.00 --135.20,+00.00,01.00,000.00,1.00 --134.30,+00.00,01.00,000.00,1.00 --133.40,+00.00,01.00,000.00,1.00 --132.50,+00.00,01.00,000.00,1.00 --131.60,+00.00,01.00,000.00,1.00 --130.70,+00.00,01.00,000.00,1.00 --129.80,+00.00,01.00,000.00,1.00 --128.90,+00.00,01.00,000.00,1.00 --128.00,+00.00,01.00,000.00,1.00 --127.10,+00.00,01.00,000.00,1.00 --126.20,+00.00,01.00,000.00,1.00 --125.30,+00.00,01.00,000.00,1.00 --124.40,+00.00,01.00,000.00,1.00 --123.50,+00.00,01.00,000.00,1.00 --122.60,+00.00,01.00,000.00,1.00 --121.70,+00.00,01.00,000.00,1.00 --120.80,+00.00,01.00,000.00,1.00 --119.90,+00.00,01.00,000.00,1.00 --119.00,+00.00,01.00,000.00,1.00 --118.10,+00.00,01.00,000.00,1.00 --117.20,+00.00,01.00,000.00,1.00 --116.30,+00.00,01.00,000.00,1.00 --115.40,+00.00,01.00,000.00,1.00 --114.50,+00.00,01.00,000.00,1.00 --113.60,+00.00,01.00,000.00,1.00 --112.70,+00.00,01.00,000.00,1.00 --111.80,+00.00,01.00,000.00,1.00 --110.90,+00.00,01.00,000.00,1.00 --110.00,+00.00,01.00,000.00,1.00 --109.10,+00.00,01.00,000.00,1.00 --108.20,+00.00,01.00,000.00,1.00 --107.30,+00.00,01.00,000.00,1.00 --106.40,+00.00,01.00,000.00,1.00 --105.50,+00.00,01.00,000.00,1.00 --104.60,+00.00,01.00,000.00,1.00 --103.70,+00.00,01.00,000.00,1.00 --102.80,+00.00,01.00,000.00,1.00 --101.90,+00.00,01.00,000.00,1.00 --101.00,+00.00,01.00,000.00,1.00 --100.10,+00.00,01.00,000.00,1.00 --099.20,+00.00,01.00,000.00,1.00 --098.30,+00.00,01.00,000.00,1.00 --097.40,+00.00,01.00,000.00,1.00 --096.50,+00.00,01.00,000.00,1.00 --095.60,+00.00,01.00,000.00,1.00 --094.70,+00.00,01.00,000.00,1.00 --093.80,+00.00,01.00,000.00,1.00 --092.90,+00.00,01.00,000.00,1.00 --092.00,+00.00,01.00,000.00,1.00 --091.10,+00.00,01.00,000.00,1.00 --090.20,+00.00,01.00,000.00,1.00 --089.30,+00.00,01.00,000.00,1.00 --088.40,+00.00,01.00,000.00,1.00 --087.50,+00.00,01.00,000.00,1.00 --086.60,+00.00,01.00,000.00,1.00 --085.70,+00.00,01.00,000.00,1.00 --084.80,+00.00,01.00,000.00,1.00 --083.90,+00.00,01.00,000.00,1.00 --083.00,+00.00,01.00,000.00,1.00 --082.10,+00.00,01.00,000.00,1.00 --081.20,+00.00,01.00,000.00,1.00 --080.30,+00.00,01.00,000.00,1.00 --079.40,+00.00,01.00,000.00,1.00 --078.50,+00.00,01.00,000.00,1.00 --077.60,+00.00,01.00,000.00,1.00 --076.70,+00.00,01.00,000.00,1.00 --075.80,+00.00,01.00,000.00,1.00 --074.90,+00.00,01.00,000.00,1.00 --074.00,+00.00,01.00,000.00,1.00 --073.10,+00.00,01.00,000.00,1.00 --072.20,+00.00,01.00,000.00,1.00 --071.30,+00.00,01.00,000.00,1.00 --070.40,+00.00,01.00,000.00,1.00 --069.50,+00.00,01.00,000.00,1.00 --068.60,+00.00,01.00,000.00,1.00 --067.70,+00.00,01.00,000.00,1.00 --066.80,+00.00,01.00,000.00,1.00 --065.90,+00.00,01.00,000.00,1.00 --065.00,+00.00,01.00,000.00,1.00 --064.10,+00.00,01.00,000.00,1.00 --063.20,+00.00,01.00,000.00,1.00 --062.30,+00.00,01.00,000.00,1.00 --061.40,+00.00,01.00,000.00,1.00 --060.50,+00.00,01.00,000.00,1.00 --059.60,+00.00,01.00,000.00,1.00 --058.70,+00.00,01.00,000.00,1.00 --057.80,+00.00,01.00,000.00,1.00 --056.90,+00.00,01.00,000.00,1.00 --056.00,+00.00,01.00,000.00,1.00 --055.10,+00.00,01.00,000.00,1.00 --054.20,+00.00,01.00,000.00,1.00 --053.30,+00.00,01.00,000.00,1.00 --052.40,+00.00,01.00,000.00,1.00 --051.50,+00.00,01.00,000.00,1.00 --050.60,+00.00,01.00,000.00,1.00 --049.70,+00.00,01.00,000.00,1.00 --048.80,+00.00,01.00,000.00,1.00 --047.90,+00.00,01.00,000.00,1.00 --047.00,+00.00,01.00,000.00,1.00 --046.10,+00.00,01.00,000.00,1.00 --045.20,+00.00,01.00,000.00,1.00 --044.30,+00.00,01.00,000.00,1.00 --043.40,+00.00,01.00,000.00,1.00 --042.50,+00.00,01.00,000.00,1.00 --041.60,+00.00,01.00,000.00,1.00 --040.70,+00.00,01.00,000.00,1.00 --039.80,+00.00,01.00,000.00,1.00 --038.90,+00.00,01.00,000.00,1.00 --038.00,+00.00,01.00,000.00,1.00 --037.10,+00.00,01.00,000.00,1.00 --036.20,+00.00,01.00,000.00,1.00 --035.30,+00.00,01.00,000.00,1.00 --034.40,+00.00,01.00,000.00,1.00 --033.50,+00.00,01.00,000.00,1.00 --032.60,+00.00,01.00,000.00,1.00 --031.70,+00.00,01.00,000.00,1.00 --030.80,+00.00,01.00,000.00,1.00 --029.90,+00.00,01.00,000.00,1.00 --029.00,+00.00,01.00,000.00,1.00 --028.10,+00.00,01.00,000.00,1.00 --027.20,+00.00,01.00,000.00,1.00 --026.30,+00.00,01.00,000.00,1.00 --025.40,+00.00,01.00,000.00,1.00 --024.50,+00.00,01.00,000.00,1.00 --023.60,+00.00,01.00,000.00,1.00 --022.70,+00.00,01.00,000.00,1.00 --021.80,+00.00,01.00,000.00,1.00 --020.90,+00.00,01.00,000.00,1.00 --020.00,+00.00,01.00,000.00,1.00 --019.10,+00.00,01.00,000.00,1.00 --018.20,+00.00,01.00,000.00,1.00 --017.30,+00.00,01.00,000.00,1.00 --016.40,+00.00,01.00,000.00,1.00 --015.50,+00.00,01.00,000.00,1.00 --014.60,+00.00,01.00,000.00,1.00 --013.70,+00.00,01.00,000.00,1.00 --012.80,+00.00,01.00,000.00,1.00 --011.90,+00.00,01.00,000.00,1.00 --011.00,+00.00,01.00,000.00,1.00 --010.10,+00.00,01.00,000.00,1.00 --009.20,+00.00,01.00,000.00,1.00 --008.30,+00.00,01.00,000.00,1.00 --007.40,+00.00,01.00,000.00,1.00 --006.50,+00.00,01.00,000.00,1.00 --005.60,+00.00,01.00,000.00,1.00 --004.70,+00.00,01.00,000.00,1.00 --003.80,+00.00,01.00,000.00,1.00 --002.90,+00.00,01.00,000.00,1.00 --002.00,+00.00,01.00,000.00,1.00 --001.10,+00.00,01.00,000.00,1.00 --000.20,+00.00,01.00,000.00,1.00 -+000.70,+00.00,01.00,000.00,1.00 -+001.60,+00.00,01.00,000.00,1.00 -+002.50,+00.00,01.00,000.00,1.00 -+003.40,+00.00,01.00,000.00,1.00 -+004.30,+00.00,01.00,000.00,1.00 -+005.20,+00.00,01.00,000.00,1.00 -+006.10,+00.00,01.00,000.00,1.00 -+007.00,+00.00,01.00,000.00,1.00 -+007.90,+00.00,01.00,000.00,1.00 -+008.80,+00.00,01.00,000.00,1.00 -+009.70,+00.00,01.00,000.00,1.00 -+010.60,+00.00,01.00,000.00,1.00 -+011.50,+00.00,01.00,000.00,1.00 -+012.40,+00.00,01.00,000.00,1.00 -+013.30,+00.00,01.00,000.00,1.00 -+014.20,+00.00,01.00,000.00,1.00 -+015.10,+00.00,01.00,000.00,1.00 -+016.00,+00.00,01.00,000.00,1.00 -+016.90,+00.00,01.00,000.00,1.00 -+017.80,+00.00,01.00,000.00,1.00 -+018.70,+00.00,01.00,000.00,1.00 -+019.60,+00.00,01.00,000.00,1.00 -+020.50,+00.00,01.00,000.00,1.00 -+021.40,+00.00,01.00,000.00,1.00 -+022.30,+00.00,01.00,000.00,1.00 -+023.20,+00.00,01.00,000.00,1.00 -+024.10,+00.00,01.00,000.00,1.00 -+025.00,+00.00,01.00,000.00,1.00 -+025.90,+00.00,01.00,000.00,1.00 -+026.80,+00.00,01.00,000.00,1.00 -+027.70,+00.00,01.00,000.00,1.00 -+028.60,+00.00,01.00,000.00,1.00 -+029.50,+00.00,01.00,000.00,1.00 -+030.40,+00.00,01.00,000.00,1.00 -+031.30,+00.00,01.00,000.00,1.00 -+032.20,+00.00,01.00,000.00,1.00 -+033.10,+00.00,01.00,000.00,1.00 -+034.00,+00.00,01.00,000.00,1.00 -+034.90,+00.00,01.00,000.00,1.00 -+035.80,+00.00,01.00,000.00,1.00 -+036.70,+00.00,01.00,000.00,1.00 -+037.60,+00.00,01.00,000.00,1.00 -+038.50,+00.00,01.00,000.00,1.00 -+039.40,+00.00,01.00,000.00,1.00 -+040.30,+00.00,01.00,000.00,1.00 -+041.20,+00.00,01.00,000.00,1.00 -+042.10,+00.00,01.00,000.00,1.00 -+043.00,+00.00,01.00,000.00,1.00 -+043.90,+00.00,01.00,000.00,1.00 -+044.80,+00.00,01.00,000.00,1.00 -+045.70,+00.00,01.00,000.00,1.00 -+046.60,+00.00,01.00,000.00,1.00 -+047.50,+00.00,01.00,000.00,1.00 -+048.40,+00.00,01.00,000.00,1.00 -+049.30,+00.00,01.00,000.00,1.00 -+050.20,+00.00,01.00,000.00,1.00 -+051.10,+00.00,01.00,000.00,1.00 -+052.00,+00.00,01.00,000.00,1.00 -+052.90,+00.00,01.00,000.00,1.00 -+053.80,+00.00,01.00,000.00,1.00 -+054.70,+00.00,01.00,000.00,1.00 -+055.60,+00.00,01.00,000.00,1.00 -+056.50,+00.00,01.00,000.00,1.00 -+057.40,+00.00,01.00,000.00,1.00 -+058.30,+00.00,01.00,000.00,1.00 -+059.20,+00.00,01.00,000.00,1.00 -+060.10,+00.00,01.00,000.00,1.00 -+061.00,+00.00,01.00,000.00,1.00 -+061.90,+00.00,01.00,000.00,1.00 -+062.80,+00.00,01.00,000.00,1.00 -+063.70,+00.00,01.00,000.00,1.00 -+064.60,+00.00,01.00,000.00,1.00 -+065.50,+00.00,01.00,000.00,1.00 -+066.40,+00.00,01.00,000.00,1.00 -+067.30,+00.00,01.00,000.00,1.00 -+068.20,+00.00,01.00,000.00,1.00 -+069.10,+00.00,01.00,000.00,1.00 -+070.00,+00.00,01.00,000.00,1.00 -+070.90,+00.00,01.00,000.00,1.00 -+071.80,+00.00,01.00,000.00,1.00 -+072.70,+00.00,01.00,000.00,1.00 -+073.60,+00.00,01.00,000.00,1.00 -+074.50,+00.00,01.00,000.00,1.00 -+075.40,+00.00,01.00,000.00,1.00 -+076.30,+00.00,01.00,000.00,1.00 -+077.20,+00.00,01.00,000.00,1.00 -+078.10,+00.00,01.00,000.00,1.00 -+079.00,+00.00,01.00,000.00,1.00 -+079.90,+00.00,01.00,000.00,1.00 -+080.80,+00.00,01.00,000.00,1.00 -+081.70,+00.00,01.00,000.00,1.00 -+082.60,+00.00,01.00,000.00,1.00 -+083.50,+00.00,01.00,000.00,1.00 -+084.40,+00.00,01.00,000.00,1.00 -+085.30,+00.00,01.00,000.00,1.00 -+086.20,+00.00,01.00,000.00,1.00 -+087.10,+00.00,01.00,000.00,1.00 -+088.00,+00.00,01.00,000.00,1.00 -+088.90,+00.00,01.00,000.00,1.00 -+089.80,+00.00,01.00,000.00,1.00 -+090.70,+00.00,01.00,000.00,1.00 -+091.60,+00.00,01.00,000.00,1.00 -+092.50,+00.00,01.00,000.00,1.00 -+093.40,+00.00,01.00,000.00,1.00 -+094.30,+00.00,01.00,000.00,1.00 -+095.20,+00.00,01.00,000.00,1.00 -+096.10,+00.00,01.00,000.00,1.00 -+097.00,+00.00,01.00,000.00,1.00 -+097.90,+00.00,01.00,000.00,1.00 -+098.80,+00.00,01.00,000.00,1.00 -+099.70,+00.00,01.00,000.00,1.00 -+100.60,+00.00,01.00,000.00,1.00 -+101.50,+00.00,01.00,000.00,1.00 -+102.40,+00.00,01.00,000.00,1.00 -+103.30,+00.00,01.00,000.00,1.00 -+104.20,+00.00,01.00,000.00,1.00 -+105.10,+00.00,01.00,000.00,1.00 -+106.00,+00.00,01.00,000.00,1.00 -+106.90,+00.00,01.00,000.00,1.00 -+107.80,+00.00,01.00,000.00,1.00 -+108.70,+00.00,01.00,000.00,1.00 -+109.60,+00.00,01.00,000.00,1.00 -+110.50,+00.00,01.00,000.00,1.00 -+111.40,+00.00,01.00,000.00,1.00 -+112.30,+00.00,01.00,000.00,1.00 -+113.20,+00.00,01.00,000.00,1.00 -+114.10,+00.00,01.00,000.00,1.00 -+115.00,+00.00,01.00,000.00,1.00 -+115.90,+00.00,01.00,000.00,1.00 -+116.80,+00.00,01.00,000.00,1.00 -+117.70,+00.00,01.00,000.00,1.00 -+118.60,+00.00,01.00,000.00,1.00 -+119.50,+00.00,01.00,000.00,1.00 -+120.40,+00.00,01.00,000.00,1.00 -+121.30,+00.00,01.00,000.00,1.00 -+122.20,+00.00,01.00,000.00,1.00 -+123.10,+00.00,01.00,000.00,1.00 -+124.00,+00.00,01.00,000.00,1.00 -+124.90,+00.00,01.00,000.00,1.00 -+125.80,+00.00,01.00,000.00,1.00 -+126.70,+00.00,01.00,000.00,1.00 -+127.60,+00.00,01.00,000.00,1.00 -+128.50,+00.00,01.00,000.00,1.00 -+129.40,+00.00,01.00,000.00,1.00 -+130.30,+00.00,01.00,000.00,1.00 -+131.20,+00.00,01.00,000.00,1.00 -+132.10,+00.00,01.00,000.00,1.00 -+133.00,+00.00,01.00,000.00,1.00 -+133.90,+00.00,01.00,000.00,1.00 -+134.80,+00.00,01.00,000.00,1.00 -+135.70,+00.00,01.00,000.00,1.00 -+136.60,+00.00,01.00,000.00,1.00 -+137.50,+00.00,01.00,000.00,1.00 -+138.40,+00.00,01.00,000.00,1.00 -+139.30,+00.00,01.00,000.00,1.00 -+140.20,+00.00,01.00,000.00,1.00 -+141.10,+00.00,01.00,000.00,1.00 -+142.00,+00.00,01.00,000.00,1.00 -+142.90,+00.00,01.00,000.00,1.00 -+143.80,+00.00,01.00,000.00,1.00 -+144.70,+00.00,01.00,000.00,1.00 -+145.60,+00.00,01.00,000.00,1.00 -+146.50,+00.00,01.00,000.00,1.00 -+147.40,+00.00,01.00,000.00,1.00 -+148.30,+00.00,01.00,000.00,1.00 -+149.20,+00.00,01.00,000.00,1.00 -+150.10,+00.00,01.00,000.00,1.00 -+151.00,+00.00,01.00,000.00,1.00 -+151.90,+00.00,01.00,000.00,1.00 -+152.80,+00.00,01.00,000.00,1.00 -+153.70,+00.00,01.00,000.00,1.00 -+154.60,+00.00,01.00,000.00,1.00 -+155.50,+00.00,01.00,000.00,1.00 -+156.40,+00.00,01.00,000.00,1.00 -+157.30,+00.00,01.00,000.00,1.00 -+158.20,+00.00,01.00,000.00,1.00 -+159.10,+00.00,01.00,000.00,1.00 diff --git a/scripts/td_object_renderer/object_renderer_standalone/Makefile b/scripts/td_object_renderer/object_renderer_standalone/Makefile deleted file mode 100644 index fea677f8d1..0000000000 --- a/scripts/td_object_renderer/object_renderer_standalone/Makefile +++ /dev/null @@ -1,180 +0,0 @@ -# GNU Makefile - -# Paths -SRC_LIBCOM = ../../../lib_com -SRC_LIBDEBUG = ../../../lib_debug -SRC_LIBDEC = ../../../lib_dec -SRC_LIBENC = ../../../lib_enc -SRC_LIBREND = ../../../lib_rend ../../../lib_rend/ivas_cldfb_trans_codec ../../../lib_rend/lc3plus_codec/ETSI_Release/LC3plus_ETSI_src_va15eb59632b_20230228/src/floating_point -SRC_LIBUTIL = ../../../lib_util -SRC_APP = ./object_renderer_standalone -BUILD = build -OBJDIR = obj - -SRC_DIRS = $(sort -u $(SRC_LIBCOM) $(SRC_LIBDEBUG) $(SRC_LIBDEC) $(SRC_LIBENC) $(SRC_LIBREND) $(SRC_LIBUTIL) $(SRC_APP)) - -# Name of CLI binaries -CLI_REN ?= renderer_standalone -LIB_LIBCOM ?= libivascom.a -LIB_LIBDEBUG ?= libivasdebug.a -LIB_LIBDEC ?= libivasdec.a -LIB_LIBENC ?= libivasenc.a -LIB_LIBREND ?= libivasrend.a -LIB_LIBUTIL ?= libivasutil.a - -# Default tool settings -CC ?= gcc -RM ?= rm -f -AR ?= ar - -# Detect system -UNAME_S := $(shell uname -s) - -# Switches for cross-platform builds (i.e. build 32 bit code on 64 bit platforms) -ifneq "$(TARGET_PLATFORM)" "" -ifeq ("$(TARGET_PLATFORM)", "$(findstring $(TARGET_PLATFORM), i386 i586 i686)") - CFLAGS += -m32 - LDFLAGS += -m32 -endif - -ifeq ("$(TARGET_PLATFORM)", "$(findstring $(TARGET_PLATFORM), x86_64)") - CFLAGS += -m64 - LDFLAGS += -m64 -endif -endif - -ifndef VERBOSE -QUIET_CC = @echo ' ' Compiling $<; -QUIET_LINK= @echo ' ' Linking $@; -QUIET_AR = @echo ' ' Archiving $@; -QUIET = @ -endif - -# C compiler flags -CFLAGS += -std=c99 -pedantic -Wcast-qual -Wall -W -Wextra -Wno-long-long \ - -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ - -Werror-implicit-function-declaration -Wno-unused-parameter \ - -Wno-unused-function -Wno-implicit-fallthrough - -# libs to link -LDLIBS += -lm - -# Clang sanitizer compiler options -CCCLANG = clang -ifeq "$(CLANG)" "1" -CC = $(CCCLANG) -CFLAGS += -fsanitize=memory -LDFLAGS += -fsanitize=memory -endif -ifeq "$(CLANG)" "2" -CC = $(CCCLANG) -CFLAGS += -fsanitize=address -LDFLAGS += -fsanitize=address -endif -ifeq "$(CLANG)" "3" -CC = $(CCCLANG) -CFLAGS += -fsanitize=undefined -LDFLAGS += -fsanitize=undefined -endif - -ifeq "$(RELEASE)" "1" -CFLAGS += -DRELEASE -OPTIM ?= 2 -endif - -ifneq "$(DEBUG)" "0" -CFLAGS += -g3 -LDFLAGS += -g3 -endif - -ifeq "$(GCOV)" "1" -CFLAGS += -fprofile-arcs -ftest-coverage -LDFLAGS += -fprofile-arcs -ftest-coverage -endif - -ifeq "$(STRIP)" "1" -CFLAGS += -fdata-sections -ffunction-sections -ifneq ($(UNAME_S),Darwin) -LDFLAGS += -Wl,-gc-sections -static -else -LDFLAGS += -Wl,-dead_strip -endif -endif - -OPTIM ?= 0 -CFLAGS += -O$(OPTIM) - -CFLAGS += $(foreach DIR,$(SRC_DIRS),-I$(DIR)) - -# Source file search paths -VPATH = $(SRC_DIRS) - -############################################################################### - -SRCS_LIBCOM = $(foreach DIR,$(SRC_LIBCOM),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c))) -SRCS_LIBDEBUG = $(foreach DIR,$(SRC_LIBDEBUG),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c))) -SRCS_LIBDEC = $(foreach DIR,$(SRC_LIBDEC),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c))) -SRCS_LIBENC = $(foreach DIR,$(SRC_LIBENC),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c))) -SRCS_LIBREND = $(foreach DIR,$(SRC_LIBREND),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c))) -SRCS_LIBUTIL = $(foreach DIR,$(SRC_LIBUTIL),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c))) - -OBJS_LIBCOM = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.o)) -OBJS_LIBDEBUG = $(addprefix $(OBJDIR)/,$(SRCS_LIBDEBUG:.c=.o)) -OBJS_LIBDEC = $(addprefix $(OBJDIR)/,$(SRCS_LIBDEC:.c=.o)) -OBJS_LIBENC = $(addprefix $(OBJDIR)/,$(SRCS_LIBENC:.c=.o)) -OBJS_LIBREND = $(addprefix $(OBJDIR)/,$(SRCS_LIBREND:.c=.o)) -OBJS_LIBUTIL = $(addprefix $(OBJDIR)/,$(SRCS_LIBUTIL:.c=.o)) -OBJS_REN = $(OBJDIR)/renderer_standalone.o - - -DEPS = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.P) $(SRCS_LIBDEBUG:.c=.P) $(SRCS_LIBDEC:.c=.P) \ - $(SRCS_LIBENC:.c=.P) $(SRCS_LIBUTIL:.c=.P)) - -############################################################################### - -.PHONY: all clean clean_all - -all: $(CLI_REN) - -$(OBJDIR): - $(QUIET)mkdir -p $(OBJDIR) - -$(LIB_LIBCOM): $(OBJS_LIBCOM) - $(QUIET_AR)$(AR) rcs $@ $^ - -$(LIB_LIBDEBUG): $(OBJS_LIBDEBUG) - $(QUIET_AR)$(AR) rcs $@ $^ - -$(LIB_LIBDEC): $(OBJS_LIBDEC) $(OBJS_LIBREND) - $(QUIET_AR)$(AR) rcs $@ $^ - -$(LIB_LIBENC): $(OBJS_LIBENC) - $(QUIET_AR)$(AR) rcs $@ $^ - -$(LIB_LIBREND): $(OBJS_LIBREND) - $(QUIET_AR)$(AR) rcs $@ $^ - -$(LIB_LIBUTIL): $(OBJS_LIBUTIL) - $(QUIET_AR)$(AR) rcs $@ $^ - -$(CLI_REN): $(LIB_LIBENC) $(LIB_LIBDEC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(OBJS_REN) - $(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_REN) -L. -livasdebug -livasutil -livasenc -livasdec -livascom $(LDLIBS) -o $(CLI_REN) - -libs: $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBREND) $(LIB_LIBUTIL) - -clean: - $(QUIET)$(RM) $(OBJS_LIBENC) $(OBJS_LIBDEC) $(OBJS_REN) $(DEPS) - $(QUIET)$(RM) $(DEPS:.P=.d) - $(QUIET)test ! -d $(OBJDIR) || rm -rf $(OBJDIR) - -clean_all: clean - $(QUIET)$(RM) $(CLI_REN) $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBUTIL) $(LIB_LIBREND) - -$(OBJDIR)/%.o : %.c | $(OBJDIR) - $(QUIET_CC)$(CC) $(CFLAGS) -c -MD -o $@ $< - @cp $(OBJDIR)/$*.d $(OBJDIR)/$*.P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(OBJDIR)/$*.d >> $(OBJDIR)/$*.P; \ - $(RM) $(OBJDIR)/$*.d - --include $(DEPS) diff --git a/scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone.sln b/scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone.sln deleted file mode 100644 index 72b9350406..0000000000 --- a/scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone.sln +++ /dev/null @@ -1,68 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.136 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_dec", "..\..\..\Workspace_msvc\lib_dec.vcxproj", "{E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_com", "..\..\..\Workspace_msvc\lib_com.vcxproj", "{39EC200D-7795-4FF8-B214-B24EDA5526AE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_rend", "..\..\..\Workspace_msvc\lib_rend.vcxproj", "{718DE063-A18B-BB72-9150-62B892E6FFA6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_util", "..\..\..\Workspace_msvc\lib_util.vcxproj", "{2FA8F384-0775-F3B7-F8C3-85209222FC70}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_debug", "..\..\..\Workspace_msvc\lib_debug.vcxproj", "{54509728-928B-44D9-A118-A6F92F08B34F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "object_renderer_standalone", "object_renderer_standalone.vcxproj", "{75AE3898-3FDF-4AE2-86A1-838D0E78545E}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - Unittests|Win32 = Unittests|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {75AE3898-3FDF-4AE2-86A1-838D0E78545E}.Debug|Win32.ActiveCfg = Debug|Win32 - {75AE3898-3FDF-4AE2-86A1-838D0E78545E}.Debug|Win32.Build.0 = Debug|Win32 - {75AE3898-3FDF-4AE2-86A1-838D0E78545E}.Release|Win32.ActiveCfg = Release|Win32 - {75AE3898-3FDF-4AE2-86A1-838D0E78545E}.Release|Win32.Build.0 = Release|Win32 - {75AE3898-3FDF-4AE2-86A1-838D0E78545E}.Unittests|Win32.ActiveCfg = Release|Win32 - {75AE3898-3FDF-4AE2-86A1-838D0E78545E}.Unittests|Win32.Build.0 = Release|Win32 - {2FA8F384-0775-F3B7-F8C3-85209222FC70}.Debug|Win32.ActiveCfg = Debug|Win32 - {2FA8F384-0775-F3B7-F8C3-85209222FC70}.Debug|Win32.Build.0 = Debug|Win32 - {2FA8F384-0775-F3B7-F8C3-85209222FC70}.Release|Win32.ActiveCfg = Release|Win32 - {2FA8F384-0775-F3B7-F8C3-85209222FC70}.Release|Win32.Build.0 = Release|Win32 - {2FA8F384-0775-F3B7-F8C3-85209222FC70}.Unittests|Win32.ActiveCfg = Unittests|Win32 - {2FA8F384-0775-F3B7-F8C3-85209222FC70}.Unittests|Win32.Build.0 = Unittests|Win32 - {E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}.Debug|Win32.ActiveCfg = Debug|Win32 - {E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}.Debug|Win32.Build.0 = Debug|Win32 - {E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}.Release|Win32.ActiveCfg = Release|Win32 - {E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}.Release|Win32.Build.0 = Release|Win32 - {E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}.Unittests|Win32.ActiveCfg = Unittests|Win32 - {E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}.Unittests|Win32.Build.0 = Unittests|Win32 - {39EC200D-7795-4FF8-B214-B24EDA5526AE}.Debug|Win32.ActiveCfg = Debug|Win32 - {39EC200D-7795-4FF8-B214-B24EDA5526AE}.Debug|Win32.Build.0 = Debug|Win32 - {39EC200D-7795-4FF8-B214-B24EDA5526AE}.Release|Win32.ActiveCfg = Release|Win32 - {39EC200D-7795-4FF8-B214-B24EDA5526AE}.Release|Win32.Build.0 = Release|Win32 - {39EC200D-7795-4FF8-B214-B24EDA5526AE}.Unittests|Win32.ActiveCfg = Unittests|Win32 - {39EC200D-7795-4FF8-B214-B24EDA5526AE}.Unittests|Win32.Build.0 = Unittests|Win32 - {54509728-928B-44D9-A118-A6F92F08B34F}.Debug|Win32.ActiveCfg = Debug|Win32 - {54509728-928B-44D9-A118-A6F92F08B34F}.Debug|Win32.Build.0 = Debug|Win32 - {54509728-928B-44D9-A118-A6F92F08B34F}.Release|Win32.ActiveCfg = Release|Win32 - {54509728-928B-44D9-A118-A6F92F08B34F}.Release|Win32.Build.0 = Release|Win32 - {54509728-928B-44D9-A118-A6F92F08B34F}.Unittests|Win32.ActiveCfg = Unittests|Win32 - {54509728-928B-44D9-A118-A6F92F08B34F}.Unittests|Win32.Build.0 = Unittests|Win32 - {718DE063-A18B-BB72-9150-62B892E6FFA6}.Debug|Win32.ActiveCfg = Debug|Win32 - {718DE063-A18B-BB72-9150-62B892E6FFA6}.Debug|Win32.Build.0 = Debug|Win32 - {718DE063-A18B-BB72-9150-62B892E6FFA6}.Release|Win32.ActiveCfg = Release|Win32 - {718DE063-A18B-BB72-9150-62B892E6FFA6}.Release|Win32.Build.0 = Release|Win32 - {718DE063-A18B-BB72-9150-62B892E6FFA6}.Unittests|Win32.ActiveCfg = Unittests|Win32 - {718DE063-A18B-BB72-9150-62B892E6FFA6}.Unittests|Win32.Build.0 = Unittests|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {16E75611-7E35-43B5-B2CA-01E9C9B952F1} - EndGlobalSection -EndGlobal diff --git a/scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone.vcxproj b/scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone.vcxproj deleted file mode 100644 index 925450bae2..0000000000 --- a/scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone.vcxproj +++ /dev/null @@ -1,121 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - 15.0 - {75AE3898-3FDF-4AE2-86A1-838D0E78545E} - objectrendererstandalone - 10.0.17763.0 - - - - Application - true - v141 - MultiByte - - - Application - false - v141 - true - MultiByte - - - - - - - - - - - - - - - .\ - .\Debug_Renderer_Standalone\ - renderer_standalone - false - - - .\ - .\Release_Renderer_Standalone\ - renderer_standalone - false - - - - Level4 - Disabled - true - false - ..\..\..\lib_enc;..\..\..\lib_dec;..\..\..\lib_com;..\..\..\lib_debug;..\..\..\lib_util;..\..\..\lib_rend;%(AdditionalIncludeDirectories) - OldStyle - false - _CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions);TDREND_HRTF_TABLE_METHODS - MultiThreadedDebug - .\Debug_Renderer_Standalone\renderer_standalone.pdb - - false - - - .\renderer_standalone.exe - .\Debug_Renderer_Standalone\renderer_standalone.pdb - Console - - - - - Level3 - MaxSpeed - true - true - true - true - ..\..\..\lib_enc;..\..\..\lib_dec;..\..\..\lib_com;..\..\..\lib_debug;..\..\..\lib_util;..\..\..\lib_rend;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions);OBJECT_RENDERER_EXTERNAL_METADATA - MultiThreaded - $(IntDir)renderer_standalone.pdb - - - true - true - .\renderer_standalone.exe - false - - - - - - - - {39ec200d-7795-4ff8-b214-b24eda5526ae} - - - {54509728-928b-44d9-a118-a6f92f08b34f} - - - {e822ddaf-0f5f-4cd0-a694-38ae69de74d3} - - - {718de063-a18b-bb72-9150-62b892e6ffa6} - - - {2fa8f384-0775-f3b7-f8c3-85209222fc70} - - - - - - \ No newline at end of file diff --git a/scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone.vcxproj.filters b/scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone.vcxproj.filters deleted file mode 100644 index 880c4e60a8..0000000000 --- a/scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - \ No newline at end of file diff --git a/scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone/renderer_standalone.c b/scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone/renderer_standalone.c deleted file mode 100644 index 948da8a425..0000000000 --- a/scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone/renderer_standalone.c +++ /dev/null @@ -1,646 +0,0 @@ -/****************************************************************************************************** - - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository. All Rights Reserved. - - This software is protected by copyright law and by international treaties. - The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository retain full ownership rights in their respective contributions in - the software. This notice grants no license of any kind, including but not limited to patent - license, nor is any license granted by implication, estoppel or otherwise. - - Contributors are required to enter into the IVAS codec Public Collaboration agreement before making - contributions. - - This software is provided "AS IS", without any express or implied warranties. The software is in the - development stage. It is intended exclusively for experts who have experience with such software and - solely for the purpose of inspection. All implied warranties of non-infringement, merchantability - and fitness for a particular purpose are hereby disclaimed and excluded. - - Any dispute, controversy or claim arising under or in relation to providing this software shall be - submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in - accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and - the United Nations Convention on Contracts on the International Sales of Goods. - -*******************************************************************************************************/ -#include -#include -#include - -#define _USE_MATH_DEFINES -#include - -#include "options.h" -#include "stdint.h" -#include "prot.h" -#include "ivas_prot.h" -#include "ivas_cnst.h" -#include "ivas_stat_dec.h" -#include "cnst.h" -#include "wmops.h" -#include "hrtf_file_reader.h" -#include "ivas_error.h" - -/*------------------------------------------------------------------------------------------* - * Constants - *------------------------------------------------------------------------------------------*/ - -#define META_LINE_LENGTH 200 /* max number of characters at one line of metadata input/output file */ -#define NUM_ISM_METADATA_PER_LINE 4 /* Number of ISM metadata per line in a metadata file */ - -/*---------------------------------------------------------------------* - * Local function prototypes - *---------------------------------------------------------------------*/ -static char *to_upper( char *str ); -static void usage_rend( void ); -static void readMetadata( FILE *file, ISM_METADATA_HANDLE hIsmMetaData ); - -static void ivas_binaural_add_LFE_local( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - int16_t output_frame, /* i : length of input frame */ - float output_f[][L_FRAME48k], /* i/o: synthesized core-coder transport channels/DirAC output */ - const int8_t render_lfe /* i : render lfe flag */ -); - -/*---------------------------------------------------------------------* - * usage_rend() - * - * Print the usage of the "renderer_standalone" program - *---------------------------------------------------------------------*/ - -static void usage_rend( void ) -{ - fprintf( stdout, "Usage: renderer_standalone.exe [Options] Channels Metadata Fs InputAudio OutputAudio\n\n" ); - - fprintf( stdout, "Mandatory parameters:\n" ); - fprintf( stdout, "---------------------\n" ); - fprintf( stdout, "Channels : Number of channels\n" ); - fprintf( stdout, "Metadata : Metadata files, number of files specified by Channels\n" ); - fprintf( stdout, "Fs : Sampling rate\n" ); - fprintf( stdout, "InputAudio : Audio to be rendered, interleaved Channels\n" ); - fprintf( stdout, "OutputAudio : Rendered output audio\n\n" ); - - fprintf( stdout, "Options:\n" ); - fprintf( stdout, "--------\n" ); - fprintf( stdout, "-T File : Head rotation specified by external trajectory File\n" ); - fprintf( stdout, "-hrtf File : HRTF filter file (if not specified: use default model from ROM)\n" ); - fprintf( stdout, "-mc Conf : Run renderer on multichannel input, where Conf is one of \n" ); - fprintf( stdout, " 5_1, 7_1, 5_1_2, 5_1_4 and 7_1_4. Note: In this mode the Channels\n" ); - fprintf( stdout, " and Metadata arguments are omitted.\n" ); - fprintf( stdout, "\n" ); - - exit( -1 ); -} - - -/*------------------------------------------------------------------------------------------* - * Global variables - *------------------------------------------------------------------------------------------*/ - -int32_t frame = 0; /* Counter of frames */ - - -/*------------------------------------------------------------------------------------------* - * Standalone Renderer program - * - * - *------------------------------------------------------------------------------------------*/ -int main( int argc, char *argv[] ) -{ - int16_t nFrameLength; - int16_t n, nS, nSamplesRead, i, j; -#ifndef FIX_ITD - int16_t offset; -#endif - - float *MixFrame; - float output[MAX_CICP_CHANNELS][L_FRAME48k]; - int16_t NumLdspks = 2; - int16_t *MixFrameWav; - int16_t *input_buff; - int16_t nChannels; - float tmp; - int32_t noClipping; - FILE *f_input; - FILE *f_output; - FILE *f_quat_traj; - float x, y, z, w; - FILE *f_metadata[MAX_NUM_OBJECTS]; - Decoder_Struct st_ivas_static; - Decoder_Struct *st_ivas = &st_ivas_static; - - MixFrame = count_malloc( 2 * L_FRAME48k * sizeof( float ) ); - MixFrameWav = count_malloc( 2 * L_FRAME48k * sizeof( int16_t ) ); - input_buff = count_malloc( MAX_CICP_CHANNELS * L_FRAME48k * sizeof( int16_t ) ); - nChannels = 0; - noClipping = 0; - - for ( i = 0; i < 2 * L_FRAME48k; i++ ) - { - MixFrame[i] = 0.0; - MixFrameWav[i] = 0; - } - for ( i = 0; i < MAX_NUM_OBJECTS; ++i ) - { - f_metadata[i] = NULL; - } - - - /*------------------------------------------------------------------------------------------* - * Struct initializations - *------------------------------------------------------------------------------------------*/ - st_ivas->hHrtfTD = NULL; - st_ivas->hRenderConfig = NULL; - st_ivas->hHeadTrackData = NULL; - st_ivas->ivas_format = ISM_FORMAT; - f_quat_traj = NULL; - if ( ( st_ivas->hDecoderConfig = (DECODER_CONFIG_HANDLE) count_malloc( sizeof( DECODER_CONFIG ) ) ) == NULL ) - { - return IVAS_ERR_FAILED_ALLOC; - } - st_ivas->hDecoderConfig->Opt_Headrotation = FALSE; - - /* ISm metadata handles */ - for ( n = 0; n < MAX_NUM_OBJECTS; n++ ) - { - st_ivas->hIsmMetaData[n] = NULL; - } - - /*------------------------------------------------------------------------------------------* - * Parse command line and initialize renderer - *------------------------------------------------------------------------------------------*/ - if ( ( argc ) < 5 ) - { - fprintf( stderr, "Not enough input arguments!\n\n" ); - usage_rend(); - } - i = 1; - /* Optional arguments */ - while ( argv[i][0] == '-' ) - { - if ( strcmp( to_upper( argv[i] ), "-HRTF" ) == 0 ) - { - i++; - ivas_HRTF_binary_open( &( st_ivas->hHrtfTD ) ); - i++; - } - else if ( strcmp( to_upper( argv[i] ), "-T" ) == 0 ) - { - i++; - f_quat_traj = fopen( argv[i], "r" ); - - if ( f_quat_traj == NULL ) - { - fprintf( stderr, "\nError: Unable to open head-rotation file %s \n\n", argv[i] ); - usage_rend(); - } - i++; - } - else if ( strcmp( to_upper( argv[i] ), "-MC" ) == 0 ) - { - st_ivas->ivas_format = MC_FORMAT; - st_ivas->mc_mode = MC_MODE_MCT; - i++; - if ( strcmp( to_upper( argv[i] ), "5_1" ) == 0 ) - { - st_ivas->transport_config = AUDIO_CONFIG_5_1; - nChannels = 6; - } - else if ( strcmp( to_upper( argv[i] ), "7_1" ) == 0 ) - { - st_ivas->transport_config = AUDIO_CONFIG_7_1; - nChannels = 8; - } - else if ( strcmp( to_upper( argv[i] ), "5_1_2" ) == 0 ) - { - st_ivas->transport_config = AUDIO_CONFIG_5_1_2; - nChannels = 8; - } - else if ( strcmp( to_upper( argv[i] ), "5_1_4" ) == 0 ) - { - st_ivas->transport_config = AUDIO_CONFIG_5_1_4; - nChannels = 10; - } - else if ( strcmp( to_upper( argv[i] ), "7_1_4" ) == 0 ) - { - st_ivas->transport_config = AUDIO_CONFIG_7_1_4; - nChannels = 12; - } - else - { - fprintf( stderr, "\nError: Unknown MC configuration %s \n\n", argv[i] ); - usage_rend(); - } - st_ivas->nchan_transport = nChannels; - st_ivas->hIntSetup.num_lfe = 1; - st_ivas->hIntSetup.nchan_out_woLFE = nChannels - 1; - st_ivas->hIntSetup.index_lfe[0] = 3; - i++; - } - else - { - fprintf( stderr, "Unknown option: %s\n\n", argv[i] ); - usage_rend(); - } - } - - if ( st_ivas->ivas_format == ISM_FORMAT ) - { - - if ( ( argc - i ) < 5 ) - { - fprintf( stderr, "Not enough input arguments!\n\n" ); - usage_rend(); - } - - /* Mandatory arguments */ - nChannels = (int16_t) atoi( argv[i] ); /* Number of channels */ - st_ivas->nSCE = nChannels; - st_ivas->nchan_transport = nChannels; - i++; - - if ( ( argc - i ) < ( 3 + nChannels ) ) - { - fprintf( stderr, "Not enough input arguments for %d channels!\n\n", nChannels ); - usage_rend(); - } - - /* Metadata files */ - for ( j = 0; j < nChannels; j++ ) - { - if ( ( f_metadata[j] = fopen( argv[i], "r" ) ) == NULL ) - { - fprintf( stderr, "\nError: Unable to open metadata file %s \n\n", argv[i] ); - exit( -1 ); - } - st_ivas->hIsmMetaData[j] = (ISM_METADATA_HANDLE) count_malloc( sizeof( ISM_METADATA_FRAME ) ); - i++; - } - } - - - /* Fs and 20ms frame length */ - st_ivas->hDecoderConfig->output_Fs = atoi( argv[i] ) * 1000; - nFrameLength = ( (int16_t) ( st_ivas->hDecoderConfig->output_Fs / 1000 ) ) * 20; /* 20 ms frame */ - i++; - - /* Input, n-channel audio */ - if ( ( f_input = fopen( argv[i], "rb" ) ) == NULL ) - { - fprintf( stderr, "Error: input file %s cannot be opened\n\n", argv[i] ); - exit( -1 ); - } - i++; - - /* Output rendered audio */ - if ( ( f_output = fopen( argv[i], "wb" ) ) == NULL ) - { - fprintf( stderr, "Error: output file %s cannot be opened\n\n", argv[i] ); - exit( -1 ); - } - i++; - - if ( i != argc ) - { - fprintf( stderr, "Too many arguments!\n\n" ); - usage_rend(); - } - - - if ( f_quat_traj != NULL ) - { - st_ivas->hDecoderConfig->Opt_Headrotation = 1; - if ( ( st_ivas->hHeadTrackData = (HEAD_TRACK_DATA_HANDLE) count_malloc( sizeof( HEAD_TRACK_DATA ) ) ) == NULL ) - { - fprintf( stderr, "Can not allocate memory for head-tracking\n" ); - exit( -1 ); - } - st_ivas->hDecoderConfig->Opt_Headrotation = TRUE; - } - else - { - st_ivas->hDecoderConfig->Opt_Headrotation = 0; - } - - /* Init limiter */ - st_ivas->hLimiter = ivas_limiter_open( NumLdspks, st_ivas->hDecoderConfig->output_Fs ); - st_ivas->hDecoderConfig->nchan_out = NumLdspks; - st_ivas->hLimiter->strong_saturation_count = 0; - st_ivas->hLimiter->gain = 1.f; - st_ivas->hLimiter->release_heuristic = 0.f; - - ivas_td_binaural_open( st_ivas ); - - int16_t nFrameCount = 0; - int16_t currFrameLength, currWindowLength; - - /*------------------------------------------------------------------------------------------* - * Main rendering loop - *------------------------------------------------------------------------------------------*/ - fprintf( stdout, "Rendering...\n" ); - while ( 1 ) - { - /* Read the next frame from the file */ - nSamplesRead = (int16_t) fread( input_buff, sizeof( int16_t ), nFrameLength * nChannels, f_input ); - if ( nSamplesRead <= 0 ) - { - if ( frame == 0 ) - { - fprintf( stderr, "Error: no frames processed." ); - } - break; - } - - if ( nSamplesRead % nChannels != 0 ) - { - fprintf( stderr, "Error: total number of entries in input audio was not a multiple of the number of channels.\n\n" ); - break; - } - - currWindowLength = nSamplesRead / nChannels; - if ( currWindowLength < nFrameLength ) - { - currFrameLength = currWindowLength; - } - else - { - currFrameLength = nFrameLength; - } - - - /* Renderer expects non-interleaved channels, so de-interleave here. */ - for ( nS = 0; nS < nChannels; nS++ ) - { - for ( n = 0; n < currFrameLength; n++ ) - { - output[nS][n] = input_buff[nChannels * n + nS]; - } -#ifdef FIX_ITD - /* Pad to full frame length */ - for ( ; n < nFrameLength; n++ ) - { - output[nS][n] = 0; - } -#endif - } -#ifdef FIX_ITD - currFrameLength = nFrameLength; -#endif - - if ( st_ivas->ivas_format == ISM_FORMAT ) - { - /* Read metadata */ - for ( j = 0; j < nChannels; j++ ) - { - readMetadata( f_metadata[j], st_ivas->hIsmMetaData[j] ); - } - } - else /* st_ivas->ivas_format == MC_FORMAT */ - { - ivas_binaural_add_LFE_local( st_ivas, currFrameLength, output, 1 ); - } - - /* Read headrotation */ - if ( f_quat_traj != NULL ) - { - for ( i = 0; i < 4; i++ ) /* MAX_PARAM_SPATIAL_SUBFRAMES = 4 */ - { - if ( 4 == fscanf( f_quat_traj, "%f,%f,%f,%f", &w, &x, &y, &z ) ) - { - st_ivas->hHeadTrackData->num_quaternions = -1; - - st_ivas->hHeadTrackData->Quaternions[i].w = w; - st_ivas->hHeadTrackData->Quaternions[i].x = x; - st_ivas->hHeadTrackData->Quaternions[i].y = y; - st_ivas->hHeadTrackData->Quaternions[i].z = z; - - st_ivas->hHeadTrackData->num_quaternions = 0; - } - else - { - if ( feof( f_quat_traj ) ) - { - rewind( f_quat_traj ); - i--; /* Rewind and re-read the value for i */ - } - else - { - fprintf( stderr, "Incorrect format in headrotation file! \n\n" ); - exit( -1 ); - } - } - } - } - - /* Renderer */ - ObjRenderIVASFrame( st_ivas, output, currFrameLength ); - - /* Write the rendered audio to file. */ - - /* Apply limiter */ - ivas_limiter_dec( st_ivas->hLimiter, output, st_ivas->hDecoderConfig->nchan_out, nFrameLength, FALSE ); - - -#ifndef FIX_ITD - /* Trim first frame to compensate for delay */ - if ( nFrameCount == 0 ) - { - offset = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / 200 ); /* 240 samples for 48kHz etc */ - } - else - { - offset = 0; - } -#endif - - /* For Wav: Interleave, convert to int16_t */ -#ifdef FIX_ITD - for ( n = 0; n < currFrameLength; n++ ) -#else - for ( n = 0; n < ( currFrameLength - offset ); n++ ) -#endif - { - for ( nS = 0; nS < NumLdspks; nS++ ) - { -#ifdef FIX_ITD - tmp = output[nS][n] + 0.5f * sign( output[nS][n] ); -#else - tmp = output[nS][n + offset] + 0.5f * sign( output[nS][n + offset] ); -#endif - if ( tmp > MAX16B_FLT ) - { - tmp = MAX16B_FLT; - noClipping++; - } - if ( tmp < MIN16B_FLT ) - { - tmp = MIN16B_FLT; - noClipping++; - } - MixFrameWav[n * NumLdspks + nS] = (int16_t) ( tmp ); - } - } -#ifdef FIX_ITD - fwrite( MixFrameWav, sizeof( int16_t ), ( currFrameLength ) * NumLdspks, f_output ); -#else - fwrite( MixFrameWav, sizeof( int16_t ), ( currFrameLength - offset ) * NumLdspks, f_output ); -#endif - - nFrameCount++; - - frame++; - - fprintf( stdout, "." ); - } - fprintf( stdout, "\n" ); - - - /*------------------------------------------------------------------------------------------* - * Close and deallocate memory - *------------------------------------------------------------------------------------------*/ - - fclose( f_input ); - fclose( f_output ); - - count_free( MixFrame ); - count_free( MixFrameWav ); - count_free( input_buff ); - - ivas_td_binaural_close( &st_ivas->hBinRendererTd ); - count_free( st_ivas->hDecoderConfig ); - st_ivas->hHrtfTD = NULL; - - /* ISM metadata handles */ - for ( n = 0; n < MAX_NUM_OBJECTS; n++ ) - { - if ( st_ivas->hIsmMetaData[n] != NULL ) - { - count_free( st_ivas->hIsmMetaData[n] ); - st_ivas->hIsmMetaData[n] = NULL; - } - } - - if ( st_ivas->hHeadTrackData != NULL ) - { - count_free( st_ivas->hHeadTrackData ); - fclose( f_quat_traj ); - } - - ivas_limiter_close( &st_ivas->hLimiter ); - -#ifdef RAM_COUNTING_TOOL - mem_count_summary( USE_DEFAULT ); -#endif - -#ifdef DEBUGGING - dbgclose(); -#endif - - fprintf( stdout, "Done rendering %d frames.\n", nFrameCount ); - if ( noClipping > 0 ) - { - fprintf( stderr, "*** Clipping on %d samples.\n", noClipping ); - } - /* system( "pause" ); */ - return 0; -} - -/*---------------------------------------------------------------------* - * to_upper() - * - * Capitalize all letters of a string. - * (normally to_upper() function would be used but it does not work in Unix) - *---------------------------------------------------------------------*/ -static char *to_upper( - char *str ) -{ - int16_t i; - char *p = str; - - i = 0; - while ( str[i] != 0 ) - { - if ( str[i] >= 'a' && str[i] <= 'z' ) - { - str[i] -= 0x20; - } - i++; - } - - return p; -} - -/*---------------------------------------------------------------------* - * readMetadata() - * - * Read one frame of metadata - *---------------------------------------------------------------------*/ -static void readMetadata( - FILE *file, - ISM_METADATA_HANDLE hIsmMetaData ) -{ - char char_buff[META_LINE_LENGTH]; - float meta_prm[NUM_ISM_METADATA_PER_LINE]; - char *char_ptr; - int16_t j; - - if ( fgets( char_buff, META_LINE_LENGTH, file ) == NULL ) - { - fprintf( stderr, "\n!!!Error: Early EOF met while reading ISM metadata input file. Exiting!!!\n\n" ); - exit( -1 ); - } - - j = 0; - char_ptr = strtok( char_buff, "," ); - meta_prm[j++] = (float) atof( char_ptr ); - while ( char_ptr != NULL && j < NUM_ISM_METADATA_PER_LINE ) - { - char_ptr = strtok( NULL, "," ); - meta_prm[j++] = (float) atof( char_ptr ); - } - - hIsmMetaData->azimuth = meta_prm[0]; - hIsmMetaData->elevation = meta_prm[1]; - - return; -} - -/*KLUDGE: Copied here instead of moving ivas_binaural_add_LFE to a separate file. */ -static void ivas_binaural_add_LFE_local( - Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ - int16_t output_frame, /* i : length of input frame */ - float output_f[][L_FRAME48k], /* i/o: synthesized core-coder transport channels/DirAC output */ - const int8_t render_lfe /* i : render lfe flag */ -) -{ - - if ( render_lfe ) - { - float gain; - int16_t ch, idx_lfe; - - gain = GAIN_LFE / st_ivas->hIntSetup.nchan_out_woLFE; - - /* copy lfe to all other channels */ - for ( idx_lfe = 0; idx_lfe < st_ivas->hIntSetup.num_lfe; idx_lfe++ ) - { - v_multc( output_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], gain, output_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_frame ); - - for ( ch = 0; ch < ( st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe ); ch++ ) - { - if ( st_ivas->hIntSetup.index_lfe[idx_lfe] != ch ) - { - v_add( output_f[ch], output_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_f[ch], output_frame ); - } - } - } - } - - return; -} diff --git a/scripts/td_object_renderer/td_object_renderer_readme.txt b/scripts/td_object_renderer/td_object_renderer_readme.txt deleted file mode 100644 index 92ae257b57..0000000000 --- a/scripts/td_object_renderer/td_object_renderer_readme.txt +++ /dev/null @@ -1,71 +0,0 @@ -/****************************************************************************************************** - - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository. All Rights Reserved. - - This software is protected by copyright law and by international treaties. - The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, - Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other - contributors to this repository retain full ownership rights in their respective contributions in - the software. This notice grants no license of any kind, including but not limited to patent - license, nor is any license granted by implication, estoppel or otherwise. - - Contributors are required to enter into the IVAS codec Public Collaboration agreement before making - contributions. - - This software is provided "AS IS", without any express or implied warranties. The software is in the - development stage. It is intended exclusively for experts who have experience with such software and - solely for the purpose of inspection. All implied warranties of non-infringement, merchantability - and fitness for a particular purpose are hereby disclaimed and excluded. - - Any dispute, controversy or claim arising under or in relation to providing this software shall be - submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in - accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and - the United Nations Convention on Contracts on the International Sales of Goods. - -*******************************************************************************************************/ - - -Time Domain binaural renderer, standalone program -------------------------------------------------- - -The TD binaural renderer is part of the IVAS decoder but can also be run as a standalone program to render unprocessed audio. -The renderer uses the same metadata format as the IVAS encoder and supports headtracking using a headtracking trajectory file -like the IVAS decoder. It may use the default HRTF model from table ROM or load an HRTF from file. - -To run the renderer in standalone mode, without encoding/decoding via the IVAS codec: -- build the renderer_standalone project (under scripts/td_object_renderer/object_renderer_standalone/) in Visual Studio, or -- use the Makefile (i.e. 'make' in scripts/td_object_renderer/object_renderer_standalone/). - - -Usage: renderer_standalone.exe [Options] Channels Metadata Fs InputAudio OutputAudio - -Mandatory parameters: ---------------------- -Channels : Number of channels -Metadata : Metadata files, number of files specified by Channels -Fs : Sampling rate -InputAudio : Audio to be rendered, interleaved Channels -OutputAudio : Rendered output audio - -Options: --------- --T File : Head rotation specified by external trajectory File --hrtf File : HRTF filter file (if not specified: use default model from ROM) --mc Conf : Run renderer on multichannel input, where Conf is one of - 5_1, 7_1, 5_1_2, 5_1_4 and 7_1_4. Note: In this mode the Channels - and Metadata arguments are omitted. - - - -Support for rendering using the table-format HRTFs is included by building (either the decoder or renderer_standalone) with the -switch TDREND_HRTF_TABLE_METHODS active. It is active by default in the standalone renderer. In that case HRTF files in table -format may also be provided, e.g.: - IVAS_dec.exe -hrtf hrfilter_table_48kHz.bin BINAURAL 48 encoded_1ch.ivs rendered.pcm -or - renderer_standalone.exe -hrtf hrfilter_table_48kHz.bin 1 scripts/td_object_renderer/metadata/csv/t01_ch1.csv 48 audio_1ch.pcm rendered.pcm diff --git a/scripts/testv/FEC_6pct2.bin b/scripts/testv/FEC_6pct2.bin new file mode 100644 index 0000000000..dcbaf95698 --- /dev/null +++ b/scripts/testv/FEC_6pct2.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe697a3a0c812eeff5f960c1842ae36868383338a7bbf90487ab102f0f18adcc +size 50000 diff --git a/scripts/testv/config_directivity.cfg b/scripts/testv/config_directivity.cfg new file mode 100644 index 0000000000..94807d688c --- /dev/null +++ b/scripts/testv/config_directivity.cfg @@ -0,0 +1,3 @@ +[general] +directivity = [0.0, 360.0, 0.2512]; + diff --git a/scripts/testv/headrot_case04_3000_q.csv b/scripts/testv/headrot_case04_3000_q.csv new file mode 100644 index 0000000000..9f90e9e38b --- /dev/null +++ b/scripts/testv/headrot_case04_3000_q.csv @@ -0,0 +1,3000 @@ +1.00,0.00,0.00,0.00,5.03,6.40,0.00 +1.00,-0.00,0.00,0.00,5.03,6.40,0.00 +1.00,-0.00,0.00,0.00,5.03,6.40,0.00 +1.00,-0.00,0.00,0.00,5.03,6.41,0.01 +1.00,-0.00,0.00,0.00,5.03,6.41,0.01 +1.00,-0.00,0.00,0.00,5.03,6.41,0.01 +1.00,-0.00,0.00,0.01,5.03,6.41,0.01 +1.00,-0.00,0.00,0.01,5.03,6.42,0.01 +1.00,-0.00,0.00,0.01,5.03,6.42,0.01 +1.00,-0.00,0.00,0.01,5.03,6.42,0.02 +1.00,-0.00,0.00,0.01,5.03,6.43,0.02 +1.00,-0.00,0.00,0.01,5.03,6.43,0.02 +1.00,-0.00,0.00,0.01,5.03,6.43,0.02 +1.00,-0.00,0.00,0.01,5.03,6.43,0.02 +1.00,-0.00,0.00,0.01,5.03,6.44,0.03 +1.00,-0.00,0.01,0.01,5.03,6.44,0.03 +1.00,-0.00,0.01,0.01,5.03,6.44,0.03 +1.00,-0.00,0.01,0.02,5.03,6.44,0.03 +1.00,-0.00,0.01,0.02,5.03,6.45,0.03 +1.00,-0.00,0.01,0.02,5.03,6.45,0.03 +1.00,-0.00,0.01,0.02,5.03,6.45,0.04 +1.00,-0.00,0.01,0.02,5.03,6.46,0.04 +1.00,-0.00,0.01,0.02,5.03,6.46,0.04 +1.00,-0.00,0.01,0.02,5.03,6.46,0.04 +1.00,-0.00,0.01,0.02,5.03,6.46,0.04 +1.00,-0.00,0.01,0.02,5.03,6.47,0.05 +1.00,-0.00,0.01,0.02,5.03,6.47,0.05 +1.00,-0.00,0.01,0.02,5.03,6.47,0.05 +1.00,-0.00,0.01,0.03,5.03,6.48,0.05 +1.00,-0.00,0.01,0.03,5.03,6.48,0.05 +1.00,-0.00,0.01,0.03,5.02,6.48,0.05 +1.00,-0.00,0.01,0.03,5.02,6.48,0.06 +1.00,-0.00,0.01,0.03,5.02,6.49,0.06 +1.00,-0.00,0.01,0.03,5.02,6.49,0.06 +1.00,-0.00,0.01,0.03,5.02,6.49,0.06 +1.00,-0.00,0.01,0.03,5.02,6.49,0.06 +1.00,-0.00,0.01,0.03,5.02,6.50,0.07 +1.00,-0.00,0.01,0.03,5.02,6.50,0.07 +1.00,-0.00,0.01,0.03,5.02,6.50,0.07 +1.00,-0.00,0.01,0.04,5.02,6.51,0.07 +1.00,-0.00,0.01,0.04,5.02,6.51,0.07 +1.00,-0.00,0.01,0.04,5.02,6.51,0.08 +1.00,-0.00,0.01,0.04,5.02,6.51,0.08 +1.00,-0.00,0.01,0.04,5.02,6.52,0.08 +1.00,-0.00,0.02,0.04,5.02,6.52,0.08 +1.00,-0.00,0.02,0.04,5.02,6.52,0.08 +1.00,-0.00,0.02,0.04,5.02,6.53,0.08 +1.00,-0.00,0.02,0.04,5.02,6.53,0.09 +1.00,-0.00,0.02,0.04,5.02,6.53,0.09 +1.00,-0.00,0.02,0.04,5.02,6.53,0.09 +1.00,-0.00,0.02,0.05,5.02,6.54,0.09 +1.00,-0.00,0.02,0.05,5.02,6.54,0.09 +1.00,-0.00,0.02,0.05,5.02,6.54,0.10 +1.00,-0.00,0.02,0.05,5.02,6.54,0.10 +1.00,-0.00,0.02,0.05,5.02,6.55,0.10 +1.00,-0.00,0.02,0.05,5.02,6.55,0.10 +1.00,-0.00,0.02,0.05,5.02,6.55,0.10 +1.00,-0.00,0.02,0.05,5.02,6.56,0.10 +1.00,-0.00,0.02,0.05,5.02,6.56,0.11 +1.00,-0.00,0.02,0.05,5.02,6.56,0.11 +1.00,-0.00,0.02,0.05,5.02,6.56,0.11 +1.00,-0.00,0.02,0.06,5.02,6.57,0.11 +1.00,-0.00,0.02,0.06,5.02,6.57,0.11 +1.00,-0.00,0.02,0.06,5.02,6.57,0.12 +1.00,-0.00,0.02,0.06,5.02,6.58,0.12 +1.00,-0.00,0.02,0.06,5.02,6.58,0.12 +1.00,-0.00,0.02,0.06,5.02,6.58,0.12 +1.00,-0.00,0.02,0.06,5.02,6.58,0.12 +1.00,-0.00,0.02,0.06,5.02,6.59,0.12 +1.00,-0.00,0.02,0.06,5.02,6.59,0.13 +1.00,-0.00,0.02,0.06,5.01,6.59,0.13 +1.00,-0.00,0.02,0.06,5.01,6.59,0.13 +1.00,-0.00,0.03,0.07,5.01,6.60,0.13 +1.00,-0.00,0.03,0.07,5.01,6.60,0.13 +1.00,-0.00,0.03,0.07,5.01,6.60,0.14 +1.00,-0.00,0.03,0.07,5.01,6.61,0.14 +1.00,-0.00,0.03,0.07,5.01,6.61,0.14 +1.00,-0.00,0.03,0.07,5.01,6.61,0.14 +1.00,-0.00,0.03,0.07,5.01,6.61,0.14 +1.00,-0.00,0.03,0.07,5.01,6.62,0.14 +1.00,-0.00,0.03,0.07,5.01,6.62,0.15 +1.00,-0.00,0.03,0.07,5.01,6.62,0.15 +1.00,-0.00,0.03,0.08,5.01,6.63,0.15 +1.00,-0.00,0.03,0.08,5.01,6.63,0.15 +1.00,-0.00,0.03,0.08,5.01,6.63,0.15 +1.00,-0.00,0.03,0.08,5.01,6.63,0.16 +1.00,-0.00,0.03,0.08,5.01,6.64,0.16 +1.00,-0.00,0.03,0.08,5.01,6.64,0.16 +1.00,-0.00,0.03,0.08,5.01,6.64,0.16 +1.00,-0.00,0.03,0.08,5.01,6.64,0.16 +1.00,-0.00,0.03,0.08,5.01,6.65,0.16 +1.00,-0.00,0.03,0.08,5.01,6.65,0.17 +1.00,-0.00,0.03,0.08,5.01,6.65,0.17 +1.00,-0.00,0.03,0.09,5.01,6.66,0.17 +1.00,-0.00,0.03,0.09,5.00,6.66,0.17 +1.00,-0.00,0.03,0.09,5.00,6.66,0.17 +1.00,-0.00,0.03,0.09,5.00,6.66,0.18 +1.00,-0.00,0.03,0.09,5.00,6.67,0.18 +1.00,-0.00,0.03,0.09,5.00,6.67,0.18 +1.00,-0.00,0.03,0.09,5.00,6.67,0.18 +1.00,-0.00,0.03,0.09,5.00,6.68,0.18 +1.00,-0.00,0.04,0.09,5.00,6.68,0.18 +1.00,-0.00,0.04,0.09,5.00,6.68,0.19 +0.99,-0.00,0.04,0.09,5.00,6.68,0.19 +0.99,-0.00,0.04,0.10,5.00,6.69,0.19 +0.99,-0.00,0.04,0.10,5.00,6.69,0.19 +0.99,-0.00,0.04,0.10,5.00,6.69,0.19 +0.99,-0.00,0.04,0.10,5.00,6.69,0.20 +0.99,-0.00,0.04,0.10,5.00,6.70,0.20 +0.99,-0.00,0.04,0.10,5.00,6.70,0.20 +0.99,-0.00,0.04,0.10,5.00,6.70,0.20 +0.99,-0.00,0.04,0.10,5.00,6.71,0.20 +0.99,-0.00,0.04,0.10,5.00,6.71,0.20 +0.99,-0.00,0.04,0.10,4.99,6.71,0.21 +0.99,-0.00,0.04,0.10,4.99,6.71,0.21 +0.99,-0.00,0.04,0.11,4.99,6.72,0.21 +0.99,-0.00,0.04,0.11,4.99,6.72,0.21 +0.99,-0.00,0.04,0.11,4.99,6.72,0.21 +0.99,-0.00,0.04,0.11,4.99,6.72,0.22 +0.99,-0.00,0.04,0.11,4.99,6.73,0.22 +0.99,-0.00,0.04,0.11,4.99,6.73,0.22 +0.99,-0.00,0.04,0.11,4.99,6.73,0.22 +0.99,-0.00,0.04,0.11,4.99,6.74,0.22 +0.99,-0.00,0.04,0.11,4.99,6.74,0.22 +0.99,-0.00,0.04,0.11,4.99,6.74,0.23 +0.99,-0.00,0.04,0.11,4.99,6.74,0.23 +0.99,-0.01,0.04,0.12,4.99,6.75,0.23 +0.99,-0.01,0.04,0.12,4.99,6.75,0.23 +0.99,-0.01,0.04,0.12,4.99,6.75,0.23 +0.99,-0.01,0.04,0.12,4.98,6.75,0.24 +0.99,-0.01,0.05,0.12,4.98,6.76,0.24 +0.99,-0.01,0.05,0.12,4.98,6.76,0.24 +0.99,-0.01,0.05,0.12,4.98,6.76,0.24 +0.99,-0.01,0.05,0.12,4.98,6.77,0.24 +0.99,-0.01,0.05,0.12,4.98,6.77,0.24 +0.99,-0.01,0.05,0.12,4.98,6.77,0.25 +0.99,-0.01,0.05,0.12,4.98,6.77,0.25 +0.99,-0.01,0.05,0.13,4.98,6.78,0.25 +0.99,-0.01,0.05,0.13,4.98,6.78,0.25 +0.99,-0.01,0.05,0.13,4.98,6.78,0.25 +0.99,-0.01,0.05,0.13,4.98,6.78,0.26 +0.99,-0.01,0.05,0.13,4.98,6.79,0.26 +0.99,-0.01,0.05,0.13,4.98,6.79,0.26 +0.99,-0.01,0.05,0.13,4.98,6.79,0.26 +0.99,-0.01,0.05,0.13,4.97,6.80,0.26 +0.99,-0.01,0.05,0.13,4.97,6.80,0.26 +0.99,-0.01,0.05,0.13,4.97,6.80,0.27 +0.99,-0.01,0.05,0.13,4.97,6.80,0.27 +0.99,-0.01,0.05,0.14,4.97,6.81,0.27 +0.99,-0.01,0.05,0.14,4.97,6.81,0.27 +0.99,-0.01,0.05,0.14,4.97,6.81,0.27 +0.99,-0.01,0.05,0.14,4.97,6.81,0.28 +0.99,-0.01,0.05,0.14,4.97,6.82,0.28 +0.99,-0.01,0.05,0.14,4.97,6.82,0.28 +0.99,-0.01,0.05,0.14,4.97,6.82,0.28 +0.99,-0.01,0.05,0.14,4.97,6.83,0.28 +0.99,-0.01,0.05,0.14,4.97,6.83,0.28 +0.99,-0.01,0.05,0.14,4.96,6.83,0.29 +0.99,-0.01,0.05,0.14,4.96,6.83,0.29 +0.99,-0.01,0.05,0.14,4.96,6.84,0.29 +0.99,-0.01,0.06,0.15,4.96,6.84,0.29 +0.99,-0.01,0.06,0.15,4.96,6.84,0.29 +0.99,-0.01,0.06,0.15,4.96,6.84,0.30 +0.99,-0.01,0.06,0.15,4.96,6.85,0.30 +0.99,-0.01,0.06,0.15,4.96,6.85,0.30 +0.99,-0.01,0.06,0.15,4.96,6.85,0.30 +0.99,-0.01,0.06,0.15,4.96,6.86,0.30 +0.99,-0.01,0.06,0.15,4.96,6.86,0.30 +0.99,-0.01,0.06,0.15,4.96,6.86,0.31 +0.99,-0.01,0.06,0.15,4.95,6.86,0.31 +0.99,-0.01,0.06,0.15,4.95,6.87,0.31 +0.99,-0.01,0.06,0.16,4.95,6.87,0.31 +0.99,-0.01,0.06,0.16,4.95,6.87,0.31 +0.99,-0.01,0.06,0.16,4.95,6.87,0.32 +0.99,-0.01,0.06,0.16,4.95,6.88,0.32 +0.99,-0.01,0.06,0.16,4.95,6.88,0.32 +0.99,-0.01,0.06,0.16,4.95,6.88,0.32 +0.98,-0.01,0.06,0.16,4.95,6.88,0.32 +0.98,-0.01,0.06,0.16,4.95,6.89,0.32 +0.98,-0.01,0.06,0.16,4.95,6.89,0.33 +0.98,-0.01,0.06,0.16,4.94,6.89,0.33 +0.98,-0.01,0.06,0.16,4.94,6.90,0.33 +0.98,-0.01,0.06,0.17,4.94,6.90,0.33 +0.98,-0.01,0.06,0.17,4.94,6.90,0.33 +0.98,-0.01,0.06,0.17,4.94,6.90,0.33 +0.98,-0.01,0.06,0.17,4.94,6.91,0.34 +0.98,-0.01,0.06,0.17,4.94,6.91,0.34 +0.98,-0.01,0.06,0.17,4.94,6.91,0.34 +0.98,-0.01,0.06,0.17,4.94,6.91,0.34 +0.98,-0.01,0.06,0.17,4.94,6.92,0.34 +0.98,-0.01,0.07,0.17,4.94,6.92,0.35 +0.98,-0.01,0.07,0.17,4.93,6.92,0.35 +0.98,-0.01,0.07,0.17,4.93,6.92,0.35 +0.98,-0.01,0.07,0.18,4.93,6.93,0.35 +0.98,-0.01,0.07,0.18,4.93,6.93,0.35 +0.98,-0.01,0.07,0.18,4.93,6.93,0.35 +0.98,-0.01,0.07,0.18,4.93,6.94,0.36 +0.98,-0.01,0.07,0.18,4.93,6.94,0.36 +0.98,-0.01,0.07,0.18,4.93,6.94,0.36 +0.98,-0.01,0.07,0.18,4.93,6.94,0.36 +0.98,-0.01,0.07,0.18,4.93,6.95,0.36 +0.98,-0.01,0.07,0.18,4.92,6.95,0.37 +0.98,-0.01,0.07,0.18,4.92,6.95,0.37 +0.98,-0.01,0.07,0.18,4.92,6.95,0.37 +0.98,-0.01,0.07,0.19,4.92,6.96,0.37 +0.98,-0.01,0.07,0.19,4.92,6.96,0.37 +0.98,-0.01,0.07,0.19,4.92,6.96,0.37 +0.98,-0.01,0.07,0.19,4.92,6.96,0.38 +0.98,-0.01,0.07,0.19,4.92,6.97,0.38 +0.98,-0.01,0.07,0.19,4.92,6.97,0.38 +0.98,-0.01,0.07,0.19,4.92,6.97,0.38 +0.98,-0.01,0.07,0.19,4.91,6.97,0.38 +0.98,-0.01,0.07,0.19,4.91,6.98,0.39 +0.98,-0.01,0.07,0.19,4.91,6.98,0.39 +0.98,-0.01,0.07,0.19,4.91,6.98,0.39 +0.98,-0.01,0.07,0.20,4.91,6.99,0.39 +0.98,-0.01,0.07,0.20,4.91,6.99,0.39 +0.98,-0.01,0.07,0.20,4.91,6.99,0.39 +0.98,-0.02,0.07,0.20,4.91,6.99,0.40 +0.98,-0.02,0.07,0.20,4.91,7.00,0.40 +0.98,-0.02,0.08,0.20,4.90,7.00,0.40 +0.98,-0.02,0.08,0.20,4.90,7.00,0.40 +0.98,-0.02,0.08,0.20,4.90,7.00,0.40 +0.98,-0.02,0.08,0.20,4.90,7.01,0.40 +0.98,-0.02,0.08,0.20,4.90,7.01,0.41 +0.98,-0.02,0.08,0.20,4.90,7.01,0.41 +0.98,-0.02,0.08,0.20,4.90,7.01,0.41 +0.98,-0.02,0.08,0.21,4.90,7.02,0.41 +0.98,-0.02,0.08,0.21,4.90,7.02,0.41 +0.97,-0.02,0.08,0.21,4.89,7.02,0.42 +0.97,-0.02,0.08,0.21,4.89,7.02,0.42 +0.97,-0.02,0.08,0.21,4.89,7.03,0.42 +0.97,-0.02,0.08,0.21,4.89,7.03,0.42 +0.97,-0.02,0.08,0.21,4.89,7.03,0.42 +0.97,-0.02,0.08,0.21,4.89,7.03,0.42 +0.97,-0.02,0.08,0.21,4.89,7.04,0.43 +0.97,-0.02,0.08,0.21,4.89,7.04,0.43 +0.97,-0.02,0.08,0.21,4.88,7.04,0.43 +0.97,-0.02,0.08,0.22,4.88,7.05,0.43 +0.97,-0.02,0.08,0.22,4.88,7.05,0.43 +0.97,-0.02,0.08,0.22,4.88,7.05,0.43 +0.97,-0.02,0.08,0.22,4.88,7.05,0.44 +0.97,-0.02,0.08,0.22,4.88,7.06,0.44 +0.97,-0.02,0.08,0.22,4.88,7.06,0.44 +0.97,-0.02,0.08,0.22,4.88,7.06,0.44 +0.97,-0.02,0.08,0.22,4.88,7.06,0.44 +0.97,-0.02,0.08,0.22,4.87,7.07,0.45 +0.97,-0.02,0.08,0.22,4.87,7.07,0.45 +0.97,-0.02,0.08,0.22,4.87,7.07,0.45 +0.97,-0.02,0.08,0.23,4.87,7.07,0.45 +0.97,-0.02,0.08,0.23,4.87,7.08,0.45 +0.97,-0.02,0.09,0.23,4.87,7.08,0.45 +0.97,-0.02,0.09,0.23,4.87,7.08,0.46 +0.97,-0.02,0.09,0.23,4.87,7.08,0.46 +0.97,-0.02,0.09,0.23,4.86,7.09,0.46 +0.97,-0.02,0.09,0.23,4.86,7.09,0.46 +0.97,-0.02,0.09,0.23,4.86,7.09,0.46 +0.97,-0.02,0.09,0.23,4.86,7.09,0.46 +0.97,-0.02,0.09,0.23,4.86,7.10,0.47 +0.97,-0.02,0.09,0.23,4.86,7.10,0.47 +0.97,-0.02,0.09,0.24,4.86,7.10,0.47 +0.97,-0.02,0.09,0.24,4.85,7.10,0.47 +0.97,-0.02,0.09,0.24,4.85,7.11,0.47 +0.97,-0.02,0.09,0.24,4.85,7.11,0.48 +0.97,-0.02,0.09,0.24,4.85,7.11,0.48 +0.97,-0.02,0.09,0.24,4.85,7.11,0.48 +0.97,-0.02,0.09,0.24,4.85,7.12,0.48 +0.97,-0.02,0.09,0.24,4.85,7.12,0.48 +0.97,-0.02,0.09,0.24,4.85,7.12,0.48 +0.97,-0.02,0.09,0.24,4.84,7.12,0.49 +0.97,-0.02,0.09,0.24,4.84,7.13,0.49 +0.96,-0.02,0.09,0.24,4.84,7.13,0.49 +0.96,-0.02,0.09,0.25,4.84,7.13,0.49 +0.96,-0.02,0.09,0.25,4.84,7.13,0.49 +0.96,-0.02,0.09,0.25,4.84,7.14,0.49 +0.96,-0.02,0.09,0.25,4.84,7.14,0.50 +0.96,-0.02,0.09,0.25,4.83,7.14,0.50 +0.96,-0.02,0.09,0.25,4.83,7.14,0.50 +0.96,-0.02,0.09,0.25,4.83,7.15,0.50 +0.96,-0.02,0.09,0.25,4.83,7.15,0.50 +0.96,-0.02,0.09,0.25,4.83,7.15,0.51 +0.96,-0.02,0.09,0.25,4.83,7.15,0.51 +0.96,-0.03,0.10,0.25,4.83,7.16,0.51 +0.96,-0.03,0.10,0.26,4.82,7.16,0.51 +0.96,-0.03,0.10,0.26,4.82,7.16,0.51 +0.96,-0.03,0.10,0.26,4.82,7.16,0.51 +0.96,-0.03,0.10,0.26,4.82,7.17,0.52 +0.96,-0.03,0.10,0.26,4.82,7.17,0.52 +0.96,-0.03,0.10,0.26,4.82,7.17,0.52 +0.96,-0.03,0.10,0.26,4.82,7.17,0.52 +0.96,-0.03,0.10,0.26,4.81,7.18,0.52 +0.96,-0.03,0.10,0.26,4.81,7.18,0.52 +0.96,-0.03,0.10,0.26,4.81,7.18,0.53 +0.96,-0.03,0.10,0.26,4.81,7.18,0.53 +0.96,-0.03,0.10,0.26,4.81,7.19,0.53 +0.96,-0.03,0.10,0.27,4.81,7.19,0.53 +0.96,-0.03,0.10,0.27,4.81,7.19,0.53 +0.96,-0.03,0.10,0.27,4.80,7.19,0.53 +0.96,-0.03,0.10,0.27,4.80,7.20,0.54 +0.96,-0.03,0.10,0.27,4.80,7.20,0.54 +0.96,-0.03,0.10,0.27,4.80,7.20,0.54 +0.96,-0.03,0.10,0.27,4.80,7.20,0.54 +0.96,-0.03,0.10,0.27,4.80,7.21,0.54 +0.96,-0.03,0.10,0.27,4.80,7.21,0.55 +0.96,-0.03,0.10,0.27,4.79,7.21,0.55 +0.96,-0.03,0.10,0.27,4.79,7.21,0.55 +0.96,-0.03,0.10,0.28,4.79,7.22,0.55 +0.96,-0.03,0.10,0.28,4.79,7.22,0.55 +0.95,-0.03,0.10,0.28,4.79,7.22,0.55 +0.95,-0.03,0.10,0.28,4.79,7.22,0.56 +0.95,-0.03,0.10,0.28,4.79,7.23,0.56 +0.95,-0.03,0.10,0.28,4.78,7.23,0.56 +0.95,-0.03,0.10,0.28,4.78,7.23,0.56 +0.95,-0.03,0.10,0.28,4.78,7.23,0.56 +0.95,-0.03,0.10,0.28,4.78,7.24,0.56 +0.95,-0.03,0.11,0.28,4.78,7.24,0.57 +0.95,-0.03,0.11,0.28,4.78,7.24,0.57 +0.95,-0.03,0.11,0.28,4.77,7.24,0.57 +0.95,-0.03,0.11,0.29,4.77,7.25,0.57 +0.95,-0.03,0.11,0.29,4.77,7.25,0.57 +0.95,-0.03,0.11,0.29,4.77,7.25,0.57 +0.95,-0.03,0.11,0.29,4.77,7.25,0.58 +0.95,-0.03,0.11,0.29,4.77,7.26,0.58 +0.95,-0.03,0.11,0.29,4.76,7.26,0.58 +0.95,-0.03,0.11,0.29,4.76,7.26,0.58 +0.95,-0.03,0.11,0.29,4.76,7.26,0.58 +0.95,-0.03,0.11,0.29,4.76,7.27,0.58 +0.95,-0.03,0.11,0.29,4.76,7.27,0.59 +0.95,-0.03,0.11,0.29,4.76,7.27,0.59 +0.95,-0.03,0.11,0.29,4.76,7.27,0.59 +0.95,-0.03,0.11,0.30,4.75,7.27,0.59 +0.95,-0.03,0.11,0.30,4.75,7.28,0.59 +0.95,-0.03,0.11,0.30,4.75,7.28,0.60 +0.95,-0.03,0.11,0.30,4.75,7.28,0.60 +0.95,-0.04,0.11,0.30,4.75,7.28,0.60 +0.95,-0.04,0.11,0.30,4.75,7.29,0.60 +0.95,-0.04,0.11,0.30,4.74,7.29,0.60 +0.95,-0.04,0.11,0.30,4.74,7.29,0.60 +0.95,-0.04,0.11,0.30,4.74,7.29,0.61 +0.95,-0.04,0.11,0.30,4.74,7.30,0.61 +0.95,-0.04,0.11,0.30,4.74,7.30,0.61 +0.94,-0.04,0.11,0.31,4.74,7.30,0.61 +0.94,-0.04,0.11,0.31,4.73,7.30,0.61 +0.94,-0.04,0.11,0.31,4.73,7.31,0.61 +0.94,-0.04,0.11,0.31,4.73,7.31,0.62 +0.94,-0.04,0.11,0.31,4.73,7.31,0.62 +0.94,-0.04,0.11,0.31,4.73,7.31,0.62 +0.94,-0.04,0.11,0.31,4.73,7.32,0.62 +0.94,-0.04,0.12,0.31,4.72,7.32,0.62 +0.94,-0.04,0.12,0.31,4.72,7.32,0.62 +0.94,-0.04,0.12,0.31,4.72,7.32,0.63 +0.94,-0.04,0.12,0.31,4.72,7.32,0.63 +0.94,-0.04,0.12,0.31,4.72,7.33,0.63 +0.94,-0.04,0.12,0.32,4.71,7.33,0.63 +0.94,-0.04,0.12,0.32,4.71,7.33,0.63 +0.94,-0.04,0.12,0.32,4.71,7.33,0.63 +0.94,-0.04,0.12,0.32,4.71,7.34,0.64 +0.94,-0.04,0.12,0.32,4.71,7.34,0.64 +0.94,-0.04,0.12,0.32,4.71,7.34,0.64 +0.94,-0.04,0.12,0.32,4.70,7.34,0.64 +0.94,-0.04,0.12,0.32,4.70,7.35,0.64 +0.94,-0.04,0.12,0.32,4.70,7.35,0.64 +0.94,-0.04,0.12,0.32,4.70,7.35,0.65 +0.94,-0.04,0.12,0.32,4.70,7.35,0.65 +0.94,-0.04,0.12,0.32,4.70,7.35,0.65 +0.94,-0.04,0.12,0.33,4.69,7.36,0.65 +0.94,-0.04,0.12,0.33,4.69,7.36,0.65 +0.94,-0.04,0.12,0.33,4.69,7.36,0.65 +0.94,-0.04,0.12,0.33,4.69,7.36,0.66 +0.94,-0.04,0.12,0.33,4.69,7.37,0.66 +0.94,-0.04,0.12,0.33,4.68,7.37,0.66 +0.93,-0.04,0.12,0.33,4.68,7.37,0.66 +0.93,-0.04,0.12,0.33,4.68,7.37,0.66 +0.93,-0.04,0.12,0.33,4.68,7.38,0.66 +0.93,-0.04,0.12,0.33,4.68,7.38,0.67 +0.93,-0.04,0.12,0.33,4.68,7.38,0.67 +0.93,-0.04,0.12,0.33,4.67,7.38,0.67 +0.93,-0.04,0.12,0.34,4.67,7.38,0.67 +0.93,-0.04,0.12,0.34,4.67,7.39,0.67 +0.93,-0.04,0.12,0.34,4.67,7.39,0.67 +0.93,-0.05,0.12,0.34,4.67,7.39,0.68 +0.93,-0.05,0.12,0.34,4.66,7.39,0.68 +0.93,-0.05,0.12,0.34,4.66,7.40,0.68 +0.93,-0.05,0.13,0.34,4.66,7.40,0.68 +0.93,-0.05,0.13,0.34,4.66,7.40,0.68 +0.93,-0.05,0.13,0.34,4.66,7.40,0.68 +0.93,-0.05,0.13,0.34,4.65,7.41,0.69 +0.93,-0.05,0.13,0.34,4.65,7.41,0.69 +0.93,-0.05,0.13,0.34,4.65,7.41,0.69 +0.93,-0.05,0.13,0.35,4.65,7.41,0.69 +0.93,-0.05,0.13,0.35,4.65,7.41,0.69 +0.93,-0.05,0.13,0.35,4.65,7.42,0.69 +0.93,-0.05,0.13,0.35,4.64,7.42,0.70 +0.93,-0.05,0.13,0.35,4.64,7.42,0.70 +0.93,-0.05,0.13,0.35,4.64,7.42,0.70 +0.93,-0.05,0.13,0.35,4.64,7.43,0.70 +0.93,-0.05,0.13,0.35,4.64,7.43,0.70 +0.93,-0.05,0.13,0.35,4.63,7.43,0.70 +0.93,-0.05,0.13,0.35,4.63,7.43,0.71 +0.92,-0.05,0.13,0.35,4.63,7.43,0.71 +0.92,-0.05,0.13,0.35,4.63,7.44,0.71 +0.92,-0.05,0.13,0.36,4.63,7.44,0.71 +0.92,-0.05,0.13,0.36,4.62,7.44,0.71 +0.92,-0.05,0.13,0.36,4.62,7.44,0.71 +0.92,-0.05,0.13,0.36,4.62,7.45,0.72 +0.92,-0.05,0.13,0.36,4.62,7.45,0.72 +0.92,-0.05,0.13,0.36,4.62,7.45,0.72 +0.92,-0.05,0.13,0.36,4.61,7.45,0.72 +0.92,-0.05,0.13,0.36,4.61,7.45,0.72 +0.92,-0.05,0.13,0.36,4.61,7.46,0.72 +0.92,-0.05,0.13,0.36,4.61,7.46,0.73 +0.92,-0.05,0.13,0.36,4.61,7.46,0.73 +0.92,-0.05,0.13,0.36,4.60,7.46,0.73 +0.92,-0.05,0.13,0.37,4.60,7.47,0.73 +0.92,-0.05,0.13,0.37,4.60,7.47,0.73 +0.92,-0.05,0.13,0.37,4.60,7.47,0.73 +0.92,-0.05,0.13,0.37,4.60,7.47,0.74 +0.92,-0.05,0.13,0.37,4.59,7.47,0.74 +0.92,-0.05,0.13,0.37,4.59,7.48,0.74 +0.92,-0.05,0.14,0.37,4.59,7.48,0.74 +0.92,-0.05,0.14,0.37,4.59,7.48,0.74 +0.92,-0.06,0.14,0.37,4.59,7.48,0.74 +0.92,-0.06,0.14,0.37,4.58,7.48,0.75 +0.92,-0.06,0.14,0.37,4.58,7.49,0.75 +0.92,-0.06,0.14,0.37,4.58,7.49,0.75 +0.91,-0.06,0.14,0.38,4.58,7.49,0.75 +0.91,-0.06,0.14,0.38,4.58,7.49,0.75 +0.91,-0.06,0.14,0.38,4.57,7.50,0.75 +0.91,-0.06,0.14,0.38,4.57,7.50,0.76 +0.91,-0.06,0.14,0.38,4.57,7.50,0.76 +0.91,-0.06,0.14,0.38,4.57,7.50,0.76 +0.91,-0.06,0.14,0.38,4.57,7.50,0.76 +0.91,-0.06,0.14,0.38,4.56,7.51,0.76 +0.91,-0.06,0.14,0.38,4.56,7.51,0.76 +0.91,-0.06,0.14,0.38,4.56,7.51,0.77 +0.91,-0.06,0.14,0.38,4.56,7.51,0.77 +0.91,-0.06,0.14,0.38,4.56,7.51,0.77 +0.91,-0.06,0.14,0.39,4.55,7.52,0.77 +0.91,-0.06,0.14,0.39,4.55,7.52,0.77 +0.91,-0.06,0.14,0.39,4.55,7.52,0.77 +0.91,-0.06,0.14,0.39,4.55,7.52,0.78 +0.91,-0.06,0.14,0.39,4.54,7.52,0.78 +0.91,-0.06,0.14,0.39,4.54,7.53,0.78 +0.91,-0.06,0.14,0.39,4.54,7.53,0.78 +0.91,-0.06,0.14,0.39,4.54,7.53,0.78 +0.91,-0.06,0.14,0.39,4.54,7.53,0.78 +0.91,-0.06,0.14,0.39,4.53,7.54,0.79 +0.91,-0.06,0.14,0.39,4.53,7.54,0.79 +0.91,-0.06,0.14,0.39,4.53,7.54,0.79 +0.91,-0.06,0.14,0.40,4.53,7.54,0.79 +0.90,-0.06,0.14,0.40,4.53,7.54,0.79 +0.90,-0.06,0.14,0.40,4.52,7.55,0.79 +0.90,-0.06,0.14,0.40,4.52,7.55,0.79 +0.90,-0.06,0.14,0.40,4.52,7.55,0.80 +0.90,-0.06,0.14,0.40,4.52,7.55,0.80 +0.90,-0.06,0.14,0.40,4.51,7.55,0.80 +0.90,-0.06,0.14,0.40,4.51,7.56,0.80 +0.90,-0.06,0.15,0.40,4.51,7.56,0.80 +0.90,-0.06,0.15,0.40,4.51,7.56,0.80 +0.90,-0.07,0.15,0.40,4.51,7.56,0.81 +0.90,-0.07,0.15,0.40,4.50,7.56,0.81 +0.90,-0.07,0.15,0.40,4.50,7.57,0.81 +0.90,-0.07,0.15,0.41,4.50,7.57,0.81 +0.90,-0.07,0.15,0.41,4.50,7.57,0.81 +0.90,-0.07,0.15,0.41,4.50,7.57,0.81 +0.90,-0.07,0.15,0.41,4.49,7.57,0.82 +0.90,-0.07,0.15,0.41,4.49,7.58,0.82 +0.90,-0.07,0.15,0.41,4.49,7.58,0.82 +0.90,-0.07,0.15,0.41,4.49,7.58,0.82 +0.90,-0.07,0.15,0.41,4.48,7.58,0.82 +0.90,-0.07,0.15,0.41,4.48,7.58,0.82 +0.90,-0.07,0.15,0.41,4.48,7.59,0.83 +0.90,-0.07,0.15,0.41,4.48,7.59,0.83 +0.90,-0.07,0.15,0.41,4.47,7.59,0.83 +0.89,-0.07,0.15,0.42,4.47,7.59,0.83 +0.89,-0.07,0.15,0.42,4.47,7.59,0.83 +0.89,-0.07,0.15,0.42,4.47,7.60,0.83 +0.89,-0.07,0.15,0.42,4.47,7.60,0.83 +0.89,-0.07,0.15,0.42,4.46,7.60,0.84 +0.89,-0.07,0.15,0.42,4.46,7.60,0.84 +0.89,-0.07,0.15,0.42,4.46,7.60,0.84 +0.89,-0.07,0.15,0.42,4.46,7.61,0.84 +0.89,-0.07,0.15,0.42,4.45,7.61,0.84 +0.89,-0.07,0.15,0.42,4.45,7.61,0.84 +0.89,-0.07,0.15,0.42,4.45,7.61,0.85 +0.89,-0.07,0.15,0.42,4.45,7.61,0.85 +0.89,-0.07,0.15,0.42,4.45,7.62,0.85 +0.89,-0.07,0.15,0.43,4.44,7.62,0.85 +0.89,-0.07,0.15,0.43,4.44,7.62,0.85 +0.89,-0.07,0.15,0.43,4.44,7.62,0.85 +0.89,-0.07,0.15,0.43,4.44,7.62,0.86 +0.89,-0.07,0.15,0.43,4.43,7.63,0.86 +0.89,-0.07,0.15,0.43,4.43,7.63,0.86 +0.89,-0.07,0.15,0.43,4.43,7.63,0.86 +0.89,-0.08,0.15,0.43,4.43,7.63,0.86 +0.89,-0.08,0.15,0.43,4.42,7.63,0.86 +0.89,-0.08,0.15,0.43,4.42,7.64,0.86 +0.88,-0.08,0.16,0.43,4.42,7.64,0.87 +0.88,-0.08,0.16,0.43,4.42,7.64,0.87 +0.88,-0.08,0.16,0.43,4.42,7.64,0.87 +0.88,-0.08,0.16,0.44,4.41,7.64,0.87 +0.88,-0.08,0.16,0.44,4.41,7.64,0.87 +0.88,-0.08,0.16,0.44,4.41,7.65,0.87 +0.88,-0.08,0.16,0.44,4.41,7.65,0.88 +0.88,-0.08,0.16,0.44,4.40,7.65,0.88 +0.88,-0.08,0.16,0.44,4.40,7.65,0.88 +0.88,-0.08,0.16,0.44,4.40,7.65,0.88 +0.88,-0.08,0.16,0.44,4.40,7.66,0.88 +0.88,-0.08,0.16,0.44,4.39,7.66,0.88 +0.88,-0.08,0.16,0.44,4.39,7.66,0.89 +0.88,-0.08,0.16,0.44,4.39,7.66,0.89 +0.88,-0.08,0.16,0.44,4.39,7.66,0.89 +0.88,-0.08,0.16,0.44,4.38,7.67,0.89 +0.88,-0.08,0.16,0.45,4.38,7.67,0.89 +0.88,-0.08,0.16,0.45,4.38,7.67,0.89 +0.88,-0.08,0.16,0.45,4.38,7.67,0.89 +0.88,-0.08,0.16,0.45,4.37,7.67,0.90 +0.88,-0.08,0.16,0.45,4.37,7.67,0.90 +0.87,-0.08,0.16,0.45,4.37,7.68,0.90 +0.87,-0.08,0.16,0.45,4.37,7.68,0.90 +0.87,-0.08,0.16,0.45,4.36,7.68,0.90 +0.87,-0.08,0.16,0.45,4.36,7.68,0.90 +0.87,-0.08,0.16,0.45,4.36,7.68,0.91 +0.87,-0.08,0.16,0.45,4.36,7.69,0.91 +0.87,-0.08,0.16,0.45,4.36,7.69,0.91 +0.87,-0.08,0.16,0.45,4.35,7.69,0.91 +0.87,-0.08,0.16,0.46,4.35,7.69,0.91 +0.87,-0.08,0.16,0.46,4.35,7.69,0.91 +0.87,-0.09,0.16,0.46,4.35,7.69,0.91 +0.87,-0.09,0.16,0.46,4.34,7.70,0.92 +0.87,-0.09,0.16,0.46,4.34,7.70,0.92 +0.87,-0.09,0.16,0.46,4.34,7.70,0.92 +0.87,-0.09,0.16,0.46,4.34,7.70,0.92 +0.87,-0.09,0.16,0.46,4.33,7.70,0.92 +0.87,-0.09,0.16,0.46,4.33,7.71,0.92 +0.87,-0.09,0.16,0.46,4.33,7.71,0.93 +0.87,-0.09,0.16,0.46,4.33,7.71,0.93 +0.87,-0.09,0.16,0.46,4.32,7.71,0.93 +0.87,-0.09,0.16,0.46,4.32,7.71,0.93 +0.86,-0.09,0.16,0.47,4.32,7.71,0.93 +0.86,-0.09,0.16,0.47,4.32,7.72,0.93 +0.86,-0.09,0.17,0.47,4.31,7.72,0.93 +0.86,-0.09,0.17,0.47,4.31,7.72,0.94 +0.86,-0.09,0.17,0.47,4.31,7.72,0.94 +0.86,-0.09,0.17,0.47,4.31,7.72,0.94 +0.86,-0.09,0.17,0.47,4.30,7.73,0.94 +0.86,-0.09,0.17,0.47,4.30,7.73,0.94 +0.86,-0.09,0.17,0.47,4.30,7.73,0.94 +0.86,-0.09,0.17,0.47,4.30,7.73,0.95 +0.86,-0.09,0.17,0.47,4.29,7.73,0.95 +0.86,-0.09,0.17,0.47,4.29,7.73,0.95 +0.86,-0.09,0.17,0.47,4.29,7.74,0.95 +0.86,-0.09,0.17,0.48,4.28,7.74,0.95 +0.86,-0.09,0.17,0.48,4.28,7.74,0.95 +0.86,-0.09,0.17,0.48,4.28,7.74,0.95 +0.86,-0.09,0.17,0.48,4.28,7.74,0.96 +0.86,-0.09,0.17,0.48,4.27,7.74,0.96 +0.86,-0.09,0.17,0.48,4.27,7.75,0.96 +0.86,-0.09,0.17,0.48,4.27,7.75,0.96 +0.86,-0.10,0.17,0.48,4.27,7.75,0.96 +0.85,-0.10,0.17,0.48,4.26,7.75,0.96 +0.85,-0.10,0.17,0.48,4.26,7.75,0.96 +0.85,-0.10,0.17,0.48,4.26,7.75,0.97 +0.85,-0.10,0.17,0.48,4.26,7.76,0.97 +0.85,-0.10,0.17,0.48,4.25,7.76,0.97 +0.85,-0.10,0.17,0.49,4.25,7.76,0.97 +0.85,-0.10,0.17,0.49,4.25,7.76,0.97 +0.85,-0.10,0.17,0.49,4.25,7.76,0.97 +0.85,-0.10,0.17,0.49,4.24,7.76,0.98 +0.85,-0.10,0.17,0.49,4.24,7.77,0.98 +0.85,-0.10,0.17,0.49,4.24,7.77,0.98 +0.85,-0.10,0.17,0.49,4.24,7.77,0.98 +0.85,-0.10,0.17,0.49,4.23,7.77,0.98 +0.85,-0.10,0.17,0.49,4.23,7.77,0.98 +0.85,-0.10,0.17,0.49,4.23,7.77,0.98 +0.85,-0.10,0.17,0.49,4.23,7.78,0.99 +0.85,-0.10,0.17,0.49,4.22,7.78,0.99 +0.85,-0.10,0.17,0.49,4.22,7.78,0.99 +0.85,-0.10,0.17,0.49,4.22,7.78,0.99 +0.84,-0.10,0.17,0.50,4.21,7.78,0.99 +0.84,-0.10,0.17,0.50,4.21,7.78,0.99 +0.84,-0.10,0.17,0.50,4.21,7.79,0.99 +0.84,-0.10,0.17,0.50,4.21,7.79,1.00 +0.84,-0.10,0.17,0.50,4.20,7.79,1.00 +0.84,-0.10,0.17,0.50,4.20,7.79,1.00 +0.84,-0.10,0.17,0.50,4.20,7.79,1.00 +0.84,-0.10,0.17,0.50,4.20,7.79,1.00 +0.84,-0.10,0.17,0.50,4.19,7.80,1.00 +0.84,-0.10,0.17,0.50,4.19,7.80,1.00 +0.84,-0.10,0.18,0.50,4.19,7.80,1.01 +0.84,-0.11,0.18,0.50,4.19,7.80,1.01 +0.84,-0.11,0.18,0.50,4.18,7.80,1.01 +0.84,-0.11,0.18,0.51,4.18,7.80,1.01 +0.84,-0.11,0.18,0.51,4.18,7.80,1.01 +0.84,-0.11,0.18,0.51,4.17,7.81,1.01 +0.84,-0.11,0.18,0.51,4.17,7.81,1.01 +0.84,-0.11,0.18,0.51,4.17,7.81,1.02 +0.84,-0.11,0.18,0.51,4.17,7.81,1.02 +0.84,-0.11,0.18,0.51,4.16,7.81,1.02 +0.83,-0.11,0.18,0.51,4.16,7.81,1.02 +0.83,-0.11,0.18,0.51,4.16,7.82,1.02 +0.83,-0.11,0.18,0.51,4.16,7.82,1.02 +0.83,-0.11,0.18,0.51,4.15,7.82,1.03 +0.83,-0.11,0.18,0.51,4.15,7.82,1.03 +0.83,-0.11,0.18,0.51,4.15,7.82,1.03 +0.83,-0.11,0.18,0.51,4.14,7.82,1.03 +0.83,-0.11,0.18,0.52,4.14,7.82,1.03 +0.83,-0.11,0.18,0.52,4.14,7.83,1.03 +0.83,-0.11,0.18,0.52,4.14,7.83,1.03 +0.83,-0.11,0.18,0.52,4.13,7.83,1.04 +0.83,-0.11,0.18,0.52,4.13,7.83,1.04 +0.83,-0.11,0.18,0.52,4.13,7.83,1.04 +0.83,-0.11,0.18,0.52,4.13,7.83,1.04 +0.83,-0.11,0.18,0.52,4.12,7.83,1.04 +0.83,-0.11,0.18,0.52,4.12,7.84,1.04 +0.83,-0.11,0.18,0.52,4.12,7.84,1.04 +0.83,-0.11,0.18,0.52,4.11,7.84,1.05 +0.82,-0.11,0.18,0.52,4.11,7.84,1.05 +0.82,-0.11,0.18,0.52,4.11,7.84,1.05 +0.82,-0.12,0.18,0.52,4.11,7.84,1.05 +0.82,-0.12,0.18,0.53,4.10,7.85,1.05 +0.82,-0.12,0.18,0.53,4.10,7.85,1.05 +0.82,-0.12,0.18,0.53,4.10,7.85,1.05 +0.82,-0.12,0.18,0.53,4.09,7.85,1.06 +0.82,-0.12,0.18,0.53,4.09,7.85,1.06 +0.82,-0.12,0.18,0.53,4.09,7.85,1.06 +0.82,-0.12,0.18,0.53,4.09,7.85,1.06 +0.82,-0.12,0.18,0.53,4.08,7.86,1.06 +0.82,-0.12,0.18,0.53,4.08,7.86,1.06 +0.82,-0.12,0.18,0.53,4.08,7.86,1.06 +0.82,-0.12,0.18,0.53,4.07,7.86,1.07 +0.82,-0.12,0.18,0.53,4.07,7.86,1.07 +0.82,-0.12,0.18,0.53,4.07,7.86,1.07 +0.82,-0.12,0.18,0.53,4.07,7.86,1.07 +0.82,-0.12,0.18,0.54,4.06,7.87,1.07 +0.82,-0.12,0.18,0.54,4.06,7.87,1.07 +0.81,-0.12,0.18,0.54,4.06,7.87,1.07 +0.81,-0.12,0.18,0.54,4.05,7.87,1.08 +0.81,-0.12,0.18,0.54,4.05,7.87,1.08 +0.81,-0.12,0.18,0.54,4.05,7.87,1.08 +0.81,-0.12,0.18,0.54,4.05,7.87,1.08 +0.81,-0.12,0.18,0.54,4.04,7.87,1.08 +0.81,-0.12,0.18,0.54,4.04,7.88,1.08 +0.81,-0.12,0.19,0.54,4.04,7.88,1.08 +0.81,-0.12,0.19,0.54,4.03,7.88,1.08 +0.81,-0.12,0.19,0.54,4.03,7.88,1.09 +0.81,-0.12,0.19,0.54,4.03,7.88,1.09 +0.81,-0.13,0.19,0.54,4.03,7.88,1.09 +0.81,-0.13,0.19,0.55,4.02,7.88,1.09 +0.81,-0.13,0.19,0.55,4.02,7.89,1.09 +0.81,-0.13,0.19,0.55,4.02,7.89,1.09 +0.81,-0.13,0.19,0.55,4.01,7.89,1.09 +0.81,-0.13,0.19,0.55,4.01,7.89,1.10 +0.80,-0.13,0.19,0.55,4.01,7.89,1.10 +0.80,-0.13,0.19,0.55,4.01,7.89,1.10 +0.80,-0.13,0.19,0.55,4.00,7.89,1.10 +0.80,-0.13,0.19,0.55,4.00,7.89,1.10 +0.80,-0.13,0.19,0.55,4.00,7.90,1.10 +0.80,-0.13,0.19,0.55,3.99,7.90,1.10 +0.80,-0.13,0.19,0.55,3.99,7.90,1.11 +0.80,-0.13,0.19,0.55,3.99,7.90,1.11 +0.80,-0.13,0.19,0.55,3.99,7.90,1.11 +0.80,-0.13,0.19,0.55,3.98,7.90,1.11 +0.80,-0.13,0.19,0.56,3.98,7.90,1.11 +0.80,-0.13,0.19,0.56,3.98,7.91,1.11 +0.80,-0.13,0.19,0.56,3.97,7.91,1.11 +0.80,-0.13,0.19,0.56,3.97,7.91,1.12 +0.80,-0.13,0.19,0.56,3.97,7.91,1.12 +0.80,-0.13,0.19,0.56,3.97,7.91,1.12 +0.80,-0.13,0.19,0.56,3.96,7.91,1.12 +0.80,-0.13,0.19,0.56,3.96,7.91,1.12 +0.79,-0.13,0.19,0.56,3.96,7.91,1.12 +0.79,-0.13,0.19,0.56,3.95,7.92,1.12 +0.79,-0.13,0.19,0.56,3.95,7.92,1.12 +0.79,-0.13,0.19,0.56,3.95,7.92,1.13 +0.79,-0.14,0.19,0.56,3.94,7.92,1.13 +0.79,-0.14,0.19,0.56,3.94,7.92,1.13 +0.79,-0.14,0.19,0.57,3.94,7.92,1.13 +0.79,-0.14,0.19,0.57,3.94,7.92,1.13 +0.79,-0.14,0.19,0.57,3.93,7.92,1.13 +0.79,-0.14,0.19,0.57,3.93,7.92,1.13 +0.79,-0.14,0.19,0.57,3.93,7.93,1.14 +0.79,-0.14,0.19,0.57,3.92,7.93,1.14 +0.79,-0.14,0.19,0.57,3.92,7.93,1.14 +0.79,-0.14,0.19,0.57,3.92,7.93,1.14 +0.79,-0.14,0.19,0.57,3.91,7.93,1.14 +0.79,-0.14,0.19,0.57,3.91,7.93,1.14 +0.79,-0.14,0.19,0.57,3.91,7.93,1.14 +0.78,-0.14,0.19,0.57,3.91,7.93,1.15 +0.78,-0.14,0.19,0.57,3.90,7.94,1.15 +0.78,-0.14,0.19,0.57,3.90,7.94,1.15 +0.78,-0.14,0.19,0.57,3.90,7.94,1.15 +0.78,-0.14,0.19,0.58,3.89,7.94,1.15 +0.78,-0.14,0.19,0.58,3.89,7.94,1.15 +0.78,-0.14,0.19,0.58,3.89,7.94,1.15 +0.78,-0.14,0.19,0.58,3.88,7.94,1.15 +0.78,-0.14,0.19,0.58,3.88,7.94,1.16 +0.78,-0.14,0.19,0.58,3.88,7.94,1.16 +0.78,-0.14,0.19,0.58,3.88,7.95,1.16 +0.78,-0.14,0.19,0.58,3.87,7.95,1.16 +0.78,-0.14,0.19,0.58,3.87,7.95,1.16 +0.78,-0.15,0.19,0.58,3.87,7.95,1.16 +0.78,-0.15,0.19,0.58,3.86,7.95,1.16 +0.78,-0.15,0.19,0.58,3.86,7.95,1.17 +0.78,-0.15,0.19,0.58,3.86,7.95,1.17 +0.77,-0.15,0.19,0.58,3.85,7.95,1.17 +0.77,-0.15,0.19,0.58,3.85,7.95,1.17 +0.77,-0.15,0.19,0.59,3.85,7.96,1.17 +0.77,-0.15,0.19,0.59,3.84,7.96,1.17 +0.77,-0.15,0.20,0.59,3.84,7.96,1.17 +0.77,-0.15,0.20,0.59,3.84,7.96,1.17 +0.77,-0.15,0.20,0.59,3.84,7.96,1.18 +0.77,-0.15,0.20,0.59,3.83,7.96,1.18 +0.77,-0.15,0.20,0.59,3.83,7.96,1.18 +0.77,-0.15,0.20,0.59,3.83,7.96,1.18 +0.77,-0.15,0.20,0.59,3.82,7.96,1.18 +0.77,-0.15,0.20,0.59,3.82,7.97,1.18 +0.77,-0.15,0.20,0.59,3.82,7.97,1.18 +0.77,-0.15,0.20,0.59,3.81,7.97,1.18 +0.77,-0.15,0.20,0.59,3.81,7.97,1.19 +0.77,-0.15,0.20,0.59,3.81,7.97,1.19 +0.76,-0.15,0.20,0.59,3.80,7.97,1.19 +0.76,-0.15,0.20,0.59,3.80,7.97,1.19 +0.76,-0.15,0.20,0.60,3.80,7.97,1.19 +0.76,-0.15,0.20,0.60,3.80,7.97,1.19 +0.76,-0.15,0.20,0.60,3.79,7.97,1.19 +0.76,-0.15,0.20,0.60,3.79,7.98,1.20 +0.76,-0.16,0.20,0.60,3.79,7.98,1.20 +0.76,-0.16,0.20,0.60,3.78,7.98,1.20 +0.76,-0.16,0.20,0.60,3.78,7.98,1.20 +0.76,-0.16,0.20,0.60,3.78,7.98,1.20 +0.76,-0.16,0.20,0.60,3.77,7.98,1.20 +0.76,-0.16,0.20,0.60,3.77,7.98,1.20 +0.76,-0.16,0.20,0.60,3.77,7.98,1.20 +0.76,-0.16,0.20,0.60,3.76,7.98,1.21 +0.76,-0.16,0.20,0.60,3.76,7.98,1.21 +0.76,-0.16,0.20,0.60,3.76,7.98,1.21 +0.75,-0.16,0.20,0.60,3.75,7.99,1.21 +0.75,-0.16,0.20,0.61,3.75,7.99,1.21 +0.75,-0.16,0.20,0.61,3.75,7.99,1.21 +0.75,-0.16,0.20,0.61,3.75,7.99,1.21 +0.75,-0.16,0.20,0.61,3.74,7.99,1.21 +0.75,-0.16,0.20,0.61,3.74,7.99,1.22 +0.75,-0.16,0.20,0.61,3.74,7.99,1.22 +0.75,-0.16,0.20,0.61,3.73,7.99,1.22 +0.75,-0.16,0.20,0.61,3.73,7.99,1.22 +0.75,-0.16,0.20,0.61,3.73,7.99,1.22 +0.75,-0.16,0.20,0.61,3.72,7.99,1.22 +0.75,-0.16,0.20,0.61,3.72,8.00,1.22 +0.75,-0.16,0.20,0.61,3.72,8.00,1.22 +0.75,-0.16,0.20,0.61,3.71,8.00,1.23 +0.75,-0.16,0.20,0.61,3.71,8.00,1.23 +0.75,-0.16,0.20,0.61,3.71,8.00,1.23 +0.74,-0.17,0.20,0.61,3.70,8.00,1.23 +0.74,-0.17,0.20,0.62,3.70,8.00,1.23 +0.74,-0.17,0.20,0.62,3.70,8.00,1.23 +0.74,-0.17,0.20,0.62,3.69,8.00,1.23 +0.74,-0.17,0.20,0.62,3.69,8.00,1.23 +0.74,-0.17,0.20,0.62,3.69,8.00,1.24 +0.74,-0.17,0.20,0.62,3.68,8.01,1.24 +0.74,-0.17,0.20,0.62,3.68,8.01,1.24 +0.74,-0.17,0.20,0.62,3.68,8.01,1.24 +0.74,-0.17,0.20,0.62,3.68,8.01,1.24 +0.74,-0.17,0.20,0.62,3.67,8.01,1.24 +0.74,-0.17,0.20,0.62,3.67,8.01,1.24 +0.74,-0.17,0.20,0.62,3.67,8.01,1.24 +0.74,-0.17,0.20,0.62,3.66,8.01,1.25 +0.74,-0.17,0.20,0.62,3.66,8.01,1.25 +0.74,-0.17,0.20,0.62,3.66,8.01,1.25 +0.73,-0.17,0.20,0.62,3.65,8.01,1.25 +0.73,-0.17,0.20,0.63,3.65,8.01,1.25 +0.73,-0.17,0.20,0.63,3.65,8.02,1.25 +0.73,-0.17,0.20,0.63,3.64,8.02,1.25 +0.73,-0.17,0.20,0.63,3.64,8.02,1.25 +0.73,-0.17,0.20,0.63,3.64,8.02,1.26 +0.73,-0.17,0.20,0.63,3.63,8.02,1.26 +0.73,-0.17,0.20,0.63,3.63,8.02,1.26 +0.73,-0.18,0.20,0.63,3.63,8.02,1.26 +0.73,-0.18,0.20,0.63,3.62,8.02,1.26 +0.73,-0.18,0.20,0.63,3.62,8.02,1.26 +0.73,-0.18,0.20,0.63,3.62,8.02,1.26 +0.73,-0.18,0.20,0.63,3.61,8.02,1.26 +0.73,-0.18,0.20,0.63,3.61,8.02,1.26 +0.73,-0.18,0.20,0.63,3.61,8.02,1.27 +0.72,-0.18,0.20,0.63,3.60,8.02,1.27 +0.72,-0.18,0.20,0.63,3.60,8.03,1.27 +0.72,-0.18,0.20,0.63,3.60,8.03,1.27 +0.72,-0.18,0.20,0.64,3.59,8.03,1.27 +0.72,-0.18,0.20,0.64,3.59,8.03,1.27 +0.72,-0.18,0.20,0.64,3.59,8.03,1.27 +0.72,-0.18,0.20,0.64,3.58,8.03,1.27 +0.72,-0.18,0.20,0.64,3.58,8.03,1.28 +0.72,-0.18,0.20,0.64,3.58,8.03,1.28 +0.72,-0.18,0.20,0.64,3.57,8.03,1.28 +0.72,-0.18,0.20,0.64,3.57,8.03,1.28 +0.72,-0.18,0.20,0.64,3.57,8.03,1.28 +0.72,-0.18,0.20,0.64,3.56,8.03,1.28 +0.72,-0.18,0.20,0.64,3.56,8.03,1.28 +0.72,-0.18,0.20,0.64,3.56,8.03,1.28 +0.72,-0.18,0.20,0.64,3.55,8.04,1.29 +0.71,-0.18,0.20,0.64,3.55,8.04,1.29 +0.71,-0.18,0.20,0.64,3.55,8.04,1.29 +0.71,-0.19,0.20,0.64,3.55,8.04,1.29 +0.71,-0.19,0.21,0.64,3.54,8.04,1.29 +0.71,-0.19,0.21,0.65,3.54,8.04,1.29 +0.71,-0.19,0.21,0.65,3.54,8.04,1.29 +0.71,-0.19,0.21,0.65,3.53,8.04,1.29 +0.71,-0.19,0.21,0.65,3.53,8.04,1.29 +0.71,-0.19,0.21,0.65,3.53,8.04,1.30 +0.71,-0.19,0.21,0.65,3.52,8.04,1.30 +0.71,-0.19,0.21,0.65,3.52,8.04,1.30 +0.71,-0.19,0.21,0.65,3.52,8.04,1.30 +0.71,-0.19,0.21,0.65,3.51,8.04,1.30 +0.71,-0.19,0.21,0.65,3.51,8.04,1.30 +0.71,-0.19,0.21,0.65,3.51,8.04,1.30 +0.70,-0.19,0.21,0.65,3.50,8.04,1.30 +0.70,-0.19,0.21,0.65,3.50,8.05,1.31 +0.70,-0.19,0.21,0.65,3.50,8.05,1.31 +0.70,-0.19,0.21,0.65,3.49,8.05,1.31 +0.70,-0.19,0.21,0.65,3.49,8.05,1.31 +0.70,-0.19,0.21,0.65,3.49,8.05,1.31 +0.70,-0.19,0.21,0.66,3.48,8.05,1.31 +0.70,-0.19,0.21,0.66,3.48,8.05,1.31 +0.70,-0.19,0.21,0.66,3.48,8.05,1.31 +0.70,-0.19,0.21,0.66,3.47,8.05,1.31 +0.70,-0.19,0.21,0.66,3.47,8.05,1.32 +0.70,-0.20,0.21,0.66,3.47,8.05,1.32 +0.70,-0.20,0.21,0.66,3.46,8.05,1.32 +0.70,-0.20,0.21,0.66,3.46,8.05,1.32 +0.69,-0.20,0.21,0.66,3.46,8.05,1.32 +0.69,-0.20,0.21,0.66,3.45,8.05,1.32 +0.69,-0.20,0.21,0.66,3.45,8.05,1.32 +0.69,-0.20,0.21,0.66,3.45,8.05,1.32 +0.69,-0.20,0.21,0.66,3.44,8.05,1.32 +0.69,-0.20,0.21,0.66,3.44,8.05,1.33 +0.69,-0.20,0.21,0.66,3.43,8.06,1.33 +0.69,-0.20,0.21,0.66,3.43,8.06,1.33 +0.69,-0.20,0.21,0.66,3.43,8.06,1.33 +0.69,-0.20,0.21,0.67,3.42,8.06,1.33 +0.69,-0.20,0.21,0.67,3.42,8.06,1.33 +0.69,-0.20,0.21,0.67,3.42,8.06,1.33 +0.69,-0.20,0.21,0.67,3.41,8.06,1.33 +0.69,-0.20,0.21,0.67,3.41,8.06,1.33 +0.69,-0.20,0.21,0.67,3.41,8.06,1.34 +0.68,-0.20,0.21,0.67,3.40,8.06,1.34 +0.68,-0.20,0.21,0.67,3.40,8.06,1.34 +0.68,-0.20,0.21,0.67,3.40,8.06,1.34 +0.68,-0.20,0.21,0.67,3.39,8.06,1.34 +0.68,-0.20,0.21,0.67,3.39,8.06,1.34 +0.68,-0.20,0.21,0.67,3.39,8.06,1.34 +0.68,-0.21,0.21,0.67,3.38,8.06,1.34 +0.68,-0.21,0.21,0.67,3.38,8.06,1.34 +0.68,-0.21,0.21,0.67,3.38,8.06,1.35 +0.68,-0.21,0.21,0.67,3.37,8.06,1.35 +0.68,-0.21,0.21,0.67,3.37,8.06,1.35 +0.68,-0.21,0.21,0.67,3.37,8.06,1.35 +0.68,-0.21,0.21,0.68,3.36,8.06,1.35 +0.68,-0.21,0.21,0.68,3.36,8.06,1.35 +0.68,-0.21,0.21,0.68,3.36,8.06,1.35 +0.67,-0.21,0.21,0.68,3.35,8.07,1.35 +0.67,-0.21,0.21,0.68,3.35,8.07,1.35 +0.67,-0.21,0.21,0.68,3.35,8.07,1.36 +0.67,-0.21,0.21,0.68,3.34,8.07,1.36 +0.67,-0.21,0.21,0.68,3.34,8.07,1.36 +0.67,-0.21,0.21,0.68,3.34,8.07,1.36 +0.67,-0.21,0.21,0.68,3.33,8.07,1.36 +0.67,-0.21,0.21,0.68,3.33,8.07,1.36 +0.67,-0.21,0.21,0.68,3.33,8.07,1.36 +0.67,-0.21,0.21,0.68,3.32,8.07,1.36 +0.67,-0.21,0.21,0.68,3.32,8.07,1.36 +0.67,-0.21,0.21,0.68,3.32,8.07,1.37 +0.67,-0.21,0.21,0.68,3.31,8.07,1.37 +0.67,-0.21,0.21,0.68,3.31,8.07,1.37 +0.66,-0.22,0.21,0.68,3.31,8.07,1.37 +0.66,-0.22,0.21,0.68,3.30,8.07,1.37 +0.66,-0.22,0.21,0.69,3.30,8.07,1.37 +0.66,-0.22,0.21,0.69,3.30,8.07,1.37 +0.66,-0.22,0.21,0.69,3.29,8.07,1.37 +0.66,-0.22,0.21,0.69,3.29,8.07,1.37 +0.66,-0.22,0.21,0.69,3.28,8.07,1.37 +0.66,-0.22,0.21,0.69,3.28,8.07,1.38 +0.66,-0.22,0.21,0.69,3.28,8.07,1.38 +0.66,-0.22,0.21,0.69,3.27,8.07,1.38 +0.66,-0.22,0.21,0.69,3.27,8.07,1.38 +0.66,-0.22,0.21,0.69,3.27,8.07,1.38 +0.66,-0.22,0.21,0.69,3.26,8.07,1.38 +0.66,-0.22,0.21,0.69,3.26,8.07,1.38 +0.65,-0.22,0.21,0.69,3.26,8.07,1.38 +0.65,-0.22,0.21,0.69,3.25,8.07,1.38 +0.65,-0.22,0.21,0.69,3.25,8.07,1.39 +0.65,-0.22,0.21,0.69,3.25,8.07,1.39 +0.65,-0.22,0.21,0.69,3.24,8.07,1.39 +0.65,-0.22,0.21,0.69,3.24,8.07,1.39 +0.65,-0.22,0.21,0.69,3.24,8.07,1.39 +0.65,-0.22,0.21,0.70,3.23,8.07,1.39 +0.65,-0.22,0.21,0.70,3.23,8.07,1.39 +0.65,-0.23,0.21,0.70,3.23,8.07,1.39 +0.65,-0.23,0.21,0.70,3.22,8.07,1.39 +0.65,-0.23,0.21,0.70,3.22,8.07,1.39 +0.65,-0.23,0.21,0.70,3.22,8.08,1.40 +0.65,-0.23,0.21,0.70,3.21,8.08,1.40 +0.64,-0.23,0.21,0.70,3.21,8.08,1.40 +0.64,-0.23,0.21,0.70,3.20,8.08,1.40 +0.64,-0.23,0.21,0.70,3.20,8.08,1.40 +0.64,-0.23,0.21,0.70,3.20,8.08,1.40 +0.64,-0.23,0.21,0.70,3.19,8.08,1.40 +0.64,-0.23,0.21,0.70,3.19,8.08,1.40 +0.64,-0.23,0.21,0.70,3.19,8.08,1.40 +0.64,-0.23,0.21,0.70,3.18,8.08,1.40 +0.64,-0.23,0.21,0.70,3.18,8.08,1.41 +0.64,-0.23,0.21,0.70,3.18,8.08,1.41 +0.64,-0.23,0.21,0.70,3.17,8.08,1.41 +0.64,-0.23,0.21,0.70,3.17,8.08,1.41 +0.64,-0.23,0.21,0.70,3.17,8.08,1.41 +0.64,-0.23,0.21,0.71,3.16,8.08,1.41 +0.63,-0.23,0.21,0.71,3.16,8.08,1.41 +0.63,-0.23,0.21,0.71,3.16,8.08,1.41 +0.63,-0.23,0.21,0.71,3.15,8.08,1.41 +0.63,-0.23,0.21,0.71,3.15,8.08,1.41 +0.63,-0.24,0.21,0.71,3.15,8.08,1.42 +0.63,-0.24,0.21,0.71,3.14,8.08,1.42 +0.63,-0.24,0.21,0.71,3.14,8.08,1.42 +0.63,-0.24,0.21,0.71,3.13,8.08,1.42 +0.63,-0.24,0.21,0.71,3.13,8.08,1.42 +0.63,-0.24,0.21,0.71,3.13,8.08,1.42 +0.63,-0.24,0.21,0.71,3.12,8.08,1.42 +0.63,-0.24,0.21,0.71,3.12,8.08,1.42 +0.63,-0.24,0.21,0.71,3.12,8.08,1.42 +0.63,-0.24,0.21,0.71,3.11,8.08,1.42 +0.62,-0.24,0.21,0.71,3.11,8.08,1.43 +0.62,-0.24,0.21,0.71,3.11,8.08,1.43 +0.62,-0.24,0.21,0.71,3.10,8.08,1.43 +0.62,-0.24,0.21,0.71,3.10,8.08,1.43 +0.62,-0.24,0.21,0.71,3.10,8.08,1.43 +0.62,-0.24,0.21,0.72,3.09,8.08,1.43 +0.62,-0.24,0.21,0.72,3.09,8.08,1.43 +0.62,-0.24,0.21,0.72,3.09,8.08,1.43 +0.62,-0.24,0.21,0.72,3.08,8.08,1.43 +0.62,-0.24,0.21,0.72,3.08,8.08,1.43 +0.62,-0.24,0.21,0.72,3.07,8.08,1.44 +0.62,-0.24,0.21,0.72,3.07,8.08,1.44 +0.62,-0.24,0.21,0.72,3.07,8.08,1.44 +0.62,-0.25,0.21,0.72,3.06,8.08,1.44 +0.61,-0.25,0.21,0.72,3.06,8.08,1.44 +0.61,-0.25,0.21,0.72,3.06,8.08,1.44 +0.61,-0.25,0.21,0.72,3.05,8.08,1.44 +0.61,-0.25,0.21,0.72,3.05,8.08,1.44 +0.61,-0.25,0.21,0.72,3.05,8.08,1.44 +0.61,-0.25,0.21,0.72,3.04,8.08,1.44 +0.61,-0.25,0.21,0.72,3.04,8.08,1.45 +0.61,-0.25,0.21,0.72,3.04,8.08,1.45 +0.61,-0.25,0.21,0.72,3.03,8.08,1.45 +0.61,-0.25,0.21,0.72,3.03,8.08,1.45 +0.61,-0.25,0.21,0.72,3.02,8.08,1.45 +0.61,-0.25,0.21,0.72,3.02,8.08,1.45 +0.61,-0.25,0.21,0.73,3.02,8.07,1.45 +0.60,-0.25,0.21,0.73,3.01,8.07,1.45 +0.60,-0.25,0.21,0.73,3.01,8.07,1.45 +0.60,-0.25,0.21,0.73,3.01,8.07,1.45 +0.60,-0.25,0.21,0.73,3.00,8.07,1.45 +0.60,-0.25,0.21,0.73,3.00,8.07,1.46 +0.60,-0.25,0.21,0.73,3.00,8.07,1.46 +0.60,-0.25,0.21,0.73,2.99,8.07,1.46 +0.60,-0.25,0.21,0.73,2.99,8.07,1.46 +0.60,-0.26,0.21,0.73,2.99,8.07,1.46 +0.60,-0.26,0.21,0.73,2.98,8.07,1.46 +0.60,-0.26,0.21,0.73,2.98,8.07,1.46 +0.60,-0.26,0.21,0.73,2.98,8.07,1.46 +0.60,-0.26,0.21,0.73,2.97,8.07,1.46 +0.60,-0.26,0.21,0.73,2.97,8.07,1.46 +0.59,-0.26,0.21,0.73,2.96,8.07,1.46 +0.59,-0.26,0.21,0.73,2.96,8.07,1.47 +0.59,-0.26,0.21,0.73,2.96,8.07,1.47 +0.59,-0.26,0.21,0.73,2.95,8.07,1.47 +0.59,-0.26,0.21,0.73,2.95,8.07,1.47 +0.59,-0.26,0.21,0.73,2.95,8.07,1.47 +0.59,-0.26,0.21,0.73,2.94,8.07,1.47 +0.59,-0.26,0.21,0.74,2.94,8.07,1.47 +0.59,-0.26,0.21,0.74,2.94,8.07,1.47 +0.59,-0.26,0.21,0.74,2.93,8.07,1.47 +0.59,-0.26,0.21,0.74,2.93,8.07,1.47 +0.59,-0.26,0.21,0.74,2.92,8.07,1.47 +0.59,-0.26,0.21,0.74,2.92,8.07,1.48 +0.58,-0.26,0.21,0.74,2.92,8.07,1.48 +0.58,-0.26,0.21,0.74,2.91,8.07,1.48 +0.58,-0.26,0.21,0.74,2.91,8.07,1.48 +0.58,-0.27,0.21,0.74,2.91,8.07,1.48 +0.58,-0.27,0.21,0.74,2.90,8.07,1.48 +0.58,-0.27,0.21,0.74,2.90,8.07,1.48 +0.58,-0.27,0.21,0.74,2.90,8.07,1.48 +0.58,-0.27,0.21,0.74,2.89,8.07,1.48 +0.58,-0.27,0.21,0.74,2.89,8.07,1.48 +0.58,-0.27,0.21,0.74,2.89,8.07,1.48 +0.58,-0.27,0.21,0.74,2.88,8.07,1.48 +0.58,-0.27,0.21,0.74,2.88,8.07,1.49 +0.58,-0.27,0.21,0.74,2.87,8.06,1.49 +0.58,-0.27,0.21,0.74,2.87,8.06,1.49 +0.57,-0.27,0.21,0.74,2.87,8.06,1.49 +0.57,-0.27,0.21,0.74,2.86,8.06,1.49 +0.57,-0.27,0.21,0.75,2.86,8.06,1.49 +0.57,-0.27,0.21,0.75,2.86,8.06,1.49 +0.57,-0.27,0.21,0.75,2.85,8.06,1.49 +0.57,-0.27,0.21,0.75,2.85,8.06,1.49 +0.57,-0.27,0.21,0.75,2.85,8.06,1.49 +0.57,-0.27,0.21,0.75,2.84,8.06,1.49 +0.57,-0.27,0.21,0.75,2.84,8.06,1.50 +0.57,-0.27,0.21,0.75,2.83,8.06,1.50 +0.57,-0.27,0.21,0.75,2.83,8.06,1.50 +0.57,-0.27,0.21,0.75,2.83,8.06,1.50 +0.57,-0.28,0.21,0.75,2.82,8.06,1.50 +0.56,-0.28,0.21,0.75,2.82,8.06,1.50 +0.56,-0.28,0.21,0.75,2.82,8.06,1.50 +0.56,-0.28,0.21,0.75,2.81,8.06,1.50 +0.56,-0.28,0.21,0.75,2.81,8.06,1.50 +0.56,-0.28,0.21,0.75,2.81,8.06,1.50 +0.56,-0.28,0.21,0.75,2.80,8.06,1.50 +0.56,-0.28,0.21,0.75,2.80,8.06,1.50 +0.56,-0.28,0.21,0.75,2.80,8.06,1.51 +0.56,-0.28,0.21,0.75,2.79,8.05,1.51 +0.56,-0.28,0.21,0.75,2.79,8.05,1.51 +0.56,-0.28,0.21,0.75,2.78,8.05,1.51 +0.56,-0.28,0.21,0.75,2.78,8.05,1.51 +0.56,-0.28,0.21,0.75,2.78,8.05,1.51 +0.55,-0.28,0.21,0.76,2.77,8.05,1.51 +0.55,-0.28,0.21,0.76,2.77,8.05,1.51 +0.55,-0.28,0.21,0.76,2.77,8.05,1.51 +0.55,-0.28,0.21,0.76,2.76,8.05,1.51 +0.55,-0.28,0.21,0.76,2.76,8.05,1.51 +0.55,-0.28,0.21,0.76,2.76,8.05,1.51 +0.55,-0.28,0.21,0.76,2.75,8.05,1.52 +0.55,-0.28,0.21,0.76,2.75,8.05,1.52 +0.55,-0.29,0.21,0.76,2.74,8.05,1.52 +0.55,-0.29,0.21,0.76,2.74,8.05,1.52 +0.55,-0.29,0.21,0.76,2.74,8.05,1.52 +0.55,-0.29,0.21,0.76,2.73,8.05,1.52 +0.55,-0.29,0.21,0.76,2.73,8.05,1.52 +0.54,-0.29,0.21,0.76,2.73,8.05,1.52 +0.54,-0.29,0.21,0.76,2.72,8.04,1.52 +0.54,-0.29,0.21,0.76,2.72,8.04,1.52 +0.54,-0.29,0.21,0.76,2.72,8.04,1.52 +0.54,-0.29,0.21,0.76,2.71,8.04,1.52 +0.54,-0.29,0.21,0.76,2.71,8.04,1.52 +0.54,-0.29,0.21,0.76,2.70,8.04,1.53 +0.54,-0.29,0.21,0.76,2.70,8.04,1.53 +0.54,-0.29,0.21,0.76,2.70,8.04,1.53 +0.54,-0.29,0.21,0.76,2.69,8.04,1.53 +0.54,-0.29,0.21,0.76,2.69,8.04,1.53 +0.54,-0.29,0.21,0.76,2.69,8.04,1.53 +0.54,-0.29,0.21,0.77,2.68,8.04,1.53 +0.53,-0.29,0.20,0.77,2.68,8.04,1.53 +0.53,-0.29,0.20,0.77,2.68,8.04,1.53 +0.53,-0.29,0.20,0.77,2.67,8.04,1.53 +0.53,-0.29,0.20,0.77,2.67,8.04,1.53 +0.53,-0.30,0.20,0.77,2.66,8.03,1.53 +0.53,-0.30,0.20,0.77,2.66,8.03,1.53 +0.53,-0.30,0.20,0.77,2.66,8.03,1.54 +0.53,-0.30,0.20,0.77,2.65,8.03,1.54 +0.53,-0.30,0.20,0.77,2.65,8.03,1.54 +0.53,-0.30,0.20,0.77,2.65,8.03,1.54 +0.53,-0.30,0.20,0.77,2.64,8.03,1.54 +0.53,-0.30,0.20,0.77,2.64,8.03,1.54 +0.53,-0.30,0.20,0.77,2.64,8.03,1.54 +0.52,-0.30,0.20,0.77,2.63,8.03,1.54 +0.52,-0.30,0.20,0.77,2.63,8.03,1.54 +0.52,-0.30,0.20,0.77,2.62,8.03,1.54 +0.52,-0.30,0.20,0.77,2.62,8.03,1.54 +0.52,-0.30,0.20,0.77,2.62,8.03,1.54 +0.52,-0.30,0.20,0.77,2.61,8.02,1.54 +0.52,-0.30,0.20,0.77,2.61,8.02,1.55 +0.52,-0.30,0.20,0.77,2.61,8.02,1.55 +0.52,-0.30,0.20,0.77,2.60,8.02,1.55 +0.52,-0.30,0.20,0.77,2.60,8.02,1.55 +0.52,-0.30,0.20,0.77,2.59,8.02,1.55 +0.52,-0.30,0.20,0.77,2.59,8.02,1.55 +0.52,-0.30,0.20,0.77,2.59,8.02,1.55 +0.51,-0.31,0.20,0.78,2.58,8.02,1.55 +0.51,-0.31,0.20,0.78,2.58,8.02,1.55 +0.51,-0.31,0.20,0.78,2.58,8.02,1.55 +0.51,-0.31,0.20,0.78,2.57,8.02,1.55 +0.51,-0.31,0.20,0.78,2.57,8.01,1.55 +0.51,-0.31,0.20,0.78,2.57,8.01,1.55 +0.51,-0.31,0.20,0.78,2.56,8.01,1.55 +0.51,-0.31,0.20,0.78,2.56,8.01,1.56 +0.51,-0.31,0.20,0.78,2.55,8.01,1.56 +0.51,-0.31,0.20,0.78,2.55,8.01,1.56 +0.51,-0.31,0.20,0.78,2.55,8.01,1.56 +0.51,-0.31,0.20,0.78,2.54,8.01,1.56 +0.50,-0.31,0.20,0.78,2.54,8.01,1.56 +0.50,-0.31,0.20,0.78,2.54,8.01,1.56 +0.50,-0.31,0.20,0.78,2.53,8.01,1.56 +0.50,-0.31,0.20,0.78,2.53,8.01,1.56 +0.50,-0.31,0.20,0.78,2.53,8.00,1.56 +0.50,-0.31,0.20,0.78,2.52,8.00,1.56 +0.50,-0.31,0.20,0.78,2.52,8.00,1.56 +0.50,-0.31,0.20,0.78,2.51,8.00,1.56 +0.50,-0.31,0.20,0.78,2.51,8.00,1.56 +0.50,-0.31,0.20,0.78,2.51,8.00,1.57 +0.50,-0.32,0.20,0.78,2.50,8.00,1.57 +0.50,-0.32,0.20,0.78,2.50,8.00,1.57 +0.50,-0.32,0.20,0.78,2.50,8.00,1.57 +0.49,-0.32,0.20,0.78,2.49,8.00,1.57 +0.49,-0.32,0.20,0.78,2.49,8.00,1.57 +0.49,-0.32,0.20,0.78,2.49,7.99,1.57 +0.49,-0.32,0.20,0.79,2.48,7.99,1.57 +0.49,-0.32,0.20,0.79,2.48,7.99,1.57 +0.49,-0.32,0.20,0.79,2.47,7.99,1.57 +0.49,-0.32,0.20,0.79,2.47,7.99,1.57 +0.49,-0.32,0.20,0.79,2.47,7.99,1.57 +0.49,-0.32,0.20,0.79,2.46,7.99,1.57 +0.49,-0.32,0.20,0.79,2.46,7.99,1.57 +0.49,-0.32,0.20,0.79,2.46,7.99,1.58 +0.49,-0.32,0.20,0.79,2.45,7.99,1.58 +0.49,-0.32,0.20,0.79,2.45,7.98,1.58 +0.48,-0.32,0.20,0.79,2.45,7.98,1.58 +0.48,-0.32,0.20,0.79,2.44,7.98,1.58 +0.48,-0.32,0.20,0.79,2.44,7.98,1.58 +0.48,-0.32,0.20,0.79,2.43,7.98,1.58 +0.48,-0.32,0.20,0.79,2.43,7.98,1.58 +0.48,-0.33,0.20,0.79,2.43,7.98,1.58 +0.48,-0.33,0.20,0.79,2.42,7.98,1.58 +0.48,-0.33,0.20,0.79,2.42,7.98,1.58 +0.48,-0.33,0.20,0.79,2.42,7.98,1.58 +0.48,-0.33,0.20,0.79,2.41,7.97,1.58 +0.48,-0.33,0.20,0.79,2.41,7.97,1.58 +0.48,-0.33,0.20,0.79,2.40,7.97,1.58 +0.47,-0.33,0.20,0.79,2.40,7.97,1.58 +0.47,-0.33,0.20,0.79,2.40,7.97,1.59 +0.47,-0.33,0.20,0.79,2.39,7.97,1.59 +0.47,-0.33,0.20,0.79,2.39,7.97,1.59 +0.47,-0.33,0.20,0.79,2.39,7.97,1.59 +0.47,-0.33,0.20,0.79,2.38,7.97,1.59 +0.47,-0.33,0.20,0.79,2.38,7.96,1.59 +0.47,-0.33,0.20,0.79,2.38,7.96,1.59 +0.47,-0.33,0.20,0.79,2.37,7.96,1.59 +0.47,-0.33,0.20,0.80,2.37,7.96,1.59 +0.47,-0.33,0.20,0.80,2.36,7.96,1.59 +0.47,-0.33,0.20,0.80,2.36,7.96,1.59 +0.47,-0.33,0.20,0.80,2.36,7.96,1.59 +0.46,-0.33,0.19,0.80,2.35,7.96,1.59 +0.46,-0.33,0.19,0.80,2.35,7.96,1.59 +0.46,-0.34,0.19,0.80,2.35,7.95,1.59 +0.46,-0.34,0.19,0.80,2.34,7.95,1.59 +0.46,-0.34,0.19,0.80,2.34,7.95,1.60 +0.46,-0.34,0.19,0.80,2.34,7.95,1.60 +0.46,-0.34,0.19,0.80,2.33,7.95,1.60 +0.46,-0.34,0.19,0.80,2.33,7.95,1.60 +0.46,-0.34,0.19,0.80,2.32,7.95,1.60 +0.46,-0.34,0.19,0.80,2.32,7.95,1.60 +0.46,-0.34,0.19,0.80,2.32,7.94,1.60 +0.46,-0.34,0.19,0.80,2.31,7.94,1.60 +0.46,-0.34,0.19,0.80,2.31,7.94,1.60 +0.45,-0.34,0.19,0.80,2.31,7.94,1.60 +0.45,-0.34,0.19,0.80,2.30,7.94,1.60 +0.45,-0.34,0.19,0.80,2.30,7.94,1.60 +0.45,-0.34,0.19,0.80,2.30,7.94,1.60 +0.45,-0.34,0.19,0.80,2.29,7.94,1.60 +0.45,-0.34,0.19,0.80,2.29,7.93,1.60 +0.45,-0.34,0.19,0.80,2.28,7.93,1.60 +0.45,-0.34,0.19,0.80,2.28,7.93,1.61 +0.45,-0.34,0.19,0.80,2.28,7.93,1.61 +0.45,-0.34,0.19,0.80,2.27,7.93,1.61 +0.45,-0.34,0.19,0.80,2.27,7.93,1.61 +0.45,-0.35,0.19,0.80,2.27,7.93,1.61 +0.44,-0.35,0.19,0.80,2.26,7.93,1.61 +0.44,-0.35,0.19,0.80,2.26,7.92,1.61 +0.44,-0.35,0.19,0.80,2.26,7.92,1.61 +0.44,-0.35,0.19,0.80,2.25,7.92,1.61 +0.44,-0.35,0.19,0.81,2.25,7.92,1.61 +0.44,-0.35,0.19,0.81,2.24,7.92,1.61 +0.44,-0.35,0.19,0.81,2.24,7.92,1.61 +0.44,-0.35,0.19,0.81,2.24,7.92,1.61 +0.44,-0.35,0.19,0.81,2.23,7.92,1.61 +0.44,-0.35,0.19,0.81,2.23,7.91,1.61 +0.44,-0.35,0.19,0.81,2.23,7.91,1.61 +0.44,-0.35,0.19,0.81,2.22,7.91,1.61 +0.43,-0.35,0.19,0.81,2.22,7.91,1.61 +0.43,-0.35,0.19,0.81,2.22,7.91,1.62 +0.43,-0.35,0.19,0.81,2.21,7.91,1.62 +0.43,-0.35,0.19,0.81,2.21,7.91,1.62 +0.43,-0.35,0.19,0.81,2.20,7.90,1.62 +0.43,-0.35,0.19,0.81,2.20,7.90,1.62 +0.43,-0.35,0.19,0.81,2.20,7.90,1.62 +0.43,-0.35,0.19,0.81,2.19,7.90,1.62 +0.43,-0.35,0.19,0.81,2.19,7.90,1.62 +0.43,-0.36,0.19,0.81,2.19,7.90,1.62 +0.43,-0.36,0.19,0.81,2.18,7.90,1.62 +0.43,-0.36,0.19,0.81,2.18,7.89,1.62 +0.43,-0.36,0.19,0.81,2.18,7.89,1.62 +0.42,-0.36,0.19,0.81,2.17,7.89,1.62 +0.42,-0.36,0.19,0.81,2.17,7.89,1.62 +0.42,-0.36,0.19,0.81,2.16,7.89,1.62 +0.42,-0.36,0.19,0.81,2.16,7.89,1.62 +0.42,-0.36,0.19,0.81,2.16,7.89,1.62 +0.42,-0.36,0.19,0.81,2.15,7.88,1.62 +0.42,-0.36,0.19,0.81,2.15,7.88,1.62 +0.42,-0.36,0.19,0.81,2.15,7.88,1.63 +0.42,-0.36,0.19,0.81,2.14,7.88,1.63 +0.42,-0.36,0.19,0.81,2.14,7.88,1.63 +0.42,-0.36,0.19,0.81,2.14,7.88,1.63 +0.42,-0.36,0.18,0.81,2.13,7.88,1.63 +0.41,-0.36,0.18,0.81,2.13,7.87,1.63 +0.41,-0.36,0.18,0.81,2.12,7.87,1.63 +0.41,-0.36,0.18,0.81,2.12,7.87,1.63 +0.41,-0.36,0.18,0.81,2.12,7.87,1.63 +0.41,-0.36,0.18,0.81,2.11,7.87,1.63 +0.41,-0.36,0.18,0.82,2.11,7.87,1.63 +0.41,-0.37,0.18,0.82,2.11,7.87,1.63 +0.41,-0.37,0.18,0.82,2.10,7.86,1.63 +0.41,-0.37,0.18,0.82,2.10,7.86,1.63 +0.41,-0.37,0.18,0.82,2.10,7.86,1.63 +0.41,-0.37,0.18,0.82,2.09,7.86,1.63 +0.41,-0.37,0.18,0.82,2.09,7.86,1.63 +0.41,-0.37,0.18,0.82,2.08,7.86,1.63 +0.40,-0.37,0.18,0.82,2.08,7.85,1.63 +0.40,-0.37,0.18,0.82,2.08,7.85,1.63 +0.40,-0.37,0.18,0.82,2.07,7.85,1.64 +0.40,-0.37,0.18,0.82,2.07,7.85,1.64 +0.40,-0.37,0.18,0.82,2.07,7.85,1.64 +0.40,-0.37,0.18,0.82,2.06,7.85,1.64 +0.40,-0.37,0.18,0.82,2.06,7.84,1.64 +0.40,-0.37,0.18,0.82,2.06,7.84,1.64 +0.40,-0.37,0.18,0.82,2.05,7.84,1.64 +0.40,-0.37,0.18,0.82,2.05,7.84,1.64 +0.40,-0.37,0.18,0.82,2.04,7.84,1.64 +0.40,-0.37,0.18,0.82,2.04,7.84,1.64 +0.39,-0.37,0.18,0.82,2.04,7.84,1.64 +0.39,-0.37,0.18,0.82,2.03,7.83,1.64 +0.39,-0.37,0.18,0.82,2.03,7.83,1.64 +0.39,-0.38,0.18,0.82,2.03,7.83,1.64 +0.39,-0.38,0.18,0.82,2.02,7.83,1.64 +0.39,-0.38,0.18,0.82,2.02,7.83,1.64 +0.39,-0.38,0.18,0.82,2.02,7.83,1.64 +0.39,-0.38,0.18,0.82,2.01,7.82,1.64 +0.39,-0.38,0.18,0.82,2.01,7.82,1.64 +0.39,-0.38,0.18,0.82,2.01,7.82,1.64 +0.39,-0.38,0.18,0.82,2.00,7.82,1.64 +0.39,-0.38,0.18,0.82,2.00,7.82,1.65 +0.38,-0.38,0.18,0.82,1.99,7.82,1.65 +0.38,-0.38,0.18,0.82,1.99,7.81,1.65 +0.38,-0.38,0.18,0.82,1.99,7.81,1.65 +0.38,-0.38,0.18,0.82,1.98,7.81,1.65 +0.38,-0.38,0.18,0.82,1.98,7.81,1.65 +0.38,-0.38,0.18,0.82,1.98,7.81,1.65 +0.38,-0.38,0.18,0.82,1.97,7.80,1.65 +0.38,-0.38,0.18,0.82,1.97,7.80,1.65 +0.38,-0.38,0.18,0.82,1.97,7.80,1.65 +0.38,-0.38,0.18,0.82,1.96,7.80,1.65 +0.38,-0.38,0.18,0.82,1.96,7.80,1.65 +0.38,-0.38,0.17,0.83,1.95,7.80,1.65 +0.37,-0.38,0.17,0.83,1.95,7.79,1.65 +0.37,-0.38,0.17,0.83,1.95,7.79,1.65 +0.37,-0.39,0.17,0.83,1.94,7.79,1.65 +0.37,-0.39,0.17,0.83,1.94,7.79,1.65 +0.37,-0.39,0.17,0.83,1.94,7.79,1.65 +0.37,-0.39,0.17,0.83,1.93,7.79,1.65 +0.37,-0.39,0.17,0.83,1.93,7.78,1.65 +0.37,-0.39,0.17,0.83,1.93,7.78,1.65 +0.37,-0.39,0.17,0.83,1.92,7.78,1.65 +0.37,-0.39,0.17,0.83,1.92,7.78,1.65 +0.37,-0.39,0.17,0.83,1.92,7.78,1.65 +0.37,-0.39,0.17,0.83,1.91,7.77,1.66 +0.37,-0.39,0.17,0.83,1.91,7.77,1.66 +0.36,-0.39,0.17,0.83,1.90,7.77,1.66 +0.36,-0.39,0.17,0.83,1.90,7.77,1.66 +0.36,-0.39,0.17,0.83,1.90,7.77,1.66 +0.36,-0.39,0.17,0.83,1.89,7.77,1.66 +0.36,-0.39,0.17,0.83,1.89,7.76,1.66 +0.36,-0.39,0.17,0.83,1.89,7.76,1.66 +0.36,-0.39,0.17,0.83,1.88,7.76,1.66 +0.36,-0.39,0.17,0.83,1.88,7.76,1.66 +0.36,-0.39,0.17,0.83,1.88,7.76,1.66 +0.36,-0.39,0.17,0.83,1.87,7.75,1.66 +0.36,-0.39,0.17,0.83,1.87,7.75,1.66 +0.36,-0.40,0.17,0.83,1.87,7.75,1.66 +0.35,-0.40,0.17,0.83,1.86,7.75,1.66 +0.35,-0.40,0.17,0.83,1.86,7.75,1.66 +0.35,-0.40,0.17,0.83,1.85,7.74,1.66 +0.35,-0.40,0.17,0.83,1.85,7.74,1.66 +0.35,-0.40,0.17,0.83,1.85,7.74,1.66 +0.35,-0.40,0.17,0.83,1.84,7.74,1.66 +0.35,-0.40,0.17,0.83,1.84,7.74,1.66 +0.35,-0.40,0.17,0.83,1.84,7.73,1.66 +0.35,-0.40,0.17,0.83,1.83,7.73,1.66 +0.35,-0.40,0.17,0.83,1.83,7.73,1.66 +0.35,-0.40,0.17,0.83,1.83,7.73,1.66 +0.35,-0.40,0.17,0.83,1.82,7.73,1.66 +0.34,-0.40,0.17,0.83,1.82,7.72,1.66 +0.34,-0.40,0.17,0.83,1.82,7.72,1.67 +0.34,-0.40,0.17,0.83,1.81,7.72,1.67 +0.34,-0.40,0.17,0.83,1.81,7.72,1.67 +0.34,-0.40,0.16,0.83,1.81,7.72,1.67 +0.34,-0.40,0.16,0.83,1.80,7.71,1.67 +0.34,-0.40,0.16,0.83,1.80,7.71,1.67 +0.34,-0.40,0.16,0.83,1.79,7.71,1.67 +0.34,-0.40,0.16,0.83,1.79,7.71,1.67 +0.34,-0.40,0.16,0.83,1.79,7.71,1.67 +0.34,-0.41,0.16,0.83,1.78,7.70,1.67 +0.34,-0.41,0.16,0.83,1.78,7.70,1.67 +0.33,-0.41,0.16,0.83,1.78,7.70,1.67 +0.33,-0.41,0.16,0.83,1.77,7.70,1.67 +0.33,-0.41,0.16,0.83,1.77,7.70,1.67 +0.33,-0.41,0.16,0.83,1.77,7.69,1.67 +0.33,-0.41,0.16,0.84,1.76,7.69,1.67 +0.33,-0.41,0.16,0.84,1.76,7.69,1.67 +0.33,-0.41,0.16,0.84,1.76,7.69,1.67 +0.33,-0.41,0.16,0.84,1.75,7.69,1.67 +0.33,-0.41,0.16,0.84,1.75,7.68,1.67 +0.33,-0.41,0.16,0.84,1.75,7.68,1.67 +0.33,-0.41,0.16,0.84,1.74,7.68,1.67 +0.33,-0.41,0.16,0.84,1.74,7.68,1.67 +0.32,-0.41,0.16,0.84,1.73,7.68,1.67 +0.32,-0.41,0.16,0.84,1.73,7.67,1.67 +0.32,-0.41,0.16,0.84,1.73,7.67,1.67 +0.32,-0.41,0.16,0.84,1.72,7.67,1.67 +0.32,-0.41,0.16,0.84,1.72,7.67,1.67 +0.32,-0.41,0.16,0.84,1.72,7.67,1.67 +0.32,-0.41,0.16,0.84,1.71,7.66,1.67 +0.32,-0.41,0.16,0.84,1.71,7.66,1.67 +0.32,-0.42,0.16,0.84,1.71,7.66,1.68 +0.32,-0.42,0.16,0.84,1.70,7.66,1.68 +0.32,-0.42,0.16,0.84,1.70,7.65,1.68 +0.32,-0.42,0.16,0.84,1.70,7.65,1.68 +0.31,-0.42,0.16,0.84,1.69,7.65,1.68 +0.31,-0.42,0.16,0.84,1.69,7.65,1.68 +0.31,-0.42,0.16,0.84,1.69,7.65,1.68 +0.31,-0.42,0.16,0.84,1.68,7.64,1.68 +0.31,-0.42,0.16,0.84,1.68,7.64,1.68 +0.31,-0.42,0.16,0.84,1.68,7.64,1.68 +0.31,-0.42,0.15,0.84,1.67,7.64,1.68 +0.31,-0.42,0.15,0.84,1.67,7.63,1.68 +0.31,-0.42,0.15,0.84,1.66,7.63,1.68 +0.31,-0.42,0.15,0.84,1.66,7.63,1.68 +0.31,-0.42,0.15,0.84,1.66,7.63,1.68 +0.31,-0.42,0.15,0.84,1.65,7.63,1.68 +0.31,-0.42,0.15,0.84,1.65,7.62,1.68 +0.30,-0.42,0.15,0.84,1.65,7.62,1.68 +0.30,-0.42,0.15,0.84,1.64,7.62,1.68 +0.30,-0.42,0.15,0.84,1.64,7.62,1.68 +0.30,-0.42,0.15,0.84,1.64,7.61,1.68 +0.30,-0.42,0.15,0.84,1.63,7.61,1.68 +0.30,-0.42,0.15,0.84,1.63,7.61,1.68 +0.30,-0.43,0.15,0.84,1.63,7.61,1.68 +0.30,-0.43,0.15,0.84,1.62,7.61,1.68 +0.30,-0.43,0.15,0.84,1.62,7.60,1.68 +0.30,-0.43,0.15,0.84,1.62,7.60,1.68 +0.30,-0.43,0.15,0.84,1.61,7.60,1.68 +0.30,-0.43,0.15,0.84,1.61,7.60,1.68 +0.29,-0.43,0.15,0.84,1.61,7.59,1.68 +0.29,-0.43,0.15,0.84,1.60,7.59,1.68 +0.29,-0.43,0.15,0.84,1.60,7.59,1.68 +0.29,-0.43,0.15,0.84,1.60,7.59,1.68 +0.29,-0.43,0.15,0.84,1.59,7.58,1.68 +0.29,-0.43,0.15,0.84,1.59,7.58,1.68 +0.29,-0.43,0.15,0.84,1.59,7.58,1.68 +0.29,-0.43,0.15,0.84,1.58,7.58,1.68 +0.29,-0.43,0.15,0.84,1.58,7.58,1.68 +0.29,-0.43,0.15,0.84,1.58,7.57,1.69 +0.29,-0.43,0.15,0.84,1.57,7.57,1.69 +0.29,-0.43,0.15,0.84,1.57,7.57,1.69 +0.28,-0.43,0.15,0.84,1.56,7.57,1.69 +0.28,-0.43,0.15,0.84,1.56,7.56,1.69 +0.28,-0.43,0.15,0.84,1.56,7.56,1.69 +0.28,-0.43,0.15,0.84,1.55,7.56,1.69 +0.28,-0.43,0.14,0.84,1.55,7.56,1.69 +0.28,-0.43,0.14,0.84,1.55,7.55,1.69 +0.28,-0.44,0.14,0.84,1.54,7.55,1.69 +0.28,-0.44,0.14,0.84,1.54,7.55,1.69 +0.28,-0.44,0.14,0.84,1.54,7.55,1.69 +0.28,-0.44,0.14,0.84,1.53,7.54,1.69 +0.28,-0.44,0.14,0.84,1.53,7.54,1.69 +0.28,-0.44,0.14,0.84,1.53,7.54,1.69 +0.27,-0.44,0.14,0.84,1.52,7.54,1.69 +0.27,-0.44,0.14,0.84,1.52,7.53,1.69 +0.27,-0.44,0.14,0.84,1.52,7.53,1.69 +0.27,-0.44,0.14,0.84,1.51,7.53,1.69 +0.27,-0.44,0.14,0.84,1.51,7.53,1.69 +0.27,-0.44,0.14,0.84,1.51,7.52,1.69 +0.27,-0.44,0.14,0.84,1.50,7.52,1.69 +0.27,-0.44,0.14,0.84,1.50,7.52,1.69 +0.27,-0.44,0.14,0.84,1.50,7.52,1.69 +0.27,-0.44,0.14,0.84,1.49,7.51,1.69 +0.27,-0.44,0.14,0.85,1.49,7.51,1.69 +0.27,-0.44,0.14,0.85,1.49,7.51,1.69 +0.26,-0.44,0.14,0.85,1.48,7.51,1.69 +0.26,-0.44,0.14,0.85,1.48,7.50,1.69 +0.26,-0.44,0.14,0.85,1.48,7.50,1.69 +0.26,-0.44,0.14,0.85,1.47,7.50,1.69 +0.26,-0.44,0.14,0.85,1.47,7.50,1.69 +0.26,-0.45,0.14,0.85,1.47,7.49,1.69 +0.26,-0.45,0.14,0.85,1.46,7.49,1.69 +0.26,-0.45,0.14,0.85,1.46,7.49,1.69 +0.26,-0.45,0.14,0.85,1.46,7.49,1.69 +0.26,-0.45,0.14,0.85,1.45,7.48,1.69 +0.26,-0.45,0.14,0.85,1.45,7.48,1.69 +0.26,-0.45,0.14,0.85,1.45,7.48,1.69 +0.25,-0.45,0.13,0.85,1.44,7.48,1.69 +0.25,-0.45,0.13,0.85,1.44,7.47,1.69 +0.25,-0.45,0.13,0.85,1.44,7.47,1.69 +0.25,-0.45,0.13,0.85,1.43,7.47,1.69 +0.25,-0.45,0.13,0.85,1.43,7.47,1.69 +0.25,-0.45,0.13,0.85,1.43,7.46,1.69 +0.25,-0.45,0.13,0.85,1.42,7.46,1.69 +0.25,-0.45,0.13,0.85,1.42,7.46,1.69 +0.25,-0.45,0.13,0.85,1.42,7.46,1.69 +0.25,-0.45,0.13,0.85,1.41,7.45,1.69 +0.25,-0.45,0.13,0.85,1.41,7.45,1.69 +0.25,-0.45,0.13,0.85,1.41,7.45,1.69 +0.25,-0.45,0.13,0.85,1.40,7.45,1.69 +0.24,-0.45,0.13,0.85,1.40,7.44,1.69 +0.24,-0.45,0.13,0.85,1.40,7.44,1.69 +0.24,-0.45,0.13,0.85,1.39,7.44,1.69 +0.24,-0.45,0.13,0.85,1.39,7.43,1.69 +0.24,-0.46,0.13,0.85,1.39,7.43,1.69 +0.24,-0.46,0.13,0.85,1.38,7.43,1.69 +0.24,-0.46,0.13,0.85,1.38,7.43,1.70 +0.24,-0.46,0.13,0.85,1.38,7.42,1.70 +0.24,-0.46,0.13,0.85,1.37,7.42,1.70 +0.24,-0.46,0.13,0.85,1.37,7.42,1.70 +0.24,-0.46,0.13,0.85,1.37,7.42,1.70 +0.24,-0.46,0.13,0.85,1.36,7.41,1.70 +0.23,-0.46,0.13,0.85,1.36,7.41,1.70 +0.23,-0.46,0.13,0.85,1.36,7.41,1.70 +0.23,-0.46,0.13,0.85,1.35,7.41,1.70 +0.23,-0.46,0.13,0.85,1.35,7.40,1.70 +0.23,-0.46,0.13,0.85,1.35,7.40,1.70 +0.23,-0.46,0.13,0.85,1.34,7.40,1.70 +0.23,-0.46,0.12,0.85,1.34,7.39,1.70 +0.23,-0.46,0.12,0.85,1.34,7.39,1.70 +0.23,-0.46,0.12,0.85,1.33,7.39,1.70 +0.23,-0.46,0.12,0.85,1.33,7.39,1.70 +0.23,-0.46,0.12,0.85,1.33,7.38,1.70 +0.23,-0.46,0.12,0.85,1.32,7.38,1.70 +0.22,-0.46,0.12,0.85,1.32,7.38,1.70 +0.22,-0.46,0.12,0.85,1.32,7.38,1.70 +0.22,-0.46,0.12,0.85,1.31,7.37,1.70 +0.22,-0.46,0.12,0.85,1.31,7.37,1.70 +0.22,-0.46,0.12,0.85,1.31,7.37,1.70 +0.22,-0.47,0.12,0.85,1.30,7.36,1.70 +0.22,-0.47,0.12,0.85,1.30,7.36,1.70 +0.22,-0.47,0.12,0.85,1.30,7.36,1.70 +0.22,-0.47,0.12,0.85,1.29,7.36,1.70 +0.22,-0.47,0.12,0.85,1.29,7.35,1.70 +0.22,-0.47,0.12,0.85,1.29,7.35,1.70 +0.22,-0.47,0.12,0.85,1.28,7.35,1.70 +0.21,-0.47,0.12,0.85,1.28,7.34,1.70 +0.21,-0.47,0.12,0.85,1.28,7.34,1.70 +0.21,-0.47,0.12,0.85,1.27,7.34,1.70 +0.21,-0.47,0.12,0.85,1.27,7.34,1.70 +0.21,-0.47,0.12,0.85,1.27,7.33,1.70 +0.21,-0.47,0.12,0.85,1.27,7.33,1.70 +0.21,-0.47,0.12,0.85,1.26,7.33,1.70 +0.21,-0.47,0.12,0.85,1.26,7.32,1.70 +0.21,-0.47,0.12,0.85,1.26,7.32,1.70 +0.21,-0.47,0.12,0.85,1.25,7.32,1.70 +0.21,-0.47,0.11,0.85,1.25,7.32,1.70 +0.21,-0.47,0.11,0.85,1.25,7.31,1.70 +0.20,-0.47,0.11,0.85,1.24,7.31,1.70 +0.20,-0.47,0.11,0.85,1.24,7.31,1.70 +0.20,-0.47,0.11,0.85,1.24,7.30,1.70 +0.20,-0.47,0.11,0.85,1.23,7.30,1.70 +0.20,-0.47,0.11,0.85,1.23,7.30,1.70 +0.20,-0.48,0.11,0.85,1.23,7.30,1.70 +0.20,-0.48,0.11,0.85,1.22,7.29,1.70 +0.20,-0.48,0.11,0.85,1.22,7.29,1.70 +0.20,-0.48,0.11,0.85,1.22,7.29,1.70 +0.20,-0.48,0.11,0.85,1.21,7.28,1.70 +0.20,-0.48,0.11,0.85,1.21,7.28,1.70 +0.20,-0.48,0.11,0.85,1.21,7.28,1.70 +0.20,-0.48,0.11,0.85,1.20,7.27,1.70 +0.19,-0.48,0.11,0.85,1.20,7.27,1.70 +0.19,-0.48,0.11,0.85,1.20,7.27,1.70 +0.19,-0.48,0.11,0.85,1.19,7.27,1.70 +0.19,-0.48,0.11,0.85,1.19,7.26,1.70 +0.19,-0.48,0.11,0.85,1.19,7.26,1.70 +0.19,-0.48,0.11,0.85,1.19,7.26,1.70 +0.19,-0.48,0.11,0.85,1.18,7.25,1.70 +0.19,-0.48,0.11,0.85,1.18,7.25,1.70 +0.19,-0.48,0.11,0.85,1.18,7.25,1.70 +0.19,-0.48,0.11,0.85,1.17,7.24,1.70 +0.19,-0.48,0.11,0.85,1.17,7.24,1.70 +0.19,-0.48,0.11,0.85,1.17,7.24,1.70 +0.18,-0.48,0.10,0.85,1.16,7.24,1.70 +0.18,-0.48,0.10,0.85,1.16,7.23,1.70 +0.18,-0.48,0.10,0.85,1.16,7.23,1.70 +0.18,-0.48,0.10,0.85,1.15,7.23,1.70 +0.18,-0.48,0.10,0.85,1.15,7.22,1.70 +0.18,-0.48,0.10,0.85,1.15,7.22,1.70 +0.18,-0.49,0.10,0.85,1.14,7.22,1.70 +0.18,-0.49,0.10,0.85,1.14,7.21,1.70 +0.18,-0.49,0.10,0.85,1.14,7.21,1.70 +0.18,-0.49,0.10,0.85,1.14,7.21,1.70 +0.18,-0.49,0.10,0.85,1.13,7.21,1.70 +0.18,-0.49,0.10,0.85,1.13,7.20,1.70 +0.17,-0.49,0.10,0.85,1.13,7.20,1.70 +0.17,-0.49,0.10,0.85,1.12,7.20,1.70 +0.17,-0.49,0.10,0.85,1.12,7.19,1.70 +0.17,-0.49,0.10,0.85,1.12,7.19,1.70 +0.17,-0.49,0.10,0.85,1.11,7.19,1.70 +0.17,-0.49,0.10,0.85,1.11,7.18,1.70 +0.17,-0.49,0.10,0.85,1.11,7.18,1.70 +0.17,-0.49,0.10,0.85,1.10,7.18,1.70 +0.17,-0.49,0.10,0.85,1.10,7.17,1.70 +0.17,-0.49,0.10,0.85,1.10,7.17,1.70 +0.17,-0.49,0.10,0.85,1.09,7.17,1.70 +0.17,-0.49,0.10,0.85,1.09,7.16,1.70 +0.16,-0.49,0.10,0.85,1.09,7.16,1.70 +0.16,-0.49,0.10,0.85,1.09,7.16,1.70 +0.16,-0.49,0.09,0.85,1.08,7.16,1.70 +0.16,-0.49,0.09,0.85,1.08,7.15,1.70 +0.16,-0.49,0.09,0.85,1.08,7.15,1.70 +0.16,-0.49,0.09,0.85,1.07,7.15,1.70 +0.16,-0.49,0.09,0.85,1.07,7.14,1.70 +0.16,-0.49,0.09,0.85,1.07,7.14,1.70 +0.16,-0.50,0.09,0.85,1.06,7.14,1.70 +0.16,-0.50,0.09,0.85,1.06,7.13,1.70 +0.16,-0.50,0.09,0.85,1.06,7.13,1.70 +0.16,-0.50,0.09,0.85,1.06,7.13,1.70 +0.16,-0.50,0.09,0.85,1.05,7.12,1.70 +0.15,-0.50,0.09,0.85,1.05,7.12,1.70 +0.15,-0.50,0.09,0.85,1.05,7.12,1.70 +0.15,-0.50,0.09,0.85,1.04,7.11,1.70 +0.15,-0.50,0.09,0.85,1.04,7.11,1.70 +0.15,-0.50,0.09,0.85,1.04,7.11,1.70 +0.15,-0.50,0.09,0.85,1.03,7.10,1.70 +0.15,-0.50,0.09,0.85,1.03,7.10,1.70 +0.15,-0.50,0.09,0.85,1.03,7.10,1.70 +0.15,-0.50,0.09,0.85,1.02,7.09,1.70 +0.15,-0.50,0.09,0.85,1.02,7.09,1.70 +0.15,-0.50,0.09,0.85,1.02,7.09,1.70 +0.15,-0.50,0.09,0.85,1.02,7.08,1.70 +0.14,-0.50,0.09,0.85,1.01,7.08,1.70 +0.14,-0.50,0.09,0.85,1.01,7.08,1.70 +0.14,-0.50,0.08,0.85,1.01,7.07,1.70 +0.14,-0.50,0.08,0.85,1.00,7.07,1.70 +0.14,-0.50,0.08,0.85,1.00,7.07,1.70 +0.14,-0.50,0.08,0.85,1.00,7.07,1.70 +0.14,-0.50,0.08,0.85,0.99,7.06,1.70 +0.14,-0.50,0.08,0.85,0.99,7.06,1.70 +0.14,-0.50,0.08,0.85,0.99,7.06,1.70 +0.14,-0.51,0.08,0.85,0.99,7.05,1.70 +0.14,-0.51,0.08,0.85,0.98,7.05,1.70 +0.14,-0.51,0.08,0.85,0.98,7.05,1.70 +0.13,-0.51,0.08,0.85,0.98,7.04,1.70 +0.13,-0.51,0.08,0.85,0.97,7.04,1.70 +0.13,-0.51,0.08,0.85,0.97,7.04,1.70 +0.13,-0.51,0.08,0.85,0.97,7.03,1.70 +0.13,-0.51,0.08,0.85,0.97,7.03,1.70 +0.13,-0.51,0.08,0.85,0.96,7.03,1.70 +0.13,-0.51,0.08,0.85,0.96,7.02,1.70 +0.13,-0.51,0.08,0.85,0.96,7.02,1.70 +0.13,-0.51,0.08,0.85,0.95,7.02,1.69 +0.13,-0.51,0.08,0.85,0.95,7.01,1.69 +0.13,-0.51,0.08,0.85,0.95,7.01,1.69 +0.13,-0.51,0.08,0.85,0.94,7.00,1.69 +0.13,-0.51,0.08,0.85,0.94,7.00,1.69 +0.12,-0.51,0.08,0.85,0.94,7.00,1.69 +0.12,-0.51,0.07,0.85,0.94,6.99,1.69 +0.12,-0.51,0.07,0.85,0.93,6.99,1.69 +0.12,-0.51,0.07,0.85,0.93,6.99,1.69 +0.12,-0.51,0.07,0.85,0.93,6.98,1.69 +0.12,-0.51,0.07,0.85,0.92,6.98,1.69 +0.12,-0.51,0.07,0.85,0.92,6.98,1.69 +0.12,-0.51,0.07,0.85,0.92,6.97,1.69 +0.12,-0.51,0.07,0.85,0.92,6.97,1.69 +0.12,-0.51,0.07,0.85,0.91,6.97,1.69 +0.12,-0.51,0.07,0.85,0.91,6.96,1.69 +0.12,-0.52,0.07,0.85,0.91,6.96,1.69 +0.11,-0.52,0.07,0.85,0.90,6.96,1.69 +0.11,-0.52,0.07,0.85,0.90,6.95,1.69 +0.11,-0.52,0.07,0.85,0.90,6.95,1.69 +0.11,-0.52,0.07,0.85,0.90,6.95,1.69 +0.11,-0.52,0.07,0.85,0.89,6.94,1.69 +0.11,-0.52,0.07,0.85,0.89,6.94,1.69 +0.11,-0.52,0.07,0.85,0.89,6.94,1.69 +0.11,-0.52,0.07,0.85,0.88,6.93,1.69 +0.11,-0.52,0.07,0.85,0.88,6.93,1.69 +0.11,-0.52,0.07,0.85,0.88,6.93,1.69 +0.11,-0.52,0.07,0.85,0.88,6.92,1.69 +0.11,-0.52,0.07,0.85,0.87,6.92,1.69 +0.11,-0.52,0.06,0.85,0.87,6.92,1.69 +0.10,-0.52,0.06,0.85,0.87,6.91,1.69 +0.10,-0.52,0.06,0.85,0.86,6.91,1.69 +0.10,-0.52,0.06,0.85,0.86,6.90,1.69 +0.10,-0.52,0.06,0.85,0.86,6.90,1.69 +0.10,-0.52,0.06,0.84,0.86,6.90,1.69 +0.10,-0.52,0.06,0.84,0.85,6.89,1.69 +0.10,-0.52,0.06,0.84,0.85,6.89,1.69 +0.10,-0.52,0.06,0.84,0.85,6.89,1.69 +0.10,-0.52,0.06,0.84,0.84,6.88,1.69 +0.10,-0.52,0.06,0.84,0.84,6.88,1.69 +0.10,-0.52,0.06,0.84,0.84,6.88,1.69 +0.10,-0.52,0.06,0.84,0.84,6.87,1.69 +0.09,-0.52,0.06,0.84,0.83,6.87,1.69 +0.09,-0.52,0.06,0.84,0.83,6.87,1.69 +0.09,-0.52,0.06,0.84,0.83,6.86,1.69 +0.09,-0.53,0.06,0.84,0.82,6.86,1.69 +0.09,-0.53,0.06,0.84,0.82,6.85,1.69 +0.09,-0.53,0.06,0.84,0.82,6.85,1.69 +0.09,-0.53,0.06,0.84,0.82,6.85,1.69 +0.09,-0.53,0.06,0.84,0.81,6.84,1.69 +0.09,-0.53,0.06,0.84,0.81,6.84,1.69 +0.09,-0.53,0.05,0.84,0.81,6.84,1.69 +0.09,-0.53,0.05,0.84,0.81,6.83,1.69 +0.09,-0.53,0.05,0.84,0.80,6.83,1.69 +0.09,-0.53,0.05,0.84,0.80,6.83,1.69 +0.08,-0.53,0.05,0.84,0.80,6.82,1.69 +0.08,-0.53,0.05,0.84,0.79,6.82,1.69 +0.08,-0.53,0.05,0.84,0.79,6.81,1.69 +0.08,-0.53,0.05,0.84,0.79,6.81,1.69 +0.08,-0.53,0.05,0.84,0.79,6.81,1.68 +0.08,-0.53,0.05,0.84,0.78,6.80,1.68 +0.08,-0.53,0.05,0.84,0.78,6.80,1.68 +0.08,-0.53,0.05,0.84,0.78,6.80,1.68 +0.08,-0.53,0.05,0.84,0.78,6.79,1.68 +0.08,-0.53,0.05,0.84,0.77,6.79,1.68 +0.08,-0.53,0.05,0.84,0.77,6.79,1.68 +0.08,-0.53,0.05,0.84,0.77,6.78,1.68 +0.08,-0.53,0.05,0.84,0.76,6.78,1.68 +0.07,-0.53,0.05,0.84,0.76,6.77,1.68 +0.07,-0.53,0.05,0.84,0.76,6.77,1.68 +0.07,-0.53,0.05,0.84,0.76,6.77,1.68 +0.07,-0.53,0.05,0.84,0.75,6.76,1.68 +0.07,-0.53,0.05,0.84,0.75,6.76,1.68 +0.07,-0.53,0.04,0.84,0.75,6.76,1.68 +0.07,-0.54,0.04,0.84,0.75,6.75,1.68 +0.07,-0.54,0.04,0.84,0.74,6.75,1.68 +0.07,-0.54,0.04,0.84,0.74,6.74,1.68 +0.07,-0.54,0.04,0.84,0.74,6.74,1.68 +0.07,-0.54,0.04,0.84,0.74,6.74,1.68 +0.07,-0.54,0.04,0.84,0.73,6.73,1.68 +0.06,-0.54,0.04,0.84,0.73,6.73,1.68 +0.06,-0.54,0.04,0.84,0.73,6.73,1.68 +0.06,-0.54,0.04,0.84,0.72,6.72,1.68 +0.06,-0.54,0.04,0.84,0.72,6.72,1.68 +0.06,-0.54,0.04,0.84,0.72,6.71,1.68 +0.06,-0.54,0.04,0.84,0.72,6.71,1.68 +0.06,-0.54,0.04,0.84,0.71,6.71,1.68 +0.06,-0.54,0.04,0.84,0.71,6.70,1.68 +0.06,-0.54,0.04,0.84,0.71,6.70,1.68 +0.06,-0.54,0.04,0.84,0.71,6.70,1.68 +0.06,-0.54,0.04,0.84,0.70,6.69,1.68 +0.06,-0.54,0.04,0.84,0.70,6.69,1.68 +0.06,-0.54,0.04,0.84,0.70,6.68,1.68 +0.05,-0.54,0.04,0.84,0.70,6.68,1.68 +0.05,-0.54,0.03,0.84,0.69,6.68,1.68 +0.05,-0.54,0.03,0.84,0.69,6.67,1.68 +0.05,-0.54,0.03,0.84,0.69,6.67,1.68 +0.05,-0.54,0.03,0.84,0.69,6.67,1.68 +0.05,-0.54,0.03,0.84,0.68,6.66,1.68 +0.05,-0.54,0.03,0.84,0.68,6.66,1.67 +0.05,-0.54,0.03,0.84,0.68,6.65,1.67 +0.05,-0.54,0.03,0.84,0.68,6.65,1.67 +0.05,-0.54,0.03,0.84,0.67,6.65,1.67 +0.05,-0.54,0.03,0.84,0.67,6.64,1.67 +0.05,-0.54,0.03,0.84,0.67,6.64,1.67 +0.05,-0.55,0.03,0.84,0.66,6.63,1.67 +0.04,-0.55,0.03,0.84,0.66,6.63,1.67 +0.04,-0.55,0.03,0.84,0.66,6.63,1.67 +0.04,-0.55,0.03,0.84,0.66,6.62,1.67 +0.04,-0.55,0.03,0.84,0.65,6.62,1.67 +0.04,-0.55,0.03,0.84,0.65,6.61,1.67 +0.04,-0.55,0.03,0.84,0.65,6.61,1.67 +0.04,-0.55,0.03,0.84,0.65,6.61,1.67 +0.04,-0.55,0.03,0.84,0.64,6.60,1.67 +0.04,-0.55,0.03,0.84,0.64,6.60,1.67 +0.04,-0.55,0.02,0.83,0.64,6.60,1.67 +0.04,-0.55,0.02,0.83,0.64,6.59,1.67 +0.04,-0.55,0.02,0.83,0.63,6.59,1.67 +0.04,-0.55,0.02,0.83,0.63,6.58,1.67 +0.03,-0.55,0.02,0.83,0.63,6.58,1.67 +0.03,-0.55,0.02,0.83,0.63,6.58,1.67 +0.03,-0.55,0.02,0.83,0.62,6.57,1.67 +0.03,-0.55,0.02,0.83,0.62,6.57,1.67 +0.03,-0.55,0.02,0.83,0.62,6.56,1.67 +0.03,-0.55,0.02,0.83,0.62,6.56,1.67 +0.03,-0.55,0.02,0.83,0.61,6.56,1.67 +0.03,-0.55,0.02,0.83,0.61,6.55,1.67 +0.03,-0.55,0.02,0.83,0.61,6.55,1.67 +0.03,-0.55,0.02,0.83,0.61,6.54,1.67 +0.03,-0.55,0.02,0.83,0.60,6.54,1.67 +0.03,-0.55,0.02,0.83,0.60,6.54,1.67 +0.03,-0.55,0.02,0.83,0.60,6.53,1.66 +0.02,-0.55,0.02,0.83,0.60,6.53,1.66 +0.02,-0.55,0.02,0.83,0.59,6.52,1.66 +0.02,-0.55,0.02,0.83,0.59,6.52,1.66 +0.02,-0.55,0.01,0.83,0.59,6.52,1.66 +0.02,-0.55,0.01,0.83,0.59,6.51,1.66 +0.02,-0.56,0.01,0.83,0.59,6.51,1.66 +0.02,-0.56,0.01,0.83,0.58,6.50,1.66 +0.02,-0.56,0.01,0.83,0.58,6.50,1.66 +0.02,-0.56,0.01,0.83,0.58,6.50,1.66 +0.02,-0.56,0.01,0.83,0.58,6.49,1.66 +0.02,-0.56,0.01,0.83,0.57,6.49,1.66 +0.02,-0.56,0.01,0.83,0.57,6.48,1.66 +0.02,-0.56,0.01,0.83,0.57,6.48,1.66 +0.01,-0.56,0.01,0.83,0.57,6.48,1.66 +0.01,-0.56,0.01,0.83,0.56,6.47,1.66 +0.01,-0.56,0.01,0.83,0.56,6.47,1.66 +0.01,-0.56,0.01,0.83,0.56,6.46,1.66 +0.01,-0.56,0.01,0.83,0.56,6.46,1.66 +0.01,-0.56,0.01,0.83,0.55,6.46,1.66 +0.01,-0.56,0.01,0.83,0.55,6.45,1.66 +0.01,-0.56,0.01,0.83,0.55,6.45,1.66 +0.01,-0.56,0.01,0.83,0.55,6.44,1.66 +0.01,-0.56,0.01,0.83,0.54,6.44,1.66 +0.01,-0.56,0.00,0.83,0.54,6.44,1.66 +0.01,-0.56,0.00,0.83,0.54,6.43,1.66 +0.01,-0.56,0.00,0.83,0.54,6.43,1.66 +0.00,-0.56,0.00,0.83,0.54,6.42,1.65 +0.00,-0.56,0.00,0.83,0.53,6.42,1.65 +0.00,-0.56,0.00,0.83,0.53,6.41,1.65 +0.00,-0.56,0.00,0.83,0.53,6.41,1.65 +0.00,-0.56,0.00,0.83,0.53,6.41,1.65 +0.00,-0.56,0.00,0.83,0.52,6.40,1.65 +0.00,-0.56,0.00,0.83,0.52,6.40,1.65 +-0.00,-0.56,-0.00,0.83,0.52,6.39,1.65 +-0.00,-0.56,-0.00,0.83,0.52,6.39,1.65 +-0.00,-0.56,-0.00,0.83,0.51,6.39,1.65 +-0.00,-0.56,-0.00,0.83,0.51,6.38,1.65 +-0.00,-0.56,-0.00,0.83,0.51,6.38,1.65 +-0.00,-0.56,-0.00,0.83,0.51,6.37,1.65 +-0.01,-0.57,-0.00,0.82,0.51,6.37,1.65 +-0.01,-0.57,-0.00,0.82,0.50,6.37,1.65 +-0.01,-0.57,-0.00,0.82,0.50,6.36,1.65 +-0.01,-0.57,-0.01,0.82,0.50,6.36,1.65 +-0.01,-0.57,-0.01,0.82,0.50,6.35,1.65 +-0.01,-0.57,-0.01,0.82,0.49,6.35,1.65 +-0.01,-0.57,-0.01,0.82,0.49,6.34,1.65 +-0.01,-0.57,-0.01,0.82,0.49,6.34,1.65 +-0.01,-0.57,-0.01,0.82,0.49,6.34,1.65 +-0.01,-0.57,-0.01,0.82,0.48,6.33,1.65 +-0.01,-0.57,-0.01,0.82,0.48,6.33,1.65 +-0.01,-0.57,-0.01,0.82,0.48,6.32,1.65 +-0.01,-0.57,-0.01,0.82,0.48,6.32,1.64 +-0.01,-0.57,-0.01,0.82,0.48,6.31,1.64 +-0.02,-0.57,-0.01,0.82,0.47,6.31,1.64 +-0.02,-0.57,-0.01,0.82,0.47,6.31,1.64 +-0.02,-0.57,-0.01,0.82,0.47,6.30,1.64 +-0.02,-0.57,-0.01,0.82,0.47,6.30,1.64 +-0.02,-0.57,-0.01,0.82,0.46,6.29,1.64 +-0.02,-0.57,-0.01,0.82,0.46,6.29,1.64 +-0.02,-0.57,-0.01,0.82,0.46,6.29,1.64 +-0.02,-0.57,-0.01,0.82,0.46,6.28,1.64 +-0.02,-0.57,-0.02,0.82,0.46,6.28,1.64 +-0.02,-0.57,-0.02,0.82,0.45,6.27,1.64 +-0.02,-0.57,-0.02,0.82,0.45,6.27,1.64 +-0.02,-0.57,-0.02,0.82,0.45,6.26,1.64 +-0.02,-0.57,-0.02,0.82,0.45,6.26,1.64 +-0.03,-0.57,-0.02,0.82,0.45,6.26,1.64 +-0.03,-0.57,-0.02,0.82,0.44,6.25,1.64 +-0.03,-0.57,-0.02,0.82,0.44,6.25,1.64 +-0.03,-0.57,-0.02,0.82,0.44,6.24,1.64 +-0.03,-0.57,-0.02,0.82,0.44,6.24,1.64 +-0.03,-0.57,-0.02,0.82,0.43,6.23,1.64 +-0.03,-0.57,-0.02,0.82,0.43,6.23,1.64 +-0.03,-0.57,-0.02,0.82,0.43,6.23,1.64 +-0.03,-0.57,-0.02,0.82,0.43,6.22,1.63 +-0.03,-0.58,-0.02,0.82,0.43,6.22,1.63 +-0.03,-0.58,-0.02,0.82,0.42,6.21,1.63 +-0.03,-0.58,-0.02,0.82,0.42,6.21,1.63 +-0.03,-0.58,-0.02,0.82,0.42,6.20,1.63 +-0.03,-0.58,-0.02,0.82,0.42,6.20,1.63 +-0.04,-0.58,-0.03,0.82,0.42,6.20,1.63 +-0.04,-0.58,-0.03,0.82,0.41,6.19,1.63 +-0.04,-0.58,-0.03,0.82,0.41,6.19,1.63 +-0.04,-0.58,-0.03,0.82,0.41,6.18,1.63 +-0.04,-0.58,-0.03,0.82,0.41,6.18,1.63 +-0.04,-0.58,-0.03,0.81,0.41,6.17,1.63 +-0.04,-0.58,-0.03,0.81,0.40,6.17,1.63 +-0.04,-0.58,-0.03,0.81,0.40,6.16,1.63 +-0.04,-0.58,-0.03,0.81,0.40,6.16,1.63 +-0.04,-0.58,-0.03,0.81,0.40,6.16,1.63 +-0.04,-0.58,-0.03,0.81,0.39,6.15,1.63 +-0.04,-0.58,-0.03,0.81,0.39,6.15,1.63 +-0.04,-0.58,-0.03,0.81,0.39,6.14,1.63 +-0.05,-0.58,-0.03,0.81,0.39,6.14,1.63 +-0.05,-0.58,-0.03,0.81,0.39,6.13,1.63 +-0.05,-0.58,-0.03,0.81,0.38,6.13,1.62 +-0.05,-0.58,-0.03,0.81,0.38,6.13,1.62 +-0.05,-0.58,-0.03,0.81,0.38,6.12,1.62 +-0.05,-0.58,-0.04,0.81,0.38,6.12,1.62 +-0.05,-0.58,-0.04,0.81,0.38,6.11,1.62 +-0.05,-0.58,-0.04,0.81,0.37,6.11,1.62 +-0.05,-0.58,-0.04,0.81,0.37,6.10,1.62 +-0.05,-0.58,-0.04,0.81,0.37,6.10,1.62 +-0.05,-0.58,-0.04,0.81,0.37,6.09,1.62 +-0.05,-0.58,-0.04,0.81,0.37,6.09,1.62 +-0.05,-0.58,-0.04,0.81,0.36,6.09,1.62 +-0.05,-0.58,-0.04,0.81,0.36,6.08,1.62 +-0.06,-0.58,-0.04,0.81,0.36,6.08,1.62 +-0.06,-0.58,-0.04,0.81,0.36,6.07,1.62 +-0.06,-0.58,-0.04,0.81,0.36,6.07,1.62 +-0.06,-0.58,-0.04,0.81,0.35,6.06,1.62 +-0.06,-0.58,-0.04,0.81,0.35,6.06,1.62 +-0.06,-0.58,-0.04,0.81,0.35,6.05,1.62 +-0.06,-0.58,-0.04,0.81,0.35,6.05,1.62 +-0.06,-0.59,-0.04,0.81,0.35,6.05,1.62 +-0.06,-0.59,-0.04,0.81,0.35,6.04,1.61 +-0.06,-0.59,-0.04,0.81,0.34,6.04,1.61 +-0.06,-0.59,-0.05,0.81,0.34,6.03,1.61 +-0.06,-0.59,-0.05,0.81,0.34,6.03,1.61 +-0.06,-0.59,-0.05,0.81,0.34,6.02,1.61 +-0.06,-0.59,-0.05,0.81,0.34,6.02,1.61 +-0.07,-0.59,-0.05,0.81,0.33,6.01,1.61 +-0.07,-0.59,-0.05,0.81,0.33,6.01,1.61 +-0.07,-0.59,-0.05,0.81,0.33,6.01,1.61 +-0.07,-0.59,-0.05,0.80,0.33,6.00,1.61 +-0.07,-0.59,-0.05,0.80,0.33,6.00,1.61 +-0.07,-0.59,-0.05,0.80,0.32,5.99,1.61 +-0.07,-0.59,-0.05,0.80,0.32,5.99,1.61 +-0.07,-0.59,-0.05,0.80,0.32,5.98,1.61 +-0.07,-0.59,-0.05,0.80,0.32,5.98,1.61 +-0.07,-0.59,-0.05,0.80,0.32,5.97,1.61 +-0.07,-0.59,-0.05,0.80,0.31,5.97,1.61 +-0.07,-0.59,-0.05,0.80,0.31,5.97,1.61 +-0.07,-0.59,-0.05,0.80,0.31,5.96,1.60 +-0.07,-0.59,-0.06,0.80,0.31,5.96,1.60 +-0.08,-0.59,-0.06,0.80,0.31,5.95,1.60 +-0.08,-0.59,-0.06,0.80,0.31,5.95,1.60 +-0.08,-0.59,-0.06,0.80,0.30,5.94,1.60 +-0.08,-0.59,-0.06,0.80,0.30,5.94,1.60 +-0.08,-0.59,-0.06,0.80,0.30,5.93,1.60 +-0.08,-0.59,-0.06,0.80,0.30,5.93,1.60 +-0.08,-0.59,-0.06,0.80,0.30,5.92,1.60 +-0.08,-0.59,-0.06,0.80,0.29,5.92,1.60 +-0.08,-0.59,-0.06,0.80,0.29,5.92,1.60 +-0.08,-0.59,-0.06,0.80,0.29,5.91,1.60 +-0.08,-0.59,-0.06,0.80,0.29,5.91,1.60 +-0.08,-0.59,-0.06,0.80,0.29,5.90,1.60 +-0.08,-0.59,-0.06,0.80,0.29,5.90,1.60 +-0.08,-0.59,-0.06,0.80,0.28,5.89,1.60 +-0.09,-0.59,-0.06,0.80,0.28,5.89,1.60 +-0.09,-0.59,-0.06,0.80,0.28,5.88,1.60 +-0.09,-0.59,-0.06,0.80,0.28,5.88,1.59 +-0.09,-0.59,-0.07,0.80,0.28,5.87,1.59 +-0.09,-0.59,-0.07,0.80,0.28,5.87,1.59 +-0.09,-0.59,-0.07,0.80,0.27,5.86,1.59 +-0.09,-0.59,-0.07,0.80,0.27,5.86,1.59 +-0.09,-0.59,-0.07,0.80,0.27,5.86,1.59 +-0.09,-0.59,-0.07,0.80,0.27,5.85,1.59 +-0.09,-0.60,-0.07,0.80,0.27,5.85,1.59 +-0.09,-0.60,-0.07,0.80,0.27,5.84,1.59 +-0.09,-0.60,-0.07,0.79,0.26,5.84,1.59 +-0.09,-0.60,-0.07,0.79,0.26,5.83,1.59 +-0.09,-0.60,-0.07,0.79,0.26,5.83,1.59 +-0.10,-0.60,-0.07,0.79,0.26,5.82,1.59 +-0.10,-0.60,-0.07,0.79,0.26,5.82,1.59 +-0.10,-0.60,-0.07,0.79,0.25,5.81,1.59 +-0.10,-0.60,-0.07,0.79,0.25,5.81,1.59 +-0.10,-0.60,-0.07,0.79,0.25,5.80,1.59 +-0.10,-0.60,-0.07,0.79,0.25,5.80,1.58 +-0.10,-0.60,-0.08,0.79,0.25,5.80,1.58 +-0.10,-0.60,-0.08,0.79,0.25,5.79,1.58 +-0.10,-0.60,-0.08,0.79,0.24,5.79,1.58 +-0.10,-0.60,-0.08,0.79,0.24,5.78,1.58 +-0.10,-0.60,-0.08,0.79,0.24,5.78,1.58 +-0.10,-0.60,-0.08,0.79,0.24,5.77,1.58 +-0.10,-0.60,-0.08,0.79,0.24,5.77,1.58 +-0.10,-0.60,-0.08,0.79,0.24,5.76,1.58 +-0.11,-0.60,-0.08,0.79,0.24,5.76,1.58 +-0.11,-0.60,-0.08,0.79,0.23,5.75,1.58 +-0.11,-0.60,-0.08,0.79,0.23,5.75,1.58 +-0.11,-0.60,-0.08,0.79,0.23,5.74,1.58 +-0.11,-0.60,-0.08,0.79,0.23,5.74,1.58 +-0.11,-0.60,-0.08,0.79,0.23,5.73,1.58 +-0.11,-0.60,-0.08,0.79,0.23,5.73,1.58 +-0.11,-0.60,-0.08,0.79,0.22,5.73,1.58 +-0.11,-0.60,-0.08,0.79,0.22,5.72,1.57 +-0.11,-0.60,-0.09,0.79,0.22,5.72,1.57 +-0.11,-0.60,-0.09,0.79,0.22,5.71,1.57 +-0.11,-0.60,-0.09,0.79,0.22,5.71,1.57 +-0.11,-0.60,-0.09,0.79,0.22,5.70,1.57 +-0.11,-0.60,-0.09,0.79,0.21,5.70,1.57 +-0.12,-0.60,-0.09,0.79,0.21,5.69,1.57 +-0.12,-0.60,-0.09,0.79,0.21,5.69,1.57 +-0.12,-0.60,-0.09,0.78,0.21,5.68,1.57 +-0.12,-0.60,-0.09,0.78,0.21,5.68,1.57 +-0.12,-0.60,-0.09,0.78,0.21,5.67,1.57 +-0.12,-0.60,-0.09,0.78,0.21,5.67,1.57 +-0.12,-0.60,-0.09,0.78,0.20,5.66,1.57 +-0.12,-0.60,-0.09,0.78,0.20,5.66,1.57 +-0.12,-0.60,-0.09,0.78,0.20,5.65,1.57 +-0.12,-0.60,-0.09,0.78,0.20,5.65,1.57 +-0.12,-0.60,-0.09,0.78,0.20,5.64,1.56 +-0.12,-0.60,-0.09,0.78,0.20,5.64,1.56 +-0.12,-0.60,-0.10,0.78,0.19,5.63,1.56 +-0.12,-0.60,-0.10,0.78,0.19,5.63,1.56 +-0.12,-0.60,-0.10,0.78,0.19,5.63,1.56 +-0.13,-0.60,-0.10,0.78,0.19,5.62,1.56 +-0.13,-0.60,-0.10,0.78,0.19,5.62,1.56 +-0.13,-0.60,-0.10,0.78,0.19,5.61,1.56 +-0.13,-0.61,-0.10,0.78,0.19,5.61,1.56 +-0.13,-0.61,-0.10,0.78,0.18,5.60,1.56 +-0.13,-0.61,-0.10,0.78,0.18,5.60,1.56 +-0.13,-0.61,-0.10,0.78,0.18,5.59,1.56 +-0.13,-0.61,-0.10,0.78,0.18,5.59,1.56 +-0.13,-0.61,-0.10,0.78,0.18,5.58,1.56 +-0.13,-0.61,-0.10,0.78,0.18,5.58,1.56 +-0.13,-0.61,-0.10,0.78,0.18,5.57,1.55 +-0.13,-0.61,-0.10,0.78,0.17,5.57,1.55 +-0.13,-0.61,-0.10,0.78,0.17,5.56,1.55 +-0.13,-0.61,-0.10,0.78,0.17,5.56,1.55 +-0.13,-0.61,-0.11,0.78,0.17,5.55,1.55 +-0.14,-0.61,-0.11,0.78,0.17,5.55,1.55 +-0.14,-0.61,-0.11,0.78,0.17,5.54,1.55 +-0.14,-0.61,-0.11,0.77,0.17,5.54,1.55 +-0.14,-0.61,-0.11,0.77,0.16,5.53,1.55 +-0.14,-0.61,-0.11,0.77,0.16,5.53,1.55 +-0.14,-0.61,-0.11,0.77,0.16,5.52,1.55 +-0.14,-0.61,-0.11,0.77,0.16,5.52,1.55 +-0.14,-0.61,-0.11,0.77,0.16,5.51,1.55 +-0.14,-0.61,-0.11,0.77,0.16,5.51,1.55 +-0.14,-0.61,-0.11,0.77,0.16,5.50,1.55 +-0.14,-0.61,-0.11,0.77,0.16,5.50,1.54 +-0.14,-0.61,-0.11,0.77,0.15,5.50,1.54 +-0.14,-0.61,-0.11,0.77,0.15,5.49,1.54 +-0.14,-0.61,-0.11,0.77,0.15,5.49,1.54 +-0.14,-0.61,-0.11,0.77,0.15,5.48,1.54 +-0.15,-0.61,-0.12,0.77,0.15,5.48,1.54 +-0.15,-0.61,-0.12,0.77,0.15,5.47,1.54 +-0.15,-0.61,-0.12,0.77,0.15,5.47,1.54 +-0.15,-0.61,-0.12,0.77,0.14,5.46,1.54 +-0.15,-0.61,-0.12,0.77,0.14,5.46,1.54 +-0.15,-0.61,-0.12,0.77,0.14,5.45,1.54 +-0.15,-0.61,-0.12,0.77,0.14,5.45,1.54 +-0.15,-0.61,-0.12,0.77,0.14,5.44,1.54 +-0.15,-0.61,-0.12,0.77,0.14,5.44,1.54 +-0.15,-0.61,-0.12,0.77,0.14,5.43,1.53 +-0.15,-0.61,-0.12,0.77,0.14,5.43,1.53 +-0.15,-0.61,-0.12,0.77,0.13,5.42,1.53 +-0.15,-0.61,-0.12,0.77,0.13,5.42,1.53 +-0.15,-0.61,-0.12,0.77,0.13,5.41,1.53 +-0.15,-0.61,-0.12,0.77,0.13,5.41,1.53 +-0.16,-0.61,-0.12,0.77,0.13,5.40,1.53 +-0.16,-0.61,-0.12,0.76,0.13,5.40,1.53 +-0.16,-0.61,-0.13,0.76,0.13,5.39,1.53 +-0.16,-0.61,-0.13,0.76,0.13,5.39,1.53 +-0.16,-0.61,-0.13,0.76,0.12,5.38,1.53 +-0.16,-0.61,-0.13,0.76,0.12,5.38,1.53 +-0.16,-0.61,-0.13,0.76,0.12,5.37,1.53 +-0.16,-0.61,-0.13,0.76,0.12,5.37,1.53 +-0.16,-0.61,-0.13,0.76,0.12,5.36,1.52 +-0.16,-0.61,-0.13,0.76,0.12,5.36,1.52 +-0.16,-0.61,-0.13,0.76,0.12,5.35,1.52 +-0.16,-0.61,-0.13,0.76,0.12,5.35,1.52 +-0.16,-0.61,-0.13,0.76,0.12,5.34,1.52 +-0.16,-0.61,-0.13,0.76,0.11,5.34,1.52 +-0.16,-0.61,-0.13,0.76,0.11,5.33,1.52 +-0.17,-0.61,-0.13,0.76,0.11,5.33,1.52 +-0.17,-0.61,-0.13,0.76,0.11,5.32,1.52 +-0.17,-0.61,-0.13,0.76,0.11,5.32,1.52 +-0.17,-0.61,-0.14,0.76,0.11,5.31,1.52 +-0.17,-0.61,-0.14,0.76,0.11,5.31,1.52 +-0.17,-0.62,-0.14,0.76,0.11,5.30,1.52 +-0.17,-0.62,-0.14,0.76,0.11,5.30,1.52 +-0.17,-0.62,-0.14,0.76,0.10,5.29,1.51 +-0.17,-0.62,-0.14,0.76,0.10,5.29,1.51 +-0.17,-0.62,-0.14,0.76,0.10,5.28,1.51 +-0.17,-0.62,-0.14,0.76,0.10,5.28,1.51 +-0.17,-0.62,-0.14,0.76,0.10,5.27,1.51 +-0.17,-0.62,-0.14,0.76,0.10,5.27,1.51 +-0.17,-0.62,-0.14,0.76,0.10,5.26,1.51 +-0.17,-0.62,-0.14,0.75,0.10,5.26,1.51 +-0.17,-0.62,-0.14,0.75,0.10,5.25,1.51 +-0.18,-0.62,-0.14,0.75,0.09,5.25,1.51 +-0.18,-0.62,-0.14,0.75,0.09,5.24,1.51 +-0.18,-0.62,-0.14,0.75,0.09,5.24,1.51 +-0.18,-0.62,-0.15,0.75,0.09,5.23,1.51 +-0.18,-0.62,-0.15,0.75,0.09,5.23,1.50 +-0.18,-0.62,-0.15,0.75,0.09,5.22,1.50 +-0.18,-0.62,-0.15,0.75,0.09,5.22,1.50 +-0.18,-0.62,-0.15,0.75,0.09,5.21,1.50 +-0.18,-0.62,-0.15,0.75,0.09,5.21,1.50 +-0.18,-0.62,-0.15,0.75,0.09,5.20,1.50 +-0.18,-0.62,-0.15,0.75,0.08,5.20,1.50 +-0.18,-0.62,-0.15,0.75,0.08,5.19,1.50 +-0.18,-0.62,-0.15,0.75,0.08,5.19,1.50 +-0.18,-0.62,-0.15,0.75,0.08,5.18,1.50 +-0.18,-0.62,-0.15,0.75,0.08,5.18,1.50 +-0.19,-0.62,-0.15,0.75,0.08,5.17,1.50 +-0.19,-0.62,-0.15,0.75,0.08,5.17,1.50 +-0.19,-0.62,-0.15,0.75,0.08,5.16,1.49 +-0.19,-0.62,-0.15,0.75,0.08,5.16,1.49 +-0.19,-0.62,-0.16,0.75,0.08,5.15,1.49 +-0.19,-0.62,-0.16,0.75,0.07,5.15,1.49 +-0.19,-0.62,-0.16,0.75,0.07,5.14,1.49 +-0.19,-0.62,-0.16,0.75,0.07,5.14,1.49 +-0.19,-0.62,-0.16,0.75,0.07,5.13,1.49 +-0.19,-0.62,-0.16,0.74,0.07,5.13,1.49 +-0.19,-0.62,-0.16,0.74,0.07,5.12,1.49 +-0.19,-0.62,-0.16,0.74,0.07,5.12,1.49 +-0.19,-0.62,-0.16,0.74,0.07,5.11,1.49 +-0.19,-0.62,-0.16,0.74,0.07,5.11,1.49 +-0.19,-0.62,-0.16,0.74,0.07,5.10,1.49 +-0.19,-0.62,-0.16,0.74,0.07,5.10,1.48 +-0.20,-0.62,-0.16,0.74,0.06,5.09,1.48 +-0.20,-0.62,-0.16,0.74,0.06,5.09,1.48 +-0.20,-0.62,-0.16,0.74,0.06,5.08,1.48 +-0.20,-0.62,-0.17,0.74,0.06,5.08,1.48 +-0.20,-0.62,-0.17,0.74,0.06,5.07,1.48 +-0.20,-0.62,-0.17,0.74,0.06,5.07,1.48 +-0.20,-0.62,-0.17,0.74,0.06,5.06,1.48 +-0.20,-0.62,-0.17,0.74,0.06,5.06,1.48 +-0.20,-0.62,-0.17,0.74,0.06,5.05,1.48 +-0.20,-0.62,-0.17,0.74,0.06,5.05,1.48 +-0.20,-0.62,-0.17,0.74,0.06,5.04,1.48 +-0.20,-0.62,-0.17,0.74,0.06,5.04,1.48 +-0.20,-0.62,-0.17,0.74,0.05,5.03,1.47 +-0.20,-0.62,-0.17,0.74,0.05,5.03,1.47 +-0.20,-0.62,-0.17,0.74,0.05,5.02,1.47 +-0.20,-0.62,-0.17,0.74,0.05,5.02,1.47 +-0.21,-0.62,-0.17,0.74,0.05,5.01,1.47 +-0.21,-0.62,-0.17,0.74,0.05,5.00,1.47 +-0.21,-0.62,-0.17,0.73,0.05,5.00,1.47 +-0.21,-0.62,-0.18,0.73,0.05,4.99,1.47 +-0.21,-0.62,-0.18,0.73,0.05,4.99,1.47 +-0.21,-0.62,-0.18,0.73,0.05,4.98,1.47 +-0.21,-0.62,-0.18,0.73,0.05,4.98,1.47 +-0.21,-0.62,-0.18,0.73,0.05,4.97,1.47 +-0.21,-0.62,-0.18,0.73,0.05,4.97,1.46 +-0.21,-0.62,-0.18,0.73,0.04,4.96,1.46 +-0.21,-0.62,-0.18,0.73,0.04,4.96,1.46 +-0.21,-0.62,-0.18,0.73,0.04,4.95,1.46 +-0.21,-0.62,-0.18,0.73,0.04,4.95,1.46 +-0.21,-0.62,-0.18,0.73,0.04,4.94,1.46 +-0.21,-0.62,-0.18,0.73,0.04,4.94,1.46 +-0.21,-0.62,-0.18,0.73,0.04,4.93,1.46 +-0.21,-0.62,-0.18,0.73,0.04,4.93,1.46 +-0.22,-0.62,-0.18,0.73,0.04,4.92,1.46 +-0.22,-0.62,-0.18,0.73,0.04,4.92,1.46 +-0.22,-0.62,-0.19,0.73,0.04,4.91,1.46 +-0.22,-0.62,-0.19,0.73,0.04,4.91,1.45 +-0.22,-0.62,-0.19,0.73,0.04,4.90,1.45 +-0.22,-0.62,-0.19,0.73,0.04,4.90,1.45 +-0.22,-0.62,-0.19,0.73,0.03,4.89,1.45 +-0.22,-0.62,-0.19,0.73,0.03,4.89,1.45 +-0.22,-0.62,-0.19,0.73,0.03,4.88,1.45 +-0.22,-0.62,-0.19,0.72,0.03,4.88,1.45 +-0.22,-0.62,-0.19,0.72,0.03,4.87,1.45 +-0.22,-0.62,-0.19,0.72,0.03,4.87,1.45 +-0.22,-0.62,-0.19,0.72,0.03,4.86,1.45 +-0.22,-0.62,-0.19,0.72,0.03,4.85,1.45 +-0.22,-0.62,-0.19,0.72,0.03,4.85,1.45 +-0.22,-0.62,-0.19,0.72,0.03,4.84,1.44 +-0.22,-0.62,-0.19,0.72,0.03,4.84,1.44 +-0.23,-0.62,-0.20,0.72,0.03,4.83,1.44 +-0.23,-0.62,-0.20,0.72,0.03,4.83,1.44 +-0.23,-0.63,-0.20,0.72,0.03,4.82,1.44 +-0.23,-0.63,-0.20,0.72,0.03,4.82,1.44 +-0.23,-0.63,-0.20,0.72,0.03,4.81,1.44 +-0.23,-0.63,-0.20,0.72,0.03,4.81,1.44 +-0.23,-0.63,-0.20,0.72,0.02,4.80,1.44 +-0.23,-0.63,-0.20,0.72,0.02,4.80,1.44 +-0.23,-0.63,-0.20,0.72,0.02,4.79,1.44 +-0.23,-0.63,-0.20,0.72,0.02,4.79,1.44 +-0.23,-0.63,-0.20,0.72,0.02,4.78,1.43 +-0.23,-0.63,-0.20,0.72,0.02,4.78,1.43 +-0.23,-0.63,-0.20,0.72,0.02,4.77,1.43 +-0.23,-0.63,-0.20,0.72,0.02,4.77,1.43 +-0.23,-0.63,-0.20,0.72,0.02,4.76,1.43 +-0.23,-0.63,-0.21,0.71,0.02,4.76,1.43 +-0.23,-0.63,-0.21,0.71,0.02,4.75,1.43 +-0.24,-0.63,-0.21,0.71,0.02,4.75,1.43 +-0.24,-0.63,-0.21,0.71,0.02,4.74,1.43 +-0.24,-0.63,-0.21,0.71,0.02,4.73,1.43 +-0.24,-0.63,-0.21,0.71,0.02,4.73,1.43 +-0.24,-0.63,-0.21,0.71,0.02,4.72,1.42 +-0.24,-0.63,-0.21,0.71,0.02,4.72,1.42 +-0.24,-0.63,-0.21,0.71,0.02,4.71,1.42 +-0.24,-0.63,-0.21,0.71,0.02,4.71,1.42 +-0.24,-0.63,-0.21,0.71,0.02,4.70,1.42 +-0.24,-0.63,-0.21,0.71,0.01,4.70,1.42 +-0.24,-0.63,-0.21,0.71,0.01,4.69,1.42 +-0.24,-0.63,-0.21,0.71,0.01,4.69,1.42 +-0.24,-0.63,-0.21,0.71,0.01,4.68,1.42 +-0.24,-0.63,-0.22,0.71,0.01,4.68,1.42 +-0.24,-0.63,-0.22,0.71,0.01,4.67,1.42 +-0.24,-0.63,-0.22,0.71,0.01,4.67,1.42 +-0.24,-0.63,-0.22,0.71,0.01,4.66,1.41 +-0.25,-0.63,-0.22,0.71,0.01,4.66,1.41 +-0.25,-0.63,-0.22,0.71,0.01,4.65,1.41 +-0.25,-0.63,-0.22,0.71,0.01,4.65,1.41 +-0.25,-0.63,-0.22,0.71,0.01,4.64,1.41 +-0.25,-0.63,-0.22,0.70,0.01,4.63,1.41 +-0.25,-0.63,-0.22,0.70,0.01,4.63,1.41 +-0.25,-0.63,-0.22,0.70,0.01,4.62,1.41 +-0.25,-0.63,-0.22,0.70,0.01,4.62,1.41 +-0.25,-0.63,-0.22,0.70,0.01,4.61,1.41 +-0.25,-0.63,-0.22,0.70,0.01,4.61,1.41 +-0.25,-0.63,-0.22,0.70,0.01,4.60,1.40 +-0.25,-0.63,-0.22,0.70,0.01,4.60,1.40 +-0.25,-0.63,-0.23,0.70,0.01,4.59,1.40 +-0.25,-0.63,-0.23,0.70,0.01,4.59,1.40 +-0.25,-0.63,-0.23,0.70,0.01,4.58,1.40 +-0.25,-0.63,-0.23,0.70,0.01,4.58,1.40 +-0.25,-0.63,-0.23,0.70,0.01,4.57,1.40 +-0.25,-0.63,-0.23,0.70,0.01,4.57,1.40 +-0.26,-0.63,-0.23,0.70,0.01,4.56,1.40 +-0.26,-0.63,-0.23,0.70,0.01,4.55,1.40 +-0.26,-0.63,-0.23,0.70,0.01,4.55,1.40 +-0.26,-0.63,-0.23,0.70,0.01,4.54,1.39 +-0.26,-0.63,-0.23,0.70,0.00,4.54,1.39 +-0.26,-0.63,-0.23,0.70,0.00,4.53,1.39 +-0.26,-0.63,-0.23,0.70,0.00,4.53,1.39 +-0.26,-0.63,-0.23,0.70,0.00,4.52,1.39 +-0.26,-0.63,-0.23,0.69,0.00,4.52,1.39 +-0.26,-0.63,-0.24,0.69,0.00,4.51,1.39 +-0.26,-0.63,-0.24,0.69,0.00,4.51,1.39 +-0.26,-0.63,-0.24,0.69,0.00,4.50,1.39 +-0.26,-0.63,-0.24,0.69,0.00,4.50,1.39 +-0.26,-0.63,-0.24,0.69,0.00,4.49,1.39 +-0.26,-0.63,-0.24,0.69,0.00,4.49,1.38 +-0.26,-0.63,-0.24,0.69,0.00,4.48,1.38 +-0.26,-0.63,-0.24,0.69,0.00,4.48,1.38 +-0.26,-0.63,-0.24,0.69,0.00,4.47,1.38 +-0.27,-0.63,-0.24,0.69,0.00,4.46,1.38 +-0.27,-0.63,-0.24,0.69,0.00,4.46,1.38 +-0.27,-0.63,-0.24,0.69,0.00,4.45,1.38 +-0.27,-0.63,-0.24,0.69,0.00,4.45,1.38 +-0.27,-0.63,-0.24,0.69,0.00,4.44,1.38 +-0.27,-0.63,-0.24,0.69,0.00,4.44,1.38 +-0.27,-0.63,-0.25,0.69,0.00,4.43,1.38 +-0.27,-0.63,-0.25,0.69,0.00,4.43,1.37 +-0.27,-0.63,-0.25,0.69,0.00,4.42,1.37 +-0.27,-0.63,-0.25,0.69,0.00,4.42,1.37 +-0.27,-0.63,-0.25,0.69,0.00,4.41,1.37 +-0.27,-0.63,-0.25,0.69,0.00,4.41,1.37 +-0.27,-0.63,-0.25,0.68,0.00,4.40,1.37 +-0.27,-0.63,-0.25,0.68,0.00,4.39,1.37 +-0.27,-0.63,-0.25,0.68,0.00,4.39,1.37 +-0.27,-0.63,-0.25,0.68,0.00,4.38,1.37 +-0.27,-0.63,-0.25,0.68,0.00,4.38,1.37 +-0.27,-0.63,-0.25,0.68,0.00,4.37,1.36 +-0.28,-0.63,-0.25,0.68,0.00,4.37,1.36 +-0.28,-0.63,-0.25,0.68,0.00,4.36,1.36 +-0.28,-0.63,-0.26,0.68,0.00,4.36,1.36 +-0.28,-0.63,-0.26,0.68,0.00,4.35,1.36 +-0.28,-0.63,-0.26,0.68,0.00,4.35,1.36 +-0.28,-0.63,-0.26,0.68,0.00,4.34,1.36 +-0.28,-0.63,-0.26,0.68,0.00,4.34,1.36 +-0.28,-0.63,-0.26,0.68,0.00,4.33,1.36 +-0.28,-0.63,-0.26,0.68,0.00,4.32,1.36 +-0.28,-0.63,-0.26,0.68,0.00,4.32,1.36 +-0.28,-0.63,-0.26,0.68,0.00,4.31,1.35 +-0.28,-0.63,-0.26,0.68,0.00,4.31,1.35 +-0.28,-0.63,-0.26,0.68,0.00,4.30,1.35 +-0.28,-0.63,-0.26,0.68,0.00,4.30,1.35 +-0.28,-0.63,-0.26,0.68,0.00,4.29,1.35 +-0.28,-0.63,-0.26,0.67,0.00,4.29,1.35 +-0.28,-0.63,-0.26,0.67,0.00,4.28,1.35 +-0.28,-0.63,-0.27,0.67,0.00,4.28,1.35 +-0.28,-0.63,-0.27,0.67,0.00,4.27,1.35 +-0.29,-0.63,-0.27,0.67,0.00,4.27,1.35 +-0.29,-0.63,-0.27,0.67,0.00,4.26,1.34 +-0.29,-0.63,-0.27,0.67,0.00,4.25,1.34 +-0.29,-0.63,-0.27,0.67,0.00,4.25,1.34 +-0.29,-0.63,-0.27,0.67,0.00,4.24,1.34 +-0.29,-0.63,-0.27,0.67,0.00,4.24,1.34 +-0.29,-0.63,-0.27,0.67,0.00,4.23,1.34 +-0.29,-0.63,-0.27,0.67,0.00,4.23,1.34 +-0.29,-0.63,-0.27,0.67,0.00,4.22,1.34 +-0.29,-0.63,-0.27,0.67,0.00,4.22,1.34 +-0.29,-0.63,-0.27,0.67,0.00,4.21,1.34 +-0.29,-0.63,-0.27,0.67,0.00,4.21,1.34 +-0.29,-0.63,-0.27,0.67,0.00,4.20,1.33 +-0.29,-0.63,-0.28,0.67,0.00,4.20,1.33 +-0.29,-0.63,-0.28,0.67,0.00,4.19,1.33 +-0.29,-0.63,-0.28,0.67,0.00,4.18,1.33 +-0.29,-0.63,-0.28,0.67,0.00,4.18,1.33 +-0.29,-0.63,-0.28,0.66,0.00,4.17,1.33 +-0.29,-0.63,-0.28,0.66,0.00,4.17,1.33 +-0.30,-0.63,-0.28,0.66,0.00,4.16,1.33 +-0.30,-0.63,-0.28,0.66,0.00,4.16,1.33 +-0.30,-0.63,-0.28,0.66,0.00,4.15,1.33 +-0.30,-0.63,-0.28,0.66,0.00,4.15,1.32 +-0.30,-0.63,-0.28,0.66,0.00,4.14,1.32 +-0.30,-0.63,-0.28,0.66,0.00,4.14,1.32 +-0.30,-0.63,-0.28,0.66,0.00,4.13,1.32 +-0.30,-0.63,-0.28,0.66,0.00,4.12,1.32 +-0.30,-0.63,-0.28,0.66,0.00,4.12,1.32 +-0.30,-0.63,-0.29,0.66,0.00,4.11,1.32 +-0.30,-0.63,-0.29,0.66,0.01,4.11,1.32 +-0.30,-0.63,-0.29,0.66,0.01,4.10,1.32 +-0.30,-0.63,-0.29,0.66,0.01,4.10,1.32 +-0.30,-0.63,-0.29,0.66,0.01,4.09,1.31 +-0.30,-0.63,-0.29,0.66,0.01,4.09,1.31 +-0.30,-0.63,-0.29,0.66,0.01,4.08,1.31 +-0.30,-0.63,-0.29,0.66,0.01,4.08,1.31 +-0.30,-0.63,-0.29,0.66,0.01,4.07,1.31 +-0.30,-0.63,-0.29,0.65,0.01,4.06,1.31 +-0.30,-0.63,-0.29,0.65,0.01,4.06,1.31 +-0.31,-0.63,-0.29,0.65,0.01,4.05,1.31 +-0.31,-0.63,-0.29,0.65,0.01,4.05,1.31 +-0.31,-0.63,-0.29,0.65,0.01,4.04,1.31 +-0.31,-0.63,-0.29,0.65,0.01,4.04,1.30 +-0.31,-0.63,-0.30,0.65,0.01,4.03,1.30 +-0.31,-0.63,-0.30,0.65,0.01,4.03,1.30 +-0.31,-0.63,-0.30,0.65,0.01,4.02,1.30 +-0.31,-0.63,-0.30,0.65,0.01,4.02,1.30 +-0.31,-0.63,-0.30,0.65,0.01,4.01,1.30 +-0.31,-0.63,-0.30,0.65,0.01,4.00,1.30 +-0.31,-0.63,-0.30,0.65,0.01,4.00,1.30 +-0.31,-0.63,-0.30,0.65,0.01,3.99,1.30 +-0.31,-0.63,-0.30,0.65,0.01,3.99,1.30 +-0.31,-0.63,-0.30,0.65,0.01,3.98,1.29 +-0.31,-0.63,-0.30,0.65,0.01,3.98,1.29 +-0.31,-0.63,-0.30,0.65,0.01,3.97,1.29 +-0.31,-0.63,-0.30,0.65,0.01,3.97,1.29 +-0.31,-0.63,-0.30,0.65,0.01,3.96,1.29 +-0.31,-0.63,-0.31,0.64,0.01,3.96,1.29 +-0.31,-0.63,-0.31,0.64,0.02,3.95,1.29 +-0.32,-0.63,-0.31,0.64,0.02,3.94,1.29 +-0.32,-0.63,-0.31,0.64,0.02,3.94,1.29 +-0.32,-0.63,-0.31,0.64,0.02,3.93,1.29 +-0.32,-0.63,-0.31,0.64,0.02,3.93,1.28 +-0.32,-0.63,-0.31,0.64,0.02,3.92,1.28 +-0.32,-0.63,-0.31,0.64,0.02,3.92,1.28 +-0.32,-0.63,-0.31,0.64,0.02,3.91,1.28 +-0.32,-0.63,-0.31,0.64,0.02,3.91,1.28 +-0.32,-0.63,-0.31,0.64,0.02,3.90,1.28 +-0.32,-0.63,-0.31,0.64,0.02,3.90,1.28 +-0.32,-0.63,-0.31,0.64,0.02,3.89,1.28 +-0.32,-0.63,-0.31,0.64,0.02,3.88,1.28 +-0.32,-0.63,-0.31,0.64,0.02,3.88,1.28 +-0.32,-0.63,-0.32,0.64,0.02,3.87,1.27 +-0.32,-0.63,-0.32,0.64,0.02,3.87,1.27 +-0.32,-0.63,-0.32,0.64,0.02,3.86,1.27 +-0.32,-0.63,-0.32,0.64,0.02,3.86,1.27 +-0.32,-0.63,-0.32,0.64,0.02,3.85,1.27 +-0.32,-0.63,-0.32,0.63,0.02,3.85,1.27 +-0.32,-0.63,-0.32,0.63,0.03,3.84,1.27 +-0.32,-0.63,-0.32,0.63,0.03,3.83,1.27 +-0.33,-0.63,-0.32,0.63,0.03,3.83,1.27 +-0.33,-0.62,-0.32,0.63,0.03,3.82,1.26 +-0.33,-0.62,-0.32,0.63,0.03,3.82,1.26 +-0.33,-0.62,-0.32,0.63,0.03,3.81,1.26 +-0.33,-0.62,-0.32,0.63,0.03,3.81,1.26 +-0.33,-0.62,-0.32,0.63,0.03,3.80,1.26 +-0.33,-0.62,-0.33,0.63,0.03,3.80,1.26 +-0.33,-0.62,-0.33,0.63,0.03,3.79,1.26 +-0.33,-0.62,-0.33,0.63,0.03,3.79,1.26 +-0.33,-0.62,-0.33,0.63,0.03,3.78,1.26 +-0.33,-0.62,-0.33,0.63,0.03,3.77,1.26 +-0.33,-0.62,-0.33,0.63,0.03,3.77,1.25 +-0.33,-0.62,-0.33,0.63,0.03,3.76,1.25 +-0.33,-0.62,-0.33,0.63,0.03,3.76,1.25 +-0.33,-0.62,-0.33,0.63,0.04,3.75,1.25 +-0.33,-0.62,-0.33,0.63,0.04,3.75,1.25 +-0.33,-0.62,-0.33,0.62,0.04,3.74,1.25 +-0.33,-0.62,-0.33,0.62,0.04,3.74,1.25 +-0.33,-0.62,-0.33,0.62,0.04,3.73,1.25 +-0.33,-0.62,-0.33,0.62,0.04,3.72,1.25 +-0.33,-0.62,-0.33,0.62,0.04,3.72,1.25 +-0.33,-0.62,-0.34,0.62,0.04,3.71,1.24 +-0.34,-0.62,-0.34,0.62,0.04,3.71,1.24 +-0.34,-0.62,-0.34,0.62,0.04,3.70,1.24 +-0.34,-0.62,-0.34,0.62,0.04,3.70,1.24 +-0.34,-0.62,-0.34,0.62,0.04,3.69,1.24 +-0.34,-0.62,-0.34,0.62,0.04,3.69,1.24 +-0.34,-0.62,-0.34,0.62,0.04,3.68,1.24 +-0.34,-0.62,-0.34,0.62,0.05,3.68,1.24 +-0.34,-0.62,-0.34,0.62,0.05,3.67,1.24 +-0.34,-0.62,-0.34,0.62,0.05,3.66,1.23 +-0.34,-0.62,-0.34,0.62,0.05,3.66,1.23 +-0.34,-0.62,-0.34,0.62,0.05,3.65,1.23 +-0.34,-0.62,-0.34,0.62,0.05,3.65,1.23 +-0.34,-0.62,-0.34,0.62,0.05,3.64,1.23 +-0.34,-0.62,-0.35,0.61,0.05,3.64,1.23 +-0.34,-0.62,-0.35,0.61,0.05,3.63,1.23 +-0.34,-0.62,-0.35,0.61,0.05,3.63,1.23 +-0.34,-0.62,-0.35,0.61,0.05,3.62,1.23 +-0.34,-0.62,-0.35,0.61,0.05,3.61,1.23 +-0.34,-0.62,-0.35,0.61,0.06,3.61,1.22 +-0.34,-0.62,-0.35,0.61,0.06,3.60,1.22 +-0.34,-0.62,-0.35,0.61,0.06,3.60,1.22 +-0.34,-0.62,-0.35,0.61,0.06,3.59,1.22 +-0.34,-0.62,-0.35,0.61,0.06,3.59,1.22 +-0.35,-0.62,-0.35,0.61,0.06,3.58,1.22 +-0.35,-0.62,-0.35,0.61,0.06,3.58,1.22 +-0.35,-0.62,-0.35,0.61,0.06,3.57,1.22 +-0.35,-0.62,-0.35,0.61,0.06,3.57,1.22 +-0.35,-0.62,-0.35,0.61,0.06,3.56,1.21 +-0.35,-0.62,-0.36,0.61,0.06,3.55,1.21 +-0.35,-0.62,-0.36,0.61,0.07,3.55,1.21 +-0.35,-0.62,-0.36,0.61,0.07,3.54,1.21 +-0.35,-0.62,-0.36,0.61,0.07,3.54,1.21 +-0.35,-0.62,-0.36,0.60,0.07,3.53,1.21 +-0.35,-0.62,-0.36,0.60,0.07,3.53,1.21 +-0.35,-0.62,-0.36,0.60,0.07,3.52,1.21 +-0.35,-0.62,-0.36,0.60,0.07,3.52,1.21 +-0.35,-0.62,-0.36,0.60,0.07,3.51,1.20 +-0.35,-0.62,-0.36,0.60,0.07,3.50,1.20 +-0.35,-0.62,-0.36,0.60,0.07,3.50,1.20 +-0.35,-0.62,-0.36,0.60,0.07,3.49,1.20 +-0.35,-0.62,-0.36,0.60,0.08,3.49,1.20 +-0.35,-0.62,-0.36,0.60,0.08,3.48,1.20 +-0.35,-0.62,-0.37,0.60,0.08,3.48,1.20 +-0.35,-0.62,-0.37,0.60,0.08,3.47,1.20 +-0.35,-0.62,-0.37,0.60,0.08,3.47,1.20 +-0.35,-0.62,-0.37,0.60,0.08,3.46,1.20 +-0.36,-0.62,-0.37,0.60,0.08,3.45,1.19 +-0.36,-0.62,-0.37,0.60,0.08,3.45,1.19 +-0.36,-0.62,-0.37,0.60,0.08,3.44,1.19 +-0.36,-0.62,-0.37,0.60,0.08,3.44,1.19 +-0.36,-0.62,-0.37,0.59,0.09,3.43,1.19 +-0.36,-0.62,-0.37,0.59,0.09,3.43,1.19 +-0.36,-0.62,-0.37,0.59,0.09,3.42,1.19 +-0.36,-0.62,-0.37,0.59,0.09,3.42,1.19 +-0.36,-0.62,-0.37,0.59,0.09,3.41,1.19 +-0.36,-0.62,-0.37,0.59,0.09,3.41,1.18 +-0.36,-0.62,-0.37,0.59,0.09,3.40,1.18 +-0.36,-0.62,-0.38,0.59,0.09,3.39,1.18 +-0.36,-0.62,-0.38,0.59,0.09,3.39,1.18 +-0.36,-0.62,-0.38,0.59,0.10,3.38,1.18 +-0.36,-0.62,-0.38,0.59,0.10,3.38,1.18 +-0.36,-0.62,-0.38,0.59,0.10,3.37,1.18 +-0.36,-0.62,-0.38,0.59,0.10,3.37,1.18 +-0.36,-0.62,-0.38,0.59,0.10,3.36,1.18 +-0.36,-0.62,-0.38,0.59,0.10,3.36,1.17 +-0.36,-0.62,-0.38,0.59,0.10,3.35,1.17 +-0.36,-0.62,-0.38,0.59,0.10,3.34,1.17 +-0.36,-0.62,-0.38,0.59,0.10,3.34,1.17 +-0.36,-0.62,-0.38,0.59,0.11,3.33,1.17 +-0.36,-0.62,-0.38,0.58,0.11,3.33,1.17 +-0.37,-0.61,-0.38,0.58,0.11,3.32,1.17 +-0.37,-0.61,-0.39,0.58,0.11,3.32,1.17 +-0.37,-0.61,-0.39,0.58,0.11,3.31,1.17 +-0.37,-0.61,-0.39,0.58,0.11,3.31,1.16 +-0.37,-0.61,-0.39,0.58,0.11,3.30,1.16 +-0.37,-0.61,-0.39,0.58,0.11,3.29,1.16 +-0.37,-0.61,-0.39,0.58,0.12,3.29,1.16 +-0.37,-0.61,-0.39,0.58,0.12,3.28,1.16 +-0.37,-0.61,-0.39,0.58,0.12,3.28,1.16 +-0.37,-0.61,-0.39,0.58,0.12,3.27,1.16 +-0.37,-0.61,-0.39,0.58,0.12,3.27,1.16 +-0.37,-0.61,-0.39,0.58,0.12,3.26,1.16 +-0.37,-0.61,-0.39,0.58,0.12,3.26,1.15 +-0.37,-0.61,-0.39,0.58,0.12,3.25,1.15 +-0.37,-0.61,-0.39,0.58,0.13,3.24,1.15 +-0.37,-0.61,-0.39,0.58,0.13,3.24,1.15 +-0.37,-0.61,-0.40,0.58,0.13,3.23,1.15 +-0.37,-0.61,-0.40,0.57,0.13,3.23,1.15 +-0.37,-0.61,-0.40,0.57,0.13,3.22,1.15 +-0.37,-0.61,-0.40,0.57,0.13,3.22,1.15 +-0.37,-0.61,-0.40,0.57,0.13,3.21,1.15 +-0.37,-0.61,-0.40,0.57,0.13,3.21,1.14 +-0.37,-0.61,-0.40,0.57,0.14,3.20,1.14 +-0.37,-0.61,-0.40,0.57,0.14,3.20,1.14 +-0.37,-0.61,-0.40,0.57,0.14,3.19,1.14 +-0.37,-0.61,-0.40,0.57,0.14,3.18,1.14 +-0.38,-0.61,-0.40,0.57,0.14,3.18,1.14 +-0.38,-0.61,-0.40,0.57,0.14,3.17,1.14 +-0.38,-0.61,-0.40,0.57,0.14,3.17,1.14 +-0.38,-0.61,-0.40,0.57,0.15,3.16,1.14 +-0.38,-0.61,-0.41,0.57,0.15,3.16,1.13 +-0.38,-0.61,-0.41,0.57,0.15,3.15,1.13 +-0.38,-0.61,-0.41,0.57,0.15,3.15,1.13 +-0.38,-0.61,-0.41,0.57,0.15,3.14,1.13 +-0.38,-0.61,-0.41,0.57,0.15,3.13,1.13 +-0.38,-0.61,-0.41,0.56,0.15,3.13,1.13 +-0.38,-0.61,-0.41,0.56,0.16,3.12,1.13 +-0.38,-0.61,-0.41,0.56,0.16,3.12,1.13 +-0.38,-0.61,-0.41,0.56,0.16,3.11,1.13 +-0.38,-0.61,-0.41,0.56,0.16,3.11,1.12 +-0.38,-0.61,-0.41,0.56,0.16,3.10,1.12 +-0.38,-0.61,-0.41,0.56,0.16,3.10,1.12 +-0.38,-0.61,-0.41,0.56,0.16,3.09,1.12 +-0.38,-0.61,-0.41,0.56,0.17,3.08,1.12 +-0.38,-0.61,-0.41,0.56,0.17,3.08,1.12 +-0.38,-0.61,-0.42,0.56,0.17,3.07,1.12 +-0.38,-0.61,-0.42,0.56,0.17,3.07,1.12 +-0.38,-0.61,-0.42,0.56,0.17,3.06,1.12 +-0.38,-0.61,-0.42,0.56,0.17,3.06,1.11 +-0.38,-0.61,-0.42,0.56,0.17,3.05,1.11 +-0.38,-0.61,-0.42,0.56,0.18,3.05,1.11 +-0.38,-0.61,-0.42,0.56,0.18,3.04,1.11 +-0.38,-0.61,-0.42,0.55,0.18,3.03,1.11 +-0.39,-0.61,-0.42,0.55,0.18,3.03,1.11 +-0.39,-0.61,-0.42,0.55,0.18,3.02,1.11 +-0.39,-0.61,-0.42,0.55,0.18,3.02,1.11 +-0.39,-0.61,-0.42,0.55,0.18,3.01,1.11 +-0.39,-0.61,-0.42,0.55,0.19,3.01,1.10 +-0.39,-0.60,-0.42,0.55,0.19,3.00,1.10 +-0.39,-0.60,-0.43,0.55,0.19,3.00,1.10 +-0.39,-0.60,-0.43,0.55,0.19,2.99,1.10 +-0.39,-0.60,-0.43,0.55,0.19,2.99,1.10 +-0.39,-0.60,-0.43,0.55,0.19,2.98,1.10 +-0.39,-0.60,-0.43,0.55,0.20,2.97,1.10 +-0.39,-0.60,-0.43,0.55,0.20,2.97,1.10 +-0.39,-0.60,-0.43,0.55,0.20,2.96,1.10 +-0.39,-0.60,-0.43,0.55,0.20,2.96,1.09 +-0.39,-0.60,-0.43,0.55,0.20,2.95,1.09 +-0.39,-0.60,-0.43,0.55,0.20,2.95,1.09 +-0.39,-0.60,-0.43,0.55,0.21,2.94,1.09 +-0.39,-0.60,-0.43,0.54,0.21,2.94,1.09 +-0.39,-0.60,-0.43,0.54,0.21,2.93,1.09 +-0.39,-0.60,-0.43,0.54,0.21,2.92,1.09 +-0.39,-0.60,-0.43,0.54,0.21,2.92,1.09 +-0.39,-0.60,-0.44,0.54,0.21,2.91,1.08 +-0.39,-0.60,-0.44,0.54,0.22,2.91,1.08 +-0.39,-0.60,-0.44,0.54,0.22,2.90,1.08 +-0.39,-0.60,-0.44,0.54,0.22,2.90,1.08 +-0.39,-0.60,-0.44,0.54,0.22,2.89,1.08 +-0.39,-0.60,-0.44,0.54,0.22,2.89,1.08 +-0.39,-0.60,-0.44,0.54,0.22,2.88,1.08 +-0.40,-0.60,-0.44,0.54,0.23,2.88,1.08 +-0.40,-0.60,-0.44,0.54,0.23,2.87,1.08 +-0.40,-0.60,-0.44,0.54,0.23,2.86,1.07 +-0.40,-0.60,-0.44,0.54,0.23,2.86,1.07 +-0.40,-0.60,-0.44,0.54,0.23,2.85,1.07 +-0.40,-0.60,-0.44,0.54,0.23,2.85,1.07 +-0.40,-0.60,-0.44,0.54,0.24,2.84,1.07 +-0.40,-0.60,-0.45,0.53,0.24,2.84,1.07 +-0.40,-0.60,-0.45,0.53,0.24,2.83,1.07 +-0.40,-0.60,-0.45,0.53,0.24,2.83,1.07 +-0.40,-0.60,-0.45,0.53,0.24,2.82,1.07 +-0.40,-0.60,-0.45,0.53,0.25,2.81,1.06 +-0.40,-0.60,-0.45,0.53,0.25,2.81,1.06 +-0.40,-0.60,-0.45,0.53,0.25,2.80,1.06 +-0.40,-0.60,-0.45,0.53,0.25,2.80,1.06 +-0.40,-0.60,-0.45,0.53,0.25,2.79,1.06 +-0.40,-0.60,-0.45,0.53,0.25,2.79,1.06 +-0.40,-0.60,-0.45,0.53,0.26,2.78,1.06 +-0.40,-0.60,-0.45,0.53,0.26,2.78,1.06 +-0.40,-0.60,-0.45,0.53,0.26,2.77,1.06 +-0.40,-0.60,-0.45,0.53,0.26,2.77,1.05 +-0.40,-0.60,-0.45,0.53,0.26,2.76,1.05 +-0.40,-0.60,-0.46,0.53,0.27,2.75,1.05 +-0.40,-0.59,-0.46,0.53,0.27,2.75,1.05 +-0.40,-0.59,-0.46,0.52,0.27,2.74,1.05 +-0.40,-0.59,-0.46,0.52,0.27,2.74,1.05 +-0.40,-0.59,-0.46,0.52,0.27,2.73,1.05 +-0.40,-0.59,-0.46,0.52,0.27,2.73,1.05 +-0.40,-0.59,-0.46,0.52,0.28,2.72,1.04 +-0.40,-0.59,-0.46,0.52,0.28,2.72,1.04 +-0.40,-0.59,-0.46,0.52,0.28,2.71,1.04 +-0.41,-0.59,-0.46,0.52,0.28,2.70,1.04 +-0.41,-0.59,-0.46,0.52,0.28,2.70,1.04 +-0.41,-0.59,-0.46,0.52,0.29,2.69,1.04 +-0.41,-0.59,-0.46,0.52,0.29,2.69,1.04 +-0.41,-0.59,-0.46,0.52,0.29,2.68,1.04 +-0.41,-0.59,-0.46,0.52,0.29,2.68,1.04 +-0.41,-0.59,-0.47,0.52,0.29,2.67,1.03 +-0.41,-0.59,-0.47,0.52,0.30,2.67,1.03 +-0.41,-0.59,-0.47,0.52,0.30,2.66,1.03 +-0.41,-0.59,-0.47,0.52,0.30,2.66,1.03 +-0.41,-0.59,-0.47,0.51,0.30,2.65,1.03 +-0.41,-0.59,-0.47,0.51,0.30,2.64,1.03 +-0.41,-0.59,-0.47,0.51,0.31,2.64,1.03 +-0.41,-0.59,-0.47,0.51,0.31,2.63,1.03 +-0.41,-0.59,-0.47,0.51,0.31,2.63,1.03 +-0.41,-0.59,-0.47,0.51,0.31,2.62,1.02 +-0.41,-0.59,-0.47,0.51,0.31,2.62,1.02 +-0.41,-0.59,-0.47,0.51,0.32,2.61,1.02 +-0.41,-0.59,-0.47,0.51,0.32,2.61,1.02 +-0.41,-0.59,-0.47,0.51,0.32,2.60,1.02 +-0.41,-0.59,-0.48,0.51,0.32,2.60,1.02 +-0.41,-0.59,-0.48,0.51,0.32,2.59,1.02 +-0.41,-0.59,-0.48,0.51,0.33,2.58,1.02 +-0.41,-0.59,-0.48,0.51,0.33,2.58,1.01 +-0.41,-0.59,-0.48,0.51,0.33,2.57,1.01 +-0.41,-0.59,-0.48,0.51,0.33,2.57,1.01 +-0.41,-0.59,-0.48,0.51,0.34,2.56,1.01 +-0.41,-0.59,-0.48,0.50,0.34,2.56,1.01 +-0.41,-0.59,-0.48,0.50,0.34,2.55,1.01 +-0.41,-0.59,-0.48,0.50,0.34,2.55,1.01 +-0.41,-0.59,-0.48,0.50,0.34,2.54,1.01 +-0.41,-0.59,-0.48,0.50,0.35,2.54,1.01 +-0.41,-0.58,-0.48,0.50,0.35,2.53,1.00 +-0.42,-0.58,-0.48,0.50,0.35,2.52,1.00 +-0.42,-0.58,-0.48,0.50,0.35,2.52,1.00 +-0.42,-0.58,-0.49,0.50,0.35,2.51,1.00 +-0.42,-0.58,-0.49,0.50,0.36,2.51,1.00 +-0.42,-0.58,-0.49,0.50,0.36,2.50,1.00 +-0.42,-0.58,-0.49,0.50,0.36,2.50,1.00 +-0.42,-0.58,-0.49,0.50,0.36,2.49,1.00 +-0.42,-0.58,-0.49,0.50,0.37,2.49,0.99 +-0.42,-0.58,-0.49,0.50,0.37,2.48,0.99 +-0.42,-0.58,-0.49,0.50,0.37,2.48,0.99 +-0.42,-0.58,-0.49,0.50,0.37,2.47,0.99 +-0.42,-0.58,-0.49,0.50,0.37,2.46,0.99 +-0.42,-0.58,-0.49,0.49,0.38,2.46,0.99 +-0.42,-0.58,-0.49,0.49,0.38,2.45,0.99 +-0.42,-0.58,-0.49,0.49,0.38,2.45,0.99 +-0.42,-0.58,-0.49,0.49,0.38,2.44,0.99 +-0.42,-0.58,-0.49,0.49,0.39,2.44,0.98 +-0.42,-0.58,-0.50,0.49,0.39,2.43,0.98 +-0.42,-0.58,-0.50,0.49,0.39,2.43,0.98 +-0.42,-0.58,-0.50,0.49,0.39,2.42,0.98 +-0.42,-0.58,-0.50,0.49,0.39,2.42,0.98 +-0.42,-0.58,-0.50,0.49,0.40,2.41,0.98 +-0.42,-0.58,-0.50,0.49,0.40,2.41,0.98 +-0.42,-0.58,-0.50,0.49,0.40,2.40,0.98 +-0.42,-0.58,-0.50,0.49,0.40,2.39,0.97 +-0.42,-0.58,-0.50,0.49,0.41,2.39,0.97 +-0.42,-0.58,-0.50,0.49,0.41,2.38,0.97 +-0.42,-0.58,-0.50,0.49,0.41,2.38,0.97 +-0.42,-0.58,-0.50,0.49,0.41,2.37,0.97 +-0.42,-0.58,-0.50,0.48,0.41,2.37,0.97 +-0.42,-0.58,-0.50,0.48,0.42,2.36,0.97 +-0.42,-0.58,-0.51,0.48,0.42,2.36,0.97 +-0.42,-0.58,-0.51,0.48,0.42,2.35,0.97 +-0.42,-0.58,-0.51,0.48,0.42,2.35,0.96 +-0.42,-0.58,-0.51,0.48,0.43,2.34,0.96 +-0.42,-0.57,-0.51,0.48,0.43,2.33,0.96 +-0.43,-0.57,-0.51,0.48,0.43,2.33,0.96 +-0.43,-0.57,-0.51,0.48,0.43,2.32,0.96 +-0.43,-0.57,-0.51,0.48,0.44,2.32,0.96 +-0.43,-0.57,-0.51,0.48,0.44,2.31,0.96 +-0.43,-0.57,-0.51,0.48,0.44,2.31,0.96 +-0.43,-0.57,-0.51,0.48,0.44,2.30,0.95 +-0.43,-0.57,-0.51,0.48,0.45,2.30,0.95 +-0.43,-0.57,-0.51,0.48,0.45,2.29,0.95 +-0.43,-0.57,-0.51,0.48,0.45,2.29,0.95 +-0.43,-0.57,-0.51,0.48,0.45,2.28,0.95 +-0.43,-0.57,-0.52,0.47,0.46,2.28,0.95 +-0.43,-0.57,-0.52,0.47,0.46,2.27,0.95 +-0.43,-0.57,-0.52,0.47,0.46,2.26,0.95 +-0.43,-0.57,-0.52,0.47,0.46,2.26,0.95 +-0.43,-0.57,-0.52,0.47,0.47,2.25,0.94 +-0.43,-0.57,-0.52,0.47,0.47,2.25,0.94 +-0.43,-0.57,-0.52,0.47,0.47,2.24,0.94 +-0.43,-0.57,-0.52,0.47,0.47,2.24,0.94 +-0.43,-0.57,-0.52,0.47,0.48,2.23,0.94 +-0.43,-0.57,-0.52,0.47,0.48,2.23,0.94 +-0.43,-0.57,-0.52,0.47,0.48,2.22,0.94 +-0.43,-0.57,-0.52,0.47,0.48,2.22,0.94 +-0.43,-0.57,-0.52,0.47,0.49,2.21,0.93 +-0.43,-0.57,-0.52,0.47,0.49,2.21,0.93 +-0.43,-0.57,-0.52,0.47,0.49,2.20,0.93 +-0.43,-0.57,-0.53,0.47,0.49,2.19,0.93 +-0.43,-0.57,-0.53,0.46,0.50,2.19,0.93 +-0.43,-0.57,-0.53,0.46,0.50,2.18,0.93 +-0.43,-0.57,-0.53,0.46,0.50,2.18,0.93 +-0.43,-0.57,-0.53,0.46,0.50,2.17,0.93 +-0.43,-0.57,-0.53,0.46,0.51,2.17,0.93 +-0.43,-0.56,-0.53,0.46,0.51,2.16,0.92 +-0.43,-0.56,-0.53,0.46,0.51,2.16,0.92 +-0.43,-0.56,-0.53,0.46,0.51,2.15,0.92 +-0.43,-0.56,-0.53,0.46,0.52,2.15,0.92 +-0.43,-0.56,-0.53,0.46,0.52,2.14,0.92 +-0.43,-0.56,-0.53,0.46,0.52,2.14,0.92 +-0.43,-0.56,-0.53,0.46,0.52,2.13,0.92 +-0.43,-0.56,-0.53,0.46,0.53,2.13,0.92 +-0.43,-0.56,-0.53,0.46,0.53,2.12,0.91 +-0.44,-0.56,-0.54,0.46,0.53,2.11,0.91 +-0.44,-0.56,-0.54,0.46,0.53,2.11,0.91 +-0.44,-0.56,-0.54,0.46,0.54,2.10,0.91 +-0.44,-0.56,-0.54,0.45,0.54,2.10,0.91 +-0.44,-0.56,-0.54,0.45,0.54,2.09,0.91 +-0.44,-0.56,-0.54,0.45,0.55,2.09,0.91 +-0.44,-0.56,-0.54,0.45,0.55,2.08,0.91 +-0.44,-0.56,-0.54,0.45,0.55,2.08,0.90 +-0.44,-0.56,-0.54,0.45,0.55,2.07,0.90 +-0.44,-0.56,-0.54,0.45,0.56,2.07,0.90 +-0.44,-0.56,-0.54,0.45,0.56,2.06,0.90 +-0.44,-0.56,-0.54,0.45,0.56,2.06,0.90 +-0.44,-0.56,-0.54,0.45,0.56,2.05,0.90 +-0.44,-0.56,-0.54,0.45,0.57,2.05,0.90 +-0.44,-0.56,-0.54,0.45,0.57,2.04,0.90 +-0.44,-0.56,-0.55,0.45,0.57,2.03,0.90 +-0.44,-0.56,-0.55,0.45,0.58,2.03,0.89 +-0.44,-0.56,-0.55,0.45,0.58,2.02,0.89 +-0.44,-0.56,-0.55,0.45,0.58,2.02,0.89 +-0.44,-0.56,-0.55,0.45,0.58,2.01,0.89 +-0.44,-0.56,-0.55,0.44,0.59,2.01,0.89 +-0.44,-0.55,-0.55,0.44,0.59,2.00,0.89 +-0.44,-0.55,-0.55,0.44,0.59,2.00,0.89 +-0.44,-0.55,-0.55,0.44,0.59,1.99,0.89 +-0.44,-0.55,-0.55,0.44,0.60,1.99,0.88 +-0.44,-0.55,-0.55,0.44,0.60,1.98,0.88 +-0.44,-0.55,-0.55,0.44,0.60,1.98,0.88 +-0.44,-0.55,-0.55,0.44,0.61,1.97,0.88 +-0.44,-0.55,-0.55,0.44,0.61,1.97,0.88 +-0.44,-0.55,-0.55,0.44,0.61,1.96,0.88 +-0.44,-0.55,-0.56,0.44,0.61,1.96,0.88 +-0.44,-0.55,-0.56,0.44,0.62,1.95,0.88 +-0.44,-0.55,-0.56,0.44,0.62,1.94,0.88 +-0.44,-0.55,-0.56,0.44,0.62,1.94,0.87 +-0.44,-0.55,-0.56,0.44,0.63,1.93,0.87 +-0.44,-0.55,-0.56,0.44,0.63,1.93,0.87 +-0.44,-0.55,-0.56,0.44,0.63,1.92,0.87 +-0.44,-0.55,-0.56,0.43,0.63,1.92,0.87 +-0.44,-0.55,-0.56,0.43,0.64,1.91,0.87 +-0.44,-0.55,-0.56,0.43,0.64,1.91,0.87 +-0.44,-0.55,-0.56,0.43,0.64,1.90,0.87 +-0.44,-0.55,-0.56,0.43,0.65,1.90,0.86 +-0.44,-0.55,-0.56,0.43,0.65,1.89,0.86 +-0.44,-0.55,-0.56,0.43,0.65,1.89,0.86 +-0.44,-0.55,-0.56,0.43,0.66,1.88,0.86 +-0.44,-0.55,-0.57,0.43,0.66,1.88,0.86 +-0.44,-0.55,-0.57,0.43,0.66,1.87,0.86 +-0.45,-0.55,-0.57,0.43,0.66,1.87,0.86 +-0.45,-0.55,-0.57,0.43,0.67,1.86,0.86 +-0.45,-0.54,-0.57,0.43,0.67,1.86,0.85 +-0.45,-0.54,-0.57,0.43,0.67,1.85,0.85 +-0.45,-0.54,-0.57,0.43,0.68,1.85,0.85 +-0.45,-0.54,-0.57,0.43,0.68,1.84,0.85 +-0.45,-0.54,-0.57,0.42,0.68,1.83,0.85 +-0.45,-0.54,-0.57,0.42,0.68,1.83,0.85 +-0.45,-0.54,-0.57,0.42,0.69,1.82,0.85 +-0.45,-0.54,-0.57,0.42,0.69,1.82,0.85 +-0.45,-0.54,-0.57,0.42,0.69,1.81,0.85 +-0.45,-0.54,-0.57,0.42,0.70,1.81,0.84 +-0.45,-0.54,-0.57,0.42,0.70,1.80,0.84 +-0.45,-0.54,-0.57,0.42,0.70,1.80,0.84 +-0.45,-0.54,-0.58,0.42,0.71,1.79,0.84 +-0.45,-0.54,-0.58,0.42,0.71,1.79,0.84 +-0.45,-0.54,-0.58,0.42,0.71,1.78,0.84 +-0.45,-0.54,-0.58,0.42,0.72,1.78,0.84 +-0.45,-0.54,-0.58,0.42,0.72,1.77,0.84 +-0.45,-0.54,-0.58,0.42,0.72,1.77,0.83 +-0.45,-0.54,-0.58,0.42,0.72,1.76,0.83 +-0.45,-0.54,-0.58,0.42,0.73,1.76,0.83 +-0.45,-0.54,-0.58,0.42,0.73,1.75,0.83 +-0.45,-0.54,-0.58,0.41,0.73,1.75,0.83 +-0.45,-0.54,-0.58,0.41,0.74,1.74,0.83 +-0.45,-0.54,-0.58,0.41,0.74,1.74,0.83 +-0.45,-0.54,-0.58,0.41,0.74,1.73,0.83 +-0.45,-0.54,-0.58,0.41,0.75,1.73,0.82 +-0.45,-0.53,-0.58,0.41,0.75,1.72,0.82 +-0.45,-0.53,-0.59,0.41,0.75,1.72,0.82 +-0.45,-0.53,-0.59,0.41,0.76,1.71,0.82 +-0.45,-0.53,-0.59,0.41,0.76,1.70,0.82 +-0.45,-0.53,-0.59,0.41,0.76,1.70,0.82 +-0.45,-0.53,-0.59,0.41,0.76,1.69,0.82 +-0.45,-0.53,-0.59,0.41,0.77,1.69,0.82 +-0.45,-0.53,-0.59,0.41,0.77,1.68,0.82 +-0.45,-0.53,-0.59,0.41,0.77,1.68,0.81 +-0.45,-0.53,-0.59,0.41,0.78,1.67,0.81 +-0.45,-0.53,-0.59,0.41,0.78,1.67,0.81 +-0.45,-0.53,-0.59,0.41,0.78,1.66,0.81 +-0.45,-0.53,-0.59,0.40,0.79,1.66,0.81 +-0.45,-0.53,-0.59,0.40,0.79,1.65,0.81 +-0.45,-0.53,-0.59,0.40,0.79,1.65,0.81 +-0.45,-0.53,-0.59,0.40,0.80,1.64,0.81 +-0.45,-0.53,-0.59,0.40,0.80,1.64,0.80 +-0.45,-0.53,-0.60,0.40,0.80,1.63,0.80 +-0.45,-0.53,-0.60,0.40,0.81,1.63,0.80 +-0.45,-0.53,-0.60,0.40,0.81,1.62,0.80 +-0.45,-0.53,-0.60,0.40,0.81,1.62,0.80 +-0.45,-0.53,-0.60,0.40,0.82,1.61,0.80 +-0.45,-0.53,-0.60,0.40,0.82,1.61,0.80 +-0.45,-0.53,-0.60,0.40,0.82,1.60,0.80 +-0.45,-0.53,-0.60,0.40,0.83,1.60,0.79 +-0.45,-0.52,-0.60,0.40,0.83,1.59,0.79 +-0.45,-0.52,-0.60,0.40,0.83,1.59,0.79 +-0.45,-0.52,-0.60,0.40,0.84,1.58,0.79 +-0.45,-0.52,-0.60,0.40,0.84,1.58,0.79 +-0.45,-0.52,-0.60,0.39,0.84,1.57,0.79 +-0.46,-0.52,-0.60,0.39,0.85,1.57,0.79 +-0.46,-0.52,-0.60,0.39,0.85,1.56,0.79 +-0.46,-0.52,-0.61,0.39,0.85,1.56,0.79 +-0.46,-0.52,-0.61,0.39,0.86,1.55,0.78 +-0.46,-0.52,-0.61,0.39,0.86,1.55,0.78 +-0.46,-0.52,-0.61,0.39,0.86,1.54,0.78 +-0.46,-0.52,-0.61,0.39,0.87,1.54,0.78 +-0.46,-0.52,-0.61,0.39,0.87,1.53,0.78 +-0.46,-0.52,-0.61,0.39,0.87,1.53,0.78 +-0.46,-0.52,-0.61,0.39,0.88,1.52,0.78 +-0.46,-0.52,-0.61,0.39,0.88,1.52,0.78 +-0.46,-0.52,-0.61,0.39,0.88,1.51,0.77 +-0.46,-0.52,-0.61,0.39,0.89,1.51,0.77 +-0.46,-0.52,-0.61,0.39,0.89,1.50,0.77 +-0.46,-0.52,-0.61,0.39,0.89,1.49,0.77 +-0.46,-0.52,-0.61,0.38,0.90,1.49,0.77 +-0.46,-0.52,-0.61,0.38,0.90,1.48,0.77 +-0.46,-0.52,-0.61,0.38,0.90,1.48,0.77 +-0.46,-0.52,-0.62,0.38,0.91,1.47,0.77 +-0.46,-0.51,-0.62,0.38,0.91,1.47,0.76 +-0.46,-0.51,-0.62,0.38,0.91,1.46,0.76 +-0.46,-0.51,-0.62,0.38,0.92,1.46,0.76 +-0.46,-0.51,-0.62,0.38,0.92,1.45,0.76 +-0.46,-0.51,-0.62,0.38,0.92,1.45,0.76 +-0.46,-0.51,-0.62,0.38,0.93,1.44,0.76 +-0.46,-0.51,-0.62,0.38,0.93,1.44,0.76 +-0.46,-0.51,-0.62,0.38,0.93,1.43,0.76 +-0.46,-0.51,-0.62,0.38,0.94,1.43,0.76 +-0.46,-0.51,-0.62,0.38,0.94,1.42,0.75 +-0.46,-0.51,-0.62,0.38,0.95,1.42,0.75 +-0.46,-0.51,-0.62,0.38,0.95,1.41,0.75 +-0.46,-0.51,-0.62,0.38,0.95,1.41,0.75 +-0.46,-0.51,-0.62,0.37,0.96,1.40,0.75 +-0.46,-0.51,-0.62,0.37,0.96,1.40,0.75 +-0.46,-0.51,-0.63,0.37,0.96,1.39,0.75 +-0.46,-0.51,-0.63,0.37,0.97,1.39,0.75 +-0.46,-0.51,-0.63,0.37,0.97,1.38,0.74 +-0.46,-0.51,-0.63,0.37,0.97,1.38,0.74 +-0.46,-0.51,-0.63,0.37,0.98,1.37,0.74 +-0.46,-0.51,-0.63,0.37,0.98,1.37,0.74 +-0.46,-0.51,-0.63,0.37,0.98,1.36,0.74 +-0.46,-0.50,-0.63,0.37,0.99,1.36,0.74 +-0.46,-0.50,-0.63,0.37,0.99,1.35,0.74 +-0.46,-0.50,-0.63,0.37,1.00,1.35,0.74 +-0.46,-0.50,-0.63,0.37,1.00,1.34,0.73 +-0.46,-0.50,-0.63,0.37,1.00,1.34,0.73 +-0.46,-0.50,-0.63,0.37,1.01,1.33,0.73 +-0.46,-0.50,-0.63,0.37,1.01,1.33,0.73 +-0.46,-0.50,-0.63,0.37,1.01,1.32,0.73 +-0.46,-0.50,-0.63,0.36,1.02,1.32,0.73 +-0.46,-0.50,-0.64,0.36,1.02,1.31,0.73 +-0.46,-0.50,-0.64,0.36,1.02,1.31,0.73 +-0.46,-0.50,-0.64,0.36,1.03,1.30,0.73 +-0.46,-0.50,-0.64,0.36,1.03,1.30,0.72 +-0.46,-0.50,-0.64,0.36,1.03,1.29,0.72 +-0.46,-0.50,-0.64,0.36,1.04,1.29,0.72 +-0.46,-0.50,-0.64,0.36,1.04,1.28,0.72 +-0.46,-0.50,-0.64,0.36,1.05,1.28,0.72 +-0.46,-0.50,-0.64,0.36,1.05,1.27,0.72 +-0.46,-0.50,-0.64,0.36,1.05,1.27,0.72 +-0.46,-0.50,-0.64,0.36,1.06,1.26,0.72 +-0.46,-0.50,-0.64,0.36,1.06,1.26,0.71 +-0.46,-0.50,-0.64,0.36,1.06,1.26,0.71 +-0.46,-0.49,-0.64,0.36,1.07,1.25,0.71 +-0.46,-0.49,-0.64,0.36,1.07,1.25,0.71 +-0.46,-0.49,-0.64,0.35,1.08,1.24,0.71 +-0.46,-0.49,-0.65,0.35,1.08,1.24,0.71 +-0.46,-0.49,-0.65,0.35,1.08,1.23,0.71 +-0.46,-0.49,-0.65,0.35,1.09,1.23,0.71 +-0.46,-0.49,-0.65,0.35,1.09,1.22,0.71 +-0.46,-0.49,-0.65,0.35,1.09,1.22,0.70 +-0.46,-0.49,-0.65,0.35,1.10,1.21,0.70 +-0.46,-0.49,-0.65,0.35,1.10,1.21,0.70 +-0.46,-0.49,-0.65,0.35,1.11,1.20,0.70 +-0.46,-0.49,-0.65,0.35,1.11,1.20,0.70 +-0.46,-0.49,-0.65,0.35,1.11,1.19,0.70 +-0.46,-0.49,-0.65,0.35,1.12,1.19,0.70 +-0.46,-0.49,-0.65,0.35,1.12,1.18,0.70 +-0.46,-0.49,-0.65,0.35,1.12,1.18,0.69 +-0.46,-0.49,-0.65,0.35,1.13,1.17,0.69 +-0.46,-0.49,-0.65,0.35,1.13,1.17,0.69 +-0.46,-0.49,-0.65,0.35,1.14,1.16,0.69 +-0.46,-0.49,-0.65,0.34,1.14,1.16,0.69 +-0.46,-0.49,-0.66,0.34,1.14,1.15,0.69 +-0.46,-0.48,-0.66,0.34,1.15,1.15,0.69 +-0.47,-0.48,-0.66,0.34,1.15,1.14,0.69 +-0.47,-0.48,-0.66,0.34,1.16,1.14,0.68 +-0.47,-0.48,-0.66,0.34,1.16,1.13,0.68 +-0.47,-0.48,-0.66,0.34,1.16,1.13,0.68 +-0.47,-0.48,-0.66,0.34,1.17,1.12,0.68 +-0.47,-0.48,-0.66,0.34,1.17,1.12,0.68 +-0.47,-0.48,-0.66,0.34,1.17,1.11,0.68 +-0.47,-0.48,-0.66,0.34,1.18,1.11,0.68 +-0.47,-0.48,-0.66,0.34,1.18,1.10,0.68 +-0.47,-0.48,-0.66,0.34,1.19,1.10,0.68 +-0.47,-0.48,-0.66,0.34,1.19,1.09,0.67 +-0.47,-0.48,-0.66,0.34,1.19,1.09,0.67 +-0.47,-0.48,-0.66,0.34,1.20,1.08,0.67 +-0.47,-0.48,-0.66,0.34,1.20,1.08,0.67 +-0.47,-0.48,-0.67,0.33,1.21,1.08,0.67 +-0.47,-0.48,-0.67,0.33,1.21,1.07,0.67 +-0.47,-0.48,-0.67,0.33,1.21,1.07,0.67 +-0.47,-0.48,-0.67,0.33,1.22,1.06,0.67 +-0.47,-0.48,-0.67,0.33,1.22,1.06,0.66 +-0.47,-0.48,-0.67,0.33,1.23,1.05,0.66 +-0.47,-0.47,-0.67,0.33,1.23,1.05,0.66 +-0.47,-0.47,-0.67,0.33,1.23,1.04,0.66 +-0.47,-0.47,-0.67,0.33,1.24,1.04,0.66 +-0.47,-0.47,-0.67,0.33,1.24,1.03,0.66 +-0.47,-0.47,-0.67,0.33,1.25,1.03,0.66 +-0.47,-0.47,-0.67,0.33,1.25,1.02,0.66 +-0.47,-0.47,-0.67,0.33,1.25,1.02,0.66 +-0.47,-0.47,-0.67,0.33,1.26,1.01,0.65 +-0.47,-0.47,-0.67,0.33,1.26,1.01,0.65 +-0.47,-0.47,-0.67,0.33,1.27,1.00,0.65 +-0.47,-0.47,-0.67,0.33,1.27,1.00,0.65 +-0.47,-0.47,-0.68,0.32,1.27,0.99,0.65 +-0.47,-0.47,-0.68,0.32,1.28,0.99,0.65 +-0.47,-0.47,-0.68,0.32,1.28,0.98,0.65 +-0.47,-0.47,-0.68,0.32,1.29,0.98,0.65 +-0.47,-0.47,-0.68,0.32,1.29,0.98,0.64 +-0.47,-0.47,-0.68,0.32,1.29,0.97,0.64 +-0.47,-0.47,-0.68,0.32,1.30,0.97,0.64 +-0.47,-0.47,-0.68,0.32,1.30,0.96,0.64 +-0.47,-0.47,-0.68,0.32,1.31,0.96,0.64 +-0.47,-0.46,-0.68,0.32,1.31,0.95,0.64 +-0.47,-0.46,-0.68,0.32,1.31,0.95,0.64 +-0.47,-0.46,-0.68,0.32,1.32,0.94,0.64 +-0.47,-0.46,-0.68,0.32,1.32,0.94,0.64 +-0.47,-0.46,-0.68,0.32,1.33,0.93,0.63 +-0.47,-0.46,-0.68,0.32,1.33,0.93,0.63 +-0.47,-0.46,-0.68,0.32,1.34,0.92,0.63 +-0.47,-0.46,-0.68,0.32,1.34,0.92,0.63 +-0.47,-0.46,-0.69,0.31,1.34,0.91,0.63 +-0.47,-0.46,-0.69,0.31,1.35,0.91,0.63 +-0.47,-0.46,-0.69,0.31,1.35,0.90,0.63 +-0.47,-0.46,-0.69,0.31,1.36,0.90,0.63 +-0.47,-0.46,-0.69,0.31,1.36,0.90,0.62 +-0.47,-0.46,-0.69,0.31,1.36,0.89,0.62 +-0.47,-0.46,-0.69,0.31,1.37,0.89,0.62 +-0.47,-0.46,-0.69,0.31,1.37,0.88,0.62 +-0.47,-0.46,-0.69,0.31,1.38,0.88,0.62 +-0.47,-0.46,-0.69,0.31,1.38,0.87,0.62 +-0.47,-0.46,-0.69,0.31,1.39,0.87,0.62 +-0.47,-0.45,-0.69,0.31,1.39,0.86,0.62 +-0.47,-0.45,-0.69,0.31,1.39,0.86,0.61 +-0.47,-0.45,-0.69,0.31,1.40,0.85,0.61 +-0.47,-0.45,-0.69,0.31,1.40,0.85,0.61 +-0.47,-0.45,-0.69,0.31,1.41,0.84,0.61 +-0.47,-0.45,-0.69,0.31,1.41,0.84,0.61 +-0.47,-0.45,-0.70,0.30,1.41,0.83,0.61 +-0.47,-0.45,-0.70,0.30,1.42,0.83,0.61 +-0.47,-0.45,-0.70,0.30,1.42,0.83,0.61 +-0.47,-0.45,-0.70,0.30,1.43,0.82,0.61 +-0.47,-0.45,-0.70,0.30,1.43,0.82,0.60 +-0.47,-0.45,-0.70,0.30,1.44,0.81,0.60 +-0.47,-0.45,-0.70,0.30,1.44,0.81,0.60 +-0.47,-0.45,-0.70,0.30,1.44,0.80,0.60 +-0.47,-0.45,-0.70,0.30,1.45,0.80,0.60 +-0.47,-0.45,-0.70,0.30,1.45,0.79,0.60 +-0.47,-0.45,-0.70,0.30,1.46,0.79,0.60 +-0.47,-0.45,-0.70,0.30,1.46,0.78,0.60 +-0.47,-0.45,-0.70,0.30,1.47,0.78,0.60 +-0.47,-0.44,-0.70,0.30,1.47,0.78,0.59 +-0.47,-0.44,-0.70,0.30,1.48,0.77,0.59 +-0.47,-0.44,-0.70,0.30,1.48,0.77,0.59 +-0.47,-0.44,-0.70,0.30,1.48,0.76,0.59 +-0.47,-0.44,-0.71,0.29,1.49,0.76,0.59 +-0.47,-0.44,-0.71,0.29,1.49,0.75,0.59 +-0.47,-0.44,-0.71,0.29,1.50,0.75,0.59 +-0.47,-0.44,-0.71,0.29,1.50,0.74,0.59 +-0.47,-0.44,-0.71,0.29,1.51,0.74,0.58 +-0.47,-0.44,-0.71,0.29,1.51,0.73,0.58 +-0.47,-0.44,-0.71,0.29,1.51,0.73,0.58 +-0.47,-0.44,-0.71,0.29,1.52,0.73,0.58 +-0.47,-0.44,-0.71,0.29,1.52,0.72,0.58 +-0.47,-0.44,-0.71,0.29,1.53,0.72,0.58 +-0.47,-0.44,-0.71,0.29,1.53,0.71,0.58 +-0.47,-0.44,-0.71,0.29,1.54,0.71,0.58 +-0.47,-0.44,-0.71,0.29,1.54,0.70,0.58 +-0.47,-0.44,-0.71,0.29,1.54,0.70,0.57 +-0.47,-0.43,-0.71,0.29,1.55,0.69,0.57 +-0.47,-0.43,-0.71,0.29,1.55,0.69,0.57 +-0.47,-0.43,-0.71,0.29,1.56,0.68,0.57 +-0.47,-0.43,-0.71,0.28,1.56,0.68,0.57 +-0.47,-0.43,-0.72,0.28,1.57,0.68,0.57 +-0.47,-0.43,-0.72,0.28,1.57,0.67,0.57 +-0.47,-0.43,-0.72,0.28,1.58,0.67,0.57 +-0.47,-0.43,-0.72,0.28,1.58,0.66,0.56 +-0.47,-0.43,-0.72,0.28,1.59,0.66,0.56 +-0.47,-0.43,-0.72,0.28,1.59,0.65,0.56 +-0.47,-0.43,-0.72,0.28,1.59,0.65,0.56 +-0.47,-0.43,-0.72,0.28,1.60,0.64,0.56 +-0.47,-0.43,-0.72,0.28,1.60,0.64,0.56 +-0.47,-0.43,-0.72,0.28,1.61,0.64,0.56 +-0.47,-0.43,-0.72,0.28,1.61,0.63,0.56 +-0.47,-0.43,-0.72,0.28,1.62,0.63,0.56 +-0.47,-0.43,-0.72,0.28,1.62,0.62,0.55 +-0.47,-0.43,-0.72,0.28,1.63,0.62,0.55 +-0.47,-0.42,-0.72,0.28,1.63,0.61,0.55 +-0.47,-0.42,-0.72,0.28,1.63,0.61,0.55 +-0.47,-0.42,-0.72,0.27,1.64,0.60,0.55 +-0.47,-0.42,-0.72,0.27,1.64,0.60,0.55 +-0.47,-0.42,-0.73,0.27,1.65,0.60,0.55 +-0.47,-0.42,-0.73,0.27,1.65,0.59,0.55 +-0.47,-0.42,-0.73,0.27,1.66,0.59,0.55 +-0.47,-0.42,-0.73,0.27,1.66,0.58,0.54 +-0.47,-0.42,-0.73,0.27,1.67,0.58,0.54 +-0.47,-0.42,-0.73,0.27,1.67,0.57,0.54 +-0.47,-0.42,-0.73,0.27,1.68,0.57,0.54 +-0.47,-0.42,-0.73,0.27,1.68,0.56,0.54 +-0.47,-0.42,-0.73,0.27,1.68,0.56,0.54 +-0.47,-0.42,-0.73,0.27,1.69,0.56,0.54 +-0.47,-0.42,-0.73,0.27,1.69,0.55,0.54 +-0.47,-0.42,-0.73,0.27,1.70,0.55,0.53 +-0.47,-0.42,-0.73,0.27,1.70,0.54,0.53 +-0.47,-0.41,-0.73,0.27,1.71,0.54,0.53 +-0.47,-0.41,-0.73,0.27,1.71,0.53,0.53 +-0.47,-0.41,-0.73,0.27,1.72,0.53,0.53 +-0.47,-0.41,-0.73,0.26,1.72,0.53,0.53 +-0.47,-0.41,-0.73,0.26,1.73,0.52,0.53 +-0.47,-0.41,-0.74,0.26,1.73,0.52,0.53 +-0.47,-0.41,-0.74,0.26,1.74,0.51,0.53 +-0.47,-0.41,-0.74,0.26,1.74,0.51,0.52 +-0.47,-0.41,-0.74,0.26,1.75,0.50,0.52 +-0.47,-0.41,-0.74,0.26,1.75,0.50,0.52 +-0.47,-0.41,-0.74,0.26,1.75,0.50,0.52 +-0.47,-0.41,-0.74,0.26,1.76,0.49,0.52 +-0.47,-0.41,-0.74,0.26,1.76,0.49,0.52 +-0.47,-0.41,-0.74,0.26,1.77,0.48,0.52 +-0.47,-0.41,-0.74,0.26,1.77,0.48,0.52 +-0.47,-0.41,-0.74,0.26,1.78,0.47,0.52 +-0.47,-0.41,-0.74,0.26,1.78,0.47,0.51 +-0.47,-0.40,-0.74,0.26,1.79,0.47,0.51 +-0.47,-0.40,-0.74,0.26,1.79,0.46,0.51 +-0.47,-0.40,-0.74,0.26,1.80,0.46,0.51 +-0.47,-0.40,-0.74,0.25,1.80,0.45,0.51 +-0.47,-0.40,-0.74,0.25,1.81,0.45,0.51 +-0.47,-0.40,-0.74,0.25,1.81,0.44,0.51 +-0.47,-0.40,-0.74,0.25,1.82,0.44,0.51 +-0.47,-0.40,-0.75,0.25,1.82,0.44,0.50 +-0.47,-0.40,-0.75,0.25,1.83,0.43,0.50 +-0.47,-0.40,-0.75,0.25,1.83,0.43,0.50 +-0.47,-0.40,-0.75,0.25,1.83,0.42,0.50 +-0.47,-0.40,-0.75,0.25,1.84,0.42,0.50 +-0.47,-0.40,-0.75,0.25,1.84,0.41,0.50 +-0.47,-0.40,-0.75,0.25,1.85,0.41,0.50 +-0.47,-0.40,-0.75,0.25,1.85,0.41,0.50 +-0.47,-0.40,-0.75,0.25,1.86,0.40,0.50 +-0.47,-0.40,-0.75,0.25,1.86,0.40,0.49 +-0.47,-0.39,-0.75,0.25,1.87,0.39,0.49 +-0.47,-0.39,-0.75,0.25,1.87,0.39,0.49 +-0.47,-0.39,-0.75,0.25,1.88,0.38,0.49 +-0.47,-0.39,-0.75,0.25,1.88,0.38,0.49 +-0.47,-0.39,-0.75,0.24,1.89,0.38,0.49 +-0.47,-0.39,-0.75,0.24,1.89,0.37,0.49 +-0.47,-0.39,-0.75,0.24,1.90,0.37,0.49 +-0.47,-0.39,-0.75,0.24,1.90,0.36,0.49 +-0.47,-0.39,-0.75,0.24,1.91,0.36,0.48 +-0.47,-0.39,-0.76,0.24,1.91,0.36,0.48 +-0.47,-0.39,-0.76,0.24,1.92,0.35,0.48 +-0.47,-0.39,-0.76,0.24,1.92,0.35,0.48 +-0.47,-0.39,-0.76,0.24,1.93,0.34,0.48 +-0.47,-0.39,-0.76,0.24,1.93,0.34,0.48 +-0.47,-0.39,-0.76,0.24,1.94,0.33,0.48 +-0.47,-0.39,-0.76,0.24,1.94,0.33,0.48 +-0.47,-0.39,-0.76,0.24,1.95,0.33,0.48 +-0.47,-0.38,-0.76,0.24,1.95,0.32,0.47 +-0.47,-0.38,-0.76,0.24,1.96,0.32,0.47 +-0.47,-0.38,-0.76,0.24,1.96,0.31,0.47 +-0.47,-0.38,-0.76,0.24,1.97,0.31,0.47 +-0.47,-0.38,-0.76,0.23,1.97,0.31,0.47 +-0.47,-0.38,-0.76,0.23,1.98,0.30,0.47 +-0.47,-0.38,-0.76,0.23,1.98,0.30,0.47 +-0.47,-0.38,-0.76,0.23,1.99,0.29,0.47 +-0.47,-0.38,-0.76,0.23,1.99,0.29,0.47 +-0.47,-0.38,-0.76,0.23,2.00,0.29,0.46 +-0.47,-0.38,-0.76,0.23,2.00,0.28,0.46 +-0.47,-0.38,-0.77,0.23,2.01,0.28,0.46 +-0.47,-0.38,-0.77,0.23,2.01,0.27,0.46 +-0.47,-0.38,-0.77,0.23,2.02,0.27,0.46 +-0.47,-0.38,-0.77,0.23,2.02,0.26,0.46 +-0.47,-0.38,-0.77,0.23,2.03,0.26,0.46 +-0.47,-0.37,-0.77,0.23,2.03,0.26,0.46 +-0.47,-0.37,-0.77,0.23,2.04,0.25,0.46 +-0.47,-0.37,-0.77,0.23,2.04,0.25,0.45 +-0.47,-0.37,-0.77,0.23,2.05,0.24,0.45 +-0.47,-0.37,-0.77,0.23,2.05,0.24,0.45 +-0.47,-0.37,-0.77,0.23,2.06,0.24,0.45 +-0.47,-0.37,-0.77,0.22,2.06,0.23,0.45 +-0.47,-0.37,-0.77,0.22,2.07,0.23,0.45 +-0.47,-0.37,-0.77,0.22,2.07,0.22,0.45 +-0.47,-0.37,-0.77,0.22,2.08,0.22,0.45 +-0.47,-0.37,-0.77,0.22,2.08,0.22,0.45 +-0.47,-0.37,-0.77,0.22,2.09,0.21,0.44 +-0.47,-0.37,-0.77,0.22,2.09,0.21,0.44 +-0.47,-0.37,-0.77,0.22,2.10,0.20,0.44 +-0.47,-0.37,-0.77,0.22,2.10,0.20,0.44 +-0.47,-0.37,-0.78,0.22,2.11,0.20,0.44 +-0.47,-0.36,-0.78,0.22,2.11,0.19,0.44 +-0.47,-0.36,-0.78,0.22,2.12,0.19,0.44 +-0.47,-0.36,-0.78,0.22,2.12,0.18,0.44 +-0.47,-0.36,-0.78,0.22,2.13,0.18,0.44 +-0.47,-0.36,-0.78,0.22,2.13,0.18,0.43 +-0.47,-0.36,-0.78,0.22,2.14,0.17,0.43 +-0.47,-0.36,-0.78,0.22,2.14,0.17,0.43 +-0.47,-0.36,-0.78,0.22,2.15,0.16,0.43 +-0.47,-0.36,-0.78,0.21,2.15,0.16,0.43 +-0.47,-0.36,-0.78,0.21,2.16,0.16,0.43 +-0.47,-0.36,-0.78,0.21,2.16,0.15,0.43 +-0.47,-0.36,-0.78,0.21,2.17,0.15,0.43 +-0.47,-0.36,-0.78,0.21,2.17,0.15,0.43 +-0.47,-0.36,-0.78,0.21,2.18,0.14,0.42 +-0.47,-0.36,-0.78,0.21,2.18,0.14,0.42 +-0.47,-0.35,-0.78,0.21,2.19,0.13,0.42 +-0.47,-0.35,-0.78,0.21,2.19,0.13,0.42 +-0.47,-0.35,-0.78,0.21,2.20,0.13,0.42 +-0.47,-0.35,-0.78,0.21,2.20,0.12,0.42 +-0.46,-0.35,-0.78,0.21,2.21,0.12,0.42 +-0.46,-0.35,-0.79,0.21,2.21,0.11,0.42 +-0.46,-0.35,-0.79,0.21,2.22,0.11,0.42 +-0.46,-0.35,-0.79,0.21,2.22,0.11,0.41 +-0.46,-0.35,-0.79,0.21,2.23,0.10,0.41 +-0.46,-0.35,-0.79,0.21,2.23,0.10,0.41 +-0.46,-0.35,-0.79,0.21,2.24,0.09,0.41 +-0.46,-0.35,-0.79,0.20,2.24,0.09,0.41 +-0.46,-0.35,-0.79,0.20,2.25,0.09,0.41 +-0.46,-0.35,-0.79,0.20,2.25,0.08,0.41 +-0.46,-0.35,-0.79,0.20,2.26,0.08,0.41 +-0.46,-0.35,-0.79,0.20,2.27,0.08,0.41 +-0.46,-0.34,-0.79,0.20,2.27,0.07,0.40 +-0.46,-0.34,-0.79,0.20,2.28,0.07,0.40 +-0.46,-0.34,-0.79,0.20,2.28,0.06,0.40 +-0.46,-0.34,-0.79,0.20,2.29,0.06,0.40 +-0.46,-0.34,-0.79,0.20,2.29,0.06,0.40 +-0.46,-0.34,-0.79,0.20,2.30,0.05,0.40 +-0.46,-0.34,-0.79,0.20,2.30,0.05,0.40 +-0.46,-0.34,-0.79,0.20,2.31,0.05,0.40 +-0.46,-0.34,-0.79,0.20,2.31,0.04,0.40 +-0.46,-0.34,-0.79,0.20,2.32,0.04,0.39 +-0.46,-0.34,-0.80,0.20,2.32,0.03,0.39 +-0.46,-0.34,-0.80,0.20,2.33,0.03,0.39 +-0.46,-0.34,-0.80,0.20,2.33,0.03,0.39 +-0.46,-0.34,-0.80,0.20,2.34,0.02,0.39 +-0.46,-0.34,-0.80,0.19,2.34,0.02,0.39 +-0.46,-0.33,-0.80,0.19,2.35,0.01,0.39 +-0.46,-0.33,-0.80,0.19,2.35,0.01,0.39 +-0.46,-0.33,-0.80,0.19,2.36,0.01,0.39 +-0.46,-0.33,-0.80,0.19,2.37,0.00,0.38 +-0.46,-0.33,-0.80,0.19,2.37,0.00,0.38 diff --git a/scripts/testv/config_hospital_patientroom.cfg b/scripts/testv/rend_config_hospital_patientroom.cfg similarity index 100% rename from scripts/testv/config_hospital_patientroom.cfg rename to scripts/testv/rend_config_hospital_patientroom.cfg diff --git a/scripts/testv/config_recreation.cfg b/scripts/testv/rend_config_recreation.cfg similarity index 100% rename from scripts/testv/config_recreation.cfg rename to scripts/testv/rend_config_recreation.cfg diff --git a/scripts/testv/config_renderer.cfg b/scripts/testv/rend_config_renderer.cfg similarity index 100% rename from scripts/testv/config_renderer.cfg rename to scripts/testv/rend_config_renderer.cfg diff --git a/scripts/testv/stv16c.pcm b/scripts/testv/stv16c.pcm deleted file mode 100644 index b4132c04f5..0000000000 --- a/scripts/testv/stv16c.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87c121deab7586d5ad0a39c8d59027c36d2cf7639345abfab8685b89ea029170 -size 640002 diff --git a/scripts/testv/stv16c.wav b/scripts/testv/stv16c.wav new file mode 100644 index 0000000000..d107fe711d --- /dev/null +++ b/scripts/testv/stv16c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61f9eca5dafeb46a6aa29c82a8252ebb4ffd4e7a7255f5a4653d8335e685872e +size 640046 diff --git a/scripts/testv/stv16n.pcm b/scripts/testv/stv16n.pcm deleted file mode 100644 index 7d7aaf880b..0000000000 --- a/scripts/testv/stv16n.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:03b93acbaeffbb1866f6135a45bcb4ff0038c5672e226cf97507c293bd155b5b -size 620802 diff --git a/scripts/testv/stv16n.wav b/scripts/testv/stv16n.wav new file mode 100644 index 0000000000..9a9c8798e5 --- /dev/null +++ b/scripts/testv/stv16n.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d0ac0846c3046d91843b390fbef3a0180dac92b7d53e4079b3541d43b8af188 +size 620846 diff --git a/scripts/testv/stv1ISM48s.pcm b/scripts/testv/stv1ISM48s.pcm deleted file mode 100644 index dd0da48121..0000000000 --- a/scripts/testv/stv1ISM48s.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c2173b806b73bbbd07db8f68f976237441663e7760abd0d01b012eba519b99b -size 2880000 diff --git a/scripts/testv/stv1ISM48s.wav b/scripts/testv/stv1ISM48s.wav new file mode 100644 index 0000000000..da05075565 --- /dev/null +++ b/scripts/testv/stv1ISM48s.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dfd1f55af3964c73b423efe64c7400c02ea3c5f289bf347b019350fe3165bcf3 +size 2880044 diff --git a/scripts/testv/stv_IVASMASA_1dir1TC.met b/scripts/testv/stv1MASA1TC48c.met similarity index 100% rename from scripts/testv/stv_IVASMASA_1dir1TC.met rename to scripts/testv/stv1MASA1TC48c.met diff --git a/scripts/testv/stv1MASA1TC48c.wav b/scripts/testv/stv1MASA1TC48c.wav new file mode 100644 index 0000000000..263f109000 --- /dev/null +++ b/scripts/testv/stv1MASA1TC48c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2409df48bf501463db0e468aeeee11e5aa866f0adf91ef714a7c6fc506235aa1 +size 288044 diff --git a/scripts/testv/stv_IVASMASA_1dir1TC_DTX.met b/scripts/testv/stv1MASA1TC48n.met similarity index 100% rename from scripts/testv/stv_IVASMASA_1dir1TC_DTX.met rename to scripts/testv/stv1MASA1TC48n.met diff --git a/scripts/testv/stv1MASA1TC48n.wav b/scripts/testv/stv1MASA1TC48n.wav new file mode 100644 index 0000000000..1b0012d886 --- /dev/null +++ b/scripts/testv/stv1MASA1TC48n.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81065ed959b13b8c2a4bb1a05ef14095f523912bc3007fdd172cce87a8398046 +size 1927724 diff --git a/scripts/testv/stv_IVASMASA_1dir2TC.met b/scripts/testv/stv1MASA2TC48c.met similarity index 100% rename from scripts/testv/stv_IVASMASA_1dir2TC.met rename to scripts/testv/stv1MASA2TC48c.met diff --git a/scripts/testv/stv1MASA2TC48c.wav b/scripts/testv/stv1MASA2TC48c.wav new file mode 100644 index 0000000000..982e69fb20 --- /dev/null +++ b/scripts/testv/stv1MASA2TC48c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1bd8440cbf857f9376d053f780572213964c32a267f325948f3a3a02805dc998 +size 1152044 diff --git a/scripts/testv/stv_IVASMASA_1dir2TC_DTX.met b/scripts/testv/stv1MASA2TC48n.met similarity index 100% rename from scripts/testv/stv_IVASMASA_1dir2TC_DTX.met rename to scripts/testv/stv1MASA2TC48n.met diff --git a/scripts/testv/stv1MASA2TC48n.wav b/scripts/testv/stv1MASA2TC48n.wav new file mode 100644 index 0000000000..f25eb24353 --- /dev/null +++ b/scripts/testv/stv1MASA2TC48n.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97f1a7a43012ce166b929df59bd756f5d96433ea00ce0a1005380368c01619a0 +size 3855404 diff --git a/scripts/testv/stv2ISM48s.pcm b/scripts/testv/stv2ISM48s.pcm deleted file mode 100644 index abd56e3ed8..0000000000 --- a/scripts/testv/stv2ISM48s.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:211548331868fda700dd75809d88b8f350d0a2e1af41f1a2c930efb35b34b877 -size 5760000 diff --git a/scripts/testv/stv2ISM48s.wav b/scripts/testv/stv2ISM48s.wav new file mode 100644 index 0000000000..02de53114d --- /dev/null +++ b/scripts/testv/stv2ISM48s.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e042a1a219fcd4f8a82d1d200071139b76c749d97a7b627774431ba961486b2c +size 5760044 diff --git a/scripts/testv/stv_IVASMASA_2dir1TC.met b/scripts/testv/stv2MASA1TC48c.met similarity index 100% rename from scripts/testv/stv_IVASMASA_2dir1TC.met rename to scripts/testv/stv2MASA1TC48c.met diff --git a/scripts/testv/stv2MASA1TC48c.wav b/scripts/testv/stv2MASA1TC48c.wav new file mode 100644 index 0000000000..afe705b0b1 --- /dev/null +++ b/scripts/testv/stv2MASA1TC48c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d500a55bcc63dda1fd93329bcef272a21eb49731ceb0a60e546ef02e07cdd9b +size 576044 diff --git a/scripts/testv/stv_IVASMASA_2dir2TC.met b/scripts/testv/stv2MASA2TC48c.met similarity index 100% rename from scripts/testv/stv_IVASMASA_2dir2TC.met rename to scripts/testv/stv2MASA2TC48c.met diff --git a/scripts/testv/stv2MASA2TC48c.wav b/scripts/testv/stv2MASA2TC48c.wav new file mode 100644 index 0000000000..e159c4f9ae --- /dev/null +++ b/scripts/testv/stv2MASA2TC48c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60a713ed1b97cf94b16849806951ef83d8f41c8ee455b267ec0a292c695cbbc1 +size 576044 diff --git a/scripts/testv/stv2OA32c.pcm b/scripts/testv/stv2OA32c.pcm deleted file mode 100644 index a041d613a5..0000000000 --- a/scripts/testv/stv2OA32c.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:da0638a1ce4079133a80d51d72ae872238d25761e88fec6326050ef4f153ef49 -size 11520306 diff --git a/scripts/testv/stv2OA32c.wav b/scripts/testv/stv2OA32c.wav new file mode 100644 index 0000000000..86d288de72 --- /dev/null +++ b/scripts/testv/stv2OA32c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1824c3afe43861b2ed1e4ff94591932f34bb1885d96796e282d3839906e50aed +size 11520350 diff --git a/scripts/testv/stv2OA48c.pcm b/scripts/testv/stv2OA48c.pcm deleted file mode 100644 index bcf391ec1a..0000000000 --- a/scripts/testv/stv2OA48c.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2611c295c37f89c21d7a974bd7da8d41e5509337aee43392a2047eca63af09e1 -size 17280450 diff --git a/scripts/testv/stv2OA48c.wav b/scripts/testv/stv2OA48c.wav new file mode 100644 index 0000000000..24bb1f0872 --- /dev/null +++ b/scripts/testv/stv2OA48c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f573744bd97ad3dcb8e86c39d1770725a34f3c43c37c62c26d670a7f722a880e +size 17280494 diff --git a/scripts/testv/stv32c.pcm b/scripts/testv/stv32c.pcm deleted file mode 100644 index 30436d6417..0000000000 --- a/scripts/testv/stv32c.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd7efc93702578d54eebeedfa09cb8f027654fdcd9fa56b74576e43511d2c8a5 -size 1280000 diff --git a/scripts/testv/stv32c.wav b/scripts/testv/stv32c.wav new file mode 100644 index 0000000000..640532cc12 --- /dev/null +++ b/scripts/testv/stv32c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00089d67aa513a9f6b2f73526e94d5c32437c6944ec6467072dc27ccaa1f5080 +size 1389542 diff --git a/scripts/testv/stv32n.pcm b/scripts/testv/stv32n.pcm deleted file mode 100644 index 1a6ab73020..0000000000 --- a/scripts/testv/stv32n.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64b927b04a013157dc5b6cbdf74b6c15cbc5035d35607def39757244c8d2c343 -size 1241600 diff --git a/scripts/testv/stv32n.wav b/scripts/testv/stv32n.wav new file mode 100644 index 0000000000..6a23d99d6e --- /dev/null +++ b/scripts/testv/stv32n.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a92be333a359a77ec70324815d71282398dede88e59ac19a31f8d18913c0505 +size 1241644 diff --git a/scripts/testv/stv3ISM48s.pcm b/scripts/testv/stv3ISM48s.pcm deleted file mode 100644 index 490ec89821..0000000000 --- a/scripts/testv/stv3ISM48s.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cc045085eccb2157581ab413d315ed9ad2278787690c7112499ba3919e039427 -size 8640000 diff --git a/scripts/testv/stv3ISM48s.wav b/scripts/testv/stv3ISM48s.wav new file mode 100644 index 0000000000..c52500f610 --- /dev/null +++ b/scripts/testv/stv3ISM48s.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a29dfd720edab2367f86c394d4abc9f641596d50697539be70cdfe178d2a28d +size 8640044 diff --git a/scripts/testv/stv3OA32c.pcm b/scripts/testv/stv3OA32c.pcm deleted file mode 100644 index 3a66fd65df..0000000000 --- a/scripts/testv/stv3OA32c.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d5d4c15eb0d60327e3fba67801d921537c0b1633c1f6e1626e0a9ec31a9ff01d -size 20480544 diff --git a/scripts/testv/stv3OA32c.wav b/scripts/testv/stv3OA32c.wav new file mode 100644 index 0000000000..07cda52674 --- /dev/null +++ b/scripts/testv/stv3OA32c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdd1fd31b318bef4439a35baf2252c8edabb826198c75d705095b68dfa288fb0 +size 20480588 diff --git a/scripts/testv/stv3OA48c.pcm b/scripts/testv/stv3OA48c.pcm deleted file mode 100644 index daaaafb65a..0000000000 --- a/scripts/testv/stv3OA48c.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a63b96d6e7baf35520b3841e80ba63babc6e66b0750a88039628665f05b4d797 -size 30720800 diff --git a/scripts/testv/stv3OA48c.wav b/scripts/testv/stv3OA48c.wav new file mode 100644 index 0000000000..960d9e2019 --- /dev/null +++ b/scripts/testv/stv3OA48c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ce54b1708a76f34eeedc40b01e806cb92d32b0813e8ac23bfceaaa8d25262e6 +size 30720844 diff --git a/scripts/testv/stv48c.pcm b/scripts/testv/stv48c.pcm deleted file mode 100644 index 0b115c28ec..0000000000 --- a/scripts/testv/stv48c.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f9ce14457d7027466a26ed258e1080aaa84755d340ec024032460b6f9dd7088 -size 1920000 diff --git a/scripts/testv/stv48c.wav b/scripts/testv/stv48c.wav new file mode 100644 index 0000000000..1be5a1dc3c --- /dev/null +++ b/scripts/testv/stv48c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59f39e02d601b453170cde1e49d50e58b58ff5154ba54c75fc5d79f4964d1e48 +size 1920044 diff --git a/scripts/testv/stv48n.pcm b/scripts/testv/stv48n.pcm deleted file mode 100644 index 16a6205b72..0000000000 --- a/scripts/testv/stv48n.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:799bd2f938ea02f608af8f1a125746c85789dc938d5ca23d7c2766c643761488 -size 1862400 diff --git a/scripts/testv/stv48n.wav b/scripts/testv/stv48n.wav new file mode 100644 index 0000000000..2d79cee520 --- /dev/null +++ b/scripts/testv/stv48n.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c774e6fe4e22274ef72552901c4b4870d56d825fa67e8e3e59a30cc0a44dbfa +size 1862444 diff --git a/scripts/testv/stv4ISM48n.wav b/scripts/testv/stv4ISM48n.wav new file mode 100644 index 0000000000..0ca6e5f3f5 --- /dev/null +++ b/scripts/testv/stv4ISM48n.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74697fcb6241db1bed87121244c09a3499ea4024cdf15d279feafbedbca6123a +size 7680044 diff --git a/scripts/testv/stv4ISM48s.pcm b/scripts/testv/stv4ISM48s.pcm deleted file mode 100644 index 90034cabcb..0000000000 --- a/scripts/testv/stv4ISM48s.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:338608f5416666088dd09533bc2f7d93c3545ef4d23a2b34c869df15f23ee550 -size 11520000 diff --git a/scripts/testv/stv4ISM48s.wav b/scripts/testv/stv4ISM48s.wav new file mode 100644 index 0000000000..de034819ea --- /dev/null +++ b/scripts/testv/stv4ISM48s.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70433aebd892f38df31f12f10e71caaa1e794c64abb7d3e75fe895676e63609e +size 11520044 diff --git a/scripts/testv/stv512MC48c.pcm b/scripts/testv/stv512MC48c.pcm deleted file mode 100644 index 278cd0701f..0000000000 --- a/scripts/testv/stv512MC48c.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:860fd8f0fb4fc26c0ec525ee0b932551084029281a155315c8a441fad21563e1 -size 2304000 diff --git a/scripts/testv/stv512MC48c.wav b/scripts/testv/stv512MC48c.wav new file mode 100644 index 0000000000..e21644a5d9 --- /dev/null +++ b/scripts/testv/stv512MC48c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3be0c6dccbf26f8755200683bba42553eb36feed297110e289afcec32e0c8459 +size 2304044 diff --git a/scripts/testv/stv514MC48c.pcm b/scripts/testv/stv514MC48c.pcm deleted file mode 100644 index 37c80b7eef..0000000000 --- a/scripts/testv/stv514MC48c.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b82dfc9cc7ddfb53cf8233934d14f6b61b1bec10f2a3648ee603a92793a2ce32 -size 2880000 diff --git a/scripts/testv/stv514MC48c.wav b/scripts/testv/stv514MC48c.wav new file mode 100644 index 0000000000..113cd6219a --- /dev/null +++ b/scripts/testv/stv514MC48c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2097dd80fa69f239689b06a62a44eb592bf2fe699e549347ae4567c1b690170 +size 2880044 diff --git a/scripts/testv/stv51MC48c.pcm b/scripts/testv/stv51MC48c.pcm deleted file mode 100644 index ee5d30894b..0000000000 --- a/scripts/testv/stv51MC48c.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf352e4c5b907dfa1c444086b1dd3c2c85b35cc8b6f2339126ca9caa5b2d60ca -size 11520000 diff --git a/scripts/testv/stv51MC48c.wav b/scripts/testv/stv51MC48c.wav new file mode 100644 index 0000000000..e5f4bae7d4 --- /dev/null +++ b/scripts/testv/stv51MC48c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:daccececb4336a7f2492185767d108dbc5594a7d6e2841d861f43ef44437a377 +size 11520044 diff --git a/scripts/testv/stv714MC48c.pcm b/scripts/testv/stv714MC48c.pcm deleted file mode 100644 index c96edbcc9a..0000000000 --- a/scripts/testv/stv714MC48c.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b86e109d1fc6e1af00415ff8f40518dd29b6e29d579337a5fcfad38d8fcbd5f -size 3456000 diff --git a/scripts/testv/stv714MC48c.wav b/scripts/testv/stv714MC48c.wav new file mode 100644 index 0000000000..cabcb790b0 --- /dev/null +++ b/scripts/testv/stv714MC48c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da62e19b166089efae2f22e68d76b82d3295d15785a4967465a04bc1c75b0462 +size 3456044 diff --git a/scripts/testv/stv71MC48c.wav b/scripts/testv/stv71MC48c.wav new file mode 100644 index 0000000000..72b3337e59 --- /dev/null +++ b/scripts/testv/stv71MC48c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fb15d0c109c41d5e629b2e15a47be72ca8d209919ac39f79a7947e9cd2e5e02 +size 2304044 diff --git a/scripts/testv/stv8c.pcm b/scripts/testv/stv8c.pcm deleted file mode 100644 index 33202e720a..0000000000 --- a/scripts/testv/stv8c.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2299d6dac56e54e4684d04ab280df3b5642ff858c69e6adcc179e92f5322fc20 -size 320002 diff --git a/scripts/testv/stv8c.wav b/scripts/testv/stv8c.wav new file mode 100644 index 0000000000..5f3b0ed4d9 --- /dev/null +++ b/scripts/testv/stv8c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:722081dcfaaee1c04254b0bde8436c73748a44f6760067907194a1ba24b199d7 +size 320046 diff --git a/scripts/testv/stv8n.pcm b/scripts/testv/stv8n.pcm deleted file mode 100644 index a92d8d473a..0000000000 --- a/scripts/testv/stv8n.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b24bbc4f76a827857f9f6cbfbc03efc3e15cd72e88e8e4670deeda67674fcdb3 -size 310402 diff --git a/scripts/testv/stv8n.wav b/scripts/testv/stv8n.wav new file mode 100644 index 0000000000..2b35ec4dba --- /dev/null +++ b/scripts/testv/stv8n.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:223e9f5353c49163803abedf97d557436d025f445fe9de4508c9559ca15b330b +size 310446 diff --git a/scripts/testv/stvFOA16c.pcm b/scripts/testv/stvFOA16c.pcm deleted file mode 100644 index ff0ac24666..0000000000 --- a/scripts/testv/stvFOA16c.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15effd94a7de8af7979405119556131124d273c6d106f3e03ed1cf55d42c7388 -size 2560072 diff --git a/scripts/testv/stvFOA16c.wav b/scripts/testv/stvFOA16c.wav new file mode 100644 index 0000000000..cb67e8b371 --- /dev/null +++ b/scripts/testv/stvFOA16c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6725a5d2647516071033f83f385dc7dfe4ff6719d493b1b682ec0274c1347e93 +size 2560116 diff --git a/scripts/testv/stvFOA32c.pcm b/scripts/testv/stvFOA32c.pcm deleted file mode 100644 index cddf93873b..0000000000 --- a/scripts/testv/stvFOA32c.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:efb3b80d1b914eeea575505009bee3dd14afb21b7a2f7d68620b3fb0f2e389b0 -size 5120136 diff --git a/scripts/testv/stvFOA32c.wav b/scripts/testv/stvFOA32c.wav new file mode 100644 index 0000000000..661a97a3dc --- /dev/null +++ b/scripts/testv/stvFOA32c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:273308e57de4c5f3ef2eeed164b0a9f34ba86ab05ca533ee5ee8a76528c01abe +size 5120180 diff --git a/scripts/testv/stvFOA48c.pcm b/scripts/testv/stvFOA48c.pcm deleted file mode 100644 index 34b0c5a6ab..0000000000 --- a/scripts/testv/stvFOA48c.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a07fa723662c3017989130d49d5cfcf0d5d498be992212970e19cd1a60c61193 -size 7680200 diff --git a/scripts/testv/stvFOA48c.wav b/scripts/testv/stvFOA48c.wav new file mode 100644 index 0000000000..7ece23b084 --- /dev/null +++ b/scripts/testv/stvFOA48c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45a1dd6c4fe6802e98821657337b453d5dab2fe32089c675637b9d23cfe74c8d +size 7680244 diff --git a/scripts/testv/stvISM1.csv b/scripts/testv/stvISM1.csv index 8d729654c4..0082c12823 100644 --- a/scripts/testv/stvISM1.csv +++ b/scripts/testv/stvISM1.csv @@ -1,1500 +1,1500 @@ -0.00,0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 -9.60,0.00,1.00,0.00,1.00 -14.40,0.00,1.00,0.00,1.00 -19.20,0.00,1.00,0.00,1.00 -24.00,0.00,1.00,0.00,1.00 -28.80,0.00,1.00,0.00,1.00 -33.60,0.00,1.00,0.00,1.00 -38.40,0.00,1.00,0.00,1.00 -43.20,0.00,1.00,0.00,1.00 -48.00,0.00,1.00,0.00,1.00 -52.80,0.00,1.00,0.00,1.00 -57.60,0.00,1.00,0.00,1.00 -62.40,0.00,1.00,0.00,1.00 -67.20,0.00,1.00,0.00,1.00 -72.00,0.00,1.00,0.00,1.00 -76.80,0.00,1.00,0.00,1.00 -81.60,0.00,1.00,0.00,1.00 -86.40,0.00,1.00,0.00,1.00 -91.20,0.00,1.00,0.00,1.00 -96.00,0.00,1.00,0.00,1.00 -100.80,0.00,1.00,0.00,1.00 -105.60,0.00,1.00,0.00,1.00 -110.40,0.00,1.00,0.00,1.00 -115.20,0.00,1.00,0.00,1.00 -120.00,0.00,1.00,0.00,1.00 -124.80,0.00,1.00,0.00,1.00 -129.60,0.00,1.00,0.00,1.00 -134.40,0.00,1.00,0.00,1.00 -139.20,0.00,1.00,0.00,1.00 -144.00,0.00,1.00,0.00,1.00 -148.80,0.00,1.00,0.00,1.00 -153.60,0.00,1.00,0.00,1.00 -158.40,0.00,1.00,0.00,1.00 -163.20,0.00,1.00,0.00,1.00 -168.00,0.00,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 --163.20,0.00,1.00,0.00,1.00 --158.40,0.00,1.00,0.00,1.00 --153.60,0.00,1.00,0.00,1.00 --148.80,0.00,1.00,0.00,1.00 --144.00,0.00,1.00,0.00,1.00 --139.20,0.00,1.00,0.00,1.00 --134.40,0.00,1.00,0.00,1.00 --129.60,0.00,1.00,0.00,1.00 --124.80,0.00,1.00,0.00,1.00 --120.00,0.00,1.00,0.00,1.00 --115.20,0.00,1.00,0.00,1.00 --110.40,0.00,1.00,0.00,1.00 --105.60,0.00,1.00,0.00,1.00 --100.80,0.00,1.00,0.00,1.00 --96.00,0.00,1.00,0.00,1.00 --91.20,0.00,1.00,0.00,1.00 --86.40,0.00,1.00,0.00,1.00 --81.60,0.00,1.00,0.00,1.00 --76.80,0.00,1.00,0.00,1.00 --72.00,0.00,1.00,0.00,1.00 --67.20,0.00,1.00,0.00,1.00 --62.40,0.00,1.00,0.00,1.00 --57.60,0.00,1.00,0.00,1.00 --52.80,0.00,1.00,0.00,1.00 --48.00,0.00,1.00,0.00,1.00 --43.20,0.00,1.00,0.00,1.00 --38.40,0.00,1.00,0.00,1.00 --33.60,0.00,1.00,0.00,1.00 --28.80,0.00,1.00,0.00,1.00 --24.00,0.00,1.00,0.00,1.00 --19.20,0.00,1.00,0.00,1.00 --14.40,0.00,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -9.60,-0.00,1.00,0.00,1.00 -14.40,-0.00,1.00,0.00,1.00 -19.20,-0.00,1.00,0.00,1.00 -24.00,-0.00,1.00,0.00,1.00 -28.80,-0.00,1.00,0.00,1.00 -33.60,-4.80,1.00,0.00,1.00 -38.40,-4.80,1.00,0.00,1.00 -43.20,-4.80,1.00,0.00,1.00 -48.00,-4.80,1.00,0.00,1.00 -52.80,-4.80,1.00,0.00,1.00 -57.60,-4.80,1.00,0.00,1.00 -62.40,-4.80,1.00,0.00,1.00 -67.20,-4.80,1.00,0.00,1.00 -72.00,-4.80,1.00,0.00,1.00 -76.80,-4.80,1.00,0.00,1.00 -81.60,-4.80,1.00,0.00,1.00 -86.40,-4.80,1.00,0.00,1.00 -91.20,-4.80,1.00,0.00,1.00 -96.00,-4.80,1.00,0.00,1.00 -100.80,-4.80,1.00,0.00,1.00 -105.60,-4.80,1.00,0.00,1.00 -110.40,-4.80,1.00,0.00,1.00 -115.20,-4.80,1.00,0.00,1.00 -120.00,-4.80,1.00,0.00,1.00 -124.80,-4.80,1.00,0.00,1.00 -129.60,-4.80,1.00,0.00,1.00 -134.40,-4.80,1.00,0.00,1.00 -139.20,-4.80,1.00,0.00,1.00 -144.00,-4.80,1.00,0.00,1.00 -148.80,-4.80,1.00,0.00,1.00 -153.60,-0.00,1.00,0.00,1.00 -158.40,-0.00,1.00,0.00,1.00 -163.20,-0.00,1.00,0.00,1.00 -168.00,-0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 --163.20,0.00,1.00,0.00,1.00 --158.40,0.00,1.00,0.00,1.00 --153.60,0.00,1.00,0.00,1.00 --148.80,4.80,1.00,0.00,1.00 --144.00,4.80,1.00,0.00,1.00 --139.20,4.80,1.00,0.00,1.00 --134.40,4.80,1.00,0.00,1.00 --129.60,4.80,1.00,0.00,1.00 --124.80,4.80,1.00,0.00,1.00 --120.00,4.80,1.00,0.00,1.00 --115.20,4.80,1.00,0.00,1.00 --110.40,4.80,1.00,0.00,1.00 --105.60,4.80,1.00,0.00,1.00 --100.80,4.80,1.00,0.00,1.00 --96.00,4.80,1.00,0.00,1.00 --91.20,4.80,1.00,0.00,1.00 --86.40,4.80,1.00,0.00,1.00 --81.60,4.80,1.00,0.00,1.00 --76.80,4.80,1.00,0.00,1.00 --72.00,4.80,1.00,0.00,1.00 --67.20,4.80,1.00,0.00,1.00 --62.40,4.80,1.00,0.00,1.00 --57.60,4.80,1.00,0.00,1.00 --52.80,4.80,1.00,0.00,1.00 --48.00,4.80,1.00,0.00,1.00 --43.20,4.80,1.00,0.00,1.00 --38.40,4.80,1.00,0.00,1.00 --33.60,4.80,1.00,0.00,1.00 --28.80,0.00,1.00,0.00,1.00 --24.00,0.00,1.00,0.00,1.00 --19.20,0.00,1.00,0.00,1.00 --14.40,0.00,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -9.60,-0.00,1.00,0.00,1.00 -14.40,-0.00,1.00,0.00,1.00 -19.20,-4.80,1.00,0.00,1.00 -24.00,-4.80,1.00,0.00,1.00 -28.80,-4.80,1.00,0.00,1.00 -33.60,-4.80,1.00,0.00,1.00 -38.40,-4.80,1.00,0.00,1.00 -43.20,-4.80,1.00,0.00,1.00 -48.00,-4.80,1.00,0.00,1.00 -52.80,-9.60,1.00,0.00,1.00 -57.60,-9.60,1.00,0.00,1.00 -62.40,-9.60,1.00,0.00,1.00 -67.20,-9.60,1.00,0.00,1.00 -72.00,-9.60,1.00,0.00,1.00 -76.80,-9.60,1.00,0.00,1.00 -81.60,-9.60,1.00,0.00,1.00 -86.40,-9.60,1.00,0.00,1.00 -91.20,-9.60,1.00,0.00,1.00 -96.00,-9.60,1.00,0.00,1.00 -100.80,-9.60,1.00,0.00,1.00 -105.60,-9.60,1.00,0.00,1.00 -110.40,-9.60,1.00,0.00,1.00 -115.20,-9.60,1.00,0.00,1.00 -120.00,-9.60,1.00,0.00,1.00 -124.80,-9.60,1.00,0.00,1.00 -129.60,-9.60,1.00,0.00,1.00 -134.40,-4.80,1.00,0.00,1.00 -139.20,-4.80,1.00,0.00,1.00 -144.00,-4.80,1.00,0.00,1.00 -148.80,-4.80,1.00,0.00,1.00 -153.60,-4.80,1.00,0.00,1.00 -158.40,-4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 -168.00,-0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 --163.20,4.80,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 --153.60,4.80,1.00,0.00,1.00 --148.80,4.80,1.00,0.00,1.00 --144.00,4.80,1.00,0.00,1.00 --139.20,4.80,1.00,0.00,1.00 --134.40,4.80,1.00,0.00,1.00 --129.60,9.60,1.00,0.00,1.00 --124.80,9.60,1.00,0.00,1.00 --120.00,9.60,1.00,0.00,1.00 --115.20,9.60,1.00,0.00,1.00 --110.40,9.60,1.00,0.00,1.00 --105.60,9.60,1.00,0.00,1.00 --100.80,9.60,1.00,0.00,1.00 --96.00,9.60,1.00,0.00,1.00 --91.20,9.60,1.00,0.00,1.00 --86.40,9.60,1.00,0.00,1.00 --81.60,9.60,1.00,0.00,1.00 --76.80,9.60,1.00,0.00,1.00 --72.00,9.60,1.00,0.00,1.00 --67.20,9.60,1.00,0.00,1.00 --62.40,9.60,1.00,0.00,1.00 --57.60,9.60,1.00,0.00,1.00 --52.80,9.60,1.00,0.00,1.00 --48.00,4.80,1.00,0.00,1.00 --43.20,4.80,1.00,0.00,1.00 --38.40,4.80,1.00,0.00,1.00 --33.60,4.80,1.00,0.00,1.00 --28.80,4.80,1.00,0.00,1.00 --24.00,4.80,1.00,0.00,1.00 --19.20,4.80,1.00,0.00,1.00 --14.40,0.00,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -9.60,-0.00,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 -19.20,-4.80,1.00,0.00,1.00 -24.00,-4.80,1.00,0.00,1.00 -28.80,-4.80,1.00,0.00,1.00 -33.60,-9.60,1.00,0.00,1.00 -38.40,-9.60,1.00,0.00,1.00 -43.20,-9.60,1.00,0.00,1.00 -48.00,-9.60,1.00,0.00,1.00 -52.80,-9.60,1.00,0.00,1.00 -57.60,-14.40,1.00,0.00,1.00 -62.40,-14.40,1.00,0.00,1.00 -67.20,-14.40,1.00,0.00,1.00 -72.00,-14.40,1.00,0.00,1.00 -76.80,-14.40,1.00,0.00,1.00 -81.60,-14.40,1.00,0.00,1.00 -86.40,-14.40,1.00,0.00,1.00 -91.20,-14.40,1.00,0.00,1.00 -96.00,-14.40,1.00,0.00,1.00 -100.80,-14.40,1.00,0.00,1.00 -105.60,-14.40,1.00,0.00,1.00 -110.40,-14.40,1.00,0.00,1.00 -115.20,-14.40,1.00,0.00,1.00 -120.00,-14.40,1.00,0.00,1.00 -124.80,-9.60,1.00,0.00,1.00 -129.60,-9.60,1.00,0.00,1.00 -134.40,-9.60,1.00,0.00,1.00 -139.20,-9.60,1.00,0.00,1.00 -144.00,-9.60,1.00,0.00,1.00 -148.80,-9.60,1.00,0.00,1.00 -153.60,-4.80,1.00,0.00,1.00 -158.40,-4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 -168.00,-4.80,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 --163.20,4.80,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 --153.60,4.80,1.00,0.00,1.00 --148.80,9.60,1.00,0.00,1.00 --144.00,9.60,1.00,0.00,1.00 --139.20,9.60,1.00,0.00,1.00 --134.40,9.60,1.00,0.00,1.00 --129.60,9.60,1.00,0.00,1.00 --124.80,9.60,1.00,0.00,1.00 --120.00,14.40,1.00,0.00,1.00 --115.20,14.40,1.00,0.00,1.00 --110.40,14.40,1.00,0.00,1.00 --105.60,14.40,1.00,0.00,1.00 --100.80,14.40,1.00,0.00,1.00 --96.00,14.40,1.00,0.00,1.00 --91.20,14.40,1.00,0.00,1.00 --86.40,14.40,1.00,0.00,1.00 --81.60,14.40,1.00,0.00,1.00 --76.80,14.40,1.00,0.00,1.00 --72.00,14.40,1.00,0.00,1.00 --67.20,14.40,1.00,0.00,1.00 --62.40,14.40,1.00,0.00,1.00 --57.60,14.40,1.00,0.00,1.00 --52.80,9.60,1.00,0.00,1.00 --48.00,9.60,1.00,0.00,1.00 --43.20,9.60,1.00,0.00,1.00 --38.40,9.60,1.00,0.00,1.00 --33.60,9.60,1.00,0.00,1.00 --28.80,4.80,1.00,0.00,1.00 --24.00,4.80,1.00,0.00,1.00 --19.20,4.80,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 -19.20,-4.80,1.00,0.00,1.00 -24.00,-9.60,1.00,0.00,1.00 -28.80,-9.60,1.00,0.00,1.00 -33.60,-9.60,1.00,0.00,1.00 -38.40,-9.60,1.00,0.00,1.00 -43.20,-14.40,1.00,0.00,1.00 -48.00,-14.40,1.00,0.00,1.00 -52.80,-14.40,1.00,0.00,1.00 -57.60,-14.40,1.00,0.00,1.00 -62.40,-19.20,1.00,0.00,1.00 -67.20,-19.20,1.00,0.00,1.00 -72.00,-19.20,1.00,0.00,1.00 -76.80,-19.20,1.00,0.00,1.00 -81.60,-19.20,1.00,0.00,1.00 -86.40,-19.20,1.00,0.00,1.00 -91.20,-19.20,1.00,0.00,1.00 -96.00,-19.20,1.00,0.00,1.00 -100.80,-19.20,1.00,0.00,1.00 -105.60,-19.20,1.00,0.00,1.00 -110.40,-19.20,1.00,0.00,1.00 -115.20,-19.20,1.00,0.00,1.00 -120.00,-14.40,1.00,0.00,1.00 -124.80,-14.40,1.00,0.00,1.00 -129.60,-14.40,1.00,0.00,1.00 -134.40,-14.40,1.00,0.00,1.00 -139.20,-14.40,1.00,0.00,1.00 -144.00,-9.60,1.00,0.00,1.00 -148.80,-9.60,1.00,0.00,1.00 -153.60,-9.60,1.00,0.00,1.00 -158.40,-4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 -168.00,-4.80,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 --163.20,4.80,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 --153.60,9.60,1.00,0.00,1.00 --148.80,9.60,1.00,0.00,1.00 --144.00,9.60,1.00,0.00,1.00 --139.20,14.40,1.00,0.00,1.00 --134.40,14.40,1.00,0.00,1.00 --129.60,14.40,1.00,0.00,1.00 --124.80,14.40,1.00,0.00,1.00 --120.00,14.40,1.00,0.00,1.00 --115.20,19.20,1.00,0.00,1.00 --110.40,19.20,1.00,0.00,1.00 --105.60,19.20,1.00,0.00,1.00 --100.80,19.20,1.00,0.00,1.00 --96.00,19.20,1.00,0.00,1.00 --91.20,19.20,1.00,0.00,1.00 --86.40,19.20,1.00,0.00,1.00 --81.60,19.20,1.00,0.00,1.00 --76.80,19.20,1.00,0.00,1.00 --72.00,19.20,1.00,0.00,1.00 --67.20,19.20,1.00,0.00,1.00 --62.40,19.20,1.00,0.00,1.00 --57.60,14.40,1.00,0.00,1.00 --52.80,14.40,1.00,0.00,1.00 --48.00,14.40,1.00,0.00,1.00 --43.20,14.40,1.00,0.00,1.00 --38.40,9.60,1.00,0.00,1.00 --33.60,9.60,1.00,0.00,1.00 --28.80,9.60,1.00,0.00,1.00 --24.00,9.60,1.00,0.00,1.00 --19.20,4.80,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 -19.20,-9.60,1.00,0.00,1.00 -24.00,-9.60,1.00,0.00,1.00 -28.80,-9.60,1.00,0.00,1.00 -33.60,-14.40,1.00,0.00,1.00 -33.60,-14.40,1.00,0.00,1.00 -38.40,-14.40,1.00,0.00,1.00 -43.20,-19.20,1.00,0.00,1.00 -48.00,-19.20,1.00,0.00,1.00 -57.60,-19.20,1.00,0.00,1.00 -62.40,-19.20,1.00,0.00,1.00 -67.20,-24.00,1.00,0.00,1.00 -72.00,-24.00,1.00,0.00,1.00 -76.80,-24.00,1.00,0.00,1.00 -81.60,-24.00,1.00,0.00,1.00 -86.40,-24.00,1.00,0.00,1.00 -91.20,-24.00,1.00,0.00,1.00 -96.00,-24.00,1.00,0.00,1.00 -100.80,-24.00,1.00,0.00,1.00 -105.60,-24.00,1.00,0.00,1.00 -110.40,-24.00,1.00,0.00,1.00 -115.20,-19.20,1.00,0.00,1.00 -120.00,-19.20,1.00,0.00,1.00 -129.60,-19.20,1.00,0.00,1.00 -134.40,-19.20,1.00,0.00,1.00 -139.20,-19.20,1.00,0.00,1.00 -144.00,-14.40,1.00,0.00,1.00 -148.80,-14.40,1.00,0.00,1.00 -148.80,-14.40,1.00,0.00,1.00 -153.60,-9.60,1.00,0.00,1.00 -158.40,-9.60,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 -168.00,-4.80,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 --163.20,4.80,1.00,0.00,1.00 --158.40,9.60,1.00,0.00,1.00 --153.60,9.60,1.00,0.00,1.00 --148.80,14.40,1.00,0.00,1.00 --148.80,14.40,1.00,0.00,1.00 --144.00,14.40,1.00,0.00,1.00 --139.20,19.20,1.00,0.00,1.00 --134.40,19.20,1.00,0.00,1.00 --129.60,19.20,1.00,0.00,1.00 --120.00,19.20,1.00,0.00,1.00 --115.20,19.20,1.00,0.00,1.00 --110.40,24.00,1.00,0.00,1.00 --105.60,24.00,1.00,0.00,1.00 --100.80,24.00,1.00,0.00,1.00 --96.00,24.00,1.00,0.00,1.00 --91.20,24.00,1.00,0.00,1.00 --86.40,24.00,1.00,0.00,1.00 --81.60,24.00,1.00,0.00,1.00 --76.80,24.00,1.00,0.00,1.00 --72.00,24.00,1.00,0.00,1.00 --67.20,24.00,1.00,0.00,1.00 --62.40,19.20,1.00,0.00,1.00 --57.60,19.20,1.00,0.00,1.00 --48.00,19.20,1.00,0.00,1.00 --43.20,19.20,1.00,0.00,1.00 --38.40,14.40,1.00,0.00,1.00 --33.60,14.40,1.00,0.00,1.00 --33.60,14.40,1.00,0.00,1.00 --28.80,9.60,1.00,0.00,1.00 --24.00,9.60,1.00,0.00,1.00 --19.20,9.60,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 -19.20,-9.60,1.00,0.00,1.00 -19.20,-9.60,1.00,0.00,1.00 -24.00,-14.40,1.00,0.00,1.00 -28.80,-14.40,1.00,0.00,1.00 -33.60,-19.20,1.00,0.00,1.00 -38.40,-19.20,1.00,0.00,1.00 -43.20,-19.20,1.00,0.00,1.00 -48.00,-24.00,1.00,0.00,1.00 -52.80,-24.00,1.00,0.00,1.00 -57.60,-24.00,1.00,0.00,1.00 -62.40,-24.00,1.00,0.00,1.00 -72.00,-28.80,1.00,0.00,1.00 -76.80,-28.80,1.00,0.00,1.00 -81.60,-28.80,1.00,0.00,1.00 -86.40,-28.80,1.00,0.00,1.00 -91.20,-28.80,1.00,0.00,1.00 -96.00,-28.80,1.00,0.00,1.00 -100.80,-28.80,1.00,0.00,1.00 -105.60,-28.80,1.00,0.00,1.00 -115.20,-28.80,1.00,0.00,1.00 -120.00,-24.00,1.00,0.00,1.00 -124.80,-24.00,1.00,0.00,1.00 -129.60,-24.00,1.00,0.00,1.00 -134.40,-24.00,1.00,0.00,1.00 -139.20,-19.20,1.00,0.00,1.00 -144.00,-19.20,1.00,0.00,1.00 -148.80,-14.40,1.00,0.00,1.00 -153.60,-14.40,1.00,0.00,1.00 -158.40,-14.40,1.00,0.00,1.00 -163.20,-9.60,1.00,0.00,1.00 -163.20,-9.60,1.00,0.00,1.00 -168.00,-4.80,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 --163.20,9.60,1.00,0.00,1.00 --163.20,9.60,1.00,0.00,1.00 --158.40,14.40,1.00,0.00,1.00 --153.60,14.40,1.00,0.00,1.00 --148.80,14.40,1.00,0.00,1.00 --144.00,19.20,1.00,0.00,1.00 --139.20,19.20,1.00,0.00,1.00 --134.40,24.00,1.00,0.00,1.00 --129.60,24.00,1.00,0.00,1.00 --124.80,24.00,1.00,0.00,1.00 --120.00,24.00,1.00,0.00,1.00 --115.20,28.80,1.00,0.00,1.00 --105.60,28.80,1.00,0.00,1.00 --100.80,28.80,1.00,0.00,1.00 --96.00,28.80,1.00,0.00,1.00 --91.20,28.80,1.00,0.00,1.00 --86.40,28.80,1.00,0.00,1.00 --81.60,28.80,1.00,0.00,1.00 --76.80,28.80,1.00,0.00,1.00 --72.00,28.80,1.00,0.00,1.00 --62.40,24.00,1.00,0.00,1.00 --57.60,24.00,1.00,0.00,1.00 --52.80,24.00,1.00,0.00,1.00 --48.00,24.00,1.00,0.00,1.00 --43.20,19.20,1.00,0.00,1.00 --38.40,19.20,1.00,0.00,1.00 --33.60,19.20,1.00,0.00,1.00 --28.80,14.40,1.00,0.00,1.00 --24.00,14.40,1.00,0.00,1.00 --19.20,9.60,1.00,0.00,1.00 --19.20,9.60,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 -19.20,-14.40,1.00,0.00,1.00 -24.00,-14.40,1.00,0.00,1.00 -28.80,-19.20,1.00,0.00,1.00 -33.60,-19.20,1.00,0.00,1.00 -38.40,-24.00,1.00,0.00,1.00 -43.20,-24.00,1.00,0.00,1.00 -48.00,-24.00,1.00,0.00,1.00 -52.80,-28.80,1.00,0.00,1.00 -57.60,-28.80,1.00,0.00,1.00 -62.40,-28.80,1.00,0.00,1.00 -67.20,-33.60,1.00,0.00,1.00 -72.00,-33.60,1.00,0.00,1.00 -81.60,-33.60,1.00,0.00,1.00 -86.40,-33.60,1.00,0.00,1.00 -91.20,-33.60,1.00,0.00,1.00 -96.00,-33.60,1.00,0.00,1.00 -100.80,-33.60,1.00,0.00,1.00 -110.40,-33.60,1.00,0.00,1.00 -115.20,-33.60,1.00,0.00,1.00 -120.00,-28.80,1.00,0.00,1.00 -124.80,-28.80,1.00,0.00,1.00 -129.60,-28.80,1.00,0.00,1.00 -134.40,-24.00,1.00,0.00,1.00 -139.20,-24.00,1.00,0.00,1.00 -144.00,-19.20,1.00,0.00,1.00 -148.80,-19.20,1.00,0.00,1.00 -153.60,-14.40,1.00,0.00,1.00 -158.40,-14.40,1.00,0.00,1.00 -163.20,-9.60,1.00,0.00,1.00 -168.00,-9.60,1.00,0.00,1.00 -168.00,-4.80,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 --168.00,9.60,1.00,0.00,1.00 --163.20,9.60,1.00,0.00,1.00 --158.40,14.40,1.00,0.00,1.00 --153.60,14.40,1.00,0.00,1.00 --148.80,19.20,1.00,0.00,1.00 --144.00,19.20,1.00,0.00,1.00 --139.20,24.00,1.00,0.00,1.00 --134.40,24.00,1.00,0.00,1.00 --129.60,28.80,1.00,0.00,1.00 --124.80,28.80,1.00,0.00,1.00 --120.00,28.80,1.00,0.00,1.00 --115.20,33.60,1.00,0.00,1.00 --110.40,33.60,1.00,0.00,1.00 --100.80,33.60,1.00,0.00,1.00 --96.00,33.60,1.00,0.00,1.00 --91.20,33.60,1.00,0.00,1.00 --86.40,33.60,1.00,0.00,1.00 --81.60,33.60,1.00,0.00,1.00 --72.00,33.60,1.00,0.00,1.00 --67.20,33.60,1.00,0.00,1.00 --62.40,28.80,1.00,0.00,1.00 --57.60,28.80,1.00,0.00,1.00 --52.80,28.80,1.00,0.00,1.00 --48.00,24.00,1.00,0.00,1.00 --43.20,24.00,1.00,0.00,1.00 --38.40,24.00,1.00,0.00,1.00 --33.60,19.20,1.00,0.00,1.00 --28.80,19.20,1.00,0.00,1.00 --24.00,14.40,1.00,0.00,1.00 --19.20,14.40,1.00,0.00,1.00 --14.40,9.60,1.00,0.00,1.00 --14.40,9.60,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 -9.60,-9.60,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 -19.20,-14.40,1.00,0.00,1.00 -24.00,-19.20,1.00,0.00,1.00 -28.80,-19.20,1.00,0.00,1.00 -33.60,-24.00,1.00,0.00,1.00 -38.40,-24.00,1.00,0.00,1.00 -43.20,-28.80,1.00,0.00,1.00 -48.00,-28.80,1.00,0.00,1.00 -52.80,-33.60,1.00,0.00,1.00 -57.60,-33.60,1.00,0.00,1.00 -62.40,-33.60,1.00,0.00,1.00 -67.20,-38.40,1.00,0.00,1.00 -72.00,-38.40,1.00,0.00,1.00 -81.60,-38.40,1.00,0.00,1.00 -86.40,-38.40,1.00,0.00,1.00 -91.20,-38.40,1.00,0.00,1.00 -96.00,-38.40,1.00,0.00,1.00 -105.60,-38.40,1.00,0.00,1.00 -110.40,-38.40,1.00,0.00,1.00 -115.20,-33.60,1.00,0.00,1.00 -120.00,-33.60,1.00,0.00,1.00 -124.80,-33.60,1.00,0.00,1.00 -129.60,-28.80,1.00,0.00,1.00 -134.40,-28.80,1.00,0.00,1.00 -139.20,-24.00,1.00,0.00,1.00 -144.00,-24.00,1.00,0.00,1.00 -148.80,-19.20,1.00,0.00,1.00 -153.60,-19.20,1.00,0.00,1.00 -158.40,-14.40,1.00,0.00,1.00 -163.20,-14.40,1.00,0.00,1.00 -168.00,-9.60,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --168.00,9.60,1.00,0.00,1.00 --163.20,14.40,1.00,0.00,1.00 --158.40,14.40,1.00,0.00,1.00 --153.60,19.20,1.00,0.00,1.00 --148.80,19.20,1.00,0.00,1.00 --144.00,24.00,1.00,0.00,1.00 --139.20,24.00,1.00,0.00,1.00 --134.40,28.80,1.00,0.00,1.00 --129.60,28.80,1.00,0.00,1.00 --124.80,33.60,1.00,0.00,1.00 --120.00,33.60,1.00,0.00,1.00 --115.20,33.60,1.00,0.00,1.00 --110.40,38.40,1.00,0.00,1.00 --105.60,38.40,1.00,0.00,1.00 --96.00,38.40,1.00,0.00,1.00 --91.20,38.40,1.00,0.00,1.00 --86.40,38.40,1.00,0.00,1.00 --81.60,38.40,1.00,0.00,1.00 --72.00,38.40,1.00,0.00,1.00 --67.20,38.40,1.00,0.00,1.00 --62.40,33.60,1.00,0.00,1.00 --57.60,33.60,1.00,0.00,1.00 --52.80,33.60,1.00,0.00,1.00 --48.00,28.80,1.00,0.00,1.00 --43.20,28.80,1.00,0.00,1.00 --38.40,24.00,1.00,0.00,1.00 --33.60,24.00,1.00,0.00,1.00 --28.80,19.20,1.00,0.00,1.00 --24.00,19.20,1.00,0.00,1.00 --19.20,14.40,1.00,0.00,1.00 --14.40,9.60,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -9.60,-9.60,1.00,0.00,1.00 -14.40,-14.40,1.00,0.00,1.00 -19.20,-14.40,1.00,0.00,1.00 -24.00,-19.20,1.00,0.00,1.00 -24.00,-24.00,1.00,0.00,1.00 -28.80,-24.00,1.00,0.00,1.00 -33.60,-28.80,1.00,0.00,1.00 -38.40,-28.80,1.00,0.00,1.00 -43.20,-33.60,1.00,0.00,1.00 -48.00,-33.60,1.00,0.00,1.00 -52.80,-38.40,1.00,0.00,1.00 -62.40,-38.40,1.00,0.00,1.00 -67.20,-38.40,1.00,0.00,1.00 -72.00,-43.20,1.00,0.00,1.00 -76.80,-43.20,1.00,0.00,1.00 -86.40,-43.20,1.00,0.00,1.00 -91.20,-43.20,1.00,0.00,1.00 -96.00,-43.20,1.00,0.00,1.00 -105.60,-43.20,1.00,0.00,1.00 -110.40,-43.20,1.00,0.00,1.00 -115.20,-38.40,1.00,0.00,1.00 -124.80,-38.40,1.00,0.00,1.00 -129.60,-38.40,1.00,0.00,1.00 -134.40,-33.60,1.00,0.00,1.00 -139.20,-33.60,1.00,0.00,1.00 -144.00,-28.80,1.00,0.00,1.00 -148.80,-28.80,1.00,0.00,1.00 -153.60,-24.00,1.00,0.00,1.00 -158.40,-19.20,1.00,0.00,1.00 -158.40,-19.20,1.00,0.00,1.00 -163.20,-14.40,1.00,0.00,1.00 -168.00,-9.60,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --168.00,9.60,1.00,0.00,1.00 --163.20,14.40,1.00,0.00,1.00 --158.40,19.20,1.00,0.00,1.00 --158.40,19.20,1.00,0.00,1.00 --153.60,24.00,1.00,0.00,1.00 --148.80,28.80,1.00,0.00,1.00 --144.00,28.80,1.00,0.00,1.00 --139.20,33.60,1.00,0.00,1.00 --134.40,33.60,1.00,0.00,1.00 --129.60,38.40,1.00,0.00,1.00 --124.80,38.40,1.00,0.00,1.00 --115.20,38.40,1.00,0.00,1.00 --110.40,43.20,1.00,0.00,1.00 --105.60,43.20,1.00,0.00,1.00 --96.00,43.20,1.00,0.00,1.00 --91.20,43.20,1.00,0.00,1.00 --86.40,43.20,1.00,0.00,1.00 --76.80,43.20,1.00,0.00,1.00 --72.00,43.20,1.00,0.00,1.00 --67.20,38.40,1.00,0.00,1.00 --62.40,38.40,1.00,0.00,1.00 --52.80,38.40,1.00,0.00,1.00 --48.00,33.60,1.00,0.00,1.00 --43.20,33.60,1.00,0.00,1.00 --38.40,28.80,1.00,0.00,1.00 --33.60,28.80,1.00,0.00,1.00 --28.80,24.00,1.00,0.00,1.00 --24.00,24.00,1.00,0.00,1.00 --24.00,19.20,1.00,0.00,1.00 --19.20,14.40,1.00,0.00,1.00 --14.40,14.40,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -9.60,-9.60,1.00,0.00,1.00 -14.40,-14.40,1.00,0.00,1.00 -14.40,-19.20,1.00,0.00,1.00 -19.20,-19.20,1.00,0.00,1.00 -24.00,-24.00,1.00,0.00,1.00 -28.80,-28.80,1.00,0.00,1.00 -33.60,-28.80,1.00,0.00,1.00 -38.40,-33.60,1.00,0.00,1.00 -43.20,-38.40,1.00,0.00,1.00 -48.00,-38.40,1.00,0.00,1.00 -52.80,-43.20,1.00,0.00,1.00 -57.60,-43.20,1.00,0.00,1.00 -62.40,-43.20,1.00,0.00,1.00 -72.00,-48.00,1.00,0.00,1.00 -76.80,-48.00,1.00,0.00,1.00 -86.40,-48.00,1.00,0.00,1.00 -91.20,-48.00,1.00,0.00,1.00 -100.80,-48.00,1.00,0.00,1.00 -105.60,-48.00,1.00,0.00,1.00 -110.40,-48.00,1.00,0.00,1.00 -120.00,-43.20,1.00,0.00,1.00 -124.80,-43.20,1.00,0.00,1.00 -129.60,-38.40,1.00,0.00,1.00 -134.40,-38.40,1.00,0.00,1.00 -139.20,-33.60,1.00,0.00,1.00 -144.00,-33.60,1.00,0.00,1.00 -148.80,-28.80,1.00,0.00,1.00 -153.60,-24.00,1.00,0.00,1.00 -158.40,-24.00,1.00,0.00,1.00 -163.20,-19.20,1.00,0.00,1.00 -163.20,-14.40,1.00,0.00,1.00 -168.00,-14.40,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --168.00,14.40,1.00,0.00,1.00 --163.20,14.40,1.00,0.00,1.00 --163.20,19.20,1.00,0.00,1.00 --158.40,24.00,1.00,0.00,1.00 --153.60,24.00,1.00,0.00,1.00 --148.80,28.80,1.00,0.00,1.00 --144.00,33.60,1.00,0.00,1.00 --139.20,33.60,1.00,0.00,1.00 --134.40,38.40,1.00,0.00,1.00 --129.60,38.40,1.00,0.00,1.00 --124.80,43.20,1.00,0.00,1.00 --120.00,43.20,1.00,0.00,1.00 --110.40,48.00,1.00,0.00,1.00 --105.60,48.00,1.00,0.00,1.00 --100.80,48.00,1.00,0.00,1.00 --91.20,48.00,1.00,0.00,1.00 --86.40,48.00,1.00,0.00,1.00 --76.80,48.00,1.00,0.00,1.00 --72.00,48.00,1.00,0.00,1.00 --62.40,43.20,1.00,0.00,1.00 --57.60,43.20,1.00,0.00,1.00 --52.80,43.20,1.00,0.00,1.00 --48.00,38.40,1.00,0.00,1.00 --43.20,38.40,1.00,0.00,1.00 --38.40,33.60,1.00,0.00,1.00 --33.60,28.80,1.00,0.00,1.00 --28.80,28.80,1.00,0.00,1.00 --24.00,24.00,1.00,0.00,1.00 --19.20,19.20,1.00,0.00,1.00 --14.40,19.20,1.00,0.00,1.00 --14.40,14.40,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -4.80,-9.60,1.00,0.00,1.00 -9.60,-9.60,1.00,0.00,1.00 -9.60,-14.40,1.00,0.00,1.00 -14.40,-19.20,1.00,0.00,1.00 -19.20,-24.00,1.00,0.00,1.00 -24.00,-24.00,1.00,0.00,1.00 -24.00,-28.80,1.00,0.00,1.00 -28.80,-33.60,1.00,0.00,1.00 -33.60,-38.40,1.00,0.00,1.00 -38.40,-38.40,1.00,0.00,1.00 -43.20,-43.20,1.00,0.00,1.00 -48.00,-43.20,1.00,0.00,1.00 -52.80,-48.00,1.00,0.00,1.00 -62.40,-48.00,1.00,0.00,1.00 -67.20,-52.80,1.00,0.00,1.00 -76.80,-52.80,1.00,0.00,1.00 -86.40,-52.80,1.00,0.00,1.00 -91.20,-52.80,1.00,0.00,1.00 -100.80,-52.80,1.00,0.00,1.00 -105.60,-52.80,1.00,0.00,1.00 -115.20,-48.00,1.00,0.00,1.00 -120.00,-48.00,1.00,0.00,1.00 -129.60,-48.00,1.00,0.00,1.00 -134.40,-43.20,1.00,0.00,1.00 -139.20,-43.20,1.00,0.00,1.00 -144.00,-38.40,1.00,0.00,1.00 -148.80,-33.60,1.00,0.00,1.00 -153.60,-33.60,1.00,0.00,1.00 -158.40,-28.80,1.00,0.00,1.00 -158.40,-24.00,1.00,0.00,1.00 -163.20,-19.20,1.00,0.00,1.00 -168.00,-19.20,1.00,0.00,1.00 -168.00,-14.40,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --168.00,14.40,1.00,0.00,1.00 --168.00,19.20,1.00,0.00,1.00 --163.20,19.20,1.00,0.00,1.00 --158.40,24.00,1.00,0.00,1.00 --158.40,28.80,1.00,0.00,1.00 --153.60,33.60,1.00,0.00,1.00 --148.80,33.60,1.00,0.00,1.00 --144.00,38.40,1.00,0.00,1.00 --139.20,43.20,1.00,0.00,1.00 --134.40,43.20,1.00,0.00,1.00 --129.60,48.00,1.00,0.00,1.00 --120.00,48.00,1.00,0.00,1.00 --115.20,48.00,1.00,0.00,1.00 --105.60,52.80,1.00,0.00,1.00 --100.80,52.80,1.00,0.00,1.00 --91.20,52.80,1.00,0.00,1.00 --86.40,52.80,1.00,0.00,1.00 --76.80,52.80,1.00,0.00,1.00 --67.20,52.80,1.00,0.00,1.00 --62.40,48.00,1.00,0.00,1.00 --52.80,48.00,1.00,0.00,1.00 --48.00,43.20,1.00,0.00,1.00 --43.20,43.20,1.00,0.00,1.00 --38.40,38.40,1.00,0.00,1.00 --33.60,38.40,1.00,0.00,1.00 --28.80,33.60,1.00,0.00,1.00 --24.00,28.80,1.00,0.00,1.00 --24.00,24.00,1.00,0.00,1.00 --19.20,24.00,1.00,0.00,1.00 --14.40,19.20,1.00,0.00,1.00 --9.60,14.40,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 --4.80,9.60,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -4.80,-9.60,1.00,0.00,1.00 -9.60,-14.40,1.00,0.00,1.00 -9.60,-14.40,1.00,0.00,1.00 -14.40,-19.20,1.00,0.00,1.00 -14.40,-24.00,1.00,0.00,1.00 -19.20,-28.80,1.00,0.00,1.00 -24.00,-33.60,1.00,0.00,1.00 -28.80,-33.60,1.00,0.00,1.00 -28.80,-38.40,1.00,0.00,1.00 -33.60,-43.20,1.00,0.00,1.00 -38.40,-43.20,1.00,0.00,1.00 -48.00,-48.00,1.00,0.00,1.00 -52.80,-52.80,1.00,0.00,1.00 -57.60,-52.80,1.00,0.00,1.00 -67.20,-57.60,1.00,0.00,1.00 -76.80,-57.60,1.00,0.00,1.00 -81.60,-57.60,1.00,0.00,1.00 -91.20,-57.60,1.00,0.00,1.00 -100.80,-57.60,1.00,0.00,1.00 -110.40,-57.60,1.00,0.00,1.00 -115.20,-52.80,1.00,0.00,1.00 -124.80,-52.80,1.00,0.00,1.00 -129.60,-48.00,1.00,0.00,1.00 -139.20,-48.00,1.00,0.00,1.00 -144.00,-43.20,1.00,0.00,1.00 -148.80,-38.40,1.00,0.00,1.00 -153.60,-38.40,1.00,0.00,1.00 -153.60,-33.60,1.00,0.00,1.00 -158.40,-28.80,1.00,0.00,1.00 -163.20,-24.00,1.00,0.00,1.00 -163.20,-24.00,1.00,0.00,1.00 -168.00,-19.20,1.00,0.00,1.00 -172.80,-14.40,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --172.80,14.40,1.00,0.00,1.00 --168.00,19.20,1.00,0.00,1.00 --163.20,24.00,1.00,0.00,1.00 --163.20,24.00,1.00,0.00,1.00 --158.40,28.80,1.00,0.00,1.00 --153.60,33.60,1.00,0.00,1.00 --153.60,38.40,1.00,0.00,1.00 --148.80,38.40,1.00,0.00,1.00 --144.00,43.20,1.00,0.00,1.00 --139.20,48.00,1.00,0.00,1.00 --129.60,48.00,1.00,0.00,1.00 --124.80,52.80,1.00,0.00,1.00 --115.20,52.80,1.00,0.00,1.00 --110.40,57.60,1.00,0.00,1.00 --100.80,57.60,1.00,0.00,1.00 --91.20,57.60,1.00,0.00,1.00 --81.60,57.60,1.00,0.00,1.00 --76.80,57.60,1.00,0.00,1.00 --67.20,57.60,1.00,0.00,1.00 --57.60,52.80,1.00,0.00,1.00 --52.80,52.80,1.00,0.00,1.00 --48.00,48.00,1.00,0.00,1.00 --38.40,43.20,1.00,0.00,1.00 --33.60,43.20,1.00,0.00,1.00 --28.80,38.40,1.00,0.00,1.00 --28.80,33.60,1.00,0.00,1.00 --24.00,33.60,1.00,0.00,1.00 --19.20,28.80,1.00,0.00,1.00 --14.40,24.00,1.00,0.00,1.00 --14.40,19.20,1.00,0.00,1.00 --9.60,14.40,1.00,0.00,1.00 --9.60,14.40,1.00,0.00,1.00 --4.80,9.60,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -4.80,-9.60,1.00,0.00,1.00 -4.80,-14.40,1.00,0.00,1.00 -9.60,-19.20,1.00,0.00,1.00 -9.60,-19.20,1.00,0.00,1.00 -14.40,-24.00,1.00,0.00,1.00 -19.20,-28.80,1.00,0.00,1.00 -19.20,-33.60,1.00,0.00,1.00 -24.00,-38.40,1.00,0.00,1.00 -28.80,-43.20,1.00,0.00,1.00 -33.60,-43.20,1.00,0.00,1.00 -38.40,-48.00,1.00,0.00,1.00 -43.20,-52.80,1.00,0.00,1.00 -48.00,-52.80,1.00,0.00,1.00 -52.80,-57.60,1.00,0.00,1.00 -62.40,-57.60,1.00,0.00,1.00 -72.00,-62.40,1.00,0.00,1.00 -81.60,-62.40,1.00,0.00,1.00 -91.20,-62.40,1.00,0.00,1.00 -100.80,-62.40,1.00,0.00,1.00 -110.40,-62.40,1.00,0.00,1.00 -120.00,-57.60,1.00,0.00,1.00 -129.60,-57.60,1.00,0.00,1.00 -134.40,-52.80,1.00,0.00,1.00 -139.20,-48.00,1.00,0.00,1.00 -144.00,-48.00,1.00,0.00,1.00 -148.80,-43.20,1.00,0.00,1.00 -153.60,-38.40,1.00,0.00,1.00 -158.40,-33.60,1.00,0.00,1.00 -163.20,-33.60,1.00,0.00,1.00 -163.20,-28.80,1.00,0.00,1.00 -168.00,-24.00,1.00,0.00,1.00 -168.00,-19.20,1.00,0.00,1.00 -172.80,-14.40,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --172.80,14.40,1.00,0.00,1.00 --168.00,19.20,1.00,0.00,1.00 --168.00,24.00,1.00,0.00,1.00 --163.20,28.80,1.00,0.00,1.00 --163.20,33.60,1.00,0.00,1.00 --158.40,33.60,1.00,0.00,1.00 --153.60,38.40,1.00,0.00,1.00 --148.80,43.20,1.00,0.00,1.00 --144.00,48.00,1.00,0.00,1.00 --139.20,48.00,1.00,0.00,1.00 --134.40,52.80,1.00,0.00,1.00 --129.60,57.60,1.00,0.00,1.00 --120.00,57.60,1.00,0.00,1.00 --110.40,62.40,1.00,0.00,1.00 --100.80,62.40,1.00,0.00,1.00 --91.20,62.40,1.00,0.00,1.00 --81.60,62.40,1.00,0.00,1.00 --72.00,62.40,1.00,0.00,1.00 --62.40,57.60,1.00,0.00,1.00 --52.80,57.60,1.00,0.00,1.00 --48.00,52.80,1.00,0.00,1.00 --43.20,52.80,1.00,0.00,1.00 --38.40,48.00,1.00,0.00,1.00 --33.60,43.20,1.00,0.00,1.00 --28.80,43.20,1.00,0.00,1.00 --24.00,38.40,1.00,0.00,1.00 --19.20,33.60,1.00,0.00,1.00 --19.20,28.80,1.00,0.00,1.00 --14.40,24.00,1.00,0.00,1.00 --9.60,19.20,1.00,0.00,1.00 --9.60,19.20,1.00,0.00,1.00 --4.80,14.40,1.00,0.00,1.00 --4.80,9.60,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -4.80,-9.60,1.00,0.00,1.00 -4.80,-14.40,1.00,0.00,1.00 -9.60,-19.20,1.00,0.00,1.00 -9.60,-24.00,1.00,0.00,1.00 -14.40,-24.00,1.00,0.00,1.00 -14.40,-28.80,1.00,0.00,1.00 -19.20,-33.60,1.00,0.00,1.00 -19.20,-38.40,1.00,0.00,1.00 -24.00,-43.20,1.00,0.00,1.00 -28.80,-48.00,1.00,0.00,1.00 -33.60,-52.80,1.00,0.00,1.00 -38.40,-52.80,1.00,0.00,1.00 -43.20,-57.60,1.00,0.00,1.00 -48.00,-62.40,1.00,0.00,1.00 -57.60,-62.40,1.00,0.00,1.00 -67.20,-67.20,1.00,0.00,1.00 -81.60,-67.20,1.00,0.00,1.00 -91.20,-67.20,1.00,0.00,1.00 -105.60,-67.20,1.00,0.00,1.00 -115.20,-67.20,1.00,0.00,1.00 -124.80,-62.40,1.00,0.00,1.00 -134.40,-57.60,1.00,0.00,1.00 -139.20,-57.60,1.00,0.00,1.00 -144.00,-52.80,1.00,0.00,1.00 -148.80,-48.00,1.00,0.00,1.00 -153.60,-43.20,1.00,0.00,1.00 -158.40,-43.20,1.00,0.00,1.00 -163.20,-38.40,1.00,0.00,1.00 -163.20,-33.60,1.00,0.00,1.00 -168.00,-28.80,1.00,0.00,1.00 -168.00,-24.00,1.00,0.00,1.00 -172.80,-19.20,1.00,0.00,1.00 -172.80,-14.40,1.00,0.00,1.00 -177.60,-9.60,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,9.60,1.00,0.00,1.00 --172.80,14.40,1.00,0.00,1.00 --172.80,19.20,1.00,0.00,1.00 --168.00,24.00,1.00,0.00,1.00 --168.00,28.80,1.00,0.00,1.00 --163.20,33.60,1.00,0.00,1.00 --163.20,38.40,1.00,0.00,1.00 --158.40,43.20,1.00,0.00,1.00 --153.60,43.20,1.00,0.00,1.00 --148.80,48.00,1.00,0.00,1.00 --144.00,52.80,1.00,0.00,1.00 --139.20,57.60,1.00,0.00,1.00 --134.40,57.60,1.00,0.00,1.00 --124.80,62.40,1.00,0.00,1.00 --115.20,67.20,1.00,0.00,1.00 --105.60,67.20,1.00,0.00,1.00 --91.20,67.20,1.00,0.00,1.00 --81.60,67.20,1.00,0.00,1.00 --67.20,67.20,1.00,0.00,1.00 --57.60,62.40,1.00,0.00,1.00 --48.00,62.40,1.00,0.00,1.00 --43.20,57.60,1.00,0.00,1.00 --38.40,52.80,1.00,0.00,1.00 --33.60,52.80,1.00,0.00,1.00 --28.80,48.00,1.00,0.00,1.00 --24.00,43.20,1.00,0.00,1.00 --19.20,38.40,1.00,0.00,1.00 --19.20,33.60,1.00,0.00,1.00 --14.40,28.80,1.00,0.00,1.00 --14.40,24.00,1.00,0.00,1.00 --9.60,24.00,1.00,0.00,1.00 --9.60,19.20,1.00,0.00,1.00 --4.80,14.40,1.00,0.00,1.00 --4.80,9.60,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -4.80,-9.60,1.00,0.00,1.00 -4.80,-14.40,1.00,0.00,1.00 -4.80,-19.20,1.00,0.00,1.00 -9.60,-24.00,1.00,0.00,1.00 -9.60,-28.80,1.00,0.00,1.00 -9.60,-33.60,1.00,0.00,1.00 -14.40,-38.40,1.00,0.00,1.00 -14.40,-38.40,1.00,0.00,1.00 -19.20,-43.20,1.00,0.00,1.00 -24.00,-48.00,1.00,0.00,1.00 -24.00,-52.80,1.00,0.00,1.00 -28.80,-57.60,1.00,0.00,1.00 -38.40,-62.40,1.00,0.00,1.00 -43.20,-62.40,1.00,0.00,1.00 -52.80,-67.20,1.00,0.00,1.00 -62.40,-72.00,1.00,0.00,1.00 -76.80,-72.00,1.00,0.00,1.00 -96.00,-72.00,1.00,0.00,1.00 -110.40,-72.00,1.00,0.00,1.00 -120.00,-67.20,1.00,0.00,1.00 -134.40,-67.20,1.00,0.00,1.00 -139.20,-62.40,1.00,0.00,1.00 -148.80,-57.60,1.00,0.00,1.00 -153.60,-57.60,1.00,0.00,1.00 -158.40,-52.80,1.00,0.00,1.00 -158.40,-48.00,1.00,0.00,1.00 -163.20,-43.20,1.00,0.00,1.00 -163.20,-38.40,1.00,0.00,1.00 -168.00,-33.60,1.00,0.00,1.00 -168.00,-28.80,1.00,0.00,1.00 -172.80,-24.00,1.00,0.00,1.00 -172.80,-19.20,1.00,0.00,1.00 -172.80,-14.40,1.00,0.00,1.00 -177.60,-9.60,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,9.60,1.00,0.00,1.00 --172.80,14.40,1.00,0.00,1.00 --172.80,19.20,1.00,0.00,1.00 --172.80,24.00,1.00,0.00,1.00 --168.00,28.80,1.00,0.00,1.00 --168.00,33.60,1.00,0.00,1.00 --163.20,38.40,1.00,0.00,1.00 --163.20,43.20,1.00,0.00,1.00 --158.40,48.00,1.00,0.00,1.00 --158.40,52.80,1.00,0.00,1.00 --153.60,57.60,1.00,0.00,1.00 --148.80,57.60,1.00,0.00,1.00 --139.20,62.40,1.00,0.00,1.00 --134.40,67.20,1.00,0.00,1.00 --120.00,67.20,1.00,0.00,1.00 --110.40,72.00,1.00,0.00,1.00 --96.00,72.00,1.00,0.00,1.00 --76.80,72.00,1.00,0.00,1.00 --62.40,72.00,1.00,0.00,1.00 --52.80,67.20,1.00,0.00,1.00 --43.20,62.40,1.00,0.00,1.00 --38.40,62.40,1.00,0.00,1.00 --28.80,57.60,1.00,0.00,1.00 --24.00,52.80,1.00,0.00,1.00 --24.00,48.00,1.00,0.00,1.00 --19.20,43.20,1.00,0.00,1.00 --14.40,38.40,1.00,0.00,1.00 --14.40,38.40,1.00,0.00,1.00 --9.60,33.60,1.00,0.00,1.00 --9.60,28.80,1.00,0.00,1.00 --9.60,24.00,1.00,0.00,1.00 --4.80,19.20,1.00,0.00,1.00 --4.80,14.40,1.00,0.00,1.00 --4.80,9.60,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -0.00,-9.60,1.00,0.00,1.00 -4.80,-14.40,1.00,0.00,1.00 -4.80,-19.20,1.00,0.00,1.00 -4.80,-24.00,1.00,0.00,1.00 -4.80,-28.80,1.00,0.00,1.00 -9.60,-33.60,1.00,0.00,1.00 -9.60,-38.40,1.00,0.00,1.00 -14.40,-43.20,1.00,0.00,1.00 -14.40,-48.00,1.00,0.00,1.00 -14.40,-52.80,1.00,0.00,1.00 -19.20,-57.60,1.00,0.00,1.00 -24.00,-57.60,1.00,0.00,1.00 -28.80,-62.40,1.00,0.00,1.00 -33.60,-67.20,1.00,0.00,1.00 -43.20,-72.00,1.00,0.00,1.00 -57.60,-72.00,1.00,0.00,1.00 -76.80,-76.80,1.00,0.00,1.00 -96.00,-76.80,1.00,0.00,1.00 -115.20,-76.80,1.00,0.00,1.00 -129.60,-72.00,1.00,0.00,1.00 -139.20,-72.00,1.00,0.00,1.00 -148.80,-67.20,1.00,0.00,1.00 -153.60,-62.40,1.00,0.00,1.00 -158.40,-57.60,1.00,0.00,1.00 -163.20,-52.80,1.00,0.00,1.00 -163.20,-48.00,1.00,0.00,1.00 -168.00,-43.20,1.00,0.00,1.00 -168.00,-38.40,1.00,0.00,1.00 -172.80,-33.60,1.00,0.00,1.00 -172.80,-28.80,1.00,0.00,1.00 -172.80,-24.00,1.00,0.00,1.00 -172.80,-19.20,1.00,0.00,1.00 -177.60,-14.40,1.00,0.00,1.00 -177.60,-9.60,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,9.60,1.00,0.00,1.00 --177.60,14.40,1.00,0.00,1.00 --172.80,19.20,1.00,0.00,1.00 --172.80,24.00,1.00,0.00,1.00 --172.80,28.80,1.00,0.00,1.00 --172.80,33.60,1.00,0.00,1.00 --168.00,38.40,1.00,0.00,1.00 --168.00,43.20,1.00,0.00,1.00 --163.20,48.00,1.00,0.00,1.00 --163.20,52.80,1.00,0.00,1.00 --158.40,57.60,1.00,0.00,1.00 --153.60,62.40,1.00,0.00,1.00 --148.80,67.20,1.00,0.00,1.00 --139.20,72.00,1.00,0.00,1.00 --129.60,72.00,1.00,0.00,1.00 --115.20,76.80,1.00,0.00,1.00 --96.00,76.80,1.00,0.00,1.00 --76.80,76.80,1.00,0.00,1.00 --57.60,72.00,1.00,0.00,1.00 --43.20,72.00,1.00,0.00,1.00 --33.60,67.20,1.00,0.00,1.00 --28.80,62.40,1.00,0.00,1.00 --24.00,57.60,1.00,0.00,1.00 --19.20,57.60,1.00,0.00,1.00 --14.40,52.80,1.00,0.00,1.00 --14.40,48.00,1.00,0.00,1.00 --14.40,43.20,1.00,0.00,1.00 --9.60,38.40,1.00,0.00,1.00 --9.60,33.60,1.00,0.00,1.00 --4.80,28.80,1.00,0.00,1.00 --4.80,24.00,1.00,0.00,1.00 --4.80,19.20,1.00,0.00,1.00 --4.80,14.40,1.00,0.00,1.00 --0.00,9.60,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -0.00,-9.60,1.00,0.00,1.00 -0.00,-14.40,1.00,0.00,1.00 -4.80,-19.20,1.00,0.00,1.00 -4.80,-24.00,1.00,0.00,1.00 -4.80,-28.80,1.00,0.00,1.00 -4.80,-33.60,1.00,0.00,1.00 -4.80,-38.40,1.00,0.00,1.00 -9.60,-43.20,1.00,0.00,1.00 -9.60,-48.00,1.00,0.00,1.00 -9.60,-52.80,1.00,0.00,1.00 -14.40,-57.60,1.00,0.00,1.00 -14.40,-62.40,1.00,0.00,1.00 -19.20,-67.20,1.00,0.00,1.00 -24.00,-72.00,1.00,0.00,1.00 -33.60,-72.00,1.00,0.00,1.00 -43.20,-76.80,1.00,0.00,1.00 -67.20,-81.60,1.00,0.00,1.00 -96.00,-81.60,1.00,0.00,1.00 -124.80,-81.60,1.00,0.00,1.00 -144.00,-76.80,1.00,0.00,1.00 -153.60,-72.00,1.00,0.00,1.00 -158.40,-67.20,1.00,0.00,1.00 -163.20,-62.40,1.00,0.00,1.00 -168.00,-57.60,1.00,0.00,1.00 -168.00,-52.80,1.00,0.00,1.00 -168.00,-48.00,1.00,0.00,1.00 -172.80,-43.20,1.00,0.00,1.00 -172.80,-38.40,1.00,0.00,1.00 -172.80,-33.60,1.00,0.00,1.00 -172.80,-28.80,1.00,0.00,1.00 -177.60,-24.00,1.00,0.00,1.00 -177.60,-19.20,1.00,0.00,1.00 -177.60,-14.40,1.00,0.00,1.00 -177.60,-9.60,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,9.60,1.00,0.00,1.00 --177.60,14.40,1.00,0.00,1.00 --177.60,19.20,1.00,0.00,1.00 --177.60,24.00,1.00,0.00,1.00 --172.80,28.80,1.00,0.00,1.00 --172.80,33.60,1.00,0.00,1.00 --172.80,38.40,1.00,0.00,1.00 --172.80,43.20,1.00,0.00,1.00 --168.00,48.00,1.00,0.00,1.00 --168.00,52.80,1.00,0.00,1.00 --168.00,57.60,1.00,0.00,1.00 --163.20,62.40,1.00,0.00,1.00 --158.40,67.20,1.00,0.00,1.00 --153.60,72.00,1.00,0.00,1.00 --144.00,76.80,1.00,0.00,1.00 --124.80,81.60,1.00,0.00,1.00 --96.00,81.60,1.00,0.00,1.00 --67.20,81.60,1.00,0.00,1.00 --43.20,76.80,1.00,0.00,1.00 --33.60,72.00,1.00,0.00,1.00 --24.00,72.00,1.00,0.00,1.00 --19.20,67.20,1.00,0.00,1.00 --14.40,62.40,1.00,0.00,1.00 --14.40,57.60,1.00,0.00,1.00 --9.60,52.80,1.00,0.00,1.00 --9.60,48.00,1.00,0.00,1.00 --9.60,43.20,1.00,0.00,1.00 --4.80,38.40,1.00,0.00,1.00 --4.80,33.60,1.00,0.00,1.00 --4.80,28.80,1.00,0.00,1.00 --4.80,24.00,1.00,0.00,1.00 --4.80,19.20,1.00,0.00,1.00 --0.00,14.40,1.00,0.00,1.00 --0.00,9.60,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -0.00,-9.60,1.00,0.00,1.00 -0.00,-14.40,1.00,0.00,1.00 -0.00,-19.20,1.00,0.00,1.00 -0.00,-24.00,1.00,0.00,1.00 -0.00,-28.80,1.00,0.00,1.00 -0.00,-33.60,1.00,0.00,1.00 -4.80,-38.40,1.00,0.00,1.00 -4.80,-43.20,1.00,0.00,1.00 -4.80,-48.00,1.00,0.00,1.00 -4.80,-52.80,1.00,0.00,1.00 -4.80,-57.60,1.00,0.00,1.00 -4.80,-62.40,1.00,0.00,1.00 -9.60,-67.20,1.00,0.00,1.00 -9.60,-72.00,1.00,0.00,1.00 -14.40,-76.80,1.00,0.00,1.00 -24.00,-81.60,1.00,0.00,1.00 -43.20,-86.40,1.00,0.00,1.00 -110.40,-86.40,1.00,0.00,1.00 -148.80,-81.60,1.00,0.00,1.00 -163.20,-76.80,1.00,0.00,1.00 -168.00,-72.00,1.00,0.00,1.00 -172.80,-67.20,1.00,0.00,1.00 -172.80,-62.40,1.00,0.00,1.00 -172.80,-57.60,1.00,0.00,1.00 -172.80,-52.80,1.00,0.00,1.00 -177.60,-48.00,1.00,0.00,1.00 -177.60,-43.20,1.00,0.00,1.00 -177.60,-38.40,1.00,0.00,1.00 -177.60,-33.60,1.00,0.00,1.00 -177.60,-28.80,1.00,0.00,1.00 -177.60,-24.00,1.00,0.00,1.00 -177.60,-19.20,1.00,0.00,1.00 -177.60,-14.40,1.00,0.00,1.00 -177.60,-9.60,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,9.60,1.00,0.00,1.00 --177.60,14.40,1.00,0.00,1.00 --177.60,19.20,1.00,0.00,1.00 --177.60,24.00,1.00,0.00,1.00 --177.60,28.80,1.00,0.00,1.00 --177.60,33.60,1.00,0.00,1.00 --177.60,38.40,1.00,0.00,1.00 --177.60,43.20,1.00,0.00,1.00 --177.60,48.00,1.00,0.00,1.00 --172.80,52.80,1.00,0.00,1.00 --172.80,57.60,1.00,0.00,1.00 --172.80,62.40,1.00,0.00,1.00 --172.80,67.20,1.00,0.00,1.00 --168.00,72.00,1.00,0.00,1.00 --163.20,76.80,1.00,0.00,1.00 --148.80,81.60,1.00,0.00,1.00 --110.40,86.40,1.00,0.00,1.00 --43.20,86.40,1.00,0.00,1.00 --24.00,81.60,1.00,0.00,1.00 --14.40,76.80,1.00,0.00,1.00 --9.60,72.00,1.00,0.00,1.00 --9.60,67.20,1.00,0.00,1.00 --4.80,62.40,1.00,0.00,1.00 --4.80,57.60,1.00,0.00,1.00 --4.80,52.80,1.00,0.00,1.00 --4.80,48.00,1.00,0.00,1.00 --4.80,43.20,1.00,0.00,1.00 --4.80,38.40,1.00,0.00,1.00 --0.00,33.60,1.00,0.00,1.00 --0.00,28.80,1.00,0.00,1.00 --0.00,24.00,1.00,0.00,1.00 --0.00,19.20,1.00,0.00,1.00 --0.00,14.40,1.00,0.00,1.00 --0.00,9.60,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --0.00,-4.80,1.00,0.00,1.00 --0.00,-9.60,1.00,0.00,1.00 --0.00,-14.40,1.00,0.00,1.00 --0.00,-19.20,1.00,0.00,1.00 --0.00,-24.00,1.00,0.00,1.00 --0.00,-28.80,1.00,0.00,1.00 --0.00,-33.60,1.00,0.00,1.00 --0.00,-38.40,1.00,0.00,1.00 --0.00,-43.20,1.00,0.00,1.00 --0.00,-48.00,1.00,0.00,1.00 --0.00,-52.80,1.00,0.00,1.00 --0.00,-57.60,1.00,0.00,1.00 --0.00,-62.40,1.00,0.00,1.00 --4.80,-67.20,1.00,0.00,1.00 --4.80,-72.00,1.00,0.00,1.00 --4.80,-76.80,1.00,0.00,1.00 --9.60,-81.60,1.00,0.00,1.00 --19.20,-86.40,1.00,0.00,1.00 --134.40,-86.40,1.00,0.00,1.00 --168.00,-81.60,1.00,0.00,1.00 --172.80,-76.80,1.00,0.00,1.00 --177.60,-72.00,1.00,0.00,1.00 --177.60,-67.20,1.00,0.00,1.00 --177.60,-62.40,1.00,0.00,1.00 --177.60,-57.60,1.00,0.00,1.00 --177.60,-52.80,1.00,0.00,1.00 --177.60,-48.00,1.00,0.00,1.00 --177.60,-43.20,1.00,0.00,1.00 --177.60,-38.40,1.00,0.00,1.00 --177.60,-33.60,1.00,0.00,1.00 --177.60,-28.80,1.00,0.00,1.00 --177.60,-24.00,1.00,0.00,1.00 --177.60,-19.20,1.00,0.00,1.00 --177.60,-14.40,1.00,0.00,1.00 --177.60,-9.60,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 -177.60,9.60,1.00,0.00,1.00 -177.60,14.40,1.00,0.00,1.00 -177.60,19.20,1.00,0.00,1.00 -177.60,24.00,1.00,0.00,1.00 -177.60,28.80,1.00,0.00,1.00 -177.60,33.60,1.00,0.00,1.00 -177.60,38.40,1.00,0.00,1.00 -177.60,43.20,1.00,0.00,1.00 -177.60,48.00,1.00,0.00,1.00 -177.60,52.80,1.00,0.00,1.00 -177.60,57.60,1.00,0.00,1.00 -177.60,62.40,1.00,0.00,1.00 -177.60,67.20,1.00,0.00,1.00 -177.60,72.00,1.00,0.00,1.00 -172.80,76.80,1.00,0.00,1.00 -168.00,81.60,1.00,0.00,1.00 -134.40,86.40,1.00,0.00,1.00 -19.20,86.40,1.00,0.00,1.00 -9.60,81.60,1.00,0.00,1.00 -4.80,76.80,1.00,0.00,1.00 -4.80,72.00,1.00,0.00,1.00 -4.80,67.20,1.00,0.00,1.00 -0.00,62.40,1.00,0.00,1.00 -0.00,57.60,1.00,0.00,1.00 -0.00,52.80,1.00,0.00,1.00 -0.00,48.00,1.00,0.00,1.00 -0.00,43.20,1.00,0.00,1.00 -0.00,38.40,1.00,0.00,1.00 -0.00,33.60,1.00,0.00,1.00 -0.00,28.80,1.00,0.00,1.00 -0.00,24.00,1.00,0.00,1.00 -0.00,19.20,1.00,0.00,1.00 -0.00,14.40,1.00,0.00,1.00 -0.00,9.60,1.00,0.00,1.00 -0.00,4.80,1.00,0.00,1.00 +0.00,0.00,0.00,0.00,1.00,0.00,0.00 +4.80,0.00,0.02,0.00,1.00,0.00,-4.80 +9.60,0.00,0.04,0.00,1.00,0.00,4.80 +14.40,0.00,0.06,0.00,1.00,0.00,-9.60 +19.20,0.00,0.09,0.00,1.00,0.00,14.40 +24.00,0.00,0.11,0.00,1.00,0.00,-14.40 +28.80,0.00,0.13,0.00,1.00,0.00,19.20 +33.60,0.00,0.15,0.00,1.00,0.00,-24.00 +38.40,0.00,0.17,0.00,1.00,0.00,24.00 +43.20,0.00,0.19,0.00,1.00,0.00,-28.80 +48.00,0.00,0.21,0.00,1.00,0.00,33.60 +52.80,0.00,0.23,0.00,1.00,0.00,-33.60 +57.60,0.00,0.26,0.00,1.00,0.00,38.40 +62.40,0.00,0.28,0.00,1.00,4.80,-38.40 +67.20,0.00,0.30,0.00,1.00,4.80,38.40 +72.00,0.00,0.32,0.00,1.00,4.80,-43.20 +76.80,0.00,0.34,0.00,1.00,9.60,43.20 +81.60,0.00,0.36,0.00,1.00,19.20,-43.20 +86.40,0.00,0.38,0.00,1.00,134.40,43.20 +91.20,0.00,0.41,0.00,1.00,168.00,-43.20 +96.00,0.00,0.43,0.00,1.00,172.80,43.20 +100.80,0.00,0.45,0.00,1.00,177.60,-43.20 +105.60,0.00,0.47,0.00,1.00,177.60,43.20 +110.40,0.00,0.49,0.00,1.00,177.60,-43.20 +115.20,0.00,0.51,0.00,1.00,177.60,38.40 +120.00,0.00,0.53,0.00,1.00,177.60,-38.40 +124.80,0.00,0.56,0.00,1.00,177.60,33.60 +129.60,0.00,0.58,0.00,1.00,177.60,-33.60 +134.40,0.00,0.60,0.00,1.00,177.60,28.80 +139.20,0.00,0.62,0.00,1.00,177.60,-28.80 +144.00,0.00,0.64,0.00,1.00,177.60,24.00 +148.80,0.00,0.66,0.00,1.00,177.60,-19.20 +153.60,0.00,0.68,0.00,1.00,177.60,19.20 +158.40,0.00,0.70,0.00,1.00,177.60,-14.40 +163.20,0.00,0.73,0.00,1.00,177.60,9.60 +168.00,0.00,0.75,0.00,1.00,177.60,-9.60 +172.80,0.00,0.77,0.00,1.00,177.60,4.80 +177.60,0.00,0.79,0.00,1.00,-177.60,-0.00 +-177.60,0.00,0.81,0.00,1.00,-177.60,-0.00 +-172.80,0.00,0.83,0.00,1.00,-177.60,4.80 +-168.00,0.00,0.85,0.00,1.00,-177.60,-9.60 +-163.20,0.00,0.88,0.00,1.00,-177.60,9.60 +-158.40,0.00,0.90,0.00,1.00,-177.60,-14.40 +-153.60,0.00,0.92,0.00,1.00,-177.60,19.20 +-148.80,0.00,0.94,0.00,1.00,-177.60,-19.20 +-144.00,0.00,0.96,0.00,1.00,-177.60,24.00 +-139.20,0.00,0.98,0.00,1.00,-177.60,-28.80 +-134.40,0.00,1.00,0.00,1.00,-177.60,28.80 +-129.60,0.00,1.03,0.00,1.00,-177.60,-33.60 +-124.80,0.00,1.05,0.00,1.00,-177.60,33.60 +-120.00,0.00,1.07,0.00,1.00,-177.60,-38.40 +-115.20,0.00,1.09,0.00,1.00,-177.60,38.40 +-110.40,0.00,1.11,0.00,1.00,-177.60,-43.20 +-105.60,0.00,1.13,0.00,1.00,-172.80,43.20 +-100.80,0.00,1.15,0.00,1.00,-168.00,-43.20 +-96.00,0.00,1.17,0.00,1.00,-134.40,43.20 +-91.20,0.00,1.20,0.00,1.00,-19.20,-43.20 +-86.40,0.00,1.22,0.00,1.00,-9.60,43.20 +-81.60,0.00,1.24,0.00,1.00,-4.80,-43.20 +-76.80,0.00,1.26,0.00,1.00,-4.80,43.20 +-72.00,0.00,1.28,0.00,1.00,-4.80,-43.20 +-67.20,0.00,1.30,0.00,1.00,-0.00,38.40 +-62.40,0.00,1.32,0.00,1.00,-0.00,-38.40 +-57.60,0.00,1.35,0.00,1.00,-0.00,38.40 +-52.80,0.00,1.37,0.00,1.00,-0.00,-33.60 +-48.00,0.00,1.39,0.00,1.00,-0.00,33.60 +-43.20,0.00,1.41,0.00,1.00,-0.00,-28.80 +-38.40,0.00,1.43,0.00,1.00,-0.00,24.00 +-33.60,0.00,1.45,0.00,1.00,-0.00,-24.00 +-28.80,0.00,1.47,0.00,1.00,-0.00,19.20 +-24.00,0.00,1.50,0.00,1.00,-0.00,-14.40 +-19.20,0.00,1.52,0.00,1.00,-0.00,14.40 +-14.40,0.00,1.54,0.00,1.00,-0.00,-9.60 +-9.60,0.00,1.56,0.00,1.00,-0.00,4.80 +-4.80,0.00,1.58,0.00,1.00,-0.00,-4.80 +0.00,0.00,1.60,0.00,1.00,-0.00,0.00 +4.80,-0.00,1.62,0.00,1.00,-0.00,-4.80 +9.60,-0.00,1.64,0.00,1.00,-0.00,4.80 +14.40,-0.00,1.67,0.00,1.00,-0.00,-9.60 +19.20,-0.00,1.69,0.00,1.00,-0.00,14.40 +24.00,-0.00,1.71,0.00,1.00,-0.00,-14.40 +28.80,-0.00,1.73,0.00,1.00,-0.00,19.20 +33.60,-4.80,1.75,0.00,1.00,-4.80,-19.20 +38.40,-4.80,1.77,0.00,1.00,-4.80,24.00 +43.20,-4.80,1.79,0.00,1.00,-4.80,-24.00 +48.00,-4.80,1.82,0.00,1.00,-4.80,28.80 +52.80,-4.80,1.84,0.00,1.00,-4.80,-28.80 +57.60,-4.80,1.86,0.00,1.00,-4.80,33.60 +62.40,-4.80,1.88,0.00,1.00,-9.60,-33.60 +67.20,-4.80,1.90,0.00,1.00,-9.60,38.40 +72.00,-4.80,1.92,0.00,1.00,-14.40,-38.40 +76.80,-4.80,1.94,0.00,1.00,-24.00,38.40 +81.60,-4.80,1.97,0.00,1.00,-43.20,-38.40 +86.40,-4.80,1.99,0.00,1.00,-110.40,38.40 +91.20,-4.80,2.01,0.00,1.00,-148.80,-38.40 +96.00,-4.80,2.03,0.00,1.00,-163.20,38.40 +100.80,-4.80,2.05,0.00,1.00,-168.00,-38.40 +105.60,-4.80,2.07,0.00,1.00,-172.80,38.40 +110.40,-4.80,2.09,0.00,1.00,-172.80,-38.40 +115.20,-4.80,2.11,0.00,1.00,-172.80,33.60 +120.00,-4.80,2.14,0.00,1.00,-172.80,-33.60 +124.80,-4.80,2.16,0.00,1.00,-177.60,33.60 +129.60,-4.80,2.18,0.00,1.00,-177.60,-28.80 +134.40,-4.80,2.20,0.00,1.00,-177.60,28.80 +139.20,-4.80,2.22,0.00,1.00,-177.60,-24.00 +144.00,-4.80,2.24,0.00,1.00,-177.60,24.00 +148.80,-4.80,2.26,0.00,1.00,-177.60,-19.20 +153.60,-0.00,2.29,0.00,1.00,-177.60,14.40 +158.40,-0.00,2.31,0.00,1.00,-177.60,-14.40 +163.20,-0.00,2.33,0.00,1.00,-177.60,9.60 +168.00,-0.00,2.35,0.00,1.00,-177.60,-9.60 +172.80,-0.00,2.37,0.00,1.00,-177.60,4.80 +177.60,-0.00,2.39,0.00,1.00,177.60,-0.00 +-177.60,0.00,2.41,0.00,1.00,177.60,-0.00 +-172.80,0.00,2.44,0.00,1.00,177.60,4.80 +-168.00,0.00,2.46,0.00,1.00,177.60,-9.60 +-163.20,0.00,2.48,0.00,1.00,177.60,9.60 +-158.40,0.00,2.50,0.00,1.00,177.60,-14.40 +-153.60,0.00,2.52,0.00,1.00,177.60,14.40 +-148.80,4.80,2.54,0.00,1.00,177.60,-19.20 +-144.00,4.80,2.56,0.00,1.00,177.60,24.00 +-139.20,4.80,2.58,0.00,1.00,177.60,-24.00 +-134.40,4.80,2.61,0.00,1.00,177.60,28.80 +-129.60,4.80,2.63,0.00,1.00,172.80,-28.80 +-124.80,4.80,2.65,0.00,1.00,172.80,33.60 +-120.00,4.80,2.67,0.00,1.00,172.80,-33.60 +-115.20,4.80,2.69,0.00,1.00,172.80,33.60 +-110.40,4.80,2.71,0.00,1.00,168.00,-38.40 +-105.60,4.80,2.73,0.00,1.00,163.20,38.40 +-100.80,4.80,2.76,0.00,1.00,148.80,-38.40 +-96.00,4.80,2.78,0.00,1.00,110.40,38.40 +-91.20,4.80,2.80,0.00,1.00,43.20,-38.40 +-86.40,4.80,2.82,0.00,1.00,24.00,38.40 +-81.60,4.80,2.84,0.00,1.00,14.40,-38.40 +-76.80,4.80,2.86,0.00,1.00,9.60,38.40 +-72.00,4.80,2.88,0.00,1.00,9.60,-38.40 +-67.20,4.80,2.91,0.00,1.00,4.80,38.40 +-62.40,4.80,2.93,0.00,1.00,4.80,-33.60 +-57.60,4.80,2.95,0.00,1.00,4.80,33.60 +-52.80,4.80,2.97,0.00,1.00,4.80,-28.80 +-48.00,4.80,2.99,0.00,1.00,4.80,28.80 +-43.20,4.80,3.01,0.00,1.00,4.80,-24.00 +-38.40,4.80,3.03,0.00,1.00,0.00,24.00 +-33.60,4.80,3.05,0.00,1.00,0.00,-19.20 +-28.80,0.00,3.08,0.00,1.00,0.00,19.20 +-24.00,0.00,3.10,0.00,1.00,0.00,-14.40 +-19.20,0.00,3.12,0.00,1.00,0.00,14.40 +-14.40,0.00,3.14,0.00,1.00,0.00,-9.60 +-9.60,0.00,3.16,0.00,1.00,0.00,4.80 +-4.80,0.00,3.18,0.00,1.00,0.00,-4.80 +0.00,0.00,3.20,0.00,1.00,-0.00,0.00 +4.80,-0.00,3.23,0.00,1.00,-0.00,-4.80 +9.60,-0.00,3.25,0.00,1.00,-0.00,4.80 +14.40,-0.00,3.27,0.00,1.00,-4.80,-9.60 +19.20,-4.80,3.29,0.00,1.00,-4.80,9.60 +24.00,-4.80,3.31,0.00,1.00,-4.80,-14.40 +28.80,-4.80,3.33,0.00,1.00,-4.80,14.40 +33.60,-4.80,3.35,0.00,1.00,-4.80,-19.20 +38.40,-4.80,3.38,0.00,1.00,-9.60,19.20 +43.20,-4.80,3.40,0.00,1.00,-9.60,-24.00 +48.00,-4.80,3.42,0.00,1.00,-9.60,24.00 +52.80,-9.60,3.44,0.00,1.00,-14.40,-28.80 +57.60,-9.60,3.46,0.00,1.00,-14.40,28.80 +62.40,-9.60,3.48,0.00,1.00,-19.20,-28.80 +67.20,-9.60,3.50,0.00,1.00,-24.00,33.60 +72.00,-9.60,3.52,0.00,1.00,-33.60,-33.60 +76.80,-9.60,3.55,0.00,1.00,-43.20,33.60 +81.60,-9.60,3.57,0.00,1.00,-67.20,-33.60 +86.40,-9.60,3.59,0.00,1.00,-96.00,33.60 +91.20,-9.60,3.61,0.00,1.00,-124.80,-33.60 +96.00,-9.60,3.63,0.00,1.00,-144.00,33.60 +100.80,-9.60,3.65,0.00,1.00,-153.60,-33.60 +105.60,-9.60,3.67,0.00,1.00,-158.40,33.60 +110.40,-9.60,3.70,0.00,1.00,-163.20,-33.60 +115.20,-9.60,3.72,0.00,1.00,-168.00,33.60 +120.00,-9.60,3.74,0.00,1.00,-168.00,-28.80 +124.80,-9.60,3.76,0.00,1.00,-168.00,28.80 +129.60,-9.60,3.78,0.00,1.00,-172.80,-28.80 +134.40,-4.80,3.80,0.00,1.00,-172.80,24.00 +139.20,-4.80,3.82,0.00,1.00,-172.80,-24.00 +144.00,-4.80,3.85,0.00,1.00,-172.80,19.20 +148.80,-4.80,3.87,0.00,1.00,-177.60,-19.20 +153.60,-4.80,3.89,0.00,1.00,-177.60,14.40 +158.40,-4.80,3.91,0.00,1.00,-177.60,-14.40 +163.20,-4.80,3.93,0.00,1.00,-177.60,9.60 +168.00,-0.00,3.95,0.00,1.00,-177.60,-4.80 +172.80,-0.00,3.97,0.00,1.00,-177.60,4.80 +177.60,-0.00,3.99,0.00,1.00,177.60,-0.00 +-177.60,0.00,4.02,0.00,1.00,177.60,-0.00 +-172.80,0.00,4.04,0.00,1.00,177.60,4.80 +-168.00,0.00,4.06,0.00,1.00,177.60,-4.80 +-163.20,4.80,4.08,0.00,1.00,177.60,9.60 +-158.40,4.80,4.10,0.00,1.00,177.60,-14.40 +-153.60,4.80,4.12,0.00,1.00,172.80,14.40 +-148.80,4.80,4.14,0.00,1.00,172.80,-19.20 +-144.00,4.80,4.17,0.00,1.00,172.80,19.20 +-139.20,4.80,4.19,0.00,1.00,172.80,-24.00 +-134.40,4.80,4.21,0.00,1.00,168.00,24.00 +-129.60,9.60,4.23,0.00,1.00,168.00,-28.80 +-124.80,9.60,4.25,0.00,1.00,168.00,28.80 +-120.00,9.60,4.27,0.00,1.00,163.20,-28.80 +-115.20,9.60,4.29,0.00,1.00,158.40,33.60 +-110.40,9.60,4.32,0.00,1.00,153.60,-33.60 +-105.60,9.60,4.34,0.00,1.00,144.00,33.60 +-100.80,9.60,4.36,0.00,1.00,124.80,-33.60 +-96.00,9.60,4.38,0.00,1.00,96.00,33.60 +-91.20,9.60,4.40,0.00,1.00,67.20,-33.60 +-86.40,9.60,4.42,0.00,1.00,43.20,33.60 +-81.60,9.60,4.44,0.00,1.00,33.60,-33.60 +-76.80,9.60,4.46,0.00,1.00,24.00,33.60 +-72.00,9.60,4.49,0.00,1.00,19.20,-33.60 +-67.20,9.60,4.51,0.00,1.00,14.40,33.60 +-62.40,9.60,4.53,0.00,1.00,14.40,-28.80 +-57.60,9.60,4.55,0.00,1.00,9.60,28.80 +-52.80,9.60,4.57,0.00,1.00,9.60,-28.80 +-48.00,4.80,4.59,0.00,1.00,9.60,24.00 +-43.20,4.80,4.61,0.00,1.00,4.80,-24.00 +-38.40,4.80,4.64,0.00,1.00,4.80,19.20 +-33.60,4.80,4.66,0.00,1.00,4.80,-19.20 +-28.80,4.80,4.68,0.00,1.00,4.80,14.40 +-24.00,4.80,4.70,0.00,1.00,4.80,-14.40 +-19.20,4.80,4.72,0.00,1.00,0.00,9.60 +-14.40,0.00,4.74,0.00,1.00,0.00,-9.60 +-9.60,0.00,4.76,0.00,1.00,0.00,4.80 +-4.80,0.00,4.79,0.00,1.00,0.00,-4.80 +0.00,0.00,4.81,0.00,1.00,-0.00,0.00 +4.80,-0.00,4.83,0.00,1.00,-0.00,-4.80 +9.60,-0.00,4.85,0.00,1.00,-4.80,4.80 +14.40,-4.80,4.87,0.00,1.00,-4.80,-9.60 +19.20,-4.80,4.89,0.00,1.00,-4.80,9.60 +24.00,-4.80,4.91,0.00,1.00,-4.80,-9.60 +28.80,-4.80,4.93,0.00,1.00,-9.60,14.40 +33.60,-9.60,4.96,0.00,1.00,-9.60,-14.40 +38.40,-9.60,4.98,0.00,1.00,-14.40,19.20 +43.20,-9.60,5.00,0.00,1.00,-14.40,-19.20 +48.00,-9.60,5.02,0.00,1.00,-14.40,24.00 +52.80,-9.60,5.04,0.00,1.00,-19.20,-24.00 +57.60,-14.40,5.06,0.00,1.00,-24.00,24.00 +62.40,-14.40,5.08,0.00,1.00,-28.80,-28.80 +67.20,-14.40,5.11,0.00,1.00,-33.60,28.80 +72.00,-14.40,5.13,0.00,1.00,-43.20,-28.80 +76.80,-14.40,5.15,0.00,1.00,-57.60,28.80 +81.60,-14.40,5.17,0.00,1.00,-76.80,-28.80 +86.40,-14.40,5.19,0.00,1.00,-96.00,28.80 +91.20,-14.40,5.21,0.00,1.00,-115.20,-28.80 +96.00,-14.40,5.23,0.00,1.00,-129.60,28.80 +100.80,-14.40,5.26,0.00,1.00,-139.20,-28.80 +105.60,-14.40,5.28,0.00,1.00,-148.80,28.80 +110.40,-14.40,5.30,0.00,1.00,-153.60,-28.80 +115.20,-14.40,5.32,0.00,1.00,-158.40,28.80 +120.00,-14.40,5.34,0.00,1.00,-163.20,-24.00 +124.80,-9.60,5.36,0.00,1.00,-163.20,24.00 +129.60,-9.60,5.38,0.00,1.00,-168.00,-24.00 +134.40,-9.60,5.40,0.00,1.00,-168.00,19.20 +139.20,-9.60,5.43,0.00,1.00,-172.80,-19.20 +144.00,-9.60,5.45,0.00,1.00,-172.80,19.20 +148.80,-9.60,5.47,0.00,1.00,-172.80,-14.40 +153.60,-4.80,5.49,0.00,1.00,-172.80,14.40 +158.40,-4.80,5.51,0.00,1.00,-177.60,-9.60 +163.20,-4.80,5.53,0.00,1.00,-177.60,9.60 +168.00,-4.80,5.55,0.00,1.00,-177.60,-4.80 +172.80,-0.00,5.58,0.00,1.00,-177.60,4.80 +177.60,-0.00,5.60,0.00,1.00,177.60,-0.00 +-177.60,0.00,5.62,0.00,1.00,177.60,-0.00 +-172.80,0.00,5.64,0.00,1.00,177.60,4.80 +-168.00,4.80,5.66,0.00,1.00,177.60,-4.80 +-163.20,4.80,5.68,0.00,1.00,172.80,9.60 +-158.40,4.80,5.70,0.00,1.00,172.80,-9.60 +-153.60,4.80,5.72,0.00,1.00,172.80,14.40 +-148.80,9.60,5.75,0.00,1.00,172.80,-14.40 +-144.00,9.60,5.77,0.00,1.00,168.00,19.20 +-139.20,9.60,5.79,0.00,1.00,168.00,-19.20 +-134.40,9.60,5.81,0.00,1.00,163.20,19.20 +-129.60,9.60,5.83,0.00,1.00,163.20,-24.00 +-124.80,9.60,5.85,0.00,1.00,158.40,24.00 +-120.00,14.40,5.87,0.00,1.00,153.60,-24.00 +-115.20,14.40,5.90,0.00,1.00,148.80,28.80 +-110.40,14.40,5.92,0.00,1.00,139.20,-28.80 +-105.60,14.40,5.94,0.00,1.00,129.60,28.80 +-100.80,14.40,5.96,0.00,1.00,115.20,-28.80 +-96.00,14.40,5.98,0.00,1.00,96.00,28.80 +-91.20,14.40,6.00,0.00,1.00,76.80,-28.80 +-86.40,14.40,6.02,0.00,1.00,57.60,28.80 +-81.60,14.40,6.05,0.00,1.00,43.20,-28.80 +-76.80,14.40,6.07,0.00,1.00,33.60,28.80 +-72.00,14.40,6.09,0.00,1.00,28.80,-28.80 +-67.20,14.40,6.11,0.00,1.00,24.00,28.80 +-62.40,14.40,6.13,0.00,1.00,19.20,-28.80 +-57.60,14.40,6.15,0.00,1.00,14.40,24.00 +-52.80,9.60,6.17,0.00,1.00,14.40,-24.00 +-48.00,9.60,6.19,0.00,1.00,14.40,24.00 +-43.20,9.60,6.22,0.00,1.00,9.60,-19.20 +-38.40,9.60,6.24,0.00,1.00,9.60,19.20 +-33.60,9.60,6.26,0.00,1.00,4.80,-14.40 +-28.80,4.80,6.28,0.00,1.00,4.80,14.40 +-24.00,4.80,6.30,0.00,1.00,4.80,-9.60 +-19.20,4.80,6.32,0.00,1.00,4.80,9.60 +-14.40,4.80,6.34,0.00,1.00,0.00,-9.60 +-9.60,0.00,6.37,0.00,1.00,0.00,4.80 +-4.80,0.00,6.39,0.00,1.00,0.00,-4.80 +0.00,0.00,6.41,0.00,1.00,-0.00,0.00 +4.80,-0.00,6.43,0.00,1.00,-4.80,-0.00 +9.60,-4.80,6.45,0.00,1.00,-4.80,4.80 +14.40,-4.80,6.47,0.00,1.00,-4.80,-4.80 +19.20,-4.80,6.49,0.00,1.00,-9.60,9.60 +24.00,-9.60,6.52,0.00,1.00,-9.60,-9.60 +28.80,-9.60,6.54,0.00,1.00,-9.60,14.40 +33.60,-9.60,6.56,0.00,1.00,-14.40,-14.40 +38.40,-9.60,6.58,0.00,1.00,-14.40,14.40 +43.20,-14.40,6.60,0.00,1.00,-19.20,-19.20 +48.00,-14.40,6.62,0.00,1.00,-24.00,19.20 +52.80,-14.40,6.64,0.00,1.00,-24.00,-19.20 +57.60,-14.40,6.66,0.00,1.00,-28.80,19.20 +62.40,-19.20,6.69,0.00,1.00,-38.40,-24.00 +67.20,-19.20,6.71,0.00,1.00,-43.20,24.00 +72.00,-19.20,6.73,0.00,1.00,-52.80,-24.00 +76.80,-19.20,6.75,0.00,1.00,-62.40,24.00 +81.60,-19.20,6.77,0.00,1.00,-76.80,-24.00 +86.40,-19.20,6.79,0.00,1.00,-96.00,24.00 +91.20,-19.20,6.81,0.00,1.00,-110.40,-24.00 +96.00,-19.20,6.84,0.00,1.00,-120.00,24.00 +100.80,-19.20,6.86,0.00,1.00,-134.40,-24.00 +105.60,-19.20,6.88,0.00,1.00,-139.20,24.00 +110.40,-19.20,6.90,0.00,1.00,-148.80,-24.00 +115.20,-19.20,6.92,0.00,1.00,-153.60,24.00 +120.00,-14.40,6.94,0.00,1.00,-158.40,-24.00 +124.80,-14.40,6.96,0.00,1.00,-158.40,19.20 +129.60,-14.40,6.99,0.00,1.00,-163.20,-19.20 +134.40,-14.40,7.01,0.00,1.00,-163.20,19.20 +139.20,-14.40,7.03,0.00,1.00,-168.00,-14.40 +144.00,-9.60,7.05,0.00,1.00,-168.00,14.40 +148.80,-9.60,7.07,0.00,1.00,-172.80,-14.40 +153.60,-9.60,7.09,0.00,1.00,-172.80,9.60 +158.40,-4.80,7.11,0.00,1.00,-172.80,-9.60 +163.20,-4.80,7.13,0.00,1.00,-177.60,9.60 +168.00,-4.80,7.16,0.00,1.00,-177.60,-4.80 +172.80,-0.00,7.18,0.00,1.00,-177.60,4.80 +177.60,-0.00,7.20,0.00,1.00,177.60,-0.00 +-177.60,0.00,7.22,0.00,1.00,177.60,-0.00 +-172.80,0.00,7.24,0.00,1.00,177.60,4.80 +-168.00,4.80,7.26,0.00,1.00,172.80,-4.80 +-163.20,4.80,7.28,0.00,1.00,172.80,9.60 +-158.40,4.80,7.31,0.00,1.00,172.80,-9.60 +-153.60,9.60,7.33,0.00,1.00,168.00,9.60 +-148.80,9.60,7.35,0.00,1.00,168.00,-14.40 +-144.00,9.60,7.37,0.00,1.00,163.20,14.40 +-139.20,14.40,7.39,0.00,1.00,163.20,-14.40 +-134.40,14.40,7.41,0.00,1.00,158.40,19.20 +-129.60,14.40,7.43,0.00,1.00,158.40,-19.20 +-124.80,14.40,7.46,0.00,1.00,153.60,19.20 +-120.00,14.40,7.48,0.00,1.00,148.80,-24.00 +-115.20,19.20,7.50,0.00,1.00,139.20,24.00 +-110.40,19.20,7.52,0.00,1.00,134.40,-24.00 +-105.60,19.20,7.54,0.00,1.00,120.00,24.00 +-100.80,19.20,7.56,0.00,1.00,110.40,-24.00 +-96.00,19.20,7.58,0.00,1.00,96.00,24.00 +-91.20,19.20,7.60,0.00,1.00,76.80,-24.00 +-86.40,19.20,7.63,0.00,1.00,62.40,24.00 +-81.60,19.20,7.65,0.00,1.00,52.80,-24.00 +-76.80,19.20,7.67,0.00,1.00,43.20,24.00 +-72.00,19.20,7.69,0.00,1.00,38.40,-24.00 +-67.20,19.20,7.71,0.00,1.00,28.80,24.00 +-62.40,19.20,7.73,0.00,1.00,24.00,-24.00 +-57.60,14.40,7.75,0.00,1.00,24.00,19.20 +-52.80,14.40,7.78,0.00,1.00,19.20,-19.20 +-48.00,14.40,7.80,0.00,1.00,14.40,19.20 +-43.20,14.40,7.82,0.00,1.00,14.40,-19.20 +-38.40,9.60,7.84,0.00,1.00,9.60,14.40 +-33.60,9.60,7.86,0.00,1.00,9.60,-14.40 +-28.80,9.60,7.88,0.00,1.00,9.60,14.40 +-24.00,9.60,7.90,0.00,1.00,4.80,-9.60 +-19.20,4.80,7.93,0.00,1.00,4.80,9.60 +-14.40,4.80,7.95,0.00,1.00,4.80,-4.80 +-9.60,4.80,7.97,0.00,1.00,0.00,4.80 +-4.80,0.00,7.99,0.00,1.00,0.00,-0.00 +0.00,0.00,8.01,0.00,1.00,-0.00,0.00 +4.80,-0.00,8.03,0.00,1.00,-4.80,-0.00 +9.60,-4.80,8.05,0.00,1.00,-4.80,4.80 +14.40,-4.80,8.07,0.00,1.00,-9.60,-4.80 +19.20,-9.60,8.10,0.00,1.00,-9.60,4.80 +24.00,-9.60,8.12,0.00,1.00,-14.40,-9.60 +28.80,-9.60,8.14,0.00,1.00,-14.40,9.60 +33.60,-14.40,8.16,0.00,1.00,-19.20,-9.60 +33.60,-14.40,8.18,0.00,1.00,-19.20,14.40 +38.40,-14.40,8.20,0.00,1.00,-24.00,-14.40 +43.20,-19.20,8.22,0.00,1.00,-28.80,14.40 +48.00,-19.20,8.25,0.00,1.00,-33.60,-14.40 +57.60,-19.20,8.27,0.00,1.00,-38.40,19.20 +62.40,-19.20,8.29,0.00,1.00,-43.20,-19.20 +67.20,-24.00,8.31,0.00,1.00,-48.00,19.20 +72.00,-24.00,8.33,0.00,1.00,-57.60,-19.20 +76.80,-24.00,8.35,0.00,1.00,-67.20,19.20 +81.60,-24.00,8.37,0.00,1.00,-81.60,-19.20 +86.40,-24.00,8.40,0.00,1.00,-91.20,19.20 +91.20,-24.00,8.42,0.00,1.00,-105.60,-19.20 +96.00,-24.00,8.44,0.00,1.00,-115.20,19.20 +100.80,-24.00,8.46,0.00,1.00,-124.80,-19.20 +105.60,-24.00,8.48,0.00,1.00,-134.40,19.20 +110.40,-24.00,8.50,0.00,1.00,-139.20,-19.20 +115.20,-19.20,8.52,0.00,1.00,-144.00,19.20 +120.00,-19.20,8.54,0.00,1.00,-148.80,-19.20 +129.60,-19.20,8.57,0.00,1.00,-153.60,19.20 +134.40,-19.20,8.59,0.00,1.00,-158.40,-14.40 +139.20,-19.20,8.61,0.00,1.00,-163.20,14.40 +144.00,-14.40,8.63,0.00,1.00,-163.20,-14.40 +148.80,-14.40,8.65,0.00,1.00,-168.00,14.40 +148.80,-14.40,8.67,0.00,1.00,-168.00,-9.60 +153.60,-9.60,8.69,0.00,1.00,-172.80,9.60 +158.40,-9.60,8.72,0.00,1.00,-172.80,-9.60 +163.20,-4.80,8.74,0.00,1.00,-177.60,4.80 +168.00,-4.80,8.76,0.00,1.00,-177.60,-4.80 +172.80,-4.80,8.78,0.00,1.00,-177.60,4.80 +177.60,-0.00,8.80,0.00,1.00,177.60,-0.00 +-177.60,0.00,8.82,0.00,1.00,177.60,-0.00 +-172.80,4.80,8.84,0.00,1.00,177.60,4.80 +-168.00,4.80,8.87,0.00,1.00,172.80,-4.80 +-163.20,4.80,8.89,0.00,1.00,172.80,4.80 +-158.40,9.60,8.91,0.00,1.00,168.00,-9.60 +-153.60,9.60,8.93,0.00,1.00,168.00,9.60 +-148.80,14.40,8.95,0.00,1.00,163.20,-9.60 +-148.80,14.40,8.97,0.00,1.00,163.20,14.40 +-144.00,14.40,8.99,0.00,1.00,158.40,-14.40 +-139.20,19.20,9.01,0.00,1.00,153.60,14.40 +-134.40,19.20,9.04,0.00,1.00,148.80,-14.40 +-129.60,19.20,9.06,0.00,1.00,144.00,19.20 +-120.00,19.20,9.08,0.00,1.00,139.20,-19.20 +-115.20,19.20,9.10,0.00,1.00,134.40,19.20 +-110.40,24.00,9.12,0.00,1.00,124.80,-19.20 +-105.60,24.00,9.14,0.00,1.00,115.20,19.20 +-100.80,24.00,9.16,0.00,1.00,105.60,-19.20 +-96.00,24.00,9.19,0.00,1.00,91.20,19.20 +-91.20,24.00,9.21,0.00,1.00,81.60,-19.20 +-86.40,24.00,9.23,0.00,1.00,67.20,19.20 +-81.60,24.00,9.25,0.00,1.00,57.60,-19.20 +-76.80,24.00,9.27,0.00,1.00,48.00,19.20 +-72.00,24.00,9.29,0.00,1.00,43.20,-19.20 +-67.20,24.00,9.31,0.00,1.00,38.40,19.20 +-62.40,19.20,9.34,0.00,1.00,33.60,-19.20 +-57.60,19.20,9.36,0.00,1.00,28.80,19.20 +-48.00,19.20,9.38,0.00,1.00,24.00,-14.40 +-43.20,19.20,9.40,0.00,1.00,19.20,14.40 +-38.40,14.40,9.42,0.00,1.00,19.20,-14.40 +-33.60,14.40,9.44,0.00,1.00,14.40,14.40 +-33.60,14.40,9.46,0.00,1.00,14.40,-9.60 +-28.80,9.60,9.48,0.00,1.00,9.60,9.60 +-24.00,9.60,9.51,0.00,1.00,9.60,-9.60 +-19.20,9.60,9.53,0.00,1.00,4.80,4.80 +-14.40,4.80,9.55,0.00,1.00,4.80,-4.80 +-9.60,4.80,9.57,0.00,1.00,0.00,4.80 +-4.80,0.00,9.59,0.00,1.00,0.00,-0.00 +0.00,0.00,9.61,0.00,1.00,-0.00,0.00 +4.80,-0.00,9.63,0.00,1.00,-4.80,-0.00 +9.60,-4.80,9.66,0.00,1.00,-4.80,4.80 +14.40,-4.80,9.68,0.00,1.00,-9.60,-4.80 +19.20,-9.60,9.70,0.00,1.00,-9.60,4.80 +19.20,-9.60,9.72,0.00,1.00,-14.40,-4.80 +24.00,-14.40,9.74,0.00,1.00,-19.20,9.60 +28.80,-14.40,9.76,0.00,1.00,-19.20,-9.60 +33.60,-19.20,9.78,0.00,1.00,-24.00,9.60 +38.40,-19.20,9.81,0.00,1.00,-28.80,-9.60 +43.20,-19.20,9.83,0.00,1.00,-33.60,9.60 +48.00,-24.00,9.85,0.00,1.00,-38.40,-14.40 +52.80,-24.00,9.87,0.00,1.00,-43.20,14.40 +57.60,-24.00,9.89,0.00,1.00,-48.00,-14.40 +62.40,-24.00,9.91,0.00,1.00,-52.80,14.40 +72.00,-28.80,9.93,0.00,1.00,-62.40,-14.40 +76.80,-28.80,9.95,0.00,1.00,-72.00,14.40 +81.60,-28.80,9.98,0.00,1.00,-81.60,-14.40 +86.40,-28.80,10.00,0.00,1.00,-91.20,14.40 +91.20,-28.80,10.02,0.00,1.00,-100.80,-14.40 +96.00,-28.80,10.04,0.00,1.00,-110.40,14.40 +100.80,-28.80,10.06,0.00,1.00,-120.00,-14.40 +105.60,-28.80,10.08,0.00,1.00,-129.60,14.40 +115.20,-28.80,10.10,0.00,1.00,-134.40,-14.40 +120.00,-24.00,10.13,0.00,1.00,-139.20,14.40 +124.80,-24.00,10.15,0.00,1.00,-144.00,-14.40 +129.60,-24.00,10.17,0.00,1.00,-148.80,14.40 +134.40,-24.00,10.19,0.00,1.00,-153.60,-14.40 +139.20,-19.20,10.21,0.00,1.00,-158.40,9.60 +144.00,-19.20,10.23,0.00,1.00,-163.20,-9.60 +148.80,-14.40,10.25,0.00,1.00,-163.20,9.60 +153.60,-14.40,10.28,0.00,1.00,-168.00,-9.60 +158.40,-14.40,10.30,0.00,1.00,-168.00,4.80 +163.20,-9.60,10.32,0.00,1.00,-172.80,-4.80 +163.20,-9.60,10.34,0.00,1.00,-172.80,4.80 +168.00,-4.80,10.36,0.00,1.00,-177.60,-4.80 +172.80,-4.80,10.38,0.00,1.00,-177.60,0.00 +177.60,-0.00,10.40,0.00,1.00,177.60,-0.00 +-177.60,0.00,10.42,0.00,1.00,177.60,-0.00 +-172.80,4.80,10.45,0.00,1.00,172.80,0.00 +-168.00,4.80,10.47,0.00,1.00,172.80,-4.80 +-163.20,9.60,10.49,0.00,1.00,168.00,4.80 +-163.20,9.60,10.51,0.00,1.00,168.00,-4.80 +-158.40,14.40,10.53,0.00,1.00,163.20,4.80 +-153.60,14.40,10.55,0.00,1.00,163.20,-9.60 +-148.80,14.40,10.57,0.00,1.00,158.40,9.60 +-144.00,19.20,10.60,0.00,1.00,153.60,-9.60 +-139.20,19.20,10.62,0.00,1.00,148.80,9.60 +-134.40,24.00,10.64,0.00,1.00,144.00,-14.40 +-129.60,24.00,10.66,0.00,1.00,139.20,14.40 +-124.80,24.00,10.68,0.00,1.00,134.40,-14.40 +-120.00,24.00,10.70,0.00,1.00,129.60,14.40 +-115.20,28.80,10.72,0.00,1.00,120.00,-14.40 +-105.60,28.80,10.74,0.00,1.00,110.40,14.40 +-100.80,28.80,10.77,0.00,1.00,100.80,-14.40 +-96.00,28.80,10.79,0.00,1.00,91.20,14.40 +-91.20,28.80,10.81,0.00,1.00,81.60,-14.40 +-86.40,28.80,10.83,0.00,1.00,72.00,14.40 +-81.60,28.80,10.85,0.00,1.00,62.40,-14.40 +-76.80,28.80,10.87,0.00,1.00,52.80,14.40 +-72.00,28.80,10.89,0.00,1.00,48.00,-14.40 +-62.40,24.00,10.92,0.00,1.00,43.20,14.40 +-57.60,24.00,10.94,0.00,1.00,38.40,-14.40 +-52.80,24.00,10.96,0.00,1.00,33.60,14.40 +-48.00,24.00,10.98,0.00,1.00,28.80,-14.40 +-43.20,19.20,11.00,0.00,1.00,24.00,9.60 +-38.40,19.20,11.02,0.00,1.00,19.20,-9.60 +-33.60,19.20,11.04,0.00,1.00,19.20,9.60 +-28.80,14.40,11.07,0.00,1.00,14.40,-9.60 +-24.00,14.40,11.09,0.00,1.00,9.60,9.60 +-19.20,9.60,11.11,0.00,1.00,9.60,-4.80 +-19.20,9.60,11.13,0.00,1.00,4.80,4.80 +-14.40,4.80,11.15,0.00,1.00,4.80,-4.80 +-9.60,4.80,11.17,0.00,1.00,0.00,4.80 +-4.80,0.00,11.19,0.00,1.00,0.00,-0.00 +0.00,0.00,11.21,0.00,1.00,-4.80,0.00 +4.80,-4.80,11.24,0.00,1.00,-4.80,-0.00 +9.60,-4.80,11.26,0.00,1.00,-9.60,0.00 +14.40,-9.60,11.28,0.00,1.00,-9.60,-4.80 +14.40,-9.60,11.30,0.00,1.00,-14.40,4.80 +19.20,-14.40,11.32,0.00,1.00,-14.40,-4.80 +24.00,-14.40,11.34,0.00,1.00,-19.20,4.80 +28.80,-19.20,11.36,0.00,1.00,-24.00,-4.80 +33.60,-19.20,11.39,0.00,1.00,-28.80,4.80 +38.40,-24.00,11.41,0.00,1.00,-28.80,-9.60 +43.20,-24.00,11.43,0.00,1.00,-33.60,9.60 +48.00,-24.00,11.45,0.00,1.00,-38.40,-9.60 +52.80,-28.80,11.47,0.00,1.00,-48.00,9.60 +57.60,-28.80,11.49,0.00,1.00,-52.80,-9.60 +62.40,-28.80,11.51,0.00,1.00,-57.60,9.60 +67.20,-33.60,11.54,0.00,1.00,-67.20,-9.60 +72.00,-33.60,11.56,0.00,1.00,-76.80,9.60 +81.60,-33.60,11.58,0.00,1.00,-81.60,-9.60 +86.40,-33.60,11.60,0.00,1.00,-91.20,9.60 +91.20,-33.60,11.62,0.00,1.00,-100.80,-9.60 +96.00,-33.60,11.64,0.00,1.00,-110.40,9.60 +100.80,-33.60,11.66,0.00,1.00,-115.20,-9.60 +110.40,-33.60,11.68,0.00,1.00,-124.80,9.60 +115.20,-33.60,11.71,0.00,1.00,-129.60,-9.60 +120.00,-28.80,11.73,0.00,1.00,-139.20,9.60 +124.80,-28.80,11.75,0.00,1.00,-144.00,-9.60 +129.60,-28.80,11.77,0.00,1.00,-148.80,9.60 +134.40,-24.00,11.79,0.00,1.00,-153.60,-9.60 +139.20,-24.00,11.81,0.00,1.00,-153.60,9.60 +144.00,-19.20,11.83,0.00,1.00,-158.40,-9.60 +148.80,-19.20,11.86,0.00,1.00,-163.20,4.80 +153.60,-14.40,11.88,0.00,1.00,-163.20,-4.80 +158.40,-14.40,11.90,0.00,1.00,-168.00,4.80 +163.20,-9.60,11.92,0.00,1.00,-172.80,-4.80 +168.00,-9.60,11.94,0.00,1.00,-172.80,4.80 +168.00,-4.80,11.96,0.00,1.00,-177.60,-0.00 +172.80,-4.80,11.98,0.00,1.00,-177.60,0.00 +177.60,-0.00,12.01,0.00,1.00,177.60,-0.00 +-177.60,0.00,12.03,0.00,1.00,177.60,-0.00 +-172.80,4.80,12.05,0.00,1.00,172.80,0.00 +-168.00,4.80,12.07,0.00,1.00,172.80,-0.00 +-168.00,9.60,12.09,0.00,1.00,168.00,4.80 +-163.20,9.60,12.11,0.00,1.00,163.20,-4.80 +-158.40,14.40,12.13,0.00,1.00,163.20,4.80 +-153.60,14.40,12.15,0.00,1.00,158.40,-4.80 +-148.80,19.20,12.18,0.00,1.00,153.60,4.80 +-144.00,19.20,12.20,0.00,1.00,153.60,-9.60 +-139.20,24.00,12.22,0.00,1.00,148.80,9.60 +-134.40,24.00,12.24,0.00,1.00,144.00,-9.60 +-129.60,28.80,12.26,0.00,1.00,139.20,9.60 +-124.80,28.80,12.28,0.00,1.00,129.60,-9.60 +-120.00,28.80,12.30,0.00,1.00,124.80,9.60 +-115.20,33.60,12.33,0.00,1.00,115.20,-9.60 +-110.40,33.60,12.35,0.00,1.00,110.40,9.60 +-100.80,33.60,12.37,0.00,1.00,100.80,-9.60 +-96.00,33.60,12.39,0.00,1.00,91.20,9.60 +-91.20,33.60,12.41,0.00,1.00,81.60,-9.60 +-86.40,33.60,12.43,0.00,1.00,76.80,9.60 +-81.60,33.60,12.45,0.00,1.00,67.20,-9.60 +-72.00,33.60,12.48,0.00,1.00,57.60,9.60 +-67.20,33.60,12.50,0.00,1.00,52.80,-9.60 +-62.40,28.80,12.52,0.00,1.00,48.00,9.60 +-57.60,28.80,12.54,0.00,1.00,38.40,-9.60 +-52.80,28.80,12.56,0.00,1.00,33.60,9.60 +-48.00,24.00,12.58,0.00,1.00,28.80,-9.60 +-43.20,24.00,12.60,0.00,1.00,28.80,9.60 +-38.40,24.00,12.62,0.00,1.00,24.00,-9.60 +-33.60,19.20,12.65,0.00,1.00,19.20,4.80 +-28.80,19.20,12.67,0.00,1.00,14.40,-4.80 +-24.00,14.40,12.69,0.00,1.00,14.40,4.80 +-19.20,14.40,12.71,0.00,1.00,9.60,-4.80 +-14.40,9.60,12.73,0.00,1.00,9.60,4.80 +-14.40,9.60,12.75,0.00,1.00,4.80,-4.80 +-9.60,4.80,12.77,0.00,1.00,4.80,0.00 +-4.80,4.80,12.80,0.00,1.00,0.00,-0.00 +0.00,0.00,12.82,0.00,1.00,-4.80,0.00 +4.80,-4.80,12.84,0.00,1.00,-4.80,-0.00 +9.60,-4.80,12.86,0.00,1.00,-9.60,0.00 +9.60,-9.60,12.88,0.00,1.00,-9.60,-0.00 +14.40,-9.60,12.90,0.00,1.00,-14.40,0.00 +19.20,-14.40,12.92,0.00,1.00,-19.20,-4.80 +24.00,-19.20,12.95,0.00,1.00,-24.00,4.80 +28.80,-19.20,12.97,0.00,1.00,-24.00,-4.80 +33.60,-24.00,12.99,0.00,1.00,-28.80,4.80 +38.40,-24.00,13.01,0.00,1.00,-33.60,-4.80 +43.20,-28.80,13.03,0.00,1.00,-38.40,4.80 +48.00,-28.80,13.05,0.00,1.00,-43.20,-4.80 +52.80,-33.60,13.07,0.00,1.00,-48.00,4.80 +57.60,-33.60,13.09,0.00,1.00,-52.80,-4.80 +62.40,-33.60,13.12,0.00,1.00,-62.40,4.80 +67.20,-38.40,13.14,0.00,1.00,-67.20,-4.80 +72.00,-38.40,13.16,0.00,1.00,-76.80,4.80 +81.60,-38.40,13.18,0.00,1.00,-86.40,-4.80 +86.40,-38.40,13.20,0.00,1.00,-91.20,4.80 +91.20,-38.40,13.22,0.00,1.00,-100.80,-4.80 +96.00,-38.40,13.24,0.00,1.00,-105.60,4.80 +105.60,-38.40,13.27,0.00,1.00,-115.20,-4.80 +110.40,-38.40,13.29,0.00,1.00,-120.00,4.80 +115.20,-33.60,13.31,0.00,1.00,-129.60,-4.80 +120.00,-33.60,13.33,0.00,1.00,-134.40,4.80 +124.80,-33.60,13.35,0.00,1.00,-139.20,-4.80 +129.60,-28.80,13.37,0.00,1.00,-144.00,4.80 +134.40,-28.80,13.39,0.00,1.00,-148.80,-4.80 +139.20,-24.00,13.42,0.00,1.00,-153.60,4.80 +144.00,-24.00,13.44,0.00,1.00,-158.40,-4.80 +148.80,-19.20,13.46,0.00,1.00,-158.40,4.80 +153.60,-19.20,13.48,0.00,1.00,-163.20,-4.80 +158.40,-14.40,13.50,0.00,1.00,-168.00,4.80 +163.20,-14.40,13.52,0.00,1.00,-168.00,-4.80 +168.00,-9.60,13.54,0.00,1.00,-172.80,0.00 +172.80,-9.60,13.56,0.00,1.00,-177.60,-0.00 +172.80,-4.80,13.59,0.00,1.00,-177.60,0.00 +177.60,-0.00,13.61,0.00,1.00,177.60,-0.00 +-177.60,0.00,13.63,0.00,1.00,177.60,-0.00 +-172.80,4.80,13.65,0.00,1.00,172.80,0.00 +-172.80,9.60,13.67,0.00,1.00,168.00,-0.00 +-168.00,9.60,13.69,0.00,1.00,168.00,0.00 +-163.20,14.40,13.71,0.00,1.00,163.20,-4.80 +-158.40,14.40,13.74,0.00,1.00,158.40,4.80 +-153.60,19.20,13.76,0.00,1.00,158.40,-4.80 +-148.80,19.20,13.78,0.00,1.00,153.60,4.80 +-144.00,24.00,13.80,0.00,1.00,148.80,-4.80 +-139.20,24.00,13.82,0.00,1.00,144.00,4.80 +-134.40,28.80,13.84,0.00,1.00,139.20,-4.80 +-129.60,28.80,13.86,0.00,1.00,134.40,4.80 +-124.80,33.60,13.89,0.00,1.00,129.60,-4.80 +-120.00,33.60,13.91,0.00,1.00,120.00,4.80 +-115.20,33.60,13.93,0.00,1.00,115.20,-4.80 +-110.40,38.40,13.95,0.00,1.00,105.60,4.80 +-105.60,38.40,13.97,0.00,1.00,100.80,-4.80 +-96.00,38.40,13.99,0.00,1.00,91.20,4.80 +-91.20,38.40,14.01,0.00,1.00,86.40,-4.80 +-86.40,38.40,14.03,0.00,1.00,76.80,4.80 +-81.60,38.40,14.06,0.00,1.00,67.20,-4.80 +-72.00,38.40,14.08,0.00,1.00,62.40,4.80 +-67.20,38.40,14.10,0.00,1.00,52.80,-4.80 +-62.40,33.60,14.12,0.00,1.00,48.00,4.80 +-57.60,33.60,14.14,0.00,1.00,43.20,-4.80 +-52.80,33.60,14.16,0.00,1.00,38.40,4.80 +-48.00,28.80,14.18,0.00,1.00,33.60,-4.80 +-43.20,28.80,14.21,0.00,1.00,28.80,4.80 +-38.40,24.00,14.23,0.00,1.00,24.00,-4.80 +-33.60,24.00,14.25,0.00,1.00,24.00,4.80 +-28.80,19.20,14.27,0.00,1.00,19.20,-4.80 +-24.00,19.20,14.29,0.00,1.00,14.40,4.80 +-19.20,14.40,14.31,0.00,1.00,9.60,-4.80 +-14.40,9.60,14.33,0.00,1.00,9.60,0.00 +-9.60,9.60,14.36,0.00,1.00,4.80,-0.00 +-9.60,4.80,14.38,0.00,1.00,4.80,0.00 +-4.80,4.80,14.40,0.00,1.00,0.00,-0.00 +0.00,0.00,14.42,0.00,1.00,-4.80,0.00 +4.80,-4.80,14.44,0.00,1.00,-4.80,-0.00 +4.80,-4.80,14.46,0.00,1.00,-9.60,0.00 +9.60,-9.60,14.48,0.00,1.00,-14.40,-0.00 +14.40,-14.40,14.50,0.00,1.00,-14.40,0.00 +19.20,-14.40,14.53,0.00,1.00,-19.20,-0.00 +24.00,-19.20,14.55,0.00,1.00,-24.00,0.00 +24.00,-24.00,14.57,0.00,1.00,-28.80,-0.00 +28.80,-24.00,14.59,0.00,1.00,-33.60,0.00 +33.60,-28.80,14.61,0.00,1.00,-38.40,-0.00 +38.40,-28.80,14.63,0.00,1.00,-43.20,0.00 +43.20,-33.60,14.65,0.00,1.00,-48.00,-0.00 +48.00,-33.60,14.68,0.00,1.00,-52.80,0.00 +52.80,-38.40,14.70,0.00,1.00,-57.60,-0.00 +62.40,-38.40,14.72,0.00,1.00,-62.40,0.00 +67.20,-38.40,14.74,0.00,1.00,-72.00,-0.00 +72.00,-43.20,14.76,0.00,1.00,-76.80,0.00 +76.80,-43.20,14.78,0.00,1.00,-86.40,-0.00 +86.40,-43.20,14.80,0.00,1.00,-91.20,0.00 +91.20,-43.20,14.83,0.00,1.00,-100.80,-0.00 +96.00,-43.20,14.85,0.00,1.00,-105.60,0.00 +105.60,-43.20,14.87,0.00,1.00,-110.40,-0.00 +110.40,-43.20,14.89,0.00,1.00,-120.00,0.00 +115.20,-38.40,14.91,0.00,1.00,-124.80,-0.00 +124.80,-38.40,14.93,0.00,1.00,-129.60,0.00 +129.60,-38.40,14.95,0.00,1.00,-134.40,-0.00 +134.40,-33.60,14.97,0.00,1.00,-139.20,0.00 +139.20,-33.60,15.00,0.00,1.00,-144.00,-0.00 +144.00,-28.80,15.02,0.00,1.00,-148.80,0.00 +148.80,-28.80,15.04,0.00,1.00,-153.60,-0.00 +153.60,-24.00,15.06,0.00,1.00,-158.40,0.00 +158.40,-19.20,15.08,0.00,1.00,-163.20,-0.00 +158.40,-19.20,15.10,0.00,1.00,-163.20,0.00 +163.20,-14.40,15.12,0.00,1.00,-168.00,-0.00 +168.00,-9.60,15.15,0.00,1.00,-172.80,0.00 +172.80,-9.60,15.17,0.00,1.00,-172.80,-0.00 +172.80,-4.80,15.19,0.00,1.00,-177.60,0.00 +177.60,-0.00,15.21,0.00,1.00,177.60,-0.00 +-177.60,0.00,15.23,0.00,1.00,172.80,-0.00 +-172.80,4.80,15.25,0.00,1.00,172.80,0.00 +-172.80,9.60,15.27,0.00,1.00,168.00,-0.00 +-168.00,9.60,15.30,0.00,1.00,163.20,0.00 +-163.20,14.40,15.32,0.00,1.00,163.20,-0.00 +-158.40,19.20,15.34,0.00,1.00,158.40,0.00 +-158.40,19.20,15.36,0.00,1.00,153.60,-0.00 +-153.60,24.00,15.38,0.00,1.00,148.80,0.00 +-148.80,28.80,15.40,0.00,1.00,144.00,-0.00 +-144.00,28.80,15.42,0.00,1.00,139.20,0.00 +-139.20,33.60,15.44,0.00,1.00,134.40,-0.00 +-134.40,33.60,15.47,0.00,1.00,129.60,0.00 +-129.60,38.40,15.49,0.00,1.00,124.80,-0.00 +-124.80,38.40,15.51,0.00,1.00,120.00,0.00 +-115.20,38.40,15.53,0.00,1.00,110.40,-0.00 +-110.40,43.20,15.55,0.00,1.00,105.60,0.00 +-105.60,43.20,15.57,0.00,1.00,100.80,-0.00 +-96.00,43.20,15.59,0.00,1.00,91.20,0.00 +-91.20,43.20,15.62,0.00,1.00,86.40,-0.00 +-86.40,43.20,15.64,0.00,1.00,76.80,0.00 +-76.80,43.20,15.66,0.00,1.00,72.00,-0.00 +-72.00,43.20,15.68,0.00,1.00,62.40,0.00 +-67.20,38.40,15.70,0.00,1.00,57.60,-0.00 +-62.40,38.40,15.72,0.00,1.00,52.80,0.00 +-52.80,38.40,15.74,0.00,1.00,48.00,-0.00 +-48.00,33.60,15.77,0.00,1.00,43.20,0.00 +-43.20,33.60,15.79,0.00,1.00,38.40,-0.00 +-38.40,28.80,15.81,0.00,1.00,33.60,0.00 +-33.60,28.80,15.83,0.00,1.00,28.80,-0.00 +-28.80,24.00,15.85,0.00,1.00,24.00,0.00 +-24.00,24.00,15.87,0.00,1.00,19.20,-0.00 +-24.00,19.20,15.89,0.00,1.00,14.40,0.00 +-19.20,14.40,15.91,0.00,1.00,14.40,-0.00 +-14.40,14.40,15.94,0.00,1.00,9.60,0.00 +-9.60,9.60,15.96,0.00,1.00,4.80,-0.00 +-4.80,4.80,15.98,0.00,1.00,4.80,0.00 +-4.80,4.80,16.00,0.00,1.00,0.00,-0.00 +0.00,0.00,16.00,0.00,1.00,-4.80,0.00 +4.80,-4.80,15.98,0.00,1.00,-4.80,0.00 +4.80,-4.80,15.96,0.00,1.00,-9.60,-0.00 +9.60,-9.60,15.94,0.00,1.00,-14.40,0.00 +14.40,-14.40,15.91,0.00,1.00,-19.20,-0.00 +14.40,-19.20,15.89,0.00,1.00,-24.00,0.00 +19.20,-19.20,15.87,0.00,1.00,-24.00,-0.00 +24.00,-24.00,15.85,0.00,1.00,-28.80,0.00 +28.80,-28.80,15.83,0.00,1.00,-33.60,-0.00 +33.60,-28.80,15.81,0.00,1.00,-38.40,0.00 +38.40,-33.60,15.79,0.00,1.00,-43.20,-0.00 +43.20,-38.40,15.77,0.00,1.00,-48.00,0.00 +48.00,-38.40,15.74,0.00,1.00,-52.80,-4.80 +52.80,-43.20,15.72,0.00,1.00,-62.40,4.80 +57.60,-43.20,15.70,0.00,1.00,-67.20,-4.80 +62.40,-43.20,15.68,0.00,1.00,-72.00,4.80 +72.00,-48.00,15.66,0.00,1.00,-76.80,-4.80 +76.80,-48.00,15.64,0.00,1.00,-86.40,4.80 +86.40,-48.00,15.62,0.00,1.00,-91.20,-4.80 +91.20,-48.00,15.59,0.00,1.00,-96.00,4.80 +100.80,-48.00,15.57,0.00,1.00,-105.60,-4.80 +105.60,-48.00,15.55,0.00,1.00,-110.40,4.80 +110.40,-48.00,15.53,0.00,1.00,-115.20,-4.80 +120.00,-43.20,15.51,0.00,1.00,-124.80,4.80 +124.80,-43.20,15.49,0.00,1.00,-129.60,-4.80 +129.60,-38.40,15.47,0.00,1.00,-134.40,4.80 +134.40,-38.40,15.44,0.00,1.00,-139.20,-4.80 +139.20,-33.60,15.42,0.00,1.00,-144.00,0.00 +144.00,-33.60,15.40,0.00,1.00,-148.80,-0.00 +148.80,-28.80,15.38,0.00,1.00,-153.60,0.00 +153.60,-24.00,15.36,0.00,1.00,-158.40,-0.00 +158.40,-24.00,15.34,0.00,1.00,-158.40,0.00 +163.20,-19.20,15.32,0.00,1.00,-163.20,-0.00 +163.20,-14.40,15.30,0.00,1.00,-168.00,0.00 +168.00,-14.40,15.27,0.00,1.00,-172.80,-0.00 +172.80,-9.60,15.25,0.00,1.00,-172.80,0.00 +172.80,-4.80,15.23,0.00,1.00,-177.60,-0.00 +177.60,-0.00,15.21,0.00,1.00,177.60,0.00 +-177.60,0.00,15.19,0.00,1.00,172.80,0.00 +-172.80,4.80,15.17,0.00,1.00,172.80,-0.00 +-172.80,9.60,15.15,0.00,1.00,168.00,0.00 +-168.00,14.40,15.12,0.00,1.00,163.20,-0.00 +-163.20,14.40,15.10,0.00,1.00,158.40,0.00 +-163.20,19.20,15.08,0.00,1.00,158.40,-0.00 +-158.40,24.00,15.06,0.00,1.00,153.60,0.00 +-153.60,24.00,15.04,0.00,1.00,148.80,-0.00 +-148.80,28.80,15.02,0.00,1.00,144.00,0.00 +-144.00,33.60,15.00,0.00,1.00,139.20,-0.00 +-139.20,33.60,14.97,0.00,1.00,134.40,0.00 +-134.40,38.40,14.95,0.00,1.00,129.60,-4.80 +-129.60,38.40,14.93,0.00,1.00,124.80,4.80 +-124.80,43.20,14.91,0.00,1.00,115.20,-4.80 +-120.00,43.20,14.89,0.00,1.00,110.40,4.80 +-110.40,48.00,14.87,0.00,1.00,105.60,-4.80 +-105.60,48.00,14.85,0.00,1.00,96.00,4.80 +-100.80,48.00,14.83,0.00,1.00,91.20,-4.80 +-91.20,48.00,14.80,0.00,1.00,86.40,4.80 +-86.40,48.00,14.78,0.00,1.00,76.80,-4.80 +-76.80,48.00,14.76,0.00,1.00,72.00,4.80 +-72.00,48.00,14.74,0.00,1.00,67.20,-4.80 +-62.40,43.20,14.72,0.00,1.00,62.40,4.80 +-57.60,43.20,14.70,0.00,1.00,52.80,-4.80 +-52.80,43.20,14.68,0.00,1.00,48.00,4.80 +-48.00,38.40,14.65,0.00,1.00,43.20,-4.80 +-43.20,38.40,14.63,0.00,1.00,38.40,0.00 +-38.40,33.60,14.61,0.00,1.00,33.60,-0.00 +-33.60,28.80,14.59,0.00,1.00,28.80,0.00 +-28.80,28.80,14.57,0.00,1.00,24.00,-0.00 +-24.00,24.00,14.55,0.00,1.00,24.00,0.00 +-19.20,19.20,14.53,0.00,1.00,19.20,-0.00 +-14.40,19.20,14.50,0.00,1.00,14.40,0.00 +-14.40,14.40,14.48,0.00,1.00,9.60,-0.00 +-9.60,9.60,14.46,0.00,1.00,4.80,0.00 +-4.80,4.80,14.44,0.00,1.00,4.80,-0.00 +-4.80,4.80,14.42,0.00,1.00,0.00,0.00 +0.00,0.00,14.40,0.00,1.00,-4.80,0.00 +4.80,-4.80,14.38,0.00,1.00,-9.60,0.00 +4.80,-9.60,14.36,0.00,1.00,-9.60,-0.00 +9.60,-9.60,14.33,0.00,1.00,-14.40,0.00 +9.60,-14.40,14.31,0.00,1.00,-19.20,-4.80 +14.40,-19.20,14.29,0.00,1.00,-24.00,4.80 +19.20,-24.00,14.27,0.00,1.00,-28.80,-4.80 +24.00,-24.00,14.25,0.00,1.00,-33.60,4.80 +24.00,-28.80,14.23,0.00,1.00,-38.40,-4.80 +28.80,-33.60,14.21,0.00,1.00,-43.20,4.80 +33.60,-38.40,14.18,0.00,1.00,-48.00,-4.80 +38.40,-38.40,14.16,0.00,1.00,-52.80,4.80 +43.20,-43.20,14.14,0.00,1.00,-57.60,-4.80 +48.00,-43.20,14.12,0.00,1.00,-62.40,4.80 +52.80,-48.00,14.10,0.00,1.00,-67.20,-4.80 +62.40,-48.00,14.08,0.00,1.00,-72.00,9.60 +67.20,-52.80,14.06,0.00,1.00,-81.60,-9.60 +76.80,-52.80,14.03,0.00,1.00,-86.40,9.60 +86.40,-52.80,14.01,0.00,1.00,-91.20,-9.60 +91.20,-52.80,13.99,0.00,1.00,-96.00,9.60 +100.80,-52.80,13.97,0.00,1.00,-105.60,-9.60 +105.60,-52.80,13.95,0.00,1.00,-110.40,9.60 +115.20,-48.00,13.93,0.00,1.00,-115.20,-9.60 +120.00,-48.00,13.91,0.00,1.00,-120.00,9.60 +129.60,-48.00,13.89,0.00,1.00,-124.80,-4.80 +134.40,-43.20,13.86,0.00,1.00,-129.60,4.80 +139.20,-43.20,13.84,0.00,1.00,-134.40,-4.80 +144.00,-38.40,13.82,0.00,1.00,-139.20,4.80 +148.80,-33.60,13.80,0.00,1.00,-144.00,-4.80 +153.60,-33.60,13.78,0.00,1.00,-148.80,4.80 +158.40,-28.80,13.76,0.00,1.00,-153.60,-4.80 +158.40,-24.00,13.74,0.00,1.00,-158.40,4.80 +163.20,-19.20,13.71,0.00,1.00,-163.20,-4.80 +168.00,-19.20,13.69,0.00,1.00,-168.00,4.80 +168.00,-14.40,13.67,0.00,1.00,-172.80,-0.00 +172.80,-9.60,13.65,0.00,1.00,-172.80,0.00 +177.60,-4.80,13.63,0.00,1.00,-177.60,-0.00 +177.60,-0.00,13.61,0.00,1.00,177.60,0.00 +-177.60,0.00,13.59,0.00,1.00,172.80,0.00 +-177.60,4.80,13.56,0.00,1.00,172.80,-0.00 +-172.80,9.60,13.54,0.00,1.00,168.00,0.00 +-168.00,14.40,13.52,0.00,1.00,163.20,-0.00 +-168.00,19.20,13.50,0.00,1.00,158.40,4.80 +-163.20,19.20,13.48,0.00,1.00,153.60,-4.80 +-158.40,24.00,13.46,0.00,1.00,148.80,4.80 +-158.40,28.80,13.44,0.00,1.00,144.00,-4.80 +-153.60,33.60,13.42,0.00,1.00,139.20,4.80 +-148.80,33.60,13.39,0.00,1.00,134.40,-4.80 +-144.00,38.40,13.37,0.00,1.00,129.60,4.80 +-139.20,43.20,13.35,0.00,1.00,124.80,-4.80 +-134.40,43.20,13.33,0.00,1.00,120.00,4.80 +-129.60,48.00,13.31,0.00,1.00,115.20,-4.80 +-120.00,48.00,13.29,0.00,1.00,110.40,9.60 +-115.20,48.00,13.27,0.00,1.00,105.60,-9.60 +-105.60,52.80,13.24,0.00,1.00,96.00,9.60 +-100.80,52.80,13.22,0.00,1.00,91.20,-9.60 +-91.20,52.80,13.20,0.00,1.00,86.40,9.60 +-86.40,52.80,13.18,0.00,1.00,81.60,-9.60 +-76.80,52.80,13.16,0.00,1.00,72.00,9.60 +-67.20,52.80,13.14,0.00,1.00,67.20,-9.60 +-62.40,48.00,13.12,0.00,1.00,62.40,9.60 +-52.80,48.00,13.09,0.00,1.00,57.60,-4.80 +-48.00,43.20,13.07,0.00,1.00,52.80,4.80 +-43.20,43.20,13.05,0.00,1.00,48.00,-4.80 +-38.40,38.40,13.03,0.00,1.00,43.20,4.80 +-33.60,38.40,13.01,0.00,1.00,38.40,-4.80 +-28.80,33.60,12.99,0.00,1.00,33.60,4.80 +-24.00,28.80,12.97,0.00,1.00,28.80,-4.80 +-24.00,24.00,12.95,0.00,1.00,24.00,4.80 +-19.20,24.00,12.92,0.00,1.00,19.20,-4.80 +-14.40,19.20,12.90,0.00,1.00,14.40,4.80 +-9.60,14.40,12.88,0.00,1.00,9.60,-4.80 +-9.60,9.60,12.86,0.00,1.00,9.60,0.00 +-4.80,9.60,12.84,0.00,1.00,4.80,-0.00 +-4.80,4.80,12.82,0.00,1.00,0.00,0.00 +0.00,0.00,12.80,0.00,1.00,-4.80,0.00 +4.80,-4.80,12.77,0.00,1.00,-9.60,0.00 +4.80,-9.60,12.75,0.00,1.00,-14.40,-0.00 +9.60,-14.40,12.73,0.00,1.00,-14.40,4.80 +9.60,-14.40,12.71,0.00,1.00,-19.20,-4.80 +14.40,-19.20,12.69,0.00,1.00,-24.00,4.80 +14.40,-24.00,12.67,0.00,1.00,-28.80,-4.80 +19.20,-28.80,12.65,0.00,1.00,-33.60,4.80 +24.00,-33.60,12.62,0.00,1.00,-38.40,-9.60 +28.80,-33.60,12.60,0.00,1.00,-43.20,9.60 +28.80,-38.40,12.58,0.00,1.00,-48.00,-9.60 +33.60,-43.20,12.56,0.00,1.00,-52.80,9.60 +38.40,-43.20,12.54,0.00,1.00,-57.60,-9.60 +48.00,-48.00,12.52,0.00,1.00,-62.40,9.60 +52.80,-52.80,12.50,0.00,1.00,-67.20,-9.60 +57.60,-52.80,12.48,0.00,1.00,-72.00,9.60 +67.20,-57.60,12.45,0.00,1.00,-81.60,-14.40 +76.80,-57.60,12.43,0.00,1.00,-86.40,14.40 +81.60,-57.60,12.41,0.00,1.00,-91.20,-14.40 +91.20,-57.60,12.39,0.00,1.00,-96.00,14.40 +100.80,-57.60,12.37,0.00,1.00,-100.80,-14.40 +110.40,-57.60,12.35,0.00,1.00,-110.40,14.40 +115.20,-52.80,12.33,0.00,1.00,-115.20,-14.40 +124.80,-52.80,12.30,0.00,1.00,-120.00,9.60 +129.60,-48.00,12.28,0.00,1.00,-124.80,-9.60 +139.20,-48.00,12.26,0.00,1.00,-129.60,9.60 +144.00,-43.20,12.24,0.00,1.00,-134.40,-9.60 +148.80,-38.40,12.22,0.00,1.00,-139.20,9.60 +153.60,-38.40,12.20,0.00,1.00,-144.00,-9.60 +153.60,-33.60,12.18,0.00,1.00,-148.80,9.60 +158.40,-28.80,12.15,0.00,1.00,-153.60,-9.60 +163.20,-24.00,12.13,0.00,1.00,-158.40,4.80 +163.20,-24.00,12.11,0.00,1.00,-163.20,-4.80 +168.00,-19.20,12.09,0.00,1.00,-168.00,4.80 +172.80,-14.40,12.07,0.00,1.00,-168.00,-4.80 +172.80,-9.60,12.05,0.00,1.00,-172.80,4.80 +177.60,-4.80,12.03,0.00,1.00,-177.60,-0.00 +177.60,-0.00,12.01,0.00,1.00,177.60,0.00 +-177.60,0.00,11.98,0.00,1.00,172.80,0.00 +-177.60,4.80,11.96,0.00,1.00,168.00,-0.00 +-172.80,9.60,11.94,0.00,1.00,168.00,4.80 +-172.80,14.40,11.92,0.00,1.00,163.20,-4.80 +-168.00,19.20,11.90,0.00,1.00,158.40,4.80 +-163.20,24.00,11.88,0.00,1.00,153.60,-4.80 +-163.20,24.00,11.86,0.00,1.00,148.80,4.80 +-158.40,28.80,11.83,0.00,1.00,144.00,-9.60 +-153.60,33.60,11.81,0.00,1.00,139.20,9.60 +-153.60,38.40,11.79,0.00,1.00,134.40,-9.60 +-148.80,38.40,11.77,0.00,1.00,129.60,9.60 +-144.00,43.20,11.75,0.00,1.00,124.80,-9.60 +-139.20,48.00,11.73,0.00,1.00,120.00,9.60 +-129.60,48.00,11.71,0.00,1.00,115.20,-9.60 +-124.80,52.80,11.68,0.00,1.00,110.40,9.60 +-115.20,52.80,11.66,0.00,1.00,100.80,-14.40 +-110.40,57.60,11.64,0.00,1.00,96.00,14.40 +-100.80,57.60,11.62,0.00,1.00,91.20,-14.40 +-91.20,57.60,11.60,0.00,1.00,86.40,14.40 +-81.60,57.60,11.58,0.00,1.00,81.60,-14.40 +-76.80,57.60,11.56,0.00,1.00,72.00,14.40 +-67.20,57.60,11.54,0.00,1.00,67.20,-14.40 +-57.60,52.80,11.51,0.00,1.00,62.40,9.60 +-52.80,52.80,11.49,0.00,1.00,57.60,-9.60 +-48.00,48.00,11.47,0.00,1.00,52.80,9.60 +-38.40,43.20,11.45,0.00,1.00,48.00,-9.60 +-33.60,43.20,11.43,0.00,1.00,43.20,9.60 +-28.80,38.40,11.41,0.00,1.00,38.40,-9.60 +-28.80,33.60,11.39,0.00,1.00,33.60,9.60 +-24.00,33.60,11.36,0.00,1.00,28.80,-9.60 +-19.20,28.80,11.34,0.00,1.00,24.00,4.80 +-14.40,24.00,11.32,0.00,1.00,19.20,-4.80 +-14.40,19.20,11.30,0.00,1.00,14.40,4.80 +-9.60,14.40,11.28,0.00,1.00,14.40,-4.80 +-9.60,14.40,11.26,0.00,1.00,9.60,4.80 +-4.80,9.60,11.24,0.00,1.00,4.80,-0.00 +-4.80,4.80,11.21,0.00,1.00,0.00,0.00 +0.00,0.00,11.19,0.00,1.00,-4.80,0.00 +0.00,-4.80,11.17,0.00,1.00,-9.60,0.00 +4.80,-9.60,11.15,0.00,1.00,-14.40,-4.80 +4.80,-14.40,11.13,0.00,1.00,-19.20,4.80 +9.60,-19.20,11.11,0.00,1.00,-19.20,-4.80 +9.60,-19.20,11.09,0.00,1.00,-24.00,4.80 +14.40,-24.00,11.07,0.00,1.00,-28.80,-9.60 +19.20,-28.80,11.04,0.00,1.00,-33.60,9.60 +19.20,-33.60,11.02,0.00,1.00,-38.40,-9.60 +24.00,-38.40,11.00,0.00,1.00,-43.20,9.60 +28.80,-43.20,10.98,0.00,1.00,-48.00,-14.40 +33.60,-43.20,10.96,0.00,1.00,-52.80,14.40 +38.40,-48.00,10.94,0.00,1.00,-57.60,-14.40 +43.20,-52.80,10.92,0.00,1.00,-62.40,14.40 +48.00,-52.80,10.89,0.00,1.00,-72.00,-14.40 +52.80,-57.60,10.87,0.00,1.00,-76.80,14.40 +62.40,-57.60,10.85,0.00,1.00,-81.60,-19.20 +72.00,-62.40,10.83,0.00,1.00,-86.40,19.20 +81.60,-62.40,10.81,0.00,1.00,-91.20,-19.20 +91.20,-62.40,10.79,0.00,1.00,-96.00,19.20 +100.80,-62.40,10.77,0.00,1.00,-100.80,-19.20 +110.40,-62.40,10.74,0.00,1.00,-105.60,19.20 +120.00,-57.60,10.72,0.00,1.00,-115.20,-14.40 +129.60,-57.60,10.70,0.00,1.00,-120.00,14.40 +134.40,-52.80,10.68,0.00,1.00,-124.80,-14.40 +139.20,-48.00,10.66,0.00,1.00,-129.60,14.40 +144.00,-48.00,10.64,0.00,1.00,-134.40,-14.40 +148.80,-43.20,10.62,0.00,1.00,-139.20,14.40 +153.60,-38.40,10.60,0.00,1.00,-144.00,-14.40 +158.40,-33.60,10.57,0.00,1.00,-148.80,9.60 +163.20,-33.60,10.55,0.00,1.00,-153.60,-9.60 +163.20,-28.80,10.53,0.00,1.00,-158.40,9.60 +168.00,-24.00,10.51,0.00,1.00,-163.20,-9.60 +168.00,-19.20,10.49,0.00,1.00,-163.20,4.80 +172.80,-14.40,10.47,0.00,1.00,-168.00,-4.80 +172.80,-9.60,10.45,0.00,1.00,-172.80,4.80 +177.60,-4.80,10.42,0.00,1.00,-177.60,-0.00 +177.60,-0.00,10.40,0.00,1.00,177.60,0.00 +-177.60,0.00,10.38,0.00,1.00,172.80,0.00 +-177.60,4.80,10.36,0.00,1.00,168.00,-0.00 +-172.80,9.60,10.34,0.00,1.00,163.20,4.80 +-172.80,14.40,10.32,0.00,1.00,163.20,-4.80 +-168.00,19.20,10.30,0.00,1.00,158.40,4.80 +-168.00,24.00,10.28,0.00,1.00,153.60,-9.60 +-163.20,28.80,10.25,0.00,1.00,148.80,9.60 +-163.20,33.60,10.23,0.00,1.00,144.00,-9.60 +-158.40,33.60,10.21,0.00,1.00,139.20,9.60 +-153.60,38.40,10.19,0.00,1.00,134.40,-14.40 +-148.80,43.20,10.17,0.00,1.00,129.60,14.40 +-144.00,48.00,10.15,0.00,1.00,124.80,-14.40 +-139.20,48.00,10.13,0.00,1.00,120.00,14.40 +-134.40,52.80,10.10,0.00,1.00,115.20,-14.40 +-129.60,57.60,10.08,0.00,1.00,105.60,14.40 +-120.00,57.60,10.06,0.00,1.00,100.80,-14.40 +-110.40,62.40,10.04,0.00,1.00,96.00,19.20 +-100.80,62.40,10.02,0.00,1.00,91.20,-19.20 +-91.20,62.40,10.00,0.00,1.00,86.40,19.20 +-81.60,62.40,9.98,0.00,1.00,81.60,-19.20 +-72.00,62.40,9.95,0.00,1.00,76.80,19.20 +-62.40,57.60,9.93,0.00,1.00,72.00,-19.20 +-52.80,57.60,9.91,0.00,1.00,62.40,14.40 +-48.00,52.80,9.89,0.00,1.00,57.60,-14.40 +-43.20,52.80,9.87,0.00,1.00,52.80,14.40 +-38.40,48.00,9.85,0.00,1.00,48.00,-14.40 +-33.60,43.20,9.83,0.00,1.00,43.20,14.40 +-28.80,43.20,9.81,0.00,1.00,38.40,-14.40 +-24.00,38.40,9.78,0.00,1.00,33.60,9.60 +-19.20,33.60,9.76,0.00,1.00,28.80,-9.60 +-19.20,28.80,9.74,0.00,1.00,24.00,9.60 +-14.40,24.00,9.72,0.00,1.00,19.20,-9.60 +-9.60,19.20,9.70,0.00,1.00,19.20,4.80 +-9.60,19.20,9.68,0.00,1.00,14.40,-4.80 +-4.80,14.40,9.66,0.00,1.00,9.60,4.80 +-4.80,9.60,9.63,0.00,1.00,4.80,-4.80 +-0.00,4.80,9.61,0.00,1.00,0.00,0.00 +0.00,0.00,9.59,0.00,1.00,-4.80,0.00 +0.00,-4.80,9.57,0.00,1.00,-9.60,0.00 +4.80,-9.60,9.55,0.00,1.00,-14.40,-4.80 +4.80,-14.40,9.53,0.00,1.00,-19.20,4.80 +9.60,-19.20,9.51,0.00,1.00,-24.00,-4.80 +9.60,-24.00,9.48,0.00,1.00,-28.80,9.60 +14.40,-24.00,9.46,0.00,1.00,-33.60,-9.60 +14.40,-28.80,9.44,0.00,1.00,-33.60,14.40 +19.20,-33.60,9.42,0.00,1.00,-38.40,-14.40 +19.20,-38.40,9.40,0.00,1.00,-43.20,14.40 +24.00,-43.20,9.38,0.00,1.00,-48.00,-14.40 +28.80,-48.00,9.36,0.00,1.00,-57.60,19.20 +33.60,-52.80,9.34,0.00,1.00,-62.40,-19.20 +38.40,-52.80,9.31,0.00,1.00,-67.20,19.20 +43.20,-57.60,9.29,0.00,1.00,-72.00,-19.20 +48.00,-62.40,9.27,0.00,1.00,-76.80,19.20 +57.60,-62.40,9.25,0.00,1.00,-81.60,-19.20 +67.20,-67.20,9.23,0.00,1.00,-86.40,24.00 +81.60,-67.20,9.21,0.00,1.00,-91.20,-24.00 +91.20,-67.20,9.19,0.00,1.00,-96.00,24.00 +105.60,-67.20,9.16,0.00,1.00,-100.80,-24.00 +115.20,-67.20,9.14,0.00,1.00,-105.60,24.00 +124.80,-62.40,9.12,0.00,1.00,-110.40,-19.20 +134.40,-57.60,9.10,0.00,1.00,-115.20,19.20 +139.20,-57.60,9.08,0.00,1.00,-120.00,-19.20 +144.00,-52.80,9.06,0.00,1.00,-129.60,19.20 +148.80,-48.00,9.04,0.00,1.00,-134.40,-19.20 +153.60,-43.20,9.01,0.00,1.00,-139.20,19.20 +158.40,-43.20,8.99,0.00,1.00,-144.00,-14.40 +163.20,-38.40,8.97,0.00,1.00,-148.80,14.40 +163.20,-33.60,8.95,0.00,1.00,-148.80,-14.40 +168.00,-28.80,8.93,0.00,1.00,-153.60,9.60 +168.00,-24.00,8.91,0.00,1.00,-158.40,-9.60 +172.80,-19.20,8.89,0.00,1.00,-163.20,9.60 +172.80,-14.40,8.87,0.00,1.00,-168.00,-4.80 +177.60,-9.60,8.84,0.00,1.00,-172.80,4.80 +177.60,-4.80,8.82,0.00,1.00,-177.60,-4.80 +177.60,-0.00,8.80,0.00,1.00,177.60,0.00 +-177.60,0.00,8.78,0.00,1.00,172.80,0.00 +-177.60,4.80,8.76,0.00,1.00,168.00,-4.80 +-177.60,9.60,8.74,0.00,1.00,163.20,4.80 +-172.80,14.40,8.72,0.00,1.00,158.40,-4.80 +-172.80,19.20,8.69,0.00,1.00,153.60,9.60 +-168.00,24.00,8.67,0.00,1.00,148.80,-9.60 +-168.00,28.80,8.65,0.00,1.00,148.80,9.60 +-163.20,33.60,8.63,0.00,1.00,144.00,-14.40 +-163.20,38.40,8.61,0.00,1.00,139.20,14.40 +-158.40,43.20,8.59,0.00,1.00,134.40,-14.40 +-153.60,43.20,8.57,0.00,1.00,129.60,19.20 +-148.80,48.00,8.54,0.00,1.00,120.00,-19.20 +-144.00,52.80,8.52,0.00,1.00,115.20,19.20 +-139.20,57.60,8.50,0.00,1.00,110.40,-19.20 +-134.40,57.60,8.48,0.00,1.00,105.60,19.20 +-124.80,62.40,8.46,0.00,1.00,100.80,-19.20 +-115.20,67.20,8.44,0.00,1.00,96.00,24.00 +-105.60,67.20,8.42,0.00,1.00,91.20,-24.00 +-91.20,67.20,8.40,0.00,1.00,86.40,24.00 +-81.60,67.20,8.37,0.00,1.00,81.60,-24.00 +-67.20,67.20,8.35,0.00,1.00,76.80,24.00 +-57.60,62.40,8.33,0.00,1.00,72.00,-19.20 +-48.00,62.40,8.31,0.00,1.00,67.20,19.20 +-43.20,57.60,8.29,0.00,1.00,62.40,-19.20 +-38.40,52.80,8.27,0.00,1.00,57.60,19.20 +-33.60,52.80,8.25,0.00,1.00,48.00,-19.20 +-28.80,48.00,8.22,0.00,1.00,43.20,19.20 +-24.00,43.20,8.20,0.00,1.00,38.40,-14.40 +-19.20,38.40,8.18,0.00,1.00,33.60,14.40 +-19.20,33.60,8.16,0.00,1.00,33.60,-14.40 +-14.40,28.80,8.14,0.00,1.00,28.80,14.40 +-14.40,24.00,8.12,0.00,1.00,24.00,-9.60 +-9.60,24.00,8.10,0.00,1.00,19.20,9.60 +-9.60,19.20,8.07,0.00,1.00,14.40,-4.80 +-4.80,14.40,8.05,0.00,1.00,9.60,4.80 +-4.80,9.60,8.03,0.00,1.00,4.80,-4.80 +-0.00,4.80,8.01,0.00,1.00,0.00,0.00 +0.00,0.00,7.99,0.00,1.00,-4.80,0.00 +0.00,-4.80,7.97,0.00,1.00,-9.60,0.00 +4.80,-9.60,7.95,0.00,1.00,-14.40,-4.80 +4.80,-14.40,7.93,0.00,1.00,-19.20,4.80 +4.80,-19.20,7.90,0.00,1.00,-24.00,-9.60 +9.60,-24.00,7.88,0.00,1.00,-28.80,9.60 +9.60,-28.80,7.86,0.00,1.00,-33.60,-14.40 +9.60,-33.60,7.84,0.00,1.00,-38.40,14.40 +14.40,-38.40,7.82,0.00,1.00,-43.20,-14.40 +14.40,-38.40,7.80,0.00,1.00,-48.00,19.20 +19.20,-43.20,7.78,0.00,1.00,-52.80,-19.20 +24.00,-48.00,7.75,0.00,1.00,-57.60,19.20 +24.00,-52.80,7.73,0.00,1.00,-62.40,-24.00 +28.80,-57.60,7.71,0.00,1.00,-67.20,24.00 +38.40,-62.40,7.69,0.00,1.00,-72.00,-24.00 +43.20,-62.40,7.67,0.00,1.00,-76.80,24.00 +52.80,-67.20,7.65,0.00,1.00,-81.60,-24.00 +62.40,-72.00,7.63,0.00,1.00,-86.40,28.80 +76.80,-72.00,7.60,0.00,1.00,-91.20,-28.80 +96.00,-72.00,7.58,0.00,1.00,-96.00,28.80 +110.40,-72.00,7.56,0.00,1.00,-100.80,-28.80 +120.00,-67.20,7.54,0.00,1.00,-105.60,28.80 +134.40,-67.20,7.52,0.00,1.00,-110.40,-24.00 +139.20,-62.40,7.50,0.00,1.00,-115.20,24.00 +148.80,-57.60,7.48,0.00,1.00,-120.00,-24.00 +153.60,-57.60,7.46,0.00,1.00,-124.80,24.00 +158.40,-52.80,7.43,0.00,1.00,-129.60,-24.00 +158.40,-48.00,7.41,0.00,1.00,-134.40,19.20 +163.20,-43.20,7.39,0.00,1.00,-139.20,-19.20 +163.20,-38.40,7.37,0.00,1.00,-144.00,19.20 +168.00,-33.60,7.35,0.00,1.00,-148.80,-14.40 +168.00,-28.80,7.33,0.00,1.00,-153.60,14.40 +172.80,-24.00,7.31,0.00,1.00,-158.40,-9.60 +172.80,-19.20,7.28,0.00,1.00,-163.20,9.60 +172.80,-14.40,7.26,0.00,1.00,-168.00,-9.60 +177.60,-9.60,7.24,0.00,1.00,-172.80,4.80 +177.60,-4.80,7.22,0.00,1.00,-177.60,-4.80 +177.60,-0.00,7.20,0.00,1.00,177.60,0.00 +-177.60,0.00,7.18,0.00,1.00,172.80,0.00 +-177.60,4.80,7.16,0.00,1.00,168.00,-4.80 +-177.60,9.60,7.13,0.00,1.00,163.20,4.80 +-172.80,14.40,7.11,0.00,1.00,158.40,-9.60 +-172.80,19.20,7.09,0.00,1.00,153.60,9.60 +-172.80,24.00,7.07,0.00,1.00,148.80,-9.60 +-168.00,28.80,7.05,0.00,1.00,144.00,14.40 +-168.00,33.60,7.03,0.00,1.00,139.20,-14.40 +-163.20,38.40,7.01,0.00,1.00,134.40,19.20 +-163.20,43.20,6.99,0.00,1.00,129.60,-19.20 +-158.40,48.00,6.96,0.00,1.00,124.80,19.20 +-158.40,52.80,6.94,0.00,1.00,120.00,-24.00 +-153.60,57.60,6.92,0.00,1.00,115.20,24.00 +-148.80,57.60,6.90,0.00,1.00,110.40,-24.00 +-139.20,62.40,6.88,0.00,1.00,105.60,24.00 +-134.40,67.20,6.86,0.00,1.00,100.80,-24.00 +-120.00,67.20,6.84,0.00,1.00,96.00,28.80 +-110.40,72.00,6.81,0.00,1.00,91.20,-28.80 +-96.00,72.00,6.79,0.00,1.00,86.40,28.80 +-76.80,72.00,6.77,0.00,1.00,81.60,-28.80 +-62.40,72.00,6.75,0.00,1.00,76.80,28.80 +-52.80,67.20,6.73,0.00,1.00,72.00,-24.00 +-43.20,62.40,6.71,0.00,1.00,67.20,24.00 +-38.40,62.40,6.69,0.00,1.00,62.40,-24.00 +-28.80,57.60,6.66,0.00,1.00,57.60,24.00 +-24.00,52.80,6.64,0.00,1.00,52.80,-24.00 +-24.00,48.00,6.62,0.00,1.00,48.00,19.20 +-19.20,43.20,6.60,0.00,1.00,43.20,-19.20 +-14.40,38.40,6.58,0.00,1.00,38.40,19.20 +-14.40,38.40,6.56,0.00,1.00,33.60,-14.40 +-9.60,33.60,6.54,0.00,1.00,28.80,14.40 +-9.60,28.80,6.52,0.00,1.00,24.00,-14.40 +-9.60,24.00,6.49,0.00,1.00,19.20,9.60 +-4.80,19.20,6.47,0.00,1.00,14.40,-9.60 +-4.80,14.40,6.45,0.00,1.00,9.60,4.80 +-4.80,9.60,6.43,0.00,1.00,4.80,-4.80 +-0.00,4.80,6.41,0.00,1.00,0.00,0.00 +0.00,0.00,6.39,0.00,1.00,-4.80,0.00 +0.00,-4.80,6.37,0.00,1.00,-9.60,4.80 +0.00,-9.60,6.34,0.00,1.00,-14.40,-4.80 +4.80,-14.40,6.32,0.00,1.00,-19.20,9.60 +4.80,-19.20,6.30,0.00,1.00,-24.00,-9.60 +4.80,-24.00,6.28,0.00,1.00,-28.80,14.40 +4.80,-28.80,6.26,0.00,1.00,-33.60,-14.40 +9.60,-33.60,6.24,0.00,1.00,-38.40,19.20 +9.60,-38.40,6.22,0.00,1.00,-43.20,-19.20 +14.40,-43.20,6.19,0.00,1.00,-48.00,19.20 +14.40,-48.00,6.17,0.00,1.00,-52.80,-24.00 +14.40,-52.80,6.15,0.00,1.00,-57.60,24.00 +19.20,-57.60,6.13,0.00,1.00,-62.40,-28.80 +24.00,-57.60,6.11,0.00,1.00,-67.20,28.80 +28.80,-62.40,6.09,0.00,1.00,-72.00,-28.80 +33.60,-67.20,6.07,0.00,1.00,-76.80,28.80 +43.20,-72.00,6.05,0.00,1.00,-81.60,-28.80 +57.60,-72.00,6.02,0.00,1.00,-86.40,33.60 +76.80,-76.80,6.00,0.00,1.00,-91.20,-33.60 +96.00,-76.80,5.98,0.00,1.00,-96.00,33.60 +115.20,-76.80,5.96,0.00,1.00,-100.80,-33.60 +129.60,-72.00,5.94,0.00,1.00,-105.60,28.80 +139.20,-72.00,5.92,0.00,1.00,-110.40,-28.80 +148.80,-67.20,5.90,0.00,1.00,-115.20,28.80 +153.60,-62.40,5.87,0.00,1.00,-120.00,-28.80 +158.40,-57.60,5.85,0.00,1.00,-124.80,28.80 +163.20,-52.80,5.83,0.00,1.00,-129.60,-24.00 +163.20,-48.00,5.81,0.00,1.00,-134.40,24.00 +168.00,-43.20,5.79,0.00,1.00,-139.20,-24.00 +168.00,-38.40,5.77,0.00,1.00,-144.00,19.20 +172.80,-33.60,5.75,0.00,1.00,-148.80,-19.20 +172.80,-28.80,5.72,0.00,1.00,-153.60,14.40 +172.80,-24.00,5.70,0.00,1.00,-158.40,-14.40 +172.80,-19.20,5.68,0.00,1.00,-163.20,9.60 +177.60,-14.40,5.66,0.00,1.00,-168.00,-9.60 +177.60,-9.60,5.64,0.00,1.00,-172.80,4.80 +177.60,-4.80,5.62,0.00,1.00,-177.60,-4.80 +177.60,-0.00,5.60,0.00,1.00,177.60,0.00 +-177.60,0.00,5.58,0.00,1.00,172.80,0.00 +-177.60,4.80,5.55,0.00,1.00,168.00,-4.80 +-177.60,9.60,5.53,0.00,1.00,163.20,4.80 +-177.60,14.40,5.51,0.00,1.00,158.40,-9.60 +-172.80,19.20,5.49,0.00,1.00,153.60,9.60 +-172.80,24.00,5.47,0.00,1.00,148.80,-14.40 +-172.80,28.80,5.45,0.00,1.00,144.00,14.40 +-172.80,33.60,5.43,0.00,1.00,139.20,-19.20 +-168.00,38.40,5.40,0.00,1.00,134.40,19.20 +-168.00,43.20,5.38,0.00,1.00,129.60,-24.00 +-163.20,48.00,5.36,0.00,1.00,124.80,24.00 +-163.20,52.80,5.34,0.00,1.00,120.00,-24.00 +-158.40,57.60,5.32,0.00,1.00,115.20,28.80 +-153.60,62.40,5.30,0.00,1.00,110.40,-28.80 +-148.80,67.20,5.28,0.00,1.00,105.60,28.80 +-139.20,72.00,5.26,0.00,1.00,100.80,-28.80 +-129.60,72.00,5.23,0.00,1.00,96.00,28.80 +-115.20,76.80,5.21,0.00,1.00,91.20,-33.60 +-96.00,76.80,5.19,0.00,1.00,86.40,33.60 +-76.80,76.80,5.17,0.00,1.00,81.60,-33.60 +-57.60,72.00,5.15,0.00,1.00,76.80,33.60 +-43.20,72.00,5.13,0.00,1.00,72.00,-28.80 +-33.60,67.20,5.11,0.00,1.00,67.20,28.80 +-28.80,62.40,5.08,0.00,1.00,62.40,-28.80 +-24.00,57.60,5.06,0.00,1.00,57.60,28.80 +-19.20,57.60,5.04,0.00,1.00,52.80,-28.80 +-14.40,52.80,5.02,0.00,1.00,48.00,24.00 +-14.40,48.00,5.00,0.00,1.00,43.20,-24.00 +-14.40,43.20,4.98,0.00,1.00,38.40,19.20 +-9.60,38.40,4.96,0.00,1.00,33.60,-19.20 +-9.60,33.60,4.93,0.00,1.00,28.80,19.20 +-4.80,28.80,4.91,0.00,1.00,24.00,-14.40 +-4.80,24.00,4.89,0.00,1.00,19.20,14.40 +-4.80,19.20,4.87,0.00,1.00,14.40,-9.60 +-4.80,14.40,4.85,0.00,1.00,9.60,9.60 +-0.00,9.60,4.83,0.00,1.00,4.80,-4.80 +-0.00,4.80,4.81,0.00,1.00,0.00,4.80 +0.00,0.00,4.79,0.00,1.00,-4.80,0.00 +0.00,-4.80,4.76,0.00,1.00,-9.60,4.80 +0.00,-9.60,4.74,0.00,1.00,-14.40,-4.80 +0.00,-14.40,4.72,0.00,1.00,-19.20,9.60 +4.80,-19.20,4.70,0.00,1.00,-24.00,-9.60 +4.80,-24.00,4.68,0.00,1.00,-28.80,14.40 +4.80,-28.80,4.66,0.00,1.00,-33.60,-14.40 +4.80,-33.60,4.64,0.00,1.00,-38.40,19.20 +4.80,-38.40,4.61,0.00,1.00,-43.20,-24.00 +9.60,-43.20,4.59,0.00,1.00,-48.00,24.00 +9.60,-48.00,4.57,0.00,1.00,-52.80,-24.00 +9.60,-52.80,4.55,0.00,1.00,-57.60,28.80 +14.40,-57.60,4.53,0.00,1.00,-62.40,-28.80 +14.40,-62.40,4.51,0.00,1.00,-67.20,33.60 +19.20,-67.20,4.49,0.00,1.00,-72.00,-33.60 +24.00,-72.00,4.46,0.00,1.00,-76.80,33.60 +33.60,-72.00,4.44,0.00,1.00,-81.60,-33.60 +43.20,-76.80,4.42,0.00,1.00,-86.40,38.40 +67.20,-81.60,4.40,0.00,1.00,-91.20,-38.40 +96.00,-81.60,4.38,0.00,1.00,-96.00,38.40 +124.80,-81.60,4.36,0.00,1.00,-100.80,-38.40 +144.00,-76.80,4.34,0.00,1.00,-105.60,33.60 +153.60,-72.00,4.32,0.00,1.00,-110.40,-33.60 +158.40,-67.20,4.29,0.00,1.00,-115.20,33.60 +163.20,-62.40,4.27,0.00,1.00,-120.00,-33.60 +168.00,-57.60,4.25,0.00,1.00,-124.80,28.80 +168.00,-52.80,4.23,0.00,1.00,-129.60,-28.80 +168.00,-48.00,4.21,0.00,1.00,-134.40,28.80 +172.80,-43.20,4.19,0.00,1.00,-139.20,-24.00 +172.80,-38.40,4.17,0.00,1.00,-144.00,24.00 +172.80,-33.60,4.14,0.00,1.00,-148.80,-19.20 +172.80,-28.80,4.12,0.00,1.00,-153.60,19.20 +177.60,-24.00,4.10,0.00,1.00,-158.40,-14.40 +177.60,-19.20,4.08,0.00,1.00,-163.20,14.40 +177.60,-14.40,4.06,0.00,1.00,-168.00,-9.60 +177.60,-9.60,4.04,0.00,1.00,-172.80,4.80 +177.60,-4.80,4.02,0.00,1.00,-177.60,-4.80 +177.60,-0.00,3.99,0.00,1.00,177.60,0.00 +-177.60,0.00,3.97,0.00,1.00,172.80,0.00 +-177.60,4.80,3.95,0.00,1.00,168.00,-4.80 +-177.60,9.60,3.93,0.00,1.00,163.20,4.80 +-177.60,14.40,3.91,0.00,1.00,158.40,-9.60 +-177.60,19.20,3.89,0.00,1.00,153.60,14.40 +-177.60,24.00,3.87,0.00,1.00,148.80,-14.40 +-172.80,28.80,3.85,0.00,1.00,144.00,19.20 +-172.80,33.60,3.82,0.00,1.00,139.20,-19.20 +-172.80,38.40,3.80,0.00,1.00,134.40,24.00 +-172.80,43.20,3.78,0.00,1.00,129.60,-24.00 +-168.00,48.00,3.76,0.00,1.00,124.80,28.80 +-168.00,52.80,3.74,0.00,1.00,120.00,-28.80 +-168.00,57.60,3.72,0.00,1.00,115.20,28.80 +-163.20,62.40,3.70,0.00,1.00,110.40,-33.60 +-158.40,67.20,3.67,0.00,1.00,105.60,33.60 +-153.60,72.00,3.65,0.00,1.00,100.80,-33.60 +-144.00,76.80,3.63,0.00,1.00,96.00,33.60 +-124.80,81.60,3.61,0.00,1.00,91.20,-38.40 +-96.00,81.60,3.59,0.00,1.00,86.40,38.40 +-67.20,81.60,3.57,0.00,1.00,81.60,-38.40 +-43.20,76.80,3.55,0.00,1.00,76.80,38.40 +-33.60,72.00,3.52,0.00,1.00,72.00,-33.60 +-24.00,72.00,3.50,0.00,1.00,67.20,33.60 +-19.20,67.20,3.48,0.00,1.00,62.40,-33.60 +-14.40,62.40,3.46,0.00,1.00,57.60,33.60 +-14.40,57.60,3.44,0.00,1.00,52.80,-28.80 +-9.60,52.80,3.42,0.00,1.00,48.00,28.80 +-9.60,48.00,3.40,0.00,1.00,43.20,-24.00 +-9.60,43.20,3.38,0.00,1.00,38.40,24.00 +-4.80,38.40,3.35,0.00,1.00,33.60,-24.00 +-4.80,33.60,3.33,0.00,1.00,28.80,19.20 +-4.80,28.80,3.31,0.00,1.00,24.00,-14.40 +-4.80,24.00,3.29,0.00,1.00,19.20,14.40 +-4.80,19.20,3.27,0.00,1.00,14.40,-9.60 +-0.00,14.40,3.25,0.00,1.00,9.60,9.60 +-0.00,9.60,3.23,0.00,1.00,4.80,-4.80 +-0.00,4.80,3.20,0.00,1.00,0.00,4.80 +0.00,0.00,3.18,0.00,1.00,-4.80,0.00 +0.00,-4.80,3.16,0.00,1.00,-9.60,4.80 +0.00,-9.60,3.14,0.00,1.00,-14.40,-4.80 +0.00,-14.40,3.12,0.00,1.00,-19.20,9.60 +0.00,-19.20,3.10,0.00,1.00,-24.00,-14.40 +0.00,-24.00,3.08,0.00,1.00,-28.80,14.40 +0.00,-28.80,3.05,0.00,1.00,-33.60,-19.20 +0.00,-33.60,3.03,0.00,1.00,-38.40,19.20 +4.80,-38.40,3.01,0.00,1.00,-43.20,-24.00 +4.80,-43.20,2.99,0.00,1.00,-48.00,28.80 +4.80,-48.00,2.97,0.00,1.00,-52.80,-28.80 +4.80,-52.80,2.95,0.00,1.00,-57.60,33.60 +4.80,-57.60,2.93,0.00,1.00,-62.40,-33.60 +4.80,-62.40,2.91,0.00,1.00,-67.20,33.60 +9.60,-67.20,2.88,0.00,1.00,-72.00,-38.40 +9.60,-72.00,2.86,0.00,1.00,-76.80,38.40 +14.40,-76.80,2.84,0.00,1.00,-81.60,-38.40 +24.00,-81.60,2.82,0.00,1.00,-86.40,43.20 +43.20,-86.40,2.80,0.00,1.00,-91.20,-43.20 +110.40,-86.40,2.78,0.00,1.00,-96.00,43.20 +148.80,-81.60,2.76,0.00,1.00,-100.80,-43.20 +163.20,-76.80,2.73,0.00,1.00,-105.60,38.40 +168.00,-72.00,2.71,0.00,1.00,-110.40,-38.40 +172.80,-67.20,2.69,0.00,1.00,-115.20,38.40 +172.80,-62.40,2.67,0.00,1.00,-120.00,-38.40 +172.80,-57.60,2.65,0.00,1.00,-124.80,33.60 +172.80,-52.80,2.63,0.00,1.00,-129.60,-33.60 +177.60,-48.00,2.61,0.00,1.00,-134.40,28.80 +177.60,-43.20,2.58,0.00,1.00,-139.20,-28.80 +177.60,-38.40,2.56,0.00,1.00,-144.00,24.00 +177.60,-33.60,2.54,0.00,1.00,-148.80,-24.00 +177.60,-28.80,2.52,0.00,1.00,-153.60,19.20 +177.60,-24.00,2.50,0.00,1.00,-158.40,-19.20 +177.60,-19.20,2.48,0.00,1.00,-163.20,14.40 +177.60,-14.40,2.46,0.00,1.00,-168.00,-9.60 +177.60,-9.60,2.44,0.00,1.00,-172.80,9.60 +177.60,-4.80,2.41,0.00,1.00,-177.60,-4.80 +177.60,-0.00,2.39,0.00,1.00,177.60,0.00 +-177.60,0.00,2.37,0.00,1.00,172.80,0.00 +-177.60,4.80,2.35,0.00,1.00,168.00,-4.80 +-177.60,9.60,2.33,0.00,1.00,163.20,9.60 +-177.60,14.40,2.31,0.00,1.00,158.40,-9.60 +-177.60,19.20,2.29,0.00,1.00,153.60,14.40 +-177.60,24.00,2.26,0.00,1.00,148.80,-19.20 +-177.60,28.80,2.24,0.00,1.00,144.00,19.20 +-177.60,33.60,2.22,0.00,1.00,139.20,-24.00 +-177.60,38.40,2.20,0.00,1.00,134.40,24.00 +-177.60,43.20,2.18,0.00,1.00,129.60,-28.80 +-177.60,48.00,2.16,0.00,1.00,124.80,28.80 +-172.80,52.80,2.14,0.00,1.00,120.00,-33.60 +-172.80,57.60,2.11,0.00,1.00,115.20,33.60 +-172.80,62.40,2.09,0.00,1.00,110.40,-38.40 +-172.80,67.20,2.07,0.00,1.00,105.60,38.40 +-168.00,72.00,2.05,0.00,1.00,100.80,-38.40 +-163.20,76.80,2.03,0.00,1.00,96.00,38.40 +-148.80,81.60,2.01,0.00,1.00,91.20,-43.20 +-110.40,86.40,1.99,0.00,1.00,86.40,43.20 +-43.20,86.40,1.97,0.00,1.00,81.60,-43.20 +-24.00,81.60,1.94,0.00,1.00,76.80,43.20 +-14.40,76.80,1.92,0.00,1.00,72.00,-38.40 +-9.60,72.00,1.90,0.00,1.00,67.20,38.40 +-9.60,67.20,1.88,0.00,1.00,62.40,-38.40 +-4.80,62.40,1.86,0.00,1.00,57.60,33.60 +-4.80,57.60,1.84,0.00,1.00,52.80,-33.60 +-4.80,52.80,1.82,0.00,1.00,48.00,33.60 +-4.80,48.00,1.79,0.00,1.00,43.20,-28.80 +-4.80,43.20,1.77,0.00,1.00,38.40,28.80 +-4.80,38.40,1.75,0.00,1.00,33.60,-24.00 +-0.00,33.60,1.73,0.00,1.00,28.80,19.20 +-0.00,28.80,1.71,0.00,1.00,24.00,-19.20 +-0.00,24.00,1.69,0.00,1.00,19.20,14.40 +-0.00,19.20,1.67,0.00,1.00,14.40,-14.40 +-0.00,14.40,1.64,0.00,1.00,9.60,9.60 +-0.00,9.60,1.62,0.00,1.00,4.80,-4.80 +-0.00,4.80,1.60,0.00,1.00,0.00,4.80 +-0.00,0.00,1.58,0.00,1.00,-4.80,0.00 +-0.00,-4.80,1.56,0.00,1.00,-9.60,4.80 +-0.00,-9.60,1.54,0.00,1.00,-14.40,-4.80 +-0.00,-14.40,1.52,0.00,1.00,-19.20,9.60 +-0.00,-19.20,1.50,0.00,1.00,-24.00,-14.40 +-0.00,-24.00,1.47,0.00,1.00,-28.80,19.20 +-0.00,-28.80,1.45,0.00,1.00,-33.60,-19.20 +-0.00,-33.60,1.43,0.00,1.00,-38.40,24.00 +-0.00,-38.40,1.41,0.00,1.00,-43.20,-28.80 +-0.00,-43.20,1.39,0.00,1.00,-48.00,28.80 +-0.00,-48.00,1.37,0.00,1.00,-52.80,-33.60 +-0.00,-52.80,1.35,0.00,1.00,-57.60,33.60 +-0.00,-57.60,1.32,0.00,1.00,-62.40,-38.40 +-0.00,-62.40,1.30,0.00,1.00,-67.20,38.40 +-4.80,-67.20,1.28,0.00,1.00,-72.00,-43.20 +-4.80,-72.00,1.26,0.00,1.00,-76.80,43.20 +-4.80,-76.80,1.24,0.00,1.00,-81.60,-43.20 +-9.60,-81.60,1.22,0.00,1.00,-86.40,43.20 +-19.20,-86.40,1.20,0.00,1.00,-91.20,-48.00 +-134.40,-86.40,1.17,0.00,1.00,-96.00,48.00 +-168.00,-81.60,1.15,0.00,1.00,-100.80,-48.00 +-172.80,-76.80,1.13,0.00,1.00,-105.60,43.20 +-177.60,-72.00,1.11,0.00,1.00,-110.40,-43.20 +-177.60,-67.20,1.09,0.00,1.00,-115.20,43.20 +-177.60,-62.40,1.07,0.00,1.00,-120.00,-38.40 +-177.60,-57.60,1.05,0.00,1.00,-124.80,38.40 +-177.60,-52.80,1.03,0.00,1.00,-129.60,-38.40 +-177.60,-48.00,1.00,0.00,1.00,-134.40,33.60 +-177.60,-43.20,0.98,0.00,1.00,-139.20,-28.80 +-177.60,-38.40,0.96,0.00,1.00,-144.00,28.80 +-177.60,-33.60,0.94,0.00,1.00,-148.80,-24.00 +-177.60,-28.80,0.92,0.00,1.00,-153.60,24.00 +-177.60,-24.00,0.90,0.00,1.00,-158.40,-19.20 +-177.60,-19.20,0.88,0.00,1.00,-163.20,14.40 +-177.60,-14.40,0.85,0.00,1.00,-168.00,-14.40 +-177.60,-9.60,0.83,0.00,1.00,-172.80,9.60 +-177.60,-4.80,0.81,0.00,1.00,-177.60,-4.80 +-177.60,-0.00,0.79,0.00,1.00,177.60,0.00 +177.60,0.00,0.77,0.00,1.00,172.80,0.00 +177.60,4.80,0.75,0.00,1.00,168.00,-4.80 +177.60,9.60,0.73,0.00,1.00,163.20,9.60 +177.60,14.40,0.70,0.00,1.00,158.40,-14.40 +177.60,19.20,0.68,0.00,1.00,153.60,14.40 +177.60,24.00,0.66,0.00,1.00,148.80,-19.20 +177.60,28.80,0.64,0.00,1.00,144.00,24.00 +177.60,33.60,0.62,0.00,1.00,139.20,-24.00 +177.60,38.40,0.60,0.00,1.00,134.40,28.80 +177.60,43.20,0.58,0.00,1.00,129.60,-28.80 +177.60,48.00,0.56,0.00,1.00,124.80,33.60 +177.60,52.80,0.53,0.00,1.00,120.00,-38.40 +177.60,57.60,0.51,0.00,1.00,115.20,38.40 +177.60,62.40,0.49,0.00,1.00,110.40,-38.40 +177.60,67.20,0.47,0.00,1.00,105.60,43.20 +177.60,72.00,0.45,0.00,1.00,100.80,-43.20 +172.80,76.80,0.43,0.00,1.00,96.00,43.20 +168.00,81.60,0.41,0.00,1.00,91.20,-48.00 +134.40,86.40,0.38,0.00,1.00,86.40,48.00 +19.20,86.40,0.36,0.00,1.00,81.60,-48.00 +9.60,81.60,0.34,0.00,1.00,76.80,43.20 +4.80,76.80,0.32,0.00,1.00,72.00,-43.20 +4.80,72.00,0.30,0.00,1.00,67.20,43.20 +4.80,67.20,0.28,0.00,1.00,62.40,-43.20 +0.00,62.40,0.26,0.00,1.00,57.60,38.40 +0.00,57.60,0.23,0.00,1.00,52.80,-38.40 +0.00,52.80,0.21,0.00,1.00,48.00,33.60 +0.00,48.00,0.19,0.00,1.00,43.20,-33.60 +0.00,43.20,0.17,0.00,1.00,38.40,28.80 +0.00,38.40,0.15,0.00,1.00,33.60,-28.80 +0.00,33.60,0.13,0.00,1.00,28.80,24.00 +0.00,28.80,0.11,0.00,1.00,24.00,-19.20 +0.00,24.00,0.09,0.00,1.00,19.20,19.20 +0.00,19.20,0.06,0.00,1.00,14.40,-14.40 +0.00,14.40,0.04,0.00,1.00,9.60,9.60 +0.00,9.60,0.02,0.00,1.00,4.80,-4.80 +0.00,4.80,0.00,0.00,1.00,0.00,4.80 diff --git a/scripts/testv/stvISM2.csv b/scripts/testv/stvISM2.csv index dcd3fee39c..35698d046f 100644 --- a/scripts/testv/stvISM2.csv +++ b/scripts/testv/stvISM2.csv @@ -1,1500 +1,1500 @@ -0.00,4.80,1.00,0.00,1.00 -0.00,9.60,1.00,0.00,1.00 -0.00,14.40,1.00,0.00,1.00 -0.00,19.20,1.00,0.00,1.00 -0.00,24.00,1.00,0.00,1.00 -0.00,28.80,1.00,0.00,1.00 -0.00,33.60,1.00,0.00,1.00 -0.00,38.40,1.00,0.00,1.00 -0.00,43.20,1.00,0.00,1.00 -0.00,48.00,1.00,0.00,1.00 -0.00,52.80,1.00,0.00,1.00 -0.00,57.60,1.00,0.00,1.00 -0.00,62.40,1.00,0.00,1.00 -4.80,67.20,1.00,0.00,1.00 -4.80,72.00,1.00,0.00,1.00 -4.80,76.80,1.00,0.00,1.00 -9.60,81.60,1.00,0.00,1.00 -19.20,86.40,1.00,0.00,1.00 -134.40,86.40,1.00,0.00,1.00 -168.00,81.60,1.00,0.00,1.00 -172.80,76.80,1.00,0.00,1.00 -177.60,72.00,1.00,0.00,1.00 -177.60,67.20,1.00,0.00,1.00 -177.60,62.40,1.00,0.00,1.00 -177.60,57.60,1.00,0.00,1.00 -177.60,52.80,1.00,0.00,1.00 -177.60,48.00,1.00,0.00,1.00 -177.60,43.20,1.00,0.00,1.00 -177.60,38.40,1.00,0.00,1.00 -177.60,33.60,1.00,0.00,1.00 -177.60,28.80,1.00,0.00,1.00 -177.60,24.00,1.00,0.00,1.00 -177.60,19.20,1.00,0.00,1.00 -177.60,14.40,1.00,0.00,1.00 -177.60,9.60,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --177.60,-9.60,1.00,0.00,1.00 --177.60,-14.40,1.00,0.00,1.00 --177.60,-19.20,1.00,0.00,1.00 --177.60,-24.00,1.00,0.00,1.00 --177.60,-28.80,1.00,0.00,1.00 --177.60,-33.60,1.00,0.00,1.00 --177.60,-38.40,1.00,0.00,1.00 --177.60,-43.20,1.00,0.00,1.00 --177.60,-48.00,1.00,0.00,1.00 --177.60,-52.80,1.00,0.00,1.00 --177.60,-57.60,1.00,0.00,1.00 --177.60,-62.40,1.00,0.00,1.00 --177.60,-67.20,1.00,0.00,1.00 --177.60,-72.00,1.00,0.00,1.00 --172.80,-76.80,1.00,0.00,1.00 --168.00,-81.60,1.00,0.00,1.00 --134.40,-86.40,1.00,0.00,1.00 --19.20,-86.40,1.00,0.00,1.00 --9.60,-81.60,1.00,0.00,1.00 --4.80,-76.80,1.00,0.00,1.00 --4.80,-72.00,1.00,0.00,1.00 --4.80,-67.20,1.00,0.00,1.00 --0.00,-62.40,1.00,0.00,1.00 --0.00,-57.60,1.00,0.00,1.00 --0.00,-52.80,1.00,0.00,1.00 --0.00,-48.00,1.00,0.00,1.00 --0.00,-43.20,1.00,0.00,1.00 --0.00,-38.40,1.00,0.00,1.00 --0.00,-33.60,1.00,0.00,1.00 --0.00,-28.80,1.00,0.00,1.00 --0.00,-24.00,1.00,0.00,1.00 --0.00,-19.20,1.00,0.00,1.00 --0.00,-14.40,1.00,0.00,1.00 --0.00,-9.60,1.00,0.00,1.00 --0.00,-4.80,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 --0.00,9.60,1.00,0.00,1.00 --0.00,14.40,1.00,0.00,1.00 --0.00,19.20,1.00,0.00,1.00 --0.00,24.00,1.00,0.00,1.00 --0.00,28.80,1.00,0.00,1.00 --0.00,33.60,1.00,0.00,1.00 --4.80,38.40,1.00,0.00,1.00 --4.80,43.20,1.00,0.00,1.00 --4.80,48.00,1.00,0.00,1.00 --4.80,52.80,1.00,0.00,1.00 --4.80,57.60,1.00,0.00,1.00 --4.80,62.40,1.00,0.00,1.00 --9.60,67.20,1.00,0.00,1.00 --9.60,72.00,1.00,0.00,1.00 --14.40,76.80,1.00,0.00,1.00 --24.00,81.60,1.00,0.00,1.00 --43.20,86.40,1.00,0.00,1.00 --110.40,86.40,1.00,0.00,1.00 --148.80,81.60,1.00,0.00,1.00 --163.20,76.80,1.00,0.00,1.00 --168.00,72.00,1.00,0.00,1.00 --172.80,67.20,1.00,0.00,1.00 --172.80,62.40,1.00,0.00,1.00 --172.80,57.60,1.00,0.00,1.00 --172.80,52.80,1.00,0.00,1.00 --177.60,48.00,1.00,0.00,1.00 --177.60,43.20,1.00,0.00,1.00 --177.60,38.40,1.00,0.00,1.00 --177.60,33.60,1.00,0.00,1.00 --177.60,28.80,1.00,0.00,1.00 --177.60,24.00,1.00,0.00,1.00 --177.60,19.20,1.00,0.00,1.00 --177.60,14.40,1.00,0.00,1.00 --177.60,9.60,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-9.60,1.00,0.00,1.00 -177.60,-14.40,1.00,0.00,1.00 -177.60,-19.20,1.00,0.00,1.00 -177.60,-24.00,1.00,0.00,1.00 -177.60,-28.80,1.00,0.00,1.00 -177.60,-33.60,1.00,0.00,1.00 -177.60,-38.40,1.00,0.00,1.00 -177.60,-43.20,1.00,0.00,1.00 -177.60,-48.00,1.00,0.00,1.00 -172.80,-52.80,1.00,0.00,1.00 -172.80,-57.60,1.00,0.00,1.00 -172.80,-62.40,1.00,0.00,1.00 -172.80,-67.20,1.00,0.00,1.00 -168.00,-72.00,1.00,0.00,1.00 -163.20,-76.80,1.00,0.00,1.00 -148.80,-81.60,1.00,0.00,1.00 -110.40,-86.40,1.00,0.00,1.00 -43.20,-86.40,1.00,0.00,1.00 -24.00,-81.60,1.00,0.00,1.00 -14.40,-76.80,1.00,0.00,1.00 -9.60,-72.00,1.00,0.00,1.00 -9.60,-67.20,1.00,0.00,1.00 -4.80,-62.40,1.00,0.00,1.00 -4.80,-57.60,1.00,0.00,1.00 -4.80,-52.80,1.00,0.00,1.00 -4.80,-48.00,1.00,0.00,1.00 -4.80,-43.20,1.00,0.00,1.00 -4.80,-38.40,1.00,0.00,1.00 -0.00,-33.60,1.00,0.00,1.00 -0.00,-28.80,1.00,0.00,1.00 -0.00,-24.00,1.00,0.00,1.00 -0.00,-19.20,1.00,0.00,1.00 -0.00,-14.40,1.00,0.00,1.00 -0.00,-9.60,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 --0.00,9.60,1.00,0.00,1.00 --0.00,14.40,1.00,0.00,1.00 --4.80,19.20,1.00,0.00,1.00 --4.80,24.00,1.00,0.00,1.00 --4.80,28.80,1.00,0.00,1.00 --4.80,33.60,1.00,0.00,1.00 --4.80,38.40,1.00,0.00,1.00 --9.60,43.20,1.00,0.00,1.00 --9.60,48.00,1.00,0.00,1.00 --9.60,52.80,1.00,0.00,1.00 --14.40,57.60,1.00,0.00,1.00 --14.40,62.40,1.00,0.00,1.00 --19.20,67.20,1.00,0.00,1.00 --24.00,72.00,1.00,0.00,1.00 --33.60,72.00,1.00,0.00,1.00 --43.20,76.80,1.00,0.00,1.00 --67.20,81.60,1.00,0.00,1.00 --96.00,81.60,1.00,0.00,1.00 --124.80,81.60,1.00,0.00,1.00 --144.00,76.80,1.00,0.00,1.00 --153.60,72.00,1.00,0.00,1.00 --158.40,67.20,1.00,0.00,1.00 --163.20,62.40,1.00,0.00,1.00 --168.00,57.60,1.00,0.00,1.00 --168.00,52.80,1.00,0.00,1.00 --168.00,48.00,1.00,0.00,1.00 --172.80,43.20,1.00,0.00,1.00 --172.80,38.40,1.00,0.00,1.00 --172.80,33.60,1.00,0.00,1.00 --172.80,28.80,1.00,0.00,1.00 --177.60,24.00,1.00,0.00,1.00 --177.60,19.20,1.00,0.00,1.00 --177.60,14.40,1.00,0.00,1.00 --177.60,9.60,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-9.60,1.00,0.00,1.00 -177.60,-14.40,1.00,0.00,1.00 -177.60,-19.20,1.00,0.00,1.00 -177.60,-24.00,1.00,0.00,1.00 -172.80,-28.80,1.00,0.00,1.00 -172.80,-33.60,1.00,0.00,1.00 -172.80,-38.40,1.00,0.00,1.00 -172.80,-43.20,1.00,0.00,1.00 -168.00,-48.00,1.00,0.00,1.00 -168.00,-52.80,1.00,0.00,1.00 -168.00,-57.60,1.00,0.00,1.00 -163.20,-62.40,1.00,0.00,1.00 -158.40,-67.20,1.00,0.00,1.00 -153.60,-72.00,1.00,0.00,1.00 -144.00,-76.80,1.00,0.00,1.00 -124.80,-81.60,1.00,0.00,1.00 -96.00,-81.60,1.00,0.00,1.00 -67.20,-81.60,1.00,0.00,1.00 -43.20,-76.80,1.00,0.00,1.00 -33.60,-72.00,1.00,0.00,1.00 -24.00,-72.00,1.00,0.00,1.00 -19.20,-67.20,1.00,0.00,1.00 -14.40,-62.40,1.00,0.00,1.00 -14.40,-57.60,1.00,0.00,1.00 -9.60,-52.80,1.00,0.00,1.00 -9.60,-48.00,1.00,0.00,1.00 -9.60,-43.20,1.00,0.00,1.00 -4.80,-38.40,1.00,0.00,1.00 -4.80,-33.60,1.00,0.00,1.00 -4.80,-28.80,1.00,0.00,1.00 -4.80,-24.00,1.00,0.00,1.00 -4.80,-19.20,1.00,0.00,1.00 -0.00,-14.40,1.00,0.00,1.00 -0.00,-9.60,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 --0.00,9.60,1.00,0.00,1.00 --4.80,14.40,1.00,0.00,1.00 --4.80,19.20,1.00,0.00,1.00 --4.80,24.00,1.00,0.00,1.00 --4.80,28.80,1.00,0.00,1.00 --9.60,33.60,1.00,0.00,1.00 --9.60,38.40,1.00,0.00,1.00 --14.40,43.20,1.00,0.00,1.00 --14.40,48.00,1.00,0.00,1.00 --14.40,52.80,1.00,0.00,1.00 --19.20,57.60,1.00,0.00,1.00 --24.00,57.60,1.00,0.00,1.00 --28.80,62.40,1.00,0.00,1.00 --33.60,67.20,1.00,0.00,1.00 --43.20,72.00,1.00,0.00,1.00 --57.60,72.00,1.00,0.00,1.00 --76.80,76.80,1.00,0.00,1.00 --96.00,76.80,1.00,0.00,1.00 --115.20,76.80,1.00,0.00,1.00 --129.60,72.00,1.00,0.00,1.00 --139.20,72.00,1.00,0.00,1.00 --148.80,67.20,1.00,0.00,1.00 --153.60,62.40,1.00,0.00,1.00 --158.40,57.60,1.00,0.00,1.00 --163.20,52.80,1.00,0.00,1.00 --163.20,48.00,1.00,0.00,1.00 --168.00,43.20,1.00,0.00,1.00 --168.00,38.40,1.00,0.00,1.00 --172.80,33.60,1.00,0.00,1.00 --172.80,28.80,1.00,0.00,1.00 --172.80,24.00,1.00,0.00,1.00 --172.80,19.20,1.00,0.00,1.00 --177.60,14.40,1.00,0.00,1.00 --177.60,9.60,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-9.60,1.00,0.00,1.00 -177.60,-14.40,1.00,0.00,1.00 -172.80,-19.20,1.00,0.00,1.00 -172.80,-24.00,1.00,0.00,1.00 -172.80,-28.80,1.00,0.00,1.00 -172.80,-33.60,1.00,0.00,1.00 -168.00,-38.40,1.00,0.00,1.00 -168.00,-43.20,1.00,0.00,1.00 -163.20,-48.00,1.00,0.00,1.00 -163.20,-52.80,1.00,0.00,1.00 -158.40,-57.60,1.00,0.00,1.00 -153.60,-62.40,1.00,0.00,1.00 -148.80,-67.20,1.00,0.00,1.00 -139.20,-72.00,1.00,0.00,1.00 -129.60,-72.00,1.00,0.00,1.00 -115.20,-76.80,1.00,0.00,1.00 -96.00,-76.80,1.00,0.00,1.00 -76.80,-76.80,1.00,0.00,1.00 -57.60,-72.00,1.00,0.00,1.00 -43.20,-72.00,1.00,0.00,1.00 -33.60,-67.20,1.00,0.00,1.00 -28.80,-62.40,1.00,0.00,1.00 -24.00,-57.60,1.00,0.00,1.00 -19.20,-57.60,1.00,0.00,1.00 -14.40,-52.80,1.00,0.00,1.00 -14.40,-48.00,1.00,0.00,1.00 -14.40,-43.20,1.00,0.00,1.00 -9.60,-38.40,1.00,0.00,1.00 -9.60,-33.60,1.00,0.00,1.00 -4.80,-28.80,1.00,0.00,1.00 -4.80,-24.00,1.00,0.00,1.00 -4.80,-19.20,1.00,0.00,1.00 -4.80,-14.40,1.00,0.00,1.00 -0.00,-9.60,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 --4.80,9.60,1.00,0.00,1.00 --4.80,14.40,1.00,0.00,1.00 --4.80,19.20,1.00,0.00,1.00 --9.60,24.00,1.00,0.00,1.00 --9.60,28.80,1.00,0.00,1.00 --9.60,33.60,1.00,0.00,1.00 --14.40,38.40,1.00,0.00,1.00 --14.40,38.40,1.00,0.00,1.00 --19.20,43.20,1.00,0.00,1.00 --24.00,48.00,1.00,0.00,1.00 --24.00,52.80,1.00,0.00,1.00 --28.80,57.60,1.00,0.00,1.00 --38.40,62.40,1.00,0.00,1.00 --43.20,62.40,1.00,0.00,1.00 --52.80,67.20,1.00,0.00,1.00 --62.40,72.00,1.00,0.00,1.00 --76.80,72.00,1.00,0.00,1.00 --96.00,72.00,1.00,0.00,1.00 --110.40,72.00,1.00,0.00,1.00 --120.00,67.20,1.00,0.00,1.00 --134.40,67.20,1.00,0.00,1.00 --139.20,62.40,1.00,0.00,1.00 --148.80,57.60,1.00,0.00,1.00 --153.60,57.60,1.00,0.00,1.00 --158.40,52.80,1.00,0.00,1.00 --158.40,48.00,1.00,0.00,1.00 --163.20,43.20,1.00,0.00,1.00 --163.20,38.40,1.00,0.00,1.00 --168.00,33.60,1.00,0.00,1.00 --168.00,28.80,1.00,0.00,1.00 --172.80,24.00,1.00,0.00,1.00 --172.80,19.20,1.00,0.00,1.00 --172.80,14.40,1.00,0.00,1.00 --177.60,9.60,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-9.60,1.00,0.00,1.00 -172.80,-14.40,1.00,0.00,1.00 -172.80,-19.20,1.00,0.00,1.00 -172.80,-24.00,1.00,0.00,1.00 -168.00,-28.80,1.00,0.00,1.00 -168.00,-33.60,1.00,0.00,1.00 -163.20,-38.40,1.00,0.00,1.00 -163.20,-43.20,1.00,0.00,1.00 -158.40,-48.00,1.00,0.00,1.00 -158.40,-52.80,1.00,0.00,1.00 -153.60,-57.60,1.00,0.00,1.00 -148.80,-57.60,1.00,0.00,1.00 -139.20,-62.40,1.00,0.00,1.00 -134.40,-67.20,1.00,0.00,1.00 -120.00,-67.20,1.00,0.00,1.00 -110.40,-72.00,1.00,0.00,1.00 -96.00,-72.00,1.00,0.00,1.00 -76.80,-72.00,1.00,0.00,1.00 -62.40,-72.00,1.00,0.00,1.00 -52.80,-67.20,1.00,0.00,1.00 -43.20,-62.40,1.00,0.00,1.00 -38.40,-62.40,1.00,0.00,1.00 -28.80,-57.60,1.00,0.00,1.00 -24.00,-52.80,1.00,0.00,1.00 -24.00,-48.00,1.00,0.00,1.00 -19.20,-43.20,1.00,0.00,1.00 -14.40,-38.40,1.00,0.00,1.00 -14.40,-38.40,1.00,0.00,1.00 -9.60,-33.60,1.00,0.00,1.00 -9.60,-28.80,1.00,0.00,1.00 -9.60,-24.00,1.00,0.00,1.00 -4.80,-19.20,1.00,0.00,1.00 -4.80,-14.40,1.00,0.00,1.00 -4.80,-9.60,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 --4.80,9.60,1.00,0.00,1.00 --4.80,14.40,1.00,0.00,1.00 --9.60,19.20,1.00,0.00,1.00 --9.60,24.00,1.00,0.00,1.00 --14.40,24.00,1.00,0.00,1.00 --14.40,28.80,1.00,0.00,1.00 --19.20,33.60,1.00,0.00,1.00 --19.20,38.40,1.00,0.00,1.00 --24.00,43.20,1.00,0.00,1.00 --28.80,48.00,1.00,0.00,1.00 --33.60,52.80,1.00,0.00,1.00 --38.40,52.80,1.00,0.00,1.00 --43.20,57.60,1.00,0.00,1.00 --48.00,62.40,1.00,0.00,1.00 --57.60,62.40,1.00,0.00,1.00 --67.20,67.20,1.00,0.00,1.00 --81.60,67.20,1.00,0.00,1.00 --91.20,67.20,1.00,0.00,1.00 --105.60,67.20,1.00,0.00,1.00 --115.20,67.20,1.00,0.00,1.00 --124.80,62.40,1.00,0.00,1.00 --134.40,57.60,1.00,0.00,1.00 --139.20,57.60,1.00,0.00,1.00 --144.00,52.80,1.00,0.00,1.00 --148.80,48.00,1.00,0.00,1.00 --153.60,43.20,1.00,0.00,1.00 --158.40,43.20,1.00,0.00,1.00 --163.20,38.40,1.00,0.00,1.00 --163.20,33.60,1.00,0.00,1.00 --168.00,28.80,1.00,0.00,1.00 --168.00,24.00,1.00,0.00,1.00 --172.80,19.20,1.00,0.00,1.00 --172.80,14.40,1.00,0.00,1.00 --177.60,9.60,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -177.60,-9.60,1.00,0.00,1.00 -172.80,-14.40,1.00,0.00,1.00 -172.80,-19.20,1.00,0.00,1.00 -168.00,-24.00,1.00,0.00,1.00 -168.00,-28.80,1.00,0.00,1.00 -163.20,-33.60,1.00,0.00,1.00 -163.20,-38.40,1.00,0.00,1.00 -158.40,-43.20,1.00,0.00,1.00 -153.60,-43.20,1.00,0.00,1.00 -148.80,-48.00,1.00,0.00,1.00 -144.00,-52.80,1.00,0.00,1.00 -139.20,-57.60,1.00,0.00,1.00 -134.40,-57.60,1.00,0.00,1.00 -124.80,-62.40,1.00,0.00,1.00 -115.20,-67.20,1.00,0.00,1.00 -105.60,-67.20,1.00,0.00,1.00 -91.20,-67.20,1.00,0.00,1.00 -81.60,-67.20,1.00,0.00,1.00 -67.20,-67.20,1.00,0.00,1.00 -57.60,-62.40,1.00,0.00,1.00 -48.00,-62.40,1.00,0.00,1.00 -43.20,-57.60,1.00,0.00,1.00 -38.40,-52.80,1.00,0.00,1.00 -33.60,-52.80,1.00,0.00,1.00 -28.80,-48.00,1.00,0.00,1.00 -24.00,-43.20,1.00,0.00,1.00 -19.20,-38.40,1.00,0.00,1.00 -19.20,-33.60,1.00,0.00,1.00 -14.40,-28.80,1.00,0.00,1.00 -14.40,-24.00,1.00,0.00,1.00 -9.60,-24.00,1.00,0.00,1.00 -9.60,-19.20,1.00,0.00,1.00 -4.80,-14.40,1.00,0.00,1.00 -4.80,-9.60,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 --4.80,9.60,1.00,0.00,1.00 --4.80,14.40,1.00,0.00,1.00 --9.60,19.20,1.00,0.00,1.00 --9.60,19.20,1.00,0.00,1.00 --14.40,24.00,1.00,0.00,1.00 --19.20,28.80,1.00,0.00,1.00 --19.20,33.60,1.00,0.00,1.00 --24.00,38.40,1.00,0.00,1.00 --28.80,43.20,1.00,0.00,1.00 --33.60,43.20,1.00,0.00,1.00 --38.40,48.00,1.00,0.00,1.00 --43.20,52.80,1.00,0.00,1.00 --48.00,52.80,1.00,0.00,1.00 --52.80,57.60,1.00,0.00,1.00 --62.40,57.60,1.00,0.00,1.00 --72.00,62.40,1.00,0.00,1.00 --81.60,62.40,1.00,0.00,1.00 --91.20,62.40,1.00,0.00,1.00 --100.80,62.40,1.00,0.00,1.00 --110.40,62.40,1.00,0.00,1.00 --120.00,57.60,1.00,0.00,1.00 --129.60,57.60,1.00,0.00,1.00 --134.40,52.80,1.00,0.00,1.00 --139.20,48.00,1.00,0.00,1.00 --144.00,48.00,1.00,0.00,1.00 --148.80,43.20,1.00,0.00,1.00 --153.60,38.40,1.00,0.00,1.00 --158.40,33.60,1.00,0.00,1.00 --163.20,33.60,1.00,0.00,1.00 --163.20,28.80,1.00,0.00,1.00 --168.00,24.00,1.00,0.00,1.00 --168.00,19.20,1.00,0.00,1.00 --172.80,14.40,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -172.80,-14.40,1.00,0.00,1.00 -168.00,-19.20,1.00,0.00,1.00 -168.00,-24.00,1.00,0.00,1.00 -163.20,-28.80,1.00,0.00,1.00 -163.20,-33.60,1.00,0.00,1.00 -158.40,-33.60,1.00,0.00,1.00 -153.60,-38.40,1.00,0.00,1.00 -148.80,-43.20,1.00,0.00,1.00 -144.00,-48.00,1.00,0.00,1.00 -139.20,-48.00,1.00,0.00,1.00 -134.40,-52.80,1.00,0.00,1.00 -129.60,-57.60,1.00,0.00,1.00 -120.00,-57.60,1.00,0.00,1.00 -110.40,-62.40,1.00,0.00,1.00 -100.80,-62.40,1.00,0.00,1.00 -91.20,-62.40,1.00,0.00,1.00 -81.60,-62.40,1.00,0.00,1.00 -72.00,-62.40,1.00,0.00,1.00 -62.40,-57.60,1.00,0.00,1.00 -52.80,-57.60,1.00,0.00,1.00 -48.00,-52.80,1.00,0.00,1.00 -43.20,-52.80,1.00,0.00,1.00 -38.40,-48.00,1.00,0.00,1.00 -33.60,-43.20,1.00,0.00,1.00 -28.80,-43.20,1.00,0.00,1.00 -24.00,-38.40,1.00,0.00,1.00 -19.20,-33.60,1.00,0.00,1.00 -19.20,-28.80,1.00,0.00,1.00 -14.40,-24.00,1.00,0.00,1.00 -9.60,-19.20,1.00,0.00,1.00 -9.60,-19.20,1.00,0.00,1.00 -4.80,-14.40,1.00,0.00,1.00 -4.80,-9.60,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 --4.80,9.60,1.00,0.00,1.00 --9.60,14.40,1.00,0.00,1.00 --9.60,14.40,1.00,0.00,1.00 --14.40,19.20,1.00,0.00,1.00 --14.40,24.00,1.00,0.00,1.00 --19.20,28.80,1.00,0.00,1.00 --24.00,33.60,1.00,0.00,1.00 --28.80,33.60,1.00,0.00,1.00 --28.80,38.40,1.00,0.00,1.00 --33.60,43.20,1.00,0.00,1.00 --38.40,43.20,1.00,0.00,1.00 --48.00,48.00,1.00,0.00,1.00 --52.80,52.80,1.00,0.00,1.00 --57.60,52.80,1.00,0.00,1.00 --67.20,57.60,1.00,0.00,1.00 --76.80,57.60,1.00,0.00,1.00 --81.60,57.60,1.00,0.00,1.00 --91.20,57.60,1.00,0.00,1.00 --100.80,57.60,1.00,0.00,1.00 --110.40,57.60,1.00,0.00,1.00 --115.20,52.80,1.00,0.00,1.00 --124.80,52.80,1.00,0.00,1.00 --129.60,48.00,1.00,0.00,1.00 --139.20,48.00,1.00,0.00,1.00 --144.00,43.20,1.00,0.00,1.00 --148.80,38.40,1.00,0.00,1.00 --153.60,38.40,1.00,0.00,1.00 --153.60,33.60,1.00,0.00,1.00 --158.40,28.80,1.00,0.00,1.00 --163.20,24.00,1.00,0.00,1.00 --163.20,24.00,1.00,0.00,1.00 --168.00,19.20,1.00,0.00,1.00 --172.80,14.40,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -172.80,-14.40,1.00,0.00,1.00 -168.00,-19.20,1.00,0.00,1.00 -163.20,-24.00,1.00,0.00,1.00 -163.20,-24.00,1.00,0.00,1.00 -158.40,-28.80,1.00,0.00,1.00 -153.60,-33.60,1.00,0.00,1.00 -153.60,-38.40,1.00,0.00,1.00 -148.80,-38.40,1.00,0.00,1.00 -144.00,-43.20,1.00,0.00,1.00 -139.20,-48.00,1.00,0.00,1.00 -129.60,-48.00,1.00,0.00,1.00 -124.80,-52.80,1.00,0.00,1.00 -115.20,-52.80,1.00,0.00,1.00 -110.40,-57.60,1.00,0.00,1.00 -100.80,-57.60,1.00,0.00,1.00 -91.20,-57.60,1.00,0.00,1.00 -81.60,-57.60,1.00,0.00,1.00 -76.80,-57.60,1.00,0.00,1.00 -67.20,-57.60,1.00,0.00,1.00 -57.60,-52.80,1.00,0.00,1.00 -52.80,-52.80,1.00,0.00,1.00 -48.00,-48.00,1.00,0.00,1.00 -38.40,-43.20,1.00,0.00,1.00 -33.60,-43.20,1.00,0.00,1.00 -28.80,-38.40,1.00,0.00,1.00 -28.80,-33.60,1.00,0.00,1.00 -24.00,-33.60,1.00,0.00,1.00 -19.20,-28.80,1.00,0.00,1.00 -14.40,-24.00,1.00,0.00,1.00 -14.40,-19.20,1.00,0.00,1.00 -9.60,-14.40,1.00,0.00,1.00 -9.60,-14.40,1.00,0.00,1.00 -4.80,-9.60,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 --4.80,9.60,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 --9.60,14.40,1.00,0.00,1.00 --14.40,19.20,1.00,0.00,1.00 --19.20,24.00,1.00,0.00,1.00 --24.00,24.00,1.00,0.00,1.00 --24.00,28.80,1.00,0.00,1.00 --28.80,33.60,1.00,0.00,1.00 --33.60,38.40,1.00,0.00,1.00 --38.40,38.40,1.00,0.00,1.00 --43.20,43.20,1.00,0.00,1.00 --48.00,43.20,1.00,0.00,1.00 --52.80,48.00,1.00,0.00,1.00 --62.40,48.00,1.00,0.00,1.00 --67.20,52.80,1.00,0.00,1.00 --76.80,52.80,1.00,0.00,1.00 --86.40,52.80,1.00,0.00,1.00 --91.20,52.80,1.00,0.00,1.00 --100.80,52.80,1.00,0.00,1.00 --105.60,52.80,1.00,0.00,1.00 --115.20,48.00,1.00,0.00,1.00 --120.00,48.00,1.00,0.00,1.00 --129.60,48.00,1.00,0.00,1.00 --134.40,43.20,1.00,0.00,1.00 --139.20,43.20,1.00,0.00,1.00 --144.00,38.40,1.00,0.00,1.00 --148.80,33.60,1.00,0.00,1.00 --153.60,33.60,1.00,0.00,1.00 --158.40,28.80,1.00,0.00,1.00 --158.40,24.00,1.00,0.00,1.00 --163.20,19.20,1.00,0.00,1.00 --168.00,19.20,1.00,0.00,1.00 --168.00,14.40,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -177.60,-4.80,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -168.00,-14.40,1.00,0.00,1.00 -168.00,-19.20,1.00,0.00,1.00 -163.20,-19.20,1.00,0.00,1.00 -158.40,-24.00,1.00,0.00,1.00 -158.40,-28.80,1.00,0.00,1.00 -153.60,-33.60,1.00,0.00,1.00 -148.80,-33.60,1.00,0.00,1.00 -144.00,-38.40,1.00,0.00,1.00 -139.20,-43.20,1.00,0.00,1.00 -134.40,-43.20,1.00,0.00,1.00 -129.60,-48.00,1.00,0.00,1.00 -120.00,-48.00,1.00,0.00,1.00 -115.20,-48.00,1.00,0.00,1.00 -105.60,-52.80,1.00,0.00,1.00 -100.80,-52.80,1.00,0.00,1.00 -91.20,-52.80,1.00,0.00,1.00 -86.40,-52.80,1.00,0.00,1.00 -76.80,-52.80,1.00,0.00,1.00 -67.20,-52.80,1.00,0.00,1.00 -62.40,-48.00,1.00,0.00,1.00 -52.80,-48.00,1.00,0.00,1.00 -48.00,-43.20,1.00,0.00,1.00 -43.20,-43.20,1.00,0.00,1.00 -38.40,-38.40,1.00,0.00,1.00 -33.60,-38.40,1.00,0.00,1.00 -28.80,-33.60,1.00,0.00,1.00 -24.00,-28.80,1.00,0.00,1.00 -24.00,-24.00,1.00,0.00,1.00 -19.20,-24.00,1.00,0.00,1.00 -14.40,-19.20,1.00,0.00,1.00 -9.60,-14.40,1.00,0.00,1.00 -9.60,-9.60,1.00,0.00,1.00 -4.80,-9.60,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 --14.40,14.40,1.00,0.00,1.00 --14.40,19.20,1.00,0.00,1.00 --19.20,19.20,1.00,0.00,1.00 --24.00,24.00,1.00,0.00,1.00 --28.80,28.80,1.00,0.00,1.00 --33.60,28.80,1.00,0.00,1.00 --38.40,33.60,1.00,0.00,1.00 --43.20,38.40,1.00,0.00,1.00 --48.00,38.40,1.00,0.00,1.00 --52.80,43.20,1.00,0.00,1.00 --57.60,43.20,1.00,0.00,1.00 --62.40,43.20,1.00,0.00,1.00 --72.00,48.00,1.00,0.00,1.00 --76.80,48.00,1.00,0.00,1.00 --86.40,48.00,1.00,0.00,1.00 --91.20,48.00,1.00,0.00,1.00 --100.80,48.00,1.00,0.00,1.00 --105.60,48.00,1.00,0.00,1.00 --110.40,48.00,1.00,0.00,1.00 --120.00,43.20,1.00,0.00,1.00 --124.80,43.20,1.00,0.00,1.00 --129.60,38.40,1.00,0.00,1.00 --134.40,38.40,1.00,0.00,1.00 --139.20,33.60,1.00,0.00,1.00 --144.00,33.60,1.00,0.00,1.00 --148.80,28.80,1.00,0.00,1.00 --153.60,24.00,1.00,0.00,1.00 --158.40,24.00,1.00,0.00,1.00 --163.20,19.20,1.00,0.00,1.00 --163.20,14.40,1.00,0.00,1.00 --168.00,14.40,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -168.00,-14.40,1.00,0.00,1.00 -163.20,-14.40,1.00,0.00,1.00 -163.20,-19.20,1.00,0.00,1.00 -158.40,-24.00,1.00,0.00,1.00 -153.60,-24.00,1.00,0.00,1.00 -148.80,-28.80,1.00,0.00,1.00 -144.00,-33.60,1.00,0.00,1.00 -139.20,-33.60,1.00,0.00,1.00 -134.40,-38.40,1.00,0.00,1.00 -129.60,-38.40,1.00,0.00,1.00 -124.80,-43.20,1.00,0.00,1.00 -120.00,-43.20,1.00,0.00,1.00 -110.40,-48.00,1.00,0.00,1.00 -105.60,-48.00,1.00,0.00,1.00 -100.80,-48.00,1.00,0.00,1.00 -91.20,-48.00,1.00,0.00,1.00 -86.40,-48.00,1.00,0.00,1.00 -76.80,-48.00,1.00,0.00,1.00 -72.00,-48.00,1.00,0.00,1.00 -62.40,-43.20,1.00,0.00,1.00 -57.60,-43.20,1.00,0.00,1.00 -52.80,-43.20,1.00,0.00,1.00 -48.00,-38.40,1.00,0.00,1.00 -43.20,-38.40,1.00,0.00,1.00 -38.40,-33.60,1.00,0.00,1.00 -33.60,-28.80,1.00,0.00,1.00 -28.80,-28.80,1.00,0.00,1.00 -24.00,-24.00,1.00,0.00,1.00 -19.20,-19.20,1.00,0.00,1.00 -14.40,-19.20,1.00,0.00,1.00 -14.40,-14.40,1.00,0.00,1.00 -9.60,-9.60,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 --14.40,14.40,1.00,0.00,1.00 --19.20,14.40,1.00,0.00,1.00 --24.00,19.20,1.00,0.00,1.00 --24.00,24.00,1.00,0.00,1.00 --28.80,24.00,1.00,0.00,1.00 --33.60,28.80,1.00,0.00,1.00 --38.40,28.80,1.00,0.00,1.00 --43.20,33.60,1.00,0.00,1.00 --48.00,33.60,1.00,0.00,1.00 --52.80,38.40,1.00,0.00,1.00 --62.40,38.40,1.00,0.00,1.00 --67.20,38.40,1.00,0.00,1.00 --72.00,43.20,1.00,0.00,1.00 --76.80,43.20,1.00,0.00,1.00 --86.40,43.20,1.00,0.00,1.00 --91.20,43.20,1.00,0.00,1.00 --96.00,43.20,1.00,0.00,1.00 --105.60,43.20,1.00,0.00,1.00 --110.40,43.20,1.00,0.00,1.00 --115.20,38.40,1.00,0.00,1.00 --124.80,38.40,1.00,0.00,1.00 --129.60,38.40,1.00,0.00,1.00 --134.40,33.60,1.00,0.00,1.00 --139.20,33.60,1.00,0.00,1.00 --144.00,28.80,1.00,0.00,1.00 --148.80,28.80,1.00,0.00,1.00 --153.60,24.00,1.00,0.00,1.00 --158.40,19.20,1.00,0.00,1.00 --158.40,19.20,1.00,0.00,1.00 --163.20,14.40,1.00,0.00,1.00 --168.00,9.60,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -168.00,-9.60,1.00,0.00,1.00 -163.20,-14.40,1.00,0.00,1.00 -158.40,-19.20,1.00,0.00,1.00 -158.40,-19.20,1.00,0.00,1.00 -153.60,-24.00,1.00,0.00,1.00 -148.80,-28.80,1.00,0.00,1.00 -144.00,-28.80,1.00,0.00,1.00 -139.20,-33.60,1.00,0.00,1.00 -134.40,-33.60,1.00,0.00,1.00 -129.60,-38.40,1.00,0.00,1.00 -124.80,-38.40,1.00,0.00,1.00 -115.20,-38.40,1.00,0.00,1.00 -110.40,-43.20,1.00,0.00,1.00 -105.60,-43.20,1.00,0.00,1.00 -96.00,-43.20,1.00,0.00,1.00 -91.20,-43.20,1.00,0.00,1.00 -86.40,-43.20,1.00,0.00,1.00 -76.80,-43.20,1.00,0.00,1.00 -72.00,-43.20,1.00,0.00,1.00 -67.20,-38.40,1.00,0.00,1.00 -62.40,-38.40,1.00,0.00,1.00 -52.80,-38.40,1.00,0.00,1.00 -48.00,-33.60,1.00,0.00,1.00 -43.20,-33.60,1.00,0.00,1.00 -38.40,-28.80,1.00,0.00,1.00 -33.60,-28.80,1.00,0.00,1.00 -28.80,-24.00,1.00,0.00,1.00 -24.00,-24.00,1.00,0.00,1.00 -24.00,-19.20,1.00,0.00,1.00 -19.20,-14.40,1.00,0.00,1.00 -14.40,-14.40,1.00,0.00,1.00 -9.60,-9.60,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 --14.40,9.60,1.00,0.00,1.00 --19.20,14.40,1.00,0.00,1.00 --24.00,19.20,1.00,0.00,1.00 --28.80,19.20,1.00,0.00,1.00 --33.60,24.00,1.00,0.00,1.00 --38.40,24.00,1.00,0.00,1.00 --43.20,28.80,1.00,0.00,1.00 --48.00,28.80,1.00,0.00,1.00 --52.80,33.60,1.00,0.00,1.00 --57.60,33.60,1.00,0.00,1.00 --62.40,33.60,1.00,0.00,1.00 --67.20,38.40,1.00,0.00,1.00 --72.00,38.40,1.00,0.00,1.00 --81.60,38.40,1.00,0.00,1.00 --86.40,38.40,1.00,0.00,1.00 --91.20,38.40,1.00,0.00,1.00 --96.00,38.40,1.00,0.00,1.00 --105.60,38.40,1.00,0.00,1.00 --110.40,38.40,1.00,0.00,1.00 --115.20,33.60,1.00,0.00,1.00 --120.00,33.60,1.00,0.00,1.00 --124.80,33.60,1.00,0.00,1.00 --129.60,28.80,1.00,0.00,1.00 --134.40,28.80,1.00,0.00,1.00 --139.20,24.00,1.00,0.00,1.00 --144.00,24.00,1.00,0.00,1.00 --148.80,19.20,1.00,0.00,1.00 --153.60,19.20,1.00,0.00,1.00 --158.40,14.40,1.00,0.00,1.00 --163.20,14.40,1.00,0.00,1.00 --168.00,9.60,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -172.80,-9.60,1.00,0.00,1.00 -168.00,-9.60,1.00,0.00,1.00 -163.20,-14.40,1.00,0.00,1.00 -158.40,-14.40,1.00,0.00,1.00 -153.60,-19.20,1.00,0.00,1.00 -148.80,-19.20,1.00,0.00,1.00 -144.00,-24.00,1.00,0.00,1.00 -139.20,-24.00,1.00,0.00,1.00 -134.40,-28.80,1.00,0.00,1.00 -129.60,-28.80,1.00,0.00,1.00 -124.80,-33.60,1.00,0.00,1.00 -120.00,-33.60,1.00,0.00,1.00 -115.20,-33.60,1.00,0.00,1.00 -110.40,-38.40,1.00,0.00,1.00 -105.60,-38.40,1.00,0.00,1.00 -96.00,-38.40,1.00,0.00,1.00 -91.20,-38.40,1.00,0.00,1.00 -86.40,-38.40,1.00,0.00,1.00 -81.60,-38.40,1.00,0.00,1.00 -72.00,-38.40,1.00,0.00,1.00 -67.20,-38.40,1.00,0.00,1.00 -62.40,-33.60,1.00,0.00,1.00 -57.60,-33.60,1.00,0.00,1.00 -52.80,-33.60,1.00,0.00,1.00 -48.00,-28.80,1.00,0.00,1.00 -43.20,-28.80,1.00,0.00,1.00 -38.40,-24.00,1.00,0.00,1.00 -33.60,-24.00,1.00,0.00,1.00 -28.80,-19.20,1.00,0.00,1.00 -24.00,-19.20,1.00,0.00,1.00 -19.20,-14.40,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 -9.60,-9.60,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 --14.40,9.60,1.00,0.00,1.00 --14.40,9.60,1.00,0.00,1.00 --19.20,14.40,1.00,0.00,1.00 --24.00,14.40,1.00,0.00,1.00 --28.80,19.20,1.00,0.00,1.00 --33.60,19.20,1.00,0.00,1.00 --38.40,24.00,1.00,0.00,1.00 --43.20,24.00,1.00,0.00,1.00 --48.00,24.00,1.00,0.00,1.00 --52.80,28.80,1.00,0.00,1.00 --57.60,28.80,1.00,0.00,1.00 --62.40,28.80,1.00,0.00,1.00 --67.20,33.60,1.00,0.00,1.00 --72.00,33.60,1.00,0.00,1.00 --81.60,33.60,1.00,0.00,1.00 --86.40,33.60,1.00,0.00,1.00 --91.20,33.60,1.00,0.00,1.00 --96.00,33.60,1.00,0.00,1.00 --100.80,33.60,1.00,0.00,1.00 --110.40,33.60,1.00,0.00,1.00 --115.20,33.60,1.00,0.00,1.00 --120.00,28.80,1.00,0.00,1.00 --124.80,28.80,1.00,0.00,1.00 --129.60,28.80,1.00,0.00,1.00 --134.40,24.00,1.00,0.00,1.00 --139.20,24.00,1.00,0.00,1.00 --144.00,19.20,1.00,0.00,1.00 --148.80,19.20,1.00,0.00,1.00 --153.60,14.40,1.00,0.00,1.00 --158.40,14.40,1.00,0.00,1.00 --163.20,9.60,1.00,0.00,1.00 --168.00,9.60,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -168.00,-4.80,1.00,0.00,1.00 -168.00,-9.60,1.00,0.00,1.00 -163.20,-9.60,1.00,0.00,1.00 -158.40,-14.40,1.00,0.00,1.00 -153.60,-14.40,1.00,0.00,1.00 -148.80,-19.20,1.00,0.00,1.00 -144.00,-19.20,1.00,0.00,1.00 -139.20,-24.00,1.00,0.00,1.00 -134.40,-24.00,1.00,0.00,1.00 -129.60,-28.80,1.00,0.00,1.00 -124.80,-28.80,1.00,0.00,1.00 -120.00,-28.80,1.00,0.00,1.00 -115.20,-33.60,1.00,0.00,1.00 -110.40,-33.60,1.00,0.00,1.00 -100.80,-33.60,1.00,0.00,1.00 -96.00,-33.60,1.00,0.00,1.00 -91.20,-33.60,1.00,0.00,1.00 -86.40,-33.60,1.00,0.00,1.00 -81.60,-33.60,1.00,0.00,1.00 -72.00,-33.60,1.00,0.00,1.00 -67.20,-33.60,1.00,0.00,1.00 -62.40,-28.80,1.00,0.00,1.00 -57.60,-28.80,1.00,0.00,1.00 -52.80,-28.80,1.00,0.00,1.00 -48.00,-24.00,1.00,0.00,1.00 -43.20,-24.00,1.00,0.00,1.00 -38.40,-24.00,1.00,0.00,1.00 -33.60,-19.20,1.00,0.00,1.00 -28.80,-19.20,1.00,0.00,1.00 -24.00,-14.40,1.00,0.00,1.00 -19.20,-14.40,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 --19.20,9.60,1.00,0.00,1.00 --19.20,9.60,1.00,0.00,1.00 --24.00,14.40,1.00,0.00,1.00 --28.80,14.40,1.00,0.00,1.00 --33.60,19.20,1.00,0.00,1.00 --38.40,19.20,1.00,0.00,1.00 --43.20,19.20,1.00,0.00,1.00 --48.00,24.00,1.00,0.00,1.00 --52.80,24.00,1.00,0.00,1.00 --57.60,24.00,1.00,0.00,1.00 --62.40,24.00,1.00,0.00,1.00 --72.00,28.80,1.00,0.00,1.00 --76.80,28.80,1.00,0.00,1.00 --81.60,28.80,1.00,0.00,1.00 --86.40,28.80,1.00,0.00,1.00 --91.20,28.80,1.00,0.00,1.00 --96.00,28.80,1.00,0.00,1.00 --100.80,28.80,1.00,0.00,1.00 --105.60,28.80,1.00,0.00,1.00 --115.20,28.80,1.00,0.00,1.00 --120.00,24.00,1.00,0.00,1.00 --124.80,24.00,1.00,0.00,1.00 --129.60,24.00,1.00,0.00,1.00 --134.40,24.00,1.00,0.00,1.00 --139.20,19.20,1.00,0.00,1.00 --144.00,19.20,1.00,0.00,1.00 --148.80,14.40,1.00,0.00,1.00 --153.60,14.40,1.00,0.00,1.00 --158.40,14.40,1.00,0.00,1.00 --163.20,9.60,1.00,0.00,1.00 --163.20,9.60,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -168.00,-4.80,1.00,0.00,1.00 -163.20,-9.60,1.00,0.00,1.00 -163.20,-9.60,1.00,0.00,1.00 -158.40,-14.40,1.00,0.00,1.00 -153.60,-14.40,1.00,0.00,1.00 -148.80,-14.40,1.00,0.00,1.00 -144.00,-19.20,1.00,0.00,1.00 -139.20,-19.20,1.00,0.00,1.00 -134.40,-24.00,1.00,0.00,1.00 -129.60,-24.00,1.00,0.00,1.00 -124.80,-24.00,1.00,0.00,1.00 -120.00,-24.00,1.00,0.00,1.00 -115.20,-28.80,1.00,0.00,1.00 -105.60,-28.80,1.00,0.00,1.00 -100.80,-28.80,1.00,0.00,1.00 -96.00,-28.80,1.00,0.00,1.00 -91.20,-28.80,1.00,0.00,1.00 -86.40,-28.80,1.00,0.00,1.00 -81.60,-28.80,1.00,0.00,1.00 -76.80,-28.80,1.00,0.00,1.00 -72.00,-28.80,1.00,0.00,1.00 -62.40,-24.00,1.00,0.00,1.00 -57.60,-24.00,1.00,0.00,1.00 -52.80,-24.00,1.00,0.00,1.00 -48.00,-24.00,1.00,0.00,1.00 -43.20,-19.20,1.00,0.00,1.00 -38.40,-19.20,1.00,0.00,1.00 -33.60,-19.20,1.00,0.00,1.00 -28.80,-14.40,1.00,0.00,1.00 -24.00,-14.40,1.00,0.00,1.00 -19.20,-9.60,1.00,0.00,1.00 -19.20,-9.60,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 --19.20,9.60,1.00,0.00,1.00 --24.00,9.60,1.00,0.00,1.00 --28.80,9.60,1.00,0.00,1.00 --33.60,14.40,1.00,0.00,1.00 --33.60,14.40,1.00,0.00,1.00 --38.40,14.40,1.00,0.00,1.00 --43.20,19.20,1.00,0.00,1.00 --48.00,19.20,1.00,0.00,1.00 --57.60,19.20,1.00,0.00,1.00 --62.40,19.20,1.00,0.00,1.00 --67.20,24.00,1.00,0.00,1.00 --72.00,24.00,1.00,0.00,1.00 --76.80,24.00,1.00,0.00,1.00 --81.60,24.00,1.00,0.00,1.00 --86.40,24.00,1.00,0.00,1.00 --91.20,24.00,1.00,0.00,1.00 --96.00,24.00,1.00,0.00,1.00 --100.80,24.00,1.00,0.00,1.00 --105.60,24.00,1.00,0.00,1.00 --110.40,24.00,1.00,0.00,1.00 --115.20,19.20,1.00,0.00,1.00 --120.00,19.20,1.00,0.00,1.00 --129.60,19.20,1.00,0.00,1.00 --134.40,19.20,1.00,0.00,1.00 --139.20,19.20,1.00,0.00,1.00 --144.00,14.40,1.00,0.00,1.00 --148.80,14.40,1.00,0.00,1.00 --148.80,14.40,1.00,0.00,1.00 --153.60,9.60,1.00,0.00,1.00 --158.40,9.60,1.00,0.00,1.00 --163.20,4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 --172.80,4.80,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 -168.00,-4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 -158.40,-9.60,1.00,0.00,1.00 -153.60,-9.60,1.00,0.00,1.00 -148.80,-14.40,1.00,0.00,1.00 -148.80,-14.40,1.00,0.00,1.00 -144.00,-14.40,1.00,0.00,1.00 -139.20,-19.20,1.00,0.00,1.00 -134.40,-19.20,1.00,0.00,1.00 -129.60,-19.20,1.00,0.00,1.00 -120.00,-19.20,1.00,0.00,1.00 -115.20,-19.20,1.00,0.00,1.00 -110.40,-24.00,1.00,0.00,1.00 -105.60,-24.00,1.00,0.00,1.00 -100.80,-24.00,1.00,0.00,1.00 -96.00,-24.00,1.00,0.00,1.00 -91.20,-24.00,1.00,0.00,1.00 -86.40,-24.00,1.00,0.00,1.00 -81.60,-24.00,1.00,0.00,1.00 -76.80,-24.00,1.00,0.00,1.00 -72.00,-24.00,1.00,0.00,1.00 -67.20,-24.00,1.00,0.00,1.00 -62.40,-19.20,1.00,0.00,1.00 -57.60,-19.20,1.00,0.00,1.00 -48.00,-19.20,1.00,0.00,1.00 -43.20,-19.20,1.00,0.00,1.00 -38.40,-14.40,1.00,0.00,1.00 -33.60,-14.40,1.00,0.00,1.00 -33.60,-14.40,1.00,0.00,1.00 -28.80,-9.60,1.00,0.00,1.00 -24.00,-9.60,1.00,0.00,1.00 -19.20,-9.60,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 --19.20,4.80,1.00,0.00,1.00 --24.00,9.60,1.00,0.00,1.00 --28.80,9.60,1.00,0.00,1.00 --33.60,9.60,1.00,0.00,1.00 --38.40,9.60,1.00,0.00,1.00 --43.20,14.40,1.00,0.00,1.00 --48.00,14.40,1.00,0.00,1.00 --52.80,14.40,1.00,0.00,1.00 --57.60,14.40,1.00,0.00,1.00 --62.40,19.20,1.00,0.00,1.00 --67.20,19.20,1.00,0.00,1.00 --72.00,19.20,1.00,0.00,1.00 --76.80,19.20,1.00,0.00,1.00 --81.60,19.20,1.00,0.00,1.00 --86.40,19.20,1.00,0.00,1.00 --91.20,19.20,1.00,0.00,1.00 --96.00,19.20,1.00,0.00,1.00 --100.80,19.20,1.00,0.00,1.00 --105.60,19.20,1.00,0.00,1.00 --110.40,19.20,1.00,0.00,1.00 --115.20,19.20,1.00,0.00,1.00 --120.00,14.40,1.00,0.00,1.00 --124.80,14.40,1.00,0.00,1.00 --129.60,14.40,1.00,0.00,1.00 --134.40,14.40,1.00,0.00,1.00 --139.20,14.40,1.00,0.00,1.00 --144.00,9.60,1.00,0.00,1.00 --148.80,9.60,1.00,0.00,1.00 --153.60,9.60,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 --163.20,4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 -168.00,-4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 -158.40,-4.80,1.00,0.00,1.00 -153.60,-9.60,1.00,0.00,1.00 -148.80,-9.60,1.00,0.00,1.00 -144.00,-9.60,1.00,0.00,1.00 -139.20,-14.40,1.00,0.00,1.00 -134.40,-14.40,1.00,0.00,1.00 -129.60,-14.40,1.00,0.00,1.00 -124.80,-14.40,1.00,0.00,1.00 -120.00,-14.40,1.00,0.00,1.00 -115.20,-19.20,1.00,0.00,1.00 -110.40,-19.20,1.00,0.00,1.00 -105.60,-19.20,1.00,0.00,1.00 -100.80,-19.20,1.00,0.00,1.00 -96.00,-19.20,1.00,0.00,1.00 -91.20,-19.20,1.00,0.00,1.00 -86.40,-19.20,1.00,0.00,1.00 -81.60,-19.20,1.00,0.00,1.00 -76.80,-19.20,1.00,0.00,1.00 -72.00,-19.20,1.00,0.00,1.00 -67.20,-19.20,1.00,0.00,1.00 -62.40,-19.20,1.00,0.00,1.00 -57.60,-14.40,1.00,0.00,1.00 -52.80,-14.40,1.00,0.00,1.00 -48.00,-14.40,1.00,0.00,1.00 -43.20,-14.40,1.00,0.00,1.00 -38.40,-9.60,1.00,0.00,1.00 -33.60,-9.60,1.00,0.00,1.00 -28.80,-9.60,1.00,0.00,1.00 -24.00,-9.60,1.00,0.00,1.00 -19.20,-4.80,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 --19.20,4.80,1.00,0.00,1.00 --24.00,4.80,1.00,0.00,1.00 --28.80,4.80,1.00,0.00,1.00 --33.60,9.60,1.00,0.00,1.00 --38.40,9.60,1.00,0.00,1.00 --43.20,9.60,1.00,0.00,1.00 --48.00,9.60,1.00,0.00,1.00 --52.80,9.60,1.00,0.00,1.00 --57.60,14.40,1.00,0.00,1.00 --62.40,14.40,1.00,0.00,1.00 --67.20,14.40,1.00,0.00,1.00 --72.00,14.40,1.00,0.00,1.00 --76.80,14.40,1.00,0.00,1.00 --81.60,14.40,1.00,0.00,1.00 --86.40,14.40,1.00,0.00,1.00 --91.20,14.40,1.00,0.00,1.00 --96.00,14.40,1.00,0.00,1.00 --100.80,14.40,1.00,0.00,1.00 --105.60,14.40,1.00,0.00,1.00 --110.40,14.40,1.00,0.00,1.00 --115.20,14.40,1.00,0.00,1.00 --120.00,14.40,1.00,0.00,1.00 --124.80,9.60,1.00,0.00,1.00 --129.60,9.60,1.00,0.00,1.00 --134.40,9.60,1.00,0.00,1.00 --139.20,9.60,1.00,0.00,1.00 --144.00,9.60,1.00,0.00,1.00 --148.80,9.60,1.00,0.00,1.00 --153.60,4.80,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 --163.20,4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 -168.00,-4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 -158.40,-4.80,1.00,0.00,1.00 -153.60,-4.80,1.00,0.00,1.00 -148.80,-9.60,1.00,0.00,1.00 -144.00,-9.60,1.00,0.00,1.00 -139.20,-9.60,1.00,0.00,1.00 -134.40,-9.60,1.00,0.00,1.00 -129.60,-9.60,1.00,0.00,1.00 -124.80,-9.60,1.00,0.00,1.00 -120.00,-14.40,1.00,0.00,1.00 -115.20,-14.40,1.00,0.00,1.00 -110.40,-14.40,1.00,0.00,1.00 -105.60,-14.40,1.00,0.00,1.00 -100.80,-14.40,1.00,0.00,1.00 -96.00,-14.40,1.00,0.00,1.00 -91.20,-14.40,1.00,0.00,1.00 -86.40,-14.40,1.00,0.00,1.00 -81.60,-14.40,1.00,0.00,1.00 -76.80,-14.40,1.00,0.00,1.00 -72.00,-14.40,1.00,0.00,1.00 -67.20,-14.40,1.00,0.00,1.00 -62.40,-14.40,1.00,0.00,1.00 -57.60,-14.40,1.00,0.00,1.00 -52.80,-9.60,1.00,0.00,1.00 -48.00,-9.60,1.00,0.00,1.00 -43.20,-9.60,1.00,0.00,1.00 -38.40,-9.60,1.00,0.00,1.00 -33.60,-9.60,1.00,0.00,1.00 -28.80,-4.80,1.00,0.00,1.00 -24.00,-4.80,1.00,0.00,1.00 -19.20,-4.80,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 -9.60,-0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 --14.40,0.00,1.00,0.00,1.00 --19.20,4.80,1.00,0.00,1.00 --24.00,4.80,1.00,0.00,1.00 --28.80,4.80,1.00,0.00,1.00 --33.60,4.80,1.00,0.00,1.00 --38.40,4.80,1.00,0.00,1.00 --43.20,4.80,1.00,0.00,1.00 --48.00,4.80,1.00,0.00,1.00 --52.80,9.60,1.00,0.00,1.00 --57.60,9.60,1.00,0.00,1.00 --62.40,9.60,1.00,0.00,1.00 --67.20,9.60,1.00,0.00,1.00 --72.00,9.60,1.00,0.00,1.00 --76.80,9.60,1.00,0.00,1.00 --81.60,9.60,1.00,0.00,1.00 --86.40,9.60,1.00,0.00,1.00 --91.20,9.60,1.00,0.00,1.00 --96.00,9.60,1.00,0.00,1.00 --100.80,9.60,1.00,0.00,1.00 --105.60,9.60,1.00,0.00,1.00 --110.40,9.60,1.00,0.00,1.00 --115.20,9.60,1.00,0.00,1.00 --120.00,9.60,1.00,0.00,1.00 --124.80,9.60,1.00,0.00,1.00 --129.60,9.60,1.00,0.00,1.00 --134.40,4.80,1.00,0.00,1.00 --139.20,4.80,1.00,0.00,1.00 --144.00,4.80,1.00,0.00,1.00 --148.80,4.80,1.00,0.00,1.00 --153.60,4.80,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 --163.20,4.80,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 -168.00,-0.00,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 -158.40,-4.80,1.00,0.00,1.00 -153.60,-4.80,1.00,0.00,1.00 -148.80,-4.80,1.00,0.00,1.00 -144.00,-4.80,1.00,0.00,1.00 -139.20,-4.80,1.00,0.00,1.00 -134.40,-4.80,1.00,0.00,1.00 -129.60,-9.60,1.00,0.00,1.00 -124.80,-9.60,1.00,0.00,1.00 -120.00,-9.60,1.00,0.00,1.00 -115.20,-9.60,1.00,0.00,1.00 -110.40,-9.60,1.00,0.00,1.00 -105.60,-9.60,1.00,0.00,1.00 -100.80,-9.60,1.00,0.00,1.00 -96.00,-9.60,1.00,0.00,1.00 -91.20,-9.60,1.00,0.00,1.00 -86.40,-9.60,1.00,0.00,1.00 -81.60,-9.60,1.00,0.00,1.00 -76.80,-9.60,1.00,0.00,1.00 -72.00,-9.60,1.00,0.00,1.00 -67.20,-9.60,1.00,0.00,1.00 -62.40,-9.60,1.00,0.00,1.00 -57.60,-9.60,1.00,0.00,1.00 -52.80,-9.60,1.00,0.00,1.00 -48.00,-4.80,1.00,0.00,1.00 -43.20,-4.80,1.00,0.00,1.00 -38.40,-4.80,1.00,0.00,1.00 -33.60,-4.80,1.00,0.00,1.00 -28.80,-4.80,1.00,0.00,1.00 -24.00,-4.80,1.00,0.00,1.00 -19.20,-4.80,1.00,0.00,1.00 -14.40,-0.00,1.00,0.00,1.00 -9.60,-0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 --14.40,0.00,1.00,0.00,1.00 --19.20,0.00,1.00,0.00,1.00 --24.00,0.00,1.00,0.00,1.00 --28.80,0.00,1.00,0.00,1.00 --33.60,4.80,1.00,0.00,1.00 --38.40,4.80,1.00,0.00,1.00 --43.20,4.80,1.00,0.00,1.00 --48.00,4.80,1.00,0.00,1.00 --52.80,4.80,1.00,0.00,1.00 --57.60,4.80,1.00,0.00,1.00 --62.40,4.80,1.00,0.00,1.00 --67.20,4.80,1.00,0.00,1.00 --72.00,4.80,1.00,0.00,1.00 --76.80,4.80,1.00,0.00,1.00 --81.60,4.80,1.00,0.00,1.00 --86.40,4.80,1.00,0.00,1.00 --91.20,4.80,1.00,0.00,1.00 --96.00,4.80,1.00,0.00,1.00 --100.80,4.80,1.00,0.00,1.00 --105.60,4.80,1.00,0.00,1.00 --110.40,4.80,1.00,0.00,1.00 --115.20,4.80,1.00,0.00,1.00 --120.00,4.80,1.00,0.00,1.00 --124.80,4.80,1.00,0.00,1.00 --129.60,4.80,1.00,0.00,1.00 --134.40,4.80,1.00,0.00,1.00 --139.20,4.80,1.00,0.00,1.00 --144.00,4.80,1.00,0.00,1.00 --148.80,4.80,1.00,0.00,1.00 --153.60,0.00,1.00,0.00,1.00 --158.40,0.00,1.00,0.00,1.00 --163.20,0.00,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 -168.00,-0.00,1.00,0.00,1.00 -163.20,-0.00,1.00,0.00,1.00 -158.40,-0.00,1.00,0.00,1.00 -153.60,-0.00,1.00,0.00,1.00 -148.80,-4.80,1.00,0.00,1.00 -144.00,-4.80,1.00,0.00,1.00 -139.20,-4.80,1.00,0.00,1.00 -134.40,-4.80,1.00,0.00,1.00 -129.60,-4.80,1.00,0.00,1.00 -124.80,-4.80,1.00,0.00,1.00 -120.00,-4.80,1.00,0.00,1.00 -115.20,-4.80,1.00,0.00,1.00 -110.40,-4.80,1.00,0.00,1.00 -105.60,-4.80,1.00,0.00,1.00 -100.80,-4.80,1.00,0.00,1.00 -96.00,-4.80,1.00,0.00,1.00 -91.20,-4.80,1.00,0.00,1.00 -86.40,-4.80,1.00,0.00,1.00 -81.60,-4.80,1.00,0.00,1.00 -76.80,-4.80,1.00,0.00,1.00 -72.00,-4.80,1.00,0.00,1.00 -67.20,-4.80,1.00,0.00,1.00 -62.40,-4.80,1.00,0.00,1.00 -57.60,-4.80,1.00,0.00,1.00 -52.80,-4.80,1.00,0.00,1.00 -48.00,-4.80,1.00,0.00,1.00 -43.20,-4.80,1.00,0.00,1.00 -38.40,-4.80,1.00,0.00,1.00 -33.60,-4.80,1.00,0.00,1.00 -28.80,-0.00,1.00,0.00,1.00 -24.00,-0.00,1.00,0.00,1.00 -19.20,-0.00,1.00,0.00,1.00 -14.40,-0.00,1.00,0.00,1.00 -9.60,-0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 --14.40,0.00,1.00,0.00,1.00 --19.20,0.00,1.00,0.00,1.00 --24.00,0.00,1.00,0.00,1.00 --28.80,0.00,1.00,0.00,1.00 --33.60,0.00,1.00,0.00,1.00 --38.40,0.00,1.00,0.00,1.00 --43.20,0.00,1.00,0.00,1.00 --48.00,0.00,1.00,0.00,1.00 --52.80,0.00,1.00,0.00,1.00 --57.60,0.00,1.00,0.00,1.00 --62.40,0.00,1.00,0.00,1.00 --67.20,0.00,1.00,0.00,1.00 --72.00,0.00,1.00,0.00,1.00 --76.80,0.00,1.00,0.00,1.00 --81.60,0.00,1.00,0.00,1.00 --86.40,0.00,1.00,0.00,1.00 --91.20,0.00,1.00,0.00,1.00 --96.00,0.00,1.00,0.00,1.00 --100.80,0.00,1.00,0.00,1.00 --105.60,0.00,1.00,0.00,1.00 --110.40,0.00,1.00,0.00,1.00 --115.20,0.00,1.00,0.00,1.00 --120.00,0.00,1.00,0.00,1.00 --124.80,0.00,1.00,0.00,1.00 --129.60,0.00,1.00,0.00,1.00 --134.40,0.00,1.00,0.00,1.00 --139.20,0.00,1.00,0.00,1.00 --144.00,0.00,1.00,0.00,1.00 --148.80,0.00,1.00,0.00,1.00 --153.60,0.00,1.00,0.00,1.00 --158.40,0.00,1.00,0.00,1.00 --163.20,0.00,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 -168.00,0.00,1.00,0.00,1.00 -163.20,0.00,1.00,0.00,1.00 -158.40,0.00,1.00,0.00,1.00 -153.60,0.00,1.00,0.00,1.00 -148.80,0.00,1.00,0.00,1.00 -144.00,0.00,1.00,0.00,1.00 -139.20,0.00,1.00,0.00,1.00 -134.40,0.00,1.00,0.00,1.00 -129.60,0.00,1.00,0.00,1.00 -124.80,0.00,1.00,0.00,1.00 -120.00,0.00,1.00,0.00,1.00 -115.20,0.00,1.00,0.00,1.00 -110.40,0.00,1.00,0.00,1.00 -105.60,0.00,1.00,0.00,1.00 -100.80,0.00,1.00,0.00,1.00 -96.00,0.00,1.00,0.00,1.00 -91.20,0.00,1.00,0.00,1.00 -86.40,0.00,1.00,0.00,1.00 -81.60,0.00,1.00,0.00,1.00 -76.80,0.00,1.00,0.00,1.00 -72.00,0.00,1.00,0.00,1.00 -67.20,0.00,1.00,0.00,1.00 -62.40,0.00,1.00,0.00,1.00 -57.60,0.00,1.00,0.00,1.00 -52.80,0.00,1.00,0.00,1.00 -48.00,0.00,1.00,0.00,1.00 -43.20,0.00,1.00,0.00,1.00 -38.40,0.00,1.00,0.00,1.00 -33.60,0.00,1.00,0.00,1.00 -28.80,0.00,1.00,0.00,1.00 -24.00,0.00,1.00,0.00,1.00 -19.20,0.00,1.00,0.00,1.00 -14.40,0.00,1.00,0.00,1.00 -9.60,0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 +0.00,4.80,16.00,0.00,1.00,0.00,0.00 +0.00,9.60,15.98,0.00,1.00,-177.60,4.80 +0.00,14.40,15.96,0.00,1.00,4.80,9.60 +0.00,19.20,15.94,0.00,1.00,-168.00,14.40 +0.00,24.00,15.91,0.00,1.00,14.40,19.20 +0.00,28.80,15.89,0.00,1.00,-163.20,24.00 +0.00,33.60,15.87,0.00,1.00,19.20,28.80 +0.00,38.40,15.85,0.00,1.00,-153.60,33.60 +0.00,43.20,15.83,0.00,1.00,28.80,38.40 +0.00,48.00,15.81,0.00,1.00,-148.80,43.20 +0.00,52.80,15.79,0.00,1.00,38.40,48.00 +0.00,57.60,15.77,0.00,1.00,-139.20,52.80 +0.00,62.40,15.74,0.00,1.00,48.00,57.60 +4.80,67.20,15.72,0.00,1.00,-124.80,62.40 +4.80,72.00,15.70,0.00,1.00,57.60,67.20 +4.80,76.80,15.68,0.00,1.00,-115.20,72.00 +9.60,81.60,15.66,0.00,1.00,72.00,76.80 +19.20,86.40,15.64,0.00,1.00,-100.80,81.60 +134.40,86.40,15.62,0.00,1.00,86.40,86.40 +168.00,81.60,15.59,0.00,1.00,-86.40,89.20 +172.80,76.80,15.57,0.00,1.00,100.80,86.40 +177.60,72.00,15.55,0.00,1.00,-76.80,81.60 +177.60,67.20,15.53,0.00,1.00,110.40,76.80 +177.60,62.40,15.51,0.00,1.00,-62.40,72.00 +177.60,57.60,15.49,0.00,1.00,124.80,67.20 +177.60,52.80,15.47,0.00,1.00,-52.80,62.40 +177.60,48.00,15.44,0.00,1.00,134.40,57.60 +177.60,43.20,15.42,0.00,1.00,-38.40,52.80 +177.60,38.40,15.40,0.00,1.00,144.00,48.00 +177.60,33.60,15.38,0.00,1.00,-33.60,43.20 +177.60,28.80,15.36,0.00,1.00,153.60,38.40 +177.60,24.00,15.34,0.00,1.00,-24.00,33.60 +177.60,19.20,15.32,0.00,1.00,158.40,28.80 +177.60,14.40,15.30,0.00,1.00,-14.40,24.00 +177.60,9.60,15.27,0.00,1.00,168.00,19.20 +177.60,4.80,15.25,0.00,1.00,-9.60,14.40 +177.60,0.00,15.23,0.00,1.00,172.80,9.60 +-177.60,-0.00,15.21,0.00,1.00,-0.00,4.80 +-177.60,-4.80,15.19,0.00,1.00,-177.60,-0.00 +-177.60,-9.60,15.17,0.00,1.00,4.80,-4.80 +-177.60,-14.40,15.15,0.00,1.00,-172.80,-9.60 +-177.60,-19.20,15.12,0.00,1.00,14.40,-14.40 +-177.60,-24.00,15.10,0.00,1.00,-163.20,-19.20 +-177.60,-28.80,15.08,0.00,1.00,19.20,-24.00 +-177.60,-33.60,15.06,0.00,1.00,-158.40,-28.80 +-177.60,-38.40,15.04,0.00,1.00,28.80,-33.60 +-177.60,-43.20,15.02,0.00,1.00,-148.80,-38.40 +-177.60,-48.00,15.00,0.00,1.00,33.60,-48.00 +-177.60,-52.80,14.97,0.00,1.00,-139.20,-48.00 +-177.60,-57.60,14.95,0.00,1.00,43.20,-52.80 +-177.60,-62.40,14.93,0.00,1.00,-129.60,-57.60 +-177.60,-67.20,14.91,0.00,1.00,57.60,-62.40 +-177.60,-72.00,14.89,0.00,1.00,-120.00,-67.20 +-172.80,-76.80,14.87,0.00,1.00,67.20,-76.80 +-168.00,-81.60,14.85,0.00,1.00,-105.60,-76.80 +-134.40,-86.40,14.83,0.00,1.00,81.60,-86.40 +-19.20,-86.40,14.80,0.00,1.00,-91.20,-89.20 +-9.60,-81.60,14.78,0.00,1.00,96.00,-86.40 +-4.80,-76.80,14.76,0.00,1.00,-76.80,-81.60 +-4.80,-72.00,14.74,0.00,1.00,110.40,-76.80 +-4.80,-67.20,14.72,0.00,1.00,-67.20,-72.00 +-0.00,-62.40,14.70,0.00,1.00,120.00,-67.20 +-0.00,-57.60,14.68,0.00,1.00,-52.80,-62.40 +-0.00,-52.80,14.65,0.00,1.00,129.60,-57.60 +-0.00,-48.00,14.63,0.00,1.00,-43.20,-52.80 +-0.00,-43.20,14.61,0.00,1.00,144.00,-48.00 +-0.00,-38.40,14.59,0.00,1.00,-33.60,-43.20 +-0.00,-33.60,14.57,0.00,1.00,148.80,-38.40 +-0.00,-28.80,14.55,0.00,1.00,-24.00,-33.60 +-0.00,-24.00,14.53,0.00,1.00,158.40,-28.80 +-0.00,-19.20,14.50,0.00,1.00,-19.20,-24.00 +-0.00,-14.40,14.48,0.00,1.00,168.00,-19.20 +-0.00,-9.60,14.46,0.00,1.00,-9.60,-14.40 +-0.00,-4.80,14.44,0.00,1.00,172.80,-9.60 +-0.00,0.00,14.42,0.00,1.00,-4.80,-4.80 +-0.00,4.80,14.40,0.00,1.00,0.00,0.00 +-0.00,9.60,14.38,0.00,1.00,-177.60,4.80 +-0.00,14.40,14.36,0.00,1.00,9.60,9.60 +-0.00,19.20,14.33,0.00,1.00,-168.00,14.40 +-0.00,24.00,14.31,0.00,1.00,14.40,19.20 +-0.00,28.80,14.29,0.00,1.00,-163.20,24.00 +-0.00,33.60,14.27,0.00,1.00,24.00,28.80 +-4.80,38.40,14.25,0.00,1.00,-153.60,33.60 +-4.80,43.20,14.23,0.00,1.00,28.80,38.40 +-4.80,48.00,14.21,0.00,1.00,-144.00,43.20 +-4.80,52.80,14.18,0.00,1.00,38.40,48.00 +-4.80,57.60,14.16,0.00,1.00,-134.40,52.80 +-4.80,62.40,14.14,0.00,1.00,48.00,57.60 +-9.60,67.20,14.12,0.00,1.00,-124.80,62.40 +-9.60,72.00,14.10,0.00,1.00,62.40,67.20 +-14.40,76.80,14.08,0.00,1.00,-115.20,72.00 +-24.00,81.60,14.06,0.00,1.00,72.00,76.80 +-43.20,86.40,14.03,0.00,1.00,-100.80,81.60 +-110.40,86.40,14.01,0.00,1.00,86.40,86.40 +-148.80,81.60,13.99,0.00,1.00,-86.40,86.40 +-163.20,76.80,13.97,0.00,1.00,96.00,81.60 +-168.00,72.00,13.95,0.00,1.00,-76.80,76.80 +-172.80,67.20,13.93,0.00,1.00,110.40,72.00 +-172.80,62.40,13.91,0.00,1.00,-62.40,67.20 +-172.80,57.60,13.89,0.00,1.00,120.00,62.40 +-172.80,52.80,13.86,0.00,1.00,-52.80,57.60 +-177.60,48.00,13.84,0.00,1.00,134.40,52.80 +-177.60,43.20,13.82,0.00,1.00,-43.20,48.00 +-177.60,38.40,13.80,0.00,1.00,144.00,43.20 +-177.60,33.60,13.78,0.00,1.00,-33.60,38.40 +-177.60,28.80,13.76,0.00,1.00,148.80,33.60 +-177.60,24.00,13.74,0.00,1.00,-24.00,28.80 +-177.60,19.20,13.71,0.00,1.00,158.40,24.00 +-177.60,14.40,13.69,0.00,1.00,-19.20,19.20 +-177.60,9.60,13.67,0.00,1.00,168.00,14.40 +-177.60,4.80,13.65,0.00,1.00,-9.60,9.60 +-177.60,0.00,13.63,0.00,1.00,172.80,4.80 +177.60,-0.00,13.61,0.00,1.00,-0.00,0.00 +177.60,-4.80,13.59,0.00,1.00,-177.60,-0.00 +177.60,-9.60,13.56,0.00,1.00,4.80,-4.80 +177.60,-14.40,13.54,0.00,1.00,-172.80,-9.60 +177.60,-19.20,13.52,0.00,1.00,14.40,-14.40 +177.60,-24.00,13.50,0.00,1.00,-163.20,-19.20 +177.60,-28.80,13.48,0.00,1.00,19.20,-24.00 +177.60,-33.60,13.46,0.00,1.00,-153.60,-28.80 +177.60,-38.40,13.44,0.00,1.00,28.80,-33.60 +177.60,-43.20,13.42,0.00,1.00,-148.80,-38.40 +177.60,-48.00,13.39,0.00,1.00,38.40,-43.20 +172.80,-52.80,13.37,0.00,1.00,-139.20,-48.00 +172.80,-57.60,13.35,0.00,1.00,48.00,-52.80 +172.80,-62.40,13.33,0.00,1.00,-124.80,-57.60 +172.80,-67.20,13.31,0.00,1.00,57.60,-62.40 +168.00,-72.00,13.29,0.00,1.00,-115.20,-67.20 +163.20,-76.80,13.27,0.00,1.00,72.00,-72.00 +148.80,-81.60,13.24,0.00,1.00,-105.60,-76.80 +110.40,-86.40,13.22,0.00,1.00,81.60,-81.60 +43.20,-86.40,13.20,0.00,1.00,-91.20,-86.40 +24.00,-81.60,13.18,0.00,1.00,96.00,-86.40 +14.40,-76.80,13.16,0.00,1.00,-76.80,-81.60 +9.60,-72.00,13.14,0.00,1.00,105.60,-76.80 +9.60,-67.20,13.12,0.00,1.00,-67.20,-72.00 +4.80,-62.40,13.09,0.00,1.00,120.00,-67.20 +4.80,-57.60,13.07,0.00,1.00,-57.60,-62.40 +4.80,-52.80,13.05,0.00,1.00,129.60,-57.60 +4.80,-48.00,13.03,0.00,1.00,-43.20,-52.80 +4.80,-43.20,13.01,0.00,1.00,139.20,-48.00 +4.80,-38.40,12.99,0.00,1.00,-33.60,-43.20 +0.00,-33.60,12.97,0.00,1.00,148.80,-38.40 +0.00,-28.80,12.95,0.00,1.00,-28.80,-33.60 +0.00,-24.00,12.92,0.00,1.00,158.40,-28.80 +0.00,-19.20,12.90,0.00,1.00,-19.20,-24.00 +0.00,-14.40,12.88,0.00,1.00,163.20,-19.20 +0.00,-9.60,12.86,0.00,1.00,-9.60,-14.40 +0.00,-4.80,12.84,0.00,1.00,172.80,-9.60 +0.00,0.00,12.82,0.00,1.00,-4.80,-4.80 +-0.00,4.80,12.80,0.00,1.00,0.00,0.00 +-0.00,9.60,12.77,0.00,1.00,-177.60,4.80 +-0.00,14.40,12.75,0.00,1.00,9.60,9.60 +-4.80,19.20,12.73,0.00,1.00,-168.00,14.40 +-4.80,24.00,12.71,0.00,1.00,14.40,19.20 +-4.80,28.80,12.69,0.00,1.00,-158.40,24.00 +-4.80,33.60,12.67,0.00,1.00,24.00,28.80 +-4.80,38.40,12.65,0.00,1.00,-153.60,33.60 +-9.60,43.20,12.62,0.00,1.00,33.60,38.40 +-9.60,48.00,12.60,0.00,1.00,-144.00,43.20 +-9.60,52.80,12.58,0.00,1.00,43.20,48.00 +-14.40,57.60,12.56,0.00,1.00,-134.40,52.80 +-14.40,62.40,12.54,0.00,1.00,52.80,57.60 +-19.20,67.20,12.52,0.00,1.00,-124.80,62.40 +-24.00,72.00,12.50,0.00,1.00,62.40,67.20 +-33.60,72.00,12.48,0.00,1.00,-110.40,72.00 +-43.20,76.80,12.45,0.00,1.00,72.00,72.00 +-67.20,81.60,12.43,0.00,1.00,-100.80,76.80 +-96.00,81.60,12.41,0.00,1.00,86.40,81.60 +-124.80,81.60,12.39,0.00,1.00,-86.40,81.60 +-144.00,76.80,12.37,0.00,1.00,96.00,76.80 +-153.60,72.00,12.35,0.00,1.00,-76.80,76.80 +-158.40,67.20,12.33,0.00,1.00,110.40,72.00 +-163.20,62.40,12.30,0.00,1.00,-67.20,67.20 +-168.00,57.60,12.28,0.00,1.00,120.00,62.40 +-168.00,52.80,12.26,0.00,1.00,-52.80,57.60 +-168.00,48.00,12.24,0.00,1.00,129.60,52.80 +-172.80,43.20,12.22,0.00,1.00,-43.20,48.00 +-172.80,38.40,12.20,0.00,1.00,139.20,43.20 +-172.80,33.60,12.18,0.00,1.00,-33.60,38.40 +-172.80,28.80,12.15,0.00,1.00,148.80,33.60 +-177.60,24.00,12.13,0.00,1.00,-24.00,28.80 +-177.60,19.20,12.11,0.00,1.00,158.40,24.00 +-177.60,14.40,12.09,0.00,1.00,-19.20,19.20 +-177.60,9.60,12.07,0.00,1.00,168.00,14.40 +-177.60,4.80,12.05,0.00,1.00,-9.60,9.60 +-177.60,0.00,12.03,0.00,1.00,172.80,4.80 +177.60,-0.00,12.01,0.00,1.00,-0.00,0.00 +177.60,-4.80,11.98,0.00,1.00,-177.60,-0.00 +177.60,-9.60,11.96,0.00,1.00,4.80,-4.80 +177.60,-14.40,11.94,0.00,1.00,-168.00,-9.60 +177.60,-19.20,11.92,0.00,1.00,14.40,-14.40 +177.60,-24.00,11.90,0.00,1.00,-163.20,-19.20 +172.80,-28.80,11.88,0.00,1.00,24.00,-24.00 +172.80,-33.60,11.86,0.00,1.00,-153.60,-28.80 +172.80,-38.40,11.83,0.00,1.00,28.80,-33.60 +172.80,-43.20,11.81,0.00,1.00,-144.00,-38.40 +168.00,-48.00,11.79,0.00,1.00,38.40,-43.20 +168.00,-52.80,11.77,0.00,1.00,-134.40,-48.00 +168.00,-57.60,11.75,0.00,1.00,48.00,-52.80 +163.20,-62.40,11.73,0.00,1.00,-124.80,-57.60 +158.40,-67.20,11.71,0.00,1.00,62.40,-62.40 +153.60,-72.00,11.68,0.00,1.00,-115.20,-67.20 +144.00,-76.80,11.66,0.00,1.00,72.00,-72.00 +124.80,-81.60,11.64,0.00,1.00,-100.80,-76.80 +96.00,-81.60,11.62,0.00,1.00,81.60,-76.80 +67.20,-81.60,11.60,0.00,1.00,-91.20,-81.60 +43.20,-76.80,11.58,0.00,1.00,96.00,-81.60 +33.60,-72.00,11.56,0.00,1.00,-81.60,-76.80 +24.00,-72.00,11.54,0.00,1.00,105.60,-72.00 +19.20,-67.20,11.51,0.00,1.00,-67.20,-72.00 +14.40,-62.40,11.49,0.00,1.00,115.20,-67.20 +14.40,-57.60,11.47,0.00,1.00,-57.60,-62.40 +9.60,-52.80,11.45,0.00,1.00,129.60,-57.60 +9.60,-48.00,11.43,0.00,1.00,-48.00,-52.80 +9.60,-43.20,11.41,0.00,1.00,139.20,-48.00 +4.80,-38.40,11.39,0.00,1.00,-38.40,-43.20 +4.80,-33.60,11.36,0.00,1.00,148.80,-38.40 +4.80,-28.80,11.34,0.00,1.00,-28.80,-33.60 +4.80,-24.00,11.32,0.00,1.00,153.60,-28.80 +4.80,-19.20,11.30,0.00,1.00,-19.20,-24.00 +0.00,-14.40,11.28,0.00,1.00,163.20,-19.20 +0.00,-9.60,11.26,0.00,1.00,-9.60,-14.40 +0.00,-4.80,11.24,0.00,1.00,172.80,-9.60 +0.00,0.00,11.21,0.00,1.00,-4.80,-4.80 +-0.00,4.80,11.19,0.00,1.00,0.00,0.00 +-0.00,9.60,11.17,0.00,1.00,-177.60,4.80 +-4.80,14.40,11.15,0.00,1.00,9.60,9.60 +-4.80,19.20,11.13,0.00,1.00,-168.00,14.40 +-4.80,24.00,11.11,0.00,1.00,14.40,19.20 +-4.80,28.80,11.09,0.00,1.00,-158.40,24.00 +-9.60,33.60,11.07,0.00,1.00,24.00,28.80 +-9.60,38.40,11.04,0.00,1.00,-148.80,33.60 +-14.40,43.20,11.02,0.00,1.00,33.60,38.40 +-14.40,48.00,11.00,0.00,1.00,-139.20,43.20 +-14.40,52.80,10.98,0.00,1.00,43.20,48.00 +-19.20,57.60,10.96,0.00,1.00,-129.60,52.80 +-24.00,57.60,10.94,0.00,1.00,52.80,52.80 +-28.80,62.40,10.92,0.00,1.00,-120.00,57.60 +-33.60,67.20,10.89,0.00,1.00,62.40,62.40 +-43.20,72.00,10.87,0.00,1.00,-110.40,67.20 +-57.60,72.00,10.85,0.00,1.00,76.80,72.00 +-76.80,76.80,10.83,0.00,1.00,-100.80,72.00 +-96.00,76.80,10.81,0.00,1.00,86.40,76.80 +-115.20,76.80,10.79,0.00,1.00,-86.40,76.80 +-129.60,72.00,10.77,0.00,1.00,96.00,76.80 +-139.20,72.00,10.74,0.00,1.00,-76.80,72.00 +-148.80,67.20,10.72,0.00,1.00,105.60,67.20 +-153.60,62.40,10.70,0.00,1.00,-67.20,67.20 +-158.40,57.60,10.68,0.00,1.00,120.00,62.40 +-163.20,52.80,10.66,0.00,1.00,-57.60,57.60 +-163.20,48.00,10.64,0.00,1.00,129.60,52.80 +-168.00,43.20,10.62,0.00,1.00,-48.00,48.00 +-168.00,38.40,10.60,0.00,1.00,139.20,43.20 +-172.80,33.60,10.57,0.00,1.00,-38.40,38.40 +-172.80,28.80,10.55,0.00,1.00,148.80,33.60 +-172.80,24.00,10.53,0.00,1.00,-28.80,28.80 +-172.80,19.20,10.51,0.00,1.00,158.40,24.00 +-177.60,14.40,10.49,0.00,1.00,-19.20,19.20 +-177.60,9.60,10.47,0.00,1.00,163.20,14.40 +-177.60,4.80,10.45,0.00,1.00,-9.60,9.60 +-177.60,0.00,10.42,0.00,1.00,172.80,4.80 +177.60,-0.00,10.40,0.00,1.00,-0.00,0.00 +177.60,-4.80,10.38,0.00,1.00,-177.60,-0.00 +177.60,-9.60,10.36,0.00,1.00,4.80,-4.80 +177.60,-14.40,10.34,0.00,1.00,-168.00,-9.60 +172.80,-19.20,10.32,0.00,1.00,14.40,-14.40 +172.80,-24.00,10.30,0.00,1.00,-163.20,-19.20 +172.80,-28.80,10.28,0.00,1.00,24.00,-24.00 +172.80,-33.60,10.25,0.00,1.00,-153.60,-28.80 +168.00,-38.40,10.23,0.00,1.00,33.60,-33.60 +168.00,-43.20,10.21,0.00,1.00,-144.00,-38.40 +163.20,-48.00,10.19,0.00,1.00,43.20,-43.20 +163.20,-52.80,10.17,0.00,1.00,-134.40,-48.00 +158.40,-57.60,10.15,0.00,1.00,52.80,-52.80 +153.60,-62.40,10.13,0.00,1.00,-124.80,-57.60 +148.80,-67.20,10.10,0.00,1.00,62.40,-62.40 +139.20,-72.00,10.08,0.00,1.00,-115.20,-67.20 +129.60,-72.00,10.06,0.00,1.00,72.00,-67.20 +115.20,-76.80,10.04,0.00,1.00,-100.80,-72.00 +96.00,-76.80,10.02,0.00,1.00,81.60,-76.80 +76.80,-76.80,10.00,0.00,1.00,-91.20,-76.80 +57.60,-72.00,9.98,0.00,1.00,96.00,-76.80 +43.20,-72.00,9.95,0.00,1.00,-81.60,-72.00 +33.60,-67.20,9.93,0.00,1.00,105.60,-72.00 +28.80,-62.40,9.91,0.00,1.00,-67.20,-67.20 +24.00,-57.60,9.89,0.00,1.00,115.20,-62.40 +19.20,-57.60,9.87,0.00,1.00,-57.60,-57.60 +14.40,-52.80,9.85,0.00,1.00,124.80,-52.80 +14.40,-48.00,9.83,0.00,1.00,-48.00,-52.80 +14.40,-43.20,9.81,0.00,1.00,134.40,-48.00 +9.60,-38.40,9.78,0.00,1.00,-38.40,-43.20 +9.60,-33.60,9.76,0.00,1.00,144.00,-38.40 +4.80,-28.80,9.74,0.00,1.00,-28.80,-33.60 +4.80,-24.00,9.72,0.00,1.00,153.60,-28.80 +4.80,-19.20,9.70,0.00,1.00,-19.20,-24.00 +4.80,-14.40,9.68,0.00,1.00,163.20,-19.20 +0.00,-9.60,9.66,0.00,1.00,-14.40,-14.40 +0.00,-4.80,9.63,0.00,1.00,172.80,-9.60 +0.00,0.00,9.61,0.00,1.00,-4.80,-4.80 +-0.00,4.80,9.59,0.00,1.00,0.00,0.00 +-4.80,9.60,9.57,0.00,1.00,-177.60,4.80 +-4.80,14.40,9.55,0.00,1.00,9.60,9.60 +-4.80,19.20,9.53,0.00,1.00,-168.00,14.40 +-9.60,24.00,9.51,0.00,1.00,19.20,19.20 +-9.60,28.80,9.48,0.00,1.00,-158.40,24.00 +-9.60,33.60,9.46,0.00,1.00,24.00,28.80 +-14.40,38.40,9.44,0.00,1.00,-148.80,33.60 +-14.40,38.40,9.42,0.00,1.00,33.60,33.60 +-19.20,43.20,9.40,0.00,1.00,-139.20,38.40 +-24.00,48.00,9.38,0.00,1.00,43.20,43.20 +-24.00,52.80,9.36,0.00,1.00,-129.60,48.00 +-28.80,57.60,9.34,0.00,1.00,52.80,52.80 +-38.40,62.40,9.31,0.00,1.00,-120.00,57.60 +-43.20,62.40,9.29,0.00,1.00,67.20,62.40 +-52.80,67.20,9.27,0.00,1.00,-110.40,62.40 +-62.40,72.00,9.25,0.00,1.00,76.80,67.20 +-76.80,72.00,9.23,0.00,1.00,-100.80,67.20 +-96.00,72.00,9.21,0.00,1.00,86.40,72.00 +-110.40,72.00,9.19,0.00,1.00,-86.40,72.00 +-120.00,67.20,9.16,0.00,1.00,96.00,72.00 +-134.40,67.20,9.14,0.00,1.00,-76.80,67.20 +-139.20,62.40,9.12,0.00,1.00,105.60,67.20 +-148.80,57.60,9.10,0.00,1.00,-67.20,62.40 +-153.60,57.60,9.08,0.00,1.00,115.20,57.60 +-158.40,52.80,9.06,0.00,1.00,-57.60,52.80 +-158.40,48.00,9.04,0.00,1.00,129.60,52.80 +-163.20,43.20,9.01,0.00,1.00,-48.00,48.00 +-163.20,38.40,8.99,0.00,1.00,139.20,43.20 +-168.00,33.60,8.97,0.00,1.00,-38.40,38.40 +-168.00,28.80,8.95,0.00,1.00,148.80,33.60 +-172.80,24.00,8.93,0.00,1.00,-28.80,28.80 +-172.80,19.20,8.91,0.00,1.00,153.60,24.00 +-172.80,14.40,8.89,0.00,1.00,-19.20,19.20 +-177.60,9.60,8.87,0.00,1.00,163.20,14.40 +-177.60,4.80,8.84,0.00,1.00,-9.60,9.60 +-177.60,0.00,8.82,0.00,1.00,172.80,4.80 +177.60,-0.00,8.80,0.00,1.00,-0.00,0.00 +177.60,-4.80,8.78,0.00,1.00,-177.60,-0.00 +177.60,-9.60,8.76,0.00,1.00,4.80,-4.80 +172.80,-14.40,8.74,0.00,1.00,-168.00,-9.60 +172.80,-19.20,8.72,0.00,1.00,14.40,-14.40 +172.80,-24.00,8.69,0.00,1.00,-158.40,-19.20 +168.00,-28.80,8.67,0.00,1.00,24.00,-24.00 +168.00,-33.60,8.65,0.00,1.00,-153.60,-28.80 +163.20,-38.40,8.63,0.00,1.00,33.60,-33.60 +163.20,-43.20,8.61,0.00,1.00,-144.00,-38.40 +158.40,-48.00,8.59,0.00,1.00,43.20,-43.20 +158.40,-52.80,8.57,0.00,1.00,-134.40,-48.00 +153.60,-57.60,8.54,0.00,1.00,52.80,-52.80 +148.80,-57.60,8.52,0.00,1.00,-124.80,-52.80 +139.20,-62.40,8.50,0.00,1.00,62.40,-57.60 +134.40,-67.20,8.48,0.00,1.00,-110.40,-62.40 +120.00,-67.20,8.46,0.00,1.00,72.00,-67.20 +110.40,-72.00,8.44,0.00,1.00,-100.80,-67.20 +96.00,-72.00,8.42,0.00,1.00,81.60,-72.00 +76.80,-72.00,8.40,0.00,1.00,-91.20,-72.00 +62.40,-72.00,8.37,0.00,1.00,96.00,-72.00 +52.80,-67.20,8.35,0.00,1.00,-81.60,-67.20 +43.20,-62.40,8.33,0.00,1.00,105.60,-67.20 +38.40,-62.40,8.31,0.00,1.00,-72.00,-62.40 +28.80,-57.60,8.29,0.00,1.00,115.20,-62.40 +24.00,-52.80,8.27,0.00,1.00,-57.60,-57.60 +24.00,-48.00,8.25,0.00,1.00,124.80,-52.80 +19.20,-43.20,8.22,0.00,1.00,-48.00,-48.00 +14.40,-38.40,8.20,0.00,1.00,134.40,-43.20 +14.40,-38.40,8.18,0.00,1.00,-38.40,-38.40 +9.60,-33.60,8.16,0.00,1.00,144.00,-33.60 +9.60,-28.80,8.14,0.00,1.00,-28.80,-33.60 +9.60,-24.00,8.12,0.00,1.00,153.60,-28.80 +4.80,-19.20,8.10,0.00,1.00,-24.00,-24.00 +4.80,-14.40,8.07,0.00,1.00,163.20,-19.20 +4.80,-9.60,8.05,0.00,1.00,-14.40,-14.40 +0.00,-4.80,8.03,0.00,1.00,172.80,-9.60 +0.00,0.00,8.01,0.00,1.00,-4.80,-4.80 +-0.00,4.80,7.99,0.00,1.00,0.00,0.00 +-4.80,9.60,7.97,0.00,1.00,-177.60,4.80 +-4.80,14.40,7.95,0.00,1.00,9.60,9.60 +-9.60,19.20,7.93,0.00,1.00,-168.00,14.40 +-9.60,24.00,7.90,0.00,1.00,19.20,19.20 +-14.40,24.00,7.88,0.00,1.00,-158.40,24.00 +-14.40,28.80,7.86,0.00,1.00,28.80,24.00 +-19.20,33.60,7.84,0.00,1.00,-148.80,28.80 +-19.20,38.40,7.82,0.00,1.00,38.40,33.60 +-24.00,43.20,7.80,0.00,1.00,-139.20,38.40 +-28.80,48.00,7.78,0.00,1.00,48.00,43.20 +-33.60,52.80,7.75,0.00,1.00,-129.60,48.00 +-38.40,52.80,7.73,0.00,1.00,57.60,52.80 +-43.20,57.60,7.71,0.00,1.00,-120.00,52.80 +-48.00,62.40,7.69,0.00,1.00,67.20,57.60 +-57.60,62.40,7.67,0.00,1.00,-110.40,62.40 +-67.20,67.20,7.65,0.00,1.00,76.80,62.40 +-81.60,67.20,7.63,0.00,1.00,-100.80,62.40 +-91.20,67.20,7.60,0.00,1.00,86.40,67.20 +-105.60,67.20,7.58,0.00,1.00,-86.40,67.20 +-115.20,67.20,7.56,0.00,1.00,96.00,67.20 +-124.80,62.40,7.54,0.00,1.00,-76.80,62.40 +-134.40,57.60,7.52,0.00,1.00,105.60,62.40 +-139.20,57.60,7.50,0.00,1.00,-67.20,57.60 +-144.00,52.80,7.48,0.00,1.00,115.20,57.60 +-148.80,48.00,7.46,0.00,1.00,-57.60,52.80 +-153.60,43.20,7.43,0.00,1.00,124.80,48.00 +-158.40,43.20,7.41,0.00,1.00,-48.00,43.20 +-163.20,38.40,7.39,0.00,1.00,134.40,38.40 +-163.20,33.60,7.37,0.00,1.00,-38.40,38.40 +-168.00,28.80,7.35,0.00,1.00,144.00,33.60 +-168.00,24.00,7.33,0.00,1.00,-28.80,28.80 +-172.80,19.20,7.31,0.00,1.00,153.60,24.00 +-172.80,14.40,7.28,0.00,1.00,-19.20,19.20 +-177.60,9.60,7.26,0.00,1.00,163.20,14.40 +-177.60,4.80,7.24,0.00,1.00,-9.60,9.60 +-177.60,0.00,7.22,0.00,1.00,172.80,4.80 +177.60,-0.00,7.20,0.00,1.00,-0.00,0.00 +177.60,-4.80,7.18,0.00,1.00,-177.60,-0.00 +177.60,-9.60,7.16,0.00,1.00,4.80,-4.80 +172.80,-14.40,7.13,0.00,1.00,-168.00,-9.60 +172.80,-19.20,7.11,0.00,1.00,14.40,-14.40 +168.00,-24.00,7.09,0.00,1.00,-158.40,-19.20 +168.00,-28.80,7.07,0.00,1.00,24.00,-24.00 +163.20,-33.60,7.05,0.00,1.00,-148.80,-28.80 +163.20,-38.40,7.03,0.00,1.00,33.60,-33.60 +158.40,-43.20,7.01,0.00,1.00,-139.20,-38.40 +153.60,-43.20,6.99,0.00,1.00,43.20,-38.40 +148.80,-48.00,6.96,0.00,1.00,-129.60,-43.20 +144.00,-52.80,6.94,0.00,1.00,52.80,-48.00 +139.20,-57.60,6.92,0.00,1.00,-120.00,-52.80 +134.40,-57.60,6.90,0.00,1.00,62.40,-57.60 +124.80,-62.40,6.88,0.00,1.00,-110.40,-57.60 +115.20,-67.20,6.86,0.00,1.00,72.00,-62.40 +105.60,-67.20,6.84,0.00,1.00,-100.80,-62.40 +91.20,-67.20,6.81,0.00,1.00,81.60,-67.20 +81.60,-67.20,6.79,0.00,1.00,-91.20,-67.20 +67.20,-67.20,6.77,0.00,1.00,96.00,-67.20 +57.60,-62.40,6.75,0.00,1.00,-81.60,-62.40 +48.00,-62.40,6.73,0.00,1.00,105.60,-62.40 +43.20,-57.60,6.71,0.00,1.00,-72.00,-62.40 +38.40,-52.80,6.69,0.00,1.00,115.20,-57.60 +33.60,-52.80,6.66,0.00,1.00,-62.40,-52.80 +28.80,-48.00,6.64,0.00,1.00,124.80,-52.80 +24.00,-43.20,6.62,0.00,1.00,-52.80,-48.00 +19.20,-38.40,6.60,0.00,1.00,134.40,-43.20 +19.20,-33.60,6.58,0.00,1.00,-43.20,-38.40 +14.40,-28.80,6.56,0.00,1.00,144.00,-33.60 +14.40,-24.00,6.54,0.00,1.00,-33.60,-28.80 +9.60,-24.00,6.52,0.00,1.00,153.60,-24.00 +9.60,-19.20,6.49,0.00,1.00,-24.00,-24.00 +4.80,-14.40,6.47,0.00,1.00,163.20,-19.20 +4.80,-9.60,6.45,0.00,1.00,-14.40,-14.40 +0.00,-4.80,6.43,0.00,1.00,172.80,-9.60 +0.00,0.00,6.41,0.00,1.00,-4.80,-4.80 +-0.00,4.80,6.39,0.00,1.00,0.00,0.00 +-4.80,9.60,6.37,0.00,1.00,-177.60,4.80 +-4.80,14.40,6.34,0.00,1.00,9.60,9.60 +-9.60,19.20,6.32,0.00,1.00,-168.00,14.40 +-9.60,19.20,6.30,0.00,1.00,19.20,14.40 +-14.40,24.00,6.28,0.00,1.00,-158.40,19.20 +-19.20,28.80,6.26,0.00,1.00,28.80,24.00 +-19.20,33.60,6.24,0.00,1.00,-148.80,28.80 +-24.00,38.40,6.22,0.00,1.00,38.40,33.60 +-28.80,43.20,6.19,0.00,1.00,-139.20,38.40 +-33.60,43.20,6.17,0.00,1.00,48.00,38.40 +-38.40,48.00,6.15,0.00,1.00,-129.60,43.20 +-43.20,52.80,6.13,0.00,1.00,57.60,48.00 +-48.00,52.80,6.11,0.00,1.00,-120.00,52.80 +-52.80,57.60,6.09,0.00,1.00,67.20,52.80 +-62.40,57.60,6.07,0.00,1.00,-110.40,57.60 +-72.00,62.40,6.05,0.00,1.00,76.80,57.60 +-81.60,62.40,6.02,0.00,1.00,-100.80,62.40 +-91.20,62.40,6.00,0.00,1.00,86.40,62.40 +-100.80,62.40,5.98,0.00,1.00,-86.40,62.40 +-110.40,62.40,5.96,0.00,1.00,96.00,62.40 +-120.00,57.60,5.94,0.00,1.00,-76.80,57.60 +-129.60,57.60,5.92,0.00,1.00,105.60,57.60 +-134.40,52.80,5.90,0.00,1.00,-67.20,57.60 +-139.20,48.00,5.87,0.00,1.00,115.20,52.80 +-144.00,48.00,5.85,0.00,1.00,-57.60,48.00 +-148.80,43.20,5.83,0.00,1.00,124.80,48.00 +-153.60,38.40,5.81,0.00,1.00,-48.00,43.20 +-158.40,33.60,5.79,0.00,1.00,134.40,38.40 +-163.20,33.60,5.77,0.00,1.00,-38.40,33.60 +-163.20,28.80,5.75,0.00,1.00,144.00,28.80 +-168.00,24.00,5.72,0.00,1.00,-28.80,28.80 +-168.00,19.20,5.70,0.00,1.00,153.60,24.00 +-172.80,14.40,5.68,0.00,1.00,-19.20,19.20 +-172.80,9.60,5.66,0.00,1.00,163.20,14.40 +-177.60,4.80,5.64,0.00,1.00,-9.60,9.60 +-177.60,0.00,5.62,0.00,1.00,172.80,4.80 +177.60,-0.00,5.60,0.00,1.00,-0.00,0.00 +177.60,-4.80,5.58,0.00,1.00,-177.60,-0.00 +172.80,-9.60,5.55,0.00,1.00,4.80,-4.80 +172.80,-14.40,5.53,0.00,1.00,-168.00,-9.60 +168.00,-19.20,5.51,0.00,1.00,14.40,-14.40 +168.00,-24.00,5.49,0.00,1.00,-158.40,-19.20 +163.20,-28.80,5.47,0.00,1.00,24.00,-24.00 +163.20,-33.60,5.45,0.00,1.00,-148.80,-28.80 +158.40,-33.60,5.43,0.00,1.00,33.60,-28.80 +153.60,-38.40,5.40,0.00,1.00,-139.20,-33.60 +148.80,-43.20,5.38,0.00,1.00,43.20,-38.40 +144.00,-48.00,5.36,0.00,1.00,-129.60,-43.20 +139.20,-48.00,5.34,0.00,1.00,52.80,-48.00 +134.40,-52.80,5.32,0.00,1.00,-120.00,-48.00 +129.60,-57.60,5.30,0.00,1.00,62.40,-52.80 +120.00,-57.60,5.28,0.00,1.00,-110.40,-57.60 +110.40,-62.40,5.26,0.00,1.00,72.00,-57.60 +100.80,-62.40,5.23,0.00,1.00,-100.80,-57.60 +91.20,-62.40,5.21,0.00,1.00,81.60,-62.40 +81.60,-62.40,5.19,0.00,1.00,-91.20,-62.40 +72.00,-62.40,5.17,0.00,1.00,96.00,-62.40 +62.40,-57.60,5.15,0.00,1.00,-81.60,-62.40 +52.80,-57.60,5.13,0.00,1.00,105.60,-57.60 +48.00,-52.80,5.11,0.00,1.00,-72.00,-57.60 +43.20,-52.80,5.08,0.00,1.00,115.20,-52.80 +38.40,-48.00,5.06,0.00,1.00,-62.40,-52.80 +33.60,-43.20,5.04,0.00,1.00,124.80,-48.00 +28.80,-43.20,5.02,0.00,1.00,-52.80,-43.20 +24.00,-38.40,5.00,0.00,1.00,134.40,-38.40 +19.20,-33.60,4.98,0.00,1.00,-43.20,-38.40 +19.20,-28.80,4.96,0.00,1.00,144.00,-33.60 +14.40,-24.00,4.93,0.00,1.00,-33.60,-28.80 +9.60,-19.20,4.91,0.00,1.00,153.60,-24.00 +9.60,-19.20,4.89,0.00,1.00,-24.00,-19.20 +4.80,-14.40,4.87,0.00,1.00,163.20,-14.40 +4.80,-9.60,4.85,0.00,1.00,-14.40,-14.40 +0.00,-4.80,4.83,0.00,1.00,172.80,-9.60 +0.00,0.00,4.81,0.00,1.00,-4.80,-4.80 +-4.80,4.80,4.79,0.00,1.00,0.00,0.00 +-4.80,9.60,4.76,0.00,1.00,-177.60,4.80 +-9.60,14.40,4.74,0.00,1.00,9.60,9.60 +-9.60,14.40,4.72,0.00,1.00,-168.00,9.60 +-14.40,19.20,4.70,0.00,1.00,19.20,14.40 +-14.40,24.00,4.68,0.00,1.00,-158.40,19.20 +-19.20,28.80,4.66,0.00,1.00,28.80,24.00 +-24.00,33.60,4.64,0.00,1.00,-148.80,28.80 +-28.80,33.60,4.61,0.00,1.00,38.40,28.80 +-28.80,38.40,4.59,0.00,1.00,-139.20,33.60 +-33.60,43.20,4.57,0.00,1.00,48.00,38.40 +-38.40,43.20,4.55,0.00,1.00,-129.60,43.20 +-48.00,48.00,4.53,0.00,1.00,57.60,43.20 +-52.80,52.80,4.51,0.00,1.00,-120.00,48.00 +-57.60,52.80,4.49,0.00,1.00,67.20,48.00 +-67.20,57.60,4.46,0.00,1.00,-110.40,52.80 +-76.80,57.60,4.44,0.00,1.00,76.80,52.80 +-81.60,57.60,4.42,0.00,1.00,-100.80,57.60 +-91.20,57.60,4.40,0.00,1.00,86.40,57.60 +-100.80,57.60,4.38,0.00,1.00,-86.40,57.60 +-110.40,57.60,4.36,0.00,1.00,96.00,57.60 +-115.20,52.80,4.34,0.00,1.00,-76.80,52.80 +-124.80,52.80,4.32,0.00,1.00,105.60,52.80 +-129.60,48.00,4.29,0.00,1.00,-67.20,52.80 +-139.20,48.00,4.27,0.00,1.00,115.20,48.00 +-144.00,43.20,4.25,0.00,1.00,-57.60,48.00 +-148.80,38.40,4.23,0.00,1.00,124.80,43.20 +-153.60,38.40,4.21,0.00,1.00,-48.00,38.40 +-153.60,33.60,4.19,0.00,1.00,134.40,38.40 +-158.40,28.80,4.17,0.00,1.00,-38.40,33.60 +-163.20,24.00,4.14,0.00,1.00,144.00,28.80 +-163.20,24.00,4.12,0.00,1.00,-28.80,24.00 +-168.00,19.20,4.10,0.00,1.00,153.60,24.00 +-172.80,14.40,4.08,0.00,1.00,-19.20,19.20 +-172.80,9.60,4.06,0.00,1.00,163.20,14.40 +-177.60,4.80,4.04,0.00,1.00,-9.60,9.60 +-177.60,0.00,4.02,0.00,1.00,172.80,4.80 +177.60,-0.00,3.99,0.00,1.00,-0.00,0.00 +177.60,-4.80,3.97,0.00,1.00,-177.60,-0.00 +172.80,-9.60,3.95,0.00,1.00,4.80,-4.80 +172.80,-14.40,3.93,0.00,1.00,-168.00,-9.60 +168.00,-19.20,3.91,0.00,1.00,14.40,-14.40 +163.20,-24.00,3.89,0.00,1.00,-158.40,-19.20 +163.20,-24.00,3.87,0.00,1.00,24.00,-24.00 +158.40,-28.80,3.85,0.00,1.00,-148.80,-24.00 +153.60,-33.60,3.82,0.00,1.00,33.60,-28.80 +153.60,-38.40,3.80,0.00,1.00,-139.20,-33.60 +148.80,-38.40,3.78,0.00,1.00,43.20,-38.40 +144.00,-43.20,3.76,0.00,1.00,-129.60,-38.40 +139.20,-48.00,3.74,0.00,1.00,52.80,-43.20 +129.60,-48.00,3.72,0.00,1.00,-120.00,-48.00 +124.80,-52.80,3.70,0.00,1.00,62.40,-48.00 +115.20,-52.80,3.67,0.00,1.00,-110.40,-52.80 +110.40,-57.60,3.65,0.00,1.00,72.00,-52.80 +100.80,-57.60,3.63,0.00,1.00,-100.80,-52.80 +91.20,-57.60,3.61,0.00,1.00,81.60,-57.60 +81.60,-57.60,3.59,0.00,1.00,-91.20,-57.60 +76.80,-57.60,3.57,0.00,1.00,96.00,-57.60 +67.20,-57.60,3.55,0.00,1.00,-81.60,-57.60 +57.60,-52.80,3.52,0.00,1.00,105.60,-52.80 +52.80,-52.80,3.50,0.00,1.00,-72.00,-52.80 +48.00,-48.00,3.48,0.00,1.00,115.20,-48.00 +38.40,-43.20,3.46,0.00,1.00,-62.40,-48.00 +33.60,-43.20,3.44,0.00,1.00,124.80,-43.20 +28.80,-38.40,3.42,0.00,1.00,-52.80,-43.20 +28.80,-33.60,3.40,0.00,1.00,134.40,-38.40 +24.00,-33.60,3.38,0.00,1.00,-43.20,-33.60 +19.20,-28.80,3.35,0.00,1.00,144.00,-28.80 +14.40,-24.00,3.33,0.00,1.00,-33.60,-28.80 +14.40,-19.20,3.31,0.00,1.00,153.60,-24.00 +9.60,-14.40,3.29,0.00,1.00,-24.00,-19.20 +9.60,-14.40,3.27,0.00,1.00,163.20,-14.40 +4.80,-9.60,3.25,0.00,1.00,-14.40,-9.60 +4.80,-4.80,3.23,0.00,1.00,172.80,-9.60 +0.00,0.00,3.20,0.00,1.00,-4.80,-4.80 +-4.80,4.80,3.18,0.00,1.00,0.00,0.00 +-4.80,9.60,3.16,0.00,1.00,-177.60,4.80 +-9.60,9.60,3.14,0.00,1.00,9.60,9.60 +-9.60,14.40,3.12,0.00,1.00,-168.00,9.60 +-14.40,19.20,3.10,0.00,1.00,19.20,14.40 +-19.20,24.00,3.08,0.00,1.00,-158.40,19.20 +-24.00,24.00,3.05,0.00,1.00,28.80,24.00 +-24.00,28.80,3.03,0.00,1.00,-148.80,24.00 +-28.80,33.60,3.01,0.00,1.00,38.40,28.80 +-33.60,38.40,2.99,0.00,1.00,-139.20,33.60 +-38.40,38.40,2.97,0.00,1.00,48.00,33.60 +-43.20,43.20,2.95,0.00,1.00,-129.60,38.40 +-48.00,43.20,2.93,0.00,1.00,57.60,43.20 +-52.80,48.00,2.91,0.00,1.00,-120.00,43.20 +-62.40,48.00,2.88,0.00,1.00,67.20,48.00 +-67.20,52.80,2.86,0.00,1.00,-110.40,48.00 +-76.80,52.80,2.84,0.00,1.00,76.80,48.00 +-86.40,52.80,2.82,0.00,1.00,-100.80,52.80 +-91.20,52.80,2.80,0.00,1.00,86.40,52.80 +-100.80,52.80,2.78,0.00,1.00,-86.40,52.80 +-105.60,52.80,2.76,0.00,1.00,96.00,52.80 +-115.20,48.00,2.73,0.00,1.00,-76.80,48.00 +-120.00,48.00,2.71,0.00,1.00,105.60,48.00 +-129.60,48.00,2.69,0.00,1.00,-67.20,48.00 +-134.40,43.20,2.67,0.00,1.00,115.20,43.20 +-139.20,43.20,2.65,0.00,1.00,-57.60,43.20 +-144.00,38.40,2.63,0.00,1.00,124.80,38.40 +-148.80,33.60,2.61,0.00,1.00,-48.00,38.40 +-153.60,33.60,2.58,0.00,1.00,134.40,33.60 +-158.40,28.80,2.56,0.00,1.00,-38.40,28.80 +-158.40,24.00,2.54,0.00,1.00,144.00,28.80 +-163.20,19.20,2.52,0.00,1.00,-28.80,24.00 +-168.00,19.20,2.50,0.00,1.00,153.60,19.20 +-168.00,14.40,2.48,0.00,1.00,-19.20,14.40 +-172.80,9.60,2.46,0.00,1.00,163.20,14.40 +-177.60,4.80,2.44,0.00,1.00,-9.60,9.60 +-177.60,0.00,2.41,0.00,1.00,172.80,4.80 +177.60,-0.00,2.39,0.00,1.00,-0.00,0.00 +177.60,-4.80,2.37,0.00,1.00,-177.60,-0.00 +172.80,-9.60,2.35,0.00,1.00,4.80,-4.80 +168.00,-14.40,2.33,0.00,1.00,-168.00,-9.60 +168.00,-19.20,2.31,0.00,1.00,14.40,-14.40 +163.20,-19.20,2.29,0.00,1.00,-158.40,-14.40 +158.40,-24.00,2.26,0.00,1.00,24.00,-19.20 +158.40,-28.80,2.24,0.00,1.00,-148.80,-24.00 +153.60,-33.60,2.22,0.00,1.00,33.60,-28.80 +148.80,-33.60,2.20,0.00,1.00,-139.20,-28.80 +144.00,-38.40,2.18,0.00,1.00,43.20,-33.60 +139.20,-43.20,2.16,0.00,1.00,-129.60,-38.40 +134.40,-43.20,2.14,0.00,1.00,52.80,-38.40 +129.60,-48.00,2.11,0.00,1.00,-120.00,-43.20 +120.00,-48.00,2.09,0.00,1.00,62.40,-43.20 +115.20,-48.00,2.07,0.00,1.00,-110.40,-48.00 +105.60,-52.80,2.05,0.00,1.00,72.00,-48.00 +100.80,-52.80,2.03,0.00,1.00,-100.80,-48.00 +91.20,-52.80,2.01,0.00,1.00,81.60,-52.80 +86.40,-52.80,1.99,0.00,1.00,-91.20,-52.80 +76.80,-52.80,1.97,0.00,1.00,96.00,-52.80 +67.20,-52.80,1.94,0.00,1.00,-81.60,-52.80 +62.40,-48.00,1.92,0.00,1.00,105.60,-48.00 +52.80,-48.00,1.90,0.00,1.00,-72.00,-48.00 +48.00,-43.20,1.88,0.00,1.00,115.20,-48.00 +43.20,-43.20,1.86,0.00,1.00,-62.40,-43.20 +38.40,-38.40,1.84,0.00,1.00,124.80,-43.20 +33.60,-38.40,1.82,0.00,1.00,-52.80,-38.40 +28.80,-33.60,1.79,0.00,1.00,134.40,-33.60 +24.00,-28.80,1.77,0.00,1.00,-43.20,-33.60 +24.00,-24.00,1.75,0.00,1.00,144.00,-28.80 +19.20,-24.00,1.73,0.00,1.00,-33.60,-24.00 +14.40,-19.20,1.71,0.00,1.00,153.60,-24.00 +9.60,-14.40,1.69,0.00,1.00,-24.00,-19.20 +9.60,-9.60,1.67,0.00,1.00,163.20,-14.40 +4.80,-9.60,1.64,0.00,1.00,-14.40,-9.60 +4.80,-4.80,1.62,0.00,1.00,172.80,-9.60 +0.00,0.00,1.60,0.00,1.00,-4.80,-4.80 +-4.80,4.80,1.58,0.00,1.00,0.00,0.00 +-4.80,4.80,1.56,0.00,1.00,-177.60,4.80 +-9.60,9.60,1.54,0.00,1.00,9.60,4.80 +-14.40,14.40,1.52,0.00,1.00,-168.00,9.60 +-14.40,19.20,1.50,0.00,1.00,19.20,14.40 +-19.20,19.20,1.47,0.00,1.00,-158.40,19.20 +-24.00,24.00,1.45,0.00,1.00,28.80,19.20 +-28.80,28.80,1.43,0.00,1.00,-148.80,24.00 +-33.60,28.80,1.41,0.00,1.00,38.40,28.80 +-38.40,33.60,1.39,0.00,1.00,-139.20,28.80 +-43.20,38.40,1.37,0.00,1.00,48.00,33.60 +-48.00,38.40,1.35,0.00,1.00,-129.60,33.60 +-52.80,43.20,1.32,0.00,1.00,57.60,38.40 +-57.60,43.20,1.30,0.00,1.00,-120.00,38.40 +-62.40,43.20,1.28,0.00,1.00,67.20,43.20 +-72.00,48.00,1.26,0.00,1.00,-110.40,43.20 +-76.80,48.00,1.24,0.00,1.00,76.80,43.20 +-86.40,48.00,1.22,0.00,1.00,-100.80,48.00 +-91.20,48.00,1.20,0.00,1.00,86.40,48.00 +-100.80,48.00,1.17,0.00,1.00,-86.40,48.00 +-105.60,48.00,1.15,0.00,1.00,96.00,48.00 +-110.40,48.00,1.13,0.00,1.00,-76.80,48.00 +-120.00,43.20,1.11,0.00,1.00,105.60,43.20 +-124.80,43.20,1.09,0.00,1.00,-67.20,43.20 +-129.60,38.40,1.07,0.00,1.00,115.20,43.20 +-134.40,38.40,1.05,0.00,1.00,-57.60,38.40 +-139.20,33.60,1.03,0.00,1.00,124.80,38.40 +-144.00,33.60,1.00,0.00,1.00,-48.00,33.60 +-148.80,28.80,0.98,0.00,1.00,134.40,33.60 +-153.60,24.00,0.96,0.00,1.00,-38.40,28.80 +-158.40,24.00,0.94,0.00,1.00,144.00,24.00 +-163.20,19.20,0.92,0.00,1.00,-28.80,24.00 +-163.20,14.40,0.90,0.00,1.00,153.60,19.20 +-168.00,14.40,0.88,0.00,1.00,-19.20,14.40 +-172.80,9.60,0.85,0.00,1.00,163.20,14.40 +-172.80,4.80,0.83,0.00,1.00,-9.60,9.60 +-177.60,0.00,0.81,0.00,1.00,172.80,4.80 +177.60,-0.00,0.79,0.00,1.00,-0.00,0.00 +172.80,-4.80,0.77,0.00,1.00,-177.60,-0.00 +172.80,-9.60,0.75,0.00,1.00,4.80,-4.80 +168.00,-14.40,0.73,0.00,1.00,-168.00,-9.60 +163.20,-14.40,0.70,0.00,1.00,14.40,-14.40 +163.20,-19.20,0.68,0.00,1.00,-158.40,-14.40 +158.40,-24.00,0.66,0.00,1.00,24.00,-19.20 +153.60,-24.00,0.64,0.00,1.00,-148.80,-24.00 +148.80,-28.80,0.62,0.00,1.00,33.60,-24.00 +144.00,-33.60,0.60,0.00,1.00,-139.20,-28.80 +139.20,-33.60,0.58,0.00,1.00,43.20,-33.60 +134.40,-38.40,0.56,0.00,1.00,-129.60,-33.60 +129.60,-38.40,0.53,0.00,1.00,52.80,-38.40 +124.80,-43.20,0.51,0.00,1.00,-120.00,-38.40 +120.00,-43.20,0.49,0.00,1.00,62.40,-43.20 +110.40,-48.00,0.47,0.00,1.00,-110.40,-43.20 +105.60,-48.00,0.45,0.00,1.00,72.00,-43.20 +100.80,-48.00,0.43,0.00,1.00,-100.80,-48.00 +91.20,-48.00,0.41,0.00,1.00,81.60,-48.00 +86.40,-48.00,0.38,0.00,1.00,-91.20,-48.00 +76.80,-48.00,0.36,0.00,1.00,96.00,-48.00 +72.00,-48.00,0.34,0.00,1.00,-81.60,-48.00 +62.40,-43.20,0.32,0.00,1.00,105.60,-43.20 +57.60,-43.20,0.30,0.00,1.00,-72.00,-43.20 +52.80,-43.20,0.28,0.00,1.00,115.20,-43.20 +48.00,-38.40,0.26,0.00,1.00,-62.40,-38.40 +43.20,-38.40,0.23,0.00,1.00,124.80,-38.40 +38.40,-33.60,0.21,0.00,1.00,-52.80,-33.60 +33.60,-28.80,0.19,0.00,1.00,134.40,-33.60 +28.80,-28.80,0.17,0.00,1.00,-43.20,-28.80 +24.00,-24.00,0.15,0.00,1.00,144.00,-28.80 +19.20,-19.20,0.13,0.00,1.00,-33.60,-24.00 +14.40,-19.20,0.11,0.00,1.00,153.60,-19.20 +14.40,-14.40,0.09,0.00,1.00,-24.00,-19.20 +9.60,-9.60,0.06,0.00,1.00,163.20,-14.40 +4.80,-4.80,0.04,0.00,1.00,-14.40,-9.60 +4.80,-4.80,0.02,0.00,1.00,172.80,-4.80 +0.00,0.00,0.00,0.00,1.00,-4.80,-4.80 +-4.80,4.80,0.00,0.00,1.00,0.00,0.00 +-4.80,4.80,0.02,0.00,1.00,-177.60,4.80 +-9.60,9.60,0.04,0.00,1.00,9.60,4.80 +-14.40,14.40,0.06,0.00,1.00,-168.00,9.60 +-19.20,14.40,0.09,0.00,1.00,19.20,14.40 +-24.00,19.20,0.11,0.00,1.00,-158.40,14.40 +-24.00,24.00,0.13,0.00,1.00,28.80,19.20 +-28.80,24.00,0.15,0.00,1.00,-148.80,24.00 +-33.60,28.80,0.17,0.00,1.00,38.40,24.00 +-38.40,28.80,0.19,0.00,1.00,-139.20,28.80 +-43.20,33.60,0.21,0.00,1.00,48.00,28.80 +-48.00,33.60,0.23,0.00,1.00,-129.60,33.60 +-52.80,38.40,0.26,0.00,1.00,57.60,33.60 +-62.40,38.40,0.28,0.00,1.00,-120.00,38.40 +-67.20,38.40,0.30,0.00,1.00,67.20,38.40 +-72.00,43.20,0.32,0.00,1.00,-110.40,38.40 +-76.80,43.20,0.34,0.00,1.00,76.80,38.40 +-86.40,43.20,0.36,0.00,1.00,-100.80,43.20 +-91.20,43.20,0.38,0.00,1.00,86.40,43.20 +-96.00,43.20,0.41,0.00,1.00,-86.40,43.20 +-105.60,43.20,0.43,0.00,1.00,96.00,43.20 +-110.40,43.20,0.45,0.00,1.00,-76.80,43.20 +-115.20,38.40,0.47,0.00,1.00,105.60,38.40 +-124.80,38.40,0.49,0.00,1.00,-67.20,38.40 +-129.60,38.40,0.51,0.00,1.00,115.20,38.40 +-134.40,33.60,0.53,0.00,1.00,-57.60,33.60 +-139.20,33.60,0.56,0.00,1.00,124.80,33.60 +-144.00,28.80,0.58,0.00,1.00,-48.00,28.80 +-148.80,28.80,0.60,0.00,1.00,134.40,28.80 +-153.60,24.00,0.62,0.00,1.00,-38.40,24.00 +-158.40,19.20,0.64,0.00,1.00,144.00,24.00 +-158.40,19.20,0.66,0.00,1.00,-28.80,19.20 +-163.20,14.40,0.68,0.00,1.00,153.60,19.20 +-168.00,9.60,0.70,0.00,1.00,-19.20,14.40 +-172.80,9.60,0.73,0.00,1.00,163.20,9.60 +-172.80,4.80,0.75,0.00,1.00,-9.60,9.60 +-177.60,0.00,0.77,0.00,1.00,172.80,4.80 +177.60,-0.00,0.79,0.00,1.00,-0.00,0.00 +172.80,-4.80,0.81,0.00,1.00,-177.60,-0.00 +172.80,-9.60,0.83,0.00,1.00,4.80,-4.80 +168.00,-9.60,0.85,0.00,1.00,-168.00,-9.60 +163.20,-14.40,0.88,0.00,1.00,14.40,-9.60 +158.40,-19.20,0.90,0.00,1.00,-158.40,-14.40 +158.40,-19.20,0.92,0.00,1.00,24.00,-19.20 +153.60,-24.00,0.94,0.00,1.00,-148.80,-19.20 +148.80,-28.80,0.96,0.00,1.00,33.60,-24.00 +144.00,-28.80,0.98,0.00,1.00,-139.20,-24.00 +139.20,-33.60,1.00,0.00,1.00,43.20,-28.80 +134.40,-33.60,1.03,0.00,1.00,-129.60,-28.80 +129.60,-38.40,1.05,0.00,1.00,52.80,-33.60 +124.80,-38.40,1.07,0.00,1.00,-120.00,-33.60 +115.20,-38.40,1.09,0.00,1.00,62.40,-38.40 +110.40,-43.20,1.11,0.00,1.00,-110.40,-38.40 +105.60,-43.20,1.13,0.00,1.00,72.00,-38.40 +96.00,-43.20,1.15,0.00,1.00,-100.80,-43.20 +91.20,-43.20,1.17,0.00,1.00,81.60,-43.20 +86.40,-43.20,1.20,0.00,1.00,-91.20,-43.20 +76.80,-43.20,1.22,0.00,1.00,96.00,-43.20 +72.00,-43.20,1.24,0.00,1.00,-81.60,-43.20 +67.20,-38.40,1.26,0.00,1.00,105.60,-38.40 +62.40,-38.40,1.28,0.00,1.00,-72.00,-38.40 +52.80,-38.40,1.30,0.00,1.00,115.20,-38.40 +48.00,-33.60,1.32,0.00,1.00,-62.40,-38.40 +43.20,-33.60,1.35,0.00,1.00,124.80,-33.60 +38.40,-28.80,1.37,0.00,1.00,-52.80,-33.60 +33.60,-28.80,1.39,0.00,1.00,134.40,-28.80 +28.80,-24.00,1.41,0.00,1.00,-43.20,-28.80 +24.00,-24.00,1.43,0.00,1.00,144.00,-24.00 +24.00,-19.20,1.45,0.00,1.00,-33.60,-24.00 +19.20,-14.40,1.47,0.00,1.00,153.60,-19.20 +14.40,-14.40,1.50,0.00,1.00,-24.00,-14.40 +9.60,-9.60,1.52,0.00,1.00,163.20,-14.40 +4.80,-4.80,1.54,0.00,1.00,-14.40,-9.60 +4.80,-4.80,1.56,0.00,1.00,172.80,-4.80 +0.00,0.00,1.58,0.00,1.00,-4.80,-4.80 +-4.80,4.80,1.60,0.00,1.00,0.00,0.00 +-9.60,4.80,1.62,0.00,1.00,-177.60,4.80 +-9.60,9.60,1.64,0.00,1.00,9.60,4.80 +-14.40,9.60,1.67,0.00,1.00,-168.00,9.60 +-19.20,14.40,1.69,0.00,1.00,19.20,9.60 +-24.00,19.20,1.71,0.00,1.00,-158.40,14.40 +-28.80,19.20,1.73,0.00,1.00,28.80,19.20 +-33.60,24.00,1.75,0.00,1.00,-148.80,19.20 +-38.40,24.00,1.77,0.00,1.00,38.40,24.00 +-43.20,28.80,1.79,0.00,1.00,-139.20,24.00 +-48.00,28.80,1.82,0.00,1.00,48.00,28.80 +-52.80,33.60,1.84,0.00,1.00,-129.60,28.80 +-57.60,33.60,1.86,0.00,1.00,57.60,28.80 +-62.40,33.60,1.88,0.00,1.00,-120.00,33.60 +-67.20,38.40,1.90,0.00,1.00,67.20,33.60 +-72.00,38.40,1.92,0.00,1.00,-110.40,33.60 +-81.60,38.40,1.94,0.00,1.00,76.80,38.40 +-86.40,38.40,1.97,0.00,1.00,-100.80,38.40 +-91.20,38.40,1.99,0.00,1.00,86.40,38.40 +-96.00,38.40,2.01,0.00,1.00,-86.40,38.40 +-105.60,38.40,2.03,0.00,1.00,96.00,38.40 +-110.40,38.40,2.05,0.00,1.00,-76.80,38.40 +-115.20,33.60,2.07,0.00,1.00,105.60,33.60 +-120.00,33.60,2.09,0.00,1.00,-67.20,33.60 +-124.80,33.60,2.11,0.00,1.00,115.20,33.60 +-129.60,28.80,2.14,0.00,1.00,-57.60,33.60 +-134.40,28.80,2.16,0.00,1.00,124.80,28.80 +-139.20,24.00,2.18,0.00,1.00,-48.00,28.80 +-144.00,24.00,2.20,0.00,1.00,134.40,24.00 +-148.80,19.20,2.22,0.00,1.00,-38.40,24.00 +-153.60,19.20,2.24,0.00,1.00,144.00,19.20 +-158.40,14.40,2.26,0.00,1.00,-28.80,19.20 +-163.20,14.40,2.29,0.00,1.00,153.60,14.40 +-168.00,9.60,2.31,0.00,1.00,-19.20,14.40 +-172.80,9.60,2.33,0.00,1.00,163.20,9.60 +-172.80,4.80,2.35,0.00,1.00,-9.60,9.60 +-177.60,0.00,2.37,0.00,1.00,172.80,4.80 +177.60,-0.00,2.39,0.00,1.00,-0.00,0.00 +172.80,-4.80,2.41,0.00,1.00,-177.60,-0.00 +172.80,-9.60,2.44,0.00,1.00,4.80,-4.80 +168.00,-9.60,2.46,0.00,1.00,-168.00,-9.60 +163.20,-14.40,2.48,0.00,1.00,14.40,-9.60 +158.40,-14.40,2.50,0.00,1.00,-158.40,-14.40 +153.60,-19.20,2.52,0.00,1.00,24.00,-14.40 +148.80,-19.20,2.54,0.00,1.00,-148.80,-19.20 +144.00,-24.00,2.56,0.00,1.00,33.60,-19.20 +139.20,-24.00,2.58,0.00,1.00,-139.20,-24.00 +134.40,-28.80,2.61,0.00,1.00,43.20,-24.00 +129.60,-28.80,2.63,0.00,1.00,-129.60,-28.80 +124.80,-33.60,2.65,0.00,1.00,52.80,-28.80 +120.00,-33.60,2.67,0.00,1.00,-120.00,-33.60 +115.20,-33.60,2.69,0.00,1.00,62.40,-33.60 +110.40,-38.40,2.71,0.00,1.00,-110.40,-33.60 +105.60,-38.40,2.73,0.00,1.00,72.00,-33.60 +96.00,-38.40,2.76,0.00,1.00,-100.80,-38.40 +91.20,-38.40,2.78,0.00,1.00,81.60,-38.40 +86.40,-38.40,2.80,0.00,1.00,-91.20,-38.40 +81.60,-38.40,2.82,0.00,1.00,96.00,-38.40 +72.00,-38.40,2.84,0.00,1.00,-81.60,-38.40 +67.20,-38.40,2.86,0.00,1.00,105.60,-38.40 +62.40,-33.60,2.88,0.00,1.00,-72.00,-33.60 +57.60,-33.60,2.91,0.00,1.00,115.20,-33.60 +52.80,-33.60,2.93,0.00,1.00,-62.40,-33.60 +48.00,-28.80,2.95,0.00,1.00,124.80,-28.80 +43.20,-28.80,2.97,0.00,1.00,-52.80,-28.80 +38.40,-24.00,2.99,0.00,1.00,134.40,-28.80 +33.60,-24.00,3.01,0.00,1.00,-43.20,-24.00 +28.80,-19.20,3.03,0.00,1.00,144.00,-24.00 +24.00,-19.20,3.05,0.00,1.00,-33.60,-19.20 +19.20,-14.40,3.08,0.00,1.00,153.60,-19.20 +14.40,-9.60,3.10,0.00,1.00,-24.00,-14.40 +9.60,-9.60,3.12,0.00,1.00,163.20,-9.60 +9.60,-4.80,3.14,0.00,1.00,-14.40,-9.60 +4.80,-4.80,3.16,0.00,1.00,172.80,-4.80 +0.00,0.00,3.18,0.00,1.00,-4.80,-4.80 +-4.80,4.80,3.20,0.00,1.00,0.00,0.00 +-9.60,4.80,3.23,0.00,1.00,-177.60,4.80 +-14.40,9.60,3.25,0.00,1.00,9.60,4.80 +-14.40,9.60,3.27,0.00,1.00,-168.00,9.60 +-19.20,14.40,3.29,0.00,1.00,19.20,9.60 +-24.00,14.40,3.31,0.00,1.00,-158.40,14.40 +-28.80,19.20,3.33,0.00,1.00,28.80,14.40 +-33.60,19.20,3.35,0.00,1.00,-148.80,19.20 +-38.40,24.00,3.38,0.00,1.00,38.40,19.20 +-43.20,24.00,3.40,0.00,1.00,-139.20,19.20 +-48.00,24.00,3.42,0.00,1.00,48.00,24.00 +-52.80,28.80,3.44,0.00,1.00,-129.60,24.00 +-57.60,28.80,3.46,0.00,1.00,57.60,28.80 +-62.40,28.80,3.48,0.00,1.00,-120.00,28.80 +-67.20,33.60,3.50,0.00,1.00,67.20,28.80 +-72.00,33.60,3.52,0.00,1.00,-110.40,28.80 +-81.60,33.60,3.55,0.00,1.00,76.80,33.60 +-86.40,33.60,3.57,0.00,1.00,-100.80,33.60 +-91.20,33.60,3.59,0.00,1.00,86.40,33.60 +-96.00,33.60,3.61,0.00,1.00,-86.40,33.60 +-100.80,33.60,3.63,0.00,1.00,96.00,33.60 +-110.40,33.60,3.65,0.00,1.00,-76.80,33.60 +-115.20,33.60,3.67,0.00,1.00,105.60,28.80 +-120.00,28.80,3.70,0.00,1.00,-67.20,28.80 +-124.80,28.80,3.72,0.00,1.00,115.20,28.80 +-129.60,28.80,3.74,0.00,1.00,-57.60,28.80 +-134.40,24.00,3.76,0.00,1.00,124.80,24.00 +-139.20,24.00,3.78,0.00,1.00,-48.00,24.00 +-144.00,19.20,3.80,0.00,1.00,134.40,24.00 +-148.80,19.20,3.82,0.00,1.00,-38.40,19.20 +-153.60,14.40,3.85,0.00,1.00,144.00,19.20 +-158.40,14.40,3.87,0.00,1.00,-28.80,14.40 +-163.20,9.60,3.89,0.00,1.00,153.60,14.40 +-168.00,9.60,3.91,0.00,1.00,-19.20,9.60 +-168.00,4.80,3.93,0.00,1.00,163.20,9.60 +-172.80,4.80,3.95,0.00,1.00,-9.60,4.80 +-177.60,0.00,3.97,0.00,1.00,172.80,4.80 +177.60,-0.00,3.99,0.00,1.00,-0.00,0.00 +172.80,-4.80,4.02,0.00,1.00,-177.60,-0.00 +168.00,-4.80,4.04,0.00,1.00,4.80,-4.80 +168.00,-9.60,4.06,0.00,1.00,-168.00,-4.80 +163.20,-9.60,4.08,0.00,1.00,14.40,-9.60 +158.40,-14.40,4.10,0.00,1.00,-158.40,-9.60 +153.60,-14.40,4.12,0.00,1.00,24.00,-14.40 +148.80,-19.20,4.14,0.00,1.00,-148.80,-14.40 +144.00,-19.20,4.17,0.00,1.00,33.60,-19.20 +139.20,-24.00,4.19,0.00,1.00,-139.20,-19.20 +134.40,-24.00,4.21,0.00,1.00,43.20,-24.00 +129.60,-28.80,4.23,0.00,1.00,-129.60,-24.00 +124.80,-28.80,4.25,0.00,1.00,52.80,-24.00 +120.00,-28.80,4.27,0.00,1.00,-120.00,-28.80 +115.20,-33.60,4.29,0.00,1.00,62.40,-28.80 +110.40,-33.60,4.32,0.00,1.00,-110.40,-28.80 +100.80,-33.60,4.34,0.00,1.00,72.00,-28.80 +96.00,-33.60,4.36,0.00,1.00,-100.80,-33.60 +91.20,-33.60,4.38,0.00,1.00,81.60,-33.60 +86.40,-33.60,4.40,0.00,1.00,-91.20,-33.60 +81.60,-33.60,4.42,0.00,1.00,96.00,-33.60 +72.00,-33.60,4.44,0.00,1.00,-81.60,-33.60 +67.20,-33.60,4.46,0.00,1.00,105.60,-33.60 +62.40,-28.80,4.49,0.00,1.00,-72.00,-28.80 +57.60,-28.80,4.51,0.00,1.00,115.20,-28.80 +52.80,-28.80,4.53,0.00,1.00,-62.40,-28.80 +48.00,-24.00,4.55,0.00,1.00,124.80,-28.80 +43.20,-24.00,4.57,0.00,1.00,-52.80,-24.00 +38.40,-24.00,4.59,0.00,1.00,134.40,-24.00 +33.60,-19.20,4.61,0.00,1.00,-43.20,-19.20 +28.80,-19.20,4.64,0.00,1.00,144.00,-19.20 +24.00,-14.40,4.66,0.00,1.00,-33.60,-19.20 +19.20,-14.40,4.68,0.00,1.00,153.60,-14.40 +14.40,-9.60,4.70,0.00,1.00,-24.00,-14.40 +14.40,-9.60,4.72,0.00,1.00,163.20,-9.60 +9.60,-4.80,4.74,0.00,1.00,-14.40,-9.60 +4.80,-4.80,4.76,0.00,1.00,172.80,-4.80 +0.00,0.00,4.79,0.00,1.00,-4.80,-4.80 +-4.80,0.00,4.81,0.00,1.00,0.00,0.00 +-9.60,4.80,4.83,0.00,1.00,-177.60,0.00 +-14.40,4.80,4.85,0.00,1.00,9.60,4.80 +-19.20,9.60,4.87,0.00,1.00,-168.00,4.80 +-19.20,9.60,4.89,0.00,1.00,19.20,9.60 +-24.00,14.40,4.91,0.00,1.00,-158.40,9.60 +-28.80,14.40,4.93,0.00,1.00,28.80,14.40 +-33.60,19.20,4.96,0.00,1.00,-148.80,14.40 +-38.40,19.20,4.98,0.00,1.00,38.40,14.40 +-43.20,19.20,5.00,0.00,1.00,-139.20,19.20 +-48.00,24.00,5.02,0.00,1.00,48.00,19.20 +-52.80,24.00,5.04,0.00,1.00,-129.60,24.00 +-57.60,24.00,5.06,0.00,1.00,57.60,24.00 +-62.40,24.00,5.08,0.00,1.00,-120.00,24.00 +-72.00,28.80,5.11,0.00,1.00,67.20,24.00 +-76.80,28.80,5.13,0.00,1.00,-110.40,24.00 +-81.60,28.80,5.15,0.00,1.00,76.80,28.80 +-86.40,28.80,5.17,0.00,1.00,-100.80,28.80 +-91.20,28.80,5.19,0.00,1.00,86.40,28.80 +-96.00,28.80,5.21,0.00,1.00,-86.40,28.80 +-100.80,28.80,5.23,0.00,1.00,96.00,28.80 +-105.60,28.80,5.26,0.00,1.00,-76.80,28.80 +-115.20,28.80,5.28,0.00,1.00,105.60,28.80 +-120.00,24.00,5.30,0.00,1.00,-67.20,24.00 +-124.80,24.00,5.32,0.00,1.00,115.20,24.00 +-129.60,24.00,5.34,0.00,1.00,-57.60,24.00 +-134.40,24.00,5.36,0.00,1.00,124.80,24.00 +-139.20,19.20,5.38,0.00,1.00,-48.00,19.20 +-144.00,19.20,5.40,0.00,1.00,134.40,19.20 +-148.80,14.40,5.43,0.00,1.00,-38.40,19.20 +-153.60,14.40,5.45,0.00,1.00,144.00,14.40 +-158.40,14.40,5.47,0.00,1.00,-28.80,14.40 +-163.20,9.60,5.49,0.00,1.00,153.60,9.60 +-163.20,9.60,5.51,0.00,1.00,-19.20,9.60 +-168.00,4.80,5.53,0.00,1.00,163.20,9.60 +-172.80,4.80,5.55,0.00,1.00,-9.60,4.80 +-177.60,0.00,5.58,0.00,1.00,172.80,4.80 +177.60,-0.00,5.60,0.00,1.00,-0.00,0.00 +172.80,-4.80,5.62,0.00,1.00,-177.60,-0.00 +168.00,-4.80,5.64,0.00,1.00,4.80,-4.80 +163.20,-9.60,5.66,0.00,1.00,-168.00,-4.80 +163.20,-9.60,5.68,0.00,1.00,14.40,-9.60 +158.40,-14.40,5.70,0.00,1.00,-158.40,-9.60 +153.60,-14.40,5.72,0.00,1.00,24.00,-9.60 +148.80,-14.40,5.75,0.00,1.00,-148.80,-14.40 +144.00,-19.20,5.77,0.00,1.00,33.60,-14.40 +139.20,-19.20,5.79,0.00,1.00,-139.20,-19.20 +134.40,-24.00,5.81,0.00,1.00,43.20,-19.20 +129.60,-24.00,5.83,0.00,1.00,-129.60,-19.20 +124.80,-24.00,5.85,0.00,1.00,52.80,-24.00 +120.00,-24.00,5.87,0.00,1.00,-120.00,-24.00 +115.20,-28.80,5.90,0.00,1.00,62.40,-24.00 +105.60,-28.80,5.92,0.00,1.00,-110.40,-24.00 +100.80,-28.80,5.94,0.00,1.00,72.00,-28.80 +96.00,-28.80,5.96,0.00,1.00,-100.80,-28.80 +91.20,-28.80,5.98,0.00,1.00,81.60,-28.80 +86.40,-28.80,6.00,0.00,1.00,-91.20,-28.80 +81.60,-28.80,6.02,0.00,1.00,96.00,-28.80 +76.80,-28.80,6.05,0.00,1.00,-81.60,-28.80 +72.00,-28.80,6.07,0.00,1.00,105.60,-28.80 +62.40,-24.00,6.09,0.00,1.00,-72.00,-24.00 +57.60,-24.00,6.11,0.00,1.00,115.20,-24.00 +52.80,-24.00,6.13,0.00,1.00,-62.40,-24.00 +48.00,-24.00,6.15,0.00,1.00,124.80,-24.00 +43.20,-19.20,6.17,0.00,1.00,-52.80,-24.00 +38.40,-19.20,6.19,0.00,1.00,134.40,-19.20 +33.60,-19.20,6.22,0.00,1.00,-43.20,-19.20 +28.80,-14.40,6.24,0.00,1.00,144.00,-14.40 +24.00,-14.40,6.26,0.00,1.00,-33.60,-14.40 +19.20,-9.60,6.28,0.00,1.00,153.60,-14.40 +19.20,-9.60,6.30,0.00,1.00,-24.00,-9.60 +14.40,-4.80,6.32,0.00,1.00,163.20,-9.60 +9.60,-4.80,6.34,0.00,1.00,-14.40,-4.80 +4.80,-0.00,6.37,0.00,1.00,172.80,-4.80 +0.00,0.00,6.39,0.00,1.00,-4.80,-0.00 +-4.80,0.00,6.41,0.00,1.00,0.00,0.00 +-9.60,4.80,6.43,0.00,1.00,-177.60,0.00 +-14.40,4.80,6.45,0.00,1.00,9.60,4.80 +-19.20,9.60,6.47,0.00,1.00,-168.00,4.80 +-24.00,9.60,6.49,0.00,1.00,19.20,9.60 +-28.80,9.60,6.52,0.00,1.00,-158.40,9.60 +-33.60,14.40,6.54,0.00,1.00,28.80,9.60 +-33.60,14.40,6.56,0.00,1.00,-148.80,14.40 +-38.40,14.40,6.58,0.00,1.00,38.40,14.40 +-43.20,19.20,6.60,0.00,1.00,-139.20,14.40 +-48.00,19.20,6.62,0.00,1.00,48.00,14.40 +-57.60,19.20,6.64,0.00,1.00,-129.60,19.20 +-62.40,19.20,6.66,0.00,1.00,57.60,19.20 +-67.20,24.00,6.69,0.00,1.00,-120.00,19.20 +-72.00,24.00,6.71,0.00,1.00,67.20,19.20 +-76.80,24.00,6.73,0.00,1.00,-110.40,24.00 +-81.60,24.00,6.75,0.00,1.00,76.80,24.00 +-86.40,24.00,6.77,0.00,1.00,-100.80,24.00 +-91.20,24.00,6.79,0.00,1.00,86.40,24.00 +-96.00,24.00,6.81,0.00,1.00,-86.40,24.00 +-100.80,24.00,6.84,0.00,1.00,96.00,24.00 +-105.60,24.00,6.86,0.00,1.00,-76.80,24.00 +-110.40,24.00,6.88,0.00,1.00,105.60,24.00 +-115.20,19.20,6.90,0.00,1.00,-67.20,19.20 +-120.00,19.20,6.92,0.00,1.00,115.20,19.20 +-129.60,19.20,6.94,0.00,1.00,-57.60,19.20 +-134.40,19.20,6.96,0.00,1.00,124.80,19.20 +-139.20,19.20,6.99,0.00,1.00,-48.00,19.20 +-144.00,14.40,7.01,0.00,1.00,134.40,14.40 +-148.80,14.40,7.03,0.00,1.00,-38.40,14.40 +-148.80,14.40,7.05,0.00,1.00,144.00,14.40 +-153.60,9.60,7.07,0.00,1.00,-28.80,9.60 +-158.40,9.60,7.09,0.00,1.00,153.60,9.60 +-163.20,4.80,7.11,0.00,1.00,-19.20,9.60 +-168.00,4.80,7.13,0.00,1.00,163.20,4.80 +-172.80,4.80,7.16,0.00,1.00,-9.60,4.80 +-177.60,0.00,7.18,0.00,1.00,172.80,4.80 +177.60,-0.00,7.20,0.00,1.00,-0.00,0.00 +172.80,-4.80,7.22,0.00,1.00,-177.60,-0.00 +168.00,-4.80,7.24,0.00,1.00,4.80,-4.80 +163.20,-4.80,7.26,0.00,1.00,-168.00,-4.80 +158.40,-9.60,7.28,0.00,1.00,14.40,-4.80 +153.60,-9.60,7.31,0.00,1.00,-158.40,-9.60 +148.80,-14.40,7.33,0.00,1.00,24.00,-9.60 +148.80,-14.40,7.35,0.00,1.00,-148.80,-9.60 +144.00,-14.40,7.37,0.00,1.00,33.60,-14.40 +139.20,-19.20,7.39,0.00,1.00,-139.20,-14.40 +134.40,-19.20,7.41,0.00,1.00,43.20,-14.40 +129.60,-19.20,7.43,0.00,1.00,-129.60,-19.20 +120.00,-19.20,7.46,0.00,1.00,52.80,-19.20 +115.20,-19.20,7.48,0.00,1.00,-120.00,-19.20 +110.40,-24.00,7.50,0.00,1.00,62.40,-19.20 +105.60,-24.00,7.52,0.00,1.00,-110.40,-19.20 +100.80,-24.00,7.54,0.00,1.00,72.00,-24.00 +96.00,-24.00,7.56,0.00,1.00,-100.80,-24.00 +91.20,-24.00,7.58,0.00,1.00,81.60,-24.00 +86.40,-24.00,7.60,0.00,1.00,-91.20,-24.00 +81.60,-24.00,7.63,0.00,1.00,96.00,-24.00 +76.80,-24.00,7.65,0.00,1.00,-81.60,-24.00 +72.00,-24.00,7.67,0.00,1.00,105.60,-24.00 +67.20,-24.00,7.69,0.00,1.00,-72.00,-24.00 +62.40,-19.20,7.71,0.00,1.00,115.20,-19.20 +57.60,-19.20,7.73,0.00,1.00,-62.40,-19.20 +48.00,-19.20,7.75,0.00,1.00,124.80,-19.20 +43.20,-19.20,7.78,0.00,1.00,-52.80,-19.20 +38.40,-14.40,7.80,0.00,1.00,134.40,-14.40 +33.60,-14.40,7.82,0.00,1.00,-43.20,-14.40 +33.60,-14.40,7.84,0.00,1.00,144.00,-14.40 +28.80,-9.60,7.86,0.00,1.00,-33.60,-14.40 +24.00,-9.60,7.88,0.00,1.00,153.60,-9.60 +19.20,-9.60,7.90,0.00,1.00,-24.00,-9.60 +14.40,-4.80,7.93,0.00,1.00,163.20,-9.60 +9.60,-4.80,7.95,0.00,1.00,-14.40,-4.80 +4.80,-0.00,7.97,0.00,1.00,172.80,-4.80 +0.00,0.00,7.99,0.00,1.00,-4.80,-0.00 +-4.80,0.00,8.01,0.00,1.00,0.00,0.00 +-9.60,4.80,8.03,0.00,1.00,-177.60,0.00 +-14.40,4.80,8.05,0.00,1.00,9.60,4.80 +-19.20,4.80,8.07,0.00,1.00,-168.00,4.80 +-24.00,9.60,8.10,0.00,1.00,19.20,4.80 +-28.80,9.60,8.12,0.00,1.00,-158.40,9.60 +-33.60,9.60,8.14,0.00,1.00,24.00,9.60 +-38.40,9.60,8.16,0.00,1.00,-148.80,9.60 +-43.20,14.40,8.18,0.00,1.00,33.60,9.60 +-48.00,14.40,8.20,0.00,1.00,-139.20,14.40 +-52.80,14.40,8.22,0.00,1.00,43.20,14.40 +-57.60,14.40,8.25,0.00,1.00,-129.60,14.40 +-62.40,19.20,8.27,0.00,1.00,52.80,14.40 +-67.20,19.20,8.29,0.00,1.00,-120.00,14.40 +-72.00,19.20,8.31,0.00,1.00,62.40,14.40 +-76.80,19.20,8.33,0.00,1.00,-110.40,19.20 +-81.60,19.20,8.35,0.00,1.00,76.80,19.20 +-86.40,19.20,8.37,0.00,1.00,-100.80,19.20 +-91.20,19.20,8.40,0.00,1.00,86.40,19.20 +-96.00,19.20,8.42,0.00,1.00,-86.40,19.20 +-100.80,19.20,8.44,0.00,1.00,96.00,19.20 +-105.60,19.20,8.46,0.00,1.00,-76.80,19.20 +-110.40,19.20,8.48,0.00,1.00,105.60,19.20 +-115.20,19.20,8.50,0.00,1.00,-67.20,19.20 +-120.00,14.40,8.52,0.00,1.00,120.00,14.40 +-124.80,14.40,8.54,0.00,1.00,-57.60,14.40 +-129.60,14.40,8.57,0.00,1.00,129.60,14.40 +-134.40,14.40,8.59,0.00,1.00,-48.00,14.40 +-139.20,14.40,8.61,0.00,1.00,139.20,14.40 +-144.00,9.60,8.63,0.00,1.00,-38.40,9.60 +-148.80,9.60,8.65,0.00,1.00,148.80,9.60 +-153.60,9.60,8.67,0.00,1.00,-28.80,9.60 +-158.40,4.80,8.69,0.00,1.00,158.40,9.60 +-163.20,4.80,8.72,0.00,1.00,-19.20,4.80 +-168.00,4.80,8.74,0.00,1.00,163.20,4.80 +-172.80,0.00,8.76,0.00,1.00,-9.60,4.80 +-177.60,0.00,8.78,0.00,1.00,172.80,0.00 +177.60,-0.00,8.80,0.00,1.00,-0.00,0.00 +172.80,-0.00,8.82,0.00,1.00,-177.60,-0.00 +168.00,-4.80,8.84,0.00,1.00,4.80,-0.00 +163.20,-4.80,8.87,0.00,1.00,-168.00,-4.80 +158.40,-4.80,8.89,0.00,1.00,14.40,-4.80 +153.60,-9.60,8.91,0.00,1.00,-158.40,-4.80 +148.80,-9.60,8.93,0.00,1.00,24.00,-9.60 +144.00,-9.60,8.95,0.00,1.00,-153.60,-9.60 +139.20,-14.40,8.97,0.00,1.00,33.60,-9.60 +134.40,-14.40,8.99,0.00,1.00,-144.00,-9.60 +129.60,-14.40,9.01,0.00,1.00,43.20,-14.40 +124.80,-14.40,9.04,0.00,1.00,-134.40,-14.40 +120.00,-14.40,9.06,0.00,1.00,52.80,-14.40 +115.20,-19.20,9.08,0.00,1.00,-124.80,-14.40 +110.40,-19.20,9.10,0.00,1.00,62.40,-14.40 +105.60,-19.20,9.12,0.00,1.00,-110.40,-19.20 +100.80,-19.20,9.14,0.00,1.00,72.00,-19.20 +96.00,-19.20,9.16,0.00,1.00,-100.80,-19.20 +91.20,-19.20,9.19,0.00,1.00,81.60,-19.20 +86.40,-19.20,9.21,0.00,1.00,-91.20,-19.20 +81.60,-19.20,9.23,0.00,1.00,96.00,-19.20 +76.80,-19.20,9.25,0.00,1.00,-81.60,-19.20 +72.00,-19.20,9.27,0.00,1.00,105.60,-19.20 +67.20,-19.20,9.29,0.00,1.00,-72.00,-19.20 +62.40,-19.20,9.31,0.00,1.00,115.20,-14.40 +57.60,-14.40,9.34,0.00,1.00,-57.60,-14.40 +52.80,-14.40,9.36,0.00,1.00,124.80,-14.40 +48.00,-14.40,9.38,0.00,1.00,-48.00,-14.40 +43.20,-14.40,9.40,0.00,1.00,134.40,-14.40 +38.40,-9.60,9.42,0.00,1.00,-38.40,-14.40 +33.60,-9.60,9.44,0.00,1.00,144.00,-9.60 +28.80,-9.60,9.46,0.00,1.00,-28.80,-9.60 +24.00,-9.60,9.48,0.00,1.00,153.60,-9.60 +19.20,-4.80,9.51,0.00,1.00,-24.00,-9.60 +14.40,-4.80,9.53,0.00,1.00,163.20,-4.80 +9.60,-4.80,9.55,0.00,1.00,-14.40,-4.80 +4.80,-0.00,9.57,0.00,1.00,172.80,-4.80 +0.00,0.00,9.59,0.00,1.00,-4.80,-0.00 +-4.80,0.00,9.61,0.00,1.00,0.00,0.00 +-9.60,0.00,9.63,0.00,1.00,-177.60,0.00 +-14.40,4.80,9.66,0.00,1.00,9.60,0.00 +-19.20,4.80,9.68,0.00,1.00,-168.00,4.80 +-24.00,4.80,9.70,0.00,1.00,14.40,4.80 +-28.80,4.80,9.72,0.00,1.00,-158.40,4.80 +-33.60,9.60,9.74,0.00,1.00,24.00,4.80 +-38.40,9.60,9.76,0.00,1.00,-148.80,9.60 +-43.20,9.60,9.78,0.00,1.00,33.60,9.60 +-48.00,9.60,9.81,0.00,1.00,-139.20,9.60 +-52.80,9.60,9.83,0.00,1.00,43.20,9.60 +-57.60,14.40,9.85,0.00,1.00,-129.60,9.60 +-62.40,14.40,9.87,0.00,1.00,52.80,9.60 +-67.20,14.40,9.89,0.00,1.00,-120.00,9.60 +-72.00,14.40,9.91,0.00,1.00,62.40,14.40 +-76.80,14.40,9.93,0.00,1.00,-110.40,14.40 +-81.60,14.40,9.95,0.00,1.00,76.80,14.40 +-86.40,14.40,9.98,0.00,1.00,-100.80,14.40 +-91.20,14.40,10.00,0.00,1.00,86.40,14.40 +-96.00,14.40,10.02,0.00,1.00,-86.40,14.40 +-100.80,14.40,10.04,0.00,1.00,96.00,14.40 +-105.60,14.40,10.06,0.00,1.00,-76.80,14.40 +-110.40,14.40,10.08,0.00,1.00,110.40,14.40 +-115.20,14.40,10.10,0.00,1.00,-67.20,14.40 +-120.00,14.40,10.13,0.00,1.00,120.00,9.60 +-124.80,9.60,10.15,0.00,1.00,-57.60,9.60 +-129.60,9.60,10.17,0.00,1.00,129.60,9.60 +-134.40,9.60,10.19,0.00,1.00,-48.00,9.60 +-139.20,9.60,10.21,0.00,1.00,139.20,9.60 +-144.00,9.60,10.23,0.00,1.00,-38.40,9.60 +-148.80,9.60,10.25,0.00,1.00,148.80,9.60 +-153.60,4.80,10.28,0.00,1.00,-28.80,4.80 +-158.40,4.80,10.30,0.00,1.00,158.40,4.80 +-163.20,4.80,10.32,0.00,1.00,-19.20,4.80 +-168.00,4.80,10.34,0.00,1.00,168.00,4.80 +-172.80,0.00,10.36,0.00,1.00,-9.60,4.80 +-177.60,0.00,10.38,0.00,1.00,172.80,0.00 +177.60,-0.00,10.40,0.00,1.00,-0.00,0.00 +172.80,-0.00,10.42,0.00,1.00,-177.60,-0.00 +168.00,-4.80,10.45,0.00,1.00,4.80,-0.00 +163.20,-4.80,10.47,0.00,1.00,-168.00,-4.80 +158.40,-4.80,10.49,0.00,1.00,14.40,-4.80 +153.60,-4.80,10.51,0.00,1.00,-163.20,-4.80 +148.80,-9.60,10.53,0.00,1.00,24.00,-4.80 +144.00,-9.60,10.55,0.00,1.00,-153.60,-4.80 +139.20,-9.60,10.57,0.00,1.00,33.60,-9.60 +134.40,-9.60,10.60,0.00,1.00,-144.00,-9.60 +129.60,-9.60,10.62,0.00,1.00,43.20,-9.60 +124.80,-9.60,10.64,0.00,1.00,-134.40,-9.60 +120.00,-14.40,10.66,0.00,1.00,52.80,-9.60 +115.20,-14.40,10.68,0.00,1.00,-124.80,-9.60 +110.40,-14.40,10.70,0.00,1.00,62.40,-9.60 +105.60,-14.40,10.72,0.00,1.00,-115.20,-14.40 +100.80,-14.40,10.74,0.00,1.00,72.00,-14.40 +96.00,-14.40,10.77,0.00,1.00,-100.80,-14.40 +91.20,-14.40,10.79,0.00,1.00,81.60,-14.40 +86.40,-14.40,10.81,0.00,1.00,-91.20,-14.40 +81.60,-14.40,10.83,0.00,1.00,96.00,-14.40 +76.80,-14.40,10.85,0.00,1.00,-81.60,-14.40 +72.00,-14.40,10.87,0.00,1.00,105.60,-14.40 +67.20,-14.40,10.89,0.00,1.00,-67.20,-14.40 +62.40,-14.40,10.92,0.00,1.00,115.20,-14.40 +57.60,-14.40,10.94,0.00,1.00,-57.60,-9.60 +52.80,-9.60,10.96,0.00,1.00,124.80,-9.60 +48.00,-9.60,10.98,0.00,1.00,-48.00,-9.60 +43.20,-9.60,11.00,0.00,1.00,134.40,-9.60 +38.40,-9.60,11.02,0.00,1.00,-38.40,-9.60 +33.60,-9.60,11.04,0.00,1.00,144.00,-9.60 +28.80,-4.80,11.07,0.00,1.00,-28.80,-9.60 +24.00,-4.80,11.09,0.00,1.00,153.60,-4.80 +19.20,-4.80,11.11,0.00,1.00,-19.20,-4.80 +14.40,-4.80,11.13,0.00,1.00,163.20,-4.80 +9.60,-0.00,11.15,0.00,1.00,-14.40,-4.80 +4.80,-0.00,11.17,0.00,1.00,172.80,-0.00 +0.00,0.00,11.19,0.00,1.00,-4.80,-0.00 +-4.80,0.00,11.21,0.00,1.00,0.00,0.00 +-9.60,0.00,11.24,0.00,1.00,-177.60,0.00 +-14.40,0.00,11.26,0.00,1.00,9.60,0.00 +-19.20,4.80,11.28,0.00,1.00,-168.00,0.00 +-24.00,4.80,11.30,0.00,1.00,14.40,4.80 +-28.80,4.80,11.32,0.00,1.00,-158.40,4.80 +-33.60,4.80,11.34,0.00,1.00,24.00,4.80 +-38.40,4.80,11.36,0.00,1.00,-153.60,4.80 +-43.20,4.80,11.39,0.00,1.00,33.60,4.80 +-48.00,4.80,11.41,0.00,1.00,-144.00,4.80 +-52.80,9.60,11.43,0.00,1.00,43.20,4.80 +-57.60,9.60,11.45,0.00,1.00,-134.40,4.80 +-62.40,9.60,11.47,0.00,1.00,52.80,4.80 +-67.20,9.60,11.49,0.00,1.00,-124.80,9.60 +-72.00,9.60,11.51,0.00,1.00,62.40,9.60 +-76.80,9.60,11.54,0.00,1.00,-110.40,9.60 +-81.60,9.60,11.56,0.00,1.00,72.00,9.60 +-86.40,9.60,11.58,0.00,1.00,-100.80,9.60 +-91.20,9.60,11.60,0.00,1.00,86.40,9.60 +-96.00,9.60,11.62,0.00,1.00,-86.40,9.60 +-100.80,9.60,11.64,0.00,1.00,96.00,9.60 +-105.60,9.60,11.66,0.00,1.00,-76.80,9.60 +-110.40,9.60,11.68,0.00,1.00,110.40,9.60 +-115.20,9.60,11.71,0.00,1.00,-67.20,9.60 +-120.00,9.60,11.73,0.00,1.00,120.00,9.60 +-124.80,9.60,11.75,0.00,1.00,-52.80,9.60 +-129.60,9.60,11.77,0.00,1.00,129.60,4.80 +-134.40,4.80,11.79,0.00,1.00,-43.20,4.80 +-139.20,4.80,11.81,0.00,1.00,139.20,4.80 +-144.00,4.80,11.83,0.00,1.00,-33.60,4.80 +-148.80,4.80,11.86,0.00,1.00,148.80,4.80 +-153.60,4.80,11.88,0.00,1.00,-24.00,4.80 +-158.40,4.80,11.90,0.00,1.00,158.40,4.80 +-163.20,4.80,11.92,0.00,1.00,-19.20,4.80 +-168.00,0.00,11.94,0.00,1.00,168.00,4.80 +-172.80,0.00,11.96,0.00,1.00,-9.60,0.00 +-177.60,0.00,11.98,0.00,1.00,172.80,0.00 +177.60,-0.00,12.01,0.00,1.00,-0.00,0.00 +172.80,-0.00,12.03,0.00,1.00,-177.60,-0.00 +168.00,-0.00,12.05,0.00,1.00,4.80,-0.00 +163.20,-4.80,12.07,0.00,1.00,-168.00,-0.00 +158.40,-4.80,12.09,0.00,1.00,14.40,-4.80 +153.60,-4.80,12.11,0.00,1.00,-163.20,-4.80 +148.80,-4.80,12.13,0.00,1.00,24.00,-4.80 +144.00,-4.80,12.15,0.00,1.00,-153.60,-4.80 +139.20,-4.80,12.18,0.00,1.00,28.80,-4.80 +134.40,-4.80,12.20,0.00,1.00,-144.00,-4.80 +129.60,-9.60,12.22,0.00,1.00,38.40,-4.80 +124.80,-9.60,12.24,0.00,1.00,-134.40,-4.80 +120.00,-9.60,12.26,0.00,1.00,48.00,-4.80 +115.20,-9.60,12.28,0.00,1.00,-124.80,-9.60 +110.40,-9.60,12.30,0.00,1.00,57.60,-9.60 +105.60,-9.60,12.33,0.00,1.00,-115.20,-9.60 +100.80,-9.60,12.35,0.00,1.00,72.00,-9.60 +96.00,-9.60,12.37,0.00,1.00,-105.60,-9.60 +91.20,-9.60,12.39,0.00,1.00,81.60,-9.60 +86.40,-9.60,12.41,0.00,1.00,-91.20,-9.60 +81.60,-9.60,12.43,0.00,1.00,96.00,-9.60 +76.80,-9.60,12.45,0.00,1.00,-81.60,-9.60 +72.00,-9.60,12.48,0.00,1.00,105.60,-9.60 +67.20,-9.60,12.50,0.00,1.00,-67.20,-9.60 +62.40,-9.60,12.52,0.00,1.00,120.00,-9.60 +57.60,-9.60,12.54,0.00,1.00,-57.60,-9.60 +52.80,-9.60,12.56,0.00,1.00,129.60,-4.80 +48.00,-4.80,12.58,0.00,1.00,-48.00,-4.80 +43.20,-4.80,12.60,0.00,1.00,139.20,-4.80 +38.40,-4.80,12.62,0.00,1.00,-38.40,-4.80 +33.60,-4.80,12.65,0.00,1.00,148.80,-4.80 +28.80,-4.80,12.67,0.00,1.00,-28.80,-4.80 +24.00,-4.80,12.69,0.00,1.00,158.40,-4.80 +19.20,-4.80,12.71,0.00,1.00,-19.20,-4.80 +14.40,-0.00,12.73,0.00,1.00,163.20,-4.80 +9.60,-0.00,12.75,0.00,1.00,-9.60,-0.00 +4.80,-0.00,12.77,0.00,1.00,172.80,-0.00 +0.00,0.00,12.80,0.00,1.00,-4.80,-0.00 +-4.80,0.00,12.82,0.00,1.00,0.00,0.00 +-9.60,0.00,12.84,0.00,1.00,-177.60,0.00 +-14.40,0.00,12.86,0.00,1.00,9.60,0.00 +-19.20,0.00,12.88,0.00,1.00,-168.00,0.00 +-24.00,0.00,12.90,0.00,1.00,14.40,0.00 +-28.80,0.00,12.92,0.00,1.00,-163.20,0.00 +-33.60,4.80,12.95,0.00,1.00,24.00,0.00 +-38.40,4.80,12.97,0.00,1.00,-153.60,0.00 +-43.20,4.80,12.99,0.00,1.00,28.80,0.00 +-48.00,4.80,13.01,0.00,1.00,-144.00,4.80 +-52.80,4.80,13.03,0.00,1.00,38.40,4.80 +-57.60,4.80,13.05,0.00,1.00,-134.40,4.80 +-62.40,4.80,13.07,0.00,1.00,48.00,4.80 +-67.20,4.80,13.09,0.00,1.00,-124.80,4.80 +-72.00,4.80,13.12,0.00,1.00,62.40,4.80 +-76.80,4.80,13.14,0.00,1.00,-115.20,4.80 +-81.60,4.80,13.16,0.00,1.00,72.00,4.80 +-86.40,4.80,13.18,0.00,1.00,-100.80,4.80 +-91.20,4.80,13.20,0.00,1.00,86.40,4.80 +-96.00,4.80,13.22,0.00,1.00,-86.40,4.80 +-100.80,4.80,13.24,0.00,1.00,96.00,4.80 +-105.60,4.80,13.27,0.00,1.00,-76.80,4.80 +-110.40,4.80,13.29,0.00,1.00,110.40,4.80 +-115.20,4.80,13.31,0.00,1.00,-62.40,4.80 +-120.00,4.80,13.33,0.00,1.00,120.00,4.80 +-124.80,4.80,13.35,0.00,1.00,-52.80,4.80 +-129.60,4.80,13.37,0.00,1.00,134.40,4.80 +-134.40,4.80,13.39,0.00,1.00,-43.20,4.80 +-139.20,4.80,13.42,0.00,1.00,144.00,4.80 +-144.00,4.80,13.44,0.00,1.00,-33.60,0.00 +-148.80,4.80,13.46,0.00,1.00,153.60,0.00 +-153.60,0.00,13.48,0.00,1.00,-24.00,0.00 +-158.40,0.00,13.50,0.00,1.00,158.40,0.00 +-163.20,0.00,13.52,0.00,1.00,-14.40,0.00 +-168.00,0.00,13.54,0.00,1.00,168.00,0.00 +-172.80,0.00,13.56,0.00,1.00,-9.60,0.00 +-177.60,0.00,13.59,0.00,1.00,172.80,0.00 +177.60,-0.00,13.61,0.00,1.00,-0.00,0.00 +172.80,-0.00,13.63,0.00,1.00,-177.60,-0.00 +168.00,-0.00,13.65,0.00,1.00,4.80,-0.00 +163.20,-0.00,13.67,0.00,1.00,-172.80,-0.00 +158.40,-0.00,13.69,0.00,1.00,14.40,-0.00 +153.60,-0.00,13.71,0.00,1.00,-163.20,-0.00 +148.80,-4.80,13.74,0.00,1.00,19.20,-0.00 +144.00,-4.80,13.76,0.00,1.00,-153.60,-0.00 +139.20,-4.80,13.78,0.00,1.00,28.80,-0.00 +134.40,-4.80,13.80,0.00,1.00,-148.80,-0.00 +129.60,-4.80,13.82,0.00,1.00,38.40,-4.80 +124.80,-4.80,13.84,0.00,1.00,-139.20,-4.80 +120.00,-4.80,13.86,0.00,1.00,48.00,-4.80 +115.20,-4.80,13.89,0.00,1.00,-129.60,-4.80 +110.40,-4.80,13.91,0.00,1.00,57.60,-4.80 +105.60,-4.80,13.93,0.00,1.00,-115.20,-4.80 +100.80,-4.80,13.95,0.00,1.00,67.20,-4.80 +96.00,-4.80,13.97,0.00,1.00,-105.60,-4.80 +91.20,-4.80,13.99,0.00,1.00,81.60,-4.80 +86.40,-4.80,14.01,0.00,1.00,-91.20,-4.80 +81.60,-4.80,14.03,0.00,1.00,96.00,-4.80 +76.80,-4.80,14.06,0.00,1.00,-76.80,-4.80 +72.00,-4.80,14.08,0.00,1.00,105.60,-4.80 +67.20,-4.80,14.10,0.00,1.00,-67.20,-4.80 +62.40,-4.80,14.12,0.00,1.00,120.00,-4.80 +57.60,-4.80,14.14,0.00,1.00,-52.80,-4.80 +52.80,-4.80,14.16,0.00,1.00,129.60,-4.80 +48.00,-4.80,14.18,0.00,1.00,-43.20,-4.80 +43.20,-4.80,14.21,0.00,1.00,139.20,-4.80 +38.40,-4.80,14.23,0.00,1.00,-33.60,-4.80 +33.60,-4.80,14.25,0.00,1.00,148.80,-0.00 +28.80,-0.00,14.27,0.00,1.00,-28.80,-0.00 +24.00,-0.00,14.29,0.00,1.00,158.40,-0.00 +19.20,-0.00,14.31,0.00,1.00,-19.20,-0.00 +14.40,-0.00,14.33,0.00,1.00,163.20,-0.00 +9.60,-0.00,14.36,0.00,1.00,-9.60,-0.00 +4.80,-0.00,14.38,0.00,1.00,172.80,-0.00 +0.00,0.00,14.40,0.00,1.00,-4.80,-0.00 +-4.80,0.00,14.42,0.00,1.00,0.00,0.00 +-9.60,0.00,14.44,0.00,1.00,-177.60,-0.00 +-14.40,0.00,14.46,0.00,1.00,4.80,-0.00 +-19.20,0.00,14.48,0.00,1.00,-168.00,-0.00 +-24.00,0.00,14.50,0.00,1.00,14.40,-0.00 +-28.80,0.00,14.53,0.00,1.00,-163.20,-0.00 +-33.60,0.00,14.55,0.00,1.00,19.20,-0.00 +-38.40,0.00,14.57,0.00,1.00,-153.60,-0.00 +-43.20,0.00,14.59,0.00,1.00,28.80,-0.00 +-48.00,0.00,14.61,0.00,1.00,-148.80,-0.00 +-52.80,0.00,14.63,0.00,1.00,38.40,-0.00 +-57.60,0.00,14.65,0.00,1.00,-139.20,-0.00 +-62.40,0.00,14.68,0.00,1.00,48.00,-0.00 +-67.20,0.00,14.70,0.00,1.00,-124.80,-0.00 +-72.00,0.00,14.72,0.00,1.00,57.60,-0.00 +-76.80,0.00,14.74,0.00,1.00,-115.20,-0.00 +-81.60,0.00,14.76,0.00,1.00,72.00,-0.00 +-86.40,0.00,14.78,0.00,1.00,-100.80,-0.00 +-91.20,0.00,14.80,0.00,1.00,86.40,-0.00 +-96.00,0.00,14.83,0.00,1.00,-86.40,-0.00 +-100.80,0.00,14.85,0.00,1.00,100.80,-0.00 +-105.60,0.00,14.87,0.00,1.00,-76.80,-0.00 +-110.40,0.00,14.89,0.00,1.00,110.40,-0.00 +-115.20,0.00,14.91,0.00,1.00,-62.40,-0.00 +-120.00,0.00,14.93,0.00,1.00,124.80,-0.00 +-124.80,0.00,14.95,0.00,1.00,-48.00,-0.00 +-129.60,0.00,14.97,0.00,1.00,134.40,-0.00 +-134.40,0.00,15.00,0.00,1.00,-38.40,-0.00 +-139.20,0.00,15.02,0.00,1.00,144.00,-0.00 +-144.00,0.00,15.04,0.00,1.00,-28.80,-0.00 +-148.80,0.00,15.06,0.00,1.00,153.60,-0.00 +-153.60,0.00,15.08,0.00,1.00,-24.00,-0.00 +-158.40,0.00,15.10,0.00,1.00,163.20,-0.00 +-163.20,0.00,15.12,0.00,1.00,-14.40,-0.00 +-168.00,0.00,15.15,0.00,1.00,168.00,-0.00 +-172.80,0.00,15.17,0.00,1.00,-9.60,-0.00 +-177.60,0.00,15.19,0.00,1.00,172.80,-0.00 +177.60,0.00,15.21,0.00,1.00,-0.00,-0.00 +172.80,0.00,15.23,0.00,1.00,-177.60,0.00 +168.00,0.00,15.25,0.00,1.00,4.80,0.00 +163.20,0.00,15.27,0.00,1.00,-172.80,0.00 +158.40,0.00,15.30,0.00,1.00,9.60,0.00 +153.60,0.00,15.32,0.00,1.00,-163.20,0.00 +148.80,0.00,15.34,0.00,1.00,19.20,0.00 +144.00,0.00,15.36,0.00,1.00,-158.40,0.00 +139.20,0.00,15.38,0.00,1.00,28.80,0.00 +134.40,0.00,15.40,0.00,1.00,-148.80,0.00 +129.60,0.00,15.42,0.00,1.00,33.60,0.00 +124.80,0.00,15.44,0.00,1.00,-139.20,0.00 +120.00,0.00,15.47,0.00,1.00,43.20,0.00 +115.20,0.00,15.49,0.00,1.00,-129.60,0.00 +110.40,0.00,15.51,0.00,1.00,57.60,0.00 +105.60,0.00,15.53,0.00,1.00,-120.00,0.00 +100.80,0.00,15.55,0.00,1.00,67.20,0.00 +96.00,0.00,15.57,0.00,1.00,-105.60,0.00 +91.20,0.00,15.59,0.00,1.00,81.60,0.00 +86.40,0.00,15.62,0.00,1.00,-91.20,0.00 +81.60,0.00,15.64,0.00,1.00,96.00,0.00 +76.80,0.00,15.66,0.00,1.00,-76.80,0.00 +72.00,0.00,15.68,0.00,1.00,110.40,0.00 +67.20,0.00,15.70,0.00,1.00,-67.20,0.00 +62.40,0.00,15.72,0.00,1.00,120.00,0.00 +57.60,0.00,15.74,0.00,1.00,-52.80,0.00 +52.80,0.00,15.77,0.00,1.00,134.40,0.00 +48.00,0.00,15.79,0.00,1.00,-43.20,0.00 +43.20,0.00,15.81,0.00,1.00,144.00,0.00 +38.40,0.00,15.83,0.00,1.00,-33.60,0.00 +33.60,0.00,15.85,0.00,1.00,153.60,0.00 +28.80,0.00,15.87,0.00,1.00,-24.00,0.00 +24.00,0.00,15.89,0.00,1.00,158.40,0.00 +19.20,0.00,15.91,0.00,1.00,-19.20,0.00 +14.40,0.00,15.94,0.00,1.00,168.00,0.00 +9.60,0.00,15.96,0.00,1.00,-9.60,0.00 +4.80,0.00,15.98,0.00,1.00,172.80,0.00 +0.00,0.00,16.00,0.00,1.00,-4.80,0.00 diff --git a/scripts/testv/stvISM3.csv b/scripts/testv/stvISM3.csv index d2474d78fd..ac37e672e3 100644 --- a/scripts/testv/stvISM3.csv +++ b/scripts/testv/stvISM3.csv @@ -1,1500 +1,1500 @@ -0.00,0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 --168.00,-9.60,1.00,0.00,1.00 -14.40,14.40,1.00,0.00,1.00 --163.20,-14.40,1.00,0.00,1.00 -19.20,19.20,1.00,0.00,1.00 --153.60,-24.00,1.00,0.00,1.00 -28.80,24.00,1.00,0.00,1.00 --148.80,-28.80,1.00,0.00,1.00 -38.40,33.60,1.00,0.00,1.00 --139.20,-33.60,1.00,0.00,1.00 -48.00,38.40,1.00,0.00,1.00 --124.80,-38.40,1.00,0.00,1.00 -57.60,38.40,1.00,0.00,1.00 --115.20,-43.20,1.00,0.00,1.00 -72.00,43.20,1.00,0.00,1.00 --100.80,-43.20,1.00,0.00,1.00 -86.40,43.20,1.00,0.00,1.00 --86.40,-43.20,1.00,0.00,1.00 -100.80,43.20,1.00,0.00,1.00 --76.80,-43.20,1.00,0.00,1.00 -110.40,43.20,1.00,0.00,1.00 --62.40,-43.20,1.00,0.00,1.00 -124.80,38.40,1.00,0.00,1.00 --52.80,-38.40,1.00,0.00,1.00 -134.40,33.60,1.00,0.00,1.00 --38.40,-33.60,1.00,0.00,1.00 -144.00,28.80,1.00,0.00,1.00 --33.60,-28.80,1.00,0.00,1.00 -153.60,24.00,1.00,0.00,1.00 --24.00,-19.20,1.00,0.00,1.00 -158.40,19.20,1.00,0.00,1.00 --14.40,-14.40,1.00,0.00,1.00 -168.00,9.60,1.00,0.00,1.00 --9.60,-9.60,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --0.00,-0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 --172.80,-9.60,1.00,0.00,1.00 -14.40,9.60,1.00,0.00,1.00 --163.20,-14.40,1.00,0.00,1.00 -19.20,19.20,1.00,0.00,1.00 --158.40,-19.20,1.00,0.00,1.00 -28.80,24.00,1.00,0.00,1.00 --148.80,-28.80,1.00,0.00,1.00 -33.60,28.80,1.00,0.00,1.00 --139.20,-33.60,1.00,0.00,1.00 -43.20,33.60,1.00,0.00,1.00 --129.60,-38.40,1.00,0.00,1.00 -57.60,38.40,1.00,0.00,1.00 --120.00,-43.20,1.00,0.00,1.00 -67.20,43.20,1.00,0.00,1.00 --105.60,-43.20,1.00,0.00,1.00 -81.60,43.20,1.00,0.00,1.00 --91.20,-43.20,1.00,0.00,1.00 -96.00,43.20,1.00,0.00,1.00 --76.80,-43.20,1.00,0.00,1.00 -110.40,43.20,1.00,0.00,1.00 --67.20,-43.20,1.00,0.00,1.00 -120.00,38.40,1.00,0.00,1.00 --52.80,-38.40,1.00,0.00,1.00 -129.60,38.40,1.00,0.00,1.00 --43.20,-33.60,1.00,0.00,1.00 -144.00,33.60,1.00,0.00,1.00 --33.60,-28.80,1.00,0.00,1.00 -148.80,24.00,1.00,0.00,1.00 --24.00,-24.00,1.00,0.00,1.00 -158.40,19.20,1.00,0.00,1.00 --19.20,-14.40,1.00,0.00,1.00 -168.00,14.40,1.00,0.00,1.00 --9.60,-9.60,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 --168.00,-9.60,1.00,0.00,1.00 -14.40,14.40,1.00,0.00,1.00 --163.20,-14.40,1.00,0.00,1.00 -24.00,19.20,1.00,0.00,1.00 --153.60,-19.20,1.00,0.00,1.00 -28.80,24.00,1.00,0.00,1.00 --144.00,-24.00,1.00,0.00,1.00 -38.40,28.80,1.00,0.00,1.00 --134.40,-28.80,1.00,0.00,1.00 -48.00,33.60,1.00,0.00,1.00 --124.80,-33.60,1.00,0.00,1.00 -62.40,38.40,1.00,0.00,1.00 --115.20,-38.40,1.00,0.00,1.00 -72.00,38.40,1.00,0.00,1.00 --100.80,-38.40,1.00,0.00,1.00 -86.40,38.40,1.00,0.00,1.00 --86.40,-38.40,1.00,0.00,1.00 -96.00,38.40,1.00,0.00,1.00 --76.80,-38.40,1.00,0.00,1.00 -110.40,38.40,1.00,0.00,1.00 --62.40,-38.40,1.00,0.00,1.00 -120.00,33.60,1.00,0.00,1.00 --52.80,-33.60,1.00,0.00,1.00 -134.40,33.60,1.00,0.00,1.00 --43.20,-28.80,1.00,0.00,1.00 -144.00,28.80,1.00,0.00,1.00 --33.60,-24.00,1.00,0.00,1.00 -148.80,24.00,1.00,0.00,1.00 --24.00,-19.20,1.00,0.00,1.00 -158.40,14.40,1.00,0.00,1.00 --19.20,-14.40,1.00,0.00,1.00 -168.00,9.60,1.00,0.00,1.00 --9.60,-9.60,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --0.00,-0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 --172.80,-9.60,1.00,0.00,1.00 -14.40,9.60,1.00,0.00,1.00 --163.20,-14.40,1.00,0.00,1.00 -19.20,14.40,1.00,0.00,1.00 --153.60,-19.20,1.00,0.00,1.00 -28.80,24.00,1.00,0.00,1.00 --148.80,-24.00,1.00,0.00,1.00 -38.40,28.80,1.00,0.00,1.00 --139.20,-28.80,1.00,0.00,1.00 -48.00,33.60,1.00,0.00,1.00 --124.80,-33.60,1.00,0.00,1.00 -57.60,33.60,1.00,0.00,1.00 --115.20,-38.40,1.00,0.00,1.00 -72.00,38.40,1.00,0.00,1.00 --105.60,-38.40,1.00,0.00,1.00 -81.60,38.40,1.00,0.00,1.00 --91.20,-38.40,1.00,0.00,1.00 -96.00,38.40,1.00,0.00,1.00 --76.80,-38.40,1.00,0.00,1.00 -105.60,38.40,1.00,0.00,1.00 --67.20,-38.40,1.00,0.00,1.00 -120.00,38.40,1.00,0.00,1.00 --57.60,-33.60,1.00,0.00,1.00 -129.60,33.60,1.00,0.00,1.00 --43.20,-28.80,1.00,0.00,1.00 -139.20,28.80,1.00,0.00,1.00 --33.60,-24.00,1.00,0.00,1.00 -148.80,24.00,1.00,0.00,1.00 --28.80,-19.20,1.00,0.00,1.00 -158.40,19.20,1.00,0.00,1.00 --19.20,-14.40,1.00,0.00,1.00 -163.20,14.40,1.00,0.00,1.00 --9.60,-9.60,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 --168.00,-9.60,1.00,0.00,1.00 -14.40,9.60,1.00,0.00,1.00 --158.40,-14.40,1.00,0.00,1.00 -24.00,14.40,1.00,0.00,1.00 --153.60,-19.20,1.00,0.00,1.00 -33.60,19.20,1.00,0.00,1.00 --144.00,-24.00,1.00,0.00,1.00 -43.20,24.00,1.00,0.00,1.00 --134.40,-28.80,1.00,0.00,1.00 -52.80,28.80,1.00,0.00,1.00 --124.80,-28.80,1.00,0.00,1.00 -62.40,33.60,1.00,0.00,1.00 --110.40,-33.60,1.00,0.00,1.00 -72.00,33.60,1.00,0.00,1.00 --100.80,-33.60,1.00,0.00,1.00 -86.40,33.60,1.00,0.00,1.00 --86.40,-33.60,1.00,0.00,1.00 -96.00,33.60,1.00,0.00,1.00 --76.80,-33.60,1.00,0.00,1.00 -110.40,33.60,1.00,0.00,1.00 --67.20,-33.60,1.00,0.00,1.00 -120.00,33.60,1.00,0.00,1.00 --52.80,-28.80,1.00,0.00,1.00 -129.60,28.80,1.00,0.00,1.00 --43.20,-28.80,1.00,0.00,1.00 -139.20,24.00,1.00,0.00,1.00 --33.60,-24.00,1.00,0.00,1.00 -148.80,19.20,1.00,0.00,1.00 --24.00,-19.20,1.00,0.00,1.00 -158.40,14.40,1.00,0.00,1.00 --19.20,-14.40,1.00,0.00,1.00 -168.00,9.60,1.00,0.00,1.00 --9.60,-4.80,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --0.00,-0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 -14.40,9.60,1.00,0.00,1.00 --163.20,-14.40,1.00,0.00,1.00 -24.00,14.40,1.00,0.00,1.00 --153.60,-19.20,1.00,0.00,1.00 -28.80,19.20,1.00,0.00,1.00 --144.00,-24.00,1.00,0.00,1.00 -38.40,24.00,1.00,0.00,1.00 --134.40,-28.80,1.00,0.00,1.00 -48.00,28.80,1.00,0.00,1.00 --124.80,-28.80,1.00,0.00,1.00 -62.40,33.60,1.00,0.00,1.00 --115.20,-33.60,1.00,0.00,1.00 -72.00,33.60,1.00,0.00,1.00 --100.80,-33.60,1.00,0.00,1.00 -81.60,33.60,1.00,0.00,1.00 --91.20,-33.60,1.00,0.00,1.00 -96.00,33.60,1.00,0.00,1.00 --81.60,-33.60,1.00,0.00,1.00 -105.60,33.60,1.00,0.00,1.00 --67.20,-33.60,1.00,0.00,1.00 -115.20,33.60,1.00,0.00,1.00 --57.60,-28.80,1.00,0.00,1.00 -129.60,28.80,1.00,0.00,1.00 --48.00,-28.80,1.00,0.00,1.00 -139.20,24.00,1.00,0.00,1.00 --38.40,-24.00,1.00,0.00,1.00 -148.80,19.20,1.00,0.00,1.00 --28.80,-19.20,1.00,0.00,1.00 -153.60,14.40,1.00,0.00,1.00 --19.20,-14.40,1.00,0.00,1.00 -163.20,9.60,1.00,0.00,1.00 --9.60,-9.60,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 --168.00,-9.60,1.00,0.00,1.00 -14.40,9.60,1.00,0.00,1.00 --158.40,-9.60,1.00,0.00,1.00 -24.00,14.40,1.00,0.00,1.00 --148.80,-14.40,1.00,0.00,1.00 -33.60,19.20,1.00,0.00,1.00 --139.20,-19.20,1.00,0.00,1.00 -43.20,24.00,1.00,0.00,1.00 --129.60,-24.00,1.00,0.00,1.00 -52.80,24.00,1.00,0.00,1.00 --120.00,-28.80,1.00,0.00,1.00 -62.40,28.80,1.00,0.00,1.00 --110.40,-28.80,1.00,0.00,1.00 -76.80,28.80,1.00,0.00,1.00 --100.80,-28.80,1.00,0.00,1.00 -86.40,28.80,1.00,0.00,1.00 --86.40,-28.80,1.00,0.00,1.00 -96.00,28.80,1.00,0.00,1.00 --76.80,-28.80,1.00,0.00,1.00 -105.60,28.80,1.00,0.00,1.00 --67.20,-28.80,1.00,0.00,1.00 -120.00,28.80,1.00,0.00,1.00 --57.60,-24.00,1.00,0.00,1.00 -129.60,24.00,1.00,0.00,1.00 --48.00,-24.00,1.00,0.00,1.00 -139.20,19.20,1.00,0.00,1.00 --38.40,-19.20,1.00,0.00,1.00 -148.80,19.20,1.00,0.00,1.00 --28.80,-14.40,1.00,0.00,1.00 -158.40,14.40,1.00,0.00,1.00 --19.20,-9.60,1.00,0.00,1.00 -163.20,9.60,1.00,0.00,1.00 --9.60,-4.80,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --0.00,-0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 -14.40,9.60,1.00,0.00,1.00 --163.20,-9.60,1.00,0.00,1.00 -24.00,14.40,1.00,0.00,1.00 --153.60,-14.40,1.00,0.00,1.00 -33.60,19.20,1.00,0.00,1.00 --144.00,-19.20,1.00,0.00,1.00 -43.20,19.20,1.00,0.00,1.00 --134.40,-24.00,1.00,0.00,1.00 -52.80,24.00,1.00,0.00,1.00 --124.80,-24.00,1.00,0.00,1.00 -62.40,28.80,1.00,0.00,1.00 --115.20,-28.80,1.00,0.00,1.00 -72.00,28.80,1.00,0.00,1.00 --100.80,-28.80,1.00,0.00,1.00 -81.60,28.80,1.00,0.00,1.00 --91.20,-28.80,1.00,0.00,1.00 -96.00,28.80,1.00,0.00,1.00 --81.60,-28.80,1.00,0.00,1.00 -105.60,28.80,1.00,0.00,1.00 --67.20,-28.80,1.00,0.00,1.00 -115.20,28.80,1.00,0.00,1.00 --57.60,-28.80,1.00,0.00,1.00 -124.80,24.00,1.00,0.00,1.00 --48.00,-24.00,1.00,0.00,1.00 -134.40,24.00,1.00,0.00,1.00 --38.40,-19.20,1.00,0.00,1.00 -144.00,19.20,1.00,0.00,1.00 --28.80,-14.40,1.00,0.00,1.00 -153.60,14.40,1.00,0.00,1.00 --19.20,-9.60,1.00,0.00,1.00 -163.20,9.60,1.00,0.00,1.00 --14.40,-9.60,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 -19.20,9.60,1.00,0.00,1.00 --158.40,-9.60,1.00,0.00,1.00 -24.00,14.40,1.00,0.00,1.00 --148.80,-14.40,1.00,0.00,1.00 -33.60,14.40,1.00,0.00,1.00 --139.20,-19.20,1.00,0.00,1.00 -43.20,19.20,1.00,0.00,1.00 --129.60,-19.20,1.00,0.00,1.00 -52.80,19.20,1.00,0.00,1.00 --120.00,-24.00,1.00,0.00,1.00 -67.20,24.00,1.00,0.00,1.00 --110.40,-24.00,1.00,0.00,1.00 -76.80,24.00,1.00,0.00,1.00 --100.80,-24.00,1.00,0.00,1.00 -86.40,24.00,1.00,0.00,1.00 --86.40,-24.00,1.00,0.00,1.00 -96.00,24.00,1.00,0.00,1.00 --76.80,-24.00,1.00,0.00,1.00 -105.60,24.00,1.00,0.00,1.00 --67.20,-24.00,1.00,0.00,1.00 -115.20,24.00,1.00,0.00,1.00 --57.60,-24.00,1.00,0.00,1.00 -129.60,19.20,1.00,0.00,1.00 --48.00,-19.20,1.00,0.00,1.00 -139.20,19.20,1.00,0.00,1.00 --38.40,-14.40,1.00,0.00,1.00 -148.80,14.40,1.00,0.00,1.00 --28.80,-14.40,1.00,0.00,1.00 -153.60,9.60,1.00,0.00,1.00 --19.20,-9.60,1.00,0.00,1.00 -163.20,9.60,1.00,0.00,1.00 --9.60,-4.80,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --0.00,-0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 -14.40,9.60,1.00,0.00,1.00 --158.40,-9.60,1.00,0.00,1.00 -24.00,9.60,1.00,0.00,1.00 --153.60,-14.40,1.00,0.00,1.00 -33.60,14.40,1.00,0.00,1.00 --144.00,-14.40,1.00,0.00,1.00 -43.20,19.20,1.00,0.00,1.00 --134.40,-19.20,1.00,0.00,1.00 -52.80,19.20,1.00,0.00,1.00 --124.80,-24.00,1.00,0.00,1.00 -62.40,24.00,1.00,0.00,1.00 --110.40,-24.00,1.00,0.00,1.00 -72.00,24.00,1.00,0.00,1.00 --100.80,-24.00,1.00,0.00,1.00 -81.60,24.00,1.00,0.00,1.00 --91.20,-24.00,1.00,0.00,1.00 -96.00,24.00,1.00,0.00,1.00 --81.60,-24.00,1.00,0.00,1.00 -105.60,24.00,1.00,0.00,1.00 --72.00,-24.00,1.00,0.00,1.00 -115.20,24.00,1.00,0.00,1.00 --57.60,-24.00,1.00,0.00,1.00 -124.80,19.20,1.00,0.00,1.00 --48.00,-19.20,1.00,0.00,1.00 -134.40,19.20,1.00,0.00,1.00 --38.40,-19.20,1.00,0.00,1.00 -144.00,14.40,1.00,0.00,1.00 --28.80,-14.40,1.00,0.00,1.00 -153.60,14.40,1.00,0.00,1.00 --24.00,-9.60,1.00,0.00,1.00 -163.20,9.60,1.00,0.00,1.00 --14.40,-4.80,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 -19.20,4.80,1.00,0.00,1.00 --158.40,-9.60,1.00,0.00,1.00 -28.80,9.60,1.00,0.00,1.00 --148.80,-9.60,1.00,0.00,1.00 -38.40,14.40,1.00,0.00,1.00 --139.20,-14.40,1.00,0.00,1.00 -48.00,14.40,1.00,0.00,1.00 --129.60,-14.40,1.00,0.00,1.00 -57.60,19.20,1.00,0.00,1.00 --120.00,-19.20,1.00,0.00,1.00 -67.20,19.20,1.00,0.00,1.00 --110.40,-19.20,1.00,0.00,1.00 -76.80,19.20,1.00,0.00,1.00 --100.80,-19.20,1.00,0.00,1.00 -86.40,19.20,1.00,0.00,1.00 --86.40,-19.20,1.00,0.00,1.00 -96.00,19.20,1.00,0.00,1.00 --76.80,-19.20,1.00,0.00,1.00 -105.60,19.20,1.00,0.00,1.00 --67.20,-19.20,1.00,0.00,1.00 -115.20,19.20,1.00,0.00,1.00 --57.60,-19.20,1.00,0.00,1.00 -124.80,19.20,1.00,0.00,1.00 --48.00,-14.40,1.00,0.00,1.00 -134.40,14.40,1.00,0.00,1.00 --38.40,-14.40,1.00,0.00,1.00 -144.00,14.40,1.00,0.00,1.00 --28.80,-9.60,1.00,0.00,1.00 -153.60,9.60,1.00,0.00,1.00 --19.20,-9.60,1.00,0.00,1.00 -163.20,4.80,1.00,0.00,1.00 --9.60,-4.80,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --0.00,-0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 -14.40,4.80,1.00,0.00,1.00 --158.40,-9.60,1.00,0.00,1.00 -24.00,9.60,1.00,0.00,1.00 --148.80,-9.60,1.00,0.00,1.00 -33.60,14.40,1.00,0.00,1.00 --139.20,-14.40,1.00,0.00,1.00 -43.20,14.40,1.00,0.00,1.00 --129.60,-14.40,1.00,0.00,1.00 -52.80,19.20,1.00,0.00,1.00 --120.00,-19.20,1.00,0.00,1.00 -62.40,19.20,1.00,0.00,1.00 --110.40,-19.20,1.00,0.00,1.00 -72.00,19.20,1.00,0.00,1.00 --100.80,-19.20,1.00,0.00,1.00 -81.60,19.20,1.00,0.00,1.00 --91.20,-19.20,1.00,0.00,1.00 -96.00,19.20,1.00,0.00,1.00 --81.60,-19.20,1.00,0.00,1.00 -105.60,19.20,1.00,0.00,1.00 --72.00,-19.20,1.00,0.00,1.00 -115.20,19.20,1.00,0.00,1.00 --62.40,-19.20,1.00,0.00,1.00 -124.80,19.20,1.00,0.00,1.00 --52.80,-14.40,1.00,0.00,1.00 -134.40,14.40,1.00,0.00,1.00 --43.20,-14.40,1.00,0.00,1.00 -144.00,14.40,1.00,0.00,1.00 --33.60,-9.60,1.00,0.00,1.00 -153.60,9.60,1.00,0.00,1.00 --24.00,-9.60,1.00,0.00,1.00 -163.20,4.80,1.00,0.00,1.00 --14.40,-4.80,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 -19.20,4.80,1.00,0.00,1.00 --158.40,-4.80,1.00,0.00,1.00 -28.80,9.60,1.00,0.00,1.00 --148.80,-9.60,1.00,0.00,1.00 -38.40,9.60,1.00,0.00,1.00 --139.20,-9.60,1.00,0.00,1.00 -48.00,9.60,1.00,0.00,1.00 --129.60,-14.40,1.00,0.00,1.00 -57.60,14.40,1.00,0.00,1.00 --120.00,-14.40,1.00,0.00,1.00 -67.20,14.40,1.00,0.00,1.00 --110.40,-14.40,1.00,0.00,1.00 -76.80,14.40,1.00,0.00,1.00 --100.80,-14.40,1.00,0.00,1.00 -86.40,14.40,1.00,0.00,1.00 --86.40,-14.40,1.00,0.00,1.00 -96.00,14.40,1.00,0.00,1.00 --76.80,-14.40,1.00,0.00,1.00 -105.60,14.40,1.00,0.00,1.00 --67.20,-14.40,1.00,0.00,1.00 -115.20,14.40,1.00,0.00,1.00 --57.60,-14.40,1.00,0.00,1.00 -124.80,14.40,1.00,0.00,1.00 --48.00,-14.40,1.00,0.00,1.00 -134.40,9.60,1.00,0.00,1.00 --38.40,-9.60,1.00,0.00,1.00 -144.00,9.60,1.00,0.00,1.00 --28.80,-9.60,1.00,0.00,1.00 -153.60,4.80,1.00,0.00,1.00 --19.20,-4.80,1.00,0.00,1.00 -163.20,4.80,1.00,0.00,1.00 --9.60,-4.80,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 --0.00,-0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 -14.40,4.80,1.00,0.00,1.00 --158.40,-4.80,1.00,0.00,1.00 -24.00,4.80,1.00,0.00,1.00 --148.80,-9.60,1.00,0.00,1.00 -33.60,9.60,1.00,0.00,1.00 --139.20,-9.60,1.00,0.00,1.00 -43.20,9.60,1.00,0.00,1.00 --129.60,-14.40,1.00,0.00,1.00 -52.80,14.40,1.00,0.00,1.00 --120.00,-14.40,1.00,0.00,1.00 -62.40,14.40,1.00,0.00,1.00 --110.40,-14.40,1.00,0.00,1.00 -72.00,14.40,1.00,0.00,1.00 --100.80,-14.40,1.00,0.00,1.00 -81.60,14.40,1.00,0.00,1.00 --91.20,-14.40,1.00,0.00,1.00 -96.00,14.40,1.00,0.00,1.00 --81.60,-14.40,1.00,0.00,1.00 -105.60,14.40,1.00,0.00,1.00 --72.00,-14.40,1.00,0.00,1.00 -115.20,14.40,1.00,0.00,1.00 --62.40,-14.40,1.00,0.00,1.00 -124.80,14.40,1.00,0.00,1.00 --52.80,-14.40,1.00,0.00,1.00 -134.40,9.60,1.00,0.00,1.00 --43.20,-9.60,1.00,0.00,1.00 -144.00,9.60,1.00,0.00,1.00 --33.60,-9.60,1.00,0.00,1.00 -153.60,9.60,1.00,0.00,1.00 --24.00,-4.80,1.00,0.00,1.00 -163.20,4.80,1.00,0.00,1.00 --14.40,-4.80,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -9.60,0.00,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 -19.20,4.80,1.00,0.00,1.00 --158.40,-4.80,1.00,0.00,1.00 -28.80,4.80,1.00,0.00,1.00 --148.80,-4.80,1.00,0.00,1.00 -38.40,4.80,1.00,0.00,1.00 --139.20,-9.60,1.00,0.00,1.00 -48.00,9.60,1.00,0.00,1.00 --129.60,-9.60,1.00,0.00,1.00 -57.60,9.60,1.00,0.00,1.00 --120.00,-9.60,1.00,0.00,1.00 -67.20,9.60,1.00,0.00,1.00 --110.40,-9.60,1.00,0.00,1.00 -76.80,9.60,1.00,0.00,1.00 --100.80,-9.60,1.00,0.00,1.00 -86.40,9.60,1.00,0.00,1.00 --86.40,-9.60,1.00,0.00,1.00 -96.00,9.60,1.00,0.00,1.00 --76.80,-9.60,1.00,0.00,1.00 -105.60,9.60,1.00,0.00,1.00 --67.20,-9.60,1.00,0.00,1.00 -115.20,9.60,1.00,0.00,1.00 --57.60,-9.60,1.00,0.00,1.00 -124.80,9.60,1.00,0.00,1.00 --48.00,-9.60,1.00,0.00,1.00 -134.40,9.60,1.00,0.00,1.00 --38.40,-9.60,1.00,0.00,1.00 -144.00,4.80,1.00,0.00,1.00 --28.80,-4.80,1.00,0.00,1.00 -153.60,4.80,1.00,0.00,1.00 --19.20,-4.80,1.00,0.00,1.00 -163.20,4.80,1.00,0.00,1.00 --9.60,-0.00,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 --0.00,-0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 --168.00,-0.00,1.00,0.00,1.00 -14.40,4.80,1.00,0.00,1.00 --158.40,-4.80,1.00,0.00,1.00 -24.00,4.80,1.00,0.00,1.00 --148.80,-4.80,1.00,0.00,1.00 -33.60,4.80,1.00,0.00,1.00 --139.20,-9.60,1.00,0.00,1.00 -43.20,9.60,1.00,0.00,1.00 --129.60,-9.60,1.00,0.00,1.00 -52.80,9.60,1.00,0.00,1.00 --120.00,-9.60,1.00,0.00,1.00 -62.40,9.60,1.00,0.00,1.00 --110.40,-9.60,1.00,0.00,1.00 -72.00,9.60,1.00,0.00,1.00 --100.80,-9.60,1.00,0.00,1.00 -81.60,9.60,1.00,0.00,1.00 --91.20,-9.60,1.00,0.00,1.00 -96.00,9.60,1.00,0.00,1.00 --81.60,-9.60,1.00,0.00,1.00 -105.60,9.60,1.00,0.00,1.00 --72.00,-9.60,1.00,0.00,1.00 -115.20,9.60,1.00,0.00,1.00 --62.40,-9.60,1.00,0.00,1.00 -124.80,9.60,1.00,0.00,1.00 --52.80,-9.60,1.00,0.00,1.00 -134.40,9.60,1.00,0.00,1.00 --43.20,-9.60,1.00,0.00,1.00 -144.00,4.80,1.00,0.00,1.00 --33.60,-4.80,1.00,0.00,1.00 -153.60,4.80,1.00,0.00,1.00 --24.00,-4.80,1.00,0.00,1.00 -163.20,4.80,1.00,0.00,1.00 --14.40,-4.80,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -9.60,0.00,1.00,0.00,1.00 --168.00,-0.00,1.00,0.00,1.00 -19.20,0.00,1.00,0.00,1.00 --158.40,-4.80,1.00,0.00,1.00 -28.80,4.80,1.00,0.00,1.00 --148.80,-4.80,1.00,0.00,1.00 -38.40,4.80,1.00,0.00,1.00 --139.20,-4.80,1.00,0.00,1.00 -48.00,4.80,1.00,0.00,1.00 --129.60,-4.80,1.00,0.00,1.00 -57.60,4.80,1.00,0.00,1.00 --120.00,-4.80,1.00,0.00,1.00 -67.20,4.80,1.00,0.00,1.00 --110.40,-4.80,1.00,0.00,1.00 -76.80,4.80,1.00,0.00,1.00 --100.80,-4.80,1.00,0.00,1.00 -86.40,4.80,1.00,0.00,1.00 --86.40,-4.80,1.00,0.00,1.00 -96.00,4.80,1.00,0.00,1.00 --76.80,-4.80,1.00,0.00,1.00 -105.60,4.80,1.00,0.00,1.00 --67.20,-4.80,1.00,0.00,1.00 -115.20,4.80,1.00,0.00,1.00 --57.60,-4.80,1.00,0.00,1.00 -124.80,4.80,1.00,0.00,1.00 --48.00,-4.80,1.00,0.00,1.00 -134.40,4.80,1.00,0.00,1.00 --38.40,-4.80,1.00,0.00,1.00 -144.00,4.80,1.00,0.00,1.00 --28.80,-4.80,1.00,0.00,1.00 -153.60,4.80,1.00,0.00,1.00 --19.20,-4.80,1.00,0.00,1.00 -163.20,0.00,1.00,0.00,1.00 --9.60,-0.00,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 --0.00,-0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 --168.00,-0.00,1.00,0.00,1.00 -14.40,0.00,1.00,0.00,1.00 --158.40,-4.80,1.00,0.00,1.00 -24.00,4.80,1.00,0.00,1.00 --148.80,-4.80,1.00,0.00,1.00 -33.60,4.80,1.00,0.00,1.00 --139.20,-4.80,1.00,0.00,1.00 -43.20,4.80,1.00,0.00,1.00 --129.60,-4.80,1.00,0.00,1.00 -52.80,4.80,1.00,0.00,1.00 --120.00,-4.80,1.00,0.00,1.00 -62.40,4.80,1.00,0.00,1.00 --110.40,-4.80,1.00,0.00,1.00 -72.00,4.80,1.00,0.00,1.00 --100.80,-4.80,1.00,0.00,1.00 -81.60,4.80,1.00,0.00,1.00 --91.20,-4.80,1.00,0.00,1.00 -96.00,4.80,1.00,0.00,1.00 --81.60,-4.80,1.00,0.00,1.00 -105.60,4.80,1.00,0.00,1.00 --72.00,-4.80,1.00,0.00,1.00 -115.20,4.80,1.00,0.00,1.00 --62.40,-4.80,1.00,0.00,1.00 -124.80,4.80,1.00,0.00,1.00 --52.80,-4.80,1.00,0.00,1.00 -134.40,4.80,1.00,0.00,1.00 --43.20,-4.80,1.00,0.00,1.00 -144.00,4.80,1.00,0.00,1.00 --33.60,-4.80,1.00,0.00,1.00 -153.60,4.80,1.00,0.00,1.00 --24.00,-4.80,1.00,0.00,1.00 -163.20,0.00,1.00,0.00,1.00 --14.40,-0.00,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -9.60,0.00,1.00,0.00,1.00 --168.00,-0.00,1.00,0.00,1.00 -19.20,0.00,1.00,0.00,1.00 --158.40,-0.00,1.00,0.00,1.00 -28.80,0.00,1.00,0.00,1.00 --148.80,-0.00,1.00,0.00,1.00 -38.40,0.00,1.00,0.00,1.00 --139.20,-0.00,1.00,0.00,1.00 -48.00,0.00,1.00,0.00,1.00 --129.60,-0.00,1.00,0.00,1.00 -57.60,0.00,1.00,0.00,1.00 --120.00,-0.00,1.00,0.00,1.00 -67.20,0.00,1.00,0.00,1.00 --110.40,-0.00,1.00,0.00,1.00 -76.80,0.00,1.00,0.00,1.00 --100.80,-0.00,1.00,0.00,1.00 -86.40,0.00,1.00,0.00,1.00 --86.40,-0.00,1.00,0.00,1.00 -96.00,0.00,1.00,0.00,1.00 --76.80,-0.00,1.00,0.00,1.00 -105.60,0.00,1.00,0.00,1.00 --67.20,-0.00,1.00,0.00,1.00 -115.20,0.00,1.00,0.00,1.00 --57.60,-0.00,1.00,0.00,1.00 -124.80,0.00,1.00,0.00,1.00 --48.00,-0.00,1.00,0.00,1.00 -134.40,0.00,1.00,0.00,1.00 --38.40,-0.00,1.00,0.00,1.00 -144.00,0.00,1.00,0.00,1.00 --28.80,-0.00,1.00,0.00,1.00 -153.60,0.00,1.00,0.00,1.00 --19.20,-0.00,1.00,0.00,1.00 -163.20,0.00,1.00,0.00,1.00 --9.60,-0.00,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 --0.00,-0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 --168.00,-0.00,1.00,0.00,1.00 -14.40,0.00,1.00,0.00,1.00 --158.40,-0.00,1.00,0.00,1.00 -24.00,0.00,1.00,0.00,1.00 --148.80,-0.00,1.00,0.00,1.00 -33.60,0.00,1.00,0.00,1.00 --139.20,-0.00,1.00,0.00,1.00 -43.20,0.00,1.00,0.00,1.00 --129.60,-0.00,1.00,0.00,1.00 -52.80,0.00,1.00,0.00,1.00 --120.00,-0.00,1.00,0.00,1.00 -62.40,0.00,1.00,0.00,1.00 --110.40,-0.00,1.00,0.00,1.00 -72.00,0.00,1.00,0.00,1.00 --100.80,-0.00,1.00,0.00,1.00 -81.60,0.00,1.00,0.00,1.00 --91.20,-0.00,1.00,0.00,1.00 -96.00,0.00,1.00,0.00,1.00 --81.60,-0.00,1.00,0.00,1.00 -105.60,0.00,1.00,0.00,1.00 --72.00,-0.00,1.00,0.00,1.00 -115.20,0.00,1.00,0.00,1.00 --62.40,-0.00,1.00,0.00,1.00 -124.80,0.00,1.00,0.00,1.00 --52.80,-0.00,1.00,0.00,1.00 -134.40,0.00,1.00,0.00,1.00 --43.20,-0.00,1.00,0.00,1.00 -144.00,0.00,1.00,0.00,1.00 --33.60,-0.00,1.00,0.00,1.00 -153.60,0.00,1.00,0.00,1.00 --24.00,-0.00,1.00,0.00,1.00 -163.20,0.00,1.00,0.00,1.00 --14.40,-0.00,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -9.60,-0.00,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 -19.20,-0.00,1.00,0.00,1.00 --158.40,0.00,1.00,0.00,1.00 -28.80,-0.00,1.00,0.00,1.00 --148.80,0.00,1.00,0.00,1.00 -38.40,-0.00,1.00,0.00,1.00 --139.20,0.00,1.00,0.00,1.00 -48.00,-0.00,1.00,0.00,1.00 --129.60,0.00,1.00,0.00,1.00 -57.60,-4.80,1.00,0.00,1.00 --120.00,4.80,1.00,0.00,1.00 -67.20,-4.80,1.00,0.00,1.00 --110.40,4.80,1.00,0.00,1.00 -76.80,-4.80,1.00,0.00,1.00 --100.80,4.80,1.00,0.00,1.00 -86.40,-4.80,1.00,0.00,1.00 --86.40,4.80,1.00,0.00,1.00 -96.00,-4.80,1.00,0.00,1.00 --76.80,4.80,1.00,0.00,1.00 -105.60,-4.80,1.00,0.00,1.00 --67.20,4.80,1.00,0.00,1.00 -115.20,-4.80,1.00,0.00,1.00 --57.60,4.80,1.00,0.00,1.00 -124.80,-4.80,1.00,0.00,1.00 --48.00,0.00,1.00,0.00,1.00 -134.40,-0.00,1.00,0.00,1.00 --38.40,0.00,1.00,0.00,1.00 -144.00,-0.00,1.00,0.00,1.00 --28.80,0.00,1.00,0.00,1.00 -153.60,-0.00,1.00,0.00,1.00 --19.20,0.00,1.00,0.00,1.00 -163.20,-0.00,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 -14.40,-0.00,1.00,0.00,1.00 --158.40,0.00,1.00,0.00,1.00 -24.00,-0.00,1.00,0.00,1.00 --148.80,0.00,1.00,0.00,1.00 -33.60,-0.00,1.00,0.00,1.00 --139.20,0.00,1.00,0.00,1.00 -43.20,-0.00,1.00,0.00,1.00 --129.60,0.00,1.00,0.00,1.00 -52.80,-4.80,1.00,0.00,1.00 --120.00,4.80,1.00,0.00,1.00 -62.40,-4.80,1.00,0.00,1.00 --110.40,4.80,1.00,0.00,1.00 -72.00,-4.80,1.00,0.00,1.00 --100.80,4.80,1.00,0.00,1.00 -81.60,-4.80,1.00,0.00,1.00 --91.20,4.80,1.00,0.00,1.00 -96.00,-4.80,1.00,0.00,1.00 --81.60,4.80,1.00,0.00,1.00 -105.60,-4.80,1.00,0.00,1.00 --72.00,4.80,1.00,0.00,1.00 -115.20,-4.80,1.00,0.00,1.00 --62.40,4.80,1.00,0.00,1.00 -124.80,-4.80,1.00,0.00,1.00 --52.80,0.00,1.00,0.00,1.00 -134.40,-0.00,1.00,0.00,1.00 --43.20,0.00,1.00,0.00,1.00 -144.00,-0.00,1.00,0.00,1.00 --33.60,0.00,1.00,0.00,1.00 -153.60,-0.00,1.00,0.00,1.00 --24.00,0.00,1.00,0.00,1.00 -163.20,-0.00,1.00,0.00,1.00 --14.40,0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -9.60,-0.00,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 -19.20,-4.80,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 -28.80,-4.80,1.00,0.00,1.00 --148.80,4.80,1.00,0.00,1.00 -38.40,-4.80,1.00,0.00,1.00 --139.20,4.80,1.00,0.00,1.00 -48.00,-4.80,1.00,0.00,1.00 --129.60,4.80,1.00,0.00,1.00 -57.60,-4.80,1.00,0.00,1.00 --120.00,4.80,1.00,0.00,1.00 -67.20,-4.80,1.00,0.00,1.00 --110.40,9.60,1.00,0.00,1.00 -76.80,-9.60,1.00,0.00,1.00 --100.80,9.60,1.00,0.00,1.00 -86.40,-9.60,1.00,0.00,1.00 --86.40,9.60,1.00,0.00,1.00 -96.00,-9.60,1.00,0.00,1.00 --76.80,9.60,1.00,0.00,1.00 -105.60,-9.60,1.00,0.00,1.00 --67.20,9.60,1.00,0.00,1.00 -115.20,-4.80,1.00,0.00,1.00 --57.60,4.80,1.00,0.00,1.00 -124.80,-4.80,1.00,0.00,1.00 --48.00,4.80,1.00,0.00,1.00 -134.40,-4.80,1.00,0.00,1.00 --38.40,4.80,1.00,0.00,1.00 -144.00,-4.80,1.00,0.00,1.00 --28.80,4.80,1.00,0.00,1.00 -153.60,-4.80,1.00,0.00,1.00 --19.20,4.80,1.00,0.00,1.00 -163.20,-0.00,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 -14.40,-0.00,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 -24.00,-4.80,1.00,0.00,1.00 --148.80,4.80,1.00,0.00,1.00 -33.60,-4.80,1.00,0.00,1.00 --139.20,4.80,1.00,0.00,1.00 -43.20,-4.80,1.00,0.00,1.00 --129.60,4.80,1.00,0.00,1.00 -52.80,-4.80,1.00,0.00,1.00 --120.00,4.80,1.00,0.00,1.00 -62.40,-4.80,1.00,0.00,1.00 --110.40,9.60,1.00,0.00,1.00 -72.00,-9.60,1.00,0.00,1.00 --100.80,9.60,1.00,0.00,1.00 -81.60,-9.60,1.00,0.00,1.00 --91.20,9.60,1.00,0.00,1.00 -96.00,-9.60,1.00,0.00,1.00 --81.60,9.60,1.00,0.00,1.00 -105.60,-9.60,1.00,0.00,1.00 --72.00,9.60,1.00,0.00,1.00 -115.20,-4.80,1.00,0.00,1.00 --62.40,4.80,1.00,0.00,1.00 -124.80,-4.80,1.00,0.00,1.00 --52.80,4.80,1.00,0.00,1.00 -134.40,-4.80,1.00,0.00,1.00 --43.20,4.80,1.00,0.00,1.00 -144.00,-4.80,1.00,0.00,1.00 --33.60,4.80,1.00,0.00,1.00 -153.60,-4.80,1.00,0.00,1.00 --24.00,4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 --14.40,0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -9.60,-0.00,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 -19.20,-4.80,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 -28.80,-4.80,1.00,0.00,1.00 --148.80,4.80,1.00,0.00,1.00 -38.40,-9.60,1.00,0.00,1.00 --139.20,9.60,1.00,0.00,1.00 -48.00,-9.60,1.00,0.00,1.00 --129.60,9.60,1.00,0.00,1.00 -57.60,-9.60,1.00,0.00,1.00 --120.00,9.60,1.00,0.00,1.00 -67.20,-9.60,1.00,0.00,1.00 --110.40,9.60,1.00,0.00,1.00 -76.80,-14.40,1.00,0.00,1.00 --100.80,14.40,1.00,0.00,1.00 -86.40,-14.40,1.00,0.00,1.00 --86.40,14.40,1.00,0.00,1.00 -96.00,-14.40,1.00,0.00,1.00 --76.80,14.40,1.00,0.00,1.00 -105.60,-14.40,1.00,0.00,1.00 --67.20,9.60,1.00,0.00,1.00 -115.20,-9.60,1.00,0.00,1.00 --57.60,9.60,1.00,0.00,1.00 -124.80,-9.60,1.00,0.00,1.00 --48.00,9.60,1.00,0.00,1.00 -134.40,-9.60,1.00,0.00,1.00 --38.40,9.60,1.00,0.00,1.00 -144.00,-9.60,1.00,0.00,1.00 --28.80,4.80,1.00,0.00,1.00 -153.60,-4.80,1.00,0.00,1.00 --19.20,4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 -24.00,-4.80,1.00,0.00,1.00 --148.80,4.80,1.00,0.00,1.00 -33.60,-9.60,1.00,0.00,1.00 --139.20,9.60,1.00,0.00,1.00 -43.20,-9.60,1.00,0.00,1.00 --129.60,9.60,1.00,0.00,1.00 -52.80,-9.60,1.00,0.00,1.00 --120.00,9.60,1.00,0.00,1.00 -62.40,-9.60,1.00,0.00,1.00 --110.40,9.60,1.00,0.00,1.00 -72.00,-14.40,1.00,0.00,1.00 --100.80,14.40,1.00,0.00,1.00 -81.60,-14.40,1.00,0.00,1.00 --91.20,14.40,1.00,0.00,1.00 -96.00,-14.40,1.00,0.00,1.00 --81.60,14.40,1.00,0.00,1.00 -105.60,-14.40,1.00,0.00,1.00 --72.00,9.60,1.00,0.00,1.00 -115.20,-9.60,1.00,0.00,1.00 --62.40,9.60,1.00,0.00,1.00 -124.80,-9.60,1.00,0.00,1.00 --52.80,9.60,1.00,0.00,1.00 -134.40,-9.60,1.00,0.00,1.00 --43.20,9.60,1.00,0.00,1.00 -144.00,-9.60,1.00,0.00,1.00 --33.60,4.80,1.00,0.00,1.00 -153.60,-4.80,1.00,0.00,1.00 --24.00,4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 -19.20,-4.80,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 -28.80,-9.60,1.00,0.00,1.00 --148.80,9.60,1.00,0.00,1.00 -38.40,-9.60,1.00,0.00,1.00 --139.20,9.60,1.00,0.00,1.00 -48.00,-14.40,1.00,0.00,1.00 --129.60,14.40,1.00,0.00,1.00 -57.60,-14.40,1.00,0.00,1.00 --120.00,14.40,1.00,0.00,1.00 -67.20,-14.40,1.00,0.00,1.00 --110.40,14.40,1.00,0.00,1.00 -76.80,-19.20,1.00,0.00,1.00 --100.80,19.20,1.00,0.00,1.00 -86.40,-19.20,1.00,0.00,1.00 --86.40,19.20,1.00,0.00,1.00 -96.00,-19.20,1.00,0.00,1.00 --76.80,19.20,1.00,0.00,1.00 -105.60,-14.40,1.00,0.00,1.00 --67.20,14.40,1.00,0.00,1.00 -115.20,-14.40,1.00,0.00,1.00 --57.60,14.40,1.00,0.00,1.00 -124.80,-14.40,1.00,0.00,1.00 --48.00,14.40,1.00,0.00,1.00 -134.40,-14.40,1.00,0.00,1.00 --38.40,9.60,1.00,0.00,1.00 -144.00,-9.60,1.00,0.00,1.00 --28.80,9.60,1.00,0.00,1.00 -153.60,-9.60,1.00,0.00,1.00 --19.20,4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 --158.40,4.80,1.00,0.00,1.00 -24.00,-9.60,1.00,0.00,1.00 --148.80,9.60,1.00,0.00,1.00 -33.60,-9.60,1.00,0.00,1.00 --139.20,9.60,1.00,0.00,1.00 -43.20,-14.40,1.00,0.00,1.00 --129.60,14.40,1.00,0.00,1.00 -52.80,-14.40,1.00,0.00,1.00 --120.00,14.40,1.00,0.00,1.00 -62.40,-14.40,1.00,0.00,1.00 --110.40,14.40,1.00,0.00,1.00 -72.00,-14.40,1.00,0.00,1.00 --100.80,19.20,1.00,0.00,1.00 -81.60,-19.20,1.00,0.00,1.00 --91.20,19.20,1.00,0.00,1.00 -96.00,-19.20,1.00,0.00,1.00 --81.60,19.20,1.00,0.00,1.00 -105.60,-19.20,1.00,0.00,1.00 --72.00,14.40,1.00,0.00,1.00 -115.20,-14.40,1.00,0.00,1.00 --62.40,14.40,1.00,0.00,1.00 -124.80,-14.40,1.00,0.00,1.00 --52.80,14.40,1.00,0.00,1.00 -134.40,-14.40,1.00,0.00,1.00 --43.20,9.60,1.00,0.00,1.00 -144.00,-9.60,1.00,0.00,1.00 --33.60,9.60,1.00,0.00,1.00 -153.60,-9.60,1.00,0.00,1.00 --24.00,4.80,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 -19.20,-4.80,1.00,0.00,1.00 --158.40,9.60,1.00,0.00,1.00 -28.80,-9.60,1.00,0.00,1.00 --148.80,14.40,1.00,0.00,1.00 -38.40,-14.40,1.00,0.00,1.00 --139.20,14.40,1.00,0.00,1.00 -48.00,-14.40,1.00,0.00,1.00 --129.60,19.20,1.00,0.00,1.00 -57.60,-19.20,1.00,0.00,1.00 --120.00,19.20,1.00,0.00,1.00 -67.20,-19.20,1.00,0.00,1.00 --110.40,19.20,1.00,0.00,1.00 -76.80,-19.20,1.00,0.00,1.00 --100.80,24.00,1.00,0.00,1.00 -86.40,-24.00,1.00,0.00,1.00 --86.40,24.00,1.00,0.00,1.00 -96.00,-24.00,1.00,0.00,1.00 --76.80,24.00,1.00,0.00,1.00 -105.60,-19.20,1.00,0.00,1.00 --67.20,19.20,1.00,0.00,1.00 -115.20,-19.20,1.00,0.00,1.00 --57.60,19.20,1.00,0.00,1.00 -124.80,-19.20,1.00,0.00,1.00 --48.00,19.20,1.00,0.00,1.00 -134.40,-14.40,1.00,0.00,1.00 --38.40,14.40,1.00,0.00,1.00 -144.00,-14.40,1.00,0.00,1.00 --28.80,9.60,1.00,0.00,1.00 -153.60,-9.60,1.00,0.00,1.00 --19.20,9.60,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 -14.40,-4.80,1.00,0.00,1.00 --158.40,9.60,1.00,0.00,1.00 -24.00,-9.60,1.00,0.00,1.00 --148.80,9.60,1.00,0.00,1.00 -33.60,-14.40,1.00,0.00,1.00 --139.20,14.40,1.00,0.00,1.00 -43.20,-14.40,1.00,0.00,1.00 --129.60,19.20,1.00,0.00,1.00 -52.80,-19.20,1.00,0.00,1.00 --120.00,19.20,1.00,0.00,1.00 -62.40,-19.20,1.00,0.00,1.00 --110.40,19.20,1.00,0.00,1.00 -72.00,-19.20,1.00,0.00,1.00 --100.80,24.00,1.00,0.00,1.00 -81.60,-24.00,1.00,0.00,1.00 --91.20,24.00,1.00,0.00,1.00 -96.00,-24.00,1.00,0.00,1.00 --81.60,24.00,1.00,0.00,1.00 -105.60,-19.20,1.00,0.00,1.00 --72.00,19.20,1.00,0.00,1.00 -115.20,-19.20,1.00,0.00,1.00 --62.40,19.20,1.00,0.00,1.00 -124.80,-19.20,1.00,0.00,1.00 --52.80,19.20,1.00,0.00,1.00 -134.40,-14.40,1.00,0.00,1.00 --43.20,14.40,1.00,0.00,1.00 -144.00,-14.40,1.00,0.00,1.00 --33.60,14.40,1.00,0.00,1.00 -153.60,-9.60,1.00,0.00,1.00 --24.00,9.60,1.00,0.00,1.00 -163.20,-4.80,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 -19.20,-9.60,1.00,0.00,1.00 --158.40,9.60,1.00,0.00,1.00 -24.00,-14.40,1.00,0.00,1.00 --148.80,14.40,1.00,0.00,1.00 -33.60,-14.40,1.00,0.00,1.00 --139.20,19.20,1.00,0.00,1.00 -43.20,-19.20,1.00,0.00,1.00 --129.60,19.20,1.00,0.00,1.00 -52.80,-24.00,1.00,0.00,1.00 --120.00,24.00,1.00,0.00,1.00 -62.40,-24.00,1.00,0.00,1.00 --110.40,24.00,1.00,0.00,1.00 -76.80,-24.00,1.00,0.00,1.00 --100.80,28.80,1.00,0.00,1.00 -86.40,-28.80,1.00,0.00,1.00 --86.40,28.80,1.00,0.00,1.00 -96.00,-28.80,1.00,0.00,1.00 --76.80,28.80,1.00,0.00,1.00 -105.60,-24.00,1.00,0.00,1.00 --67.20,24.00,1.00,0.00,1.00 -120.00,-24.00,1.00,0.00,1.00 --57.60,24.00,1.00,0.00,1.00 -129.60,-24.00,1.00,0.00,1.00 --48.00,19.20,1.00,0.00,1.00 -139.20,-19.20,1.00,0.00,1.00 --38.40,19.20,1.00,0.00,1.00 -148.80,-14.40,1.00,0.00,1.00 --28.80,14.40,1.00,0.00,1.00 -158.40,-9.60,1.00,0.00,1.00 --19.20,9.60,1.00,0.00,1.00 -163.20,-9.60,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 --158.40,9.60,1.00,0.00,1.00 -24.00,-9.60,1.00,0.00,1.00 --153.60,14.40,1.00,0.00,1.00 -33.60,-14.40,1.00,0.00,1.00 --144.00,19.20,1.00,0.00,1.00 -43.20,-19.20,1.00,0.00,1.00 --134.40,19.20,1.00,0.00,1.00 -52.80,-24.00,1.00,0.00,1.00 --124.80,24.00,1.00,0.00,1.00 -62.40,-24.00,1.00,0.00,1.00 --110.40,24.00,1.00,0.00,1.00 -72.00,-24.00,1.00,0.00,1.00 --100.80,28.80,1.00,0.00,1.00 -81.60,-28.80,1.00,0.00,1.00 --91.20,28.80,1.00,0.00,1.00 -96.00,-28.80,1.00,0.00,1.00 --81.60,28.80,1.00,0.00,1.00 -105.60,-24.00,1.00,0.00,1.00 --72.00,24.00,1.00,0.00,1.00 -115.20,-24.00,1.00,0.00,1.00 --57.60,24.00,1.00,0.00,1.00 -124.80,-24.00,1.00,0.00,1.00 --48.00,19.20,1.00,0.00,1.00 -134.40,-19.20,1.00,0.00,1.00 --38.40,19.20,1.00,0.00,1.00 -144.00,-14.40,1.00,0.00,1.00 --28.80,14.40,1.00,0.00,1.00 -153.60,-14.40,1.00,0.00,1.00 --24.00,9.60,1.00,0.00,1.00 -163.20,-9.60,1.00,0.00,1.00 --14.40,4.80,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 --168.00,9.60,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 --158.40,14.40,1.00,0.00,1.00 -24.00,-14.40,1.00,0.00,1.00 --148.80,19.20,1.00,0.00,1.00 -33.60,-19.20,1.00,0.00,1.00 --139.20,19.20,1.00,0.00,1.00 -43.20,-24.00,1.00,0.00,1.00 --129.60,24.00,1.00,0.00,1.00 -52.80,-28.80,1.00,0.00,1.00 --120.00,28.80,1.00,0.00,1.00 -62.40,-28.80,1.00,0.00,1.00 --110.40,28.80,1.00,0.00,1.00 -76.80,-28.80,1.00,0.00,1.00 --100.80,33.60,1.00,0.00,1.00 -86.40,-33.60,1.00,0.00,1.00 --86.40,33.60,1.00,0.00,1.00 -96.00,-33.60,1.00,0.00,1.00 --76.80,28.80,1.00,0.00,1.00 -110.40,-28.80,1.00,0.00,1.00 --67.20,28.80,1.00,0.00,1.00 -120.00,-28.80,1.00,0.00,1.00 --57.60,28.80,1.00,0.00,1.00 -129.60,-24.00,1.00,0.00,1.00 --48.00,24.00,1.00,0.00,1.00 -139.20,-24.00,1.00,0.00,1.00 --38.40,19.20,1.00,0.00,1.00 -148.80,-19.20,1.00,0.00,1.00 --28.80,14.40,1.00,0.00,1.00 -158.40,-14.40,1.00,0.00,1.00 --19.20,9.60,1.00,0.00,1.00 -168.00,-9.60,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 --163.20,9.60,1.00,0.00,1.00 -24.00,-14.40,1.00,0.00,1.00 --153.60,14.40,1.00,0.00,1.00 -33.60,-19.20,1.00,0.00,1.00 --144.00,19.20,1.00,0.00,1.00 -43.20,-24.00,1.00,0.00,1.00 --134.40,24.00,1.00,0.00,1.00 -52.80,-24.00,1.00,0.00,1.00 --124.80,28.80,1.00,0.00,1.00 -62.40,-28.80,1.00,0.00,1.00 --115.20,28.80,1.00,0.00,1.00 -72.00,-28.80,1.00,0.00,1.00 --100.80,28.80,1.00,0.00,1.00 -81.60,-33.60,1.00,0.00,1.00 --91.20,33.60,1.00,0.00,1.00 -96.00,-33.60,1.00,0.00,1.00 --81.60,33.60,1.00,0.00,1.00 -105.60,-28.80,1.00,0.00,1.00 --67.20,28.80,1.00,0.00,1.00 -115.20,-28.80,1.00,0.00,1.00 --57.60,28.80,1.00,0.00,1.00 -124.80,-28.80,1.00,0.00,1.00 --48.00,24.00,1.00,0.00,1.00 -134.40,-24.00,1.00,0.00,1.00 --38.40,19.20,1.00,0.00,1.00 -144.00,-19.20,1.00,0.00,1.00 --28.80,19.20,1.00,0.00,1.00 -153.60,-14.40,1.00,0.00,1.00 --19.20,14.40,1.00,0.00,1.00 -163.20,-9.60,1.00,0.00,1.00 --14.40,9.60,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 --168.00,9.60,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 --158.40,14.40,1.00,0.00,1.00 -24.00,-14.40,1.00,0.00,1.00 --153.60,19.20,1.00,0.00,1.00 -33.60,-24.00,1.00,0.00,1.00 --144.00,24.00,1.00,0.00,1.00 -43.20,-24.00,1.00,0.00,1.00 --134.40,28.80,1.00,0.00,1.00 -52.80,-28.80,1.00,0.00,1.00 --124.80,33.60,1.00,0.00,1.00 -62.40,-33.60,1.00,0.00,1.00 --110.40,33.60,1.00,0.00,1.00 -72.00,-33.60,1.00,0.00,1.00 --100.80,38.40,1.00,0.00,1.00 -86.40,-38.40,1.00,0.00,1.00 --86.40,38.40,1.00,0.00,1.00 -96.00,-38.40,1.00,0.00,1.00 --76.80,33.60,1.00,0.00,1.00 -110.40,-33.60,1.00,0.00,1.00 --67.20,33.60,1.00,0.00,1.00 -120.00,-33.60,1.00,0.00,1.00 --52.80,28.80,1.00,0.00,1.00 -129.60,-28.80,1.00,0.00,1.00 --43.20,28.80,1.00,0.00,1.00 -139.20,-24.00,1.00,0.00,1.00 --33.60,24.00,1.00,0.00,1.00 -148.80,-19.20,1.00,0.00,1.00 --24.00,19.20,1.00,0.00,1.00 -158.40,-14.40,1.00,0.00,1.00 --19.20,14.40,1.00,0.00,1.00 -168.00,-9.60,1.00,0.00,1.00 --9.60,4.80,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 --168.00,4.80,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 --163.20,14.40,1.00,0.00,1.00 -24.00,-14.40,1.00,0.00,1.00 --153.60,19.20,1.00,0.00,1.00 -28.80,-19.20,1.00,0.00,1.00 --144.00,24.00,1.00,0.00,1.00 -38.40,-24.00,1.00,0.00,1.00 --134.40,28.80,1.00,0.00,1.00 -48.00,-28.80,1.00,0.00,1.00 --124.80,28.80,1.00,0.00,1.00 -57.60,-33.60,1.00,0.00,1.00 --115.20,33.60,1.00,0.00,1.00 -72.00,-33.60,1.00,0.00,1.00 --105.60,33.60,1.00,0.00,1.00 -81.60,-38.40,1.00,0.00,1.00 --91.20,38.40,1.00,0.00,1.00 -96.00,-38.40,1.00,0.00,1.00 --81.60,38.40,1.00,0.00,1.00 -105.60,-33.60,1.00,0.00,1.00 --67.20,33.60,1.00,0.00,1.00 -120.00,-33.60,1.00,0.00,1.00 --57.60,33.60,1.00,0.00,1.00 -129.60,-28.80,1.00,0.00,1.00 --48.00,28.80,1.00,0.00,1.00 -139.20,-24.00,1.00,0.00,1.00 --38.40,24.00,1.00,0.00,1.00 -148.80,-24.00,1.00,0.00,1.00 --28.80,19.20,1.00,0.00,1.00 -158.40,-14.40,1.00,0.00,1.00 --19.20,14.40,1.00,0.00,1.00 -163.20,-9.60,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 -9.60,-4.80,1.00,0.00,1.00 --168.00,9.60,1.00,0.00,1.00 -14.40,-14.40,1.00,0.00,1.00 --163.20,14.40,1.00,0.00,1.00 -24.00,-19.20,1.00,0.00,1.00 --153.60,19.20,1.00,0.00,1.00 -28.80,-24.00,1.00,0.00,1.00 --144.00,28.80,1.00,0.00,1.00 -38.40,-28.80,1.00,0.00,1.00 --134.40,33.60,1.00,0.00,1.00 -48.00,-33.60,1.00,0.00,1.00 --124.80,33.60,1.00,0.00,1.00 -62.40,-38.40,1.00,0.00,1.00 --115.20,38.40,1.00,0.00,1.00 -72.00,-38.40,1.00,0.00,1.00 --100.80,43.20,1.00,0.00,1.00 -86.40,-43.20,1.00,0.00,1.00 --86.40,43.20,1.00,0.00,1.00 -96.00,-43.20,1.00,0.00,1.00 --76.80,38.40,1.00,0.00,1.00 -110.40,-38.40,1.00,0.00,1.00 --62.40,38.40,1.00,0.00,1.00 -120.00,-38.40,1.00,0.00,1.00 --52.80,33.60,1.00,0.00,1.00 -134.40,-33.60,1.00,0.00,1.00 --43.20,28.80,1.00,0.00,1.00 -144.00,-28.80,1.00,0.00,1.00 --33.60,24.00,1.00,0.00,1.00 -153.60,-24.00,1.00,0.00,1.00 --24.00,19.20,1.00,0.00,1.00 -158.40,-19.20,1.00,0.00,1.00 --14.40,14.40,1.00,0.00,1.00 -168.00,-9.60,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 -14.40,-9.60,1.00,0.00,1.00 --163.20,14.40,1.00,0.00,1.00 -19.20,-19.20,1.00,0.00,1.00 --153.60,19.20,1.00,0.00,1.00 -28.80,-24.00,1.00,0.00,1.00 --148.80,24.00,1.00,0.00,1.00 -38.40,-28.80,1.00,0.00,1.00 --139.20,28.80,1.00,0.00,1.00 -48.00,-33.60,1.00,0.00,1.00 --129.60,33.60,1.00,0.00,1.00 -57.60,-38.40,1.00,0.00,1.00 --115.20,38.40,1.00,0.00,1.00 -67.20,-38.40,1.00,0.00,1.00 --105.60,38.40,1.00,0.00,1.00 -81.60,-43.20,1.00,0.00,1.00 --91.20,43.20,1.00,0.00,1.00 -96.00,-43.20,1.00,0.00,1.00 --76.80,43.20,1.00,0.00,1.00 -105.60,-38.40,1.00,0.00,1.00 --67.20,38.40,1.00,0.00,1.00 -120.00,-38.40,1.00,0.00,1.00 --52.80,33.60,1.00,0.00,1.00 -129.60,-33.60,1.00,0.00,1.00 --43.20,33.60,1.00,0.00,1.00 -139.20,-28.80,1.00,0.00,1.00 --33.60,28.80,1.00,0.00,1.00 -148.80,-24.00,1.00,0.00,1.00 --28.80,19.20,1.00,0.00,1.00 -158.40,-19.20,1.00,0.00,1.00 --19.20,14.40,1.00,0.00,1.00 -163.20,-14.40,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 --177.60,4.80,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 --168.00,9.60,1.00,0.00,1.00 -14.40,-14.40,1.00,0.00,1.00 --163.20,19.20,1.00,0.00,1.00 -19.20,-19.20,1.00,0.00,1.00 --153.60,24.00,1.00,0.00,1.00 -28.80,-28.80,1.00,0.00,1.00 --148.80,28.80,1.00,0.00,1.00 -38.40,-33.60,1.00,0.00,1.00 --139.20,33.60,1.00,0.00,1.00 -48.00,-38.40,1.00,0.00,1.00 --124.80,38.40,1.00,0.00,1.00 -57.60,-43.20,1.00,0.00,1.00 --115.20,43.20,1.00,0.00,1.00 -72.00,-43.20,1.00,0.00,1.00 --100.80,43.20,1.00,0.00,1.00 -86.40,-48.00,1.00,0.00,1.00 --86.40,48.00,1.00,0.00,1.00 -100.80,-48.00,1.00,0.00,1.00 --76.80,43.20,1.00,0.00,1.00 -110.40,-43.20,1.00,0.00,1.00 --62.40,43.20,1.00,0.00,1.00 -124.80,-38.40,1.00,0.00,1.00 --48.00,38.40,1.00,0.00,1.00 -134.40,-38.40,1.00,0.00,1.00 --38.40,33.60,1.00,0.00,1.00 -144.00,-28.80,1.00,0.00,1.00 --28.80,28.80,1.00,0.00,1.00 -153.60,-24.00,1.00,0.00,1.00 --24.00,24.00,1.00,0.00,1.00 -163.20,-19.20,1.00,0.00,1.00 --14.40,14.40,1.00,0.00,1.00 -168.00,-14.40,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --0.00,0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 -4.80,-4.80,1.00,0.00,1.00 --172.80,9.60,1.00,0.00,1.00 -9.60,-14.40,1.00,0.00,1.00 --163.20,14.40,1.00,0.00,1.00 -19.20,-19.20,1.00,0.00,1.00 --158.40,24.00,1.00,0.00,1.00 -28.80,-24.00,1.00,0.00,1.00 --148.80,28.80,1.00,0.00,1.00 -33.60,-28.80,1.00,0.00,1.00 --139.20,33.60,1.00,0.00,1.00 -43.20,-38.40,1.00,0.00,1.00 --129.60,38.40,1.00,0.00,1.00 -57.60,-38.40,1.00,0.00,1.00 --120.00,43.20,1.00,0.00,1.00 -67.20,-43.20,1.00,0.00,1.00 --105.60,43.20,1.00,0.00,1.00 -81.60,-48.00,1.00,0.00,1.00 --91.20,48.00,1.00,0.00,1.00 -96.00,-48.00,1.00,0.00,1.00 --76.80,43.20,1.00,0.00,1.00 -110.40,-43.20,1.00,0.00,1.00 --67.20,43.20,1.00,0.00,1.00 -120.00,-43.20,1.00,0.00,1.00 --52.80,38.40,1.00,0.00,1.00 -134.40,-38.40,1.00,0.00,1.00 --43.20,33.60,1.00,0.00,1.00 -144.00,-33.60,1.00,0.00,1.00 --33.60,28.80,1.00,0.00,1.00 -153.60,-28.80,1.00,0.00,1.00 --24.00,24.00,1.00,0.00,1.00 -158.40,-19.20,1.00,0.00,1.00 --19.20,19.20,1.00,0.00,1.00 -168.00,-14.40,1.00,0.00,1.00 --9.60,9.60,1.00,0.00,1.00 -172.80,-4.80,1.00,0.00,1.00 --4.80,4.80,1.00,0.00,1.00 +0.00,0.00,0.00,0.00,1.00,-0.00,0.00 +-177.60,-4.80,16.00,0.00,1.00,-0.00,0.00 +4.80,4.80,0.02,0.00,1.00,-0.00,0.00 +-168.00,-9.60,15.98,0.00,1.00,-0.00,0.00 +14.40,14.40,0.04,0.00,1.00,-0.00,0.00 +-163.20,-14.40,15.96,0.00,1.00,-0.00,0.00 +19.20,19.20,0.06,0.00,1.00,-0.00,0.00 +-153.60,-24.00,15.94,0.00,1.00,-0.00,0.00 +28.80,24.00,0.09,0.00,1.00,-0.00,0.00 +-148.80,-28.80,15.91,0.00,1.00,-0.00,0.00 +38.40,33.60,0.11,0.00,1.00,-0.00,0.00 +-139.20,-33.60,15.89,0.00,1.00,-0.00,0.00 +48.00,38.40,0.13,0.00,1.00,-0.00,0.00 +-124.80,-38.40,15.87,0.00,1.00,-0.00,0.00 +57.60,38.40,0.15,0.00,1.00,-0.00,0.00 +-115.20,-43.20,15.85,0.00,1.00,-0.00,0.00 +72.00,43.20,0.17,0.00,1.00,-0.00,0.00 +-100.80,-43.20,15.83,0.00,1.00,-0.00,0.00 +86.40,43.20,0.19,0.00,1.00,-0.00,0.00 +-86.40,-43.20,15.81,0.00,1.00,-177.60,0.00 +100.80,43.20,0.21,0.00,1.00,-177.60,0.00 +-76.80,-43.20,15.79,0.00,1.00,-177.60,0.00 +110.40,43.20,0.23,0.00,1.00,-177.60,0.00 +-62.40,-43.20,15.77,0.00,1.00,-177.60,0.00 +124.80,38.40,0.26,0.00,1.00,-177.60,0.00 +-52.80,-38.40,15.74,0.00,1.00,177.60,0.00 +134.40,33.60,0.28,0.00,1.00,177.60,0.00 +-38.40,-33.60,15.72,0.00,1.00,177.60,0.00 +144.00,28.80,0.30,0.00,1.00,177.60,0.00 +-33.60,-28.80,15.70,0.00,1.00,177.60,0.00 +153.60,24.00,0.32,0.00,1.00,177.60,0.00 +-24.00,-19.20,15.68,0.00,1.00,177.60,0.00 +158.40,19.20,0.34,0.00,1.00,177.60,0.00 +-14.40,-14.40,15.66,0.00,1.00,177.60,0.00 +168.00,9.60,0.36,0.00,1.00,177.60,0.00 +-9.60,-9.60,15.64,0.00,1.00,177.60,0.00 +172.80,4.80,0.38,0.00,1.00,177.60,0.00 +-0.00,-0.00,15.62,0.00,1.00,177.60,0.00 +-177.60,-0.00,0.41,0.00,1.00,-177.60,0.00 +4.80,4.80,15.59,0.00,1.00,-177.60,0.00 +-172.80,-9.60,0.43,0.00,1.00,-177.60,0.00 +14.40,9.60,15.57,0.00,1.00,-177.60,0.00 +-163.20,-14.40,0.45,0.00,1.00,-177.60,0.00 +19.20,19.20,15.55,0.00,1.00,-177.60,0.00 +-158.40,-19.20,0.47,0.00,1.00,-177.60,0.00 +28.80,24.00,15.53,0.00,1.00,-177.60,0.00 +-148.80,-28.80,0.49,0.00,1.00,-177.60,0.00 +33.60,28.80,15.51,0.00,1.00,-177.60,0.00 +-139.20,-33.60,0.51,0.00,1.00,-177.60,0.00 +43.20,33.60,15.49,0.00,1.00,-177.60,0.00 +-129.60,-38.40,0.53,0.00,1.00,-177.60,0.00 +57.60,38.40,15.47,0.00,1.00,177.60,0.00 +-120.00,-43.20,0.56,0.00,1.00,177.60,0.00 +67.20,43.20,15.44,0.00,1.00,177.60,0.00 +-105.60,-43.20,0.58,0.00,1.00,177.60,0.00 +81.60,43.20,15.42,0.00,1.00,177.60,0.00 +-91.20,-43.20,0.60,0.00,1.00,177.60,0.00 +96.00,43.20,15.40,0.00,1.00,0.00,0.00 +-76.80,-43.20,0.62,0.00,1.00,0.00,0.00 +110.40,43.20,15.38,0.00,1.00,0.00,0.00 +-67.20,-43.20,0.64,0.00,1.00,0.00,0.00 +120.00,38.40,15.36,0.00,1.00,0.00,0.00 +-52.80,-38.40,0.66,0.00,1.00,0.00,0.00 +129.60,38.40,15.34,0.00,1.00,0.00,0.00 +-43.20,-33.60,0.68,0.00,1.00,0.00,0.00 +144.00,33.60,15.32,0.00,1.00,0.00,0.00 +-33.60,-28.80,0.70,0.00,1.00,0.00,0.00 +148.80,24.00,15.30,0.00,1.00,0.00,0.00 +-24.00,-24.00,0.73,0.00,1.00,0.00,0.00 +158.40,19.20,15.27,0.00,1.00,0.00,0.00 +-19.20,-14.40,0.75,0.00,1.00,0.00,0.00 +168.00,14.40,15.25,0.00,1.00,0.00,0.00 +-9.60,-9.60,0.77,0.00,1.00,0.00,0.00 +172.80,4.80,15.23,0.00,1.00,0.00,0.00 +-4.80,-4.80,0.79,0.00,1.00,0.00,0.00 +0.00,0.00,15.21,0.00,1.00,0.00,0.00 +-177.60,-4.80,0.81,0.00,1.00,0.00,-0.00 +9.60,4.80,15.19,0.00,1.00,0.00,-0.00 +-168.00,-9.60,0.83,0.00,1.00,0.00,-0.00 +14.40,14.40,15.17,0.00,1.00,0.00,-0.00 +-163.20,-14.40,0.85,0.00,1.00,0.00,-0.00 +24.00,19.20,15.15,0.00,1.00,4.80,-0.00 +-153.60,-19.20,0.88,0.00,1.00,4.80,-4.80 +28.80,24.00,15.12,0.00,1.00,4.80,-4.80 +-144.00,-24.00,0.90,0.00,1.00,4.80,-4.80 +38.40,28.80,15.10,0.00,1.00,4.80,-4.80 +-134.40,-28.80,0.92,0.00,1.00,4.80,-4.80 +48.00,33.60,15.08,0.00,1.00,9.60,-4.80 +-124.80,-33.60,0.94,0.00,1.00,9.60,-4.80 +62.40,38.40,15.06,0.00,1.00,9.60,-4.80 +-115.20,-38.40,0.96,0.00,1.00,14.40,-4.80 +72.00,38.40,15.04,0.00,1.00,19.20,-4.80 +-100.80,-38.40,0.98,0.00,1.00,28.80,-4.80 +86.40,38.40,15.02,0.00,1.00,52.80,-4.80 +-86.40,-38.40,1.00,0.00,1.00,105.60,-4.80 +96.00,38.40,15.00,0.00,1.00,139.20,-4.80 +-76.80,-38.40,1.03,0.00,1.00,158.40,-4.80 +110.40,38.40,14.97,0.00,1.00,163.20,-4.80 +-62.40,-38.40,1.05,0.00,1.00,168.00,-4.80 +120.00,33.60,14.95,0.00,1.00,168.00,-4.80 +-52.80,-33.60,1.07,0.00,1.00,172.80,-4.80 +134.40,33.60,14.93,0.00,1.00,172.80,-4.80 +-43.20,-28.80,1.09,0.00,1.00,172.80,-4.80 +144.00,28.80,14.91,0.00,1.00,172.80,-4.80 +-33.60,-24.00,1.11,0.00,1.00,177.60,-4.80 +148.80,24.00,14.89,0.00,1.00,177.60,-4.80 +-24.00,-19.20,1.13,0.00,1.00,177.60,-4.80 +158.40,14.40,14.87,0.00,1.00,177.60,-0.00 +-19.20,-14.40,1.15,0.00,1.00,177.60,-0.00 +168.00,9.60,14.85,0.00,1.00,177.60,-0.00 +-9.60,-9.60,1.17,0.00,1.00,177.60,-0.00 +172.80,4.80,14.83,0.00,1.00,177.60,-0.00 +-0.00,-0.00,1.20,0.00,1.00,177.60,-0.00 +-177.60,-0.00,14.80,0.00,1.00,-177.60,0.00 +4.80,4.80,1.22,0.00,1.00,-177.60,0.00 +-172.80,-9.60,14.78,0.00,1.00,-177.60,0.00 +14.40,9.60,1.24,0.00,1.00,-177.60,0.00 +-163.20,-14.40,14.76,0.00,1.00,-177.60,0.00 +19.20,14.40,1.26,0.00,1.00,-177.60,0.00 +-153.60,-19.20,14.74,0.00,1.00,-177.60,4.80 +28.80,24.00,1.28,0.00,1.00,-177.60,4.80 +-148.80,-24.00,14.72,0.00,1.00,-177.60,4.80 +38.40,28.80,1.30,0.00,1.00,-172.80,4.80 +-139.20,-28.80,14.70,0.00,1.00,-172.80,4.80 +48.00,33.60,1.32,0.00,1.00,-172.80,4.80 +-124.80,-33.60,14.68,0.00,1.00,-172.80,4.80 +57.60,33.60,1.35,0.00,1.00,-168.00,4.80 +-115.20,-38.40,14.65,0.00,1.00,-168.00,4.80 +72.00,38.40,1.37,0.00,1.00,-163.20,4.80 +-105.60,-38.40,14.63,0.00,1.00,-158.40,4.80 +81.60,38.40,1.39,0.00,1.00,-139.20,4.80 +-91.20,-38.40,14.61,0.00,1.00,-105.60,4.80 +96.00,38.40,1.41,0.00,1.00,-52.80,4.80 +-76.80,-38.40,14.59,0.00,1.00,-28.80,4.80 +105.60,38.40,1.43,0.00,1.00,-19.20,4.80 +-67.20,-38.40,14.57,0.00,1.00,-14.40,4.80 +120.00,38.40,1.45,0.00,1.00,-9.60,4.80 +-57.60,-33.60,14.55,0.00,1.00,-9.60,4.80 +129.60,33.60,1.47,0.00,1.00,-9.60,4.80 +-43.20,-28.80,14.53,0.00,1.00,-4.80,4.80 +139.20,28.80,1.50,0.00,1.00,-4.80,4.80 +-33.60,-24.00,14.50,0.00,1.00,-4.80,4.80 +148.80,24.00,1.52,0.00,1.00,-4.80,4.80 +-28.80,-19.20,14.48,0.00,1.00,-4.80,4.80 +158.40,19.20,1.54,0.00,1.00,-4.80,0.00 +-19.20,-14.40,14.46,0.00,1.00,-0.00,0.00 +163.20,14.40,1.56,0.00,1.00,-0.00,0.00 +-9.60,-9.60,14.44,0.00,1.00,-0.00,0.00 +172.80,4.80,1.58,0.00,1.00,-0.00,0.00 +-4.80,-4.80,14.42,0.00,1.00,-0.00,0.00 +0.00,0.00,1.60,0.00,1.00,0.00,0.00 +-177.60,-4.80,14.40,0.00,1.00,0.00,-0.00 +9.60,4.80,1.62,0.00,1.00,0.00,-0.00 +-168.00,-9.60,14.38,0.00,1.00,4.80,-0.00 +14.40,9.60,1.64,0.00,1.00,4.80,-4.80 +-158.40,-14.40,14.36,0.00,1.00,4.80,-4.80 +24.00,14.40,1.67,0.00,1.00,4.80,-4.80 +-153.60,-19.20,14.33,0.00,1.00,4.80,-4.80 +33.60,19.20,1.69,0.00,1.00,9.60,-4.80 +-144.00,-24.00,14.31,0.00,1.00,9.60,-4.80 +43.20,24.00,1.71,0.00,1.00,9.60,-4.80 +-134.40,-28.80,14.29,0.00,1.00,14.40,-9.60 +52.80,28.80,1.73,0.00,1.00,14.40,-9.60 +-124.80,-28.80,14.27,0.00,1.00,19.20,-9.60 +62.40,33.60,1.75,0.00,1.00,24.00,-9.60 +-110.40,-33.60,14.25,0.00,1.00,28.80,-9.60 +72.00,33.60,1.77,0.00,1.00,33.60,-9.60 +-100.80,-33.60,14.23,0.00,1.00,48.00,-9.60 +86.40,33.60,1.79,0.00,1.00,67.20,-9.60 +-86.40,-33.60,14.21,0.00,1.00,96.00,-9.60 +96.00,33.60,1.82,0.00,1.00,120.00,-9.60 +-76.80,-33.60,14.18,0.00,1.00,139.20,-9.60 +110.40,33.60,1.84,0.00,1.00,148.80,-9.60 +-67.20,-33.60,14.16,0.00,1.00,153.60,-9.60 +120.00,33.60,1.86,0.00,1.00,158.40,-9.60 +-52.80,-28.80,14.14,0.00,1.00,163.20,-9.60 +129.60,28.80,1.88,0.00,1.00,168.00,-9.60 +-43.20,-28.80,14.12,0.00,1.00,168.00,-9.60 +139.20,24.00,1.90,0.00,1.00,168.00,-4.80 +-33.60,-24.00,14.10,0.00,1.00,172.80,-4.80 +148.80,19.20,1.92,0.00,1.00,172.80,-4.80 +-24.00,-19.20,14.08,0.00,1.00,172.80,-4.80 +158.40,14.40,1.94,0.00,1.00,177.60,-4.80 +-19.20,-14.40,14.06,0.00,1.00,177.60,-4.80 +168.00,9.60,1.97,0.00,1.00,177.60,-4.80 +-9.60,-4.80,14.03,0.00,1.00,177.60,-0.00 +172.80,4.80,1.99,0.00,1.00,177.60,-0.00 +-0.00,-0.00,14.01,0.00,1.00,177.60,-0.00 +-177.60,-0.00,2.01,0.00,1.00,-177.60,0.00 +4.80,4.80,13.99,0.00,1.00,-177.60,0.00 +-168.00,-4.80,2.03,0.00,1.00,-177.60,0.00 +14.40,9.60,13.97,0.00,1.00,-177.60,4.80 +-163.20,-14.40,2.05,0.00,1.00,-177.60,4.80 +24.00,14.40,13.95,0.00,1.00,-177.60,4.80 +-153.60,-19.20,2.07,0.00,1.00,-172.80,4.80 +28.80,19.20,13.93,0.00,1.00,-172.80,4.80 +-144.00,-24.00,2.09,0.00,1.00,-172.80,4.80 +38.40,24.00,13.91,0.00,1.00,-168.00,4.80 +-134.40,-28.80,2.11,0.00,1.00,-168.00,9.60 +48.00,28.80,13.89,0.00,1.00,-168.00,9.60 +-124.80,-28.80,2.14,0.00,1.00,-163.20,9.60 +62.40,33.60,13.86,0.00,1.00,-158.40,9.60 +-115.20,-33.60,2.16,0.00,1.00,-153.60,9.60 +72.00,33.60,13.84,0.00,1.00,-148.80,9.60 +-100.80,-33.60,2.18,0.00,1.00,-139.20,9.60 +81.60,33.60,13.82,0.00,1.00,-120.00,9.60 +-91.20,-33.60,2.20,0.00,1.00,-96.00,9.60 +96.00,33.60,13.80,0.00,1.00,-67.20,9.60 +-81.60,-33.60,2.22,0.00,1.00,-48.00,9.60 +105.60,33.60,13.78,0.00,1.00,-33.60,9.60 +-67.20,-33.60,2.24,0.00,1.00,-28.80,9.60 +115.20,33.60,13.76,0.00,1.00,-24.00,9.60 +-57.60,-28.80,2.26,0.00,1.00,-19.20,9.60 +129.60,28.80,13.74,0.00,1.00,-14.40,9.60 +-48.00,-28.80,2.29,0.00,1.00,-14.40,9.60 +139.20,24.00,13.71,0.00,1.00,-9.60,4.80 +-38.40,-24.00,2.31,0.00,1.00,-9.60,4.80 +148.80,19.20,13.69,0.00,1.00,-9.60,4.80 +-28.80,-19.20,2.33,0.00,1.00,-4.80,4.80 +153.60,14.40,13.67,0.00,1.00,-4.80,4.80 +-19.20,-14.40,2.35,0.00,1.00,-4.80,4.80 +163.20,9.60,13.65,0.00,1.00,-4.80,4.80 +-9.60,-9.60,2.37,0.00,1.00,-4.80,0.00 +172.80,4.80,13.63,0.00,1.00,-0.00,0.00 +-4.80,-4.80,2.39,0.00,1.00,-0.00,0.00 +0.00,0.00,13.61,0.00,1.00,0.00,0.00 +-177.60,-4.80,2.41,0.00,1.00,0.00,-0.00 +9.60,4.80,13.59,0.00,1.00,4.80,-0.00 +-168.00,-9.60,2.44,0.00,1.00,4.80,-4.80 +14.40,9.60,13.56,0.00,1.00,4.80,-4.80 +-158.40,-9.60,2.46,0.00,1.00,4.80,-4.80 +24.00,14.40,13.54,0.00,1.00,9.60,-4.80 +-148.80,-14.40,2.48,0.00,1.00,9.60,-9.60 +33.60,19.20,13.52,0.00,1.00,9.60,-9.60 +-139.20,-19.20,2.50,0.00,1.00,14.40,-9.60 +43.20,24.00,13.50,0.00,1.00,14.40,-9.60 +-129.60,-24.00,2.52,0.00,1.00,19.20,-9.60 +52.80,24.00,13.48,0.00,1.00,19.20,-14.40 +-120.00,-28.80,2.54,0.00,1.00,24.00,-14.40 +62.40,28.80,13.46,0.00,1.00,28.80,-14.40 +-110.40,-28.80,2.56,0.00,1.00,38.40,-14.40 +76.80,28.80,13.44,0.00,1.00,48.00,-14.40 +-100.80,-28.80,2.58,0.00,1.00,57.60,-14.40 +86.40,28.80,13.42,0.00,1.00,76.80,-14.40 +-86.40,-28.80,2.61,0.00,1.00,96.00,-14.40 +96.00,28.80,13.39,0.00,1.00,115.20,-14.40 +-76.80,-28.80,2.63,0.00,1.00,129.60,-14.40 +105.60,28.80,13.37,0.00,1.00,139.20,-14.40 +-67.20,-28.80,2.65,0.00,1.00,144.00,-14.40 +120.00,28.80,13.35,0.00,1.00,153.60,-14.40 +-57.60,-24.00,2.67,0.00,1.00,158.40,-14.40 +129.60,24.00,13.33,0.00,1.00,158.40,-9.60 +-48.00,-24.00,2.69,0.00,1.00,163.20,-9.60 +139.20,19.20,13.31,0.00,1.00,168.00,-9.60 +-38.40,-19.20,2.71,0.00,1.00,168.00,-9.60 +148.80,19.20,13.29,0.00,1.00,168.00,-9.60 +-28.80,-14.40,2.73,0.00,1.00,172.80,-9.60 +158.40,14.40,13.27,0.00,1.00,172.80,-4.80 +-19.20,-9.60,2.76,0.00,1.00,172.80,-4.80 +163.20,9.60,13.24,0.00,1.00,177.60,-4.80 +-9.60,-4.80,2.78,0.00,1.00,177.60,-4.80 +172.80,4.80,13.22,0.00,1.00,177.60,-0.00 +-0.00,-0.00,2.80,0.00,1.00,177.60,-0.00 +-177.60,-0.00,13.20,0.00,1.00,-177.60,0.00 +4.80,4.80,2.82,0.00,1.00,-177.60,0.00 +-168.00,-4.80,13.18,0.00,1.00,-177.60,4.80 +14.40,9.60,2.84,0.00,1.00,-177.60,4.80 +-163.20,-9.60,13.16,0.00,1.00,-172.80,4.80 +24.00,14.40,2.86,0.00,1.00,-172.80,4.80 +-153.60,-14.40,13.14,0.00,1.00,-172.80,9.60 +33.60,19.20,2.88,0.00,1.00,-168.00,9.60 +-144.00,-19.20,13.12,0.00,1.00,-168.00,9.60 +43.20,19.20,2.91,0.00,1.00,-168.00,9.60 +-134.40,-24.00,13.09,0.00,1.00,-163.20,9.60 +52.80,24.00,2.93,0.00,1.00,-158.40,9.60 +-124.80,-24.00,13.07,0.00,1.00,-158.40,14.40 +62.40,28.80,2.95,0.00,1.00,-153.60,14.40 +-115.20,-28.80,13.05,0.00,1.00,-144.00,14.40 +72.00,28.80,2.97,0.00,1.00,-139.20,14.40 +-100.80,-28.80,13.03,0.00,1.00,-129.60,14.40 +81.60,28.80,2.99,0.00,1.00,-115.20,14.40 +-91.20,-28.80,13.01,0.00,1.00,-96.00,14.40 +96.00,28.80,3.01,0.00,1.00,-76.80,14.40 +-81.60,-28.80,12.99,0.00,1.00,-57.60,14.40 +105.60,28.80,3.03,0.00,1.00,-48.00,14.40 +-67.20,-28.80,12.97,0.00,1.00,-38.40,14.40 +115.20,28.80,3.05,0.00,1.00,-28.80,14.40 +-57.60,-28.80,12.95,0.00,1.00,-24.00,14.40 +124.80,24.00,3.08,0.00,1.00,-19.20,14.40 +-48.00,-24.00,12.92,0.00,1.00,-19.20,9.60 +134.40,24.00,3.10,0.00,1.00,-14.40,9.60 +-38.40,-19.20,12.90,0.00,1.00,-14.40,9.60 +144.00,19.20,3.12,0.00,1.00,-9.60,9.60 +-28.80,-14.40,12.88,0.00,1.00,-9.60,9.60 +153.60,14.40,3.14,0.00,1.00,-9.60,4.80 +-19.20,-9.60,12.86,0.00,1.00,-4.80,4.80 +163.20,9.60,3.16,0.00,1.00,-4.80,4.80 +-14.40,-9.60,12.84,0.00,1.00,-4.80,4.80 +172.80,4.80,3.18,0.00,1.00,-4.80,0.00 +-4.80,-4.80,12.82,0.00,1.00,-0.00,0.00 +0.00,0.00,3.20,0.00,1.00,0.00,0.00 +-177.60,-0.00,12.80,0.00,1.00,0.00,-0.00 +9.60,4.80,3.23,0.00,1.00,4.80,-4.80 +-168.00,-4.80,12.77,0.00,1.00,4.80,-4.80 +19.20,9.60,3.25,0.00,1.00,4.80,-4.80 +-158.40,-9.60,12.75,0.00,1.00,9.60,-9.60 +24.00,14.40,3.27,0.00,1.00,9.60,-9.60 +-148.80,-14.40,12.73,0.00,1.00,14.40,-9.60 +33.60,14.40,3.29,0.00,1.00,14.40,-9.60 +-139.20,-19.20,12.71,0.00,1.00,19.20,-14.40 +43.20,19.20,3.31,0.00,1.00,19.20,-14.40 +-129.60,-19.20,12.69,0.00,1.00,24.00,-14.40 +52.80,19.20,3.33,0.00,1.00,28.80,-14.40 +-120.00,-24.00,12.67,0.00,1.00,33.60,-19.20 +67.20,24.00,3.35,0.00,1.00,38.40,-19.20 +-110.40,-24.00,12.65,0.00,1.00,43.20,-19.20 +76.80,24.00,3.38,0.00,1.00,52.80,-19.20 +-100.80,-24.00,12.62,0.00,1.00,67.20,-19.20 +86.40,24.00,3.40,0.00,1.00,76.80,-19.20 +-86.40,-24.00,12.60,0.00,1.00,96.00,-19.20 +96.00,24.00,3.42,0.00,1.00,105.60,-19.20 +-76.80,-24.00,12.58,0.00,1.00,120.00,-19.20 +105.60,24.00,3.44,0.00,1.00,129.60,-19.20 +-67.20,-24.00,12.56,0.00,1.00,139.20,-19.20 +115.20,24.00,3.46,0.00,1.00,144.00,-19.20 +-57.60,-24.00,12.54,0.00,1.00,148.80,-14.40 +129.60,19.20,3.48,0.00,1.00,153.60,-14.40 +-48.00,-19.20,12.52,0.00,1.00,158.40,-14.40 +139.20,19.20,3.50,0.00,1.00,163.20,-14.40 +-38.40,-14.40,12.50,0.00,1.00,163.20,-14.40 +148.80,14.40,3.52,0.00,1.00,168.00,-9.60 +-28.80,-14.40,12.48,0.00,1.00,168.00,-9.60 +153.60,9.60,3.55,0.00,1.00,172.80,-9.60 +-19.20,-9.60,12.45,0.00,1.00,172.80,-4.80 +163.20,9.60,3.57,0.00,1.00,172.80,-4.80 +-9.60,-4.80,12.43,0.00,1.00,177.60,-4.80 +172.80,4.80,3.59,0.00,1.00,177.60,-0.00 +-0.00,-0.00,12.41,0.00,1.00,177.60,-0.00 +-177.60,-0.00,3.61,0.00,1.00,-177.60,0.00 +4.80,4.80,12.39,0.00,1.00,-177.60,0.00 +-168.00,-4.80,3.63,0.00,1.00,-177.60,4.80 +14.40,9.60,12.37,0.00,1.00,-172.80,4.80 +-158.40,-9.60,3.65,0.00,1.00,-172.80,4.80 +24.00,9.60,12.35,0.00,1.00,-172.80,9.60 +-153.60,-14.40,3.67,0.00,1.00,-168.00,9.60 +33.60,14.40,12.33,0.00,1.00,-168.00,9.60 +-144.00,-14.40,3.70,0.00,1.00,-163.20,14.40 +43.20,19.20,12.30,0.00,1.00,-163.20,14.40 +-134.40,-19.20,3.72,0.00,1.00,-158.40,14.40 +52.80,19.20,12.28,0.00,1.00,-153.60,14.40 +-124.80,-24.00,3.74,0.00,1.00,-148.80,14.40 +62.40,24.00,12.26,0.00,1.00,-144.00,19.20 +-110.40,-24.00,3.76,0.00,1.00,-139.20,19.20 +72.00,24.00,12.24,0.00,1.00,-129.60,19.20 +-100.80,-24.00,3.78,0.00,1.00,-120.00,19.20 +81.60,24.00,12.22,0.00,1.00,-105.60,19.20 +-91.20,-24.00,3.80,0.00,1.00,-96.00,19.20 +96.00,24.00,12.20,0.00,1.00,-76.80,19.20 +-81.60,-24.00,3.82,0.00,1.00,-67.20,19.20 +105.60,24.00,12.18,0.00,1.00,-52.80,19.20 +-72.00,-24.00,3.85,0.00,1.00,-43.20,19.20 +115.20,24.00,12.15,0.00,1.00,-38.40,19.20 +-57.60,-24.00,3.87,0.00,1.00,-33.60,19.20 +124.80,19.20,12.13,0.00,1.00,-28.80,14.40 +-48.00,-19.20,3.89,0.00,1.00,-24.00,14.40 +134.40,19.20,12.11,0.00,1.00,-19.20,14.40 +-38.40,-19.20,3.91,0.00,1.00,-19.20,14.40 +144.00,14.40,12.09,0.00,1.00,-14.40,9.60 +-28.80,-14.40,3.93,0.00,1.00,-14.40,9.60 +153.60,14.40,12.07,0.00,1.00,-9.60,9.60 +-24.00,-9.60,3.95,0.00,1.00,-9.60,9.60 +163.20,9.60,12.05,0.00,1.00,-4.80,4.80 +-14.40,-4.80,3.97,0.00,1.00,-4.80,4.80 +172.80,4.80,12.03,0.00,1.00,-4.80,4.80 +-4.80,-0.00,3.99,0.00,1.00,-0.00,0.00 +0.00,0.00,12.01,0.00,1.00,0.00,0.00 +-177.60,-0.00,4.02,0.00,1.00,0.00,-0.00 +9.60,4.80,11.98,0.00,1.00,4.80,-4.80 +-168.00,-4.80,4.04,0.00,1.00,4.80,-4.80 +19.20,4.80,11.96,0.00,1.00,9.60,-9.60 +-158.40,-9.60,4.06,0.00,1.00,9.60,-9.60 +28.80,9.60,11.94,0.00,1.00,14.40,-9.60 +-148.80,-9.60,4.08,0.00,1.00,14.40,-14.40 +38.40,14.40,11.92,0.00,1.00,19.20,-14.40 +-139.20,-14.40,4.10,0.00,1.00,19.20,-14.40 +48.00,14.40,11.90,0.00,1.00,24.00,-19.20 +-129.60,-14.40,4.12,0.00,1.00,28.80,-19.20 +57.60,19.20,11.88,0.00,1.00,33.60,-19.20 +-120.00,-19.20,4.14,0.00,1.00,38.40,-19.20 +67.20,19.20,11.86,0.00,1.00,43.20,-24.00 +-110.40,-19.20,4.17,0.00,1.00,52.80,-24.00 +76.80,19.20,11.83,0.00,1.00,62.40,-24.00 +-100.80,-19.20,4.19,0.00,1.00,72.00,-24.00 +86.40,19.20,11.81,0.00,1.00,81.60,-24.00 +-86.40,-19.20,4.21,0.00,1.00,91.20,-24.00 +96.00,19.20,11.79,0.00,1.00,105.60,-24.00 +-76.80,-19.20,4.23,0.00,1.00,115.20,-24.00 +105.60,19.20,11.77,0.00,1.00,124.80,-24.00 +-67.20,-19.20,4.25,0.00,1.00,134.40,-24.00 +115.20,19.20,11.75,0.00,1.00,139.20,-19.20 +-57.60,-19.20,4.27,0.00,1.00,144.00,-19.20 +124.80,19.20,11.73,0.00,1.00,148.80,-19.20 +-48.00,-14.40,4.29,0.00,1.00,153.60,-19.20 +134.40,14.40,11.71,0.00,1.00,158.40,-19.20 +-38.40,-14.40,4.32,0.00,1.00,158.40,-14.40 +144.00,14.40,11.68,0.00,1.00,163.20,-14.40 +-28.80,-9.60,4.34,0.00,1.00,168.00,-14.40 +153.60,9.60,11.66,0.00,1.00,168.00,-9.60 +-19.20,-9.60,4.36,0.00,1.00,172.80,-9.60 +163.20,4.80,11.64,0.00,1.00,172.80,-4.80 +-9.60,-4.80,4.38,0.00,1.00,172.80,-4.80 +172.80,4.80,11.62,0.00,1.00,177.60,-4.80 +-0.00,-0.00,4.40,0.00,1.00,177.60,-0.00 +-177.60,-0.00,11.60,0.00,1.00,-177.60,0.00 +4.80,4.80,4.42,0.00,1.00,-177.60,4.80 +-168.00,-4.80,11.58,0.00,1.00,-172.80,4.80 +14.40,4.80,4.44,0.00,1.00,-172.80,4.80 +-158.40,-9.60,11.56,0.00,1.00,-172.80,9.60 +24.00,9.60,4.46,0.00,1.00,-168.00,9.60 +-148.80,-9.60,11.54,0.00,1.00,-168.00,14.40 +33.60,14.40,4.49,0.00,1.00,-163.20,14.40 +-139.20,-14.40,11.51,0.00,1.00,-158.40,14.40 +43.20,14.40,4.51,0.00,1.00,-158.40,19.20 +-129.60,-14.40,11.49,0.00,1.00,-153.60,19.20 +52.80,19.20,4.53,0.00,1.00,-148.80,19.20 +-120.00,-19.20,11.47,0.00,1.00,-144.00,19.20 +62.40,19.20,4.55,0.00,1.00,-139.20,19.20 +-110.40,-19.20,11.45,0.00,1.00,-134.40,24.00 +72.00,19.20,4.57,0.00,1.00,-124.80,24.00 +-100.80,-19.20,11.43,0.00,1.00,-115.20,24.00 +81.60,19.20,4.59,0.00,1.00,-105.60,24.00 +-91.20,-19.20,11.41,0.00,1.00,-91.20,24.00 +96.00,19.20,4.61,0.00,1.00,-81.60,24.00 +-81.60,-19.20,11.39,0.00,1.00,-72.00,24.00 +105.60,19.20,4.64,0.00,1.00,-62.40,24.00 +-72.00,-19.20,11.36,0.00,1.00,-52.80,24.00 +115.20,19.20,4.66,0.00,1.00,-43.20,24.00 +-62.40,-19.20,11.34,0.00,1.00,-38.40,19.20 +124.80,19.20,4.68,0.00,1.00,-33.60,19.20 +-52.80,-14.40,11.32,0.00,1.00,-28.80,19.20 +134.40,14.40,4.70,0.00,1.00,-24.00,19.20 +-43.20,-14.40,11.30,0.00,1.00,-19.20,14.40 +144.00,14.40,4.72,0.00,1.00,-19.20,14.40 +-33.60,-9.60,11.28,0.00,1.00,-14.40,14.40 +153.60,9.60,4.74,0.00,1.00,-14.40,9.60 +-24.00,-9.60,11.26,0.00,1.00,-9.60,9.60 +163.20,4.80,4.76,0.00,1.00,-9.60,9.60 +-14.40,-4.80,11.24,0.00,1.00,-4.80,4.80 +172.80,4.80,4.79,0.00,1.00,-4.80,4.80 +-4.80,-0.00,11.21,0.00,1.00,-0.00,0.00 +0.00,0.00,4.81,0.00,1.00,0.00,0.00 +-177.60,-0.00,11.19,0.00,1.00,0.00,-0.00 +9.60,4.80,4.83,0.00,1.00,4.80,-4.80 +-168.00,-4.80,11.17,0.00,1.00,4.80,-4.80 +19.20,4.80,4.85,0.00,1.00,9.60,-9.60 +-158.40,-4.80,11.15,0.00,1.00,14.40,-9.60 +28.80,9.60,4.87,0.00,1.00,14.40,-14.40 +-148.80,-9.60,11.13,0.00,1.00,19.20,-14.40 +38.40,9.60,4.89,0.00,1.00,19.20,-19.20 +-139.20,-9.60,11.11,0.00,1.00,24.00,-19.20 +48.00,9.60,4.91,0.00,1.00,28.80,-19.20 +-129.60,-14.40,11.09,0.00,1.00,33.60,-24.00 +57.60,14.40,4.93,0.00,1.00,38.40,-24.00 +-120.00,-14.40,11.07,0.00,1.00,43.20,-24.00 +67.20,14.40,4.96,0.00,1.00,48.00,-24.00 +-110.40,-14.40,11.04,0.00,1.00,57.60,-28.80 +76.80,14.40,4.98,0.00,1.00,62.40,-28.80 +-100.80,-14.40,11.02,0.00,1.00,72.00,-28.80 +86.40,14.40,5.00,0.00,1.00,81.60,-28.80 +-86.40,-14.40,11.00,0.00,1.00,91.20,-28.80 +96.00,14.40,5.02,0.00,1.00,100.80,-28.80 +-76.80,-14.40,10.98,0.00,1.00,110.40,-28.80 +105.60,14.40,5.04,0.00,1.00,120.00,-28.80 +-67.20,-14.40,10.96,0.00,1.00,129.60,-28.80 +115.20,14.40,5.06,0.00,1.00,134.40,-24.00 +-57.60,-14.40,10.94,0.00,1.00,139.20,-24.00 +124.80,14.40,5.08,0.00,1.00,144.00,-24.00 +-48.00,-14.40,10.92,0.00,1.00,148.80,-24.00 +134.40,9.60,5.11,0.00,1.00,153.60,-19.20 +-38.40,-9.60,10.89,0.00,1.00,158.40,-19.20 +144.00,9.60,5.13,0.00,1.00,158.40,-14.40 +-28.80,-9.60,10.87,0.00,1.00,163.20,-14.40 +153.60,4.80,5.15,0.00,1.00,168.00,-14.40 +-19.20,-4.80,10.85,0.00,1.00,168.00,-9.60 +163.20,4.80,5.17,0.00,1.00,172.80,-9.60 +-9.60,-4.80,10.83,0.00,1.00,172.80,-4.80 +172.80,0.00,5.19,0.00,1.00,177.60,-4.80 +-0.00,-0.00,10.81,0.00,1.00,177.60,-0.00 +-177.60,-0.00,5.21,0.00,1.00,-177.60,0.00 +4.80,0.00,10.79,0.00,1.00,-177.60,4.80 +-168.00,-4.80,5.23,0.00,1.00,-172.80,4.80 +14.40,4.80,10.77,0.00,1.00,-172.80,9.60 +-158.40,-4.80,5.26,0.00,1.00,-168.00,9.60 +24.00,4.80,10.74,0.00,1.00,-168.00,14.40 +-148.80,-9.60,5.28,0.00,1.00,-163.20,14.40 +33.60,9.60,10.72,0.00,1.00,-158.40,14.40 +-139.20,-9.60,5.30,0.00,1.00,-158.40,19.20 +43.20,9.60,10.70,0.00,1.00,-153.60,19.20 +-129.60,-14.40,5.32,0.00,1.00,-148.80,24.00 +52.80,14.40,10.68,0.00,1.00,-144.00,24.00 +-120.00,-14.40,5.34,0.00,1.00,-139.20,24.00 +62.40,14.40,10.66,0.00,1.00,-134.40,24.00 +-110.40,-14.40,5.36,0.00,1.00,-129.60,28.80 +72.00,14.40,10.64,0.00,1.00,-120.00,28.80 +-100.80,-14.40,5.38,0.00,1.00,-110.40,28.80 +81.60,14.40,10.62,0.00,1.00,-100.80,28.80 +-91.20,-14.40,5.40,0.00,1.00,-91.20,28.80 +96.00,14.40,10.60,0.00,1.00,-81.60,28.80 +-81.60,-14.40,5.43,0.00,1.00,-72.00,28.80 +105.60,14.40,10.57,0.00,1.00,-62.40,28.80 +-72.00,-14.40,5.45,0.00,1.00,-57.60,28.80 +115.20,14.40,10.55,0.00,1.00,-48.00,24.00 +-62.40,-14.40,5.47,0.00,1.00,-43.20,24.00 +124.80,14.40,10.53,0.00,1.00,-38.40,24.00 +-52.80,-14.40,5.49,0.00,1.00,-33.60,24.00 +134.40,9.60,10.51,0.00,1.00,-28.80,19.20 +-43.20,-9.60,5.51,0.00,1.00,-24.00,19.20 +144.00,9.60,10.49,0.00,1.00,-19.20,19.20 +-33.60,-9.60,5.53,0.00,1.00,-19.20,14.40 +153.60,9.60,10.47,0.00,1.00,-14.40,14.40 +-24.00,-4.80,5.55,0.00,1.00,-14.40,9.60 +163.20,4.80,10.45,0.00,1.00,-9.60,9.60 +-14.40,-4.80,5.58,0.00,1.00,-4.80,4.80 +172.80,4.80,10.42,0.00,1.00,-4.80,4.80 +-4.80,-0.00,5.60,0.00,1.00,-0.00,0.00 +0.00,0.00,10.40,0.00,1.00,0.00,0.00 +-177.60,-0.00,5.62,0.00,1.00,4.80,-4.80 +9.60,0.00,10.38,0.00,1.00,4.80,-4.80 +-168.00,-4.80,5.64,0.00,1.00,9.60,-9.60 +19.20,4.80,10.36,0.00,1.00,9.60,-9.60 +-158.40,-4.80,5.66,0.00,1.00,14.40,-14.40 +28.80,4.80,10.34,0.00,1.00,19.20,-14.40 +-148.80,-4.80,5.68,0.00,1.00,19.20,-19.20 +38.40,4.80,10.32,0.00,1.00,24.00,-19.20 +-139.20,-9.60,5.70,0.00,1.00,28.80,-24.00 +48.00,9.60,10.30,0.00,1.00,33.60,-24.00 +-129.60,-9.60,5.72,0.00,1.00,38.40,-24.00 +57.60,9.60,10.28,0.00,1.00,43.20,-28.80 +-120.00,-9.60,5.75,0.00,1.00,48.00,-28.80 +67.20,9.60,10.25,0.00,1.00,52.80,-28.80 +-110.40,-9.60,5.77,0.00,1.00,57.60,-33.60 +76.80,9.60,10.23,0.00,1.00,67.20,-33.60 +-100.80,-9.60,5.79,0.00,1.00,76.80,-33.60 +86.40,9.60,10.21,0.00,1.00,81.60,-33.60 +-86.40,-9.60,5.81,0.00,1.00,91.20,-33.60 +96.00,9.60,10.19,0.00,1.00,100.80,-33.60 +-76.80,-9.60,5.83,0.00,1.00,110.40,-33.60 +105.60,9.60,10.17,0.00,1.00,115.20,-33.60 +-67.20,-9.60,5.85,0.00,1.00,124.80,-33.60 +115.20,9.60,10.15,0.00,1.00,129.60,-28.80 +-57.60,-9.60,5.87,0.00,1.00,134.40,-28.80 +124.80,9.60,10.13,0.00,1.00,139.20,-28.80 +-48.00,-9.60,5.90,0.00,1.00,144.00,-24.00 +134.40,9.60,10.10,0.00,1.00,148.80,-24.00 +-38.40,-9.60,5.92,0.00,1.00,153.60,-19.20 +144.00,4.80,10.08,0.00,1.00,158.40,-19.20 +-28.80,-4.80,5.94,0.00,1.00,163.20,-14.40 +153.60,4.80,10.06,0.00,1.00,163.20,-14.40 +-19.20,-4.80,5.96,0.00,1.00,168.00,-9.60 +163.20,4.80,10.04,0.00,1.00,172.80,-9.60 +-9.60,-0.00,5.98,0.00,1.00,172.80,-4.80 +172.80,0.00,10.02,0.00,1.00,177.60,-4.80 +-0.00,-0.00,6.00,0.00,1.00,177.60,-0.00 +-177.60,-0.00,10.00,0.00,1.00,-177.60,0.00 +4.80,0.00,6.02,0.00,1.00,-177.60,4.80 +-168.00,-0.00,9.98,0.00,1.00,-172.80,4.80 +14.40,4.80,6.05,0.00,1.00,-172.80,9.60 +-158.40,-4.80,9.95,0.00,1.00,-168.00,9.60 +24.00,4.80,6.07,0.00,1.00,-163.20,14.40 +-148.80,-4.80,9.93,0.00,1.00,-163.20,14.40 +33.60,4.80,6.09,0.00,1.00,-158.40,19.20 +-139.20,-9.60,9.91,0.00,1.00,-153.60,19.20 +43.20,9.60,6.11,0.00,1.00,-148.80,24.00 +-129.60,-9.60,9.89,0.00,1.00,-144.00,24.00 +52.80,9.60,6.13,0.00,1.00,-139.20,28.80 +-120.00,-9.60,9.87,0.00,1.00,-134.40,28.80 +62.40,9.60,6.15,0.00,1.00,-129.60,28.80 +-110.40,-9.60,9.85,0.00,1.00,-124.80,33.60 +72.00,9.60,6.17,0.00,1.00,-115.20,33.60 +-100.80,-9.60,9.83,0.00,1.00,-110.40,33.60 +81.60,9.60,6.19,0.00,1.00,-100.80,33.60 +-91.20,-9.60,9.81,0.00,1.00,-91.20,33.60 +96.00,9.60,6.22,0.00,1.00,-81.60,33.60 +-81.60,-9.60,9.78,0.00,1.00,-76.80,33.60 +105.60,9.60,6.24,0.00,1.00,-67.20,33.60 +-72.00,-9.60,9.76,0.00,1.00,-57.60,33.60 +115.20,9.60,6.26,0.00,1.00,-52.80,28.80 +-62.40,-9.60,9.74,0.00,1.00,-48.00,28.80 +124.80,9.60,6.28,0.00,1.00,-43.20,28.80 +-52.80,-9.60,9.72,0.00,1.00,-38.40,24.00 +134.40,9.60,6.30,0.00,1.00,-33.60,24.00 +-43.20,-9.60,9.70,0.00,1.00,-28.80,24.00 +144.00,4.80,6.32,0.00,1.00,-24.00,19.20 +-33.60,-4.80,9.68,0.00,1.00,-19.20,19.20 +153.60,4.80,6.34,0.00,1.00,-19.20,14.40 +-24.00,-4.80,9.66,0.00,1.00,-14.40,14.40 +163.20,4.80,6.37,0.00,1.00,-9.60,9.60 +-14.40,-4.80,9.63,0.00,1.00,-9.60,9.60 +172.80,0.00,6.39,0.00,1.00,-4.80,4.80 +-4.80,-0.00,9.61,0.00,1.00,-4.80,4.80 +0.00,0.00,6.41,0.00,1.00,0.00,0.00 +-177.60,-0.00,9.59,0.00,1.00,4.80,-4.80 +9.60,0.00,6.43,0.00,1.00,4.80,-4.80 +-168.00,-0.00,9.57,0.00,1.00,9.60,-9.60 +19.20,0.00,6.45,0.00,1.00,14.40,-9.60 +-158.40,-4.80,9.55,0.00,1.00,14.40,-14.40 +28.80,4.80,6.47,0.00,1.00,19.20,-19.20 +-148.80,-4.80,9.53,0.00,1.00,24.00,-19.20 +38.40,4.80,6.49,0.00,1.00,24.00,-24.00 +-139.20,-4.80,9.51,0.00,1.00,28.80,-24.00 +48.00,4.80,6.52,0.00,1.00,33.60,-28.80 +-129.60,-4.80,9.48,0.00,1.00,38.40,-28.80 +57.60,4.80,6.54,0.00,1.00,43.20,-33.60 +-120.00,-4.80,9.46,0.00,1.00,48.00,-33.60 +67.20,4.80,6.56,0.00,1.00,57.60,-33.60 +-110.40,-4.80,9.44,0.00,1.00,62.40,-38.40 +76.80,4.80,6.58,0.00,1.00,67.20,-38.40 +-100.80,-4.80,9.42,0.00,1.00,76.80,-38.40 +86.40,4.80,6.60,0.00,1.00,86.40,-38.40 +-86.40,-4.80,9.40,0.00,1.00,91.20,-38.40 +96.00,4.80,6.62,0.00,1.00,100.80,-38.40 +-76.80,-4.80,9.38,0.00,1.00,105.60,-38.40 +105.60,4.80,6.64,0.00,1.00,115.20,-38.40 +-67.20,-4.80,9.36,0.00,1.00,120.00,-33.60 +115.20,4.80,6.66,0.00,1.00,124.80,-33.60 +-57.60,-4.80,9.34,0.00,1.00,134.40,-33.60 +124.80,4.80,6.69,0.00,1.00,139.20,-28.80 +-48.00,-4.80,9.31,0.00,1.00,144.00,-28.80 +134.40,4.80,6.71,0.00,1.00,148.80,-24.00 +-38.40,-4.80,9.29,0.00,1.00,153.60,-24.00 +144.00,4.80,6.73,0.00,1.00,153.60,-19.20 +-28.80,-4.80,9.27,0.00,1.00,158.40,-19.20 +153.60,4.80,6.75,0.00,1.00,163.20,-14.40 +-19.20,-4.80,9.25,0.00,1.00,168.00,-14.40 +163.20,0.00,6.77,0.00,1.00,168.00,-9.60 +-9.60,-0.00,9.23,0.00,1.00,172.80,-9.60 +172.80,0.00,6.79,0.00,1.00,177.60,-4.80 +-0.00,-0.00,9.21,0.00,1.00,177.60,-0.00 +-177.60,-0.00,6.81,0.00,1.00,-177.60,0.00 +4.80,0.00,9.19,0.00,1.00,-177.60,4.80 +-168.00,-0.00,6.84,0.00,1.00,-172.80,9.60 +14.40,0.00,9.16,0.00,1.00,-168.00,9.60 +-158.40,-4.80,6.86,0.00,1.00,-168.00,14.40 +24.00,4.80,9.14,0.00,1.00,-163.20,14.40 +-148.80,-4.80,6.88,0.00,1.00,-158.40,19.20 +33.60,4.80,9.12,0.00,1.00,-153.60,19.20 +-139.20,-4.80,6.90,0.00,1.00,-153.60,24.00 +43.20,4.80,9.10,0.00,1.00,-148.80,24.00 +-129.60,-4.80,6.92,0.00,1.00,-144.00,28.80 +52.80,4.80,9.08,0.00,1.00,-139.20,28.80 +-120.00,-4.80,6.94,0.00,1.00,-134.40,33.60 +62.40,4.80,9.06,0.00,1.00,-124.80,33.60 +-110.40,-4.80,6.96,0.00,1.00,-120.00,33.60 +72.00,4.80,9.04,0.00,1.00,-115.20,38.40 +-100.80,-4.80,6.99,0.00,1.00,-105.60,38.40 +81.60,4.80,9.01,0.00,1.00,-100.80,38.40 +-91.20,-4.80,7.01,0.00,1.00,-91.20,38.40 +96.00,4.80,8.99,0.00,1.00,-86.40,38.40 +-81.60,-4.80,7.03,0.00,1.00,-76.80,38.40 +105.60,4.80,8.97,0.00,1.00,-67.20,38.40 +-72.00,-4.80,7.05,0.00,1.00,-62.40,38.40 +115.20,4.80,8.95,0.00,1.00,-57.60,33.60 +-62.40,-4.80,7.07,0.00,1.00,-48.00,33.60 +124.80,4.80,8.93,0.00,1.00,-43.20,33.60 +-52.80,-4.80,7.09,0.00,1.00,-38.40,28.80 +134.40,4.80,8.91,0.00,1.00,-33.60,28.80 +-43.20,-4.80,7.11,0.00,1.00,-28.80,24.00 +144.00,4.80,8.89,0.00,1.00,-24.00,24.00 +-33.60,-4.80,7.13,0.00,1.00,-24.00,19.20 +153.60,4.80,8.87,0.00,1.00,-19.20,19.20 +-24.00,-4.80,7.16,0.00,1.00,-14.40,14.40 +163.20,0.00,8.84,0.00,1.00,-14.40,9.60 +-14.40,-0.00,7.18,0.00,1.00,-9.60,9.60 +172.80,0.00,8.82,0.00,1.00,-4.80,4.80 +-4.80,-0.00,7.20,0.00,1.00,-4.80,4.80 +0.00,0.00,8.80,0.00,1.00,0.00,0.00 +-177.60,-0.00,7.22,0.00,1.00,4.80,-4.80 +9.60,0.00,8.78,0.00,1.00,4.80,-4.80 +-168.00,-0.00,7.24,0.00,1.00,9.60,-9.60 +19.20,0.00,8.76,0.00,1.00,14.40,-14.40 +-158.40,-0.00,7.26,0.00,1.00,19.20,-14.40 +28.80,0.00,8.74,0.00,1.00,19.20,-19.20 +-148.80,-0.00,7.28,0.00,1.00,24.00,-24.00 +38.40,0.00,8.72,0.00,1.00,28.80,-24.00 +-139.20,-0.00,7.31,0.00,1.00,33.60,-28.80 +48.00,0.00,8.69,0.00,1.00,38.40,-28.80 +-129.60,-0.00,7.33,0.00,1.00,43.20,-33.60 +57.60,0.00,8.67,0.00,1.00,48.00,-33.60 +-120.00,-0.00,7.35,0.00,1.00,52.80,-38.40 +67.20,0.00,8.65,0.00,1.00,57.60,-38.40 +-110.40,-0.00,7.37,0.00,1.00,62.40,-38.40 +76.80,0.00,8.63,0.00,1.00,72.00,-43.20 +-100.80,-0.00,7.39,0.00,1.00,76.80,-43.20 +86.40,0.00,8.61,0.00,1.00,86.40,-43.20 +-86.40,-0.00,7.41,0.00,1.00,91.20,-43.20 +96.00,0.00,8.59,0.00,1.00,100.80,-43.20 +-76.80,-0.00,7.43,0.00,1.00,105.60,-43.20 +105.60,0.00,8.57,0.00,1.00,110.40,-43.20 +-67.20,-0.00,7.46,0.00,1.00,120.00,-38.40 +115.20,0.00,8.54,0.00,1.00,124.80,-38.40 +-57.60,-0.00,7.48,0.00,1.00,129.60,-38.40 +124.80,0.00,8.52,0.00,1.00,134.40,-33.60 +-48.00,-0.00,7.50,0.00,1.00,139.20,-33.60 +134.40,0.00,8.50,0.00,1.00,144.00,-28.80 +-38.40,-0.00,7.52,0.00,1.00,148.80,-28.80 +144.00,0.00,8.48,0.00,1.00,153.60,-24.00 +-28.80,-0.00,7.54,0.00,1.00,158.40,-19.20 +153.60,0.00,8.46,0.00,1.00,163.20,-19.20 +-19.20,-0.00,7.56,0.00,1.00,163.20,-14.40 +163.20,0.00,8.44,0.00,1.00,168.00,-9.60 +-9.60,-0.00,7.58,0.00,1.00,172.80,-9.60 +172.80,0.00,8.42,0.00,1.00,172.80,-4.80 +-0.00,-0.00,7.60,0.00,1.00,177.60,-0.00 +-177.60,-0.00,8.40,0.00,1.00,-177.60,0.00 +4.80,0.00,7.63,0.00,1.00,-172.80,4.80 +-168.00,-0.00,8.37,0.00,1.00,-172.80,9.60 +14.40,0.00,7.65,0.00,1.00,-168.00,9.60 +-158.40,-0.00,8.35,0.00,1.00,-163.20,14.40 +24.00,0.00,7.67,0.00,1.00,-163.20,19.20 +-148.80,-0.00,8.33,0.00,1.00,-158.40,19.20 +33.60,0.00,7.69,0.00,1.00,-153.60,24.00 +-139.20,-0.00,8.31,0.00,1.00,-148.80,28.80 +43.20,0.00,7.71,0.00,1.00,-144.00,28.80 +-129.60,-0.00,8.29,0.00,1.00,-139.20,33.60 +52.80,0.00,7.73,0.00,1.00,-134.40,33.60 +-120.00,-0.00,8.27,0.00,1.00,-129.60,38.40 +62.40,0.00,7.75,0.00,1.00,-124.80,38.40 +-110.40,-0.00,8.25,0.00,1.00,-120.00,38.40 +72.00,0.00,7.78,0.00,1.00,-110.40,43.20 +-100.80,-0.00,8.22,0.00,1.00,-105.60,43.20 +81.60,0.00,7.80,0.00,1.00,-100.80,43.20 +-91.20,-0.00,8.20,0.00,1.00,-91.20,43.20 +96.00,0.00,7.82,0.00,1.00,-86.40,43.20 +-81.60,-0.00,8.18,0.00,1.00,-76.80,43.20 +105.60,0.00,7.84,0.00,1.00,-72.00,43.20 +-72.00,-0.00,8.16,0.00,1.00,-62.40,38.40 +115.20,0.00,7.86,0.00,1.00,-57.60,38.40 +-62.40,-0.00,8.14,0.00,1.00,-52.80,38.40 +124.80,0.00,7.88,0.00,1.00,-48.00,33.60 +-52.80,-0.00,8.12,0.00,1.00,-43.20,33.60 +134.40,0.00,7.90,0.00,1.00,-38.40,28.80 +-43.20,-0.00,8.10,0.00,1.00,-33.60,28.80 +144.00,0.00,7.93,0.00,1.00,-28.80,24.00 +-33.60,-0.00,8.07,0.00,1.00,-24.00,24.00 +153.60,0.00,7.95,0.00,1.00,-19.20,19.20 +-24.00,-0.00,8.05,0.00,1.00,-19.20,14.40 +163.20,0.00,7.97,0.00,1.00,-14.40,14.40 +-14.40,-0.00,8.03,0.00,1.00,-9.60,9.60 +172.80,0.00,7.99,0.00,1.00,-4.80,4.80 +-4.80,-0.00,8.01,0.00,1.00,-4.80,4.80 +0.00,0.00,8.01,0.00,1.00,0.00,0.00 +-177.60,0.00,7.99,0.00,1.00,4.80,-4.80 +9.60,-0.00,8.03,0.00,1.00,4.80,-4.80 +-168.00,0.00,7.97,0.00,1.00,9.60,-9.60 +19.20,-0.00,8.05,0.00,1.00,14.40,-14.40 +-158.40,0.00,7.95,0.00,1.00,19.20,-19.20 +28.80,-0.00,8.07,0.00,1.00,24.00,-19.20 +-148.80,0.00,7.93,0.00,1.00,24.00,-24.00 +38.40,-0.00,8.10,0.00,1.00,28.80,-28.80 +-139.20,0.00,7.90,0.00,1.00,33.60,-28.80 +48.00,-0.00,8.12,0.00,1.00,38.40,-33.60 +-129.60,0.00,7.88,0.00,1.00,43.20,-38.40 +57.60,-4.80,8.14,0.00,1.00,48.00,-38.40 +-120.00,4.80,7.86,0.00,1.00,52.80,-43.20 +67.20,-4.80,8.16,0.00,1.00,62.40,-43.20 +-110.40,4.80,7.84,0.00,1.00,67.20,-43.20 +76.80,-4.80,8.18,0.00,1.00,72.00,-48.00 +-100.80,4.80,7.82,0.00,1.00,76.80,-48.00 +86.40,-4.80,8.20,0.00,1.00,86.40,-48.00 +-86.40,4.80,7.80,0.00,1.00,91.20,-48.00 +96.00,-4.80,8.22,0.00,1.00,96.00,-48.00 +-76.80,4.80,7.78,0.00,1.00,105.60,-48.00 +105.60,-4.80,8.25,0.00,1.00,110.40,-48.00 +-67.20,4.80,7.75,0.00,1.00,115.20,-43.20 +115.20,-4.80,8.27,0.00,1.00,120.00,-43.20 +-57.60,4.80,7.73,0.00,1.00,129.60,-38.40 +124.80,-4.80,8.29,0.00,1.00,134.40,-38.40 +-48.00,0.00,7.71,0.00,1.00,139.20,-33.60 +134.40,-0.00,8.31,0.00,1.00,144.00,-33.60 +-38.40,0.00,7.69,0.00,1.00,148.80,-28.80 +144.00,-0.00,8.33,0.00,1.00,153.60,-24.00 +-28.80,0.00,7.67,0.00,1.00,153.60,-24.00 +153.60,-0.00,8.35,0.00,1.00,158.40,-19.20 +-19.20,0.00,7.65,0.00,1.00,163.20,-14.40 +163.20,-0.00,8.37,0.00,1.00,168.00,-14.40 +-9.60,0.00,7.63,0.00,1.00,172.80,-9.60 +172.80,-0.00,8.40,0.00,1.00,172.80,-4.80 +-0.00,0.00,7.60,0.00,1.00,177.60,-0.00 +-177.60,0.00,8.42,0.00,1.00,-177.60,0.00 +4.80,-0.00,7.58,0.00,1.00,-172.80,4.80 +-168.00,0.00,8.44,0.00,1.00,-172.80,9.60 +14.40,-0.00,7.56,0.00,1.00,-168.00,14.40 +-158.40,0.00,8.46,0.00,1.00,-163.20,14.40 +24.00,-0.00,7.54,0.00,1.00,-158.40,19.20 +-148.80,0.00,8.48,0.00,1.00,-153.60,24.00 +33.60,-0.00,7.52,0.00,1.00,-153.60,24.00 +-139.20,0.00,8.50,0.00,1.00,-148.80,28.80 +43.20,-0.00,7.50,0.00,1.00,-144.00,33.60 +-129.60,0.00,8.52,0.00,1.00,-139.20,33.60 +52.80,-4.80,7.48,0.00,1.00,-134.40,38.40 +-120.00,4.80,8.54,0.00,1.00,-129.60,38.40 +62.40,-4.80,7.46,0.00,1.00,-120.00,43.20 +-110.40,4.80,8.57,0.00,1.00,-115.20,43.20 +72.00,-4.80,7.43,0.00,1.00,-110.40,48.00 +-100.80,4.80,8.59,0.00,1.00,-105.60,48.00 +81.60,-4.80,7.41,0.00,1.00,-96.00,48.00 +-91.20,4.80,8.61,0.00,1.00,-91.20,48.00 +96.00,-4.80,7.39,0.00,1.00,-86.40,48.00 +-81.60,4.80,8.63,0.00,1.00,-76.80,48.00 +105.60,-4.80,7.37,0.00,1.00,-72.00,48.00 +-72.00,4.80,8.65,0.00,1.00,-67.20,43.20 +115.20,-4.80,7.35,0.00,1.00,-62.40,43.20 +-62.40,4.80,8.67,0.00,1.00,-52.80,43.20 +124.80,-4.80,7.33,0.00,1.00,-48.00,38.40 +-52.80,0.00,8.69,0.00,1.00,-43.20,38.40 +134.40,-0.00,7.31,0.00,1.00,-38.40,33.60 +-43.20,0.00,8.72,0.00,1.00,-33.60,28.80 +144.00,-0.00,7.28,0.00,1.00,-28.80,28.80 +-33.60,0.00,8.74,0.00,1.00,-24.00,24.00 +153.60,-0.00,7.26,0.00,1.00,-24.00,19.20 +-24.00,0.00,8.76,0.00,1.00,-19.20,19.20 +163.20,-0.00,7.24,0.00,1.00,-14.40,14.40 +-14.40,0.00,8.78,0.00,1.00,-9.60,9.60 +172.80,-0.00,7.22,0.00,1.00,-4.80,4.80 +-4.80,0.00,8.80,0.00,1.00,-4.80,4.80 +0.00,0.00,7.20,0.00,1.00,0.00,0.00 +-177.60,0.00,8.82,0.00,1.00,4.80,-4.80 +9.60,-0.00,7.18,0.00,1.00,9.60,-9.60 +-168.00,0.00,8.84,0.00,1.00,9.60,-9.60 +19.20,-4.80,7.16,0.00,1.00,14.40,-14.40 +-158.40,4.80,8.87,0.00,1.00,19.20,-19.20 +28.80,-4.80,7.13,0.00,1.00,24.00,-24.00 +-148.80,4.80,8.89,0.00,1.00,28.80,-24.00 +38.40,-4.80,7.11,0.00,1.00,33.60,-28.80 +-139.20,4.80,8.91,0.00,1.00,38.40,-33.60 +48.00,-4.80,7.09,0.00,1.00,43.20,-38.40 +-129.60,4.80,8.93,0.00,1.00,48.00,-38.40 +57.60,-4.80,7.07,0.00,1.00,52.80,-43.20 +-120.00,4.80,8.95,0.00,1.00,57.60,-43.20 +67.20,-4.80,7.05,0.00,1.00,62.40,-48.00 +-110.40,9.60,8.97,0.00,1.00,67.20,-48.00 +76.80,-9.60,7.03,0.00,1.00,72.00,-52.80 +-100.80,9.60,8.99,0.00,1.00,81.60,-52.80 +86.40,-9.60,7.01,0.00,1.00,86.40,-52.80 +-86.40,9.60,9.01,0.00,1.00,91.20,-52.80 +96.00,-9.60,6.99,0.00,1.00,96.00,-52.80 +-76.80,9.60,9.04,0.00,1.00,105.60,-52.80 +105.60,-9.60,6.96,0.00,1.00,110.40,-48.00 +-67.20,9.60,9.06,0.00,1.00,115.20,-48.00 +115.20,-4.80,6.94,0.00,1.00,120.00,-48.00 +-57.60,4.80,9.08,0.00,1.00,124.80,-43.20 +124.80,-4.80,6.92,0.00,1.00,129.60,-43.20 +-48.00,4.80,9.10,0.00,1.00,134.40,-38.40 +134.40,-4.80,6.90,0.00,1.00,139.20,-33.60 +-38.40,4.80,9.12,0.00,1.00,144.00,-33.60 +144.00,-4.80,6.88,0.00,1.00,148.80,-28.80 +-28.80,4.80,9.14,0.00,1.00,153.60,-24.00 +153.60,-4.80,6.86,0.00,1.00,158.40,-19.20 +-19.20,4.80,9.16,0.00,1.00,163.20,-19.20 +163.20,-0.00,6.84,0.00,1.00,168.00,-14.40 +-9.60,0.00,9.19,0.00,1.00,168.00,-9.60 +172.80,-0.00,6.81,0.00,1.00,172.80,-4.80 +-0.00,0.00,9.21,0.00,1.00,177.60,-0.00 +-177.60,0.00,6.79,0.00,1.00,-177.60,0.00 +4.80,-0.00,9.23,0.00,1.00,-172.80,4.80 +-168.00,0.00,6.77,0.00,1.00,-168.00,9.60 +14.40,-0.00,9.25,0.00,1.00,-168.00,14.40 +-158.40,4.80,6.75,0.00,1.00,-163.20,19.20 +24.00,-4.80,9.27,0.00,1.00,-158.40,19.20 +-148.80,4.80,6.73,0.00,1.00,-153.60,24.00 +33.60,-4.80,9.29,0.00,1.00,-148.80,28.80 +-139.20,4.80,6.71,0.00,1.00,-144.00,33.60 +43.20,-4.80,9.31,0.00,1.00,-139.20,33.60 +-129.60,4.80,6.69,0.00,1.00,-134.40,38.40 +52.80,-4.80,9.34,0.00,1.00,-129.60,43.20 +-120.00,4.80,6.66,0.00,1.00,-124.80,43.20 +62.40,-4.80,9.36,0.00,1.00,-120.00,48.00 +-110.40,9.60,6.64,0.00,1.00,-115.20,48.00 +72.00,-9.60,9.38,0.00,1.00,-110.40,48.00 +-100.80,9.60,6.62,0.00,1.00,-105.60,52.80 +81.60,-9.60,9.40,0.00,1.00,-96.00,52.80 +-91.20,9.60,6.60,0.00,1.00,-91.20,52.80 +96.00,-9.60,9.42,0.00,1.00,-86.40,52.80 +-81.60,9.60,6.58,0.00,1.00,-81.60,52.80 +105.60,-9.60,9.44,0.00,1.00,-72.00,52.80 +-72.00,9.60,6.56,0.00,1.00,-67.20,48.00 +115.20,-4.80,9.46,0.00,1.00,-62.40,48.00 +-62.40,4.80,6.54,0.00,1.00,-57.60,43.20 +124.80,-4.80,9.48,0.00,1.00,-52.80,43.20 +-52.80,4.80,6.52,0.00,1.00,-48.00,38.40 +134.40,-4.80,9.51,0.00,1.00,-43.20,38.40 +-43.20,4.80,6.49,0.00,1.00,-38.40,33.60 +144.00,-4.80,9.53,0.00,1.00,-33.60,28.80 +-33.60,4.80,6.47,0.00,1.00,-28.80,24.00 +153.60,-4.80,9.55,0.00,1.00,-24.00,24.00 +-24.00,4.80,6.45,0.00,1.00,-19.20,19.20 +163.20,-4.80,9.57,0.00,1.00,-14.40,14.40 +-14.40,0.00,6.43,0.00,1.00,-9.60,9.60 +172.80,-0.00,9.59,0.00,1.00,-9.60,9.60 +-4.80,0.00,6.41,0.00,1.00,-4.80,4.80 +0.00,0.00,9.61,0.00,1.00,0.00,0.00 +-177.60,0.00,6.39,0.00,1.00,4.80,-4.80 +9.60,-0.00,9.63,0.00,1.00,9.60,-9.60 +-168.00,4.80,6.37,0.00,1.00,14.40,-14.40 +19.20,-4.80,9.66,0.00,1.00,14.40,-14.40 +-158.40,4.80,6.34,0.00,1.00,19.20,-19.20 +28.80,-4.80,9.68,0.00,1.00,24.00,-24.00 +-148.80,4.80,6.32,0.00,1.00,28.80,-28.80 +38.40,-9.60,9.70,0.00,1.00,33.60,-33.60 +-139.20,9.60,6.30,0.00,1.00,38.40,-33.60 +48.00,-9.60,9.72,0.00,1.00,43.20,-38.40 +-129.60,9.60,6.28,0.00,1.00,48.00,-43.20 +57.60,-9.60,9.74,0.00,1.00,52.80,-43.20 +-120.00,9.60,6.26,0.00,1.00,57.60,-48.00 +67.20,-9.60,9.76,0.00,1.00,62.40,-52.80 +-110.40,9.60,6.24,0.00,1.00,67.20,-52.80 +76.80,-14.40,9.78,0.00,1.00,76.80,-57.60 +-100.80,14.40,6.22,0.00,1.00,81.60,-57.60 +86.40,-14.40,9.81,0.00,1.00,86.40,-57.60 +-86.40,14.40,6.19,0.00,1.00,91.20,-57.60 +96.00,-14.40,9.83,0.00,1.00,96.00,-57.60 +-76.80,14.40,6.17,0.00,1.00,100.80,-57.60 +105.60,-14.40,9.85,0.00,1.00,110.40,-52.80 +-67.20,9.60,6.15,0.00,1.00,115.20,-52.80 +115.20,-9.60,9.87,0.00,1.00,120.00,-48.00 +-57.60,9.60,6.13,0.00,1.00,124.80,-48.00 +124.80,-9.60,9.89,0.00,1.00,129.60,-43.20 +-48.00,9.60,6.11,0.00,1.00,134.40,-38.40 +134.40,-9.60,9.91,0.00,1.00,139.20,-38.40 +-38.40,9.60,6.09,0.00,1.00,144.00,-33.60 +144.00,-9.60,9.93,0.00,1.00,148.80,-28.80 +-28.80,4.80,6.07,0.00,1.00,153.60,-24.00 +153.60,-4.80,9.95,0.00,1.00,158.40,-24.00 +-19.20,4.80,6.05,0.00,1.00,163.20,-19.20 +163.20,-4.80,9.98,0.00,1.00,168.00,-14.40 +-9.60,4.80,6.02,0.00,1.00,168.00,-9.60 +172.80,-0.00,10.00,0.00,1.00,172.80,-4.80 +-0.00,0.00,6.00,0.00,1.00,177.60,-0.00 +-177.60,0.00,10.02,0.00,1.00,-177.60,0.00 +4.80,-0.00,5.98,0.00,1.00,-172.80,4.80 +-168.00,4.80,10.04,0.00,1.00,-168.00,9.60 +14.40,-4.80,5.96,0.00,1.00,-168.00,14.40 +-158.40,4.80,10.06,0.00,1.00,-163.20,19.20 +24.00,-4.80,5.94,0.00,1.00,-158.40,24.00 +-148.80,4.80,10.08,0.00,1.00,-153.60,24.00 +33.60,-9.60,5.92,0.00,1.00,-148.80,28.80 +-139.20,9.60,10.10,0.00,1.00,-144.00,33.60 +43.20,-9.60,5.90,0.00,1.00,-139.20,38.40 +-129.60,9.60,10.13,0.00,1.00,-134.40,38.40 +52.80,-9.60,5.87,0.00,1.00,-129.60,43.20 +-120.00,9.60,10.15,0.00,1.00,-124.80,48.00 +62.40,-9.60,5.85,0.00,1.00,-120.00,48.00 +-110.40,9.60,10.17,0.00,1.00,-115.20,52.80 +72.00,-14.40,5.83,0.00,1.00,-110.40,52.80 +-100.80,14.40,10.19,0.00,1.00,-100.80,57.60 +81.60,-14.40,5.81,0.00,1.00,-96.00,57.60 +-91.20,14.40,10.21,0.00,1.00,-91.20,57.60 +96.00,-14.40,5.79,0.00,1.00,-86.40,57.60 +-81.60,14.40,10.23,0.00,1.00,-81.60,57.60 +105.60,-14.40,5.77,0.00,1.00,-76.80,57.60 +-72.00,9.60,10.25,0.00,1.00,-67.20,52.80 +115.20,-9.60,5.75,0.00,1.00,-62.40,52.80 +-62.40,9.60,10.28,0.00,1.00,-57.60,48.00 +124.80,-9.60,5.72,0.00,1.00,-52.80,43.20 +-52.80,9.60,10.30,0.00,1.00,-48.00,43.20 +134.40,-9.60,5.70,0.00,1.00,-43.20,38.40 +-43.20,9.60,10.32,0.00,1.00,-38.40,33.60 +144.00,-9.60,5.68,0.00,1.00,-33.60,33.60 +-33.60,4.80,10.34,0.00,1.00,-28.80,28.80 +153.60,-4.80,5.66,0.00,1.00,-24.00,24.00 +-24.00,4.80,10.36,0.00,1.00,-19.20,19.20 +163.20,-4.80,5.64,0.00,1.00,-14.40,14.40 +-14.40,4.80,10.38,0.00,1.00,-14.40,14.40 +172.80,-0.00,5.62,0.00,1.00,-9.60,9.60 +-4.80,0.00,10.40,0.00,1.00,-4.80,4.80 +0.00,0.00,5.60,0.00,1.00,0.00,0.00 +-177.60,0.00,10.42,0.00,1.00,4.80,-4.80 +9.60,-4.80,5.58,0.00,1.00,9.60,-9.60 +-168.00,4.80,10.45,0.00,1.00,14.40,-14.40 +19.20,-4.80,5.55,0.00,1.00,19.20,-19.20 +-158.40,4.80,10.47,0.00,1.00,19.20,-19.20 +28.80,-9.60,5.53,0.00,1.00,24.00,-24.00 +-148.80,9.60,10.49,0.00,1.00,28.80,-28.80 +38.40,-9.60,5.51,0.00,1.00,33.60,-33.60 +-139.20,9.60,10.51,0.00,1.00,38.40,-38.40 +48.00,-14.40,5.49,0.00,1.00,43.20,-43.20 +-129.60,14.40,10.53,0.00,1.00,48.00,-43.20 +57.60,-14.40,5.47,0.00,1.00,52.80,-48.00 +-120.00,14.40,10.55,0.00,1.00,57.60,-52.80 +67.20,-14.40,5.45,0.00,1.00,62.40,-52.80 +-110.40,14.40,10.57,0.00,1.00,72.00,-57.60 +76.80,-19.20,5.43,0.00,1.00,76.80,-57.60 +-100.80,19.20,10.60,0.00,1.00,81.60,-62.40 +86.40,-19.20,5.40,0.00,1.00,86.40,-62.40 +-86.40,19.20,10.62,0.00,1.00,91.20,-62.40 +96.00,-19.20,5.38,0.00,1.00,96.00,-62.40 +-76.80,19.20,10.64,0.00,1.00,100.80,-62.40 +105.60,-14.40,5.36,0.00,1.00,105.60,-57.60 +-67.20,14.40,10.66,0.00,1.00,110.40,-57.60 +115.20,-14.40,5.34,0.00,1.00,120.00,-52.80 +-57.60,14.40,10.68,0.00,1.00,124.80,-48.00 +124.80,-14.40,5.32,0.00,1.00,129.60,-48.00 +-48.00,14.40,10.70,0.00,1.00,134.40,-43.20 +134.40,-14.40,5.30,0.00,1.00,139.20,-38.40 +-38.40,9.60,10.72,0.00,1.00,144.00,-33.60 +144.00,-9.60,5.28,0.00,1.00,148.80,-33.60 +-28.80,9.60,10.74,0.00,1.00,153.60,-28.80 +153.60,-9.60,5.26,0.00,1.00,158.40,-24.00 +-19.20,4.80,10.77,0.00,1.00,158.40,-19.20 +163.20,-4.80,5.23,0.00,1.00,163.20,-14.40 +-9.60,4.80,10.79,0.00,1.00,168.00,-9.60 +172.80,-0.00,5.21,0.00,1.00,172.80,-4.80 +-0.00,0.00,10.81,0.00,1.00,177.60,-0.00 +-177.60,0.00,5.19,0.00,1.00,-177.60,0.00 +4.80,-0.00,10.83,0.00,1.00,-172.80,4.80 +-168.00,4.80,5.17,0.00,1.00,-168.00,9.60 +14.40,-4.80,10.85,0.00,1.00,-163.20,14.40 +-158.40,4.80,5.15,0.00,1.00,-158.40,19.20 +24.00,-9.60,10.87,0.00,1.00,-158.40,24.00 +-148.80,9.60,5.13,0.00,1.00,-153.60,28.80 +33.60,-9.60,10.89,0.00,1.00,-148.80,33.60 +-139.20,9.60,5.11,0.00,1.00,-144.00,33.60 +43.20,-14.40,10.92,0.00,1.00,-139.20,38.40 +-129.60,14.40,5.08,0.00,1.00,-134.40,43.20 +52.80,-14.40,10.94,0.00,1.00,-129.60,48.00 +-120.00,14.40,5.06,0.00,1.00,-124.80,48.00 +62.40,-14.40,10.96,0.00,1.00,-120.00,52.80 +-110.40,14.40,5.04,0.00,1.00,-110.40,57.60 +72.00,-14.40,10.98,0.00,1.00,-105.60,57.60 +-100.80,19.20,5.02,0.00,1.00,-100.80,62.40 +81.60,-19.20,11.00,0.00,1.00,-96.00,62.40 +-91.20,19.20,5.00,0.00,1.00,-91.20,62.40 +96.00,-19.20,11.02,0.00,1.00,-86.40,62.40 +-81.60,19.20,4.98,0.00,1.00,-81.60,62.40 +105.60,-19.20,11.04,0.00,1.00,-76.80,57.60 +-72.00,14.40,4.96,0.00,1.00,-72.00,57.60 +115.20,-14.40,11.07,0.00,1.00,-62.40,52.80 +-62.40,14.40,4.93,0.00,1.00,-57.60,52.80 +124.80,-14.40,11.09,0.00,1.00,-52.80,48.00 +-52.80,14.40,4.91,0.00,1.00,-48.00,43.20 +134.40,-14.40,11.11,0.00,1.00,-43.20,43.20 +-43.20,9.60,4.89,0.00,1.00,-38.40,38.40 +144.00,-9.60,11.13,0.00,1.00,-33.60,33.60 +-33.60,9.60,4.87,0.00,1.00,-28.80,28.80 +153.60,-9.60,11.15,0.00,1.00,-24.00,24.00 +-24.00,4.80,4.85,0.00,1.00,-19.20,19.20 +163.20,-4.80,11.17,0.00,1.00,-19.20,19.20 +-14.40,4.80,4.83,0.00,1.00,-14.40,14.40 +172.80,-4.80,11.19,0.00,1.00,-9.60,9.60 +-4.80,0.00,4.81,0.00,1.00,-4.80,4.80 +0.00,0.00,11.21,0.00,1.00,0.00,0.00 +-177.60,0.00,4.79,0.00,1.00,4.80,-4.80 +9.60,-4.80,11.24,0.00,1.00,9.60,-9.60 +-168.00,4.80,4.76,0.00,1.00,14.40,-14.40 +19.20,-4.80,11.26,0.00,1.00,19.20,-19.20 +-158.40,9.60,4.74,0.00,1.00,24.00,-24.00 +28.80,-9.60,11.28,0.00,1.00,28.80,-24.00 +-148.80,14.40,4.72,0.00,1.00,33.60,-28.80 +38.40,-14.40,11.30,0.00,1.00,38.40,-33.60 +-139.20,14.40,4.70,0.00,1.00,43.20,-38.40 +48.00,-14.40,11.32,0.00,1.00,48.00,-43.20 +-129.60,19.20,4.68,0.00,1.00,52.80,-48.00 +57.60,-19.20,11.34,0.00,1.00,57.60,-52.80 +-120.00,19.20,4.66,0.00,1.00,62.40,-52.80 +67.20,-19.20,11.36,0.00,1.00,67.20,-57.60 +-110.40,19.20,4.64,0.00,1.00,72.00,-62.40 +76.80,-19.20,11.39,0.00,1.00,76.80,-62.40 +-100.80,24.00,4.61,0.00,1.00,81.60,-67.20 +86.40,-24.00,11.41,0.00,1.00,86.40,-67.20 +-86.40,24.00,4.59,0.00,1.00,91.20,-67.20 +96.00,-24.00,11.43,0.00,1.00,96.00,-67.20 +-76.80,24.00,4.57,0.00,1.00,100.80,-67.20 +105.60,-19.20,11.45,0.00,1.00,105.60,-62.40 +-67.20,19.20,4.55,0.00,1.00,110.40,-57.60 +115.20,-19.20,11.47,0.00,1.00,115.20,-57.60 +-57.60,19.20,4.53,0.00,1.00,120.00,-52.80 +124.80,-19.20,11.49,0.00,1.00,124.80,-48.00 +-48.00,19.20,4.51,0.00,1.00,129.60,-43.20 +134.40,-14.40,11.51,0.00,1.00,134.40,-43.20 +-38.40,14.40,4.49,0.00,1.00,139.20,-38.40 +144.00,-14.40,11.54,0.00,1.00,144.00,-33.60 +-28.80,9.60,4.46,0.00,1.00,148.80,-28.80 +153.60,-9.60,11.56,0.00,1.00,153.60,-24.00 +-19.20,9.60,4.44,0.00,1.00,158.40,-19.20 +163.20,-4.80,11.58,0.00,1.00,163.20,-14.40 +-9.60,4.80,4.42,0.00,1.00,168.00,-9.60 +172.80,-4.80,11.60,0.00,1.00,172.80,-4.80 +-0.00,0.00,4.40,0.00,1.00,177.60,-0.00 +-177.60,0.00,11.62,0.00,1.00,-177.60,0.00 +4.80,-4.80,4.38,0.00,1.00,-172.80,4.80 +-168.00,4.80,11.64,0.00,1.00,-168.00,9.60 +14.40,-4.80,4.36,0.00,1.00,-163.20,14.40 +-158.40,9.60,11.66,0.00,1.00,-158.40,19.20 +24.00,-9.60,4.34,0.00,1.00,-153.60,24.00 +-148.80,9.60,11.68,0.00,1.00,-148.80,28.80 +33.60,-14.40,4.32,0.00,1.00,-144.00,33.60 +-139.20,14.40,11.71,0.00,1.00,-139.20,38.40 +43.20,-14.40,4.29,0.00,1.00,-134.40,43.20 +-129.60,19.20,11.73,0.00,1.00,-129.60,43.20 +52.80,-19.20,4.27,0.00,1.00,-124.80,48.00 +-120.00,19.20,11.75,0.00,1.00,-120.00,52.80 +62.40,-19.20,4.25,0.00,1.00,-115.20,57.60 +-110.40,19.20,11.77,0.00,1.00,-110.40,57.60 +72.00,-19.20,4.23,0.00,1.00,-105.60,62.40 +-100.80,24.00,11.79,0.00,1.00,-100.80,67.20 +81.60,-24.00,4.21,0.00,1.00,-96.00,67.20 +-91.20,24.00,11.81,0.00,1.00,-91.20,67.20 +96.00,-24.00,4.19,0.00,1.00,-86.40,67.20 +-81.60,24.00,11.83,0.00,1.00,-81.60,67.20 +105.60,-19.20,4.17,0.00,1.00,-76.80,62.40 +-72.00,19.20,11.86,0.00,1.00,-72.00,62.40 +115.20,-19.20,4.14,0.00,1.00,-67.20,57.60 +-62.40,19.20,11.88,0.00,1.00,-62.40,52.80 +124.80,-19.20,4.12,0.00,1.00,-57.60,52.80 +-52.80,19.20,11.90,0.00,1.00,-52.80,48.00 +134.40,-14.40,4.10,0.00,1.00,-48.00,43.20 +-43.20,14.40,11.92,0.00,1.00,-43.20,38.40 +144.00,-14.40,4.08,0.00,1.00,-38.40,33.60 +-33.60,14.40,11.94,0.00,1.00,-33.60,28.80 +153.60,-9.60,4.06,0.00,1.00,-28.80,24.00 +-24.00,9.60,11.96,0.00,1.00,-24.00,24.00 +163.20,-4.80,4.04,0.00,1.00,-19.20,19.20 +-14.40,4.80,11.98,0.00,1.00,-14.40,14.40 +172.80,-4.80,4.02,0.00,1.00,-9.60,9.60 +-4.80,0.00,12.01,0.00,1.00,-4.80,4.80 +0.00,0.00,3.99,0.00,1.00,0.00,0.00 +-177.60,0.00,12.03,0.00,1.00,4.80,-4.80 +9.60,-4.80,3.97,0.00,1.00,9.60,-9.60 +-168.00,4.80,12.05,0.00,1.00,14.40,-14.40 +19.20,-9.60,3.95,0.00,1.00,19.20,-19.20 +-158.40,9.60,12.07,0.00,1.00,24.00,-24.00 +24.00,-14.40,3.93,0.00,1.00,28.80,-28.80 +-148.80,14.40,12.09,0.00,1.00,33.60,-33.60 +33.60,-14.40,3.91,0.00,1.00,38.40,-38.40 +-139.20,19.20,12.11,0.00,1.00,43.20,-38.40 +43.20,-19.20,3.89,0.00,1.00,48.00,-43.20 +-129.60,19.20,12.13,0.00,1.00,52.80,-48.00 +52.80,-24.00,3.87,0.00,1.00,57.60,-52.80 +-120.00,24.00,12.15,0.00,1.00,62.40,-57.60 +62.40,-24.00,3.85,0.00,1.00,67.20,-62.40 +-110.40,24.00,12.18,0.00,1.00,72.00,-62.40 +76.80,-24.00,3.82,0.00,1.00,76.80,-67.20 +-100.80,28.80,12.20,0.00,1.00,81.60,-72.00 +86.40,-28.80,3.80,0.00,1.00,86.40,-72.00 +-86.40,28.80,12.22,0.00,1.00,91.20,-72.00 +96.00,-28.80,3.78,0.00,1.00,96.00,-72.00 +-76.80,28.80,12.24,0.00,1.00,100.80,-67.20 +105.60,-24.00,3.76,0.00,1.00,105.60,-67.20 +-67.20,24.00,12.26,0.00,1.00,110.40,-62.40 +120.00,-24.00,3.74,0.00,1.00,115.20,-57.60 +-57.60,24.00,12.28,0.00,1.00,120.00,-57.60 +129.60,-24.00,3.72,0.00,1.00,124.80,-52.80 +-48.00,19.20,12.30,0.00,1.00,129.60,-48.00 +139.20,-19.20,3.70,0.00,1.00,134.40,-43.20 +-38.40,19.20,12.33,0.00,1.00,139.20,-38.40 +148.80,-14.40,3.67,0.00,1.00,144.00,-33.60 +-28.80,14.40,12.35,0.00,1.00,148.80,-28.80 +158.40,-9.60,3.65,0.00,1.00,153.60,-24.00 +-19.20,9.60,12.37,0.00,1.00,158.40,-19.20 +163.20,-9.60,3.63,0.00,1.00,163.20,-14.40 +-9.60,4.80,12.39,0.00,1.00,168.00,-9.60 +172.80,-4.80,3.61,0.00,1.00,172.80,-4.80 +-0.00,0.00,12.41,0.00,1.00,177.60,-0.00 +-177.60,0.00,3.59,0.00,1.00,-177.60,0.00 +4.80,-4.80,12.43,0.00,1.00,-172.80,4.80 +-168.00,4.80,3.57,0.00,1.00,-168.00,9.60 +14.40,-9.60,12.45,0.00,1.00,-163.20,14.40 +-158.40,9.60,3.55,0.00,1.00,-158.40,19.20 +24.00,-9.60,12.48,0.00,1.00,-153.60,24.00 +-153.60,14.40,3.52,0.00,1.00,-148.80,28.80 +33.60,-14.40,12.50,0.00,1.00,-144.00,33.60 +-144.00,19.20,3.50,0.00,1.00,-139.20,38.40 +43.20,-19.20,12.52,0.00,1.00,-134.40,43.20 +-134.40,19.20,3.48,0.00,1.00,-129.60,48.00 +52.80,-24.00,12.54,0.00,1.00,-124.80,52.80 +-124.80,24.00,3.46,0.00,1.00,-120.00,57.60 +62.40,-24.00,12.56,0.00,1.00,-115.20,57.60 +-110.40,24.00,3.44,0.00,1.00,-110.40,62.40 +72.00,-24.00,12.58,0.00,1.00,-105.60,67.20 +-100.80,28.80,3.42,0.00,1.00,-100.80,67.20 +81.60,-28.80,12.60,0.00,1.00,-96.00,72.00 +-91.20,28.80,3.40,0.00,1.00,-91.20,72.00 +96.00,-28.80,12.62,0.00,1.00,-86.40,72.00 +-81.60,28.80,3.38,0.00,1.00,-81.60,72.00 +105.60,-24.00,12.65,0.00,1.00,-76.80,67.20 +-72.00,24.00,3.35,0.00,1.00,-72.00,62.40 +115.20,-24.00,12.67,0.00,1.00,-67.20,62.40 +-57.60,24.00,3.33,0.00,1.00,-62.40,57.60 +124.80,-24.00,12.69,0.00,1.00,-57.60,52.80 +-48.00,19.20,3.31,0.00,1.00,-52.80,48.00 +134.40,-19.20,12.71,0.00,1.00,-48.00,43.20 +-38.40,19.20,3.29,0.00,1.00,-43.20,38.40 +144.00,-14.40,12.73,0.00,1.00,-38.40,38.40 +-28.80,14.40,3.27,0.00,1.00,-33.60,33.60 +153.60,-14.40,12.75,0.00,1.00,-28.80,28.80 +-24.00,9.60,3.25,0.00,1.00,-24.00,24.00 +163.20,-9.60,12.77,0.00,1.00,-19.20,19.20 +-14.40,4.80,3.23,0.00,1.00,-14.40,14.40 +172.80,-4.80,12.80,0.00,1.00,-9.60,9.60 +-4.80,0.00,3.20,0.00,1.00,-4.80,4.80 +0.00,0.00,12.82,0.00,1.00,0.00,0.00 +-177.60,4.80,3.18,0.00,1.00,4.80,-4.80 +9.60,-4.80,12.84,0.00,1.00,9.60,-9.60 +-168.00,9.60,3.16,0.00,1.00,14.40,-14.40 +14.40,-9.60,12.86,0.00,1.00,19.20,-19.20 +-158.40,14.40,3.14,0.00,1.00,24.00,-24.00 +24.00,-14.40,12.88,0.00,1.00,28.80,-28.80 +-148.80,19.20,3.12,0.00,1.00,33.60,-33.60 +33.60,-19.20,12.90,0.00,1.00,38.40,-38.40 +-139.20,19.20,3.10,0.00,1.00,43.20,-43.20 +43.20,-24.00,12.92,0.00,1.00,48.00,-48.00 +-129.60,24.00,3.08,0.00,1.00,52.80,-52.80 +52.80,-28.80,12.95,0.00,1.00,57.60,-57.60 +-120.00,28.80,3.05,0.00,1.00,62.40,-57.60 +62.40,-28.80,12.97,0.00,1.00,67.20,-62.40 +-110.40,28.80,3.03,0.00,1.00,72.00,-67.20 +76.80,-28.80,12.99,0.00,1.00,76.80,-72.00 +-100.80,33.60,3.01,0.00,1.00,81.60,-72.00 +86.40,-33.60,13.01,0.00,1.00,86.40,-76.80 +-86.40,33.60,2.99,0.00,1.00,91.20,-76.80 +96.00,-33.60,13.03,0.00,1.00,96.00,-76.80 +-76.80,28.80,2.97,0.00,1.00,100.80,-72.00 +110.40,-28.80,13.05,0.00,1.00,105.60,-72.00 +-67.20,28.80,2.95,0.00,1.00,110.40,-67.20 +120.00,-28.80,13.07,0.00,1.00,115.20,-62.40 +-57.60,28.80,2.93,0.00,1.00,120.00,-57.60 +129.60,-24.00,13.09,0.00,1.00,124.80,-52.80 +-48.00,24.00,2.91,0.00,1.00,129.60,-48.00 +139.20,-24.00,13.12,0.00,1.00,134.40,-43.20 +-38.40,19.20,2.88,0.00,1.00,139.20,-38.40 +148.80,-19.20,13.14,0.00,1.00,144.00,-33.60 +-28.80,14.40,2.86,0.00,1.00,148.80,-28.80 +158.40,-14.40,13.16,0.00,1.00,153.60,-24.00 +-19.20,9.60,2.84,0.00,1.00,158.40,-19.20 +168.00,-9.60,13.18,0.00,1.00,163.20,-14.40 +-9.60,4.80,2.82,0.00,1.00,168.00,-9.60 +172.80,-4.80,13.20,0.00,1.00,172.80,-4.80 +-0.00,0.00,2.80,0.00,1.00,177.60,-0.00 +-177.60,0.00,13.22,0.00,1.00,-177.60,0.00 +4.80,-4.80,2.78,0.00,1.00,-172.80,4.80 +-168.00,4.80,13.24,0.00,1.00,-168.00,9.60 +14.40,-9.60,2.76,0.00,1.00,-163.20,14.40 +-163.20,9.60,13.27,0.00,1.00,-158.40,19.20 +24.00,-14.40,2.73,0.00,1.00,-153.60,24.00 +-153.60,14.40,13.29,0.00,1.00,-148.80,28.80 +33.60,-19.20,2.71,0.00,1.00,-144.00,33.60 +-144.00,19.20,13.31,0.00,1.00,-139.20,38.40 +43.20,-24.00,2.69,0.00,1.00,-134.40,43.20 +-134.40,24.00,13.33,0.00,1.00,-129.60,48.00 +52.80,-24.00,2.67,0.00,1.00,-124.80,52.80 +-124.80,28.80,13.35,0.00,1.00,-120.00,57.60 +62.40,-28.80,2.65,0.00,1.00,-115.20,62.40 +-115.20,28.80,13.37,0.00,1.00,-110.40,67.20 +72.00,-28.80,2.63,0.00,1.00,-105.60,72.00 +-100.80,28.80,13.39,0.00,1.00,-100.80,72.00 +81.60,-33.60,2.61,0.00,1.00,-96.00,76.80 +-91.20,33.60,13.42,0.00,1.00,-91.20,76.80 +96.00,-33.60,2.58,0.00,1.00,-86.40,76.80 +-81.60,33.60,13.44,0.00,1.00,-81.60,72.00 +105.60,-28.80,2.56,0.00,1.00,-76.80,72.00 +-67.20,28.80,13.46,0.00,1.00,-72.00,67.20 +115.20,-28.80,2.54,0.00,1.00,-67.20,62.40 +-57.60,28.80,13.48,0.00,1.00,-62.40,57.60 +124.80,-28.80,2.52,0.00,1.00,-57.60,57.60 +-48.00,24.00,13.50,0.00,1.00,-52.80,52.80 +134.40,-24.00,2.50,0.00,1.00,-48.00,48.00 +-38.40,19.20,13.52,0.00,1.00,-43.20,43.20 +144.00,-19.20,2.48,0.00,1.00,-38.40,38.40 +-28.80,19.20,13.54,0.00,1.00,-33.60,33.60 +153.60,-14.40,2.46,0.00,1.00,-28.80,28.80 +-19.20,14.40,13.56,0.00,1.00,-24.00,24.00 +163.20,-9.60,2.44,0.00,1.00,-19.20,19.20 +-14.40,9.60,13.59,0.00,1.00,-14.40,14.40 +172.80,-4.80,2.41,0.00,1.00,-9.60,9.60 +-4.80,4.80,13.61,0.00,1.00,-4.80,4.80 +0.00,0.00,2.39,0.00,1.00,0.00,0.00 +-177.60,4.80,13.63,0.00,1.00,4.80,-4.80 +9.60,-4.80,2.37,0.00,1.00,9.60,-9.60 +-168.00,9.60,13.65,0.00,1.00,14.40,-14.40 +14.40,-9.60,2.35,0.00,1.00,19.20,-19.20 +-158.40,14.40,13.67,0.00,1.00,24.00,-24.00 +24.00,-14.40,2.33,0.00,1.00,28.80,-28.80 +-153.60,19.20,13.69,0.00,1.00,33.60,-33.60 +33.60,-24.00,2.31,0.00,1.00,38.40,-38.40 +-144.00,24.00,13.71,0.00,1.00,43.20,-43.20 +43.20,-24.00,2.29,0.00,1.00,48.00,-48.00 +-134.40,28.80,13.74,0.00,1.00,52.80,-52.80 +52.80,-28.80,2.26,0.00,1.00,57.60,-57.60 +-124.80,33.60,13.76,0.00,1.00,62.40,-62.40 +62.40,-33.60,2.24,0.00,1.00,67.20,-67.20 +-110.40,33.60,13.78,0.00,1.00,72.00,-72.00 +72.00,-33.60,2.22,0.00,1.00,76.80,-72.00 +-100.80,38.40,13.80,0.00,1.00,81.60,-76.80 +86.40,-38.40,2.20,0.00,1.00,86.40,-81.60 +-86.40,38.40,13.82,0.00,1.00,91.20,-81.60 +96.00,-38.40,2.18,0.00,1.00,96.00,-81.60 +-76.80,33.60,13.84,0.00,1.00,100.80,-76.80 +110.40,-33.60,2.16,0.00,1.00,105.60,-72.00 +-67.20,33.60,13.86,0.00,1.00,110.40,-67.20 +120.00,-33.60,2.14,0.00,1.00,115.20,-62.40 +-52.80,28.80,13.89,0.00,1.00,120.00,-57.60 +129.60,-28.80,2.11,0.00,1.00,124.80,-52.80 +-43.20,28.80,13.91,0.00,1.00,129.60,-48.00 +139.20,-24.00,2.09,0.00,1.00,134.40,-43.20 +-33.60,24.00,13.93,0.00,1.00,139.20,-38.40 +148.80,-19.20,2.07,0.00,1.00,144.00,-33.60 +-24.00,19.20,13.95,0.00,1.00,148.80,-28.80 +158.40,-14.40,2.05,0.00,1.00,153.60,-24.00 +-19.20,14.40,13.97,0.00,1.00,158.40,-19.20 +168.00,-9.60,2.03,0.00,1.00,163.20,-14.40 +-9.60,4.80,13.99,0.00,1.00,168.00,-9.60 +172.80,-4.80,2.01,0.00,1.00,172.80,-4.80 +-0.00,0.00,14.01,0.00,1.00,177.60,-0.00 +-177.60,0.00,1.99,0.00,1.00,-177.60,0.00 +4.80,-4.80,14.03,0.00,1.00,-172.80,4.80 +-168.00,4.80,1.97,0.00,1.00,-168.00,9.60 +14.40,-9.60,14.06,0.00,1.00,-163.20,14.40 +-163.20,14.40,1.94,0.00,1.00,-158.40,19.20 +24.00,-14.40,14.08,0.00,1.00,-153.60,24.00 +-153.60,19.20,1.92,0.00,1.00,-148.80,28.80 +28.80,-19.20,14.10,0.00,1.00,-144.00,33.60 +-144.00,24.00,1.90,0.00,1.00,-139.20,38.40 +38.40,-24.00,14.12,0.00,1.00,-134.40,43.20 +-134.40,28.80,1.88,0.00,1.00,-129.60,48.00 +48.00,-28.80,14.14,0.00,1.00,-124.80,52.80 +-124.80,28.80,1.86,0.00,1.00,-120.00,57.60 +57.60,-33.60,14.16,0.00,1.00,-115.20,62.40 +-115.20,33.60,1.84,0.00,1.00,-110.40,67.20 +72.00,-33.60,14.18,0.00,1.00,-105.60,72.00 +-105.60,33.60,1.82,0.00,1.00,-100.80,76.80 +81.60,-38.40,14.21,0.00,1.00,-96.00,81.60 +-91.20,38.40,1.79,0.00,1.00,-91.20,81.60 +96.00,-38.40,14.23,0.00,1.00,-86.40,81.60 +-81.60,38.40,1.77,0.00,1.00,-81.60,76.80 +105.60,-33.60,14.25,0.00,1.00,-76.80,72.00 +-67.20,33.60,1.75,0.00,1.00,-72.00,72.00 +120.00,-33.60,14.27,0.00,1.00,-67.20,67.20 +-57.60,33.60,1.73,0.00,1.00,-62.40,62.40 +129.60,-28.80,14.29,0.00,1.00,-57.60,57.60 +-48.00,28.80,1.71,0.00,1.00,-52.80,52.80 +139.20,-24.00,14.31,0.00,1.00,-48.00,48.00 +-38.40,24.00,1.69,0.00,1.00,-43.20,43.20 +148.80,-24.00,14.33,0.00,1.00,-38.40,38.40 +-28.80,19.20,1.67,0.00,1.00,-33.60,33.60 +158.40,-14.40,14.36,0.00,1.00,-28.80,28.80 +-19.20,14.40,1.64,0.00,1.00,-24.00,24.00 +163.20,-9.60,14.38,0.00,1.00,-19.20,19.20 +-9.60,9.60,1.62,0.00,1.00,-14.40,14.40 +172.80,-4.80,14.40,0.00,1.00,-9.60,9.60 +-4.80,4.80,1.60,0.00,1.00,-4.80,4.80 +0.00,0.00,14.42,0.00,1.00,0.00,0.00 +-177.60,4.80,1.58,0.00,1.00,4.80,-4.80 +9.60,-4.80,14.44,0.00,1.00,9.60,-9.60 +-168.00,9.60,1.56,0.00,1.00,14.40,-14.40 +14.40,-14.40,14.46,0.00,1.00,19.20,-19.20 +-163.20,14.40,1.54,0.00,1.00,24.00,-24.00 +24.00,-19.20,14.48,0.00,1.00,28.80,-28.80 +-153.60,19.20,1.52,0.00,1.00,33.60,-33.60 +28.80,-24.00,14.50,0.00,1.00,38.40,-38.40 +-144.00,28.80,1.50,0.00,1.00,43.20,-43.20 +38.40,-28.80,14.53,0.00,1.00,48.00,-48.00 +-134.40,33.60,1.47,0.00,1.00,52.80,-52.80 +48.00,-33.60,14.55,0.00,1.00,57.60,-57.60 +-124.80,33.60,1.45,0.00,1.00,62.40,-62.40 +62.40,-38.40,14.57,0.00,1.00,67.20,-67.20 +-115.20,38.40,1.43,0.00,1.00,72.00,-72.00 +72.00,-38.40,14.59,0.00,1.00,76.80,-76.80 +-100.80,43.20,1.41,0.00,1.00,81.60,-81.60 +86.40,-43.20,14.61,0.00,1.00,86.40,-86.40 +-86.40,43.20,1.39,0.00,1.00,91.20,-86.40 +96.00,-43.20,14.63,0.00,1.00,96.00,-81.60 +-76.80,38.40,1.37,0.00,1.00,100.80,-76.80 +110.40,-38.40,14.65,0.00,1.00,105.60,-72.00 +-62.40,38.40,1.35,0.00,1.00,110.40,-67.20 +120.00,-38.40,14.68,0.00,1.00,115.20,-62.40 +-52.80,33.60,1.32,0.00,1.00,120.00,-57.60 +134.40,-33.60,14.70,0.00,1.00,124.80,-52.80 +-43.20,28.80,1.30,0.00,1.00,129.60,-48.00 +144.00,-28.80,14.72,0.00,1.00,134.40,-43.20 +-33.60,24.00,1.28,0.00,1.00,139.20,-38.40 +153.60,-24.00,14.74,0.00,1.00,144.00,-33.60 +-24.00,19.20,1.26,0.00,1.00,148.80,-28.80 +158.40,-19.20,14.76,0.00,1.00,153.60,-24.00 +-14.40,14.40,1.24,0.00,1.00,158.40,-19.20 +168.00,-9.60,14.78,0.00,1.00,163.20,-14.40 +-9.60,9.60,1.22,0.00,1.00,168.00,-9.60 +172.80,-4.80,14.80,0.00,1.00,172.80,-4.80 +-0.00,0.00,1.20,0.00,1.00,177.60,-0.00 +-177.60,0.00,14.83,0.00,1.00,-177.60,0.00 +4.80,-4.80,1.17,0.00,1.00,-172.80,4.80 +-172.80,9.60,14.85,0.00,1.00,-168.00,9.60 +14.40,-9.60,1.15,0.00,1.00,-163.20,14.40 +-163.20,14.40,14.87,0.00,1.00,-158.40,19.20 +19.20,-19.20,1.13,0.00,1.00,-153.60,24.00 +-153.60,19.20,14.89,0.00,1.00,-148.80,28.80 +28.80,-24.00,1.11,0.00,1.00,-144.00,33.60 +-148.80,24.00,14.91,0.00,1.00,-139.20,38.40 +38.40,-28.80,1.09,0.00,1.00,-134.40,43.20 +-139.20,28.80,14.93,0.00,1.00,-129.60,48.00 +48.00,-33.60,1.07,0.00,1.00,-124.80,52.80 +-129.60,33.60,14.95,0.00,1.00,-120.00,57.60 +57.60,-38.40,1.05,0.00,1.00,-115.20,62.40 +-115.20,38.40,14.97,0.00,1.00,-110.40,67.20 +67.20,-38.40,1.03,0.00,1.00,-105.60,72.00 +-105.60,38.40,15.00,0.00,1.00,-100.80,76.80 +81.60,-43.20,1.00,0.00,1.00,-96.00,81.60 +-91.20,43.20,15.02,0.00,1.00,-91.20,86.40 +96.00,-43.20,0.98,0.00,1.00,-86.40,86.40 +-76.80,43.20,15.04,0.00,1.00,-81.60,81.60 +105.60,-38.40,0.96,0.00,1.00,-76.80,76.80 +-67.20,38.40,15.06,0.00,1.00,-72.00,72.00 +120.00,-38.40,0.94,0.00,1.00,-67.20,67.20 +-52.80,33.60,15.08,0.00,1.00,-62.40,62.40 +129.60,-33.60,0.92,0.00,1.00,-57.60,57.60 +-43.20,33.60,15.10,0.00,1.00,-52.80,52.80 +139.20,-28.80,0.90,0.00,1.00,-48.00,48.00 +-33.60,28.80,15.12,0.00,1.00,-43.20,43.20 +148.80,-24.00,0.88,0.00,1.00,-38.40,38.40 +-28.80,19.20,15.15,0.00,1.00,-33.60,33.60 +158.40,-19.20,0.85,0.00,1.00,-28.80,28.80 +-19.20,14.40,15.17,0.00,1.00,-24.00,24.00 +163.20,-14.40,0.83,0.00,1.00,-19.20,19.20 +-9.60,9.60,15.19,0.00,1.00,-14.40,14.40 +172.80,-4.80,0.81,0.00,1.00,-9.60,9.60 +-4.80,4.80,15.21,0.00,1.00,-4.80,4.80 +0.00,0.00,0.79,0.00,1.00,0.00,0.00 +-177.60,4.80,15.23,0.00,1.00,4.80,-4.80 +4.80,-4.80,0.77,0.00,1.00,9.60,-9.60 +-168.00,9.60,15.25,0.00,1.00,14.40,-14.40 +14.40,-14.40,0.75,0.00,1.00,19.20,-19.20 +-163.20,19.20,15.27,0.00,1.00,24.00,-24.00 +19.20,-19.20,0.73,0.00,1.00,28.80,-28.80 +-153.60,24.00,15.30,0.00,1.00,33.60,-33.60 +28.80,-28.80,0.70,0.00,1.00,38.40,-38.40 +-148.80,28.80,15.32,0.00,1.00,43.20,-43.20 +38.40,-33.60,0.68,0.00,1.00,48.00,-48.00 +-139.20,33.60,15.34,0.00,1.00,52.80,-52.80 +48.00,-38.40,0.66,0.00,1.00,57.60,-57.60 +-124.80,38.40,15.36,0.00,1.00,62.40,-62.40 +57.60,-43.20,0.64,0.00,1.00,67.20,-67.20 +-115.20,43.20,15.38,0.00,1.00,72.00,-72.00 +72.00,-43.20,0.62,0.00,1.00,76.80,-76.80 +-100.80,43.20,15.40,0.00,1.00,81.60,-81.60 +86.40,-48.00,0.60,0.00,1.00,86.40,-86.40 +-86.40,48.00,15.42,0.00,1.00,91.20,-86.40 +100.80,-48.00,0.58,0.00,1.00,96.00,-81.60 +-76.80,43.20,15.44,0.00,1.00,100.80,-76.80 +110.40,-43.20,0.56,0.00,1.00,105.60,-72.00 +-62.40,43.20,15.47,0.00,1.00,110.40,-67.20 +124.80,-38.40,0.53,0.00,1.00,115.20,-62.40 +-48.00,38.40,15.49,0.00,1.00,120.00,-57.60 +134.40,-38.40,0.51,0.00,1.00,124.80,-52.80 +-38.40,33.60,15.51,0.00,1.00,129.60,-48.00 +144.00,-28.80,0.49,0.00,1.00,134.40,-43.20 +-28.80,28.80,15.53,0.00,1.00,139.20,-38.40 +153.60,-24.00,0.47,0.00,1.00,144.00,-33.60 +-24.00,24.00,15.55,0.00,1.00,148.80,-28.80 +163.20,-19.20,0.45,0.00,1.00,153.60,-24.00 +-14.40,14.40,15.57,0.00,1.00,158.40,-19.20 +168.00,-14.40,0.43,0.00,1.00,163.20,-14.40 +-9.60,9.60,15.59,0.00,1.00,168.00,-9.60 +172.80,-4.80,0.41,0.00,1.00,172.80,-4.80 +-0.00,0.00,15.62,0.00,1.00,177.60,-0.00 +-177.60,0.00,0.38,0.00,1.00,-177.60,0.00 +4.80,-4.80,15.64,0.00,1.00,-172.80,4.80 +-172.80,9.60,0.36,0.00,1.00,-168.00,9.60 +9.60,-14.40,15.66,0.00,1.00,-163.20,14.40 +-163.20,14.40,0.34,0.00,1.00,-158.40,19.20 +19.20,-19.20,15.68,0.00,1.00,-153.60,24.00 +-158.40,24.00,0.32,0.00,1.00,-148.80,28.80 +28.80,-24.00,15.70,0.00,1.00,-144.00,33.60 +-148.80,28.80,0.30,0.00,1.00,-139.20,38.40 +33.60,-28.80,15.72,0.00,1.00,-134.40,43.20 +-139.20,33.60,0.28,0.00,1.00,-129.60,48.00 +43.20,-38.40,15.74,0.00,1.00,-124.80,52.80 +-129.60,38.40,0.26,0.00,1.00,-120.00,57.60 +57.60,-38.40,15.77,0.00,1.00,-115.20,62.40 +-120.00,43.20,0.23,0.00,1.00,-110.40,67.20 +67.20,-43.20,15.79,0.00,1.00,-105.60,72.00 +-105.60,43.20,0.21,0.00,1.00,-100.80,76.80 +81.60,-48.00,15.81,0.00,1.00,-96.00,81.60 +-91.20,48.00,0.19,0.00,1.00,-91.20,86.40 +96.00,-48.00,15.83,0.00,1.00,-86.40,86.40 +-76.80,43.20,0.17,0.00,1.00,-81.60,81.60 +110.40,-43.20,15.85,0.00,1.00,-76.80,76.80 +-67.20,43.20,0.15,0.00,1.00,-72.00,72.00 +120.00,-43.20,15.87,0.00,1.00,-67.20,67.20 +-52.80,38.40,0.13,0.00,1.00,-62.40,62.40 +134.40,-38.40,15.89,0.00,1.00,-57.60,57.60 +-43.20,33.60,0.11,0.00,1.00,-52.80,52.80 +144.00,-33.60,15.91,0.00,1.00,-48.00,48.00 +-33.60,28.80,0.09,0.00,1.00,-43.20,43.20 +153.60,-28.80,15.94,0.00,1.00,-38.40,38.40 +-24.00,24.00,0.06,0.00,1.00,-33.60,33.60 +158.40,-19.20,15.96,0.00,1.00,-28.80,28.80 +-19.20,19.20,0.04,0.00,1.00,-24.00,24.00 +168.00,-14.40,15.98,0.00,1.00,-19.20,19.20 +-9.60,9.60,0.02,0.00,1.00,-14.40,14.40 +172.80,-4.80,16.00,0.00,1.00,-9.60,9.60 +-4.80,4.80,0.00,0.00,1.00,-4.80,4.80 diff --git a/scripts/testv/stvISM4.csv b/scripts/testv/stvISM4.csv index 6318155a25..326176319a 100644 --- a/scripts/testv/stvISM4.csv +++ b/scripts/testv/stvISM4.csv @@ -1,1500 +1,1500 @@ --0.00,0.00,1.00,0.00,1.00 --0.00,4.80,1.00,0.00,1.00 --0.00,9.60,1.00,0.00,1.00 --0.00,14.40,1.00,0.00,1.00 --0.00,19.20,1.00,0.00,1.00 --0.00,24.00,1.00,0.00,1.00 --0.00,28.80,1.00,0.00,1.00 --0.00,33.60,1.00,0.00,1.00 --0.00,38.40,1.00,0.00,1.00 --0.00,43.20,1.00,0.00,1.00 --0.00,48.00,1.00,0.00,1.00 --0.00,52.80,1.00,0.00,1.00 --0.00,57.60,1.00,0.00,1.00 --0.00,62.40,1.00,0.00,1.00 --0.00,67.20,1.00,0.00,1.00 --0.00,72.00,1.00,0.00,1.00 --0.00,76.80,1.00,0.00,1.00 --0.00,81.60,1.00,0.00,1.00 --0.00,86.40,1.00,0.00,1.00 --177.60,89.20,1.00,0.00,1.00 --177.60,86.40,1.00,0.00,1.00 --177.60,81.60,1.00,0.00,1.00 --177.60,76.80,1.00,0.00,1.00 --177.60,72.00,1.00,0.00,1.00 --177.60,67.20,1.00,0.00,1.00 -177.60,62.40,1.00,0.00,1.00 -177.60,57.60,1.00,0.00,1.00 -177.60,52.80,1.00,0.00,1.00 -177.60,48.00,1.00,0.00,1.00 -177.60,43.20,1.00,0.00,1.00 -177.60,38.40,1.00,0.00,1.00 -177.60,33.60,1.00,0.00,1.00 -177.60,28.80,1.00,0.00,1.00 -177.60,24.00,1.00,0.00,1.00 -177.60,19.20,1.00,0.00,1.00 -177.60,14.40,1.00,0.00,1.00 -177.60,9.60,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --177.60,-9.60,1.00,0.00,1.00 --177.60,-14.40,1.00,0.00,1.00 --177.60,-19.20,1.00,0.00,1.00 --177.60,-24.00,1.00,0.00,1.00 --177.60,-28.80,1.00,0.00,1.00 --177.60,-33.60,1.00,0.00,1.00 --177.60,-38.40,1.00,0.00,1.00 --177.60,-48.00,1.00,0.00,1.00 --177.60,-48.00,1.00,0.00,1.00 --177.60,-52.80,1.00,0.00,1.00 --177.60,-57.60,1.00,0.00,1.00 -177.60,-62.40,1.00,0.00,1.00 -177.60,-67.20,1.00,0.00,1.00 -177.60,-76.80,1.00,0.00,1.00 -177.60,-76.80,1.00,0.00,1.00 -177.60,-86.40,1.00,0.00,1.00 -177.60,-89.20,1.00,0.00,1.00 -0.00,-86.40,1.00,0.00,1.00 -0.00,-81.60,1.00,0.00,1.00 -0.00,-76.80,1.00,0.00,1.00 -0.00,-72.00,1.00,0.00,1.00 -0.00,-67.20,1.00,0.00,1.00 -0.00,-62.40,1.00,0.00,1.00 -0.00,-57.60,1.00,0.00,1.00 -0.00,-52.80,1.00,0.00,1.00 -0.00,-48.00,1.00,0.00,1.00 -0.00,-43.20,1.00,0.00,1.00 -0.00,-38.40,1.00,0.00,1.00 -0.00,-33.60,1.00,0.00,1.00 -0.00,-28.80,1.00,0.00,1.00 -0.00,-24.00,1.00,0.00,1.00 -0.00,-19.20,1.00,0.00,1.00 -0.00,-14.40,1.00,0.00,1.00 -0.00,-9.60,1.00,0.00,1.00 -0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,4.80,1.00,0.00,1.00 -0.00,9.60,1.00,0.00,1.00 -0.00,14.40,1.00,0.00,1.00 -0.00,19.20,1.00,0.00,1.00 -0.00,24.00,1.00,0.00,1.00 -4.80,28.80,1.00,0.00,1.00 -4.80,33.60,1.00,0.00,1.00 -4.80,38.40,1.00,0.00,1.00 -4.80,43.20,1.00,0.00,1.00 -4.80,48.00,1.00,0.00,1.00 -4.80,52.80,1.00,0.00,1.00 -9.60,57.60,1.00,0.00,1.00 -9.60,62.40,1.00,0.00,1.00 -9.60,67.20,1.00,0.00,1.00 -14.40,72.00,1.00,0.00,1.00 -19.20,76.80,1.00,0.00,1.00 -28.80,81.60,1.00,0.00,1.00 -52.80,86.40,1.00,0.00,1.00 -105.60,86.40,1.00,0.00,1.00 -139.20,81.60,1.00,0.00,1.00 -158.40,76.80,1.00,0.00,1.00 -163.20,72.00,1.00,0.00,1.00 -168.00,67.20,1.00,0.00,1.00 -168.00,62.40,1.00,0.00,1.00 -172.80,57.60,1.00,0.00,1.00 -172.80,52.80,1.00,0.00,1.00 -172.80,48.00,1.00,0.00,1.00 -172.80,43.20,1.00,0.00,1.00 -177.60,38.40,1.00,0.00,1.00 -177.60,33.60,1.00,0.00,1.00 -177.60,28.80,1.00,0.00,1.00 -177.60,24.00,1.00,0.00,1.00 -177.60,19.20,1.00,0.00,1.00 -177.60,14.40,1.00,0.00,1.00 -177.60,9.60,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --177.60,-9.60,1.00,0.00,1.00 --177.60,-14.40,1.00,0.00,1.00 --177.60,-19.20,1.00,0.00,1.00 --177.60,-24.00,1.00,0.00,1.00 --177.60,-28.80,1.00,0.00,1.00 --177.60,-33.60,1.00,0.00,1.00 --177.60,-38.40,1.00,0.00,1.00 --172.80,-43.20,1.00,0.00,1.00 --172.80,-48.00,1.00,0.00,1.00 --172.80,-52.80,1.00,0.00,1.00 --172.80,-57.60,1.00,0.00,1.00 --168.00,-62.40,1.00,0.00,1.00 --168.00,-67.20,1.00,0.00,1.00 --163.20,-72.00,1.00,0.00,1.00 --158.40,-76.80,1.00,0.00,1.00 --139.20,-81.60,1.00,0.00,1.00 --105.60,-86.40,1.00,0.00,1.00 --52.80,-86.40,1.00,0.00,1.00 --28.80,-81.60,1.00,0.00,1.00 --19.20,-76.80,1.00,0.00,1.00 --14.40,-72.00,1.00,0.00,1.00 --9.60,-67.20,1.00,0.00,1.00 --9.60,-62.40,1.00,0.00,1.00 --9.60,-57.60,1.00,0.00,1.00 --4.80,-52.80,1.00,0.00,1.00 --4.80,-48.00,1.00,0.00,1.00 --4.80,-43.20,1.00,0.00,1.00 --4.80,-38.40,1.00,0.00,1.00 --4.80,-33.60,1.00,0.00,1.00 --4.80,-28.80,1.00,0.00,1.00 --0.00,-24.00,1.00,0.00,1.00 --0.00,-19.20,1.00,0.00,1.00 --0.00,-14.40,1.00,0.00,1.00 --0.00,-9.60,1.00,0.00,1.00 --0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,4.80,1.00,0.00,1.00 -0.00,9.60,1.00,0.00,1.00 -4.80,14.40,1.00,0.00,1.00 -4.80,19.20,1.00,0.00,1.00 -4.80,24.00,1.00,0.00,1.00 -4.80,28.80,1.00,0.00,1.00 -4.80,33.60,1.00,0.00,1.00 -9.60,38.40,1.00,0.00,1.00 -9.60,43.20,1.00,0.00,1.00 -9.60,48.00,1.00,0.00,1.00 -14.40,52.80,1.00,0.00,1.00 -14.40,57.60,1.00,0.00,1.00 -19.20,62.40,1.00,0.00,1.00 -24.00,67.20,1.00,0.00,1.00 -28.80,72.00,1.00,0.00,1.00 -33.60,72.00,1.00,0.00,1.00 -48.00,76.80,1.00,0.00,1.00 -67.20,81.60,1.00,0.00,1.00 -96.00,81.60,1.00,0.00,1.00 -120.00,76.80,1.00,0.00,1.00 -139.20,76.80,1.00,0.00,1.00 -148.80,72.00,1.00,0.00,1.00 -153.60,67.20,1.00,0.00,1.00 -158.40,62.40,1.00,0.00,1.00 -163.20,57.60,1.00,0.00,1.00 -168.00,52.80,1.00,0.00,1.00 -168.00,48.00,1.00,0.00,1.00 -168.00,43.20,1.00,0.00,1.00 -172.80,38.40,1.00,0.00,1.00 -172.80,33.60,1.00,0.00,1.00 -172.80,28.80,1.00,0.00,1.00 -177.60,24.00,1.00,0.00,1.00 -177.60,19.20,1.00,0.00,1.00 -177.60,14.40,1.00,0.00,1.00 -177.60,9.60,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --177.60,-9.60,1.00,0.00,1.00 --177.60,-14.40,1.00,0.00,1.00 --177.60,-19.20,1.00,0.00,1.00 --177.60,-24.00,1.00,0.00,1.00 --172.80,-28.80,1.00,0.00,1.00 --172.80,-33.60,1.00,0.00,1.00 --172.80,-38.40,1.00,0.00,1.00 --168.00,-43.20,1.00,0.00,1.00 --168.00,-48.00,1.00,0.00,1.00 --168.00,-52.80,1.00,0.00,1.00 --163.20,-57.60,1.00,0.00,1.00 --158.40,-62.40,1.00,0.00,1.00 --153.60,-67.20,1.00,0.00,1.00 --148.80,-72.00,1.00,0.00,1.00 --139.20,-76.80,1.00,0.00,1.00 --120.00,-76.80,1.00,0.00,1.00 --96.00,-81.60,1.00,0.00,1.00 --67.20,-81.60,1.00,0.00,1.00 --48.00,-76.80,1.00,0.00,1.00 --33.60,-72.00,1.00,0.00,1.00 --28.80,-72.00,1.00,0.00,1.00 --24.00,-67.20,1.00,0.00,1.00 --19.20,-62.40,1.00,0.00,1.00 --14.40,-57.60,1.00,0.00,1.00 --14.40,-52.80,1.00,0.00,1.00 --9.60,-48.00,1.00,0.00,1.00 --9.60,-43.20,1.00,0.00,1.00 --9.60,-38.40,1.00,0.00,1.00 --4.80,-33.60,1.00,0.00,1.00 --4.80,-28.80,1.00,0.00,1.00 --4.80,-24.00,1.00,0.00,1.00 --4.80,-19.20,1.00,0.00,1.00 --4.80,-14.40,1.00,0.00,1.00 --0.00,-9.60,1.00,0.00,1.00 --0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,4.80,1.00,0.00,1.00 -4.80,9.60,1.00,0.00,1.00 -4.80,14.40,1.00,0.00,1.00 -4.80,19.20,1.00,0.00,1.00 -4.80,24.00,1.00,0.00,1.00 -9.60,28.80,1.00,0.00,1.00 -9.60,33.60,1.00,0.00,1.00 -9.60,38.40,1.00,0.00,1.00 -14.40,43.20,1.00,0.00,1.00 -14.40,48.00,1.00,0.00,1.00 -19.20,52.80,1.00,0.00,1.00 -19.20,52.80,1.00,0.00,1.00 -24.00,57.60,1.00,0.00,1.00 -28.80,62.40,1.00,0.00,1.00 -38.40,67.20,1.00,0.00,1.00 -48.00,72.00,1.00,0.00,1.00 -57.60,72.00,1.00,0.00,1.00 -76.80,76.80,1.00,0.00,1.00 -96.00,76.80,1.00,0.00,1.00 -115.20,76.80,1.00,0.00,1.00 -129.60,72.00,1.00,0.00,1.00 -139.20,67.20,1.00,0.00,1.00 -144.00,67.20,1.00,0.00,1.00 -153.60,62.40,1.00,0.00,1.00 -158.40,57.60,1.00,0.00,1.00 -158.40,52.80,1.00,0.00,1.00 -163.20,48.00,1.00,0.00,1.00 -168.00,43.20,1.00,0.00,1.00 -168.00,38.40,1.00,0.00,1.00 -168.00,33.60,1.00,0.00,1.00 -172.80,28.80,1.00,0.00,1.00 -172.80,24.00,1.00,0.00,1.00 -172.80,19.20,1.00,0.00,1.00 -177.60,14.40,1.00,0.00,1.00 -177.60,9.60,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --177.60,-9.60,1.00,0.00,1.00 --177.60,-14.40,1.00,0.00,1.00 --172.80,-19.20,1.00,0.00,1.00 --172.80,-24.00,1.00,0.00,1.00 --172.80,-28.80,1.00,0.00,1.00 --168.00,-33.60,1.00,0.00,1.00 --168.00,-38.40,1.00,0.00,1.00 --168.00,-43.20,1.00,0.00,1.00 --163.20,-48.00,1.00,0.00,1.00 --158.40,-52.80,1.00,0.00,1.00 --158.40,-57.60,1.00,0.00,1.00 --153.60,-62.40,1.00,0.00,1.00 --144.00,-67.20,1.00,0.00,1.00 --139.20,-67.20,1.00,0.00,1.00 --129.60,-72.00,1.00,0.00,1.00 --115.20,-76.80,1.00,0.00,1.00 --96.00,-76.80,1.00,0.00,1.00 --76.80,-76.80,1.00,0.00,1.00 --57.60,-72.00,1.00,0.00,1.00 --48.00,-72.00,1.00,0.00,1.00 --38.40,-67.20,1.00,0.00,1.00 --28.80,-62.40,1.00,0.00,1.00 --24.00,-57.60,1.00,0.00,1.00 --19.20,-52.80,1.00,0.00,1.00 --19.20,-52.80,1.00,0.00,1.00 --14.40,-48.00,1.00,0.00,1.00 --14.40,-43.20,1.00,0.00,1.00 --9.60,-38.40,1.00,0.00,1.00 --9.60,-33.60,1.00,0.00,1.00 --9.60,-28.80,1.00,0.00,1.00 --4.80,-24.00,1.00,0.00,1.00 --4.80,-19.20,1.00,0.00,1.00 --4.80,-14.40,1.00,0.00,1.00 --4.80,-9.60,1.00,0.00,1.00 --0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,4.80,1.00,0.00,1.00 -4.80,9.60,1.00,0.00,1.00 -4.80,14.40,1.00,0.00,1.00 -4.80,19.20,1.00,0.00,1.00 -9.60,24.00,1.00,0.00,1.00 -9.60,28.80,1.00,0.00,1.00 -14.40,33.60,1.00,0.00,1.00 -14.40,33.60,1.00,0.00,1.00 -19.20,38.40,1.00,0.00,1.00 -19.20,43.20,1.00,0.00,1.00 -24.00,48.00,1.00,0.00,1.00 -28.80,52.80,1.00,0.00,1.00 -33.60,57.60,1.00,0.00,1.00 -38.40,62.40,1.00,0.00,1.00 -43.20,62.40,1.00,0.00,1.00 -52.80,67.20,1.00,0.00,1.00 -67.20,67.20,1.00,0.00,1.00 -76.80,72.00,1.00,0.00,1.00 -96.00,72.00,1.00,0.00,1.00 -105.60,72.00,1.00,0.00,1.00 -120.00,67.20,1.00,0.00,1.00 -129.60,67.20,1.00,0.00,1.00 -139.20,62.40,1.00,0.00,1.00 -144.00,57.60,1.00,0.00,1.00 -148.80,52.80,1.00,0.00,1.00 -153.60,52.80,1.00,0.00,1.00 -158.40,48.00,1.00,0.00,1.00 -163.20,43.20,1.00,0.00,1.00 -163.20,38.40,1.00,0.00,1.00 -168.00,33.60,1.00,0.00,1.00 -168.00,28.80,1.00,0.00,1.00 -172.80,24.00,1.00,0.00,1.00 -172.80,19.20,1.00,0.00,1.00 -172.80,14.40,1.00,0.00,1.00 -177.60,9.60,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --177.60,-9.60,1.00,0.00,1.00 --172.80,-14.40,1.00,0.00,1.00 --172.80,-19.20,1.00,0.00,1.00 --172.80,-24.00,1.00,0.00,1.00 --168.00,-28.80,1.00,0.00,1.00 --168.00,-33.60,1.00,0.00,1.00 --163.20,-38.40,1.00,0.00,1.00 --163.20,-43.20,1.00,0.00,1.00 --158.40,-48.00,1.00,0.00,1.00 --153.60,-52.80,1.00,0.00,1.00 --148.80,-52.80,1.00,0.00,1.00 --144.00,-57.60,1.00,0.00,1.00 --139.20,-62.40,1.00,0.00,1.00 --129.60,-67.20,1.00,0.00,1.00 --120.00,-67.20,1.00,0.00,1.00 --105.60,-72.00,1.00,0.00,1.00 --96.00,-72.00,1.00,0.00,1.00 --76.80,-72.00,1.00,0.00,1.00 --67.20,-67.20,1.00,0.00,1.00 --52.80,-67.20,1.00,0.00,1.00 --43.20,-62.40,1.00,0.00,1.00 --38.40,-62.40,1.00,0.00,1.00 --33.60,-57.60,1.00,0.00,1.00 --28.80,-52.80,1.00,0.00,1.00 --24.00,-48.00,1.00,0.00,1.00 --19.20,-43.20,1.00,0.00,1.00 --19.20,-38.40,1.00,0.00,1.00 --14.40,-33.60,1.00,0.00,1.00 --14.40,-33.60,1.00,0.00,1.00 --9.60,-28.80,1.00,0.00,1.00 --9.60,-24.00,1.00,0.00,1.00 --4.80,-19.20,1.00,0.00,1.00 --4.80,-14.40,1.00,0.00,1.00 --4.80,-9.60,1.00,0.00,1.00 --0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,4.80,1.00,0.00,1.00 -4.80,9.60,1.00,0.00,1.00 -4.80,14.40,1.00,0.00,1.00 -9.60,19.20,1.00,0.00,1.00 -9.60,24.00,1.00,0.00,1.00 -14.40,24.00,1.00,0.00,1.00 -14.40,28.80,1.00,0.00,1.00 -19.20,33.60,1.00,0.00,1.00 -19.20,38.40,1.00,0.00,1.00 -24.00,43.20,1.00,0.00,1.00 -28.80,48.00,1.00,0.00,1.00 -33.60,52.80,1.00,0.00,1.00 -38.40,52.80,1.00,0.00,1.00 -43.20,57.60,1.00,0.00,1.00 -52.80,62.40,1.00,0.00,1.00 -62.40,62.40,1.00,0.00,1.00 -72.00,62.40,1.00,0.00,1.00 -81.60,67.20,1.00,0.00,1.00 -91.20,67.20,1.00,0.00,1.00 -105.60,67.20,1.00,0.00,1.00 -115.20,62.40,1.00,0.00,1.00 -124.80,62.40,1.00,0.00,1.00 -134.40,57.60,1.00,0.00,1.00 -139.20,57.60,1.00,0.00,1.00 -144.00,52.80,1.00,0.00,1.00 -148.80,48.00,1.00,0.00,1.00 -153.60,43.20,1.00,0.00,1.00 -158.40,38.40,1.00,0.00,1.00 -158.40,38.40,1.00,0.00,1.00 -163.20,33.60,1.00,0.00,1.00 -168.00,28.80,1.00,0.00,1.00 -168.00,24.00,1.00,0.00,1.00 -172.80,19.20,1.00,0.00,1.00 -172.80,14.40,1.00,0.00,1.00 -172.80,9.60,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --172.80,-9.60,1.00,0.00,1.00 --172.80,-14.40,1.00,0.00,1.00 --172.80,-19.20,1.00,0.00,1.00 --168.00,-24.00,1.00,0.00,1.00 --168.00,-28.80,1.00,0.00,1.00 --163.20,-33.60,1.00,0.00,1.00 --158.40,-38.40,1.00,0.00,1.00 --158.40,-38.40,1.00,0.00,1.00 --153.60,-43.20,1.00,0.00,1.00 --148.80,-48.00,1.00,0.00,1.00 --144.00,-52.80,1.00,0.00,1.00 --139.20,-57.60,1.00,0.00,1.00 --134.40,-57.60,1.00,0.00,1.00 --124.80,-62.40,1.00,0.00,1.00 --115.20,-62.40,1.00,0.00,1.00 --105.60,-67.20,1.00,0.00,1.00 --91.20,-67.20,1.00,0.00,1.00 --81.60,-67.20,1.00,0.00,1.00 --72.00,-62.40,1.00,0.00,1.00 --62.40,-62.40,1.00,0.00,1.00 --52.80,-62.40,1.00,0.00,1.00 --43.20,-57.60,1.00,0.00,1.00 --38.40,-52.80,1.00,0.00,1.00 --33.60,-52.80,1.00,0.00,1.00 --28.80,-48.00,1.00,0.00,1.00 --24.00,-43.20,1.00,0.00,1.00 --19.20,-38.40,1.00,0.00,1.00 --19.20,-33.60,1.00,0.00,1.00 --14.40,-28.80,1.00,0.00,1.00 --14.40,-24.00,1.00,0.00,1.00 --9.60,-24.00,1.00,0.00,1.00 --9.60,-19.20,1.00,0.00,1.00 --4.80,-14.40,1.00,0.00,1.00 --4.80,-9.60,1.00,0.00,1.00 --0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -0.00,4.80,1.00,0.00,1.00 -4.80,9.60,1.00,0.00,1.00 -4.80,14.40,1.00,0.00,1.00 -9.60,14.40,1.00,0.00,1.00 -14.40,19.20,1.00,0.00,1.00 -14.40,24.00,1.00,0.00,1.00 -19.20,28.80,1.00,0.00,1.00 -19.20,33.60,1.00,0.00,1.00 -24.00,38.40,1.00,0.00,1.00 -28.80,38.40,1.00,0.00,1.00 -33.60,43.20,1.00,0.00,1.00 -38.40,48.00,1.00,0.00,1.00 -43.20,52.80,1.00,0.00,1.00 -48.00,52.80,1.00,0.00,1.00 -57.60,57.60,1.00,0.00,1.00 -62.40,57.60,1.00,0.00,1.00 -72.00,62.40,1.00,0.00,1.00 -81.60,62.40,1.00,0.00,1.00 -91.20,62.40,1.00,0.00,1.00 -100.80,62.40,1.00,0.00,1.00 -110.40,57.60,1.00,0.00,1.00 -120.00,57.60,1.00,0.00,1.00 -129.60,57.60,1.00,0.00,1.00 -134.40,52.80,1.00,0.00,1.00 -139.20,48.00,1.00,0.00,1.00 -144.00,48.00,1.00,0.00,1.00 -148.80,43.20,1.00,0.00,1.00 -153.60,38.40,1.00,0.00,1.00 -158.40,33.60,1.00,0.00,1.00 -158.40,28.80,1.00,0.00,1.00 -163.20,28.80,1.00,0.00,1.00 -168.00,24.00,1.00,0.00,1.00 -168.00,19.20,1.00,0.00,1.00 -172.80,14.40,1.00,0.00,1.00 -172.80,9.60,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --172.80,-9.60,1.00,0.00,1.00 --172.80,-14.40,1.00,0.00,1.00 --168.00,-19.20,1.00,0.00,1.00 --168.00,-24.00,1.00,0.00,1.00 --163.20,-28.80,1.00,0.00,1.00 --158.40,-28.80,1.00,0.00,1.00 --158.40,-33.60,1.00,0.00,1.00 --153.60,-38.40,1.00,0.00,1.00 --148.80,-43.20,1.00,0.00,1.00 --144.00,-48.00,1.00,0.00,1.00 --139.20,-48.00,1.00,0.00,1.00 --134.40,-52.80,1.00,0.00,1.00 --129.60,-57.60,1.00,0.00,1.00 --120.00,-57.60,1.00,0.00,1.00 --110.40,-57.60,1.00,0.00,1.00 --100.80,-62.40,1.00,0.00,1.00 --91.20,-62.40,1.00,0.00,1.00 --81.60,-62.40,1.00,0.00,1.00 --72.00,-62.40,1.00,0.00,1.00 --62.40,-57.60,1.00,0.00,1.00 --57.60,-57.60,1.00,0.00,1.00 --48.00,-52.80,1.00,0.00,1.00 --43.20,-52.80,1.00,0.00,1.00 --38.40,-48.00,1.00,0.00,1.00 --33.60,-43.20,1.00,0.00,1.00 --28.80,-38.40,1.00,0.00,1.00 --24.00,-38.40,1.00,0.00,1.00 --19.20,-33.60,1.00,0.00,1.00 --19.20,-28.80,1.00,0.00,1.00 --14.40,-24.00,1.00,0.00,1.00 --14.40,-19.20,1.00,0.00,1.00 --9.60,-14.40,1.00,0.00,1.00 --4.80,-14.40,1.00,0.00,1.00 --4.80,-9.60,1.00,0.00,1.00 --0.00,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 -4.80,9.60,1.00,0.00,1.00 -9.60,9.60,1.00,0.00,1.00 -9.60,14.40,1.00,0.00,1.00 -14.40,19.20,1.00,0.00,1.00 -19.20,24.00,1.00,0.00,1.00 -19.20,28.80,1.00,0.00,1.00 -24.00,28.80,1.00,0.00,1.00 -28.80,33.60,1.00,0.00,1.00 -33.60,38.40,1.00,0.00,1.00 -38.40,43.20,1.00,0.00,1.00 -43.20,43.20,1.00,0.00,1.00 -48.00,48.00,1.00,0.00,1.00 -52.80,48.00,1.00,0.00,1.00 -57.60,52.80,1.00,0.00,1.00 -67.20,52.80,1.00,0.00,1.00 -76.80,57.60,1.00,0.00,1.00 -81.60,57.60,1.00,0.00,1.00 -91.20,57.60,1.00,0.00,1.00 -100.80,57.60,1.00,0.00,1.00 -110.40,52.80,1.00,0.00,1.00 -115.20,52.80,1.00,0.00,1.00 -124.80,52.80,1.00,0.00,1.00 -129.60,48.00,1.00,0.00,1.00 -134.40,48.00,1.00,0.00,1.00 -139.20,43.20,1.00,0.00,1.00 -144.00,38.40,1.00,0.00,1.00 -148.80,38.40,1.00,0.00,1.00 -153.60,33.60,1.00,0.00,1.00 -158.40,28.80,1.00,0.00,1.00 -163.20,24.00,1.00,0.00,1.00 -163.20,24.00,1.00,0.00,1.00 -168.00,19.20,1.00,0.00,1.00 -172.80,14.40,1.00,0.00,1.00 -172.80,9.60,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --172.80,-9.60,1.00,0.00,1.00 --172.80,-14.40,1.00,0.00,1.00 --168.00,-19.20,1.00,0.00,1.00 --163.20,-24.00,1.00,0.00,1.00 --163.20,-24.00,1.00,0.00,1.00 --158.40,-28.80,1.00,0.00,1.00 --153.60,-33.60,1.00,0.00,1.00 --148.80,-38.40,1.00,0.00,1.00 --144.00,-38.40,1.00,0.00,1.00 --139.20,-43.20,1.00,0.00,1.00 --134.40,-48.00,1.00,0.00,1.00 --129.60,-48.00,1.00,0.00,1.00 --124.80,-52.80,1.00,0.00,1.00 --115.20,-52.80,1.00,0.00,1.00 --110.40,-52.80,1.00,0.00,1.00 --100.80,-57.60,1.00,0.00,1.00 --91.20,-57.60,1.00,0.00,1.00 --81.60,-57.60,1.00,0.00,1.00 --76.80,-57.60,1.00,0.00,1.00 --67.20,-52.80,1.00,0.00,1.00 --57.60,-52.80,1.00,0.00,1.00 --52.80,-48.00,1.00,0.00,1.00 --48.00,-48.00,1.00,0.00,1.00 --43.20,-43.20,1.00,0.00,1.00 --38.40,-43.20,1.00,0.00,1.00 --33.60,-38.40,1.00,0.00,1.00 --28.80,-33.60,1.00,0.00,1.00 --24.00,-28.80,1.00,0.00,1.00 --19.20,-28.80,1.00,0.00,1.00 --19.20,-24.00,1.00,0.00,1.00 --14.40,-19.20,1.00,0.00,1.00 --9.60,-14.40,1.00,0.00,1.00 --9.60,-9.60,1.00,0.00,1.00 --4.80,-9.60,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 -4.80,9.60,1.00,0.00,1.00 -9.60,9.60,1.00,0.00,1.00 -14.40,14.40,1.00,0.00,1.00 -14.40,19.20,1.00,0.00,1.00 -19.20,24.00,1.00,0.00,1.00 -24.00,24.00,1.00,0.00,1.00 -24.00,28.80,1.00,0.00,1.00 -28.80,33.60,1.00,0.00,1.00 -33.60,33.60,1.00,0.00,1.00 -38.40,38.40,1.00,0.00,1.00 -43.20,43.20,1.00,0.00,1.00 -48.00,43.20,1.00,0.00,1.00 -57.60,48.00,1.00,0.00,1.00 -62.40,48.00,1.00,0.00,1.00 -67.20,48.00,1.00,0.00,1.00 -76.80,52.80,1.00,0.00,1.00 -86.40,52.80,1.00,0.00,1.00 -91.20,52.80,1.00,0.00,1.00 -100.80,52.80,1.00,0.00,1.00 -105.60,48.00,1.00,0.00,1.00 -115.20,48.00,1.00,0.00,1.00 -120.00,48.00,1.00,0.00,1.00 -124.80,43.20,1.00,0.00,1.00 -134.40,43.20,1.00,0.00,1.00 -139.20,38.40,1.00,0.00,1.00 -144.00,38.40,1.00,0.00,1.00 -148.80,33.60,1.00,0.00,1.00 -153.60,28.80,1.00,0.00,1.00 -153.60,28.80,1.00,0.00,1.00 -158.40,24.00,1.00,0.00,1.00 -163.20,19.20,1.00,0.00,1.00 -168.00,14.40,1.00,0.00,1.00 -168.00,14.40,1.00,0.00,1.00 -172.80,9.60,1.00,0.00,1.00 -177.60,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --177.60,-4.80,1.00,0.00,1.00 --172.80,-9.60,1.00,0.00,1.00 --168.00,-14.40,1.00,0.00,1.00 --168.00,-14.40,1.00,0.00,1.00 --163.20,-19.20,1.00,0.00,1.00 --158.40,-24.00,1.00,0.00,1.00 --153.60,-28.80,1.00,0.00,1.00 --153.60,-28.80,1.00,0.00,1.00 --148.80,-33.60,1.00,0.00,1.00 --144.00,-38.40,1.00,0.00,1.00 --139.20,-38.40,1.00,0.00,1.00 --134.40,-43.20,1.00,0.00,1.00 --124.80,-43.20,1.00,0.00,1.00 --120.00,-48.00,1.00,0.00,1.00 --115.20,-48.00,1.00,0.00,1.00 --105.60,-48.00,1.00,0.00,1.00 --100.80,-52.80,1.00,0.00,1.00 --91.20,-52.80,1.00,0.00,1.00 --86.40,-52.80,1.00,0.00,1.00 --76.80,-52.80,1.00,0.00,1.00 --67.20,-48.00,1.00,0.00,1.00 --62.40,-48.00,1.00,0.00,1.00 --57.60,-48.00,1.00,0.00,1.00 --48.00,-43.20,1.00,0.00,1.00 --43.20,-43.20,1.00,0.00,1.00 --38.40,-38.40,1.00,0.00,1.00 --33.60,-33.60,1.00,0.00,1.00 --28.80,-33.60,1.00,0.00,1.00 --24.00,-28.80,1.00,0.00,1.00 --24.00,-24.00,1.00,0.00,1.00 --19.20,-24.00,1.00,0.00,1.00 --14.40,-19.20,1.00,0.00,1.00 --14.40,-14.40,1.00,0.00,1.00 --9.60,-9.60,1.00,0.00,1.00 --4.80,-9.60,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 -9.60,9.60,1.00,0.00,1.00 -14.40,14.40,1.00,0.00,1.00 -19.20,19.20,1.00,0.00,1.00 -19.20,19.20,1.00,0.00,1.00 -24.00,24.00,1.00,0.00,1.00 -28.80,28.80,1.00,0.00,1.00 -33.60,28.80,1.00,0.00,1.00 -38.40,33.60,1.00,0.00,1.00 -43.20,33.60,1.00,0.00,1.00 -48.00,38.40,1.00,0.00,1.00 -52.80,38.40,1.00,0.00,1.00 -57.60,43.20,1.00,0.00,1.00 -62.40,43.20,1.00,0.00,1.00 -72.00,43.20,1.00,0.00,1.00 -76.80,48.00,1.00,0.00,1.00 -86.40,48.00,1.00,0.00,1.00 -91.20,48.00,1.00,0.00,1.00 -100.80,48.00,1.00,0.00,1.00 -105.60,48.00,1.00,0.00,1.00 -110.40,43.20,1.00,0.00,1.00 -120.00,43.20,1.00,0.00,1.00 -124.80,43.20,1.00,0.00,1.00 -129.60,38.40,1.00,0.00,1.00 -134.40,38.40,1.00,0.00,1.00 -139.20,33.60,1.00,0.00,1.00 -144.00,33.60,1.00,0.00,1.00 -148.80,28.80,1.00,0.00,1.00 -153.60,24.00,1.00,0.00,1.00 -158.40,24.00,1.00,0.00,1.00 -163.20,19.20,1.00,0.00,1.00 -163.20,14.40,1.00,0.00,1.00 -168.00,14.40,1.00,0.00,1.00 -172.80,9.60,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --172.80,-4.80,1.00,0.00,1.00 --172.80,-9.60,1.00,0.00,1.00 --168.00,-14.40,1.00,0.00,1.00 --163.20,-14.40,1.00,0.00,1.00 --163.20,-19.20,1.00,0.00,1.00 --158.40,-24.00,1.00,0.00,1.00 --153.60,-24.00,1.00,0.00,1.00 --148.80,-28.80,1.00,0.00,1.00 --144.00,-33.60,1.00,0.00,1.00 --139.20,-33.60,1.00,0.00,1.00 --134.40,-38.40,1.00,0.00,1.00 --129.60,-38.40,1.00,0.00,1.00 --124.80,-43.20,1.00,0.00,1.00 --120.00,-43.20,1.00,0.00,1.00 --110.40,-43.20,1.00,0.00,1.00 --105.60,-48.00,1.00,0.00,1.00 --100.80,-48.00,1.00,0.00,1.00 --91.20,-48.00,1.00,0.00,1.00 --86.40,-48.00,1.00,0.00,1.00 --76.80,-48.00,1.00,0.00,1.00 --72.00,-43.20,1.00,0.00,1.00 --62.40,-43.20,1.00,0.00,1.00 --57.60,-43.20,1.00,0.00,1.00 --52.80,-38.40,1.00,0.00,1.00 --48.00,-38.40,1.00,0.00,1.00 --43.20,-33.60,1.00,0.00,1.00 --38.40,-33.60,1.00,0.00,1.00 --33.60,-28.80,1.00,0.00,1.00 --28.80,-28.80,1.00,0.00,1.00 --24.00,-24.00,1.00,0.00,1.00 --19.20,-19.20,1.00,0.00,1.00 --19.20,-19.20,1.00,0.00,1.00 --14.40,-14.40,1.00,0.00,1.00 --9.60,-9.60,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 -9.60,9.60,1.00,0.00,1.00 -14.40,14.40,1.00,0.00,1.00 -19.20,14.40,1.00,0.00,1.00 -24.00,19.20,1.00,0.00,1.00 -24.00,24.00,1.00,0.00,1.00 -28.80,24.00,1.00,0.00,1.00 -33.60,28.80,1.00,0.00,1.00 -38.40,28.80,1.00,0.00,1.00 -43.20,33.60,1.00,0.00,1.00 -48.00,33.60,1.00,0.00,1.00 -52.80,38.40,1.00,0.00,1.00 -62.40,38.40,1.00,0.00,1.00 -67.20,38.40,1.00,0.00,1.00 -72.00,38.40,1.00,0.00,1.00 -76.80,43.20,1.00,0.00,1.00 -86.40,43.20,1.00,0.00,1.00 -91.20,43.20,1.00,0.00,1.00 -96.00,43.20,1.00,0.00,1.00 -105.60,43.20,1.00,0.00,1.00 -110.40,38.40,1.00,0.00,1.00 -115.20,38.40,1.00,0.00,1.00 -120.00,38.40,1.00,0.00,1.00 -129.60,33.60,1.00,0.00,1.00 -134.40,33.60,1.00,0.00,1.00 -139.20,28.80,1.00,0.00,1.00 -144.00,28.80,1.00,0.00,1.00 -148.80,24.00,1.00,0.00,1.00 -153.60,24.00,1.00,0.00,1.00 -153.60,19.20,1.00,0.00,1.00 -158.40,19.20,1.00,0.00,1.00 -163.20,14.40,1.00,0.00,1.00 -168.00,9.60,1.00,0.00,1.00 -172.80,9.60,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --172.80,-4.80,1.00,0.00,1.00 --172.80,-9.60,1.00,0.00,1.00 --168.00,-9.60,1.00,0.00,1.00 --163.20,-14.40,1.00,0.00,1.00 --158.40,-19.20,1.00,0.00,1.00 --153.60,-19.20,1.00,0.00,1.00 --153.60,-24.00,1.00,0.00,1.00 --148.80,-24.00,1.00,0.00,1.00 --144.00,-28.80,1.00,0.00,1.00 --139.20,-28.80,1.00,0.00,1.00 --134.40,-33.60,1.00,0.00,1.00 --129.60,-33.60,1.00,0.00,1.00 --120.00,-38.40,1.00,0.00,1.00 --115.20,-38.40,1.00,0.00,1.00 --110.40,-38.40,1.00,0.00,1.00 --105.60,-43.20,1.00,0.00,1.00 --96.00,-43.20,1.00,0.00,1.00 --91.20,-43.20,1.00,0.00,1.00 --86.40,-43.20,1.00,0.00,1.00 --76.80,-43.20,1.00,0.00,1.00 --72.00,-38.40,1.00,0.00,1.00 --67.20,-38.40,1.00,0.00,1.00 --62.40,-38.40,1.00,0.00,1.00 --52.80,-38.40,1.00,0.00,1.00 --48.00,-33.60,1.00,0.00,1.00 --43.20,-33.60,1.00,0.00,1.00 --38.40,-28.80,1.00,0.00,1.00 --33.60,-28.80,1.00,0.00,1.00 --28.80,-24.00,1.00,0.00,1.00 --24.00,-24.00,1.00,0.00,1.00 --24.00,-19.20,1.00,0.00,1.00 --19.20,-14.40,1.00,0.00,1.00 --14.40,-14.40,1.00,0.00,1.00 --9.60,-9.60,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 -9.60,9.60,1.00,0.00,1.00 -14.40,9.60,1.00,0.00,1.00 -19.20,14.40,1.00,0.00,1.00 -24.00,19.20,1.00,0.00,1.00 -28.80,19.20,1.00,0.00,1.00 -33.60,24.00,1.00,0.00,1.00 -38.40,24.00,1.00,0.00,1.00 -43.20,28.80,1.00,0.00,1.00 -48.00,28.80,1.00,0.00,1.00 -52.80,28.80,1.00,0.00,1.00 -57.60,33.60,1.00,0.00,1.00 -62.40,33.60,1.00,0.00,1.00 -67.20,33.60,1.00,0.00,1.00 -72.00,38.40,1.00,0.00,1.00 -81.60,38.40,1.00,0.00,1.00 -86.40,38.40,1.00,0.00,1.00 -91.20,38.40,1.00,0.00,1.00 -96.00,38.40,1.00,0.00,1.00 -105.60,38.40,1.00,0.00,1.00 -110.40,33.60,1.00,0.00,1.00 -115.20,33.60,1.00,0.00,1.00 -120.00,33.60,1.00,0.00,1.00 -124.80,33.60,1.00,0.00,1.00 -129.60,28.80,1.00,0.00,1.00 -134.40,28.80,1.00,0.00,1.00 -139.20,24.00,1.00,0.00,1.00 -144.00,24.00,1.00,0.00,1.00 -148.80,19.20,1.00,0.00,1.00 -153.60,19.20,1.00,0.00,1.00 -158.40,14.40,1.00,0.00,1.00 -163.20,14.40,1.00,0.00,1.00 -168.00,9.60,1.00,0.00,1.00 -168.00,9.60,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --172.80,-4.80,1.00,0.00,1.00 --168.00,-9.60,1.00,0.00,1.00 --168.00,-9.60,1.00,0.00,1.00 --163.20,-14.40,1.00,0.00,1.00 --158.40,-14.40,1.00,0.00,1.00 --153.60,-19.20,1.00,0.00,1.00 --148.80,-19.20,1.00,0.00,1.00 --144.00,-24.00,1.00,0.00,1.00 --139.20,-24.00,1.00,0.00,1.00 --134.40,-28.80,1.00,0.00,1.00 --129.60,-28.80,1.00,0.00,1.00 --124.80,-33.60,1.00,0.00,1.00 --120.00,-33.60,1.00,0.00,1.00 --115.20,-33.60,1.00,0.00,1.00 --110.40,-33.60,1.00,0.00,1.00 --105.60,-38.40,1.00,0.00,1.00 --96.00,-38.40,1.00,0.00,1.00 --91.20,-38.40,1.00,0.00,1.00 --86.40,-38.40,1.00,0.00,1.00 --81.60,-38.40,1.00,0.00,1.00 --72.00,-38.40,1.00,0.00,1.00 --67.20,-33.60,1.00,0.00,1.00 --62.40,-33.60,1.00,0.00,1.00 --57.60,-33.60,1.00,0.00,1.00 --52.80,-28.80,1.00,0.00,1.00 --48.00,-28.80,1.00,0.00,1.00 --43.20,-28.80,1.00,0.00,1.00 --38.40,-24.00,1.00,0.00,1.00 --33.60,-24.00,1.00,0.00,1.00 --28.80,-19.20,1.00,0.00,1.00 --24.00,-19.20,1.00,0.00,1.00 --19.20,-14.40,1.00,0.00,1.00 --14.40,-9.60,1.00,0.00,1.00 --9.60,-9.60,1.00,0.00,1.00 --9.60,-4.80,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,4.80,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 -14.40,9.60,1.00,0.00,1.00 -14.40,9.60,1.00,0.00,1.00 -19.20,14.40,1.00,0.00,1.00 -24.00,14.40,1.00,0.00,1.00 -28.80,19.20,1.00,0.00,1.00 -33.60,19.20,1.00,0.00,1.00 -38.40,19.20,1.00,0.00,1.00 -43.20,24.00,1.00,0.00,1.00 -48.00,24.00,1.00,0.00,1.00 -52.80,28.80,1.00,0.00,1.00 -57.60,28.80,1.00,0.00,1.00 -62.40,28.80,1.00,0.00,1.00 -67.20,28.80,1.00,0.00,1.00 -76.80,33.60,1.00,0.00,1.00 -81.60,33.60,1.00,0.00,1.00 -86.40,33.60,1.00,0.00,1.00 -91.20,33.60,1.00,0.00,1.00 -96.00,33.60,1.00,0.00,1.00 -100.80,33.60,1.00,0.00,1.00 -110.40,28.80,1.00,0.00,1.00 -115.20,28.80,1.00,0.00,1.00 -120.00,28.80,1.00,0.00,1.00 -124.80,28.80,1.00,0.00,1.00 -129.60,24.00,1.00,0.00,1.00 -134.40,24.00,1.00,0.00,1.00 -139.20,24.00,1.00,0.00,1.00 -144.00,19.20,1.00,0.00,1.00 -148.80,19.20,1.00,0.00,1.00 -153.60,14.40,1.00,0.00,1.00 -158.40,14.40,1.00,0.00,1.00 -163.20,9.60,1.00,0.00,1.00 -168.00,9.60,1.00,0.00,1.00 -168.00,4.80,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --172.80,-4.80,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 --168.00,-9.60,1.00,0.00,1.00 --163.20,-9.60,1.00,0.00,1.00 --158.40,-14.40,1.00,0.00,1.00 --153.60,-14.40,1.00,0.00,1.00 --148.80,-19.20,1.00,0.00,1.00 --144.00,-19.20,1.00,0.00,1.00 --139.20,-24.00,1.00,0.00,1.00 --134.40,-24.00,1.00,0.00,1.00 --129.60,-24.00,1.00,0.00,1.00 --124.80,-28.80,1.00,0.00,1.00 --120.00,-28.80,1.00,0.00,1.00 --115.20,-28.80,1.00,0.00,1.00 --110.40,-28.80,1.00,0.00,1.00 --100.80,-33.60,1.00,0.00,1.00 --96.00,-33.60,1.00,0.00,1.00 --91.20,-33.60,1.00,0.00,1.00 --86.40,-33.60,1.00,0.00,1.00 --81.60,-33.60,1.00,0.00,1.00 --76.80,-33.60,1.00,0.00,1.00 --67.20,-28.80,1.00,0.00,1.00 --62.40,-28.80,1.00,0.00,1.00 --57.60,-28.80,1.00,0.00,1.00 --52.80,-28.80,1.00,0.00,1.00 --48.00,-24.00,1.00,0.00,1.00 --43.20,-24.00,1.00,0.00,1.00 --38.40,-19.20,1.00,0.00,1.00 --33.60,-19.20,1.00,0.00,1.00 --28.80,-19.20,1.00,0.00,1.00 --24.00,-14.40,1.00,0.00,1.00 --19.20,-14.40,1.00,0.00,1.00 --14.40,-9.60,1.00,0.00,1.00 --14.40,-9.60,1.00,0.00,1.00 --9.60,-4.80,1.00,0.00,1.00 --4.80,-4.80,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 -14.40,4.80,1.00,0.00,1.00 -19.20,9.60,1.00,0.00,1.00 -19.20,9.60,1.00,0.00,1.00 -24.00,14.40,1.00,0.00,1.00 -28.80,14.40,1.00,0.00,1.00 -33.60,14.40,1.00,0.00,1.00 -38.40,19.20,1.00,0.00,1.00 -43.20,19.20,1.00,0.00,1.00 -48.00,24.00,1.00,0.00,1.00 -52.80,24.00,1.00,0.00,1.00 -57.60,24.00,1.00,0.00,1.00 -62.40,24.00,1.00,0.00,1.00 -72.00,24.00,1.00,0.00,1.00 -76.80,28.80,1.00,0.00,1.00 -81.60,28.80,1.00,0.00,1.00 -86.40,28.80,1.00,0.00,1.00 -91.20,28.80,1.00,0.00,1.00 -96.00,28.80,1.00,0.00,1.00 -100.80,28.80,1.00,0.00,1.00 -105.60,28.80,1.00,0.00,1.00 -110.40,24.00,1.00,0.00,1.00 -120.00,24.00,1.00,0.00,1.00 -124.80,24.00,1.00,0.00,1.00 -129.60,24.00,1.00,0.00,1.00 -134.40,19.20,1.00,0.00,1.00 -139.20,19.20,1.00,0.00,1.00 -144.00,19.20,1.00,0.00,1.00 -148.80,14.40,1.00,0.00,1.00 -153.60,14.40,1.00,0.00,1.00 -158.40,9.60,1.00,0.00,1.00 -158.40,9.60,1.00,0.00,1.00 -163.20,9.60,1.00,0.00,1.00 -168.00,4.80,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --172.80,-4.80,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 --163.20,-9.60,1.00,0.00,1.00 --158.40,-9.60,1.00,0.00,1.00 --158.40,-9.60,1.00,0.00,1.00 --153.60,-14.40,1.00,0.00,1.00 --148.80,-14.40,1.00,0.00,1.00 --144.00,-19.20,1.00,0.00,1.00 --139.20,-19.20,1.00,0.00,1.00 --134.40,-19.20,1.00,0.00,1.00 --129.60,-24.00,1.00,0.00,1.00 --124.80,-24.00,1.00,0.00,1.00 --120.00,-24.00,1.00,0.00,1.00 --110.40,-24.00,1.00,0.00,1.00 --105.60,-28.80,1.00,0.00,1.00 --100.80,-28.80,1.00,0.00,1.00 --96.00,-28.80,1.00,0.00,1.00 --91.20,-28.80,1.00,0.00,1.00 --86.40,-28.80,1.00,0.00,1.00 --81.60,-28.80,1.00,0.00,1.00 --76.80,-28.80,1.00,0.00,1.00 --72.00,-24.00,1.00,0.00,1.00 --62.40,-24.00,1.00,0.00,1.00 --57.60,-24.00,1.00,0.00,1.00 --52.80,-24.00,1.00,0.00,1.00 --48.00,-24.00,1.00,0.00,1.00 --43.20,-19.20,1.00,0.00,1.00 --38.40,-19.20,1.00,0.00,1.00 --33.60,-14.40,1.00,0.00,1.00 --28.80,-14.40,1.00,0.00,1.00 --24.00,-14.40,1.00,0.00,1.00 --19.20,-9.60,1.00,0.00,1.00 --19.20,-9.60,1.00,0.00,1.00 --14.40,-4.80,1.00,0.00,1.00 --9.60,-4.80,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 -14.40,4.80,1.00,0.00,1.00 -19.20,9.60,1.00,0.00,1.00 -24.00,9.60,1.00,0.00,1.00 -28.80,9.60,1.00,0.00,1.00 -33.60,14.40,1.00,0.00,1.00 -38.40,14.40,1.00,0.00,1.00 -43.20,14.40,1.00,0.00,1.00 -48.00,14.40,1.00,0.00,1.00 -52.80,19.20,1.00,0.00,1.00 -57.60,19.20,1.00,0.00,1.00 -62.40,19.20,1.00,0.00,1.00 -67.20,19.20,1.00,0.00,1.00 -72.00,24.00,1.00,0.00,1.00 -76.80,24.00,1.00,0.00,1.00 -81.60,24.00,1.00,0.00,1.00 -86.40,24.00,1.00,0.00,1.00 -91.20,24.00,1.00,0.00,1.00 -96.00,24.00,1.00,0.00,1.00 -100.80,24.00,1.00,0.00,1.00 -105.60,24.00,1.00,0.00,1.00 -110.40,19.20,1.00,0.00,1.00 -115.20,19.20,1.00,0.00,1.00 -120.00,19.20,1.00,0.00,1.00 -124.80,19.20,1.00,0.00,1.00 -129.60,19.20,1.00,0.00,1.00 -134.40,14.40,1.00,0.00,1.00 -139.20,14.40,1.00,0.00,1.00 -144.00,14.40,1.00,0.00,1.00 -148.80,9.60,1.00,0.00,1.00 -153.60,9.60,1.00,0.00,1.00 -158.40,9.60,1.00,0.00,1.00 -163.20,4.80,1.00,0.00,1.00 -168.00,4.80,1.00,0.00,1.00 -172.80,4.80,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --172.80,-4.80,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 --163.20,-4.80,1.00,0.00,1.00 --158.40,-9.60,1.00,0.00,1.00 --153.60,-9.60,1.00,0.00,1.00 --148.80,-9.60,1.00,0.00,1.00 --144.00,-14.40,1.00,0.00,1.00 --139.20,-14.40,1.00,0.00,1.00 --134.40,-14.40,1.00,0.00,1.00 --129.60,-19.20,1.00,0.00,1.00 --124.80,-19.20,1.00,0.00,1.00 --120.00,-19.20,1.00,0.00,1.00 --115.20,-19.20,1.00,0.00,1.00 --110.40,-19.20,1.00,0.00,1.00 --105.60,-24.00,1.00,0.00,1.00 --100.80,-24.00,1.00,0.00,1.00 --96.00,-24.00,1.00,0.00,1.00 --91.20,-24.00,1.00,0.00,1.00 --86.40,-24.00,1.00,0.00,1.00 --81.60,-24.00,1.00,0.00,1.00 --76.80,-24.00,1.00,0.00,1.00 --72.00,-24.00,1.00,0.00,1.00 --67.20,-19.20,1.00,0.00,1.00 --62.40,-19.20,1.00,0.00,1.00 --57.60,-19.20,1.00,0.00,1.00 --52.80,-19.20,1.00,0.00,1.00 --48.00,-14.40,1.00,0.00,1.00 --43.20,-14.40,1.00,0.00,1.00 --38.40,-14.40,1.00,0.00,1.00 --33.60,-14.40,1.00,0.00,1.00 --28.80,-9.60,1.00,0.00,1.00 --24.00,-9.60,1.00,0.00,1.00 --19.20,-9.60,1.00,0.00,1.00 --14.40,-4.80,1.00,0.00,1.00 --9.60,-4.80,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 -9.60,4.80,1.00,0.00,1.00 -14.40,4.80,1.00,0.00,1.00 -19.20,4.80,1.00,0.00,1.00 -24.00,9.60,1.00,0.00,1.00 -28.80,9.60,1.00,0.00,1.00 -33.60,9.60,1.00,0.00,1.00 -38.40,9.60,1.00,0.00,1.00 -43.20,14.40,1.00,0.00,1.00 -48.00,14.40,1.00,0.00,1.00 -52.80,14.40,1.00,0.00,1.00 -57.60,14.40,1.00,0.00,1.00 -62.40,14.40,1.00,0.00,1.00 -67.20,14.40,1.00,0.00,1.00 -72.00,19.20,1.00,0.00,1.00 -76.80,19.20,1.00,0.00,1.00 -81.60,19.20,1.00,0.00,1.00 -86.40,19.20,1.00,0.00,1.00 -91.20,19.20,1.00,0.00,1.00 -96.00,19.20,1.00,0.00,1.00 -100.80,19.20,1.00,0.00,1.00 -105.60,19.20,1.00,0.00,1.00 -110.40,19.20,1.00,0.00,1.00 -115.20,14.40,1.00,0.00,1.00 -120.00,14.40,1.00,0.00,1.00 -124.80,14.40,1.00,0.00,1.00 -129.60,14.40,1.00,0.00,1.00 -134.40,14.40,1.00,0.00,1.00 -139.20,9.60,1.00,0.00,1.00 -144.00,9.60,1.00,0.00,1.00 -148.80,9.60,1.00,0.00,1.00 -153.60,9.60,1.00,0.00,1.00 -158.40,4.80,1.00,0.00,1.00 -163.20,4.80,1.00,0.00,1.00 -168.00,4.80,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --172.80,-0.00,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 --163.20,-4.80,1.00,0.00,1.00 --158.40,-4.80,1.00,0.00,1.00 --153.60,-9.60,1.00,0.00,1.00 --148.80,-9.60,1.00,0.00,1.00 --144.00,-9.60,1.00,0.00,1.00 --139.20,-9.60,1.00,0.00,1.00 --134.40,-14.40,1.00,0.00,1.00 --129.60,-14.40,1.00,0.00,1.00 --124.80,-14.40,1.00,0.00,1.00 --120.00,-14.40,1.00,0.00,1.00 --115.20,-14.40,1.00,0.00,1.00 --110.40,-19.20,1.00,0.00,1.00 --105.60,-19.20,1.00,0.00,1.00 --100.80,-19.20,1.00,0.00,1.00 --96.00,-19.20,1.00,0.00,1.00 --91.20,-19.20,1.00,0.00,1.00 --86.40,-19.20,1.00,0.00,1.00 --81.60,-19.20,1.00,0.00,1.00 --76.80,-19.20,1.00,0.00,1.00 --72.00,-19.20,1.00,0.00,1.00 --67.20,-14.40,1.00,0.00,1.00 --62.40,-14.40,1.00,0.00,1.00 --57.60,-14.40,1.00,0.00,1.00 --52.80,-14.40,1.00,0.00,1.00 --48.00,-14.40,1.00,0.00,1.00 --43.20,-14.40,1.00,0.00,1.00 --38.40,-9.60,1.00,0.00,1.00 --33.60,-9.60,1.00,0.00,1.00 --28.80,-9.60,1.00,0.00,1.00 --24.00,-9.60,1.00,0.00,1.00 --19.20,-4.80,1.00,0.00,1.00 --14.40,-4.80,1.00,0.00,1.00 --9.60,-4.80,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 -9.60,0.00,1.00,0.00,1.00 -14.40,4.80,1.00,0.00,1.00 -19.20,4.80,1.00,0.00,1.00 -24.00,4.80,1.00,0.00,1.00 -28.80,4.80,1.00,0.00,1.00 -33.60,9.60,1.00,0.00,1.00 -38.40,9.60,1.00,0.00,1.00 -43.20,9.60,1.00,0.00,1.00 -48.00,9.60,1.00,0.00,1.00 -52.80,9.60,1.00,0.00,1.00 -57.60,9.60,1.00,0.00,1.00 -62.40,9.60,1.00,0.00,1.00 -67.20,14.40,1.00,0.00,1.00 -72.00,14.40,1.00,0.00,1.00 -76.80,14.40,1.00,0.00,1.00 -81.60,14.40,1.00,0.00,1.00 -86.40,14.40,1.00,0.00,1.00 -91.20,14.40,1.00,0.00,1.00 -96.00,14.40,1.00,0.00,1.00 -100.80,14.40,1.00,0.00,1.00 -105.60,14.40,1.00,0.00,1.00 -110.40,14.40,1.00,0.00,1.00 -115.20,9.60,1.00,0.00,1.00 -120.00,9.60,1.00,0.00,1.00 -124.80,9.60,1.00,0.00,1.00 -129.60,9.60,1.00,0.00,1.00 -134.40,9.60,1.00,0.00,1.00 -139.20,9.60,1.00,0.00,1.00 -144.00,9.60,1.00,0.00,1.00 -148.80,4.80,1.00,0.00,1.00 -153.60,4.80,1.00,0.00,1.00 -158.40,4.80,1.00,0.00,1.00 -163.20,4.80,1.00,0.00,1.00 -168.00,4.80,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --172.80,-0.00,1.00,0.00,1.00 --168.00,-4.80,1.00,0.00,1.00 --163.20,-4.80,1.00,0.00,1.00 --158.40,-4.80,1.00,0.00,1.00 --153.60,-4.80,1.00,0.00,1.00 --148.80,-4.80,1.00,0.00,1.00 --144.00,-9.60,1.00,0.00,1.00 --139.20,-9.60,1.00,0.00,1.00 --134.40,-9.60,1.00,0.00,1.00 --129.60,-9.60,1.00,0.00,1.00 --124.80,-9.60,1.00,0.00,1.00 --120.00,-9.60,1.00,0.00,1.00 --115.20,-9.60,1.00,0.00,1.00 --110.40,-14.40,1.00,0.00,1.00 --105.60,-14.40,1.00,0.00,1.00 --100.80,-14.40,1.00,0.00,1.00 --96.00,-14.40,1.00,0.00,1.00 --91.20,-14.40,1.00,0.00,1.00 --86.40,-14.40,1.00,0.00,1.00 --81.60,-14.40,1.00,0.00,1.00 --76.80,-14.40,1.00,0.00,1.00 --72.00,-14.40,1.00,0.00,1.00 --67.20,-14.40,1.00,0.00,1.00 --62.40,-9.60,1.00,0.00,1.00 --57.60,-9.60,1.00,0.00,1.00 --52.80,-9.60,1.00,0.00,1.00 --48.00,-9.60,1.00,0.00,1.00 --43.20,-9.60,1.00,0.00,1.00 --38.40,-9.60,1.00,0.00,1.00 --33.60,-9.60,1.00,0.00,1.00 --28.80,-4.80,1.00,0.00,1.00 --24.00,-4.80,1.00,0.00,1.00 --19.20,-4.80,1.00,0.00,1.00 --14.40,-4.80,1.00,0.00,1.00 --9.60,-0.00,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 -9.60,0.00,1.00,0.00,1.00 -14.40,0.00,1.00,0.00,1.00 -19.20,4.80,1.00,0.00,1.00 -24.00,4.80,1.00,0.00,1.00 -28.80,4.80,1.00,0.00,1.00 -33.60,4.80,1.00,0.00,1.00 -38.40,4.80,1.00,0.00,1.00 -43.20,4.80,1.00,0.00,1.00 -48.00,4.80,1.00,0.00,1.00 -52.80,4.80,1.00,0.00,1.00 -57.60,4.80,1.00,0.00,1.00 -62.40,9.60,1.00,0.00,1.00 -67.20,9.60,1.00,0.00,1.00 -72.00,9.60,1.00,0.00,1.00 -76.80,9.60,1.00,0.00,1.00 -81.60,9.60,1.00,0.00,1.00 -86.40,9.60,1.00,0.00,1.00 -91.20,9.60,1.00,0.00,1.00 -96.00,9.60,1.00,0.00,1.00 -100.80,9.60,1.00,0.00,1.00 -105.60,9.60,1.00,0.00,1.00 -110.40,9.60,1.00,0.00,1.00 -115.20,9.60,1.00,0.00,1.00 -120.00,9.60,1.00,0.00,1.00 -124.80,4.80,1.00,0.00,1.00 -129.60,4.80,1.00,0.00,1.00 -134.40,4.80,1.00,0.00,1.00 -139.20,4.80,1.00,0.00,1.00 -144.00,4.80,1.00,0.00,1.00 -148.80,4.80,1.00,0.00,1.00 -153.60,4.80,1.00,0.00,1.00 -158.40,4.80,1.00,0.00,1.00 -163.20,4.80,1.00,0.00,1.00 -168.00,0.00,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --172.80,-0.00,1.00,0.00,1.00 --168.00,-0.00,1.00,0.00,1.00 --163.20,-4.80,1.00,0.00,1.00 --158.40,-4.80,1.00,0.00,1.00 --153.60,-4.80,1.00,0.00,1.00 --148.80,-4.80,1.00,0.00,1.00 --144.00,-4.80,1.00,0.00,1.00 --139.20,-4.80,1.00,0.00,1.00 --134.40,-4.80,1.00,0.00,1.00 --129.60,-4.80,1.00,0.00,1.00 --124.80,-4.80,1.00,0.00,1.00 --120.00,-9.60,1.00,0.00,1.00 --115.20,-9.60,1.00,0.00,1.00 --110.40,-9.60,1.00,0.00,1.00 --105.60,-9.60,1.00,0.00,1.00 --100.80,-9.60,1.00,0.00,1.00 --96.00,-9.60,1.00,0.00,1.00 --91.20,-9.60,1.00,0.00,1.00 --86.40,-9.60,1.00,0.00,1.00 --81.60,-9.60,1.00,0.00,1.00 --76.80,-9.60,1.00,0.00,1.00 --72.00,-9.60,1.00,0.00,1.00 --67.20,-9.60,1.00,0.00,1.00 --62.40,-9.60,1.00,0.00,1.00 --57.60,-4.80,1.00,0.00,1.00 --52.80,-4.80,1.00,0.00,1.00 --48.00,-4.80,1.00,0.00,1.00 --43.20,-4.80,1.00,0.00,1.00 --38.40,-4.80,1.00,0.00,1.00 --33.60,-4.80,1.00,0.00,1.00 --28.80,-4.80,1.00,0.00,1.00 --24.00,-4.80,1.00,0.00,1.00 --19.20,-4.80,1.00,0.00,1.00 --14.40,-0.00,1.00,0.00,1.00 --9.60,-0.00,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,0.00,1.00,0.00,1.00 -9.60,0.00,1.00,0.00,1.00 -14.40,0.00,1.00,0.00,1.00 -19.20,0.00,1.00,0.00,1.00 -24.00,0.00,1.00,0.00,1.00 -28.80,0.00,1.00,0.00,1.00 -33.60,0.00,1.00,0.00,1.00 -38.40,0.00,1.00,0.00,1.00 -43.20,4.80,1.00,0.00,1.00 -48.00,4.80,1.00,0.00,1.00 -52.80,4.80,1.00,0.00,1.00 -57.60,4.80,1.00,0.00,1.00 -62.40,4.80,1.00,0.00,1.00 -67.20,4.80,1.00,0.00,1.00 -72.00,4.80,1.00,0.00,1.00 -76.80,4.80,1.00,0.00,1.00 -81.60,4.80,1.00,0.00,1.00 -86.40,4.80,1.00,0.00,1.00 -91.20,4.80,1.00,0.00,1.00 -96.00,4.80,1.00,0.00,1.00 -100.80,4.80,1.00,0.00,1.00 -105.60,4.80,1.00,0.00,1.00 -110.40,4.80,1.00,0.00,1.00 -115.20,4.80,1.00,0.00,1.00 -120.00,4.80,1.00,0.00,1.00 -124.80,4.80,1.00,0.00,1.00 -129.60,4.80,1.00,0.00,1.00 -134.40,4.80,1.00,0.00,1.00 -139.20,0.00,1.00,0.00,1.00 -144.00,0.00,1.00,0.00,1.00 -148.80,0.00,1.00,0.00,1.00 -153.60,0.00,1.00,0.00,1.00 -158.40,0.00,1.00,0.00,1.00 -163.20,0.00,1.00,0.00,1.00 -168.00,0.00,1.00,0.00,1.00 -172.80,0.00,1.00,0.00,1.00 -177.60,0.00,1.00,0.00,1.00 --177.60,-0.00,1.00,0.00,1.00 --172.80,-0.00,1.00,0.00,1.00 --168.00,-0.00,1.00,0.00,1.00 --163.20,-0.00,1.00,0.00,1.00 --158.40,-0.00,1.00,0.00,1.00 --153.60,-0.00,1.00,0.00,1.00 --148.80,-0.00,1.00,0.00,1.00 --144.00,-0.00,1.00,0.00,1.00 --139.20,-0.00,1.00,0.00,1.00 --134.40,-4.80,1.00,0.00,1.00 --129.60,-4.80,1.00,0.00,1.00 --124.80,-4.80,1.00,0.00,1.00 --120.00,-4.80,1.00,0.00,1.00 --115.20,-4.80,1.00,0.00,1.00 --110.40,-4.80,1.00,0.00,1.00 --105.60,-4.80,1.00,0.00,1.00 --100.80,-4.80,1.00,0.00,1.00 --96.00,-4.80,1.00,0.00,1.00 --91.20,-4.80,1.00,0.00,1.00 --86.40,-4.80,1.00,0.00,1.00 --81.60,-4.80,1.00,0.00,1.00 --76.80,-4.80,1.00,0.00,1.00 --72.00,-4.80,1.00,0.00,1.00 --67.20,-4.80,1.00,0.00,1.00 --62.40,-4.80,1.00,0.00,1.00 --57.60,-4.80,1.00,0.00,1.00 --52.80,-4.80,1.00,0.00,1.00 --48.00,-4.80,1.00,0.00,1.00 --43.20,-4.80,1.00,0.00,1.00 --38.40,-0.00,1.00,0.00,1.00 --33.60,-0.00,1.00,0.00,1.00 --28.80,-0.00,1.00,0.00,1.00 --24.00,-0.00,1.00,0.00,1.00 --19.20,-0.00,1.00,0.00,1.00 --14.40,-0.00,1.00,0.00,1.00 --9.60,-0.00,1.00,0.00,1.00 --4.80,-0.00,1.00,0.00,1.00 -0.00,0.00,1.00,0.00,1.00 -4.80,-0.00,1.00,0.00,1.00 -9.60,-0.00,1.00,0.00,1.00 -14.40,-0.00,1.00,0.00,1.00 -19.20,-0.00,1.00,0.00,1.00 -24.00,-0.00,1.00,0.00,1.00 -28.80,-0.00,1.00,0.00,1.00 -33.60,-0.00,1.00,0.00,1.00 -38.40,-0.00,1.00,0.00,1.00 -43.20,-0.00,1.00,0.00,1.00 -48.00,-0.00,1.00,0.00,1.00 -52.80,-0.00,1.00,0.00,1.00 -57.60,-0.00,1.00,0.00,1.00 -62.40,-0.00,1.00,0.00,1.00 -67.20,-0.00,1.00,0.00,1.00 -72.00,-0.00,1.00,0.00,1.00 -76.80,-0.00,1.00,0.00,1.00 -81.60,-0.00,1.00,0.00,1.00 -86.40,-0.00,1.00,0.00,1.00 -91.20,-0.00,1.00,0.00,1.00 -96.00,-0.00,1.00,0.00,1.00 -100.80,-0.00,1.00,0.00,1.00 -105.60,-0.00,1.00,0.00,1.00 -110.40,-0.00,1.00,0.00,1.00 -115.20,-0.00,1.00,0.00,1.00 -120.00,-0.00,1.00,0.00,1.00 -124.80,-0.00,1.00,0.00,1.00 -129.60,-0.00,1.00,0.00,1.00 -134.40,-0.00,1.00,0.00,1.00 -139.20,-0.00,1.00,0.00,1.00 -144.00,-0.00,1.00,0.00,1.00 -148.80,-0.00,1.00,0.00,1.00 -153.60,-0.00,1.00,0.00,1.00 -158.40,-0.00,1.00,0.00,1.00 -163.20,-0.00,1.00,0.00,1.00 -168.00,-0.00,1.00,0.00,1.00 -172.80,-0.00,1.00,0.00,1.00 -177.60,-0.00,1.00,0.00,1.00 --177.60,0.00,1.00,0.00,1.00 --172.80,0.00,1.00,0.00,1.00 --168.00,0.00,1.00,0.00,1.00 --163.20,0.00,1.00,0.00,1.00 --158.40,0.00,1.00,0.00,1.00 --153.60,0.00,1.00,0.00,1.00 --148.80,0.00,1.00,0.00,1.00 --144.00,0.00,1.00,0.00,1.00 --139.20,0.00,1.00,0.00,1.00 --134.40,0.00,1.00,0.00,1.00 --129.60,0.00,1.00,0.00,1.00 --124.80,0.00,1.00,0.00,1.00 --120.00,0.00,1.00,0.00,1.00 --115.20,0.00,1.00,0.00,1.00 --110.40,0.00,1.00,0.00,1.00 --105.60,0.00,1.00,0.00,1.00 --100.80,0.00,1.00,0.00,1.00 --96.00,0.00,1.00,0.00,1.00 --91.20,0.00,1.00,0.00,1.00 --86.40,0.00,1.00,0.00,1.00 --81.60,0.00,1.00,0.00,1.00 --76.80,0.00,1.00,0.00,1.00 --72.00,0.00,1.00,0.00,1.00 --67.20,0.00,1.00,0.00,1.00 --62.40,0.00,1.00,0.00,1.00 --57.60,0.00,1.00,0.00,1.00 --52.80,0.00,1.00,0.00,1.00 --48.00,0.00,1.00,0.00,1.00 --43.20,0.00,1.00,0.00,1.00 --38.40,0.00,1.00,0.00,1.00 --33.60,0.00,1.00,0.00,1.00 --28.80,0.00,1.00,0.00,1.00 --24.00,0.00,1.00,0.00,1.00 --19.20,0.00,1.00,0.00,1.00 --14.40,0.00,1.00,0.00,1.00 --9.60,0.00,1.00,0.00,1.00 --4.80,0.00,1.00,0.00,1.00 +-0.00,0.00,0.00,0.00,1.00,0.00,4.80 +-0.00,4.80,0.06,0.00,1.00,4.80,9.60 +-0.00,9.60,0.13,0.00,1.00,9.60,14.40 +-0.00,14.40,0.19,0.00,1.00,14.40,19.20 +-0.00,19.20,0.26,0.00,1.00,19.20,24.00 +-0.00,24.00,0.32,0.00,1.00,24.00,28.80 +-0.00,28.80,0.39,0.00,1.00,28.80,33.60 +-0.00,33.60,0.45,0.00,1.00,33.60,38.40 +-0.00,38.40,0.51,0.00,1.00,38.40,43.20 +-0.00,43.20,0.58,0.00,1.00,43.20,48.00 +-0.00,48.00,0.64,0.00,1.00,48.00,52.80 +-0.00,52.80,0.71,0.00,1.00,52.80,57.60 +-0.00,57.60,0.77,0.00,1.00,57.60,62.40 +-0.00,62.40,0.84,0.00,1.00,62.40,67.20 +-0.00,67.20,0.90,0.00,1.00,67.20,72.00 +-0.00,72.00,0.96,0.00,1.00,72.00,76.80 +-0.00,76.80,1.03,0.00,1.00,76.80,81.60 +-0.00,81.60,1.09,0.00,1.00,81.60,86.40 +-0.00,86.40,1.16,0.00,1.00,86.40,86.40 +-177.60,89.20,1.22,0.00,1.00,91.20,81.60 +-177.60,86.40,1.29,0.00,1.00,96.00,76.80 +-177.60,81.60,1.35,0.00,1.00,100.80,72.00 +-177.60,76.80,1.41,0.00,1.00,105.60,67.20 +-177.60,72.00,1.48,0.00,1.00,110.40,62.40 +-177.60,67.20,1.54,0.00,1.00,115.20,57.60 +177.60,62.40,1.61,0.00,1.00,120.00,52.80 +177.60,57.60,1.67,0.00,1.00,124.80,48.00 +177.60,52.80,1.73,0.00,1.00,129.60,43.20 +177.60,48.00,1.80,0.00,1.00,134.40,38.40 +177.60,43.20,1.86,0.00,1.00,139.20,33.60 +177.60,38.40,1.93,0.00,1.00,144.00,28.80 +177.60,33.60,1.99,0.00,1.00,148.80,24.00 +177.60,28.80,2.06,0.00,1.00,153.60,19.20 +177.60,24.00,2.12,0.00,1.00,158.40,14.40 +177.60,19.20,2.18,0.00,1.00,163.20,9.60 +177.60,14.40,2.25,0.00,1.00,168.00,4.80 +177.60,9.60,2.31,0.00,1.00,172.80,0.00 +177.60,4.80,2.38,0.00,1.00,177.60,-0.00 +-177.60,-0.00,2.44,0.00,1.00,-177.60,-4.80 +-177.60,-4.80,2.51,0.00,1.00,-172.80,-9.60 +-177.60,-9.60,2.57,0.00,1.00,-168.00,-14.40 +-177.60,-14.40,2.63,0.00,1.00,-163.20,-19.20 +-177.60,-19.20,2.70,0.00,1.00,-158.40,-24.00 +-177.60,-24.00,2.76,0.00,1.00,-153.60,-28.80 +-177.60,-28.80,2.83,0.00,1.00,-148.80,-33.60 +-177.60,-33.60,2.89,0.00,1.00,-144.00,-38.40 +-177.60,-38.40,2.96,0.00,1.00,-139.20,-43.20 +-177.60,-48.00,3.02,0.00,1.00,-134.40,-48.00 +-177.60,-48.00,3.08,0.00,1.00,-129.60,-52.80 +-177.60,-52.80,3.15,0.00,1.00,-124.80,-57.60 +-177.60,-57.60,3.21,0.00,1.00,-120.00,-62.40 +177.60,-62.40,3.28,0.00,1.00,-115.20,-67.20 +177.60,-67.20,3.34,0.00,1.00,-110.40,-72.00 +177.60,-76.80,3.41,0.00,1.00,-105.60,-76.80 +177.60,-76.80,3.47,0.00,1.00,-100.80,-81.60 +177.60,-86.40,3.53,0.00,1.00,-96.00,-86.40 +177.60,-89.20,3.60,0.00,1.00,-91.20,-86.40 +0.00,-86.40,3.66,0.00,1.00,-86.40,-81.60 +0.00,-81.60,3.73,0.00,1.00,-81.60,-76.80 +0.00,-76.80,3.79,0.00,1.00,-76.80,-72.00 +0.00,-72.00,3.86,0.00,1.00,-72.00,-67.20 +0.00,-67.20,3.92,0.00,1.00,-67.20,-62.40 +0.00,-62.40,3.98,0.00,1.00,-62.40,-57.60 +0.00,-57.60,4.05,0.00,1.00,-57.60,-52.80 +0.00,-52.80,4.11,0.00,1.00,-52.80,-48.00 +0.00,-48.00,4.18,0.00,1.00,-48.00,-43.20 +0.00,-43.20,4.24,0.00,1.00,-43.20,-38.40 +0.00,-38.40,4.31,0.00,1.00,-38.40,-33.60 +0.00,-33.60,4.37,0.00,1.00,-33.60,-28.80 +0.00,-28.80,4.43,0.00,1.00,-28.80,-24.00 +0.00,-24.00,4.50,0.00,1.00,-24.00,-19.20 +0.00,-19.20,4.56,0.00,1.00,-19.20,-14.40 +0.00,-14.40,4.63,0.00,1.00,-14.40,-9.60 +0.00,-9.60,4.69,0.00,1.00,-9.60,-4.80 +0.00,-4.80,4.76,0.00,1.00,-4.80,0.00 +0.00,0.00,4.82,0.00,1.00,0.00,4.80 +0.00,4.80,4.88,0.00,1.00,4.80,9.60 +0.00,9.60,4.95,0.00,1.00,9.60,14.40 +0.00,14.40,5.01,0.00,1.00,14.40,19.20 +0.00,19.20,5.08,0.00,1.00,19.20,24.00 +0.00,24.00,5.14,0.00,1.00,24.00,28.80 +4.80,28.80,5.20,0.00,1.00,28.80,33.60 +4.80,33.60,5.27,0.00,1.00,33.60,38.40 +4.80,38.40,5.33,0.00,1.00,38.40,43.20 +4.80,43.20,5.40,0.00,1.00,43.20,48.00 +4.80,48.00,5.46,0.00,1.00,48.00,52.80 +4.80,52.80,5.53,0.00,1.00,52.80,57.60 +9.60,57.60,5.59,0.00,1.00,57.60,62.40 +9.60,62.40,5.65,0.00,1.00,62.40,67.20 +9.60,67.20,5.72,0.00,1.00,67.20,72.00 +14.40,72.00,5.78,0.00,1.00,72.00,76.80 +19.20,76.80,5.85,0.00,1.00,76.80,81.60 +28.80,81.60,5.91,0.00,1.00,81.60,86.40 +52.80,86.40,5.98,0.00,1.00,86.40,86.40 +105.60,86.40,6.04,0.00,1.00,91.20,81.60 +139.20,81.60,6.10,0.00,1.00,96.00,76.80 +158.40,76.80,6.17,0.00,1.00,100.80,72.00 +163.20,72.00,6.23,0.00,1.00,105.60,67.20 +168.00,67.20,6.30,0.00,1.00,110.40,62.40 +168.00,62.40,6.36,0.00,1.00,115.20,57.60 +172.80,57.60,6.43,0.00,1.00,120.00,52.80 +172.80,52.80,6.49,0.00,1.00,124.80,48.00 +172.80,48.00,6.55,0.00,1.00,129.60,43.20 +172.80,43.20,6.62,0.00,1.00,134.40,38.40 +177.60,38.40,6.68,0.00,1.00,139.20,33.60 +177.60,33.60,6.75,0.00,1.00,144.00,28.80 +177.60,28.80,6.81,0.00,1.00,148.80,24.00 +177.60,24.00,6.88,0.00,1.00,153.60,19.20 +177.60,19.20,6.94,0.00,1.00,158.40,14.40 +177.60,14.40,7.00,0.00,1.00,163.20,9.60 +177.60,9.60,7.07,0.00,1.00,168.00,4.80 +177.60,4.80,7.13,0.00,1.00,172.80,0.00 +177.60,0.00,7.20,0.00,1.00,177.60,-0.00 +-177.60,-0.00,7.26,0.00,1.00,-177.60,-4.80 +-177.60,-4.80,7.33,0.00,1.00,-172.80,-9.60 +-177.60,-9.60,7.39,0.00,1.00,-168.00,-14.40 +-177.60,-14.40,7.45,0.00,1.00,-163.20,-19.20 +-177.60,-19.20,7.52,0.00,1.00,-158.40,-24.00 +-177.60,-24.00,7.58,0.00,1.00,-153.60,-28.80 +-177.60,-28.80,7.65,0.00,1.00,-148.80,-33.60 +-177.60,-33.60,7.71,0.00,1.00,-144.00,-38.40 +-177.60,-38.40,7.78,0.00,1.00,-139.20,-43.20 +-172.80,-43.20,7.84,0.00,1.00,-134.40,-48.00 +-172.80,-48.00,7.90,0.00,1.00,-129.60,-52.80 +-172.80,-52.80,7.97,0.00,1.00,-124.80,-57.60 +-172.80,-57.60,8.03,0.00,1.00,-120.00,-62.40 +-168.00,-62.40,8.10,0.00,1.00,-115.20,-67.20 +-168.00,-67.20,8.16,0.00,1.00,-110.40,-72.00 +-163.20,-72.00,8.22,0.00,1.00,-105.60,-76.80 +-158.40,-76.80,8.29,0.00,1.00,-100.80,-81.60 +-139.20,-81.60,8.35,0.00,1.00,-96.00,-86.40 +-105.60,-86.40,8.42,0.00,1.00,-91.20,-86.40 +-52.80,-86.40,8.48,0.00,1.00,-86.40,-81.60 +-28.80,-81.60,8.55,0.00,1.00,-81.60,-76.80 +-19.20,-76.80,8.61,0.00,1.00,-76.80,-72.00 +-14.40,-72.00,8.67,0.00,1.00,-72.00,-67.20 +-9.60,-67.20,8.74,0.00,1.00,-67.20,-62.40 +-9.60,-62.40,8.80,0.00,1.00,-62.40,-57.60 +-9.60,-57.60,8.87,0.00,1.00,-57.60,-52.80 +-4.80,-52.80,8.93,0.00,1.00,-52.80,-48.00 +-4.80,-48.00,9.00,0.00,1.00,-48.00,-43.20 +-4.80,-43.20,9.06,0.00,1.00,-43.20,-38.40 +-4.80,-38.40,9.12,0.00,1.00,-38.40,-33.60 +-4.80,-33.60,9.19,0.00,1.00,-33.60,-28.80 +-4.80,-28.80,9.25,0.00,1.00,-28.80,-24.00 +-0.00,-24.00,9.32,0.00,1.00,-24.00,-19.20 +-0.00,-19.20,9.38,0.00,1.00,-19.20,-14.40 +-0.00,-14.40,9.45,0.00,1.00,-14.40,-9.60 +-0.00,-9.60,9.51,0.00,1.00,-9.60,-4.80 +-0.00,-4.80,9.57,0.00,1.00,-4.80,0.00 +0.00,0.00,9.64,0.00,1.00,0.00,4.80 +0.00,4.80,9.70,0.00,1.00,4.80,9.60 +0.00,9.60,9.77,0.00,1.00,9.60,14.40 +4.80,14.40,9.83,0.00,1.00,14.40,19.20 +4.80,19.20,9.90,0.00,1.00,19.20,24.00 +4.80,24.00,9.96,0.00,1.00,24.00,28.80 +4.80,28.80,10.02,0.00,1.00,28.80,33.60 +4.80,33.60,10.09,0.00,1.00,33.60,38.40 +9.60,38.40,10.15,0.00,1.00,38.40,43.20 +9.60,43.20,10.22,0.00,1.00,43.20,48.00 +9.60,48.00,10.28,0.00,1.00,48.00,52.80 +14.40,52.80,10.35,0.00,1.00,52.80,57.60 +14.40,57.60,10.41,0.00,1.00,57.60,62.40 +19.20,62.40,10.47,0.00,1.00,62.40,67.20 +24.00,67.20,10.54,0.00,1.00,67.20,72.00 +28.80,72.00,10.60,0.00,1.00,72.00,72.00 +33.60,72.00,10.67,0.00,1.00,76.80,76.80 +48.00,76.80,10.73,0.00,1.00,81.60,81.60 +67.20,81.60,10.80,0.00,1.00,86.40,81.60 +96.00,81.60,10.86,0.00,1.00,91.20,81.60 +120.00,76.80,10.92,0.00,1.00,96.00,76.80 +139.20,76.80,10.99,0.00,1.00,100.80,72.00 +148.80,72.00,11.05,0.00,1.00,105.60,67.20 +153.60,67.20,11.12,0.00,1.00,110.40,62.40 +158.40,62.40,11.18,0.00,1.00,115.20,57.60 +163.20,57.60,11.24,0.00,1.00,120.00,52.80 +168.00,52.80,11.31,0.00,1.00,124.80,48.00 +168.00,48.00,11.37,0.00,1.00,129.60,43.20 +168.00,43.20,11.44,0.00,1.00,134.40,38.40 +172.80,38.40,11.50,0.00,1.00,139.20,33.60 +172.80,33.60,11.57,0.00,1.00,144.00,28.80 +172.80,28.80,11.63,0.00,1.00,148.80,24.00 +177.60,24.00,11.69,0.00,1.00,153.60,19.20 +177.60,19.20,11.76,0.00,1.00,158.40,14.40 +177.60,14.40,11.82,0.00,1.00,163.20,9.60 +177.60,9.60,11.89,0.00,1.00,168.00,4.80 +177.60,4.80,11.95,0.00,1.00,172.80,0.00 +177.60,0.00,12.02,0.00,1.00,177.60,-0.00 +-177.60,-0.00,12.08,0.00,1.00,-177.60,-4.80 +-177.60,-4.80,12.14,0.00,1.00,-172.80,-9.60 +-177.60,-9.60,12.21,0.00,1.00,-168.00,-14.40 +-177.60,-14.40,12.27,0.00,1.00,-163.20,-19.20 +-177.60,-19.20,12.34,0.00,1.00,-158.40,-24.00 +-177.60,-24.00,12.40,0.00,1.00,-153.60,-28.80 +-172.80,-28.80,12.47,0.00,1.00,-148.80,-33.60 +-172.80,-33.60,12.53,0.00,1.00,-144.00,-38.40 +-172.80,-38.40,12.59,0.00,1.00,-139.20,-43.20 +-168.00,-43.20,12.66,0.00,1.00,-134.40,-48.00 +-168.00,-48.00,12.72,0.00,1.00,-129.60,-52.80 +-168.00,-52.80,12.79,0.00,1.00,-124.80,-57.60 +-163.20,-57.60,12.85,0.00,1.00,-120.00,-62.40 +-158.40,-62.40,12.92,0.00,1.00,-115.20,-67.20 +-153.60,-67.20,12.98,0.00,1.00,-110.40,-72.00 +-148.80,-72.00,13.04,0.00,1.00,-105.60,-76.80 +-139.20,-76.80,13.11,0.00,1.00,-100.80,-81.60 +-120.00,-76.80,13.17,0.00,1.00,-96.00,-81.60 +-96.00,-81.60,13.24,0.00,1.00,-91.20,-81.60 +-67.20,-81.60,13.30,0.00,1.00,-86.40,-76.80 +-48.00,-76.80,13.37,0.00,1.00,-81.60,-72.00 +-33.60,-72.00,13.43,0.00,1.00,-76.80,-72.00 +-28.80,-72.00,13.49,0.00,1.00,-72.00,-67.20 +-24.00,-67.20,13.56,0.00,1.00,-67.20,-62.40 +-19.20,-62.40,13.62,0.00,1.00,-62.40,-57.60 +-14.40,-57.60,13.69,0.00,1.00,-57.60,-52.80 +-14.40,-52.80,13.75,0.00,1.00,-52.80,-48.00 +-9.60,-48.00,13.82,0.00,1.00,-48.00,-43.20 +-9.60,-43.20,13.88,0.00,1.00,-43.20,-38.40 +-9.60,-38.40,13.94,0.00,1.00,-38.40,-33.60 +-4.80,-33.60,14.01,0.00,1.00,-33.60,-28.80 +-4.80,-28.80,14.07,0.00,1.00,-28.80,-24.00 +-4.80,-24.00,14.14,0.00,1.00,-24.00,-19.20 +-4.80,-19.20,14.20,0.00,1.00,-19.20,-14.40 +-4.80,-14.40,14.27,0.00,1.00,-14.40,-9.60 +-0.00,-9.60,14.33,0.00,1.00,-9.60,-4.80 +-0.00,-4.80,14.39,0.00,1.00,-4.80,0.00 +0.00,0.00,14.46,0.00,1.00,0.00,4.80 +0.00,4.80,14.52,0.00,1.00,4.80,9.60 +4.80,9.60,14.59,0.00,1.00,9.60,14.40 +4.80,14.40,14.65,0.00,1.00,14.40,19.20 +4.80,19.20,14.71,0.00,1.00,19.20,24.00 +4.80,24.00,14.78,0.00,1.00,24.00,28.80 +9.60,28.80,14.84,0.00,1.00,28.80,33.60 +9.60,33.60,14.91,0.00,1.00,33.60,38.40 +9.60,38.40,14.97,0.00,1.00,38.40,43.20 +14.40,43.20,15.04,0.00,1.00,43.20,48.00 +14.40,48.00,15.10,0.00,1.00,48.00,52.80 +19.20,52.80,15.16,0.00,1.00,52.80,57.60 +19.20,52.80,15.23,0.00,1.00,57.60,57.60 +24.00,57.60,15.29,0.00,1.00,62.40,62.40 +28.80,62.40,15.36,0.00,1.00,67.20,67.20 +38.40,67.20,15.42,0.00,1.00,72.00,72.00 +48.00,72.00,15.49,0.00,1.00,76.80,72.00 +57.60,72.00,15.55,0.00,1.00,81.60,76.80 +76.80,76.80,15.61,0.00,1.00,86.40,76.80 +96.00,76.80,15.68,0.00,1.00,91.20,76.80 +115.20,76.80,15.74,0.00,1.00,96.00,72.00 +129.60,72.00,15.81,0.00,1.00,100.80,72.00 +139.20,67.20,15.87,0.00,1.00,105.60,67.20 +144.00,67.20,15.94,0.00,1.00,110.40,62.40 +153.60,62.40,16.00,0.00,1.00,115.20,57.60 +158.40,57.60,16.00,0.00,1.00,120.00,52.80 +158.40,52.80,15.94,0.00,1.00,124.80,48.00 +163.20,48.00,15.87,0.00,1.00,129.60,43.20 +168.00,43.20,15.81,0.00,1.00,134.40,38.40 +168.00,38.40,15.74,0.00,1.00,139.20,33.60 +168.00,33.60,15.68,0.00,1.00,144.00,28.80 +172.80,28.80,15.61,0.00,1.00,148.80,24.00 +172.80,24.00,15.55,0.00,1.00,153.60,19.20 +172.80,19.20,15.49,0.00,1.00,158.40,14.40 +177.60,14.40,15.42,0.00,1.00,163.20,9.60 +177.60,9.60,15.36,0.00,1.00,168.00,4.80 +177.60,4.80,15.29,0.00,1.00,172.80,0.00 +177.60,0.00,15.23,0.00,1.00,177.60,-0.00 +-177.60,-0.00,15.16,0.00,1.00,-177.60,-4.80 +-177.60,-4.80,15.10,0.00,1.00,-172.80,-9.60 +-177.60,-9.60,15.04,0.00,1.00,-168.00,-14.40 +-177.60,-14.40,14.97,0.00,1.00,-163.20,-19.20 +-172.80,-19.20,14.91,0.00,1.00,-158.40,-24.00 +-172.80,-24.00,14.84,0.00,1.00,-153.60,-28.80 +-172.80,-28.80,14.78,0.00,1.00,-148.80,-33.60 +-168.00,-33.60,14.71,0.00,1.00,-144.00,-38.40 +-168.00,-38.40,14.65,0.00,1.00,-139.20,-43.20 +-168.00,-43.20,14.59,0.00,1.00,-134.40,-48.00 +-163.20,-48.00,14.52,0.00,1.00,-129.60,-52.80 +-158.40,-52.80,14.46,0.00,1.00,-124.80,-57.60 +-158.40,-57.60,14.39,0.00,1.00,-120.00,-62.40 +-153.60,-62.40,14.33,0.00,1.00,-115.20,-67.20 +-144.00,-67.20,14.27,0.00,1.00,-110.40,-72.00 +-139.20,-67.20,14.20,0.00,1.00,-105.60,-72.00 +-129.60,-72.00,14.14,0.00,1.00,-100.80,-76.80 +-115.20,-76.80,14.07,0.00,1.00,-96.00,-76.80 +-96.00,-76.80,14.01,0.00,1.00,-91.20,-76.80 +-76.80,-76.80,13.94,0.00,1.00,-86.40,-72.00 +-57.60,-72.00,13.88,0.00,1.00,-81.60,-72.00 +-48.00,-72.00,13.82,0.00,1.00,-76.80,-67.20 +-38.40,-67.20,13.75,0.00,1.00,-72.00,-62.40 +-28.80,-62.40,13.69,0.00,1.00,-67.20,-57.60 +-24.00,-57.60,13.62,0.00,1.00,-62.40,-57.60 +-19.20,-52.80,13.56,0.00,1.00,-57.60,-52.80 +-19.20,-52.80,13.49,0.00,1.00,-52.80,-48.00 +-14.40,-48.00,13.43,0.00,1.00,-48.00,-43.20 +-14.40,-43.20,13.37,0.00,1.00,-43.20,-38.40 +-9.60,-38.40,13.30,0.00,1.00,-38.40,-33.60 +-9.60,-33.60,13.24,0.00,1.00,-33.60,-28.80 +-9.60,-28.80,13.17,0.00,1.00,-28.80,-24.00 +-4.80,-24.00,13.11,0.00,1.00,-24.00,-19.20 +-4.80,-19.20,13.04,0.00,1.00,-19.20,-14.40 +-4.80,-14.40,12.98,0.00,1.00,-14.40,-9.60 +-4.80,-9.60,12.92,0.00,1.00,-9.60,-4.80 +-0.00,-4.80,12.85,0.00,1.00,-4.80,0.00 +0.00,0.00,12.79,0.00,1.00,0.00,4.80 +0.00,4.80,12.72,0.00,1.00,4.80,9.60 +4.80,9.60,12.66,0.00,1.00,9.60,14.40 +4.80,14.40,12.59,0.00,1.00,14.40,19.20 +4.80,19.20,12.53,0.00,1.00,19.20,24.00 +9.60,24.00,12.47,0.00,1.00,24.00,28.80 +9.60,28.80,12.40,0.00,1.00,28.80,33.60 +14.40,33.60,12.34,0.00,1.00,33.60,38.40 +14.40,33.60,12.27,0.00,1.00,38.40,38.40 +19.20,38.40,12.21,0.00,1.00,43.20,43.20 +19.20,43.20,12.14,0.00,1.00,48.00,48.00 +24.00,48.00,12.08,0.00,1.00,52.80,52.80 +28.80,52.80,12.02,0.00,1.00,57.60,57.60 +33.60,57.60,11.95,0.00,1.00,62.40,62.40 +38.40,62.40,11.89,0.00,1.00,67.20,62.40 +43.20,62.40,11.82,0.00,1.00,72.00,67.20 +52.80,67.20,11.76,0.00,1.00,76.80,72.00 +67.20,67.20,11.69,0.00,1.00,81.60,72.00 +76.80,72.00,11.63,0.00,1.00,86.40,72.00 +96.00,72.00,11.57,0.00,1.00,91.20,72.00 +105.60,72.00,11.50,0.00,1.00,96.00,67.20 +120.00,67.20,11.44,0.00,1.00,100.80,67.20 +129.60,67.20,11.37,0.00,1.00,105.60,62.40 +139.20,62.40,11.31,0.00,1.00,110.40,57.60 +144.00,57.60,11.24,0.00,1.00,115.20,57.60 +148.80,52.80,11.18,0.00,1.00,120.00,52.80 +153.60,52.80,11.12,0.00,1.00,124.80,48.00 +158.40,48.00,11.05,0.00,1.00,129.60,43.20 +163.20,43.20,10.99,0.00,1.00,134.40,38.40 +163.20,38.40,10.92,0.00,1.00,139.20,33.60 +168.00,33.60,10.86,0.00,1.00,144.00,28.80 +168.00,28.80,10.80,0.00,1.00,148.80,24.00 +172.80,24.00,10.73,0.00,1.00,153.60,19.20 +172.80,19.20,10.67,0.00,1.00,158.40,14.40 +172.80,14.40,10.60,0.00,1.00,163.20,9.60 +177.60,9.60,10.54,0.00,1.00,168.00,4.80 +177.60,4.80,10.47,0.00,1.00,172.80,0.00 +177.60,0.00,10.41,0.00,1.00,177.60,-0.00 +-177.60,-0.00,10.35,0.00,1.00,-177.60,-4.80 +-177.60,-4.80,10.28,0.00,1.00,-172.80,-9.60 +-177.60,-9.60,10.22,0.00,1.00,-168.00,-14.40 +-172.80,-14.40,10.15,0.00,1.00,-163.20,-19.20 +-172.80,-19.20,10.09,0.00,1.00,-158.40,-24.00 +-172.80,-24.00,10.02,0.00,1.00,-153.60,-28.80 +-168.00,-28.80,9.96,0.00,1.00,-148.80,-33.60 +-168.00,-33.60,9.90,0.00,1.00,-144.00,-38.40 +-163.20,-38.40,9.83,0.00,1.00,-139.20,-43.20 +-163.20,-43.20,9.77,0.00,1.00,-134.40,-48.00 +-158.40,-48.00,9.70,0.00,1.00,-129.60,-52.80 +-153.60,-52.80,9.64,0.00,1.00,-124.80,-57.60 +-148.80,-52.80,9.57,0.00,1.00,-120.00,-57.60 +-144.00,-57.60,9.51,0.00,1.00,-115.20,-62.40 +-139.20,-62.40,9.45,0.00,1.00,-110.40,-67.20 +-129.60,-67.20,9.38,0.00,1.00,-105.60,-67.20 +-120.00,-67.20,9.32,0.00,1.00,-100.80,-72.00 +-105.60,-72.00,9.25,0.00,1.00,-96.00,-72.00 +-96.00,-72.00,9.19,0.00,1.00,-91.20,-72.00 +-76.80,-72.00,9.12,0.00,1.00,-86.40,-72.00 +-67.20,-67.20,9.06,0.00,1.00,-81.60,-67.20 +-52.80,-67.20,9.00,0.00,1.00,-76.80,-62.40 +-43.20,-62.40,8.93,0.00,1.00,-72.00,-62.40 +-38.40,-62.40,8.87,0.00,1.00,-67.20,-57.60 +-33.60,-57.60,8.80,0.00,1.00,-62.40,-52.80 +-28.80,-52.80,8.74,0.00,1.00,-57.60,-48.00 +-24.00,-48.00,8.67,0.00,1.00,-52.80,-43.20 +-19.20,-43.20,8.61,0.00,1.00,-48.00,-38.40 +-19.20,-38.40,8.55,0.00,1.00,-43.20,-38.40 +-14.40,-33.60,8.48,0.00,1.00,-38.40,-33.60 +-14.40,-33.60,8.42,0.00,1.00,-33.60,-28.80 +-9.60,-28.80,8.35,0.00,1.00,-28.80,-24.00 +-9.60,-24.00,8.29,0.00,1.00,-24.00,-19.20 +-4.80,-19.20,8.22,0.00,1.00,-19.20,-14.40 +-4.80,-14.40,8.16,0.00,1.00,-14.40,-9.60 +-4.80,-9.60,8.10,0.00,1.00,-9.60,-4.80 +-0.00,-4.80,8.03,0.00,1.00,-4.80,0.00 +0.00,0.00,7.97,0.00,1.00,0.00,4.80 +0.00,4.80,7.90,0.00,1.00,4.80,9.60 +4.80,9.60,7.84,0.00,1.00,9.60,14.40 +4.80,14.40,7.78,0.00,1.00,14.40,19.20 +9.60,19.20,7.71,0.00,1.00,19.20,24.00 +9.60,24.00,7.65,0.00,1.00,24.00,24.00 +14.40,24.00,7.58,0.00,1.00,28.80,28.80 +14.40,28.80,7.52,0.00,1.00,33.60,33.60 +19.20,33.60,7.45,0.00,1.00,33.60,38.40 +19.20,38.40,7.39,0.00,1.00,38.40,43.20 +24.00,43.20,7.33,0.00,1.00,43.20,48.00 +28.80,48.00,7.26,0.00,1.00,48.00,52.80 +33.60,52.80,7.20,0.00,1.00,57.60,52.80 +38.40,52.80,7.13,0.00,1.00,62.40,57.60 +43.20,57.60,7.07,0.00,1.00,67.20,62.40 +52.80,62.40,7.00,0.00,1.00,72.00,62.40 +62.40,62.40,6.94,0.00,1.00,76.80,67.20 +72.00,62.40,6.88,0.00,1.00,81.60,67.20 +81.60,67.20,6.81,0.00,1.00,86.40,67.20 +91.20,67.20,6.75,0.00,1.00,91.20,67.20 +105.60,67.20,6.68,0.00,1.00,96.00,67.20 +115.20,62.40,6.62,0.00,1.00,100.80,62.40 +124.80,62.40,6.55,0.00,1.00,105.60,57.60 +134.40,57.60,6.49,0.00,1.00,110.40,57.60 +139.20,57.60,6.43,0.00,1.00,115.20,52.80 +144.00,52.80,6.36,0.00,1.00,120.00,48.00 +148.80,48.00,6.30,0.00,1.00,129.60,43.20 +153.60,43.20,6.23,0.00,1.00,134.40,43.20 +158.40,38.40,6.17,0.00,1.00,139.20,38.40 +158.40,38.40,6.10,0.00,1.00,144.00,33.60 +163.20,33.60,6.04,0.00,1.00,148.80,28.80 +168.00,28.80,5.98,0.00,1.00,148.80,24.00 +168.00,24.00,5.91,0.00,1.00,153.60,19.20 +172.80,19.20,5.85,0.00,1.00,158.40,14.40 +172.80,14.40,5.78,0.00,1.00,163.20,9.60 +172.80,9.60,5.72,0.00,1.00,168.00,4.80 +177.60,4.80,5.65,0.00,1.00,172.80,0.00 +177.60,0.00,5.59,0.00,1.00,177.60,-0.00 +-177.60,-0.00,5.53,0.00,1.00,-177.60,-4.80 +-177.60,-4.80,5.46,0.00,1.00,-172.80,-9.60 +-172.80,-9.60,5.40,0.00,1.00,-168.00,-14.40 +-172.80,-14.40,5.33,0.00,1.00,-163.20,-19.20 +-172.80,-19.20,5.27,0.00,1.00,-158.40,-24.00 +-168.00,-24.00,5.20,0.00,1.00,-153.60,-28.80 +-168.00,-28.80,5.14,0.00,1.00,-148.80,-33.60 +-163.20,-33.60,5.08,0.00,1.00,-148.80,-38.40 +-158.40,-38.40,5.01,0.00,1.00,-144.00,-43.20 +-158.40,-38.40,4.95,0.00,1.00,-139.20,-43.20 +-153.60,-43.20,4.88,0.00,1.00,-134.40,-48.00 +-148.80,-48.00,4.82,0.00,1.00,-129.60,-52.80 +-144.00,-52.80,4.76,0.00,1.00,-120.00,-57.60 +-139.20,-57.60,4.69,0.00,1.00,-115.20,-57.60 +-134.40,-57.60,4.63,0.00,1.00,-110.40,-62.40 +-124.80,-62.40,4.56,0.00,1.00,-105.60,-67.20 +-115.20,-62.40,4.50,0.00,1.00,-100.80,-67.20 +-105.60,-67.20,4.43,0.00,1.00,-96.00,-67.20 +-91.20,-67.20,4.37,0.00,1.00,-91.20,-67.20 +-81.60,-67.20,4.31,0.00,1.00,-86.40,-67.20 +-72.00,-62.40,4.24,0.00,1.00,-81.60,-62.40 +-62.40,-62.40,4.18,0.00,1.00,-76.80,-62.40 +-52.80,-62.40,4.11,0.00,1.00,-72.00,-57.60 +-43.20,-57.60,4.05,0.00,1.00,-67.20,-52.80 +-38.40,-52.80,3.98,0.00,1.00,-62.40,-52.80 +-33.60,-52.80,3.92,0.00,1.00,-57.60,-48.00 +-28.80,-48.00,3.86,0.00,1.00,-48.00,-43.20 +-24.00,-43.20,3.79,0.00,1.00,-43.20,-38.40 +-19.20,-38.40,3.73,0.00,1.00,-38.40,-33.60 +-19.20,-33.60,3.66,0.00,1.00,-33.60,-28.80 +-14.40,-28.80,3.60,0.00,1.00,-33.60,-24.00 +-14.40,-24.00,3.53,0.00,1.00,-28.80,-24.00 +-9.60,-24.00,3.47,0.00,1.00,-24.00,-19.20 +-9.60,-19.20,3.41,0.00,1.00,-19.20,-14.40 +-4.80,-14.40,3.34,0.00,1.00,-14.40,-9.60 +-4.80,-9.60,3.28,0.00,1.00,-9.60,-4.80 +-0.00,-4.80,3.21,0.00,1.00,-4.80,0.00 +0.00,0.00,3.15,0.00,1.00,0.00,4.80 +0.00,4.80,3.08,0.00,1.00,4.80,9.60 +4.80,9.60,3.02,0.00,1.00,9.60,14.40 +4.80,14.40,2.96,0.00,1.00,14.40,19.20 +9.60,14.40,2.89,0.00,1.00,19.20,19.20 +14.40,19.20,2.83,0.00,1.00,19.20,24.00 +14.40,24.00,2.76,0.00,1.00,24.00,28.80 +19.20,28.80,2.70,0.00,1.00,28.80,33.60 +19.20,33.60,2.63,0.00,1.00,33.60,38.40 +24.00,38.40,2.57,0.00,1.00,38.40,43.20 +28.80,38.40,2.51,0.00,1.00,43.20,43.20 +33.60,43.20,2.44,0.00,1.00,48.00,48.00 +38.40,48.00,2.38,0.00,1.00,52.80,52.80 +43.20,52.80,2.31,0.00,1.00,57.60,52.80 +48.00,52.80,2.25,0.00,1.00,62.40,57.60 +57.60,57.60,2.18,0.00,1.00,72.00,57.60 +62.40,57.60,2.12,0.00,1.00,76.80,62.40 +72.00,62.40,2.06,0.00,1.00,81.60,62.40 +81.60,62.40,1.99,0.00,1.00,86.40,62.40 +91.20,62.40,1.93,0.00,1.00,91.20,62.40 +100.80,62.40,1.86,0.00,1.00,96.00,62.40 +110.40,57.60,1.80,0.00,1.00,100.80,57.60 +120.00,57.60,1.73,0.00,1.00,105.60,57.60 +129.60,57.60,1.67,0.00,1.00,115.20,52.80 +134.40,52.80,1.61,0.00,1.00,120.00,48.00 +139.20,48.00,1.54,0.00,1.00,124.80,48.00 +144.00,48.00,1.48,0.00,1.00,129.60,43.20 +148.80,43.20,1.41,0.00,1.00,134.40,38.40 +153.60,38.40,1.35,0.00,1.00,139.20,33.60 +158.40,33.60,1.29,0.00,1.00,144.00,33.60 +158.40,28.80,1.22,0.00,1.00,148.80,28.80 +163.20,28.80,1.16,0.00,1.00,153.60,24.00 +168.00,24.00,1.09,0.00,1.00,158.40,19.20 +168.00,19.20,1.03,0.00,1.00,163.20,14.40 +172.80,14.40,0.96,0.00,1.00,163.20,9.60 +172.80,9.60,0.90,0.00,1.00,168.00,4.80 +177.60,4.80,0.84,0.00,1.00,172.80,0.00 +177.60,0.00,0.77,0.00,1.00,177.60,-0.00 +-177.60,-0.00,0.71,0.00,1.00,-177.60,-4.80 +-177.60,-4.80,0.64,0.00,1.00,-172.80,-9.60 +-172.80,-9.60,0.58,0.00,1.00,-168.00,-14.40 +-172.80,-14.40,0.51,0.00,1.00,-163.20,-19.20 +-168.00,-19.20,0.45,0.00,1.00,-163.20,-24.00 +-168.00,-24.00,0.39,0.00,1.00,-158.40,-28.80 +-163.20,-28.80,0.32,0.00,1.00,-153.60,-33.60 +-158.40,-28.80,0.26,0.00,1.00,-148.80,-33.60 +-158.40,-33.60,0.19,0.00,1.00,-144.00,-38.40 +-153.60,-38.40,0.13,0.00,1.00,-139.20,-43.20 +-148.80,-43.20,0.06,0.00,1.00,-134.40,-48.00 +-144.00,-48.00,0.00,0.00,1.00,-129.60,-48.00 +-139.20,-48.00,0.00,0.00,1.00,-124.80,-52.80 +-134.40,-52.80,0.16,0.00,1.00,-120.00,-57.60 +-129.60,-57.60,0.32,0.00,1.00,-115.20,-57.60 +-120.00,-57.60,0.48,0.00,1.00,-105.60,-62.40 +-110.40,-57.60,0.65,0.00,1.00,-100.80,-62.40 +-100.80,-62.40,0.81,0.00,1.00,-96.00,-62.40 +-91.20,-62.40,0.97,0.00,1.00,-91.20,-62.40 +-81.60,-62.40,1.13,0.00,1.00,-86.40,-62.40 +-72.00,-62.40,1.29,0.00,1.00,-81.60,-57.60 +-62.40,-57.60,1.45,0.00,1.00,-76.80,-57.60 +-57.60,-57.60,1.62,0.00,1.00,-72.00,-52.80 +-48.00,-52.80,1.78,0.00,1.00,-62.40,-52.80 +-43.20,-52.80,1.94,0.00,1.00,-57.60,-48.00 +-38.40,-48.00,2.10,0.00,1.00,-52.80,-43.20 +-33.60,-43.20,2.26,0.00,1.00,-48.00,-43.20 +-28.80,-38.40,2.42,0.00,1.00,-43.20,-38.40 +-24.00,-38.40,2.59,0.00,1.00,-38.40,-33.60 +-19.20,-33.60,2.75,0.00,1.00,-33.60,-28.80 +-19.20,-28.80,2.91,0.00,1.00,-28.80,-24.00 +-14.40,-24.00,3.07,0.00,1.00,-24.00,-19.20 +-14.40,-19.20,3.23,0.00,1.00,-19.20,-19.20 +-9.60,-14.40,3.39,0.00,1.00,-19.20,-14.40 +-4.80,-14.40,3.56,0.00,1.00,-14.40,-9.60 +-4.80,-9.60,3.72,0.00,1.00,-9.60,-4.80 +-0.00,-4.80,3.88,0.00,1.00,-4.80,0.00 +0.00,0.00,4.04,0.00,1.00,0.00,4.80 +4.80,4.80,4.20,0.00,1.00,4.80,9.60 +4.80,9.60,4.36,0.00,1.00,9.60,14.40 +9.60,9.60,4.53,0.00,1.00,14.40,14.40 +9.60,14.40,4.69,0.00,1.00,14.40,19.20 +14.40,19.20,4.85,0.00,1.00,19.20,24.00 +19.20,24.00,5.01,0.00,1.00,24.00,28.80 +19.20,28.80,5.17,0.00,1.00,28.80,33.60 +24.00,28.80,5.33,0.00,1.00,33.60,33.60 +28.80,33.60,5.49,0.00,1.00,38.40,38.40 +33.60,38.40,5.66,0.00,1.00,43.20,43.20 +38.40,43.20,5.82,0.00,1.00,48.00,43.20 +43.20,43.20,5.98,0.00,1.00,52.80,48.00 +48.00,48.00,6.14,0.00,1.00,57.60,52.80 +52.80,48.00,6.30,0.00,1.00,62.40,52.80 +57.60,52.80,6.46,0.00,1.00,67.20,57.60 +67.20,52.80,6.63,0.00,1.00,72.00,57.60 +76.80,57.60,6.79,0.00,1.00,81.60,57.60 +81.60,57.60,6.95,0.00,1.00,86.40,57.60 +91.20,57.60,7.11,0.00,1.00,91.20,57.60 +100.80,57.60,7.27,0.00,1.00,96.00,57.60 +110.40,52.80,7.43,0.00,1.00,100.80,52.80 +115.20,52.80,7.60,0.00,1.00,110.40,52.80 +124.80,52.80,7.76,0.00,1.00,115.20,48.00 +129.60,48.00,7.92,0.00,1.00,120.00,48.00 +134.40,48.00,8.08,0.00,1.00,124.80,43.20 +139.20,43.20,8.24,0.00,1.00,129.60,38.40 +144.00,38.40,8.40,0.00,1.00,134.40,38.40 +148.80,38.40,8.57,0.00,1.00,139.20,33.60 +153.60,33.60,8.73,0.00,1.00,144.00,28.80 +158.40,28.80,8.89,0.00,1.00,148.80,24.00 +163.20,24.00,9.05,0.00,1.00,153.60,24.00 +163.20,24.00,9.21,0.00,1.00,158.40,19.20 +168.00,19.20,9.37,0.00,1.00,163.20,14.40 +172.80,14.40,9.54,0.00,1.00,168.00,9.60 +172.80,9.60,9.70,0.00,1.00,168.00,4.80 +177.60,4.80,9.86,0.00,1.00,172.80,0.00 +177.60,0.00,10.02,0.00,1.00,177.60,-0.00 +-177.60,-0.00,10.18,0.00,1.00,-177.60,-4.80 +-177.60,-4.80,10.34,0.00,1.00,-172.80,-9.60 +-172.80,-9.60,10.51,0.00,1.00,-168.00,-14.40 +-172.80,-14.40,10.67,0.00,1.00,-168.00,-19.20 +-168.00,-19.20,10.83,0.00,1.00,-163.20,-24.00 +-163.20,-24.00,10.99,0.00,1.00,-158.40,-24.00 +-163.20,-24.00,11.15,0.00,1.00,-153.60,-28.80 +-158.40,-28.80,11.31,0.00,1.00,-148.80,-33.60 +-153.60,-33.60,11.47,0.00,1.00,-144.00,-38.40 +-148.80,-38.40,11.64,0.00,1.00,-139.20,-38.40 +-144.00,-38.40,11.80,0.00,1.00,-134.40,-43.20 +-139.20,-43.20,11.96,0.00,1.00,-129.60,-48.00 +-134.40,-48.00,12.12,0.00,1.00,-124.80,-48.00 +-129.60,-48.00,12.28,0.00,1.00,-120.00,-52.80 +-124.80,-52.80,12.44,0.00,1.00,-115.20,-52.80 +-115.20,-52.80,12.61,0.00,1.00,-110.40,-57.60 +-110.40,-52.80,12.77,0.00,1.00,-100.80,-57.60 +-100.80,-57.60,12.93,0.00,1.00,-96.00,-57.60 +-91.20,-57.60,13.09,0.00,1.00,-91.20,-57.60 +-81.60,-57.60,13.25,0.00,1.00,-86.40,-57.60 +-76.80,-57.60,13.41,0.00,1.00,-81.60,-57.60 +-67.20,-52.80,13.58,0.00,1.00,-72.00,-52.80 +-57.60,-52.80,13.74,0.00,1.00,-67.20,-52.80 +-52.80,-48.00,13.90,0.00,1.00,-62.40,-48.00 +-48.00,-48.00,14.06,0.00,1.00,-57.60,-43.20 +-43.20,-43.20,14.22,0.00,1.00,-52.80,-43.20 +-38.40,-43.20,14.38,0.00,1.00,-48.00,-38.40 +-33.60,-38.40,14.55,0.00,1.00,-43.20,-33.60 +-28.80,-33.60,14.71,0.00,1.00,-38.40,-33.60 +-24.00,-28.80,14.87,0.00,1.00,-33.60,-28.80 +-19.20,-28.80,15.03,0.00,1.00,-28.80,-24.00 +-19.20,-24.00,15.19,0.00,1.00,-24.00,-19.20 +-14.40,-19.20,15.35,0.00,1.00,-19.20,-14.40 +-9.60,-14.40,15.52,0.00,1.00,-14.40,-14.40 +-9.60,-9.60,15.68,0.00,1.00,-14.40,-9.60 +-4.80,-9.60,15.84,0.00,1.00,-9.60,-4.80 +-4.80,-4.80,16.00,0.00,1.00,-4.80,0.00 +0.00,0.00,16.00,0.00,1.00,0.00,4.80 +4.80,4.80,15.84,0.00,1.00,4.80,9.60 +4.80,9.60,15.68,0.00,1.00,9.60,9.60 +9.60,9.60,15.52,0.00,1.00,9.60,14.40 +14.40,14.40,15.35,0.00,1.00,14.40,19.20 +14.40,19.20,15.19,0.00,1.00,19.20,24.00 +19.20,24.00,15.03,0.00,1.00,24.00,24.00 +24.00,24.00,14.87,0.00,1.00,28.80,28.80 +24.00,28.80,14.71,0.00,1.00,33.60,33.60 +28.80,33.60,14.55,0.00,1.00,38.40,38.40 +33.60,33.60,14.38,0.00,1.00,43.20,38.40 +38.40,38.40,14.22,0.00,1.00,48.00,43.20 +43.20,43.20,14.06,0.00,1.00,52.80,43.20 +48.00,43.20,13.90,0.00,1.00,57.60,48.00 +57.60,48.00,13.74,0.00,1.00,62.40,48.00 +62.40,48.00,13.58,0.00,1.00,67.20,52.80 +67.20,48.00,13.41,0.00,1.00,72.00,52.80 +76.80,52.80,13.25,0.00,1.00,81.60,52.80 +86.40,52.80,13.09,0.00,1.00,86.40,52.80 +91.20,52.80,12.93,0.00,1.00,91.20,52.80 +100.80,52.80,12.77,0.00,1.00,96.00,52.80 +105.60,48.00,12.61,0.00,1.00,105.60,48.00 +115.20,48.00,12.44,0.00,1.00,110.40,48.00 +120.00,48.00,12.28,0.00,1.00,115.20,48.00 +124.80,43.20,12.12,0.00,1.00,120.00,43.20 +134.40,43.20,11.96,0.00,1.00,124.80,43.20 +139.20,38.40,11.80,0.00,1.00,129.60,38.40 +144.00,38.40,11.64,0.00,1.00,134.40,33.60 +148.80,33.60,11.47,0.00,1.00,139.20,33.60 +153.60,28.80,11.31,0.00,1.00,144.00,28.80 +153.60,28.80,11.15,0.00,1.00,148.80,24.00 +158.40,24.00,10.99,0.00,1.00,153.60,19.20 +163.20,19.20,10.83,0.00,1.00,158.40,19.20 +168.00,14.40,10.67,0.00,1.00,163.20,14.40 +168.00,14.40,10.51,0.00,1.00,168.00,9.60 +172.80,9.60,10.34,0.00,1.00,172.80,4.80 +177.60,4.80,10.18,0.00,1.00,172.80,0.00 +177.60,0.00,10.02,0.00,1.00,177.60,-0.00 +-177.60,-0.00,9.86,0.00,1.00,-177.60,-4.80 +-177.60,-4.80,9.70,0.00,1.00,-172.80,-9.60 +-172.80,-9.60,9.54,0.00,1.00,-172.80,-14.40 +-168.00,-14.40,9.37,0.00,1.00,-168.00,-19.20 +-168.00,-14.40,9.21,0.00,1.00,-163.20,-19.20 +-163.20,-19.20,9.05,0.00,1.00,-158.40,-24.00 +-158.40,-24.00,8.89,0.00,1.00,-153.60,-28.80 +-153.60,-28.80,8.73,0.00,1.00,-148.80,-33.60 +-153.60,-28.80,8.57,0.00,1.00,-144.00,-33.60 +-148.80,-33.60,8.40,0.00,1.00,-139.20,-38.40 +-144.00,-38.40,8.24,0.00,1.00,-134.40,-43.20 +-139.20,-38.40,8.08,0.00,1.00,-129.60,-43.20 +-134.40,-43.20,7.92,0.00,1.00,-124.80,-48.00 +-124.80,-43.20,7.76,0.00,1.00,-120.00,-48.00 +-120.00,-48.00,7.60,0.00,1.00,-115.20,-48.00 +-115.20,-48.00,7.43,0.00,1.00,-110.40,-52.80 +-105.60,-48.00,7.27,0.00,1.00,-105.60,-52.80 +-100.80,-52.80,7.11,0.00,1.00,-96.00,-52.80 +-91.20,-52.80,6.95,0.00,1.00,-91.20,-52.80 +-86.40,-52.80,6.79,0.00,1.00,-86.40,-52.80 +-76.80,-52.80,6.63,0.00,1.00,-81.60,-52.80 +-67.20,-48.00,6.46,0.00,1.00,-72.00,-48.00 +-62.40,-48.00,6.30,0.00,1.00,-67.20,-48.00 +-57.60,-48.00,6.14,0.00,1.00,-62.40,-43.20 +-48.00,-43.20,5.98,0.00,1.00,-57.60,-43.20 +-43.20,-43.20,5.82,0.00,1.00,-52.80,-38.40 +-38.40,-38.40,5.66,0.00,1.00,-48.00,-38.40 +-33.60,-33.60,5.49,0.00,1.00,-43.20,-33.60 +-28.80,-33.60,5.33,0.00,1.00,-38.40,-28.80 +-24.00,-28.80,5.17,0.00,1.00,-33.60,-24.00 +-24.00,-24.00,5.01,0.00,1.00,-28.80,-24.00 +-19.20,-24.00,4.85,0.00,1.00,-24.00,-19.20 +-14.40,-19.20,4.69,0.00,1.00,-19.20,-14.40 +-14.40,-14.40,4.53,0.00,1.00,-14.40,-9.60 +-9.60,-9.60,4.36,0.00,1.00,-9.60,-9.60 +-4.80,-9.60,4.20,0.00,1.00,-9.60,-4.80 +-4.80,-4.80,4.04,0.00,1.00,-4.80,0.00 +0.00,0.00,3.88,0.00,1.00,0.00,4.80 +4.80,4.80,3.72,0.00,1.00,4.80,4.80 +4.80,4.80,3.56,0.00,1.00,4.80,9.60 +9.60,9.60,3.39,0.00,1.00,9.60,14.40 +14.40,14.40,3.23,0.00,1.00,14.40,19.20 +19.20,19.20,3.07,0.00,1.00,19.20,19.20 +19.20,19.20,2.91,0.00,1.00,24.00,24.00 +24.00,24.00,2.75,0.00,1.00,24.00,28.80 +28.80,28.80,2.59,0.00,1.00,28.80,28.80 +33.60,28.80,2.42,0.00,1.00,33.60,33.60 +38.40,33.60,2.26,0.00,1.00,38.40,38.40 +43.20,33.60,2.10,0.00,1.00,43.20,38.40 +48.00,38.40,1.94,0.00,1.00,48.00,43.20 +52.80,38.40,1.78,0.00,1.00,52.80,43.20 +57.60,43.20,1.62,0.00,1.00,62.40,43.20 +62.40,43.20,1.45,0.00,1.00,67.20,48.00 +72.00,43.20,1.29,0.00,1.00,72.00,48.00 +76.80,48.00,1.13,0.00,1.00,76.80,48.00 +86.40,48.00,0.97,0.00,1.00,86.40,48.00 +91.20,48.00,0.81,0.00,1.00,91.20,48.00 +100.80,48.00,0.65,0.00,1.00,96.00,48.00 +105.60,48.00,0.48,0.00,1.00,105.60,48.00 +110.40,43.20,0.32,0.00,1.00,110.40,43.20 +120.00,43.20,0.16,0.00,1.00,115.20,43.20 +124.80,43.20,0.00,0.00,1.00,124.80,38.40 +129.60,38.40,0.00,0.00,1.00,129.60,38.40 +134.40,38.40,0.04,0.00,1.00,134.40,33.60 +139.20,33.60,0.08,0.00,1.00,139.20,33.60 +144.00,33.60,0.12,0.00,1.00,144.00,28.80 +148.80,28.80,0.16,0.00,1.00,148.80,24.00 +153.60,24.00,0.20,0.00,1.00,153.60,24.00 +158.40,24.00,0.24,0.00,1.00,158.40,19.20 +163.20,19.20,0.28,0.00,1.00,158.40,14.40 +163.20,14.40,0.32,0.00,1.00,163.20,14.40 +168.00,14.40,0.36,0.00,1.00,168.00,9.60 +172.80,9.60,0.40,0.00,1.00,172.80,4.80 +172.80,4.80,0.44,0.00,1.00,172.80,0.00 +177.60,0.00,0.48,0.00,1.00,177.60,-0.00 +-177.60,-0.00,0.52,0.00,1.00,-177.60,-4.80 +-172.80,-4.80,0.56,0.00,1.00,-172.80,-9.60 +-172.80,-9.60,0.60,0.00,1.00,-172.80,-14.40 +-168.00,-14.40,0.64,0.00,1.00,-168.00,-14.40 +-163.20,-14.40,0.68,0.00,1.00,-163.20,-19.20 +-163.20,-19.20,0.72,0.00,1.00,-158.40,-24.00 +-158.40,-24.00,0.76,0.00,1.00,-158.40,-24.00 +-153.60,-24.00,0.80,0.00,1.00,-153.60,-28.80 +-148.80,-28.80,0.84,0.00,1.00,-148.80,-33.60 +-144.00,-33.60,0.88,0.00,1.00,-144.00,-33.60 +-139.20,-33.60,0.92,0.00,1.00,-139.20,-38.40 +-134.40,-38.40,0.96,0.00,1.00,-134.40,-38.40 +-129.60,-38.40,1.00,0.00,1.00,-129.60,-43.20 +-124.80,-43.20,1.04,0.00,1.00,-124.80,-43.20 +-120.00,-43.20,1.08,0.00,1.00,-115.20,-48.00 +-110.40,-43.20,1.12,0.00,1.00,-110.40,-48.00 +-105.60,-48.00,1.16,0.00,1.00,-105.60,-48.00 +-100.80,-48.00,1.20,0.00,1.00,-96.00,-48.00 +-91.20,-48.00,1.24,0.00,1.00,-91.20,-48.00 +-86.40,-48.00,1.28,0.00,1.00,-86.40,-48.00 +-76.80,-48.00,1.32,0.00,1.00,-76.80,-48.00 +-72.00,-43.20,1.36,0.00,1.00,-72.00,-43.20 +-62.40,-43.20,1.40,0.00,1.00,-67.20,-43.20 +-57.60,-43.20,1.44,0.00,1.00,-62.40,-43.20 +-52.80,-38.40,1.48,0.00,1.00,-52.80,-38.40 +-48.00,-38.40,1.52,0.00,1.00,-48.00,-38.40 +-43.20,-33.60,1.56,0.00,1.00,-43.20,-33.60 +-38.40,-33.60,1.60,0.00,1.00,-38.40,-28.80 +-33.60,-28.80,1.64,0.00,1.00,-33.60,-28.80 +-28.80,-28.80,1.68,0.00,1.00,-28.80,-24.00 +-24.00,-24.00,1.72,0.00,1.00,-24.00,-19.20 +-19.20,-19.20,1.76,0.00,1.00,-24.00,-19.20 +-19.20,-19.20,1.80,0.00,1.00,-19.20,-14.40 +-14.40,-14.40,1.84,0.00,1.00,-14.40,-9.60 +-9.60,-9.60,1.88,0.00,1.00,-9.60,-4.80 +-4.80,-4.80,1.92,0.00,1.00,-4.80,-4.80 +-4.80,-4.80,1.96,0.00,1.00,-4.80,0.00 +0.00,0.00,2.01,0.00,1.00,0.00,4.80 +4.80,4.80,2.05,0.00,1.00,4.80,4.80 +4.80,4.80,2.09,0.00,1.00,4.80,9.60 +9.60,9.60,2.13,0.00,1.00,9.60,14.40 +14.40,14.40,2.17,0.00,1.00,14.40,14.40 +19.20,14.40,2.21,0.00,1.00,14.40,19.20 +24.00,19.20,2.25,0.00,1.00,19.20,24.00 +24.00,24.00,2.29,0.00,1.00,24.00,24.00 +28.80,24.00,2.33,0.00,1.00,28.80,28.80 +33.60,28.80,2.37,0.00,1.00,33.60,28.80 +38.40,28.80,2.41,0.00,1.00,38.40,33.60 +43.20,33.60,2.45,0.00,1.00,43.20,33.60 +48.00,33.60,2.49,0.00,1.00,48.00,38.40 +52.80,38.40,2.53,0.00,1.00,52.80,38.40 +62.40,38.40,2.57,0.00,1.00,57.60,38.40 +67.20,38.40,2.61,0.00,1.00,62.40,43.20 +72.00,38.40,2.65,0.00,1.00,72.00,43.20 +76.80,43.20,2.69,0.00,1.00,76.80,43.20 +86.40,43.20,2.73,0.00,1.00,86.40,43.20 +91.20,43.20,2.77,0.00,1.00,91.20,43.20 +96.00,43.20,2.81,0.00,1.00,100.80,43.20 +105.60,43.20,2.85,0.00,1.00,105.60,43.20 +110.40,38.40,2.89,0.00,1.00,110.40,38.40 +115.20,38.40,2.93,0.00,1.00,120.00,38.40 +120.00,38.40,2.97,0.00,1.00,124.80,38.40 +129.60,33.60,3.01,0.00,1.00,129.60,33.60 +134.40,33.60,3.05,0.00,1.00,134.40,33.60 +139.20,28.80,3.09,0.00,1.00,139.20,28.80 +144.00,28.80,3.13,0.00,1.00,144.00,28.80 +148.80,24.00,3.17,0.00,1.00,148.80,24.00 +153.60,24.00,3.21,0.00,1.00,153.60,19.20 +153.60,19.20,3.25,0.00,1.00,158.40,19.20 +158.40,19.20,3.29,0.00,1.00,163.20,14.40 +163.20,14.40,3.33,0.00,1.00,163.20,9.60 +168.00,9.60,3.37,0.00,1.00,168.00,9.60 +172.80,9.60,3.41,0.00,1.00,172.80,4.80 +172.80,4.80,3.45,0.00,1.00,172.80,0.00 +177.60,0.00,3.49,0.00,1.00,177.60,-0.00 +-177.60,-0.00,3.53,0.00,1.00,-177.60,-4.80 +-172.80,-4.80,3.57,0.00,1.00,-172.80,-9.60 +-172.80,-9.60,3.61,0.00,1.00,-172.80,-9.60 +-168.00,-9.60,3.65,0.00,1.00,-168.00,-14.40 +-163.20,-14.40,3.69,0.00,1.00,-163.20,-19.20 +-158.40,-19.20,3.73,0.00,1.00,-163.20,-19.20 +-153.60,-19.20,3.77,0.00,1.00,-158.40,-24.00 +-153.60,-24.00,3.81,0.00,1.00,-153.60,-28.80 +-148.80,-24.00,3.85,0.00,1.00,-148.80,-28.80 +-144.00,-28.80,3.89,0.00,1.00,-144.00,-33.60 +-139.20,-28.80,3.93,0.00,1.00,-139.20,-33.60 +-134.40,-33.60,3.97,0.00,1.00,-134.40,-38.40 +-129.60,-33.60,4.01,0.00,1.00,-129.60,-38.40 +-120.00,-38.40,4.05,0.00,1.00,-124.80,-38.40 +-115.20,-38.40,4.09,0.00,1.00,-120.00,-43.20 +-110.40,-38.40,4.13,0.00,1.00,-110.40,-43.20 +-105.60,-43.20,4.17,0.00,1.00,-105.60,-43.20 +-96.00,-43.20,4.21,0.00,1.00,-100.80,-43.20 +-91.20,-43.20,4.25,0.00,1.00,-91.20,-43.20 +-86.40,-43.20,4.29,0.00,1.00,-86.40,-43.20 +-76.80,-43.20,4.33,0.00,1.00,-76.80,-43.20 +-72.00,-38.40,4.37,0.00,1.00,-72.00,-38.40 +-67.20,-38.40,4.41,0.00,1.00,-62.40,-38.40 +-62.40,-38.40,4.45,0.00,1.00,-57.60,-38.40 +-52.80,-38.40,4.49,0.00,1.00,-52.80,-33.60 +-48.00,-33.60,4.53,0.00,1.00,-48.00,-33.60 +-43.20,-33.60,4.57,0.00,1.00,-43.20,-28.80 +-38.40,-28.80,4.61,0.00,1.00,-38.40,-28.80 +-33.60,-28.80,4.65,0.00,1.00,-33.60,-24.00 +-28.80,-24.00,4.69,0.00,1.00,-28.80,-24.00 +-24.00,-24.00,4.73,0.00,1.00,-24.00,-19.20 +-24.00,-19.20,4.77,0.00,1.00,-19.20,-14.40 +-19.20,-14.40,4.81,0.00,1.00,-14.40,-14.40 +-14.40,-14.40,4.85,0.00,1.00,-14.40,-9.60 +-9.60,-9.60,4.89,0.00,1.00,-9.60,-4.80 +-4.80,-4.80,4.93,0.00,1.00,-4.80,-4.80 +-4.80,-4.80,4.97,0.00,1.00,-4.80,0.00 +0.00,0.00,5.01,0.00,1.00,0.00,4.80 +4.80,4.80,5.05,0.00,1.00,4.80,4.80 +9.60,4.80,5.09,0.00,1.00,4.80,9.60 +9.60,9.60,5.13,0.00,1.00,9.60,9.60 +14.40,9.60,5.17,0.00,1.00,9.60,14.40 +19.20,14.40,5.21,0.00,1.00,14.40,19.20 +24.00,19.20,5.25,0.00,1.00,19.20,19.20 +28.80,19.20,5.29,0.00,1.00,24.00,24.00 +33.60,24.00,5.33,0.00,1.00,24.00,24.00 +38.40,24.00,5.37,0.00,1.00,28.80,28.80 +43.20,28.80,5.41,0.00,1.00,33.60,28.80 +48.00,28.80,5.45,0.00,1.00,38.40,33.60 +52.80,28.80,5.49,0.00,1.00,43.20,33.60 +57.60,33.60,5.53,0.00,1.00,48.00,33.60 +62.40,33.60,5.57,0.00,1.00,52.80,38.40 +67.20,33.60,5.61,0.00,1.00,62.40,38.40 +72.00,38.40,5.65,0.00,1.00,67.20,38.40 +81.60,38.40,5.69,0.00,1.00,76.80,38.40 +86.40,38.40,5.73,0.00,1.00,86.40,38.40 +91.20,38.40,5.77,0.00,1.00,91.20,38.40 +96.00,38.40,5.81,0.00,1.00,100.80,38.40 +105.60,38.40,5.85,0.00,1.00,105.60,38.40 +110.40,33.60,5.89,0.00,1.00,115.20,33.60 +115.20,33.60,5.93,0.00,1.00,120.00,33.60 +120.00,33.60,5.97,0.00,1.00,129.60,33.60 +124.80,33.60,6.02,0.00,1.00,134.40,28.80 +129.60,28.80,6.06,0.00,1.00,139.20,28.80 +134.40,28.80,6.10,0.00,1.00,144.00,24.00 +139.20,24.00,6.14,0.00,1.00,148.80,24.00 +144.00,24.00,6.18,0.00,1.00,153.60,19.20 +148.80,19.20,6.22,0.00,1.00,158.40,19.20 +153.60,19.20,6.26,0.00,1.00,158.40,14.40 +158.40,14.40,6.30,0.00,1.00,163.20,14.40 +163.20,14.40,6.34,0.00,1.00,168.00,9.60 +168.00,9.60,6.38,0.00,1.00,168.00,9.60 +168.00,9.60,6.42,0.00,1.00,172.80,4.80 +172.80,4.80,6.46,0.00,1.00,177.60,0.00 +177.60,0.00,6.50,0.00,1.00,177.60,-0.00 +-177.60,-0.00,6.54,0.00,1.00,-177.60,-4.80 +-172.80,-4.80,6.58,0.00,1.00,-177.60,-9.60 +-168.00,-9.60,6.62,0.00,1.00,-172.80,-9.60 +-168.00,-9.60,6.66,0.00,1.00,-168.00,-14.40 +-163.20,-14.40,6.70,0.00,1.00,-168.00,-14.40 +-158.40,-14.40,6.74,0.00,1.00,-163.20,-19.20 +-153.60,-19.20,6.78,0.00,1.00,-158.40,-19.20 +-148.80,-19.20,6.82,0.00,1.00,-158.40,-24.00 +-144.00,-24.00,6.86,0.00,1.00,-153.60,-24.00 +-139.20,-24.00,6.90,0.00,1.00,-148.80,-28.80 +-134.40,-28.80,6.94,0.00,1.00,-144.00,-28.80 +-129.60,-28.80,6.98,0.00,1.00,-139.20,-33.60 +-124.80,-33.60,7.02,0.00,1.00,-134.40,-33.60 +-120.00,-33.60,7.06,0.00,1.00,-129.60,-33.60 +-115.20,-33.60,7.10,0.00,1.00,-120.00,-38.40 +-110.40,-33.60,7.14,0.00,1.00,-115.20,-38.40 +-105.60,-38.40,7.18,0.00,1.00,-105.60,-38.40 +-96.00,-38.40,7.22,0.00,1.00,-100.80,-38.40 +-91.20,-38.40,7.26,0.00,1.00,-91.20,-38.40 +-86.40,-38.40,7.30,0.00,1.00,-86.40,-38.40 +-81.60,-38.40,7.34,0.00,1.00,-76.80,-38.40 +-72.00,-38.40,7.38,0.00,1.00,-67.20,-38.40 +-67.20,-33.60,7.42,0.00,1.00,-62.40,-33.60 +-62.40,-33.60,7.46,0.00,1.00,-52.80,-33.60 +-57.60,-33.60,7.50,0.00,1.00,-48.00,-33.60 +-52.80,-28.80,7.54,0.00,1.00,-43.20,-28.80 +-48.00,-28.80,7.58,0.00,1.00,-38.40,-28.80 +-43.20,-28.80,7.62,0.00,1.00,-33.60,-24.00 +-38.40,-24.00,7.66,0.00,1.00,-28.80,-24.00 +-33.60,-24.00,7.70,0.00,1.00,-24.00,-19.20 +-28.80,-19.20,7.74,0.00,1.00,-24.00,-19.20 +-24.00,-19.20,7.78,0.00,1.00,-19.20,-14.40 +-19.20,-14.40,7.82,0.00,1.00,-14.40,-9.60 +-14.40,-9.60,7.86,0.00,1.00,-9.60,-9.60 +-9.60,-9.60,7.90,0.00,1.00,-9.60,-4.80 +-9.60,-4.80,7.94,0.00,1.00,-4.80,-4.80 +-4.80,-4.80,7.98,0.00,1.00,-4.80,0.00 +0.00,0.00,8.02,0.00,1.00,0.00,4.80 +4.80,4.80,8.06,0.00,1.00,4.80,4.80 +9.60,4.80,8.10,0.00,1.00,4.80,9.60 +14.40,9.60,8.14,0.00,1.00,9.60,9.60 +14.40,9.60,8.18,0.00,1.00,9.60,14.40 +19.20,14.40,8.22,0.00,1.00,14.40,14.40 +24.00,14.40,8.26,0.00,1.00,14.40,19.20 +28.80,19.20,8.30,0.00,1.00,19.20,19.20 +33.60,19.20,8.34,0.00,1.00,24.00,24.00 +38.40,19.20,8.38,0.00,1.00,28.80,24.00 +43.20,24.00,8.42,0.00,1.00,28.80,24.00 +48.00,24.00,8.46,0.00,1.00,33.60,28.80 +52.80,28.80,8.50,0.00,1.00,38.40,28.80 +57.60,28.80,8.54,0.00,1.00,48.00,28.80 +62.40,28.80,8.58,0.00,1.00,52.80,33.60 +67.20,28.80,8.62,0.00,1.00,57.60,33.60 +76.80,33.60,8.66,0.00,1.00,67.20,33.60 +81.60,33.60,8.70,0.00,1.00,76.80,33.60 +86.40,33.60,8.74,0.00,1.00,81.60,33.60 +91.20,33.60,8.78,0.00,1.00,91.20,33.60 +96.00,33.60,8.82,0.00,1.00,100.80,33.60 +100.80,33.60,8.86,0.00,1.00,110.40,33.60 +110.40,28.80,8.90,0.00,1.00,115.20,33.60 +115.20,28.80,8.94,0.00,1.00,124.80,28.80 +120.00,28.80,8.98,0.00,1.00,129.60,28.80 +124.80,28.80,9.02,0.00,1.00,139.20,28.80 +129.60,24.00,9.06,0.00,1.00,144.00,24.00 +134.40,24.00,9.10,0.00,1.00,148.80,24.00 +139.20,24.00,9.14,0.00,1.00,153.60,19.20 +144.00,19.20,9.18,0.00,1.00,153.60,19.20 +148.80,19.20,9.22,0.00,1.00,158.40,14.40 +153.60,14.40,9.26,0.00,1.00,163.20,14.40 +158.40,14.40,9.30,0.00,1.00,163.20,9.60 +163.20,9.60,9.34,0.00,1.00,168.00,9.60 +168.00,9.60,9.38,0.00,1.00,172.80,4.80 +168.00,4.80,9.42,0.00,1.00,172.80,4.80 +172.80,4.80,9.46,0.00,1.00,177.60,0.00 +177.60,0.00,9.50,0.00,1.00,177.60,-0.00 +-177.60,-0.00,9.54,0.00,1.00,-177.60,-4.80 +-172.80,-4.80,9.58,0.00,1.00,-177.60,-4.80 +-168.00,-4.80,9.62,0.00,1.00,-172.80,-9.60 +-168.00,-9.60,9.66,0.00,1.00,-172.80,-9.60 +-163.20,-9.60,9.70,0.00,1.00,-168.00,-14.40 +-158.40,-14.40,9.74,0.00,1.00,-163.20,-14.40 +-153.60,-14.40,9.78,0.00,1.00,-163.20,-19.20 +-148.80,-19.20,9.82,0.00,1.00,-158.40,-19.20 +-144.00,-19.20,9.86,0.00,1.00,-153.60,-24.00 +-139.20,-24.00,9.90,0.00,1.00,-153.60,-24.00 +-134.40,-24.00,9.94,0.00,1.00,-148.80,-28.80 +-129.60,-24.00,9.98,0.00,1.00,-144.00,-28.80 +-124.80,-28.80,10.03,0.00,1.00,-139.20,-28.80 +-120.00,-28.80,10.07,0.00,1.00,-129.60,-33.60 +-115.20,-28.80,10.11,0.00,1.00,-124.80,-33.60 +-110.40,-28.80,10.15,0.00,1.00,-115.20,-33.60 +-100.80,-33.60,10.19,0.00,1.00,-110.40,-33.60 +-96.00,-33.60,10.23,0.00,1.00,-100.80,-33.60 +-91.20,-33.60,10.27,0.00,1.00,-91.20,-33.60 +-86.40,-33.60,10.31,0.00,1.00,-81.60,-33.60 +-81.60,-33.60,10.35,0.00,1.00,-76.80,-33.60 +-76.80,-33.60,10.39,0.00,1.00,-67.20,-33.60 +-67.20,-28.80,10.43,0.00,1.00,-57.60,-28.80 +-62.40,-28.80,10.47,0.00,1.00,-52.80,-28.80 +-57.60,-28.80,10.51,0.00,1.00,-48.00,-28.80 +-52.80,-28.80,10.55,0.00,1.00,-38.40,-24.00 +-48.00,-24.00,10.59,0.00,1.00,-33.60,-24.00 +-43.20,-24.00,10.63,0.00,1.00,-28.80,-24.00 +-38.40,-19.20,10.67,0.00,1.00,-28.80,-19.20 +-33.60,-19.20,10.71,0.00,1.00,-24.00,-19.20 +-28.80,-19.20,10.75,0.00,1.00,-19.20,-14.40 +-24.00,-14.40,10.79,0.00,1.00,-14.40,-14.40 +-19.20,-14.40,10.83,0.00,1.00,-14.40,-9.60 +-14.40,-9.60,10.87,0.00,1.00,-9.60,-9.60 +-14.40,-9.60,10.91,0.00,1.00,-9.60,-4.80 +-9.60,-4.80,10.95,0.00,1.00,-4.80,-4.80 +-4.80,-4.80,10.99,0.00,1.00,-4.80,0.00 +0.00,0.00,11.03,0.00,1.00,0.00,0.00 +4.80,0.00,11.07,0.00,1.00,0.00,4.80 +9.60,4.80,11.11,0.00,1.00,4.80,4.80 +14.40,4.80,11.15,0.00,1.00,4.80,9.60 +19.20,9.60,11.19,0.00,1.00,9.60,9.60 +19.20,9.60,11.23,0.00,1.00,9.60,14.40 +24.00,14.40,11.27,0.00,1.00,14.40,14.40 +28.80,14.40,11.31,0.00,1.00,19.20,19.20 +33.60,14.40,11.35,0.00,1.00,19.20,19.20 +38.40,19.20,11.39,0.00,1.00,24.00,19.20 +43.20,19.20,11.43,0.00,1.00,28.80,24.00 +48.00,24.00,11.47,0.00,1.00,33.60,24.00 +52.80,24.00,11.51,0.00,1.00,38.40,24.00 +57.60,24.00,11.55,0.00,1.00,43.20,24.00 +62.40,24.00,11.59,0.00,1.00,48.00,28.80 +72.00,24.00,11.63,0.00,1.00,52.80,28.80 +76.80,28.80,11.67,0.00,1.00,62.40,28.80 +81.60,28.80,11.71,0.00,1.00,72.00,28.80 +86.40,28.80,11.75,0.00,1.00,81.60,28.80 +91.20,28.80,11.79,0.00,1.00,91.20,28.80 +96.00,28.80,11.83,0.00,1.00,100.80,28.80 +100.80,28.80,11.87,0.00,1.00,110.40,28.80 +105.60,28.80,11.91,0.00,1.00,120.00,28.80 +110.40,24.00,11.95,0.00,1.00,129.60,24.00 +120.00,24.00,11.99,0.00,1.00,134.40,24.00 +124.80,24.00,12.03,0.00,1.00,139.20,24.00 +129.60,24.00,12.07,0.00,1.00,144.00,24.00 +134.40,19.20,12.11,0.00,1.00,148.80,19.20 +139.20,19.20,12.15,0.00,1.00,153.60,19.20 +144.00,19.20,12.19,0.00,1.00,158.40,14.40 +148.80,14.40,12.23,0.00,1.00,163.20,14.40 +153.60,14.40,12.27,0.00,1.00,163.20,14.40 +158.40,9.60,12.31,0.00,1.00,168.00,9.60 +158.40,9.60,12.35,0.00,1.00,168.00,9.60 +163.20,9.60,12.39,0.00,1.00,172.80,4.80 +168.00,4.80,12.43,0.00,1.00,172.80,4.80 +172.80,4.80,12.47,0.00,1.00,177.60,0.00 +177.60,0.00,12.51,0.00,1.00,177.60,-0.00 +-177.60,-0.00,12.55,0.00,1.00,-177.60,-4.80 +-172.80,-4.80,12.59,0.00,1.00,-177.60,-4.80 +-168.00,-4.80,12.63,0.00,1.00,-172.80,-9.60 +-163.20,-9.60,12.67,0.00,1.00,-172.80,-9.60 +-158.40,-9.60,12.71,0.00,1.00,-168.00,-14.40 +-158.40,-9.60,12.75,0.00,1.00,-168.00,-14.40 +-153.60,-14.40,12.79,0.00,1.00,-163.20,-14.40 +-148.80,-14.40,12.83,0.00,1.00,-163.20,-19.20 +-144.00,-19.20,12.87,0.00,1.00,-158.40,-19.20 +-139.20,-19.20,12.91,0.00,1.00,-153.60,-24.00 +-134.40,-19.20,12.95,0.00,1.00,-148.80,-24.00 +-129.60,-24.00,12.99,0.00,1.00,-144.00,-24.00 +-124.80,-24.00,13.03,0.00,1.00,-139.20,-24.00 +-120.00,-24.00,13.07,0.00,1.00,-134.40,-28.80 +-110.40,-24.00,13.11,0.00,1.00,-129.60,-28.80 +-105.60,-28.80,13.15,0.00,1.00,-120.00,-28.80 +-100.80,-28.80,13.19,0.00,1.00,-110.40,-28.80 +-96.00,-28.80,13.23,0.00,1.00,-100.80,-28.80 +-91.20,-28.80,13.27,0.00,1.00,-91.20,-28.80 +-86.40,-28.80,13.31,0.00,1.00,-81.60,-28.80 +-81.60,-28.80,13.35,0.00,1.00,-72.00,-28.80 +-76.80,-28.80,13.39,0.00,1.00,-62.40,-28.80 +-72.00,-24.00,13.43,0.00,1.00,-52.80,-24.00 +-62.40,-24.00,13.47,0.00,1.00,-48.00,-24.00 +-57.60,-24.00,13.51,0.00,1.00,-43.20,-24.00 +-52.80,-24.00,13.55,0.00,1.00,-38.40,-24.00 +-48.00,-24.00,13.59,0.00,1.00,-33.60,-19.20 +-43.20,-19.20,13.63,0.00,1.00,-28.80,-19.20 +-38.40,-19.20,13.67,0.00,1.00,-24.00,-19.20 +-33.60,-14.40,13.71,0.00,1.00,-19.20,-14.40 +-28.80,-14.40,13.75,0.00,1.00,-19.20,-14.40 +-24.00,-14.40,13.79,0.00,1.00,-14.40,-9.60 +-19.20,-9.60,13.83,0.00,1.00,-9.60,-9.60 +-19.20,-9.60,13.87,0.00,1.00,-9.60,-4.80 +-14.40,-4.80,13.91,0.00,1.00,-4.80,-4.80 +-9.60,-4.80,13.95,0.00,1.00,-4.80,-0.00 +-4.80,-0.00,13.99,0.00,1.00,-0.00,0.00 +0.00,0.00,14.04,0.00,1.00,0.00,0.00 +4.80,0.00,14.08,0.00,1.00,0.00,4.80 +9.60,4.80,14.12,0.00,1.00,4.80,4.80 +14.40,4.80,14.16,0.00,1.00,4.80,9.60 +19.20,9.60,14.20,0.00,1.00,9.60,9.60 +24.00,9.60,14.24,0.00,1.00,9.60,9.60 +28.80,9.60,14.28,0.00,1.00,14.40,14.40 +33.60,14.40,14.32,0.00,1.00,14.40,14.40 +38.40,14.40,14.36,0.00,1.00,19.20,14.40 +43.20,14.40,14.40,0.00,1.00,19.20,19.20 +48.00,14.40,14.44,0.00,1.00,24.00,19.20 +52.80,19.20,14.48,0.00,1.00,28.80,19.20 +57.60,19.20,14.52,0.00,1.00,33.60,19.20 +62.40,19.20,14.56,0.00,1.00,38.40,24.00 +67.20,19.20,14.60,0.00,1.00,43.20,24.00 +72.00,24.00,14.64,0.00,1.00,48.00,24.00 +76.80,24.00,14.68,0.00,1.00,57.60,24.00 +81.60,24.00,14.72,0.00,1.00,67.20,24.00 +86.40,24.00,14.76,0.00,1.00,81.60,24.00 +91.20,24.00,14.80,0.00,1.00,91.20,24.00 +96.00,24.00,14.84,0.00,1.00,105.60,24.00 +100.80,24.00,14.88,0.00,1.00,115.20,24.00 +105.60,24.00,14.92,0.00,1.00,124.80,24.00 +110.40,19.20,14.96,0.00,1.00,134.40,19.20 +115.20,19.20,15.00,0.00,1.00,139.20,19.20 +120.00,19.20,15.04,0.00,1.00,144.00,19.20 +124.80,19.20,15.08,0.00,1.00,148.80,19.20 +129.60,19.20,15.12,0.00,1.00,153.60,19.20 +134.40,14.40,15.16,0.00,1.00,158.40,14.40 +139.20,14.40,15.20,0.00,1.00,163.20,14.40 +144.00,14.40,15.24,0.00,1.00,163.20,14.40 +148.80,9.60,15.28,0.00,1.00,168.00,9.60 +153.60,9.60,15.32,0.00,1.00,168.00,9.60 +158.40,9.60,15.36,0.00,1.00,172.80,4.80 +163.20,4.80,15.40,0.00,1.00,172.80,4.80 +168.00,4.80,15.44,0.00,1.00,177.60,4.80 +172.80,4.80,15.48,0.00,1.00,177.60,0.00 +177.60,0.00,15.52,0.00,1.00,177.60,-0.00 +-177.60,-0.00,15.56,0.00,1.00,-177.60,-4.80 +-172.80,-4.80,15.60,0.00,1.00,-177.60,-4.80 +-168.00,-4.80,15.64,0.00,1.00,-177.60,-4.80 +-163.20,-4.80,15.68,0.00,1.00,-172.80,-9.60 +-158.40,-9.60,15.72,0.00,1.00,-172.80,-9.60 +-153.60,-9.60,15.76,0.00,1.00,-168.00,-14.40 +-148.80,-9.60,15.80,0.00,1.00,-168.00,-14.40 +-144.00,-14.40,15.84,0.00,1.00,-163.20,-14.40 +-139.20,-14.40,15.88,0.00,1.00,-163.20,-19.20 +-134.40,-14.40,15.92,0.00,1.00,-158.40,-19.20 +-129.60,-19.20,15.96,0.00,1.00,-153.60,-19.20 +-124.80,-19.20,16.00,0.00,1.00,-148.80,-19.20 +-120.00,-19.20,16.00,0.00,1.00,-144.00,-19.20 +-115.20,-19.20,15.96,0.00,1.00,-139.20,-24.00 +-110.40,-19.20,15.92,0.00,1.00,-134.40,-24.00 +-105.60,-24.00,15.88,0.00,1.00,-124.80,-24.00 +-100.80,-24.00,15.84,0.00,1.00,-115.20,-24.00 +-96.00,-24.00,15.80,0.00,1.00,-105.60,-24.00 +-91.20,-24.00,15.76,0.00,1.00,-91.20,-24.00 +-86.40,-24.00,15.72,0.00,1.00,-81.60,-24.00 +-81.60,-24.00,15.68,0.00,1.00,-67.20,-24.00 +-76.80,-24.00,15.64,0.00,1.00,-57.60,-24.00 +-72.00,-24.00,15.60,0.00,1.00,-48.00,-24.00 +-67.20,-19.20,15.56,0.00,1.00,-43.20,-19.20 +-62.40,-19.20,15.52,0.00,1.00,-38.40,-19.20 +-57.60,-19.20,15.48,0.00,1.00,-33.60,-19.20 +-52.80,-19.20,15.44,0.00,1.00,-28.80,-19.20 +-48.00,-14.40,15.40,0.00,1.00,-24.00,-14.40 +-43.20,-14.40,15.36,0.00,1.00,-19.20,-14.40 +-38.40,-14.40,15.32,0.00,1.00,-19.20,-14.40 +-33.60,-14.40,15.28,0.00,1.00,-14.40,-9.60 +-28.80,-9.60,15.24,0.00,1.00,-14.40,-9.60 +-24.00,-9.60,15.20,0.00,1.00,-9.60,-9.60 +-19.20,-9.60,15.16,0.00,1.00,-9.60,-4.80 +-14.40,-4.80,15.12,0.00,1.00,-4.80,-4.80 +-9.60,-4.80,15.08,0.00,1.00,-4.80,-0.00 +-4.80,-0.00,15.04,0.00,1.00,-0.00,0.00 +0.00,0.00,15.00,0.00,1.00,0.00,0.00 +4.80,0.00,14.96,0.00,1.00,0.00,4.80 +9.60,4.80,14.92,0.00,1.00,4.80,4.80 +14.40,4.80,14.88,0.00,1.00,4.80,4.80 +19.20,4.80,14.84,0.00,1.00,4.80,9.60 +24.00,9.60,14.80,0.00,1.00,9.60,9.60 +28.80,9.60,14.76,0.00,1.00,9.60,9.60 +33.60,9.60,14.72,0.00,1.00,9.60,9.60 +38.40,9.60,14.68,0.00,1.00,14.40,14.40 +43.20,14.40,14.64,0.00,1.00,14.40,14.40 +48.00,14.40,14.60,0.00,1.00,19.20,14.40 +52.80,14.40,14.56,0.00,1.00,24.00,14.40 +57.60,14.40,14.52,0.00,1.00,24.00,19.20 +62.40,14.40,14.48,0.00,1.00,28.80,19.20 +67.20,14.40,14.44,0.00,1.00,38.40,19.20 +72.00,19.20,14.40,0.00,1.00,43.20,19.20 +76.80,19.20,14.36,0.00,1.00,52.80,19.20 +81.60,19.20,14.32,0.00,1.00,62.40,19.20 +86.40,19.20,14.28,0.00,1.00,76.80,19.20 +91.20,19.20,14.24,0.00,1.00,96.00,19.20 +96.00,19.20,14.20,0.00,1.00,110.40,19.20 +100.80,19.20,14.16,0.00,1.00,120.00,19.20 +105.60,19.20,14.12,0.00,1.00,134.40,19.20 +110.40,19.20,14.08,0.00,1.00,139.20,19.20 +115.20,14.40,14.04,0.00,1.00,148.80,14.40 +120.00,14.40,13.99,0.00,1.00,153.60,14.40 +124.80,14.40,13.95,0.00,1.00,158.40,14.40 +129.60,14.40,13.91,0.00,1.00,158.40,14.40 +134.40,14.40,13.87,0.00,1.00,163.20,14.40 +139.20,9.60,13.83,0.00,1.00,163.20,9.60 +144.00,9.60,13.79,0.00,1.00,168.00,9.60 +148.80,9.60,13.75,0.00,1.00,168.00,9.60 +153.60,9.60,13.71,0.00,1.00,172.80,4.80 +158.40,4.80,13.67,0.00,1.00,172.80,4.80 +163.20,4.80,13.63,0.00,1.00,172.80,4.80 +168.00,4.80,13.59,0.00,1.00,177.60,0.00 +172.80,0.00,13.55,0.00,1.00,177.60,0.00 +177.60,0.00,13.51,0.00,1.00,177.60,-0.00 +-177.60,-0.00,13.47,0.00,1.00,-177.60,-0.00 +-172.80,-0.00,13.43,0.00,1.00,-177.60,-4.80 +-168.00,-4.80,13.39,0.00,1.00,-177.60,-4.80 +-163.20,-4.80,13.35,0.00,1.00,-172.80,-4.80 +-158.40,-4.80,13.31,0.00,1.00,-172.80,-9.60 +-153.60,-9.60,13.27,0.00,1.00,-172.80,-9.60 +-148.80,-9.60,13.23,0.00,1.00,-168.00,-9.60 +-144.00,-9.60,13.19,0.00,1.00,-168.00,-14.40 +-139.20,-9.60,13.15,0.00,1.00,-163.20,-14.40 +-134.40,-14.40,13.11,0.00,1.00,-163.20,-14.40 +-129.60,-14.40,13.07,0.00,1.00,-158.40,-14.40 +-124.80,-14.40,13.03,0.00,1.00,-158.40,-14.40 +-120.00,-14.40,12.99,0.00,1.00,-153.60,-19.20 +-115.20,-14.40,12.95,0.00,1.00,-148.80,-19.20 +-110.40,-19.20,12.91,0.00,1.00,-139.20,-19.20 +-105.60,-19.20,12.87,0.00,1.00,-134.40,-19.20 +-100.80,-19.20,12.83,0.00,1.00,-120.00,-19.20 +-96.00,-19.20,12.79,0.00,1.00,-110.40,-19.20 +-91.20,-19.20,12.75,0.00,1.00,-96.00,-19.20 +-86.40,-19.20,12.71,0.00,1.00,-76.80,-19.20 +-81.60,-19.20,12.67,0.00,1.00,-62.40,-19.20 +-76.80,-19.20,12.63,0.00,1.00,-52.80,-19.20 +-72.00,-19.20,12.59,0.00,1.00,-43.20,-19.20 +-67.20,-14.40,12.55,0.00,1.00,-38.40,-19.20 +-62.40,-14.40,12.51,0.00,1.00,-28.80,-14.40 +-57.60,-14.40,12.47,0.00,1.00,-24.00,-14.40 +-52.80,-14.40,12.43,0.00,1.00,-24.00,-14.40 +-48.00,-14.40,12.39,0.00,1.00,-19.20,-14.40 +-43.20,-14.40,12.35,0.00,1.00,-14.40,-9.60 +-38.40,-9.60,12.31,0.00,1.00,-14.40,-9.60 +-33.60,-9.60,12.27,0.00,1.00,-9.60,-9.60 +-28.80,-9.60,12.23,0.00,1.00,-9.60,-9.60 +-24.00,-9.60,12.19,0.00,1.00,-9.60,-4.80 +-19.20,-4.80,12.15,0.00,1.00,-4.80,-4.80 +-14.40,-4.80,12.11,0.00,1.00,-4.80,-4.80 +-9.60,-4.80,12.07,0.00,1.00,-4.80,-0.00 +-4.80,-0.00,12.03,0.00,1.00,-0.00,0.00 +0.00,0.00,11.99,0.00,1.00,0.00,0.00 +4.80,0.00,11.95,0.00,1.00,0.00,0.00 +9.60,0.00,11.91,0.00,1.00,0.00,4.80 +14.40,4.80,11.87,0.00,1.00,4.80,4.80 +19.20,4.80,11.83,0.00,1.00,4.80,4.80 +24.00,4.80,11.79,0.00,1.00,4.80,4.80 +28.80,4.80,11.75,0.00,1.00,4.80,9.60 +33.60,9.60,11.71,0.00,1.00,9.60,9.60 +38.40,9.60,11.67,0.00,1.00,9.60,9.60 +43.20,9.60,11.63,0.00,1.00,14.40,9.60 +48.00,9.60,11.59,0.00,1.00,14.40,9.60 +52.80,9.60,11.55,0.00,1.00,14.40,14.40 +57.60,9.60,11.51,0.00,1.00,19.20,14.40 +62.40,9.60,11.47,0.00,1.00,24.00,14.40 +67.20,14.40,11.43,0.00,1.00,28.80,14.40 +72.00,14.40,11.39,0.00,1.00,33.60,14.40 +76.80,14.40,11.35,0.00,1.00,43.20,14.40 +81.60,14.40,11.31,0.00,1.00,57.60,14.40 +86.40,14.40,11.27,0.00,1.00,76.80,14.40 +91.20,14.40,11.23,0.00,1.00,96.00,14.40 +96.00,14.40,11.19,0.00,1.00,115.20,14.40 +100.80,14.40,11.15,0.00,1.00,129.60,14.40 +105.60,14.40,11.11,0.00,1.00,139.20,14.40 +110.40,14.40,11.07,0.00,1.00,148.80,14.40 +115.20,9.60,11.03,0.00,1.00,153.60,14.40 +120.00,9.60,10.99,0.00,1.00,158.40,9.60 +124.80,9.60,10.95,0.00,1.00,163.20,9.60 +129.60,9.60,10.91,0.00,1.00,163.20,9.60 +134.40,9.60,10.87,0.00,1.00,168.00,9.60 +139.20,9.60,10.83,0.00,1.00,168.00,9.60 +144.00,9.60,10.79,0.00,1.00,172.80,9.60 +148.80,4.80,10.75,0.00,1.00,172.80,4.80 +153.60,4.80,10.71,0.00,1.00,172.80,4.80 +158.40,4.80,10.67,0.00,1.00,172.80,4.80 +163.20,4.80,10.63,0.00,1.00,177.60,4.80 +168.00,4.80,10.59,0.00,1.00,177.60,0.00 +172.80,0.00,10.55,0.00,1.00,177.60,0.00 +177.60,0.00,10.51,0.00,1.00,177.60,-0.00 +-177.60,-0.00,10.47,0.00,1.00,-177.60,-0.00 +-172.80,-0.00,10.43,0.00,1.00,-177.60,-4.80 +-168.00,-4.80,10.39,0.00,1.00,-177.60,-4.80 +-163.20,-4.80,10.35,0.00,1.00,-177.60,-4.80 +-158.40,-4.80,10.31,0.00,1.00,-172.80,-4.80 +-153.60,-4.80,10.27,0.00,1.00,-172.80,-9.60 +-148.80,-4.80,10.23,0.00,1.00,-172.80,-9.60 +-144.00,-9.60,10.19,0.00,1.00,-172.80,-9.60 +-139.20,-9.60,10.15,0.00,1.00,-168.00,-9.60 +-134.40,-9.60,10.11,0.00,1.00,-168.00,-9.60 +-129.60,-9.60,10.07,0.00,1.00,-163.20,-9.60 +-124.80,-9.60,10.03,0.00,1.00,-163.20,-14.40 +-120.00,-9.60,9.98,0.00,1.00,-158.40,-14.40 +-115.20,-9.60,9.94,0.00,1.00,-153.60,-14.40 +-110.40,-14.40,9.90,0.00,1.00,-148.80,-14.40 +-105.60,-14.40,9.86,0.00,1.00,-139.20,-14.40 +-100.80,-14.40,9.82,0.00,1.00,-129.60,-14.40 +-96.00,-14.40,9.78,0.00,1.00,-115.20,-14.40 +-91.20,-14.40,9.74,0.00,1.00,-96.00,-14.40 +-86.40,-14.40,9.70,0.00,1.00,-76.80,-14.40 +-81.60,-14.40,9.66,0.00,1.00,-57.60,-14.40 +-76.80,-14.40,9.62,0.00,1.00,-43.20,-14.40 +-72.00,-14.40,9.58,0.00,1.00,-33.60,-14.40 +-67.20,-14.40,9.54,0.00,1.00,-28.80,-14.40 +-62.40,-9.60,9.50,0.00,1.00,-24.00,-14.40 +-57.60,-9.60,9.46,0.00,1.00,-19.20,-9.60 +-52.80,-9.60,9.42,0.00,1.00,-14.40,-9.60 +-48.00,-9.60,9.38,0.00,1.00,-14.40,-9.60 +-43.20,-9.60,9.34,0.00,1.00,-14.40,-9.60 +-38.40,-9.60,9.30,0.00,1.00,-9.60,-9.60 +-33.60,-9.60,9.26,0.00,1.00,-9.60,-4.80 +-28.80,-4.80,9.22,0.00,1.00,-4.80,-4.80 +-24.00,-4.80,9.18,0.00,1.00,-4.80,-4.80 +-19.20,-4.80,9.14,0.00,1.00,-4.80,-4.80 +-14.40,-4.80,9.10,0.00,1.00,-4.80,-0.00 +-9.60,-0.00,9.06,0.00,1.00,-0.00,-0.00 +-4.80,-0.00,9.02,0.00,1.00,-0.00,0.00 +0.00,0.00,8.98,0.00,1.00,0.00,0.00 +4.80,0.00,8.94,0.00,1.00,0.00,0.00 +9.60,0.00,8.90,0.00,1.00,0.00,0.00 +14.40,0.00,8.86,0.00,1.00,0.00,4.80 +19.20,4.80,8.82,0.00,1.00,4.80,4.80 +24.00,4.80,8.78,0.00,1.00,4.80,4.80 +28.80,4.80,8.74,0.00,1.00,4.80,4.80 +33.60,4.80,8.70,0.00,1.00,4.80,4.80 +38.40,4.80,8.66,0.00,1.00,4.80,4.80 +43.20,4.80,8.62,0.00,1.00,9.60,4.80 +48.00,4.80,8.58,0.00,1.00,9.60,9.60 +52.80,4.80,8.54,0.00,1.00,9.60,9.60 +57.60,4.80,8.50,0.00,1.00,14.40,9.60 +62.40,9.60,8.46,0.00,1.00,14.40,9.60 +67.20,9.60,8.42,0.00,1.00,19.20,9.60 +72.00,9.60,8.38,0.00,1.00,24.00,9.60 +76.80,9.60,8.34,0.00,1.00,33.60,9.60 +81.60,9.60,8.30,0.00,1.00,43.20,9.60 +86.40,9.60,8.26,0.00,1.00,67.20,9.60 +91.20,9.60,8.22,0.00,1.00,96.00,9.60 +96.00,9.60,8.18,0.00,1.00,124.80,9.60 +100.80,9.60,8.14,0.00,1.00,144.00,9.60 +105.60,9.60,8.10,0.00,1.00,153.60,9.60 +110.40,9.60,8.06,0.00,1.00,158.40,9.60 +115.20,9.60,8.02,0.00,1.00,163.20,9.60 +120.00,9.60,7.98,0.00,1.00,168.00,9.60 +124.80,4.80,7.94,0.00,1.00,168.00,9.60 +129.60,4.80,7.90,0.00,1.00,168.00,4.80 +134.40,4.80,7.86,0.00,1.00,172.80,4.80 +139.20,4.80,7.82,0.00,1.00,172.80,4.80 +144.00,4.80,7.78,0.00,1.00,172.80,4.80 +148.80,4.80,7.74,0.00,1.00,172.80,4.80 +153.60,4.80,7.70,0.00,1.00,177.60,4.80 +158.40,4.80,7.66,0.00,1.00,177.60,4.80 +163.20,4.80,7.62,0.00,1.00,177.60,0.00 +168.00,0.00,7.58,0.00,1.00,177.60,0.00 +172.80,0.00,7.54,0.00,1.00,177.60,0.00 +177.60,0.00,7.50,0.00,1.00,177.60,-0.00 +-177.60,-0.00,7.46,0.00,1.00,-177.60,-0.00 +-172.80,-0.00,7.42,0.00,1.00,-177.60,-0.00 +-168.00,-0.00,7.38,0.00,1.00,-177.60,-4.80 +-163.20,-4.80,7.34,0.00,1.00,-177.60,-4.80 +-158.40,-4.80,7.30,0.00,1.00,-177.60,-4.80 +-153.60,-4.80,7.26,0.00,1.00,-177.60,-4.80 +-148.80,-4.80,7.22,0.00,1.00,-172.80,-4.80 +-144.00,-4.80,7.18,0.00,1.00,-172.80,-4.80 +-139.20,-4.80,7.14,0.00,1.00,-172.80,-4.80 +-134.40,-4.80,7.10,0.00,1.00,-172.80,-9.60 +-129.60,-4.80,7.06,0.00,1.00,-168.00,-9.60 +-124.80,-4.80,7.02,0.00,1.00,-168.00,-9.60 +-120.00,-9.60,6.98,0.00,1.00,-168.00,-9.60 +-115.20,-9.60,6.94,0.00,1.00,-163.20,-9.60 +-110.40,-9.60,6.90,0.00,1.00,-158.40,-9.60 +-105.60,-9.60,6.86,0.00,1.00,-153.60,-9.60 +-100.80,-9.60,6.82,0.00,1.00,-144.00,-9.60 +-96.00,-9.60,6.78,0.00,1.00,-124.80,-9.60 +-91.20,-9.60,6.74,0.00,1.00,-96.00,-9.60 +-86.40,-9.60,6.70,0.00,1.00,-67.20,-9.60 +-81.60,-9.60,6.66,0.00,1.00,-43.20,-9.60 +-76.80,-9.60,6.62,0.00,1.00,-33.60,-9.60 +-72.00,-9.60,6.58,0.00,1.00,-24.00,-9.60 +-67.20,-9.60,6.54,0.00,1.00,-19.20,-9.60 +-62.40,-9.60,6.50,0.00,1.00,-14.40,-9.60 +-57.60,-4.80,6.46,0.00,1.00,-14.40,-9.60 +-52.80,-4.80,6.42,0.00,1.00,-9.60,-4.80 +-48.00,-4.80,6.38,0.00,1.00,-9.60,-4.80 +-43.20,-4.80,6.34,0.00,1.00,-9.60,-4.80 +-38.40,-4.80,6.30,0.00,1.00,-4.80,-4.80 +-33.60,-4.80,6.26,0.00,1.00,-4.80,-4.80 +-28.80,-4.80,6.22,0.00,1.00,-4.80,-4.80 +-24.00,-4.80,6.18,0.00,1.00,-4.80,-4.80 +-19.20,-4.80,6.14,0.00,1.00,-4.80,-0.00 +-14.40,-0.00,6.10,0.00,1.00,-0.00,-0.00 +-9.60,-0.00,6.06,0.00,1.00,-0.00,-0.00 +-4.80,-0.00,6.02,0.00,1.00,-0.00,0.00 +0.00,0.00,5.97,0.00,1.00,0.00,0.00 +4.80,0.00,5.93,0.00,1.00,0.00,0.00 +9.60,0.00,5.89,0.00,1.00,0.00,0.00 +14.40,0.00,5.85,0.00,1.00,0.00,0.00 +19.20,0.00,5.81,0.00,1.00,0.00,0.00 +24.00,0.00,5.77,0.00,1.00,0.00,0.00 +28.80,0.00,5.73,0.00,1.00,0.00,4.80 +33.60,0.00,5.69,0.00,1.00,0.00,4.80 +38.40,0.00,5.65,0.00,1.00,4.80,4.80 +43.20,4.80,5.61,0.00,1.00,4.80,4.80 +48.00,4.80,5.57,0.00,1.00,4.80,4.80 +52.80,4.80,5.53,0.00,1.00,4.80,4.80 +57.60,4.80,5.49,0.00,1.00,4.80,4.80 +62.40,4.80,5.45,0.00,1.00,4.80,4.80 +67.20,4.80,5.41,0.00,1.00,9.60,4.80 +72.00,4.80,5.37,0.00,1.00,9.60,4.80 +76.80,4.80,5.33,0.00,1.00,14.40,4.80 +81.60,4.80,5.29,0.00,1.00,24.00,4.80 +86.40,4.80,5.25,0.00,1.00,43.20,4.80 +91.20,4.80,5.21,0.00,1.00,110.40,4.80 +96.00,4.80,5.17,0.00,1.00,148.80,4.80 +100.80,4.80,5.13,0.00,1.00,163.20,4.80 +105.60,4.80,5.09,0.00,1.00,168.00,4.80 +110.40,4.80,5.05,0.00,1.00,172.80,4.80 +115.20,4.80,5.01,0.00,1.00,172.80,4.80 +120.00,4.80,4.97,0.00,1.00,172.80,4.80 +124.80,4.80,4.93,0.00,1.00,172.80,4.80 +129.60,4.80,4.89,0.00,1.00,177.60,4.80 +134.40,4.80,4.85,0.00,1.00,177.60,4.80 +139.20,0.00,4.81,0.00,1.00,177.60,4.80 +144.00,0.00,4.77,0.00,1.00,177.60,4.80 +148.80,0.00,4.73,0.00,1.00,177.60,0.00 +153.60,0.00,4.69,0.00,1.00,177.60,0.00 +158.40,0.00,4.65,0.00,1.00,177.60,0.00 +163.20,0.00,4.61,0.00,1.00,177.60,0.00 +168.00,0.00,4.57,0.00,1.00,177.60,0.00 +172.80,0.00,4.53,0.00,1.00,177.60,0.00 +177.60,0.00,4.49,0.00,1.00,177.60,-0.00 +-177.60,-0.00,4.45,0.00,1.00,-177.60,-0.00 +-172.80,-0.00,4.41,0.00,1.00,-177.60,-0.00 +-168.00,-0.00,4.37,0.00,1.00,-177.60,-0.00 +-163.20,-0.00,4.33,0.00,1.00,-177.60,-0.00 +-158.40,-0.00,4.29,0.00,1.00,-177.60,-0.00 +-153.60,-0.00,4.25,0.00,1.00,-177.60,-4.80 +-148.80,-0.00,4.21,0.00,1.00,-177.60,-4.80 +-144.00,-0.00,4.17,0.00,1.00,-177.60,-4.80 +-139.20,-0.00,4.13,0.00,1.00,-177.60,-4.80 +-134.40,-4.80,4.09,0.00,1.00,-177.60,-4.80 +-129.60,-4.80,4.05,0.00,1.00,-177.60,-4.80 +-124.80,-4.80,4.01,0.00,1.00,-172.80,-4.80 +-120.00,-4.80,3.97,0.00,1.00,-172.80,-4.80 +-115.20,-4.80,3.93,0.00,1.00,-172.80,-4.80 +-110.40,-4.80,3.89,0.00,1.00,-172.80,-4.80 +-105.60,-4.80,3.85,0.00,1.00,-168.00,-4.80 +-100.80,-4.80,3.81,0.00,1.00,-163.20,-4.80 +-96.00,-4.80,3.77,0.00,1.00,-148.80,-4.80 +-91.20,-4.80,3.73,0.00,1.00,-110.40,-4.80 +-86.40,-4.80,3.69,0.00,1.00,-43.20,-4.80 +-81.60,-4.80,3.65,0.00,1.00,-24.00,-4.80 +-76.80,-4.80,3.61,0.00,1.00,-14.40,-4.80 +-72.00,-4.80,3.57,0.00,1.00,-9.60,-4.80 +-67.20,-4.80,3.53,0.00,1.00,-9.60,-4.80 +-62.40,-4.80,3.49,0.00,1.00,-4.80,-4.80 +-57.60,-4.80,3.45,0.00,1.00,-4.80,-4.80 +-52.80,-4.80,3.41,0.00,1.00,-4.80,-4.80 +-48.00,-4.80,3.37,0.00,1.00,-4.80,-4.80 +-43.20,-4.80,3.33,0.00,1.00,-4.80,-4.80 +-38.40,-0.00,3.29,0.00,1.00,-4.80,-4.80 +-33.60,-0.00,3.25,0.00,1.00,-0.00,-0.00 +-28.80,-0.00,3.21,0.00,1.00,-0.00,-0.00 +-24.00,-0.00,3.17,0.00,1.00,-0.00,-0.00 +-19.20,-0.00,3.13,0.00,1.00,-0.00,-0.00 +-14.40,-0.00,3.09,0.00,1.00,-0.00,-0.00 +-9.60,-0.00,3.05,0.00,1.00,-0.00,-0.00 +-4.80,-0.00,3.01,0.00,1.00,-0.00,0.00 +0.00,0.00,2.97,0.00,1.00,-0.00,0.00 +4.80,-0.00,2.93,0.00,1.00,-0.00,0.00 +9.60,-0.00,2.89,0.00,1.00,-0.00,0.00 +14.40,-0.00,2.85,0.00,1.00,-0.00,0.00 +19.20,-0.00,2.81,0.00,1.00,-0.00,0.00 +24.00,-0.00,2.77,0.00,1.00,-0.00,0.00 +28.80,-0.00,2.73,0.00,1.00,-0.00,0.00 +33.60,-0.00,2.69,0.00,1.00,-0.00,0.00 +38.40,-0.00,2.65,0.00,1.00,-0.00,0.00 +43.20,-0.00,2.61,0.00,1.00,-0.00,0.00 +48.00,-0.00,2.57,0.00,1.00,-0.00,0.00 +52.80,-0.00,2.53,0.00,1.00,-0.00,0.00 +57.60,-0.00,2.49,0.00,1.00,-0.00,0.00 +62.40,-0.00,2.45,0.00,1.00,-0.00,0.00 +67.20,-0.00,2.41,0.00,1.00,-4.80,0.00 +72.00,-0.00,2.37,0.00,1.00,-4.80,0.00 +76.80,-0.00,2.33,0.00,1.00,-4.80,0.00 +81.60,-0.00,2.29,0.00,1.00,-9.60,0.00 +86.40,-0.00,2.25,0.00,1.00,-19.20,0.00 +91.20,-0.00,2.21,0.00,1.00,-134.40,0.00 +96.00,-0.00,2.17,0.00,1.00,-168.00,0.00 +100.80,-0.00,2.13,0.00,1.00,-172.80,0.00 +105.60,-0.00,2.09,0.00,1.00,-177.60,0.00 +110.40,-0.00,2.05,0.00,1.00,-177.60,0.00 +115.20,-0.00,2.01,0.00,1.00,-177.60,0.00 +120.00,-0.00,1.96,0.00,1.00,-177.60,0.00 +124.80,-0.00,1.92,0.00,1.00,-177.60,0.00 +129.60,-0.00,1.88,0.00,1.00,-177.60,0.00 +134.40,-0.00,1.84,0.00,1.00,-177.60,0.00 +139.20,-0.00,1.80,0.00,1.00,-177.60,0.00 +144.00,-0.00,1.76,0.00,1.00,-177.60,0.00 +148.80,-0.00,1.72,0.00,1.00,-177.60,0.00 +153.60,-0.00,1.68,0.00,1.00,-177.60,0.00 +158.40,-0.00,1.64,0.00,1.00,-177.60,0.00 +163.20,-0.00,1.60,0.00,1.00,-177.60,0.00 +168.00,-0.00,1.56,0.00,1.00,-177.60,0.00 +172.80,-0.00,1.52,0.00,1.00,-177.60,0.00 +177.60,-0.00,1.48,0.00,1.00,-177.60,0.00 +-177.60,0.00,1.44,0.00,1.00,177.60,0.00 +-172.80,0.00,1.40,0.00,1.00,177.60,0.00 +-168.00,0.00,1.36,0.00,1.00,177.60,0.00 +-163.20,0.00,1.32,0.00,1.00,177.60,0.00 +-158.40,0.00,1.28,0.00,1.00,177.60,0.00 +-153.60,0.00,1.24,0.00,1.00,177.60,0.00 +-148.80,0.00,1.20,0.00,1.00,177.60,0.00 +-144.00,0.00,1.16,0.00,1.00,177.60,0.00 +-139.20,0.00,1.12,0.00,1.00,177.60,0.00 +-134.40,0.00,1.08,0.00,1.00,177.60,0.00 +-129.60,0.00,1.04,0.00,1.00,177.60,0.00 +-124.80,0.00,1.00,0.00,1.00,177.60,0.00 +-120.00,0.00,0.96,0.00,1.00,177.60,0.00 +-115.20,0.00,0.92,0.00,1.00,177.60,0.00 +-110.40,0.00,0.88,0.00,1.00,177.60,0.00 +-105.60,0.00,0.84,0.00,1.00,177.60,0.00 +-100.80,0.00,0.80,0.00,1.00,172.80,0.00 +-96.00,0.00,0.76,0.00,1.00,168.00,0.00 +-91.20,0.00,0.72,0.00,1.00,134.40,0.00 +-86.40,0.00,0.68,0.00,1.00,19.20,0.00 +-81.60,0.00,0.64,0.00,1.00,9.60,0.00 +-76.80,0.00,0.60,0.00,1.00,4.80,0.00 +-72.00,0.00,0.56,0.00,1.00,4.80,0.00 +-67.20,0.00,0.52,0.00,1.00,4.80,0.00 +-62.40,0.00,0.48,0.00,1.00,0.00,0.00 +-57.60,0.00,0.44,0.00,1.00,0.00,0.00 +-52.80,0.00,0.40,0.00,1.00,0.00,0.00 +-48.00,0.00,0.36,0.00,1.00,0.00,0.00 +-43.20,0.00,0.32,0.00,1.00,0.00,0.00 +-38.40,0.00,0.28,0.00,1.00,0.00,0.00 +-33.60,0.00,0.24,0.00,1.00,0.00,0.00 +-28.80,0.00,0.20,0.00,1.00,0.00,0.00 +-24.00,0.00,0.16,0.00,1.00,0.00,0.00 +-19.20,0.00,0.12,0.00,1.00,0.00,0.00 +-14.40,0.00,0.08,0.00,1.00,0.00,0.00 +-9.60,0.00,0.04,0.00,1.00,0.00,0.00 +-4.80,0.00,0.00,0.00,1.00,0.00,0.00 diff --git a/scripts/testv/stvST16c.pcm b/scripts/testv/stvST16c.pcm deleted file mode 100644 index 2065162444..0000000000 --- a/scripts/testv/stvST16c.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d6c807c28b5db494240b4b8cc574c73a97c2bc3dabc2089bbfa9dd24fe28a89a -size 1280004 diff --git a/scripts/testv/stvST16c.wav b/scripts/testv/stvST16c.wav new file mode 100644 index 0000000000..3fb9ec0b3b --- /dev/null +++ b/scripts/testv/stvST16c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11a2f5887fe2407df03128634188d8aef6d3f76b52db14a1f834dbb98b7dd52e +size 1280048 diff --git a/scripts/testv/stvST16n.pcm b/scripts/testv/stvST16n.pcm deleted file mode 100644 index e9dee06322..0000000000 --- a/scripts/testv/stvST16n.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:937241850c1092ca3d847a72bd2b319e8e731194ac83215e7590b29ed66f2fbd -size 1241604 diff --git a/scripts/testv/stvST16n.wav b/scripts/testv/stvST16n.wav new file mode 100644 index 0000000000..74c80dca93 --- /dev/null +++ b/scripts/testv/stvST16n.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60a8cfa5abf4e052840fea0054fec5331465149747fd7bc7eadab18b62d864f1 +size 1241648 diff --git a/scripts/testv/stvST32c.pcm b/scripts/testv/stvST32c.pcm deleted file mode 100644 index 2c7229c369..0000000000 --- a/scripts/testv/stvST32c.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6ec344a0e1b84090e7d2ad712c1d2b5f1685eb4d6b3d09f89660e926149fb3c -size 2560000 diff --git a/scripts/testv/stvST32c.wav b/scripts/testv/stvST32c.wav new file mode 100644 index 0000000000..68a4a1fa33 --- /dev/null +++ b/scripts/testv/stvST32c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1182294e7c3ba44e854219698e6a3c209e24345ab2e5e4296fce38029324f374 +size 2560044 diff --git a/scripts/testv/stvST32n.pcm b/scripts/testv/stvST32n.pcm deleted file mode 100644 index fc9c266af6..0000000000 --- a/scripts/testv/stvST32n.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:157369cc45a4667262983e4afcfe29c307ba674d36daf0ef8d1a1e71c0551d32 -size 2483200 diff --git a/scripts/testv/stvST32n.wav b/scripts/testv/stvST32n.wav new file mode 100644 index 0000000000..7da590907d --- /dev/null +++ b/scripts/testv/stvST32n.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6edbfd26681fa42f377891761ad79f97029a3380bc644e47bff1803c7904ff9 +size 2483244 diff --git a/scripts/testv/stvST48c.pcm b/scripts/testv/stvST48c.pcm deleted file mode 100644 index d12de42a45..0000000000 --- a/scripts/testv/stvST48c.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:594b7e2f24baa73faa8628eede30706f409966c3e535cf0705217843b07e30ef -size 3840000 diff --git a/scripts/testv/stvST48c.wav b/scripts/testv/stvST48c.wav new file mode 100644 index 0000000000..df554e6521 --- /dev/null +++ b/scripts/testv/stvST48c.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40929eb3eb266ed78c16daa2a9c987745fe8e005a577f2dd81264ffda845c118 +size 3840044 diff --git a/scripts/testv/stvST48n.pcm b/scripts/testv/stvST48n.pcm deleted file mode 100644 index 3003287edd..0000000000 --- a/scripts/testv/stvST48n.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57694c7ad6e279b8ef4e9e1b19a16e4252b7bae2a2f70a09ef7b2e9f64403a04 -size 3724800 diff --git a/scripts/testv/stvST48n.wav b/scripts/testv/stvST48n.wav new file mode 100644 index 0000000000..cb2d8c4fc3 --- /dev/null +++ b/scripts/testv/stvST48n.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6074a3a3b88c7868f62c9bcf7df56e4a8fd25ffed059886846220efc4fbc0992 +size 3724844 diff --git a/scripts/testv/stv_IVASMASA_1dir1TC.pcm b/scripts/testv/stv_IVASMASA_1dir1TC.pcm deleted file mode 100644 index 8f2bfc54e0..0000000000 --- a/scripts/testv/stv_IVASMASA_1dir1TC.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4dbbaa5c75c36bc74a100bc5721bc3cf2af4e22e2854a5b85c93532556afc776 -size 288000 diff --git a/scripts/testv/stv_IVASMASA_1dir1TC_DTX.pcm b/scripts/testv/stv_IVASMASA_1dir1TC_DTX.pcm deleted file mode 100644 index b642a34076..0000000000 --- a/scripts/testv/stv_IVASMASA_1dir1TC_DTX.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c45ab47c02eab6c5f9737749a0229c0bc4eed4b6ebe2cf8db077929ec1aa76a2 -size 1927680 diff --git a/scripts/testv/stv_IVASMASA_1dir2TC.pcm b/scripts/testv/stv_IVASMASA_1dir2TC.pcm deleted file mode 100644 index 491e75f868..0000000000 --- a/scripts/testv/stv_IVASMASA_1dir2TC.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd34c99b89d9c1ed3514c3f8e32faf6b82fbc8bf364bc464904fc1c745266350 -size 1152000 diff --git a/scripts/testv/stv_IVASMASA_1dir2TC_DTX.pcm b/scripts/testv/stv_IVASMASA_1dir2TC_DTX.pcm deleted file mode 100644 index 34f827e55b..0000000000 --- a/scripts/testv/stv_IVASMASA_1dir2TC_DTX.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:04fe84511787c1577f2886bae5ee440fd3a7692381e119dab714aed70ff16466 -size 3855360 diff --git a/scripts/testv/stv_IVASMASA_2dir1TC.pcm b/scripts/testv/stv_IVASMASA_2dir1TC.pcm deleted file mode 100644 index 7c7209de2d..0000000000 --- a/scripts/testv/stv_IVASMASA_2dir1TC.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5afc7014451a8599f8399e3a503a29b23d22843ef482c0a701d4c46f6329ebc4 -size 576000 diff --git a/scripts/testv/stv_IVASMASA_2dir2TC.pcm b/scripts/testv/stv_IVASMASA_2dir2TC.pcm deleted file mode 100644 index ac8d4d341a..0000000000 --- a/scripts/testv/stv_IVASMASA_2dir2TC.pcm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d6c264295987b7db2a9a6a1352dd0b9c91a824fcc37c5631e0ba39e92df33f8 -size 576000 diff --git a/scripts/testv/test_FOA.wav b/scripts/testv/test_FOA.wav deleted file mode 100644 index fd654bb7ed..0000000000 --- a/scripts/testv/test_FOA.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9299bbe0637a72ab5419febfff4614066bda4ed8a58ffed19d068d17d4df46e0 -size 7680330 diff --git a/scripts/testv/test_HOA2.wav b/scripts/testv/test_HOA2.wav deleted file mode 100644 index e076c35ab8..0000000000 --- a/scripts/testv/test_HOA2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:daa96c69bcf085746add3c41db6e2082e1c691c1bf5ad85a8a815b0155caffe4 -size 17280580 diff --git a/scripts/testv/test_HOA3.wav b/scripts/testv/test_HOA3.wav deleted file mode 100644 index 811f8b5803..0000000000 --- a/scripts/testv/test_HOA3.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fef816a7ca44d528ff6d56c431fbd81a82b4cae5c7bd86c7770493427e9d3ffc -size 30720930 diff --git a/scripts/testv/test_ISM_1obj.wav b/scripts/testv/test_ISM_1obj.wav deleted file mode 100644 index b75df181b2..0000000000 --- a/scripts/testv/test_ISM_1obj.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ecc1d851c8c7f7ecf41e1b16abf01d35d37389584128537181add6f55530a9f -size 2880106 diff --git a/scripts/testv/test_ISM_2obj.wav b/scripts/testv/test_ISM_2obj.wav deleted file mode 100644 index a185618ec7..0000000000 --- a/scripts/testv/test_ISM_2obj.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41825bb3378c8a9657bc3ae4dbebda7a54591f5a7aae6de7f4c6cf077e9c8df0 -size 5760106 diff --git a/scripts/testv/test_ISM_3obj.wav b/scripts/testv/test_ISM_3obj.wav deleted file mode 100644 index 2ce3343535..0000000000 --- a/scripts/testv/test_ISM_3obj.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:235749b6b4f6e76c4dccbd8d9ece32bf979ce8b77b7ca4402bb5ca8c159f8acc -size 8640130 diff --git a/scripts/testv/test_ISM_4obj.wav b/scripts/testv/test_ISM_4obj.wav deleted file mode 100644 index e50b2d5cbd..0000000000 --- a/scripts/testv/test_ISM_4obj.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98bfb96a3b238a3e4004c07644932d35571f42d566f3278a6cf4bf6b080c1d1a -size 11520130 diff --git a/scripts/testv/test_MASA_1dir1TC.met b/scripts/testv/test_MASA_1dir1TC.met deleted file mode 100644 index f2ce23bd20..0000000000 --- a/scripts/testv/test_MASA_1dir1TC.met +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6349efe3448d28979b80744bcdc29d57f1c025704939b42d7b913d7fc3f23ccc -size 102300 diff --git a/scripts/testv/test_MASA_1dir1TC.wav b/scripts/testv/test_MASA_1dir1TC.wav deleted file mode 100644 index 9291feeee3..0000000000 --- a/scripts/testv/test_MASA_1dir1TC.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:54ea4543e4d6d43c312f1e461a75a3d8ce18e34bfb5777f15f2e494dd277d2e5 -size 288106 diff --git a/scripts/testv/test_MASA_1dir2TC.met b/scripts/testv/test_MASA_1dir2TC.met deleted file mode 100644 index 00acdae539..0000000000 --- a/scripts/testv/test_MASA_1dir2TC.met +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a1f87bfe360dbd221a94583aa68a58ef050e968a63351730d643f2dc2cac4e1 -size 204600 diff --git a/scripts/testv/test_MASA_1dir2TC.wav b/scripts/testv/test_MASA_1dir2TC.wav deleted file mode 100644 index aefec77efe..0000000000 --- a/scripts/testv/test_MASA_1dir2TC.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab7437cdf41e56338c93f5e593118a112a48bae5138be2cdd301eff5da59bb06 -size 1152106 diff --git a/scripts/testv/test_MASA_2dir1TC.met b/scripts/testv/test_MASA_2dir1TC.met deleted file mode 100644 index 6468877408..0000000000 --- a/scripts/testv/test_MASA_2dir1TC.met +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d125a4c4e3989ac55f9c2617f464431feae4ede9b2e15d087d3271c0a4a56303 -size 319800 diff --git a/scripts/testv/test_MASA_2dir1TC.wav b/scripts/testv/test_MASA_2dir1TC.wav deleted file mode 100644 index c80192b76b..0000000000 --- a/scripts/testv/test_MASA_2dir1TC.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b45ecb01efdc7a5d9877c9adcee2aad632ffde326dbc76554cb0452a78e3954d -size 576106 diff --git a/scripts/testv/test_MASA_2dir2TC.met b/scripts/testv/test_MASA_2dir2TC.met deleted file mode 100644 index 1b62022af5..0000000000 --- a/scripts/testv/test_MASA_2dir2TC.met +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2eb412d646d7a32c77413dea54dc44cf45dc49e6d8c2de19abe4f4b93a91fa4a -size 159900 diff --git a/scripts/testv/test_MASA_2dir2TC.wav b/scripts/testv/test_MASA_2dir2TC.wav deleted file mode 100644 index 0f72267ea0..0000000000 --- a/scripts/testv/test_MASA_2dir2TC.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a5a0379965053087ef1ce4775c85384e8c06aaa8161f12888f5e5c06d8612c1f -size 576106 diff --git a/scripts/testv/test_MC51.wav b/scripts/testv/test_MC51.wav deleted file mode 100644 index 334d819745..0000000000 --- a/scripts/testv/test_MC51.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a077210fb3ab4f4a8f04ab37a7813e474f3dfb3dbd927b71484e03986cb042a -size 11520130 diff --git a/scripts/testv/test_MC51p2.wav b/scripts/testv/test_MC51p2.wav deleted file mode 100644 index e696a7dae6..0000000000 --- a/scripts/testv/test_MC51p2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d056d0c1b412c1e8507872212f18bf333a91aac17358eae6a59c7a76f1bb0aaf -size 2304130 diff --git a/scripts/testv/test_MC51p4.wav b/scripts/testv/test_MC51p4.wav deleted file mode 100644 index 3d1c7812a4..0000000000 --- a/scripts/testv/test_MC51p4.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eddaf145410ca04daba554a719c58ed391159c7d73e6ea140d2b5de250929366 -size 2880130 diff --git a/scripts/testv/test_MC71.wav b/scripts/testv/test_MC71.wav deleted file mode 100644 index 2a0b012ab0..0000000000 --- a/scripts/testv/test_MC71.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d0ac38ddb16b2ce9cbca27965c5aedaf1af857a6fdce340bc01322794311e92d -size 2304130 diff --git a/scripts/testv/test_MC71p4.wav b/scripts/testv/test_MC71p4.wav deleted file mode 100644 index 9d0c1e594e..0000000000 --- a/scripts/testv/test_MC71p4.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1f3fa943f86082be69a774280379f179f4bd51f221ee7aad6471c0310a9f4ab -size 3456130 diff --git a/scripts/testv/test_mono.wav b/scripts/testv/test_mono.wav deleted file mode 100644 index b841d174c3..0000000000 --- a/scripts/testv/test_mono.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5daeac3fb92d487fc7ded7d1a4a9e6295d2f2f27f59f19dcdaeebaae01908a86 -size 1920106 diff --git a/scripts/testv/test_stereo.wav b/scripts/testv/test_stereo.wav deleted file mode 100644 index 70dc46062e..0000000000 --- a/scripts/testv/test_stereo.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e0de400200071a7b26de03eaef88b49efce7a5df813b971336ed17b90ba02aa2 -size 3840106 diff --git a/scripts/tools/Darwin/wmc_tool b/scripts/tools/Darwin/wmc_tool new file mode 100755 index 0000000000000000000000000000000000000000..1393aaa77f752e4595dfb5898a5a0b8a3e010ede GIT binary patch literal 502293 zcmX^0Z`VEs1_mZZ1_pKp1_ovZ1_uTP<`q8}7#R2%85npNK!61#vq}^s2I7w5(GVC7 zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!3jHhQRq> zZ~w6~FfcNM4gp|bU=UB)4BQ>WWwFqoJs{0mff|%#P1knKELzxf(sCf_$D7?~>ljBn>l2Z#x;!6^f(B1c7 z3&gw!Q1^lODCWTog3|Hv$@zK3hyX-4@4z;Qc?}8>13`S0@PnEIqvGR}i%W_!^U|RL z=;k?GX99=cWOaxF5Ff&VkmzoWk1x$D&&*4S&&*59#}a;5{z1&sfjEx=#78#+VlspT zrMnkkb6gxl9OIq+{eq#Xj~VPP&~X7;5<SG`qAS7)jS6Vi2FW3{R!gZiwBTDEf_)Og3Lj($N^#w%wG%+AYU(*FeslQ!T{u+l*E!m zkPHN)n|Htw;yx#cGy{l_&!6$}NyUiV3NjzneF9Dp^Atb<4mA_mJeaegQVgJQgOqPR zo_^l0E}qcT!O#FP2Oe$>5MTb#fanC71Hup<1A`I+LxTZ`)4Fg;GcXjiFf$0SF))DA6-b>&H#5T~P#HUenPGzf0|Pe$1497F90mpk zHz?L)U|;~HJv*p4HY#HpGeZRy2|fk}1_cJlK`#2G#YOr#nMwL7l{qO;wbCHBGB7Y` z&okM2s@~?wKBkEBqErzjBd9*GAK5_1!0>|e3pf-QO_;S97#KkL0%{C{1_MI_$UhF# z!8%~V-~(hp;R2Ea`I$jMgcVdm!`+gTnUt)pt!Jp0Qkj#P1Xd3UFSvRJbqw{vmBl5g zxq41eEnvIUpzdktf`o%6l>eiP86KWsg`>o12#kinXb6mkz-S1JhQMeDjE2By2#kin zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD zjE2By2#kinXb6mkz-S0y34u_L&Zofv&GiBdCBhz^zdgF^IbKAxFftr>2CtU$Xgdo;e0U}9kK=w|(Tk%_^ho57>g z^+NN0&;n{k{?@Hb3=E!~e~!0<_@K3Y9^LT*9?9+;X~&)aF>s|FXJO`LIPMNweaPU^ zdZ0v&U*3U%e;apiAY;QXCjO>bObiSSKkNBhCW7o}KFsLReBgiSz0R#1|Nj5?>~&EQ z@aSw+`1k+6Z+DG~07$^VqqEflDyiYo+3NA{|9_8O(_34a7<@YazgW`D2(rkhbE&|; z|Nr@0W`oS_Jp9@a5!@3znh!Jjbb}Rmbl&&qHJ!VaiQz>SNN49^kJbbHEzwL23@-fp zj2)Z*DU}E~HviKv$#QJ|r_SGcgpq;4)$qS#!#^cQ{wYTqs{hB7toP`=@6!40g-JBn zZvK`WZcwNk_2{i;bm8A-aEyV$qu2D(3MPgZtj&xJt{tTyC-S%Mt81P|Nq~Ge_J-AWAk7A5-!JvzgqmQ-v2>HO}|xz*v{|Nk#) z8yOi~Tc4Dud35gu3)nO=GC*wxTl!kmqq`RruRh&|uayiBK;>Y9orWIWy`Ut}Jr(4V zPC?J+ql_LiK%PJNkkz%*hR?GzhL6LyGlx&W^SBEiXc;L(^8rT3P8SsgpU&4W*}+N1 zwtO=agGaBZ-7+Qy$32W33=I1~gyDe~Zvq(^UVi6fVDRX?|6+dxBZFh-F%YvPf)Nyv z@tc_#e0ui^{Qv*or}Mu{=cmqth6i3eZeRo@Y~OAc6^~xq&r3muf)=3e0}(!*zYGt& zm;y3)KFHi|aGLh%w(#xEQBm;dHT4%@X7K6dZ30o9|9v`N?F22Mb=<*lSl;8soN|y; zT0s_iv>x#3Tnq9xf6E(I1_qzrtsvoDpq0)(o$q}*zkxOS^tvAK>Fs3z1@}EeMuye{ z{H?S2LAki}fJgUSkQR^DZ~QHvK&y_sr-IaZv|i$GdBniL(8b(&u;JnThJ*VXeoB_{ z*r=3n*u?X;tOup7ZzU$6vfxP_ zBZEhGD=4(O8D1-=!OB~Z`#n4Fyeww{g$OjIX};DlJmAp{PNLlq2SF2IrzR}Dft}Q8 z2~TU_L>0oz;MrNi%i-A>!wX7pyx{ca(cKHOx04YR2&JCKT2uc0|Icu|H3391Ffh1u z89VatJJ##5wE3q}d9+8b=(=1629IQxE)T{F{~w^JkB+Ubb=(sD@-QfNxE=Q~FmNz{ z3s6O99xM0b-*(AkAEOUsO}PjE;%mj$o}G7JDl#!JG#|Lp{DY}D2gOJYO^}fquZxeh zCV^a(25}iku=;ge!_WGX1E6v+2~?0Z9~F2li6}nPCU`anu)>H z;u-&xgQe^~-L{>lnHV}w`1G1Ecs3vV@3;q)`aL`EzUBed7p{z7K;=cEFXLAqQ092& z(K{6sj?gf6+yPSUxD%9DJbGE}c$paj9K&85vu0%QXg(qUE(H^q!O4by8-o=%3QAU6 zwI+fph*mdd1_oD6kOigleXQ4l(l>vz4M=(OQAVH6wcxx0OScN}zc2@Bf+to{ zSYg*~35{cDK?rgmOs>-smN2J+%F#|ic*1l%&cYAcH!w)J5`9TSjADl3o4=_T* zt&wHxsB%@&MV}dEBGdboxRj zh8L0$i%O>(9&qgKV_;xt@Mt~Y!te6Y$MS&-zw<{QNMQgkFf5P){&;DqYwvPMxIaGl znAIcs_Y1*lu*3OV&S!vv98nEP_;mh)ln>uMI`6$;tOf=7{}MG&d48k{xqLtbxuHil zI6z;kfJy`~6CUKSy2qsxmiZ8Y-YLQds&qJfJ5x|=9-nS-k?q*&3M;UEI-h&=nnrRl zGoY6BKE1qkT+9qFRu+OvTUe3L-zxp<|9=lit>Mva;nQo%xeinb*#>ekGfeR5{Dx|Z zZ|Bb!=^zt8d3ZmljPE?mzs-TshPQ+p)Z%GA&S=9`dIA&%4+7!U+tfgC_13TkR4vX0 zXE0E^22#DTfWoTRcFI~%y~f1Ez_1TQcy!*{8Nm2~-ZF9p@CzO7IATdMy5|KG*k@KdRz#HaH?!%rLjR#r9!25{B@ zXN%N%ObjoK{6Q%aTywZ|Yr3|+t+?mXshh*W%uwPCO@bcXoF2^w1zb8`y%yk?2Q|AH zJem(GG#~n3qVU}jp8p)d`HvBl{~Uk3p5fY^%kY}B!NQKewT~54>wzm`7fX%OIG@g~ zphCs9cP}VQxpw}86=QqLp?PYZJ1ATaBZ@K4oTM0_Y zf}rFEB0M^8xpaOsJn-U!J17QNIgdj6I@Yci_*-AvGcdSxKJaKf0_q7xJH|N1I>tH1 z#~ub*Hs23qFSvae0Flx;HDUQl~~ABgbiy!Eo{>;L~ClR^h|2>ErvjPALM}24qR`$XSe-}7p2fj2b`lkIuGpx?auS*1=q|z zy}k!tXsJVT)iV}QuG$JJi$FQ5-={nEfN$%Qk~V0v@#%c&ldRFr=xBMgGzOZ2T{`!I z(zD}1NXzki2{aY2Oai$Ck%}#RI$yz4@xK?(OCYIO1JrU{RRZdfKnm?{SBBRz@XRL( zO?$63LCqMj3Li)}2BxG_5?(8V+<{apA7|la!I`E(m4ipGYy%53!^`!c<}h-Zr^Ny; z^O8XnO7y&F$Oice7QXx~zZl`20#JrREBYQWV=4N0S(q7KSfH7+iIIU}7iiNpv{wP@ z+ancwovM%sa%Bc3olr!l;!;T;qSz~GLhVe5*{GBVfjSdhj0_Bj7A2^3=HG_Y?T{*Z zW1~{?!Y01t3Cjf=&a!*3=uWnPbR3SC#(H#u`y#Hr>mkL~J6N&BRt$~s?@pkgK}5I# zv?%~Bw!RgCBK&`eGN{@Vu&#m-EH1kx!GWl6cmUeb0&zXM!8XIxz~kGcQxlpv z;7x+#EZj^C3>+SvAy`T=P>jC>bqhe5Kf()MjPQDaN($2-OF-Ecy&kRsIkeYyAGm+% z49ff<0#uARfBgU7qgQtQ0gyIRoeiM&LFs|lf*#$)93IVwAz6Jco~-WE%ge;X%^$2dHOYl9C5Gm8h~36JIj3XL313=AwD-4z1-+xQ!P^76Ojf#SXSfI`DhuF{9# z@hwC{)}z-ncQH0UGBPl{FoigjALd8r#mIh~4yveo(f!B>YW?4Q@e9v?<`Z(3*>en)cw>^4oH_k;2G8In%4>IZ4Kn9siwRbWx zI9l9?4l
    ;w%mdGyLKcr+jW@3iScB-pO0l_cgHIasyX0n0GpCgE2rVX%Rrg}C821iYh*`-TB?PU*0IC=C| zfMze6ConO*Fm;61RI#AZr%uqY5oidpo1yhUg=Hse+Ak)Ck|Ks{lTK(K^o8Aa7GWvU@~YdQHKFEx3L=(%f6leUbDL}zHYr;lH$ww z4m$DR)A5*KgNY%)G4w@^I#Lu{8iJzu7$S;Sz@k{*kb%KP^L6X((m9~n zj^^W_m|fY&#PA~89vZWt1BpPP59uJoVz%c8g)!>_vgDf`Qp`#*LSq)xxpnMfM-1sp z6$#m>lzv0mShF?-eFB*QTlss4c43536pf;OFXDg^5fA9foXR8FL^OOAJgY10u3vI$3R>HV-ogtt}tQ0;0AI6U!%?Bksj)RgiXeJAqTss*d z16q!=K!X+F$uRKj4`kZNrWO% zTY{syG{K`A%y8-50ZIXgFn3FZq^TB`U{IJJ_2`}pveF~@GC0CP9e(^O0DV|>o`E-N(0Y2T}S)13ga8LQbCv;poEqx%p1$d7QIs0 zq<~V+{}N$Px5F5u1)g%4;4X%SFCrRTIt`(T2FbkwpsqNiYYIv_KA=%(4@lB^dEhUo zYXRxAb>4sR${N($1P_+Y2Thaons!YCRr}xp8K2JYE}f9UGCq)ldTk#~2Mv}9gL<1F z!l(1o&RWo@@0m9sQ^9kY9^Dq8vHi~=Q+RiOMkGkk2|b!~^~c};|6g28 zVr1B1E62dldDG+a3y;p$3xEIrH@xK0{F{S+>LGA%YzM>t`v3ecCpvpy{Qdub$0;Pm zpjh3pA2cxw)_dab|Nq{-EZ;qv5Ab+&wto2g|Np^95}i}ufXoEB2~?IggR=uGf6H$M z1_lU+r8L%~8=O#gg65H-b!_tw){+;!9{-zvGV`||0!!2jkSEd1>Y85tOMf`*o$7J2mYRzb{d^k6*k{{e=%%?B7A zIt)FU4>CHmd@E6Q=rVBlcIBtbI#+oBjfnh!Cy+%A3h`YdQ-i-Bne zXjst$k_BI?f=WCnTOLvefP$m*;0`3GH2-8Nd5h*;@EmzB@8LkO*C9^qay{T`_zhgx zLOs!PfWPGs$k^W4gZ%q`ypT#@Wax1I&%ccsG`iJtp!C(t#f%IL-@p;f$lqec!@vOb zC}?#EbUqUifC^AaMChW1LJ2e!O7Vn3m+JvYKzG8koc6S2DH z-V5b8P-XH2(hPYPi(DNN(+q(vq3NCqa-Jh>I@5=FEhrFtI@f}hX@F)pL9@x2)!?^Q zPEg|aC=S*ln7y!UF(60$WGSgw@eKD zEugk5w9y1=n=~I3c+Cr*;sPx>_{+e+0PE_!g0_@AECYX(--UAo%Px9!gBOy)tm_8P z2zWFfXMCCc|Nnni!*AbOL4_rTTYon(F}$cX#&D}5rdzMS0l5{_yvFI)FH~{s+n4*8 z85qEI3b^YH={Po6Xz;g&s$%J^L3@@iT?R;fHVuznQB7ZP35H{V$>!*nUm0PmMfjV~ zGNKs`>4?9)2o^_OGqSn*bCT3J}%HHJLwe@L+34@&YvJpfG2VJTO2{2aD;op5$p*@ zkS8oXdQBICx_bMg7#Scw0J&|)OK>WLFR-WsDVY-mE;34AxEg+Y`H_Kv0X$gJ(u3$; zyVWy+R^abNu+{RL-;Wm}7&THGgZ7GHAW#ThOW^P+zUrRHB}V z;l(L^aOjkzcy@vcQ&4(?b;kd{U}7loN6XXjVHPu3+4IiFvJgDXVh9>$Dg1%3V0#@C z!;4IPP-pxYD0=3*8h(Q&8g~BHwcvySD;v8(YIz}!;co%0g8{WgkqSkdPS!k-gJN(w z$PVrx56ejKoWCS!&R-HV!Ubx1KsxKnAbXbTfy%YRh(tf_wUS5c?Gh=EZg4&2!oRQL zuZx8>e`^;wV(z|Xb~SwK3tA_bz{J4dV+o$R=Wq950tM+4k8W_K#v1>>{(tiiwsJ*} zUfv*2a1jG)BpIIc=7>eL9zdgdF$G zZv$0XkkX;~IHO0e>EmuDh8GvY!Lh~P(g+SbaISLcwgeRq;Uy*TkOBD_R5aK=2Ney! zJUVYehsO^6FNpvJ(_wiJ(9$HNr4gVU)c~?0H=L0Hv`_{#sZzT8wT?%xY(_T|Xn6*s zN9S?S${}xvBTC;G{(sGTob}2xke@(3>*GF_-;15P*lny!4U{lXwwPXz|hl34x@B?VBU926Q1{H>y3 zJ*}Xnu0F}Ajf6I}937C!Il=0yKgMnb(m(EIb4G<##AjJ7Hfa zD9~Y3pNMvXe$I+?$Hfi zHSF2xW6t5(8Db7bf<^)i-rku=EZpyKwX6Ue`y ztc>no@TxCvWdEKE!R}wf*SLmfVC^E%01YF9f&-`t!~t4#3}S%%h1nK@HkLeKt)S8a zSeuQLo-i@I@C^ew{wSzX)cOLn76j541DEIE7Ad3_W#w=6{q+C;OXts^PIoVOOr-fB zqetfnk4`A>Cog|%2WT1?QG)QdsPlnS9wcBm4KI0go-_R4c^NWJ`pw0TQJ_?&8=Q(j zwO{jb1xS*zJY4kXnl1O-d1{Jyj&@6o5 ze~AMq3qw{HLgrb)&Ax}Qu@Otbva5(@AJ`hmC=0mRR}7kjgbX-&c7oR!L0h7h;1Dk5 zdua_?ClBi+L%V>`_9J-g2&x{^`tq;_k6rP%eBc5FE~LcjHC@}z#PA|d8=472!IP1o zLq0tJ?Bv0TR!Ll1KH8>a;zBw{A@VBaS zfP8)sG=Wt5)&ts0>NRZuh1_yTEc3ViWCta2aKEjK0eK#Q$0ojn!$yU_^*Ta@M{fn= zYZg$J43hVr`NQ*)UiDMUw3X(VYn?Rj%8_oJy8x{VRJAeQG zx6$BlWno9_{(zFBYnP1*VpfyC9W=G%(JMO95!~p(-LC@O%V48b!fO-H-%|be|NocE zK+}ZHN1(&^Z6!<$FE~_j21M>X$^$|PWXBQ}d;w7;ViR8?V57m`63@iI0E*ZDpbaMA zh02+rY&jJYSNyHpL9PDgBaDvx+fahC=#`C1$upbyl1HGKrLsGaI9Of`>i?_Y^j_ax z%Dv|dvg4>ShWBi2`1|iMGBDWa@V7Aj`TyU>n!n}e@BjZ_s<6Vky2T{UH#^oNx=_qT z;4ai2Sx6VkboVS!7YaV#yk!O|pn}`BXw#6ncfehz zZ(K-Sr=1cE4E)Dwf^%=|;DV0nX!6C#%i|32 zj2n~(xGczy`EsZM4l2Vvnt#}qi+F(BTnqvX8Xo+M5Aru%_y*b#3Z6uLtpJ@(H9YW| z56Xnj-$L8SKHyD6yK|WsUf9ZkeZk*i0?KBPeQ-X>hQ6)eDx6(9P3K()O%8&K6(3M1 z{#%KcXRp72OXnwO8|Kje62xj24@;!(I%H569%jBE+s?~^Z7ZGj@+hdtum(3&_?tmv z4d7PadXOk|1%jnPX`W;6JW#W{b1tZh0PQzl2CcILHS#8!fLh*1;44FqgZ31jbpy4x zzm}@r~m&U^VZFW7@KZ2Hq zW-~FocrOj>IzpS`C0TIqv>vDk>}2)5%EV9-hvYR-6CBie1hs2RT;UBxcq2IQM>(k5 z2sRJ3+Xxndw1Z!k|A)@xLIlC-3Owrm7CZzFTDXn0pA$anj=t{gzd8OIjNEl^JIfGd zTy-Y6j584hm2n>3yvCr_hmbWL(B*HSl~Sr;QSeGB(DEo122fiWvI-8moclG0E8}y} z^0!1E#>dcQ6&{`U@U~9QUj{9b3V9LE1TXqZ6g)ut&Cs@5mU6jjf($QR{F(_g7+nn- z-|Na`VtBzL1>orR4|y_RpXpYvc_a1{t801iXtbA@Va~{_usj3wYwN#Kx!Blr00a1VXmr5)(t( zafbSOkLCkR9-YTQYt=9&9zn}T`5}5sFCk4*_L?3}2is?a-M-t-5c{lrdQE4hgYDzE z#Kdrn0c0B^KHC;Tbe3L0u`Ly1+mVaNz7qhg{{?MdziR=ujlV^V4^+Ay^X#nyt&HnW zXJUBa2$~OQJpdYrN9q4rcCwaTBz7PkssESw1C*#C9S=Q_1rNmG)!lq(=g%gVzqK7( z9(L{00rl^WBCT3IYeJjc`@0B{d-tY-b8nd-DEInw+m`l$+J|@fp*@1MpkWBePu{_A%Is@F_1lO~@GeC~-1TXx9x?dk;F{tgKr2}$5>;wppZn*n9 zZ-Gj5P(u{D8dL=8eizW9#BRu9&LUakqjBD>^uc>g<~g+h;L_&2*{(LmXT+tiwLNxCjxHjfrjlNVc5xmvf3Ro z%B1GVzwZcAA#}xnHib}G9-CyLF*S%L8KxCnnpW}D2U)^GjIuk&Sn5vP&yx)(tVOq zhtZ>4d!fVV;L~Pc$I>u@))RtKOEr8gJvj2Z72peZL51dvk5-_z{o4{fpU&qmwt!as zLE@#G;k7KZ2=VE*e60m%YrYg@0w)ScVTU|125KjE3PMg0aqRr!*mwqX!=_8;!^Vf8 zTmYVpo#D}W2$DW{#CD|4TICRRd-}@AVvLApzP)&e>p5%io#~IRyb!hJd!NCph-bg_IMZpof+d z?3UmV;%_;s1}Z0zW>G+k$H6BNfoD;^TYzJpzl9ytOYOY>Vw(lLWN_)$c=;JpUO`fg z#Y@n-Bc$n2_>nNs<BGw4+gZa3>hVE}0UuUSY_mdQ8{RX6 zZf5NifRyZ@VxSp1y07Qid{h8hsK4ff9=%c`;rPwJ)A{mc-X&0B@%=>`FC?D7zp#Orr4BX=EuPmvj4~+( z1siB@#y$`Mif3!ks?)4};NtIvCBkLzctDn$-URns(6>j&LX10{2{H~80pM5wpYHJU zr7XlS8~alC7cY3=UY!duumjwQL0|06V+vdBZ2&ft9kkdRM7-p?^#A{hg$QH9AjUXi zb=OhQ`o~^dZLk^0?%HVu@@Dg1P*$lu&<) zpj9!iz{T$q4@<~8GoQ|HFQOq9mL7U}mW>-YS{Cap^C^2W{+OeIXNI>dCLxid=DA>LiCki zLe>p{7f`)m2H6Fxu%Xoq%I*&EPCLZ%4HsTebphI718P5ec82hR&g$U>mB^4&yFis1 zq!#OhkHSF~BC+RSbB#|g@A*Sa3@?6Zf|@YkrYpG7-i>I=LU;Hrj9_AT5zGm$n?SWU zsQryxdv_edTYJOnNwh8$qI>25vfvX3sP+a;cY|tg^r=qtonKO*vpafSRQ`izY!CeB z-^PKw^Xm<$hxHuP!+HemVcqiR^E);Zy4rnXRQv*!M~^IF!`@ISnV0A3L7 z(+O&kf~rc;X*S?Bavr^YjGoEIVQszRE}{&ebwi$=C88Xjoj#(V1Sbk<0w6W`ED!Uy zdjAC-w747Oex#Flj6sfRJy47Y7U(Kx^RmTR_{>Jv)!S2Ceb{w+OlwJ$rpwK+8uUE!g8M zA_5Ey3BH{eroA~ zw7EcG>5~j6>IZS*}>Qn00yH)KGKJy50sxzz)-KMx$e;NI-L7hL*~ zs1*h^7S4j!K|-Roo8dKLmz7VaB6OFVOQ+#WesIN&w6}>TgNfmVE6l<_tS}3~ZUmiU z1hUzu+o1I}f6D<@1_s~WI)T@Eod-aJ+rHf?YyzOX3M!C5Zt6AN3mTpJrU%Qf{4J|k zLH!EQT3~KaG1Poe!SZm)`EQON1xnt7bNx%uz{!(N*4TZZt{UhV98EOU;AxY?@;)VR zz#5)`G(3D+2|5O-^W%3$hQsnc{H<9ak2Ql9eK1-cE`9mZh?RlCvCBo}KhmOzA^{tf z67c$tUXKe6KRL@iKn^D~-w#p)@!W$n&>3$C&$T}P_y7OP6D$l2p1nRQ|84X<`CZRA z?ggbE$9-Jj?Ixf#WT57pXXlyM+Af{1njgJuKE>Dw8hbEs;dgz-zwdw}|Gx8_@ zGrm6S`0c1Vf2%)4jLC5y==>3o+h1?)o%sL%{|k-3{{8>Y#ot!;|NnomIj*HVE}bu$ zA29K^>|kJE0E>l|n1X4a5+^Y2R$A@&?WjU22UsN=nCHOX3OdBZvH5HQ$o!W9prxVT zjwNDROLn`p&WWEF)OaRnQ5poiCbC zC^&ZcsDQ;9e(IJ8HvH5s;enLz{LS^CZQ%UdVDgatzV946k2-!ks#F^LS_jmJKu#v8 z<8|zgjb}jzl7Ut0LtCc}76zrt;4onU57=EeUo@X!aoh*$g*bK| zb!~ae-w`PV4imelon{0AkAQyd~W%iQz>(#Prfdh6lPN8h&e*P&T@0;Kw!5}>!lJykM6CYV#K4{%%k}jc=6*g@X>A(-`v29x-8v(l)v_{ zWGj0HZPY`DMLd#0B@ozm43>vWBVBsIb%+b(q%PQ5Sg)Zg@(qv98=#`kwNr-; z8W^6PK5U={7aOSlW0L^)au35hj1n*R{Qm#nvGMEzNH$R72XB{px#cft$Ik!P_Mmf` z3>l$q(3f)Jpf<9swm-Ou3mcB;y!T=e$ib}#O5cE%Y3uHUEYtP`&7k~$@rePV{r}5! z&??&A+5;|~-(D^e12u4;zqkUGeg0DF>;L~gy{3{$OrS|J&^j$plh^~kn6UIE%KXRb z9iTNX5PSJsR)Nm->qOnh!rxK`5{1qbcN_Tjrok%*&+ZsD0o3*SQ6K|vf>z)`52Oxb zgH#R=U-LjK2S>}}CFj7k!#kvv|DCM%J3zGqXkEXSPbaE!@R~VLbN@A1$5RhW$+8FF zc}^c__29wZnt`YuK>M0syu8f{+G+t>H+&Ja!P2AGbkBAs1`8I$(zhPT7d?7eCVBMo z&eR3<2zVO7gY6t1&4>PbG#`A^{7bOpbMr60l6NlMg&$lx!P|?w4ZEBftsK9UO1N|v z{(uU4^g1&^`>?Mqte8vHcEr47X7J!&e4$9%rMvJCrn2T|Ot1ModYwU|>!2Lp{EV^n zTZt01RA{iUEfsTYJO?U{V0xRu?Q=%Q#(!K43JfLMj*b6>7!(-zTVI3A4e-=AWVRD@ zF49gW1_cIJ!vilN1MuKpm`AVaO&`#C4u8Roq>@DFYzu6%^6)mwCo3yJ7X11HwxD#r z;eiGV%~AnK@&>#A`K zv9ti4U<*Dz4eiXV!;r;@{4L4g(NkEn%BNeyGa0;r9en85yBC{PAZ31lLXz9?#Ag9?*_^P?UOhhVX!j3LZ#N z0cur(`@Nl@IAj4w-9l_@$xzQ$R`ci;m6O6Zg6_CI`gH*G^ciiG@p#atH^=Q7uZ_@; zpK;t?4e1K>+8Tr-M$tccf->KW)nCE6wOe;p5fg)}#XsmMy6)m4$S6AWlwQ&79Ky2`X*v%+ioOSKa}<8u;EjePD7v0hoJr2Nc{>IQ3h591qR>F6nwoU zN6TZSd5FWpK^=NnHOB&S2578g8|X-c&cmL`*FY`?&uhPX@lOfl;%_D36BiDG7DB>Z zjOYt^z)$sq)o7lbcR_9hCsfDdF1!r?859_xOG=0wN$53g+Qh{0f)V6ANV(p6{pbJx zuWLMD-L-cwCBRO;|H9)JC=-K+;{N^w)pVvWLO>Jsb3qF}JrL*e=72oVYx^h)Ww-@& z7-%eLxJ7FuA{cO1CCz zI503U2>5oU@FL|}^br+kU(g4_W-D1 z@aV4L5O}flCnzNz0X1hKCOvQi4K9EU2UYW+Gu4H*L^1ZWRSw+kZ&tjZDd=xznAeDX;4;P7Df5I}8Q`6L@aOV4h|q4gjC{r?Y7 zdazB}eUR0X{4H<5%N!6BloHV8WY8Q_rvOcVpd8}}(u5`bp^Rd^?Ed%vf5TqTl^6^q z?kFvf*RG%l#n4dp z>DC0zETJbA0T*A;S^1#!0xH=tN8La%3zDIn}VigW09Q zL)oRl!`a2BJ0ajDs7VAl+ZuE_B5Yk$uc;wu$czXp1r0&otYS3to{PdjwK~%+haXDSs$!rVkn7+MlvWXp)9s@>kj~}T%=Gj~KW|t_a zRn}`d4(R8~=gG(pw&&W9+YhjW2v?4=KA;vID4-#%YNi>tu_+~Tr)11iycx@|2$Gb|SHbqj`>pcWVW z$Un#~_RbHW^;361cS=CEVEp&Mxdj81Z+cl@tpcx~D!z%-;F`pNb$NF+2LpqnCdly8 z#gJzEagScpb_XVg7b+j&@dj#ABgb3kDq`aeX|WsHP77s_9S1&u;tf0l0A5eu#iC+k zU7CuhH2>Oz_J2TCK}rE|;RAd5EnTYi9cOo5L60pgcwVq0JZPHd6SpouLa86~j=CR3i+c$b0`+qBC_iOmcY zyU4w1cw&=b29@vViEX(RDE?pLj{hZ;$G{URHpd{II zl?d7JmI^sGfJ*gJHqYiGOs`o$RSUdK2MsPk>NW7B-TTj=voOHZv5-ULq2+p#Fm!Z5 z0o3^HMCmI*=k4Buwz>xigUa>)plcNGzYqm!g82w#-VQdL06CbyQ}AWu=l}mfO$JHu zg0Wt3HwU!n613w4%KOR8-^vIY1V&z_f5igSokHsWg64>JFdX3Lcp(m2chP#F#M`IW zbgc!bD;|3QIuQ)&Za{mgjXa>~3>I*Q6?w@%+#Jx7{WG8jY3l*dnGld(=kW&6I3?(i zHdn(ZFKcK2{|_G#`1hI<%I>_k3#8)3zIUME09#RSP>s>&e+6o#t@Byu_din7dSl!c?P<3-4>e|uNf!AU22!RH6 zZJWG6wt-f1>;n;?{QnQ5L2P>B2T=P#^oOPY|C=rQ{~tz!*!09o z%OLiH=&*JF|M#!^|Nqar|No=c{{Qc`?*IS#b^rgrS@-|H#`^#NL)QQQZ?x|J|Lk@D z|KC{m|9`^T|NleQ{{R1A)Bpb$w;*T`o1R!^GsJ!n{b1Yw|8KYb|9=2V!}uWj&7uGQ zCmsI(A4Y@N^u%?CA@+mly@&q)Z#nY+Ka2*k>4^)DK|DvKa2*k>4_Z< zK4|Ni_Je4f)BpcBo&NtHMuXV&#CcHrLA2@l|NpDc|Njr8 zL2P>Bbg2Cx`t{TQ|4p9#{|}=51P#?FZ5Rpa1`V{Q3WX7!6|66Q76L526vbSEWq=-QSJ4FT44Tg=^>W z&eM+k+m3&~=%RSg)$ncOPXf{w8bz2MpT4Se_I&lf*I zYbZezSN}nqEINNRK4Ji^7~%fk-a0xeP44l$wh z%}dakdydWj8Tng4(~PdI|M^?Rz^hVyFMx(e`8(Evd7%e7xjZ|MzU*aUU}$^{vd*L1 z_kv5ep+~nT2S~q1r|$;-)^5}_sgGsmkMjFImYQX^ zJi2`kfL7hQUhqja0G&G6@e_2HS?34PDiV)w-wi(9IgA3JD;-`pc9!nx4BY`*Y~a!9 zyTaA*?Q3;Jh)e(`_H zKD2%Yx$l{a<+IYK;1S^apb_9(9^Ig@a&7(Z((Sr~za<0U;>tON?7@S3LFTc0JH3;n*z?S{V+S zk^t%S>~`ny=)4J;Q)uBPj~5w*V|kT-@XK|CF}g+*m(^S^OmlLZ$U>ZCV(Qu z1$6KqC_R8qTP(@&>2~Ds?DY^ZyabAQ*UpbFosVDhfKC`_KB(YmdA-D~yYhoe>-my5 ziuWz=mp%h8=zRcM(0kh>`4Gr&p4~1CV1K=40T}@uA${?m71AMWZTkQJ|7&K?&Z9n^ zFFcx$SRmcD2uk+g^aRxe(*NQZL}Tge*XQ8(J7eU>&eAoWo&P<$S&f20^IG65?0tIk z6+F7@1w499-`j$E7QC#W)80E@A+1q;p#)k>3radm!Gll7JbGnsXn`)qsomhynY-h) z3)nqA-MKqFdS&-%fmRD0V}wjj%mNvTVwz7c?;_CU7-xTjJE!24$i5(RLHnUQ@4Ya+ z4H-U2@a#MSy5_F+K!sT+YyK1_hLQl!Zhs9>atB?A47u;~!2c2}>?5*>Jpyr(E8nSCk)gZ76)`2%;2p zG4iH6@JYJ{+FoZim%t}5ti}GGdMQbsMzwioB>^nT)T#W zzXf#cx@WS#fn&G3g5|-|D9_HbF1Y!}n zyTPY3QNyLP(!jIxyl1Z;_`FZ}T5xLyh6dlx5-e-MLH8Uw9%EBzs9nQQqWIDaDB-xAK%V&jc(T!j-BoXKAn$Ix6>VG z5e9{yPiKiRhexN2FzB8UVaTedgN&eb=h*4X00}0KUfEDJCI(Pw^@9o$@BymeQ%;Y9 zM$20dlq4WR%d(SIe*#hE2cGcCy#^1j6=>lFS|RP5oUh>79k1cr`nJT>qt{u$rSs)$ zQAC0UrGN1G+$G}Q96p2hpcecnf9+#wQ1l$C%m1K5bKml}_Jed9zI{3E-~a!Hw>`R9y?sIHmBGW>^+Ks{ z=MA)a1a$v~OXokxXj%cN(CxK7ZqCH88#Imv8%#4i@Z#xt(9#0de?D--N;bc+0Ue>x z3mQ{;z3JC8edp7HFw>e2bxqqFvc zN9Xq!2_V08x}Nap2Ju0+9^CWk%)Q{#`O3BPsY~ZW*Umq#oj-g#zx#H6d?5}xnYQ&n zNwr6J>3r$h`2chU`I9f8gS!uuc<^uYKsmhO z9B6CNNzm4!Bao%%MSJ+S@kk)=K3WY@vJ9kTAy^4#*-Y?|Z}Sleq$UBR{73a~^vX-)ydN~c%F5rm6|@Ssv$n&dJ6^!!xGQM7gTbTM^r;f)YO(t-(jW^v z`CATv$EA;Zbh~!AbZ02Ig3cxeof!fuQ9U}ri)4Lz69im4-@R4_wKqMRk269Reauo~ zVt66<7nEf{x2*BElrn;n>9>-bpeFId*L-Oc;465Kl^lnx-~}H?0lBlSleM-7R4;-S z?+QWu2UmZz!~|4@fS2%swLAr#VDZ3X2B>A_(cKGLsN&OI18OB7|L@xQ?q%x#|Nqk_ zfUkIa#{k-VQ4czK<(DE8!;9mWAo(iEr@OSnvD;6f^<;&4Coe+}q__yv@Mu0H@R}D? zK0_BvlvqNR#Pfg-(RKo#HO>S&YaDrD#C(v^IS`{uS3=v@h6lPh8h-MYu!61tRd(t8 zsd=#1@qce1Q|keK&kN0u{(QgH%Oco(;J?R=v}PCA8H|X~^Z}W7;Ws=qTeJTC|NmOm zr&rZTk%<9nK2*6+=d%|};Yv$i@^5#YXLvHr+I0s1{DZwbp8VTg=XmsraC-EX&hX&; zlxEGuzddvo_%;)Mzk?pVJPaP3AJeP_!PD6M{xA{#?VM??C+l*3x>GwGJ6lvho0M7) zfS36kZ>{1euFy3@L?xK2W43AzGhvP1-pauF2E}bE*D;#&) zJMlAkSf2LiYz3KAyu_oIrF8*l2|42nk51PHP}K@nvF1lZu0%`>ve8S?H{Kuzrs>T2R z|6gqU4lXVDTlzo&4qAxe+Tqb%P~g+O6eRDNe8uD7BNk8z*tyjKq+!N)P^tH%L>#nS z4kQr%9dw&>YKLogh)Tw5c2~noprq{rE408a@$IZpDd=tm+u!M;QsD{iGqQMg%CP%( zmaubx^*S~mVsz~cQOSV!_xQItGlEXnu;DFXvEeHHV8dI&W5dPYy5{fy|B&+QFeCpq zW*gp;uQpsIA3^5SM=y_q;eiRwHLMGmN~*!vcv&7S{a|?ewVOw;?QspztfOe3G!w&aMh*ss zeIVkssz-0_A(zf)kmk%nP|@3K`$G@2IU{x)+?>&Ofz*oDt{3=QH!?CXbl&i2JOZjR zk?K{KZWq=iE}aLoT_?=^z86%;wO-=y1Kl<4nG7k5T==)gxX$=?h_RHd^LppS*LuBG z|3MkN*MqUQfTi^$zvsv1XMeumWBdRrXF6RccqE@lbFqx^ozZ!b-{pMsFUHPOAoV42 z&BvKKPaz5eet8BYGkW9yHb48L`Ozc!Bt$pA>#g4KKg|ajzu#j#)_jZ=W)n!sN01Uw z*?YP9_`l8*&HtI|w>WBEa6~FTL1R7)p3OfQeLFAucD~~8TL5Z1c3$@F4gBxYc>z?w zxpbGbF6nk@UEykZ%$48&gJ%p4QegP)HB$N2e2me>@?Oab z&u($g?syK+)h;fb-(L&B`rF5t>OsZP4e+*@&WjT~I#2O$W3=Hcd1j+f@(5PeNqY2p z{kN$vdHDJ~a%g~#ck8_6(RzC~D20^nem(KUj?c(FX2|$saO)-hmiY_}4Bc$azZm&j zCNeNESf1c-1JzcJofjP&AA-jA__y8i=q}^%NxtcM@G+}z@&%99|0NbajQ2ph%{&i2 zVg*(B3@(fZeHgD<9xM*(4*THPda>l4;w{Ttr7t`z>wc6!^02fkyW4ppI`*&+<2|q* zq|OnzyoBo)>J|fOe-GCF60BzjsF;n8J&f=o#Qn(Qry7vv8Z&>Z90#c8|8u+@)O-Wg zvmU+f3Lc%V2fE!Ae7fs3Kve)pjSK&_bB>KCL8~@FgMa%OSs1`2rB5%bkR%g>XY#eq zi{LE)2OqMgO>q3?BF@ZGD&g3C40LCl0;oUdV)>!;`O7Qp3=C-#K;wBGC)pVoe7ke_ zIXt^V_ys_n8$Hk7ask8JuerhZBpg$)yisEI&FwRIdv4y3@|QlAdSy>qZ}Yc$vNABd zmNvZY)APg=(Z@(L8#Cp z8bHMj8|cP3&<5bQ;BnIDpmEYiFQ2k7Fu1gygWNag@a-5Qe=F!-S)b0(3l1&c_&cV7 zE)o59jETQR8l61W#7)@p1rl8*54m-CWaR$Pe9A_2h0o%zM$J*Z@F~)o&XK` zfkuZb9Qj)=fyNQKOH?#KY2&p7BElwseRA+Wf6IDi28Qo$AHYjzUwMG`CO!e}O}y{X z?S`~XvKwS!1jIswRi%>+54_9+t=I4Ti7*=yUXF|c{H^~$i}soif)4R4ecM^O#iKKH z2gr{uoxUePUh(X8WrwtnJvt9J)H5o0^wu+a^g1w>yx#>{gyGY9>_yi{28PxHr6$N0 zI50F+gA_+ImV5)Phhl(Sk@H!MiQz>QSUrDBF%zh)4Bg>rd9_5qNAs0W=lgy23=9k} zj(=ca00$Iu5?e3E#PHG^6p)~9LLul#?OuO@&cm;Tq3#3u;_!d|mdJnL@d5$RctPfm za!7oBKgPfyz`)-MI_?+}n>>sR4BwA2$bioE_yHc|@jU@@i6+D)zMa>>j`8U{{KEVL zDEfYRcHZ!SyU4NI{QEHm7Le`>;Pui+L2J7~LFdtHDhcxD>0_X}IP`)~FY9MfCI*C7 z@R;OmkS1^yf1n#Q*9iN%Q>Nni&z_e)|aw?c1U_!Ugd9b05v2v5BYSyheelf=TVo= z(=S@zftH@!^zHoR+xY?!2ru~=85p{Kw={z8>SFQecD>Na0V}7GcYi`&UWnfQBi0;SrX*g9RtezhXp#%d34?fHLD@bV3}|3pIJ&idRV%H z_ad{GJ$tKf~-Ul^zHC#ZatLlPoFxG_KUH%3%v(|-j*#z1R*QXd67xA|Xi9=WhX> z@B}*UvfCAs?@T&bi)xq{O0qoRc@A=L+JXNizMydc@MSpQaRA8B0cw8J2if@W5Z3(m zR}f-p>7`rP5@ol z#K;N4wgF5uDY|KIS^ zYjH#kls3Vm*F?~x(*V>Qp@ggR1~2G{!A>WI#?zpa=OBK2d7Y7g!MoeVoC9=Tk2mN7 zu44@KyO%OFFuVk9fB;Dec=USw2T2JWbNFB1_#1Q)8-MFOP@#q70}t@vpoK?w>46vS ztPBjhLCU~&L>40hLqo;?dWenutqGt^*j=Nd&V})NKHo2`0zncf1MwE^JjP9hwqoZAAUtBl<%Af~8GKRN(EsvK7 z`)YoGOBJEs3%$@O1x}*y^3XH+st2fP`;gU#@u%el{&s`Epzh{#!*4IX zJ^KH@^Kk2d5<&0?xCT=94qTqL9wAI5ToUxVux>Tj4UPZTQ60Z zfr9_L$HC{U-7=Qn4!e{HdoZ4F1YOs5pi{oVU)iC--`S!05Hs{dd5`8}36>Yi4}j_r z0pH{j6%Man8)Hz!dGwl2DeHcFK7(0mALAL!(k=|GXANsBkrW0$x<#E4x_&6f4g?I`6$W{REs}_*+1= zuxqy+Xo*G|h;Vi3wDl@sVt|P8w}4tZp51;NpydLfbJn2qqlf;Nq=Om_pvi-G;B^_W zgVs=P)#$wUBJl|WgX11h4gy`gHs`f5C{KbWcslRBaD}*{^bKqcfpw|E%N&#$-Lwgy z^$XyA3H&XAko5&EZlL{3u2&e2yIuepjCzw+xt>R_s5K}LA=Vdwl|t7S#3O>0M3nkmETrZXiLYEwD z1jYGFcF=efB>rFi{tH$N+FA#ioZbSO`d|hvM(BLt(R_phsX$MgaPHs#|Df~yU^IwL zPt5ZlVn2umm#5*5VUD4WA)r##0zRJ82pUu9{D*Zs2h>J83R(`+9j4)G_{5|0qO0M5 z!*BfZ4BwoXSwQWxLkfp&w3*MNvvh|`C-^3GNZYFPgim*l zAcseHjG#cbh~T$FO(h|qu}Z1$hd?7P{H+0u3=E!@clldEchtOe0=3^kefLM8f)doZ zMVr3{k3y6j`sVmq0Ca|OCV2i@v+UXTLy*2Z=z8n#haf%nub^AM4>5o)=xR|1C2H`6 z(hJ#`7+xrEhvs2kka)N60q|IhYbS440jR+QIzHXA8#?ob)MA9rzd=@nd~^E9Sn?LU zXzV#?(byx8ZYEG46_!bRP0c`7?byb^03I;}<>4tW=P`g2J7j+0n72pXmbwRxKl z{4ag`^6|g_|G`_XA^ROQKxTZ|26nDTx9bj1e%GU*=9dq@>u*oXyCuRtny+DlBA|}W z`um^(6W0?B1)v_=5k|*uHwDjbKMl|1FR(i@7*AP#@aQhx!QZX}It*?$C7cN%Ea)33F1Qj7HN=N=h4^7pzk?TAp35D3>Clbv>IIU|mn7@nVqspq(dI{QXZ*&#{VyiQ$DLB;}M!K>QU25@Usk z@wb5ToCoOGL1yqte~_UnP^?JaV_aUBE0OBK*gdeE9iGgu#67c?H$S-Qgmv{bFv^a?W*!;7{p;M7rK;L&;5 zr&sj=GpI|MdjPb43A}=)QW|`wRp))sylf;$G33ONhlaObvvsmg&jnR&wI_T#zxwnh zGkSc#?7f#txdXpUcd|u!{{ecG3C# zh4&T)2GOtuPlvU7|B)kT#H+TkGZ}1Sh z-r%N3ujvIQCI(RZG;1>hgJZWZL+i;(4WC}!olGFV)*gV)KZDGJ9xmeuR>j7|ZLk@U(_F@-E7bLhJL4sQ&hl#cs(e86Xf|9W&NjRy_6^p`rO&|u3_dgF-3xoL!%Hvo z%QJw~HdHfmdGtmzmVWZF{0;I1WYEK>^U;gNw;32byX!zJE4e`d)yum&8+1t9TaYJw zI)8!Z*If+{yf|_Rygr1#WdW!xXg)z5}VtDNWX@~GPgNEs$ia~7= z$88!g#U+3lu^=DjY7IHY%Xvpz|2$cJFTA1CaKItKrEPr)EGxPYZNMr0<22 zy;i;#OJ!X(LFSb100*4qVV~~O4Uo&=OZi_bfCNDeq0$YmhHpJIZ+LXxhbGHIFD~9> zU~oL{2JKa~fjUi~^z4GMMAxI&R*?r>w7mGo$lz-D4OXtqTm{;{3kgB~mR+C<;5VqH z(_s$E6en*mF!0MWfYxyx`v3nwj0UmkiLd?p{~u%@h(=^EwD!73;~NeZ28PbdkaoLA zH|t$B$c$>I>xJX3B7gpahEW+jdiMtW{r`U-3nK%=i?7!i7(nGSsGrt3*9O#m?cB=o z=l_4--VzlBpU&?uB*A9}9p@Kd{q&EKfnT$=;NSoM`~s|3AUx3C%`OHTt`Zg--qJ$f z-W(MRP~k9n1L)Z4!=R{xUb_KK5BI=1>_w^&sHiD5_37OD;P?OkE?vgQm>D1nd^-1n zJJHb0_`*tvfx)H2xD|9p63AU8RgRrUK&v!BEwR@w9=*0+T;OOG{0oZKw~l*|D~&xX zKvxI+?*{vwtBODkPx5Q_qb&ptS}MJQ|OHf)lAN z>(jYb0vtk1U;O_6zq=I_T&)NA`&ii-7&;Glbhh634LZ|mDJV<~Z@U`)_vzfL@#p`4 z@I!b(+fKY|Apjru-{(DUT0uPJKn+ya*RHMXSeGQuWpkE zptyN@4XnbW*VO1QBg2aoTR@v_TMz7DU|?Y2_kfNqtN&$W@PVWhpUz(|CU0e6XaJ`h z2L2Y%+Dgy}boW+}`#gH5g2MF$1E|vP1Uva<$bV4yfP_7|dqL6W(GB*ZN3YDq<{wNo z2_Btu89*y)yJKHKCb`c2VPtp_ehri^pq}AxF$I-*o%i?YgXXugA!|r|dY3x<`Tw84 z#Tg{od;ol;Lg%rUR-iQ`hHqUBzk#p*Y5u|J(+iFW{?@~w3bz~VFpq8l(0EI)>H5E* z+hksxxC$D|T?VTMJLjKHYmENdRi z&%gk>jqnaT1A|MKGB`0q6ug2cDB)*daOqHPJ>b*5793{X;E3mMoef&M-rWic3y*FA z-)>h1sIwu?bok52;L`c=WdsY@ok&_ex>k0$IOA}BNX-9HtQBi7M zNxVmAD=4^*w|e~f|34+Ohym&VXfVDO0-4cy@5SRQa0@^&+iU9c8*~@cBf|qPmRtd4 zk-4BS>SDIxDglR(0QdrCh+jJIzgV&c)Q~*_N}E32&`bha?hdO{Ulj8}LI_lEgS*(r zSX4kc9<(IB^A;qK{P{p_B^woZDDk(}faVGXSbzNjmpq`P?6D&xKR-uHzna0Lvo#mA zf~6Z=U^sTM!`xN^3arlmFZkCWMH|df9`H*8A(r0ag*Z%+4H0#q4gPSK@8m^|I{wz@ z%nS_t0<1GZjuLFGhZKi3ARfGMjDzq%4)(!t-xcuG^8Xk4tBG)*71Vu=tT@~!iQztX z&;q%=pv(u#!5}yA_klWGhPNkpc8A;rU3KEoYx?RZI0qcN1d8~jpx6Z;q74f~eb5|t z=Ui~P)cO3y;Z;a(Malxu!W|NpeLRq`JO&z~A^5@I>m-Jr|UXA#F5xRD%vH17%}T76t}*B891e=Hyk}utdt=`WBK91QE8w zQfDn9bz(T@5;*I;e^IcKh#vZ(gy1XniD8WmJ38>|31?-*!S1DXnvWAz&(N&e;pgYsFA!ynulL(h7mv@-pu`xEUq?4IDNg|HBdwQqhKy zc&33j9=?BJyqpNn|Kk98p1)NAbU{Ivnj>Za+~I%*0Dmi}(c8Qi)TCj6IuV+c`1@vo z7H@%DJD`IZ|9}p?e&Wc#4N+gJFf%atcbhy1Ma#@(*poHrU=Bu5MV9SFU)2mUiMc=U?4 ze?m_srt=sWUd{!b7T#qCjs;jN;+seJR8UHXBvwCm&}xGtt{rx*2TG^$3$O|x`vhF= z)mno}mORi{Np~wqC%Ekmu9Cq$L`Y@xLWH1~9Jr&f`0EaWEga7ytw1W?B95#bH__ZGy!9yzI ziy&Q84WC}qOpsW2FGw$FM6@y&KBDsN#e2~3dFz4F`-TTzM|PY*b!cg0NjWj9(mwF|}XpIf=Re$^kMzi8P)r;o12Q z)Nye=0VXeiHpc3~CZE9LZ+xvMOFTWh<2XR;785*rg9Qu^fR?^O#!o;ia+?n+SRO3N z0UdpL?fWqf1}28m7e1C*Kgu8ZSZbBseI1VI4oz^}4_dSd>M*rD;cq$4%)sz^4njI@ z0>~A&5CRjr!PkF-%q$TAk6j;Nv^-e)61?=Y`6tsZPyxm7bPD7)7m(Xr4gaI8FLVT5 zxzv0}!Nu}ti4W9;EFc#?1H146$c49GTfpagK&Oj$A~^tJKS)Q3Fvxz8c`lYeOP@nL z(t3cuV$2~e-FMzIteaFb~qG&z?gX0!P@REnS zpw(}kM;*J_S`Sn>cCucJU}6As_*+(kq@Yu7ulZp65&2stGchoL?_ES*zX?7W_vn95 z=nnc`(>9Pz9P>e$7Bom*I`?G}6LJ!m0NT9YVGUk~@(0v^?=@Wm(!vVK8T>6d1C#;~|G@Y&|yt-?Y1<-sZ2GTrZ9yt5)w=jb=z`W(v$@)JW?yVD`L3Nn7 zQ061Rlrcpx9lw=!wZdhVE=(8c3KaVPJG!9sbW2PP2VyxF}$!` z0Ins#0S)RRd-R&V1Bojx08O6#VD#vAJ<)vQKWIUUXSW-N=fNkep4~Mp1|Gep?jYk& z&V_mhG@k=nu?>zTzfM-r>Fm&00$nBJ3G-FFN|AP`%=eghi|G!oNPe7d%im z;DN{M(dYX-I!}9ahA!~vEZyMIS-Zlcn{^jxLcbfl@7|-^pTi@W-J@5e!EwJhDCM>u zsMGT3<+hoIKr&r}->+Mpf*MgqC zH7Xo0W*-Il^myy-Qho5=Pk*RYph2b<&|c#gokx&!6Tdt|ckG_l+a(v95C89s-Q&|; zx&Sl+7YsJ%=kv>2m^yB<9+92E;bwto{aZAHSd;mc{cwSFFo$j zUAn>}IZmLP&GK;Rv|g6G;5|3JDh-~=e_nVW0jHXhFwf58z0IH_Lpoh|_;jbP@a!&8 z;ecGI!VC&I(C9&D>5LafM?eFMCHx-UwKHCPJq((pU{L|>ll19)2HH%+(e1m#vC~II z;H3^|PZsh{k#bPZ>a_)p2%&F$eKQ3V*Q~6dw ziT?nP&d;8m|9pDWVaF@{cmrx9_+9`Fgw#j zpiafn)&r%%pvm(N*Xxdukr0p)ct_L~qN>aFx?=~6ifilJQq`Bm;9#6+AlkzR(2SeCn^^ z+WOX~bFYLJXq0XXXfoXJn+Is2?uoPs-5lR9em}^<(7;e41Um2>w1n2x@?FvMmu(=0 zt>5@NYC%2S&d(kPAG0>v$gwaqIFuTDbl1oUcr@3@aWItVdGxx0H*)hp&X)l%mNWb2 z@Yw;h@V5fI@Ye!#3DL)w!eFCbcyxY*H9@{PGCPz$0hOwteEZR(bL$C^qkB!~JZEHh zAqSnC$N()90nJ=hICrvk1~M^}M0#}hf_w@)R$Ks@zMv+RfbXw?E_%g%46-@MlAY7R z=>s(RJsY%C1#(PkOfUn(u~yKqDZ}wr(5^_(V60=8hzkF{L(u!S)jWDl6~e&hSNC}^ ze)#_YMLl>fXlwNAFv!$Tu{MeGo(Q*sjhY0S`8|J-+J`gGJR%b zaO}Jeo)_`x6+QSAJU&!45tOWcf#zRq%lMcWTr6He?+mfc=VM~heL>uQ)P-jw3CJ_hh`|(aUNV0Gc0iQQ_#6QSs>n-E!^GI~C+vkM3Sja)HbeK`s+{ zv9JzO;wV7R!2pL!$vUgn!2kdMmvT8mPSsuZ8no;LJnjg-!r{tOMurz*pcPf?7GFAGUwnzSoFN@#*~_V5cb3jF zJn)(m6inch@7k@8NHU;n$jd>ciN8m0p@89~*CMd=2tJ?Yn1Z9_)sisqJzDR;dsSY5 z_NqLF+|=yRE5g`l!w6a<>(MzC6xgNO$C*HDd|xXYUh?QXfpC7>gl`T^4W-9HIji{) zqod{3(sv%+tsp&(79bt`t)77l44_O0x_AU?KH~|G&U22ISNYrHK(h@T9-SXSfeN~B z8I+@sI|P8zqDOCqg-5UHZqPdM-U*=Ax<}{K9h(3D?*_NPTi<$g?gd%I-@*wRJWp=u z09By9EC)P#MUHtiA2RUhoccf$G(8e?jK!lj=hP2i0iRla(NL9)#U1VCL7 z(0;b&0}77KNB{G;FtIT(d~^65Q1ZsZ(&I<@GY?CSvWG80Lx~=pa|=L)M(5TIU~1|O zkS{uya%lbk@6(;a!2!De(A1+hK)|K*-D@#K^nlAN$o^ZaZ%&^BK6-%0@(hk2f$S8 z1x--7I}dbUUYCdpxYjW|@R|#fAHnz8bRKIswBMuoKuW_eDGz?iZ>gf24Zl=Mt~C6LFFD^^bitwFA7|My(2b#-r#ue6QYc|JyyWry<7*bfOW!|w zH2-k*>71JZwtH)W=KufYNgmy;po9bJhdXx3fyO(0I-h~21wa7=I(Nu{fdO<^hrEYR zFRvEpQmLnV|NnRFkOQ}|=YZ~9?9OHI>4uov4e?($#DCpj|3PhVvCJ?iMO?Msq51zm z^c3GYyTO@~za`ZlRN8{>B7kIh3DB}+@Kx*JgGqXJgZ2Wy3Ob$L8>F$j6;v9z zbZfkP14_i*;7ZP?+u$W=ag?v-Gf=P1qkAsIlg=8R$>%|74s^0E=-L)Y;^=h%B@S>} zYd-ehr}NbdgK7qb&ej^Ruy=$Sf8vu&8K1q`Z@J~mz|ee*u@fx*dbz9NTOtD8r?Wt# zyBFk?P7edmx*w>(LD^KtN{`_lnNF&&U8yyDu!ifHouZw`%%;E&~N8C-8=1 z(8N`*>6WjI3@@HdU|;|xpI+Vvo}lF^uR%csnnl8rbog86gEj;lV`BiHlK?TL2xQ6v zxG8$zb5*v2N+BkV0bU`MC!A)xM1TDvbIHU6%%rNAn%-;%H zf(^X2>#ZSkanp@ujwX`=HyABX&rE8@quL> zum<1G*B-sRH#|T~oQ{DqTq|e^HpKDGAf1}{b&7$HF4+ny>_APJP}K=m?giB^jIfmAP%7oq z4K8Ipy1`|xM>p7zmuDcE6q;v2txs&qO2R-lDQSV4s0<$6kRlvf3$*_F30iUQ0xI#D z14`>b^(UwnDE;7pwUF?|MCeV1H*B6aRJIiuu^y~ zsDQDINGMJB=-dj*x1g?_00VjIE&Bfl)L7bU7BD3eE>&8@!Bcy#v}<_!Bhs0$L2LH4xe+vLBL>>B#38`IQ2M0xWJP}GDezwN?h*kGkJfJ`&Mu%U z{SLhrgtbROW0If)0o=Yhfz}gySQdf%Q$}UaJd!Vh4vReah}EOlgb8GiqvhH1`LE?% zz-<<2e+ayv{0d06`OyE;kDaG|y4Qlzg=cpyXiR?3T~L3U*9>&(dM9MHo#PIM`|=Sl z9&i2s-=nh?6oQ>|LG7y6+x-15GN2*0y&ypb{#G*?Pzn#wfvjRW-kJbqc_z1l+nSxN zph5|1lf(zGO=m!7r+5C^30eycZgNDtc)1EX@()=74O$@j`aL7VYje>0OP|iq;3Z4o zrJ_R;QI9{onG*#BWQV|6?4f!-{e{Y$8J{z(8Yx*uD!4e zEI}2Ce-Fl`2xj{GgF~fnskx;L$6(cROhJkr3$0%I;oJXnXYXob>7C zIpx`WPyy-|P#3w^G#IozwbwQVM0K8q4Do@=S4Spz`~3)`BY3_1VM&lrpYV6=0x>$D zdLDer>eg+e?FehZ-{WIo@ap!_2DR8rbU?%MuMz$4Lkght3!&|44@)m_dgUs6_HqU2 zzM0OOh{iN1e!n?_+S9!tsb=sqT>;+ZGU978InHX9Q@VA7DfCeH!opR7X1Z>G*_gs*@KHbL7-8Ooidk=uB zhTg3pRiGX`cxJ0N;Lrd6FRDvGlZ6NUyIu4+p#JOT@aeV&d8wO$fx)-+KuLyYue(6! zDbTj<0}9QD{+EWz}xg0%I?2B$HTw?>f|2lw)=kl`*DzW z_*+27`ap^pM$3z(PaV4%9T^##Szp^TF)+Sd%mbQ`KMOwGrt^eP=P$^V3&?2xmU_@7 zGtJ;6Q~KPs^(22sE)N4kcPq$0%@6+Bf?BXXkaEPe^DKX>F=%mlcPl6oJiBYyKt)*b zRYryvUt6J>7&J-_T6LiH|9>}k>q(z(a2ZtL>)QFUlh@xKw5Sj~*5K1^1qy+OplOTd z;{vZaL1zFoAN*fp?+7}%2{dx_))TaA{kf+ld)Xt;Zg%j-iSD_eMh$rC545Gs^xG9i zh8GnO%S-zV54;wFTK-xXbo&ihHPj8RoiDq&p(7no+d)^&gIatoyFp|7z2O3#=RhZV zfP19;E$*Nh6Q|D#C_6Yjdn^8X^qSUz>@|Sc%ippHlqDceL$<8-WQ9G#LjD%;sUawy zO~&C__a9JifISWNDG$iTeJ$W%Mp#lh)9}D+OK`M)b7EHDZ;b&Bib5mw?Mv{e1jJ!P z1V~93I50p5YJiVVx%8SFoQaMpSY9l#`R4XXq2xVyH0C8}H0B9pw8XKSg?-oW|M&kh zUTFTo!QZaS#lWzuk&%IcfAOIr_Lp*8kfW9%Nv2nX&7=7chezjBP^aAS`#}cKa<-Nx z(7YBjIjLM`WO%Wx8SGE~7QD%c!4^F^Ra2OpmS19Ic%ccgob=@M7nBS@TcdtsOHQEG z#objOK)IHKfk6RuAe9sNKq{uP+uh&-r13duwRYoqA<%8LSPK)q0#FYY8vXno2SNAO zbsqG9ba_7W=QBXZ0X&i;47wc@ED!Uyf`;eQ`0HCiVezYI zBl*XRD$wFPkn5Ge7tSAtwy%AS*yVf-F#3rtOwEqX_0p`ypA(G`EomG zvKCRwfPBi|B8!wLpF>^$5_F0dw1)KQwtVevc*&>p$2SKi1^(7Wpz^aBR1|{Bv)3>8 z{skS3;nCd-YB~9IR%&!l1-ZR5&;V+fOE=hKY5e(Me?t0qji(qG7#cj1Pk3~m0L>md zc8aincI2;jVdwBX?!pf4f`eLc5chX-IDR`Q050T?f_kyv4}u!~{HtH zfxl%ZCwQgt|Ns9P_*>S17HD;z_iR4!AG9TXZ38%?_;hatm5U`2j@^8%Co3#Fd7oG^ zF_Z*COCOJJ$iOZqxHWt5e~AV5(Ol%yAsf##GQ9AE7+<==@W5*pP+7#kjRU#He*>!V zpMz@rN6?)(w?Laudrh4|x&HGzr-mP%#WOcCw?V<|-4K|`qBp{Be zF=u070PTVW)djD>rwcp*oi1?Sr`z!d)c>GM-p_%`i+WJg@qkAw$d1xkpsV12f`$lD zYpRnVrQY@65F=2uECt;f1sN5G))iYpc^akgCatFO0a<>o4s1E8MN5e_xL_^-6_e<- z6lhfov{(^9FIHYIU;&lBpmG+xG2R4}uTaBe>sdyI7v>OWl~h4%9Un;HgIs|-gDdbp zb5N{Z1g(UH1P(^Z3dEkW(B=v3LAD;Og#^Y7!vn7c5VbYLZfM2^SK6TL2fi#4Vy92H z6*xFrK!rVeaDWbe{f1s?qZY4R3vAWv|ltvN7ssVDb`t61AGElL~-x3C1 z4Ez1X<)xsBUGTVTH^WOORt5&pA!R?lIWRNww=Mx4TMa584>MZcEPV}%U{HFJ68E?aD%w<)Gxn-{K2u0YV!X&tG2s_5Xk8DWA@N-`qg0kIA4#XU))YdHC`n z=ZoO@x(>=gz4Zcy-=LBEnjd_q+i?ZUPy8)2e*OR74QZo;8l9jvx;way&R%x26MV0P zXLk)dsKLo}nvvl}OEoz0@V9_A;=+UOr1hiH6KE_tv?o*5mFL)u=LOtNx`LcA1;eprnhTnWTe?SGhEkIQ~$PbW1 z$3bIf&BqumKb1axx%ub+|DfOoM;0?91H;R1P!2ud)A{S06O#i!cqOYES9JuG{?#8z6o0Ve>oHtowhf8fq4EdU*Te9W`+fJf`Ml4Or= za333VxQS5~XusoL&~O9f3SLm|fpq1T--UGLtVKa-7CcDV&B)ve>i={yHtYrUiWo|G zpo5gmP9HiMAvyBJy&OyXf>~`#ChlYShw=@ zgYl;21!#|+zkTb6|NmchbAk3YfvSL(OZ*+2pjy0(;oBhv-_E1_tx}-V4XpWFvzfrh zXhQllpmQler$P6cn%)QP?)dgXU@66-fBAHN1ohtzg8Ogbpn41Q^ae|hUeh!87#UuyS_JBoz1R<)M{GS%y5lwY zFct8|)Ne0(Aj>UF-x&V)?R@c?_c*JN5$H%P@M^>^b{kFp)=A(b4W5Pp^?jjZ58&}p z7Y^{99Uhj)`CH}x|NsATHYigXCUi)}xAO&L0@<>Yx5ki(p(GTV^kBIQ-p;Ur<*aw$ zob>{fvmT>f&%N_5Bg2a@hz-7-FG`mh9(c`ac)+*w1?c!Q4gS`RpjI`!jo{M>xi{U~ zMUaEPH5lZ--GBf8N9qCbgYJ=p7Eo`YdGe*zH?$U{OJ^pQ#v`a-OJ3vg<&Ce9P}Bvj zGUaUeY0clN1YWdq50uDyO)uVIWO$KR1_{Yj&&~tTzyxoQt+4E5H8NmgDDj6Ub*hvB9pIA3T%e*;~g5%6CT?8D996 zLc%{0nzKPGm@8~LdAI2?F_ie>O2wwwQ!!ebCL3hI+Y+z^rSlPkj-8+z%Y8aOz4(~I z!0?*cr}G17zo`yrboUr^tO!zyCf|4 zH)z3W=W&-#)495!!tEnypED=8B0KoMMDn}C2L@>2RslX*+X8g7yv6GSpt7kn9yV5E zdAxMhYiFprS8p;hyx0s{OWAq+II9!rkOBtKo$L%Ynx(pMM=|(7Rx5aPBTBK-y{?7_ zUQ7ExI=QcfY^*_xP8pzlAAZ*ZparOhK&!yPEiu@_4inINv}Q;*sjV0sE&MJ0Ai+-1 zWw4VBF$-4(6(93HDR?fRikBOm^ z6)Xl$S3D3!>miE7A&S<56@kTeg04yBg(zACQS{|H$YS0FU`1dtut}hXvqvZIREVOB z5Ji*qm>9afUUc$K0ttf-KV#sA7}g3B=;gh85Nud8SRG3zZxcv(AE=cq2v%oW3KHlw zZ3dfXS`4z37c90DG&%$x4C&;}04w5604w560~_|ElQ$J4ybn~3ia-pD015P(T7lJ> zhJg(Oi-8phLlk*K6p2F=d4d&z#lVV0A&TrEioRR}Ip5RVbs8hKYmKnJR(=dQI1W)tSnJ4FijT4RZ!7;uQfa;_U(};uQiLrqanP z2oeUX$1&i$jDPjRD;=K-5#QWtc*s!Z0-f`AT(0qKH z^@1)F11m^nFYjfDl2Z^R$Kgtj>M}7XLX>QRDA^CPiuE8!;Z6ev1_mXNY$xv)kU%f* z1c;(dU`1dta4J-VC|V9tlm}6?6s!m=23Dj7Q8Wvp$Oocm23QeT46H~QqNo?5NDHE< z8>|Q{23Dj3QPcoY!~s!M2UY|UJI-3A%LG~@%iz&#TdvE*@Z!L928NfXpM$2=_eOw< z`Q)wOHghlUg)|0+T^bAw3@^N9fF`v|IXsz51w491AMFD*e8Ej?u$?c$E`b)s9s}+7 zV&Vcdk-;W;cFT891(|gmJjw-1_07MS_Q@}`4$^$L}l!4Tpk` zDF991bl!i>F#$2PFnbRp!wcD5P@M{1iwSNkJm}=@Qe$E$@jz=Upw1T`1l=Fz1UYLP zwdD(LGrXRKn1gfaQgCeeQ|r+ynsW)12v{>f6u-*_L~uZog!2W6$3Q$+!;>IQj{H*& zbUFXG;qvL83i2pqBRaU+?*I)7gFNTLc%u0LlVhhFhv7-YS+=hgVe{J#{M){H@Gt&e zEMxes;a9x_|CD2lA3%%Z__v90_ZBfaH2hO6yVdZkzT|%AArH+{t(W*aUVvNV;1S1e zv(|4VmL80!J-YXTx{;i9*Q}Z+K!X#I zbOKpXWOm{}F8kkLCjcou@oHkG~d1geUm^k3;`U z6krD*mxJvyFMIa#`M>}FLGcS-AFa?G06l=Z_}3!33Q4(@V! zKpf}M-3qFIJ-Q`a4WGQ!1dXHh?hW_{x{u`@c$w0R%LSnBv8~owMg~Xl#Z+Lzqw|pA zffw$n3=A*TK%1^1lmD=$f9J86%50Eq^U@U5qwDoz>^#x@fZe0@z<$sPj2`^1KRh&l zdi1h*diJs$@$B8A0@|eFq4^7Rcy${8`vYnG?@y-jzrU2m|Nb^;J~xd&Zy9LObQ-^v z(z2ZY|Nk?BSZOUxU}_F?8h>8i77#n{3|J=b30NlY4|5v7h3yrPcF;W|AQj6B;MzOD ziqaN<72O4yu>+(c?*hb(7hq{UuD2R11jlbXoSnNa^f5E}fH2$OuY5YkyL2|b`Z)u(aP4pt7cfx1>ItGv&XaZOQ zw4~x)gY9%x*b0+1Y>l; z7)>xn6^u~?W_a}SCaHjY0$Mr6<=HKx;+veK!r{cfjYYcy+~adP#-hytI;~Zp(?vzX zqccWDz@wMdemAK4cTwT+=;Tq^rvVxZ?A@yXT0_<=`fV2@LpOL*!xuCd)(a})4G+91 zmDAN2(7#Oq!PT37AU30fB7(K{7nJ*ZSwc+Jmv~A1*{Nu zsK&2T;0n*Rqm}`*A`)x^f9qT&(6l!wk2fD+^lUyN0UcU$v~~@EW>@|md(c@(U3Wk= zqdZjJGr1L9p(byg0IEY6KkRgv!@%GHx;2X#w4U1YVDp1Nng_}&j%TLr5BJ-g*WM+^5l{Re4vv^-jC zMX>5* zy)4JXP!f#R$Ag}?dfsk6zP!kPSQ_8^DX5 zO6P&fTf^I~U8Rt8262ZcNY%3x&?y3?4B&C^m*DX?@KRn#<7UeaP-hh!M=x?tfRk*? z5m1%Wc?`7A;2Sh5pltA9NAq6r;x5o2Dmb=YZ0QBHoWAk5K9Of&0IjeBEk`odn+#fx zBnO^VgDfyi?gB3b1FuSAIp@*srQy@d8@QQ~!EqO86}1OwDH75R)f2usGBv>V6C7oP zoUeY46=c_2{tnQQpRS#6Kzk(Jx^0x<>yesS!0VBe!RwLoLF?e_`r)Jh_SPv#&*epinU?`@JeFQ`zK%x+A64gmK*~^gST?S%d4QB361|j zbHF~3VK$#$-gO({QG}SM`v3nwe+y_r+OhHfa`2Qfh?B;j&uTgu)QqTa1vN?1j)Tt~ z0ND;sJ1(8?UOWwB0H4S7RTk8nfUHyM2A^I99iLgdk&)qreiAtQ@V7XD3ii&!;En@$ zWwTEwc$qS2Vh}XGsn_`fG^6g>9m61inn_YY<~&b?6ab)^s2)a;LlBL)E6@g!0`WTZt%wQ0}7Tu zOH98xd=dbujQ9akDN*+1C1@E8=(Mo|-yE0(_*;EJW1OJ*vg3@FKTBV~{0?eacFqOO zV0c*11+|^|n?c7ibTjSz|NsAf#S^xipdERZwh|yJ&K45bkYzsLFa-_Vfe$|W_@XNm z611~GYcspSX1=cWfJ{YsSc0p2{?>AEVu&&T2Nu-g&bgrK=C!|1cTs?6Z`^+mh&cG% zT>kx6JbL$rf=Z5F)1}A28_#sRKp_cD!{0zI`1k)mB+aQEfh1)ykQ?9y*3I>d3@@S+ z;BnDv`|tn%G}qQAb*Ya0`|ltua5=`v(0R-7z>8CzAS=L84LS}RR(JGH1*I#9Rl5&E ztXeG%QVK4_x*Zjm8Tr>Ah7L$FGB&eT$T2Z6IyU|X4=39?qNnZ)>tLz7l((7HTN0$W z+ri?siQ~892_@#utU6F3h1ZJBtm+`cpjpGQ+d+ZxfKM-PFWd;YwV*l?T34e@8eN4R zybqo<;%^uK{r~^VAE1>gpt9qe8?!^{VR(_@(R#8(1zLtdCNhrwFH!&I^icrReSt5h zd_A!fqM1>kv<*eG9=c|0==?kjXw~s6a1rGl8rf3Pv#;MIH}1^g|h;KT}< zM12l&jRD9&XjurlYDyh+)?U#E&;mgRkde>8Mm_);dHdyeP@3ty*)0fK=M0kOZ+QX| zY6j0Elsv#A-gh#I|;}K8_hAw9YOMvp+YbR)I zdGyNOKg`Ggs!t(jCM?|mnvFv?-lvyW5Og=ynGVoSWYF0Q{4L#_p!;EtvV!z<-g^<+ z4lcb)_JB95%D3L;@8|;!l0wg108f_rbQ^d!9~0=5JtD@$(0S9R^8?0yG|2tO=HNkY zevXoNK9&jKL0<*%Ah$=asmWnRh8Hi|K%P7T+VQdJr46WHmIsZzF@Rc1EuanD;ETaM zdS%%_9&1$vUF+!$D&Kl#zZ_yjoR13IsM&e%#Z-imFJFH72O12P5(9TaA-9Zs^vdo$ z#K^$kdIQu}XsA(Pv@PZFY(B!|+xhe*sQmysYm(8i%SGis=se!egAEVwHyqsG@KcJv zxev4&rg<-@Nyot78V;I&7GMY)^8xQHCq$@|NsA)KcDqF*p>C*O{Vaz zUBu-=K|2F6UHoPTYY`983AP(5OEye&k zt?GqWEGXoULoSm2?$h}XR1*G&m4q_;A;lAqIH=+O-LZ?k16%}yjv@xB?VJl*JnsSP z47}Y3?hJH6)O4_eCQDi;ih&nf^qTq~WJEc=*M)(>iGQDs@rxJD3=ADDvY=8C)XHr+ zQ2HF2lzloMAbP8y`0hLgSvTc}a;x$S(88(5poLTSzze6iimo|!#i%ek9&=Fv4Fl~3 z&7Hr9Zvk!Nicw)SybT+#;orAM7A%(vaRT^+q2|MkEeA@U@C&f+IsiU}DCRFD66YTP zCAIoia7EV(uA9KE)U6u1?tnG@a_O=LpV0@p#sQ+>^d4{uap|xI4L+8El=Xr`!>9ARM=yA2_k}vh zCXloa=+M&6?=LnrL9B)~=WLik$;)T0CKAS!GE zhpH@yuK+5WLA_j1bajK9U>?1qU-!Wpk)}{*tAgCqy%dzDL8m9c&MI6l3<`q1p!S7N z=kpihQJ^5Y59$;(9|qrj4L8_2?Bnx)K(|mv%wIpOY*n5|N8&mMuoq{9z@6U zx0wI>|G(GcLc>ok{w8gZm}W_^O>F5Ql*0``qYL2U8u|Afhn$rFX}*_Nd-RI3fyz<% zv>4A5g3d{GPp9mB9$ z<8{cfR@74%HdnuPfN0=ve#!vafB_oRWPlvf0MYdFB?G9K_UN^Z+Q(`|b83?l>5(G2@Rec;zTj*Ry~$LqA@fNuN% zAIz{6bdm$;h9dC644|V(ptTHi;Q-3P3>>!LQjfny_dBR@0=_W>TyK^vgB;Gl-zp3` zI#Cm3OX<9qtp7m4is4}y@a-qP8xWrHUkvsP2h20Xpfz%;eW@@Gl&X2 zZGuy`i4~}!4Z4`TL(0Sz5NtbHjd_?DN`i2XPazf|cvwb)7hOn#+M{Sg zRL>VOGQ7wHSppfNnr(Qyiy2Z}6p7jBmIxgOm))RLZ==oM3fanaAKAaKo0nKF*l-nn z^5`|40y0u82(;4>)OrMI1&?Zh?k|RB2Jp<7S0`@)Hxoli3|d`}bQT$?eGgvTc<_G- zarM18$nu$i;6N*#_*xIPe2MX;XSWZ(fk*Q}(0y*DVxSS?s4CED0w6bn4vpKx3rcX{ zb)(>jaA5}xD*pGdJj~y+fR}**bVr~s<5&Og8hsAX2~EAG)0QwYyoe13+f||k*&xWs zy8v{SdN;Vy$iJT3r+Y1EXPP6kF9USR{p)y$?ii46d5CVP6jX5uAIz)>E+&T83J~?i zAocG-G1YpYBp9Z`3fVSq8IV1WoxTj9WakLp{|%aB1D$XNzpBND@s&&GL(314^vmCF z_4oh(m!PRDh&2}%GcvsBfLbF7v*tP{XhjLsQ{Eb{r$ZF)1SyV&DwcsMUWcOC(KXnYEo0+>dt!wOv3h5@u%|m?4FnObq<%y$u)-zSM^64+iOf4T;?n zxP4wI_Wc2OXd&)X2dUqUu3ipBJb2C4rY07+qR|7M}67kN1Yu09Z?{xrIJ zI~4U2FEilk)j{fKqpKG}QLpgQ0(Z9H1HICF@_%VogYjZvD^S2RaN8TBv(; z8-vCm|NZ|D>4|oJe-Tj*%IV)qHXEB0K;S)d<-r)229J@mqKqEh(9quJkpvx0Lg@;G;F$K^O37~rG z?#o;3pz-`C{2dqBL8HNW94?j*%3NJKANjVvEmiU8{OHp82z2jMsU}EI^C3pd3#IR0 zt27@1-OZ<9d7(rSe7V+p@X3ZRL8mT0X}!eXSp=STa1-$8Yz5V&9=#F&J$4kABo>v# zD}c`ERRc{E?odc8%}b6iF7fDW1x?(6PEBU?Y(C0pQ(yAg1JX>j;e`%7may1xm9ige z)zSL@p8<4)3G!s0(RxVxTnXd}$YDdUu8ZLTpYElgL3_{6dp^Ck7V|-4OQ2K%iowI6 zqeUQb<SN9FG$AE@$5W`JU8Xo$!gAm z%dc^}iP=fr5s}N~eSF1>yCvUJELY z`CC9&j5{{eGSu?7sxhH8sv&)bQU*u zOS>M@%w4t=(ag=50dD3hx`5j39^JeO;1z@5p=C#ld!VK}pGUW-5Lgs^LKadB9&!~= z=Zn`Ij*Ry}H}6D)Hi!4}K4Aj2dwswst9f*T2fjcjLv;Rvwpmab@a~3?sFCI0#$nY9 z+OANt(W)1AtQyGJ(v_f-8bKpDko|3SGZ-0O7D!=_1%^YLL|zYo49gA+_H8mEc;>r6ZdO)Oqs+1q9^Ko$dzELI)3M zjeoHDAhSm|Y|sc)CH9KW2Nhj$D?w#?3C~MkuvSzR^)q2ZGv;7r{H>q^OTg6|tSber zHa)sIJ(I6^c3uUYoZ-oM7IfM2A<*(`(22pI$_6xJ&}+JL3M0b{Ye;DDx2S+`@I)z^ zy*pXwfG%}v`SAy|oD=!LOVIJ@n*aZUW@W$=EBr0D|NQ?CE2QxrNbCf%_6X>1`%Z8n z-TQJS$oO8{NejRYmdMGVC1l8#HnH1-2H98@_JGz6Ko5DH54uvM^Mgm@5zv{XNC&+_ zw}2xKK6f?z_WGb>=dss&V7>K zxu7vgkIwrpou4`n8XkDD2(&D+*H&O9$fX=i3=I1~#A_$eV51ep3=s1@=m5c9(_8aF z{z5k+4r0cq6(BQI7#SG$fe4SzTQ9jl6JVY9Uwm+ZyJjiGqzUsuvrpg!M?RhZVXhI$ zWnkdn$L-N;yKEZBFi@`C2O@kre;FQlanhE70lcISs(vfjI#v%h+;X4iNS~if6L4*%z-`7LO9bBNHr~@zJZ9&UEbYx!ogJ#?y z3j{mwLDmOu2Ic!+Tdt)b7dnCN#|9A|orhjZgA{k(f58ZG8Yu9$IfE7xnl7A&E#Oo^ zPV2Q@3l4lGP{4r*(3FNX=$LzO=t1mu>HPM(5oF#nXLv|PLyUIAYV@gWkiE8+U|)i+ zb>9afUZ#Uw2siR2_x1n(A)^|y|CTc{fNng#3DO8Hj63hW0Gadp{fpgM3=FRWzz6K> z$h_zW@tj^ey!Q0yJPs-&Uetm_44^0O!-kb#q=PmZf)3?Ze-Q&=!l!3mctZpnJLFzC zK$tEa)-OyUOwf|97n(43DZ>ldEbv`*FIWEmZ?x+Fe;5s7(-X_Cg4hqDAHDkjU*^sK z|1cWFrYGij1F;`OGr#)(|M08-|6w$UO;6knwI4(;{rdm^>#zU+!)Oqjp7=V{eh`i5 zQl(8mIWOCz`He((J7}J_`2cKi8@B^ls~n7^eObfiS*QJ>Dz3m%=ZCm<`cz$F-H`ZtX~ zU-oDYXnjw<>RAY_dlf>P-i6S%PeHT`e?IFQD1-Milp*>H%8+HuWnf5ipqsR`CAr(m;1l+(7Xk^3-iT^G^lseT=?^4SwMEX z@aK!Z&Sqc$iSS;6GFW$l82tIR3n8>=Cxq55gwU#y5L(tT8x%e_eKkMww}pZl#+^4j zn|})MH!T3|y6-&U+5F&xN9PS6P0+3{kIws`L*y7dnvZ|*Xg>CVzeNaiT7U0k$mVbO67tb+q2i>8AUB!)%DRj>{&kSv-GZjcxj9aq3Qc)lHEEVTeL zc|lCaH2y1x!CXEN*9Xkx|8|g(za<}ZD|;{^d-KaPpavPpfRg#2F10R?VO7*P~pzZk$&l&k!{6P1RT0Z4(aRm>uJ@V0f1-se%#f@YJhL^g3 z{{Kgq23~(~!pHJs*$R(dkN*u7|Noc1JLd3T;q?oT?${GP-N^zz-K7^il8ZTf7@v9c zibi&UN~Z5SL8JUHF3ttF=35Vx>K|_g6?&jsbU=+s1l5J5b8g0LRYjo}gM{=?};SPD!kGQ8yH^;J2wAks^RwOH1;?S z8hitfDl{KKz61afL@4g@Xnb=5v@)=pb?XL5Q@ay%zl`nW1&jmC+I4`awIB(&|G}rce|yoL1d8Hg z9-XZcpdqBry#k;%Z?EjX`HUzlP8d8J|ADtN?*Wm%{7%n2diSb;wfqAu=DwcDz~Fq$ zMTZ5nG{&d%o#BBOcM=&Gd>NnnYCbDH72Q`}CU5YX`;l zw-*{o3=9o65)3}QHq893QDB$YdVqX32c)*w_IeN4&mTZ5UVCj*K{8E=sD3u(0aa?f zwqEVX9!Q(u1G?(r-;3EGgCL#-T@u~7733`6&hI|GrraoA_GtVK@~I=(zdrmm zJOSoku)!ezzDWT4*GKa)cK==iFMz!7(`&n~4dmZ{FDw#a{xw1P_rQEch8Jr!Qz4MQ=ky7rjSOdlVvi z09EaJi0B4X(U}m@g{Y#<5YY*!qPbvETMkfAK-rRz;5!KF!}r>XgJgo^L4)-F4Zpou z4G|5R3l7M+5S}-L2fAp;qu16M!UG*5=h15`I{~b+7^2b%B9{u`u|ecO>)AYdZ38;N zD#61Jy|#zuF*3Zk9S5@ayWzJN#tLZ*Mx92%st>@=--RoF$@g8y*g};4K{2HB~b`Zf#)|M&DC;YP~&zNGjz-lJRWFZ zQ(vM3nT&X`Fa|t5;ludaqw~H`=f4+eAjkFUFoVkG(rszb@L3CTy>I7xU(N46y=y^r z0m8Pl37(DrK_RmnM0oN$-3OZuzUXL8Gy{XvF&AZU&`g^N3!1f{<#V8GkM5Tqh9s1Q zpw(>M;2HzukY3xeMv&rvFBrh?F=1}7VP@cOWdhX`-K^a!@u#QlQFzmn2l$4^^NyWY z9Xr2xbpH0}X0?Qx2&#L#>oq)*ixoV2c@JwcFzixbU|@K`3v%D_)(1Zz=N`Ls7b}34 zqP3`luF~yXy9RW$Lg(BCAga4q!=>{<^9cvnmj90YE=M|BkNf~l?tm`<_37oc>juTB zs5F?8-P{FA0-p^3yBhvCJm6~hmS3Ks*@~e8ba)=<5)4LH%dbW6ULFKpc-#7xzhejJ zrrFMypewWvK4$glPLbmPT~O0-s-fZ6|59nk=A(?B$!9&FM@%z*agNj zx&h>n&b=2v&g|TK;>Z90ovnAkoUJ=RQoS~Ej@{y&7eFhAYi+wgNALDeWnf^i{r{hx zfxlmZk%7S$wC|k1-<%1wF-3#FYI*k-ug^PwE&tgGs1)V(Fst2*v0>jo4gsqwwwl0o< z4LCmQWMtUK4G9{bURKdAMuwN$*ccdW?O7Nc`1_WC0>lBtY*`OtGAJ-O@VAJ9LV=UP zz=6Nj0JNG{(7jaMkZ|dakq~g{0$uCt(QC`y&d9J2)RTgY9UC5a(W%M6;L>62+xg?A z3_Cm|z$fzcgD!6GRh`*^9uik|;UUqbiyjgzAiH~QCxUF^fro^WCO9O{wStR04RC<) z+O|PMf`ftKWi2>~GH@{Pw}^p4f{8(ZfxopEbPO^$Boz2t|AB65?^Wf%aF7eaK|ev| z1E|^m43W%D}}oOsVI9B0t%`B`}pBu!Uu7}t`=~Zh=A?>`BD&`2N*rN z!KE>O>oib7f}AORJMX{n*8#=C5m3>@01;cr-G^w28P|B&a_YGf9Om# zs05v^4m$qrw@$R0?V`SL(oSA{)_Ptcwru;ch!q`)&zj~YHPx^(_*c*xjtsg$GTB!4Rp=y1c%|Bj%MiYbR(I373r zX5??Z#0c{1F_+GzpfbXRovomn&!zK+M`tUj@_TuX5uWrxgM6)17(u7r zLam$u4t;Qy@6p=}s`Ay&!{qx>Fw(hsKE1H! z!+&stQ1lL%k}YXsWO#X(0qzaZCY#o?ptRPjdc6fb!i2Tp5q1KUGf^VU3ACuL*Vdq! zkzpSv$OLePNl;~Ac%1~z5G)J~rNutIselV1eFsxEDi;fSg$ z2+|YzqXN#9D?m-YUQs5n&v?a~z{&F^=uj1Gi4&SjUUGd09f$#rXy49b9`Nk)LJjOB za7MWe%5tC+Mo?kIqBinHU(EIQUyjL5*wBT8v|imLE%BzE%O7a|mRPG-#Tik%*O)5yIdDuNYt0gRKVF zieJ<~R__J%@F0sfuQr0LhE$Hp2&+9%D#yGAMuvT$Q7U-ln4<))91(f0yB=ItXMibL zhI&SiD;)*ZW^C0F)gy=qB28PXF|NjsA@&AAEFHG$5{r~?WlmS`v`J~1-ptE#* zI(tFGVLqL$A3!&^_HuwCzjNvj(5x${ul?7fn^k2Fr~m=q%Ini@=h<5iYH-{wW@LD= zN(G#hOL9FskNEVOo-Aerod*Cq^}wZ*_3m95uOz^;+ZR+23cNtticGEc)?wQIDY~8d`qM=Aq#(af-j5v?$K-dzKD_G#U5pl8;*fi+h z$jQB?hTufC6_RMbcisZm;oE$`?aCYVj10S-K(p;2;w9)VA<#~CP*j2LRRrfHQ1p2~ zc%UnuSo3E=A`LXwlG}O1qwxqRx{=Ztxcvxq#q$>jKnJ1pny#(`rEoM?7(iU13UY-b z$Q2+0QW(AjZTjwJWkOh1GWmsrH|T^hUja}ASRO1*_2}$n`2YWZZzBT}sGY>~|NsAk z4_KiivdKSQ)ObTuk&|cV5zp>Y(1mp%_2A2qKy?Xt%;ZI$Hv>cSUXTR%2&}!Jp@h6o$xaA8bLz)&bwnRF3XmkeeJk zeFZ$5k1_f%?*&C<_f$|`03GDd#NaUlbT-JrhpdjBB0Qk`c{qGKYtS$0ab@u6H9b}U z8n5{OB0&-2r*fZO(@h|;?xmo7=Gg7a(0a1Mvy*rKEl}PkHcv z367I&!K=fdXNH0H@V!+4TM62m2)X+dY@e*o5X3B1Zm{I#Z*>4A{$59r`?);$T~55z2MIuwl-%{~ zJn!3Sqw?|-N(qQQ-vY`IE|6r{2~GhXol`-P1e+FO)t(N?L!GV{e0uX0JbLRu1!LOba*fx{Qt1qSpl?Q8$7(+?XA&y%%k%Z z@(C9c!24g0{pW81H9YvYS22A*?!dypQ1aZzGKr)7p^s&fK-q0q!*Ac5m|04BUduH9 zs4ih`{!v?M4J~aT`J|J>)$p4~H!JTnNa%oWP;Uio@^%3)2?K>HQZdu*tl(<+t@S|3 zSx|UjE&n%vb7WEgowt+7QU2P;GEt!H=?>7XF3gP0KRC*{c7g`u`4=B7>PB8pJY?VD)QRk6v5pO3pK`#b z6Flfz%IVXs+dYMm;WfKYw{F!GkTw}m+wi|5cq5@tFSO8p07`C<_2$ssc#$5AH$aOH zJCA`5uuLrD2IwZd<>1WRYx*`DGL(lKVv3?&Ec59{JVF$W>*4OfBNj+%Az7~Hg zxU_FR%IMK+$^dmuJ?P%K)&nJFKE0-IGC|4rE$GgU3bRh$Czlx+N&-E*!!^K_8hqKg z9jNyJb_dFd?CABFD#YZ{4XVJ1+#KM8aym=61w4+saD$FXWoSOY*va%V?$`hS zFLpXIFidd!_5c6tpa1_i{(@i-AI2t?2I*x6oigzI|9=?m1Lf0;Hiy~=qCxd}?8{q@ zpyg@uE({DHzGJv!m}978NN|8F|F(-Rod>>Oa8W#AcpEZb;dI!g)AfQQ|F#>BmbY9$ zSKxM@_Uydk+4A}qw~8*=QYRwSHZ>LGf+dP^H{g5fKT!d*Vg})iZ7>w zN=A7H246k&UNnm;Yjv8=3!keS>0O*J-pY9SyP>b~c>#30Pup3#11Jn8v8<^1utJ%RuS6sqn z^>c5K(<&E3PJHY9;DKwkN*daHZ1Wol&?@)N@1VnQK?h>>nm$QoWO$J##=vmg6?6?S zEvR(N;v9y|}@m4v}tzY-YbKjeH46JpAZXD{A@P6B8>P&)Ia zH)utk?lyB=g}+cQ4K0lYY)6eYA*20GuY_xxBLdp7lS$hphR%* zMXf!!WZ-WB)u^uBsSK{IPb$(ugqusJ>hE)m3{XM-mQx^|&=#>v=cCuq{^g zXXi0r%YXbWKA_7qy4Y+q_**qW?Ht!D498tBKw3Czj{N(MK=)Y5gYMP^)lkVST^@`V z{y#VdQ3-0(Y(_L`WTC>K#>{4o*OtdzFEOMYcfC+uySe(cHu&IxkOIVxDzRkn0)g{< z814h@)Un;)4LTIz4rpf;yHB_6j&77g5%z#$=rtdt{&Hlzn{NkMVC~uyVanvdhZ#VyUR3CdjDLt*`kIX>0=c zK8M-^9=)>Wm5dDFqY;{2&oI9H1Ky1R4$Iap|Nj5)c0Gf>q-?^~fB*k;{{R0UMuXV& z#J{2TgJ{@#0F?3%v|iYyyPU(NyN<)v@}EoR4@Z8VV;-Hg7ks+aJvvKIcy!D8B)L0F6pC|74Urzsi7f(&%>s+9hlwo%iGl8_v}D~3 z665sfWnFcSk>PczCF?Gjz($ZjiY4non7|H@K(Hn237EiskbsjV>v@>KF_3_vCF?bq zz*&%hf+g!+n7|c~0KX;c6OcfbM=$H`bBqk#0Ro+Z9=#qShPS%~IWK!OAAIrc5M$|Q z)U%Yq<&_8cu+-%Ww@0v&F2T#z} zeA$zwj11tR2uRTy2D&X&(&+c%@$P5o?Ju7HX{NVo* zP3-lN(~s9H5Ty&hJcHo@&^1DuCE*P}Q~6s!=fO4nw1V7?0=A341#}4$+zQ0KU@Jg( z215?n1KoR!a$V<3$N!)soAU5)(h@qA^7@O@c78V z|0R03;uo4~K$dR+S>Ae}bcx{spI!$>P(*W;)HVF%EvWjz~{xwc88w`6?{2}Nf+&izid|SVH z^1I&i?7ZRAc>ta#K;vCe29^LL79?9px zcVcy?aDXniS{wyxm_C1@#0_rlfzRsk={4<%0*$nR2X49*~@>lu<5F+tH=V7(6%@u(bJ?k`H9nIDb26WWb}B^(wd-DKf!>@zDQAC|aXqL8D#K zh6fPv@td)sO|xF)R!WFG2UML&oCxn?bi6qBsWBgmv7m0e4JGF{sC` zh-GvRp#-!g-=|xZ9Xuhm7(75TJ>KA%9?G!rgufU@=R7g&H>g`3Ly79f&>5FAp9c@aXpA084sU`g0V?Ky-+Dbo&Xw zLw_i%Wt+fUYe+xo+l#vf zAW`cVH^H*3F<@CxLU~cjxY)xl`t%tX5bdSl08enQ-n04mf6#)3IR>Df zfeXLq56|S|phgxO7lUKt{{^67ke;ic@!-beiJ(SEuiIar&W~M!EtmLPW-ws%{~CTN zl?a0FcLB8-__qnRTq=F@y4d6RAy9j6|3^@}2EKO*RDbbrixFf3T{hBuoU!4zQVC1T z?b6pRw@Vy6nt$;ZS$XuD2!aN{dZRwMSpIh8_rLFA`QMS>_rFi_aUact9=$e#pq;`# zng@=%2r%mD=`p;()6xl#-c|vS6`+LF zD;sbaR6zJ1*!K_Qbh0;P}U zLyR_{=sr;TrsY71lSlJU{vsQXUK4Imbi4FcesZ<^?#l1~&&BeSBfsx8kK{uhnxGR+ zxk2&msd>QhxC;j)!e{C-Ft}>|b8Y=rC(kdy>YWEVqL!5b%+kx`kOGgwl;p1zd66OYImk%U;fsQxqoT>n(dNsg%`C1LYR4?c} zt(F5N;PmwulD@#y)C4d!w*X8nZ2(hiCxEG~3&7Og4Il%%S>3B3eg>B^rky5`^!4}u z|6Q>3^&YaO50t(vbQn-lQ!6NeK@wE!2~c9{Z503++u3>n%$xfFO!b14fs+wg@b%7Sr!Bbc3-GBf8LsHiSP{9K3KMsQQWvLBMUo!jxtgo{{>8rIC zR4E{(FV`NAZq|1dpnx{;=-mtQ=!;}6P}$6S0xSwDlc7nDiGcx@;Y_J?@zyPopsJOS1idl;b!q~0+sxQo5z zK#4xYNeD@Pc?SM{A3&~%1R2(Ppo9-}7C6Xxp!2Ok>)URCGA+7!@c9N$&|x&+Jv;yK z@3VX1tN}V6{x~CO1(6H?z88-C`)pKR=z`ZDK6bHu0g5n&25W{Aeg1vbpi|%&UkGS0 zFt}L0D18YMmhkCKW&|&N`Ukqc^@#>3zm)C-xBg&365|MM-@)3SApdpodo&;a54!Tn zfuZGOi8TKYj3fpaN z`^PcYuQ3iCrQeRZeus?Y^u~S#kIx)n0v(andGEzh(4wE#10}2t7BQgod4wZ6_An@X zK=n6deyEGD@uxM%YZ#?o-`WH0C{rV=(#G4`7KnA3mI zDR=*TI2!_v!UubOnw4c^-s>Aw~rWDK9-be{}If`!AiR z8XnzmIJCdvmsF85=n@Dy&?OL(&`Tf$k1@of+Rwku16pqBm9Vs&EZvVk8aja`JlEAWU#B(^nDT|!;3^k(Cj9t=?|V(2X(nTJCFPHuD$RVHl7VS zP6D(#1C;!A6e0CN0VrK{K6}BY1mWKXEztnAJGxnO^BEbCXK*JNo&+^ST2GcrflA(% zlNIl}eL8FozT|3t2rh?PPnJ9b%`+SUEtKrtdIH>1y}t{z=KIAOMNlDs>^0~><`;`W z3c6W!puPYNtcXGuw}HF}YU4m_-WQyX)<1jq;uA!yhNv2{!R15-j^|q>6+b`M0^KfUX*31S^v)f8qhY*c>$b>e=g~ z!syX?_%*u+<6)2HgN*#!1bd6-J2d>0Dtg;nw7=n3e92RXhJTV}_d$VK4qDxE@V5eZ zGx9T!&RZ{>6&M&CkFm%xKms!iq@bJielEoS;J^g6NgI!V!Us7pIpndlcf*1qIse5i zc~F5^B4v2e#lo0>%0Umt)0!tdX1G|CNc=BlImW`w;L!0c=-rw-(Cle*R*~s z3HD58_vmFg3K~cOuk<+f!UeL{(zo?Vi65u|SO9WyZw2Fv$8w;B%<`U{EO(&mQa$Av z7di!wz&APw6I)Zr1lXAb)ds^xD3TXJpuC z!oa|=3lz*R8sr!l_Ji`n3q3i|QDF`Y9NsYXnD{rU+{Lm;eo?Q?R(IA7>~v`8Q?LC-Wi}iS?AOp zpbG~&zk77Ex`3Ss$*rAxLBkI(c)@--2HJF>05TYqL_tSVfKpno?0OeaDZdpoLh)M8 zqgQsm3;4WEkTX8Xg7Oh)-70^}dC=KJy*VnP&}x%S4jhBv#fZJ8g7J(DFFwnHg^v1k zt_6*SfKH$RnE+1B|6e=@%ht_pye1N?8analwPEx)_+J6M zN$15C&>Fwao1pcFom)XeDxL?QDfo15?Erau7ic6K6#SmOGGZPFe=C6c37x$apxbnN z9T`C@0yn{T0z@d8f8G|XMx4NJ6*mqfNE-A%MYdZJiC1vj)V5GGI(^i zg6!%oVD#v9`wx!c=6_85t)RmqRxp>#W`JRJ}K9&bd z(hV=YmgSdc@a(QR`@^%laevb3p-B`Vtgr3#CDe z6hK2AAZ=Jer^V z^Z0%b9Qdy#(k6KH+K72H9|sK~GI=!rXXI}wg4|vu{$Hz9sJmw3pH7>Jjtw^ATBTQB zbAsAuAm+(#n~9w@6Ios#K)7z7BO}90S@4+4_ZO9*^@-iAe3_t(4eGgHD3t{5@d7!n z@dzlBfeHp#4Ph(=%G}`g7A$K+`X4(wLKqlc{E=i}@X$OG;nBHu!h8Nc)LFeB5SPeOQ;CQRR8W>9h&T@dWBH*lyHUIyE()_VjkXa1J zS|9xS|DU1xH&d;HN3ZR}B+$s8>AN^a2Ezj{Bwm7!=VY}6I{{Q`%}Qis*e3!nwN6Pg zFgWfP0&RES2-?ipId{RD|NncP|97_TS@ZwDW9Jc29_rPtNCZvb*p?)ME`fs1k9l;r zg8b;!9rJ+$+~;`r;-Mrc|MR!_g3SV-JaG;xWW@~XLLX!Fwfs_gw0SSc8YcdpRAx{Z zOo95%aX%CIcnnqHL`DX~+pl#IwH?1agKOt^$L8}a$6GQ0rL})TZXevmE2P_2Xd_ja8K*C=oAbvdx*=*s_Yg!Hxz6TWs6-^M;Ng(0lP~pXJ z)vG|l8=%6jAb*3FGnj&{oCy`yg9~?nR5w9|mEpq0AmMDNFb`Zf4I~@_6$TY(5SIjk zgl(b1pmi*+o!?(>0~e1jpzs5QFXPLlpp*}b+maUoKE2? zc&Py_r^G+ykVh|%mPg}3P%WZ)!DB{44aa{aP(==^TmJ8h0VO$o(3u;oZ~y-XJ7?>G zHUIy=SRoD$#@1GT28Oiey+=SvfxokyAM75VUT}c|s)<&KGcb7AvVwNPHaGKwBj2MJ zoSQ(4og2g%7+$^sE#?L%5`~u!;B1GNS3uc}?OtkZ` zS7*!L6Cml%=P!PP?nLWsU9sl>e~|EnHUIw`{(tclBH95Jy|L#1f2ZRue;+^t1k_dU z-U@bzu_!2&e}7>v3W~`RIm1hi4R)X;?$i0vgYhC->h|kZ`3o}4lktsLFT^~L&Q_2? zKAqo@(mn4hP%`-ry6A27|Nk#Gh=2|E1t|jOi|3&G*E+v}yHlX$ww|5GG(Y%uKKDs} z04`l0z1S%NI(COenZdX752(%J)4dnuM{r^G?ImcefPZ^y$m;+9(?HkONHa1ptYiQk zcF@wq1M<)}zg`n?7_xjHf*g{!s8}KJX9P|2)Rb;MvXR(JRB)V8f{I(d+QPoixvP|e|aF#LU1dYmo z>JX3asi0W%=mu9#9-TK|eEb61KXA;mlSRd)+uFDFKYvRO7pTedpT92^bmhlwaC^(< z-iu<;RdJR_UHE-ofO?ajmiJ4azjT6B{rkY-o)5k}4ixSshL~aQDvTQD9^G?6o&d+l zx7Yk&k0Hcf{15^=+M|0bii>Z(u>bu3|4Y#D7bG)*MoYj6+o#)fNdkCoX+OB*Dk{Xl z(0K!zfcUq8^J`}-$gtMi{Cyul8<%=b{USltqi46BPp{2vukI<}ST#KG;*uZ(!|_&9 zTNG~HTfn)%we_1v=Uh-8kyad3M8R8Dwwwt_M{=sdoy;GpP^ z5b)`?IqlQA_rYpViDcl@yOaSO!p}WB&%Jmm2ugg?EL_8 zNAg^db3kW&fDUT_^}me;z(XbcEuclK9-Rj}Z}>3&cIn;V}&Ihio|Ld$e!KHv><1>Z>;8N_xbckX6E$yIQX!8LDkIq(*2OOJ^9dPN~ z3bFuFa&%twOup{Hc*v*QbayPMEdYzW*9r)?gU63SBVnNV84v5JAd^aTKod3{PXBE< zOP_f3I{iKF^ap$@oaJHAvV%i^kkpo5X+2p2nhJUF;u#+-tw7qyp!NuZPv>(;j(j2B z{qH|C*kwQ`K5PZWO!G6Qi|;_mFjM+JOcpe8{;d@x%UBxT4OVvW9Y^ys&@|2qK_9p} z(9+-UV0EAg))JlWttp_Y5T2gcUW4v#0k@JodQB@qOTRinX=)W8C{4+AZ)HGHe*G0_ zGt_@jFRRxy2BO-dw-@9K!vilq@`BE`0C5;f6F~FPy|x}vj0`WH@-i^I_V<7^)Lc5h zL6S1)Fl>+RUQkYP-0ukP!r972F*57}v%#+Taqs_spKepd7*O*boTm_x;@NEmDU%v` zL3bf-1y$@W%;4lTe8ScLTwcSBg)mmN#27Uq7_z=*1 zYzr$$nqPo563UeXHCPcj>kB)iHhBO(Tn6lH52)$Q2N|Ju`Xm=f_*j1A?=k!R|Nm<) zMDga+ttuQ1Dj8T*K(`Np+71UCL4E(Zpq&NH#-K(RFIxyBg9pFwP1nx%j+)0En~(qY z=-mr)RX5l=NbvK3`(ArNrIAOk>7HOvf%eO#^P_L)GtbT&o}jh&FBEtfKv$fB3SCh3 z(vwP=)6nS*c1to^#trF0p^mr?*s|gyM1XqU%JRno-JbD8d zJz5WV@Vi|0=rxrH2KOe5K<&2PtspZ%v7*fZFM9v8fUE;03Q(?d{B}fvztt49{S?wf z_kd`6agq}pH7!ysV4d(3CeO{l@Dj9L71YQ3cATYD(ec}H2maO%C@oc3+x2DeS5Tg^ zUFZXf3{&O+u;X-Z{r?Zq1@3xvoBBk8qLI&|*H$2akzpU`x@quO!i%e13=EFnjw_T( zg4-{)dLU^TPzMF%_!rx_Kp_CqX9SXvg-gtZ=wsq<(P9Fd06OOj6eBJF`8#5m;89T` z;n{8H(Q7(40OY=@ppZ8_@WK>qEHrxbxFAh%ke7~wvk)knURHepRiLbsB0wVspzgZ1 zKO@6FEw~G$xfmE;Oj!;tB3?3l0T)6qo0%CH4FA8dz5D=RssyqT18Fqo%=7tAe^n%rah6rAM0-4r37gXMWV(=HZ zW_%$6UTAv%g#^e$`}E6mlj9RhOME)Fu!0mGZ(#)u;^gaPfX+|27z(OG@4qktHReF0 zj@_W@qVupvukBwU1_tm!R=biw$BA|xd|?YxWDDZ)x0-|1-GA{MbX6LL6DERGcHVz6 zm6L%1!{TI+#Su`8cY^eTEVc!&zyVqOB_C$7|2|M_?cj?eAVszy9)Bxn#}+7Y=Yh^T z>^5bGEU|>;xYoWu|Np-f1ew*%`Zx?0O*25zqymqo5>Uq24-Ufhph*-^E7_LWkC9;? zDEJ|XFaV_H+i^zz*1e$pNnj;RASH-&stdZSt>r&|=Mu0AP?D1M11Bj^H_`CGi%0D6 zG{@iC@%R7#m$M;##VSzw)XRHSkCDM~zbd%op9+eceIT~sfftN7|NnpK4GQ93+d{Bf zQBOlghL_+bMmH-L*khpN^V}b7A4sp^ffq%f6E^oNfs#-&XsK&A>jO|QgBxrO2$efQ z!&`<2UO0o5gZhpyLm zeFBzz(WeSd{h)Rq=x7VjI-J%2L8k(zIzuH&bD@GBz2Kn+kM60U{^|=AJ(vO?=m-KR zaj*XW{{<*!z>R}aBY4r&!UisKUxQ96cMArEhGfc1p}8v_GK z1k|O4i10y0K)qRr$RAb)2ESgNr;yI)Tc_@pr=ZSk>w&tde!VJSwkP8o!`rXLAmhE@ z3MTo4hvjMhUeJ^us};W=|a>EIYB1%WP=_DQY=orD4EO!h&>-EuGZ zbY~0rbQe4LGQRidjNReVoowORE$7o&d%)B3t`EQaYtS5LJ!n+xGsFTeF3&z}NCGf0HX{MRRxV1<=|1J|5k|9=*1Ppc-_!#bU&6y=V8arc#hWFkfqR$-R=^WH);b~ z50prHcGnAdfbvK-s8w*>9lUYhu{)llx7pr-fuZrRT?5GN{GK-&AA`D29?8F7M1b7c zdY~l3qxpb>XQ#VB^Wg)Io$(Sro!V$_rYD-CZx>nHVvpN=7*6|M^4jP=c< z^PfjI>p@Uu0Nx#Q!vj8T^x`(C!s)#K;yxn-19WCcFDWtmSPScsfB*l3YVAe7kmdqt zrw8bYhCw z^wI{z0^Jqx(g?%?owD{4w7(<+v`hJ=97rsNk%8f*2#A#hVu9{k%cumgKxdX@bbwgj z{{8=-F&)Hu17a-$u^xd~TS2TFAl6Y33$&>-;|hoc%1jxc<1An90?C4oKmh0G3~nX{ zhL_7gVxV;|FXw<*pn~S*BoNCEBnz4_&hP`V>Of-gAXW*81?qXe%mT4mKw=3X7U*E( zmti2*GLV=Lh_w~OassiAfLNd%6B(C5EIp7I=w92GDj?P;kQnH`n+!J4DYBrxbA}j* z#Rig91F=B+_A|^ttWSUc|Ics(v0i{!p&-^h5Gw`50!{B^6oXi&Kw>Q*7U)u(|Nj{U z86I*lFg)ZCStY>mmE!<-B?rU*|BR~`8O|^=Fq~nOx+BBzjBzt71H(*q;e#>^YuG^t zlkVdbz97SJk+YeRf#C|5@KG6t=Ukw(i@$ISAC_Tg=b6RGz_5^4__++j7GBU{+>iN$ z_scMR`S8%2cI$uJxd0U3E*RCt37!!6Of zj0_Ch#ibX^FkBL^W?(ogA-zzB;e|vE1H%(Z>G?7Y|0O~9s)F1rz_5amfnf!sa3d4L zZpKgskk}dz1H;q? zMuC0n85x!~F#cd0DjB3=9j!Wp+t2>=ln=V3;i-xn7cC zi^Lp81_sbxP0(xwXzK}x{sJQY|Ns9PN`HgWU!n95DE%Eu|ANw>y`~^0XfG*<{tY7j z|Ns9FO8UmS5*V!3Mn3i68*OEUBG^b{O(auk9<^2G{4sl};9WvMB8AQM1XAtWQSSfMySt)x7$C{-b| zSfQXOza%xeBsE1LsS?TPoWyd4#5}NIW?o5ZQ6AXv#2kf^qSVBa%+z8%g^-L?h2s3u zqU2PCQVMCAIjLa#^NSRUQqw@j=PN)A4@ynW&&^HEO94Am!ClYL(oi8kPeCcz z-z_BEG00UR#NXd1Si#LdNFg}D)z#TU!O_n}!7Fv9u&3zo=LtFTV)vJFLM8isY2k)ZEk*g_3-QjKs23h1|rH zRE5O6N`<1-f}+&o)Vva~=Zh5*i$Q8YL0?>&S(2EPnUh&kiQxsXU1|A6U?U1jiwg3K zQ$cP}09lohnv;zNZ z)ZF-t)Wnq3B3>@#)V!3;G>{|pwG@I<6LWM+GILWEic)hR5tor!Pz*5?>SVVdM_4_q%3Q4IY<*BK8pv0V?n^=;W3{LC0iFu`oISQG1#U(|hxv&%p_9MdW=#Btc55pQ5 zL7=aJ>Q^mDM8o}~sfp}aS3gH5AJ_PhAXitIk#O1o&Qeg&*HUl>m3SpZsi2HisgRVa zkeFNoD)t~{Tybhi3B=o(#R_RTiRqv$W(f8PEMWaYed9g-f1!!u=H-CWb6RO0L<1;m z=BDNrr0Gj2K=n1qFr7yb^^>Ya)~@K-6Pb>ErJopkb(Kt>Eh) z=Bfd5nl)5C$j=&?wg%P;nF=#`#1oaUC{)f&1C{;Y z0*IFjoLiAHaUcQh;noWk^W(>ItuZ@A^t%i+Q;AB6C@n$ z;pqla|ARNN_?;q0OY`UXcb_HD3L)<#wHB%15_MY zwXdTyR8#>)*gwn_Dvm4+_B2EsSr{A!n8M&7!4!ss5Lny<$=xoVVPG)@1w#uY;o!ia z5Qw-TQk@wO4p6YTktvdDQ22sH6%>rXHA7x1q}7#}k^(Afl0fZ(G=;>Xba0i1T4l$B zq6Mnk7|BprG{rkB7$FJ6qAcDSCFnrW2Q>smH7Gj4;wTRG@plIcDkz```+5e$;>8dn z(gPsr8#x9Xor2@B2!kUXB95#Y6zLFA6qkcaYN#p5sv(gMR*xJ5kVpp$qo@Yu1BfZe z!q7+uDMtH$5O5xb1O~E$L6HtojAAx8(jnp~k?!c?qEP{@AFCCr^9zdOlk-ZnZ8ac8fR;vu zrY5wG1C?PQ$!L&NthTL21x%(|p%~Q1NCsE$1<83O)(V+v3L1(arlvx*0*JOXv<7uW zb3rD+j1NFIzP7fu7LfxSoq}<>%PBbC8CfHeyPSe4cNZwNBO8zEE>Nn6ISe(tKr$!} zL%0hhh3qhL!V6?ZJaT}cxy#WR<}3v?cY#V_WDg;^%h4IxSqfyi%h4IdSqfzy%L9#8BM@mO+k4guB2}NDd>%U0^eiLku;% zz$G76cY$TFy9+Eup}W9l;C2_dzQyV;uncy0fu$&P7uXEk?t+y45Qm}0BSZ$tVTgEy zNFf|XPCP=)KynyrJi2&>K^&!^fR-OY)e?^K%f&Mc;V7_1(#utl@yN*@EkA;4KbXT% z!wV#X6k4FZT5$=ew2qDkNg+FoobUpfffQN_Xzl`6zfgyvx(h6W>@Y+;f~AlgMvl9{ zW*|EZH6B6DHmI}E;t?c+>@4tT1|+;dQb^7st6T+{f$S`_@PaiVKyE_~FPIG6ZHVxK zNx|GkPI$r0fV&MfykKn@On1R#u(%5*MTxs$X5eras1XHn6R3HM8eSk7xSK%Ii0}eQ z!Q2FrAt$^*X29J9G6XHWKuve3!%*D?Y2P806bN^LrH~v(j=R8SAUh1zT|WNqP*t@EYz#5-%pgZn_RphLtaNIF(q+Zw3=0jY#Jm>kD~jEoO}+6W6xNCYDs?1I$x zM+r(JEl>*|IV=&5b#!roISiDT$tv0$U0hH?5*n1S!3P&mQx_VN=~bCL(zum0)ye%DRA>l#t*;ZJHTrfm^JI;6id2 zNDoqQkyUt<^zsYbq=YyOJ-onD2!|okJy-(CVdSKHuo=h>gQR<2uG9+91iwN` zeko|m7COdbjV@kLln)-A!H|HtQXv{Pl@*In1Der+nivnB83PX_m*r=I=ZRBG;>&aM z3yKvqKq8vfyj&n!p`f%l116E2pI2O>0Gj4i(8@_nO3gv2$}fN^0_lQ_mlmWXmZV~p zDk#d#!>|%G!U0Tu%L6cq0oD9W_8HIWp;{G_3&fT~Pa7fBhi7eOi$i;Gi>N>DW@ z*xD)>fTlHJ6%>-^LC!{43aRLk_~5}c1RqrKX;dIt?+dQ!kQ6{haS#IFA{IppxNt)e z0T(MMB9J~aiV&o1K{7ZnCTIZk`1Jzz2 zjBp6JeT*c9kU?%5qv`>*5s|bgAdjv?TU!WYV9gw45wu{3)$B-0FazENGvr+`gWd%_ zpkbvalG%u$2IUx}H3_+i$qH%;xy7Xl8h-hC3ZC$3`_vSLu+*aB%>2A!$W%0Jl|^o1 zGQ!~8#AJ;`9fc$vg=9?y4UI%iZH**NEsbPw+J&xtz^<{l6jh@xrbh5m3&hF}@FETu z*I-BI5YI5j5LfU*A!k^A_f1XCNX*MD&IM<9SibQOh#d8I2FXu*HTc|f|ck6B}M9>MP#AHkf|<5P(f^kv@|9k9x(ZN3hGd8>I%7u z;H46v#a^IAHYrMwH3!a>>E)Su3hBwo3eNet1(`X}X=`XV5mG^EDL{>hFDNNeuvJil za*>K#c*uZbtU^;k1KGvewi@{b%F57cRtHi0=NCX~SXc}rugOWtOia(qF9xkp$t+fI zEKAJH0aXnOX+`*?no6dw-~MhFHt zhB$lpxQ4m<#K&tY*x4$W7#JCtKoTpY4pIot&rMYbhb%cN#vNQ5{&_i-3gsE8d61P$ z;AL5kuq7#wTnJuCqJR-s#ii-#sl_D<1&Kwec_kUC#i_*#iADLPc_|8NYG4~P^Au`o zlt4>#z^gStr5gkz)4u!NE5 z1Q^odC**)m&&w}LO;J$N4M%d55~!l~2Q7mu&n!*_FSD}(Dap&%MNtJ#&d}lm6p~t$ z0)3Dv3V!|}uEACiZ<9fST&1t2pa5PysSer`4O$fxuMSxplv%8ho|B&hT4tHA012;@ z)a0B*XyF1{+*6iXR0$3=uqp7>JfO9j>X3Y*4q9Ub(VU!*2s;H8s#1bhki5dn4hrQxQ4R+S?88N6f=Ih?>A zEeGX!@S;2Ls!6D8k$ePN^Qlk(U8x6JbC#Hrk_lcXm7k`NsG#nw4)z-;q(HI(Mfq8& z$t6&)Lfk@WasinFPBDlTtB}Q#?vNOE1FZ%FDT2frcybh;9u#a948SdAeJyASotd9U zN#z2nx`?Y_!0`ks!9Z1rj)H-vH8`i@u9;Bk9gs$a`~n4pMtD_(vX0Ru6;$vmfELgB zCMFl#rYIOxQ1@&5WaBBj(hBmc0RiQW|zceQWw8SnsF$dHthxA(#b8;#b zAq5+(#s)1(fH$-dl>umdiVoO&3K|uf7%Kn~J_L_`gE<~%0FwP6afku< z?FTKAfN57i)(=_*1oi*{{h*N-m;uQ8!Rv=W2H@8ZZbia8fTSNR4)y?k{op1i7X4sx zBJ_jXr&#oZ#fi`l=}15gKyp7s9Ap4~_k)HlV8MqR{@`_0px`5re!wFDFawb62Z@7h zS0JDt+|q_RAK8AeIM@LE?gw{HVEVzDKpaH+1`VRaoTq?Q-ai1O1MF2K_k(&;VCxCE zAJ)MFn}MVsCayz3Kddi?t{)~&NI$3x2-XYofCiESK*O3~4`2&F9ps<}8KI+K2=0SG z+rgmj8{AZA5d&=z`zDrTAj)afM!$kWVp4HD!fZs_UqJzEilHXRNr_3tNNszCG-5P? z6d`NMAx0BO5t62~oc#PE?9PLD800*#A|y=;#f3#B*foLDc)SKk6Ic0GH5F(4`X6Av$UUW2)G?5Fv+{6mv zv?o?z)9&l(N0fG7Pd}{M9V3X-?ihhpJCT0(#qM`sBK_`*>UVuDh2X+c&~_+LUj?)i z4r|0HD1Zt`aD@V|p%8TgsHq4oMnTFnKnpFAQ<;K7aA6TKnu80AuxSnqB1&^$5W41K zu-6D`hA2bV3<(#4njy+CGzW${2DuW}3|0oy42q1*^gM7b!4nn5ndx~rO$N87!Pyq1 z3}!N-U=AiuGe{X0&7SUlMA#hc>Fx*94Du5=78HW=^GgVL4OCO7;j#cxS%Z}!S>Tyh zmReK-OUQ)n$;>N@2bn?GCYVYj%fO>KsKpkj0#8aTPK`IhWugYWDu?A2O&tYug3^C#iGputp1yBl1$Y<>=IG+o zl6X8do^iZ}2Do!?sHp?#41&v8P`3cY(9}_Y8i1`f0ZZYo5{NV#qpm=jJ;66~0;&BK zKrIDGl?a|L!B%rPI)nV815ydD_(2MhtB%~_QesU&nqYwqin~Gg529vQ&^TngMqXlW zs*XYh)|LjSLj{U=9R-jom}#*22((!U=w@7$S%`QA4WuYjFw|5~Q$w4G!kp94um=~9 zR?zVwn7N3qFq)|bn)U`(Xr{X5x45r&gBd7p0*39#lvuC}gI^gBa*h zVib?$ZcPQyPF`4Q1t|w@kj14B)LQ}d#0@nyLCO%WR!~qV&&bS4jn_!lgs`wR?vR5E zG@S+-I0tP?Dpp9XC@D%*P}0y;0`0_5*HKqU%>&PRr-H`YL4%SgPE<(A2Rkt(U!fY= z5%FM0fPI0m%eofgB2d>D*_8DB5{M}T0tloI*%F1MqSVA}u>Aydf)ygPCg+1@@k>*Q z(F#+G(5;|Qlv+|+l!r^V2BP#UE=f$zjtA`lj?YOgOU;Sb0UZk9>>cmo8W7?U@8%p5 zALJSm8sw*`2{jZoY>LY>OOi8iT7(E%9fX~rBmvQf>|}6vv?N|54>JoI#Uos74=Dum z5QSi#CX(3(npOs&)fC{lQ>3km;QoqpMrv|4DAl<7yMd(>CxyZ&<;jpaC5S2AzKrAHz&mn5^a#e%tSIFv;oLumrJIKi(tgoezlWV2mlUQ7W z7})`N7(CVk$|4|DP)oqeQ*!bl2Iy;{>jJ5UWd%oPl&yTep+2D9Tp+W+F4fRVOD@sG zaH@i>0@x4Myj;a4R*(z^nblNKv{g`#F;Le8WlfMVkW>MY1nq5x`Vk}rU7}(Q^>t!# zs)D+%I?`koC@Mg!NFW}`FDQ;q&MS!ptt3&mQ@2(CZT-^LgzVl*&MQ$+1C_#{{HluXaU{%XXhy-g&;bQ(zEy)8Sp#Rqsaq+)jD&PL#9pbVM{GZYdC&`{0KEkO1!$R?6-enBy4VK_LUVoz9#L^u?~O30v)ktVi) z^(D(dXb&2jfx%=L2%d++74-q68VH+Jz-3@GJlbPPH5wGO;Iv;{0!{Imc_|b{Imko^ zhD1IzC4oyrPq;(%h;t}xJ_eW1ZHY4m;vNJE%1$}C&|C!fIV2Co7^qu;YJc!KRL+Tc zpi0~Wv{Wh&T=T;WfpoHqQ^CtuaIP*=2X!UX;RB;dr6md=^Gb_TQy@KOm~nV}&~Qb$ z$?@RD7@*1)#)d{4NDXMsL2_ORblDLS4@pg0a*2kL5~%S6(gDuw(CAJ{O-n4zDY1e? z7)Tc4M+LY1oSgh}&>{_R(+afa26UE8N-B6^66i3i{4@nma0?2g2((-w2-b9R%LJ|D zD9J|{s-U0%S^AL9pRWJmFDa`JbglgTtR6G z(>*zvNuX9HE(fJnWR_^SBAEg<9NOqqhSDIHgD|8UU=6a!Gfg2cU%|B^vqS;DR8U7D zs}!_A8QR$ZhZ#s)EvWjkv$It&v{uN;R{*h$tigx4fX{J(*#d4;gHCJ%kAWdtny4L2 z6^-JOBJ6E?P&x$5g1gip<8&zpkQ3*8Q*-l+K!?IXmqVB2=jVV9%%a?UT~Lb{dO zyo|)W@OGzwB0rj*~^S}dppi)V}N&z%d0$zxe zo>`Wf2U&$woSa{f3S9#kmRSrs`zpAkG$k`%0c9B^Y&{}0KWjjjr&}q2tObqmKvOQ* zan2w|C?LWUH0~G>tumEis5vGAhPkOj)tqjbS|j#1eeC=LJUO^w}E2?9sxf2`Prof3L)S{q`C^A@rT6B zykdpSytMox&`D_dc?yY1p!HB7PzJKm!Dz6{*!qdV2afnMv`fdCB^q%|5Al$$H63Itm6l3VxwJKDCfjJQWn+3X}75 z^|f#)QPNS+HH2yeTLU^mNW}@H(n$H8DvIdU@&^e?E8mSdl(9KMmItt)Lui%x!nI#J4pq5Kw z4roF!KTpBf2x0~#CXn3$S?}-S8sg~b6AY5(<$|Sg(0N_(v>Y1j8t)Vt;u;JZFaZUR zf`S4_%+L(%16u_{Btc^%sGt!qS1r8B1I{Vn^r;MLH^UmU8Vd2@o_@wg3ZP+b1q}sQ z#iL+jt6*qhV1OYGYH1jQ#X&Uzv<{4q2UR!m@e1+rpz-$*&{>b5!zNR6GSiT3iVqHP z0at6mUSU|%ar({!_mz|ei zo@b|o760oou?0?y6xpaT^1@^!$aaeN7w(g6=1YJm#j{N#90D-E`Z4P-* zv_R(vf?A`9YAF}&ws;LtaR@z$2~J|5yk9R;OaD40S5W)d(_Lm^K=6LbzS*xw48Itoh3Ak*^{lynrZ*aGr zxCJ0*gF_o6h27bpEgj(Y7AP=4)evYtFEv*KysaiPFCCm)K;w|{V5h^v8c||mt$T14 zfRKO&RW9HSdf;(<)ac60Nrj{VFNVf~>6wp=?0zm`z z6+R~@DBv~$>L)_J0GR-9VFX%#L_-X4545R0*gU^N^J#W24Vf4Ip1xH$)w+Q_ihbowonOA}?SXrzOnwbR)gH%J#c89g0K_W1lQZhlC9l;8fVLRY# zQj3c6K-1Kq)+l(}D?+L~GcP5-ycnVZQM|ykD&-e|s?lP-3{X=RE()5rPb@9T2MdGB z90h$XYK)?R#(lM*8$H46H$Yt@Q0EpbK?NJ219hnVOhg$S?&};6x*;Jx*xM6wdMK!f z4bILi0C$Q(Cqp0~;GUlb8F2s?=%BIV%)GMvY{*IJiOI>}1N5N(E0AZju8+^g9;1KE?oly15o5Z zhcUn{llY?4SKE-eBjV(gNj1>9J5 zftJZ(l_<%_VGqO!AnQSn2E{aJJOwdyQj(YrnzSg%S4d0-r$%rhNJ&iwU9bULmk!d3 z=5COQknn&?fZU8Jn3)GUJ`WnAP?aFJLR5l=7kIg#!k|HMh%i(D>F^S$2qUDmB!=#z$wy>Ou0MK`dxe$pAj@22u)F0?u5J+z7S`Vkn9dM3|zf0J|^? zEU1vBV55NI!YuH~Eg*wH7|E3&E~@pQwPDd&pj!cS4WS7bqzJmS1;m7_heRSYV}fkf z18oEbDFI=)GFTcRs1OwOgcW7x!AcJWTLnbvh~!qd&7dqt&_IYUKx>3-6%6qE0IwpD z>+vgqlnO+-8r>l9L>wqo!O@JC5W#sEXEIDo&W7Cb0FO^-To!{yFd&<^K_-Lp2qYU9 zgW?hzp0LP+$SBwpi8b}&> zsTPP2jb(7qf%qWb=I5nlrk56_g3N*W5;SHEk_R~rW<1mZNCgF07Eud;#!-<<7^r%X zF-UqqT%-y0{L&H~1tp~D)3j1Ztw>Hy1zoa*WEkX7E4`S!m^_qX5@Z~BIvljn4G}C* ze}ZH|AzM(1BV?he0Hh8np5W`dki#jUv^YZnn)1Q(U8xl%3i){@`JmI`le6JT0u(4v zWzgyo6fUsnLkbCyLU4AovjrE-;2cXrpv4qH2F<`}MnlsI>JC`w=_r&GRVrlW6{Ui< zI;JD6AR`1p#RbTz+S;Hx0M&Q!>JSu&pnJqUp;kiNhboO0zY6g5K!hGh zO$n_q@Tv!gCZu%*&h?NY1TuIFS?&VrQGtd=kw$w#Tu7|~Q4T6a!F2{GU4agTDoO+G zxj-&NQT?W1qkyGAz$g|$IUF%c4a?wg3v@v9zzVsb4Ywd~fDb7G4FQ8gQ$rIipQDwM z$Z-bCE1+}4z?-@t9WwOj1Di{Wj0;L>_zed|DA6SXq(=ac8u!!^g`~vfYz5GHI+>u8 zn?S1-K&3bM@GEe)2VOdW@;9iYQ?SDpLuj#R3n_A=b#*~nKpiHKPe2&EZ%_&>j06qM zOrRVOaXV6pfnhPc#RZQ?tZ5b!vyihSv2|ylc>~(bg4u!`fbalO1RckS;V_Iei(;du zl|nFRbBRJOXpLD?szPdRK}n?|ktq|Dn>3J`wMaEIj+PW8*fV4GkQ@2hw$S!KEG4 zSwLwSVD%Fyx)J#uWF9fG1Jn#g*MG+J-Q!lK*wl+8p+UPhvXbkt^_3qbU%WugqufIE^$TlR6SSEfZ?NCrygGMYsV~`*=#8)5(mLM!LDOON5G{x$7WK}5&3ZTFN%@M&? z7=et$sL(-OZUtRkU4`&e(52j|DGI*+0l^B6d5Jld#hJxmDFu)sc)uLO2=JV>LQ;Ny zaS8NVT`L7u6Fs9eur?jY1W-KUE?ansjbW0isY$Vdf~t`*$a^{pN;QxBNsv_#4n-`GrI3t*p2-Qf zqtG1+O36Bi3LiWMrh{BmfzIkyuvaipuu{+f-@L1dDBTlta-g$G3i?QTpeqYO;R3>N z^`LSKTKR*nnJkMh%yRfvjKJsk(-wK2zMa# z;xZlNQgF$LJVK4#4yaNzldyOwIj;mw5$T=*xe2RBKq&|mHHg{*ygnukv=Ih8ZU;)g z#X1T~kkkq%iB7gK3$P_OkhvxKC5bsoI#6vPUUuz-aVjGI^ista+YOo$$6wSK<%0TRN{qMD+F zb5j+RRdZ4_A&FQ=0jY_q3EoMTm;xG~*VR?<3UGvvoq)_i?yqBO zGb61{nL6TP$CQ*}aLxhA zD=4TM8tECPf%oIV+OVLx;mla%=maT6AMk`)=@d+al}W|e3*jA^a#JuDTcnDMIRTs}N!dALu zmSuuAGeZ4Jp_QQ1=Lp*gISded)E%fmqR>w839E!H4Jk^@gL)E_V<@x~wD*RvouFNo z3ZV86$eR?WBG6gQgzfan&o5B$%*!mHik-0Y1PI&fnFm^UnOvgan37UtMQI@jJHdgl zy#e`|c_pbuFfUUWub}IJ2;1ojK5Q#FKQAS-M2~X6f^GyQ#?pfPywtps%)}f})KchC zAAfhkR{G?pCl+OvWaNS@q&WS84k00ICurw9c!!@tegP$6n}TsV11Q^LX&1Q$1^EXd z4lV#ShM=u31<(#bD+SdQaK}YQ0i_iWZRvt;u!k=i2HAi<=|r_l=V&WH_x~qWWagIUDu9$`7DM%d`&0_K`FWWo`JnaK z;5DA$jwWOeTq0<1YcAyE0CbZLvLF>fp_^>Ph(}CHcAPpov(}&RwvfdXW28ut|Z=^n&z^!DnDV+y_16 z5adGe%{K~(pyL#a@)gvPcJ-)(&f!YV02z>(2fBbQHAMlm${VzO8`R~g1a0O;-d$CU zx}zAh$TT-KuLNa7F=nWMA_ZgzB<>*LUtF4-3tsD;kqX|92fii+WEC{zlXCKtvx|{p zB&kvXx?M<9A-@PbCYPVAp$QJLlvMCWLU7C_RVsit{%Ar%EEk#tz-|C-xl_n21_uf( z#K6H-l9`(dxpN2<;Lu~MA=brfAlV1vWP f>(XRYyjW>p$=6Jb`U7=@{{A$!3UM# z2wIfA*|O%qv0FUX+>!y7a3gA7UCbHp(+HA;|<0&LDe`!W|r@pi^o<`}sk~!>8w@ zLUReolGGw3=jbTpL()8G8ons8s8UCPfVBmn?NUW$sVU%1|GD|#9qNgB3i)|3OF;I6 zu!3ivLVi(7Y7r>u7L`Kmf%*cx6bYQ@^7C`RnGTc}plkcUhoh$Ef)0;^Y|VsES%V@I zlrc)cT9Q)JGxPF5rhqpCq=FBgOv%hk*H1}J&Id7IJL|z20i111K}%vX^Pss6?wY*f z(p>Ov3sB}LN-fAQ0u?=(#h^1>70NOb!S;dTDmN8W<*S3%Dua@+x}Jh(i9&K>9_T8W z;#BaKdjkcHq{@=iVoe~^+ znNn8mLz6^F3&+eXd<&1a`r=N3P=YCgTo!1krmXzvk&SD zkds48@M(a_WZn+~!K zT+%>n1V<`(c#lE?v|8g{1$7g^TlD=LeO=>y zT>acbJfKPyj7=3l8!mjI<#A4GUV2G}0{G%CkoVv@vA6_WDT5C>NJ>>GDJsoN2E{xm zqCl>L1t!RC0ggeAzQJe~K`k^jz-u2OTajWRXg~|Pz#nQ2f&!ggpsxjPm}e&DfM$Te zZ4b!OGEnIaO<$13i^U4Mb_%(m`LrZZdd$pA1})P}O@URgMW93oI*d3o4V-YHCsHB% z9?3EBL9UKIKK{<}!6B~TZA^v`--m;)(JM;Tg%;bOQVSH=IiQoTKnWPq%7MBFRGC0r z0WNqD4u{GsBvnFoKS5 zIszjJbc{xEWpPPrt`6jY3{bIFTA)ypm<{r=p^*thKd4$thMaAZ13DG8G!J~F5y+jO z(iC*^S`zp^K1el_mBLfvw$R~Xua)FbNzq5CIkbkJ3i>IHvf(0yj z=xZrB!cOggo%{g`Kk%)Tpk3K1kn6Ahv5A`jTnL=i zK-U8#mVnlgL(%{w!okfYXxlO=H4RjCgPIPBX`m_%-1vef&eRmp(F&mRy1)SrE+#GGWvD(A%H63~fPP<4<#39`%l{hi{2 zLmY!b!0x~#3@QvU1@*NQz!&Ug=A~pNCxVZ`LkBvojzfGl_Q z!w3zyg$5Nya5kJltmTkc#IPHYAHX>Qk`&{EJ)>M9XK=vnQP2QG(77Di=;>5f!4Pzg zi$Wbn3Wmra9oOO+91p6S{GBxvic5+V5N8HJEdmQi8$iwhPF9B`cTjH^beIaL>787H zx<3+D8^wc;$pG(&!&q?F;Y3gwt!)TyJNt$DfRhI(WI&5YKz)nE z+~R0M1#R#K0n{oL>_KqmhH6*ORo7QfR)_S<6x0-;!pNqU=7BC5Nlj4zZ?elsEY5(g zzyYmWfgC^s6#%WG)`FDt&;SFu3Zx92jKR%ts8Wz1Xw4Rq1V}9=*4I*iH8H?yA=M0` zhymqGkgm+U5^&j9o*WPAHi7MmHj1?d$)RA-agm^@F^4Ddb1X|ON=#2x z2nCw+hbAua=_b8!4)+EtX8 z3od|k6v~t1K^(B@Xr&LPBy!mS-*OEqYhgBlYA4X* zO3=1KsJp?n2DojMnV%OAkFRJWQ!~)sFePx8HZw0Z1+=&jst07GUukZ95cn(tq}}46 z>=<7HN*yKf&Uqz})3I#9N6>+fr9%k=P{|&T)fnW%t-vR3#fRo)mVgcjRH#-^0yXf# z>-WGzBA_KP5QYL|%RT721Mqcqp!qA%Xb@z#8r12i)fuE09uKP3Q1+RE8VumZ0;m&( zcGwyyz#!+b!j4yi=3Jz#o(?%C3|by&pjfH}Do8VQKwAz$D>O0^i?qOlFvQyj^$MiE zg`biZ4=zB#$Fd>Lf`gxJiRxm|IfoPuEr7H`hUGznc_onHB+&Q>2*bL~nN_L!U};!i z0Cmg`eLNnd6=W`@7*ruZHxh$w2Rja&kT8#IgSQl+O+JO<{M^(M&?V*2Dg>IQOL7aq znHpTig31hiEd|itxXi>H(DA^KQUP2xfd*VbE&wUQD16n>jR&cK=Q;&j&;eIS#Wmcv z;F3g?ECm}pge!pUSEFqgsnqhJeeQz5B_`Wv)F3$94f zR>1_ih6ic=4tO9jO+(2Qbd!RWf@?)VYBIQMqYf?Nz*oN~r7D0s_D-OVJ@kNNMU)j> zc($^EMlecJVO1>XAZ~Eo30j&2$-Ekxu(SnE|B%cM3VM+Hp*a&&vVpbPLh4*hpI|72 zjRu0orI1Eu6d?I1KTQLw1D@$MVJnZ|tHVfg09sInLdGyl@)ewmQbAj9eV}7J$c>R= z;zALrhy_=Gkg*ofWs;~eXkLYfPsp`zfb4f(_XSXBeB#!&UZg~9zd#6bfn z4R=FO%>$~VK=FtygHi*6I)K;>Kv9O*FnEoL-!Ql`xM7e$M4c|B;$$hL*a8gyD6B0;vmz603+8?eP_G!Jh=c?LN?`~s^1&v++=A1m<3kD7gwR4Awi_H0fvA-tB*AFGECR1B1)aYHYO5%K zF0jeW0r!9upl8N|ThQ<%R^)01rO9=GYwJ;fdjWR zM_aWbcYE2EA09w-u6l#&Fh*BRE7NC1lL21S_FD)N>nLuU<-1Q(8pt=EJ2U^tt z2@#O8@?^+J2+H9Qk-N#0WaH2nV?zsV4&BLb4LX zg~ic^_zM$o5vl-dV}i6Jmc&6kfzqKuo)Yy-Emr{N7|0khXf+xn2ogH8en{kt22X6m(JZ6exs2njn2MP|Hgb-pfD^E+pf%VF@2G46a}Y z8-@az1r0u=po2E#L6S)Or}3MKlu)7CVf_F|69}|x3#ta*9fCC16bwKm1E~AvmtU@+ zr4O1`0nK+(vF!{xG6n2>q}E$dDk!Bx(lxjaPc2eN%>x~%1U@qals-WnMC!Jt!7VZP zsnKLK#2{%IJl&)Pbv2j+onC>YQ_7lLE~%g%c5y0N?E)(%U?~{nl44z5c;TY2r2smH z1y;k6l4@QKMj1A5H!sZ+kA2@0<{}m z!HEza+~7cj$1$1@5M>r5=JDq!q{R&=tFWj#_6HuefOZ5x!4KX9h?MUFKzskOFYRD}fkuX5bv@2T zr8anu84`g==?c96Rw*VATubJsfk%Wv&Gcf(A{khR5uC=r19qS>y&}+pi_{dzu0BNd z3vw9L{n+!HVQjPkXeJuu6HrkM&N&dTfJbY%y%q*tc$5FcK_fHklMF6I!a!SEF zF*U&H2q|*GSJ~;>ffFq_CF){EKU@+^YX@-)9(aNo-uMAI3ff!)F%c(hfp~;m3*A@? zQVPQ8$;UCJ40Hh?O4y_1wtx&AtT4d zNXLMJ8up+)kP3;V6`47iiQw}j5%o2+LfLe?sR7yrS=+Cgno zE$~WTB-@Mgp}nqR&=Tn45?$~lENB=RQVfDtpCMHupw>93DNEfN1XMpDU(5uFSCkfA zX*h=N=Oo1BA)fa(m$oC0Vz5!5yYwMEmwU38Ef=q7W}g0a+M zgLccc!Ka#3a^!4s0u5)~R%@M#V31yIm=On9pdR9t|( z0zOp(6lOjN7#!|AV4TQxg;lp!?`B0|I0R@*E53VA#Y86CtcZR)e&*2#+ezkQR7$5J4e4%7XhC*&) zdS)`{X4_K4DapuD2zCg#J!T6kGa%^=Y554`wmxv-hEn9?Fay_|IxM6}tp=d0380s; z!xq~?_m2`cg7jgt9K6A$7!fm&{t3$RUQNgdxW1NxUw%od6}TYBn&S0K}`+yWOWD|7BtAdg18FoFBGSsc?ekxq_$VE zMXvjyRSvQ;NE!t@AF@D&KuQFwv;&WyLJEFeJJeDaTGJxuW8>2gwI>Zr&>Z19jM_7K3@ggOMs3VqE5c(+9`kzkuL&u2w>a6z{`3| z@<9Vc;JE_GWG`g*c1kID^=}@$Cx+}Iq zEG)j>4afICV;DDEQ%nG1!Zk$#)BD%)cFSqAu4JR4}{6}21)}7WDp2raT!Vg zfSr##l?2j+U~RrlU+)f$yh=PWXbF8c1ms)I}bh zumTs=s1wML{0$FJ$gmAcl>$kSkejo>>Zmwv1s}qJw!}b%0c3$~0Bq0%kq|-MWN0H0 zbqGaI!LgtqH7})DK^@+rR9ApDDN!4dV9$U~o74iGqz~RE2Rc*(sjUh+006l)N!>ve zq+xlau@$KAL75&lQi8Hn8Y}_2*BZWD2`o|qI^s1iB{cm^v#Py~{LI$Ob30b_?9$Yr1gB_wfT=~h7EA5{Mrmn7z;Bo?K> z$J0Ptd=pbrK$Smy`~b176TDLru|fkLObWIz15n(Cv7=8*!3g0nP<4Z30!rP2R2W0^ z6lk~v8gk%l1d0NX*HTgx5bkq=Y%c}*EEsgzASlg)IFLYug1qMR1v!&K}iAJD+3h`s6%cjh8a{qFOP)PNzl3o z6c8XY5X0)wL=N%?C<@9mGC@Ae)78ba0V!Y*mO-6~9EWb8U;sr^P-<>w9_Zu_=)oE& zL8GhS2;MOa&KaQe35!mU8&Q&-E_j$1YEhbktwNrHDp&}zDgv~>2j+ZGXr&=fULeJ* zz7}L64dix^ec+-^-2ifo1gIsQn37lk+3$s|`wR*leJzDz(7}43TorAoYiDGlqhO?K zXK1FQV61Crf!H|+QVc2xKtnSXZcw0LW22w}-kpKua0Ok3G|;?<1>_V?4MWsv8BjTb zmN-EBoYla^3^YhUmVrH&Xo&}^rV(yL(H4|iSejZ~lA3}@ zDA0-wR0M)+HjMHQra;>kZBI5d@ZjYo$Ov$isR`8rufw3lHe4lSE{p0jSfE3Dz)LES zXR%=W@TU7V@YK7I0DlwQVh+s-T*X424QSwS$WbNC5-4 z2vmYVgwRSUq!I#DHfbQdplb&mGct$;Pn@VHt7FzRDCT0T%^(>Y$*l^u(95kr!K7;k zP7<(|AVe{&cccK@2$fi(kf;FK>I<)t!Bsyf6F|MJrHSlrh?$5cBa-dl;0KlV&>#a9 zwHlzB3`q@^N>?Edbf=KD0@nH#6mIb1P|+4C_@UtiDld^LI1m@fI*60BaTS;#)zD%U zx$*|DwNfZb%}vY%pNR!dTnZYVX`o(3PG&ObU?oijL-6@43RnZs0u+AW#H9%iPJAJP zS&tJHA{N@(pejxSWQ!&usSqD5;1MHG2!Jr$`ydWt0147y1LakaI0z$bQn0hLRe?uDk{Nc9q2q4nO@@QY zRYWimU9N&!l&EDTimAx+ZWXWwHnhM%ZkIvJQ=}PraMu!27=g0}D5pR*;wWhpbg^_? zASS?zGf-q9`b^Lx3!IQowL@t@z*02m8aARkMJQ!a97jOo&&e-OEiM5a76sZj$= zU4W$s1}!}XxdarPu!e?0DC8ii;DW^DRE3a?M2sX~k`G!e0CEW^^r77qY@K^hC}Z^K zF)I~NS^@0QbUSx z&>jTR0#ZjIQ!iByv?L0a_7uQD3r+>#N)y!IO$7IB!J(R&myQV5Oa+|%mrU&a7f`rh z>5YJb3QtHO!W6A}fSw((hY;4x2(8>;CeWf%0~gScqZmMutOc%coZ*=gyj}ymSRXV4 z3tAeh0GWjaO(;T_qJgKvp?zFXo&p&GYI0MGL4_u~$qug#zy~5hY=bx(`+6|YxopUj zojMAjh6`fN7ot&*YBJcvwhE@k7O-36kj)28h833-K~p%Wx=V(a6HqzW94jc8pz5Fl zJjn{S3ZMi88cc%EAt5CesMQ)8V1|v2f~h8GZ%blv28d1u@9G3gX(<>RD`+bu!<*3X z)(}|QRsn|*peTf{jKeStNe*l*BsnAe1d3RY!|CoNXdVFhj0Wi+ZS@%<3k0Vo7J-ha z&M$&>QX$m@==WI4?0r0knYybo6dXX;B{dXd%!^5TH{K!Mlv9n-{>D73s($ zEl`CBI%Wg9RFJAip1?=?LCGA{pn@a`&@MmJ;sKOTL1m^ED30L6*pSQ#PFA3-0A11t zDmFl?4q?d&G>8Z>7ux2kZ+4b$}b?7fZE>R$zPPFFL?1@38==% zha7tft)+AGK}XMm%PUYEg58@7+Sr1&WfD}>L&F-j&JJ}J7rO0IK}}5o>T6q=ZO9rx z7J!lzD0EOqjzJ>Ol#RLG4)s1ASaS`j4uvN#a8^Y!3p&CNE)S?YNd`G17nGhsSOMIT z0mUx3PJm3NqO27LpV_wU;|NL zXMmy+YC5E)1yY%Yve&j+8MT?E=F zpOFgA{NUu2n^*}tfwm|WG$aIFagm<~Dl9<#A#hsK&{PDabS+A&MUZ|_mV+L(12P}% zeB^ox6fw}nzM$L-=EAZbc&rgL28E~sL25ub9F&rveIv{rjmXOmb+AjrR{TLL3Gns- zxJq!mL1iFyF=D(EWHC69PzpCt?E{GbcqI#3VumQ0L9q`RMTQORLf4&u_w#@P31l$B z7|@hdsE-fS5u}$mpmG7Uh{G0ZZU-ko&`20^mIsZ}N2V6*D7b-U96_saV9o+L4TMpg zN2o9WX~41-2P6#6^dJV*mC!l?_d00`R|+By%W=!hOHqKX%yhK5iMSO} zh`}LHY{OUlz)L=i1sV#v#4IL4G;uMGjs#B>gUS)msYxiOK7wVSNz55?2f6~}P)Jy$ zVz>r5*MRzH(6onD9W47GsUt6qLbDQbRRm9*pg}xPHG!N+LFE!C4!G$hkNh9K3_AT9`F^>I-m^hg11JUI%~R)7W@$RH4g)`=h{2otpu39AF( zK~BB{pl*R@KSY8>TK$7Hk%1d7SXZqf$^>0Iyx|UNfnfC*JY-RqyCEmXp}O=9#SggG za)A;C2xCdg$jiJ?Oam|Z!lD6^d#IEUv6zq3L16EZvpf#dTd+}6P?&%)G~Gg(h#~;L zTOchxq>~0f`f+LjhbP|j3C-99a}VnAyP$%Yyxe00-PZ>40nW?=FBLE|4@_z(XCAm8 zz^MysjDlhngo#M2aMQq%jYR{!GY{NBVDFKedElmiy+v;3ftvz$3)Y}U&pdD~V2iP4 z9+(n%vlvVE0kxJe4t++Ml+f_W&(8+$jDgQ&Acjq0_JUjOpg9w8V_p-~+d#~kBdRG) z1$|JL0@~(8n+gUcB!p63JLD~1kkeQot$bZOqy^@nUCeq0Y3K$csQ@kE!EUU!f`*}< zK^mHy(6plX5FV1CDGB(Xf`4g=u78@Y6R7E4tl*dopU(qN#JPa4RDj+og6>Dym@Q~L zBsDi4F(Za>F=Ffkv~NFE7uHHfX(YqjxzNrMC@R3cC(uMMwD5#U>Ec*w0`9UXfKM#Z zLRw@3ax%E*SWr@g;uh$Ehxxgwpj(&3Nmm48x5q(i5tbGNyQ~dlfJhZiHLAx!0wB=Bj(@u0iw5{oL4!W8Y)5{-h?BHhfA)Lcyk z(3yWlp!@Xl^Pne~f%b2}24=xU6zzf>ROF#L859$Ua0U;a=qP0AD5T{irX#nzKqIsH zMU~LN1tsJ75(UVeO;9mVM1o4-+{6;l;Ci$v=+H0Fa4DFFYp0t6=tc?f0RXwhaD^y4 z!JsNYw{w6M7=p|NhZC4<1mc3-Q(RIM4d#JHhrn`%@H0xlj!P;{i#9fZi$SY*tm~wZ z%g}%#(EWI+P`^R51-!HFEKm=64&;-OWD^^f~ z?7zdd`wt?65(p?|8hGj!++-|IRmcFHhnEP73(yTlprsfX{WEAW2QH*Q!+4;g4>Z&d z_XCc|h89%dvNgX*frwp1Ncj;`sDg%&K&Lff?88PK7Y23H5gK&u(AyEP9$>U#ENHM0LBqqp21xWP>Qiv8DBnKQuexP3P zp!ONF0P=MP*WHnhvxyg_f7_ zvtB`mE`jc2@X5?e1<@gu1z;MkARrNR)l5lh5$FsgCD_eApcn-y2cK31-%1a%v!Jx3 zSR<)44LK1*sx8p5^(93)sd?zqD9%(;HPA|doK2LOSE32ks;gkAqhNq+CZsU~_L;hY zx{iXnt~#=LjXAify@G7kPc9;0dJYd zrU`B5JV*}=!`xDkSOjTp=_sgSTUl)ss|j%wMjHfX5{!nM1a=OJawKSl~5BJ zNG>lQpKeg?1xi?8-3qFp@>K&=$+d;W;1nsmP zP|$-g%Im^|o7 zY#|BDa2X(qII+d6m$RK}T@Wef6TQ;=02M!AA_9H<(Md;y|xv9At zLH@qr%bDUqBX6Yz@sQ)$ok70Pndh35nhWn_fl33c zI?*Qhpk{z#0?T=MF?kBQy1EJhMfvGPiMa}(Pyq)6SX2QXkBB@8b_BSEj}U{7G=NH# z+yV`(j*15Bi`4^NQ4kMW@~)$xq@)RQs)42gSPr~B0AVJ2Ee=+LybuWFAtb+nxETIJ z_7*6sDrl${Yg#F&rhpE$ODP7G9+1l*LD#=&f?F)uU7v~Ka-3?w(Fd{!IWxi2KUOD# zf*2gw;8+Jo0Q63*l*E!mO$Ge1K~5;)OgNw=PVT8C@krhSwGrb%?MP4+0~(|wTz6wc z0`&M4=)poosU=03sb#64UAgdE2Ne*W2ZbJJml-IgAP3hWIR_lRV6`B(!qXCRXoCV7 zCB#7j7;XZa0S;`ieIUya$%689fGZR=u$`p|cP%JlpyzsnU1g^L+f9m;&M~|KPe7oO z43b(jAjgnugZdK%n&8xh$jYGb0AUP+VEqD+IUxJN0ip`J`vZESj4Gr}kK#nMx(rWM z2EI2Bek~s?%1}HH8u~@LqXz9{gr zh6V#<;sUpGL9-K}V1#U&g&ZS~QTO8uFGN`giZ0mY3!s3*J>m^g3Br(?5bO=`ao^Ab zqOEzkU==S&6+H0uwG_Y;6yWhOP`?UVBZ5c2iXp>g;3bEyj0pSX{7!eV${BIrJNEE15$o{j?SS~ZlZGSIFK(4tFlAh;l=YEmF) zJ%K_(Llbp96DWYuZdd~eL7PtSpa+Ek=%xVBSQ2>aBwEJ_OHx-TE=hqMTn(+i!ONl` zNnHcdl-GwevXOH?cu)$FsxWNE+EGNPM{)_sBha8%fR862FZcxc29|$PP_hp+_aJwF zG3+I=Pyty64muQr3}V6l1vwRlu{k-l2)Y6lWC}@6M(OEN;$*l%XikPE6_D#uJ6uG> z1bN;9r#*7L0y>cjR62p&3&P+ePPnLokLRSMmLz88q=K%0f%IuW*A9XXM=k>2?}0Mg zgEEGPIY9$*21Y>#Ny(s8kJ85?x>|uO3N{2c9TjXrjmV_Tl45XU!2)#51d6F37k~l* zgfVJb@Y?CjVui#!h5Uk&%-qc4lFVd<)Z&uNT+k_Mh|8HlOL|Ll3&2aP6N`&Wb0OR8 z6H6ew=i&G0fcki#F=*&DJK!bF(7FdCrKtdMDYi}-Wa=4O9zqv1=cl2BIJ6dkjY@(- z5UL(lYJ=MGNUcMp^a(B*(Nx322An`Z0fgK!gw;@>b+h5V{sF<@sOIHT&P>ZoNljA# zi}7-Sx z{{BAk!QP$$pw;@wm;tN?bfYhWYOwfV6%Jb;g* zQ}9hpE&?4msgS7Pm!GE_oSj)vkP2G5o1U4U2Qei-KZl{ZmVr~@e?5b8W?phmX-X=C zQh9E2d}3)yzFvkBSc;d60Tct7c_kL{B?=6w6(y-fpvmtiLbeoBGY$*UHG;|?97?gKJq0A2z{v>Q zCj{Mgjm>*d+mv(^bPaVN+q|%bVJ%iqLQ^(&D-{?JxeJ@suw1Bsk_*9^46E{#)U?dJ zR0UP7VpUzOVg=P=P%=`@)MNnf0s)mOu+qn`G&c!aIzkH!@IWM}kOY?$431903{F9g ze$E~YA+Et848egxAqpWuj())k0si5xK?*+p?hHQu{s9c2L3IX47Z(QKP@fP6Uq@#K zU;i*yhTstYAXf$-e|Jx3hF}j*w-5#w&oBm0KNrs+SLYChfRLbgPe0EP24Bx$X9jSo z2D&7ss3cy20g{jzKuu@{7%v`6iC_(KrGf&)nF*%bY0CKDX*s&nB?w-yHVAm=rxOj#sD8SsS0CTT`0?5G%AZLLV!-4A!r0N8G zFA+o#y5bMQfs||zHiJuLUc7H=ZoFq+W{Cof<642niOr#L#@yvrW9aB=^Z2!^{ z1<<%M!pz{3L@)aEx z)eY|5Lu`gH86Z7B@MSOg$smWODlmWwF4bh!VlIZnq+*3M5Rn5S6w-3?^NSP|iVKTM zzy#P(}rDN)wAx6@m*P zRA8uMkgI|M=m<^l5eo{zp6-4M3YmFj@nCm?Tm`wg&j`dciceEehzD=^hnzzR<`);1 zCgznWfa3w=3Q&B2T%wShn5>XnT&lnT9+gkZ&(8s`-BT#e$S*1ZE$mPL?=1%}bOi-Z zVu^y5R!V*;=%&hGuo}0V{KOK_ErcnCW-v-iD>OX62qs``1Qs_oQhND5RsgLzP;k!A1+_61U<+dPK$Q%n`R4+vj50w@RdB-sECZV9PyiJI znTa`>Rgjh`=$J526C2TDO-%tS4lXT7ElSHN%`YuhP`6fBfLtkvMNUH#RT6BAOKNgX zBJ@D(%sd5W(D``a4TE5_L2X93(-d$z0eaW4BRJWF7K5rsP^(stAw9n&pCK8#N(ba; z4NV1bi&X(M7Uo-;Q<7Pbld1qd)CfF|>RM4ylv-SznV$!?A6&_Tua*S|4sI7X<|bvP zgM+|1Kd&UUq6BP#KQwj~)K!x~t0z>8)fJL6^7D&R^Yj>;GD{R3{ahHJuBZe#&n2@g z6J$B))V4%OV+52_Lcn+3rzj*AD4SXf z>hGoy1Ug+VHAMl`*#N~CC_Y^Cz(=wMmgbkFDrl%CYl0L*y_*V4$a$dCTuX`-K&28W zJ;Lw8VbH=b+%vB@GbL3)Ni`YNOM_+tkf9(ZX#b!u=nTT7RLJ@73VHc?phG@NQj5VS z+<>}%AjPo87-+?0Q9fved43T%M8Jrx0{R85I9YaEc979~=!ySYC zJpJ6`{rwbh$+)?pOSuLG`3GUq0u^_28|pO_sQyk(QGg$;0vb6`C`wJwEC#KT2aQO9 zMsiZ~N^?OAgG-Z36iV|zgMBWk$@wX%MWBXaNveWt9x@Nwzl3(w!Mz`a0c`oJfLcZ+ z@zACiq)Cq$Pa>uRfYREAalmb1WDdL~3~%UaF$TnsU?uY5UK*cP#+`saQ16C8MFG;}qof-O zOKYI!7(9uMrowno5Ww>uIlWK~&FWePa9lxJFW^h5K$RhABSC5&_yA-O6LcnS0leNX zPE7_iNENw2Bclq?!A{uFw{mJuW*Qa=24&Fn5GZ{iSEDKU`rw8Zxb>D_S^_zg4x|bq z46iB^lZqKYy(@;?{1k@V#AFah0n~{qN@W1`pK=o`KV%Am$j!w|<%$6#Z_U}wjm$l%MMYsV1H5X<12%HWsE;8Vijlgi*; z!r-3DV6DMmt;wKiZB<>H%Am=h0UF;@EmrV_+Y8#%k&>F0SejG9U<+z$APx6{hlcTu zoiQkAgBw5^SQTZafvPWTQlQSZf`S4zDQyF5tOJJF224TCTnz?Ig=z)pAQ*W4L5Tvm zC;&SitO7KzicqAWnqsYh)e2Ayfl4mWxrHT(C8^-P8nz}A1K4K_keL>S%rpjYx&o)V z)VvfBzo;m`h@qe;F+Det0W@LGP!4IVGoYOsb;sDg1%uizg z?;v5|Qc!>nID)%C#jsu->_)Mgde55MVN&yt1o{;G!1vk+B2cR?7GmF5}zeoyGQxt;pON)|0ov55th^e4y zDS&g;>7e+g^;4sJn%tdid+n;DGWs=49-QFCEy_#Na=5-fH*BD8Qk60hl~t^ z4wy~_UlXOs#h|Chz!mQ6tPlbkn$mzIcgNC_e9+FvWON^cRcR`esTOl_X*g>t7#SED zDJ16?R2F5XXOt*}xV+9Rw7x&00j zVW8H#4p=>SU@1)jbP{n&Y7uA(6|~+`hYMm;S!N2vB5Y1p00n&!_;Ld!&yY~v5QSiv zJ3*mTtghgmnwMIXn4=I-nv|27tl*QGoSIjhs-&j?8MXnf=uU*(qMQSf0tY!)evv{^ zYFcU$=r~!3!JuRe8plcjCnyDXJwr=F(Cyty!TxR`;h=#@(By8gf}4MkLU4eqtFs4a zfJMPE)Wy?Z!P(!%)6ZQYIK-R|t0u3Uc%di3A65h=*se0xaM`VF~f4m4bU|r9x09XlrVUjzU;Y zVoGLiW|4w#VoqvaepzvLrGf@bP!A#K5E`73T9j0jpP!womz=1{#l>K#XTkuU4*<2v z5Jeg|BosXJ5Gzpp^KvS=7(y~Yds%aG^2*TfkJ*!W;*D6I&d;921%xXYCG6OJxCQOzkn9Ef@QN)QwuPogc3NSyim509sZIT}uPfoLT|8>lvgG zF$)RKv~X@RD2srGdv!rKrh-(0JK>-;E5*>=*g;5(=|Np{*qRm4#6bq=5P{6R63~pk zh9-E94^(P^26jM(!d9K;m4fFY^V7iLq5vHZOa^DNnxc@J2U=rXtjNWHD0RUzIjUI1Qot1|=oSjFtY1E8Y6miI1*(_y zT{4TnV@FUIrKTuyF}P$FK}OWAV561A;NgnWypq%+&@t}}s#=-gYE8A+O4ZP?Siz~X zB(<1}p_l=Y)IcGL)F=fv?qGA!nRyDJz%ev1P*nvD1{UO`g35~EQt%NJX{9+im5N*p zzL~|KeyW0FQ98J(RIJFw#h{zPpsSmanp40~#!!}8l$2kb%8TT6xg_QhMPzeOR z?i=KYB!;|vT~MMgEnvuG0PVie&CkoJWJqR62N%~Rsk-I4$)L;6Qj5XvK*R#cu0hj} z=^h5~4o52mP>KfSNQLNp@RF+HSa4bcS!f7n87b)L>2ZOpVX#_o{pt(4;j09cMiOB` zZN&v@a43Msa&?PAo87?!;@~af&_oO}xEM453G*E26b)Lz_4N~BSXM@28KOb z85s_QF)~cq#>l|Tz`(%6pvka-0Ss6VFfcF_OkiL&n8?7eVJ-u+!U6^chQ$ml7gjT{ z1ngp9_;7%Mh2anbi-HUzLxCnEOMw|9gM%|8Q-Cug!vhaSwgf*$rVIXz3EPu??u z^}T}9AEERYDE$*k|AW%#=COQ$=;wmcf>2rvN~5cXnGX_Q$k4#B5X4|$V1U^NiZLdJ z1_!7xgB+4Miy0ai7DFYJki=P#)T<(iFJ)+8SPE6IjU>LDp@CsJRNM$E4zgDQVom}` z${Z$c#lXPH(BQxc5@cXtu!o5=FfjBnG=S8CFoW=8NH~C$MKLrqFflNI{on>w4-)rg zXaG@QEP#|Sx~+^ln+xk zN{@!XXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1J zhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kin zXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S0i7aZ9H z+3$Z2O5cFe8=&+qDE$aZzk$-rGf?^(ltxbt zpo7)YK*uv?=A|;gE_zZ{hAY$7)zVj0i>s-#u~W3Qx6+G-%ZxHcLtr!nMnhmU1V%$( zGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1O_q$1eG{~T*I6~oEmrp3M7IZ zLzEd3EEpIV1RdhzTQq%t%-_zwk)6F{1aOA?c_z zF$JV@29yW(+5#}AI5jmJB((y}D@n}(dv61nS6-A^0#>>M#Lb2K=m40Tnwy*f_Rt9! zH@5&}(ghf|pc2Hr0p;fAmx0ZC0Oc2_fXr7gdHou0to&F zFux?R1le6XAc957iN&eO5Dy=K3xVxF0pmhK=K_oiQG5f&g@n!n7`M0p9JMc?{2WM3 ze}HoHkgWRw7lWACz%1kd%1e345FFFfhh5{N-k0I53x$fq}(2BQ-fY-Y+pXH6XyyI3Tg8I5j>f zH90;dH7(d6K9hmXGq1R$s5CbVSG_o-;Fu_WY$~>rsDU2)(2PU#HFmMDto z&1B5*pUH&b1G8yBQGRl2adEtFYH@L5dTKy&Zh&`kfT3}Gd|6_APG)gQd`V(D!wD9% z#FUiyw9K5;_>z3EI7nGQazG}-ITmw=LYzf24a%r2?LgaY*^6U3F_iA8ytdFcV($yE&ZnS)bHN(n^%wuI>;51~I#c0H^hRxUr5lr#U`FX`9@h*uaiSYqJ{=V@ciAg!B z*h~*FGz^J%^Yn3zck=i5&SaRuX_8rzUmTE}naMDZ)0ANqr&)1H5yL}Ha}d?YWx=q7 z%MzYqp(*kvHw(jqWo!%#ECy*ssj1-P6rZ04%D0($>BRv7$(anx*o+w-vY9aKU^jIG zsbSd9!NM?M0Vq|tR+JPaCYQvACFYc-#=8~e=YkUn)bQJEVD*r^1olU~Z)$FSQ6)SB zh9u>HG8e;Ic4mePQ4A~$3l@P=F3i~AlA_GKbaZnAk{LF!gH86#D^4vcfdmoUXcL$y z)a>;fu>4XSpP3h*l39e5Z-Nct1Hf5l3kNepLo_JSF9#*64bcn?Om4{~&WSlWXy%*3 zg`pPg;t0sk%qvMPLRSbEhAN!Q$;|KoWXFO{prYc#98h{{XaoBgnoFw~mT-d83^*s8 z=PWKM$}9*-PG-2u$->ak1k&(f35Z-U85I7>dHJBMeVa1}!uZO`!th`+NWP&TEMHuj z6p);p%`u3&VveASE9ru`)0)yJdn}Tvb?;7{ffS&^%BZ3458y@QMqR zw5EZ|*q2NUEDQ}(L6)W_XB2^){DBKms^l_E;AUZ%FbU+>Jce&v;7VXSH@Kk%O)ZzX zSy(1KWJM}BH*&)Y&a)uR6G4u?&<`RvOaNIF#W0^WHzPi^A~m_RBsD$*oa-5Wax;P2 zb4>9J_qlTuGxHd_cvu(?tYc%i5M^LsV6fpE;{^5wz7LEILI)TdBtNh`V7(yNAiIFG zfn@^If-Q^}xF#?z;JU!lAl1NifnVSO(*pJhj18;}Y#*2&un8DAJYZbFG=U{x0ZTwa zf%{)P$&zX-;!hVYx9e1%#Fe=C$fp#j3b1?3-r^8Z2k7uG=J)wm({6|95s z9ie=O4G?}jh|j{n@Bn%aRuPo{1IllO@>gtysGkAl?}74HL-|v-LFD&=_^b>J0ox(` zt5E&}C|{U|fq{>efuUhHMBW+7{~*Bxj_+a+pOb;Xfq@y!p9tkQK=~`6{0&h4HYi_! z38MZVh|kTyaKI75=jCN!;NxasxB%s=LHXC9{75MOE|lL3u28-Tlpg@)Ye4zYP`(b7p97Jl zz6q3H1?5{n`7Kbs4V2#xT<*$J9J)rzGP<|+szX8f$2IU`s@2S2IU9nLiBHj@)agRI)D#BA zS3w`d{FhL9hGq!=JB$zYFDnbgz5=L!g`oTeoe=d3Q2qlbUk}P}Xotw#LHPmD^xzBS z7kEPC^Pv0#TOjW1hw>Ys>gPlG0#NfegZT{%6QK3QF)*KjVFENg-GuTlK<$46(KaH z(fG&E_~+61H_`Zy(D)zF_R2Nk;FfddzFfi0JFfcSQFfcSSFfcSR zFfcSTFfg<*Ffg<-Ffg<+Ffg<;Ffep5Ffep7Ffep6Ffep8fZFE_4805t44^u!pMe29 zR6LP^fngE@1H)tn28JmN3=C5l7#OB8FfdGKU|^WRz`!t*fq`Kb0|Ucs1_p*X3=9l& z85kJmF)%R9XJBAhz`($;kb!{#R0l3*U|?9nz`(GSfq`Ke0|Ucy1_p)|3=9k_85kH= zF)%Q!W?*1g!@$6>mVtp`9RmZydIkoD4GatnB@7G64)>vswk{$3KBI0 zci9m`ZD28|sYs)3U}4MwH;}Lq+V~n+49gH3NZc4@@CmoSj3KUq4s(GA6u{bv7+nLY zGa+s?4XhN!CY%FmAf-f(a)OlN9_IwfnxljQ&LKFkQi$_VM&aV)ql|D5d4Xh&VWUvk z2e-gVz@tz^jBkMyo50M&IjRL#1vU~kgasP=!#S`8R!+>=7Dypv=ng(~g<>$qh!#Qv zd9?dg)wFuACEcc6%QWi!ZueLACEdS86S^6CmA0f51EYw$zaSwq6orf zAhA!_#>dB_%}An%K;~w_LXde`2opRj8y_DJo3w;XSHdPL+R53$*8fe}POr4HiyoeP>O1POrV2;)H(B2VSTLnos^(|_RUKoFytAs#XT7!Ps* zit?gV$i!tle9|hu7-mE<^6VaHFdjC~24R;lfa#1P2n}*(aY+$qo((Jxnn43GK$CSK z8a_)0;Xsvx=jA{mpi~Jq2s{%95`h^28r=o)L6dIr@Y%NbGPsK|rqbi%qkIev-9R(p zkYWxpxQjmEpOqDm3ChquMn*xYpkR#;E-gqcO3NwDFD;ID^$*5btN9q3f=%~KNzE(C zOv_A#PFvx$0qPpaWD;nm3^w@(oqNd2G&J$`4|9!o@eFcx4)OH&13S#n*gdr*9y0u2 zS&$l#3>LL;&o9XbyAL!m2QBy!WuT9d5!i9Ac`5M$MX3cv`N{E4Ir+)iSnLIxXK3u0 zk`fOo?KAW90u0e6FF>JZ6b}h1Lue}_JijQVIKVqO2`X&ik`K4cIX^cyF)sx@FaiRS zbF+et;)9LiA=ZM5yp(wVg4CkKlKi6L_~6ncY#|{mcRu+1&LSx*}z&XD(uO!~FD7`o!IT%AD*nvifDhXWi zxaO4w4%RsY~poC^*ifG=Udd4^_z}wI$zaYM-G$*wfG{uw|kOZFR!LQE< z-5UYP!G@49vrGm%JHMbf3*tmWB+G-#GfR>)Ai)ToTZSgD%z%JoSg;$xV;7&NVEXZ> zF*FDVErEc|wPA}oup2FdQWH}ks*(dNK-0INpa4r58agE=XO|XW%DOu{$EQ{#rxt+b zo0D=<4UHKvgiJ7n%rS*5FocYZA(oqgr#AfyisQpmGt)Clib29rK87aX>;q4i*gWQH zXr2#Gw*`qs#hH2OP~GPKr6mQWCGp|8`31#Lk0rSpnwNw5iKQj^kZJP_64gWUzLBwW zeqKr@Xc9LsF(=+7vnVyWB(p3P>~i8 z+vTp7DKL*fwHSlr0NVH`QV*m&3CYh+&5I96EG_{}vE)yOb2uQ)z8u_PlN>`Z7{0C^g# zax;+f;>zN9a03HFkB@0_VG-0~^W4n5+{6m7qoRCF415!_Q{w}Qvf|y6p|u|(!GhN> z#6zm}OjjdIkXt~x0o+uJ&x9|Z0jq;J4qW0vSJj}F(C7tiCT8828Q^VXh+a^D3b0~V zLsNKifE4i{>)gYleCTSSk6C#}W)3XLftqOGaP+ZE1#K0ZA;8ENV_J|5LPovV=jM|U9JWdQM!-G^crIJ}ZUE41=p zvmof^aa@O(HyO0Sgn@wp#78y*-R$`IQpgz#nR#jXVDnMkH|HP3ycDSWKzwvFkj)3B zlNVrfTpU9jvU@l2KqLsz1R(5W)ds4&0v(P*bq@ z6Qm(NJ|(dv5yXOEh(950FbOqJ3(R3)V1Sti@kzyq+yF|yAb%nh89>d0XGjK6 z$RXsR-iHf-{0S*Pd_4WUU0pn(vB}VY=FbL*KSiMq1(^fFFoR4O7#cwF3epGKz-bKS zUub4#-~jDAWnf^CU|?Vf=wb%11NWH9%^`-u&tn-{zf2JCA_6K0UN!Ty7qqrt$?0P>H`G_Ve+D8ya^s2!lR&Y%F=NyEqh zcS}xYQnI$To}pe!Wlm-i*qxyBTtH@l)ibDrcbXup53VdONzK)Bf@%TVrN+R(0CLZb zPG<0WeN8AI6uuw@vQWOmB4&oG>>!a*JQ@O{Aut*OqaiRF0;3@?8UmvsFd71*Aut*O zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8Umvs zFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OqaiRF z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UiCP1itw1Tlu$|aphlUhKU>k4m(#cFqnL1 zW?03*;_&lgB*TlQs~uN<@jtZU0CW5`eCm&qsD3Aj>epgX|0jRf%3tY>D}Tf@ zt^5|wyz+}b%gVpitSkRIGfw=^%z05>f%&S(UeO2+Mu(p(n5BMjG&t;(XJsfzc6cx{ zn4DyCu+(&9FtPv3T=>9&A;kVKW8ne^hLCG)3==t689p-p{~z*jGQ-YS{tQ2-ayk6$ zIK(jVML5IHjztU;U&J%~e0WnN0OY0z%%ZC0(L63p=Pdo;sO2R?=^-nGlYP|XNu2}I`JvqLcWl(km29|kO$0Ss~$2-uQCi^n8Faqu;mvs!zz%u z!ORYp@yraC51GYRt&3!s63onCsSw1lHJ(}Q^+RTckca>Oi(h4Pu-w0op)i4gA!Pq5 zhQh|*|3eONF-!!p7cww}C|-lOd3hwm6m|v%5s+E4BN?W=U}jjw`8VFe9^?kbhFJ-L z3|l~YG!zQWW(}a;>=a*oIpPaQ0 zlUIsyc3Uzs>~vsfm}u6>u+pBF;U@!cf3qx|uoh$FF3EpI`So{H$kU_~;_- z@GFslA!HXD!$e(129Xs^4wjsiQbL-njDhy4423Hh7((PHLgG!nma(ugks)L^8^c5< z1_qI8c7};1%np_vRZ>D6tc-#3nGA)=|Nn=~pTtn80HW&{3m^RZAJTD%Ay8hGp|JDc z|B(5M7z#TW76frJbU@;bS$q{J?93S(c5*N}?EDXnt8Yvkf>*PogBR2}Og@mokdak4T9zGPz9336*96GO;}#43{w(#8Md}DFoGXo+Sq+B9pcm>4D;qXL%9|QrhAE)DktxR@ zWY5TvZOqURRKqs;7ARe7Ocad((V7!QBTN}PW`W$q%)lU0%p}9TnTf%KkwK>Wkuvi{ zP`ZE2EWS#Gp&^JhVMfqX=9NXym}OQyXO>uH>d7#rL6Tt$2ZMv}UA-BHZDp7-PfE7fcR2?=x{^D>5;J zTxQ}BtjUrNZm4&dY!JaPg+ZDbUM|QmI{Z8YPHQr&Od}Ykh=J3Z%qpn}hAAL3kjn&6 zngjV8l*UYy`ihhiEW5{A6HdxX8f5Ffq{yVxKk0zCZuB$}=#0WDLIhpD)ch)DYL|?BNEVZ@;ao9Wngsp`E>=vpWkYsvW2&k^r^<$Xwm04sJsGR}g%lR=(`NGVw(h;ie^JCVD4<55lTpP|XP1pV=6Sb0DfVxEo!gUJ8=3_n5XN&@26RUkGOguU|MG>AHwyJvJ*7Dj6CF4@4QZz|yx^ zAw>OkD9ynHs>>G^2`e%LMnK*Cxtn1pF9U-}Bs;@Ikhu?-C09LU7F&gG{!?c0RbEg# z4hS)9L9PEpS3P2A2x4Yz2$FDRn8IMeV7iAn^2g6)ho8UpJN%r_%n!Z%C_JD3 z|1S=+18fF^gQfgWhC)Vhh7eHx1J#f6jMCW)nHfSpGmEeK&Mda-8?(f!3T6&Lsch+B zhkA#}4B-q@6vP9ab_PLEJgs12 z*g5t8e{oQHt@VZF5wTVI5cbN%X4JIyFN|Tz=l2XNZJ_Cl0V-cF4#@*K5Phpa=EXtS zD;*nA&3GHeFa^}^1*Q3fCP@Cuhw6`k=mG2ZgRoaR)}!jb3knO?hM*VWj4NY6?(k<= zxu6kZPOLbC$mJ|ia6PYh1Cj?|=~cv#A#htXBrSu&D6!As$3iZKEwKCnst;c5clasJ z3Q5C>Ob$OmVXq#S-N`12o}PNYHgTeQPZPK!JRhcQfPILHW3BNCuA@*33kl~`31#xTViT*pbQN(6-q)Eq+foE1_%2P(TQ z?;^@;Sh_d>P8ZUvzWcz^h4iW#22eapt@;EPlUh{{5?jqW5tL@Xiy@Uae&XP=lQjSm z=IG(*0S&_hK87u2z7VzB{UB;VWyuaUNIX1XmcUt-m_yBQ;K3|Q7BMsgIfL3Gpzs%k zw55L_wWV30WeK4+bRs)L$O>p1nuC>LA}6DRrB&&_8-&2!k|Ba)dz&;pw0 zW`#0Ld9V~U&q3ltV%7XmSbRvVY9S#$K>bVf_yEO)2~yqzg+T`s!_IyG|BHkAPg-IO zBB25eL81){ieTlGqW~l>o<3%s_=s6#6*J?4AeMxNphpr6Qyf?swuJFRP6x{~3>@a!jSLqxSs4QD8M(4S{XtHK2BDYL zj5{@J9VT;#a&~hvI_%VBWHaJqW!eE@i)wK)GVEmFboj~1;9v==JMB#w3RNV%szBo* zY(5NAKy6fz`yg!qgd2B)-1r;OzH^L*xD})p?iYoIp!FbiAiqRGGz8Uv)Pel+Ul?2-4wPROVDk&qjlm!{BKhT@A0+?6{L;(- zNn@TMb*v0quK7ab2g)zGSo{KWqXNi{NPby(RT$hJfcXVfJ}@&ZECR)is07251XhME z)2=|&43vK?vG@nsov+0irYIo!$r0NBQx%1jub{kx+$Sm&WthTX$*|=&Gs7w|5r`V_ z*eAn^A`VUl!57^OJH-`d1bt^*SOgmXKp!tz!N?HeJ&y~VUWpkm5vO2W;^a|C*u%yp z4(LJhe3&QZxI_hXTq1)9GA@zHgFY@H0Uei+K#WU7JN!f)mylTXoLOuYzbnI(1-iJ$ zB@XI<#w8@c;}TLV3=94xs)%xQ`(Y>F4zc9vE*%&c zMElcCmOvR^R6l!Sapdnu#NVKQi}OOesxC)3O7%Ma}teg*|I zOu5X?VDiA;;iq{pq77@sz#sy$M+B*TJRdryJei3@up$f62QmYh9|jF9pFm(dPCH5eIo zg2t^Dib2}B*v6kkMHr@l%Gw22|8LDgns?w}U=TqcV|>*NvFkH4*D9F(T#XIjvBoZT zhKUv{5p8pr{ot@?VhE{W;t-qxZKHk+Vwm#4nc?Sx0LCpZn1xp{)mBe_;Oy}8A+zYJ zZ$S)Ggu!7Vy6SciBD_K46knYgej>Z;t21bh1Tw~M!^p7nGqViBU5t%jcUdBhfg-!< zAatH)1~i_|1Tjoe@PWn?)J+ea9e!R4VwiFnG?wA)@N+wodqDFN=;4FXZ((c#+YgJE zS>Qg3^r|3FM4!|J!d}VvPZ(Ur!N%Dx2Qf@p!4DZ1s{xG@Ff;sY;DEHzf`t+N)TuYc z!0m&hw;(hq{6KNc%+Lg%!< zWoobljbF}z+MCb=Q6nzQAoAax;pd9Oj2A(D*cb8)Kc!h9Zu;Wx@RNhNA&Bz{q)j(j zjbk<_Ju$L6{&>;OvU0&;#*34J7^a9ZGz868V)*!ieZJJnOJjzgoDb#)y?npFNRx4X)XR8=oiDdH25G8Zne}o#+saHehKVm%Gp*#1ilPX<{A;X{E8QxZPOTV#kiSakgVZz{~t z5M;*C5EKBiL)ziziU`(g}*YeE=8KyK1uU=RWMKa8OvNE75XXnf#vlQ&ZM;&T(S|5hDlyol~U zZ&3ydkXhQ$xI#9|2Q98ZZUm(PP?~-m2q`~d{py8>884#eLDgN5yvZ%fFlB)cWPag= zvBOVLKlnww!_Jq{3_CR#Ik-3&g}Gl;Gwj4ymsLW?dYS_nrW`m9EhFO{euBn&Aa$AK zs*XTdT_(9IHxN;76H}MTFf?3()hDm2A$80vXNRA^n7F#lk>+Dy<@XC~ho39>7|cO+ z+rxZFdtkXc!;~M)4677a7`DLbeGX=DyB6FQ%0O<{qRnG9fZDZ;@jJK`W(2)vTv!y( z$ejhsH;_3_iPtCo!R9z6US~q*vm`+CS?mlGA7(@BZ-?3c=l@m?P}_DPL!qM#BYaL* z7->!y)UG{kO`kr>$^=MR4eO&UI0-3Nb=@%AwdK%0ipO$DyVi5LNQ5P0$E-ih63}+7 zIQM5J29ri+acCb!a@AvuK8pA%_hpc@_tcSLN`o*XxUa#1G>3WsscqXR1Zvxgdl&!x zZ~DUA;pYl&NW3a0Lc-M$7Or%TSH)O}{em$2q4E0C-QlObD#OPleufbFmkfmu_!&b$ zZBWK@5cM2^3{w~s5p8l%JJguvhxuns#QcqjBg4cDMurQ*h73DjG7GPI!7PG0mm|jz z!Ual?2{VFTGp~fFM=tREsth10nWrbYqwTni~bVk>St(ty~NY zBI1k;TV66bSiTSk&plXz=KdSG8AE$jv=g#|E7SpfByD5Jy9tIR*lOIZ;95{IT?QE(a- zUG;)ld=)n|y@J~6ps`iZyd(oN#DAbN6|_bGl7=B`1YrIGtq}nE3$!N6A^==2T~hc9 ziEEIbK;lLq_x%6Am4l(-63Bc|{*gCi*a=#S2xxx8{w+fxsNZS7k)d$m z&;KD)*cb}4e*O=c$j%^=$;J>^&%{vpnVECdnIHc{de|96LcaVkH~zw4`Xb!nC$7F+ zd6snWgF1)Fhy6iq8c4eq)Rz-ybodFW|HN0F@MoAZ1>A2DU$xdBQU8JZE1*6lXe}3L zEz2KH25_82V(DLj`gJeW9e!#uI_!Mq4jQ}W(&DOhn7m4itJ{;2VP_{h!^DWC3@hWI zYrJ6f;VgEBiIuDjTZr+)B!7k}4sWpgVY)x84i{flgX9Nd>Tp>7t;Ns~#Kp3r2-GLF zVrQ6WiKYGqwO2rOH+q|;wFFXc+!KQ2`Gnp7x0->*=NK6_fZ`fFX7rMw@ZnpAkgv=# zt3cx|pzzIr%7fO}f#$?O`Ssunh7eFWuz-!>;z2z~o>=7yDH|8u_z!O*ynu{-Z2*mz zytw`!vDO7`?2F<0{}8Q4ENukn7#O&X038DZwGm)rU=Ot*c6USVcKGvu>(YP!#jmk3 z2!hHKP+#HU-2Wj;fB%bv_~1T{JHtGyjLc+A=G08B8Rg>i|J(am+Lz=DuR) zT=kk+LQ7MWyBoAV$D7r`@->5kxmP2@LquFCW0#vKK(>(h9M+Wv}|d@`2>4U4DqX4001JFN50h=>30C{)OcO zuBHXx{=W@$tsiI&7A(Jl*2IAP`^$x43IizLqSmVvhBKtjfP^!o&H#loZ2c9;-a9S~ zQ$THQP&k9jBxZ(H513_ECH6wXG8MFjg^^)P8WV#ENF7M75!xS*1IhU?Yz2ua_CwNO zq$^|$2{eZX_FJ^W&pi?hQy8u?Y=Nb#{VtHar|=1p_fXQ+N2I)m-ah{TYJX$Ndr0je zh<_pNA&`G%SQ##Y+dRx-s}?}*2Kl!Ty7mQ>u3s=A*0%j&WY_}AKcKn=lxH}gYihI< zLF*muq3a!GUL)2!%De`xca&vf5Yggvu=H}aFo)@D{0~~gEVC*RI!+?!$}lCtiD4_K z{6ZclT?`!`1+7&Et$lTLWC#Jd8PtXWg&U~NjI16s#|csg>YISp$b#0q!p2oWYhFS6 z5xCmN* zoxzN>t~ZmRu=)M}5c#DHg>RT3W5Ns|{z8Vrhn9$Of8_P98e9w^+1EIUp1)}Zwa->E z6oT3rpfF*0^FL$O=_4xDO6g>AKrxZv*p5Kvv7aQAktenud1BDZN?zvb-$a}+a4g6C)$86=^7Sy3!~ zS;L5&6dQF7d4J!NELF=ortubd|2wA;@6FfeNKCTCvV?|$Mt_#X@ zUl|G)T=*X%pUYU-C=E$xpgBC`y!?WfA%uH7CpgZCF}D&q?UJ}gJo6@M+DLGMq>ayx zxYGuQ0wis4Dv*~p*ySN_Gc$kPM9!>~D;^Cw)dGT;u z2oevTwhU7ayhoiEN6w=U-+|`EA$b&3wu18JOlTMkMEHZsEzsN>Jp8{h6lyXw1ZgOq zn8nF(=n^Nx(@z|XoLww49ez1({T~9V6F}{;-^^0rb=4sEXF5UFkAwONpz#M|<{zLn z!y7U+DE)xPnb7KaSRWnKr-Aj+L46v~S}f#tq?Z%J z6p-81K;;30%aI7W%?9^{uXl1ObqNqAdOl9l120=OM2vg#nz zZcsYWfR2kltJ^ujbD_l47nH2sdAS_5oO&PtDW}pMFzbtIXj`J=oiKR4 zN9Q|X@OqD5%#z^#XfcyCw=gqC}))f@SBcVQ{$SQwFhA9c4F>nS3krPY~pgo2c zKq(jcTQ16s2p zY?N6C*}DyDr&!&DteeVUV-SS2VHkG)hxXHu>qie(hLG0*#P_ExLHk>nrBcrkKcr_IQb| zDuntQR3AM>>N_Yw_cWuAKL~^Rp=kSjL3@8eX$%xEpm36Abolvzfk9+t7Fzzl3`rxk zc9{7eR!@6ugy#Q^ko=EaPlMKF5>ro`SuspG&;dDn09P4supLweK z5{Jwif!Yp{jhORB86piq^2{7r3QzurEKG%zU!nGpJazzS+z`4x7+i)C+z*VhKU@+i z|4V}NKWJMGW;HXs$_^ ziNPcTOTQ6R&U1mwd37^LUlCHyL;8x4a=z!^fANZo|4rnT844M%{tp4wQ=swL16qvW za~>MB7(+ni@4|oo#UFt8;7P9%<75zluq9RrgV@Y6tJv&e>m_AY{jdYGS2k{elmW1P z#O>O`gG#LW2~oESv@YWzRO}0q*fR)wrQ;@4b4sD+yx?Z|X`=$&BX$sy z*1mEuh=Asqg_%2Mb=JuTgW5D8^Y1~-0^4-~!d}_99@X4<4~8iIMgc2*^yB`5k*9cD~vJY4_SQG8Bdig3d4yUUkS0yf=H*17_h>TOjO}jB6lf!otJZ z1G0tbUg9Yi14i~NfkA?%e4=b-xSgge6&(77L=c-jM9E9`Iv65k#i zh&Ix}^ANYERzmt6kD?uZBKNl@b1+OttnFT8QK=l;t%oEsLDCo=+FVLC*h85s70a>6m0a(_FGq5vETzCrN zMs&A5WtLi%%>ik{Gzc?nfw^ZJ)IAT7>MBrw$rHMlMFV+l5?Xs3R0rVhFG0sn!Snf$ zIWAD03))8m8UvaEwHMSM2928%-TwaZKLlh3s80{t?+B%2;QCm6)ipPUDIqWan}X_1 zAJAN}zr#;(9^DG@b80*!PoSq!LoS9X4(yQpBh1tgB+Rg;C~ONv&-GY{9#N$I6|i*z zpnSq5jJkIMWVQzb!%hZq&{{09Rmk}i)Rz(Cg5(8o8!g=7C;Fb?hkyQuAn(zh3ObW1 z3(@`nt=om{36@+n%Z*{mEe23KUUF4EG~7XX85G8#FaYIg*cmgR{SB9p!X$Amq%1n^ z#xNzplwpfh!i=C_%`1yQZ3s{qS_Z9`q#0HRf#MNlulRwbL7~PBCdSST6G3YaUNCcL zX^3-lb8sTghykVTZEg%x4j6&P@*9Fc?KjZc3(&YOXv}jz6G!#|(3)Jqc#Ew6>d?7) z$eJ?Hm{U9>C#(WjTP(tpTqoV0irkWInW<2Fdr%;PF?Gn?UYy{Qo~Bi;+PDv>pv~ju`U3CQzRow9g*AE)BXLO6wp) zV7w|r;R+^(5E*E`p2N;C5!6m1rAz>=7XXD7`eJPaWc%+f|6^5Dh4}jEhW;-%7gj6tSm~*hp3$0*gF#W-9 zU@pN9aR(@U{$SNGj{u1=OM%^X_WytJ2v!Yq3q}L8hR^pcX1g*>kvCujpGODcPY3Zs z7z-D&g4_+!13E*3lVODr2O}r<$^Y|%Ufy3&1acDx$Zi%6GmdI$AqhqXu=!j6{}<1Z5rU zlHy|K(vm;OP^iM`P{qO65M;^RAq9&2hzl0x^6WB2ii`{)58NGoGBPw=dc-Wb>H#PX zFv}WovM^kfXW)D#!8k+ev%AC3jDPVK@>`+jwXJ0+WaNa{&A`cU(ebk&cn;&7HNzC@ z*UgYNlonF`qyRc!iiP1~<9mp`8?0et)ee@RwI>QJ3?ZQL%m>U2A;@_PU)W}V_Vd8j z&5$(a#emf3WdQeiKf6QDydg9`pbc6lWCIx=29=kf^XFjWEe5WzHEE)&L|q~EBdDAP zm5ZP<+LF=XCunR9RMtWGkbQBW`UOU=&!pe~d z(E6^+|F@ch#uq?yQ_LJ%@bvZWe@F(n4KKNBfi<`<25y^ny!|h}`H>)aJRdTzD!j@K zv`6{>|E-`lEvT;yYMX%8a6-!#5AAP=B(0e>wS zrc7jI5COI4r!#`u%hIc=A?ASRMos?y7cZ@VmnVn5mcUn>aYwkNF9c}o{<&0 zo{_--R*#9S0>u}o&H&Y8pgFq*pn3+S9+QIXrv}$OQsDj6$n{tixE{ka2ekf43$$hn zx&|B6?_hw}XHu_Mfb4;q>G|(}$YpSSCJe66kozj2HPaxsf!qjkALv|+07eE8E{296 z5762!h6bV6%wntFFmtWS6?L%CWMvTaVr3BA&&ZLT`2T-M7wF8UBOKtl%TCaFCW@M~ zITaZug2perSQ##A1~OcXcZKXLi??Jb1g!}-Zj9gYxteh&Xs$I|-oZkH(_yF1!FY>$ zMxJcYnVrUr4m&~e(cBCZLF0rz%np_yIY&l@kZ$d{LD>uoin3Hs%{s-vU~bHcP|Lw6 zF9dGKFfs^%_NIZ_>hfP13PE#L#Y~b$ATvQ{OL{Oi1aYt|C<5(OZD3>w@c^9@2IV)h zGlV<>^+kh0`%|S>fzIV&W?4|g!q5<;5AFj=uR3@dQtq@_fzRB4uPp}6&B5Z1{5e)= zc?XU=NP8SKh6bO9KMt`w-3l@n59(8Z$~@3no6;-{6HhWQh&*Ov5JdI^=u81yW5|3D z!wd$~&()6Lz0#oc4I0M;l`Ek6I#Bz43es6W%q|R54v3?+BSCw)LHla z2ilf=;|wXIz-EHSj$vgW1IjsH9rcJazNFql#;`ir5#!)5xEKUM@$ygzF&7n#HW%eR zlLK7#(0b0;bDJPIUBlO($wSJQTNapO(eU+We}uqu#xMT}f#-~2YnWl{&l;HttUqIx zST)&%VG8IRUC>F2gb%52Kz#(zo)S=<<0;PB z{fdu45VRKnv_ISiOTQoFHc&bPxec~PB-5E;N&^ctox%2EGfS{NDimv*=3>&MH zT=f>j2Ccubgw=mit2kH~M83X->_G;NwS(r2+n{EF_Ta$k8^z_2^aDC$4b;bjo%^zg zjbVxc7sD3Vd2eEt41w2|LevT~ED93B(QmXs+S?8?57cJ_nGG731f6RPGrtRDK4{)6 z9=tB+=St?8J3!|nfzClXX~{4}f`tKk?i=X5GI8+y*<)t0RiLw(szG`g8Mdqd>0xEK zxPn=72PnQl>s>TNIl4ty9e#q-M6kn84Nixjnw$+gMHo4|L1_^Ee7J`{|A&Cihl|XH zoE`Qaw0@`p8qd)Eq)E`T!@f8%Ot}p$OKv(r$`Vle!xq<|GvRiD`X7@Wc6xx$Nrd*< z8RrOs=l+jAgv1Rfj6iFEm^)S!u`nzOy2i{fzO#SL3{JKSRE|0{)?MI&WD7wJGeMOXGKEV9iX$cK>LNc z8dd~pGID{>&f-*r>`UTQWZ22+2xU7m?3B`U_<0r74`OH#dQr`|^MSX+Penb*_{TaY zhA9es3?`s?3+Y;i$)Umw;4=nc@}O~~El%KZq{1ysvu4d=W4IV9?_jY|4m8FrvC4_D zAt)Up|8a?wLltN|6_ma}=>as~(#XURQpUs~cn5k$Y$V9O1W3Aqq$lxJ2~M!_CGl0R z(DVcgE7&{>XfEYDbbZ+iF^+CehK3-{h80DcKluegV@o10A@vjT91AEu4t7K8;5G}$ zz9sZM$exT06z)OBzgO~LJH-ApnEikLZ+*e!US2TOTPhC&U7h9F_lj#;4k4|L8ssQd$;FAg1} z0G%-ono~nQD_b12R?r+$4uZxLKyw1HGsa~c8Kzv50ge00tYUOT)US__>Zr${z19p3 zmxARTEE18*ViremS^Y5uS{8%Kz=g?>^y~@^FM7x6!gz@NsxbRuahl6mn25BF4ZZKM z+L8l2Rz*x12%7UH_YC{Y5Y&8`uosfPPMc!pOV}Cq9J3+$l5;jBUqbSv40zv)BQw(Z z^{_J-6lMfHWn2h7zg}`xt0BXb1=^6d2d;j@LM>3-P8S7 zhQdTiNFHPigv99vs9TWtvT^+XkEmy8kPjdH|1S>Chi@4RABy1ad!E*Sj&&fN9{@T# z091CP@0(FYD&L)$A!eeN?=qlqH!OV_P(KEAMm=~gwP8h(*H3wHe%m@*VTM5+fs<2q5?ka^%J zcF>(YnCBKeoCBHXgxxhU)t+I>0(R7T05YyDvuc(-!;~xFewNItdgyv8P6tnY^PTSOUI0vin>VF~J+g8D_w3JpO|m_=8W zF)&O4&C5+QfXF{m2JfYS_fJ865AgZDjF2;XLHa>+T`>J=3=C5e{{7zy+D8Gp>)^n5 z_LvvJ4nG+j8UBLCWg-1{nN>*)4MB?L3{zq_!0TaFCLDp-mt(>(Wd(E850Ku>LZJvy zpVpp{<27hp5ws@cKQrgVztyfQzxcbX{1)!K@<+VW%3tY@EC1vl1K%+PTARec&~WLl zDP$}F#6J4`zc`4#fh2Yc!d`i>4`MHDd^^&fVaf{bhMqes_ z(DgJ5dm-iQp8x;FL1(HxU=~@m0-}Evh&>C!UU{$sY8G@|jix=r6dTYQBY%dK2~aaY zYkdA6X1w?(pK;}{bf%R*;+a=|3ujsR#h-QM-)gp%f14R6eqm-^^^KW%)mLVwRiBv| zS9QoR2$jn)2z4?jbJ;Vp6uva>lmg8)vPe2q*)X<9f!ypM%CKcdyoAt9c?O~TYz&2< z{V&@X8Nltyhs?sOj6rGq|NpHE7#Kw6vojPb@G^w_;bSme!Q`+rL*$1!=xpklpmWvY zB!qS|IqY1)=I|4w?gcx;&qfx85D7=fSbj#m!{nFj4nIL-8>n;A!mFh08Ky7@GHjXs z|Gx=1Z!k+h`qiwEa~42n;Dg8W8RK`HX5!-VVif19XJjaJ5Dc$+2Y!^F*%%_z<_pOK+30qO?t#`qugj2y2)Zt!Mw z_z7Zz+|bFyuv3PM!35-v+nkVb18inL;9vloox>=>mCYy#H9HdQKU`*O)S`wd2P?zH zQ~&>qZ)1Yobp`4ZfZ`CewvB;}Vav4t|IMc{G3*4%PhTq)WBiU@MhUJSMoF&yj0}Yh zf)KaoG{*m!4-JY)!%Bjm0$c_ zSAGk3S@|R0dF8KkrV1kIs=%B&OKLJ^=nc`w8neu_3QOl072 z__=T%q~EIwy))?%`22drd61I-|4%=l1!)t)&QZR`3d#S$j0_tbpliM2O(1K%5||ja zYBMm1fa~bl5VO(EJn9A+A7lFee>$knKcLRA1!j&f)Eoz9hArT{$n?WJ!-!!g==_0B zF^8X;XyXE)d4ABiKs+Pz8Nm!F<4yBOh|F7U&GN*SFcR&l?moSi;+G(vW+#Ky81H#Yp#86*D0E z=F$v1;rCZ%GeGXIGG;*BU-d-*W!|767E+F$F=7DUU&Sd8xxdPSp&>|yeFo(IDr-m^ zOw(EjdK9C_hv!UIJjPbjK4zGFG0p%LGyf|`Q&Htz6e91 z;-CK^AV047{U58@4}Sd*(J};`SpvJG4YD>HW-jQ=65jv+#X(^**@$81Z)V9=pm2G? zECF7Rmm$v4oyiWmcWncBJ)I{z!$c|QdO8kv20`So0fmF(eMC68(K#GuC^_r|r3DH2 zI&}$@wYcDQ>d>%&tiOeX1!SG06nJgMsek{)JB%E5g7)k_{Qf^gn3)59N85252Jkty zpuMvk^$wFEb7Ru0&e||ck@)r>d~f3>8-^)6m>hPl`Tt*B7&O){?(h>-HoufZv?mpq z7(z5abH&M^^?Z=_XsrpulwgjApwG+|v8)Zq=1U^XSNQus zBp9?WHGTKWAMuPUzlAfc{Nm5N@^3ZE%D>Ev6F)PvuKL2vvg#`{^Qv#mOsl>#Gp+)K z$pdD_RR?Ssz~^p)$|BI5(<5fFRiHBI3A4zmr_92uYXAP94%!ng$qrfX$G{-jjZIzg z-~ZDUm>ITke2BL|UZVp#_ZzhS$>HDs5YYN3(EWShGjB8*3K#$VAHtDQfuf%I?|<Kp$2ho3#J`R9Mg-)fhYU;Ld{ehYV6`6J$O<*)Rk;I{n#X6B23@;O%iO6Oep zBc5yJw{Y&2U;KGi{;lR+`PZ3wA}CHg1R(Y8ie~8jtfCBsiTn&955yUMif}mm{IAaN zGx3xFxK07Jn_F!drZ5OW&R*Vn5+V-DYZ3`Ff_^ZsERs@~5%jBZVG$_K#T6ZPUgu{p zkr8$HIn$Y8;%{d0RiO1epnFe2^NB?^ko!~{_!+iTL)(5Ym?gpOPf!~Nw6_J+_G|d} zKZFaqo&=KS#lUqZB+ZL~>rPOam}vw$dlI4_G~WbT^8vaO6I}m-%O(k=^^jsn>mkKn zgVsZW_Md>(-h$f5Vyp}oLGA_hU8Zp{Y&pQjaMAIQ0C;Y}*N9;Xc-#hbR->ZB&JJk( z4?cTI+~KFDD84p;6w*Bd(Dj|*HUMOOCu}VJ;Xa66Mxb$M@E&CcOV~Yn3qk7@nHao5 zXEB5Bj{xnZ;MmwH#Zf9Jq`}DH%~4xF`IR!`M9<8O3Q#zDW@=Qx!dw&@<_w?zZ8$AM^YJl`khBsLTSLE6vE6?Qw9v)XUii zDnV|3t;{%)o3(y(HsgUxABKh?dq(c;j)NUiFQ*@2`*^BW&WjrH8 zVJ{0q$TM+=pC@`4c6NfzW+>ET?2xkOWGGB#VF>ZCWf0P4We5b>;}e-(F`tnmJD0Ij zN}H3R@Fg=th*xBGMLbxnS4x|gq0oVuAp})zuaveZLt!%$Lx`pzL!eJ&CfE#3#$G9y z-VDZ0sTbl5J9!uwL_lu2-@~vIG|mkY1JR)V56EpG_Df|ZO;COQR-9pH2dJDCX4okX znxA862s**hu(N}Sqx*ga!_F?ohM?EZj1w&xT7m=^W(0j;Tv)`%&=SPQv7pFbp&{r6 zKf_PZ8loTW9YH@B7Zkk|cK8WuQT_zL(G3?U~J9CohYVlV-%$2u+I@H6uu!^AhtoZxZ*v<|DMkzpceEiGt2crRn@4tr+Z zEYRBI-p1G;`x!;R`M8%c4$KDS;||979i4&>JG&Y|cL#7}docFQ5@B@s338t>LxWHr z=ssCThKaA4IlybaKyd)FBO7`?S}$Y#j{S@R;C$NK7!NiVbmw3%qr*>-eW13wA_Id+ zHnfinT5FuZ$`GQ%7`vmFk&ml~QCbMp4{MQhr~;j5rqdYvV?Lt@xPPj{7zbv9`(cdn zJG2BHc4{{=Oa!I7493n`ptDUtZC21Y7H77jl_XMn#5cG&rXfx#469VotD20MWE*O|PqhurVHnv)?!o>@4% z;?N8!m^lys{tx-hq##(9FB5#A&SCOS(B4sQ$avcyWrm-i^OJvwJNy*0cKG?Iu4Xc* z&A7*kVajxHyH#w}LMw(T;@J*6pD|0U618UdDP7I56FJTPV3t`0OUr+h9e%F3WZo^3 z$*}T7hQm&ARtCZA84No+isXB=h?4>;ED4|No1F z=DJ@?JN(RKWY`IcW6=4Lpfm6se*6#dWQ^bOpHVXlw7$=?G5&`=qX@W8@nm%P31Wld z7<9Mr3u%X+puHF`?HP7*GcxRqVRZPp2{fj}EVJsxa>tdh{57AM99~t_Ha{T25gxL=+ z{tw}{VweItmsN{V(EE+B!%lDBGg4VAd8Ff684A6b7(&kUH0%VGxjB_N6~3$tg6lXL z0`=J#1Pz231phNK6bfvcC?!xPC-jj~z&rnDVa0z&p6pYMT~cdV83OmSG8Fdw`yZmo z$mIQG=}k=nQxUmE5pYZ%)G03fBX;OWo5XyuGV4Fd0npA?{_+A{%7RO z)<4)U^?`}cTb_-fu>0Tt5J859paZoIlMh-r{8SKN=my29Asd6BJ(ECo!{7fQ%mN2j zJY?nvx0hKM8ZJF%W?IGc|NoXp%q(EB90mqUMHYra&{$F`3&X|7%&e=HFgRGwS7CtM zx!u43zH|F2vx?S!35Ft29ssGE|A!G=ZhiRwU;Gg(Xw3)1Dg_3Io$)LTg$=9>A@U5& z*_x~jA)YZ3LS8ZqLfR}2KXYpwCim1hOn$+{uq9iRw>#UBVPenA>dPR%XEXA2Co`~c z*E29=CowaGDwWsuo9j1D_>8F{#R7`dS1KVIN+C!3K2ZqMU?|3erU8iYXl{xgHdW0+R{N@rgA zBc5gDw{X^#U;Not{;g(T`S&p6M2-fBo$|a4g^X^Xvy>UYcj$KTIqd+|Tb)S^JM9@5 z3OxlHg3MSurDm}?{5;{xU;?VQWE5ru{Xwdm9#%lw0Q{AZwE3#8dh$zVaV^c4)t9}Q zxw^A?LFc*(n15$u5Cr8-Pu%ny*rrqhI*-^&o9i9t9~-`ulgp=uoL8m40(o$p!Nc%jDrQ}{9pS`rwNgA?^Xi*+c$@AO=f@ zDWG_Og&Qc%fX-+L)ebNNg~v~3##M@m0^oUhTYZpP$yG453R(M0n7cu7%OF8w+{QxeRM2Ob0<#Yk#-MWvjKO=mq*sCNT?VxaKx4tbnK@T!{f)PX z|H)W*hJhg@UX`H`)Q*d9WGDo+IY8xCJhUAb|CbS5mab%Uu(bclSonsSAp~^KDrj#C zD84~^Q{)*KL{>1d1%c)RK>6=Qox^0%IcNCej{_Wkp!;nz*%>ZsF*;a+?01p$ta{C? zrIjtoAe18MPz5@NO_P=3;*bCT#qIwx7lO{5wg1al=*YkjvX&JzZ@~K+G-kSpk>fNd z?m+1W7GF~=7^b`j-(@QbkB0;X29fx;421`o7(zhh4RTonYM(JNF@%81oE-3YJE)z< zfYQ!`ls%l_b{?qg0hLkn8984&P4uX8{s$W4VgsEiwbKoppEy>5<|4d#9V}13Q3s!G zt;xzz2s&r?*T4Vbh`1761{}+dqDWH98T8!~K zyczkpycng0KyyGYk`7g%Gyz%v!+^9OgW)x3KgRX{|HVP>1nsj!aVLL6kckB-4Ua$39C6Ti49G8_@fgrPOz?P&DnlXYj6i7y(QZ)MNpyzPW0&+mZb!<$JPccE z*cmSF=VJH>+S3MVZ!ETI)GF4mpF?66aukv-@?lVmoit^c1%H2Wb7LkI^$!zC|qv2IUZ z#~+~b)|(N0uiZs$Mvm^Bzws9HYZ<|Nhvq}?uLhM>D;OBIC@^w#KVs%M4XS6-%o(P5 zh>LYI^g8@_%D^y1UIDUSk%NKDC_|ZHr#OSK5wbr(brQ%gwV-l=-Qg!EE5pQ0c7~rk zj0~3B6&VFV_l1Mz>p^#DM1kDK@AyNDmEocnGs91vkMb6v@w0=x3?bXO8-m0I78E%! zgZ2!Gtg2*$?BDpt%&-bH{|DM13@Uq(?LNrO5R$3nurpB;5`LZB3?_cc3>UM+9DaI1 z=g7eAK30ap1zZdv-i`4)<}+)9`(&_rTu{H;n-wyr3+j`-<7fEk0oohM%5X7Tmtl$n z2g4TFo_|ms3OXx66M9y{LRE;p$ZaO%x)hOzxCyqCK=Gxh3^5OMR)LQ$!xWgkp!4Mv zKx1jlh%*FH!hx9~1T^LXn%9(KWtjM#S!&gbNAVWl*%&T@)*r+AwV?Lq38X$RXw2jR zv)HPsx(rjqSQsY$XA%Rqg$^-Eod&IE1*L~aX5h89LCE$!l!dsnoS9)KD4oK}QBKgg zh2o%d3nj8wyab&^B)p1|p&@9-kN?v_^REuzyFNr#{jGLi`NiLD<+pIxl|SNLR{lzN zUil~AY2|-r$e29HJkUC5&^mljTy}Fb1cCO>f!YS3aTL(F6X-6MMNAAKy{rzFx&Ot@ zJehu&zhUOo@)70f?qzh?xgT^N6(gvgW-{t!WZ2oO=&*AwBa>0DBE!yJM=0BoVW%c9 zgP;%itVPc36@UMSWNz7yr-9c=1~}5jJY*uH>7c2}WjbV^J66ow38(oGe57-#CfbRAIjkW)+c3%0#-)ZHy zaL1MZnW1y-#takxOEXk*hC`vQHB*o2kjx{GRV*Wq4Bn*i9ryTpA}soegvui3{@|}(GY}7 z{S=0VAQ6WJMGw6pVFc3m6sm8^C*1Ztgx1d>^*3Sa8F1U9=miNIkovPapnG)wZ#4ng z-LRs_Q4JCwAh}~Y3{x6D{@laj%vz)aS?dhiD=)%0RSH))5*jA}t#i7P12GqTP6qSJBG8=D zA8SGI{=je6f)P_~Aa}JrWENTV&6Huv0|thzp!*6z`vX9CVu8dzm_qLTu3&Q5d4u_f z`46Ta=Ab+xVaTu(BF12n!RGK2a_$-Gd?={z4?6b@bbbYB-z{W*2-4Su%nw24RX}Ag ze19pk$g0bx;Bxa4sILnu8zAd-L{^{~aP=F9@sYt_sW+`oVPH+je;(ftU%216Ka4F>3*ZqZe$YLNXv3E%&3 z0fhl<{RQ|OQRw;$#gG3(s+lFcXaD_gy7B*iaZq@H>MKI^3Ze7{8<%=0hkaa1LkH5H z1GV=-a~54}pz{T11ifTjSY*k_@WGssMG$oMG`P>jAOP-jf$B$CJMJO_gNTIG5A#>d z5?W@WT-~=nIjlUzFDM!(zk<+1A*2{fYxEa@*?j2U)<)~#UeM}gL@ zfcsIV+z+i`mh1+t;cYw*$>#>z;Ju#Udy5*+LBzDRA?+Z0ZsfkGM&M3Z8Z@s_36lR0 zxf}1qL5M$KeYOKykTT3nlVJ*I?+z#~L2cm|%nGZ-8Kt^UJc_rt#>Q~*I~&79a$-=x69COIK0F8sJ3B3gDIouFF#a%$fQo_4d&n%Y${Z@!@&CU$$lV7IL;SXgp&>}u z1e|9Ik1$330;PSB`#|yYh*^BqTVsYP2lvC=ExJlo3p#hs$go8mDh{&q1;Y{x?yAX92%3XUU}6Y40h+t* zWhex-3Bhh*mRJP}FJ{m_{eS;WLH!btUeFj6XfEzPlPI_^0=fem=I;H*3{w)g9DY9B z19AJ(Kal;zkC;VPf%Yh~Ff;_M`|^MK0$zqK3@Qv04{nFJ?X4!m6wp0)4vY+2%%EZ* z|9LR}Fk8UJ0KRYL2~5rZ|69TL;eqZPVqge~0<9BfgzQCyi7(`02!YkbE13>hn#nQ< zY2+f-NODeP1DB~?3=9I=nHd&doZQ_GjPln&da$jL)L2N~8p({+koeYQXbgG@8h;Rh zq~&G}NPP_2-)0HALz;aiWPRi(0dTuX^OHb?Ib+AH9iJfK2MS|QJ#EP>#yyjX!Gw`P z3|dc%uX@ZZ0;#7NKzkR(Ry}8ySY@LEIe!{7o&&3&!Fv~>^)qPig(b6?_szfmO;>>O z4I=~i%zIE-3R;T|5@TZEI1O6+3yND$WAHhSL8yHp!u>>0K6`1zFy&AFu9d&i8CU*@ zXIl9!oO$IJf0mVht65k6b!MFSpIP7{sLjanMgY9-cSW=0kN@cmJO39m?PPeukpG}r zXzhb$!L<*X1=c=j=3o1unQ!fbX5O_Ant9efXy#tKh?&9UH+0QC=qw4)nqg3QJ!FEM z`Fmmoq@H4AbXfb4S!69JOh9QEG*%2MFCH>7giL=7S$Dcy6VzsAnD~g9Ya*z<0&1Ir z((P4dhA9ge8B9RuNQ!~l2%t5spz)MBkodJ=Xbk!RieFYp{BmnBOaZO`_^i+Hb25{I z<$NXvOPG0}^QS;&9$<#7F`LZ9V9CJDU;=8hh%hu7eMmv9w_};-{B`HKCb&o%znY=v_qbip^%${A>^Aj!_P0u z3_pb#8ZJpOfckX}mwqHMT>PfQa1oS_I_kD?Nij-s7qc-;e8JSPv!03L^(tnD5JqN) zpAVS1CO$L*`HySjQzOtG0IrEISsQ{lGZiX8_b@P47XJXLIS*9>3WL>J3{ya36d>_O zhgl~+WR_X=Sc_rGi^Hy#EB^d9d2pC@;-kro6G7u$9@>!d}FyJ`373w26l_cD#lrmc-(2kFy*_t!%qed&>m8eRS#Jkf^VQ#|Vw~*BKZ@I&^x2JopwA zy(nhbsWA~!MuYlKFU%Q!g4&s&Z~*0v0#Mv7W(4i)0Q*;Q0z_>D7XLn!h4}Z82KGGm zhlycIgA8u}eqlo7mjoFG(-nP?bjrYZ!1lr723wAc4nJNpb4}E^$nXO_tQn;sb|1!J z_gyCNIk7my`YMv$4H68d8Ql+MwI5CUzAcEW9+mP&DAi`k!BHdvpC=X_{Fob~e-ioT?AF%jV?0|&H4?{$H1J&=K{Q{u1 zte|>FgaxyFn+x*40E6i?9A(v1s2iq%?ivtaFa_u7bV#1&2Cdz0gQPQfcr1j5$3o2T zSjY zWVZtcgDGf@D=1&QT+BETIo~lhKUB`Dv4^4g% zQ#c0+^FTF*DIoWO{227_zj!dT%?+vRq*lS|I#y`71%uk%C;ywCD1f9>V)8C%?g5l` zuc%{p^E*a{DGk5=o8q$j86%|J0NJf@^uH;n9)#tc7tGRHVjpWS!@>!aR~)%O{WXzQ zGqON+kmRau>X7mZ;wO<+kC-LEVRZp&?g35)Q;^(rXx;&pi!gs5hpL$l$~PPgro~F2 zJzK)Bzc5R!0@WRkfBuJblta=AEbnj#I{bVQ%=i=LCRjVAkrfhmlW>H?8b*dG4xj#; zeq$C{1rG~#&|D279u`C00}6`-UIx<_B~ZIzdFLUt41I{D4CRK{UxaKw)O=8TriT&H zMhXGdA;G9=reO~x%^Xo>m~#B@e{oP49Q})wW}s%l!ma|ztqdFtrXFZ%hGF3WNSV8^ z0i(7cu%L46vP{%-$UuQ`V3P*^~7s^{Ox{FTTU8u{s*M}cxetpLr@IEf+A55NH|+CGF<3n za@e_&iNRz#XzZ7vA!rv9!WH!hw4u%FH zdsc=*&DQx+k_-(&R!Hu!WQVL>vuBh9ue}Ai12l&Tng@Zo0d(#%%nhKi1JFKhn7tsi zFgrnJfy@Ev1-Xxd^@lmg9iVfYK9t#pVafp(hAq|X429kT3?VPX#JbVl{!ta;_6NL} zZqMLlFu~^b1w63zb-4F{p}YM$%$`60w}Q$fkUJG0K=Mf*-{;#@MC8XgqCk0!0DuC`;B{3~DL+t^%3$)*c<1xGW&qx2wK=V_7 z@ti5};1VQHyQ(lu0kv5{^NatRL2FQ1R{lz7UHK!PZRNLc_LX1!IadCy=3M#LnQ7u@ zX699o_!)kJ)I^%7@PqoY601z~A#)<2v+!@R zIs62T^NM6z&z{NzUf&@I8Z+%sV%XWiEO}abJKX36gQEK3UsW~uJ)Oj55w`@HPq89q9K&bAe5*a;es1)nYX=YL2E6N_L6mk76H zp=_{1y~E^-dJIz-m>_$gZ?ZZ3%-|C4X8Krr8MM~#njY+&ILTGJ^%$mr%mIx;>$MLySW>g3i}w2F;Co zuKeQfvGQBE`^q2jZYzJKyRQ6`@3QiLGi2RBz8=Gr|ILgSv5faU2cVrB%z!NMXIg@&NH?;-0I7BDbu5o2fw`pm+xrG$y$C+I91(AZ_tzyH(0 z^&@nAlaZMr1XSN_f5b4+NtI!WC=0{HMfwmwf!c1MJOrxCqyPV(4oYhYObn(wm>ewk z!^dqzSHZ?GgP>}5FfmvvFfy2e&eYN1fs`L+42?nGlo?hkltRqzR0fT4h^<1;8~>Xj zbNL`M6!jRUytm$#`_`B-_q8@t?n`Cn+&}ra^9ARVSwWz@5D+L3!N6pH?Z3Ih#sAGR z;4!opfsp*MqFM9@c&<#8p^$MpQwV7P`a^BTohKL?f;bvL<2?+kqo0$zj8uVvKA0@Yif z^?{)KG3PT&gYRm6&%hvZNA`#LOJ*4@F;UL$lS~dfL3LWA3~0_yY*l8{ft8$03|lzC z>k_5GYZ5_bc!AdBGBH5cASb68d~v%vT9dw$~sn+-c#&mkU? zc5f*`#;7ypAp7`1=d;1j|FwaPQ@^wkh_GVp0M8+V&i)16QO3wD+5O1eVWN|R)I?Cd z1s|VIm=W}pd1cWvX3160ts!mbNpg^Q0qx}ng+nH@2Y4_4g1`SmGT9+)&>ASv8Nk7R zA$$2H7#c1~u!F{HC01?z#s?n92c5HVM;UTX^{?d)KVj(>)D}XHU(j00mpI}VycP^2 zej)1!An^-XM*xan(A*hhjz@UaK4pd}pmq@`UXksd&E&B2#cFVy|ED$d3=alohAmu3 zXLx|xnV|ix3d{^4-iq-S+5hd$AZ_kBEv+(Muv$B8yO~A2{KM(sK06?ukr^r9avXyK9D-$8 z(%?OZb95M{Jji3(0%{k4@{$;%!_TC8&>e$fs}|}oOxX?HYuKj4Fy+O1ho91n4m+PR zi>!j#|E=5MC&&$tE<)S@vQt!);is@6Xg?q%?Sa~LAhSXDQoLZ62A>zPLX4xEg^^+B z*L;VcGFPGJOb}y*y0GfXSwI96y{-6FJj>!}jW}rED#s)|o z0NT5EQHf#7W+nzp4iQKgylr>*`I4D;)gxxv2X=(shgAr@ zOQCvKK-ImhM(91t3(=dv$^c$};8+RK=c>#w7ev)NnC6>;&z};9_Lhsln*5^VMvJpPq~kJ2e3zw+Z@zm*S) zL1#@Hm_M8B@Dr4OLFE>5d1c1HAOb4i(dBPgr^fl}j17|8Ldc1)WX9 zoOSRHuje!T1m*c(-3&iL?X*A4f~!7*_A)UGtoqH&zv>4w->UDRJyz=- zem+x~Hg7U{(X7N?;m?c)dXO>>|0jytm)kkKTRiHZfSGU7Y zbUz&Z4>>~-=7+6rOs1f67vwLPA2jM6CWFeQdS=ONj?4c;+87u_K>2hslgw#Nb_T%= zafhET(;0qh);dg<5asMh$W0$*7^Xb9%&;><-{EIvu)|J!c80l`LaJ2FfJt(63=MF7>E)yWJKudy){g2pH^n&WqX&cFtRPXcrN4^Y_yGIJhi zz01Gn#fc(k9$^q^#{Z0mjvGl4=ZH6h9;PuebtMarNro3G4 z@Y6C7a<&(U{WTdB#|$DMwy7?|PqRdZogB;!K^oy2vt<|=e!jZwuv26uqoyz?!%hu$ z20@KLP?}?yz~Sg*d4iF_^u#wv_`l?C2;yX9sN@u6sNiH}sN^(csNm#esN@V}sNm#f zsN^hUsNfW2sN|f;P+|57qUSfW*s2qUOinYcWSj^pi$MMFhxw3kKdnFir-RC=1y)R^ zFD8TAA3I;E2d@O}^L>5UVW);7w=^itgYJL=rFpLp5Hmeg9W+5>O`43{+#ae7nm^MW zexjG7iN!wb2((TZRL2#w zF$mT(NoOx&VF&^3RgGuV0q@@rX8B?Mnps#&Ta>#yo7LgxY9@v)ZObr?$;Xs|A(w&bodEkgVwWw?8vTjm<%$jo>@5i z#Gn5mptC|>GfS@moh8uA>tOlzpSn3{eLAQP2d!lT)t#X8035g-ekLB^1FvTjdkzVY z-{5*q8l2Bq9?TAU!o0fZDYMwBoOl1HKbX((^YdhepY==(g>RG@Lte~x__;!vaqIud z%sc-tX5Jax-LMm6CSwSstV(?XF%wi4F*7ZI)|;z~Ucdf7{Qx`Ue!Zmlh06tAFmv?bF0OrZFV6leGuZOpI}6n3yPsX%vUSlne;Y0t~> z6O_I(m>G70?k)r6VUPO^CZPU1Cuc*DRx6~vS+2!7`*{ zhKbLF7$?4WVwm{h6T?K1-Jm|2AXh_>!&gY(``7pRLBD?QFFM885X8l@pvdtigPj$?J14}l#ysd|_zPk?fY|L2wgQOV3}G{X*!2+hgBaGB2h|Yv0T8~r`5>cfN1BLtP*pgay5R|A#Zpgo2283n;@ZPo%~aJ!fj+%CSw z%pd|L(0{z$~!} zlm@|dEHwRr(p-{ALlBd~f}+RbA)2so|5xm}QUSCdirHc3OD+bJY|uIpX#Wtr*OZfC z3lFq!2x_B%$|+DEuYr>x1auxrJOk{^6VQ1i+^<1%3XtgJr3-*=vd8Q_QKp@B8Q{UM0rLI zO9-29qC6wR&d;kIepWC!{FD(F?QURp*!j@hVWOgg)I>df#|HTkGWH`4_M{6ZwMNL0=Ypi>4*7C&>1V0@KcP?Bw8OFahmH z0@({1TY%XG9;@Sljn(Pn9IH!UXSg^y6XH(L7)`xAWSocT|AZ;e+;h!2AO$TOjMSA>$;V^RqsuLhOXBFBV>vD392y2eK1%$1!LQ z4m6(midkkAXdH3%FMZgU33v~-CIf>ANG)=BfX;IS?Rf*uvvfhvq0oe$Q46|9vjIMi zqmOqS2Xy{LXLjZeO-2!JdqsvqEry05PsNi`S_TcEJ88I7W;#@X?yRh50*xEUtn%h` zu=M^1cb_20E>JnyCm3KREH2uez~}fQBo5+d(7dvwJY)_I7Pe;?8-jRP78LP<@*~5N zB9OnZr7;eE)HJpw8e%3a-a%<>0el>klr$!?>Wdu1l!o8`w_1A#c_*uLR}eN+u3Ljcn=QFU%aP7-}6R7i%y~ zIq;rw3ux^rsQm;wXDaDc^<_{zRA?|v31)(u~V|$>v8c<)uMwH>Fr6I#kP(1^R$2aSpSAxqLP?=xrFu6;dtJ{;2VW;;- zhL!QqHrLDbkTaq{?qA2LU&msrD33Db7^Z;kyg_yYavJGiW-xJJ!k$Jz=@VR^C_>f(fXZW7IziMY4B+}? zIU{O${${zuPSE-R1ryZr{2jlCd4@h@Z_#WSh`pdTFlZkHs2&5Iv$;S9GR~OwA2vS? z-9rN1PXgMz3_5RfjyOkm2Y=j-DeMkEUoHmqPdT$0H5fuTL>hwbGje2s?nmi!H-Oj8 z9E={89PSJzU#vmnV|UKoeUX0gVT=y*!}0>7X&h z{+m$yk?mIa^M9)q=-z2@(e4F&jz5BpA?X{GR}RWT>TD54h7T||!rD5ZJPF!^-T^uf zS{BKzj)=TMjXbhImSGCWjVSg)`)3?d5PLy&_yI0RdPT3lAArhI@cB2m>u*>&x>ArK z5MMc3A;~bMK?+fhg37=h&~j7~T8`Q?b7X_op~BL!DKm%QiY)2i&(LyIQJrB5!!blT z3c8C{3EU4AUZtkaFy*Hpt~?&=@*;^p=kk>cR*<|gAl`L~g3nSA%l2saA2N%HK?GFJezA7=xrW2S9JH@d{w+hH50{2HXsz&PW(h6OoCxS_ z|Hl20bl0lJFvS71{%AeujuwZVCM-Y9xuN$nUtxiae}mRUi#jq)%d%Uro>)8Z$!(WZyQV?!mQhn}N~c=fd3(yVKMdroik1ouvXg8y_@2wq+MY z9x^8@vI?}03$%wDqy|*hg4_YRryDe;zzI65YAHkELT-i-P`H5egQ#$~CTQ${mEod1 zBj@YJAOAxZfcB0+`{ys2CA2{6z&JqXkT7$+ZscMJnE}3Q8rp{Ab+BB04YdsT^7p?u zXp90BhM=>9K=q^JR!DuLAj2>Pbe9+`&%o*sP+o=Aa~jBN5zy*w&^Qa^TzW{@f#Nov z5qG`axDjG6lMJHX2K9kJ^)=`|MNs<|)OH2M8;7WHH^`sz3>>c$fBg@MgWP`^1Z#Vm z8Zztz<-d2#BC9~@23y-RHsHQ6M%xBbzC+qJkn$b0uNTx7NL&H2 zdneRx(3vja`~X^G3p&penigQ;Q_sxt8gwpEHTeEW=~ao#Ao^Fr^#A(56?9%?2eZRY z&^e@>0t<>XdzrxHSpx$@2-s}USz{6mAq~<`f0;V}23v`cZc zjj;QJ5y>BnaDRa2ofKFYCNe&Q*dGD2ALx;$UWz+m#y9K3!AKBovO&-X}x_FOwyg3>#vOaQfkKyeGYtMzl;PxCL# z5?aQfb48(Pj8jyk+r*J!BB%_NU}X4^z|JtSaWbTgQ&olJ4Pj$Yxhf1US7Bu$DE-6A z*9OpjWR*O#EPvOx0%OBo6inHfSlm>}mEfzmkWZU)ev6VM%Q zpgrs`_b~QD+{38KFh$-NwEo1w5_Cs9>$Np~t)zhGG z1=YLAW$6n%Whr=F7e+Y&ISUw4PKbchm*b>F| zPL2Q&=AHN;8KQ<`1MkEK@enrX?r5-^GMIOAG%)Yv5a65mAQ~#?3^i*8^G=QezKIXQ zq2lIH@eRy7IWF)`pIXYN&ax7rk$r-@3lcS6eJSWJZ!}#+= zDI~pfSTO#~D20lka(!}yZ}rsf3W&lQDGHCGsat~ksK zUeCwzfbl0sA=I2Vj6Y8lK-T$j{9ybE+E>l+hw-mQ0n|Jerk@NPOn*=0L)8c{{mjUR znkmEdQzIX$PJ`*^3+T8rhY8cq6?stg4op8i@}TN{n0|ux2XHK5*;$~>Fy;Br|KbnM zJN|q)xp^lu7c!Mw z!vY5elNXDfcV>Xr`@d#nh3})LYqMCupww`(nhJ&Nqu#z;-Q zua-Of^z3Zd$uG(~>AoKeEo14MR0?n1f%mU4o8#030{oLSr z_I11tmLR(s|Nakw&9{U4&JTWr?g|iH_0d^i<@;`ipP=?HBPVFRyEu4GT;R+9=?&(L zrWvp22fcW|zvu)L2REqSo59QwlCa1Lx(-BSRlW$r6nPGY!mrFStGZpUj@1s z;0-e(Y|lv5AZ>F`sUmEj_&Z2)S! z$Vfuk1qr;6FSW0A70v>fbOz z+6dm9pfeXCZ3J$HhM?c95O;(0gYG>5rC)nS?rhLm$i0g37P|yx5LGxSoxn(3_bd0Hsbv>Mn z3>P$7q4S=tkUWE4R<3~N6HvZLU}gwG&reDnko*KXZy0QzE7Uw!hMgas16FDfYv%? z)G=%U)zOR$vx1rxA!q(1PJ`6lta}B(c7f~%tyKc0S=jn1*{A=fH`Fj}`9B|W{>cC7 z4A8PwY9i-GhKZ28B{mU!&fj8zl@_{?dSJ?Ah}n_~GlG6HE-X3+I!Elh&`CDx=To2WT%pXdf47UlMelWa7gDNc&>FIJjT9 zGvoh%b8wz8WZ2mOy7wE$9)$&koiwgzaF$l;VEcs9)p8r z{ddMf4|zx%P7^wQti;$c3sN?Tf$MXbPyeSYWHXq8)OLzZk$S-_wum4R}OJm@Sf z&^hj)v$R0<2IG_uJJDKi4uk z{9Fqi=K$5GpnL$Td)9&LOm^tHKpv!ZfjrES3CU7W_0)ox~BtlmMyGY0NK?88n0wz2!X6Y6o=Zyfn*m4 z*e=jr!=SN!(E13_dFeUebK?0??gL`@|33sW&d&ipFC8+@&jCI!9dzGbJToLLLFu=Q z$>Aq@I(_)+e+Veuzvgz_8O6jPGMyW=7e*XBPK}=5mM(zgMf)fJr!&MdY!MfMsg+nI ztjI9M;opDoymc|N!_LplKg^4f#vnu>+H0mF_JypXa2Jbuc+ z@Dp_AFzAe84o1%I7togS8*W0+WP=I~MJ1VhMIXTFIG zm^iv&Vfs#||Bf)2mcY|EC~Zowf~E0XsQ*fs87vbHFqk5{;m})1 z7=z47{_ubLgM*lEXgmmUgEbyEgn-kM(IMIum2C>Jjf7eugOrT3=&()PzWm9VeLoQnTi>VkiDw*3=AU1zuC>v z&7RDBz%m1Bwg$*-P8RSO8YyO{FffR8!1lp1GlU?!gG047C}aKlB9J>kcU#LcFo@K1 za#+IMxxPOrgAuYf7I{DIA`blKfbLO-nQ>AYGX4hJPkR8`mthkDoek zY*WDJK4v8GfzN%+OyY~MhVG}G!X(N)g_*&mky#XJKdtnt$Lk$_sxUMJvBLM$impme zgw*r<_!*`g;A8;T>7cp2SLO~Ay&Q!mdNO*z{Rrw)EByT*;>qd(-fQc~!4NWqN!0tw zpZ}(yv}9rdNlQhbyIXLC4L1X#Z{R6{>R*RiNS;3>4Dm1W{^3%#$zcD!h=Ta{Wfa1{ z#Z02ylZo{2^GJw)n?U|$BGJE$3?ao#qTZMP{5J*V50IbD|Nj>U(IEy9zpwcV;jjAp zUmP^{;nCl)ljERvH)qG>AWcS&(^(ypgFF~HPTMmweB{{JIg0~&?`j1j2X}lw=>BQP zouG53-m-$vXbYOMm|@~i6G%9L#wtPK2kH-i&eklFW0>-Lvh&VqOb$Q6;|c5xfm0SS zOaz_ta0)sX1L{M7+RhzJaXU`@`)|U;DB%sdd+ycW{~=EQ{+m5!X7UErU!b#eLFXrF zzW+bH;qQNwugnaqHvRf94k^#YCO%}A0-x<5EXFV;l%pZ&D>K8&1<*0GIAO?m?6P0~ z#s8dl{29va@Y934VP`}?1NgkT(@hK^*LWa)*v!Py{gV?C&*F>>8>I9g;-LLDG7A|l zax_No0L@Q==DnYZK+ap(&m{c1i33yyimn2=vl!%WW`0r9{DPdQe{qHb)Aw%L!^1XwNsI zJ_7kka+S3R!xT^*jR{tB$<;KfU2QBu+qmC7)ma#YI8=Nzl0T zum9qpwkD{q?Od3|(P`HV$nk>RFMVy6UBGV2?cth+E2iNgy-a+d4gboJN z&rA-M|3PP0fcvuI@OpAFRLy5521}5A4DAfyaaGVc&K$asvmZcvy0g0)cCL8=8LO`{ zuht8!^ghfm(d#mZ&A-xHnPH-rF^J8# z5_ET#S1^dpyV5(EVWL+th|ROodosgBug@Sh_eyVO#))3Sj1yn2=UQpb&=Mq}FeB&( zOlK=X(D=NrBDRg2rP_85)9M zVxT!;hFXS@>ZaHqAa_6Hgrr4Y5%Ap(TR1^yX_$h}3K!+pFlE>YO4Ei63?d-43ppTa znM4?-fX;jXs|Ae@GKz9*STgKbcuwASWyPhMfb%d&QWZ3zl+u zJN)d2sy+A(Vr~Mm+Dxe0Oop8=k{y1wK-D&Wg{TchR+|e|o6E5CMZCk$N|@R&kZ|xq zR$B;FTgb5UMYO}uJgC~l&k*<83q#hkg3{4}xBnqwR|?fr%CPfAxWmsx(0#*;9e%!= z?C=wGH!rCESk2B5;>hgq6Vm?`n+U7pLE{uNL3^*k{cf>|?x6WM1_n!yc88sx7c;DU z(Fw^zpg9Z24oDsWjpb&`Fii1)&c$jla&(h3X0b3BQct}Ug49!wocSh#?v{DT45_1- z-$LprhhU^SiWxLsfvBT?y@99!)lm#V45qMk|DgW7h8?7il3;8Ky3Ps7JD~ajR5yf) za(ACnVwkAS=&)0sSv!k?5wfQclsB(6F-!!_d4cK&=Kudg?lUro+_C;)4mu|blt(?8 z8A4t%%dGmz$gq`*q2UsUeVPe!Kdm>Df;nitDo8)5?dcE2=!e;5E{C7hYz!AyKIQ@UnLuUmi|q_QH4+_uyxh+?QR5^3 z5AeDCe;Erw_o0IN$Dr{d(0!KwFSA-cTFeTaPm%=J`Rm{OpPt~&U<&F7g4QU5#(+R` zJQfcj=`f0+AxKJKK@q4O2pSu5&IjEcB)JMS76&@d3U+?SQ)cm1C+_^84jLnpWMP=t z@bCXtP#A;KnTW!Spf8LIi>69|&dL*A^>Dqz&tFgfPY2Z-3wJ@%@Lxg5d1=V|*r4Mk z;5}?8>-EsuV4(RHE%3OB2vYqD2|q~v3JE_@SV^)nTvPy!6>fvrdmm~qXe}dXoY$UN z`n7{PLkRfn)US+%pgnhxKBm;fdO-%udPatw#z=k46^slaJTsZWZ4JymCW9rS-^u_! zV+l0Z1v_J@33SGiAOqrzB}RswpgtuiZParzSZ09xk__;3mN-{K;sn+&WDtSW1q}kY z`$;Q4@`C$?D?jo^fX-P0ooNd4C#bIkK5K~qxo;?iwQu;GS$vfR58^%mNS{z@q9-Hh zJPOWi&{<2KtPnQjtR+!z*jY=UGzD6>nz$Mg-u;4*J_2lS@dIWC_J7Zz=0LF6-qr~jubSTJk>G8Tg7c|d1XcthJlR?xiLz{PMeaXKXI zZV5p4ErQB0(AizkHNRlLp{y4Lt@(wnIS0)-p^U+T(-v{-q8Cnv*t6d}VCn00>uCF0=S_v0}Wr8$=sYk!VP7P)bZf0HvK~R{0&+lNC zUUg_Qq>Qk9{eSub8PI&9F!=rlrp=K00yKtc1UfT9n!yxQufgg@P&o-Y%L}r$UnaZb z`2P@4I~r70Hugf&%@hHKDG9IsL(X}C_K{J_=$HQy`>N2(=okN?`$M347QC+*e;IwS z6Jl?f0HkgJE-N-nxN08y;LD0STDGT`+QWo(srYz=*XXJPd>Nl=n;_wEQO$x1!e-u*|@PYC= z=w2HRM#LE{D^Bu*+rXrp(V}6)!*}A4#%YF?j1wQaH`wY*F-+Od#!#qz|8Iym=q^F` z1GXFtYI0w=8-gAz7Fb!zVKcKT=m^e;ztYn-B znm?@OYS?)rtJ>mzmbFEuki*Vz%b8ZLoCQfwFP1Z|1odscE@oKyU@_}NP@f3YE@X6V z2vV8>iN8mZ3{!4oSzGMNvb2z2z){%5!VvOvvjfKYi_fytPG}M@N?oJa-cCQkbLzkNInT;X0QacJs6l6OusS9tODHy?Gfy- zvp5NK2P#K4Xspir+y9Uy@BWK>6hQKfDMMq>S7nBk4mTlwTg3;uGbI#!XNu-dUc{X# zBA_;^=&Jwb4io=3%S`-Rjs48hm&(q$ueF_W-x@pSzPCP=bAUPi8mMf4{r|r>$gYkY zh`pe45_E*{)-ob<_npHSMdr!)(3;~_J4jbdu8HPh}%Ac+QrU%6Z<3?rieN= z1by{qSjiv@>4QT0Y7(pd@-s{U-5dG+#Anp1?(Ei0+ zh@MrTKH_}{du8H9sQ$&Eb|mY>JW0^{g9b}bzreHsJRbOyp$p=#C_aWMkUpEts#_5K zt3Y!yXCUmAjOQU{eS!KVT9RSPdfHk?lRXVB4M9>Y4MAp65P8s?K1dBHExeI{oTm&rAN)U) z=xa?Dh7izM@t|{%UNDP;*YMagYi7L^pD$(2D6RE_nPZhaqv-3EptXa4<1OreG8Ud; zU>C*hLG2IF*p~fY=0eb!NcMjj3qf~Q$}@|<2DM2aF-e>T$$PRggv1Lnd`w~h z^(`e<88I-3cz*@eYuu-KxEU_KW#(Q5YP<9ZGF)6M$ndd&nIWW))xq-qU*^IDMuw0+ zMhF|UkE8Enyah-cwEm~>A%qP&6B=}$>nv6VOPE?vT{nx7!4jr^;lKYOvp&jO!1OHq z^FL(PLwO5OnHA5-{dyrILx=>UG#6;@;13^Uoc_n>|0bX?U-0>V$RZ|j_&w7e5)4y7 zd)`3(ZIHV`=l8@jioOP&9qIiy-lG05Gx+QttB>*)KmY$1FXaNALEW%(ArnXUBR@zx z3p5r0D(4wrLe6haU}P`_wFN+TD}&BBc;N_13$VNY9;|}oLvvoxIm)2>#@tqZ@poPM zE!<`0k9g;mztWvn{>gV-`TsEFJmnwpdsd>~z5IolX%*~jX$}U5pD&mgwv;V%SZU5E zb{drCRw^+}oWjNsxPlF|UX*hc2NS~w2Rtv5C+srZ%bQaW!Cf*3pI+GR5Qa?T)W;R;D02#x1BhD~oK@udq zKx=-rLHB_$Ldw3U;tW%M7c)%!EYGmBEEQ6(7Yj2?ykZSeKS#JBNc1;E96T?@EVAm4 zIOL3e&>grxn8jB8FJk)m(`e2tP<;j&KagCtR~&TDkaV}aAcN&^(E3$o(N#yp8Ky`u zOLl)}l6;-`?|;ZOCaG=*#)hDS;-EMb1Fuv1CC)JA8WTe|Xr80v&wtYce<6177H62^ zkOWBsAV2(KV3@MtAB4X}9CX(gv(XEAhMnKCA?mM~Lfk(~xFHDSzpq~);xIp)7KfB0 zpfwaAKg=&?`Z&{g7K$Hwu=rsz)DLr*VSW$?`(Xl-A5NnA;Q@49vrC*|%7F}sn?Zg! z$pAX{1j26y$>l=w0!Z!<1H+UDzajh@afT@z?;+~SSQ^0Rh>Jqig384_kUQT&{0ll` z93+-0&M@W5TZo^(f$CXi(N!tp3{!&NLd^N*54zt=bXB}K!;}+mpz4$%Vo~A@Q#{_F znine0Fr_0Ga_&0JjsTFl*HH7Idc8sBy+YON23pJb3e^rrP@KI)Rc8YVgRc_PFJ z2GIiwk2(g1DGJ{pd<$?`i-7N^uKJvb5Q18k0)e9*l)!cresJ% z^nk<{WJBEeT#RAL2`Pvgs5p2|;33GITu3;9#1BBtxeZz?4^33Dequq z#S|t;SgYMg2!Ng$lg3ZBFzLBAjQ~AU!O-7k6m6;B|K=)XJ##umZ1kkt( zs0{(C*Fk=p2l5*eLpO{Ma@%(%28elo|C|115;k@Q`M(*GHXe)OzeDK%VVR5Hn3-37W@cLTotY8bCIzLD z6`qJR!XV=Cvr(yGr*Z_eZOYORqykEF@(e#`Dmmi`>X;fjf|?i>6fF*d z#N`tPh7U*o%@2C|dw-D|LqiZ7(}JSop%A%y&mimbyJ8_`fX-Y1?cX`c@WULmpErt~ zK`@?KG8?q^ay~PI$gN_~y*pA`HR593(?RE+GdWmtFiIMM;vICiD@eUZy~E@TagJ_# zW~uBIfB%O}WM&ZQWCope%*!Ru$e*3V#ta zk%NUNXicDkJ4F9SX314?ObjBOp#4D#ko`kzI2l4RIT8DXcm)|kI+6Gc77QVtpfh)& z`;88mGlXO!>31|@2;upbZw~So%+H`RCVw+CuaZFXHzyW<&qVU~2}X#&9iVAo0waS6 zCnGEP%r^}ghLCT}T&q?vFbJHg&a429nZ9BcTLl_7<@pqjW@%QlH~A)E{?aCrrNh7j<6EjEbygBlDWJ#XaA|1k5c`pwL}>L;@VIK6yh=38|J z;zlrkAB4RU@m;wq5VNQpiWlRp1 z^-K(w;52ccVI`=~1&2FoW3V1@gZb$p4K&KR|YZ&uEre1+iCr6|9W?pbb%f zQ42yRs6)~Q<27#Z{3)zVXjX@WE2zAHl^w9MWVseZZr^T5de1U~nBmOCAOb4?7F_!u zBG1T{-6+Hm;&V+O8qSC`{QI}$#6QgJt0W^9dCk1)6&GrGeVYqbc8I~tj%=j(dI5_sX316eIT@y$(tx;W-bP3m zvP0bh3u9QAgWUF*S$Y*LUJjms_+f!0ME^t?h#x;NORoCFz#www6uUX-tO!sVhPn4A zGxMr_XzpE)#l7|-3{%WNWyWvGiIBdE^r|hK3{$d{A$HlVfw*s4H6Z`VK>fEA>OWze{=0x27ofF^{R|8up!2pt^LL=IJG0N;{IU>( z$q6QIE)Ed}Gi`>3Akdi=Jp25?`5;(>!31>Q*9mooEngqAXnxjb*qJFV20kmvlu`V& zg=9m}=f?~aLE|WyN(>V-*ueXh0zWfzuIf-l9!C*<4H-uPt@99FwMG~+j`G9bRTC7J zpfK%|f%p*?)&e|`IQYl~p&QsC{#M)ui6>YZTg(pe{}Tp=3$Szui|gZD5V?D^Az{@e z1To{Qy2H-xfB%c0+2)Q>&;DkXTP24UPyAToX+CJ(4z%vlfaMpceL|cJQ?&RYcKu_P zUe(S9aRR=$a&*6Xn!U%->Ns}ptaDDHUU56-WnlLp5Ul;m|P~#(S3l;;pZP_##K%X3?e6( zEVMjUv73R)ERenvObkKQjAB}n%p6*v@?j^$|KPH1HG~Z=e?j~3ZG;)7fZFOS{z2TN z`48e&Ey0di;5u(L!%EONHK@)@_ydt!$pJdIT4ohI|C&4O1f|2p4A4A{rK~Ra4lzIQ z8-#xF31U{`LP!|F!i@PdBn+{oNl;lmp8<64C}JPKI4i@&2W$)zwK*Yu&;@J^TRN2- zc7puo`TxHOsBh9C=I|4AchnnZu2p;r4MBbk3yb&}W(2KgTu}6Zf#CvZY&)BkK@het zzu_-rpYeW1{w&bmyxvC8x#8mAy?Ky*#^T_;dE7<}J3;1OXJpt4-Y3rpIs=t2i}5#n zzp)@_uRLho6X@JSkR714P#`f-AJd01e#d-9KCm5-dypV@K<+_;*l`rJzMffP6|DW@ z28lm#Tv|Zb;J8fu0}00yLJU(tYo%cAmhbV1bPYO_0~C)Boz#EyKz`NNyL0 zxEJhpP6!+9_Qr1z`(_H^Zg+v^#XxRXcnxs_2a4Ne;BMFZ0x=8b_6?6A>L)&e&%yQ3p$R&i5fHKLD2jYX#5BFxc7Hv)>U7bSynxkX4v_InQ7HGq`tn#DIWNExFv(b zPX%^{i;S(1a7pHXjA4V$k&{uF5%h;~VbNy>h6~ay5P8rV6VN_^3?tCKYlodDn4ovK zqMf$~-X{QFS0V#hI|E*`Bn4jM2RS233cSY8iqYYx13SY-P#@I=YWIUb|F?R8_OA9a z6fWds2m#46HbCsR<^c8S7(jO-ZGo--`NP0)0p_j_=zYGRJq(>}4nINb6+m+@nCo4j zYkI)$g04*muceX(y9;*4onsBeURkKU2cT=yL2J%gBz>zMvND8NFiUiU?&3o}$CsIr zAp~@eFX+BU`C7(8(D`*7ptb6%422rtJspy(0y$vw)sm~6A?%e8??UYRT+J}?K{dm~ zOM(njLNpqJzW6h&RCo+Yj|bQgV}~zyBhnS<+>a9s3?iU?(Ephje(q;t_z6#cyAbL? z=S=JauPKsRWdN}keCLr8guU|MO;k5*6l9oU0(HZJyO8`eAIS|TwGPy_hx<^N0^*^EpKA)lEz1go+jcdTRyLe}4b?pT?{=J4~;tLn?3H4&gS zZRX(f!KGG(3NlOq#XD&I;7m4$pD(2$XJvrG4Wt${Kd#EjFeQWobgwPL$_Ffv_7Z6S zH27?AX@{LN*%*FK7Gl_`$;fX6x(`ocbGlQhJ*`f&a;;tJTJWk zc3uJ~k9^O9$b;MjTHA+_N6^*?f%6D>9Vc;T6M)vVfz}1*u`^5o<>S3_o`;G5p+` z35k<$3=9{<6J`W`XI@zZTJy*u?_klv4mtxEv}QzfRk9%D?CY6K4m)=;|1iJF^uzq7 z5yMUp|0XMg3F!W2@HrC9lHhq(&^VeVD?=gZoD{{ca9)P&S%<8HgX~#{tUu&n z1fTVD5#mnKRqle|`_wOi@(gI-08HFbkYUP#|Npmw?xp1T9B(0C$XE! zQo&^tQK3#kqhjW zTvmsl`=M^h<%F<7dtx$p9V|~U2$<_IGKhfAwgm6L`pQ@cS{Do2t96};VW%1+g9ymZ z3>Ao-AbVit@d0Iq5G_sz%dY?WW{`S80dXz ziVTIIdmJ?sPe^GRGz4)la&ocEbf`*HWC#Jx)Bj{-FhO6_3R-Ut*|(+--M0p{2VDM3 zfcLHaW?&Hc-^^h7U!GwnC-VVIOIZdXjaD!YH)c0ao1!^~-q?xVvB2u`&VTjrk{n*Nmxg`oY)ApadSgSg`!E5noqc7`oT@wDNWDMSv%jjWLTiV;unv(J&^2~r6FtUT%FQTjd5}1R%!Q`-Wmr=t`P`MV*3~9eaGII!;XG;e^ zsB@TX#m_Kh0VBhfZ_Esxcwr&N|m2s3Mjlm?%yWn@DoHo zCUmRInlGWiSy1k(N4hVA*_FgAo z@A)hLrz`yZZwAu)w;Fe!?LRZq#XtE>D}SXkuly0uvhrIv>&h?wY%Bj(v#sxYYu^THz7$<`i-iGvA2%pXO@)j(1<5mrymk^|2vHDX*aAA6^o2OX zPKksWK|h#R7JWMcaT};jR2s$;As!B?Z$Nd8{6>bt27ZPRP%~j8FqricJVQofW|-}?M^9_cBcdUynDz#V&dAJVyjm2LCTp0 zfBtU;-B|?+XOLSK^Fi93kg`DJHK=TeU|lg*?*r|B%0fE71Ee0_4v{?0M=8Vy)U&2wBPB^zyH%g;o$J;{}xak`Z5_(--FhBzD$R(L2bG@%u?QS z{{A=Z_zx*l+dyaji#vetihCi>u(Rnutn3wez3}V*kQd?(J0CD}tomE+zVeH|+sbd@ zt}B1UyR7_`?!59(zSGM8%uL`lEx*!tuly0uxbj;#)5HLWvpF`;loDld_-V%A@Ke0jVKQi47bt!~>kSq8!26s{{#LuJ{NnGt@>{sm z${+ELD}SXQ1&^sf*13Vo9Pw3>d<;|M85jx~1m;I^Fh^Ep|N9>z&n%hE%g7J{S+9uQ zj1E4BotbZ#|Eqw3FFaC@x|5h`t{M*a`&i9}-IiNMb92F8mD}x|;2DE=F zo{=M4fuAAdB$`+QA4AAXG_eP~3?ZDssCpfE8A3GC#1`-{gm|KfG4L>iWTJ^Ba5IE- zqKO^gVhCA@CZ@o}5ONYt40O-pOEj?u91J0xA!zOc%@L!CEnsH|@kA42U}p%)L=#J3 zV+iR)6Fb1l5V8_YOo5dl3n1Ko+`i6#c>pJk$n zfyQ$?(ZoP~*_CKwp!?cEyFPg>+8rzT*I?2!w#L2Xv$euMM`=$7NDGgZH7AM-%O05K?s{#-1!dF_hncmt}r9$JLAHlZ43=T zkqiw%k^&2gW^sVlp)V-I_I31?mff>S{A)$bA71m>9Nz#z8#(|2OA=j>&o8 z7%K#=*M{890U2L_v>~B)7J&P`kUI+$86AE;`~P2Dg8_1G{sSh45c#Q$g%4O5LgZgE z6oT$p0NL5W1|5?`8*c%n8*u%|jJ&TAY7e*{2(brr*DlDMjGzBaz+;GL<}CQ}KLpg5 zjAulyXEDtY0-dYGIhrC+MDC&>hyGu?EbHA=?$%&v3F78hPz2Hsn!C{iojcCR5CWRJ>1E{R>S2@?+Rw;P*dpmr z1v;M+GLORmKA#dYkHY{ypAyt2s%K*OxPoc&EJ!_wy-oqu37*g~4o*f+Zu_qcg&Zsl zAsW1pvTD^P$XdK^1_lA2%uI`HPM+=r&{z%+L>`>hpltBGA(Rce>*obGL=EVyAr2@T zH2<8z1rZ0i5he~=L#N5gAjrwcuoJY_l+gP6&&JWgBk45F|uZ<9~>+W zKQ(I{CWFpF7n5}OdGHV<4TH)dTWDGW-F5O4)E-or5%i03VbP9*5H+AQ1WL=Gvt~eS z!f9Cwsm)6$ElaGDh1w5F%U?m`KuMi>hlnHWO;FJ`d(ug*Go&#fP<(i< zU<9Xm(3qMw@)*!!#NPK8>X5dd7PyZqwkn(n*2fiF2%!sgBf+oDFS9dL!DACpK__=bvHY zNe3h$cCTZAv?D=hSz9tR1cBmj#dq!qGxnL_aiz}h+!5xC9kV2UK=w<3(upOr7`G%d zgULcBvF=A8w=;{cddw_>HkKr|>N&H-s`NjQy@?Hs3|m$(Iat1&3~5J#+mzEGY*3rh zl3C1q=HLIOpz#+`hK5U^`HNCeoHRq%M}Of)n>!;szo5v?Fl90$g9vEp`M>H@w z{Cva?IxksxRVz2c6cC@4n_&v9p8tQC0o-QBY-2L4GGPJDrHQPn0-49aP}s4lLCTY{ zAt>{dMumJMQ{ie>h7gfjrob1>!mB|0u{Bv3Ozb-u!1Gg}vGtYz|C@sDt>I*7m~@J< zL5Q1?vpbv9!BUfzVIt_x==x5E!W2n|D$v|^JtIS*f~5a1W+sLZkh(-xhKbsi41x8G zBH2?9bxXxFie!6joFc_>Q0p}4TvyN@|C2{sgHEz8DB^r5zeATBw8mT1dp;XO;cEtl z5RNKHdS_rfV4HBM(}v@t!;g$ZTt8s`hP7}0JF{N=lP|RLi@)&7zttiu|1z^qe8>zf ze;#u~<~EyUe|&aknCLMFl3y8E-PR_sv8`obbzhsn#=e$;)n#o08_QY-R@b!&Y^-Y; zSe@2BXlGi>!0NpAK|AwW@EN!53~L!!9oIf+XI%ThnPK7&E`})}8Wa~AERePpEG|E@ zLCVrA@(n?coEauAb_VsggjXGuZwL}cj|(qITyV27gb3F%1#+-L^wKUqgtJS)@gbb; zwQ(}e_&CYMFr}DD#Je7}_ZoDzTrMI$PO?DG>s4TEum#17#z%%9E1F{=`xmYw@+at= z-oMo$E5G;$ul$oAwDP|*D>$v%axqN#;=ga@-)hE{f1N@7A!vMEgQS07E@=9{${o?j zn%bc3kO zMl#F9jLC?!@zR-Lq5>-oBz-8b5|=&-xEQ9u(gP?RJV<7l2ull~bTAd< zN8~&SO$YEinanbgc4>gPJn6xOnkO@25orK9PlC#-juYGwjEoLHLH>Nh3EDdjNe`aK zQPac!W{!#Ic^I@d2|cbrV`H#BvH};wlm!e7TZBazEI|DV84&;f|E-|CC+KEjngba# zkmdr_ZzA2Gvk3PyiM)1ZWC&UK?Y;%5f5pMYFeTyt|1F^V*U-%ao#BEmhRqI97KVvi z{z1$G-C6aSlVM83|NmR&%P|x^V4gY)-3;{f&&mZF|7GX~#koBrL*WDFj#;pD4yt>Q z)r00FG#D97Kx2oXeLak_48owWxCXM5fniI=zj%v`|Nl*e85%Bu{D*7~zCE6x@oCW6 z(h-~tQ>L&nTojjK5I(?kz%qmr)XxxGCC?z94LSS4!4h;|=mNO|7QUPeQ$XUNb6!C8 z`U*w{lWlCE@(#2{U3eAf{FeQk3{wt3&zr=ypA%HigT`&J$${GTp#7elU*j!aGBB8c zXwcqc29^dX&{-lXl3w8Y2NXsiwV?C1UotV6fb@XQ-~-JMgYHxVt zgS4mmIT@xfFhb8hfu3;!b`Nxpnt`!l*5B%b;6C~PW`>Kfvaf@?A!x;Ad5eXQ_0lEVZr0ylN*eaNKIT)t=XJW_(&HsVa!Tbyg3((nu-mtu39{vS6OS%C> z*D@A5{Q4gPn@fE86A~U`;5;n03R~X5HC|)R;9wcf%3uQ8w+$L&oEioR8_*u{VkWU} zP&|Rs!3z#h9na8R&g5Wuof)(?1hn@-bk$jCm^_eU5Dw*Fm{QKhF!2T(!$m0>24T>h zj|$8OEd4n^`CbZK9)QM(J^ubTQIJ1i;RzK7l?Nd4jz9lREZITj0cd^)w0>D))ou=k zDG#7+d_)Qu#*5#=8CQPsXIlBUntA2l!weIV z_uPZ-HA+;1jH?BK!i`yURR#ycl#DugVU7bD-CV2;7dz`5CVO$7oVA9Dp}U)rtGkPp z;bIS?gJljQgJlmJgJ5s1!{i>;h9J=SOgSIrE#5M7uJZdDZ;|&_-hzXb;Ug%`u4QHT z2%6Idi~og)gW|BBiJ{P8Yu7B~^!J|`a$W!zgM;M@>4qTC`97favs^L`7V$e73SA@} zszCR5cr$WvWwSB{)@L#lg3gtVpU42d?;yUGu@JOA$LkoAFv zle1gX)?ufnCRZ?6{{MdyP~KU@4j$K>2r5sV7#o6QI2fjY%mK;G2CW5SXb^(6hdt}j z+CR>S_RpVu$QW%UJ7}LK=GhA%f5X~AAosqgf%#qLM?3?ASG@+Tw~(s2K5V9Wo24;w?g7P`TzeA zZ&t=YP<$syMpnK2_df&_WQ?C3=m<$RpP&ou@BkW;km{Ol*VgWJ>q{fpS)P{@! z_bD_>5n%|rOADm$KR6tnSAOw#TKO#;v`!XshJ+eBYTp8sZb0b*6fXxD8B9Ru$AkL2 zT%ryZpgYuGiO-iR7V4PA0UDcPSk%1wkK1&1KMg-Nnpgsqv?#FEZ zLB_`!nHjcZFg5Jt_*i?HLlIQwf#$(ER>iS{+D{CtwlabGF(RufK=HuBFwuk^w5GRV z=YlG;AE0t1hn-={2{r~n(EL0oe$d;D42%sy>QJ-lnHY9%{ri6_C|zXaa7QqM*3L3Q z#&R0j8iJHSsNG@Zod5r)Kj3Egd07>r9<<-#9~)$C@B#sb zEmh&5xR6=}IyVSxJ~$tP_#&%#*ui^gOdc>xtr7y|LuSx=V$oIn?2vZBeKv-|?!W&- z=Cd;tdjI_&(ovsq*_h$Lr5C~sKRFnMyBYo_OlD*RmmgC=`46;?@kCw1OFo%b0T3g5BMmjbQDc)8edCCA^`$sJi4KQ#ZwO%~3~+;N8iv=3Wk)qysL zAE|5%Q!LpTK7!7W1LgljHijw2ptUjJ_;&cY6qJTHGfZ5`#xUi@W`>Cz3>@7YALA|L z_c9ckyoRI?h4=qMKyoix8-h496)H;q{}(qFg`^3QR}eLjvxdc2X(O#!)(k?FFW~j~ z+zvngR!6S<;vcc{TX^`&AMs%;f2D`6{F5KD@_#cMcnpJwjbX}5<(;|s&VAyX(ghwz z{ou<90a>;90WUU90WUT90c2K90c2J90Xf!90Xfz90Z$f90Z$e z90VI}90VI|{;y`(`TsD(&i}U=cK-j&uoIL%KzF;nlxEx+&&XgY55gP_g<4DuAsNs- z2HIbdAPuQkuKfBx9h6ryJR#*v0<^wqWP+40jBE^3f|(kEo-ibC~6fGI$z-UbHjpoWjN+2)d7X zJ`+c_mmx#QiCZNA{t#?4`SRncm zxgcXN*Fo#`I3Z#OIU!+o31mJ8M68h$qV6m!!;}S3v43oeYJbIqDbU4ih=P@=oLs?U=<+sRM}s$=Cd zH7#J~HF7ruJz{MLs`>qYI!x^0VYZ3WSQ(}`wl|lOP|HVP)HVRGrTaEoJu$Rim!Dlu8H)q%h%Tu5{177!4 z&ae{{j-WC@RFgXbmQVh~GwhTE)ol_CAv5Y6CW|vc`Wlw(41yr_pt=sER-REJyFr{G z;LqJ z%`D)1w_bzR?}6$r&>e8B4ME%>^Vt}-fZ7KgOfuf0VE=*IA2O>RF^jJH%fc`vKHJm+ zbYCrKO`#qGgUAbSr%DZu3iFPL0y9wC1hmf%QJ=`wAw9pP=~`kQz-^hKnF|pmC&1W{001M_Yq3 zcor0CFf;4~weu309ey5Sa`*{a7uNe1a>g7euD42ZM_gfI_*u;4u=A(6!_Q)N2Gas2 z29Xo24M85v43!`^gWR`=1u|}LD#0BA2@9!JD?o7=@32$Bi@_A+rx%_u|46QSWDK#Z z2x=Fy9ly9Vxv2jzo>Ob$OmXZ)zJFif#$XDIw3?l4gzoOxolI{0p*OD~uuwO)uL(zoIz zNP7j8=0R~%t;R9?CA0J@jb4WzFYOtAg7P~b$Q@{PJE&eS;dj~rnm_w&%<$7&fgwbS zq2UrJUuGyXTzuiq@Dr2=g&7@whJLQST$WY(~5C2{LE@l$l}5e__U* zFf|XInI?XR%y+LkAj)9sz^o+45xF9Wkx^ZafkRQQkx5C8Lqbt*Gn2#5hqE1aF8IxO z5wvG(2dLZxpPeMUD)BwU>~qWz`xp)?$vt3Z_{;bnGX8Ud88WvH3Ug3j={PgPlwvl> z_$|nN+nE`r{9({AM|P7JRL=nc2Gh^M4nM!ncG$TES}!Xyg2oX(jg{>(;)SSKx+U0-}-H}!_GZ?41#}VGwi(2B$NG$ zks$=s9s~6wRx>h$cyM$CtzhEd7IhU80`>JaGBZqR;9}S!(ZDeAM=-V0;SithnbB)>o;C9bFX?G?C=vb&TY@g{Tj5sh39X) z1!yl%&R=c;=2J!98?E_*1&+{`3vtv&=>qo8#klCR8Yr@Ph<;!e`o#6Y985s&+h|iaL zSq?f6ibE@dnZdl7nL!8?CJ);kb}}(E1S!4!KYalcgUMtj22)VJ1MP=ntgM2xn@YGR z7BWNgSqb;V5@u*VE9IWZ!N}0`3XBJA85kRE6(%0AVVKxp14;{*g&9o2{z_q= z2+C7?85yP=5MnT$$t1}g#m+FXgt=j7JhRB_)ej)!$DsTV%2S|nVFg2j5XaFDDN#mo zZjUvb1t33WZh+WjcCcd>*xVBCi4U12!FvvF{`x=t8#Cj|ufYr}L2651az%jZSjKgb zICulf&*^R}i`f_^z7Ti#S3~`5v#bL}7KYKI$1m%(cry+e7uzNu5Io5_CD`ti%pt?++f#G8&Tf?lE%nUyp zS3%l6ptV#dnV{hbQt!+(@eU)TELfnzUyOSp!n@U<$;nMrMeb%}fkaK;jBhAz`!-D!!J9VM+`uhdERZytYV@1)^se6T_4_ zEDUBbtQO{=@j4Dh(ENqNPjLPSWu6Ff=fmj`x3n=aOaa}y3re>j_WyE*o!~GqXV^LM z?|*TS`#ElNfyayv^g!I^$O^Hihlydzx>x_F=l%UJ4$AkS`u++7g9xY{CH&+6bP)dn z1B1w&-|S#_GE9W{0p|Z2CWa|8zwONum>hn>`n4dpEu08RXYownc(l~`_22aR|Nr8j zL2>_$cOp2hL3vf!VWOgo{lt~9`24~ZuI5Z)*w#a1x1{k3_C%70O6B|xgtRK z)EP9PI#4nySiL+~DK;Z-`Y zw1~w$tw`?aKypte55zs02O$0f-LnI7kKpopwknGhCEsWhl)4`ybpE1dR=X>WKKm8m~|N`5&Um?C?{evg!wD?L#Xg!xRo? zhn+t_dpK4*>|DXXVDci^;U_~Q!^JvAhAE(O`GLH{&&A9CPk*57@N+GQR(JTh9Ykw8 z{5-h)|McLV|E8dJmSa7{uPKZSQ(~cU?6DmZ$H?hHu^ke>ptI#c@uaa0q6Q-!G(*(Y z{r@kn2XYI6eN~__f5(N8bl|`UX}f&}kL!x8n)(8=4pD)V!L*aBVW&MSL*Z%;hL8>} zho9n%oZT~(9DdHQa@c9c3|i+W_WEiQXq-oM73f@ZP&k0HO;eT zO=A{44Qj)I$`;U_%Am5viV;+{h`nxP0nH^#ubR&+_8QbTQvlD!2(MCR1l^JS!(3xA z!$dQ2ho3*0IY49Dg`hLYLF}*0(yKt`gX}r+=YNO?JHtir*wbIg-BzNYHJXg#uOI*V z9|F3wuY<|q=gM429t7pjsVohk`$>N)%!I^+*|-1GLF4Bjb(uK`bz7n84$Odrm(I8U z(?RVFkolmx{yFIEU{D{Gz@DA|&7gTq=9ORkSyuk7W?lK$nQDRsoC~}T57f_j zI341iTc9(9nIYvND8D%|Gz5X{a$sRF0lD!i$X&_|D-)(c$|kmNpuK*=s}3`O+e$w{ z=4LM8g0BTlWCE3$puL)i{doVIA@h_V^Gc!SEtmwc|I=4++Y)S!<|2eSp!KLz!G0EA zbqsW_F&D#52he#4QVu)i85y!yF)@UkU|=u-r58}%*v`N(Wxf={&IT@roiErsf;bpB zxKFZA2;yYm%Xch(rArQ>~YV=C@lu1#i6t_l;&hmU}#`qU|<9BIT#q& zp)?DF0)qhq1A`LOUR5Zq2BnpuvNONBq3J{Ja=|fq`K$Lm?v!CNunDlwy#Tm6AmPQp8w5ILJ6T#d-LdL3uzN zTy(IpiNgR$P(%dA!$u1+s57YJ14`;j3=H5h2viOsV^9GE<1;ZZFrZ^(IT#xojcg9F z@_eB32BZ;IHbTovI|fMEg8T3N`9%f!MTsSu`FVN@jyX9BK_K~J zg`m{p)S|M~6g`j$AgmCQky)%zoS#-wo>-KskXfuyP?TSinp~2aqL5UHWOPnqxk6$d zSTHlMB(*3HY{G4KS1^3jv z)S|>3g@DqeoXlhepUmXcyy8?PJ%xar)WqUc9fhLQ#1yarIS?s@w9K4Tu>JW(3Pq`D zAmj5DAchB}Cgk>f-6I;Oy_>>F2Hx9OCHb;uz!-tb_<<$Gl2~(&AK5NR(g%cxq8@W(g?3 z3ySg~fl-o?SfT({n3rFYnGBAXy!;Y{qSV~{veXoCz=GA}rDm37fIN_qs*qS(l969j ztdN&q1oj=)-~>f-N@{9uYKlThzCuP~S*k*AVoIt)VqT>}QEEX^YH?~_3E1<+3W>!a zHK3p`F3l`SOv=p3EUCos0@$v!{35Us1*Js=`NgRqHzWl zRe&i>Nli;lE-A(^O-~`j!!^iN!82IF&tD{Pwv zL`{%y^m(~>xs)^0@={XM6vBP|1A^l{c)65QQqwZ?QV{~YT>4rHA^8dcMX6<}c_j); z<%vaknR)3}3hFBA3YmEdnJKAxC7EfNsYMF;MGASPxk;%-N(#BD#l?x~snCS&?(D3f zr4P0aWLtc^yI-htd^|6gazRmIdTycuNI`LBaY<@!d`44_ zq%3Q4IY<*BK8pv0V?n^=;W3{LC0 ziFu`oISQG1#U(|hxv&%p_9MdW=#Btc55pQ5L7=aJ>Q^mDM8o}~sfp}aS3gH5AJ_Ph zAXitIk#O1o&Qeg&*HUl>m3SpZsi2HisgRVakeFNoD)t~{Tybhi3B=o(#R_RTiRqv$ zW(f8PEMWaYed9g-f1!!u=H-CWb6RO0L<1;m=BDNrr0Gj2K=n z1qFr7yb^^>Ya)~@K-6Pb>ErJopkb(Kt>Eh)=Bfd5nl)5C$j=&?wg%P;nF=#`#1oaUC{)f&1C{;Y0*IFjoLiAHaUcQh;noWk^W(>ItuZ@A^t%i+Q;AB6C@n$;pqla|ARNN_?;q0OY`UXcb_HD3L)<#wHB%15_MYwXdTyR8#>)*gwn_Dvm4+_B2EsSr{A! zn8M&7!4!ss5Lny<$=xoVVPG)@1w#uY;o!ia5Qw-TQk@wO4p6YTktvdDQ22sH6%>rX zHA7x1q}7#}k^(Afl0fZ(G=;>Xba0i1T4l$Bq6Mnk7|BprG{rkB7$FJ6qAcDSCFnrW z2Q>smH7Gj4;wTRG@plIcDkz```+5e$;>8dn(gPsr8#x9Xor2@B2!kUXB95#Y6zLFA z6qkcaYN#p5sv(gMR*xJ5kVpp$qo@Yu1BfZe!q7+uDMtH$5O5xb1O~E$L6HtojAAx8(jnp~ zk?!c?qEP{@AFCCr^9zdOlk-ZnZ8ac8fR;vurY5wG1C?PQ$!L&NthTL21x%(|p%~Q1 zNCsE$1<83O)(V+v3L1(arlvx*0*JOXv<7uWb3rD+j1NFIzP7fu7LfxSoq}<>%PBbC z8CfHeyPSe4cNZwNBO8zEE>Nn6ISe(tKr$!}L%0hhh3qhL!V6?ZJaT}cxy#WR<}3v? zcY#V_WDg;^%h4IxSqfyi%h4IdSqf zzy%L9#8BM@mO+k4guB2}NDd>%U0^eiLku;%z$G76cY$TFy9+Eup}W9l;C2_dzQyV; zuncy0fu$&P7uXEk?t+y45Qm}0BSZ$tVTgEyNFf|XPCP=)KynyrJi2&>K^&!^fR-OY z)e?^K%f&Mc;V7_1(#utl@yN*@EkA;4KbXT%!wV#X6k4FZT5$=ew2qDkNg+FoobUpf zffQN_Xzl`6zfgyvx(h6W>@Y+;f~AlgMvl9{W*|EZH6B6DHmI}E;t?c+>@4tT1|+;d zQb^7st6T+{f$S`_@PaiVKyE_~FPIG6ZHVxKNx|GkPI$r0fV&MfykKn@On1R#u(%5* zMTxs$X5eras1XHn6R3HM8eSk7xSK%Ii0}eQ!Q2FrAt$^*X29J9G6XHWKuve3!%*D? zY2P806bN^LrH~v(j=R8SAUh1zT|WNqP*t@EYz#5-%pgZn_RphLtaNIF(q z+Zw3=0jY#Jm>kD~jEoO}+6W6xNCYDs?1I$xM+r(JEl>*|IV=&5b#!roISiDT$tv0$ zU0hH?5*n1S!3P&mQx_VN=~b zCL(zum0)ye%DRA>l#t*;ZJHTrfm^JI;6id2NDoqQkyUt<^zsYbq=YyOJ-onD z2!|okJy-(CVdSKHuo=h>gQR<2uG9+91iwN`eko|m7COdbjV@kLln)-A!H|HtQXv{P zl@*In1Der+nivnB83PX_m*r=I=ZRBG;>&aM3yKvqKq8vfyj&n!p`f%l116E2pI2O> z0Gj4i(8@_nO3gv2$}fN^0_lQ_mlmWXmZV~pDk#d#!>|%G!U0Tu%L6cq0oD9W_8 zHIWp;{G_3&fT~Pa7fBhi7eOi$i;Gi>N>DW@*xD)>fTlHJ6%>-^LC!{43aRLk_~5}c z1RqrKX;dIt?+dQ!kQ6{haS#IFA{IppxNt)e0T(MMB9J~aiV&o1K{7ZnCTIZk`1Jzz2jBp6JeT*c9kU?%5qv`>*5s|bgAdjv? zTU!WYV9gw45wu{3)$B-0FazENGvr+`gWd%_pkbvalG%u$2IUx}H3_+i$qH%;xy7Xl z8h-hC3ZC$3`_vSLu+*aB%>2A!$W%0Jl|^o1GQ!~8#AJ;`9fc$vg=9?y4UI%iZH**N zEsbPw+J&xtz^<{l6jh@xrbh5m3&hF}@FETu*I-BI5YI5j5LfU*A!k^A_f1XCNX*MD z&IM<9SibQOh#d8I2FXu*HTc|f|ck6B}M9> zMP#AHkf|<5P(f^kv@|9k9x(ZN3hGd8>I%7u;H46v#a^IAHYrMwH3!a>>E)Su3hBwo z3eNet1(`X}X=`XV5mG^EDL{>hFDNNeuvJila*>K#c*uZbtU^;k1KGvewi@{b%F57c zRtHi0=NCX~SXc}rugOWtOia(qF9xkp$t+fIEKAJH0aXnOX+`*?no6dw-~MhFHthB$lpxQ4m<#K&tY*x4$W7#JCtKoTpY z4pIot&rMYbhb%cN#vNQ5{&_i-3gsE8d61P$;AL5kuq7#wTnJuCqJR-s#ii-#sl_D< z1&Kwec_kUC#i_*#iADLPc_|8NYG4~P^Au`olt4>#z^gStr5gkz)4u!NE51Q^odC**)m&&w}LO;J$N4M%d55~!l~ z2Q7mu&n!*_FSD}(Dap&%MNtJ#&d}lm6q5M%ArK{}4>Co;&p*U9*b3rpGDwiC^tBWe zz^fs!}9BgO>~EY&Jt5nGQsPl^3xO&71W*8!F~gU6i7CpC_gJTxdiG}h+BwC6ZjN?*A?n(A+1=2 zES7YK#IPG^H5kY$NUVV;N8#x~!B)Wl+)~!pf|k&k`FWI7E}*K5xC#awPoNSERE6j$ z7-(99b1Lqd38mfvX;jEBP(WyeS4Al67+q391-}Al@tkjBa#22{NXsuRQBbc|S5Q+> zuT=-PCZKC*Q;Sm-iZk*{b5cM{?2;36K&^5}za=pzr&1A8u)%6<(2@jrLkm$EfYztz zfW4=nQK5;k0ubRt&{(#b_HbppjAL%4-n7~ z8hL>kfUF<9eh6d$e*NH9B+LUy`oZF058&4iZgOJL4;CjvKe&C0ML$@a2>p3Rva+13)^!UPW?0s3!%so`Cyd9W1aJNcv&oIt28?`eNw% zVd8}JgSvoVy&w;0AUOautO@o2w(!$I4r-7QItqs1J_xiO4C=nYO@$UQ&=#?8Vo3&~ zoJMW*D<~u;6~`mYMzsAE6u_n!YJ!}Um{g3^wpU0aMiWR8vZfqjG=UT$X-dn<&o9F6 zJcx%u&I2n#(xgyaSX6>t6DWZje zf;jDt5m>bo>33i3e)lEP@4l#h*Vj@AE-VFYhXVCgKs({EMvQ_2sDK1lDDWBzQ8$2^ ziqK*dq)Y>}&=NV7DJTRN77?R4xUdMD=D;ALGzSKuYc2+Rji6?TGIY(5a3QD}q6|ZG zV5nn|D`CxGWiZX4$jD631LqPvQBjwVB$1`lwr~A>F!5_ z&B31TelX1-KY?RGAt*n;gn-vTHFX*;3lNnxSQ(N9o_S@dMJ2F=OxT{xys~(Z8H8T=w^V*1n{V6UJ7Un7ij-!BDjm3S_~Q}SI9^N zZRu110p$5Z1O$7^VSJNJf~I*`sF zxQqpL3qTA_9R;WX*lH876z(d4NV75O3Z&T+d^0DI+Ft?GQh-#6;OP=Sdg{4-Ia?l1@ zT>3!06;MyyP*W464B=`81%>jA%$(GCjbu#-3tQt3Ik-U6X`q2~(59qfh180YqC^EH z4NWD`P7HM&b%oSC@T_+#XuKUXD2d`kg_L}-6I1dPs*xQL4|W9D7YMtoYauQIb&Zit zNzX5Vm_i_cKrCUoYb<^oOm73p#aX_@h+|bAs+E=&LQzZt|6g8ewvz4Ls7$~xID8Y zIRmFfh@jO$*a=D!5Pir_26snG;x+Oxv!GEt!o~KGLNE_e2~aCAo5%I6#E1KQ06G7Icd4Xw1~5={)JD%dK3{b0?@Ra{~P$zYIK zO$9|;1@#yMbxly#1Q`QK6%a|#-e#yDK~m5qD%Mb6Cl;qFsOzdDO=f|j0>-ZaVL4jvuqhMsMkPLQwsJa!D5Z- zsG>L$<}@^;;9Tf{0yf{O!Hukev*OgP6ktX|!lVwxI#7M%?uioo$N^{rH^>f68{9#l zS`d=-KAj~Do9|t!VUE!#ZXWNO@$c>2?S`U z=I0h5`xj&rNjSft7_=}PoKUeREJY$5ieV*WP{>FVTfq8~WgxT%jm^MdG7JRIL*a`0 z08$Nv%_`tBFd821v7{Oe3R-a5FD`+m_{_W%ilQ83A_PMsADWWDrJ*O>p?btQ6gD4& z%jdSl83S<-f&^u!oLp!wg8LkjhhhxWtw6Ou_#7(d#5_7pa4~66)}Q(WKH61(12A#i=Qfo-@oiygg{RBG_UKP-P2aL!%9(2DIiNIj;n| z>v^r~_Do|%)QkXn&hTmmu? z(WuKThPo5FVix2{5QetxG>S`7Qj3ao6qI6$z^xf81<$;)#GK3&NE;92J4inewAMjg zwOBnSPe}(2LYKA}ObptOYPo}A1iP%9IcgHkIpOEg@OOaU7X zZFDL_X^_i77}5=}23h2prjVDf;98Mcq5xkisH2co3R<8H?QDR<45Y0VRDIdm*(w-X zE9B%WfLKP>;6q%%=eWRZ0k^3^C$@pdzz{7>)DEVKMsZ0I_BK5z9fD=SU22eVx|9RR ziF3ZGx%ow)L*byyp-b}fb3g}XQEt92s6`BNtAcA@Mq*xaDkuqn)_J=mmLw_!XI6oZ zw1e8J5d>O-21*>E1+euxeyNE?prvZ+o_Qsy>8VBPU_H=IKBPyYP*j{*m8y|hl9~%z zRSM$dr$M>e3NUV7i6%I4Dd?jJX(98#0Sirf@xH;%@nNn(V7I$Km*&A%zbQDI7#SK^ zDdd5ctS9EBBo?KBdfKUZ;DJ3*sia_~02(O)FGNbuEKALUtU@YI&M!!Xu7M28EC!u@ z6WT?NqiLt6Wn74IXAwzAT>GK$kY_HX#`Yo!owMqN1;_KNK8WuOR54VO-;o1ky`AQ!JbGx9^A3*`9uLX|O-24>Kxq-zBnI)hS4xs@Y z_>kNNN(PXSgcNh&+9+p@8|=X4Kp)w@(c-9(9#FhxzL4z;B}thWzD6F21)aB!O}SBye@cJ4h?pVcZv*g4F(OEfPzOsK>;LYXa@Fyt%4zvps^8D(1@3- z7T)9m=M-@IR0g%1VU1Z0h4^q!KVu^W&@i`xh61eOQLwR9Ftji*zz_$uG>pOGpqc<$ z2gb*Ps+;(Dh4^^T_UT0*Kl1=%O|XhL)C=28KSM z5xq2!o1mvxf)=bBDG+5XXb%A_py7^FvMJ5W&dV>)vr|G0y(^=;(H(qJCJt*rbqTnd z#o|}kP8G1TLB$j_yFfOZX({BU=Ef)HE{|B4{@T7f>N%Pl7ccwCvv!fMojaQ<2CYhKr(PM37Dv% zkf)#tI)@nSZv{;q1*K$=>3IrDIto~90r@>1bVMZF0+6%8p$(G4?rhMO4sd%56d0gt z2sEFUnyUfcR+E{R4$dv0amaYE(_vwaC^50tJ-7-$NI-)s7w`r>@HjqdbY8 z*l}8N2}ls68>~0KAf61ZsL3%NQrIA(JvhV>Wd_07(Z@$Y1ME)7MndE)t*HaqGYN4< ze7u{d4=5F&DA5F!rl7Ovkj&5o_4+_-utBLE+$sg74M+S0(BkY|XJmmtC#3VDWDbGM;R zo)JPlC}Q)IL5g)0@=!`^P;SJMQ9;5QpyCMGaLCqIP?7IiVYrFkX8pM2Y?Izcn@gv1Eh+Vi(&MLb?|ZU zqerZlD2yJluHZ`(<$GV@B%1uKj7L6fmy zVUTLbaqh5YGe`txQ%WXiek-#=r9Q6Gu!jiAcG9xG8{BqoS9da zpA9)2Jux{Md}cnhEQS^0zK#*`L9WjJK`xLJ=?x8xkPhnw$vS&D2Em#VW@vKYIu$C3 zEa&1M3Odr=*D(SjX;5JS+L&u#U;v67=*R`QF%n;tnw(#h0`KI3hbj~lz=uyn!>osm zR^;U8r7I|a7a_z$j{JuXSwJPACpCZ$Jq1M&=!~5bkOM%~F}N)NHWBJwn4u|pgT2SOVL4E(cBF(5fUCy36PsH1vB$NC+0yz6si*BR)|W_ zhypJcR2Vc44iSb5Ae~nN6#=D9ka;NQlza{4K*dZZSm4B$C!>T9R2A4EX(0E5rohUR!Oc`i4;tD{1BVrCAQ&{J1Un2~M8SwBN@P_ z+CWO-O2C;5k{iKRK@3Gvf(TPI6<`-;fdv(^6l@ewT$lwutOaBc2qU=?#6`6pv>Yrt z3v>~Ht|2r5gA_qmvw)az^^iz}W=xRHdZ4|(ASECSR|ZQX1Qmj!p0J|KJXq2pS0S1!!52t%3o5AK+C4ay@VHppa99)V=zVo+Q{!xI*H5E%tq1-K~~DG`!du>}J(?_%>g z_RxnGiXeA@V+8DdXs!kKzQ9q8GUNfyUWlb};8H8K9DGUv)GHvNOyo=rx&;NcDljj# z96VMAY7!|xJqtDxT*-sO2WpxEXlfMVSMNjGc?~3uygCcShsH8E=sIX-;BED(L70a61Yz@CA|wVX%9nQ4NXJgYjWSv$id0u>`1vqo50Iy19= zq?mweKz9bDBm%c(LD#&c!s7?z1aKZDt6l^}8pH#cv3lUD8D2Nq!cqq`+L59XWG7P0 zgSa4!o;yKeNGTV@1&y77dK!rIi*Bi|Az_PfxERgBNSOg-H3$=MA=I(R*(5VBvjk=? zdTD|hfeN+?nNTYs?n9MEi(dtJdLTj%q^5*c725ds;ng{*J^^{7Cj zp-2O~ATFdmZmH^Ao-fku77p{b#Xme0{jN#r<#mSkPaDo^nuN#MaBiCH2j8x zB9!P70n#IYM~!=Gi9%9ha<&5K2%SvOVNIX~3ZT*(eBKqf+XF8hK=~U~(ka+siy^dF zw1pJ8(Ym@IEuan)$R{9--8U!&7Dj@GW+qUMhqxW7#K5o^-r|DCBi1wviCM_;k=VL3 z(7XZdX2EPh4nTN-D1uI4#Bdl!nnkfu(@G&2w4X#F7qqM_DODjgx1gj_k;s$@%1s(b z&03@y8b?bC66~3=ddQ7@ZChyl0V=T}DI3;VfO;PhV^FQor=NHGL*5;TuMnUK^7;^5K_>MWqN46ynM6y1pY4l<9J*n;SS+YAcx6p6aeqBL5e~YPrwx;SpbbM zkf-5lQKg}kx`HmK>@5Oc+5xoy6t&1|?G#X>1Sw9T5(I9A#+yiHBKZasQ{Zkmig}P44q`1drl7Hd@E5^$7UEoE990%1nm|L@ zS_;K!xh0^n2_;n{gJK0$3n(@(R!}uBj>%JkS`Sg2f~Hu{C{01tLeDr&LDd{iqH6-# zpkS+j)dB^OEijC(5o8;ZMy!^B41n7VaRtN}&?HZq0@B^Bpmr!ItU)6dpfN}g8{#XF z14|GVnG`Fi8k%DDJF==21qD#xfaZu`i;6%-VpQm$F1LcNuC79OD(D{W)D#6@|A1fx z$GpUx%Hqsou#^Hw5xifHVFY-ZS|KSvzqkZ?ldhG5s)?Ra8d#eSWCAE2aeXbk#Ktg5 z)zqX|K|$5X800-21*ICu9Fc-Tu&a-o0>~}8y1F%>H9R001qJ6&-%uaN5YI4Iuw)HR zH-f?twDJcO1PTfYMfs&AnR%%ogTP(LVlWGo*&qvqKt&6bl~|SzW#wiC?1Jgk+szAqcE7&U-C|D_I zfG^wCM3nA{IXTeTBn5pWJ{5WZU|zP!h8+#9k}p;4z3GzcR# zPC#4`#)uUi1+cF{axje4j{pf_Xi-g3Lh=`~bCLaqWD14}(3Ar*9dG_2Ir2azVzCWs zA2e#wGOAKc9^^O{$ZhE%l?ADY3S0veMdkTLpp9Rkt(R#WWm*f{A*-By9f{zO(Y$@~%Ay^1gXeszu0m7CBXJn?8z^tS= zvp|k`A#AHtQDR*1 z_)t~CmWC81=0QCP$}tpL3fgW%*iO*KN(E5+2joqPQxWKRX2N#*8FSa}_{JGmD{m!F?))-2A-El6=s5Z15USa7Poe?JW_soi!J7SOB`opbbW;iOCrX z;3l#jFBh6c5QpHmDkU>5Ewv~$FF92qDYc|LH8l_H0`-#o0(J2IS@op+l9K#fbME7+t!$9O?{#^7TwAnt>nYY1{7__7;?M9>L}MfnQqNE><7K}T;TXMhaI z%mdxImYSjfTICJeu?_0-RD$;JB5$ZFM%_dVT4b7=npc9dhZr+dK#>Bn0}^+T@GmaS z%>}RZ&PWCCzysfm0fp0Ua0D&Nc5K`sso+=)y2Gdhlp4UEfQBL{+>61x zIg1i?!O2kpEDg#9;3@(|uqYLg`ioNwKv(dj=2Yq_c;=O$YA;Gn1Ksmgk`FNr8XM&q znUG|H2xpKzNZ}3+Q_#UQpe_8M6XDZyQlYs7WJzifl5=zv@*!y+G!0*rSX8N_K)~7p z&sGd3Cb8HU@b|h>6v+XAXC7b0aC$dO{Qe#rR%4p zCg+0~u+8+~i~!EIrJyA-nR(FM26s(facM4iw*@G36r~pA7lDeN%wo{7tqNtCiD3Ic zah012s`AxAYn4GsSY1!SvqT{|F%NWmOmQlBm%V|4Mp9)-YO$t{f}w(ju~Cu&_+U?P z+BH(pFf)M(KwRYr@l0wS_}E@hq6ZzB335G#H*^%#!Gj5qJ^$+Pp(@z5XVBn*pSX~e zSPWiIj(+k3rnmJJJVE;@K<5J`gGwgQo_UnL>gwPa%`8>`-?a(K-Z}~?sU?Y-p!;%= z&z8t6h8*{hngY@R!r*WRXJiF+@a%)S0_3pJl6+98!3_i@lhi!$nGtXYLXK+DQwYh2 zo<0N$A4o+B%5{*^Exy37mg6xdb})XgS(dU^`Vprt%% z3aAngR~IB^7Qrqo1KAHLUNkgyz@~$21D7-q8^MtZ9^Rvn0IgU;?2bV!zjOrcHUVwu zglu8~)%*$y3MK}qYC+uu@UDD6M_<=?A6Gy35D%zQ1!GeM(1r_NXnCBInwMUZp#Z+C z3*;z@nW%puAM?IXg)0olpZtl zl0nNfQ&V6SY!N6Cg3ce#Oamue=pj_dzDIIQe2}Z7kB`4|d~k>>cpH-;#P{K#oAZiN zb)m&JsMG=lb`I#UD^LQ4v~r*>0#zmuSAYv1gu|io3Q3ia-A_;%P;BsWfg%-r{8=XC z>=E!0777}fc?yv7NTDRZJP~xnFr*FvSr4w;!L>fP-~%0ql$xTa;Fe#ckXn(LTac5g zqmZZoQI(&jU}$6vF-r$hMT3vbfDCgcf=<0i0-c;uTv=R_nyUjj69ZJNl@=(JBxZwr zY-nTx(GRMYk|D>LaCA(FTyCf0NZA$sN?&1)ZM)YI-M^pze=^)kg84lQFe2+6soSMLn5$C5C44 zC0d|GNy*uutpZ-t0BR{f`B0S*k>Y5hSg<{i+67VFg3L!8*MrTi zL^u&tMr#{_+s=NWKH%g53K`Ji5m4VEF}FC{P(d5KK>)Q%1$z*jxuM$CbJg|Llhq;p zG6gjSs4%jrrFo!xMN(4~z?52Km|ansI?&FJT$;St^z3oCu49k z9I6x~2wJm+Bmq*3iS@MpOg%Swi ziNy+zp!1kOAqq|_wUFGCSdw1^-6#Ss8lY~33qns}0{1rJ!7Vmh@WEv|3R(&UpgRPh z8bJ4vV-t(d&r5}*46L%Cov^83i$N@Kj}2Oa6_gakgD0PR5pr2rI+X)$bo z2cijTp@Ie|F{UMgkJSW=L9Vt2iK4j_a{e5`DX>xjoMo|k9_k=?K1j|lDoQOb01c1l zrGpwQAX~uG>AK*_V~ESZ=^PyYn06H<=7I|#9fk7bcn}9{Ibz>5tYm>LZiSavU=46y zv{5Xo09xsTDT!Qmz_(n3%37FBpxOzvxDvFj5bADltpRQuW#;F_!{aO3$kYt9H%tlK zrOnJsO#v+~gz5nq=~tQ?9|S&&0BN^4C_BcNfKo?EymMX&Jf(JS*_wTJfQInI)hz0Trqhlt2x9@cKRQkO*i=41}Qo*>VrM;Q)L?9ccavG#Uii ztp;^EYIO$bg~x+xHI#j(pauiDu>k5sp`EV=3NXkKtgsW+pg9*QtEWRw27{Id8Yq@( zfeO+L9nh9T&ZFvb7oblK3E#o7eF1eLm!U^X$6@}DF#&t(2c}k+rf?lCnU^M z+TblkXp>K&I6pVF1avPsv5|+6aHa;Av7j5u58(=6d)9P7y9+^X1|292X%%UL z`sJ`rGt6Z$|0vjk+f+!Zq5cLf(Sj>dv{f*HuHivizXKjfOw&+u1znzCrQljokeUqc z+NeW|IPh)nNvR6pj=dA8V-GzOSrKIg7oM$bpb?CcR9F=YI(r*jcY>BCK{Bs~CM<1% z(?2A$gMuF9erV1Fm26;bwvaj((VRi@P1wpK`06l{ z9Do*-p^!1ml6(c{qEyh+k&}Y1Jo-No^u$ntH6gT6 zhwTQ3L?CLV2uUznFpI!zOF`!^f!ZnxpgU_abHF_y1?VyH;1)DI33-BgU7#bXi}Lex zK~3-C#4^YLFR0;~TBHt|tA$TQ*@HEMiU?3i3yqa{kji4v2@Rm)41M?oR`7#HQ2g@Y z`axzOt*wCE1L2pi0G^qIy9Km-5Ih0|jd{>0ke)(7PAX_50XE_f9(6&tme|TJ41C`N ztlg^MmzbN1>PhI~uHdp0Y5OiQ-htg_0czTUTE*a-4#8tcpb$g$60xoghD8p@ouIBF zsG|g0F9sT=hkGIuGG_}uW*r{j#U({~po5dZnG76dsYS)n2C?wX=pZ*0$Lhfx3vC-i zy{`ifWNbrtusWC|bHM|3*i3`eLg2tH%~1$REy~Tz1J%W#CKNo)!b1VFF&fs72B`rh zD?%=T$U_e4K`98~7I;GEl0dzxx1csu zewqfR8puT-(3UsII7}tc_%(wPE9j~{c(V;;3M|Ayxl#d~VqobKB%7O>o10&j3h9Nx zbD?3Z4x}`Ii-3+ZgIW&Cm(T%k&~e)+DGrqR5OD;$;{l#yKw%AT!D@u&<$z{-+)8tD zP{R+i3`aiR3^9TZEy6+WN9u`yxR9&_aba<^A^ySyT!bpX+L$2ih$V3lPoQ+Dkf%ib zQp**LFsso=3{O$`mu0pv)XJq2CVJOv72 zkS0jq4Ak<{g!eL#gA2)cZCJub41+7!!G@tgWdyneo!L0t{zK&MwA>6Ef2mrE+B zhh3bCR=dE830MjSxujTE7hbsNYbk(^VS&|lpnhs%P7Zh>GrWBUFWEtwp@jy><=`ei z=oAs80tT((N45vt@CLV>LG6rU1>eMydUFdj(CpE*gO%GvHy@C9q#e!JtSiHCFsOS1IRFY&6M#Gd zO|RIp9Y_f%YlDqPD~AOIzozE@a=WFcHl${PKmmh(GQoz(%L~> zdsEW+M1JNkn}OEs?>C z!(mk?Y~(#P1>94FtPRpp04@B0_NsIsYfeCGnu~Q5QcIG-<5>!BnR$shIh8t~Yr~*p z<*CIA1sRpanaQB_l#sQG;KhHiv35|~R13V)7s>YGd}yz$7_W8Mfd?L7Ik=TXKo5YO#)jPoAx6 zrj>$fG3cN;9dOkK2`UH^l$JmjS1Ez6a|DeeMWq(ygYU`>E-iqpq9?XZ1xfNKDIT=o zHopXNBP?j#1lH67`2pPjf-HwsuvI{tv{eJm3gdPy$p4@y)6@io0_X}l%zyydfjq|o zIv6&w0(s6Gss|J$Xyq2D{|vsaFS8hQuPb;I5>!_wBKZ!q=(q^JSq3%_2J<1vP!L9+ z>CuK9Pm46Gg|gllnh-!bK^U4K5L0LhP#a-0U@#dS^!a=u=E^`8pcKHM0U&sUsG(aC zjTD&Ro&JzK1TqCQ#+8=|+Fl5njRlRdLybWW4TR~scA(f*utiS#AY+hKz?Uv zsz4ao$H*#C=GjnZ(1_MXl4bCDIMOVGYlB;ch)tvdBiAmvS1;Radz0=jRx zxTF|fKEV?+c!fB45D&Cf3w%{EI0b-5+(AV=B8loKfG$1*t+IqHw}vhO1}Q@9P6AbP zkmb1`aY!``S!)R%umrDh2HzoBlA(~Bn4Xyoy3Do|aY{0B6oMTBZjaf5$_z+)Ls~up zxu6eRxS#)Uk(EX#tO?kt{JwZDVtMIgSFv1d6TEKb> z$XuOO}h`wPV>XdXh=0;%m4Y?14JXqAJk43b8{&W9{eA&?TmD(%4Ir;vhQ z*ABJRh1RslIk^P3U=v*}bQuoJAcR|>4u$7(Pz8_dYV`735p+p86p!3*qw?@~M`PLPFz~Y8l6=qr5qPcuGT95+y`54DUj3T~?};J12&vu$ zm)el>TwhBev>*jEMF(Da4Q@|D=O0m>1WU_MQKZ3gZO95NtWl3{3DP70+&=I?r7P^h z1DHLabb@IYcwipXlL0piq77p)QwpfXhjIiH(yB{^O!&wPsMJ78*&r^+N^r&n&$okD z9E0wmfTU&6e4`>txed|+!f2*|gs_-`+z5cQEHK9XK{{cWkO|;w8H*x_V?kLPn(<%; zB6a>jLWqhQ!~_VE|cR8vq+LK_o;_HyPRpL>)rWQ*bOONX<(rR#1nxDAg69O-j^8B-k^c z(0}Rdr+o_jg+7)l?F?IuCj(NR|1Qa zfR1?0OG!-um!;6G0U5Rd`xDgMg^GfPRkRd9OIslk3CfjFGxBs4(x9qfLnxq@bv$?n zB&q~>V8qx6RZt-}u{c{t0aQK1+bjB73PGS{UJ9WF3XqL7;CcyGH57s5pw3pXRlwL` z2XYyxK?zBmSh^LE_y^Vh#U+V(DTzfX@bNUz7T?5_6j0?4A3s2B>jdwVM6A$&2a|#= z%m5U(VeIJBQZPa|3{>49nSfHaAQi^YJOvsqfrcD78-bz#TJ|6qK5qnFl(#1A4FqO3>&kID&T!gL4KbeZry>lNU(ws;>o^NCUYYWFNR_Q#XJdBLQkjC#ED8K=ylK z>pp`*M_)^!7<8~6C|5-r>e?BZ=qMQJ+8LVZC>ZP7Ss-=}f)s-a0?^P*g&Pzo*w`p& zfOlsgIb1F#`<}kY!+xXXfNU$|-ONR3IO$ zS`BKRgPM|%CG!fosYU6j3ZS4s8zlf42Et&AwQUtN>OlU`R8Uhu-fNANKtYOYVWxwo zN%E5+J%Ica(AAp?ARi?r<(Gk0@E4^frhqQ6Dk;iODNRl-R;WrX%14wxAfu2H8ORAx zFT#_rKBOy%6o60_c?#Ot@;D@SV-zfqqz6i)u6f`CQ&3A3s+J0lDOsSaQb3lWWB}O8 z2@T}(0b1gLs%eB9QM3i67M7+Km!zg35(=~;0~LYbnhm4;gDKFqMcb1N4Lo>x2{Hm) zWokmT!0Rw*u?<%VnaiU33>N6n9`KS1zLLM}Jp@lqZ zg9V&aKy6zKs4A!?BtxMRQ0?I20#d-hEdrGw5FxZu3aNwul}#E5FX-Aq$BYbO!4oIy z$?BMO4T`zgYBNa2MsllyE%b6LP%!D*fs+KRB?wUr>m4b;HbNzqC?qO?w)(1&}e2 za{$1HhGXqpq7=>0qw(laoWiHIL6hO2aupFwM3<|e7A0y~iDD}9yjumVfekG%klSU@ z@)T)C9^AEr6h`2z0m>;*jW|jg1zjv17l;Y);tUj7h&~ha$O0$iQ|(Y15U>;tx`vJD zP7z936o=9l^!Indo$=sdRbvZ2m;roh4zxr7Whqz*gy>R%4=IKF5VjVlBwqp4Qqu^| zODq7j)pPR8Q;SPLhed(*lp>l!kYLruRTp3>fMld09u!ddY0%j+sGGny0)Xo;aL);HOdC8KL*0)EMo=#+ldN7AsJ8&B2Z`?WK%yEH z1E4gf0k7~d6PW^}*F$__bMK11*Vyr9B03(1KF|xY7jm zcN4)qTX3jm=A|QoHB$j+|0NT9{{<8-Sb8I%pu!VUh%iNK9-wDO>>-3TGeRpjm>DnMpoK@*D5rD))(aA+SFl&3&OfSTNt zVo;$8Z?eN{1Mq=J5ZfTm#=ag5bS@k6WT%b-sNsTG^Mz>CqnZr%u&siru?6hbIArrd zlVQarMbH!us_v5ELy`j<3rWrhKY=0^ zgEM-W<@&kNDEXUf{xjME)}Hektgtxeo!(8HK-s-0<_By zwRiyKQ&5?y1&Sm1Fg7G}f|C^}D?pd@fr<^#szX?E0u3TU%mw$}KsC34wL+$XjRMjN zA>`X4k@5@3C7`x9c=8ve=?h-GR|2Xr@*&5bLTl;Ve9+Oe;PMI-hhX>Sf;P6GZJ7iW z_0X_}t+PX&#f5IWR8Uh>fcn}NW*f2wkOiP51qvP1kzagUbUdPm)2-$OWZm5LN(pWI(YCt`i`WsVHlO!DqHX&#Q(;4rqi8Y0)q^ z3!$h0AIY4UgS7Yun0Im`oZ%`RXU5ps-1X&CYB$UDpRQo_80A9(0 zmY5+*W>D-yMv-9yyU=wf;Qc(HKmr+zFa|Uw73$*ybp+`p4yarJE#k1nn%lt%5Hu2o zoaI5I^pUB>Itp%}8As469GJ5}P6J^S=MgFlKpL=Y#Q_O}Gd+j_btSY;z`ahI!j*!E z!*bj*^HLO`D>I$3o#O^uFO`DQK_YHN6k>1)6x;9>Kk$+dV}XW(E-{OV5KUZ+qa(o+ z#h`KobZQdHsgGb8XcBXV+<~qDITR8WsTi(7&NZMu8Z_-;RR_yHNb1N-qtL8`Tou6+ zCuk54R81f!Qc$@BN;wb=N8krSbbcS2t86j z8&8e`wH2Vj1~LeQp>-mN3Bp9JM8fI-c#xCt0H|Bw*$P3{AICCZY(y?-oc)59y==1WMk1l@5}>t5ZHU< zW*)dHU~iF|dElmi-GVi!(K8QR3)o_;nFpo>-YmwFeL$@xj6GCN!-mK7@xPXi5S;sNi2(qU)cg>jY}L z7b`d>!{_tB6LBu!D;1!3ilF-uHf9SN4@u39N6d&JT#Oj|0PWjP)rGZ^Q5wncb}qED z1d0l9?+G-~3oSfhQo1;nnt;133g8n{52Ed;mahFu z(IK#$A^eOIu;Y?S)1r+H;9}6~9qT$NGSKTt3DP_N3QUGRa=CMdz|Hx7zK0Iz95kp)^|0@|Aj zN~oZv44`TsBo4x`qB5y8O$S<h00y>Sx{P1tdUfjhMb5Y)fVX3`jVoY)I4-)6lW@_8fc|J z&L+ytE762%)m1RmQ7}L@6VjLg`%K+HT}MG(R~=az*%^qG4G%2PE_2ABGwNz~a3Mr^ zA`#?Kv|NHHP4N`J2$z6N0B0->++~@XngX=EQd2`&D~sIggO<<=nhG^FsK$e=P|(2D zumFu;5H=l4T|mA~h9El;;e=W1z`CYzKVfe_)sA=N#$h5&L30+|KEARVAw1Ku)^O%vMAd5|6$hPkC6u?W)I(os;uwzAqNRukeV zj5Y|&Bp3}h3G5scWK&n zc6OjsKM~i8XzD0{FG+#iwu5rx2-;~opr8j~nA^c6CvqDamd+t3g+UyKh-7%WLq5*} z9;Vp5iChAMEQVpEB!Nw z;E8+Cwrpr~4;&QK?MH%oiqOL^b5nCQg8Y5KmovqKM&3#b;vvVgJAb)rr1LCpZg1eWviV)7Jpb#)a2it^Ko5_1(m zp#lyDu&4q&9uavG>@84MRnSl^*0fSkO#vNhmr@KWJs_7sg06ql z1h-hQyFL@eea%O_3f2>Xf1u;0V!LbgG0O*}qDTyVCnhN-1gPc&pnQ%Z$ zoZM4O;*q=uY9q#j+L53t1~f=VxbDV?1nBW8(1V4FQcH?5Q_E68yK>>T4k{o#4+=fd zE;CR}K@P4%at=6r!D>Nng{LLt&;|uEN{E95Fx&(-102|3`#_cr6K#n2R2K6TjG{LD0k(EK=0m2vt!TJRt zb3pck14I>c_XqSu8C6J|9>s}hbs3(j418}M{8~O(l%aSYH1vyfM-AG!>_~$cM1=<= z5FjA}D&t590`Tdm;6?jZ3aUA!3do_L3=Iaz#075Wf@UW`!3fzl3pqv}qwdESUWl>~ z6kV{(7eE1rd&C>05`-Z&A=n$>L|gN6!75&mDtO@QYbk&yD8S=mpnes!Mg)(3 z6+?#0z*8P6@M8~C6f{6{2S__&(aR#j3phau9y*{%=28`~KXD)FgvIc@M9_WkSR^2g zJskzuwQ49+WuRRfphcJ9KyX1!)uceqdIE)nh9>HICQtyQ-LM7{f;OGtK@SQ8&`klL zu_W-;Nwkg=mZYvwT#^DixEfl2gO^1?lDY<@DX$M{WFzN(@SqeTRbkkSwWEkokK_`N zN1#Ek03T04UhoO>4J`kppkyCt?m_PUV%SS!p#riD9CRoK8N`D93vwz9V{>w95p)GA z$P|*CjMCGk#K~}j(3}iSDj?URcDRU$3G%!JPJ85f1#}`6sB{9k7lgq{oN!SEAJ0ii zElJGGNd;a10_oF$t{ns&j$8!3-vec~2W1QobAkrs42*&fl9EBG9;J^(bhQFm6l@4? zIx5(L8j(qvCB@*zf(7W92^3R7E&v4r2xHW=;I-44#R`de3i$;knYo$8C7H+>PN>c&i zQf!?v$ka2mJcKT2&QC)LacC_78t@4!{R4u*QO(PxoSBxFlA5Lf7USgtb%~PmN{ZsacdixW7l6AYAj7~Ht*7VY zCne@6fT!(Ji$LS1kO~eIeo2Wrprgi96u?@cmkQ~Ft}lVI6$%nFi=e~)VCz6Z3o88+ zlS?woz-u2tVF62Eyj;rQ+jvFfz;$>|tbJSRo|Pu!fOghtQNb28J^Q zA~)7BGCU~wz|6pKp+w}x8b*dEC1*gUmx-KM!^m)?tbl=GOS#B_HH-`=%0n0!=2VF6 zSi{J$p<)6z1H*x4MxGxadzu+RM&D>*6j`u_k>O1X;{;v?hCdS-MJ}viWSB6C@c=Ia z!-e^bA}c`V&u5&%#=!7nDWk}THH-{B%NUP|QAxE}i9s2pPDwRc34G)>D2J4%LRu45O^#12Ey>r*Py$Qwaxs81SY}>{MSO_@ zLuy4yY7uB{Ln5f00u@Rn3Jk8f1tpaVV88HkF@VM`z@0_pkqrh&>CXVpL=2Gp!T_#> zL4!05`dW^lt?W*fVE^Uk=V<9eG(a*rgFXYezXvuJ)CbjIK8q>wGe)QrPIbd8|u1&30sX-@&kCU7zWclkk=nPc-F)HWp@1zkfO$SyvtVOWdR zlhBln-AV-pMDD_7H7pk@pyWbuCc~;cB{eNGFI7QRt5{W6t5`v`7?g}uGc_5&n|wf} z3as?;E6q)UR({X|13b4cEkfUF)LV$m` zYmkDEzdM7EzkdJ&XwHPe(Zz+qH`FJD!Pn85!Ph^`l_5C9KggBA$KT!4nIYK2(=CL- z#WRe-)6c~-$kjQ7As{3u-qX)Bgu&M{*qH%bs>OqkLylKqfFxuFP!EX##*4>NB3Of5 zsh|LHrh)=CCn_j_+^C=ca-@O+$R`R4jxH_=Ah#;`Iyx&TfE=p;b}UG(yQi}P*tH4@ zE}mfu3NZI7z}%~#0CKPb$XTGZj^JhiQfmQx?G!{1x}X!nfs||zHiJuLUc7H=ZoFq+ zW{Cof<642niOr#L#@yvrW9aB=^Z2!^{1<78l$fWWkO<->g1Ct#iFpbj!U(J+1EeNHp(HUcLqQ=eH$O!|AvZHmAvdu?!8bDx zbOD8eucsgAdRVZ93c-a%po|LQlqMFXDg+losK8LiAXfzi&C64HECHq z*qtC(K`v%A0x^x^(-aiq!6!OEju{2>iwjE=^GX!J@c?oKC_X?gQOHe9R>&`Kdp%1!r2XuprMxG`YLvns`Njz9KCqEs0n@@g0Y7uC|WHCq$ z7g!3^Py<~sghdK8u9pu!e;!3rLn*%iyoxY0FI`EKi$Mi!4k$&b7At_3lqfjo=Yrap z3b6IgdZ0=M()@D)RYsYhrYg8$0hR$xWGR3Ofy~65%qmFB6m$w4s0W2;v8JYg6$h6V zq!y*+l;)QfE2vwmD?o0H#3HAmi7E-U#U(X4ClPvHd1ju1GwAq3@P1IR*`PKf+-V9p zodCT`+7X;=LW@DwBdArY$B>?1lFyI~U4#YlvxcSuxW%df8tU{d%_+$&$VpWIpIHSS zCU>nUC`v6Z&dkpP+Yhc}!8Zqk0|&PY9CMR0)4@UDoS#>cT2TVFz#kgB3hJuKpv5t& z#p(*l8Tt9esd;(~PMIYNj(#o-P*+rfoad5RmI<;PbSPgUq%i`@DIrCv;67_&u|lE( zOg+Sb`6;D2`H&&ZM1_F-^3)>G)Qb`5&RT>Pb+BD|De7Q7>S_5!>fpnuK=+F0q*j2A z2~Ghg0Ugjme+ug0*+5W7r?@0F5fYQ3d7vr3%(TqZ6ov4_BG4gcdJN#*m7o(8z!OBE zjuA?PG5F-Enr4Cq$a7SUGZl0h)Rpu>zI63>QwRbb9+;Y<0P1Xj;tLcXu6f`ScLPiF zOHvgyRFgG9ilN?3g(c)X&|$qL#R{NO36vh;R~<2EVHob2SDcxWs-UEr4CEK1EQ$w)2EECweKh8U1iXnqB+8-(OM zP~w4&Um$#2RGe9r3h5Do1}wr{gMvN%{TQl2W?;3>sR(o`6UZ=-l92rD)I5cN#NrZ= zQ`A8z6MEzV!V2r^S_XTo>ROQc(7a;Uol*)Y$r=>v&@|7WW36e$01jIPbscpESN~v8 zi2%|LvKE|sTq{6_rKN%c4xH^kvxq*4NvSy)(y(y%POU7@FG^8Bj)ZC={ipXBLAtL4XDvK?8NEd8N6ab>F4QB?_f^ps`$+)a3k>)FMzr zu_RT&H4m8w?O#GW>fqjw!T`4XRX{DHl6YuS4AP`W3>Om90YGVO!#Lo!Ffs?;5{5VQ zN8A4d+W)G>3OGxs?9>uSVF*I;1cNeY z_79Z4kgL&@e0^|33*36kFD-$bIS5h(5r$WliAlu_pxzZjZhi_wZelWsqX6ne6{RwO z`cJuu6`*tm>f(WVc%Y6KxSLpzU(TSRsRJ_68QgV9gS28nQ{lP!MW8!_67v*PGZn%T zi!u}QNstjrjH4JeKbqqE(40d)5 ziVVICx^@iF46zKZsSJLp3_c|cKB)}uB@FJV4AvS9)|w2O)>hTEsSKJ78ldql)nWx- zxV@k~J1MDYiKRIu47Q-A2GVdJcxV{k*cpR@Hn;(#fmKmv8mRihCI#wjD<~*nlhQV@ z#yVh#ZNL=N%++AfRH#;f4uXM~my{@givqCY!74!0<_JX!swvhASgioX5UAt=9ZOk~ zSdt3vt6^(0F@Sx>0GUW*$V_7Zrz>!(OU+9G@r#P`ix>)u64P@N89?hH7|J1yb%wP3 zB8HTF25{11fOJk7K%G+tSR8=bllf^3;0;0yTnY-%0Y`8bs2J9(gPrj0l3EN}EKmw^ zDY%tt1=0eZB~b9mOez9(U_n6u$}6Bln?Oe%7o~zHN{~B{U|s&;9xZ%elUQxADF+2& zH3U}{m!#%WK{knMI&7q6~ak71ZCJ>3R7@sVQLZ`X-iSU~>e9snB*WQt%O> z1XKxPC?s3&B4Nx=^_ph)D(r_{L-RiP$w!U6=EuA+6qYtG=YHf9{7A+h0wfA_`DZLe`-1?9a$+T zLr2EJQ48wTfTm%=gBj4=fm0)R?oI)9{+2;cPtP~CxHvIARUxFPG!J}^oFW&4Y6?S9 z34?P{W(jx*22%Q4DTL;M4(SG+O`8nvZtFuvhC%0tr-E+*Q{-aM(_`QY_jOhX0S!%Q zK$5#-X-Ph4V{0|eD=7zcdoznco4QLD(NXehHXF#_7fqOWamJnz(LNHU!+i!nwDAwiV=vxpkxdh$4UVwC^iF~}uY zNso)mF|QIl-~qm9C9_xoC4@ou>Xm>(xS%K>5(41c5Wx3?<>i-v29lvY=AzVG@R@R; z5e2ZCJm@WvpyoqjX-P(Y5$N!_A}*}q2a3^@)YM$iMdA67g?hP(DX9vHd6f!9si5Jg z)Vva~kBb!&i$S3QGPbxhvm`MoGbgj864VI>y9(xfF3?~KNP9tPQ2}URJTJcpJYJHK znv(+R5EbO-6=#A5O<@XCQqxkCOP~h?AO(b;LWqZJkgI}cu!5hzLbzj4kfUEnBshRW zJUoLHU;z&bONc+M6x>TI6@oHBJC9Rz6vA>6Q!;Ziixhklb5is2%Zjrr6*ORidI&*> z(BO>JqNJky{OnY{FDC8Gqrh|?j z1Si8{kYoy|wu4R7gH(a?3ux^!ST;K~wE!fT3z^bK6m4Lqg7hPVKl4~10dZH|iILMJCPH?ssZj-{HSkeUZtLSC%M#egVv z!819kSj1Am6)NbG5wNUZK4@wOGHwN`m-JmSi@;+?P#2}9C~`5lWEMe2)U9BnmBrxU ziqgE2)FRL+{tT*Gnc!+owb)A4(6Cs+sj?)sn2Vv90g==|A&Jx|1vlB=o57%~n~|DR zz);3emRgjQU!2O2!hn*-7;+hk@^c|+Ix{B~wBi-imV^W-s6mhln!3r%1&z;uuIsx#C!GS_4^V z2xl27=;`TkfvaJ#T5$d93%bCq1e8V+VL@%h1!{08fX8xmi$P}@fCt3ECjdYbG05Oz z&;TUNbD%>~z{3Zi%niPjKt~}}FI`VTPd_I!DLyqXSwFF;D6vvYFBxKb9{9rGOlY0} zpW+U!6yT{*K}#D)Tz1|3ek|15o-mR^i%*P6NpW^Wgtmt zdV$MBTlbJ+1Tr-Qic8o@8@Z6?PchVpOpp;Ed2n3ES}A~{9BLDyi~{FqG>9 zQIct_l>(SwQUp%jVB?^QbK&s?(giwf6%?eP0FSi-l~M}C7EuuM6cj*xhg2(ssl^$f zavs$K?`5<3yp_9)UtBotUGtmNWiP}M4C zuu@PpG=P>&3_7Z2dWLDpg$;v_f~t8jxX%fm(kuoEn1RYUaN(+2%%Gsa!NGucAPqE4 z#!#LFQ{)etO;;^eg^aR=gPO>B=`cwUHx*RXD1lTcG3bM`E5vs&C1CwvGZB)>h}AR6 z3`KCOf>Tqo!NUpz{1YJz{1bKz#`AU5F*IHz+%C`%&^CufuVtcfgyr{fx&eh$TSH5 z%q<26ovTa?OCB*WxLjpo*zkpc;louXh9h4Y7+9_`F+2!kWVmsSi2<~bkcYvL;Q|9I z0|NsC^8p41hLlnU)`T(!hAs6BOcf0b3|D#?7#B=nU=Wzh!1iJm1KWdT3=Ch^Fz|4! zW8m&!VPptkXJirJU}R9?XJq4$XJl~EW@PfvW@Nab&&ayMfRQo4n345{86#7HIU|FP z6(iFID@JA>Yeq&E8%Fj$wv5aQc8rXB92l8R92r@jI5INTI5BcDI5RT7aAss-aAjnD z;>yT!#Ep@$!JU!mhC3ts84pHI2`@(G3NJ>+3Eqqh4StLqKN1-kdXgC#bttU?r8S|n7L?Y8(mGID7fS0vX?-Yd z0HqC~v=NjxhSDZb+7wEgL1}X+Z2_e%p|lm0wuaK6d;{{oEtGEurPsU%#k2s!CMdlV zO7DTv2ch&aFbxSMkk&I`z5v4|D18%3-viSKbrAC)zFWx9z_1XcnSp@;V!i=5Z!fa)XFJ)+8SPE7D8A*IOLj%KdsQ53aI4GS< zK+H)1N&Sb3TQM+jGBh|q(lG-A`v*|?K-}5K&;U{k!VI?`LBv6NqZk@M`339;KB#(- zxHq`e0kIeu9w4drVQ2sqM_>tyI|y@Pk?(tBF_B|LMK7_{9r!V z$WdZ61V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ON zU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(h=+i(GUVzb z&`E%qd8rJrJB74$we(fh;%e$_>=bS7t@NUYxIagoKNU|{fJWMHsoU;y9E4s$ar zjKRRbAc4+yU}IolV1|o=?p9}FVqjp>Vqo~|#lY~ljDdk^4g&+@J_ZKH7Yq!HLW~Sd zc8m;6NsJ6k9gGZ2^B5VJwlFd3n2s{z=^2|Jj`1ttbip2Qz(!`>a z_{8MG(##@|aY%wisX3{M#bCkoii-Gx)S}}2yu_T$lFIlp1CajWlEma}kg@S;iJ3X5 zB4BeNLMf?5MFmi1erXAqS(0B`P>@>05T96*pUDuPRFztk&k&!Sn3I#A%n+ZPlV6;g zl3BzMpIVVw!VsSZ7GQ`^OUo%O&R~d7OHVB+W{6MAFG$T}h)*jh%FHWC12IZVk|7jG zwkS0*g&{tzC^eNKKCL)4HJc$mtt2%khao<#yeP9Il_5SCYF}<@ZgNHuLp+GiEr8Gk zm0&tIzYL@>HMcmmgdrYeA=q6oD+@|Xk~0#E7~%^`K`tsR&MzuqhzHpWR#ub>wV^l< zrlT0nC`l|~0L5H#VsUCR$lBtPqGXsD$T=WBOdRAK5Wlz}53DH%`=B5S&7#as878R$)2c;&*r=+F@8^mWauzBVcmlT!erskCd7@9-mo%8cbQY%V8 zYLXaob5nE6^NUiFa|@s;wHTgu8R}UWj=W}OU}4xZm5qUgY>WY?bwj0`Lc8(uOqFfe)MCFhi;q{e%sCZ?noVbd89 zkj!uw8Z=N#vD%Q8l*F)=g@xh4T2=-Yh7+wIo3<`}vp~G( znU|Jdl$%(RnV(n2(8J2YaArO$0|Tca!z@N4hWTv9Mu>2Vch1i%E{S(ZEJ=(H2=e!h z4@peQNyTP*fT3YXyql+wYrK=czjr1>Kc`7%Nq%uaa%LvOR8CWdg`8%foN4x z!y0x|x1!Y4c!sSUEDTfTgOY`7MM+U&a!GtxVoqslyjxLzE;yAy4L`>QRu9QOV1LB> zrsn1sRl@UJNKy_cKQSy|XJOdW4~oc+g`l(xGdH-TC^Ih|-Qa*^hGpzvqdoJAQ;SL< zVFWkZ1SSeKd@%Yo^6~cv~3OhMj7|wuG?2@CP5~5))$gTtJU{6D{Y8At5 zPH?&bXNO~)#U(|V1p&#)3}-l57~ZsiG+bE>A{R^s#X)jjJ}7@*;>>|C-hix_43h8Y z2g?_iCIuuXCo_EF%t_5l0jcfhVqw@Z1*GK23|0mPX17dGZCHghnK4Y|3eC&ROTkeT zGCbr0C9hs?7KS;0m>5_XzDxmGnwp$Z1ak6oE=19i%h1lv!teo9H3tiqz!NlGOMN zaL#A=z|90I^qJxru5srkX67+8@~|-MS;NKvN@WHH1_p1gGVWpf!}EvniqH|pJ5py@ zKd{{3{~z_^Do;tS&$ri3kwDIZvWs7+yh0BQ*)u`@96 zF)}b@Y=*QW`=I%0=UvM14SLcA}pKukzw}tX!Zb104Q2v~E5PmO| zzvB~xzZ1$o62b^>$6kQ((;$2nPKfyoIS{@%l+RKO;Wt3}F(nZGQYe2)IfQ>2%1^0) z@R_+F=J8ZR_!dz9lsX9C1IpK_hw!VR{5Opd{sJgprwPJ80_AU63E{ti@;z2V`0U&e z`!v=<_^Kd2GXq1;RtVn)%Kro9S3&t@J0bF`p!}O+OyKaj1>&J!L z4+8@q3j@OkC|?-LXSoJZuLkAcfbuOtd=3VNAB@ak^TVNh111PR56X{#@@t^{70eL% zBOpE}0|SEtgntFZ=VD+mfbw6!_^uFnQ2OU*WMJU&hxkvOfq?ao-)N`PNW=jR!Fmv zlY#mt1j_e;@>`+&C66HHpM&xn`XKsmL-_}qA$(AK2Na(fJ$+2eqm#U_{U}%#63K$;BW#ZbFdl( zG`;~E-x0zGb;ZHz!_fHIX#7S9A8!6+H2yL){zf$Z9yI=OH2zsM{uMO-9W*|uQUoa5NV0eQj{{@Zz2aV6nh8kX6XnbKbz7!f?5sj~b#@9pRo1*b;(D*KBd>=G^2pT^I zjh}+X&qd>xqVem{_-$x>P*Vvxe5azx&q3pZ+RVu6*P+SpK;s`o;~z)kUq<8KM&mz5 zA_D^hsBTJTU|>jLU|>jPU|>jNU|>jRU|`5#U|`5(U|`5%U|`5* zU|`5$U|`5)U|`5&U|`5+U|=XU|=X_U|=X=U|=X^U|=X?U|=X`U|;~% zag_`V3{?ya4Al$_3^fc447Cgl40Q|)4D}2Q3=N=ij)8%piGhKknSp_!g@J*gm4Shw zje&uooq>U&gMopelYxPui-Ccmn}LC$hk=2imw|x+R9E&hFfdGDU|^WYz`zj7z`y|V zpB4iHgFgcULpYLOqoDqcVPIg0Wnf^4V_;wyPJUMa4dEFY5E^iakB>4mK=gvK^>>pX zCP7Cr5W@~&t?+&=Y?uXA6xN3Ti5i0YR)~QSuo%=-q_GjOFy`yBR)RL$I#FXG?fM^x*%g|=wqx|Spk`#OzLA~6qK5qUzQpl zTw0J?l$KMPUs@dR>K}}=Zt^iS1)J^(8UxHs%S?q%72vc1>Ke!ZK4^9VHpK!R?#;?H zH1YKhbB%ZL403f2@$~ltJIv77J+&krGTd5OkQ$H-7PWBCFUbeHFB#oJu)L8G*m16T zDe(bCsRc#($?;A(`N`Q>>;#eqOwDMq*KMfLlN^$Z>}8uEB=!!G`hZR%T_P2P-tj4Go<0 zOY=(N9gEV71CoO=G=js$2vN;|D-+kelA_Gi;&^A!3|ARwW(btfj7$-Yw0IQH7-t1| z8ye*o#21z3q!xol^)myKz|&Ir^%HSD2Xot z1)QNVrjQAykU6H11%{B3F~~VSM#j$hc`2Eod9%F4oOqYaqSWM)%(B#Cu&kk(e@RAa z5xTHNc4{SPW)iF@%Et()TY*TiSVPgs5EhE@#i=ERpi&n!3C0i~@0(hbo|@vGlb@8B z12PwduV-Wqajs=5Xa*-fw>X`F;nzK$0}Kr8SCN*Di2S<8!^FVAevpBQg@J*I0W`J* z>fVC7y`W(oYX;^;4hl@5k!28<00vDeK$I|+=O)LO-5m4@`ulu9M@S}zh+ZJ{;`*72UxCOyqL}8AHn*+W=l;~>#e=r9-TVN zDV1kD?D+ZHt0nf$i-nrpZeDt$@JC+gPnyk_^Zop3B}moKY$TXS@;KM1VXSl>T!9qU|y z&@GAUma!gB=ihbC%CdJ~VyCB|+m>0bS?^3X@2LOyT}oN6{-c0`Wzu{Jv+o;b zh-QAtRCKtua~h-Y{kw~8|2>tOrI(eLE4TmV2_3l;-I~P*bwik%wo1yqHeK^|tKiKI z@vjYb|I+z=s;X&8*r|kh>{C|fEHmRZz199w=D;IkgXN2MRvx~y=+sY<2(vGXWi6Ng z{CMkK@b^!PZyR4cV$bjR>CD@0itU?IdJl`dSGqmr1;fgtrGC|pON_PoxMs{u1^v$Er8X6AkygLv_@?Bu2-y7n9fq^Lqw+ ztv@*xUi9^9yM1AE@w9jEW_{_KTlvm%_R8IE`NA54E8@*G9=~dCJ@1j^dHBttO;WYj zUs^N2<8rGxa;n0y?jGNR#02a7n|v#$T37zLq0nRB{wKEQa*8&*0kL2A!NgN0MNm<4BVd)Kh0;1a+B0tJv5}bPdgU+TBH7o^?I#QO*i%8|(5; z=gpga-TQXT{BOS1`}MoliT==yeSUq~%}>1FzHhagop|r*=ViX{s#fgldwqH8z1v;P zMjHDMFOYlIrTXUJ3eluu%U6GWWSxVo>bq93PHp^eS1*00w|lkFx+Ckp?vkEjuX}J? z*!cw;PnRlcZJZ){Z_%$OQ=76Yj_dsr^9d}e^H+TL$6d=xUv7S!QnEt9r^W15{9ok@ zjy=phc6@8K((mX$)%F@KuAlV3rhmMizHfHUi|Sh*_T~>=F5F#x{G`GXW#`3Bu?|yT zKRb9)wRzWrE6r|xY!VOa&mZ%jrO@JcV8MDNvBk?-`YJnqw9v6;fCWU7I&#ndf=j9RGK-h zb@_W!HpNVf2P-_+O_T{Peo-psJ@3&Z-TG4#`#ObZoH~3>ca2l~K82#Id8uc2H9VV~ zC)lC0@Id1ey+gZZgq}P5U^4STn=ca{9&t+4f5qJQ=X0{*UFCfzUC#+g?ib@+Sr^@= z$l0Rqyz=GY6>To8yYrML)gL@nP_p|%_rXg4DaLP)$W5QI>c8o!*_tKX|7#b%5|Yd} zn0ti9nu*Qm*}(&k)U2vo*L%*Jm-b0duqXNH{f(2Sui)OUw&}SBv*^?`vpern=`Q&VHezWvtW=wHYn)xc>iO;E}{Ig$747ha8 zcFjjZ`YDw^mi&T8rZ_9&*u#i}t`E;i^1L#8|KcF`Yr!pEi9WqbCAPnN#ePl-e)6e- z=azQ3C+C5<`LXNmqKp>3S@pcAt7^vgOVNpcW*yuifbM)g&j{DJfjWMqH=W(GS35U)WPBH{p{7!txjq7aS)g9QUGg9C#ig8~B^0|NsK0|Nt0 z9Xfr338Du^b3nKZ%usz2AO-^i13E1ORR^PCwu5MpeNbr(N`ns~1fv-QAbgNMRuB`) zhl#`JqlF+z1_l@n69?%7+cyCs&wxf-m_Wo~G_pQW*qk^6kw0+L zn0sL~D851F>*r)9nVIP4r0C{k=9O0HR#=$nnwjVo=j$1Pq`_$(WCtisx%-7OFflM3 z0J#+!j9_^Y1_p3C2gyg@EEBBVnv`qsrtjL(g$Mh>k8ZgHQV%i%WG6@s$Y79uXcU9E zVEv#l1gQb}Ux2ZZfkA8n;jcRP=6U27=#d9II9+i zxET&{e;ndGIK)F4u-n^!L;O1qa}sfgOEF@xoH*1o;}9>xA>NI{{fao$JK_-E zgu|U?IMmzV5RbqiegKF0892n{89>Pko;=`;dpOje!VwM$INSqD@1V2`HyFyW#$m5M z4s*8Qu-B7`fk6psCNfpbz`!8LAi;10TAqUP6G&cz2_!DVpzr|1V_<-lQw%woNyQ~8 z$=ceWJa5JjAD^C^pBG^RyS`^~zoRgoI8j_fllM0c; zE)x}8Vq_2>Uy@OjUml;6nwMUZ5uaLAlwTC!oy-s)6!9M&MYc+4ax*D zy@N|ElM;(FljAe{U0svQl3dFe;-m7)bAv#tq2|Pw zfV2mf7@9z}rxlkJr6%TLHN)A^HNYEWxN*E^esR2iL26!Zeo89H1dx$X6L2^nuLNv= zaEYNg%!5gZDe;LpIr+(D4Ds>F6^Zdlsp*+{@yUrL$r%jsQ7JhAAc^#fiui)mqT>9# z#GK5M%J?z^kcC7#*~JiSYhHOS)QX~1X!wCGOwCJyT9=cVl%AX%Ukr*(Lx%X!yz4dPar}&JhugPM-0G zddA2y5O%zgo(Y^~q-P3B$4m^&49pBHV3L^u!~E=L)F9D zQLucP0IFme7#J=<^EFId0V>Xcmak#_8}~uBfn17O-aSAPmw+e%lP{3OrNJT);scU6 za^?F2Nn9496if<0-2*Cr#K9sE0#+`8+7qyP9VDXwRSyzJF4s7q=Cd;}fWsf87K8iG$iBFmVecagdu};tojSu($!q zc_4{Hn|vT)h5#gSF0crMh(HqOh6sVl1SD}Dun2_6KoaML2!Y80Bynh00W4mDB+d^O zfe;Ny;-EAR5oKWLKoS>(2{JG+Oh6JxZg0&%5{GuJz`7P7i9?etSbPPNxF}czLTo@1 z7lR0a$sI`Il3)=CaR5nN3L*q1PauiQfkhz11tf7$TL2PyzDkWgwgnDmXs9bcFLk1;(eBhHyTpp!oDs5zYq{5T9NO!ug189F52`3Wy)1A$Kh z8ebHR&x^)qMdSZHgKFMaH2zyO{!=vmT{QkxH2zsM{!ujkUNrtzH2zvN{!%plTr~bv zG=47{zZH#Ni^eZSFU_9n=@n4CEM>p%+(~!K+@&7>@zq|_rTt6s( zH`x9?&A`A=svYXlY`X}=^yqwA!sF3xd+am=!;8+p|Np;8`Tzg_G1jZ685kI25A(~T z=zm%M|NnoGL7^Uma{n0Jp(e3)7o5AuB|D*%4hha*BJsRIwFflNA zbnZRz_y2#7&aDUj{{Nri(aoZ&!2l9=ePMXOqq`R@+1vWy@Bjb1Kt+N_=Q)qg<1Z@z z{r~R)5%ypOHI6`nCV&6`Z#ht+||=@#&4ekI}2E#$#?0VG%kF> z<~I%=owX-CI!g~AhxiXrh`XNf=rwhLIP66dNPnm64Ugv98w{l&4_r72@<1p^kt#$H zBvdQ@{QnPTy{usbtGMCO>w3+j^WrX$U-p4&3y`Y{K?b%S;Gc4!r;MLXO=Zm@-} zH#~YnA9(auad>ndL|FRb|L_0*J(_2{MuwY9we>7iQ#6kdY>EBSAjl-|qS% z&6dHYOb5i`-+sZPoAuHOP_{HZP>B?8bs)!s(^C@z*zqs;w;%9eJOJ`;5XkaQ*9UMD zTpxIJ``&;DN7C>A|M|CvzTn?}$;0vj#EI%2-K<$4dpZy9(ns=j9>|FkVV1p?0DHIF z^#C;0z2{(Z!|2tjJKvkcCtA;u7$O9)p^63~mz4J7s8!!6_CLIt~IJ-3%zn&im*8 z|IMyf7+*$!(+eaMy8Zb7zx4n(j!M)#x>=tcg-3RDIZ}G>`vHyY*R0??>(LzxDwbp* z#S-faxgVemcfsFA0@L&hxS$c?XF6&m$l+ zQ8Sz=NL~RVe-kRNjby$nNFHkcPN=*&l6)vg{=s)p{Ibr3$_FFK=Yr%9eEK@yPX+NkdQBOSlSc73m}kB+g9^&l0+3rekH5GA@>}mzFt;1xFGyYa_WS?;%^w(B z4wP^~LSZdfqw54v2LA`v6*|GA8{%<@7Bf)dMb?rB($Wp_cdzMeNa}d8{3|G>wPt`^ z(7YE!F_eN@2K=6q?0ksw{5+C&X0*5W}Klj|F(`Qf?& zSV!lDgAbS(K}6@FZm?SzFLb)zfJj2D0~RIMNQjVCLWcq1*L>W9NbH+8g}aU9a$OKLPb&H#EZE zaD=&b9(3&d;n8b)r393>p{>6QpTVV*0K{$02N;o@*Lk7!K&evmUQm!QlyIaqg9DfG zI5>RWfwRDhz?y2BB57q+?CdD7HJj4#pL$5=Qx0=Ay z8Hfdm_~S2%*%0ZhM6-J;LJn+D4M@710c2C8733;Nx_t`H zpwM)1{KW@m1_tzIYS3$Mcrz6gvBzI5V+F-3LJ*wQXS1LP!i}5@%7~rdMq=5g|Nmbc z{0J&eV}BqTG#-e)#s{P(E|Ms?@^JkDD&s5<)v|%QBd=LNT@xhb&2I$226ems0C|54 z69dD9lZU}0AK(rRntTQU`6K`T|Hr4_iW$H8?Lr5tAV2yIxt@FIQW3sgYiTx?li~%YBYmv?L7WMgbU3@un>XD ztKpOHhWfl4;c6xiXvB6y!VJ>s{=f+;&>%VF&>#FM{2xdy%n(?}Ge86IGe{EZv`k1= z0hI^Xa@sc}rCj)Y(RuuZ3_f`*zGT7b%V$V7+7R&N7m!+9zI+LiB+i#_kd%Vr6<^sQ zM4~U5LB2#ufgk~pyHFzcG?EjR{su=bt~j{`Qi{vh=RuMn(>ss9h(wE9PgfOFpm545sy-7B=R5W88fFFbk! zIFQWy#f{y(IBe!YhVwc@UwCwb3g+W4?t*lK(ts~=$tcGI_8C0kfFiQn^#@XX1bZ~U zkpOwtqqFn@*f2<9cme9;f(mOJP(u$?zgz{o;4>H0*TXP)6F+u?54->w3^NxqG&_&KmBdaAAm5;*wHlCl-Jq%-b!_U>b7bFu>T$F@ z@B%bV;?W%n8qpGgjWFy%(FGoaKucj69-Xx-JUUAkcyxx&KsFLG%C*9ySM+@bY(TN| z_=|shpe};z0grCi6`*z^c-RTV1jo$LZZbzK0>nSUU{H^9oe zLt!IwnxM1+8`bJ`-Qm&gIs+6T++fQ<4W}C(2OqF_fXWBg2Of-|^tl3>IHN&bi{q}4 ze(9Zm;BoCju=$b=S`64BZ#ARcr?520JUsZ zfCODob&7*^f(qCj9^IuEpgLDTb-vDrS;&j3?Ey#uhJ|-Pq9AV~TX-2f#1D7sGLRb3 zU{olwg^NI8pU8*s>@+ZPlIC!oOtT4@4yTzBXSkM1A=5ADzs z9tVH1cy#;1l*ofLf}=C^fk!7K1iC|afXWFE(5NXmVGsjAL5{6Om;{kVltOg$+gDJXf!r^I+D)|I zohRuD-OGf_FEam03^SmrWjC-4Vt>+1(mg+9F5#^z|<^&TyFm`Jb<+- z*!U2+0)bWqFc*MoMLar8qL86cn6;Um8Ui3Klli6bzQXl*xQay1QG$RSo zgIQ02>T=``IW%5yR~Yj^6$WVA11JrGDvSyDU=@ZAc;*IMG{cMomwxQL$Tdek$aNrF zeUWR9Y>+6#&B!$e$DjZIU;Mv^s5y-9!)p$U`~UyHXa+k5wdMeoV32;#2iQParvP$A z04c078hPLWn&U5;KuNe;0I6RA5y5QhvE4(?s-V0Hnui2WLVI+E?m*7%;8t2Fs5N#1 z+Qf+PpyuFf4QjiK1JWg{o5!qz1!6UXUoL z)cu56>S}@w0Obw3VWR|F~OL9v0gH9ieg zxb`qW7QBH9SL2(Ydx-9;Gq#v*#U0nf=Xf(5m4^YfRB}Q zhJq3`xKKF>E)qb)8xK4>kL?Gw-Cw+U1}f_hdUP{;bO&>IbTWE$26BMLH#Cs@2_QT0 zx(j3{{&Ly%1Sse;K*cS1gayo%eDnXmhvs3A&RgKl6?m~%%K^~(F~|y#mDfS@HW00E zUxQo%LhCfvjog#0Eg8LkApv0Fh^t{JvmS;f%{mZ&^{Jy9MBo$J;)?I z(kvKcfawKzR1K6;I(;u7*QnrW7f=@(l!%}MZ=J_qsDdi0?po03iVbXZCGHxspTH@Z zK&tEn84POK9)H0FG7y|BUVu``Z%_r@dEBEr6jWeu z1Y!cb2*GXFLNt}2f&d(?aN9wt7i(#A0=2XOElhq<_Xw1S(MlVSZf60HPDcUsQU_!* zF=dJXIJLkFhPj||4m@Q_=w(EiQV3EDPIus9A_>gJC{u2N2kg=>|CuGSUj0pl$;T zp$=?IUIYadJnld#f?y5+by>gzl_xw9V{;%jsD1~H)13e%n9k!b>_8TFf_g!q(i~j0 zo&b$rf;*VtY7sntbpkx4(t3cur5Bv`KuamXQ@tPw&?;Gv&J*Ct<`dw_X2@UzNKU{5 zJcteMHJt{fsQ^%Dg39wl=b>2+G_&4${Kb8cOF%XrcR)B2>i8F>7Z8o6l@~ze1-S9D z?!y27sN<|9tS?@I3`WgG@bnIu{|gjH7NF${9-W|}@X!;;DFD8@hn;$^k91Rvd=+RvZT2*_&qZ`~3 zxZ&CP(-YF54FTER?Fwo%L59FfSYP;^12wXbSVSX_21D~1C_Yd_Faox)9Mq@x==9y- z)9JbbGbBO1c-TD2QBZU>A7BIp15%iPhRZ+;xul@#9+VlVa|E~=^x_wt5>jfq8UQi{35C>}l ziI;-JA;AfAI1k9-pspWiIXt}K`VF)W7c{3+y91n$x*_iRU%KLd=>|klgEj?tG#^2m zawuVaaqkQ$k0CE{0;No>HS_xS|Nq09mdEykmL0!%dh7rHP6_lH7@Xok^#-^N3&~30 zQ66}n0NFvXgz7y0;vJ}24lc&Q6>aVV{O$gYr$L?pMd9%mjv%!NtwvxjMjdSmp0`1- zqgg?UQR-;WG=m399UTlB;KADN?*_R7qjUim^~gyR+(<^5-o@4Kw>k|f-a(}zsOJU> zJB<2%GbrQ3BIo!E^macJ$?g7GRBZRxfSTWE?f$e=$bJH+7;pm-*_WuP5UJgt2r>{H zx8T}62+YM&yMrbfJczE{dm)W+mPWk>UZAcMyR9 z)%oQ(xjJ_dqZ86E27B@Ni!4xJbsm55lLsa4kz0GvE+BGbx}k;&)}RDMC@44)kr|Io z7lFu}1acoJT+mkQFdQc%GLyj$fS1+ayxCd$0l8n=S^EP~5yLYIC{6c<{y-X?kNAvc ze*kDR5PB)NFBAe;Jvza)*A9hxjGlnR0k{jW2xI_s`lAKJ1~qvg!+Hr|E{6CRzQB}piy?Qc-8A4>*}KMYDI@Vw?20*YBsT0xAhf#y`Y zB_Ly!$6v&7Gcb5|9`WdfjDY!aGcfpcKJ(~2{{ON^^AUw;#~4J$1epbz4}qr=k51nO zKAo;Jd^&w6AbSVY-)OE~z`)-EI+V$yxpoEvf6HZ1+UO2l0A5JMc)_Fj2UDpzr2Xm( zN?a45DHpT_rR4yB%QA@i4Uo75x1ksCFfhFA1B-)V5IoDW!2^`uj=SCf&wdVWyOQnC15|I*$S#J%J==mjlQDg|Y$3kW?=|Nj5~nq|Uk zMvVUO%>&?+kG94Kv}+ff@;y33Pk40t9)R}mV13f+w_uNaz+6cViU8LWpu)M+^@qoC z*B7AU7CgWcq@aSY6jVBcd*@A{AOaA^_lXo%o#p`uQV=SO7P~m~JJkO)kcY;r+Ylly#Zv%Q30EN1>Ye#*c z2ZSY1@9xnZ+ThXc3(5qr(ytaWWp%@++f@SEC7j^_&L`l?s{s+<&jc74CcNYWcQIT$ zJgi*>>fN9Q&H%?4r17K!G4KJ@z!~7xSzvoh!S*5y

    6HcnK;$Aw``lDD5l&FY!3; zdIFlCpc_D4CwN%9c7XHK1oW;hs5=fS&o@A;2OCiG1^K4)_=|}kHaI_lx0}6X168Y_ zlnr$;IAtFOD*~-C1l0|o1t8#*tqe&J7r^tX)eUT0O}HZbh;k!>2`%`@C60V0ccKM@xN38MbA>ul8@#ipe}8P zhc;;Z<2X32AX^(c!=t+t)LuD&t~(v78zcWk?gjN*L7i}TO#p9HK^p)}!k~ya{$hd< zDJ{@@=&C_g3!){BqdV~qn=S$^P$iK2uvBn$dq5Q&&bB<*1)wqkr7`pw>;ObqVC@uO zT{^u3w0ZCU|NrdZIv7+%cOHLn6BN^(t{>30`aA#$gJz^rJ3wc4qqrDkH%iYGV{IZd zh7N#?vvmEyKOHng$NJ*SE>NVpet@jHJ^msE#awJPJ*0;VE*QIoAk{pmmD+jyMGeSo zM29yQ%mpRA3m%;ZeL5d`bl!WB1rmfc0WiW2F|CKT+y)ek@W#e5*Z+**$`-Uh6jUxl zN~jWWd>}<4NE60Js~zx0JE;8w4STSwFvC7Y5VYVNv`-u~8wj5=4cJ9q*eikjjuiG4 zJ3(O&+Ioeup6d9E`#X^>AP@;p1W_X4D#*==fZ(y0E&u=j?`H5w236_c?QG~~gZ$kY`U0u<2&$7Y2Czgx3knbeSgc?! z_H6`M^ap!RC#@fVxGG`ynk19Nfo=s;~daN`Er za|7)kcs&`mq%H%j6>gFXn2WsAWAQ$i3*H?4 z0kk^>b5s>vFkrJZ1?GcWPXVCTBB+>#?+7SiePO>9IU1o=53ba) z72JJ5P917EQpbxeXvSi+^^p?^WTYCD!*4*_T$Yc)P5&1j&9yHW>OfmXUU-0JmO$$; zLA?<0Yzk;wEo?66CMbHqy)R!-p9QiW?fSu^ z`2{1WHh(<{w3iyp>Hx35LQC-?6#6L@yvV?nct5d1`~>Qyfm+irKPf@{#07WlI&|Na zfF{P!eTUUg4x7>936#FzH3fPcK?{j6P=gqBj16ifeg>2}(8BD&CN%Rwg%4``5OqMW z9kj;R()9&o9?}jx5Zw!!*aj!zqo7m`nv4SP4T5c8b_aC}KqJ-&g|~zl7+x=d>>)yF z`ANS;8Rvpj(4av>_{v>evwWc5KIj-E&_Z@laReVNxB^;+Z0Y&{;^aE8rQi|;>|~*L z|Nn!=Q@T+G!2W=o465o;M4y30k0IvqTu*p*p7iXz;M4gKv=*)N_zNpgLj<%E5;SR# zu;rB?1H;P{P{G=Z;x-GA+ra4_Y!NJbE!ht$9T+@73r1_RW!W^iRB(lyJq6D9 z7d${C5TH}w&^MubfSP9gpnDE*j1_>E!-6&+8~|62C~Y>-INlA&rl|uSoyS0j&4I?+ zK+S4q5Fb>4G9L2*RZHNBX4e~tE}jS^Hb7mv4`_pQt~XwSW@SCPUGX>@)Q;^91+5c= zt-j#e2a6fdfDBIO_S)d}O|JU@R8dsp^F?@2|a6NK% z1y$-;+a9{0o;4`-LY8#Pfw^dH4?a-PK-wPgb`drMUwDAW9>Hyz2cV_5;IW+>ppfsp z4jywvUR4J&0ko z;Gt~}aGW-S7dOCK|DX^kN}sTp#72H@mR3GKL%WzOp3(DG^$6wfkt%AGYBIrb!&f_nH!NRy)04i0iT`!dIdVu`=k{vW(02(+& zjXdblhPYDu1rKZ26LqQJb}VS{FWRHI_5?$TA7nt-7qo!n0n`r~pau_UuoSc2o(MWa z2$Bmx!=12Pu$zy8;U(x`PEg`~T?H=4K$b*!G}m5WDDj3`0$R`m+sS?y)b4;-@&a^1 z8>C$VjzV70;3>pzWJ{KT7CC?>R&KloMLg(GNMr+(zoXRFxc0Nd24&Bj~ z9+hDNm9ytof((Y`Mo4=D)CfX}Q<$4``A`M~;y`92%2|If7i~bm2P6m^5I}W5sAmjv zCAlL45qzK#0hrU#2Mi4vP-H>fS%`)3jaS_a9ypgNfRw|cjU8VH7#ip3!S%pH+w}!_ z!8s_sHP`-Nr~@UVACSQ?(4G#^*$%LkW-nKOBLyMrdc%Y90@5N2jKL0!Aw$p_6BG?7 z^Y@@r3z1~OzJrZcQQ$i)%V^==RR^6TfZFH)Rh_=b{{FZe@@JCDDpxdI9{&=3@8+y-S|8q@&L5}e)uP*8(ZfI8KPSSD2C{sK3qL2kuW z<3iIsxOI%)2ZILADX<|(gD4L?z{i<@r@=ux>%jW}m%vnkW{#i}=4>9FVH_UaAcbxM zuu2Uw)pihkYyxa%9YrB%gaf6i$hH)@T!R-5;7~-_?cmP}-nPwmNs~FPOZQ^@YAC= zw85j-wF5eUQSchvrr`1DZUrfRsSQ3`4x|LkhpO^|sN(eKcI|k{0a4Q7(Tl9447}9X zb%IB4Xop9yYXekgJVY2YF$jv98K4uoK-;h_50xrFrvMv3rb4TKcF@#Tw`;@8#h|k< zxx=1vSplLQ$YhfFn7|t$0}mo>>i@ zf#gVMh{+c`j=LTJPl$FS!lm^63DHEVcKnmm^RO>rk zXS@u8j2eOTgJY``G%g65T!qHdD^NUvw1J%j9;3(uZRiD!1@s~XmpQms=eolK8eGmG z=XM@{5dfx%j8hS?$>`DZ?+z%^AV$NZ=Q!+eI#5)@PBr@a0uf%HEN^)AfcAXoj#Cd|u%XXexXD3|x?b zy40Y7Ral?t0z??2OT7>h=08BEyF*6O!Oj1g+h9}dAqOEIfAI}8{nB~-1@m)IN&wY6 zH{dI}Q0g6+hK0}m|9@@k0UqHy{$e{+`w=jWUpsjHd=f}uv+E6sm$KlV8)&Bq%D5oM zdyqpw?MCGO$ESCoN)EZL0BX7;f(_id28BDQB>>&g`2QlJl?1B32o6{9w}5w5fGT!y zuXq6@2q8TvL?;+@BSFi75^Gpr;RI*~3Y;ClBLqvpTwK`!;9C zYefu0NI(7m|0U>rTP%YQ;Kh2Nsu;X|64vrA1$hRwQ;Vm`clir+uoS%L=*0?9`HN`s zfiB=eH2J20s!Q-x6|Bj(9VCL@I?M;DMi@Q;%taf->IDfx2C-o67o6t# zgVZ9-a{zPE%v%i-B+|SS;PC_a1m8|D7tOqrnC8J-VxY9ydHe;oo(XgfgFK?minYIs zG8X_EXao1>A^k2U4|qpJ9$du0H>;y`KniAqTGFmRkha8=-17=zLGEbc4F76SSRleb z2h2qauUe2Gk>L;8fC9RX0yN;(dHlr&kXCR@1ZjfxAV?6^Jb3s+i>f)tK_P&=pdV89 z!aKA$mPCNg7)KN&a8qHWedqBPU67LO1E}eT<8W5cXgAm$;A+18DyTGrC1i{N4b*b~ z{R41`tqY!k0jDLf8G4|JIk1t(U+_KzSI*#>OU8%)|G(Y?8Y)6QPYU8yoc$PVt6RU{ z@W8sjRSLG+1#O0@ZU%~{Ks6$2Clu1P2M0H1UkdE@{osHE&4z$FPT;~}4Oj@&1AGCh zJfS-+r@=)*$3B2sSSVeh&(l$y0`WZ9Vo<9WM?6ntMo!(}dUS`fFD$5gSt=P`0WPGK%p+kQx*y@C2Q=eC>eb^f=KMuYuz1{L z{T9VdI^baixSM3(BD?7iD3np^WqE9|3?1WuXAh*h1<$Bgi7S>-FVKl&KR~@E(7fFR z@b2I5;6fVIq=M`Ne&GQ+bnF;tQOw;bpaL0vObnp`ZCntw5(F)mgH(X{97)X3To_ho zK+`Ll8z4iC(8vSbd=DD(;$tK-K}q~Ti9Alw6(ERu^4E9d$b;OJg`A+?K^kz7h5v|_ zFtnWY=w=|L5rLx&1hsgP>N=3wILkn=jWlvcCC(vjBu}Ch>qzOA1>Pnq!7~;eI|-Ej zT=9)X<4SXgMpp^GM%V9&P#fTFGU#Y8? z&Of0Zy}CKk3=F|OntwqHnqTzy{r~TA@GoDHi&D547y^n?a}!HSi&7O*^HLP@)1Vqbj<`b(o?O#GPbH9Bf$qa-=L5H zeTbj)OG~hM8WBF_MVTe33Q%Pb_roHAfq@~kI1%JZ)nZr_K|KmpUs9BqoT`uq_E>R1 zYEeL9a&~HoLUevwT5)PgEEj_UOrMnk9N>t2aKtM>%tunKpaAg*TI50EJufjg6{-*7 zB4mvifdKNI0z`{~0@&%u${`}iApunjiWmh9Pg*JDmF6a;7J(uk9LdEB1*t^}1&|QX zFw{{n(ggV*5){Z56=!6omFPpn6*6&V29OlgV2za2w8YY!5-SA*O|W+vLi1893R06x zQd96b!%6{^vdS4S(g)b{;2?x%0%b@-^-QrYDk%s~E%eI=F+z&1i;~MiGILX{At_k3 z)EbIXtW`_7kj;gpBXonyQj<&ai>$2TedCK#6LWI%ljAe^^J+=S;FX3chh^hbo--nZd!L{N4|391z3>gjo|J!ge zFg$7e{~wfT9yI^|-@?Vf5Zd;3;y0nehL=11|%^ znF;^@C-5>b$W8qJzlE29A#LLS|0{SI7$!~p|NjIp1H-0?|Np<>Wnd7Q^#4B(9|J?o zr2qd7_!t;kCjI{(z{kL_V$%Qr1$+z)7bgAxKY@>d;mf4||2Ob4FqBOG|NjCX1H*yI z|NnpBV_*=N^8dd8KLdmBl>h$?_!$@yru_dOz|X+&Z_5AwCHxEwVN?JApTf_;ux{%A z|DgSN@239$e}$icL1)_k|6lkS7;2{d|1ToIz_4lB|NkZe3=D^+{r?{#z`(F==KudS z0t^h-X8!*_M}UEWW7hxwp!4V@X8r$vM}UDLXx9J#e*_p9QfB@CFC)mnFlpBR|2BdQ z44Y>C{~sgB!0=?&|Nk|D3=Cgp{r^8lkbyyO_W%ET1Q{3{X8-?xN05ObZ}$KHe*_sA z`ey(CFC)ajaA5ZT|29Gl3>Rkq{~sg7z`!-<|9{ZFc$qo>|IZO(VDOsr|NkB#28Q-I z|Nq|+Vqn-i=l}mdLJSON=KTLJBh0|?VgCRBF2W29f(!otPZ4Hd$XM|Ie+!6S`2YVJ zVFre(h5!Gb5oTc6vGD)@H^K}I9E<+{=MiCGuv_&1zm5n4gWsb6|9wOl7~Gcr|6d}) zz>u-@|Nki>3=CCE|Nq}2!obk8^#A`WA`A@omj3_$Lxh2WVcGxx5~2(YAC~?9ZzIaU zV6*)H{}@pQhKA+;|JR5zFl=A`|Nk6O1_pr@|Nrk1WnfTR@&ErFQ3i&p761P;h%qoM zS@HkBf*1qC<`w_{JBTqbJYDhse}WhTgTTuF{~N>@801&}|Gz+tfgy0^|NjTX7#M0+ z{{R0#jDewh<^TT-;tULXSN{L6AkM(>eC7ZD4&n?9zgGVLpCHb_5VGq3{}you2A9?U z|E~~dV3@V~|Nk@M3=9`n|Ns9+oPj}W&Hw*A5)2GBYySV&kzin$vgZH)00{<$eQW;z zFOXnhxUlB`{|OQd41d@B|Gzx7#OYU}_1C!`q|1h@VF|3aF9L1o+j{~R(54Bp%R|JRUVV2IoH|G$R}14HY! z|Nk>&7#L=3`~SZ~hJj(I$lLz^KZh&>!;#GBA`K`~UxdA_K#$ zWB>m@P-I|Of9(H%1|zl#zBL&ov{|5KD07`jjV|KFj+z;N!w z|NkqL7#Q?V{{MeMiGiW*RUhzbLP%f8fx+v_|NlEw7#Jp8`Tzfh3IoHBEC2uhQDI;Z zyZZmXj4A_z_tpRZZB!W;GOzysAEU~^Fyrd~|23)%3>&Wg|362Sf#J~A|Nr->GBBuL z`~UxrDg#5rwg3PBs4_5=UHkuEMvZ}?@7n+WHfjtE3$FeDAEU;=pmF{G{~9$0hREyx z|IbllV937y|NkB}28P<}|Nq}nV_@jN{{R0UH3o)-*Z=>QQD<^TUTbQl=yU;Y38 zLx+Lk@T>p-C3G1WUcUPO-$IvxA>#G_|1r7@47soW|F6+yV5oon|Nk6a28J!K|Nq~k z%fN8z_5c5ObQu^Py#D|Hk1hkl*Vq65%jhvMu)q2L-$svt!RF2X|1o+D3_)-H|F6+w zVA%ZT|Nl993=A@F|Nq~k$H36@_WyqteFg?ll>%yyGFAmKFjfdKO7pODOkjkF%P=r7 zaFqT3uMbk-!VW$iTZMsv!GwWzgl>Gm{0Hhx(4zde$Ey~-b|NlYvWiq((3A8ae^RoH! zu!HXS1Ie#pU|@LM1a%KgJ`EucI$F`O?EimdkeM*~D1c3=AQR z3=AQa|NobQx~wpH*JftsbSAhN6^slFZcYFH%Yz&RQxgW3W&qhSgMd6}S1UgKHwfte zK|o%D3BUU+2*^hekgvcaufxE=07_e}Rsa9TurV;OgejxOMH7pj08_Lc19KiY%t7IG zf{B4atm*%MQ{?c>L4+r0Nu*BG|Nj}t@=Wny1t9$#%nS@AP5=MbqsW)R$Cn2)1H+r9|NnK7#y8O#g}zncF4*G864LdbV8Gcd3T5zYk1*{AVb6WoY_d#|alQY->pmckHm4V?z%m4oY zDDv)b`3I~F3_n`_|F=b!F9Az~{l~z@z#!WC|GyBjyeC8+6ov|H3=ABt|Nnz71%&(G zwV9b|0z?hS4K8d93{9>7|A!-+!Q=;40FqB(V_?|T`u~3fio8EuzJ-l};Zy7X{|?CV zuFcFvJnW#RGs6-#1_q%v+;cL5urn~YbYgc0NPZ1F1A|HD|NoZA`U?>H&#*Hv_;q5BOOXCI>m?%JyKplwoSJ|;yi&L! z<8s)_SWtMka5FIMn}9tWKxOa}ZU%-86aN1XLXHnm8SH`xOVC*5JsfTTnel>~f#Jb~ z|NlRroAC%?1`iJd!>lz&%28J6G|NnPEGXvC00{O#-hk@bG#Q*=zk>&Fc=I8J* zFbGfj|34C0o+$vV0HnW%hk?Oo67FzV!^6N}HwmpC0fmDX*a&diyuic2P&DcPe=TG? z5)twrco-OJCSi|rkQ)Se85puB{r``vj48r73=CpZ zaHpp~d<+a6Q}CxJ1%3twn<=={6X<+sHyn0=(o+II1B1mB-2H+Eeg+0tbT=?T+D4!< zXa^qyL*11B|3Q6D7IAUZGDr>F{Q-y734R8KuBo`g0(4{Uk*V1G)}Z*{5MW@~HTD00 zZR9>JsC^@gumg0YG-#Y2TmKwnhK~RP!;WeH|3{#k;e{}xK!Aba&Gi5OozUVP)FcIk z*8~9u2EG~C%TkaX8w3~_1ZLn)TOcz)r&r#Yfx8_00-9HtiMt#V5oBP{nTb2ynFum4 zIM2i#)**rn3^g-xr@Io+Jj6`=>28J~1H+=3xYOMZK?a63GynfrLk`DSNFD@*!41%y z$V}X0B|iii7!JJ(VqiEw6L;NdA;iG&bSCaFju2vC5S)d(KVBikz@Rqk|9@d* z_al|#GlUozq-Npnm+cT@U{J)P|Ar6)g9sk|KZF<LTCN|uZb+5fRK+6f!O~OS)S8`a28N^a|Nq~CZpJEv z86Bbw3{i`4r87~&TH|1XEECKM#g0Inn7h%qq4EXM6e9&rYS z!o|4#pd-$}unUhLe8d?T)-3-2-yhk2Cdfbn$PYQ<3=Fpk_+f%L1B2WW+~&cGnE z1h*e9h%+!4ErE=A!N+Tm#=AaYY z_zx5ZA0!wUW-dYNGlJT$PGB#B{U9RAz;JX4_Wmu%3=>HPhCfUG|5rvYdqfdsPlO}` z!|$d4|2reQ)3uqo6gs9=A<4iXx9tD_L}Ym;NGBWQj~S8-4Drjby8$G>Lz01E+Oq%u zub}8Z4fX^`{)Qw2gV%E0@;@XQ82&B)|33jmKR7Fa!$3lcfx&LY|NoOv~) z4BJ*?Z!dz}aX^ZJ;l}F!|BaCC0JU3Hz}A5M@|GygDj9i2n zpt=9}b^rhKBdcL%11kXe)kB(r!EZh8vIDeMV8(jf`3|&(pldyz@=uz9VZ-|W_{%?O z28J)|ahDx$q!}1Kt;bz<@W?PQuy4SvUq^<4fpr7!Hl>dY1B1wh|NlX^Ys1q7q$>lC zha4FO2A&PL!=Oiof#Ki!|Nm1_(p(HU&4I#rjSK^W^M?QbL5C2+&CdW!gUvr9!@v-N z$Ng_)7#M=^xQ|Dcfx!!p`*dU>>rFrh^1$t9f)uVG_xXUNZvq> zfnnDM-2GY5+L99+aF^c&atsV-Hek<-AoC~4F)+N_@c;iNWH&Oc1V=JReuEqXL&HYg z{h|wU3=CZxal7w>90S9QjkxU>kY`}ng+m?`h6eHs40ksE|38a`0nrx+%@237z}*-k z&%hA04fi;Gi97>C_O}23%}~k`U3ghCMV^77X*>3G4syd5c?O2b+yDO;Mb-~0^Vq>g zfXi0U8l09LxZ@gR4rqPOxgEI6UyvFF1qOy+1k|`FFfgd?#BB~J-ZB&z7=m`uT7+&whT?S784Z838|34Td{X;s&ApIK@85oRr{r?Y| z_e7LIkU39~`~}cjs9pd67oq6Sgs069iVO@VcHs_30VM{8UAzAOuSC%gnPdW)Z=l4$ zAiNv5`va617&LZcA7=vTFHmA&klT&jeoz=sP=c&g!&OFs)NBE*&)SVYZQoF0U|2#x z%^xKOhIgR#aL9f|YYQqUGcZW)!QL+exy1prCTtIGw}AYdqRhaMg~yB*Wd?=<0%ojG zW?{a1oFDcvKk}4&!m3jw%Dg4Lt7iQDtB_w--fq&os|H&wE2w9*6np5ck zt>4@CAJYDD;}hs-^5m1~V|L|J=w)%`)97J!;WKDs^Wd{+W_Rav$m6qcu^B~$SzU_hTWh!E(Qh$Zjc~o{XdijkJm%lAPQkpxfX5;k7#P5FLZJN&Q1Rc; zX+cH?NRa%4@)e-w{fF}5?u7EMKn?y0<-_Em#!`)X0F4)P0}Y_@?Es}g_d9~rBtZF~ z^%Wp~1C$S1PXXdDfbv1>CqVoIQ2qrd{QydTfYJx>Na z3{3P4H6h}t`mphs85kKPutX>`0~3PO~lAu*5qy_1{2_Wxz~Vy6zx^FeotyFzf#=fn}LBLA1eM7 z8vZbMUW1C?0dG)4xF2+}ASfI#;)M-j{ugLCgZGs&FfcSg#iP*D!%V37JgE7waJvo_ ze+FI<&Ap2)07*0dQBiuo%7#Kj~k|34_2Soi7Xn?`|6#y0I zfW|K@+^V4B*T4(h7#P6osTmj;wnD`pLLCTo7Q+pw_$)MkF>pfcHHF3(tk}}$1f@3t zhD>Nf5xnPD&!9kN zprwaHHVh0344C!ZU8wqg@TpD+_XzPq+;a<>@L}bKJXE|0T2O(?Baja&c|qZWXeWTC zXF=i}Q1us}@dYzyHdNfr8>9*mK5wDoSD*n8%h&vT2)99WKuA+Qh&waD6IKii;CW#N z28QiW@ndBWb+G&*!Vgg|0SzB$G%)x=#cxC11FEM%I`2Zoom4?Q1_oIC{)39&Ld!3f z0ub{#q3I2lzXGA+$HE}y!2H!KfZboKq3XH7n>7&S^Hr$$KF|hG1_lQ3nnwl(h9W_T zy}zLG1^B7#P6wnG6gJ+Cm_6AZ|n^-GxBz6kzCq=6BE@ZIFB= zSiJzlHfZ?3;&&ocd=s?30IxR(^^=7`=74mfV$c~bp!EC<8t>pWC=3h?yM#gR5nvF2 z#tSsrF^G#m#7{u$9a#Q~5doPmz)%V8V1xEAgKSEKs^^B5C$R8e1Qk~TFQjE)fM!32 z15j}vXubfid0}8+Py(Il!XUuV6AdzzfdSHMd@Aa{yG%;$pUJ7{uYaDs|gLfad# zaO;PPPk31s0F*pyJlW5LbfQb0Ai`B*Z=F_240>IJYlI6{3DL zmx8DVosj{O0q?tIU|>jtir;|dUr_rSBtHu(?p6chA=(uuq2f$d5OHWR!5}CNF<%N= zZo~46IaGWDv_JyyHDh34sFOy7A;csIISs1*7PS2XUateHA3Z$RoNLGvRlpNh#r z{Cgw|;vVqYEd~aLiBRz!(DDu1ykIy074L%PBUt_Z8!9dZ^$;xFH02@Yqt|z!Gjc%g zDS?I$G#fB1gsQ&@&FIkLhT$4i9KHSd3o4EtkCy@&7=)NG`^!!W5ciZp+g-5qSqc^J zg<1%$ei*tHu*dH_sCpTwdf52cUZ^+^w0#K6zqg>`U!Vp3ho?Zr z(Zll)RNM=i&SClb6I6VkJtQ7M{ZbH1O9^5==*$xkA7*bPR2;P41SAeE4j9Uz;-K{* zAaU?{4-5W{6ez_gBeuZ0opHvCNG8*sJI$hJLe!&yvh;cFVOxq z5KB`HVtyVpLSW@sI8@vT8qTornE@5ofI0-`&WBL(x;T)j3=H6P&0K*Mv_`~8$8!B!B&4}Q=I}8jA%c0^Q zpy^WuI{qr63vtg9Xn6}uKM_!IQ)oL1D$Q^bDqe*azo3I%K;`)!Xhi`_SGsx-^S49m zJDB-7Q1K*aK>~~S%~0{9&~gLTuH({&nDfgO63S5P89bok=;HugP;oVALlu_Z*bE@% zptsu%pyH39?uX^yOsKdVv|S2q-Z5;2ir+v>hf0PJ^VOgU6K3x`sJI`r;|t42uMM%M zA9f>%Iq2hn5F!8%k@oCVGJ~Vn51gs$T z>Oj@Q{A&Ug-vi!A#J~XFYs0|6a1JVN3k^@0`Twl2hrf_D#QaTA|H9IbB~)AzT5rO{ zL!sh&(DD{0J{2mC-hRFS6@Lcx7p&fSW(^v*LCkl++Vj7l>bF4K39#`f4I79%j&85IEyO)v zpbb6nJ|qSPhEq`STC{#5sQ)j-Aix0HZway!e1;qY1B0U-#GED2@j6)hwge^)Z3n{o zBdeg|N1^6Ji(>`_dx$w&wII_GRKh3=9klq2eacgaa%0PD906py?1+ZohE@#k&9l3$!5#K7)~gfkD|F zBJKcP9|LVRF&KlzA$bLvbajWg=Q(u#3!3a0CPBqxq5V^6wa0J>D((W_P|3gm-WSQh zz!2jBF{cVTfC25^FjPRruYxuaFff3QW(Hf|02TiPIy{qsfdQ7kZb8M@L&c%ZdIob( zi22u{`3Tl-&w`5UKnqA%zE}YjcY~^jx#tU1JO-MvpxPLCy&&eJkK^e=#re?6lUS%Y z_&|0B1_oHYx!Ma9{$MYn5C?FG-+`Kg-p`fx#%_*{H^iOj?UQLx@dHo~!Qyd0R6GIN zUWJ8&fDgnRMQFbjCO#P|E&(k#q0I$`qfqfb(DV<>zec_gbM`^Y8CbcU02SW>wHH>u zFMx`dLen`+d>>Ri1DasLdsG=17_$5z=3j=kKVk8^94e09F1iL4*M{a7SUzR+hnRz2 zz9~Y*k3c(E;4>5$7#Oml;^_XG2^H^w&M$)}<$3U z6QLv#FlRYb{T^t)9v03wq2eo{=@3>f34_MRz&cS0?Ldfo^3l{MK*jB#=>!(D((fX7hwJ97f|s8sQFN72LBL6-=N8wfio0h4thV@9xDDCTJAxU1w&{kc7K&X)z5>LSFn7s9x5&ht&d>s zw8v0!^z^12262xXG@nAJD;V}e#ap2R-rzGjK;>>YMExvidl*`sFwB68qqo~vL&Zg) z^#U|H8NNZq#i0FtSbs_-0(&|)j)2%(1GN{XJ_jm}K0dGthdD=}>e0vFbRr?<^Fj+S zSUQP-ikm|7FKj$yGgMp%8t~BKiQ#V~_V^Nvf|x%8T24ZTw-`WMg+Svc=<8Twpz0q& z`w_7EeFIb+eSY&bRD2mUL%{Njd^E(~qtNsK3;!ahI0v-Cgr)!6Q1MsL^Z+x5DF(a0 zlw%;~qt}l%Q1R7J_rt~q7?O)hic3n<()5xUQc{aj(=&@pQj6kCa^sV8^7B%Q8RFwp z^5fHU@{za+vs} z#Nt$Rb%vJlzVYd)CGjBz@rj^oV?cg~Xtj)wPtPljPp+siG>?zZ%P-1J%!$t|Ni6~? z@eD9D2o5SKfLug`a7M6UJje-#@vg3}1qDDls(A%qvMvFG|dT#9(4xiD!~elA)_BG@uOQy5$@Njhv2#F8y4mODoHjfWB1vxyp z!~|?^P=H%fkTc-kVDor} zjFSAkVh0CzA5SOecq2U{JyWpD6H)DUHi86uaEYNY*f>O-K@*9qvyp4CA;?u=TjB8@ zUs9BqSyJp7jAo*%B|OQ4QkPedH#m*CmVp8`ASB+Uz(2$QWE{+se&nScBXHUQ1&6C^ zuyMR=h(UZve6VGFum#9)KW{`b%L-2P%yM2i=$i@iC?X6NDs^lZ^9H%Mqy^ zHS`P(QXuyyL6VSRd@d-Aacj;31tut~1(z5a#mDD?0z1CED6s%Fhq#8sgOe~M6~n?Q z2q~aU^jkyns78zJ&P!Z6|k%mh>*8o36WfdT}n%!H;Qqzq$*EiYub zB4>asuPj$rP|`PuM^5@k#zJ!$s2l_p#fIh>mvVU`vJj!z02N}O90AH>Q0E(4#K)KB zfvT{~#GK5k)D%d02C9+blSRJ{OAM6+p$?izTsoCR#j%^7UaaIB$gyX(?)QKMZ8ODaY<2rC2B~5 z!vj_`;jd~@s${5PpvDa(nk?hvQ(zWkL4w&B6yJvCprRnLC>37W7Nb=k;DS83#Ly%@ z9#;3oC&n9kW@Wkh1(#T+<|QWOq{e5ac}5f$1(z6^#K&hA$0uc$fZH-q9Uvv1A@OCd zre%parJ%ag2v+leDlwDzV3YWu;6%?5gLqel_*78HfQm(stx1W+naS~)X^^`fJ(Gh= z3=NYr5{qD!NwTY}i=k^7wAzY@h&R?V0qI35tg*$fp;5eVd~!x=a&~-9YMyIufOj%T z7r2zg*Pek#FenOPL5?UiQVUVz50PX+ZG=S6U~tRDH7Up&Z_0Irrcs2!hB(q5rW4@h z7Px$m2SsmuSz->Bf*w?Ex%veg#2cC*)e0cBA@QKBWe|^9T?AXi!x}WOrXjSLGc=43 zj)zy6;5r=Kwl&YoFUcs%FUN=>MA%@9AW)=2VgzOnG`qpdJ=3Jr^vpbP6%brvo|az( zu6=^Mp~_tSL*j$L?GKDr52)^kG<(1f1l6n1bebBU=otVt02*PSA{Nq6FafvqLcsZf zKmq8sIGMN&jNW5cMKy33ap4h_Gk`19~#247sw89V+NK`5TOor z64v?yTn8bQzt{@dfGluohSnUO{_({nDVcfkrNyZ!P+OrPiEzEKQG9%EVs4 z$m!q&7@w4w0%?|EmKMP!#_?fB7V+^#`6Y=ZspK|djKM8TV{ik?732m>aQo6S9)B|* zoD3oDcS2!~8a%Mng;I$IV{1L(uR9El<9*{%8m0!|hG}q#p=CTgZsI}xp7i{pN^*k- zrK$(zO;cFJ!b`IsYK*0&7EvQIf{o)r^#Hu;z}80qr7PoGf^Clbe{C2QI0R8XL$C#aAE0 zJr0c&Siud=DM)P@zu*!h1I!LsK_#ReZ)gmY0}m#7VsSBwo4_dv(ta_IhxAZ`ON>CB zw!HMx#G;hcl=z&?ywt=Z=zY%A$Z1GLiAj7Icswk(09=be8lj-n3ol8aT|JC47TFi@ zLLO2$_<19;6neWj3vJLQxWoiB=!Pwvph?;lG(ZLkAyZI41RTZaZ9){+K*k_(Gz<|= z%S)wdUjW(DfcvcAlm;(MP)5A*l_l`5Ggv<;rGkfH!L0*oWM9%6 z1CX5K9v=)rZt=Jp1yG;E^0Fb8!4OFH4lXgWgcWjFN1#x%6@eBrs2hi z4YGxRhJN7%5L%gRXq1{;kdv643hu6XLWbp_ot-FTOL6qfEudq4si46H$OtaZq9_YA zUJmNkgn&w*VDQKcvK83!J1jgAo`aN2;1LGwQyR$m0~Qakej)B$1+@rykTTdX9yG)V zwhEN9K*0hYq4x{UEGl*l%0$n!!6hc3<{au+IF{ifv-tSLyp(uPuiz3h(4agXb+=gG-DIGm9ZTN%;IhW>QY7XRv9!YjBC71xz-vxHvN%JWK_a za)pgTl|d&zfxXhf*Q5NnSOW1JNk_V4l$xd&AD>=P5nqs6RGbfLikDQzml=Qx zT7)a0)f46nTo%ZEM)5(QL2UfwftjF5Kvz(451r!zb&KJHjNslBibJ7w4WbSMb*-SI$e3DTAqO`Q zq#Cndg0~*Uq8wXsgyKp>MnNi*a&y6hbx3_b6g@DXp${WMI^npBrz}u68C1R!O5)IR z43VxtRRe5D7I_W`Tna#YuHYDe1tYE|LR4^xac*XwXRd3IH+bL)H1-6VP0fLpgYa%8 zD2mYYG}r^d(Bcywa!@-_dj^PT2fGVv_~97JK?)scHxz5z9K}dzFErRFp7f5Wt7}pa zyc>!$L{SqabRGp?T*F&+ph*m9n-0Tt6i*=1l`mxU4>a=%YIB0(0&YJzJfUHZF&dTy zR*uw?g(@^n%`GUYL{HVQbOyB;X~-8gD2|i`&=eb*#s`B&P~lT85W{hY2(njQu{1eA z%|pnfG1!LzS)fr#NR|SPvA~uWkhLTs3$_ly7}T>2HbK;&xu79D$bt|oBeI|hFFB($ zFB{tD%*@XNk7`k)@tT9w`NTfg4XQKXz0Y90<5*~sLu5(ljb)+|wLONGjnS-um*$`~ z2v82FpM?}x@rmHk09e?9TLFfkRt9Kl6*gUn-kt>&tgv|w*8rrt6Wou$F#!px8A0QH zpjs9-KNkgCUx3nTKq_EBL+ zNzGACqj=D2ieU42a5ortrpm(1Nmx3L$XO58n#R4}3Dh7(pH(lYB&LlA?H7O>c;Ki4 zj{y}Fq!z^|<(KABXT=4mh&PDGS2G~;O-OvO8wdq?gPNY;!US9d$79R(E+NS|ph5^C zmzGu4)__G@@B%8kg1kWq32G-~$|NXYC@LVO9Bj>2N=^W_xjeM;6%*-IV zAt=T}YelS+^5EtpXxs|P;n=EL&?Gsy&kh=vfi}u4h^u>G;RMnSD%`=dG~k9ElAZ9t z0<9~7EHDAJ_aKA&D82!eaj+F8s1pH1tuR5$$56+?>sol@9o(yhb{>$@Gm2B70gJk% zGq?oY7KN?K1&{PWN-fMni?~J>IYlnzQ$AU);7S1!V`iX81C=01*#=vW9cMEYT)Se6 zZ$y=bC%&BxVJjgK_QO*QQ6?nkc!Fj)any{Uu_Z)95@ksNs8)nmiWsYtk&^?s9SHF! zXkj#Ts5T$IstjX^GNNk*DrCX^L4^14j-MbeZpJli3K^aPO;ka~Goh6xQXF8-=g2-n zlqaBu8hp?Wych(v(nK;98ZX3;1c25FU|n$uiZC2bKp6=@F3YhcN*rE78b*RQ(c+6s z5|gvzlQXj8(-Je0hFZYu|A=b7!DqaXdOumPwI9f1cu1uRW+{ZZkT5>P*BQ1q19`51 zr0{k&0<~+gF2XZ|EW!gdgIoRfl$<8wd*1s0$Ql3)waoKCPM zxPJ*=hJ$BP6*>Mu1Jr1p7o?F7SgQ>ChzI5ABqbFxc7iK^L*o%=6AHZjg@!#*@MuC> zenDy;v`vOGNC>anK)oc`oB^!n11Ha)$XCywDXfkOCUZfNui=`HJwGo8+=2v_&_1Muw2Cy&0$<8GO!3~he0O9-9aNI&^d8z!w=95g*x&;;R+y_nc&U}#4(7)KWJSe z0^xxYc8Gj|+QtCwr2^Fy(6$%uhEW#sBr!6*eFp0xq6G z!zx9oC8b4q@%RU1K(p`+x!_ERUY&qjLO3V2LDf9eDp1Nm4AXg{%@v^5NLUL-obzLt zQ!QBa!>s^y=%7&!np#V&K%H7EE=fr(D#GqhSiuZh$)5$vlAsg?ZG{+v7KH~vGb4Nm z3)v~)X<1MUKPU%%VisOe!iKh}wG0K4L7_uh;8n7qmMv&oZWPLzWN5C&IwJ3f%Qr@z zxO`(|7!T=eK+-+D`G}I^$ximc=JDht{9t!bTN9S{;cKIUP#guCEhlDchmiqj4XNxmNnQuEzz00y4Jy+p+tLk9B(Paj_-^jBf}+g4k~A#k zn<16Qrol}tP+e{r57`sw4C>^8G6A9f7u4-Y=?+^L9klobZ4eJRwZU4{&`D0r&LMPl zD9Q*hwn)P^<%$?50PVskN(C=2Mc;ve)UU_pFr+1&2%kbbuF(1klnmgx8{An#mq*(c z0M?fVDw(iEuyK5RPJTHpXZEmkus{g_+HeImR)gK*QD^o{kh3RrXbQFTF^qQ&ffO^~ zDi)N0;MFCfUkTpJ4qoUIpHy6oRLOw`VUbcc)rT_3>HmQI18x_ABA9mb(MWAw$}cH-^O%tUSclU(7=4DH@uV7iE^9Y~4l_Qz%gao&5msa*of*OiGSVE-nS148xFE zk`G(13m<{PY$Rk+&@w={3F<*uxep#mLEbV99&Lh*YC_@6+VS+PQQB?bo^=*@ zz=u#90m}pvyix`&nKVIP_Y4__MA{Wh`fhA!v_L!dIEzo1Jnp=hg*vq!0P!+HJ#@qp z`%n-{-UCg7LZ`HXLG3K)?!4U8T#$d!8Uf%|L(Q*fm$3S|m zpe#kix)k_2UC?j^=r|ig&~Y~4QVeOX4O$<7iXqUFX;5Rt*Z}LW1bk|q8jD0ht0Y0= z6YvFZ*mE(WT?`+XgVf@%@d@bqGvr7G%}fxOcfr`*gVtR}F%H@k0JWx3TH)Z{aR6w5 z3l^P5@sPdZpa{a+WP}<;urq~hKO*IV(i3d4d;w(57fzed5)N!z7pSL>)Xb+wOp;Tb zLvkd-jo?ljil?C&6Ze8Kq@F4^jgXM`3;~^~06T*)#Mc>g0$~VfZ5cQlfDY6_j9b9E zRnQ!Pt;G#)l;J(t2iYx<{yb>uPH0|vW?o8sP-<~$E@;Nk**V@=54y$1&j zpw2-UMs&RmN}Aw?y+a)Unr_L=^UOis$rKOCjNr3E<3Xn&ptV`SEeNb_0%)utP0pb=2S9ZQeyvzm zUSaqQx!{B4Tx_K`qzMDtjGBY(C=2TBKsCX=0~ORAz}$gq5+4jcauw7Ki-*ixQ*{_D zhqPVYkOmL($OWk70~z^2?)Kqpx}Y}f{eqEZb7AoS8u-Ipn2LStD|n?w7PK~jwD3VE z#zA(w;!H-Mr3%O+44`dx@#(ps9Y>&}Z{wlkOT;X-M)(KI0v4?OF)STmNOuf0&H-v3 z;Ak9xd_%i36tt`dvIPc5&49gGi70QOeM8Vv6+&l;f)hKak%oDa9B2hF^yF1gq6bf1 zgVrCxj)Fo;FUYF~f(^i1&q19%c(($y&eKt)CrC4iZInO;M~TgI&|m;9yrC_KFR zfHe}ZELCLCE3V8fNlaqUD=sO5&>1imXqQb<0fSy%eo3lcdS0nsK~a7|YEelgl2B4< zW=@K3W(riu(aBS{Br%-HJL%LB(fAGxWQngKn=JR_xu z0nTI4OHWRYhaS`i-W&rl6>`Ek#0(f4WDdv~dPVtQCnx4+CNt=PL>cswii;WalJj$O zQ}dwLfk7@!pn#NSU;tlv!2~r!0($=-jFy3l!zkGO?Jz#*nh#PMnkW&gu5SR9E=8C6Z8*BzXBITKa8FL;WB`n z1#&0M{ZL_sUIqpRP?*BZ+W^%MqdA}sMh`!j|EELs!|t8i0SZh81_l^i05uq-A9OW2 z%zl{uh0yd1k_Wp<08D}|n*uXH=^M;|5+JuinP6%TntlbSei*$0>VB|d2Dq^dP-P6u z(ez&sgs6nkFm(`7O#K_s^gn>=htUfN*uN7^e*^R)85nH}yC?(d0Ce~4N7KIpdM^x& z=7s8mQRv}!6sjK@O$-dM1Oug&&@{l}4`$w3H2o@5ATlu81e%^9qL8!(V}t11X!;}O zfF4(v(jF9>VrXPOa z;RT3(SU!jFFyjw&KQPEFn0^K5y@(P}{V;dJ^rP1Y22lH9`7btnd+zt|l;SJD)R|vf~4JHn=7sdw_7ufVG UhC)JfjWMqH=CI&kO5buDB16T+`GB7xVF@yOa!hykpfs?_3L5@M1fsKKIft7)Q z0j>_pa)8o5K!!0eFu-UIkO2$~3?S237#J8Vm>>ccOb`=bvjSy<1usPY1#dD~97YSUgSiY6+z=Y359B*}}j8QVTLB;Au$;h#m7BqA}*V6G)f=Mw>uA z52Hb9K?(w&mZX5(31Sn21)z$8p!VSk7YT?n7+^Fk9`tiElgv!?b5eA3GV@9+bSo^( zbj?ikiu3i1zT385kJk7#JALp!{+M z1_m1j1_nL`28J4_SONnBLoNdYLl6T4LkLt1L|HO0FqAMbFhnyjFjO!wFvNodk+2Dr zUCF?}PzPm$LKT#@A{iJMl%QgM3=9lj3=9m_3=9m#3=9miP;n4t#lXN20b)RLCIbTl zBn2@rq%bfr@G~$l2s1D+lrbC!l?`l z3~>w$3|R~e4228~45}bO1_p*$1_lOWD4QG#6qmU42|*<|p)@iD%4U*K0Z}LoqeP$# zXcA{oWME)`sWrHX^ z5CO%4P+A#EgD6iB!N9=43#CC64~T$bEd~Y#X9fm_U??9%i8C-TI5IFW_%bjsgfTEM zxPk;hWgi0rgD#XE0Hvd#C7J=0@5aEukj}uski@{iU=J0GVPIhJVPIg;U|?WSfr^3h zS~dd%gERxAEHPqWU`S(NU@&K3VBlh4U;yR9dVXcZc!DlO{UWIPwNP=@y%6=Fv<9-{HdNeO6{3DNNRWYn;T=?bwmC!`l(#`r z!fc?rL4x6dAgVimF@eI9pP?Zhq8?WM@5130|Ub!9N{U(3@Q(K z8Ky`<)Pu@MkbBgi=CDD-2UHe=#7&{%la(RrL1_~t?gAC(J_iX0WoRZ5$Kg&Z9OBtf zbDlxN4VJGepyH>vA@(Xks&$5KIQ;b(Y(6i;a}S962hhT&AL?HpsDEMcbrpv>a$s{n zK19U}q3*e;1u>r$mL8zu{)!NB7ijn&hKfg_r4vsa=6{B|vkB@>Sl$GcYcMvliv)0( z!^#4Q-wbJpdth~?C<`Q=WU4^KLFEg`JPoM$duaTE>NAk|YIcx%K86HnIs}PY0b%U@AA)X%{oUV=mX1rG7c&~Tn=2?=LVe1O8@H&i@B z10oJ8k3iy6q4g{WT0JYs2C47R>k&DyxFiFEBx?Pl3=V%@h6Ejm`QVNdsLcWucliQ| zm)#&s85kJu;t1#SIQ+$oL;NKU@%1>wdvS>8L;ZzbzgM$C@-KQh-wPGr0L|AeP=9TP z`d3sI5)M_+@_Ydf|K5d~a~zuAVePs^9PWGvHUB~!#C%XY9c1-Z9O}7nhKZe7d z|Dg7YLeo_P$WjIdhT}NQd5XgvX>j?^%MkVwk{;ec%MDPU0+e4ApyLNn;~A3KA>pqG ztruY7Qvo%H8(MFI+zrz61&6($ejdntkQ!uMjl=!@Pv#$1}voCs!oKrFchUGrle#RF%%aRW#*NnF{I@e zq~?KCR)VzAnRN`^GBI~j7}b|fc)4Np!iP6e3- z@*Bt(#U&}JMPU2#U{Y!2MVTe33~8Y7U`Q;<&jhW?o8aUP*wVIYh5>eqKpxMF~hhLwuBx ziEBkkQDSmQd~iuoW?p){TTy;)yjx~YD#VBYkPD4W+=^0D<300=Q;SOCLlTp6QsaG7 zbMuQT0}M@IqDeVWBQ1(cit;jxONt;S&9TGLlOjPd_q%L2;A9*25?v9!5snhdq93>UP)>Zy5Hf#a6>HIGC`$QRVt2T2oD=@ z_(MVi6x%4ShAT43%*!ls4S*(bxUjP!T+GloIJKm-AU-HHJu^SA7@Mu2q+w_R2|j4V zVpW%w1XgL}mRSML7vP)-$`x>XU5vo7X=DP+$HnoPdGRTkMM(KM*dQLBr46C^G!rSK z#)C33r08IXPt6163?pM$)(lI`DNRMsnV=kR;+dD6Q<{<*?~$6Al3Ik#n*pF49G_HN z3^N>&$-v(riO9U5O@g<4r&?Hz~Qe*^6E|79DxwteQ6mg*RX8`njB`27DupH&?>>O{bXTabb5#i|M8E>d(%;4_h>Es-5q-SUXXBz2&JJ?JNObm<+ zFcQRKWI%@y6);hVT9`^055i{#n+8(}qgmi4f=q&l!t{YeKx|AJCJHebp$j4oQV$b@ zs6dE=Sd0wJU|X3OSfOr$xDC`AgsF$L(mN~JP685o!t^r7m1@I(4#pyniO%mwTc zX#Wm0Mh+YM1Bt`>eIRkz7#T=hLI7e8sJjnxA4m*@6_CV1z6FVaum+Mi$SjZ;2pb@Y zgUkYnfv^RVIP!SE1CltjDGO50;DIC#9fAXk2Ox>V<~%?W5lG^ov2BnT2qz$kgXWDu zVj!G>Bo3NC0EvNc0g^auz6T^;fg}!_mjQ`4Ac=#<*+F6;+<_#HJl8M*NgUJ%0;vVz z8A#$5AOR>|fFur@`+^EHtUwY6&H2E@Hz0{adW;a69Z2G!c?XCn1H%C%apd`^6G-B) zc?gi63rOOic`1+>2;V>w2hBf$#6b7~k~nNm1SI|fNgR1D>jRQFY-|yv{s)pcXnq7F z2FB2FZ%|qT&C7wsK=VOJ;>dGq0!ZSpxfGBd2_$jk`8x$9anKwfNG%9!Ac@1qB0=H? zNaCP*Mvxc?TOf(U#=b$~4oKplxi*j(2zwxjgXVNVVjvuVBo3NS1c`xg1d=$Y`~iu9 zZ~~GzXnqJJ2ErLg;-I-6kQfLTAc=$KEBppm|1+7zocm5(mvwg2X_00g^aqt`#H(!Yh!(L361fF%aH>Bo3Mz28n_24kU5V z{4PiggbyHz!{(1c;wO;AVROMCagXLV93I`QPv0pqc(fiUVSO=~nSsHh`3T2hkSqfK zH@);uiQ&KMm3K-E{PGSA|5ZVJa7e#=@c;k+|Ej0nDKTV#irSYK!2ClXKB$O&c>v7c z1>%EdD_(8@^EZL`prZWc0x*9Shz}}yUrqq?7lHVoYT#u9m_G}|2W5+w1z`Rp5Fb=) zyi5S|yFh$UQT#Fh%x?nmL8CJ-9l-o55Fa$v{L%o-F9PvFvokLh!2B!_A2hxBQUJ_P z0`d767#LnMfca4%K4`l8<%fSD{|15hpla{s12EqU#0O2CzPteDJAwG1A(fX0z>4DtT!D=6?e5LDO6>6~O#gAULmkYprEf62n>U=o?%vS>OLCZp3Hh}p~uay|mCctu};aktni*X*E zk35>6d1w->t?Nm36y{YQoC6* zU;^&T#fo@h14YpS6y%NKO z39*Mk?)B)b{o&E=`r{bGf0#(~8v(FrXXyu!jEA-BhY~R`t2cnrqcik}N9XYupc3)* zg9#_m45_EckQ*MIr5DnUyS`;$@aT1Y>(S{7a@z%uPFIjiK6pUv|G>YEp~LlkL+yKo z61Ilg_Y9?4AlLD4V`w>0qVLfi`op8wi4m&#hDWalqerLj4gPIH9RjbfflQBwoBo<{ zf=9RO4XD94__u|=?+^ePS;F+X7vU8JkIvc`9-XBRJi1*Ucyu#B%?2}j1O9_WI|aa0 zHv`xKo!3Bt^y%OK|A-)h`wn5hN4G0s-wB|(8OgWuV9Rj(7N_U>uzT(W!gF9ID8Rd2 zUwD8$_rjwaT8 zA}XaItI%TR^$D0NP~w0%KkP3&Zh}3U-$)=u@e5GgHUD8?=sfHJ_Wkh}CqTSIAX7ST z?rTVKWbo)b4lY4nJpKM3k^q{INJK;29_-Qh<^*WfSLa@f|NsAYe&}d5`Tzg_ao0B@ zj0_C?`{sgp9=)xgTHT|2DoBk-=P{4Y>o4;D|NrmNd8pgv`3VHJ#47<9Dv(nMw&f}1nimj55+%E;r5*SjKx15&^SNt`iGGNB>%^w zJM=~8vHc9GuyB|L*7pZm>@>bP010LfaPaQpv+enYjt)TRC z-1QG=V%DPp zFQ4cR0Ok1;-3*q8_*=JwLc81bM7M(gXw-$F)AdKU>kp3^2OqF@x_;?){o*kLly#cE zfx^f2g-3Jk3kLov2U-r4m>qZh16sJ*?fb=}*Y(yeP%FCg97r+SKL!SHk_QFm0l2%? zeq>;H?d<`wjKO1u$H51z9-W~4cfzCFg9DN)!P>up?CN$s0W#`VKLgm!pj6}0830mt zqC50QXMn(K#tGf7uv7z0WuWpL;Zbm&|MBnt|4!FG&9#4^&b9*E)D1T3MK{bLj2Aq* zeIM)swH!Slo+yC0;zc(Dw8ZQbK(-GQs4qH8pLleJ-tg%3z2MX7iWJ6Rt83A%4##CR zv@+}teF83(KX`P53@us=FWzj$#|&@)_VNgLbk{xrvAavZfXZ*rPH@$){{R1fXd*{ci!b1HBE)?^JRqU=!K2%O z!^84WG5ZcsALMl;$RISiGWH#yUe{||s2nK8f%FM@SRN{a>QlrbR}9t13N9ldWv>UU z_0sM70~}$X62H5OV`sgd0|PY5j=c!@3NQRU2&DPb$Z4LD0iNbN4|QHR_<)J=!odg3 z$cex8GYN^G^EcMSzu_GN!|O0;;!nN+su~YIVDezR;BoK)GxmJ&4rDDfAF%flnGXU$ zncbta^ngca=#Ea`EwJox-1P&fn+9?KG`pSXX7Ipp2;&KlPS*>^U4MWZH4Eq z&!ai_f(E#0)6L*v>3X0P)Ox(&(R_ddluN&S00+>A*KDAc!0Y4Pu3LHo{&$9MX+6L{ z^+3x3{uW+PQQ7Uf!=uynh6k8F{$d|Q7pP46AYNJwc3S807gk8w2CTXDGBmyjI~?M| z&;y{>&2iTc2v0!r@Ck7CIstC;T<8o?*Z~d_ZPyPTouEdb>jMvK*B51=LI#xfK~2L8 z9=*_P2r3~$A9!^8-hdVm^&sbi8jp;irfld14^Td11c%8naAZC3U<7;ifrlon;B0yH z@Bjao-2eaopMX++;mvf=yu*N$Z$@hc*$T~Qmpj36cLG#K;;wK&%|Q-OlJ4Bg0d99~1r5h^PW=N)yS<<~ z$EULuG$M1{^$jEuwu04x3QllRgGhqca~*emfuy9H!P4~wfA4=txIO50;IM23nabaK zkAZ=q8_Wim<_|o&xjeeT_JWF!&hszo-v0mJdVs%mD_pODWh=-n{4MSvw|0Xq?Ph5H z!Btv+-1Q9`6WqY$3m)CQATN0Ix*mY0@7+&9EiVxF_=~3?cIRP_-d4~slt=eeuv$n1 zxAzMu^Me|=jyu2&e{ehZ1-#nd_7Y*v`lk#GFF~slJz$OjXH2leIt4tMT^~p^yS`w2 z`5x4`>xP6`=kXVl{(>s;H_f$gpp|&72UHT=asaEt64~Iw43vu>z+DW=F%P;S@dVD; z54xvkO94#zG&*eunROM2r4^Pz9qWsKxvwCAgbwu z4_J_E=jX3M>5s@VBl|NbrVe$xqBc#1o})EQSwMLTR3v~C7^u4pZkk5F0rw2SP1Ad= z#FP}U4iGU-Q%g|5LK{-BrYVa@FAo!_lL`@M@aSap=nMo`QP7m>`U1IS3QcI8p=UaM zPq=it9syN}-3*zOmRK4fuYm&MYrn+#^+pjNNY10%K>*BS_h_!Y!BEQD?fU1nRJZF9Xg7e-^+UJo5k}WPujhfAl#q5` zXYHHLQjoLww;g~s;Y+x?UElC;J7DShr&OZb_09JSieQItU}!y1$__0_yIo&E41l%+ zA;Ub-cDhTa>lv3$U&!bIsIwD#qTBUM=e5q`FFHUSdsk4&4{D!1c9rN3 z{n9DW9eM(XE?c-Ru%6PO=2`)UN>H_Z0TLmgt{AA(1Zs&maDbfj8dS|=lNIo2egPgX z>vk3JnBl?b`s1Z4sL=sx13=sPkW%S~2WUtT+*f$w(&_rZrPKFLbL}05O7{JrMf$H< z_k-3nx^(+KZ~+x9pdbO4K(0UjmkM;3-U$QcY0%VwNAnQ@Voe4uJAKW%AG8XTfXQZ{ zdH~sEaJLJTmtg%ar1%82*?x2*;&TVM)&RvPs15+d=M7x(*@HJe7ykhjouJMzEIva# zx?Keb#AhyC7bHHl5LpW)CgE`f9!7iVOH@4hbo$=tu6@w$`vlxj>4uK$HoxKcUwXr_ z^QU9y36IW;yFd$|LABC8^l${#Na%4-q?w>-1DTnHZYE0HboyR#>2$r|1IcROr~#K^ zoyT7sdjc-7Klp&U7qu66%ME>qWJr6ps9%GZ#jx4q{82_2~9{J)f`LyKG3uWc(AtH z^@9iF1&DKm&_t^0a?nH^>d@6h)p?+)i3gRbp`ej+n8_+7Drjo->y*(%Eb9fqrET*8 zMsSv&4GO?+*B|hF35p?bI|NcaKwBd}j=Mew6i^={2SVoOY#f5g_?H2=`7XK((YQ7iGVk6zd3X~!9= zYmYfFF}zke?)qFqv$_^!@N4nouFs=mp&YLLLTQc+FK)g5|DS)G>vId&&!zC*2xv^9 z)Ah}9*Ds(E1kea6Xz=2PN3V^5OSkKr?$Q(8zGpnTLoa|V1I-j?D2OIAxPp?+2T*BL z@%#UOP-z4zAU(iI2h@)!bpWLk{%rza`woFCLPpmwuR-PO4~Xy!3y83$>zCK;;PHpo z0?oBw7)sb)mSJQ{NK*$?ctXoVxJw*&g52%6gW<5e2bj4}CJj8e{Nmm(B$su&f&$vc z8eF4*q8q}mErnXG;Q`ImJ3$74b`*jJs9zX?;uI9YovuG#H-r2Hk6lonM$~nnAtca9 zck>$#Z~(!bb&#I};w%NIv)=whb(V*<>w{uYP5pxb5i6hsg3BgQ+v@-$Boq5SfOa3! z|NsBra-f6@9FQ+TGiIPMU`VEV;Q{gi$b}fLg9n;A)O9Nnt^+lfUw~W(2{U_8a|x8| zG)fgbx=TTo_6yX&Vg--Gy1sbb4O6O9+R*I!hw)|k|NsAyTdv??Ggw^+3RS2JUtmTn zM)Q2tLi`vYH(ybAVj0;q+kl-OZZ_-75>(9kRbZ8&j1<#zM#Gr zbReaK7o5R6U4Oh>22%%0ZJ_cv{|2aO3z}XF1qIX(B3%9%G||y~L;##sK*PSEc|i}D zW3)TN1$W_G6b4*K;s;UahVTLdtZQp$)OI^Hv==H>RCZ`VTwny z>jy>;P=^o}eUM-UE2^qH3KN9{D_AtDZaqvizGMlEsZuf%#?-F^1tD0iWj)jDMv&un zfnE8%^n*w94_E%_2OzCSq&_~VhluFOgLvQ;Ex0G|`e0vpIwXJRJ^)v24?LP{AHZ6Q ztxVuv!UNE-8mI!~-^Red??Cepef}0hMg|5DqyI0Mp;W@z{6n3;^*yADdjKwm&o|Vb zS1M)S!NkPC@S1f8BNM0_bO&S*tjdewZ#e^=vT;4{(H;5#(kI{f2%Hw6E&-K)CHBW% z-w1*g#-8`+Z3TDWL4_zp!wGPm4C=&#d+!P9u-Ta(HyIdSg7&?DTQ8uA*Y3~<9=)y` zVA=dCxOcw+lmho(WnkFX3k{5f`~UxYfRgQDi0b1nHeF?4Xt~YbBFo6YaNP9`$S;@< zu}3)M*!~G{XB2{*VFeEv2gVLpP|#?Va5dDP*XM6N!@$7MP%ygAZrpPZA_b9v%sJfKkyrsJ-6K%3gZHoX>t)P`rCfSQ?aUWb8( z7{E@lcD+zy3sTSM(G4ES@n}Av0Gg-(Re#;3cO1cmD=6sGo`dy*M@YbfrY%W-|Nno@ z4c7b;JTVHYNl^zT8sA(16(W!+P1rzjcPn`E64YY@4^%+7y^s+_$DN?M7P)SF3Jqn@ z@H==?zq$4UB<+_(LGo|6D`YQNqLP}t;XjGjJOf)Di3F($KQKbov>Yg5e%&?!p29*ucyyvqiGo`DNOO`Wz=a3I z))UC}7swl!8JkTg8QkD3{|L&A(CHCSc@Cb>SprJMy}lPbdP8q`^nzq-KX`VY^z6I< zZd>jGEs+E@#v{R;eL>@Bps@Y`ZC7Y~26rFW8+}1jkqr

    f##d(k- zT&Wba6#x`57r%f*1>rezQmFtmq<-E)GmPj|+V}=^6p}~hUQizz(G&;qpsf>76AsLU zcR;}P;s=auye|XV6uidVrg`BDsKWT)!^k8alkAVowvdi_)EjxGa*B((1b$<^T2e^s3qsE7r51(K`5 zqEU4wFwyuDO&C+91T;DeR-n({2RcL!CS%Fp59$MexX@780b=h1Rbrs>J^3g&yMxL; zSe$I|=yu((Zw55c{J6*f+FAszuuFK3yS@Px=PwUIs*(-+R%AlDc^A=@fzB0q2|9-8 zxa%8GUEb~brr`_=xC64oqdOF2$pc844synY>)_yp=Q{q@#h{5MkRA@O9?;|zD8P~Q z%t6yrS_Za50IdE3WRTSrNqr8wdQZ?GK&dWLEdy1(kA;E30pu)8bSsTD~JazVip{C1szDm&|JHLhreHf6STy4 z19T}IVxh&L+5nk0d@=VF$iz7y6OX&D0a4Aha~Swr&v1YSwDv#*)-aZu zL-arjZtxxk{+0tEM?pFo{QC}c9)Hnr=Kp{2^4A9);Ds-YuP-*&u3;)o?smoE7>)!- z2Czw>#JUEYSi?Aoc6h-#ki$U^WO`{18f>gx!(3{Q;mQ)wbTX*92yx-P)95a|dfXLa z$S3d$f;B9qNmyOWliRdvIoJ9Giq)b83FDAg4x>4PfaE8uZ0SLmoLxZl{)4l)qs7-^uX5{{L&%ouC2_k9x&}ou|58_w<@DAvJs!APOk` z%b)@Zvaky5o>m@^dycz;nr#do$6Y~-@fq+~pb9#&3e*aRba_J;fE&Mvst(lGMjlgv zRdto1(P2oh0@U*ZPo8R&NP=3s@X9IVJlJtB8(2X@=%pZ|FQC?Os^IZg*ApJiwI`q} z!yrb$`p%B$AV%1-;>atIU~PUN0P=${sQ3XzB4~JmuphR9MvtL>z!OBx4;(;-gDMS> z_dqqDb*UL14Ysii4GiG!+yzi-Glm93B?~ARz#)7Ab8ZJd&IFrmEJU~twAkeY*k1k? zXb%&-f=L}}vOL&iS8ya)fybV}7Vm-v9_R>ZaM}iU9MPu};THF2LF&vOci{~JNW_!` zfEHtd?6(Jxr?Z2D*%jm>{(Uz*dRswTQ$0WnV<6?d%^6Vk0*$JJ=OSjn3;Udd3=A)e zKutSPe1j&$!G_paffLS&eV}8ZK_Mo6782|3Af=#%OpsO$xakA-2qJDl`3GD2ya}2# zfW++ytWm`YE0FnHW`SD`;E1__88PsoV_4F!Ll}L)qq+6~LrDy%$;H2o1D{0}2TM%x z$@A|!;L#m=01|>ypt{BN%}X~>NQ1(PzvU{V{<+{`?RtX0eK&Xt20VLk+!eH#311$! z1(mNQR$!{!3S6p}=zytm9oxmAv?>m!%H<#_SHN~5NRab2-*MM1pzh&u*B$fQ7(tzO zP^TX>LU04zY6E38L{vbF3V3=t08LLTZo|_PL@US#lR!IAEI@?~C|&84@-^q~VC;6? z0a#p-4XMhR>$R0B{Xwbd}N4o0?&|XBW@d7DX-~~2l(JRAiRuILARlPt0 zsLtd(2AbOO=ypXaq`M%=8Pu!;w^vK^K=}zAf}rjVC<*bm)PttUyF)>ZNvKxvKeD1hgKK)ngbcmk|f@c}85;L3lIH{p>E^3nm=v}rAW%M?%p=0`1m|1>b8 zn!g2f9B1>7YX1Hfu!uE(O97P8Uj%08@VCT48U3KMOPhaa@VEGYMKt+a{lHlRyn^Zg z%4jBo0}H4)S#k|joPd_$!j^wQmpBG+fY!v#0PkdCywD9k&YcCc0vj|W^)izYG$px# zp~L_*ObW{4sD?8rfDCts7~Wj_grNd$yp+FH2FYcpHJ>)95P`)04Wydy0KD>aKMr#A zpO=rp=@hhR*cTL#u+0msp!yf2AC$7KT@REvf>&npw}P6rpbZ+`;6v3LK)nvoR1j>m z1e~Zq?(PLO4x#(1KrM&YWnf*QTRH_^7h(6X0(d?l4BX{J4o%QHjt`I}j-Z9kkR^`Y z47RKc3JfKxV5*2qmj}H0nz0NtuD_!jY!B9MO7j~~+T4LiiaVgqeo!BI2Xx*8I#~o7 zG{9D$ff{W46rg<-jqC8FcmonhApi2WJOmZ4py2Ct{Q&LngQi$#@Nb&{)(YwSS{y22 zYj%CZ`1&zO5^cW?lLzaAEKs)ZbUoAUdZzUNWM>^)bM70)*XKc_eT>+3eSqo$4d{IU z*Bo!49T@ngA|?;kCt2W5gT=v8HSET`fEsfKY}M-oP#>Cq8)zK{sPwcrRO*FY-y5*L z)&nJ4_~biXA?7xxzF>OI(wzE&5wv-*1hjh%+^4rKA2r95%vVbxjiUUA3(@tin1AhMkI{@6LZ+!sj&X=BnPCtUGCumZA7Le-&kLKD7(A*8$Z*^lI=X;H`R~;R;X~c3#{C%2^(u?Y|5R3@^Mdf_wqmZwf6~ z`CH`JL5*Bc&lyy>{(!9y2iMV{+8(_15K^7o0Ow`ULaO%$a~0hpU$Ap707ACEzAo+bKbrPs6(tU9Kzpf1@0xeet@qV6UCw^9o*7~ zjEADuMh)P?dFT26|6y^_`Wmd*^~1gcP-_qGL-#*_>q)30P-_cin9l$dbRbcbVLs5J zH*n^MEP4YoRrp&cKuv*<*Du-#wTk%AQo9H*r$NOcc(x#+4z#om%&g+?%Y^g?z+4A} zOcZ~gKaxy5e~SYWSB1aD5Q(e7-#Q&!rGf(yZN1^tE8u(!?e=hin`zdr7tkhj*X#$U zi}oN4s5L?7Nx=$v!Q65M!?V zt+!#)Aisi&tM%(ij&e}f*aOYM*8D9EP@_SqPlvyy5Q%Hc-;#vHjplFV16SkNV)HmC z`*nhvvM8eqFZO|s90R%7dmkhs3&2Kz6oOa55)+Y?=P)DEn!g2f;5KYdONYM&x&sOv zqPF}kplerNrXo3CgTFNh%*Ez>4rJ$-;7W}0dm(;U12%^wKWqh!q@jhr27fE)j4tpY zEZ~Wo7tpcOqY&3X%TDloi#P6y8{P@L4NW_X5q3dK>fM^ETre1 z2g%#;I=?jRxa$HY27v~!8qlO8#tJ&vJQg1)Nr0+0a4QL1Zh`8dV%C>x;Lh0(#+U1U zfLsdQf{3=30leq?IAYH;XyOuHKbL~q{x6VAd=3UCaEX8XBq;u$cywbbVSy@H0#@<> z+(iL(Jr5w->Y$}4koG!gV>igxrJ&t`kg6Fpz7J|2cRL7xh9)qJH%0~qNQ(tFG?IK8 zkt<$;4&Mhar0rM@Nt;l6AD}l1UhKOEO(jY@5G71WImkJ663w}P7(uL3(7Z9+VXr0k zzsQ44B8aSKfSk$l5_FLSw3$Jyo7bO0ax>`eK2TEJCzlT?^CoOZauH}3*o%GUP^nU6 zDHhPGbWk4=61E^eqJ}Mru98G@)oW0sz1ZgkwfFBfBqxEU*dc)e8au$KA~0g;;7NpU zUyC7y;f1x(FnlcuN+|rD?SKFO2Sr~6>&qH&L)Y~KbP+hbhxP=+rXo@7PMCc)H46! z+4&PxYWsl_8EA1Acy9=}VcxO?)Q$)3=X1T`2;PARYN~>h|FQibN4{8a43tekyCZKv zV(1KVDg@V-kRCG&cuwa9cr)`0(0s~^ZU){a1_p#UsO<;J5}mH_E(kAZ{TF2Xm8*p5 zHF(b^$f+~7fQ~&p0P2_gcnR7C4mxD%<=uavy$es^p^4HIKkmAq4HVJGT~|zl&>I$j z=x$e76a5Bw(G_TZ;|CLee>AvB>N*45nC=Aa!vr`i1Ts z0XZ!Jln_8U96p1`-@*nq3)F1`4Htmw^_`%=+XWs#?mYe?8r&d0((QT#+Qux&fFx^B zTOYm`^nwSd&IJwIf)*WjhMwpaXgmeF$PcvA5;Wizpx}Wa3JH7{aNt8vd4T!oWfpkw zAM7ocqYL(dgQN5Ki~H+Ai`4jAy&(-H=tA63&wuX zC8n)%_9)c1&;?VVW>s`)6?DtZgPow&(eV9AlOX8=GRFm8jQ0TEYn9##%0z!&eguVh zv+Dzhhrvr4(MMt6K@MAR?SaJ+w*0LgphAL3qhPhn-y@j*spfA5Es@0Tr+tw5J`_KJ z)`5WX!Trq;Kgp8erxGj7mzR6w}X8Nsz<>?(EP1xkT&lF=sA0!rLG@dGBANA z!mog)r@`qPEiZh4=7np}yl{6FI4^+qTYO-_or=p=;Yr0{Cxe=Va3`}cfSnw&4c*C* z6)B;hx`3Euf9()FnSjg(cU3j`TS4c&L6gacouCD;@T5N-lrKSf1XS%olRj)Ba>qun zYhHc>^&N>!udw*_MK}bO$8E?+CTv)Y;VlKVGZD$81X?_R_Fp{!%^8E1P=b694_yvO z=ziM*_76Nkl!8}YgU8Qy!CI@ce}Y=8h#3S#gB3JFdjiy8?F`)mZ=-_y9-uh`P;Ghu zldD?2(;u8ya*9|mcfl~*FC%f z3=9dN!EImAv^~g&(509ldnM652O4vROj&ihet204+6;=e2ZhkGwhOQgJdm0n2Ds(ft9L=m6&v(5M$^^A@7P2C1q*MKNlVTHpXY6@$VR+?9lk(}0M|~prwEyqb%#e zV|VZoI)-`R`2Fy577GKzG1un|$6X(Qj{iCCdIyxZkPX%YZD7fT>|FtMOF?qbxIO-& zV)_67kj;F0rSjdbcbXrlwH_$pY4p7VT3Yhbj){Sx+4qjZOD!hQblUj{&|Joy<_GG? ziX;=z^KpkwO4GAz%aOjpO!9?}JyL!R(gJm7u z;jNIC3B=bR9s2xzplL~%E=&G?&~wcO+%0YKeHq@SXs8a@cs9qMV z2^5T+(5QS}28)2#i6Ccy!UR$hfrF0h-DIGe2W*06y$H-I(7wkHj4vmH4ul0eM5*-v zXi20ixb!k8RRRk#wjL;vX!gCsa@_R+XfbC)?Q`=wcBmQMu6Lk|o4|YOz&(5TwprLF zwTUZ1g*0ekaObi8Z}VXT3Ww)0FuVlq2m)JU0J0l20t*@p1r-{gI;LY+ zpq)@G&AxX)s}dml5j$N$>soh!f=V0QiU%`wQMcuT&ewYdYFB{H)g!)U__h;X!oV%j zfR+#MUm%*y z@IrPe_#~(w`y>h=BR$KOA`PoRPd&&6l>yzZKj7<$8&MTGFfcg0bb~1ZSqt(+42B|x zm!MO5L0i@Lft&?WWR9VT=_TldSFj?GGeL@kP!)mNuj)!FsO<~R22;%6`o)f z2~ZXBs45f~7#v=MM(%#>`%wh3#TJVS)*Yby3mFjsEdiDQg=y#B7br`BK|JV4(+Q96 zRxlUR90RohL5t+jmu(6#>@zNg*jlgyoL^B^0D#uvf(I}lneGG;O`OJU@Jt74)`I(A zv88n$-K8M=AD~VHyX^wo3F&u2mIi>9H{O6xK%80%O73r78bD@}9)L=A@IpGm?ZO{h zF&zTQ-(WXE+J#^yB!7dMkY)N{CZt^mW(C^E7E}UY$1!a}1Qk0p44P}NaFj-adOe_` zJ04tnfa6G|6m+NoE42R(Zij&uVS-Mp1W!^xCNj1!0;N6pB20^7Sl#w~Is?PY{h)S8 z?G*<8mU*C@1{%WY^eJrs+P@Nq8K;8X(CNKmAK&H@5i z{Tgx_a?61d<8Ie0SiK1D`he2VS4fcnPeY}k8t?|=OR3+W&Nxa9_y%@{B{(^YOakRg z@EMj{XM^fC_-en#H=t!M&=VHm-F5IrduVa`0y?A&S?vLxXX?DTiv?VnLx<2~*Mp)B zWwpmWNaA?`8Bzz0(84E^Kwa_=-3+!Y3=Izatvjc&JctQCr-XjT`rn-DbhgQ%Ku#dPdCPy#t30ItbFhfRRaqy+8$v8e{1qVZy1HK=*k zdHjXZJWyQ!d94CoX#%>Zq!g_%Wd;=|psBr1CWLPq-zb2h6tWAmbL$t-m`3MRaC@k; z7j$nF%yT=E^NUO385qEsjKQN5vM;i8D(EcZwBz8jfI-W(5J%I1PMe3A*9$&@#iJKe zOn?rZ2VGQf=*8N9U?;-|4*6Txf%6yStdUOF4{66;-+>L)0G;OonqUESotocpc=Yyy zTp9>J$c#aNVJE1&uulPcQkDv6x&u6`549CSwH_#uf}QNr4Y3D&cs(fm;YBNd3uy5$ zsJa9fMy(*LkTVOoeD7ueRpK=og#JG8k6K9vWQ z+PgVCx?8~v2L;B1{QF(s@vlF~cnGSjQ=psmKr8fir|qpu3?v^X(cRDi3J2KQUuMuY zFVLa?tPDw@z6EId5NWOC2S}j~o`425grT*k{0fjaP-;(ZNFx_qF@X+mn*m*j4m-@g zo1xS74rmyIfq?5%(ad9ks?&q0 z165uRu&Hx^s$+wwLti`J@&uein4EsTQG$G+w09uTVq~{XU&3qVo*r5J}%!D_9XTl$J z3cR*#ti1!;z*7oZka@zRcLL}tHPEV6$WbcbjbP6(4kFnNiGI-To>IMT*8V1F254(i z0xhyV(G4}m^+mUX1t_n$p6CP%z0Pl}1qWQIK{sm*Oj|G(Z3>JBP&Ar>2g?##50vP1 zv#P;#%3{?CzBUG8A-Jh=5Z_W|P_qN+TujjZOVAJ!O0y7sO5zGMoVAxj>tfKn9<*1h z39f~~eJLwMw<;BLP;MbK>OpOJE70&Gq&bM3?OdSCuN{`a8?RCS|NnoT35tG@KFv~n zXlw5QvOWd|23AmZyjB6T zaU#zHPOR`c_5f(y3tY#7vKCQc37f}kg=qy<>YxQUph63J#}{u&8fX{@G=Kr}H5d3S zBJdf$Am5|;9K5=kZ!xH#ssxn}Sk);gIDq@c&lZ8zp_LCMptI~jlh!}LTRKWWSrc^D z2k4w9q+L#(wRb@G*Fnw>KjG8qdcddCcSpDD9hLe{*Eij+H^A4N+<+g81v>U0w8;~6 zi^CiK)_0HuZ~=1T(hl$f7SQsR53mLnXh&slzzdJg&-5P@)H3g?9WPC`Wj79s)NfJUXv`TIbPu!s9#W zJ`_-y2f9!r?Kp!iL$~Xn<_Dl*e*SLPKj0?x1&NoBL6tdp9Tj9q&ZF@S_^{;8+8Ldt zQ#?9DJ3Kml8+WbtxKuEizxClXWW^e=i#UC>sAP zGGC^X^(q?wE;8Sxll3VwU!arqEi&Jxll3ba|1T1sp_A3D1|=-)QMn$d+(1-r6e>5l zMhP1Dm7V|pA9LNx06jCo1GJ6|+~1jk+&Tu;t`|VtFlL<5h4l2Yvp!Rt5`mPCd1aH&F)~PQdXb))D)A1LI;Oc%& zx9b{Mr`{P66KjxT0<_TgKsSReILm{MPXTd2*&cjC5{LuZ9>m}J9(?S@4^`0GJkaPD z=nfhZ18FO0_ybZEU=1V=21p>K%mp=FksV*x?Ro}0xyB3H@6~x6IniKCF}dJ9S3kfD zHajdhVF|zk)Hs4(e{cqLNpb^dv7j^v z>S_~{EDq1ZpDYBRJ}#OAvKGn5{H+}jdsRV8q(I?48PZ%M#dcQ$wu8=w0JRCe%!b+C zdVs%kDYy4&+#ESp->) zfficLFBCw1Jjkg72f$?IYE?Z#DEwMT9;0G6ypmr5xh6gl0W&@eQ z1v4QtJYXhd1{chP%;18VkQrPsQ@;+>{Q)yA>qR}fT|dBQcHUKkdU)W=&_H2`yvhZa z8;d|A&5$DG10py;=jeh~B!h<4kWwJ1mu2btfxk6`k%8f504p>jD}b^Sw5bhtmo6U1vZK8oiEu zzOA+Ei&9Y63)B?=O#^^ubgD~1_clV-|A9gXvy+5w zy3GT;0l2mU+{*%u$C>njN*UyGDF&4Hp{*N_Zr6rxfo|6g;I4B+C+Iqhtt|(@o2nbY zBU+#)b+>~6OdfQ((eW3i&5*G&NQ!KQ&fJ5C%+X2{(4Z)IJsR}x3RtRBLU;)t;e=Bi zW~4K{2BkVkl$LOKK(A~9MQb;MEo7YK2)M>_1>G3~iUY_>7}S7APnNI|V5RBsfCtSg zfQ@)vj-0?ihq-%ngR4WdLLSmx+&%>q{78j-i3M0Y2Ll5reO`mO4K1hPDDXiWx%gWk zgJ+=4aK0cn!O~s)d(gP4>kAJ^A^;t!iAV(cJs?*g59NR5l|kmv*AIL+YHCS7ZQUyYsXs?{{IIZ z3d-OCJue=VCp%qNK)Hm5JQqOKfvVN}PeFb~K7)##6SRyR)FNeo%m%H1^bf#eqM!yb zbWD_cGDs)rhA?Q;g}+4~lvlbz?f_LDFOXZtpplLVpgu}Zw`-3oY)tekq^6hvuBE$6 zp*F#XHo;?}izmScXO4kK274SqJq)qN+8!qmgSWA^#|7NgNC%mA-1UY-i6aA45VZEu z^#-V=3bI20lmj7aHsM^znoT$tvSt&`g{;|xb0KRs;atet3piK54zyGm&b0(zq;Uf> zxB)61KxdYLh7=)(`Zpi2fEGK)U+nD!g(Y$Vdq=lx2Q(_c2Sl%cv?4pOL<6L`4jRXs02&qnI|x3gxS-oX0aSp2MIpm{-K@rW z&@o7@JSB$L4zLsiAJAL?y)YX*=~}zO6MO>}s6?%L4{{r_*VcfJcLUusITy4u4SLUZ z=kXUmyFkSx*j5klm<^Z-s^w>RfX+~Zs04@Et_Emz+|q$=dLSDp`GS@cFdT37LFAJN z(1aFr91(oPFzCi;NGb9t( zg9_*foChFZSh}8oWxG(&;R(bna;TmNFQyN89Cy7@0P;?^E9jITo7z$lk7m~!91ts; z4=_UQ1n(pjz!n-HkNj&x_Xubg3d{^9xEbIxz(9GBwG)w$HAs}pp_P|0mo9XI`ox`{4LOH$3Tm;G(Z<8cTWXHF(~nat~!UT1O>TF z0eou$I4n59Bh6sufAB~%m|0&6x>fTH=Aqug>EyHugeGyb^TtA^I&{uheQnn4PXyz?W#j{k03U%n)?W z6?phnvK*A9Kx4%WpnZLa3<0{<=Or^J|3PYy?gr2$d>%7)Im}^T@X$O2-azD`c?f({ z_78iHgD>nn7!Nf+Vupxyf)p@b=ybgTO%lh!`azYGM|Uf+Sq-#T9Wyn9c7uY(-#waN zKw^pkHS9{NAzs&Zy@D!HCkK%LU)OrV15|{8;ubtCyR+*5e~4`Bfl4a~>-!DRG!3|r z@qlK{&WpQRLAjyx_zSHT^fb*3solW&uG94dI0&^tr3$i-A;xt(fM&fw>m0!uAH6gK zZ-kiv4Z7~oE1eU-p%2=1Y3(|LzZrDsB_ggsIR$>PPdg|^JHhD{><~-W17&WAKm>&u zxT=9j9x7#e{RmrNg2lSQmx-5wcO7ZGegg>=P&*5Jyc%N6af1hFL0C7g0)~Ns1zaxf zgY|u-df^2OcqfU6wd)S>z1~oRK-U+6R#mue0Lw7Fo(8f-fb8yVn8a{7&$iu7{YDA?MTLEF))D6Rb=q!g$f^ku{H}F0?=@Tj-8>cGIjtdIsRgM4|suTDTm`8 zP#^3yn^+2cV7EndiwMTqx~ca8QD+ zMxCyP9R;TW9thh2b7S*?0FU0iZ$Nv@eK&N6ZUJq!^MqW;$<&ORZuwiEvw)f^AjO@> zUmOJ&44`!rphN>o`X1e-JHQzelt!cL(RD-CPeYOzc=8xD0Nw3j0Hz#F_}9B`U_1dT zM8Qg6?Lht%XgiQCMTwzXlm$e(ZeYC7$@(){iQ%=ON4GC%(-~+W9KLH&fdL$c4mIdb z&;fY>6zQOI`&wp$M<2kpp*SDDRA71?x&iONTHxscd_6j(?C{M1mmLt1<1ZFvFfi^OvR)OaM@wr%_@-$^&)>VcuEHpp52HLa$rFVl$Vdd6$9KA;G3Tyt~j0! zb_GP__zM}3E4rbsI0$kfXzmhJg27bqz+JH^3F?ZKNmyN>f$j?MKm{Ui1R%;$M~EvR zBFA4$OJ`u%Hv#GjYh+izRJ5hT!omRN3U%zRP(gRaHBcJ{;R;B}3@*)gr-8!)B69qN z0LT?npsv^oav>}%U@92kuDF&64U4mhSi^z`-4y{~SGXS7Hv?)xM+r2_K_{1*ceBR8 zObo_uA_uyO{~+!81N#<3O*BI@kq>4fD|QnhT`Evof@Gzakh30Psm65zv>=<33JN9= z_xOu9sSFJJRzod(46_il27Ur4Pv1`kN0Ui6Yhwa5fGQHO29OS#cU~KHvzo&6=wR35 zf~E&tI)iqffhPSS<#%@}*0TR&6SlIy1XL}9{Et0z@2W!0+@%uDpgtn#^d0oGfk3yY zuV-Lj@a#N-RzROkVPNp-d;kiZygbkd4=8WJa`=W6P+1SIj|1V7u#7huA!!1agyn}a zgrqoJ5|&IO5t6@hp>{%|&mJN303_3R1XSloJH|k+xb$d#gSj}S^Y{yuY>+A7t3*LF zd!QNw^&TD2R#lJ}ncBb#k#?wpPGttKy8Qu}0s&n&0~+@F06hn4Q~v+|ua{4NtP2SC zXnqsn(OJ90qqB5_M`!2?=sB98s~Y&XG1%~yfUc|nZT7X{DiMO*lDMoG97`|3YwAEJ z>2@A}QIHRBHi5=lS3m|;T@iK9{R*%q#Hx57$f60*T(#=~Xu6-11Wxzhn&JzH4QiZ& zPu4;hG!0^qM=wa%@fY`#pw|z;*V2P^p8)Fy$8%;5xFs494G(e9O5zipA39u*AXb5Z zR(OH7zJo#2zDc=!vLRA zs0Lq33m*Tjg!-VW^1rp_3*hh0L`u7v#CBn-3dzg z3Z<+sJwVkbc+>f3&_a5gmt=i_^m#$u8E_*Ow6Nj_ytj5U6C5GXbJrlJ9f5|Xz^kn~ zT^}5C{SIp4f=0^08bQ}9msx{k`L{Xz?{K}}P_ecU1jMy=eNX~Y2(s-5*cM5!7Kl|0HvdbX zftbe_6kgv2ucGKY{$fTpsJsN-_U`(Fv7z=m1AmJ=C{&>POrS+deD?qUFWJEtIwOvl z!k5cFplnxxMrY^6T}#1(nb7{qI&fPNWx=frENg)mz@Thb0TppCz+=d;0Y1 zglCI#>)@#kl;6P%3pMy#K^w6_t8_sfWz>CvdQIRsg=RAF#3AxzE3Q<{im(T?UI*k{ z*zDki(j<7Q1-SuwHx?v^X+U$>tU}ZrR%!)u8u$Ph(E3(Ld|v{kH_%ue1?yB!2t50rq;sQCd2%i}Ljrh@vdu0M{0*84Ir zKr0Rcnx>GWDV`inT39tfy4RpNP3TouogX^DI||_S8+gk^cLQk6UGon{SlxCi2Nc3@ zUakdqQNe1CgVlge(TANN0zNkkEC=nTgLaNW){#Kc-UY~jHE7!ec$f#2PC%n`Ovk_r zXFyEGV+^1TKR1psfNsMEPi=xF!Nwj3^{=5ytzB=F)PkZJR4V-k4@ZL2XFYg062xpd zP#SdH^$mD)9^|wOpKefj3zFmC2HIH&ZvB8<1KBVTn*~a}pq+)joe#h_Je(+jZ7%GJ zXJB}_9yA0EIwJ>s(hA($$6usj42b!HltOF;HAk4c!Qlt5=J{LoQ5CRajCTv7D!A8+ zZo+5q#637*KvqQeqbsp}M1dU182cRWMU`HHp0PO$) z=LtwD0I6a?(}l0iC%iV9@Y-;~YrP4twI`6WaNvzc;}KAWhu*gY?V0Qhy>Q$WeAs8V z>l16&EBw9CO);Q7VW0>FwVrNx^acocfL7Xr?_~eb?Rufp^$)214rz!!Zm4|>Ziqex zH$)$U8={Zv(RW>xSb|p-HPk+?F9FRigVxS7f=q!nM2r&u|A!q33tnknG6!i93aAr*H)Gdf+tt3~TVj=P=#nb{rM0iCUZOoDa0cC;QSWdkjoas@4DfO-UBtrgT- zh~sBiy8bA=2esAV21c0Aw#*+dAtrI5*k@r8#j=rTiyPLLU(Q*g1X105gU$9=@0JYU$g0|Q|C)iQ^ z1zRK#kcZ|k{uaWZp23#Xd3ncX?A7z2 zb2PvUSU?lEp!2{8Yr+;ZOrYL%=kXV&xoAOC;)~xvNKS*T`NB*P;JL3(*Bi%OPk@wm zyZ*3tJy8qk_<(MAehBh_>lbU+A9ZZqu0J|mzkrgvM<-+&6*?abx~mM*e^CQ>(vSz5 zTtJBjl)gdwKpiFC5+N9q3uDI&MN2$qK) z(h5Gaj0?S@<8N{Q^Z)^Hiq*wAhA} z?$DyN8@$Q`rJOHa+U>fh)Ah&ex!tZmG(nLEu2xYB-36ejzIdn)g60br74wqq`Jp5qz>9 z+-!Hq1Wnk0t9Aa?li=YG*A1W>)ei83r{mv)8_}hpgX&PqQ&5K$)K6i^gbu&*x0FG2 zgW5&#!CM9J`Ntm^U%vx21tIOIaA-3-JP2fUX$9z{IM7N-@Y-ZF4Ll4C4EqwG8q^>f z+(EMx-3+D-u*2OqfO8o*SU@!%XwY*8qFV(H8Z_lEAAm<6Kx>0R?Kto{p^0Jt|G(S> z76*lZvg?)B10|rF4mWf&KsJSf&dtLN2nGglKz>gL`KA(M)dT2&+GDQALGcd?SJ1#y z>wyx^W3I;;UV@sG5YK?Oa`L0^WCNew>e1`F0LxA`Si^7yXxtC7D*+zryd|Jp=E32~ z1-j%C9DUH?R(SM-*VZ{gT&)dC9-tV4EFpoYfmNBZ5H)B%1C1#kXK1KB&H!2ij}nqh zq5uEC%m5F3por^(!~?+Mpb%CCoh}1f@&R2H4_%E{x2xxG`2C|S3%!DlD12Z8D`M}J2@Y-O|!P_YA>ks+=|K$d7!wBR) zaHR9Ml!K~A&^W6$D5-#IJ1`Auy4`^Ekd`;pE(f>GmV?`7%fW54<(O?Vc8})V8;q}y zHPkM*E(I;4f!{{VEtcz5UtNI5`cxN`oa~^#`eo_@Q?|pYZdy! zqcZ?x)CTZeU}pemcwz&34%GnF?cJbwP-Tz-?*V8L1q-1>*_|MeO%PQq5LNKAtw4vj zfR-a*>0EI@2H0WKPAO@i`u_;1(Fz@MXqf?xbx?YQY~BK=9P*Fnb4N1JlD{8(S9-VW z1NbH`O*i;dDyUcfVqY$_)H@c0SiivE0_y66dwRVAOpxdW7hYEa!QlYT72s7;ggu=P z8bOB?957FVPGkcaj^Sx1m?&h&8aOB*JJ!HV$c{BI6S89s%+#*~ZQlViE$h8OCcr&w z>4{$(7KT4tL6gIo^YZa(=ztUWLg`-3mtf%>aLU-sD(1jZg44ndvzE>C&7#Lpe z1#f$}0@|Mgo~zt|#q5SakQc9jwr#!ag`_fU%4!1s|8K0l0y$U)dYKidX#m=Ty94UX z8Q>vg&>`2gA0QX)@wb3a`vYwl^MG8eX;aVNss^?Ovs!_5C0-?fytkm+bpgEb0v-DV z*V5gt3lKXKAdMDKLj^V-0=uM&*^Nm^Sr!!5-43uhwFmsIZQxc5sIUR=Re#{o zoC_-L!DHt(kWKw#S2X zA|=?8LhvDqm{X+C22k?@m(~L%pwloxsRMMC%LeELFOUICbWsOzt7-#eWYYnb)tX&@ zFoC@i4=K+<8?r#<_Y6=p&VUy7pu7&MYT#P|CwPPBlcCF1z+=1S`L(g&H{gscASBi>zD%*XjBE{j^+bQVCT;0 z4B&VTQt<&i#|GNj3Lbd=09(lp+FJ^#ie?;luz*Gvv=Pq=v3mw6x|?5v!uk*L)dQdv zG!-75wH>gT#pAA^eOnA3h*6~ujP62m0LYv-(AKAG$8qo+BdELJ0qS!>#v^y2Eb2um zt`NP0&RCF1D2sZ}q7+vsD^bBI08;dTHUxn41*ozEjZ}adrJ$Y)uEs9<={MlUE>|q5 zZGzs|1#dk9nFkuY0gXw>ft?fzvgQG_gwgi?|NkW$SR7JoGYBxW9w_kuC7E5IyL_M* z_8fn)*%PTM03|WdfElPQ0y@YAbmuy1YrJ1_JY+z@RJ1cGj&U#(QvZUPkop(Qgw(%aCZzraGxh60gCSt1Wj%W9y%aRo z1h0?R*upaxxFFsKtB*asz>xsC)CS%pF@}hukFfB!`~{t82nt(Br40)#GtdA3Up|D$ z5v;jE<2f(?gGXdQ*FU!00R=1MuJwx`CTOb!&ZZp$1KQ1YoiXqb2Kx+DEPdN`ZVyu%Mcp|hJ7=kt(BiP;9~6pWF7Jl~*P>IjnA#Rlr1!)^g=a{@aCbZR(Q5jap?Z-6`hp&)|~ctF;wsJZ|D{~9#t zd4utFKe*@v)!v}_IZ&8%BTc8kgJT)g!-=5y1gQkw^#eYdsH6roX~7B2)>u}V!OegL zX=xN{ngIDtqtq1I2YvwQ{er>@RQ6ke$^giP?XYSdwzekT4HU|*9f-OETB3uZsM{63 zG!dL8bge*X1-vxzoHIxtY)gno;~VhN|DAh5^IaaDTOq4Ur)GdBVZMNCrC!$tkA3=D zjwvarDNY{yE5m)A<3sZEJvt3MIx9Fl_T^~lXXceCID72R&nqs8cS$Vq=qwQM=&X?N z*qIm~oLQ9`@8;3zp>W(mqcksBLuTBB@Iy6`|%9-Xz|qv(#g{%7!LhIWTR5f3S6!9%@O zb)X~h!AwXw3uZ>u8G|}nAhq$}%`ae474QmKFcWeO37BbFhgQz=w?Madfu&Gcds0vy1Ki|A$ZGcDI5Ig)WwQ-~r`AvO4G@CQyNlSY&%& zJ_1tv!mcfri~Ro|bV{iQXgV02)%ja8K~3Oh*AJ}Vp@VKvPX+x3yTh<(ERQPK=5yFd|Y%imf84o2{q$c&Ivj6r3W#UcKdH{g*V@Nfex$FBpm-@yYai2l(Q zkTOubl{$FzhA!~v1q~7Pf_)Ad4H5qXYO5i)@vnol^tLYe_y7OCtx#7!Gy~01yCP0? zkpKyR*PMZlS`7dVAYK5SxbD#l+C&Ggn37Gw71IV#mfQ_ucOLTSZCwDWJ0S&aitYdZ z5cS7jtN|&2SnAPyK)|DSDw4uvkY&BC3qbzEQ_$?p(b88=NlnZ2==2ac?jVtus=xp; z2voI0bwe!v4N3=45&TEmK@~Ax@Yt!KT~wS|m8#*<$#Kkq18gwJD^L{>gBOu*aN2PO zO;FbWyxI<&ZZKMY7-yFRg}~DcsDlUYfi#0RjDapK07ovk1cHPZqySoc0X?2Sf!Zs* zQ$d*rHC{e}jA}gq9)#m>DFQ2l#@q21^46d-7j%K;1yDr{8gKJxtUdAnJOe`+baqht6vvOME=!t zW?%qU!C=MR9iYWT9=)L(phx37f{$I;rB~+2u+IbR!sDQcZH5;UEI?iZYl5Dw06G*K zrBVj1AV;ouaa6+~eUOT`6})!_QTMJm3knBpb+2Q%W0*(d8v#(c-MRM%C{#PQegNIl zG4&02Iuv}siN|qQuwy}I5`Y^#$6YUg=;N+aAk-EJ1)e+gINmDo7hWAnz?i*L75@JJ z4>o3}94P&CUjOW|+N1MVCzD6>A(rO7Ap00fIY3*8+_*r6Z7bM0kX|<^-9Wh(&{aSy z;Ddv_E#R7HhDUF!0w|^9DIq~kG3Cs(lvI!XX$s-K{sF-Z@TM44H~0`7-vu6!{E~YH z6m-bz<|0Ao>>YOn9b3R~-1Q8|=iRPntXo0u=kN6fA94W=2$&*hD1k>Hx?RseSF0R+ zzyunQ0Udb_8V_j&1-l31g>DB0(Ag2apz8$)DhACp!n_SBfd$M#X%Z3;go<`>Xn_kH zeFkEzk^mJ-Gdw^pX1w6hEr4qCGEho}1meD8ND_as$bo?Yv<F{qm(0ZUm&Z9SUibuCEc&Rj~;)67Ke?rEpZZx}|V0^hA zv>n%VO7jm!{=SXOpuOG%0vFWooU=%cH!tP=!{z<~D@ zbcQ}S#t{En9$BC}^n^$9CH`$wL_rSg5C9LapJ04x0%<)x02NHVQ$cdDU|#?Uc5r@t z!D9jr1aNXdP5yb{JMNK_e=KMk84}B$@QmgO@ALR{8u)Zpa2$6K$kEcTKIR|-+V+jb zU{MT%*%1aq4FPwY6ciK`GClU^l_-?tmn7!EbL-A{P-8^FRsq^^GSE>dPCM?PQ)PY3 zK@W$e3r?VC=Bc1#VIV_;-L6wCT~E{|fuq8sSL7%tXM-!!c2i#>NTmff_ zVU;c`0|O}0zMck)1C4S}O$Dt7I&d2G>NvWqpMr{ONF3nlcS7Qz7Iz#>#4xxYvh5px z0R_%OTS1Ab+xH06FP@zr_C+9jXQv@3WI`u+bo*X_s)24NwD16RXk0J61kFZtLo#pc z3{Z^#+8%=l=o!eyWr2-@lxnCc^bGh0dgK&(7SwzPn`J;mp(cRpi3`ZKelhs}|Fr{Y zhU^olK#J8(2DpO3&>a#C-Jn9w^#-Ig(tw1`jb_&~j4zk{1nC9)8Bb0FXObX)-}qpU z{h)yapZxr6cqZ9bS`Z(Sn3R+1v0uR%GWOunS)kz2S)t*vFR>&sJ|M{7*JD3KO?0eB zX8~x$!XoXsgM)(YF$X6c`6vQ>VLft~gSWUtQY19*KCVqW?jT}~BjDsQjMfJ=*iiz`1Kf*C%}W9I;?j;gNTlH~?c!l{KZ6#N zgI4i_+Hu|BHPWCXA3&=}cfglG!^hiTV|Hsjz|E%}9^i|`z^nOFJ(^v2fX3{=TJa1~ z!p7_lg2vh)!=RugIN(byHA+F}EboBaL*lvsJbJJz0}=->Qf$7jyoXx zH9#9g4={jNa)Tx{UU-0~-5`6BdwuVCbccR`>@Wdcg2utXz_Bj|y2B(4G{_4d3Iz=s zf%e&hZ}YYQ-7~SP0UQ+IjtcuBP)s7mAWB$4r^d5_YiGzvkYgxh^PC5$aO>Q=0yJpx zp`&%lAJDMS9Y|Hx3KE6QYQb08_nLytzVq^^5V%ndQUeKb(BQB~H&_#BghB&+YT%vb z+B=W|I{wxYBpnU`NOpjfpWOjA7D>4WLOFC$X$G{J47uY8dYXCX#a$fWJ4&Dd9qR-# z=tj5e4d`Tai5F<%57e>+72-1xOT|Ddh(IfpL96AUhCv2{8K8^2gq)zO-AdV-K?B?E z6QCWJ=Gq$!b?nDocYubCkGq1Ja-fk=P*{Lh;&q44faed4fi6=}+6Eng0Xm_A{kSXW z78C|hUMb~juHC}G-(m`yFYARIkJ3FAY$#}G>H3Qf@I^+*L8>kYj|30Ui87t89iRdB zZqOl`eQ!Z!0cfVN^Z1KH_MnIbt(;~!?g|<11Id8;g`KVopy3M9YUz5T7PK>YLAL`( zr)x{M>jrDrmRh!M*B0<*3fBeQ4m_Q%Yr0)mSi7zPiLU`2NZIVVKmr^{ySiOhbRK^p z52|51kH2ux0!2py$Y|)4B!+GLz0MGqE^z7208RaYYzDO%Knn-DIXrs7w+2BA<{l*m zQ1J!2M+lT`HYj=#tSaXSxo zmo{{Rd)OQP{QnQiAsGSrjts$$ogY0rK?h51sBmQ12VSYv32kLf(gqJ4DRjE-fnN9o za+CqcIGC%Czfe>HZ8q4$P{G+)yGNagfdRJbz{v;{Hg{fD@q=Pir z?Kqn31FJ>KA9^5NuwZ|=4%AbHYVJJ#V%}}*TL(jXA9SG38yU-3~2~ytWZ@B?k1q)hu zz=1XYf;#k|WDJ^P1CO7Eg6i=Ln3W91s9y|dwgXbhTsZCuy893`ZU~-1g$(k8nU;0n zeRZJmV_ooCM6jqfe=GECY0&)i2@g<99JH$rqzp0>djiD7oQVZ5O9wlVm=hd#+Jn;< zX!ag77d`=85O%}YzMLop9o&2Yl;&P&fP!vKbL|?23Ni4u3`oGhmdRWIT}OI{5!BM} zb_IEXAH1m)oWi<8FFiOB}jIcS|ZUbi1wr9T>Gi5`0z-s3e0OuLMpK-3~1L>s{A?kDmca zLeI;&16h@OVV?lh=uO(FMi(HAPQ_`o0yd)?VMdEXjSfdM+7w~57HLMS!HkxH8vREL z)z!x&-~qB*0#|_OU~~0pXsqosgc`jN&FFB1(LOkhw!mg|0nBJKsL^i7MwfQ8a!4pK zfHn}Y{ujsPW&^Yc>=wN)4)^LAoZ3JKk730915kUU+x5aeYp8p+X(EN9eYfZggwegY zjAp>*(>9pN_E3{!kWF^z7Bxbctd7fM2M%mTYr~9off~(-X7qnCczApf!xfA?*o?ja zY72nE!vkvcG7Y5gaOf7DfH1lhr_ln~j4p*4?F%*98_j4_gwa|!jTXUXG^pnVYCG=> zh8q1r9o5yZMBxE)Uldn>NMJJ>bR{y_=t!v1Q_+m>Mi||I(`XrNMyEhpAs6<=LyfjV zGnxlsG$T%_I)Bw3C0uPX5BDey?2Ak3AAVVD&_T@m0Zb3HMwp+9a zVRSl9qaCmq{Tj5O_rktXsJS}G=2~})-V=s9`LZxBC%a%V7t~CA`Q`in|DZ-MN+aXM zGf*Xl+$aeJkAH&)$I)93D6RfEZ=ekr+IKw2euMO9n?#Q zoCSISJlTnQ-2kXJh3%ZE&1Udc5aiSZYtUiXPaz2(d_Z$8e=Fq50Pu|i2T;%PNwWeq zYCu<6xn2ORH9@mZv<|A058UViwL~plFQD%t zECF?>Nb&Lk&^!X9ZHnY&Zg7x-QyvF6{6JBI8R-s)NY@tyM><60_=^@07fYl&C@?sH zBE728k>SM~kjFtLBO)E9KTH&Fq?hD^!xprc4>D|G1`B$SQQ!sD;Dg&l)xgR3Wh1l- z0{exyw6GjBw}25ae<1;L!UOE=+!LVX6W|880%!%OE11byq62H8{|A*i5YhS)P-_{i z0Fn{GOf1_#GoV(0n)N6uK}*`eP4I4c(B#w}Q0;^}nSrtxD4p+vofu$%>>+T@0S}ph zPUM3m?NU${0|%RyJOe}X3l>mk6Ev#;S{4cNFQh$h!wc;Uz?bi_dNjLU0EYxPe?msi zK^ICuyVAnK;Ish|IsPI8#0AeBg4*KHvm0SW&hZz_n&3EtbU;C;EyDCU34_uEe=BHk z0XqKE4crs`z?r)tc2-x-UKw|;9_rAJ+vOGLeo)d z3!a|3!T9nPXoMTm#f1z>fd>Hz-^Ow0b+|_-$V;%YF&{Ma)Cpd_Cm;hVJV27LJP?GC z{45QVgaw8vLh>3&vN!cbv}258EPTKayfh6lSoi`lzNQFTcLw9K!}grYDS?9h&&y6o zY4-x+G0+JWAm!iy1&w-Wf`&gqTe^I+s0UZDrNN0!3_a?1kvmUQUV z6!2>nWYy6$gSM+cEd_@r#@5*YkIvc?pb^l{P*Bnb9fZOGS!D=1yWBy*L)-NSXpIFZ z?}08dXgyGp2xj*NaDZ=l2cJU%-UJ05AObBEgPfYC4O-#~I=I^PhKIH52hjR|(8^L@ z&=GnMpsD!1IH>rA6}bAK{m-u_H`nfAtOE@fpYVWN6M6tP*m@i^_Q-%V8j8A3qw_=O zR8UIjXjK6fq|oIWovt5tfY!%pLu$Yo9-Xc?x*_aj(3BKtjl@0$P%L#Gf6*llj*k!U zQ_M9%0*s(byIdiA8TealAO#BOZYq#}5Nh{|f!6J~erVVWvY(-}0J;^YX)hzTk! z`N10}K@BwU?Lr_fX9;MlES&ovyqguytuFyxT?ON|fbVK|McCO1wew{W*vqb<-GHEI zgTxDH*cr4Z(%SU~_;`2ly-iTh&+zD-3i3O68U?g`&i4m2W{!%1j^YP}B>15I2Of+U zjiWP#)AfZ1cu@}P%hLb<|L^BwU|@Jr zFaH1kOVC=n2}p<3?Oy<@xUPu*|Btv9VgHQ+M}`-&|Nj5qe*+}D4K52RfA47e;PaqRB^i9H0#zNmI&cu@tH1?&A$(L!FHq~q@Zyyy$<~#SVBL$~aO=!L)>Vt5_+0{&u#Wux|9^i3 zNH$jV|NnjEwT=w?YinUK^HS*lfAHC6`=`Riu7boshnel)02ez55<3mjdjT%CR_Oo# z{S0-E3@?~LCW9t`_M6wiOzsEC+Jj`Dihx`IV%-L@CV*HMK`d}S2^abQADTmgJsRJv z0F9$|?#%$*_yJjm zb9GnBA5_ks*{K-tZ71JYcE^s5>`nH`irUhD=};3&J9-hdWC zfrfX%``J)-Gl923Kx+oj7$~@X_Mg9{5~2mnt> zwYHoL1`d$(Zy?O}D;x|AwhRgk4*V^mY%pf~K9Hyb3rN(Lg@M5q%xqr)5@i94nuA2a z%=SqjQP3f#{4G_i3=FnlW_t}t6m(A$e~UDn*`5YsMlm!n@VB&sOaL?613;oaV9`>L zD45x91rnVIy5Op%hMj@I7R+o{0f}~lML9vDU}ifXNECFdD}ReD$QNK{`wx%;L9kjY zIJ5l`h{+8WJq}U}X11RJiGnWwEeFoyYc{glCRIesC&ae5njE9CUIHKErL<8K8Hc-Eah7qzy`|E-Vc2 zw8{_esT={X+X1Idlyh&ubJO6o2^vViy3Uy4059S$lUM5Sjw~oCgLcOXctCDLfixh& zv$xd{A45crzqkP6f}5vkVNeaKvpbJWe(F57|1ms35}S^%(E)rA{Ao0oy%Wgx_0e$WazJO-CwH8=p-U{AQgP9TGSuz=GcX!;so zaL8db_`3+G2LKI@47kBBd7!~D8)7)9>5R{C(5Y+Sej~V*?t22f*#$CHnG3ep6@2*i zQ4kwjQYe5s!vj2VGXd_Bc+i{;XzL8E#Vc-Fha^#Rx{_T3la9T{G;?!F!G2x<_bCA7K1u#km#X*=9YJ=_coFP)gd zvBpU#Ie>=dG18eM-0aR{`)|Mv2Hko7@+A}4U{D>3FKpyMXRGangpC?>unkl{?gFjK zg*Je1efs~uwzBpl4t;iTDiH!D{$(0hsGMkL}+9H~c0CDAPS=eA&$a4kSJT@o@>%kHm0!7qa0W z;D&=*9ISLg+86@j_|c7{ACWV>C# z+oTfMKyh`*19GMiEO4H3GBBWo4R|*ucpM760Tn#10}3O^xv`z0pg|G-eFr*^zc|nF z|9|H}kfq>J%g)drou@iL_qnzlfUGTG0-v1t1Do-n;Rnzl*fmh`IgJ(MGVo9WVa1Xh zBq&w|9WV>=2h3!YjXoZoTOl_iP6frcM`tf+6RZ#9phKU|UeGStmIEaU{F<%}{F=TK z_%%Zp@N33y;MYt&z^|EmfnT%q0l#MLhvVP__CS^N@m8Dv|Nk3+a!9YMfJbL5cq|ff zO{zyH_|RI9ZdTPFir`a5?t(nt%_|4u_JYmu=-vw6%>&tkq6><$Zq|R_A9Q1pXpO3>kOjISSq zM!ER6F|-_jAD#;uB?Fx>3OU#cG~A_B0y2_f(E`cL1!6*PK-Uypr@zD02-i};qmQY1ypE&)7Lj~K{zFs`stVAuufczblV8h{O- zY5}5-w>tcT^yfW}w|XF$0SIOUf|-C|W+0da2xbL>*??ez?x6tNeY|x7LUaa#2^z_R zDp-LK1+@jCqB{_x2N28?2<8O@6SRU3stvS25XyXkQ1Ai4{DEMCmH|T5a=`8pKHdsC zZyzcufe-}^XF^3mSqjYTo(hh%UTE-wQ^yNt@Op4?fD_s`1y%&kFp3PMW%}N!;8U() zHeUqI;eqZ8-_IbC%Mug7!{9-3v;z zU}pDJaHRFN8i2wT64e@v|NkFv1r-#~3g{nd1q3QV5ET%Z*9%e&nhgM%(%T9uNA`gd zBd9W-2cDV}ZThGP>gs`{pofDf{Qn0Vri3=5UUYu!ywG{7BlJm!D`YCD)Aa}cKJX|9 z_+;1XFHZmc2RbX@hevbm56J5B63~V0KVU5e{%xTTIs{&y0u}n$+6k^N;71rVz>UiN z0h%iX-I?^FNCnjX;NQl;zYkRHJ%B8~4h1P~Jph|(f-I*8S3aOx1FW%_9XzY_ngygE zZZjn3K^je6aL7@dc-rNJ!z5t!s z1FDiCgCtge|NUNA`A5|(Dy zFCgcE0>g$E+`IrYxk{K`pX_%10&N5%83{H3!(7lb99Sdd=s7Tx3l@@(!Fphp@`Bey z{D95qae+=M&Hcd$a>(m-2rD7I5!hTDXtwajKD$Q9y4!eAssuGg5qSZ$mlJF&Hsf6( z$s8I!P?JGNA3sSu?)n$hP5sYs%=K>!|2Eer9j^c2r>A&;4teTz{R41PquNRR;xZX2knOv`SOhYI(e=mcSzwnC z7e$b>CR{<2-l$Qe@(Ux11b>kpMIZ;G2j$LhSc38iRPZI}G)AxoP=gXw3PUe~0pEu1 zdSjm(B+Y^qzbFCe2dA~;FIIrq&}`?y=z62M_6kEKE4*+56``PQ0m+{rU5D@AAXyi* z{KEAEXs#cW_dx}5uM?;$2A%iy!UJ^kb*JwO{%t}X0^P0`Kx-vI>m)va?}`B*>{BY? z0V<9`OM*H>UmRo50p$pY8hnO9+=VFNm|m}GuD!xg0b1e&u2OD5qS6C8f&wZwP)Y*O zQBUA34N34|Cgi9mFf$%})DxHqIqC__gd}({)3OfK#r<)NA>IRY9wsPZLeeOxmdzx@mr4(ENjwe>!L{8q@3h9-zqSJpMxK>%aeyFz;;zHA+GGZ5L=r99;UJeF8g_4n!bMd_aAWz7u^3~{heDu&0LSpsUVL-{SO|80~-$y2_ulbpp*qN84?ma zP}MKpK>cITm|brxN?7~@>4Am?e+wH})l{%;5QWeNQu}9&@Yv|l-3nF+ni~O0Bic{U z;u0LQRdsftfCHr|l+*({(;KV+C7pm)>w!h%K~=u%560JPK)O9ZnE`3sLjm020abN2 znqY+=Ambh{K&|D~Ajg0P*t9|SWIO@Q@Xhc5oxjrE3l2ZXIF9INPv?E8_)7 zkb=~_mVzvufyYib*i3N3gXEQc35|{n`!nDJ!X|J3|A!4WHokel$iUFK*9X+F@7xL+ zDDdcn3>$Rzg1W0dovonmgHLBKs6*k=4c=A`w%t|W7z0BySSLfh?u$vFVU=#yiBCbD z&V#!|Kqm--rhNBTwKy`o5c>M>{|+Gr28Nff!4qY$buiYgAe(EmApkj>$P`BK;!jZQb_%?7gqgA#s=*wrp+pkwu&q!*C9oiWs}^{3{2xY~kpMc| z1vDfB&5XM~`~#g(1rph(1oBJg@fVDc`DT#VE`3lkiGfNy_y`(GnF{VS!gf`H$5>i) zL1(;{igmYwhNM&(8bDn1>9!I#P`Lu14CJiN4M?oN8s)#$jY4{ zLD2BYffm>diR;II|960{p?m2EDt5bh&mfe8RQ?4A!g)yDDgjaq^2$p^kYcDiyQhM) z2c)NW^!>m8FJFSoC)W@Aq+22B_x^jN2$zKlo&pP^#Et@T>@0?vq7KzC6RZIm$C^;V z7O)_SDd3Zx!7<(`@G=%=iZN6}FjxaLj!mJ0c3?sNR?yJ`&9219@wIoDaV!hkZUzY( z)Hwe09!DH6&;~^+B90wET#Pt&MvCKeZ{cwq=Fx2{{tz>cJz8OLocJCZ$FFlex_Mte zfU5;Xa0fU9pb=~iQVELS*9gmwd34tbym$+;5SER28j#`%6kIR2gBqvZ;GvZ6&_A65 z;Pe71faDFHbRn zN~9;CdSwP^`4V{S-x1^%@Fh&(MO)pjZ>(LP)SGm>J^-uh4t)c!2; z5!?q_3IeKkn8CW4!E=1jH7^XuK?fx>9Cv*IDz&>^Us$_7sP_gn6J~gTT5+JY{*2(w zD_W&`;306(>E4hPTudI#FId2nV4yX;91u<5W2#Pc3v~*BW&>ZZJ?{DjVlv33{QaHa zS!5*3`1^AiK^_GeiDn^xYd>fn)%6W%MKk&VI|$prj<^8Y6JM&?4OR>~ajG`})YG^D zu1y3GiW$KQOW1dU9QB$Nd>{Zs6TIAa#ng0&f7`)Mrk9|$GQ=oUm)e7ta)Mn6S_aX2dNHl?Fg;!{bD-e?S+%g1pUxbgs||574c2pnyUI@@uG<@wxs2 zq|yV$$IJGAprwy*7++?C&%y$=F0g2Q06x$kblzAuL#OK%=&9(?)TRpY0lGGD`b>QN z?>{(sT?VI>&f_oqUxQjPS3H`JSfF(Z!GjX8#^sNfplkp>(xMd7VR8UTfv-1tQpyP) z7y?~539W&^;S8F{fhypKh=ZDs&{h)cOjKANgmln5Lr;K@cP^FM4;uG;@$nV7)d=eM zoq&YWYc)_t?FMa%1%*F6*pOX6?QMX$6^psy9#q+rOdJ zk>Lf;n}7fJgE|H;f}CK~Rnj1Zn65&2ydTWxT;F+^0wT_U$L_{zs zprLE~<#EY%9)FSY5)}D=7+-G(MIFfbK`;M7&hUejhaQb@96)ta=U&iEjz{NK(A*BF z(*Ul%dqML*9^H_GF*=XGI12I)tP6|aL$4hG?V{mt5e69tYDqUA5Z?C`T%I3);qww) z<$_xEpat>5`<_E3j3E-Lpf-+2^8sOx?x_$LfSVg$zd$<;FzTKLkM5~p=R)c=Xfn9* z9A5i@JZcHzHoss5o$Cf_ZrJFTn84~RLeoPa^^kKs^+8KpK~v_!FujnNtpB=YhsSQfM?}aDF9E7Vpc9y|Y;*!z7JxHJ0I0WrqT7MP@(_P7=#&(YD9DV7 z;9h|%NUHgOL#OMDM%Ner?ZL%-?*tH|^#H%ep@Tp8I$d8JOnt!zDO5X;zeogG4jMrN z)rXJ{qQi05H;$mDB4|%kw?wz^3y)scOS?c9?Lr2J@4W-f?Sl)<&YPXb_J4ra{!Nem z|9=g-v+@DtT58u59-RT8a=AAEwCnCfXMhCw7Kk@k@(5_i3YslIsd=AJ8>Bs#{|ub} zp{WpjP7mnv3((4a56~V8Q1uA9{6e%1)&}|W@c;jp`Ot*A3$$bvK0EQ~DJZ2v);)ks zQG@vN0sIOLHMl9;K&Hq-O#y{**pq+%L2VJ&2aroI9&|f!v>qr083VnE17VCg+?afj zF_68KphX(TU&#LhP4j~bUa&j(Tem|T@c~rZA3VE9+$VmX~Z0Tm#C!ld!NN*3+UF3wM-leaf zf*N)FeUOsMcZWx>>w#U6eMI2Z!2VA`S=4n$w+Bae=#$P1j0YGmFrENqfo|6w-J#IP z-O=qJVd?syP7CDH;|}1Q31Whr6AL=r$rTZUB|I;egO{O!w^f5~x&Y-I=xr{bnhv}! z8I)F`VxaLm&?s{**!7?RV9;J|>a*7yKgm{9^6@P~x9rR#?h=GRjufC2#I?A+h~|ATWMB9`D|#m8O$sDPV( ze>}hwL7^`?kL{0ur-D`Yz)LgWv5Txv6+>SsTwf82K6qsWDjq>2c>h3~A;1Fz9^F&H zg1xOs^~2MLplCk?+VcV{(vN|g>K>inKdtlVJmK*jvj3Rz!f^(@q{QrF4xp9h*I&qh zHG8ACf~~r+9R?g5)3x6+G4i=7ZBR zs95X{{Q$q8V#ect|2-^SKY;TzXz~N96k#mLs7_bVH8`O14HP3H4^cA>_|{C1&e92p zj5EOlvb}o-+!OH-&q0ra1DA)OD&>GjH^aUuP#=IcX+aj|yab(w1>Q;BdHlu6W9UUs zGo*Y2Z88L%i36GdJpl1;cPMmJ8g%;&Xsf;h_#|ym$_8&R1Wigz=ytH^biD#frXJR= z8~B^eA;y7H;sfx;Huwb9zIsp@(|Pj%cyuO>iB(jA~g@&6uXqS(<{y2Yb2 zbcIK!?*f<31E2W?UFUSTZh$5e=zUin-L9b91wl4`0G$Ea?Yf}zm`68j+(l3$`C{j% zeN!RH1DuCmYzIX|x9bYX23Szb15^k>$~bWIEFQF}3Avc#=yv_{awBLorrY&Hw+HCB z?MFz>g5%G?%>s{Z);AXv8TQRYw#@7PzyF{4qg>~BbhDlV$u5J+f-5GS`=Gwa507rv zO&36JJqGD3EWP*dKWGjgd79$3M>lIPSkdtpuJ``^Z>ZhCP-2Vb@;=Z3*~l)J@#tm^ z2kSZp+4Sgj4;;uZAHx!C=kXU#KT&fBC=;_PBI^=?>RJoY1r0io7mm3eVCZ(;()@r0 zJaEpx4YbT*1!S0NQ3V!rPo9T(6f_6$V$WTOYeK;t^DU6uOs5_|F=cTF7E_v$O(}z# z!Vfcr5wzW>3tT*JQ3Z`UV7kq5Jr+}Skxf;AnhNT;ce}#ODFLm{TLC*o-4!_*9C!jr z2EDEa_U(kmGAMPuaJvnzcvp0LD0uXuXz7J&>9*Z;4m4l{8mKwA?-aZm;ko`-f)sTggzRVph5r6qZH^2t#O{I2XUzx8LgP8<4mf0?6<6aM15nICdPAKb zI$EzFY9MGPYOejk$luQc+E@iz3eyTY1Q%<6!~^6TXb%NeI~@Y&ERW9X@Y<<205&WO z8W-88U!I#BpIBPr(P?npfg@ip1GIPt)E$AB?u{U0K~)X-)(&v#u6o?{52&@>kFMI(0O9uWh^g{8h-m9fP&}y9dHHp0#-so+zziY zlpwkNr4Yz0P}c{v9_`k@|1ZCTi%cv%GPhfZ9vQJAuoDpi9N-X0#t4CWkg=#CpoA0x zlIS78ckTcG*YTiRQ{Mi^?tO)ajtnn;fCARi73zISXnzmxedX`qi~w4s2dZU`zo@tg z>RbO{eEI6{|Nj%ZU15!;#y17QpqZRGYe30->x4C+Hp~Z50{1xH`T=y*3@E&gw}NU3 zuxRg827CwWA9sBKQg*y`#~R4uyW_1F;H(#L7Qbjvr`+1-0V+Cb;}dGz)^`2GKXASBJa z@Olbb$aqAc(-k~Q3P~^$&9x5%OQA!h7eqi^%Lgw{fawF^Vy{F5G6AOX&D6~S#hC--18Mr#ur%ntne%%C@4Z%=ZS-7kcNcPT6s3}ZP zQ?#M#6yfR|K0NvQz$pP7!(RuvEJ_713(A4)4P;UTHzaNx4UL+DwtN~Gs z)3FLc3=EKQ%x+g4;R|Xu;qfV`0SWGye!Bunh4=!cn*lz#r}7Gvx9}@Qoe_F;ug_f)YZ+6;P~$ zu8664Dlk_~VO_KO_#uNN4^d z>JkBuZq{#y6dCsQA=ec?7ytc#849k0a3p6)yfeT{3#|)CrA28e$UdwI7ZP(+%}e>` z|NVanIM=)JO6Dv8zQy&qggKot_R0KKPpo##rW&l$DgL5+aybXWL zCQ!?_caWs&zu-P4fjrd7@!IvcD?CZ#Nn)UcEqg$bVc#O;gk5~@-~X4Ovqf;G6;S&C zJX4O;qPn^t(hLTTxPr$I_aAuX#PA{vl<@Sy=WP4{wM__^Y3cf-)(@u|Z~+XO8UgJe z1kHUzCNDdWzxaO|R2W|AcD-Wl`UG_8)0IxwC!jT$ulqpDE4p2efZJ7~tm>>9ig+a{&TrE0CE(HbQrG1JF`<@~Pp#j(|&>nFH=u8(G zT_IN@1B}0SA-*;Xu0U&Dum(rP3Tm&yeAn9w+Bf6@89&rK4XTkLB7{1}U~S;-YM^Vr zaFmc(-3Dr~fptSHJ#q##%BJP}<1@bi>;8U5hR^(wxN`s`X@2I{I`Nr5?qIhoq!-0M z+ack7BZ|Nk?(zUgjN0d+-PUv#%B ztOd>K^0$C`#9$*q17a zP7JSE_k*Sb@T;e_0(1NM>1UQDl0S-DuxZCvveC{svga<^wM<>(q)*JAV71$UHR2JR@ zS$-V33Bn1Lehr$efL?{l%L2Ch&_0gmppG%LHy;mj1L(pxm~G&}bfJgnJ~Ra_%mU{Z z&=?LZa7saA*$9_{_3nRysuwgR!P>DC$=}t-|NVan+KmM^29)K%nGAGi>6-ulAz>_? zglYo!of>jf8XpmtzN9l8SWtzQrY@EP=w8K|mCD?u|wkXj#VAGCFD(~G7u2vL|o zhBd&xV|a?DOwXg6b=3|e-_1St@BeGb3Ak2r z>OB5}=@`M582DsC+=fAF2XHrJ>rp(0LHh=vV+wH_22<2|{6)r5P#sKUy;oa;)3aFX z6|kSoN!8PN{Kcgspv?b+@g?Yl1_JuQVX_dc;Sb|WTTtl;No%0Qc;F6b{VF7Ff_kr= z$6vI8u9AnUXg**8Qndm_C;%jM3PmUbB=jZ@bTs+{hEhq7Zq|TpiVXWKz!?@glC|y# zC|VwzJeNjLzAk;`(R_p>I@U49F&1>= z)!_+gdNB2$4cnOB<10J^EZC=X^LD!m{cv|b1zwveHLVIhRcuox;1D&UwH8XTa)3@f1G zApT;828P8T1_J}b8YFQRB=zf&#FsKOFf4_t--;x@oS}gMvA8svIhlE>4CUaqOgc;fl%4_AHxEiLh0?2_ zG*lT*3KY)h7^D~`23mrJj*;bHY-}{LImF8AtAV450Y=+H`EpSDq$))I7L?vWfQIRZ zsecVskBj~Tm50$V{gl##+=(tvseOZ8KQA;seezUIGj$Z4^K(>JNO7oISGV}8klvInAK;}CorYHmy zr4|(BC#Mz{=NBnB=jY}o=A|eESLT%@RzM6=EmjCi%qdM($S+dxNlZ%3L9v_2tG&FTUwlOf24~{!no4LQraAaz<*30_X}^P;v&vj%!{Dh#6R#Uy`bzp_;78z{>?v?^~Kvl39?Gs^F8E zmkPOC78EfGiAAXjpo|e*T2PQ*1WLkM`XKel=6mK9XQreoD5)l^CM$sxYHD5yLk!p* zFylatf<$l%2W2FM%wjZCK~WAe7naO@ON&bsl2R4iGK-2!6!P-(6v{I)OHzvq5|dLE zoHG)OKq*7DSOJ!9vE>zpYLFsGctDdZYW@c0*HlPu1*=RD6cmaJ zi%P&mnnFQ-xk741fr3I#emV#n8Yn0v=NBs!XXYuCB<3k7B!YN}AZ{Xv4;J_ddrxX+i!G#bi zFw`-~RY3uiloWz9)AJO9J>C5j6f*P5;=%3&xhg&>u{br}2*fmsPg78cFUl{?OHlxm zV1997X<}Z9fNj%6EU^=lvK_NFWSs}N$6twyk6d(mfnRz8?3TaSUAuYckHBTWe zIVZn3RUxgsD6=G0A+0DiF-1WkwIZ`bK_RiYIJKxmL7||uI3qqYFC{ZM6>JHVnVwn# z6HTqiEQWIwic&#NfT$`~02>TdSgZgtAI^dBk}^w*ONvqxbK^7f(m;6$q`SBzF*zGz zGlU6Fetzi=hOly~2&87bFZ41Dz-hV#6><40PZ$jPD3FPZ*0{5hO7us5((3 zF_;;u3S1sBgS1qDw( z7tbJ9=MaT}kf3-^KhF>a1z*o#X9WcnP;pZd56v*;x%mafkR%Uf<`=|6SfvFii6yB} z4mkfp*)ElN@xH0K@t%2^B?>T(D=7CObK>*z!I~7{N<8!6OvjWIINQIpL;=*gK$sa^ zk_hI2%|zzF&4dYp%uxu4huI5u5rPZWkIIFcfT9bD12Pez1?;u}Q2hyZ5Y&8_?NIZP zxp4Clnm{HhxJ3HJ`?~tZd-}ndpxA^7`-g@oD1dst#U%{YwG7IjyS~AlGD!0d+(-hI zJ|!8c3aNSE_85p+P?V~RXx|m5f*XK}Tnx&YX$s2Vt{#X2HH;LLQ*$!Yut+c{L;C5U zE6*5;iZiQH8K5f$L2CuWeVyY&{QZ66!(4-cJ^lR{-~z$ko&gNd3* z2`W@!m9$@JZc=IyLvA9d;i!-dq0)*{Q=!G>&~E1qWVyhg0!o0zCGp^pgjA=Hf&g3< zLz$zc15#N*-_n5r1i(2|0hCXWau_JbDFlF8TJh+j;37CaH#Jv*0kq``l$HDvb5j+P zA)Qs%ycC7<%#sX+#5@JhJW$^O)Wd_cvO!Jc#AHwh1JvFISq^CjBe!o-^7X+(dtgKI zOG^}-a`Kb2LAF4I;k{N{1`X9rO^}2yy!V!$m#P3828?IWWYDy>s;*6C&}PtO2xV|# z&|=VMP-ReKs9}g>sAI6PVX(7fP-O6B&|}cGV~A#mWpGVp@JnUzDPizQWpFQHa8G5h z)?l#KWQdPvh>urbfFxw7yU{6`63Fk%t4CO0nGAL{{tz!4JuR(j4ISY4MtF}mq8g6a7wDlO5iRJsL(4v;e))O2!P%Jw1*s_tL8QH1J-V%Yi>bFC1l_MQtdE=`}zk2Gr&_HgDt32j+Qv%8T7RrQ&Lh> zoGQW9N`8KhmOezk0yZfH2*4%91X@8g#af}30Zk2hQRC#GaOu*t3kngc*)KD$f zQBW(c(zI46$uCLFi3io;3fi^`#Z}e}*xUg!2kJ3|25@3zz^T3(9Jx9Qswq0y3ZHn@ zVue~Akjt^S8=7K3{zgv#Fh5)4awoFAn3|z>;;r>B1u;O=W0-2f&tQ%U;yP0a4Iyy6eIuQ)uP6PwE55WNLLom2_hB3f;5Dc&$1Ouo8!2s%}L#Jlqv4o;E19*Us zOF;qZSg;$56@pT8^UG3G6jDlyKn+=!)Z)y%lA=<0bz=nyC@uvBaM7XQlbKYMSX2og z)+`2%_?5s1lMt0vY6?gz`Rx_Bz5XQ`sh~kpXxM@Z0&ua4*J6~O2aE&m7a()sy#jcr zXS6Rwpf3c876x#7aE=cFjocC!BM^;T3JSrM#U-h^L?$4->d_M$0|UriDC31LnMI)9 zS6M1jI`vG?%P#^YPf*FCnygyP1=i=ASdxLwRak5RtA~!KBO45Fsew!fdzecBHtvq3 z4m9eDYATn4LQraQetKSJRceX?s8mx3sVqn>24x|bInWGSTAZ4qP?C?-lCXky5EwxI zfz0LVgXVIrKt)%cCKp&dCqF$iIWb2eA3E|?43dRNfySFbSsG1B1!OVE$VAXMKR6Sj zsL)W#FDQ;LE&-JrN}60C)!=aPgfvwY+%j`g6@pR=OEZg7Q$S4|WG^cO=a&{Gg9d?f zK)wW71BwSwbZ2K4AbAel=CuNQ!6`L8GfyEjFB2)46@pXKL1mSd0<72uH(5YkV{lIx zWH6{Pou7tVBY1`aRK7v`)L@OO#jx@6T#)$+E~zEpc^*AblMm9aasky7nV_-=Tnp=g zLO`_`5__N#iOj^D%qp<^!Lu^xu?{vVxU?X(C@rTnzqA-M&)FROImXQLAPIa(@^HS6yT0v8R zY57I!;0dtg{M>?^)C$m~O$s<&=qQvHrz)s}`&^)2LvcxJVhT8JL-UFYQj;^&GE-Ba zs|wTg7(f#?klB(HhN2QsaA06VJLb!08hl|7N-_~ z(p74TLQZCJ2`C_71{Z_oBvZiUYJO2>YB40lK(Y$CiN)DE3aNVOdJ1~_IhjfEsd>rz ziA6<;m0Ehq5YzMWOH!>AGSk4W18abd+9Lu)OD`EDm{?p~nwy#eipLblsuV6Re~34s zPSwp&h}PB3NX;pTwNe0gY7{^mh)ud>Ajz`SqNM!dRJc5J*+a1cXvQ@kT&jU)8j5lu zc_EX}nO6cDn$XaM z_hBJs>L!7lmY1)al$e}d3JUYQd<6&_ltA)}GSf3bbKjt}01Lrng_O)9n6J`P^FZ@1 zsk-I4$+}=wFxgluh2;E#N^pV(&7$gohCWgd++4Tw+0h$sRQW(Hd0E-faT!y0jTv$d6$w&nU3fRS}#R{nv$*HL+ zpt?I1G^3Z93!2K!tV#v>S2YDZX$>BWDF)dF(+ujSrsStWCPKl}VIbKg26)IZWHNwK z3pi0RBr{+J3j@d~xbGB5b`6?-)nWxS_rUz?T$EV?ZWllXw5=3E^AbUm>?QdM$>0K0 zA2Qtl4wQIMQJ~1hpvRyGDg782pp&oI*9(A(eTJeWm?D4B6eCy+sw+4(H5**XFhD9) zWVs;F++!Lj8z751R}#ExpqN2NLDdYj$f5*P#;F!F zC@64nfcoLQTnbtW8qS&uMg~Sk;6z)LnVwOi5SE{roa&eknqe<0$cI$PdJ2v?ISN4_ zc~DQQIJKxOHAN3(0thRFWMmdA6z8Xvl!NAhGm8}pit-_?3{aT|$`25ua}vwJ89k{I zv?w99C=XoVB<3i9W=cykQ;YQ!K9GfEq?c3ZODU$ulHWH$)*A=2lRD!A(zS{f>V z*3AU_yM=^<=EgxY9>EH3{y_@C0j{pj9-xMUf@7$Qr@w-;zl*1zyFze?qo0dokV~)< zB9tBTDnaE2D94sy1bAvuZe~eIY6>XmA%RhnkyxStR+yJx0-EK9E@&u%c9cQ&23SpA zY9_e)0EJItX-P(Y5h%kKfqjQHI6;w|l9~#t(n|6bG7`%`MM_GlLSkN}0%$!@YH?~F zXw^r4UNNYZQj!l2x#H5ylEkFUoXnC+3@?D~0u4Zbj3_8ADge#i=j9iHyW<(DIVqso z#De_1;!IGUhAB)*O-oHKDaJ5OPa(v^HON)LGg!gTUm@HvD9F(-BoZ9nAs(K=3b1%U z3R;M_trXl#D;0t=K}&d2bQHpJ5>qmBGm8{_6LV7Y^2>^|D-|?gf_ex+htS}R)S{%K z{QT@xz2rnqkZ<&Pxp=vhA?qL^BM$K%yj+O3y?;P3NC4DOL8x<$@C=D}bM*8H4RQsE zLOUQf#U&{@nMryXb|B?otgod25d^g_@={YlsUH+9purOjO$9A|UM|RxC9*SI{oT+^ z&CEwOQ~_dYWHhBy~8ofseQ?icDDAJ5CB3|Zu<08&s4?rO(pq$Z}M79o30 zUkkK^C`Y#>GdESCC^ZM1<%%;h3yL9zLWjWIf*gHagX05SgW`i-o&Eh>z<~%MObzr5 z5HaKH>Eq++?-%bJ>Fnbg3{e3i4O7h!3c;gD@lO8!!JsH}hN%J58islXX__D=C`6MJ zb3jd!w8Ui4LJe>%6_$d!R3K4Mrc238OG_QwALa@bM-~Qq8X}G?3=RWKVeq&srZ6Ogz~UxI z?soAE1B)pr7+N3+gGPQK;)Y0h1`?oPaU)YC)u8YNiz+A>DS!$WP(cN1*MNEfh;#z) zx1nU&c+h|{RJSpbp|EI*cUCY$5{5-tyfaGBfyS$$hM=eht%3oIqd3^d-yJNdpnxI_ z8kUBN8)8Iy03;6}$AF_#a6A@aaHK=TkyV2t9U_Y2a?rpz)D&dZkVprsM~(qVq=SV~ zRD<#X#1v#gF%rFQH)|XIMN~FD3R{y;-XOjF549psuik1Lx;(ECEB(c zkRm`!qe4^D8j>bJWmtT2UP&}aDpuQ8qXH&V4e10YgPOq#1<83O)}WCD4Mh+WG%pCE zZ4IqKjk#Qq2{7XWkd3dct*u4m07s`_T<&rTj(0}Zh~zG(V9MPEO6|zTqq+-}>R}E; z4KI)kio+1@0!bk|jGXWSnGug1U})}gbcQ(#EgnG`5=VIXIyxgeOMxtRIXa^_O99PY z{$Z{#hoOZRxEeqTX{7M-4|7F!7+LND8IL=>zy%M~VW{o`%OFQ2!d+k~B!`jXF0dKM zA%+@W;F1rkyTCHo-36AS&|P3NaJvg!-(qzaSO&Yhz)}>t3v32%cR|X2h{I6h5h8=+ zFho2;q!11xCmtbYAUO;*9$h@cAdXT%FIPd;5{~@n;u(f;6j&qDA_!0+N<_H|G9EeE zqvc0X?FVxhYIuQUkU|Tz!o9czR9Z*JgQSohMoxHv%s>h)1vGbot6!+YP~8QVL3S7- z9>G#b4kO21U^9>%h8mBcW*gL5XyqzM2H9B(2zP;`keo$Uxe77^*;#1e1#3cp+=d!n zFd4Yp5blCW!Q4hpc)`qoyA3tGU~L#ocfn+^xCvp(PI!UL zKn^ZwenhlbK|KZRE(6KLJ8Q>-`#`XuL&PRXI#yfT8mRyQsf0P09LIu;j1Pd?2n$U} z1S1^mg4Fg$2}&a^PzxV9ED?@%ba8<>43wD3D%u=fTu?$18kDfnL>Ev~7aEf2?gB|6 zISk=0kOZ>B$O$!&87K~egc!nIh&DEcyFf!7h_)<}yJ+9Ub^)apT;T<31;dgYa#jWD zp*XxihQm@9C^evk7r3blaTt1dfu#@;i3l&S1d_wZiAS&*$PtO=E^t#9ySuuv-E?!WS4<4Ptkbt>TAsRM(9*a-|TDAZ+F+MT5B(n@WkPKd} zguKWUvRK=imkTU|v_(b(vXvS%N2Q>Z1KLur30DQ*J%g&d6nUo|R;k?7Tnz=VO$ful z`#m7ra^QMEb1yl?si47J@SK4{GHj`EN@g)=!aW5%h>NH*k-Vg#2@gO}7$oPF6vc!6 zRghm`jnDxW0$U485gI7Uw6&3@CJJD_)zDNxRi>+pqzu{fAeE2}z^ED&Y;6?`G%+=S zf(1zwyfO!}NfG23gqtA^10+6pFb=^7Rg@YPNGAD$YepmmkWn9m0Jum-(E=_EQAEJS z5Q+$-kBuS(DT|N{4h#xGQ2@>aC?cT75Q+e(YlR{J>(ihJ!a5Wvf}qwsC>}wz9S9>F z0&Y(uNg-sAo6@LyKy6ASEegn^@zB;8!WdYy2w4Oz*kLUJBqf*u?}8cfE|@{@f*#PY z(iX{VL{NkB5$IeTkO%a&z?<6Dz}wn2{PK}^N~NYKgrydNRsj}6rpsVc%DIWj2!nGI zlQj}`6q0llk~I}HG!iwnHIg*7G?Kw78obpLH17*OlLurKlE&gvRE@fr8WCE-IUYRe z>*5;h=p5o1<{07%p4&%k7)VXdNX*MD&IK0(u!f+2K)kbms9#9DMt*^gLY^kn*T|+o zmPLZjlmMHRTBHzOlvq%ZT7){03pXh|$T1+mHOLTRWLaX4rh4Xg@uh(Zw-hx$O*AFC;ZfEKV6Rl@h+qq-D4g$1epWg2Mc28YbmH} z!D@hlk|OYS|4`^^Xz;RCD+R<hMd$ zO#!XBLh>_sK@D;^fmRBsmxB@scvT0oYms~eS_Y|5P?QQ@3IbZzkeC8lJPcY3kf@;U ztPb`YD5OBL0Y&*)smUc!uR`2HX>tLX0!}fA^<0ppMDCCncFRdj2S))U*1)rG@bsWy zt6%_bis@@Xvot8vQBWFz$~xjoByc=srYV5SCmjU?O=|_vrg_{&8A?F~(x{MMpn%W_ zFS`(Hfb_K#z{~to6+nyWz)RX83!Xs>aMi2T71R{eYtjXN zyl@8;d<4=DxQhuh0LgxkILLMd0{X#CGpO^C?FWm44Z!byaBCK(AFK()LF8c2C@su+ zkfT`8<^2OdB4Do~xgXT@23t?S{je4}*bF57FmW9M`eBWCbp0@KLi#~{2C!a`2Q-iz z02(&~djMPb=^zI+$Os(;LvW)NTB?BB`*2gCMGUkF1>WTbZ#AN}y%ZD@lZxXJW+NJl z3JPFT3^hScN=zz7DuKYqY7x`~I(rLQ6X+N&f|@{zkTj*`@%=%68YsPjPQ zeIaSe$xk;lAfySb2uTz8tTL>cpxF-Mr{sK;$OWBkMp#pECa7})>$WH;lqBX6)>M*+ zq6u`q8bM7UMaX^voySI46PoitN4F8ygz7wy9wS1Uz>1Kamz-amK}Zwm*ryC+O~sjc zgf)Q_A!{m0BtjEN5wa%GVRcxY2R^F`n)X17G{LPyNZTeCbYev@ctt&E)j8-0q#RK1 zxG29^Au$JZq+2EE^bpXAkKi^VsGFXdrw=*~57Zzo$wI{s$9AGbi~{Ja!Xj{m0A~b`JpTwfs)7_64&7SUlFwG!8fnz}- zC_ldh-1Wzu%0LJ9q~WpvQCWkPAz9#=R|Yzn5)u52HYBHGwK{ z$g!NbOw<4!90<-Lu)LzF1FF)Yr+LDRM?@3&6jGyjoPmMWKu`-ZCqLaNJ`H9dXmddZ zX#a6;ay)3zCf*j_YsWu$mXn%RqMHFqh~QzgJn+GG$)ID3!Chp?>A~PF&w2R@scE3? zL`uA%J)+>j8(f2F$o_*IT#75e;Lb!i7}W5Dop%cJACiI46HrMt5ULG}f$^YXA+Ll~ z1EJbr27=OmY6<8ZSbfkru%Lk!n4>`lo8qbQjN>&lz@2+TO&v&Q5R!nPIb2f*eEKSm zst{~8?ka&uvoY!l&>6DO;dYd>9MFc^p`8#=qX1GRg2&gf)f|q_U{8Tmf-8QILgcC= zx44v86Ocyap`)lsXL%rpJ7^p-UIVnFR!5-%YfA&vp#sIb4tU=!%rw{lHl*(a+Uy55 z6}nXoW!O4iK?5nu6bv;L)YQ;sE-(kdHSEE~qZM>~2xcy#D~x8Ufu_BI6`HATIr-(F z6Awy?@^cijQ^DtbqZU@6LP9|yGc6v(K#vlmcqDggDrBZ1EC(qEox^}jAE>ti>WLd_ zYJ!xZXapaB5U-J}2|DOGCly=c4mr3$^Dm%@QqZm!&<5<1qC^EH4NWD`Qh#+Fb%j*W z%}bzT)>9#qrmzeJcA`Q`KG=yV`3lv@j)(_40;~jKmvt?~MWC)RvMHcTFTkb{2q2I; zWJ?sl7iAEm6RZ%S6?U}-F`!N(`ZmlUO@#^~91MdptwLsA3YvC^E48t?5*&R-XzD@6 zfvwBQS5O0;{*28&wD1Ax0bxihP(jyF0hD$@BIp=AtPb)67F$7T!Q}@Qxmwhq2Pp-o z9Z)W?u~9(x1jN&!=$?iMyPyk$OanJba5xN`qaa3UVKa(|Ucf;N*_I-AmOKqE)22)XZV5V1W1k}HFP^5R@Yz`jzbs5=^}_R zb=cH{Ct2b(NOr0Xx?vDI?9hclZUW~~SP2IzU~~;*v1L_|T5!>j3c9!jOV-LSDAv|S z69?O?Yhj93v_XW;EYXBPR^W^@@PrW=Vc~=BX|Uz$?&!iG%MoE=YpbAM0x#@Aa>y7Q z4xq!Vuz6SA72Rlvjeh9DAQKTbg6fx4{5E0>d5|lx1S7V{0NDpA0!YnuirAbE8E;fD zQovS5QUd2Ea8^f)eCQc(Xrdrn zULGz#S(I8*T9jwa%LNuuhOQq3_cTDKK!HaN5$%1{ zZn=s^aY+&Oo)9Qd!Ls0i2#|5Qlmji$Svv~8sk!+@m58;-pwj_C5|o>-3+b2WYbm(q zWhCY$r>200C5lTRhhu^c^j3h!m_`uj4kJ)MEVKZ&%E>P^u_(2;L_r;NpIUlqk-7p% z4|He*I=%!xa$h5}BsCYbcoTHGc77U^tE~Xz=9OrI;$BlhA4NzDnFkJ7==tXHzQN9* zOEo~@tl$D!n+;!8sNig3WN2Uoy0fadBrz`~u?VuVCl9pH6r9Zztl&rHDWqqXfv!{n zoq}4NoL`U%U1}JXSqwS|KDeYbB{Ls&wIS^29_V>M8ql@jRtg|%LE~b`X$pMoHd1(k zMr*;xmw`eGwh9!-7#LVDkI z!?~c|D_lAr*$6ZjVkm;R4V+{^XEK6<6nryVX@LUdSaMz18H=EUQq%IGr$j=JaReC$ zPLAO5KX6DPMQdgrc;y-NY&VdjAteW-Mt~eeiFR0{LQZ~uHspjn@S4LC&;|og&H}H) z2QNG>N-ZwUfgAybWML`jP*Jcez;1$YK{*+AlO5>H#N-kMtk=aLhCIMm)`7<@K+cT^ z9oHCbWNHf9%K<7U;o%I*qtJ2{B&MN-B~^jrS5pC!{y=3bcFVy78_*zupL3d-2fDHh za&}`{eojt)IjE39TCoW`^c=LVGBXc;sxbI4EYKMup!*p?C)2HI#CW3aQa%{;LOcW0UhU6tdLm(j|Z>@aNt978z{)*!N~SwVYnQuC7al9hB63?Rqq*FsJP zR8W8`OwP~M*TSI$={$Z=eW|4YI@w7*vU(TS5Jyj+V30H~7c7l~j?sdr<{96)1QV6cj*WhGt+N*eVzz2^t$g1&w&QYT@-8xR?T`Ptfg88nD)xhC+O} zr=PKr0%&qTK|=vn@hI5XDi~TA7+{ElS|P?@aZpVFtpnrZ!P6P>3i04mxk5lkuz}8i z16?YGWK(=_hzqz{1KkxB9}h7*9$nN%!O+su(!kIMJemq}6ZB9y1v^_%KL}Bh;AQ zgSvwtbHT=fZnz@aRFEz$g@TeIkP(Prg4~%EuK_9!p$8;^ib;g46=30@qYxkO40S5W)d(_Lm^K=6LhvI*xw48Itoh3Ak*^{ zlynrZ*aGr423BW-c20oXTcE%IolXh5r!qBH1J)V@=N8boFZj9? zP(XndB8ph7bq}rr5TqYkgn~*Rlw1$pA(&bLy8IMe7=tS5;u3ItD`+Jbm&JpsFHi~r zcUfTN8ZQ^9vI6h61J9oI^506I307R>FgF z4|q2RD6K(SB(PkI?hwd?l7a@(zC#@a5C^~I@B{^7fa=kd6tFIcXD}TC>3%_-g1QX= z-9_M_0s9J{6BHD12QJi4gnR)q0p4Z@CuGRJPKdQ20Z^KN1so_$K?$R%Bp%#o2CG7z zth2@D5lGd7>S0)sl4l6d{Gd>T2x}S|8H$9z8!gKWFs( z=+X0|X?1=y(h1PuvzkG5Cz2TCRA^K|&^0!C8Fr|GDVcdC=z^8S`k=XaurNq9WPdQM z{SFd=*#tVkA47j?QBfY~_-If|I0xKZhHYoGDbLJH$uBPkn+z#jK*b2w`^!KQh++-p z&KpokuK+5QK$i)EdrhEo6_Bp<0&Oe=celW0AZS@lW?or-Hsm1q#N=e~@zc<<4BC1E z7jPgu^|h!mI0){RIzw(t0iA0OKMjG3BaqM`NLVTE>lhIqEK?F zth0w>5G3pr6wJ`%z!fi45?Rj0Kh(*`H6DDoJ4o7~!omOoK!F7vE&;b#;)_y~^NUj8 zJxlQTh=Kz6Ac|<1^{^q5ocz3W1qJXmy77<$f1%?fPzmVS44?y0ArlLrW+hAmXmtY$0`Y0UXNWOGY`9tl6)LSL7V`x z9u#Jvqzc+fix{FQNz6_KwSe*!5|hD61DuLeQj=5jQWEn@AZ(j!!Uw7f?2t5&`$6+s<;mdY zHB=7dGp&r&!~)200(hJ-9vt_eJf~m_zMN7=0jCOZpB6llghvg?KcH?qNFCU6Xh#*& zIt51*WHc0Blz^O-siTkuRt?G);AK^rU;`8~6>Jnh#S64BuvW+f9|i+b1{xOx(V*=e zB}K^vl^SYbm<4ws$S@>Vg1B(A!PbMqJvu8^!B#;Rd5R7+APG{epnz~LBn3fBFp$l9 zpl$0=RS0FU1WHgLIG!M-C~nh0i4b8DqPBn*J|NrS9s(6X2(<>-od@v+Xo;Jx0uCiG zAK+C4ay@+!SfJ_FJ8<3){80r9!D9m{f8RW!@ zkwGAt2wUuck`g4KF(L$eqJUNuAa{U67VLd!VFK|1p_DcHS_;k?sma-(W@KJ!Id~iuJTL_HEZ9hJV-ge+Fw+zeQ|joEffR%|q64%R zqqw9fIk!Lq>;-svr2}bBX@b^|8X&D3L@Pp&9D!T}fZT_^t_K>+;GhG^gM6ExmzJ4c zT9m2)@-EbupeY29JjiJ<PSU1R6WQTBt0N5Z2d!VNlJcciH?F2 zQuJwBLGLI_O+hZ_A(Q%gF?lh0D5W>ZIPjVWT|?wT9qLbzEGT3PDshA?G!=la1(X(Nz#2%P(a@6AiV}tVypnv-8UD%H@FW2W6toOt2Rc;@k`s_Z0;CX}-Rx|^ zJ_YAk5&|uz2r}jgPBR*sR#109Zg@*g(NQQV0^P4wlnUBZoQ|-9j1UAB7a*rcRN18bjL_w9W<8>Qm5# z)@CpzkTe>r2Pr0?8ql2qDT%;c4$!q?sqpv#IRTtU$*QhFkp}Sqti=GYvTb3h1KLtV zib{~3NHGuMf-rjS1c@P~To4yD4hkxY5a}1Sod9Ym5Vi=1i_sj6lo>!)gD?RXLLG~o zO)~Q`;r$2&NKCAJ%)+U8XJ=TA*1@BiGNUs8diJ3PcQ@zp@SR35apoq8C)BIQY`3@uc9>2mMG-n z8D=jutZfuvH3d?F!zge;We40+c+mm3KnHZOszNSkKRn1g#o$SPgnG0R1g-o~IFE>r<@+*Ky%%45)G zCQ!WqzUUF$$%H3#Sk=Lphbs*Eu=7y*3|`R0d-G7J^^9uzCkGpF|rCY zn}W&`h})5p28PA(jt4v*v8Gu_%t8;rL?l~~6TxjNXs&~HYGJlO0uUvWfi7bMk4Zq+ zltTNapcy;`t+dP(Xg3sU9@3$wpwT|iG$d$Uh=LM0T;db+5_2kxGmDj=%F}Z4LAM{~ z7Puj`ogrZWiVp=)=z_Ki8Gt5cKyF708Ca$PtEdl$JnFP0IjX_Y6Ii zA_;UuTz)}n9(3a%$U3mEz@Y}|y<_tiI84((8a2R%f&x)TL8&|m;&O;9@EHb@LkcJm z7dfz?OIq`wx1xe9Qcx{c1h?IE;5LFMp+Q<<7$c-W640az4m1#7UrPaUEh;ocDS#H# z=YX_Uf(j{6aDkRq6v3|Tg=fE#+yXZRTLlepiqKThP;hf}R?vdBEDR9s4^VjkYe}Y+ z7iE^DYAC3IG((msR70EL56`a znt>o8Y`U;T1JppIC;$O?z5{VU7_S>`5P=Hn-9wEe#f^xecaq!)av2DtI2Z17^hkgV zZxDzvP;?_|YLMY*fr~XHAiCf-gJLQL=_AVHjNLW>y^ z-2@*xgL@1Xq(rz0t_NCsf^Nw}-gk!L3Akb;3qS)tpxPU9F)VoI4p+$v3Ij|dh#N#h zwGrBPP|yW6#EQVzIYF}qD2$QS!V7I^EF&coX!I)}dWMkjLL@!(;tY09Jh()M8VK?f zlA$0j@|Zt(7!M{8or&C5L>hXv24dz}2Js(MAE3pAo4B$vIF73_pUL z2{(@zZz7qAGXVg*$TC^jz!T@@db z2WvA!6sMpm)-y^|P_@uAPE$}dhm+`0)< z$f{Bl6hL8!)?fk0QJMyPtP|7>R?yYe1#gvswp?M|7KLbV@fHh~R{*I54|YOQ0IZ1( zH%Zmhq*y^g)yNp+G93k_8pu)x1%+T&A2$V%8M?Zho>mNIfr?-IZ>4C1ghXy#pa8T(AZAO760T44KQ1g*HF`2P?NXpSnL|2$t z0h_c(QwVn|v=9TeXh64OV7CytO|6e`HbO5h(?KqU8cmF+lJiQ?Ov2(JOhu%72IMBJ z9s#8wQ1rkHa`a>Y$~46~3QCaF3MYw9wlE9O%>^YlkhvxKC5bsoI#6vWW3EHp@U zU|dK`5?9KEgdeP#gPay|IYbFM>_=R2tFHwrE0Q4-0lA44nYpF8km)RioYcJZk_^zX zO5ommVsZ(1+ZX5ra#$@2YB_;37N}?jwE>{TGq@o^OfMLzHGynSaY<25YMurnrGh2F zeRxphf-t!K02T(@4QbvX__!No=x&DVfw~=JIHFq%;-Tu$wpB2J*VwRBfEav=$wOLT z2Cpzc0RkHID9<{PIN-=fswF@pFNl5!ERVvKBgR;;Nr4I_Slr<(f0SbKoIyJoLW)vT zt>8@u(ACw2 zQpge@Pawq$#no^LQV2ssJQHLG)Mwx#Mguy}2M=qI=fJxVKnraYK@(`!3V4_3fJ%fc z@F+1-<_B4URLFq1APh@8u&@RN0aYr7=L@c&J?Sn=wW{Vecx?(bT9R+A#q5`qy7dVfhlwhFMm5C`S zsVNG&x(Z$aj_?6qP)Uf~u*24sMv5@V32q7+8le4=;G1iTO2G~+*33kTW+WZp!WDGE zC)$Y)nBh_4n37Tq&N`s*0u^mWdWMkl0@k$!t=7woMUGF9QuOIosFhB^L|BbbOQC0i!a|rrOTkA#5wZiTR&KKc0t3Z8kHB~-B!cEl55dp+|&J8_ar z6dY4himWIt1Yu`p5w3;3c3=Ku$`_Ip!0H*^Ycbt!n!d4QB=7DM%dJ5>s~`FWWo`Cx-U zeRuH44&*?FM9@JixsYS5&`kzyRZmS!&QJh%@by4@&OlfJW)Z|8_^nFGOiN2GO3h17 zRY*!LDF-be0l7fEB)>o%e6ovrQhrHEey%!bu@*=MY^WaO%0z5ZpnDS`Ls2OR_m$>> zThd_Hflts+1f7Upl&_$UwD(vYbXIk82FL)&!8WNW3W=p9`MHTDnV>!ocs&QGLkrRa z>Nymn9&ZEM_5+$k0q(zXvin! z;-lM zc;YFu7#t|D5CcbNNoH=U0{EmDkb9ul(Lk(=*Fdrl#K{Dm90T6l2(uv>bWe>sR5{o| zpuo#dj#mett%oCMQy|G0WFaIIVh>3L$6|$o#G(>VY5;oz8j2v*#o%*BP^Za2xd2>6 zAkU8_7NsIme{pI-Vo_pAYEGq|f@fX{s`jGPG|)w_CHW|mZsi%7kYs`gXOKNe;SLT{ zP(lM8E(N;bDLp3@noB^Iq!uALM@Jz)54`;jv{bJsv8YlsjsVU&mgxq}a zX-SEB3i)|3J3!Whu!3ivLVi(7Y7uB9Qc)?y8fcON&+&oNTz-BI*nU{DMmjVEv_lJ& zOf=zZ%0O`m$`>VIElH{AnR$62Q}WZm0-&SgQ!?|?^;1%l^Fa)hd;re1rJ(h=nR(F6 z26s(facOP=C|7~D*5o|mts&Z3HQi~MSVNO%mQ}8TNNKVWH zt#|{eEy-6fP|!%KEJ-ca)KM^0&@eViQYgT_XhzGZUBqICm;ILOhcSxrGCi z1aW#pM?oDtm;gS`L{l9;R0X^C78*Py`QQO$&|=Ku%w&bkJoF>UFukp(;0XyraDG!z z$2d+!9UP;X#R}lN*+IEmMA(78E|{Su{TlUL5Izf&f$&=|c)0aM@I> z13J79>=f8`VbmSfdU|>a%AnQ0X$q(k5LXu@W)>+Vg6|RmrvpgoqM@k+HXURexS)a9 z2#!?H$PuL&H1?0!0*=^7;t1N23_9Wjve6mTqfk&#Ff=egRSfDTfX|EabM$qM_i^=e z5AlGiRWLRMZy<-&l+XzX@ZGzh@P%i^;u3JB3_f)$DOI7Qs5CDb6!oB(0yz&Bnjpso zI0iZT2BTR7wb0Z6uYHJoMT&)>0WIjRN2oOj%GkgFG%yD0i)1E(t}lbkw?G!QgGz5` z0)s3PFILdCQ^?Is&nQU(B}njkghbHA)6i<62$TwQQ^5;RK`9ryz7*N_NREjQa&`3a z@pq074si_tISK0faM0mrMX9>bVjEO!fdV@xvlv{Tpt=ZDnIwa@s-%Kb9Kzu+7bjIJ zfcN-AWk9jP%LVdtNCv1Y} zG86M44Rf$V^uU9h&^5!Lk_!3QIYcgS^6_`}jt}w=^>gv`b62nc#RUlKYbiLwj*x>L zLk9{!@J-~PBYjd*L3f8Mpy@XO=>=hA{m4hqAr?BoQifkVo&6*95IwMfkzj(cRNIKFrZ4)HUAU-w9+r3O1-PG;%aGHgPjR5(eE$l$oBFSOVI` z21x_(MgzP7l$4qVs=Gl=hr~2cod#}vK@(?c3T%lFIKaW>X9_6Sr=*soCYLDWmzL<} zr|BkvPId)t;!iDx>}i5|9NF2S!LBYyjsr6_6zY(bfP4l%jw%dv8X%~!23uB8l&YHs zIq?tH@`UCRu&W@&I#^|LVh(g_H8Hsabo?q*9i&eJj$CM@`ujV@2ZuNYg@E0GNf=ZZ zVhZYODS+?D&df{6Oil#VNGKrysuaOzNkYREYB|`Ekfe%axvL*WXuvHrs4#-F;S6Fe zhr}X=-H5aV&IypD7$58zc?I0Xm650de3I)FQBOv;pK2kYwmyQ2-x%kdauN0iApY?MZ>0h6oh^ZCTNRl=IL41Gx&M z44jO?M;kzuq8bYBt;ZuN0_lTb(9R9W-p9L`Omi=p?< zfwC*e0BrVvDg=mIKq{aZr#&Fm(7FxM`#`q>DBP4#Aaw}5iy3Q7U4A%>@3*X6sajF4g|Xr zM1YD5u*0A&19)Et6vWVB94AnR9(=zac+U(XIy7_*LAz`~wJ$;tv|}hERUtPY)Xjw) zUJJ4a%t1)QJDpU_BJ^PjB#s`7Vb}H5ZjV;C_2_P&7m1FTGpg1mxcg`z;9CK<5 zK1&#UzA!>1V#l5qS?9Me{8 z9#ngyoaO=Qrh^+rpw1%N3CEz+4!HyYcBV13_=6XSS_E-8wE}89XlV!3caWwA=p13Nn;>lm@bSoqGnwIM%%ge&bly0n<0`tk zx{w(O&_HGhWGD?ZHUz@psl3d@oXo0JeXumF8-zMui9Qtp(ni*EsYt4!{st{igDX#LmHn_fMlus zG!3W@c#)t9%A_FAz+F$018|0FC}dE#BwxW95)?krF)!riXfcriid6lATP2XeC*Q;h zMYbSn|)_!Dru z6cmnNT?k3US#t56G3Yl!c>Ja{PJvIRQR zjnhxyk_|md%0W{eXj5sh(gS28&ejjsR09fLaAbfoEw&~Vp18oR1tTi(I}BI&fE)*l z1zeUvB7r>fq2Z6GK?x0fkV8OO3VQ%4fZE|8C1~xUqC}*2AuQX$vlcY(ff63dlqEcS zA^ZeY3Tg|Zw6%zcQQTS~1ud2=1`cW5`tZapPEABdFfJ3&V;Pq^MClI-SELM$7S%ZQ zgF2;?)H+@uGcq6m{s1I-svd4e1?;DF=<V= z76-gB2}v+oFpI1~Lt-Vcr3#>^gf8eSMo`gI>qn@Da#)|Uub3y%#;>0q@ zlqjg7ms+F_THOR+yI~L345~#z%@JsKlJ=7OiTu$cxL1~mXDVZYKGg^<*u+{`>s#}(9ehNoG0C_oPT zf{lTL)PQ1}kV_!)kVAD*h7{lyc!ExY03|Vq1+V}HZR1n$Ni9pwfrlze766}Ch%f|{ zvob+Ms)Ac)QE`bv2xwJdei68^3J1;PD1c^iP?HiUl;% z069Ynver)lHUU(uPz=h;;039mG+UNflnGvCg)j!GIEO2PB}Uk`eDH=r4aj5x$WM;iDD8U5_cTmz% z0H+&R>IB)5o0^-OUzQ3P!UGqdpuA`ps{<($;3A;2(V>=uawl}67<7ReO1cAOK}fO# z84kLl5}t2BVGSPX&qjAVfiTqN_6~OsM7nEv8T zX=-SIu9QO>DOAu!%~_xj25Eu}?19=}n(%Qc}sknF%@2tOs3| z0Et7&8eT4`(6x1_bquVSfTduNONw=M;f0I7mICOAQ&^n`8qZA3$w@6z0G05tOMl^p zfTh5zO+YSJuvJilBrlMupdtsO`bV}0-24W&pFypSVg=vClH?3{-2uu6;G#FTKm%eN z+#X#!Sh-DfBLaCVH&W?>(L#hZsUY*X`Dx(m`oMnD&?L4I;(~TBw)`I?V%Rn?1;3NF@bkelv`XHUO>Q z0{J8jbm|dE2gEDjK}>K73FTw2g{_g4!0#|Y$}##{3NHD1NPQTPRiL~I)`#RcY)Kq+ zND`>%2I)batpbT86{RL-LqirX268dtY-$jXB=3Ma6`-X@ko>MdN5@0*H^{-DCDJKn ziJ*OTuu>i*42m$M)CcaffyCjd86%=lvN)vZhcuoLi>;};CIG%F0jW5LOj;Hr-3J2d zD}at8P)IDT$jr%11YaxxAE<%$^&m^GVYM-Am0D^FxC;tdrmLd>T7wDgsOf;VmL-Ds z7ZvL$q?ROu2g(%OGV>C1aw>H|*PlbD5>ty63Nk8-LE8dh6UX3n_^^3BP%)wf-gSdy zdvQLrBUcRCjs!a#3DjVQl&qkI;7IinXqzUebxhq#2~_1EU)T*vF(_kp@I@vNIZ&Mg z@&)YfZipzzWw6B}5D`!{1R0PAEqDQq5P`a1Y2dy;NKOH|c009LAs4a*1H5w)%GAWKkyoxjOI^I9fuKZ;vVI1nQl-*{Wt*K@JpG(g9bYu$CVvC_xDfbmh5HFle?pKTRPjwJ2W! zw7@gCv;eZrjp&68!KsNwp#8S_MGA>|3aJ&D#o(n9kS!^o1&4_xAb%@>7nP>Kce;Q! znSwVPAWCrL@C8@C5TBN3WagwQKzfK!Q*F_gDXD?hLE-i%C=5Xas!$lK_eR( zpt0)AVuieX1@I^_s1=onR4jtFQ5C_r|H6tU}F#1vrZHy%lC_AX2nFyp4grS)U zv>F1`cU7z5ucS9_Szrs4j&Dx2=L2Y{3l7@@S;M z1XtvcR1DInuZ6Uf3^|C9Ljz&Dt{o^w!&D!t@|Q9ywEi?#e(c-$hDE zND&9mc<_h^HC{j|3N-c&siz_PBEYi;pjriy33U__Q&JQ_dn_QEt)Lr#K#CBXlR-5r zWOEKk9K}SC6nKYIW{Co5!?r?hVtQt>0%Xq?EU6%e19*WLxKU~g%3qK|3TXu;WV97j z03ur1plpxB4AenvL?BXL-9Q)ALGQe9goP($#TSuFy zLGwT;)dy&K9Jc8YPynJQLy%^iom`~BXplZ^mP0o9AR-CU;X>KxqX`+(2knr^FG;lm zH{(E+8fZ5aXr>8#)^{-^wWLCB7*_|KPXXGL4qmJXYv?Gb=c{gVT3W})A63EmOk%=8S z*wB55d_FxSd4L+Y;3Lt%y$R@mCF;D7uAKtt*0~~3#{s+(Hz^gqvl6t86EwXCnQaEg z0O&Lk$Xqoji9kYLUrQmhAO%zoB6c}JCpb~91Ze@Kd8jCOZ9Sw?(T1!HhE$@uc8CN4 zZ~1~6H}D0(;62UIi91j+J38e63RVy%dddM*eWj#;+Z>R=e(3%ra90mpAV8uS)EP&; z3J{dhK&l|M3Ro3ld=u8LBqpOl3x9B;!D=I@{{b3;FG)?omOU`;hXMtFzLr8VQaVXR z3=cwkHlRF-@D%7~C~!vvI$j8AoPvv@%ru2!#A*nTufbDTSiKEN#dfxMRDkC^L2ked z8l0htSYS(h^B1RK(D^mc%3f&m8}FK2oaP`L1?frWr)gj=5`>owphY)GsZ66Fzc{l5 zw9ykf@0^>Om{$zGl2akSKt~}jH8CBFbbf(Ceu1?@6{uGVZn`1Pddbf#ODzH&09BF? zx(nG*!Acj=gT(2HXq+WMd@iP>-I1V?jY`UP`foI=mUGt^jR^f|{3zmM7RVpkw2;Ko|6Z zch-Z>;mQTw%K#&B)VHNQ0_^jqiY()aGV3!u#c@X!maibQs{f~^9^rhJggKuu40K7+S8 zpgjjj{DTU+;*!L?l*FPG__&`!QYENE0&0E0JLtjilOVu{DtU6vBN@;6WmAgC@8Hdde2an~=5@Ec^;e zij0k*B_3!+ftDuR8BiPYK;1snlQ*C;Dfy64MQSB#fz8v_1}`&4Ico!|rxtWr3TRYH zS2qvgeb6pz(8&~-%|Bmo4-OpGpoX^re4GZ6u+Z!R9gqRF3>2z}0~A0>0i5(fMFZ-X z6^da76$VfMH3m9<1PTa{84B=YMxcotj0SOBRP&5Ul z=7Ne<$d>MmR0Wiv(N%B+A2I^Y8KCqDi%yUmQIef5az7zW!B!zpK@}_nSr7t>a+vc$ zp_K+2*TXVk3R-dwI&cT%c94DGrn$NSf-N7E*x+k1SB==xZqygU;dw z<*H~yT{|Na9R(v@J3})a1!G-1i&zxJpn?E2=277W1qwDc3L4;DjYtkx&{aqS%@|o| zg4fw;7$Pb(kd2^n1TArZjz&=f7cKAo*%g_W(3H2iaey zkegbRo(j5YG6!vF0i+m&!4_-VDrnS!{Gq9!rht4r3sM3FDXxW?4r*-WCxbI=a(+rG z=o|--j}nve%Tg5*p|^5^PE^QGDNRl-23PWk@&{xTQX&I60qR9~^3{j*1d##|sv-|` z`7PS%I>-gEV@iqwqF{j}Jy05Tg&eYmTB1<3RB%km0^NTKvJ52yz!r^YAeRr&5)V{O zBix9hEhx3HG_|-SH3gASpcNUY2n5$`808;KfwnE$F)q-+gO`^eBfwRrCR7VN2%*I` zTqR`Ajp{RP#i=Fn;MF9^vu&`Wd_bq_fY0&)s{k#yg;s!ISAjAmxH|yK+@R1#&c)!9 z%*qps;r(6MNkX6ojRI)>0BGG9wb0^&iVw(!^jmGSW<3VG1@g%Q&@qCWDpl7H3lYqEoTw17(AEZ3aT*|7G!aRK_+Wt#@k2ual0ZNl!~hqh!3Iki zAUT9h3U+q33b1?w4?buai5>?uDk{Nc9q0%+8;AWi8)?is<_w?rwL=~tY>=iFiCDk7MO zE>}SG#ix8u{3{B%Az=wwxGYi6Yh)$533qm1rQs2 z&>l2EKvuy@AVil6e6BepjKKXt$eN*&d<9TTO(Qrju>jOo&&e-OEiM6_F9|w<0nrqK z1gkb^4j5ZqfTaiqt-1!e1XMe~8X5|rkh3R)3lfu46+$wQS1~}6d`UiN6#~d5pwNeQ zSFm;NL7|M%qsOdNKxqZEe*wD;yt)Og>q{&Goz$TKiTnICq*g67>OldOpN87o(g0OR z;Q9;Pb5a1ehd`wPWIz-&I)U7x1og5q$?9c+dJCX>kmz0yB&tC%07_#T@CpwzktslW zJ;WzAS3eglNewB&LEA4#3rHP>OubY+(9$hf+EV}rEjSf`D^1Yp)`{SrEjU$V=A|Q2 zXQl$q{!1qI{tGBvXqX+bhY;4x2(8>enHYM$8@S%1=I|%DfQFoE1d3!WaE0Rx&y?T= z5#W6apyglSy>+13SCl1l;B8CLJ}xLvfsCMflO0|gfX`5b*amSn_H}FEA#;$MVN2F< z4rHR54EC_Cf~m2EAv7H$n-7{EEG{X6mkm%pYz7t-G*Dg8K^;(AA2fIbYC3_2-xSo; z6hPSxCI;Fzg=LKp)D;>UV1|v2f~h8GhfiX028f0kpsfuazW}SzQZP1F&<1-FJ|Y56 zETGg3R$;4v!#Jc+!Y~g>4s0x>7rppcWgb^#)03py~;1H-IuZ zbmiJ%T16NJ9d=?ym$? z7v@9GfQPm}Ajg7&OJY#^0=qpIv|9;nH!LVXp>YjgKbIM+2R0nki3bf1fWiq}PJvCa zwT0P+tN|ni4QNmSgVrNP@w9@i0w_X3%3v58A!-^}j7B-z2-Z|ZYCnJ`t-+ZCTpoc; zM7IrmR0c=_Y7NLgu*^^O!86Ep1E9&WKqHPI{g55f zx#+9O!Gq->c@0g-B6Lqs#3QXBhn}(xGA6MswJ0$iw6p|7LNDS#PB~x`z)tjoFKB|5 zNuaf)C7|(#eDH-LMWAC4GE%{16F5cXCRTz@pDU1(*xVi6C9zZY1iUT_)%(M8q+O&{6<2l%WMa znh!C)1ojO|K?thsARz^>_CZVH5Ua3384fa*4I5sDuFe5(sDhOz2xCAKW1&7iP)8t_ z>9BQ_pu`I=K@5m3H9&bAyr&;)j)iA&E>VlN;I$XXSVzdY`;hHh&{6#)Cs4{N zR&Y!PpUn^N{<66bL8GM5{0EcL#W7C<&QS{Boz7ZFGc+J4gG;7@k|LA<08M&<*36Ny>I?VkCRjee z(pA9B2&3!1K#`-MfIB!5ORR?Gx-XoItB6{5rHfodBiCt=lfIB!4X}f>6f|H|~(X_+By$OFxzC!+WY+(H7Cy{M|-XY4`zuBQO<6t$a25J!R!PgVf6d_ctm zw2lO|j52i;vUC*EauU-aiz>m*3mt__Xypnm0HK57;4#X0SSt0pJk~ zBGiG~V+x?5WoUy842TQG>h%!J<6(C1qi6xvl3#1-|A*DwaxZF|5Qm}#F4uLCt ztrfE1BSRnqU>J+#ASqCq19=B$l8ep)-}MCZ7_>tL(u$06m=02c;zjhF4pIQa=si4` zIEY5d@*pko7EzV{x&*7HIh`D6T;vf)T+WOF=SI~ck6(5+CW`~%?QXEeay`w z$o7NS7#R#C2*RL+wxEL&OY%X-M1!1)HS2(s!cOnQ<5-Y>oH>ke>yW653gi@6s>2o} zwuDPrL{kD}7z~4w6t*~k-gbf0Us#F)kdg3X6R|rI(LlkWAGytfz6BeWWfkxY7J=M= zj4_K`WLZ!P5H(n^0h!3!nKxHX2zA*mQ9J4BQe! zP3B110*Q&59neww}uZpg9ZBnr2XajB5UfZrs9-iU4m)1~+c8Wkj^#g+(LQ zOpanA<(Yg~wQs=zh9y&@gc)js3@PiQs>0GN!x2r8ObptC3o7M^X^tV9VmPhGT8X2& z5OPl|iS03v6Ol_VR3p(FWVoD%+$zJRhN!j-)@B)AH%1eRUy{2is6jBm-4s;EpmbAE zrHD_TWaJ7+i;bX#pn?iVrT|Hio-shW5Sas;D`=H3KsJNZ9d=9MTibD|LCz7_jG(xm z0&h#w_Cr*i8gW;qny@vS+Q8U9%xGNbv;m&Qr7iA zF^Z_J2a1ki(e;402OxDvY6*BY8#c-fy5kVE?-zB}3)KC08ka67gBO=36_+5*>;{AQnI)wqso?d| ziOD6PS%W<2Sze$;anxJ32Hjx_o{fdL1H9lwp;!lOH+UT{lv$FGSfmDBF0NG!nsERP zsX$vbNTIJ)3_c&BBp-hWQ+1P=%ZqoswFTn3z9Q#Iy@^&?+TVCxhYw5z>f>aquz-tP2CdHEoGPPHJ9y z3G5(9P&6tem8L}-8-Ok)ft)i8TKXPs3gUxS1%r9G4zg3wRxpkQpDvtR3|EM9&>OUL zEvYO>1uHNFnF|grFxLpg1-q=cq$nE91Fd=l%NfGYR0oeD<5<6_1D;$*Uhxr7lvS=LeBN@it=h6u3}AZB?NbE_Mp=$vC8p0Y2puG&Sp11Ud^2b7>u@A%nb3 z3jM%)=sYfXa0uvmjWWTC#fMmjpRl+d>}7l*l?7Uf0dob6 zMuZlqEJr=E7^Vh`WgsaW!3B~+8j%EXK^VMnK>^z$dQfOVf(bQ-K)S%rD<~;~9d?U4 zZval3YHFZ06}ool4SrZM0r?9NV|dg-D>0C@FpR_J$i^WZv5T^29A*TF1~*->L@jt6 z5cOPKka7@43qd3sqF?mWl;1wg9(7FwD$$}23P({k1 zkX8%GJ{<*h19cq*bzOB7n^E0^NMVp{H~?i8!U>>&0Vi;9)`gXI;G;=l?OBi#5XO=a z@vqGSX#!zHQYE&mLUkX=41Mt7Z{VsIxv^ASQk0pOj(Ru`NI3|@4zg8%wKQ}Q2m3XLIJ#|2_6u*DrQXu^gC}r z8Ok}oG_NE+G%vFx8uiv2a14WdgN!LorC5Ui;(rbBc&Y|U!G+5&)bR>tY{PRvQfV4$ z9S$qxAe-AEv4_ao@B#<1-BSmVfUyQ8YDI}7kWm^R*m^05+znR>PO+#x0n`yNd>y6K zB3;^alu)O^K{;UXbd*qnhy0EbiZR$bN+>N4TTnj(araC#gjWNvX++rNybBi`O9=R*My&J3*83OEN$MC!kI@ zcohb?H;cUE1G&`7c=E0}m^YcF?#$NdtsYYodYgprOPQ zRm(`!S{Ph=fwLd9K?6D*1#_GPOBNjMplN6#nggIT1jDel3%EBl+ChT`3ziO$TYb3N%nLnEPo(si1S6U~}J8Jhm;h0(5C4c;hdq2?sf~ z%@r(&xbd2_8ClSNsYC_6 zR{Y?JTIjembXMKX)5ldoD=jkxy2}_Ui$3S6pamHc0v%`spX~&-I#6t~h3@&RsR7M< zCg&DtC?L!0C@3i@fDcQ?Hs=VBSx{1i_sdbvzX0tpga;?+Kr{GZ?BMes^9xe*kdD6q zIZpxXGpMsb@rrtk6`Ti>X2Fln&geigI*a2 zvJ7&oDR}MxIe;*RJW?w%OEkdqg3x#YnGNk0AqNpOoq}#iE6YqNP0WETZGq0hLZYr1 zEjhyHq#+$iq)7&(O9WBctVn)@7zs)ZI6BUdxiXM*K^Pt!X_+aY@w;Lx)f64o6l*2W zL2ZZ=PC>~PRRmNVfo^$4*azEV3?2*tO>~3IhXx6nHK^0b@bp#7%Z0dPnTjO{c$5yU z0D-LNK%S6*tlkLn_XT(GLAMb@V+lNROM@~3;jAEk-+0iZSUl*&n$m*!5YQ>u3eNd? z#U=4Bi6x2g0U#A%(dbx=26c!vwm*2h=3ZEzrPfU^G}?tRAQ^j4v)oO$L=g;45DH3f7y zbxBcaGWaO7^8BI{$W`swot}x}Y@BMqkp{8_mKi`!f)@@T4mp0p8AZ{Vv3l;QCGkk^ z0jDX@WGrZq1S$GJc7rflaDjv{f(&}X4z!FcN-ZhMOf5?VZ9GqgAIAhvnTSBmPg4Me zt0K4dh{0XZx!C9xz?6VlcP*$j?RRVqXw zuJF{rY}M*0;GBCv_8_!Cgi?q(F{G$~c^7o^HY5k5CtEA`^ST104uj67QT>0xll$1hI|+R3q3hSb&oj$^=~uI*t)J(BZ8Dl%N8Q z9wsFggVwcyJgp1vK!Nr*Kmq}AY6&r+2hjrxb}I$doKgkVVvG=jTwadbM$oJv$N~l*H2S6GW(B>aJ1?VH+840>Z80s$YFhH?F258qg zxJ{e_zqUL@K?Ahf80o?taJ_(h{tgihKah8zode{sL7}3diFW27$fe-cH{#qukPtMh!{Y%I9PnMkSQbx#N-O{;X>mW-I z-9AuAfV_dSdIOYMq2(5qyb5n}#NACZ??tdN+ekY7-enVVT$l9{ZKT3nKu3%Z^faXTug1zMV00PZ;?78jT1f({7; z-+uwV_Ny$hC==931FxI{EfOd$$u9yODwtW40j~P;(=eI;oEzM{!dgh^Ybm&->OyNE=z+@lY2XSL zwpa>W7a>;sfxHD(538|ocQe6t0h(%91i}j{G&g{~h|q)O>^zVYz)r;427tK+OMU@6 z2airdPD8Fu(3>n^XM-wM)S$w-h@GG_L1tmCjWApZ4iB($q)kt#WhJy3fiq0->&9av zq>?7XGHe<#>_Hx6f(&ZK!dW$c_l^hpnIp| z3-SxVqa2{pLII>RJtsdYF-HNmf&|oN10NU)%Kk}-If;46sVU&gsN>6X^9zbKH1!Me z3t()8g2c=s=>7|^b)b>~)D%igF3BuQ1l>UmD%26>BIs0jUM`06+~oMg(vp0=33prccZ%2HGGxVXTD zWO064NjYd|O=ht|K~a85YBI?ANtH-u<|LMb%N6h~U?r(Vd0VVaQ8qoP^3ZQEeQ&NjS0h5`ZSFFPYv8gOGB{c{t+H7^D1D+PBwLrX)2{5%DvV1Kue zaK|85g%E##pI`+y{~(3n09RLM4+Td*7X`;q7f*i$XMYz@KX--T5Jx{3#~_zrB|R=K z$Gl3=MUtQ{4)_!_ln_oW%FQeRg>XSpJ|qOdl?_;7UVcetaw;q>6{UhsErOKjU^RKE znc!0dL4lH3T9T1p1Ue4Chzo1@fnqczH8nRi1>{q3$0av0B~>9YuTr5XwE(n+3Ywsb z6%xT?*dSwzOEXInlQMHMODZv(&jrdOAngUEMFsiAsS0`dMG7EmGE#F=6pB)d3-a@d zGm~<_d$hpzq@<>$CYKarn53r=;^7+Ps^A%{;ODOp?idv0=obeM+)V%z%;_ONV4Va)FLeL>JI3u+vsVF}` zJ5?_^QIm@cl-EEQJb(*%@5GY>L>2imvlpO;e!)d5Q1Y56%h`Q;!@`30$voK>t) z4!YGjDOI5$wFsmUlA=LD3ChqV`T03kTnxGjNr}nXAdRI33i(Bu>6xGlRX`(X#URO) z)Z$Ed9tWucSRRPzg@1Q0Fn|LWe*>#RNz-*oe|R@Q5g=6_lb- z0&d1YM%*+NKtpcOiXCi(E_BWdq!&?2fpamOn+!@xs>M+Ci76={#o+laP~)mt0doi* zxp4(;hd`RD;PZ?XK=&bl8(x`t3Q%)lJ)FGK+@w_S)zF}TPyh`vXQpK)gZ*3#%AKGf zPR`HG1y#SGUaCTBMRICtN@|KCxGc)a%*`wT1Spg`I&x+y3wW6m|v%Tl>HNTi6*G3he*>U&7A7z~S)s{}FZu20w?t|DUik zFg$hm`=5n_fkE5x?|&5z28KGvzyDo07#LnT{{5fA!N6eU^!I-c2Lr<*r@#NVa4;}% zIsg5Chl7Ek$ocPo7ET6+Mb3Z!t8g+fd~p8z--VNb!OrFH{}fIJhKVkJ|F>{5Fno6T z`+o^11H%p1zyFVLGB9|!{r&%hlY!xZ+u#2zTnr4#?tlNQa4|4!bN~C_g^PjVx%=P$ zDO?N;4?O< z85m;y|NhV6W?<;^|NFm(n}MM?;P3x6+zbql0{;F#!_C03F7WUFH{1*i?*sq-=iy;s z;12%#Ux$Z*AvO5#e;*zOhW){R|L5>9Fl-L_`@e^Wfq^~r@BcMC3=GksfB&E1VPN=*Im0 zzlN8AfiM2=|0}!<4432o{{O;9mLnzYISE!{h3||84jg z7(D9#{*U2jV7Suu_kRsP14C=)-~V&?85k~i{r$fO#Gm;0{~dk?hVV&$|Nr4B8Ute*_sAPG9=_Uq*<5;l<^@|80aA7^YnP`#(mAf#KxUzyE85 z7#RLt{ri885CenpwZH%O2r)2ZT>Ja~jt~Pw&fUNNS%euFyzc$|uOiIAu>RTK|1QD| z43|Fr{huPtz##MU@BbcQ28Oy{fB&x$W?-24`|tlV!VC5oTcc#rW?(j|c<9 z3!Z=fO+*+N7W4l5A0ooQAgTE8e~SnM!z;yq|Cfj`FlTm z--V5V;fC?Q|0!$?3_K?P{P5=G(5oKU7HvjiON0fnKvgN=3J)#T@pDq9WUn9!EU~cp8{~3_D&AU-( zZU6n}5o2J8wEg#AM~s1ChV8%qK4J_E?`{A6&kZ&cLAM^zVO&I0M6ar+@!T#2FY$o&Wux zBhJ83Wr9{~HMghTXyc{_{vOFnkIA_g_bnf#Gh* zzyBeU3=A8>{{1hJWMBx3`1gN`Bm+ZV#J~SrBpDcvMg04JMUsKxY2?5EUnChAentQL zFCxXj;2!_)zljtBLwDl8{~=Ng3?=3N{+CEGFgz*$_kWKR1H+f{fB&yYF))aLDt`tB z2F9u&2F3~jMrj^)jtPwH0w8f21_lNJi@*Q1plU!ANE}3?s%KzOVPIeYsShyu`@eyi zfq{Wfz>QDBi=Vrkqk+L*%38}KFi>G+U}(_&_dgz4 zo+%2f0HoiAk%3{q?!W)K$nqIrX|VnjMh1p6c;s6c85nNjkzc~dz@TOR_x}cD^O;tI zEdbengpq+^m-%0u;q!!%fnkmL-~YzQ`t!ir!R}*WVqn;hN52Xa1H(o<`dye97>=0# z{XYZQe5T1@3qbBmVPasgvH1Jn4MpA&F5kk$z>s9|_y2Sh`AKm3B}@zqH}U8{!olQZ0n9?i_m z@=S1Z-mo$-C_4ZB{{mznEd4S)hRgG?F)+Mz#_diWHU@@Y&bZ^*hmC<@zsukM`6%XR z!OhQMV_@KO{rmq6iu`f7d=DD~!!Fmq{~eL#YrxXra9qR2z;N63?|&JTco2uj!x=UP zhU;#B|3@L~X9@)y0E(wKYzz#7?zrW7*clkS-T(gof};ODT)z%G1B1NB-~S;f^8Rpn zA9e6V7MOm z_rC;W9LKu{+C6Omw?M(;b34m6aM%AJQRP-g!|(Q2Lppw2;qU)t zDE?mv@*cRJnZn7y@GRl)|5Q%2aE#yts{v^Pg~J|B1_tG4fGF%J{0p)-HZ$vSF4cvSiE(V5& zm4E;Hp@fqsJe*><7#R4g|Nh^^hU5?CwQMl+Yq%H~7B=Eek8`*f7=oMr{@=rntbaS) zeS5eV7~XgO{eKC?{g}d(vHvOkdl>DIshK@EGBRwQ*^J|KVX^FgW}dXTL)R zG|quX-iDWfAqtOt3@-yiJ`QRTUxnh1Qn)*K1Q;0hEB^bRfRf*$;rUHRfPvw^^1uHHDE@?Wen9s72rw|% ztNi;9>JP%xGqXKhe~thHL$cbx|1l`~Asuy){vH7ahWTp${#T*Mm%_twjQ|6~Pqlyl zeNg1x;qqq$7#LL5agRg15ny0&QUCWp97TT+TtAN>14Fg?zyGsQYcn&m2snyCt^${x|GPjs;P$kF4FSo6#y=Hw|NUn` z*3a}CE)N{4lU~u=_ycsI~h4{%4?+H_71g1{7X@gdpRR zV#xUp6ka^wtOqg`Yz}Drb+h@u|9K!0xIZ8RSRivipzr?g{{vCvdg!(&$OoXYOc7BAh95Ei{-=Wc z=fo$_&*aJ{(Z}q{r_jsd%BRu8>cMBw#^%9i(ai44=a9o^;mBv;$fx1Nr{KgV;lwB4 z#K!?1hm8?sU{Hwt_aEd9kWnBE8gDHTWnhqq{r6u0B!Gnf|7YasXHxB8Vfe(ffsujX z|9?io$hpi63^!R=H*hhuvmRyz3ku}l6kuRjF2uT5nBk#NC0NXK8Z+w|K8Ai4P-DHB zo%JmrLnjAo7e7NkC+l*4hN)bvNB9}OafLH5?Brp6$j>l??=i#%ese1ZhOLaO7a19z zF+$82wD`fsz|g_Lx{8P44aW^;umzg7UD6B;t7KTGs4@JMSNr2Lzt_w&2od%C>fYx7t zBpDbO(x5a6{DgS$>=%P1h{M3Z@PZezej41z1+8O%ic3N1 z4^VkfzXv1)8Uh5-EFgk`fuVv4Vm_>`{X!7J2Mx)Cm9RnhpdmF7-x_KFH;BW)z#svo zL0u&%6HI}+USNg*#C@c|L;F!T2TY4{y&rtbH@iLUquRHK1eS;@DFJCqub>Mjn^2FY)O$p*pF(|DDrOlwU81j}U8I;}zrH?`B zYf$P>#*_5I7LuoZAZ3d;?pmZ3NPJ_~AP`V9DPlM9Sp!7BGbrr_rNf|f8k8=B(rr+B8kAlJrP1S&5Wf_(C4(U)H7zp_JY0~Omz-0Y zlFFd04AH5rtEI217FSbeW2b0qZ>1Lv5r&fi`H=k1z`()4z|6o9hRkPVV2FY988|@W zWa)4|3s`*xlrI1>09MGrO=n=>V^9F|ZWqJsVPF7-96wb2E|NG%I}cR+KC(C?0|PHq z{2{V90|NsWRQxfLILJb7sQ6Q4aV7=^L8$n1WN{V-1|g{UOJs2d(0VqA`(LAp3q#ev zMH3f=ioZt_7lVp_L=zW>ihn^9cZQ08M-%6SivL6s2hDS_LB)R~iG!k)9V-48O`HWP z&QOAg7f`sdLdBWT#1*09EJ)&@^*~BcadsqeP&}$a#ktVL)u7_MXyVFHaRD@O6{xr{ znz*~Ovz3B|yI-iLf{C7mo~eS7fuX5^nUS%AMo?;sf=6NrL|oUzM3VtYv8A4=9?0Dw zzv9Bo42%pG(0U754Ko81LkL!JW_Ue^s-A^`0b0MIinB7n>OoX-HU@0<2QvdZ1FYUb zRnNfytG`giIpOsjsyG(|tiDGT=VmZ~mg}hEJPaGKluOJEybK4hit{nR+7GDa@G~?( z+ZCwd0t_+FosfmVY-R>Qh6!)5i3>4+mKT8)ArZ_B!tizqk}v}^g9rnxeS#`3%7Crj zWM&X!_`wfpPoSz7XJCM~Gf>4P7#;{>Q!mNDAc{>K)@nkS0?I2a3?Kg^L?A3s`;3W! zm*E3iIP)Hs5q>B2opC4w*@5`1fcE#*$0vXt%YR75oXyTx`8jyQD(8Rl;>V43} zr$WU8(8L!)#Y51<*FnW2(8RYx#beOK4?@Kg(8Nze#Z%D4Z$ia0(8QlZ#dFZaKS9L{ z(8T{j#Y@n{*_a^tWfC;MfY&fHFff4Tc0l>aNe$E*0oDJI1f&R69|9EzuUTebV997;K>8Goj)z_1;kNGf;6*J^|T~1{F_Hhu90shahp#8f1`rRzbzVYmpfk z7?wiSJ8Gb+Kgk41=M_-@!um^+%n<*!L)C-VBr`BDctFK(LB+vqkr@~m@}S~wnh^8B zYmgZj7!IS{wZ9Au44}2Tpm-G0ho}dy`DI{W z@Pev$hKhsN`Z6#u6hp;r3?S;kYkV0P80JC6zZgQq!E1XN7#I#g#cPcq;xO}HLB-cW z#ldTNLH%boh&z`WL)3%T=z`LlJ5>ClDMTE+CYOPM0klRIPr9J$Q+y%n=RxcJjZkqWe~37E?JENV!(FJjSpY;FyylgGfq|79V(*GTh&W8W z7F7IB5JVij#+8AAAqcbvkwJn%0_q;vxJ*A({fsb(dhnW81_p-RP;t9(h&XtyD+2?= zBdGY|1c*3zZ7ZlB$OG}O0@Qq1`R@T1=Vy431xd*nQ2(~_K-_Pi3^51129|+=VJ%dA zNg6~Py!I6o4p4D}Jcu}G8Xc5RL3cMMZ85kHkq2l^Q z5OMI@R|WB5ZzJ6E%5r?HW(B4Rp_~uH8IC!lqXx$$l$iI>d3!wFj5Ojde3o3p< z9MVox138j`fuWWU;-36Qh&h*_;V=m*?$`_w2d#w#Y1sx9pV$Er2d{l)U|@I%6~EC1 z5eKh%Wnf?s;)j?&r5hp+UhB%hzyMnN26BH=4@4Zi#+8AAp&P1xb3a5Jytb8rfnf(! z+=TwL|EMF@NfWkq7VF5J!BcS0h5iBmr@B$hRu=LL;2yy3? zX%KV3YhFS1ks!z%eg+3l#F%_~TJDpdU5c8GfL8dnAehGS51^<5Bg@Y+@e z28N$dahKf?aqyZ}1_lNlVTgN99D#^~*NB4hBUHTN0Yn_UW|M(|p%p5A>mfuOyjByG zAEDx3A3?;yYcv@c7#>5#Q(r*D!D}-??F12sy}VqIdW7@?`J;i%T*vNI=pvXp9RKK4Cb_NyQ;v1a%LSKE!<3czG>UTox)0UJJ&+zyR9& z3QBLSCJ^=DHDC-34BMgV#jPRY;I&o^3=G$y;sH=`@ER)y28Q2IaZ4MBdhnVmQ2SOC z5QYoUQ$1HstRLnPGv0O+^`EZ-%Ff%IUGOB936mtc5-*57Xc zi(`%_bb`et7=DOA(-p{A1_p+yVDp7B#wC_P#bNU;P~{BKINZ4tY(D0=#Cb79Uj}9d zh}M?HF8&Cto|nN=4HC}awWACS4DZE2W2K033|RTbERNkA39vXX1E&SV9PnC11_lOG zusFyCsMrfE&dcD&2~iJTyA0}&fW=YOf_P0JuQFhUXD3)aFGHF-#2oP2R8adFD!%L} zq}%|nO=n3#Z~u0)Pwf|GcYg+f`%j*cp1D^A?m?vb3yHVsQ7Gi zh&Xs{CIbV*WLX9V1qRGb!^<#P8KNFGZ@365&V3FN z4&XKW3=9k>!QvpBQ1M+H;vd1{ybRBv;Rfrk{ez01;)d7@UULpAuOzXjD=n}%FT-;W zhP8SR42O6YSe%#Pq87w_@LFO928J@IxW6Jq99I7H zK*gib(#amMILIbcd>QJ_Ca61M?Z&4#)U!%q4+lvph<`JrA?^Y11qbz~!0LG!GF2er z;I-+XaS5pSduaTE*R(S*Fr+Jh%*Pz3^@FPSlYy86%a74e@%IW4aaj7vgNm<#mK)IG zoS_CP-lhpr4_@QVz`!sGD*j;)BwfMcYadt~HOxS~i(qkHhA&Wmf!EA4FfcrWiua?1 zznC=0U%U*Z91wfKdnFhc7|f(0;U)(SfAARqp#C^mJ;)|h90yfz0u5*Io_q!dhJ2{_ zJxPf9;Ijr87#OC5%T>(r@HVJ=bbDvvuy-8}@xx$oUWOx3|ANk(0lD}URQwGe#66(B z86a^H8BjQYSg2SBEY8btO&g*fye6K3fx#Xuj;a>K3&A0tjzj#d9LQeG`Gsm6>ickr zFTx?dRR$7|=;hl{9O|#*5Pyk7{0|OsQE>c%LIf3S;t;n7i}Nx}wSJf?WJfrNW7z$ z^SMy*4bXfIK3fA+uYt|yWe}Bxgadf55d#CmUa&aG#i;la)STnc{0=@tgMope21j~$ z3^s?C;X)k5eDI_@XuJz7j%qfD$0`rX7a$fY-ixFBm%yQ34=m2hAPP-au>PGlSRB=C z5HA6Tcqv$%mm%yWBt3xlvVp<}EY83H+T0J)55xE5A>pqGtruY7^BJt3mw_8vZ-V#g zfac@D^$Sclf|kc2ZjM9TTLEJ47qobZ1*_*}aDcYkq1|zYT(CI8J{YSPhxj6}I4^_V zEl49$EW1SLk`=FPbtYS zDvnPqtzbxo9c-p&ZfazTT~T~mW?p7|Vo_0IWjyEzw@L=^@wM?OrMbD44DpZ?>><4P z%)HDJ6s5`W1&Kw)sYQCp1qBT8Q9c&gsg~TPF{RC=pL7VKPTQdv$!}jFC9&fXCC;x z*Bq!YEH0c9Q{n?a$B5=9#|KyDl_XX`t+#ZoC;*=z8}C{HI%KpsGd~Y1WrUFO4~B>t z8G7cGCFW$N#CwM$Yw(7}tD&hQ^knP!pwx7bS%$^|po|?Kl9Usll9~nzI70)+loTBD z0WkGJsma8s&k9HmHjEE81g9!|24@8%XF`=3!JGs-VKd$}4|K;)alCVGL4bD|G<_PH z1?Lx)#6z79QU`Y!vPUf7zV*y2PAvkZt^h+52ph%6#vmU<#KD1rrY68UIoK#Z6BIZ` za4C?jI9z8Ab{)h#$n{lNtu-=&yAO0N5y*MqOcG#d>Xuvr&MwHlF$X!4fWm;}%*+6Y zLlI`+aj6B^rEuFoDsk9u26t;fKKP9P07FwK3neHGL9T>KU@AcpK~6!2Zkc)TB`DLl``FZiq z8Hq*30dC+TE7&mJ6_O4yjLt$g8WMbl2Eo~x1yDo4`G*cx zzxpPYBxiuiObq)$@niv3;|eOI(ES3EHZ=7tj(5#1D5->%ImyBCSQQ#T?v!#YN-qw; zp~l>^INmw2xCEEHp&>{C=qkBHP;Cab-vaDq*SzGM{NmJ<_>k0!k^peIUz`fMKCC3Q zq6Ajd85x1q`hZ$9&iQ#InR%t)Y7CcpLkpLDc){)rIbIjtYXJetxmm$R@xex*LNdz7 z5MqZ5c#Ur{Hj`Z~A*bqQmZgF{Ku`lid{mSVD7)mP#Czs}R}2$nurb)T_;i5nhXf#U z8xX7MV71^h9uI30;#LPq+~6i6ZbcBoU_~M>b)YsV*drnN*{ON)0g1&WnR)401J=;E z1gxe2q6X|@i0=sM1*?Swm^ZX-jLizLGKi7>;8U+bP59u_By4H}k^{1`k|2=>@hV&k zHs!9CkaM*2i$G1uC?7*&^cb4MHG!M>nR)48Cla9-qz;-Pz}GUmq$cMiLeKHW<~}6# zu6c;|j#Ey4ayFL21MF`jNKnDrMrf@^Y__->8W%uYQs6cu*jAEF0qHV^#3rae0xoz! ztvMnb0Mcp*vCtV>&=kkxiec|$NUa44Zn%1E9s`Gmp)vRpK2S>i!;+97a-s?8`P|Y-PsTyT%K8yoB;_?SVIxgcFhE}>cNGmkD)n| z6%ZZRf;2NAGr-%(5WUL@D(yj8$j8tU$rys(GDT7h&!`}W8etUqphht$WQ}m@G0qC` zHZ;mFh%YM5Ni7DsC^H}_AQ@asNBMwTq0n0_;!*5Ew<;5(<%!47u7;+F(g18RLwuBb z7=7)dmFK|u$H)L%BwK+ zVrUK-6NpD@#)10%=xGCNsv)$S0&3G>rWKGjkTN5qAn^4W@xi5_n;CLS^Gl24K}|X= z4JA;Gcd(8(w)g?tVrUeamzf7@ti~6E>QH!( z1lqaC1b2l{vN5PQFD^|o!e%C-05L{RCm=201_VlYqP2BFp#<(*!m?$Mzb`gB!0M2* zJ*f1-sn8I7u?BSP#ydGFlOeyfq@c6}It~|H;$vu8keQmCTAo>)8V|Z30(@^T$P&xc zqN4nw_}t=j25=L$v?Md97_1L;0|n?R4KOD@%EuIZDOnjvlc5EqPYrFW#)DD?s9X&I zbNYflrj3xqq+&EFv+$zKl2lMJmw35`E90vz?A5SOecq2U{JyVAGD6`^{qMW>Z z&_E>QvN}`+pnI~53-V9}rwjfmD(YzG)K_Ip7+x7<>sz8io!7=Zw_k?0CP# z+|&Sg*#|8df(_y`8H!7aic5;n^reFCa$$&%GBn6d%>|8dCxb?wpd)A&u<{05Y%|11 z8JU0!ujCTwKq6>NG#3)z;M4~mr!z7EXBB9{3%-sRmSw;tNNQ0D(vS)$ujOSHmq5GX zxeW19ro|;inFZj1NKgOx;*yliy!g`M)D)11k~7df6lDra{#76aSi;uNJU2DhsJNua z#n2U041ldnP0lC+TM=arj*`-(fMoE{r=c;*z$&(oNCH`ulZqCJxv9Cyxdmv!4NeZp zkmL{_WoQm5@Q|(zDg&97hoLbyF*A=LJ__!1XCv2u-Iz>Ku9}SAk;F6dX|~!(;H6LX59Lnx711#d+8hBHWG1WdX^c z0FFYpujSz291-E@O4WpJ5an8p@^7*y%hlQjv=%*fh7lqcyQF_q~@i7GGly{p)K_k$8GdI?!vQdE+UR*9w+r6#7JY6V40N+yQulZrtj0^k}NsjLJg zYEVUDXbK+XMsC-l4~K)iWD0BQ_@)*YC#I(cBg__9QBT^wJMn9cxl6s8lv zWlV8Nkr6EO$LC}wCC4Whmx5an42dQAnW$b#OHV~liQvqK#cU%3P-25PAwLaNAZF&J z7Y76+XMzeN&_pb%(M6DZ#!&_1ql}T~JHewc@!%mXP}>|*IAM)OL&K1GH%}kecqe~< z?@WgH`1Fd3_=41;;{3cs(4BwrWd$0F>{O6EP|{P;~&R4d6B*LLRghfFT~K9!g9uEX^!RMR9IP zerZ8LDteNN0(CEur;c%UbRgD&+lTR>>Ke^2@#(qwd61k1YM@3LBK5hj1$PodVR3#D zPG7<*m$Y(FcL3Ec2EF3S+>*p320c)20@E2V7I-qNfI%-Wza&-9(aBR6l$7-{5{ok! z^inGGiYs#=bV(6|UV2`sURi1pXciWQ6JNxjSCpEQ2+{y$737pK=z;1K2EBru620{N z5(Yg`Ka4>S9QJxe`JjS@K`%7}y7D3;r3k@e&`VEFjtAYrS5OiUzG@I+7^D#nF$2a< zsmx2v%}izh*#WYPK@VbbQgJbZ9_UWL)Vvb3RVHL}LHis)dnsV+aA4;qSU?3}>yTj< zfYid+AR2T`323hwR5|>7g%GF!Y@ZBBEeONbO@r7V4BDRvI`Rjq9DWW%1yrB|y8i&C z54OGz#s}?>2ko7ODo32x0NsH80wf9Aj|Sa)0MidU7YMX|2V@0IKkQtG7lI(yF)+Z+ zGlK9ydmUgb2<;Bqd-wl;K1@IC{09~2Q33xT${1kog{gzlpnZ&>vx#7Q*f|jzpojtO z4}|Img%QY|F!w`+89=KDL1x4B!_JeK0o4yX4+*3Oqz9%S=6}$60U$ZpX$=pc=OaCU z>W7`j1X2S!g9%-KIW%0M!3{s3f&+A*0qEW>kflf%WDXLSp$JVs>>LXNsDAL>VMrQa z`#fNDEt>uf(DN2HfDSZ9I`0Z*1kC*~ejA#8*tr-7p!yep4ibPV2Hk&##0D{Y(DcL3 z&q#=ez`(EqO+W11jtOrd`uCt6+=U)~knAZYGC_kUhqQnquU4L!{`eP3=I58`eEmVd>~T)9R>ylP}+sq#sEK8C?XTmVVJ zG-J{K4$Xepc_t48A^KtagJDLXrytP%YLHtXszDn$Aol+dfr_9dSakiMeefVB!p;SN z*#pyW2NQtOAhjSSj0P36P@6!)aBLn55rypsf=R&iA@iY81QP<&7NQXSE9Agj23gP^ e7^Lunm4Bf82~i1A2O}RCLqx-& (int, str): - """ - Print the summary of the comparison. - """ - print("Compare Custom Report") - print("=====================") - print( - f"file size in samples: file 1 = {self.file_size_1_samples},", - f"file 2 = {self.file_size_2_samples}", - ) - if self.file_size_1_samples != self.file_size_2_samples: - print("WARNING !!!! file size different") - print(f"Total number of samples compared = {self.samples}") - if not self.diff_present: - print("Comparison success") - print("") - return 0, "Comparison success" - - # comparison failed - print( - f"First unmatched diff ==> {self.first_diff}", - f"at sample num {self.first_diff_sample_num}", - ) - diff_msg = f"MAXIMUM ABS DIFF ==> {self.max_diff} at sample num {self.max_diff_sample_num}" - print(diff_msg) - print("Comparison failed") - print("") - return 1, f"Comparison failed, {diff_msg}" - - def compare_next_sample(self): - """ - Compare the next input sample from both files. - """ - if self.samples == self.file_samples_to_read: - return 1 - val1_c = self.file_1.read(self.sample_size) - val2_c = self.file_2.read(self.sample_size) - if (len(val1_c) != self.sample_size) or (len(val2_c) != self.sample_size): - return 1 - - val1 = int.from_bytes(val1_c, byteorder="little", signed=True) - val2 = int.from_bytes(val2_c, byteorder="little", signed=True) - - self.samples = self.samples + 1 - abs_diff = (val1 - val2) if (val1 > val2) else (val2 - val1) - if abs_diff > self.tolerance: - if abs_diff > self.max_diff: - self.max_diff = abs_diff - self.max_diff_sample_num = self.samples - if not self.diff_present: - self.first_diff = abs_diff - self.first_diff_sample_num = self.samples - self.diff_present = True - return 0 - - -def usage(): - print(__doc__) - return 1, "" - - -def cmp_custom( - file_1_name, - file_2_name, - sample_size_in_bytes_str, - tolerance_str, - end_samples_to_skip_str="0", -) -> (int, str): - """ - Function to compare the samples in 2 PCM files. - """ - - # check for python >= 3.7 - if sys.version_info[0] < 3 or sys.version_info[1] < 7: - sys.exit( - "This script is written for Python >= 3.7. Found: " - + platform.python_version() - ) - - sample_size_in_bytes = int(sample_size_in_bytes_str) - if sample_size_in_bytes not in [1, 2, 4, 8]: - print(f"Error: unsupported sample size ({sample_size_in_bytes})") - return usage() - - cmp_samples = CompareSamples( - file_1_name, - file_2_name, - sample_size_in_bytes, - int(tolerance_str), - int(end_samples_to_skip_str), - ) - - cmp_samples.get_file_sizes() - - result = 0 - while result == 0: - result = cmp_samples.compare_next_sample() - - return cmp_samples.print_summary() - - -def main(argv) -> int: - if len(argv) < 5: - return usage() - retval, _reason = cmp_custom(*argv[1:]) - return retval - - -if __name__ == "__main__": - sys.exit(main(sys.argv)) diff --git a/tests/cmp_pcm.py b/tests/cmp_pcm.py new file mode 100755 index 0000000000..a54aa2cf11 --- /dev/null +++ b/tests/cmp_pcm.py @@ -0,0 +1,72 @@ +#!/usr/bin/env python3 + +import os +import sys +import argparse + +THIS_PATH = os.path.join(os.getcwd(), __file__) +sys.path.append(os.path.join(os.path.dirname(THIS_PATH), "../scripts")) + +import pyaudio3dtools +import pyivastest +import numpy as np + + +def cmp_pcm(file1, file2, out_config, fs) -> (int, str): + """ + Compare 2 PCM files for bitexactness + """ + print("Cmp PCM Report") + print("=====================") + + out_config = "MONO" if out_config == "" else out_config + if out_config.upper() not in pyivastest.constants.OC_TO_NCHANNELS: + out_config_in_file_names = os.path.splitext(os.path.basename(out_config))[0] + nchannels = ( + pyivastest.IvasScriptsCommon.IvasScript.get_n_channels_from_ls_layout( + out_config + ) + ) + else: + out_config_in_file_names = out_config + nchannels = pyivastest.constants.OC_TO_NCHANNELS[out_config.upper()] + + s1, _ = pyaudio3dtools.audiofile.readfile(file1, nchannels, fs, outdtype=np.int16) + s2, _ = pyaudio3dtools.audiofile.readfile(file2, nchannels, fs, outdtype=np.int16) + + if s1.shape != s2.shape: + print( + f"file size in samples: file 1 = {s1.shape[0]},", + f"file 2 = {s2.shape[0]}", + ) + return 1, "FAIL: File lengths differ" + + cmp_result = pyaudio3dtools.audioarray.compare(s1, s2, fs, per_frame=False) + + if cmp_result["bitexact"]: + return 0, "SUCCESS: Files are bitexact" + else: + diff_msg = f"MAXIMUM ABS DIFF ==> {cmp_result['max_abs_diff']} at sample num {cmp_result['max_abs_diff_pos_sample']} (assuming {nchannels} channels)" + first_msg = f"First diff found at sample num {cmp_result['first_diff_pos_sample']} in channel {cmp_result['first_diff_pos_channel']}, frame {cmp_result['first_diff_pos_frame']} (assuming {nchannels} channels, {fs} sampling rate)" + print(diff_msg) + print(first_msg) + return 1, "FAIL: Files have different content" + + +if __name__ == "__main__": + parser = argparse.ArgumentParser() + parser.add_argument("file1", type=str) + parser.add_argument("file2", type=str) + parser.add_argument( + "-o", + "--out_config", + type=str.upper, + default="MONO", + choices=pyivastest.constants.OC_TO_NCHANNELS.keys(), + ) + parser.add_argument("-s", "--sampling_rate", type=int, default=48000, dest="fs") + args = parser.parse_args() + + result, msg = cmp_pcm(**vars(args)) + print(msg) + sys.exit(result) diff --git a/tests/conftest.py b/tests/conftest.py index a4678c7d28..ef5f46ffc9 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,6 +1,6 @@ __copyright__ = \ """ -(C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +(C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -450,7 +450,22 @@ def test_vector_path(request) -> str: path = str(path.resolve()) return path + +@pytest.fixture(scope="session") +def br_switch_file_path(request) -> str: + """ + Return base directory of test vector files. + """ + if request.config.option.test_vector_path: + return request.config.option.test_vector_path + here = Path(__file__).parent.resolve() + + path = here.joinpath("../scripts/switchPaths") + + path = str(path.resolve()) + + return path @pytest.fixture(scope="session") def reference_path(request) -> str: diff --git a/tests/create_short_testvectors.py b/tests/create_short_testvectors.py index bb9207b75d..3b92bd8e45 100755 --- a/tests/create_short_testvectors.py +++ b/tests/create_short_testvectors.py @@ -2,7 +2,7 @@ __copyright__ = \ """ -(C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +(C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -50,15 +50,15 @@ CUT_LEN = "5.0" def create_short_testvectors(): for fs in ['48', '32', '16']: - in_file = f"{TEST_VECTOR_DIR}/stvFOA{fs}c.pcm" + in_file = f"{TEST_VECTOR_DIR}/stvFOA{fs}c.wav" cut_gain = "1.0" - cut_file = f"{TEST_VECTOR_DIR}/stvFOA{fs}c_cut.pcm" + cut_file = f"{TEST_VECTOR_DIR}/stvFOA{fs}c_cut.wav" cut_samples(in_file, cut_file, NUM_CHANNELS, fs + "000", CUT_FROM, CUT_LEN, cut_gain) cut_gain = "16.0" - cut_file = f"{TEST_VECTOR_DIR}/stvFOA{fs}c_cut_{cut_gain}.pcm" + cut_file = f"{TEST_VECTOR_DIR}/stvFOA{fs}c_cut_{cut_gain}.wav" cut_samples(in_file, cut_file, NUM_CHANNELS, fs + "000", CUT_FROM, CUT_LEN, cut_gain) cut_gain = ".004" - cut_file = f"{TEST_VECTOR_DIR}/stvFOA{fs}c_cut_{cut_gain}.pcm" + cut_file = f"{TEST_VECTOR_DIR}/stvFOA{fs}c_cut_{cut_gain}.wav" cut_samples(in_file, cut_file, NUM_CHANNELS, fs + "000", CUT_FROM, CUT_LEN, cut_gain) diff --git a/tests/cut_pcm.py b/tests/cut_pcm.py index 938cb6fc43..99a6f6fc10 100755 --- a/tests/cut_pcm.py +++ b/tests/cut_pcm.py @@ -2,7 +2,7 @@ __copyright__ = \ """ -(C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +(C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -47,6 +47,13 @@ gain: optional gain value to apply to the copied samples import sys import platform +import numpy as np +from pathlib import Path + +HERE = Path(__file__).parent.resolve() +SCRIPTS_DIR = str(HERE.joinpath("../scripts").resolve()) +sys.path.append(SCRIPTS_DIR) +from pyaudio3dtools import audiofile def usage(): @@ -56,7 +63,7 @@ def usage(): def cut_samples(in_file, out_file, num_channels, sample_rate, start, duration, gain="1.0"): """ - Function to cut samples from a 16-bit PCM file. + Function to cut samples from an audio file (wav or pcm) """ # check for python >= 3.7 @@ -64,46 +71,26 @@ def cut_samples(in_file, out_file, num_channels, sample_rate, start, duration, g sys.exit("This script is written for Python >= 3.7. Found: " + platform.python_version()) # all input parameters are strings - convert some - num_ch = int(num_channels) fs = int(sample_rate) start_sec = float(start) dur_sec = float(duration) gain_f = float(gain) - with open(in_file, "rb") as fid_in: - fid_in.seek(0, 2) - num_in_samples = fid_in.tell() / 2 - num_in_samples_ch = num_in_samples / num_ch - num_samples_to_skip = int(start_sec * fs) - dur_samples = dur_sec * fs - if num_samples_to_skip + dur_samples > num_in_samples_ch: - sys.exit( - f"requested too many samples ({num_samples_to_skip}+{dur_samples})" - + f" - input is too short ({num_in_samples_ch})" - ) - num_bytes_to_skip = num_samples_to_skip * num_ch * 2 - num_bytes_to_copy = dur_samples * num_ch * 2 - fid_in.seek(num_bytes_to_skip, 0) - num_clip = 0 - with open(out_file, "wb") as fid_out: - bytes_written = 0 - while bytes_written < num_bytes_to_copy: - data = fid_in.read(2) - val = int.from_bytes(data, byteorder="little", signed=True) - val = int(val * gain_f) - if val > 32767: - val = 32767 - num_clip += 1 - if val < -32768: - val = -32768 - num_clip += 1 - data = val.to_bytes(2, byteorder="little", signed=True) - written = fid_out.write(data) - assert written == 2, f"Error writing data: {written} != {2}" - bytes_written += 2 - if num_clip: - print(f"{num_clip} output samples have been clipped.") + s, fs = audiofile.readfile(in_file, num_channels, fs, outdtype="float") + + num_in_samples = s.shape[0] + num_samples_to_skip = int(start_sec * fs) + dur_samples = int(dur_sec * fs) + if num_samples_to_skip + dur_samples > num_in_samples: + sys.exit( + f"requested too many samples ({num_samples_to_skip}+{dur_samples})" + + f" - input is too short ({num_in_samples})" + ) + + s_out = s[num_samples_to_skip:num_samples_to_skip + dur_samples, :] * gain_f + audiofile.writefile(out_file, s_out, fs) + def main(argv): if len(argv) < 7: diff --git a/tests/prepare_pytests.py b/tests/prepare_pytests.py index 8f6b20065e..9074a6704a 100755 --- a/tests/prepare_pytests.py +++ b/tests/prepare_pytests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 __copyright__ = """ -(C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +(C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/tests/renderer/README.md b/tests/renderer/README.md index b819e43c5c..9748d8abf1 100644 --- a/tests/renderer/README.md +++ b/tests/renderer/README.md @@ -2,24 +2,10 @@ See also the [contribution page](https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec/-/wikis/Contributions/2-external-renderer) for related presentations. -## Running Tests - -### Two testfiles are located in `tests/renderer/`: - -* `test_renderer.py` -* `test_renderer_vs_decoder.py` \ - (requires `DEC_TO_REND_FLOAT_DUMP` defined in `options.h`, cannot be run in parallel i.e. `-n 1` argument must be used for the `pytest-xdist` plugin) - ### Run tests with: `python3 -m pytest -q -n auto tests/renderer/test_renderer.py` -OR - -:warning: `DEC_TO_REND_FLOAT_DUMP` must be defined before compiling! :warning: - -`python3 -m pytest -q -n 1 tests/renderer/test_renderer_vs_decoder.py` - ### Important flags (see [pytest docs](https://docs.pytest.org/en/7.2.x/) for more information): * `-k` flag can filter test cases, e.g. `-k "test_ism_binaural_static"` @@ -37,9 +23,7 @@ this option will also report captured logs, **required for obtaining the command ├── cut -> Default location for output files for test conditions ├── data -> Input test vectors ├── ref -> Default location for output files for reference conditions -├── run_test_renderer_vs_decoder.sh -> Compiles and runs test_renderer_vs_decoder.py with CMake and DEC_TO_REND_FLOAT_DUMP defined ├── test_renderer_be_comparison.py -> Tests for CI Merge Request pipeline to compare renderer bit-exactness -├── test_renderer.py -> Comparison of renderer against standalone executables / python scripts (to be deprecated soon) -├── test_renderer_vs_decoder.py -> Comparison of renderer against decoder (to be deprecated soon) +├── test_renderer.py -> Runs the renderer for all modes └── utils.py -> Wrapper functions for executables for use in testcases ``` diff --git a/tests/renderer/constants.py b/tests/renderer/constants.py index da7302bdc2..e29696adec 100644 --- a/tests/renderer/constants.py +++ b/tests/renderer/constants.py @@ -42,26 +42,6 @@ TESTV_DIR = SCRIPTS_DIR.joinpath("testv") BIN_SUFFIX_MERGETARGET = "_ref" -""" Encoder commandline template """ -IVAS_COD_CMD = [ - str(TESTS_DIR.parent.parent.joinpath("IVAS_cod")), - "", # 1 -> mode - "", # 2 -> options for mode - "", # 3 -> bitrate - "48", # 4 -> input fs - "", # 5 -> input file - "", # 6 -> bitstream file -] - -""" Decoder commandline template """ -IVAS_DEC_CMD = [ - str(TESTS_DIR.parent.parent.joinpath("IVAS_dec")), - "-no_delay_cmp", - "", # 2 -> output format, - "48", # 3 -> output fs - "", # 4 -> bitstream file - "", # 5 -> output file -] """ Renderer commandline template """ RENDERER_CMD = [ @@ -81,39 +61,6 @@ RENDERER_CMD = [ "-q", ] -""" TD Object Renderer commandline template """ -TDRENDERER_CMD = [ - str( - SCRIPTS_DIR.joinpath("td_object_renderer") - .joinpath("object_renderer_standalone") - .joinpath("renderer_standalone") - ), - "48", - "", # 4 -> input file - "", # 5 -> output file -] - -""" CREND commandline template """ -CREND_CMD = [ - str( - SCRIPTS_DIR.joinpath("ivas_pytests/tests/unit_tests/crend/IVAS_crend_unit_test") - ), - "-test", - "1", - "-sr", - "48", - "-ifmt", - "", # 4 -> input format - "-ofmt", - "", # 8 -> output format - "-i", - "", # 2 -> input file - "-o", - "/dev/null", # 6 -> output file - # "-lp_lfe", - # "-limiter" - # "-no_delay_cmp" -] """ Format to file mappings """ NCHAN_TO_FILE = { @@ -132,7 +79,7 @@ NCHAN_TO_FILE = { 16: TEST_VECTOR_DIR.joinpath("spectral_test_16ch_48kHz.wav"), } -FORMAT_TO_FILE = { +FORMAT_TO_FILE_SMOKETEST = { "MONO": NCHAN_TO_FILE[1], "STEREO": NCHAN_TO_FILE[2], "5_1": NCHAN_TO_FILE[6], @@ -153,20 +100,37 @@ FORMAT_TO_FILE = { # "ISM4": TEST_VECTOR_DIR.joinpath("spectral_test_ism4.txt"), # "MASA1": NCHAN_TO_FILE[1], # "MASA2": NCHAN_TO_FILE[2], - "MASA1": TESTV_DIR.joinpath("stv_IVASMASA_1dir1TC.pcm"), - "MASA2": TESTV_DIR.joinpath("stv_IVASMASA_2dir2TC.pcm"), + "MASA1": TESTV_DIR.joinpath("stv1MASA1TC48c.wav"), + "MASA2": TESTV_DIR.joinpath("stv2MASA2TC48c.wav"), "META": TEST_VECTOR_DIR.joinpath("mixed_scene.txt"), "16ch_8+4+4": NCHAN_TO_FILE[16], - "4d0": NCHAN_TO_FILE[4], "4d4": NCHAN_TO_FILE[8], - "cicp1": NCHAN_TO_FILE[1], - "cicp20": NCHAN_TO_FILE[15], - "cicp2": NCHAN_TO_FILE[2], - "custom1": NCHAN_TO_FILE[11], - "itu_4+5+1": NCHAN_TO_FILE[11], "t_design_4": NCHAN_TO_FILE[12], } +FORMAT_TO_FILE_COMPARETEST = { + "MONO": TESTV_DIR.joinpath("stv48c.wav"), + "STEREO": TESTV_DIR.joinpath("stvST48c.wav"), + "5_1": TESTV_DIR.joinpath("stv51MC48c.wav"), + "7_1": TESTV_DIR.joinpath("stv71MC48c.wav"), + "5_1_2": TESTV_DIR.joinpath("stv512MC48c.wav"), + "5_1_4": TESTV_DIR.joinpath("stv514MC48c.wav"), + "7_1_4": TESTV_DIR.joinpath("stv714MC48c.wav"), + "FOA": TESTV_DIR.joinpath("stvFOA48c.wav"), + "HOA2": TESTV_DIR.joinpath("stv2OA48c.wav"), + "HOA3": TESTV_DIR.joinpath("stv3OA48c.wav"), + "ISM1": TESTV_DIR.joinpath("stv1ISM48s.wav"), + "ISM2": TESTV_DIR.joinpath("stv2ISM48s.wav"), + "ISM3": TESTV_DIR.joinpath("stv3ISM48s.wav"), + "ISM4": TESTV_DIR.joinpath("stv4ISM48s.wav"), + "MASA1": TESTV_DIR.joinpath("stv1MASA1TC48c.wav"), + "MASA2": TESTV_DIR.joinpath("stv2MASA2TC48c.wav"), + "META": TEST_VECTOR_DIR.joinpath("mixed_scene.txt"), + "16ch_8+4+4": TESTV_DIR.joinpath("stv3OA48c.wav"), + "4d4": TESTV_DIR.joinpath("stv71MC48c.wav"), + "t_design_4": TESTV_DIR.joinpath("stv714MC48c.wav"), +} + FORMAT_TO_METADATA_FILES = { "ISM1": [str(TESTV_DIR.joinpath("stvISM1.csv"))], "ISM2": [ @@ -184,64 +148,18 @@ FORMAT_TO_METADATA_FILES = { str(TESTV_DIR.joinpath("stvISM3.csv")), str(TESTV_DIR.joinpath("stvISM4.csv")), ], - "MASA1": [str(TESTV_DIR.joinpath("stv_IVASMASA_1dir1TC.met"))], - "MASA2": [str(TESTV_DIR.joinpath("stv_IVASMASA_2dir2TC.met"))], -} - -FORMAT_TO_IVAS = { - "MONO": ["", ""], - "STEREO": ["-stereo", ""], - "FOA": ["-sba", "1"], - "HOA2": ["-sba", "2"], - "HOA3": ["-sba", "3"], - "5_1": ["-mc", "5_1"], - "7_1": ["-mc", "7_1"], - "5_1_2": ["-mc", "5_1_2"], - "5_1_4": ["-mc", "5_1_4"], - "7_1_4": ["-mc", "7_1_4"], - "ISM1": ["-ism", "1"], - "ISM2": ["-ism", "2"], - "ISM3": ["-ism", "3"], - "ISM4": ["-ism", "4"], -} - -FORMAT_TO_IVAS_BR = { - "MONO": "128000", - "STEREO": "256000", - "FOA": "512000", - "HOA2": "512000", - "HOA3": "512000", - "5_1": "512000", - "7_1": "512000", - "5_1_2": "512000", - "5_1_4": "512000", - "7_1_4": "512000", - "ISM1": "256000", - "ISM2": "256000", - "ISM3": "256000", - "ISM4": "256000", + "MASA1": [str(TESTV_DIR.joinpath("stv1MASA1TC48c.met"))], + "MASA2": [str(TESTV_DIR.joinpath("stv2MASA2TC48c.met"))], } -FORMAT_TO_CREND_FORMAT = { - "MONO": "0", - "STEREO": "1", - "BINAURAL": "2", - "BINAURAL_ROOM": "2", - "FOA": "3", - "5_1": "4", - "7_1": "5", - "5_1_2": "6", - "5_1_4": "7", - "7_1_4": "8", - "HOA2": "9", - "HOA3": "10", -} """ Input formats """ INPUT_FORMATS_AMBI = ["FOA", "HOA2", "HOA3"] INPUT_FORMATS_MC = ["MONO", "STEREO", "5_1", "5_1_2", "5_1_4", "7_1", "7_1_4"] INPUT_FORMATS_ISM = ["ISM1", "ISM2", "ISM3", "ISM4"] -INPUT_FORMATS_MASA = ["MASA2"] #["MASA1", "MASA2"] # Disable MASA1 tests until MASA1 can be implemented properly +INPUT_FORMATS_MASA = [ + "MASA2" +] # ["MASA1", "MASA2"] # Disable MASA1 tests until MASA1 can be implemented properly """ Non binaural / parametric output formats """ OUTPUT_FORMATS = [ @@ -261,7 +179,6 @@ OUTPUT_FORMATS = [ CUSTOM_LS_TO_TEST = [ "t_design_4", "4d4", - "itu_4+5+1", "16ch_8+4+4", ] @@ -276,13 +193,34 @@ HR_TRAJECTORIES_TO_TEST = [ "rotate_yaw_pitch_roll1", ] +CONFIG_FILES_TO_TEST = [ + "just_reverb" +] + """ Per-testcase xfail SNR thresholds (dB) """ -pass_snr = { +pass_snr = dict() # not relevant for tests anymore, should be deprecated soon +_pass_snr = { #################################################################### # # External Renderer vs Standalone and pyaudio3dtools renderers tests # #################################################################### + # Failure reason: Renderer uses getRSH() with int16_t vs float in python + "test_ambisonics[FOA-5_1]": 39, + "test_ambisonics[FOA-5_1_2]": 40, + "test_ambisonics[FOA-5_1_4]": 41, + "test_ambisonics[FOA-7_1]": 39, + "test_ambisonics[FOA-7_1_4]": 41, + "test_ambisonics[HOA2-5_1]": 26, + "test_ambisonics[HOA2-5_1_2]": 29, + "test_ambisonics[HOA2-5_1_4]": 31, + "test_ambisonics[HOA2-7_1]": 27, + "test_ambisonics[HOA2-7_1_4]": 32, + "test_ambisonics[HOA3-5_1]": 25, + "test_ambisonics[HOA3-5_1_2]": 27, + "test_ambisonics[HOA3-5_1_4]": 29, + "test_ambisonics[HOA3-7_1]": 25, + "test_ambisonics[HOA3-7_1_4]": 30, # TODO needs debugging "test_ambisonics_binaural_headrotation[HOA2-BINAURAL-full_circle_in_15s]": 18, "test_ambisonics_binaural_headrotation[HOA3-BINAURAL-full_circle_in_15s]": 15, @@ -299,242 +237,128 @@ pass_snr = { "test_ambisonics_binaural_static[FOA-BINAURAL_ROOM]": 0, "test_ambisonics_binaural_static[HOA2-BINAURAL_ROOM]": 0, "test_ambisonics_binaural_static[HOA3-BINAURAL_ROOM]": 0, + # Failure reason: Renderer uses getRSH() with int16_t vs float in python + "test_custom_ls_input[t_design_4-FOA]": 43, + "test_custom_ls_input[t_design_4-HOA2]": 39, + "test_custom_ls_input[t_design_4-HOA3]": 36, + "test_custom_ls_output[FOA-16ch_8+4+4]": 40, + "test_custom_ls_output[FOA-4d4]": 40, + "test_custom_ls_output[FOA-itu_4+5+1]": 41, + "test_custom_ls_output[FOA-t_design_4]": 40, + "test_custom_ls_output[HOA2-16ch_8+4+4]": 32, + "test_custom_ls_output[HOA2-4d4]": 31, + "test_custom_ls_output[HOA2-itu_4+5+1]": 31, + "test_custom_ls_output[HOA2-t_design_4]": 34, + "test_custom_ls_output[HOA3-16ch_8+4+4]": 30, + "test_custom_ls_output[HOA3-4d4]": 29, + "test_custom_ls_output[HOA3-itu_4+5+1]": 30, + "test_custom_ls_output[HOA3-t_design_4]": 32, # Failure reason: TD Object Renderer standalone does not support custom LS input # Comparison with pyaudio3dtools results in bad SNR - "test_custom_ls_input_binaural[16ch_8+4+4-BINAURAL]": 0, + "test_custom_ls_input_binaural[16ch_8+4+4-BINAURAL]": 8, "test_custom_ls_input_binaural[16ch_8+4+4-BINAURAL_ROOM]": 0, - "test_custom_ls_input_binaural[4d4-BINAURAL]": 0, + "test_custom_ls_input_binaural[4d4-BINAURAL]": 6, "test_custom_ls_input_binaural[4d4-BINAURAL_ROOM]": 0, - "test_custom_ls_input_binaural_headrotation[16ch_8+4+4-BINAURAL-full_circle_in_15s]": 0, + "test_custom_ls_input_binaural[itu_4+5+1-BINAURAL]": 1, + "test_custom_ls_input_binaural[itu_4+5+1-BINAURAL_ROOM]": 3, + "test_custom_ls_input_binaural[t_design_4-BINAURAL]": 5, + "test_custom_ls_input_binaural[t_design_4-BINAURAL_ROOM]": 0, + "test_custom_ls_input_binaural_headrotation[16ch_8+4+4-BINAURAL-full_circle_in_15s]": 7, + "test_custom_ls_input_binaural_headrotation[16ch_8+4+4-BINAURAL-rotate_yaw_pitch_roll1]": 6, "test_custom_ls_input_binaural_headrotation[16ch_8+4+4-BINAURAL_ROOM-full_circle_in_15s]": 0, "test_custom_ls_input_binaural_headrotation[16ch_8+4+4-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 0, - "test_custom_ls_input_binaural_headrotation[16ch_8+4+4-BINAURAL-rotate_yaw_pitch_roll1]": 0, - "test_custom_ls_input_binaural_headrotation[4d4-BINAURAL-full_circle_in_15s]": 0, + "test_custom_ls_input_binaural_headrotation[4d4-BINAURAL-full_circle_in_15s]": 7, + "test_custom_ls_input_binaural_headrotation[4d4-BINAURAL-rotate_yaw_pitch_roll1]": 5, "test_custom_ls_input_binaural_headrotation[4d4-BINAURAL_ROOM-full_circle_in_15s]": 0, "test_custom_ls_input_binaural_headrotation[4d4-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 0, - "test_custom_ls_input_binaural_headrotation[4d4-BINAURAL-rotate_yaw_pitch_roll1]": 0, - "test_custom_ls_input_binaural_headrotation[itu_4+5+1-BINAURAL-full_circle_in_15s]": 0, + "test_custom_ls_input_binaural_headrotation[itu_4+5+1-BINAURAL-full_circle_in_15s]": 1, + "test_custom_ls_input_binaural_headrotation[itu_4+5+1-BINAURAL-rotate_yaw_pitch_roll1]": 1, "test_custom_ls_input_binaural_headrotation[itu_4+5+1-BINAURAL_ROOM-full_circle_in_15s]": 3, "test_custom_ls_input_binaural_headrotation[itu_4+5+1-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 3, - "test_custom_ls_input_binaural_headrotation[itu_4+5+1-BINAURAL-rotate_yaw_pitch_roll1]": 0, - "test_custom_ls_input_binaural_headrotation[t_design_4-BINAURAL-full_circle_in_15s]": 0, + "test_custom_ls_input_binaural_headrotation[t_design_4-BINAURAL-full_circle_in_15s]": 4, + "test_custom_ls_input_binaural_headrotation[t_design_4-BINAURAL-rotate_yaw_pitch_roll1]": 4, "test_custom_ls_input_binaural_headrotation[t_design_4-BINAURAL_ROOM-full_circle_in_15s]": 0, "test_custom_ls_input_binaural_headrotation[t_design_4-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 0, - "test_custom_ls_input_binaural_headrotation[t_design_4-BINAURAL-rotate_yaw_pitch_roll1]": 0, - "test_custom_ls_input_binaural[itu_4+5+1-BINAURAL]": 0, - "test_custom_ls_input_binaural[itu_4+5+1-BINAURAL_ROOM]": 3, - "test_custom_ls_input_binaural[t_design_4-BINAURAL]": 0, - "test_custom_ls_input_binaural[t_design_4-BINAURAL_ROOM]": 0, - # TODO need to verify 5ms rendering in external renderer - # Crend unit test does not support intermediate conversion to 7_1_4 - # Comparison with pyaudio3dtools results in bad SNR - "test_ism_binaural_headrotation[ISM1-BINAURAL_ROOM-full_circle_in_15s]": 9, + # TODO needs debugging + "test_ism_binaural_headrotation[ISM2-BINAURAL-rotate_yaw_pitch_roll1]": 34, + "test_ism_binaural_headrotation[ISM3-BINAURAL-rotate_yaw_pitch_roll1]": 34, + "test_ism_binaural_headrotation[ISM4-BINAURAL-rotate_yaw_pitch_roll1]": 33, + # Failure reason: Crend unit test does not support intermediate conversion to 7_1_4 + "test_ism_binaural_headrotation[ISM1-BINAURAL_ROOM-full_circle_in_15s]": 10, "test_ism_binaural_headrotation[ISM1-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 4, "test_ism_binaural_headrotation[ISM2-BINAURAL_ROOM-full_circle_in_15s]": 10, "test_ism_binaural_headrotation[ISM2-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 3, - "test_ism_binaural_headrotation[ISM2-BINAURAL-rotate_yaw_pitch_roll1]": 24, "test_ism_binaural_headrotation[ISM3-BINAURAL_ROOM-full_circle_in_15s]": 10, "test_ism_binaural_headrotation[ISM3-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 4, - "test_ism_binaural_headrotation[ISM3-BINAURAL-rotate_yaw_pitch_roll1]": 24, "test_ism_binaural_headrotation[ISM4-BINAURAL_ROOM-full_circle_in_15s]": 10, "test_ism_binaural_headrotation[ISM4-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 4, - "test_ism_binaural_headrotation[ISM4-BINAURAL-rotate_yaw_pitch_roll1]": 24, "test_ism_binaural_static[ISM1-BINAURAL_ROOM]": 23, "test_ism_binaural_static[ISM2-BINAURAL_ROOM]": 21, "test_ism_binaural_static[ISM3-BINAURAL_ROOM]": 21, "test_ism_binaural_static[ISM4-BINAURAL_ROOM]": 21, - # TODO needs debugging - # Failure reason: minor differences could be due to crossfades or metadata position rounding - "test_ism[ISM1-5_1_2]": 48, - "test_ism[ISM1-5_1_4]": 48, - "test_ism[ISM1-5_1]": 48, - "test_ism[ISM1-7_1_4]": 46, - "test_ism[ISM1-7_1]": 45, - "test_ism[ISM1-FOA]": 44, - "test_ism[ISM1-HOA2]": 40, - "test_ism[ISM1-HOA3]": 37, - "test_ism[ISM1-STEREO]": 54, - "test_ism[ISM2-5_1_2]": 46, - "test_ism[ISM2-5_1_4]": 45, + # Failure Reason: Tangent law panning missing in python scripts + "test_ism[ISM1-STEREO]": 8, + "test_ism[ISM2-STEREO]": 13, + "test_ism[ISM3-STEREO]": 13, + "test_ism[ISM4-STEREO]": 13, + # Failure Reason: Casting of positions in renderer to int16_t vs. float in python + "test_ism[ISM1-5_1]": 43, + "test_ism[ISM1-5_1_2]": 43, + "test_ism[ISM1-5_1_4]": 43, + "test_ism[ISM1-7_1]": 40, + "test_ism[ISM1-7_1_4]": 41, + "test_ism[ISM1-FOA]": 49, + "test_ism[ISM1-HOA2]": 45, + "test_ism[ISM1-HOA3]": 42, "test_ism[ISM2-5_1]": 47, - "test_ism[ISM2-7_1_4]": 43, - "test_ism[ISM2-7_1]": 45, - "test_ism[ISM2-FOA]": 41, - "test_ism[ISM2-HOA2]": 37, - "test_ism[ISM2-HOA3]": 34, - "test_ism[ISM2-STEREO]": 55, - "test_ism[ISM3-5_1_2]": 44, - "test_ism[ISM3-5_1_4]": 43, + "test_ism[ISM2-5_1_2]": 44, + "test_ism[ISM2-5_1_4]": 43, + "test_ism[ISM2-7_1]": 44, + "test_ism[ISM2-7_1_4]": 41, + "test_ism[ISM2-FOA]": 47, + "test_ism[ISM2-HOA2]": 43, + "test_ism[ISM2-HOA3]": 40, "test_ism[ISM3-5_1]": 45, - "test_ism[ISM3-7_1_4]": 42, - "test_ism[ISM3-7_1]": 44, - "test_ism[ISM3-FOA]": 39, - "test_ism[ISM3-HOA2]": 36, - "test_ism[ISM3-HOA3]": 33, - "test_ism[ISM3-STEREO]": 54, - "test_ism[ISM4-5_1_2]": 44, - "test_ism[ISM4-5_1_4]": 44, + "test_ism[ISM3-5_1_2]": 43, + "test_ism[ISM3-5_1_4]": 42, + "test_ism[ISM3-7_1]": 43, + "test_ism[ISM3-7_1_4]": 41, + "test_ism[ISM3-FOA]": 47, + "test_ism[ISM3-HOA2]": 43, + "test_ism[ISM3-HOA3]": 40, "test_ism[ISM4-5_1]": 46, - "test_ism[ISM4-7_1_4]": 43, - "test_ism[ISM4-7_1]": 44, - "test_ism[ISM4-FOA]": 40, - "test_ism[ISM4-HOA2]": 36, - "test_ism[ISM4-HOA3]": 33, - "test_ism[ISM4-STEREO]": 57, + "test_ism[ISM4-5_1_2]": 43, + "test_ism[ISM4-5_1_4]": 43, + "test_ism[ISM4-7_1]": 45, + "test_ism[ISM4-7_1_4]": 41, + "test_ism[ISM4-FOA]": 47, + "test_ism[ISM4-HOA2]": 43, + "test_ism[ISM4-HOA3]": 40, # TODO delay alignment of LFE in binaural output # Failure reason: bitexact except for delay alignment of LFE signal (Issue 59) "test_multichannel_binaural_headrotation[5_1-BINAURAL-full_circle_in_15s]": 7, "test_multichannel_binaural_headrotation[5_1-BINAURAL-rotate_yaw_pitch_roll1]": 6, + "test_multichannel_binaural_headrotation[5_1_2-BINAURAL-full_circle_in_15s]": 9, + "test_multichannel_binaural_headrotation[5_1_2-BINAURAL-rotate_yaw_pitch_roll1]": 1, + "test_multichannel_binaural_headrotation[5_1_4-BINAURAL-full_circle_in_15s]": 10, + "test_multichannel_binaural_headrotation[5_1_4-BINAURAL-rotate_yaw_pitch_roll1]": 1, "test_multichannel_binaural_headrotation[7_1-BINAURAL-full_circle_in_15s]": 8, "test_multichannel_binaural_headrotation[7_1-BINAURAL-rotate_yaw_pitch_roll1]": 8, - # Failure reason: bitexact except for clicks and differences in center channel, could be due to crossfades - "test_multichannel_binaural_headrotation[5_1_2-BINAURAL-full_circle_in_15s]": 30, - "test_multichannel_binaural_headrotation[5_1_2-BINAURAL-rotate_yaw_pitch_roll1]": 30, - "test_multichannel_binaural_headrotation[5_1_4-BINAURAL-full_circle_in_15s]": 29, - "test_multichannel_binaural_headrotation[5_1_4-BINAURAL-rotate_yaw_pitch_roll1]": 29, - "test_multichannel_binaural_headrotation[7_1_4-BINAURAL-full_circle_in_15s]": 30, - "test_multichannel_binaural_headrotation[7_1_4-BINAURAL-rotate_yaw_pitch_roll1]": 30, - "test_multichannel_binaural_static[5_1_2-BINAURAL]": 30, - "test_multichannel_binaural_static[5_1_4-BINAURAL]": 29, - "test_multichannel_binaural_static[5_1-BINAURAL]": 27, - "test_multichannel_binaural_static[7_1-BINAURAL]": 30, - "test_multichannel_binaural_static[7_1_4-BINAURAL]": 30, - # TODO needs debugging - # Failure reason: headrotation may be applied differently, differences increase progressively - "test_multichannel_binaural_headrotation[5_1-BINAURAL_ROOM-full_circle_in_15s]": 10, - "test_multichannel_binaural_headrotation[5_1-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 4, - "test_multichannel_binaural_headrotation[5_1_2-BINAURAL_ROOM-full_circle_in_15s]": 11, - "test_multichannel_binaural_headrotation[5_1_2-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 3, - "test_multichannel_binaural_headrotation[5_1_4-BINAURAL_ROOM-full_circle_in_15s]": 12, - "test_multichannel_binaural_headrotation[5_1_4-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 3, - "test_multichannel_binaural_headrotation[7_1-BINAURAL_ROOM-full_circle_in_15s]": 10, - "test_multichannel_binaural_headrotation[7_1-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 3, - "test_multichannel_binaural_headrotation[7_1_4-BINAURAL_ROOM-full_circle_in_15s]": 10, - "test_multichannel_binaural_headrotation[7_1_4-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 3, - ##################################### - # - # External vs Internal Renderer tests - # - ##################################### - # Failure reason: only fails for this trajectory with very high SNR, possible minor diff. in crossfade - # or due to usage of multiple TD Object Renderer instances - "test_ism_binaural_headrotation_vs_decoder[ISM2-BINAURAL-rotate_yaw_pitch_roll1]": 84, - "test_ism_binaural_headrotation_vs_decoder[ISM3-BINAURAL-rotate_yaw_pitch_roll1]": 78, - "test_ism_binaural_headrotation_vs_decoder[ISM4-BINAURAL-rotate_yaw_pitch_roll1]": 85, - # TODO needs investigation - # Failure reason: conversion to 7_1_4 could be implemented differently w.r.t decoder - "test_ism_binaural_headrotation_vs_decoder[ISM1-BINAURAL_ROOM-full_circle_in_15s]": 15, - "test_ism_binaural_headrotation_vs_decoder[ISM1-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 15, - "test_ism_binaural_headrotation_vs_decoder[ISM2-BINAURAL_ROOM-full_circle_in_15s]": 12, - "test_ism_binaural_headrotation_vs_decoder[ISM2-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 13, - "test_ism_binaural_headrotation_vs_decoder[ISM3-BINAURAL_ROOM-full_circle_in_15s]": 12, - "test_ism_binaural_headrotation_vs_decoder[ISM3-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 13, - "test_ism_binaural_headrotation_vs_decoder[ISM4-BINAURAL_ROOM-full_circle_in_15s]": 12, - "test_ism_binaural_headrotation_vs_decoder[ISM4-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 13, - "test_ism_binaural_static_vs_decoder[ISM1-BINAURAL_ROOM]": 15, - "test_ism_binaural_static_vs_decoder[ISM2-BINAURAL_ROOM]": 12, - "test_ism_binaural_static_vs_decoder[ISM3-BINAURAL_ROOM]": 12, - "test_ism_binaural_static_vs_decoder[ISM4-BINAURAL_ROOM]": 12, - # TODO harmonize panning to stereo - # Failure reason ISM to stereo panning is done via EFAP in the renderer and tangent law in decoder, harmonize - "test_ism_vs_decoder[ISM1-STEREO]": 8, - "test_ism_vs_decoder[ISM2-STEREO]": 17, - "test_ism_vs_decoder[ISM3-STEREO]": 14, - "test_ism_vs_decoder[ISM4-STEREO]": 14, - # TODO needs investigation - # Failure reason: likely differences between metadata position rounding (decoder uses ceil()) and crossfades - "test_ism_vs_decoder[ISM1-5_1_2]": 26, - "test_ism_vs_decoder[ISM1-5_1]": 26, - "test_ism_vs_decoder[ISM1-5_1_4]": 26, - "test_ism_vs_decoder[ISM1-7_1]": 26, - "test_ism_vs_decoder[ISM1-7_1_4]": 26, - "test_ism_vs_decoder[ISM1-FOA]": 26, - "test_ism_vs_decoder[ISM1-HOA2]": 26, - "test_ism_vs_decoder[ISM1-HOA3]": 26, - "test_ism_vs_decoder[ISM2-5_1_2]": 31, - "test_ism_vs_decoder[ISM2-5_1_4]": 31, - "test_ism_vs_decoder[ISM2-5_1]": 6, - "test_ism_vs_decoder[ISM2-7_1_4]": 31, - "test_ism_vs_decoder[ISM2-7_1]": 5, - "test_ism_vs_decoder[ISM2-FOA]": 31, - "test_ism_vs_decoder[ISM2-HOA2]": 30, - "test_ism_vs_decoder[ISM2-HOA3]": 29, - "test_ism_vs_decoder[ISM3-5_1_2]": 32, - "test_ism_vs_decoder[ISM3-5_1_4]": 32, - "test_ism_vs_decoder[ISM3-5_1]": 8, - "test_ism_vs_decoder[ISM3-7_1_4]": 31, - "test_ism_vs_decoder[ISM3-7_1]": 7, - "test_ism_vs_decoder[ISM3-FOA]": 32, - "test_ism_vs_decoder[ISM3-HOA2]": 31, - "test_ism_vs_decoder[ISM3-HOA3]": 29, - "test_ism_vs_decoder[ISM3-MONO]": 77, - "test_ism_vs_decoder[ISM4-5_1_2]": 31, - "test_ism_vs_decoder[ISM4-5_1_4]": 30, - "test_ism_vs_decoder[ISM4-5_1]": 8, - "test_ism_vs_decoder[ISM4-7_1_4]": 30, - "test_ism_vs_decoder[ISM4-7_1]": 7, - "test_ism_vs_decoder[ISM4-FOA]": 31, - "test_ism_vs_decoder[ISM4-HOA2]": 30, - "test_ism_vs_decoder[ISM4-HOA3]": 29, - "test_ism_vs_decoder[ISM4-MONO]": 77, - # TODO needs investigation - # Failure reason: headrotation and crossfade could have differences - "test_multichannel_binaural_headrotation_vs_decoder[5_1_2-BINAURAL-full_circle_in_15s]": 4, - "test_multichannel_binaural_headrotation_vs_decoder[5_1_2-BINAURAL-rotate_yaw_pitch_roll1]": 0, - "test_multichannel_binaural_headrotation_vs_decoder[5_1_4-BINAURAL-full_circle_in_15s]": 4, - "test_multichannel_binaural_headrotation_vs_decoder[5_1_4-BINAURAL-rotate_yaw_pitch_roll1]": 0, - "test_multichannel_binaural_headrotation_vs_decoder[7_1_4-BINAURAL-full_circle_in_15s]": 4, - "test_multichannel_binaural_headrotation_vs_decoder[7_1_4-BINAURAL-rotate_yaw_pitch_roll1]": 0, - # TODO needs investigation - "test_multichannel_binaural_headrotation_vs_decoder[5_1-BINAURAL_ROOM-full_circle_in_15s]": 5, - "test_multichannel_binaural_headrotation_vs_decoder[5_1-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 0, - "test_multichannel_binaural_headrotation_vs_decoder[5_1_2-BINAURAL_ROOM-full_circle_in_15s]": 6, - "test_multichannel_binaural_headrotation_vs_decoder[5_1_2-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 0, - "test_multichannel_binaural_headrotation_vs_decoder[5_1_4-BINAURAL_ROOM-full_circle_in_15s]": 7, - "test_multichannel_binaural_headrotation_vs_decoder[5_1_4-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 0, - "test_multichannel_binaural_headrotation_vs_decoder[7_1-BINAURAL_ROOM-full_circle_in_15s]": 5, - "test_multichannel_binaural_headrotation_vs_decoder[7_1-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 0, - "test_multichannel_binaural_headrotation_vs_decoder[7_1_4-BINAURAL_ROOM-full_circle_in_15s]": 5, - "test_multichannel_binaural_headrotation_vs_decoder[7_1_4-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 0, - # TODO needs investigation - "test_multichannel_binaural_static_vs_decoder[5_1_2-BINAURAL_ROOM]": 18, - "test_multichannel_binaural_static_vs_decoder[5_1_4-BINAURAL_ROOM]": 18, - "test_multichannel_binaural_static_vs_decoder[5_1-BINAURAL_ROOM]": 18, - "test_multichannel_binaural_static_vs_decoder[7_1_4-BINAURAL_ROOM]": 18, - "test_multichannel_binaural_static_vs_decoder[7_1-BINAURAL_ROOM]": 19, - # Failure reason: Mono downmix significantly different, needs a fix - "test_multichannel_vs_decoder[5_1_2-MONO]": 1, - "test_multichannel_vs_decoder[5_1_4-MONO]": 1, - "test_multichannel_vs_decoder[5_1-MONO]": 1, - "test_multichannel_vs_decoder[7_1_4-MONO]": 1, - "test_multichannel_vs_decoder[7_1-MONO]": 1, - "test_multichannel_vs_decoder[STEREO-MONO]": 17, - # Failure reason: Stereo downmix differs slightly, needs a fix - "test_multichannel_vs_decoder[5_1_2-STEREO]": 44, - "test_multichannel_vs_decoder[5_1_4-STEREO]": 48, - "test_multichannel_vs_decoder[5_1-STEREO]": 48, - "test_multichannel_vs_decoder[7_1_4-STEREO]": 46, - "test_multichannel_vs_decoder[7_1-STEREO]": 44, - # TODO needs investigation - # Failure reason: possibly due to minor differences in crossfades - "test_multichannel_vs_decoder[5_1_2-5_1_4]": 63, - "test_multichannel_vs_decoder[5_1_2-5_1]": 63, - "test_multichannel_vs_decoder[5_1_2-7_1_4]": 63, - "test_multichannel_vs_decoder[5_1_2-7_1]": 63, - "test_multichannel_vs_decoder[5_1_4-5_1_2]": 63, - "test_multichannel_vs_decoder[5_1_4-5_1]": 62, - "test_multichannel_vs_decoder[5_1_4-7_1_4]": 61, - "test_multichannel_vs_decoder[5_1_4-7_1]": 62, - "test_multichannel_vs_decoder[5_1-5_1_2]": 62, - "test_multichannel_vs_decoder[5_1-5_1_4]": 62, - "test_multichannel_vs_decoder[5_1-7_1_4]": 62, - "test_multichannel_vs_decoder[5_1-7_1]": 62, - "test_multichannel_vs_decoder[7_1_4-5_1_2]": 63, - "test_multichannel_vs_decoder[7_1_4-5_1_4]": 63, - "test_multichannel_vs_decoder[7_1_4-5_1]": 63, - "test_multichannel_vs_decoder[7_1_4-7_1]": 62, - "test_multichannel_vs_decoder[7_1-5_1_2]": 63, - "test_multichannel_vs_decoder[7_1-5_1_4]": 63, - "test_multichannel_vs_decoder[7_1-5_1]": 63, - "test_multichannel_vs_decoder[7_1-7_1_4]": 63, + "test_multichannel_binaural_headrotation[7_1_4-BINAURAL-full_circle_in_15s]": 8, + "test_multichannel_binaural_headrotation[7_1_4-BINAURAL-rotate_yaw_pitch_roll1]": 1, + # Failure reason: differences in LFE alignment and possibly rotation + "test_multichannel_binaural_headrotation[5_1-BINAURAL_ROOM-full_circle_in_15s]": 14, + "test_multichannel_binaural_headrotation[5_1-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 12, + "test_multichannel_binaural_headrotation[5_1_2-BINAURAL_ROOM-full_circle_in_15s]": 8, + "test_multichannel_binaural_headrotation[5_1_4-BINAURAL_ROOM-full_circle_in_15s]": 6, + "test_multichannel_binaural_headrotation[5_1_4-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 6, + "test_multichannel_binaural_headrotation[7_1-BINAURAL_ROOM-full_circle_in_15s]": 11, + "test_multichannel_binaural_headrotation[7_1-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 9, + "test_multichannel_binaural_headrotation[5_1_2-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 6, + # Failure reason: mixed format, see above + "test_metadata[mixed_scene-5_1]": 47, + "test_metadata[mixed_scene-5_1_2]": 47, + "test_metadata[mixed_scene-7_1]": 48, + "test_metadata[mixed_scene-7_1_4]": 47, + "test_metadata[mixed_scene-5_1_4]": 47, } diff --git a/tests/renderer/data/renderer_config_format_readme.txt b/tests/renderer/data/renderer_config_format_readme.txt index adf4f01362..1fe493b279 100644 --- a/tests/renderer/data/renderer_config_format_readme.txt +++ b/tests/renderer/data/renderer_config_format_readme.txt @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/tests/renderer/run_test_renderer_vs_decoder.sh b/tests/renderer/run_test_renderer_vs_decoder.sh deleted file mode 100755 index 215a6435b0..0000000000 --- a/tests/renderer/run_test_renderer_vs_decoder.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# WARNING! This script is a temporary helper, ideally these steps should be done manually and the pytest suite also run manually -cd ../../ -mkdir build -cmake -B build -G "Unix Makefiles" -DDEC_TO_REND_FLOAT_DUMP=true -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true -cmake --build build -- -j -python3 -m pytest -q -n 1 -rA tests/renderer/test_renderer_vs_decoder.py - -echo "WARNING! Existing executables in root were overwritten!" diff --git a/tests/renderer/test_renderer.py b/tests/renderer/test_renderer.py index 97ccf03c94..00ea239714 100644 --- a/tests/renderer/test_renderer.py +++ b/tests/renderer/test_renderer.py @@ -26,45 +26,211 @@ the United Nations Convention on Contracts on the International Sales of Goods. """ - import pytest -from .utils import * +from .utils import * """ Ambisonics """ -@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS[2:]) @pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) def test_ambisonics(test_info, in_fmt, out_fmt): - compare_renderer_vs_pyscripts(test_info, in_fmt, out_fmt) + run_renderer(in_fmt, out_fmt) @pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) @pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) def test_ambisonics_binaural_static(test_info, in_fmt, out_fmt): - compare_renderer_vs_crend_unit_test(test_info, in_fmt, out_fmt) + run_renderer(in_fmt, out_fmt) @pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST) @pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) @pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) def test_ambisonics_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file): - compare_renderer_vs_crend_unit_test( - test_info, + run_renderer( in_fmt, out_fmt, trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"), ) +# Test compares rendering with render config file containing just reverb defaults against rendering without config file. +# These should be binary equivalent. +@pytest.mark.parametrize("config_file", CONFIG_FILES_TO_TEST) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM) +def test_ambisonics_binaural_headrotation_defaultrenderconfig(test_info, in_fmt, out_fmt, config_file): + compare_renderer_args( + test_info, + in_fmt, + out_fmt, + ref_kwargs={ + "name_extension": "defaultrenderconfig" + }, + cut_kwargs={ + "config_file": TESTV_DIR.joinpath(f"{config_file}.cfg") + } + ) + +# Test compares rendering with just a trajectory file against rendering with a trajectory file + a zero ref rotation. +# These should be binary equivalent. +@pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) +def test_ambisonics_binaural_headrotation_refrotzero(test_info, in_fmt, out_fmt, trj_file): + compare_renderer_args( + test_info, + in_fmt, + out_fmt, + ref_kwargs={ + "name_extension": "refrotzero", + "trj_file": HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv") + }, + cut_kwargs={ + "trj_file": HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"), + "refrot_file": HR_TRAJECTORY_DIR.joinpath("const000.csv") + } + ) + + +# Second test compares rendering with no head rotation against rendering with equal ref and head rotation. +# These should also be binary equivalent. +# Note that reference rotation is supplied per 4 subframes; head rotation per subframe. +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) +def test_ambisonics_binaural_headrotation_refrotequal(test_info, in_fmt, out_fmt): + compare_renderer_args( + test_info, + in_fmt, + out_fmt, + ref_kwargs={ + "name_extension": "refrotequal", + }, + cut_kwargs={ + "trj_file": HR_TRAJECTORY_DIR.joinpath("azi_plus_2-ele_plus_2-every-100-frames.csv"), + "refrot_file": HR_TRAJECTORY_DIR.joinpath("azi_plus_2-ele_plus_2-every-25-rows.csv") + } + ) + +# This test compares rendering with: +# ref: head rotation trajectory file (OTR=NONE) +# cut: identical head rotation trajectory file as ref but in addition a constant +# reference vector in the looking direction of the coordinate system (OTR=REF_VEC) +@pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) +def test_ambisonics_binaural_headrotation_refveczero(test_info, in_fmt, out_fmt, trj_file): + compare_renderer_args( + test_info, + in_fmt, + out_fmt, + ref_kwargs={ + "name_extension": "refveczero", + "trj_file": HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv") + }, + cut_kwargs={ + "trj_file": HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"), + "refvec_file": HR_TRAJECTORY_DIR.joinpath("const000-Vector3.csv") + } + ) + +# This test compares rendering with: +# ref: no head rotation (OTR=NONE) +# cut: rendering with head rotation and a ref vector which moves in the +# looking-direction of the head rotation and therefore compensates it (OTR=REF_VEC) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) +def test_ambisonics_binaural_headrotation_refvecequal(test_info, in_fmt, out_fmt): + compare_renderer_args( + test_info, + in_fmt, + out_fmt, + ref_kwargs={ + "name_extension": "refvecequal", + }, + cut_kwargs={ + "trj_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s.csv"), + "refvec_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s-Vector3.csv") + } + ) + +# This test compares rendering with: +# ref: a head rotation trajectory with elevation (OTR=NONE) +# cut: a static head rotation and a reference position trajectory which moves +# in a way that produces the same acoustic output as the ref head rot trajectory (OTR=REF_VEC) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) +def test_ambisonics_binaural_headrotation_refvec_rotating(test_info, in_fmt, out_fmt): + compare_renderer_args( + test_info, + in_fmt, + out_fmt, + ref_kwargs={ + "name_extension": "refvec_rotating", + "trj_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s.csv"), + }, + cut_kwargs={ + "trj_file": HR_TRAJECTORY_DIR.joinpath("const000.csv"), + "refvec_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s-ccw-Vector3.csv") + } + ) + +# This test compares rendering with: +# ref: a head rotation trajectory with elevation (OTR=NONE) +# cut: a static head rotation and a reference position trajectory which moves +# in a way that produces the same acoustic output as the ref head rot trajectory (OTR=REF_VEC) +# which also contains a fixed position offset between listener and reference position (which +# gets compensated in the REF_VEV OTR modes) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) +def test_ambisonics_binaural_headrotation_refvec_rotating_fixed_pos_offset(test_info, in_fmt, out_fmt): + compare_renderer_args( + test_info, + in_fmt, + out_fmt, + ref_kwargs={ + "name_extension": "refvec_rotating", + "trj_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s-ccw.csv"), + }, + cut_kwargs={ + "trj_file": HR_TRAJECTORY_DIR.joinpath("const000.csv"), + "refvec_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s-fixed-pos-offset-Vector3.csv") + } + ) + +# This test compares rendering with: +# ref: a reference position trajectory with elevation and REF_VEC_LEV OTR mode (OTR=REF_VEC_LEV) +# cut: a reference position trajectory without the elevation and REF_VEC OTR mode (OTR=REF_VEC) +# Since the only difference between REF_VEC_LEV and REF_VEC is that *LEV ignores +# the height difference in positions, the output must be binary equivalent. +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) +def test_ambisonics_binaural_headrotation_refveclev_vs_refvec(test_info, in_fmt, out_fmt): + compare_renderer_args( + test_info, + in_fmt, + out_fmt, + ref_kwargs={ + "name_extension": "refveclevel", + "trj_file": HR_TRAJECTORY_DIR.joinpath("const000.csv"), + "refveclev_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s-Vector3.csv"), + }, + cut_kwargs={ + "trj_file": HR_TRAJECTORY_DIR.joinpath("const000.csv"), + "refvec_file": HR_TRAJECTORY_DIR.joinpath("full-circle-4s-Vector3.csv") + } + ) + + """ Multichannel """ -@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS[2:]) @pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MC) def test_multichannel(test_info, in_fmt, out_fmt): - compare_renderer_vs_pyscripts(test_info, in_fmt, out_fmt) + run_renderer(in_fmt, out_fmt) @pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) @@ -73,7 +239,7 @@ def test_multichannel_binaural_static(test_info, in_fmt, out_fmt): if in_fmt in ["MONO", "STEREO"]: pytest.skip("MONO or STEREO to Binaural rendering unsupported") - compare_renderer_vs_crend_unit_test(test_info, in_fmt, out_fmt) + run_renderer(in_fmt, out_fmt) @pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST) @@ -84,30 +250,50 @@ def test_multichannel_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file pytest.skip("MONO or STEREO to Binaural rendering unsupported") if (in_fmt == "5_1" or in_fmt == "7_1") and out_fmt == "BINAURAL": - compare_renderer_vs_td_standalone( - test_info, + run_renderer( in_fmt, out_fmt, trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"), ) else: - compare_renderer_vs_crend_unit_test( - test_info, + run_renderer( in_fmt, out_fmt, trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"), ) +# This test compares rendering with: +# ref: a head rotation trajectory with elevation (OTR=NONE) +# cut: a static head rotation and a reference position trajectory which moves +# in a way that produces the same acoustic output as the ref head rot trajectory (OTR=REF_VEC) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MC) +def test_multichannel_binaural_headrotation_refvec_rotating(test_info, in_fmt, out_fmt): + if in_fmt in ["MONO", "STEREO"]: + pytest.skip("MONO or STEREO to Binaural rendering unsupported") + + compare_renderer_args( + test_info, + in_fmt, + out_fmt, + ref_kwargs={ + "name_extension": "refvec_rotating", + "trj_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s.csv"), + }, + cut_kwargs={ + "trj_file": HR_TRAJECTORY_DIR.joinpath("const000.csv"), + "refvec_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s-ccw-Vector3.csv") + } + ) + """ ISM """ -@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS[2:]) @pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM) def test_ism(test_info, in_fmt, out_fmt): - compare_renderer_vs_pyscripts( - test_info, in_fmt, out_fmt, in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt] - ) + run_renderer(in_fmt, out_fmt, in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt]) @pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) @@ -119,13 +305,9 @@ def test_ism_binaural_static(test_info, in_fmt, out_fmt): in_meta_files = None if out_fmt == "BINAURAL": - compare_renderer_vs_td_standalone( - test_info, in_fmt, out_fmt, in_meta_files=in_meta_files - ) + run_renderer(in_fmt, out_fmt, in_meta_files=in_meta_files) else: - compare_renderer_vs_pyscripts( - test_info, in_fmt, out_fmt, in_meta_files=in_meta_files - ) + run_renderer(in_fmt, out_fmt, in_meta_files=in_meta_files) @pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST) @@ -138,32 +320,54 @@ def test_ism_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file): in_meta_files = None if out_fmt == "BINAURAL": - compare_renderer_vs_td_standalone( - test_info, + run_renderer( in_fmt, out_fmt, trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"), in_meta_files=in_meta_files, ) else: - compare_renderer_vs_pyscripts( - test_info, + run_renderer( in_fmt, out_fmt, trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"), in_meta_files=in_meta_files, ) +# This test compares rendering with: +# ref: a head rotation trajectory with elevation (OTR=NONE) +# cut: a static head rotation and a reference position trajectory which moves +# in a way that produces the same acoustic output as the ref head rot trajectory (OTR=REF_VEC) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) +@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM) +def test_ism_binaural_headrotation_refvec_rotating(test_info, in_fmt, out_fmt): + try: + in_meta_files = FORMAT_TO_METADATA_FILES[in_fmt] + except: + in_meta_files = None + + compare_renderer_args( + test_info, + in_fmt, + out_fmt, + ref_kwargs={ + "name_extension": "refvec_rotating", + "trj_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s.csv"), + "in_meta_files": in_meta_files + }, + cut_kwargs={ + "trj_file": HR_TRAJECTORY_DIR.joinpath("const000.csv"), + "refvec_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s-ccw-Vector3.csv"), + "in_meta_files": in_meta_files + } + ) """ MASA """ -@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS[2:]) @pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MASA) def test_masa(test_info, in_fmt, out_fmt): - # # TODO: implement MASA in Python, compare BE - # compare_renderer_vs_pyscripts( test_info, in_fmt, out_fmt, in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt] - # ) run_renderer(in_fmt, out_fmt, in_meta_files=FORMAT_TO_METADATA_FILES[in_fmt]) @@ -182,19 +386,16 @@ def test_masa(test_info, in_fmt, out_fmt): """ Custom loudspeaker layouts """ -@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS[2:]) @pytest.mark.parametrize("in_layout", CUSTOM_LS_TO_TEST) def test_custom_ls_input(test_info, in_layout, out_fmt): - compare_renderer_vs_pyscripts( - test_info, CUSTOM_LAYOUT_DIR.joinpath(f"{in_layout}.txt"), out_fmt - ) + run_renderer(CUSTOM_LAYOUT_DIR.joinpath(f"{in_layout}.txt"), out_fmt) @pytest.mark.parametrize("out_fmt", CUSTOM_LS_TO_TEST) -@pytest.mark.parametrize("in_fmt", OUTPUT_FORMATS) +@pytest.mark.parametrize("in_fmt", OUTPUT_FORMATS[2:]) def test_custom_ls_output(test_info, in_fmt, out_fmt): - compare_renderer_vs_pyscripts( - test_info, + run_renderer( in_fmt, CUSTOM_LAYOUT_DIR.joinpath(f"{out_fmt}.txt"), ) @@ -203,8 +404,7 @@ def test_custom_ls_output(test_info, in_fmt, out_fmt): @pytest.mark.parametrize("out_fmt", CUSTOM_LS_TO_TEST) @pytest.mark.parametrize("in_fmt", CUSTOM_LS_TO_TEST) def test_custom_ls_input_output(test_info, in_fmt, out_fmt): - compare_renderer_vs_pyscripts( - test_info, + run_renderer( CUSTOM_LAYOUT_DIR.joinpath(f"{in_fmt}.txt"), CUSTOM_LAYOUT_DIR.joinpath(f"{out_fmt}.txt"), ) @@ -213,8 +413,7 @@ def test_custom_ls_input_output(test_info, in_fmt, out_fmt): @pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) @pytest.mark.parametrize("in_layout", CUSTOM_LS_TO_TEST) def test_custom_ls_input_binaural(test_info, in_layout, out_fmt): - compare_renderer_vs_pyscripts( - test_info, + run_renderer( CUSTOM_LAYOUT_DIR.joinpath(f"{in_layout}.txt"), out_fmt, ) @@ -224,8 +423,7 @@ def test_custom_ls_input_binaural(test_info, in_layout, out_fmt): @pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) @pytest.mark.parametrize("in_layout", CUSTOM_LS_TO_TEST) def test_custom_ls_input_binaural_headrotation(test_info, in_layout, out_fmt, trj_file): - compare_renderer_vs_pyscripts( - test_info, + run_renderer( CUSTOM_LAYOUT_DIR.joinpath(f"{in_layout}.txt"), out_fmt, trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"), @@ -235,11 +433,10 @@ def test_custom_ls_input_binaural_headrotation(test_info, in_layout, out_fmt, tr """ Metadata / scene description input """ -@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS) +@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS[2:]) @pytest.mark.parametrize("in_fmt", METADATA_SCENES_TO_TEST) def test_metadata(test_info, in_fmt, out_fmt): - compare_renderer_vs_pyscripts( - test_info, + run_renderer( "META", out_fmt, metadata_input=TEST_VECTOR_DIR.joinpath(f"{in_fmt}.txt"), diff --git a/tests/renderer/test_renderer_be_comparison.py b/tests/renderer/test_renderer_be_comparison.py index 5d89136a89..815d7fd640 100644 --- a/tests/renderer/test_renderer_be_comparison.py +++ b/tests/renderer/test_renderer_be_comparison.py @@ -37,13 +37,13 @@ from .utils import * @pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS) @pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) def test_ambisonics(test_info, in_fmt, out_fmt): - compare_renderer_vs_mergetarget(test_info, in_fmt, out_fmt) + compare_renderer_vs_mergetarget(test_info, in_fmt, out_fmt, is_comparetest=True) @pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) @pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) def test_ambisonics_binaural_static(test_info, in_fmt, out_fmt): - compare_renderer_vs_mergetarget(test_info, in_fmt, out_fmt) + compare_renderer_vs_mergetarget(test_info, in_fmt, out_fmt, is_comparetest=True) @pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST) @@ -55,6 +55,7 @@ def test_ambisonics_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file): in_fmt, out_fmt, trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"), + is_comparetest=True, ) @@ -64,7 +65,7 @@ def test_ambisonics_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file): @pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS) @pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MC) def test_multichannel(test_info, in_fmt, out_fmt): - compare_renderer_vs_mergetarget(test_info, in_fmt, out_fmt) + compare_renderer_vs_mergetarget(test_info, in_fmt, out_fmt, is_comparetest=True) @pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) @@ -73,7 +74,7 @@ def test_multichannel_binaural_static(test_info, in_fmt, out_fmt): if in_fmt in ["MONO", "STEREO"]: pytest.skip("MONO or STEREO to Binaural rendering unsupported") - compare_renderer_vs_mergetarget(test_info, in_fmt, out_fmt) + compare_renderer_vs_mergetarget(test_info, in_fmt, out_fmt, is_comparetest=True) @pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST) @@ -88,6 +89,7 @@ def test_multichannel_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file in_fmt, out_fmt, trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"), + is_comparetest=True, ) @@ -111,7 +113,7 @@ def test_ism_binaural_static(test_info, in_fmt, out_fmt): in_meta_files = None compare_renderer_vs_mergetarget( - test_info, in_fmt, out_fmt, in_meta_files=in_meta_files + test_info, in_fmt, out_fmt, in_meta_files=in_meta_files, is_comparetest=True ) @@ -130,6 +132,7 @@ def test_ism_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file): out_fmt, trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"), in_meta_files=in_meta_files, + is_comparetest=True, ) @@ -143,7 +146,7 @@ def test_ism_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file): @pytest.mark.parametrize("in_layout", CUSTOM_LS_TO_TEST) def test_custom_ls_input(test_info, in_layout, out_fmt): compare_renderer_vs_mergetarget( - test_info, CUSTOM_LAYOUT_DIR.joinpath(f"{in_layout}.txt"), out_fmt + test_info, CUSTOM_LAYOUT_DIR.joinpath(f"{in_layout}.txt"), out_fmt, is_comparetest=True ) @@ -151,7 +154,7 @@ def test_custom_ls_input(test_info, in_layout, out_fmt): @pytest.mark.parametrize("in_fmt", OUTPUT_FORMATS) def test_custom_ls_output(test_info, in_fmt, out_fmt): compare_renderer_vs_mergetarget( - test_info, in_fmt, CUSTOM_LAYOUT_DIR.joinpath(f"{out_fmt}.txt") + test_info, in_fmt, CUSTOM_LAYOUT_DIR.joinpath(f"{out_fmt}.txt"), is_comparetest=True ) @@ -162,6 +165,7 @@ def test_custom_ls_input_output(test_info, in_fmt, out_fmt): test_info, CUSTOM_LAYOUT_DIR.joinpath(f"{in_fmt}.txt"), CUSTOM_LAYOUT_DIR.joinpath(f"{out_fmt}.txt"), + is_comparetest=True, ) @@ -169,9 +173,7 @@ def test_custom_ls_input_output(test_info, in_fmt, out_fmt): @pytest.mark.parametrize("in_layout", CUSTOM_LS_TO_TEST) def test_custom_ls_input_binaural(test_info, in_layout, out_fmt): compare_renderer_vs_mergetarget( - test_info, - CUSTOM_LAYOUT_DIR.joinpath(f"{in_layout}.txt"), - out_fmt, + test_info, CUSTOM_LAYOUT_DIR.joinpath(f"{in_layout}.txt"), out_fmt, is_comparetest=True ) @@ -184,6 +186,7 @@ def test_custom_ls_input_binaural_headrotation(test_info, in_layout, out_fmt, tr CUSTOM_LAYOUT_DIR.joinpath(f"{in_layout}.txt"), out_fmt, trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"), + is_comparetest=True, ) @@ -198,4 +201,5 @@ def test_metadata(test_info, in_fmt, out_fmt): "META", out_fmt, metadata_input=TEST_VECTOR_DIR.joinpath(f"{in_fmt}.txt"), + is_comparetest=True, ) diff --git a/tests/renderer/test_renderer_vs_decoder.py b/tests/renderer/test_renderer_vs_decoder.py deleted file mode 100644 index cd88580d9b..0000000000 --- a/tests/renderer/test_renderer_vs_decoder.py +++ /dev/null @@ -1,128 +0,0 @@ -#!/usr/bin/env python3 - -""" - (C) 2022 Baseline Development Group with portions copyright Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies OY, Orange, - Panasonic Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation. All Rights Reserved. - - This software is protected by copyright law and by international treaties. - The Baseline Development Group consisting of Dolby International AB, Ericsson AB, - Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., - Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies OY, Orange, - Panasonic Corporation, Qualcomm Technologies, Inc., and VoiceAge Corporation retain full ownership - rights in their respective contributions in the software. No license of any kind, including but not - limited to patent license, of any foregoing parties is hereby granted by implication, estoppel or - otherwise. - - This software is provided "AS IS", without any express or implied warranties. The software is in the - development stage. It is intended exclusively for experts who have experience with such software and - solely for the purpose of inspection. All implied warranties of non-infringement, merchantability - and/or fitness for a particular purpose are hereby disclaimed and excluded. - - Any dispute, controversy or claim arising under or in relation to providing this software shall be - submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in - accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and - the United Nations Convention on Contracts on the International Sales of Goods. -""" - -from .utils import * - -""" Ambisonics """ - - -@pytest.mark.skip("Ambisonics comparison requires CLDFB interface") -@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS) -@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) -def test_ambisonics_vs_decoder(test_info, in_fmt, out_fmt): - compare_renderer_vs_decoder(test_info, in_fmt, out_fmt) - - -@pytest.mark.skip("Ambisonics comparison requires CLDFB interface") -@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) -@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) -def test_ambisonics_binaural_static_vs_decoder(test_info, in_fmt, out_fmt): - compare_renderer_vs_decoder(test_info, in_fmt, out_fmt) - - -@pytest.mark.skip("Ambisonics comparison requires CLDFB interface") -@pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST) -@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) -@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI) -def test_ambisonics_binaural_headrotation_vs_decoder( - test_info, in_fmt, out_fmt, trj_file -): - compare_renderer_vs_decoder( - test_info, - in_fmt, - out_fmt, - trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"), - ) - - -""" Multichannel """ - - -@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS) -@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MC) -def test_multichannel_vs_decoder(test_info, in_fmt, out_fmt): - if in_fmt == "MONO": - pytest.skip("(EVS) Mono decoder rendering unsupported") - - if in_fmt == "STEREO" and out_fmt in ["FOA", "HOA2", "HOA3"]: - pytest.skip("Stereo to Ambisonics rendering unsupported in the decoder") - - compare_renderer_vs_decoder(test_info, in_fmt, out_fmt) - - -@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) -@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MC) -def test_multichannel_binaural_static_vs_decoder(test_info, in_fmt, out_fmt): - if in_fmt in ["MONO", "STEREO"]: - pytest.skip("MONO or STEREO to Binaural rendering unsupported") - - compare_renderer_vs_decoder(test_info, in_fmt, out_fmt) - - -@pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST) -@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) -@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MC) -def test_multichannel_binaural_headrotation_vs_decoder( - test_info, in_fmt, out_fmt, trj_file -): - if in_fmt in ["MONO", "STEREO"]: - pytest.skip("MONO or STEREO to Binaural rendering unsupported") - - compare_renderer_vs_decoder( - test_info, - in_fmt, - out_fmt, - trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"), - ) - - -""" ISM """ - - -@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS) -@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM) -def test_ism_vs_decoder(test_info, in_fmt, out_fmt): - compare_renderer_vs_decoder(test_info, in_fmt, out_fmt) - - -@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) -@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM) -def test_ism_binaural_static_vs_decoder(test_info, in_fmt, out_fmt): - compare_renderer_vs_decoder(test_info, in_fmt, out_fmt) - - -@pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST) -@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL) -@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM) -def test_ism_binaural_headrotation_vs_decoder(test_info, in_fmt, out_fmt, trj_file): - compare_renderer_vs_decoder( - test_info, - in_fmt, - out_fmt, - trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"), - ) diff --git a/tests/renderer/utils.py b/tests/renderer/utils.py index 8a4ecf739b..d2af91f60c 100644 --- a/tests/renderer/utils.py +++ b/tests/renderer/utils.py @@ -31,12 +31,11 @@ import subprocess as sp import sys from pathlib import Path from tempfile import TemporaryDirectory -from typing import Optional, Tuple +from typing import Optional, Tuple, Dict import numpy as np import pytest - from .compare_audio import compare_audio_arrays from .constants import * @@ -100,59 +99,20 @@ def check_BE( ) -def run_enc( - in_fmt: str, - bit_file: str, - in_meta_files: Optional[list] = None, -) -> None: - - cmd = IVAS_COD_CMD[:] - cmd[1] = FORMAT_TO_IVAS[in_fmt][0] - cmd[2] = FORMAT_TO_IVAS[in_fmt][1] - cmd[3] = FORMAT_TO_IVAS_BR[in_fmt] - cmd[5] = str(FORMAT_TO_FILE[in_fmt]) - cmd[6] = bit_file - - if in_meta_files is not None: - cmd[3:3] = [*in_meta_files] - - if in_fmt == "MONO": - cmd.pop(1) - cmd.pop(1) - elif in_fmt == "STEREO": - cmd.pop(2) - - run_cmd(cmd) - - -def run_dec( - bit_file: str, - out_file: str, - out_fmt: str, - trj_file: Optional[str] = None, -) -> Tuple[np.ndarray, int]: - - cmd = IVAS_DEC_CMD[:] - cmd[2] = out_fmt - cmd[4] = bit_file - cmd[5] = out_file - - if trj_file is not None and out_fmt in ["BINAURAL", "BINAURAL_ROOM"]: - cmd[1:1] = ["-T", str(trj_file)] - - run_cmd(cmd) - - return pyaudio3dtools.audiofile.readfile(out_file) - - def run_renderer( in_fmt: str, out_fmt: str, metadata_input: Optional[str] = None, in_meta_files: Optional[list] = None, trj_file: Optional[str] = None, + name_extension: Optional[str] = None, + refrot_file: Optional[str] = None, + refvec_file: Optional[str] = None, + refveclev_file: Optional[str] = None, + config_file: Optional[str] = None, output_path_base: str = OUTPUT_PATH_CUT, binary_suffix: str = "", + is_comparetest: Optional[bool] = False, ) -> Tuple[np.ndarray, int]: """CuT creation with standalone renderer""" if trj_file is not None: @@ -160,11 +120,38 @@ def run_renderer( else: trj_name = "" + if refrot_file is not None: + refrot_name = f"_{refrot_file.stem}" + else: + refrot_name = "" + + if refvec_file is not None: + refvec_name = f"_{refvec_file.stem}" + else: + refvec_name = "" + + if refveclev_file is not None: + refveclev_name = f"_{refveclev_file.stem}" + else: + refveclev_name = "" + + if config_file is not None: + config_name = f"_{config_file.stem}" + else: + config_name = "" + + + if not isinstance(out_fmt, str): out_name = f"{out_fmt.stem}" else: out_name = out_fmt + if is_comparetest: + FORMAT_TO_FILE = FORMAT_TO_FILE_COMPARETEST + else: + FORMAT_TO_FILE = FORMAT_TO_FILE_SMOKETEST + if metadata_input is not None: in_file = metadata_input in_name = metadata_input.stem @@ -175,8 +162,7 @@ def run_renderer( in_file = FORMAT_TO_FILE[in_fmt] in_name = in_fmt - out_file = str(output_path_base.joinpath(f"{in_name}_to_{out_name}{trj_name}.wav")) - + out_file = str(output_path_base.joinpath(f"{in_name}_to_{out_name}{trj_name}{refrot_name}{refvec_name}{refveclev_name}{config_name}{name_extension}.wav")) cmd = RENDERER_CMD[:] cmd[2] = str(in_file) @@ -192,164 +178,33 @@ def run_renderer( if trj_file is not None: cmd.extend(["-tf", str(trj_file)]) - run_cmd(cmd) - - return pyaudio3dtools.audiofile.readfile(out_file) - - -def run_renderer_ext( - in_file: str, - in_fmt: str, - out_fmt: str, - in_meta_files: Optional[list] = None, - trj_file: Optional[str] = None, -) -> Tuple[np.ndarray, int]: - """Run renderer with decoder float dump""" - if trj_file is not None: - trj_name = f"_{trj_file.stem}" - else: - trj_name = "" - - if not isinstance(out_fmt, str): - out_name = f"{out_fmt.stem}" - else: - out_name = out_fmt - - in_name = in_fmt - - out_file = str(OUTPUT_PATH_CUT.joinpath(f"{in_name}_to_{out_name}{trj_name}.wav")) - - cmd = RENDERER_CMD[:] - cmd[2] = str(in_file) - cmd[4] = str(in_fmt) - cmd[6] = str(out_file) - cmd[8] = str(out_fmt) - - if in_meta_files is not None: - cmd[5:5] = ["-im", *in_meta_files] - - if trj_file is not None: - cmd.extend(["-tf", str(trj_file)]) - - run_cmd(cmd) - - return pyaudio3dtools.audiofile.readfile(out_file) - - -def run_crend_unittest( - in_fmt: str, - out_fmt: str, - metadata_input: Optional[str] = None, - in_meta_files: Optional[list] = None, - trj_file: Optional[str] = None, -) -> Tuple[np.ndarray, int]: - """Reference creation with standalone renderer""" - if trj_file is not None: - trj_name = f"_{trj_file.stem}" - else: - trj_name = "" - - if not isinstance(out_fmt, str): - out_name = f"{out_fmt.stem}" - else: - out_name = out_fmt - - if metadata_input is not None: - in_file = metadata_input - in_name = metadata_input.stem - elif not isinstance(in_fmt, str): - in_file = FORMAT_TO_FILE[in_fmt.stem] - in_name = in_fmt.stem - else: - in_file = FORMAT_TO_FILE[in_fmt] - in_name = in_fmt + if refrot_file is not None: + cmd.extend(["-rf", str(refrot_file)]) + cmd.extend(["-otr", "ref"]) - out_file = str(OUTPUT_PATH_REF.joinpath(f"{in_name}_to_{out_name}{trj_name}.wav")) + if refvec_file is not None: + cmd.extend(["-rvf", str(refvec_file)]) + cmd.extend(["-otr", "ref_vec"]) - cmd = CREND_CMD[:] - cmd[6] = FORMAT_TO_CREND_FORMAT[str(in_fmt)] - cmd[8] = FORMAT_TO_CREND_FORMAT[str(out_fmt)] - cmd[10] = str(in_file) - cmd[12] = str(out_file) - if out_fmt == "BINAURAL_ROOM": - cmd.append("-brir") + if refveclev_file is not None: + cmd.extend(["-rvf", str(refveclev_file)]) + cmd.extend(["-otr", "ref_vec_lev"]) - if trj_file is not None: - cmd.extend(["-t", str(trj_file)]) - cmd.extend(["-otr", "REF"]) + if config_file is not None: + cmd.extend(["-rc", str(config_file)]) run_cmd(cmd) return pyaudio3dtools.audiofile.readfile(out_file) -def run_td_standalone( - in_fmt: str, - out_fmt: str, - metadata_input: Optional[str] = None, - in_meta_files: Optional[list] = None, - trj_file: Optional[str] = None, -): - """Reference creation with TD Object renderer""" - if trj_file is not None: - trj_name = f"_{trj_file.stem}" - else: - trj_name = "" - - if not isinstance(out_fmt, str): - out_name = f"{out_fmt.stem}" - else: - out_name = out_fmt - - if metadata_input is not None: - in_file = metadata_input - in_name = metadata_input.stem - elif not isinstance(in_fmt, str): - in_file = FORMAT_TO_FILE[in_fmt.stem] - in_name = in_fmt.stem - else: - in_file = FORMAT_TO_FILE[in_fmt] - in_name = in_fmt - - out_file = str(OUTPUT_PATH_REF.joinpath(f"{in_name}_to_{out_name}{trj_name}.pcm")) - - in_spfmt = pyaudio3dtools.spatialaudioformat.Format(in_fmt) - - with TemporaryDirectory() as tmp_dir: - # write PCM tmp file - tmp_dir = Path(tmp_dir) - in_file_pcm = tmp_dir.joinpath(in_file.stem + ".pcm") - - in_sig, _ = pyaudio3dtools.audiofile.readfile(in_file) - pyaudio3dtools.audiofile.writefile(in_file_pcm, in_sig) - - cmd = TDRENDERER_CMD[:] - cmd[2] = str(in_file_pcm) - cmd[3] = str(out_file) - - if in_spfmt.isloudspeaker: - cmd[1:1] = ["-mc", in_spfmt.name] - else: - cmd[1:1] = str(in_spfmt.nchannels) - if in_meta_files is not None: - cmd[2:2] = in_meta_files - else: - cmd[2:2] = ["NULL"] * in_spfmt.nchannels - - if trj_file is not None: - cmd[1:1] = ["-T", str(trj_file)] - - run_cmd(cmd) - - return pyaudio3dtools.audiofile.readfile(out_file, nchannels=2) - - def run_pyscripts( in_fmt, out_fmt, metadata_input: Optional[str] = None, in_meta_files: Optional[list] = None, trj_file: Optional[str] = None, + is_comparetest: Optional[bool] = False, ) -> Tuple[np.ndarray, int]: """Reference creation with pyaudio3dtools""" if trj_file is not None: @@ -362,6 +217,11 @@ def run_pyscripts( else: out_name = out_fmt + if is_comparetest: + FORMAT_TO_FILE = FORMAT_TO_FILE_COMPARETEST + else: + FORMAT_TO_FILE = FORMAT_TO_FILE_SMOKETEST + if metadata_input is not None: in_file = metadata_input in_name = metadata_input.stem @@ -389,7 +249,11 @@ def run_pyscripts( def compare_renderer_vs_mergetarget(test_info, in_fmt, out_fmt, **kwargs): ref, ref_fs = run_renderer( - in_fmt, out_fmt, binary_suffix=BIN_SUFFIX_MERGETARGET, output_path_base=OUTPUT_PATH_REF, **kwargs + in_fmt, + out_fmt, + binary_suffix=BIN_SUFFIX_MERGETARGET, + output_path_base=OUTPUT_PATH_REF, + **kwargs, ) cut, cut_fs = run_renderer(in_fmt, out_fmt, **kwargs) check_BE(test_info, ref, ref_fs, cut, cut_fs) @@ -400,53 +264,7 @@ def compare_renderer_vs_pyscripts(test_info, in_fmt, out_fmt, **kwargs): cut, cut_fs = run_renderer(in_fmt, out_fmt, **kwargs) check_BE(test_info, ref, ref_fs, cut, cut_fs) - -def compare_renderer_vs_crend_unit_test(test_info, in_fmt, out_fmt, **kwargs): - ref, ref_fs = run_crend_unittest(in_fmt, out_fmt, **kwargs) - cut, cut_fs = run_renderer(in_fmt, out_fmt, **kwargs) - check_BE(test_info, ref, ref_fs, cut, cut_fs) - - -def compare_renderer_vs_td_standalone(test_info, in_fmt, out_fmt, **kwargs): - ref, ref_fs = run_td_standalone(in_fmt, out_fmt, **kwargs) - cut, cut_fs = run_renderer(in_fmt, out_fmt, **kwargs) - check_BE(test_info, ref, ref_fs, cut, cut_fs) - - -def compare_renderer_vs_decoder(test_info, in_fmt, out_fmt, **kwargs): - with TemporaryDirectory() as tmp_dir: - tmp_dir = Path(tmp_dir) - - in_meta_files = None - bit_file = str(tmp_dir.joinpath(f"{in_fmt}_to_{out_fmt}.192")) - out_file_decoder = str(OUTPUT_PATH_REF.joinpath(f"{in_fmt}_to_{out_fmt}.wav")) - - # Ref: cod -> dec (out_fmt) - if in_fmt in FORMAT_TO_METADATA_FILES.keys(): - in_meta_files = FORMAT_TO_METADATA_FILES[in_fmt] - - # encoder - run_enc(in_fmt, bit_file, in_meta_files=in_meta_files) - # decoder renderer - ref, ref_fs = run_dec(bit_file, out_file_decoder, out_fmt, **kwargs) - - # CuT cod -> dec (in_fmt) -> rend - if in_fmt in FORMAT_TO_METADATA_FILES.keys(): - tmp_fmt = "EXT" - in_meta_files = [ - str(tmp_dir.joinpath(f"{in_fmt}_to_EXT.wav.{n}.csv")) - for n in range(int(in_fmt[-1])) - ] - else: - tmp_fmt = in_fmt - - out_file_ext = str(tmp_dir.joinpath(f"{in_fmt}_to_{tmp_fmt}.wav")) - - # passthrough decoder - run_dec(bit_file, out_file_ext, tmp_fmt, **kwargs) - # external renderer - cut, cut_fs = run_renderer_ext( - out_file_ext, in_fmt, out_fmt, in_meta_files=in_meta_files, **kwargs - ) - - check_BE(test_info, ref, ref_fs, cut, cut_fs) +def compare_renderer_args(test_info, in_fmt, out_fmt, ref_kwargs: Dict, cut_kwargs: Dict): + ref, ref_fs = run_renderer(in_fmt, out_fmt, **ref_kwargs) + cut, cut_fs = run_renderer(in_fmt, out_fmt, **cut_kwargs) + check_BE(test_info, ref, ref_fs, cut, cut_fs) \ No newline at end of file diff --git a/tests/run_pytests.py b/tests/run_pytests.py index 1fc6614762..d20de6ef72 100755 --- a/tests/run_pytests.py +++ b/tests/run_pytests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 __copyright__ = """ -(C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +(C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/tests/test_param_file.py b/tests/test_param_file.py index 730acd5c00..7774d59403 100644 --- a/tests/test_param_file.py +++ b/tests/test_param_file.py @@ -1,6 +1,6 @@ __copyright__ = \ """ -(C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +(C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,7 +39,8 @@ import errno import platform from subprocess import run import pytest -from cmp_custom import cmp_custom +from cmp_pcm import cmp_pcm +from cut_pcm import cut_samples from conftest import EncoderFrontend, DecoderFrontend from testconfig import PARAM_FILE @@ -148,9 +149,20 @@ def test_param_file_tests( bitstream_file = enc_split.pop() testv_file = enc_split.pop() - sampling_rate = int(enc_split.pop()) + fs = enc_split.pop() + sampling_rate = int(fs) bitrate = enc_split.pop() + sba_br_switching_dtx = 0 + if ( + not bitrate.isdigit() + and "-dtx" in enc_opts.split() + and "-sba" in enc_opts.split() + ): + sba_br_switching_dtx = 1 + cut_file = pre_proc_input(testv_file, fs) + testv_file = cut_file + # bitrate can be a filename: remove leading "../" if bitrate.startswith("../"): bitrate = bitrate[3:] @@ -176,7 +188,10 @@ def test_param_file_tests( enc_split, update_ref, ) - + if sba_br_switching_dtx == 1: + is_exist = os.path.exists(cut_file) + if is_exist: + os.remove(cut_file) # check for networkSimulator_g192 command line if sim_opts != "": sim_split = sim_opts.split() @@ -271,12 +286,12 @@ def test_param_file_tests( tracefile_dec, ) - # compare if update_ref in [0, 2]: - compare( - f"{dut_base_path}/param_file/dec/{output_file}", - f"{reference_path}/param_file/dec/{output_file}", - ) + dut_file = f"{dut_base_path}/param_file/dec/{output_file}" + ref_file = f"{reference_path}/param_file/dec/{output_file}" + fs = int(sampling_rate) * 1000 + cmp_result, reason = cmp_pcm(dut_file, ref_file, output_config, fs) + assert cmp_result == 0, reason # remove DUT output files when test result is OK (to save disk space) if not keep_files: @@ -335,6 +350,23 @@ def encode( ) +def pre_proc_input(testv_file, fs): + cut_from = "0.0" + cut_len = "5.0" + cut_gain = "0.004" + if "stvFOA" in testv_file: + num_channel = "4" + elif "stv2OA" in testv_file: + num_channel = "9" + elif "stv3OA" in testv_file: + num_channel = "16" + cut_file = testv_file.replace(".wav", num_channel + "chn_" + cut_gain + ".wav") + cut_samples( + testv_file, cut_file, num_channel, fs + "000", cut_from, cut_len, cut_gain + ) + return cut_file + + def simulate( reference_path, dut_base_path, @@ -356,14 +388,10 @@ def simulate( if platform.system() == "Windows": netsim = [os.path.join(rootdir, "scripts", "tools", "Win32", "networkSimulator_g192.exe")] - elif platform.system() == "Linux": - # there is no Linux binary available -> use the Win32 binary via wine - netsim = [ - "wine", - os.path.join(rootdir, "scripts", "tools", "Win32", "networkSimulator_g192.exe"), - ] - elif platform.system() == "Darwin": - netsim = [os.path.join(rootdir, "scripts", "tools", "Darwin", "networkSimulator_g192")] + elif platform.system() in ["Linux", "Darwin"]: + netsim = [os.path.join(rootdir, "scripts", "tools", platform.system(), "networkSimulator_g192")] + else: + assert False, f"networkSimulator_g192 not available for {platform.system()}" if update_ref == 1 or update_ref == 2 and not os.path.exists(ref_out_file): # call network simulator on REF encoder output @@ -442,19 +470,3 @@ def decode( dut_out_file, add_option_list=add_option_list, ) - - -def compare( - pcm_file_1, - pcm_file_2, -): - """ - Compare two PCM files. - Currently, both PCM files are treated like mono files. - This is just fine when checking for bit-exactness. - More advanced comparisons are possible and might come with a future update. - """ - sample_size = "2" # 16-bit samples - tolerance = "0" # zero tolerance for BE testing - cmp_result, reason = cmp_custom(pcm_file_1, pcm_file_2, sample_size, tolerance) - assert cmp_result == 0, reason diff --git a/tests/test_sba_bs_dec_plc.py b/tests/test_sba_bs_dec_plc.py index b885c06ddd..4920a9c59c 100644 --- a/tests/test_sba_bs_dec_plc.py +++ b/tests/test_sba_bs_dec_plc.py @@ -1,6 +1,6 @@ __copyright__ = \ """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -38,7 +38,7 @@ import os import errno import pytest -from cmp_custom import cmp_custom +from cmp_pcm import cmp_pcm from conftest import DecoderFrontend # params @@ -49,7 +49,7 @@ ivas_br_list = ['32000', '64000', '96000', '256000'] sampling_rate_list = ['48', '32', '16'] agc_list = [-1, 0, 1] -AbsTol = '3' +AbsTol = '0' def check_and_makedir(dir_path): @@ -151,12 +151,13 @@ def sba_dec_plc( dut_out_raw = f"{dut_out_dir}/{plc_tag_out}.raw" ref_out_raw = f"{ref_out_dir}/{plc_tag_out}.raw" + output_config = "FOA" if ref_decoder_path: ref_decoder = DecoderFrontend(ref_decoder_path, "REF") # call REF decoder ref_decoder.run( - "FOA", + output_config, sampling_rate, ref_in_pkt, ref_out_raw, @@ -166,7 +167,7 @@ def sba_dec_plc( if update_ref == 0: # call DUT decoder decoder_frontend.run( - "FOA", + output_config, sampling_rate, ref_in_pkt_dutenc, dut_out_raw, @@ -174,16 +175,8 @@ def sba_dec_plc( ) # -------------- compare cmd -------------- - - end_skip_samples = '0' - - cmp_result, reason = cmp_custom( - dut_out_raw, - ref_out_raw, - "2", - AbsTol, - end_skip_samples - ) + fs = int(sampling_rate) * 1000 + cmp_result, reason = cmp_pcm(dut_out_raw, ref_out_raw, output_config, fs) # report compare result assert cmp_result == 0, reason diff --git a/tests/test_sba_bs_enc.py b/tests/test_sba_bs_enc.py index fcf1c00fba..6825ee12ba 100644 --- a/tests/test_sba_bs_enc.py +++ b/tests/test_sba_bs_enc.py @@ -1,6 +1,6 @@ __copyright__ = \ """ - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other @@ -39,21 +39,21 @@ import os import errno import pytest -from cmp_custom import cmp_custom +from cmp_pcm import cmp_pcm from cut_pcm import cut_samples from conftest import EncoderFrontend, DecoderFrontend # params tag_list = ['stvFOA'] -tag_list_HOA2 = ['test_HOA2'] -tag_list_HOA3 = ['test_HOA3'] +tag_list_HOA2 = ['stv2OA'] +tag_list_HOA3 = ['stv3OA'] tag_list_bw_force = ['stvFOA'] dtx_set = ['0', '1'] dict_fsample_bw = {'48': '3', '32': '2', '16': '1'} dict_bw_idx = {'FB': '3', 'SWB': '2', 'WB': '1'} dict_bw_tag = {'SWB': '_ForceSWB', 'WB': '_ForceWB'} -ivas_br_FOA = ['32000', '64000', '96000', '160000', '256000', '384000', '512000'] +ivas_br_FOA = ['32000','64000', '96000', '160000', '256000', '384000', '512000','sw_24k4_256k.bin'] ivas_br_HOA2 = ['256000', '384000', '512000'] ivas_br_HOA3 = ['256000', '384000', '512000'] @@ -63,7 +63,7 @@ agc_list = [-1, 0, 1] sample_rate_bw_idx_list = [('48', 'SWB'), ('48', 'WB'), ('32', 'WB')] -AbsTol = '4' +AbsTol = '0' def check_and_makedir(dir_path): @@ -111,6 +111,7 @@ def test_bypass_enc( ref_encoder_path, reference_path, dut_base_path, + None, tag, fs, ivas_br, @@ -119,7 +120,8 @@ def test_bypass_enc( bypass, agc, sba_order, - update_ref + update_ref, + cut_testv=True ) # dec @@ -155,6 +157,7 @@ def test_sba_enc_system( dut_base_path, ref_encoder_path, ref_decoder_path, + br_switch_file_path, update_ref, keep_files, ivas_br, @@ -166,7 +169,9 @@ def test_sba_enc_system( if dtx == '1' and ivas_br not in ['32000', '64000']: # skip high bitrates for DTX until DTX issue is resolved pytest.skip() - + if ivas_br == 'sw_24k4_256k.bin' and agc != 1: + pytest.skip() + tag = tag + fs + 'c' max_bw = "FB" bypass = -1 @@ -185,6 +190,7 @@ def test_sba_enc_system( ref_encoder_path, reference_path, dut_base_path, + br_switch_file_path, tag, fs, ivas_br, @@ -195,7 +201,8 @@ def test_sba_enc_system( sba_order, update_ref, cut_gain=cut_gain, - create_dutenc=True + create_dutenc=True, + cut_testv=True ) # dec @@ -237,7 +244,7 @@ def test_spar_hoa2_enc_system( dtx = '0' agc = -1 -# tag = tag + '_' + fs + 'k' + tag = tag + fs + 'c' max_bw = "FB" bypass = -1 sba_order = "+2" @@ -250,6 +257,7 @@ def test_spar_hoa2_enc_system( ref_encoder_path, reference_path, dut_base_path, + None, tag, fs, ivas_br, @@ -259,7 +267,6 @@ def test_spar_hoa2_enc_system( agc, sba_order, update_ref, - '.wav' ) # dec @@ -301,7 +308,7 @@ def test_spar_hoa3_enc_system( dtx = '0' agc = -1 -# tag = tag + '_' + fs + 'k' + tag = tag + fs + 'c' max_bw = "FB" bypass = -1 sba_order = "+3" @@ -314,6 +321,7 @@ def test_spar_hoa3_enc_system( ref_encoder_path, reference_path, dut_base_path, + None, tag, fs, ivas_br, @@ -323,7 +331,6 @@ def test_spar_hoa3_enc_system( agc, sba_order, update_ref, - '.wav' ) # dec @@ -368,7 +375,8 @@ def test_sba_enc_BWforce_system( if dtx == '1' and ivas_br not in ['32000', '64000']: # skip high bitrates for DTX until DTX issue is resolved pytest.skip() - + if ivas_br == 'sw_24k4_256k.bin': + pytest.skip() fs = sample_rate_bw_idx[0] bw = sample_rate_bw_idx[1] tag = tag + fs + 'c' @@ -384,6 +392,7 @@ def test_sba_enc_BWforce_system( ref_encoder_path, reference_path, dut_base_path, + None, tag, fs, ivas_br, @@ -392,7 +401,8 @@ def test_sba_enc_BWforce_system( bypass, agc, sba_order, - update_ref + update_ref, + cut_testv=True ) # dec @@ -422,6 +432,7 @@ def sba_enc( ref_encoder_path, reference_path, dut_base_path, + br_switch_file_path, tag, sampling_rate, ivas_br, @@ -431,9 +442,9 @@ def sba_enc( agc, sba_order, update_ref, - in_extension='.pcm', cut_gain='1.0', - create_dutenc=False + create_dutenc=False, + cut_testv=False ): # ------------ run cmd ------------ @@ -443,6 +454,8 @@ def sba_enc( check_and_makedir(dut_out_dir) check_and_makedir(ref_out_dir) + in_extension = ".wav" + tag_in = tag # sampling rate to BW mapping bw_idx = dict_fsample_bw[sampling_rate] @@ -450,6 +463,8 @@ def sba_enc( tag = tag + dict_bw_tag[ivas_max_bw] tag_out = f"{tag}_ivasbr{ivas_br[:-3]}k_DTX{dtx}" + if ivas_br == 'sw_24k4_256k.bin': + ivas_br = f"{br_switch_file_path}/sw_24k4_256k.bin" short_tag_ext = "" if agc != -1: short_tag_ext += f'_AGC{agc}' @@ -468,7 +483,7 @@ def sba_enc( bypass_mode = bypass if bypass >= 0 else None dtx_mode = dtx == '1' - if in_extension == '.pcm': + if cut_testv: # use shortened and potentially gain adjusted input PCM file - create if not present # cut input PCM file: currently with mostly fixed (i.e. not test dependant) values num_channels = "4" # currently only FOA inputs end up, here @@ -593,17 +608,8 @@ def sba_dec( dut_out_raw, ) - # -------------- compare cmd -------------- - - end_skip_samples = '0' - - cmp_result, reason = cmp_custom( - dut_out_raw, - ref_out_raw, - "2", - AbsTol, - end_skip_samples - ) + fs = int(sampling_rate) * 1000 + cmp_result, reason = cmp_pcm(dut_out_raw, ref_out_raw, output_config, fs) # report compare result assert cmp_result == 0, reason diff --git a/tests/testconfig.py b/tests/testconfig.py index f4827a004f..12d170ba8d 100644 --- a/tests/testconfig.py +++ b/tests/testconfig.py @@ -1,6 +1,6 @@ __copyright__ = \ """ -(C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, +(C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other diff --git a/work_in_progress/readme.txt b/work_in_progress/readme.txt index e06e36def1..02be8c90f2 100644 --- a/work_in_progress/readme.txt +++ b/work_in_progress/readme.txt @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other -- GitLab